Changeset b987eb4 in mainline for uspace/lib/ui/src/entry.c

Timestamp:

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

File:

• uspace/lib/ui/src/entry.c (modified) (3 diffs)

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 &&