Changeset 5d380b6 in mainline for uspace/lib/ui/src/menubar.c

Timestamp:

2023-01-20T11:50:41Z (15 months ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

b1f0a14

Parents:

6828a56

git-author:

Jiri Svoboda <jiri@…> (2023-01-20 19:50:21)

git-committer:

Jiri Svoboda <jiri@…> (2023-01-20 11:50:41)

Message:

Create menu windows in the correct seat

Add a mechanism to set the seat of a new display window, UI window,
UI popup - input device ID. This is set to the ID of the device which
activated the menu (mouse, keyboard). The display server determines
the correct seat from there.

This makes sure clicking outside closes the correct pop-up window.

File:

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

uspace/lib/ui/src/menubar.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2022 Jiri Svoboda
+ * Copyright (c) 2023 Jiri Svoboda
  * All rights reserved.
  *
@@ -243 +243 @@
  * @param menu Menu to select (or deselect if selected) or @c NULL
  * @param openup Open menu even if not currently open
- */
-void ui_menu_bar_select(ui_menu_bar_t *mbar, ui_menu_t *menu, bool openup)
+ * @param idev_id Input device ID associated with the selecting seat
+ */
+void ui_menu_bar_select(ui_menu_bar_t *mbar, ui_menu_t *menu, bool openup,
+    sysarg_t idev_id)
 {
         ui_menu_t *old_menu;
@@ -272 +274 @@
                          * specified.
                          */
-                        (void) ui_menu_open(mbar->selected, &rect);
+                        (void) ui_menu_open(mbar->selected, &rect, idev_id);
                 }
         }
@@ -283 +285 @@
  *
  * @param mbar Menu bar
- */
-void ui_menu_bar_left(ui_menu_bar_t *mbar)
+ * @param idev_id Input device ID
+ */
+void ui_menu_bar_left(ui_menu_bar_t *mbar, sysarg_t idev_id)
 {
         ui_menu_t *nmenu;
@@ -296 +299 @@
 
         if (nmenu != mbar->selected)
-                ui_menu_bar_select(mbar, nmenu, false);
+                ui_menu_bar_select(mbar, nmenu, false, idev_id);
 }
 
@@ -305 +308 @@
  *
  * @param mbar Menu bar
- */
-void ui_menu_bar_right(ui_menu_bar_t *mbar)
+ * @param idev_id Input device ID
+ */
+void ui_menu_bar_right(ui_menu_bar_t *mbar, sysarg_t idev_id)
 {
         ui_menu_t *nmenu;
@@ -318 +322 @@
 
         if (nmenu != mbar->selected)
-                ui_menu_bar_select(mbar, nmenu, false);
+                ui_menu_bar_select(mbar, nmenu, false, idev_id);
 }
 
@@ -345 +349 @@
 
         if (event->key == KC_LEFT)
-                ui_menu_bar_left(mbar);
+                ui_menu_bar_left(mbar, event->kbd_id);
 
         if (event->key == KC_RIGHT)
-                ui_menu_bar_right(mbar);
+                ui_menu_bar_right(mbar, event->kbd_id);
 
         if (event->key == KC_ENTER || event->key == KC_DOWN) {
@@ -354 +358 @@
                         ui_menu_bar_entry_rect(mbar, mbar->selected,
                             &rect);
-                        ui_menu_open(mbar->selected, &rect);
+                        ui_menu_open(mbar->selected, &rect, event->kbd_id);
                 }
 
@@ -362 +366 @@
         if (event->c != '\0' && !ui_menu_is_open(mbar->selected)) {
                 /* Check if it is an accelerator. */
-                ui_menu_bar_press_accel(mbar, event->c);
+                ui_menu_bar_press_accel(mbar, event->c, event->kbd_id);
         }
 
@@ -379 +383 @@
             (event->mods & (KM_CTRL | KM_SHIFT)) == 0 && event->c != '\0') {
                 /* Check if it is an accelerator. */
-                ui_menu_bar_press_accel(mbar, event->c);
+                ui_menu_bar_press_accel(mbar, event->c, event->kbd_id);
         }
 
@@ -399 +403 @@
  * @param mbar Menu bar
  * @param c Character
- */
-void ui_menu_bar_press_accel(ui_menu_bar_t *mbar, char32_t c)
+ * @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_t *menu;
@@ -409 +414 @@
                 maccel = ui_menu_get_accel(menu);
                 if (c == maccel) {
-                        ui_menu_bar_select(mbar, menu, true);
+                        ui_menu_bar_select(mbar, menu, true, kbd_id);
                         return;
                 }
@@ -433 +438 @@
         gfx_coord_t hpad;
         gfx_coord2_t ppos;
+        sysarg_t pos_id;
 
         res = ui_window_get_res(mbar->window);
@@ -446 +452 @@
 
         pos = mbar->rect.p0;
+        pos_id = event->pos_id;
 
         menu = ui_menu_first(mbar);
@@ -463 +470 @@
                         /* Open the menu, close if already open. */
                         if (menu == mbar->selected)
-                                ui_menu_bar_select(mbar, NULL, false);
+                                ui_menu_bar_select(mbar, NULL, false, pos_id);
                         else
-                                ui_menu_bar_select(mbar, menu, true);
+                                ui_menu_bar_select(mbar, menu, true, pos_id);
 
                         return ui_claimed;
@@ -544 +551 @@
 void ui_menu_bar_deactivate(ui_menu_bar_t *mbar)
 {
-        ui_menu_bar_select(mbar, NULL, false);
+        ui_menu_bar_select(mbar, NULL, false, 0);
         mbar->active = false;
 }