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

uspace/lib/draw/font.c

@@ -64 +64 @@
 }
 
-errno_t font_resolve_glyph(font_t *font, wchar_t c, glyph_id_t *glyph_id)
+errno_t font_resolve_glyph(font_t *font, char32_t c, glyph_id_t *glyph_id)
 {
         return font->backend->resolve_glyph(font->backend_data, c, glyph_id);
@@ -95 +95 @@
         size_t off = 0;
         while (true) {
-                wchar_t c = str_decode(text, &off, STR_NO_LIMIT);
+                char32_t c = str_decode(text, &off, STR_NO_LIMIT);
                 if (c == 0)
                         break;
@@ -138 +138 @@
         size_t off = 0;
         while (true) {
-                wchar_t c = str_decode(text, &off, STR_NO_LIMIT);
+                char32_t c = str_decode(text, &off, STR_NO_LIMIT);
                 if (c == 0)
                         break;