Changeset 28a5ebd in mainline for kernel/genarch/src/fb

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:

kernel/genarch/src/fb

Files:

• fb.c (modified) (3 diffs)
• font-8x16.c (modified) (1 diff)

kernel/genarch/src/fb/fb.c

@@ -123 +123 @@
 } fb_instance_t;
 
-static void fb_putwchar(outdev_t *, wchar_t);
+static void fb_putuchar(outdev_t *, char32_t);
 static void fb_redraw(outdev_t *);
 static void fb_scroll_up(outdev_t *);
@@ -129 +129 @@
 
 static outdev_operations_t fbdev_ops = {
-        .write = fb_putwchar,
+        .write = fb_putuchar,
         .redraw = fb_redraw,
         .scroll_up = fb_scroll_up,
@@ -418 +418 @@
  *
  */
-static void fb_putwchar(outdev_t *dev, wchar_t ch)
+static void fb_putuchar(outdev_t *dev, char32_t ch)
 {
         fb_instance_t *instance = (fb_instance_t *) dev->data;

kernel/genarch/src/fb/font-8x16.c

@@ -43 +43 @@
  * mark glyph if no specific glyph exists.
  */
-uint16_t fb_font_glyph(const wchar_t ch)
+uint16_t fb_font_glyph(const char32_t ch)
 {
         if (ch == 0x0000)