Changeset 5de852c in mainline for uspace/app

Timestamp:

2022-01-11T13:12:15Z (4 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

bfc0fc6

Parents:

59768c7

git-author:

Jiri Svoboda <jiri@…> (2022-01-10 20:11:54)

git-committer:

Jiri Svoboda <jiri@…> (2022-01-11 13:12:15)

Message:

Coordinate keyboard event delivery between application and UI framework

If an application sets its own keyboard event handler, it needs to call
ui_window_def_kbd() to deliver events to the window's UI control tree.
Menubar should be able to capture these events so that they are not
accidentally acted upon by the application keyboard handler.

Location:

uspace/app

Files:

• calculator/calculator.c (modified) (1 diff)
• edit/edit.c (modified) (1 diff)

uspace/app/calculator/calculator.c

@@ -186 +186 @@
         calc_t *calc = (calc_t *) arg;
 
+        if (ui_window_def_kbd(window, event) == ui_claimed)
+                return;
+
         if (event->type == KEY_PRESS && (event->mods & KM_CTRL) != 0) {
                 switch (event->key) {

uspace/app/edit/edit.c

@@ -2230 +2230 @@
         pane.keymod = event->mods;
 
+        if (ui_window_def_kbd(window, event) == ui_claimed)
+                return;
+
         if (event->type == KEY_PRESS) {
                 key_handle_press(event);