Changeset 2b95d13 in mainline for uspace/srv/hid/input

Timestamp:

2013-03-12T21:07:15Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

606f6a1

Parents:

976c434 (diff), eceff5f (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

Location:

uspace/srv/hid/input

Files:

• Makefile (modified) (1 diff)
• input.c (modified) (2 diffs)
• layout.h (modified) (1 diff)
• layout/ar.c (added)

uspace/srv/hid/input/Makefile

@@ -35 +35 @@
         layout/us_qwerty.c \
         layout/us_dvorak.c \
+        layout/ar.c \
         port/adb.c \
         port/adb_mouse.c \

uspace/srv/hid/input/input.c

@@ -62 +62 @@
 #include "input.h"
 
-#define NUM_LAYOUTS  3
+#define NUM_LAYOUTS  4
 
 static layout_ops_t *layout[NUM_LAYOUTS] = {
         &us_qwerty_ops,
         &us_dvorak_ops,
-        &cz_ops
+        &cz_ops,
+        &ar_ops
 };
 
@@ -160 +161 @@
                 layout_destroy(kdev->active_layout);
                 kdev->active_layout = layout_create(layout[2]);
+                return;
+        }
+        
+        if (type == KEY_PRESS && (kdev->mods & KM_LCTRL) &&
+            key == KC_F4) {
+                layout_destroy(kdev->active_layout);
+                kdev->active_layout = layout_create(layout[3]);
                 return;
         }

uspace/srv/hid/input/layout.h

@@ -60 +60 @@
 extern layout_ops_t us_dvorak_ops;
 extern layout_ops_t cz_ops;
+extern layout_ops_t ar_ops;
 
 extern layout_t *layout_create(layout_ops_t *);