Changeset b3b48f4 in mainline for uspace/lib/ui/src/menubar.c

Timestamp:

2022-03-11T17:28:10Z (2 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

bd16113

Parents:

b987eb4

Message:

Use Alt-key accelerators to open menus

File:

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

uspace/lib/ui/src/menubar.c

@@ -330 +330 @@
 {
         gfx_rect_t rect;
-        ui_menu_t *menu;
-        char32_t maccel;
 
         if (event->key == KC_F10) {
@@ -364 +362 @@
         if (event->c != '\0' && !ui_menu_is_open(mbar->selected)) {
                 /* Check if it is an accelerator. */
-
-                menu = ui_menu_first(mbar);
-                while (menu != NULL) {
-                        maccel = ui_menu_get_accel(menu);
-                        if (event->c == maccel) {
-                                ui_menu_bar_select(mbar, menu, true);
-                                return ui_claimed;
-                        }
-
-                        menu = ui_menu_next(menu);
-                }
+                ui_menu_bar_press_accel(mbar, event->c);
         }
 
@@ -388 +376 @@
 ui_evclaim_t ui_menu_bar_kbd_event(ui_menu_bar_t *mbar, kbd_event_t *event)
 {
+        if ((event->mods & KM_ALT) != 0 &&
+            (event->mods & (KM_CTRL | KM_SHIFT)) == 0 && event->c != '\0') {
+                /* Check if it is an accelerator. */
+                ui_menu_bar_press_accel(mbar, event->c);
+        }
+
         if (event->type == KEY_PRESS && (event->mods &
             (KM_CTRL | KM_ALT | KM_SHIFT)) == 0) {
@@ -397 +391 @@
 
         return ui_unclaimed;
+}
+
+/** Accelerator key press.
+ *
+ * If @a c matches an accelerator key, open the respective menu.
+ *
+ * @param mbar Menu bar
+ * @param c Character
+ */
+void ui_menu_bar_press_accel(ui_menu_bar_t *mbar, char32_t c)
+{
+        ui_menu_t *menu;
+        char32_t maccel;
+
+        menu = ui_menu_first(mbar);
+        while (menu != NULL) {
+                maccel = ui_menu_get_accel(menu);
+                if (c == maccel) {
+                        ui_menu_bar_select(mbar, menu, true);
+                        return;
+                }
+
+                menu = ui_menu_next(menu);
+        }
 }