Changeset 5d380b6 in mainline for uspace/lib/ui/src/menu.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/menu.c (modified) (5 diffs)

uspace/lib/ui/src/menu.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2022 Jiri Svoboda
+ * Copyright (c) 2023 Jiri Svoboda
  * All rights reserved.
  *
@@ -280 +280 @@
  * @param menu Menu
  * @param prect Parent rectangle around which the menu should be placed
- */
-errno_t ui_menu_open(ui_menu_t *menu, gfx_rect_t *prect)
+ * @param idev_id Input device associated with the menu's seat
+ */
+errno_t ui_menu_open(ui_menu_t *menu, gfx_rect_t *prect, sysarg_t idev_id)
 {
         ui_popup_t *popup = NULL;
@@ -301 +302 @@
         params.rect = geom.outer_rect;
         params.place = *prect;
+        params.idev_id = idev_id;
 
         rc = ui_popup_create(menu->mbar->ui, menu->mbar->window, &params,
@@ -522 +524 @@
         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);
+                ui_menu_bar_press_accel(menu->mbar, event->c, event->kbd_id);
 
         return ui_claimed;
@@ -616 +618 @@
                 break;
         case KC_LEFT:
-                ui_menu_bar_left(menu->mbar);
+                ui_menu_bar_left(menu->mbar, event->kbd_id);
                 break;
         case KC_RIGHT:
-                ui_menu_bar_right(menu->mbar);
+                ui_menu_bar_right(menu->mbar, event->kbd_id);
                 break;
         case KC_UP: