Changeset 28a5ebd in mainline for uspace/srv/hid/output/proto/vt100.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/srv/hid/output/proto/vt100.c (modified) (3 diffs)

uspace/srv/hid/output/proto/vt100.c

@@ -140 +140 @@
 
 vt100_state_t *vt100_state_create(sysarg_t cols, sysarg_t rows,
-    vt100_putwchar_t putwchar_fn, vt100_control_puts_t control_puts_fn,
+    vt100_putuchar_t putuchar_fn, vt100_control_puts_t control_puts_fn,
     vt100_flush_t flush_fn)
 {
@@ -147 +147 @@
                 return NULL;
 
-        state->putwchar = putwchar_fn;
+        state->putuchar = putuchar_fn;
         state->control_puts = control_puts_fn;
         state->flush = flush_fn;
@@ -220 +220 @@
 }
 
-void vt100_putwchar(vt100_state_t *state, wchar_t ch)
-{
-        state->putwchar(ch == 0 ? ' ' : ch);
+void vt100_putuchar(vt100_state_t *state, char32_t ch)
+{
+        state->putuchar(ch == 0 ? ' ' : ch);
         state->cur_col++;