Changeset 28a5ebd in mainline for uspace/lib/clui/tinput.c

Timestamp:

2020-06-18T15:39:50Z (4 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.

File:

• uspace/lib/clui/tinput.c (modified) (11 diffs)

uspace/lib/clui/tinput.c

@@ -113 +113 @@
 static void tinput_display_tail(tinput_t *ti, size_t start, size_t pad)
 {
-        wchar_t *dbuf = malloc((INPUT_MAX_SIZE + 1) * sizeof(wchar_t));
+        char32_t *dbuf = malloc((INPUT_MAX_SIZE + 1) * sizeof(char32_t));
         if (!dbuf)
                 return;
@@ -126 +126 @@
         size_t p = start;
         if (p < sa) {
-                memcpy(dbuf, ti->buffer + p, (sa - p) * sizeof(wchar_t));
+                memcpy(dbuf, ti->buffer + p, (sa - p) * sizeof(char32_t));
                 dbuf[sa - p] = '\0';
                 printf("%ls", dbuf);
@@ -137 +137 @@
 
                 memcpy(dbuf, ti->buffer + p,
-                    (sb - p) * sizeof(wchar_t));
+                    (sb - p) * sizeof(char32_t));
                 dbuf[sb - p] = '\0';
                 printf("%ls", dbuf);
@@ -148 +148 @@
         if (p < ti->nc) {
                 memcpy(dbuf, ti->buffer + p,
-                    (ti->nc - p) * sizeof(wchar_t));
+                    (ti->nc - p) * sizeof(char32_t));
                 dbuf[ti->nc - p] = '\0';
                 printf("%ls", dbuf);
@@ -154 +154 @@
 
         for (p = 0; p < pad; p++)
-                putwchar(' ');
+                putuchar(' ');
 
         console_flush(ti->console);
@@ -192 +192 @@
         tinput_console_set_lpos(ti, ti->text_coord + ti->nc);
         console_flush(ti->console);
-        putwchar('\n');
+        putuchar('\n');
 }
 
@@ -212 +212 @@
 }
 
-static void tinput_insert_char(tinput_t *ti, wchar_t c)
+static void tinput_insert_char(tinput_t *ti, char32_t c)
 {
         if (ti->nc == INPUT_MAX_SIZE)
@@ -263 +263 @@
         size_t i = 0;
         while (i < ilen) {
-                wchar_t c = str_decode(str, &off, STR_NO_LIMIT);
+                char32_t c = str_decode(str, &off, STR_NO_LIMIT);
                 if (c == '\0')
                         break;
@@ -506 +506 @@
 
         memmove(ti->buffer + sa, ti->buffer + sb,
-            (ti->nc - sb) * sizeof(wchar_t));
+            (ti->nc - sb) * sizeof(char32_t));
 
         ti->pos = ti->sel_start = sa;
@@ -526 +526 @@
 
         if (sb < ti->nc) {
-                wchar_t tmp_c = ti->buffer[sb];
+                char32_t tmp_c = ti->buffer[sb];
                 ti->buffer[sb] = '\0';
                 str = wstr_to_astr(ti->buffer + sa);
@@ -602 +602 @@
         size_t i;
         size_t a_off, b_off;
-        wchar_t ca, cb;
+        char32_t ca, cb;
 
         i = 0;