Changeset 453c5ce in mainline

Timestamp:

2019-11-09T19:06:16Z (5 years ago)

Author:

Jakub Jermář <jakub@…>

Branches:

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

Children:

e1abc964

Parents:

e18f0c0

git-author:

CHTCHEGLOV Ilia <chtcheglov.ilia@…> (2019-11-09 12:55:24)

git-committer:

Jakub Jermář <jakub@…> (2019-11-09 19:06:16)

Message:

Added support for French keyboard layout

Use CTRL+F5 to use it.

Location:

uspace/srv/hid/input

Files:

• input.c (modified) (3 diffs)
• layout.h (modified) (1 diff)
• layout/fr_azerty.c (added)
• meson.build (modified) (1 diff)

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;
+                }
         }
 

uspace/srv/hid/input/layout.h

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

uspace/srv/hid/input/meson.build

@@ -31 +31 @@
 src = files(
         'layout/cz.c',
+        'layout/fr_azerty.c',
         'layout/us_qwerty.c',
         'layout/us_dvorak.c',