Changeset 28a5ebd in mainline for uspace/srv/hid/input/layout/fr_azerty.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/input/layout/fr_azerty.c (modified) (11 diffs)

uspace/srv/hid/input/layout/fr_azerty.c

@@ -43 +43 @@
 static errno_t fr_azerty_create (layout_t *);
 static void fr_azerty_destroy (layout_t *);
-static wchar_t fr_azerty_parse_ev (layout_t *, kbd_event_t *);
+static char32_t fr_azerty_parse_ev (layout_t *, kbd_event_t *);
 
 layout_ops_t fr_azerty_ops = {
@@ -51 +51 @@
 };
 
-static wchar_t map_lcase[] = {
+static char32_t map_lcase[] = {
         [KC_Q] = 'a',
         [KC_W] = 'z',
@@ -82 +82 @@
 };
 
-static wchar_t map_ucase[] = {
+static char32_t map_ucase[] = {
         [KC_Q] = 'A',
         [KC_W] = 'Z',
@@ -117 +117 @@
 };
 
-static wchar_t map_not_shifted[] = {
+static char32_t map_not_shifted[] = {
         [KC_BACKTICK] = L'²',
 
@@ -146 +146 @@
 };
 
-static wchar_t map_shifted[] = {
+static char32_t map_shifted[] = {
         [KC_M] = '?',
         [KC_BACKTICK] = '~',
@@ -176 +176 @@
 };
 
-static wchar_t map_neutral[] = {
+static char32_t map_neutral[] = {
         [KC_BACKSPACE] = '\b',
         [KC_TAB] = '\t',
@@ -189 +189 @@
 };
 
-static wchar_t map_numeric[] = {
+static char32_t map_numeric[] = {
         [KC_N7] = '7',
         [KC_N8] = '8',
@@ -204 +204 @@
 };
 
-static wchar_t translate (unsigned int key, wchar_t *map, size_t map_len)
+static char32_t translate (unsigned int key, char32_t *map, size_t map_len)
 {
         if (key >= map_len)
@@ -221 +221 @@
 }
 
-static wchar_t fr_azerty_parse_ev (layout_t *s, kbd_event_t *e)
+static char32_t fr_azerty_parse_ev (layout_t *s, kbd_event_t *e)
 {
         if ((e->mods & (KM_CTRL | KM_ALT)))
                 return 0; // Produce no characters when Ctrl or Alt is pressed
 
-        wchar_t c = translate (e->key, map_neutral, sizeof (map_neutral) / sizeof (wchar_t));
+        char32_t c = translate (e->key, map_neutral, sizeof (map_neutral) / sizeof (char32_t));
         if (c)
                 return c;
 
         if ((e->mods & KM_SHIFT))
-                c = translate (e->key, map_shifted, sizeof (map_shifted) / sizeof (wchar_t));
+                c = translate (e->key, map_shifted, sizeof (map_shifted) / sizeof (char32_t));
         else
-                c = translate (e->key, map_not_shifted, sizeof (map_not_shifted) / sizeof (wchar_t));
+                c = translate (e->key, map_not_shifted, sizeof (map_not_shifted) / sizeof (char32_t));
 
         if (c)
@@ -239 +239 @@
 
         if (((e->mods & KM_SHIFT)) ^ ((e->mods & KM_CAPS_LOCK)))
-                c = translate (e->key, map_ucase, sizeof (map_ucase) / sizeof (wchar_t));
+                c = translate (e->key, map_ucase, sizeof (map_ucase) / sizeof (char32_t));
         else
-                c = translate (e->key, map_lcase, sizeof (map_lcase) / sizeof (wchar_t));
+                c = translate (e->key, map_lcase, sizeof (map_lcase) / sizeof (char32_t));
 
         if (c)
@@ -247 +247 @@
 
         if ((e->mods & KM_NUM_LOCK))
-                c = translate (e->key, map_numeric, sizeof (map_numeric) / sizeof (wchar_t));
+                c = translate (e->key, map_numeric, sizeof (map_numeric) / sizeof (char32_t));
         else
                 c = 0;