Changeset 28a5ebd in mainline for uspace/lib/c/include/io

Timestamp:

2020-06-18T15:39:50Z (6 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

ce52c333

Parents:

4f663f3e

Message:

Use char32_t instead of wchat_t to represent UTF-32 strings

The intention of the native HelenOS string API has been always to
support Unicode in the UTF-8 and UTF-32 encodings as the sole character
representations and ignore the obsolete mess of older single-byte and
multibyte character encodings. Before C11, the wchar_t type has been
slightly misused for the purpose of the UTF-32 strings. The newer
char32_t type is obviously a much more suitable option. The standard
defines char32_t as uint_least32_t, thus we can take the liberty to fix
it to uint32_t.

To maintain compatilibity with the C Standard, the putwchar(wchar_t)
functions has been replaced by our custom putuchar(char32_t) functions
where appropriate.

Location:

uspace/lib/c/include/io

Files:

• charfield.h (modified) (2 diffs)
• chargrid.h (modified) (1 diff)
• input.h (modified) (1 diff)
• kbd_event.h (modified) (1 diff)
• printf_core.h (modified) (2 diffs)

uspace/lib/c/include/io/charfield.h

@@ -38 +38 @@
 
 #include <stdbool.h>
-#include <wchar.h>
+#include <uchar.h>
 #include <io/color.h>
 #include <io/style.h>
@@ -77 +77 @@
 
 typedef struct {
-        wchar_t ch;
+        char32_t ch;
         char_attrs_t attrs;
         char_flags_t flags;

uspace/lib/c/include/io/chargrid.h

@@ -79 +79 @@
 extern sysarg_t chargrid_get_top_row(chargrid_t *);
 
-extern sysarg_t chargrid_putwchar(chargrid_t *, wchar_t, bool);
+extern sysarg_t chargrid_putuchar(chargrid_t *, char32_t, bool);
 extern sysarg_t chargrid_newline(chargrid_t *);
 extern sysarg_t chargrid_tabstop(chargrid_t *, sysarg_t);

uspace/lib/c/include/io/input.h

@@ -50 +50 @@
         errno_t (*active)(input_t *);
         errno_t (*deactive)(input_t *);
-        errno_t (*key)(input_t *, kbd_event_type_t, keycode_t, keymod_t, wchar_t);
+        errno_t (*key)(input_t *, kbd_event_type_t, keycode_t, keymod_t, char32_t);
         errno_t (*move)(input_t *, int, int);
         errno_t (*abs_move)(input_t *, unsigned, unsigned, unsigned, unsigned);

uspace/lib/c/include/io/kbd_event.h

@@ -59 +59 @@
 
         /** The character that was generated or '\0' for none. */
-        wchar_t c;
+        char32_t c;
 } kbd_event_t;
 

uspace/lib/c/include/io/printf_core.h

@@ -38 +38 @@
 #include <stddef.h>
 #include <stdarg.h>
+#include <uchar.h>
 
 /** Structure for specifying output methods for different printf clones. */
@@ -45 +46 @@
 
         /* Wide string output function, returns number of printed characters or EOF */
-        int (*wstr_write)(const wchar_t *, size_t, void *);
+        int (*wstr_write)(const char32_t *, size_t, void *);
 
         /* User data - output stream specification, state, locks, etc. */