Changeset 84876aa4 in mainline for uspace/srv/hid/input/input.c

Timestamp:

2019-11-15T13:46:34Z (4 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

ecb7828

Parents:

b093a62 (diff), d548fc0 (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 master into gfx

Mainly to get XCW fixes

File:

• uspace/srv/hid/input/input.c (modified) (3 diffs)

uspace/srv/hid/input/input.c

@@ -66 +66 @@
 #include "serial.h"
 
-#define NUM_LAYOUTS  4
+#define NUM_LAYOUTS 5
 
 static layout_ops_t *layout[NUM_LAYOUTS] = {
@@ -72 +72 @@
         &us_dvorak_ops,
         &cz_ops,
-        &ar_ops
+        &ar_ops,
+        &fr_azerty_ops
 };
 
@@ -208 +209 @@
         // TODO: More elegant layout switching
 
-        if ((type == KEY_PRESS) && (kdev->mods & KM_LCTRL) &&
-            (key == KC_F1)) {
-                layout_destroy(kdev->active_layout);
-                kdev->active_layout = layout_create(layout[0]);
-                return;
-        }
-
-        if ((type == KEY_PRESS) && (kdev->mods & KM_LCTRL) &&
-            (key == KC_F2)) {
-                layout_destroy(kdev->active_layout);
-                kdev->active_layout = layout_create(layout[1]);
-                return;
-        }
-
-        if ((type == KEY_PRESS) && (kdev->mods & KM_LCTRL) &&
-            (key == KC_F3)) {
-                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;
+        if ((type == KEY_PRESS) && (kdev->mods & KM_LCTRL)) {
+                switch (key) {
+                case KC_F1:
+                        layout_destroy(kdev->active_layout);
+                        kdev->active_layout = layout_create(layout[0]);
+                        break;
+                case KC_F2:
+                        layout_destroy(kdev->active_layout);
+                        kdev->active_layout = layout_create(layout[1]);
+                        break;
+                case KC_F3:
+                        layout_destroy(kdev->active_layout);
+                        kdev->active_layout = layout_create(layout[2]);
+                        break;
+                case KC_F4:
+                        layout_destroy(kdev->active_layout);
+                        kdev->active_layout = layout_create(layout[3]);
+                        break;
+                case KC_F5:
+                        layout_destroy(kdev->active_layout);
+                        kdev->active_layout = layout_create(layout[4]);
+                        break;
+                default: // default: is here to avoid compiler warning about unhandled cases
+                        break;
+                }
         }