Changeset d92b8e8f in mainline for uspace/lib

Timestamp:

2024-03-04T14:12:26Z (17 months ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

master

Children:

e229148

Parents:

ee3b28a9

git-author:

Jiri Svoboda <jiri@…> (2024-03-03 18:12:02)

git-committer:

Jiri Svoboda <jiri@…> (2024-03-04 14:12:26)

Message:

Start menu support for passing input device ID (multiseat)

Location:

uspace/lib/ui

Files:

• include/ui/menu.h (modified) (2 diffs)
• include/ui/popup.h (modified) (2 diffs)
• private/menu.h (modified) (2 diffs)
• private/popup.h (modified) (2 diffs)
• src/menu.c (modified) (4 diffs)
• src/popup.c (modified) (4 diffs)

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

@@ -1 +1 @@
 /*
- * Copyright (c) 2023 Jiri Svoboda
+ * Copyright (c) 2024 Jiri Svoboda
  * All rights reserved.
  *
@@ -59 +59 @@
 extern ui_evclaim_t ui_menu_pos_event(ui_menu_t *, gfx_coord2_t *,
     pos_event_t *);
+extern sysarg_t ui_menu_get_idev_id(ui_menu_t *);
 
 #endif

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

@@ -1 +1 @@
 /*
- * Copyright (c) 2021 Jiri Svoboda
+ * Copyright (c) 2024 Jiri Svoboda
  * All rights reserved.
  *
@@ -54 +54 @@
 extern ui_resource_t *ui_popup_get_res(ui_popup_t *);
 extern gfx_context_t *ui_popup_get_gc(ui_popup_t *);
+extern sysarg_t ui_popup_get_idev_id(ui_popup_t *);
 
 #endif

uspace/lib/ui/private/menu.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2023 Jiri Svoboda
+ * Copyright (c) 2024 Jiri Svoboda
  * All rights reserved.
  *
@@ -70 +70 @@
         /** Callback argument */
         void *arg;
+        /** ID of device that activated entry */
+        sysarg_t idev_id;
 };
 

uspace/lib/ui/private/popup.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2021 Jiri Svoboda
+ * Copyright (c) 2024 Jiri Svoboda
  * All rights reserved.
  *
@@ -58 +58 @@
         /** Placement rectangle */
         gfx_rect_t place;
+        /** ID of device that sent input event */
+        sysarg_t idev_id;
 };
 

uspace/lib/ui/src/menu.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2023 Jiri Svoboda
+ * Copyright (c) 2024 Jiri Svoboda
  * All rights reserved.
  *
@@ -578 +578 @@
         ui_menu_t *menu = (ui_menu_t *)arg;
 
+        menu->idev_id = ui_popup_get_idev_id(menu->popup);
         ui_menu_kbd_event(menu, event);
 }
@@ -592 +593 @@
         gfx_coord2_t spos;
 
+        menu->idev_id = ui_popup_get_idev_id(menu->popup);
+
         spos.x = 0;
         spos.y = 0;
@@ -641 +644 @@
 }
 
+/** Get ID of last device that input event.
+ *
+ * @param menu Menu
+ * @return Input device ID
+ */
+sysarg_t ui_menu_get_idev_id(ui_menu_t *menu)
+{
+        return menu->idev_id;
+}
+
 /** @}
  */

uspace/lib/ui/src/popup.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2023 Jiri Svoboda
+ * Copyright (c) 2024 Jiri Svoboda
  * All rights reserved.
  *
@@ -190 +190 @@
 }
 
+/** Get ID of device that sent the last position event.
+ *
+ * @param popup Popup window
+ * @return Input device ID
+ */
+sysarg_t ui_popup_get_idev_id(ui_popup_t *popup)
+{
+        return popup->idev_id;
+}
+
 /** Handle close event in popup window.
  *
@@ -214 +224 @@
         ui_popup_t *popup = (ui_popup_t *)arg;
 
+        /* Remember ID of device that sent the last event */
+        popup->idev_id = event->kbd_id;
+
         if (popup->cb != NULL && popup->cb->kbd != NULL)
                 popup->cb->kbd(popup, popup->arg, event);
@@ -229 +242 @@
         ui_popup_t *popup = (ui_popup_t *)arg;
 
+        /* Remember ID of device that sent the last event */
+        popup->idev_id = event->pos_id;
+
         if (popup->cb != NULL && popup->cb->pos != NULL)
                 popup->cb->pos(popup, popup->arg, event);