Changeset cb9313e in mainline for uspace/srv/hid/input/input.c

Timestamp:

2019-05-12T15:02:29Z (5 years ago)

Author:

Matthieu Riolo <matthieu.riolo@…>

Children:

3e1bc35

Parents:

1e8b633

git-author:

Matthieu Riolo <matthieu.riolo@…> (2019-05-12 05:41:53)

git-committer:

Matthieu Riolo <matthieu.riolo@…> (2019-05-12 15:02:29)

Message:

Adding a configuration flag which allows to define which is
the default keyboard layout

This commit adds a new configuration flag which defines the
default keyboard layout. This layout will be hardcoded into
the system. Changing to this keyboard layout can be done by
pressing CTRL+F1.

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
-
-static layout_ops_t *layout[NUM_LAYOUTS] = {
-        &us_qwerty_ops,
-        &us_dvorak_ops,
-        &cz_ops,
-        &ar_ops
-};
-
 typedef struct {
         /** Link into the list of clients */
@@ -206 +197 @@
         }
 
-        // TODO: More elegant layout switching
-
-        if ((type == KEY_PRESS) && (kdev->mods & KM_LCTRL) &&
-            (key == KC_F1)) {
+        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]);
+                kdev->active_layout = layout_create(&layout_default);
                 return;
         }
@@ -392 +359 @@
         kdev->mods = KM_NUM_LOCK;
         kdev->lock_keys = 0;
-        kdev->active_layout = layout_create(layout[0]);
+        kdev->active_layout = layout_create(&layout_default);
 
         return kdev;