Changeset 28a5ebd in mainline for uspace/srv/hid/output

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/srv/hid/output

Files:

• ctl/serial.c (modified) (2 diffs)
• ctl/serial.h (modified) (1 diff)
• gfx/font-8x16.c (modified) (1 diff)
• gfx/font-8x16.h (modified) (1 diff)
• port/chardev.c (modified) (3 diffs)
• port/kfb.c (modified) (3 diffs)
• proto/vt100.c (modified) (3 diffs)
• proto/vt100.h (modified) (3 diffs)

uspace/srv/hid/output/ctl/serial.c

@@ -57 +57 @@
         vt100_goto(state, col, row);
         vt100_set_attr(state, field->attrs);
-        vt100_putwchar(state, field->ch);
+        vt100_putuchar(state, field->ch);
 }
 
@@ -122 +122 @@
 };
 
-errno_t serial_init(vt100_putwchar_t putwchar_fn,
+errno_t serial_init(vt100_putuchar_t putuchar_fn,
     vt100_control_puts_t control_puts_fn, vt100_flush_t flush_fn)
 {
         vt100_state_t *state =
-            vt100_state_create(SERIAL_COLS, SERIAL_ROWS, putwchar_fn,
+            vt100_state_create(SERIAL_COLS, SERIAL_ROWS, putuchar_fn,
             control_puts_fn, flush_fn);
         if (state == NULL)

uspace/srv/hid/output/ctl/serial.h

@@ -37 +37 @@
 #include "../proto/vt100.h"
 
-extern errno_t serial_init(vt100_putwchar_t, vt100_control_puts_t, vt100_flush_t);
+extern errno_t serial_init(vt100_putuchar_t, vt100_control_puts_t, vt100_flush_t);
 
 #endif

uspace/srv/hid/output/gfx/font-8x16.c

@@ -45 +45 @@
  *
  */
-uint16_t fb_font_glyph(const wchar_t ch)
+uint16_t fb_font_glyph(const char32_t ch)
 {
         if (ch == 0x0000)

uspace/srv/hid/output/gfx/font-8x16.h

@@ -42 +42 @@
 #define FONT_SCANLINES  16
 
-extern uint16_t fb_font_glyph(const wchar_t);
+extern uint16_t fb_font_glyph(const char32_t);
 extern uint8_t fb_font[FONT_GLYPHS][FONT_SCANLINES];
 

uspace/srv/hid/output/port/chardev.c

@@ -78 +78 @@
 }
 
-static void chardev_putwchar(wchar_t ch)
+static void chardev_putuchar(char32_t ch)
 {
         if (chardev_bused == chardev_buf_size)
@@ -93 +93 @@
         p = str;
         while (*p != '\0')
-                chardev_putwchar(*p++);
+                chardev_putuchar(*p++);
 }
 
@@ -199 +199 @@
         }
 
-        serial_init(chardev_putwchar, chardev_control_puts, chardev_flush);
+        serial_init(chardev_putuchar, chardev_control_puts, chardev_flush);
 
         discovery_finished = true;

uspace/srv/hid/output/port/kfb.c

@@ -79 +79 @@
 
 /** Function to draw a character. */
-typedef void (*draw_char_t)(sysarg_t, sysarg_t, bool, wchar_t, pixel_t,
+typedef void (*draw_char_t)(sysarg_t, sysarg_t, bool, char32_t, pixel_t,
     pixel_t);
 
@@ -287 +287 @@
  *
  */
-static void draw_char_aligned(sysarg_t x, sysarg_t y, bool inverted, wchar_t ch,
+static void draw_char_aligned(sysarg_t x, sysarg_t y, bool inverted, char32_t ch,
     pixel_t bgcolor, pixel_t fgcolor)
 {
@@ -350 +350 @@
  */
 static void draw_char_fallback(sysarg_t x, sysarg_t y, bool inverted,
-    wchar_t ch, pixel_t bgcolor, pixel_t fgcolor)
+    char32_t ch, pixel_t bgcolor, pixel_t fgcolor)
 {
         /* Character glyph */

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++;
 

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

@@ -36 +36 @@
 #include <io/charfield.h>
 
-typedef void (*vt100_putwchar_t)(wchar_t ch);
+typedef void (*vt100_putuchar_t)(char32_t ch);
 typedef void (*vt100_control_puts_t)(const char *str);
 typedef void (*vt100_flush_t)(void);
@@ -48 +48 @@
         char_attrs_t cur_attrs;
 
-        vt100_putwchar_t putwchar;
+        vt100_putuchar_t putuchar;
         vt100_control_puts_t control_puts;
         vt100_flush_t flush;
 } vt100_state_t;
 
-extern vt100_state_t *vt100_state_create(sysarg_t, sysarg_t, vt100_putwchar_t,
+extern vt100_state_t *vt100_state_create(sysarg_t, sysarg_t, vt100_putuchar_t,
     vt100_control_puts_t, vt100_flush_t);
 extern void vt100_state_destroy(vt100_state_t *);
@@ -64 +64 @@
 extern void vt100_set_attr(vt100_state_t *, char_attrs_t);
 extern void vt100_cursor_visibility(vt100_state_t *, bool);
-extern void vt100_putwchar(vt100_state_t *, wchar_t);
+extern void vt100_putuchar(vt100_state_t *, char32_t);
 extern void vt100_flush(vt100_state_t *);