Changeset 9db4079 in mainline for uspace/srv/kbd/layout/us_qwerty.c

Timestamp:

2009-04-05T09:27:12Z (15 years ago)

Author:

Jiri Svoboda <jirik.svoboda@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

cee8d3e

Parents:

b27eb71

Message:

UCS in keyboard driver.

File:

• uspace/srv/kbd/layout/us_qwerty.c (modified) (8 diffs)

uspace/srv/kbd/layout/us_qwerty.c

@@ -37 +37 @@
 #include <layout.h>
 
-static char map_lcase[] = {
+static wchar_t map_lcase[] = {
         [KC_Q] = 'q',
         [KC_W] = 'w',
@@ -68 +68 @@
 };
 
-static char map_ucase[] = {
+static wchar_t map_ucase[] = {
         [KC_Q] = 'Q',
         [KC_W] = 'W',
@@ -99 +99 @@
 };
 
-static char map_not_shifted[] = {
+static wchar_t map_not_shifted[] = {
         [KC_BACKTICK] = '`',
 
@@ -128 +128 @@
 };
 
-static char map_shifted[] = {
+static wchar_t map_shifted[] = {
         [KC_BACKTICK] = '~',
 
@@ -157 +157 @@
 };
 
-static char map_neutral[] = {
+static wchar_t map_neutral[] = {
         [KC_BACKSPACE] = '\b',
         [KC_TAB] = '\t',
@@ -170 +170 @@
 };
 
-static char map_numeric[] = {
+static wchar_t map_numeric[] = {
         [KC_N7] = '7',
         [KC_N8] = '8',
@@ -185 +185 @@
 };
 
-static int translate(unsigned int key, char *map, size_t map_length)
+static wchar_t translate(unsigned int key, wchar_t *map, size_t map_length)
 {
-        if (key >= map_length) return 0;
-        return map[key];        
+        if (key >= map_length)
+                return 0;
+        return map[key];
 }
 
-char layout_parse_ev(kbd_event_t *ev)
+wchar_t layout_parse_ev(kbd_event_t *ev)
 {
-        char c;
+        wchar_t c;
 
         /* Produce no characters when Ctrl or Alt is pressed. */
@@ -199 +200 @@
                 return 0;
 
-        c = translate(ev->key, map_neutral, sizeof(map_neutral) / sizeof(char));
-        if (c != 0) return c;
+        c = translate(ev->key, map_neutral, sizeof(map_neutral) / sizeof(wchar_t));
+        if (c != 0)
+                return c;
 
         if (((ev->mods & KM_SHIFT) != 0) ^ ((ev->mods & KM_CAPS_LOCK) != 0))
-                c = translate(ev->key, map_ucase, sizeof(map_ucase) / sizeof(char));
+                c = translate(ev->key, map_ucase, sizeof(map_ucase) / sizeof(wchar_t));
         else
-                c = translate(ev->key, map_lcase, sizeof(map_lcase) / sizeof(char));
-
-        if (c != 0) return c;
+                c = translate(ev->key, map_lcase, sizeof(map_lcase) / sizeof(wchar_t));
+
+        if (c != 0)
+                return c;
 
         if ((ev->mods & KM_SHIFT) != 0)
-                c = translate(ev->key, map_shifted, sizeof(map_shifted) / sizeof(char));
+                c = translate(ev->key, map_shifted, sizeof(map_shifted) / sizeof(wchar_t));
         else
-                c = translate(ev->key, map_not_shifted, sizeof(map_not_shifted) / sizeof(char));
-
-        if (c != 0) return c;
+                c = translate(ev->key, map_not_shifted, sizeof(map_not_shifted) / sizeof(wchar_t));
+
+        if (c != 0)
+                return c;
 
         if ((ev->mods & KM_NUM_LOCK) != 0)
-                c = translate(ev->key, map_numeric, sizeof(map_numeric) / sizeof(char));
+                c = translate(ev->key, map_numeric, sizeof(map_numeric) / sizeof(wchar_t));
         else
                 c = 0;