Changeset 2069690 in mainline

Timestamp:

2009-03-05T22:46:14Z (16 years ago)

Author:

Jiri Svoboda <jirik.svoboda@…>

Branches:

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

Children:

4f22731f

Parents:

5ee7377

Message:

Update Dvorak layout.

File:

• uspace/srv/kbd/layout/us_dvorak.c (modified) (2 diffs)

uspace/srv/kbd/layout/us_dvorak.c

@@ -166 +166 @@
         [KC_BACKSPACE] = '\b',
         [KC_TAB] = '\t',
-        [KC_ENTER] = '\n'
+        [KC_ENTER] = '\n',
+        [KC_SPACE] = ' ',
+
+        [KC_NSLASH] = '/',
+        [KC_NTIMES] = '*',
+        [KC_NMINUS] = '-',
+        [KC_NPLUS] = '+',
+        [KC_NENTER] = '\n'
+};
+
+static char map_numeric[] = {
+        [KC_N7] = '7',
+        [KC_N8] = '8',
+        [KC_N9] = '9',
+        [KC_N4] = '4',
+        [KC_N5] = '5',
+        [KC_N6] = '6',
+        [KC_N1] = '1',
+        [KC_N2] = '2',
+        [KC_N3] = '3',
+
+        [KC_N0] = '0',
+        [KC_NPERIOD] = '.'
 };
 
@@ -198 +220 @@
                 c = translate(ev->key, map_not_shifted, sizeof(map_not_shifted) / sizeof(char));
 
-        if (c != 0 ) return c;
-
+        if (c != 0) return c;
+
+        if ((ev->mods & KM_NUM_LOCK) != 0)
+                c = translate(ev->key, map_numeric, sizeof(map_numeric) / sizeof(char));
+        else
+                c = 0;
+
+        return c;
 }
-
 
 /**