Changeset 28a5ebd in mainline for uspace/lib/draw

Timestamp:

2020-06-18T15:39:50Z (5 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/lib/draw

Files:

• font.c (modified) (3 diffs)
• font/bitmap_backend.c (modified) (1 diff)
• font/embedded.c (modified) (1 diff)
• font/pcf.c (modified) (1 diff)
• gfx/font-8x16.c (modified) (1 diff)
• include/draw/font.h (modified) (3 diffs)
• include/draw/gfx.h (modified) (2 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;

uspace/lib/draw/font/bitmap_backend.c

@@ -67 +67 @@
 }
 
-static errno_t bb_resolve_glyph(void *backend_data, wchar_t c, glyph_id_t *glyph_id)
+static errno_t bb_resolve_glyph(void *backend_data, char32_t c, glyph_id_t *glyph_id)
 {
         bitmap_backend_data_t *data = (bitmap_backend_data_t *) backend_data;

uspace/lib/draw/font/embedded.c

@@ -43 +43 @@
 #include <draw/drawctx.h>
 
-static errno_t fde_resolve_glyph(void *unused, const wchar_t chr,
+static errno_t fde_resolve_glyph(void *unused, const char32_t chr,
     glyph_id_t *glyph_id)
 {

uspace/lib/draw/font/pcf.c

@@ -143 +143 @@
 }
 
-static errno_t pcf_resolve_glyph(void *opaque_data, const wchar_t chr,
+static errno_t pcf_resolve_glyph(void *opaque_data, const char32_t chr,
     glyph_id_t *glyph_id)
 {

uspace/lib/draw/gfx/font-8x16.c

@@ -47 +47 @@
  *
  */
-uint16_t fb_font_glyph(const wchar_t ch, bool *found)
+uint16_t fb_font_glyph(const char32_t ch, bool *found)
 {
         if (found)

uspace/lib/draw/include/draw/font.h

@@ -97 +97 @@
 typedef struct {
         errno_t (*get_font_metrics)(void *, font_metrics_t *);
-        errno_t (*resolve_glyph)(void *, wchar_t, glyph_id_t *);
+        errno_t (*resolve_glyph)(void *, char32_t, glyph_id_t *);
         errno_t (*get_glyph_metrics)(void *, glyph_id_t, glyph_metrics_t *);
         errno_t (*render_glyph)(void *, drawctx_t *, source_t *, sysarg_t,
@@ -110 +110 @@
 
 typedef struct {
-        errno_t (*resolve_glyph)(void *, const wchar_t, glyph_id_t *);
+        errno_t (*resolve_glyph)(void *, const char32_t, glyph_id_t *);
         errno_t (*load_glyph_surface)(void *, glyph_id_t, surface_t **);
         errno_t (*load_glyph_metrics)(void *, glyph_id_t, glyph_metrics_t *);
@@ -118 +118 @@
 extern font_t *font_create(font_backend_t *, void *);
 extern errno_t font_get_metrics(font_t *, font_metrics_t *);
-extern errno_t font_resolve_glyph(font_t *, wchar_t, glyph_id_t *);
+extern errno_t font_resolve_glyph(font_t *, char32_t, glyph_id_t *);
 extern errno_t font_get_glyph_metrics(font_t *, glyph_id_t, glyph_metrics_t *);
 extern errno_t font_render_glyph(font_t *, drawctx_t *, source_t *,

uspace/lib/draw/include/draw/gfx.h

@@ -40 +40 @@
 #include <stdbool.h>
 #include <stddef.h>
+#include <uchar.h>
 
 #define CURSOR_WIDTH   11
@@ -52 +53 @@
 extern uint8_t cursor_mask[];
 
-extern uint16_t fb_font_glyph(const wchar_t, bool *);
+extern uint16_t fb_font_glyph(const char32_t, bool *);
 extern uint8_t fb_font[FONT_GLYPHS][FONT_SCANLINES];