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

Timestamp:

2022-01-10T19:29:00Z (2 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

5de852c

Parents:

9754ed2

git-author:

Jiri Svoboda <jiri@…> (2022-01-10 19:27:55)

git-committer:

Jiri Svoboda <jiri@…> (2022-01-10 19:29:00)

Message:

Menu control using F10, cursor keys, Enter, Escape

File:

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

uspace/lib/ui/src/menubar.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2021 Jiri Svoboda
+ * Copyright (c) 2022 Jiri Svoboda
  * All rights reserved.
  *
@@ -60 +60 @@
 static void ui_menu_bar_ctl_destroy(void *);
 static errno_t ui_menu_bar_ctl_paint(void *);
+static ui_evclaim_t ui_menu_bar_ctl_kbd_event(void *, kbd_event_t *);
 static ui_evclaim_t ui_menu_bar_ctl_pos_event(void *, pos_event_t *);
 
@@ -66 +67 @@
         .destroy = ui_menu_bar_ctl_destroy,
         .paint = ui_menu_bar_ctl_paint,
-        .pos_event = ui_menu_bar_ctl_pos_event,
+        .kbd_event = ui_menu_bar_ctl_kbd_event,
+        .pos_event = ui_menu_bar_ctl_pos_event
 };
 
@@ -236 +238 @@
  *
  * @param mbar Menu bar
- * @param rect Menu bar entry rectangle
  * @param menu Menu to select (or deselect if selected) or @c NULL
- */
-void ui_menu_bar_select(ui_menu_bar_t *mbar, gfx_rect_t *rect,
-    ui_menu_t *menu)
+ * @param openup Open menu even if not currently open
+ */
+void ui_menu_bar_select(ui_menu_bar_t *mbar, ui_menu_t *menu, bool openup)
 {
         ui_menu_t *old_menu;
+        gfx_rect_t rect;
+        bool was_open;
 
         old_menu = mbar->selected;
@@ -252 +255 @@
 
         /* Close previously open menu */
-        if (old_menu != NULL)
+        if (old_menu != NULL && ui_menu_is_open(old_menu)) {
+                was_open = true;
                 (void) ui_menu_close(old_menu);
+        } else {
+                was_open = false;
+        }
 
         (void) ui_menu_bar_paint(mbar);
 
         if (mbar->selected != NULL) {
-                (void) ui_menu_open(mbar->selected, rect);
-        }
+                ui_menu_bar_entry_rect(mbar, mbar->selected, &rect);
+                if (openup || was_open) {
+                        /*
+                         * Open the newly selected menu if either
+                         * the old menu was open or @a openup was
+                         * specified.
+                         */
+                        (void) ui_menu_open(mbar->selected, &rect);
+                }
+        }
+}
+
+/** Move one entry left.
+ *
+ * If the selected menu is open, the newly selected menu will be open
+ * as well. If we are already at the first entry, we wrap around.
+ *
+ * @param mbar Menu bar
+ */
+void ui_menu_bar_left(ui_menu_bar_t *mbar)
+{
+        ui_menu_t *nmenu;
+
+        if (mbar->selected == NULL)
+                return;
+
+        nmenu = ui_menu_prev(mbar->selected);
+        if (nmenu == NULL)
+                nmenu = ui_menu_last(mbar);
+
+        ui_menu_bar_select(mbar, nmenu, false);
+}
+
+/** Move one entry right.
+ *
+ * If the selected menu is open, the newly selected menu will be open
+ * as well. If we are already at the last entry, we wrap around.
+ *
+ * @param mbar Menu bar
+ */
+void ui_menu_bar_right(ui_menu_bar_t *mbar)
+{
+        ui_menu_t *nmenu;
+
+        if (mbar->selected == NULL)
+                return;
+
+        nmenu = ui_menu_next(mbar->selected);
+        if (nmenu == NULL)
+                nmenu = ui_menu_first(mbar);
+
+        ui_menu_bar_select(mbar, nmenu, false);
+}
+
+/** Handle menu bar key press without modifiers.
+ *
+ * @param mbar Menu bar
+ * @param kbd_event Keyboard event
+ * @return @c ui_claimed iff the event is claimed
+ */
+ui_evclaim_t ui_menu_bar_key_press_unmod(ui_menu_bar_t *mbar, kbd_event_t *event)
+{
+        gfx_rect_t rect;
+
+        if (event->key == KC_F10) {
+                ui_menu_bar_activate(mbar);
+                return ui_claimed;
+        }
+
+        if (!mbar->active)
+                return ui_unclaimed;
+
+        if (event->key == KC_ESCAPE) {
+                ui_menu_bar_deactivate(mbar);
+                return ui_claimed;
+        }
+
+        if (event->key == KC_LEFT)
+                ui_menu_bar_left(mbar);
+
+        if (event->key == KC_RIGHT)
+                ui_menu_bar_right(mbar);
+
+        if (event->key == KC_ENTER || event->key == KC_DOWN) {
+                if (mbar->selected != NULL && !ui_menu_is_open(mbar->selected)) {
+                        ui_menu_bar_entry_rect(mbar, mbar->selected,
+                            &rect);
+                        ui_menu_open(mbar->selected, &rect);
+                }
+
+                return ui_claimed;
+        }
+
+        return ui_claimed;
+}
+
+/** Handle menu bar keyboard event.
+ *
+ * @param mbar Menu bar
+ * @param kbd_event Keyboard event
+ * @return @c ui_claimed iff the event is claimed
+ */
+ui_evclaim_t ui_menu_bar_kbd_event(ui_menu_bar_t *mbar, kbd_event_t *event)
+{
+        if (event->type == KEY_PRESS && (event->mods &
+            (KM_CTRL | KM_ALT | KM_SHIFT)) == 0) {
+                ui_menu_bar_key_press_unmod(mbar, event);
+                return ui_claimed;
+        }
+
+        return ui_claimed;
 }
 
@@ -304 +420 @@
                 if (event->type == POS_PRESS &&
                     gfx_pix_inside_rect(&ppos, &rect)) {
-                        ui_menu_bar_select(mbar, &rect, menu);
+                        mbar->active = true;
+                        ui_menu_bar_select(mbar, menu, true);
                         return ui_claimed;
                 }
@@ -315 +432 @@
 }
 
+/** Handle menu bar position event.
+ *
+ * @param mbar Menu bar
+ * @param menu Menu whose entry's rectangle is to be returned
+ * @param rrect Place to store entry rectangle
+ */
+void ui_menu_bar_entry_rect(ui_menu_bar_t *mbar, ui_menu_t *menu,
+    gfx_rect_t *rrect)
+{
+        ui_resource_t *res;
+        gfx_coord2_t pos;
+        gfx_rect_t rect;
+        ui_menu_t *cur;
+        const char *caption;
+        gfx_coord_t width;
+        gfx_coord_t hpad;
+
+        res = ui_window_get_res(mbar->window);
+
+        if (res->textmode) {
+                hpad = menubar_hpad_text;
+        } else {
+                hpad = menubar_hpad;
+        }
+
+        pos = mbar->rect.p0;
+
+        cur = ui_menu_first(mbar);
+        while (cur != NULL) {
+                caption = ui_menu_caption(cur);
+                width = gfx_text_width(res->font, caption) + 2 * hpad;
+
+                rect.p0 = pos;
+                rect.p1.x = rect.p0.x + width;
+                rect.p1.y = mbar->rect.p1.y;
+
+                if (cur == menu) {
+                        *rrect = rect;
+                        return;
+                }
+
+                pos.x += width;
+                cur = ui_menu_next(cur);
+        }
+
+        /* We should never get here */
+        assert(false);
+}
+
+/** Activate menu bar.
+ *
+ * @param mbar Menu bar
+ */
+void ui_menu_bar_activate(ui_menu_bar_t *mbar)
+{
+        if (mbar->active)
+                return;
+
+        mbar->active = true;
+        if (mbar->selected == NULL)
+                mbar->selected = ui_menu_first(mbar);
+
+        (void) ui_menu_bar_paint(mbar);
+}
+
+void ui_menu_bar_deactivate(ui_menu_bar_t *mbar)
+{
+        ui_menu_bar_select(mbar, NULL, false);
+        mbar->active = false;
+}
+
 /** Destroy menu bar control.
  *
@@ -338 +526 @@
 }
 
-/** Handle menu bar control position event.
+/** Handle menu bar control keyboard event.
  *
  * @param arg Argument (ui_menu_bar_t *)
@@ -344 +532 @@
  * @return @c ui_claimed iff the event is claimed
  */
+ui_evclaim_t ui_menu_bar_ctl_kbd_event(void *arg, kbd_event_t *event)
+{
+        ui_menu_bar_t *mbar = (ui_menu_bar_t *) arg;
+
+        return ui_menu_bar_kbd_event(mbar, event);
+}
+
+/** Handle menu bar control position event.
+ *
+ * @param arg Argument (ui_menu_bar_t *)
+ * @param pos_event Position event
+ * @return @c ui_claimed iff the event is claimed
+ */
 ui_evclaim_t ui_menu_bar_ctl_pos_event(void *arg, pos_event_t *event)
 {