Changeset b987eb4 in mainline for uspace/srv

Timestamp:

2022-03-11T16:42:03Z (4 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

b3b48f4

Parents:

c38ab6c

Message:

Translate keys to characters even if modifiers are pressed.

So that we can match Alt-key to menu accelerators. Of course
this means clients must check Ctrl and Alt state to determine
if they should insert characters, not just just kbd_event_t.c.

Location:

uspace/srv/hid/input/layout

Files:

• ar.c (modified) (1 diff)
• cz.c (modified) (1 diff)
• fr_azerty.c (modified) (1 diff)
• us_dvorak.c (modified) (1 diff)
• us_qwerty.c (modified) (1 diff)

uspace/srv/hid/input/layout/ar.c

@@ -216 +216 @@
         char32_t c;
 
-        /* Produce no characters when Ctrl or Alt is pressed. */
-        if ((ev->mods & (KM_CTRL | KM_ALT)) != 0)
-                return 0;
-
         c = translate(ev->key, map_neutral, sizeof(map_neutral) / sizeof(char32_t));
         if (c != 0)

uspace/srv/hid/input/layout/cz.c

@@ -322 +322 @@
         char32_t c;
 
-        /* Produce no characters when Ctrl or Alt is pressed. */
-        if ((ev->mods & (KM_CTRL | KM_ALT)) != 0)
-                return 0;
-
         if (ev->key == KC_EQUALS) {
                 if ((ev->mods & KM_SHIFT) != 0)

uspace/srv/hid/input/layout/fr_azerty.c

@@ -223 +223 @@
 static char32_t fr_azerty_parse_ev (layout_t *s, kbd_event_t *e)
 {
-        if ((e->mods & (KM_CTRL | KM_ALT)))
-                return 0; // Produce no characters when Ctrl or Alt is pressed
-
         char32_t c = translate (e->key, map_neutral, sizeof (map_neutral) / sizeof (char32_t));
         if (c)

uspace/srv/hid/input/layout/us_dvorak.c

@@ -225 +225 @@
         char32_t c;
 
-        /* Produce no characters when Ctrl or Alt is pressed. */
-        if ((ev->mods & (KM_CTRL | KM_ALT)) != 0)
-                return 0;
-
         c = translate(ev->key, map_neutral, sizeof(map_neutral) / sizeof(char32_t));
         if (c != 0)

uspace/srv/hid/input/layout/us_qwerty.c

@@ -219 +219 @@
         char32_t c;
 
-        /* Produce no characters when Ctrl or Alt is pressed. */
-        if ((ev->mods & (KM_CTRL | KM_ALT)) != 0)
-                return 0;
-
         c = translate(ev->key, map_neutral, sizeof(map_neutral) / sizeof(char32_t));
         if (c != 0)