Changeset 1c6c3e1d in mainline for uspace/lib/ui/src/menu.c

Timestamp:

2023-10-22T17:55:33Z (17 months ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

ticket/834-toolchain-update

Children:

350ec74

Parents:

315d487 (diff), 133461c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into ticket

File:

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

uspace/lib/ui/src/menu.c

@@ -35 +35 @@
 
 #include <adt/list.h>
+#include <ctype.h>
 #include <errno.h>
 #include <gfx/color.h>
@@ -44 +45 @@
 #include <str.h>
 #include <uchar.h>
+#include <ui/ui.h>
 #include <ui/accel.h>
 #include <ui/control.h>
@@ -49 +51 @@
 #include <ui/popup.h>
 #include <ui/menu.h>
-#include <ui/menubar.h>
 #include <ui/menuentry.h>
 #include <ui/resource.h>
 #include <ui/window.h>
-#include "../private/menubar.h"
 #include "../private/menu.h"
 #include "../private/resource.h"
@@ -78 +78 @@
 /** Create new menu.
  *
+ * @param parent Parent window
  * @param mbar Menu bar
- * @param caption Caption
  * @param rmenu Place to store pointer to new menu
  * @return EOK on success, ENOMEM if out of memory
  */
-errno_t ui_menu_create(ui_menu_bar_t *mbar, const char *caption,
-    ui_menu_t **rmenu)
+errno_t ui_menu_create(ui_window_t *parent, ui_menu_t **rmenu)
 {
         ui_menu_t *menu;
@@ -92 +91 @@
                 return ENOMEM;
 
-        menu->caption = str_dup(caption);
-        if (menu->caption == NULL) {
-                free(menu);
-                return ENOMEM;
-        }
-
-        menu->mbar = mbar;
-        list_append(&menu->lmenus, &mbar->menus);
+        menu->parent = parent;
         list_initialize(&menu->entries);
 
@@ -124 +116 @@
         }
 
-        list_remove(&menu->lmenus);
         free(menu->caption);
         free(menu);
 }
 
-/** Get first menu in menu bar.
- *
- * @param mbar Menu bar
- * @return First menu or @c NULL if there is none
- */
-ui_menu_t *ui_menu_first(ui_menu_bar_t *mbar)
-{
-        link_t *link;
-
-        link = list_first(&mbar->menus);
-        if (link == NULL)
-                return NULL;
-
-        return list_get_instance(link, ui_menu_t, lmenus);
-}
-
-/** Get next menu in menu bar.
- *
- * @param cur Current menu
- * @return Next menu or @c NULL if @a cur is the last one
- */
-ui_menu_t *ui_menu_next(ui_menu_t *cur)
-{
-        link_t *link;
-
-        link = list_next(&cur->lmenus, &cur->mbar->menus);
-        if (link == NULL)
-                return NULL;
-
-        return list_get_instance(link, ui_menu_t, lmenus);
-}
-
-/** Get last menu in menu bar.
- *
- * @param mbar Menu bar
- * @return Last menu or @c NULL if there is none
- */
-ui_menu_t *ui_menu_last(ui_menu_bar_t *mbar)
-{
-        link_t *link;
-
-        link = list_last(&mbar->menus);
-        if (link == NULL)
-                return NULL;
-
-        return list_get_instance(link, ui_menu_t, lmenus);
-}
-
-/** Get previous menu in menu bar.
- *
- * @param cur Current menu
- * @return Previous menu or @c NULL if @a cur is the fist one
- */
-ui_menu_t *ui_menu_prev(ui_menu_t *cur)
-{
-        link_t *link;
-
-        link = list_prev(&cur->lmenus, &cur->mbar->menus);
-        if (link == NULL)
-                return NULL;
-
-        return list_get_instance(link, ui_menu_t, lmenus);
-}
-
-/** Get menu caption.
- *
- * @param menu Menu
- * @return Caption (owned by @a menu)
- */
-const char *ui_menu_caption(ui_menu_t *menu)
-{
-        return menu->caption;
+/** Set menu callbacks.
+ *
+ * @param menu Menu
+ * @param cb Callbacks
+ * @param arg Callback argument
+ */
+void ui_menu_set_cb(ui_menu_t *menu, ui_menu_cb_t *cb, void *arg)
+{
+        menu->cb = cb;
+        menu->arg = arg;
 }
 
@@ -212 +141 @@
     ui_menu_geom_t *geom)
 {
-        ui_resource_t *res;
         gfx_coord2_t edim;
         gfx_coord_t frame_w;
         gfx_coord_t frame_h;
-
-        res = ui_window_get_res(menu->mbar->window);
+        ui_resource_t *res;
+
+        res = ui_window_get_res(menu->parent);
 
         if (res->textmode) {
@@ -241 +170 @@
 }
 
-/** Get menu rectangle.
- *
- * @param menu Menu
- * @param spos Starting position (top-left corner)
- * @param rect Place to store menu rectangle
- */
-void ui_menu_get_rect(ui_menu_t *menu, gfx_coord2_t *spos, gfx_rect_t *rect)
-{
-        ui_menu_geom_t geom;
-
-        ui_menu_get_geom(menu, spos, &geom);
-        *rect = geom.outer_rect;
-}
-
-/** Get menu accelerator character.
- *
- * @param menu Menu
- * @return Accelerator character (lowercase) or the null character if
- *         the menu has no accelerator.
- */
-char32_t ui_menu_get_accel(ui_menu_t *menu)
-{
-        return ui_accel_get(menu->caption);
-}
-
 /** Get UI resource from menu.
  *
@@ -304 +208 @@
         params.idev_id = idev_id;
 
-        rc = ui_popup_create(menu->mbar->ui, menu->mbar->window, &params,
-            &popup);
+        rc = ui_popup_create(ui_window_get_ui(menu->parent), menu->parent,
+            &params, &popup);
         if (rc != EOK)
                 return rc;
@@ -503 +407 @@
                 /* Press outside menu - close it */
                 if (event->type == POS_PRESS)
-                        ui_menu_bar_deactivate(menu->mbar);
+                        ui_menu_close_req(menu);
         }
 
@@ -524 +428 @@
         if (event->type == KEY_PRESS && (event->mods & KM_ALT) != 0 &&
             (event->mods & (KM_CTRL | KM_SHIFT)) == 0 && event->c != '\0')
-                ui_menu_bar_press_accel(menu->mbar, event->c, event->kbd_id);
+                ui_menu_press_accel(menu, event->c, event->kbd_id);
 
         return ui_claimed;
@@ -615 +519 @@
         switch (event->key) {
         case KC_ESCAPE:
-                ui_menu_bar_deactivate(menu->mbar);
+                ui_menu_close_req(menu);
                 break;
         case KC_LEFT:
-                ui_menu_bar_left(menu->mbar, event->kbd_id);
+                ui_menu_left(menu, event->kbd_id);
                 break;
         case KC_RIGHT:
-                ui_menu_bar_right(menu->mbar, event->kbd_id);
+                ui_menu_right(menu, event->kbd_id);
                 break;
         case KC_UP:
@@ -630 +534 @@
                 break;
         case KC_ENTER:
-                if (menu->selected != NULL)
+                if (menu->selected != NULL &&
+                    !ui_menu_entry_is_disabled(menu->selected))
                         ui_menu_entry_activate(menu->selected);
                 break;
@@ -638 +543 @@
                         while (mentry != NULL) {
                                 c = ui_menu_entry_get_accel(mentry);
-                                if (c == event->c && menu->selected != NULL) {
+                                if (c == (char32_t)tolower(event->c) &&
+                                    !ui_menu_entry_is_disabled(mentry)) {
                                         ui_menu_entry_activate(mentry);
                                         break;
@@ -658 +564 @@
         ui_menu_t *menu = (ui_menu_t *)arg;
 
-        /* Deactivate menu bar, close menu */
-        ui_menu_bar_deactivate(menu->mbar);
+        /* Forward close request to caller */
+        ui_menu_close_req(menu);
 }
 
@@ -691 +597 @@
 }
 
+/** Send menu left event.
+ *
+ * @param menu Menu
+ * @param idev_id Input device ID
+ */
+void ui_menu_left(ui_menu_t *menu, sysarg_t idev_id)
+{
+        if (menu->cb != NULL && menu->cb->left != NULL)
+                menu->cb->left(menu, menu->arg, idev_id);
+}
+
+/** Send menu right event.
+ *
+ * @param menu Menu
+ * @param idev_id Input device ID
+ */
+void ui_menu_right(ui_menu_t *menu, sysarg_t idev_id)
+{
+        if (menu->cb != NULL && menu->cb->right != NULL)
+                menu->cb->right(menu, menu->arg, idev_id);
+}
+
+/** Send menu close request event.
+ *
+ * @param menu Menu
+ */
+void ui_menu_close_req(ui_menu_t *menu)
+{
+        if (menu->cb != NULL && menu->cb->close_req != NULL)
+                menu->cb->close_req(menu, menu->arg);
+}
+
+/** Send menu accelerator key press event.
+ *
+ * @param menu Menu
+ * @param c Character
+ * @param kbd_id Keyboard ID
+ */
+void ui_menu_press_accel(ui_menu_t *menu, char32_t c, sysarg_t kbd_id)
+{
+        if (menu->cb != NULL && menu->cb->press_accel != NULL)
+                menu->cb->press_accel(menu, menu->arg, c, kbd_id);
+}
+
 /** @}
  */