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

Timestamp:

2023-09-26T20:26:55Z (10 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/window.c (modified) (6 diffs)

uspace/lib/ui/src/window.c

@@ -47 +47 @@
 #include <stdlib.h>
 #include <ui/control.h>
+#include <ui/menubar.h>
 #include <ui/menu.h>
 #include <ui/menuentry.h>
@@ -76 +77 @@
 };
 
-static void wd_sysmenu(ui_wdecor_t *, void *, sysarg_t);
+static void wd_sysmenu_open(ui_wdecor_t *, void *, sysarg_t);
+static void wd_sysmenu_left(ui_wdecor_t *, void *, sysarg_t);
+static void wd_sysmenu_right(ui_wdecor_t *, void *, sysarg_t);
+static void wd_sysmenu_accel(ui_wdecor_t *, void *, char32_t, sysarg_t);
 static void wd_minimize(ui_wdecor_t *, void *);
 static void wd_maximize(ui_wdecor_t *, void *);
@@ -87 +91 @@
 
 static ui_wdecor_cb_t wdecor_cb = {
-        .sysmenu = wd_sysmenu,
+        .sysmenu_open = wd_sysmenu_open,
+        .sysmenu_left = wd_sysmenu_left,
+        .sysmenu_right = wd_sysmenu_right,
+        .sysmenu_accel = wd_sysmenu_accel,
         .minimize = wd_minimize,
         .maximize = wd_maximize,
@@ -1036 +1043 @@
  * @param idev_id Input device ID
  */
-static void wd_sysmenu(ui_wdecor_t *wdecor, void *arg, sysarg_t idev_id)
+static void wd_sysmenu_open(ui_wdecor_t *wdecor, void *arg, sysarg_t idev_id)
 {
         ui_window_t *window = (ui_window_t *) arg;
 
         ui_window_send_sysmenu(window, idev_id);
+}
+
+/** Window decoration requested moving left from system menu handle.
+ *
+ * @param wdecor Window decoration
+ * @param arg Argument (window)
+ * @param idev_id Input device ID
+ */
+static void wd_sysmenu_left(ui_wdecor_t *wdecor, void *arg, sysarg_t idev_id)
+{
+        ui_window_t *window = (ui_window_t *) arg;
+
+        if (window->mbar != NULL) {
+                ui_menu_bar_select_last(window->mbar, false, idev_id);
+                ui_wdecor_sysmenu_hdl_set_active(window->wdecor, false);
+        }
+}
+
+/** Window decoration requested moving right from system menu handle.
+ *
+ * @param wdecor Window decoration
+ * @param arg Argument (window)
+ * @param idev_id Input device ID
+ */
+static void wd_sysmenu_right(ui_wdecor_t *wdecor, void *arg, sysarg_t idev_id)
+{
+        ui_window_t *window = (ui_window_t *) arg;
+
+        if (window->mbar != NULL) {
+                ui_menu_bar_select_first(window->mbar, false, idev_id);
+                ui_wdecor_sysmenu_hdl_set_active(window->wdecor, false);
+        }
+}
+
+/** Window decoration detected accelerator press from system menu handle.
+ *
+ * @param wdecor Window decoration
+ * @param arg Argument (window)
+ * @param c Accelerator key
+ * @param idev_id Input device ID
+ */
+static void wd_sysmenu_accel(ui_wdecor_t *wdecor, void *arg, char32_t c,
+    sysarg_t idev_id)
+{
+        ui_window_t *window = (ui_window_t *) arg;
+
+        if (window->mbar != NULL) {
+                ui_menu_bar_press_accel(window->mbar, c, idev_id);
+                ui_wdecor_sysmenu_hdl_set_active(window->wdecor, false);
+        }
 }
 
@@ -1491 +1548 @@
 static void wnd_sysmenu_left(ui_menu_t *sysmenu, void *arg, sysarg_t idev_id)
 {
+        ui_window_t *window = (ui_window_t *)arg;
+
         (void)sysmenu;
-        (void)arg;
-        (void)idev_id;
+
+        if (window->mbar != NULL)
+                ui_menu_bar_select_last(window->mbar, true, idev_id);
 }
 
@@ -1504 +1564 @@
 static void wnd_sysmenu_right(ui_menu_t *sysmenu, void *arg, sysarg_t idev_id)
 {
+        ui_window_t *window = (ui_window_t *)arg;
+
         (void)sysmenu;
-        (void)arg;
-        (void)idev_id;
+
+        if (window->mbar != NULL)
+                ui_menu_bar_select_first(window->mbar, true, idev_id);
 }