Changeset b987eb4 in mainline

Timestamp:

2022-03-11T16:42:03Z (2 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

Files:

• app/tetris/scores.c (modified) (1 diff)
• lib/clui/tinput.c (modified) (1 diff)
• lib/ui/src/entry.c (modified) (3 diffs)
• srv/hid/input/layout/ar.c (modified) (1 diff)
• srv/hid/input/layout/cz.c (modified) (1 diff)
• srv/hid/input/layout/fr_azerty.c (modified) (1 diff)
• srv/hid/input/layout/us_dvorak.c (modified) (1 diff)
• srv/hid/input/layout/us_qwerty.c (modified) (1 diff)

uspace/app/tetris/scores.c

@@ -149 +149 @@
                         continue;
 
+                if ((ev.ev.key.mods & (KM_CTRL | KM_ALT)) != 0)
+                        continue;
+
                 kev = &ev.ev.key;
 

uspace/lib/clui/tinput.c

@@ -857 +857 @@
                 tinput_key_unmod(ti, kev);
 
-        if (kev->c >= ' ') {
+        if (((kev->mods & (KM_CTRL | KM_ALT)) == 0) && kev->c >= ' ') {
                 tinput_sel_delete(ti);
                 tinput_insert_char(ti, kev->c);

uspace/lib/ui/src/entry.c

@@ -664 +664 @@
                 break;
         }
-
         return ui_claimed;
 }
@@ -743 +742 @@
         if (!entry->active)
                 return ui_unclaimed;
-
-        if (event->type == KEY_PRESS && event->c >= ' ') {
-                off = 0;
-                rc = chr_encode(event->c, buf, &off, sizeof(buf));
-                if (rc == EOK) {
-                        buf[off] = '\0';
-                        (void) ui_entry_insert_str(entry, buf);
-                }
-        }
 
         /*
@@ -768 +758 @@
         if (event->type == KEY_RELEASE && event->key == KC_RSHIFT)
                 entry->rshift_held = false;
+
+        if (event->type == KEY_PRESS &&
+            (event->mods & (KM_CTRL | KM_ALT)) == 0 && event->c >= ' ') {
+                off = 0;
+                rc = chr_encode(event->c, buf, &off, sizeof(buf));
+                if (rc == EOK) {
+                        buf[off] = '\0';
+                        (void) ui_entry_insert_str(entry, buf);
+                }
+        }
 
         if (event->type == KEY_PRESS &&

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)