Changeset 5d380b6 in mainline for uspace/lib/ui/include

Timestamp:

2023-01-20T11:50:41Z (3 years 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.

Location:

uspace/lib/ui/include

Files:

• types/ui/popup.h (modified) (3 diffs)
• types/ui/window.h (modified) (1 diff)
• ui/menu.h (modified) (3 diffs)
• ui/menubar.h (modified) (3 diffs)

uspace/lib/ui/include/types/ui/popup.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2021 Jiri Svoboda
+ * Copyright (c) 2023 Jiri Svoboda
  * All rights reserved.
  *
@@ -40 +40 @@
 #include <io/kbd_event.h>
 #include <io/pos_event.h>
+#include <types/common.h>
 
 struct ui_popup;
@@ -50 +51 @@
         /** Placement rectangle close to which popup should be placed */
         gfx_rect_t place;
+        /** Input device ID associated with the popup's seat */
+        sysarg_t idev_id;
 } ui_popup_params_t;
 

uspace/lib/ui/include/types/ui/window.h

@@ -89 +89 @@
         /** Parent rectangle for popup windows */
         gfx_rect_t prect;
+        /** Input device associated with the window's seat */
+        sysarg_t idev_id;
 } ui_wnd_params_t;
 

uspace/lib/ui/include/ui/menu.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2022 Jiri Svoboda
+ * Copyright (c) 2023 Jiri Svoboda
  * All rights reserved.
  *
@@ -42 +42 @@
 #include <io/pos_event.h>
 #include <stdbool.h>
+#include <types/common.h>
 #include <types/ui/menu.h>
 #include <types/ui/menubar.h>
@@ -56 +57 @@
 extern void ui_menu_get_rect(ui_menu_t *, gfx_coord2_t *, gfx_rect_t *);
 extern char32_t ui_menu_get_accel(ui_menu_t *);
-extern errno_t ui_menu_open(ui_menu_t *, gfx_rect_t *);
+extern errno_t ui_menu_open(ui_menu_t *, gfx_rect_t *, sysarg_t);
 extern void ui_menu_close(ui_menu_t *);
 extern bool ui_menu_is_open(ui_menu_t *);

uspace/lib/ui/include/ui/menubar.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2022 Jiri Svoboda
+ * Copyright (c) 2023 Jiri Svoboda
  * All rights reserved.
  *
@@ -40 +40 @@
 #include <gfx/coord.h>
 #include <io/pos_event.h>
+#include <types/common.h>
 #include <types/ui/menubar.h>
 #include <types/ui/control.h>
@@ -56 +57 @@
 extern ui_evclaim_t ui_menu_bar_kbd_event(ui_menu_bar_t *, kbd_event_t *);
 extern ui_evclaim_t ui_menu_bar_pos_event(ui_menu_bar_t *, pos_event_t *);
-extern void ui_menu_bar_press_accel(ui_menu_bar_t *, char32_t);
+extern void ui_menu_bar_press_accel(ui_menu_bar_t *, char32_t, sysarg_t);
 extern void ui_menu_bar_unfocus(ui_menu_bar_t *);
 extern void ui_menu_bar_activate(ui_menu_bar_t *);