Changes in uspace/lib/ui/src/menubar.c [d7f82635:ec50d65e] in mainline

File:

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

uspace/lib/ui/src/menubar.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2021 Jiri Svoboda
+ * Copyright (c) 2024 Jiri Svoboda
  * All rights reserved.
  *
@@ -35 +35 @@
 
 #include <adt/list.h>
+#include <ctype.h>
 #include <errno.h>
 #include <gfx/color.h>
@@ -45 +46 @@
 #include <ui/control.h>
 #include <ui/paint.h>
-#include <ui/menu.h>
 #include <ui/menubar.h>
+#include <ui/menudd.h>
+#include <ui/wdecor.h>
 #include <ui/window.h>
 #include "../private/menubar.h"
 #include "../private/resource.h"
+#include "../private/wdecor.h"
+#include "../private/window.h"
 
 enum {
@@ -60 +64 @@
 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 *);
+static void ui_menu_bar_activate_ev(ui_menu_bar_t *);
+static void ui_menu_bar_deactivate_ev(ui_menu_bar_t *);
 
 /** Menu bar control ops */
@@ -66 +73 @@
         .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
 };
 
@@ -93 +101 @@
         mbar->ui = ui;
         mbar->window = window;
-        list_initialize(&mbar->menus);
+        list_initialize(&mbar->menudds);
+
+        if (window->mbar == NULL)
+                window->mbar = mbar;
+
         *rmbar = mbar;
         return EOK;
@@ -104 +116 @@
 void ui_menu_bar_destroy(ui_menu_bar_t *mbar)
 {
-        ui_menu_t *menu;
+        ui_menu_dd_t *mdd;
 
         if (mbar == NULL)
                 return;
 
-        /* Destroy menus */
-        menu = ui_menu_first(mbar);
-        while (menu != NULL) {
-                ui_menu_destroy(menu);
-                menu = ui_menu_first(mbar);
+        if (mbar->window->mbar == mbar)
+                mbar->window->mbar = NULL;
+
+        /* Destroy menu drop-downs */
+        mdd = ui_menu_dd_first(mbar);
+        while (mdd != NULL) {
+                ui_menu_dd_destroy(mdd);
+                mdd = ui_menu_dd_first(mbar);
         }
 
@@ -120 +135 @@
 }
 
+/** Set menu bar callbacks.
+ *
+ * @param mbar Menu bar
+ * @param cb Callbacks
+ * @param arg Callback argument
+ */
+void ui_menu_bar_set_cb(ui_menu_bar_t *mbar, ui_menu_bar_cb_t *cb, void *arg)
+{
+        mbar->cb = cb;
+        mbar->arg = arg;
+}
+
 /** Get base control from menu bar.
  *
@@ -148 +175 @@
 {
         ui_resource_t *res;
-        gfx_text_fmt_t fmt;
+        ui_text_fmt_t fmt;
         gfx_coord2_t pos;
         gfx_coord2_t tpos;
         gfx_rect_t rect;
         gfx_color_t *bg_color;
-        ui_menu_t *menu;
+        ui_menu_dd_t *mdd;
         const char *caption;
         gfx_coord_t width;
@@ -182 +209 @@
         pos = mbar->rect.p0;
 
-        gfx_text_fmt_init(&fmt);
+        ui_text_fmt_init(&fmt);
+        fmt.font = res->font;
         fmt.halign = gfx_halign_left;
         fmt.valign = gfx_valign_top;
 
-        menu = ui_menu_first(mbar);
-        while (menu != NULL) {
-                caption = ui_menu_caption(menu);
-                width = gfx_text_width(res->font, caption) + 2 * hpad;
+        mdd = ui_menu_dd_first(mbar);
+        while (mdd != NULL) {
+                caption = ui_menu_dd_caption(mdd);
+                width = ui_text_width(res->font, caption) + 2 * hpad;
                 tpos.x = pos.x + hpad;
                 tpos.y = pos.y + vpad;
@@ -197 +225 @@
                 rect.p1.y = mbar->rect.p1.y;
 
-                if (menu == mbar->selected) {
+                if (mdd == mbar->selected) {
                         fmt.color = res->wnd_sel_text_color;
+                        fmt.hgl_color = res->wnd_sel_text_hgl_color;
                         bg_color = res->wnd_sel_text_bg_color;
                 } else {
                         fmt.color = res->wnd_text_color;
+                        fmt.hgl_color = res->wnd_text_hgl_color;
                         bg_color = res->wnd_face_color;
                 }
@@ -213 +243 @@
                         goto error;
 
-                rc = gfx_puttext(res->font, &tpos, &fmt, caption);
+                rc = ui_paint_text(&tpos, &fmt, caption);
                 if (rc != EOK)
                         goto error;
 
                 pos.x += width;
-                menu = ui_menu_next(menu);
+                mdd = ui_menu_dd_next(mdd);
         }
 
@@ -236 +266 @@
  *
  * @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)
-{
-        ui_menu_t *old_menu;
-
-        old_menu = mbar->selected;
-
-        if (mbar->selected != menu)
-                mbar->selected = menu;
-        else
-                mbar->selected = NULL;
-
-        /* Close previously open menu */
-        if (old_menu != NULL)
-                (void) ui_menu_close(old_menu);
+ * @param mdd Menu drop-down to select (or deselect if selected) or @c NULL
+ * @param openup Open menu even if not currently open
+ * @param idev_id Input device ID associated with the selecting seat
+ */
+void ui_menu_bar_select(ui_menu_bar_t *mbar, ui_menu_dd_t *mdd, bool openup,
+    sysarg_t idev_id)
+{
+        ui_menu_dd_t *old_mdd;
+        gfx_rect_t rect;
+        bool was_open;
+
+        old_mdd = mbar->selected;
+
+        mbar->selected = mdd;
+
+        /* Close previously open menu drop-down */
+        if (old_mdd != NULL && ui_menu_dd_is_open(old_mdd)) {
+                was_open = true;
+                (void) ui_menu_dd_close(old_mdd);
+        } 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 drop-down if either
+                         * the old menu drop-down was open or @a openup was
+                         * specified.
+                         */
+                        (void) ui_menu_dd_open(mbar->selected, &rect, idev_id);
+                }
+
+                if (!mbar->active)
+                        ui_menu_bar_activate_ev(mbar);
+                mbar->active = true;
+        } else {
+                if (mbar->active)
+                        ui_menu_bar_deactivate_ev(mbar);
+                mbar->active = false;
+        }
+}
+
+/** Select first drop-down.
+ *
+ * @param mbar Menu bar
+ * @param openup @c true to open drop-down if it was not open
+ * @param idev_id Input device ID
+ */
+void ui_menu_bar_select_first(ui_menu_bar_t *mbar, bool openup,
+    sysarg_t idev_id)
+{
+        ui_menu_dd_t *mdd;
+
+        mdd = ui_menu_dd_first(mbar);
+        ui_menu_bar_select(mbar, mdd, openup, idev_id);
+}
+
+/** Select last drop-down.
+ *
+ * @param mbar Menu bar
+ * @param openup @c true to open drop-down if it was not open
+ * @param idev_id Input device ID
+ */
+void ui_menu_bar_select_last(ui_menu_bar_t *mbar, bool openup,
+    sysarg_t idev_id)
+{
+        ui_menu_dd_t *mdd;
+
+        mdd = ui_menu_dd_last(mbar);
+        ui_menu_bar_select(mbar, mdd, openup, idev_id);
+}
+
+/** Select system menu.
+ *
+ * @param mbar Menu bar
+ * @param openup @c true to open drop-down if it was not open
+ * @param idev_id Input device ID
+ */
+void ui_menu_bar_select_sysmenu(ui_menu_bar_t *mbar, bool openup,
+    sysarg_t idev_id)
+{
+        ui_wdecor_sysmenu_hdl_set_active(mbar->window->wdecor, true);
+
+        if (openup)
+                ui_window_send_sysmenu(mbar->window, idev_id);
+}
+
+/** 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
+ * @param idev_id Input device ID
+ */
+void ui_menu_bar_left(ui_menu_bar_t *mbar, sysarg_t idev_id)
+{
+        ui_menu_dd_t *nmdd;
+        bool sel_sysmenu = false;
+        bool was_open;
+
+        if (mbar->selected == NULL)
+                return;
+
+        nmdd = ui_menu_dd_prev(mbar->selected);
+        if (nmdd == NULL) {
+                if ((mbar->window->wdecor->style & ui_wds_sysmenu_hdl) != 0) {
+                        sel_sysmenu = true;
+                } else {
+                        nmdd = ui_menu_dd_last(mbar);
+                }
+        }
+
+        was_open = mbar->selected != NULL &&
+            ui_menu_dd_is_open(mbar->selected);
+
+        if (nmdd != mbar->selected)
+                ui_menu_bar_select(mbar, nmdd, false, idev_id);
+
+        /*
+         * Only open sysmenu *after* closing the previous menu, avoid
+         * having multiple popup windows at the same time.
+         */
+        if (sel_sysmenu)
+                ui_menu_bar_select_sysmenu(mbar, was_open, idev_id);
+}
+
+/** 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
+ * @param idev_id Input device ID
+ */
+void ui_menu_bar_right(ui_menu_bar_t *mbar, sysarg_t idev_id)
+{
+        ui_menu_dd_t *nmdd;
+        bool sel_sysmenu = false;
+        bool was_open;
+
+        if (mbar->selected == NULL)
+                return;
+
+        nmdd = ui_menu_dd_next(mbar->selected);
+        if (nmdd == NULL) {
+                if ((mbar->window->wdecor->style & ui_wds_sysmenu_hdl) != 0) {
+                        sel_sysmenu = true;
+                } else {
+                        nmdd = ui_menu_dd_first(mbar);
+                }
+        }
+
+        was_open = mbar->selected != NULL &&
+            ui_menu_dd_is_open(mbar->selected);
+
+        if (nmdd != mbar->selected)
+                ui_menu_bar_select(mbar, nmdd, false, idev_id);
+
+        /*
+         * Only open sysmenu *after* closing the previous menu, avoid
+         * having multiple popup windows at the same time.
+         */
+        if (sel_sysmenu)
+                ui_menu_bar_select_sysmenu(mbar, was_open, idev_id);
+}
+
+/** 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, event->kbd_id);
+
+        if (event->key == KC_RIGHT)
+                ui_menu_bar_right(mbar, event->kbd_id);
+
+        if (event->key == KC_ENTER || event->key == KC_DOWN) {
+                if (mbar->selected != NULL &&
+                    !ui_menu_dd_is_open(mbar->selected)) {
+                        ui_menu_bar_entry_rect(mbar, mbar->selected,
+                            &rect);
+                        ui_menu_dd_open(mbar->selected, &rect, event->kbd_id);
+                }
+
+                return ui_claimed;
+        }
+
+        if (event->c != '\0' && !ui_menu_dd_is_open(mbar->selected)) {
+                /* Check if it is an accelerator. */
+                ui_menu_bar_press_accel(mbar, event->c, event->kbd_id);
+        }
+
+        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->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, event->kbd_id);
+        }
+
+        if (event->type == KEY_PRESS && (event->mods &
+            (KM_CTRL | KM_ALT | KM_SHIFT)) == 0) {
+                return ui_menu_bar_key_press_unmod(mbar, event);
+        }
+
+        if (mbar->active)
+                return ui_claimed;
+
+        return ui_unclaimed;
+}
+
+/** Accelerator key press.
+ *
+ * If @a c matches an accelerator key, open the respective menu.
+ *
+ * @param mbar Menu bar
+ * @param c Character
+ * @param kbd_id Keyboard ID
+ */
+void ui_menu_bar_press_accel(ui_menu_bar_t *mbar, char32_t c, sysarg_t kbd_id)
+{
+        ui_menu_dd_t *mdd;
+        char32_t maccel;
+
+        mdd = ui_menu_dd_first(mbar);
+        while (mdd != NULL) {
+                maccel = ui_menu_dd_get_accel(mdd);
+                if ((char32_t)tolower(c) == maccel) {
+                        ui_menu_bar_select(mbar, mdd, true, kbd_id);
+                        return;
+                }
+
+                mdd = ui_menu_dd_next(mdd);
         }
 }
@@ -273 +546 @@
         gfx_coord2_t pos;
         gfx_rect_t rect;
-        ui_menu_t *menu;
+        ui_menu_dd_t *mdd;
         const char *caption;
         gfx_coord_t width;
         gfx_coord_t hpad;
         gfx_coord2_t ppos;
+        sysarg_t pos_id;
 
         res = ui_window_get_res(mbar->window);
@@ -291 +565 @@
 
         pos = mbar->rect.p0;
-
-        menu = ui_menu_first(mbar);
-        while (menu != NULL) {
-                caption = ui_menu_caption(menu);
-                width = gfx_text_width(res->font, caption) + 2 * hpad;
+        pos_id = event->pos_id;
+
+        mdd = ui_menu_dd_first(mbar);
+        while (mdd != NULL) {
+                caption = ui_menu_dd_caption(mdd);
+                width = ui_text_width(res->font, caption) + 2 * hpad;
 
                 rect.p0 = pos;
@@ -304 +579 @@
                 if (event->type == POS_PRESS &&
                     gfx_pix_inside_rect(&ppos, &rect)) {
-                        ui_menu_bar_select(mbar, &rect, menu);
+                        mbar->active = true;
+
+                        /* Open the menu, if not already open. */
+                        if (mdd != mbar->selected)
+                                ui_menu_bar_select(mbar, mdd, true, pos_id);
+
                         return ui_claimed;
                 }
 
                 pos.x += width;
-                menu = ui_menu_next(menu);
+                mdd = ui_menu_dd_next(mdd);
         }
 
         return ui_unclaimed;
+}
+
+/** Handle menu bar position event.
+ *
+ * @param mbar Menu bar
+ * @param mdd Menu drop-down 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_dd_t *mdd,
+    gfx_rect_t *rrect)
+{
+        ui_resource_t *res;
+        gfx_coord2_t pos;
+        gfx_rect_t rect;
+        ui_menu_dd_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_dd_first(mbar);
+        while (cur != NULL) {
+                caption = ui_menu_dd_caption(cur);
+                width = ui_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 == mdd) {
+                        *rrect = rect;
+                        return;
+                }
+
+                pos.x += width;
+                cur = ui_menu_dd_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_dd_first(mbar);
+
+        (void) ui_menu_bar_paint(mbar);
+        ui_menu_bar_activate_ev(mbar);
+}
+
+/** Deactivate menu bar.
+ *
+ * @param mbar Menu bar
+ */
+void ui_menu_bar_deactivate(ui_menu_bar_t *mbar)
+{
+        ui_menu_bar_select(mbar, NULL, false, 0);
+        ui_menu_bar_deactivate_ev(mbar);
 }
 
@@ -338 +694 @@
 }
 
-/** Handle menu bar control position event.
+/** Handle menu bar control keyboard event.
  *
  * @param arg Argument (ui_menu_bar_t *)
@@ -344 +700 @@
  * @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)
 {
@@ -351 +720 @@
 }
 
+/** Send menu bar activate event.
+ *
+ * @param mbar Menu bar
+ */
+static void ui_menu_bar_activate_ev(ui_menu_bar_t *mbar)
+{
+        if (mbar->cb != NULL && mbar->cb->activate != NULL)
+                mbar->cb->activate(mbar, mbar->arg);
+}
+
+/** Send menu bar deactivate event.
+ *
+ * @param mbar Menu bar
+ */
+static void ui_menu_bar_deactivate_ev(ui_menu_bar_t *mbar)
+{
+        if (mbar->cb != NULL && mbar->cb->deactivate != NULL)
+                mbar->cb->deactivate(mbar, mbar->arg);
+}
+
 /** @}
  */