Changeset 28a5ebd in mainline for uspace/lib/gui/terminal.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/gui/terminal.c (modified) (3 diffs)

uspace/lib/gui/terminal.c

@@ -419 +419 @@
                         if (event->type == CEV_KEY && event->ev.key.type == KEY_PRESS &&
                             event->ev.key.c != 0) {
-                                wchar_t tmp[2] = {
+                                char32_t tmp[2] = {
                                         event->ev.key.c,
                                         0
@@ -436 +436 @@
 }
 
-static void term_write_char(terminal_t *term, wchar_t ch)
+static void term_write_char(terminal_t *term, char32_t ch)
 {
         sysarg_t updated = 0;
@@ -455 +455 @@
                 break;
         default:
-                updated = chargrid_putwchar(term->frontbuf, ch, true);
+                updated = chargrid_putuchar(term->frontbuf, ch, true);
         }