Changeset fe24a52 in mainline

Timestamp:

2009-04-16T22:20:28Z (15 years ago)

Author:

Jiri Svoboda <jirik.svoboda@…>

Branches:

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

Children:

11f56c7

Parents:

87d71bf

Message:

Handle shift properly on top row of main block in Czech layout.

File:

• uspace/srv/kbd/layout/cz.c (modified) (4 diffs)

uspace/srv/kbd/layout/cz.c

@@ -55 +55 @@
 
 static wchar_t map_lcase[] = {
-        [KC_2] = L'ě',
-        [KC_3] = L'š',
-        [KC_4] = L'č',
-        [KC_5] = L'ř',
-        [KC_6] = L'ž',
-        [KC_7] = L'ý',
-        [KC_8] = L'á',
-        [KC_9] = L'í',
-        [KC_0] = L'é',
-
-        [KC_LBRACKET] = L'ú',
-        [KC_SEMICOLON] = L'ů',
-
         [KC_Q] = 'q',
         [KC_W] = 'w',
@@ -99 +86 @@
 
 static wchar_t map_ucase[] = {
-        [KC_2] = L'Ě',
-        [KC_3] = L'Š',
-        [KC_4] = L'Č',
-        [KC_5] = L'Ř',
-        [KC_6] = L'Ž',
-        [KC_7] = L'Ý',
-        [KC_8] = L'Á',
-        [KC_9] = L'Í',
-        [KC_0] = L'É',
-
-        [KC_LBRACKET] = L'Ú',
-        [KC_SEMICOLON] = L'Ů',
-
         [KC_Q] = 'Q',
         [KC_W] = 'W',
@@ -184 +158 @@
 };
 
+static wchar_t map_ns_nocaps[] = {
+        [KC_2] = L'ě',
+        [KC_3] = L'š',
+        [KC_4] = L'č',
+        [KC_5] = L'ř',
+        [KC_6] = L'ž',
+        [KC_7] = L'ý',
+        [KC_8] = L'á',
+        [KC_9] = L'í',
+        [KC_0] = L'é',
+
+        [KC_LBRACKET] = L'ú',
+        [KC_SEMICOLON] = L'ů'
+};
+
+static wchar_t map_ns_caps[] = {
+        [KC_2] = L'Ě',
+        [KC_3] = L'Š',
+        [KC_4] = L'Č',
+        [KC_5] = L'Ř',
+        [KC_6] = L'Ž',
+        [KC_7] = L'Ý',
+        [KC_8] = L'Á',
+        [KC_9] = L'Í',
+        [KC_0] = L'É',
+
+        [KC_LBRACKET] = L'Ú',
+        [KC_SEMICOLON] = L'Ů'
+};
+
 static wchar_t map_neutral[] = {
         [KC_BACKSPACE] = '\b',
@@ -325 +329 @@
         if (c != 0)
                 return c;
+
+        if ((ev->mods & KM_SHIFT) == 0) {
+                if ((ev->mods & KM_CAPS_LOCK) != 0)
+                        c = translate(ev->key, map_ns_caps, sizeof(map_ns_caps) / sizeof(wchar_t));
+                else
+                        c = translate(ev->key, map_ns_nocaps, sizeof(map_ns_nocaps) / sizeof(wchar_t));
+
+                if (c != 0)
+                        return c;
+        }       
 
         if (((ev->mods & KM_SHIFT) != 0) ^ ((ev->mods & KM_CAPS_LOCK) != 0))