Changes in uspace/lib/ui/src/menubar.c [1543d4c:5d380b6] in mainline

File:

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

uspace/lib/ui/src/menubar.c

@@ -35 +35 @@
 
 #include <adt/list.h>
-#include <ctype.h>
 #include <errno.h>
 #include <gfx/color.h>
@@ -46 +45 @@
 #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 {
@@ -99 +95 @@
         mbar->ui = ui;
         mbar->window = window;
-        list_initialize(&mbar->menudds);
-
-        if (window->mbar == NULL)
-                window->mbar = mbar;
-
+        list_initialize(&mbar->menus);
         *rmbar = mbar;
         return EOK;
@@ -114 +106 @@
 void ui_menu_bar_destroy(ui_menu_bar_t *mbar)
 {
-        ui_menu_dd_t *mdd;
+        ui_menu_t *menu;
 
         if (mbar == NULL)
                 return;
 
-        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);
+        /* Destroy menus */
+        menu = ui_menu_first(mbar);
+        while (menu != NULL) {
+                ui_menu_destroy(menu);
+                menu = ui_menu_first(mbar);
         }
 
@@ -166 +155 @@
         gfx_rect_t rect;
         gfx_color_t *bg_color;
-        ui_menu_dd_t *mdd;
+        ui_menu_t *menu;
         const char *caption;
         gfx_coord_t width;
@@ -200 +189 @@
         fmt.valign = gfx_valign_top;
 
-        mdd = ui_menu_dd_first(mbar);
-        while (mdd != NULL) {
-                caption = ui_menu_dd_caption(mdd);
+        menu = ui_menu_first(mbar);
+        while (menu != NULL) {
+                caption = ui_menu_caption(menu);
                 width = ui_text_width(res->font, caption) + 2 * hpad;
                 tpos.x = pos.x + hpad;
@@ -211 +200 @@
                 rect.p1.y = mbar->rect.p1.y;
 
-                if (mdd == mbar->selected) {
+                if (menu == mbar->selected) {
                         fmt.color = res->wnd_sel_text_color;
                         fmt.hgl_color = res->wnd_sel_text_hgl_color;
@@ -234 +223 @@
 
                 pos.x += width;
-                mdd = ui_menu_dd_next(mdd);
+                menu = ui_menu_next(menu);
         }
 
@@ -252 +241 @@
  *
  * @param mbar Menu bar
- * @param mdd Menu drop-down to select (or deselect if selected) or @c NULL
+ * @param menu Menu 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,
+void ui_menu_bar_select(ui_menu_bar_t *mbar, ui_menu_t *menu, bool openup,
     sysarg_t idev_id)
 {
-        ui_menu_dd_t *old_mdd;
+        ui_menu_t *old_menu;
         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)) {
+        old_menu = mbar->selected;
+
+        mbar->selected = menu;
+
+        /* Close previously open menu */
+        if (old_menu != NULL && ui_menu_is_open(old_menu)) {
                 was_open = true;
-                (void) ui_menu_dd_close(old_mdd);
+                (void) ui_menu_close(old_menu);
         } else {
                 was_open = false;
@@ -281 +270 @@
                 if (openup || was_open) {
                         /*
-                         * Open the newly selected menu drop-down if either
-                         * the old menu drop-down was open or @a openup was
+                         * Open the newly selected menu if either
+                         * the old menu was open or @a openup was
                          * specified.
                          */
-                        (void) ui_menu_dd_open(mbar->selected, &rect, idev_id);
+                        (void) ui_menu_open(mbar->selected, &rect, idev_id);
                 }
-
-                mbar->active = true;
-        } else {
-                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);
+        }
 }
 
@@ -349 +289 @@
 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;
+        ui_menu_t *nmenu;
 
         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);
+        nmenu = ui_menu_prev(mbar->selected);
+        if (nmenu == NULL)
+                nmenu = ui_menu_last(mbar);
+
+        if (nmenu != mbar->selected)
+                ui_menu_bar_select(mbar, nmenu, false, idev_id);
 }
 
@@ -389 +312 @@
 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;
+        ui_menu_t *nmenu;
 
         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);
+        nmenu = ui_menu_next(mbar->selected);
+        if (nmenu == NULL)
+                nmenu = ui_menu_first(mbar);
+
+        if (nmenu != mbar->selected)
+                ui_menu_bar_select(mbar, nmenu, false, idev_id);
 }
 
@@ -449 +355 @@
 
         if (event->key == KC_ENTER || event->key == KC_DOWN) {
-                if (mbar->selected != NULL &&
-                    !ui_menu_dd_is_open(mbar->selected)) {
+                if (mbar->selected != NULL && !ui_menu_is_open(mbar->selected)) {
                         ui_menu_bar_entry_rect(mbar, mbar->selected,
                             &rect);
-                        ui_menu_dd_open(mbar->selected, &rect, event->kbd_id);
+                        ui_menu_open(mbar->selected, &rect, event->kbd_id);
                 }
 
@@ -459 +364 @@
         }
 
-        if (event->c != '\0' && !ui_menu_dd_is_open(mbar->selected)) {
+        if (event->c != '\0' && !ui_menu_is_open(mbar->selected)) {
                 /* Check if it is an accelerator. */
                 ui_menu_bar_press_accel(mbar, event->c, event->kbd_id);
@@ -502 +407 @@
 void ui_menu_bar_press_accel(ui_menu_bar_t *mbar, char32_t c, sysarg_t kbd_id)
 {
-        ui_menu_dd_t *mdd;
+        ui_menu_t *menu;
         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);
+        menu = ui_menu_first(mbar);
+        while (menu != NULL) {
+                maccel = ui_menu_get_accel(menu);
+                if (c == maccel) {
+                        ui_menu_bar_select(mbar, menu, true, kbd_id);
                         return;
                 }
 
-                mdd = ui_menu_dd_next(mdd);
+                menu = ui_menu_next(menu);
         }
 }
@@ -528 +433 @@
         gfx_coord2_t pos;
         gfx_rect_t rect;
-        ui_menu_dd_t *mdd;
+        ui_menu_t *menu;
         const char *caption;
         gfx_coord_t width;
@@ -549 +454 @@
         pos_id = event->pos_id;
 
-        mdd = ui_menu_dd_first(mbar);
-        while (mdd != NULL) {
-                caption = ui_menu_dd_caption(mdd);
+        menu = ui_menu_first(mbar);
+        while (menu != NULL) {
+                caption = ui_menu_caption(menu);
                 width = ui_text_width(res->font, caption) + 2 * hpad;
 
@@ -563 +468 @@
                         mbar->active = true;
 
-                        /* Open the menu, if not already open. */
-                        if (mdd != mbar->selected)
-                                ui_menu_bar_select(mbar, mdd, true, pos_id);
+                        /* Open the menu, close if already open. */
+                        if (menu == mbar->selected)
+                                ui_menu_bar_select(mbar, NULL, false, pos_id);
+                        else
+                                ui_menu_bar_select(mbar, menu, true, pos_id);
 
                         return ui_claimed;
@@ -571 +478 @@
 
                 pos.x += width;
-                mdd = ui_menu_dd_next(mdd);
+                menu = ui_menu_next(menu);
         }
 
@@ -580 +487 @@
  *
  * @param mbar Menu bar
- * @param mdd Menu drop-down whose entry's rectangle is to be returned
+ * @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_dd_t *mdd,
+void ui_menu_bar_entry_rect(ui_menu_bar_t *mbar, ui_menu_t *menu,
     gfx_rect_t *rrect)
 {
@@ -589 +496 @@
         gfx_coord2_t pos;
         gfx_rect_t rect;
-        ui_menu_dd_t *cur;
+        ui_menu_t *cur;
         const char *caption;
         gfx_coord_t width;
@@ -604 +511 @@
         pos = mbar->rect.p0;
 
-        cur = ui_menu_dd_first(mbar);
+        cur = ui_menu_first(mbar);
         while (cur != NULL) {
-                caption = ui_menu_dd_caption(cur);
+                caption = ui_menu_caption(cur);
                 width = ui_text_width(res->font, caption) + 2 * hpad;
 
@@ -613 +520 @@
                 rect.p1.y = mbar->rect.p1.y;
 
-                if (cur == mdd) {
+                if (cur == menu) {
                         *rrect = rect;
                         return;
@@ -619 +526 @@
 
                 pos.x += width;
-                cur = ui_menu_dd_next(cur);
+                cur = ui_menu_next(cur);
         }
 
@@ -637 +544 @@
         mbar->active = true;
         if (mbar->selected == NULL)
-                mbar->selected = ui_menu_dd_first(mbar);
+                mbar->selected = ui_menu_first(mbar);
 
         (void) ui_menu_bar_paint(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);
+        mbar->active = false;
 }