Changeset 5de852c in mainline for uspace/lib/ui/src/window.c

Timestamp:

2022-01-11T13:12:15Z (2 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.

File:

• uspace/lib/ui/src/window.c (modified) (2 diffs)

uspace/lib/ui/src/window.c

@@ -963 +963 @@
                 window->cb->kbd(window, window->arg, kbd);
         else
-                return ui_window_def_kbd(window, kbd);
+                ui_window_def_kbd(window, kbd);
 }
 
@@ -1005 +1005 @@
  *
  * @param window Window
- */
-void ui_window_def_kbd(ui_window_t *window, kbd_event_t *kbd)
+ * @return ui_claimed iff event was claimed
+ */
+ui_evclaim_t ui_window_def_kbd(ui_window_t *window, kbd_event_t *kbd)
 {
         if (window->control != NULL)
-                ui_control_kbd_event(window->control, kbd);
+                return ui_control_kbd_event(window->control, kbd);
+
+        return ui_unclaimed;
 }