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

Timestamp:

2023-09-26T20:26:55Z (22 months ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

5afc1aa

Parents:

ed1a948

Message:

Handover between system menu and menu bar

We can move between them using Left and Right keys in either closed
or open state. One can now open system menu with F10, Left, Down in
a window with menu bar, or just F10 in a window without menu bar.

File:

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

uspace/lib/ui/src/menubar.c

@@ -48 +48 @@
 #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 {
@@ -97 +100 @@
         mbar->window = window;
         list_initialize(&mbar->menudds);
+
+        if (window->mbar == NULL)
+                window->mbar = mbar;
+
         *rmbar = mbar;
         return EOK;
@@ -111 +118 @@
         if (mbar == NULL)
                 return;
+
+        if (mbar->window->mbar == mbar)
+                mbar->window->mbar = NULL;
 
         /* Destroy menu drop-downs */
@@ -277 +287 @@
                         (void) ui_menu_dd_open(mbar->selected, &rect, idev_id);
                 }
-        }
+
+                mbar->active = true;
+        } else {
+                mbar->active = false;
+        }
+}
+
+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);
+}
+
+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);
+}
+
+void ui_menu_bar_select_sysmenu(ui_menu_bar_t *mbar, sysarg_t idev_id)
+{
+        bool was_open;
+
+        ui_wdecor_sysmenu_hdl_set_active(mbar->window->wdecor, true);
+        was_open = mbar->selected != NULL &&
+            ui_menu_dd_is_open(mbar->selected);
+
+        if (was_open)
+                ui_window_send_sysmenu(mbar->window, idev_id);
 }
 
@@ -296 +340 @@
 
         nmdd = ui_menu_dd_prev(mbar->selected);
-        if (nmdd == NULL)
-                nmdd = ui_menu_dd_last(mbar);
+        if (nmdd == NULL) {
+                if ((mbar->window->wdecor->style & ui_wds_sysmenu_hdl) != 0) {
+                        ui_menu_bar_select_sysmenu(mbar, idev_id);
+                } else {
+                        nmdd = ui_menu_dd_last(mbar);
+                }
+        }
 
         if (nmdd != mbar->selected)
@@ -319 +368 @@
 
         nmdd = ui_menu_dd_next(mbar->selected);
-        if (nmdd == NULL)
-                nmdd = ui_menu_dd_first(mbar);
+        if (nmdd == NULL) {
+                if ((mbar->window->wdecor->style & ui_wds_sysmenu_hdl) != 0) {
+                        ui_menu_bar_select_sysmenu(mbar, idev_id);
+                } else {
+                        nmdd = ui_menu_dd_first(mbar);
+                }
+        }
 
         if (nmdd != mbar->selected)
@@ -551 +605 @@
 }
 
+/** 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;
 }