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

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.

File:

• uspace/lib/ui/src/menu.c (modified) (4 diffs)

uspace/lib/ui/src/menu.c

@@ -66 +66 @@
 static void ui_menu_popup_kbd(ui_popup_t *, void *, kbd_event_t *);
 static void ui_menu_popup_pos(ui_popup_t *, void *, pos_event_t *);
+static void ui_menu_key_press_unmod(ui_menu_t *, kbd_event_t *);
 
 static ui_popup_cb_t ui_menu_popup_cb = {
@@ -493 +494 @@
 }
 
-/** Handle close event in menu popup window.
- *
- * @param popup Menu popup window
- * @param arg Argument (ui_menu_t *)
- */
-static void ui_menu_popup_close(ui_popup_t *popup, void *arg)
-{
-        ui_menu_t *menu = (ui_menu_t *)arg;
-
-        /* Deactivate menu bar, close menu */
-        ui_menu_bar_deactivate(menu->mbar);
+/** Handle keyboard event in menu.
+ *
+ * @param menu Menu
+ * @param event Keyboard event
+ * @return ui_claimed iff the event was claimed
+ */
+ui_evclaim_t ui_menu_kbd_event(ui_menu_t *menu, kbd_event_t *event)
+{
+        if (event->type == KEY_PRESS && (event->mods &
+            (KM_CTRL | KM_ALT | KM_SHIFT)) == 0) {
+                ui_menu_key_press_unmod(menu, event);
+        }
+
+        return ui_claimed;
 }
 
@@ -612 +616 @@
 }
 
+/** Handle close event in menu popup window.
+ *
+ * @param popup Menu popup window
+ * @param arg Argument (ui_menu_t *)
+ */
+static void ui_menu_popup_close(ui_popup_t *popup, void *arg)
+{
+        ui_menu_t *menu = (ui_menu_t *)arg;
+
+        /* Deactivate menu bar, close menu */
+        ui_menu_bar_deactivate(menu->mbar);
+}
+
 /** Handle keyboard event in menu popup window.
  *
@@ -622 +639 @@
         ui_menu_t *menu = (ui_menu_t *)arg;
 
-        if (event->type == KEY_PRESS && (event->mods &
-            (KM_CTRL | KM_ALT | KM_SHIFT)) == 0) {
-                ui_menu_key_press_unmod(menu, event);
-        }
+        ui_menu_kbd_event(menu, event);
 }