Changes in uspace/lib/ui/src/popup.c [d7f82635:d92b8e8f] in mainline

File:

• uspace/lib/ui/src/popup.c (modified) (7 diffs)

uspace/lib/ui/src/popup.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2021 Jiri Svoboda
+ * Copyright (c) 2024 Jiri Svoboda
  * All rights reserved.
  *
@@ -36 +36 @@
 #include <errno.h>
 #include <gfx/context.h>
-//#include <io/kbd_event.h>
+#include <io/kbd_event.h>
 #include <io/pos_event.h>
 #include <mem.h>
@@ -47 +47 @@
 
 static void ui_popup_window_close(ui_window_t *, void *);
+static void ui_popup_window_kbd(ui_window_t *, void *, kbd_event_t *);
 static void ui_popup_window_pos(ui_window_t *, void *, pos_event_t *);
 
 static ui_window_cb_t ui_popup_window_cb = {
         .close = ui_popup_window_close,
+        .kbd = ui_popup_window_kbd,
         .pos = ui_popup_window_pos
 };
@@ -96 +98 @@
         wparams.style &= ~ui_wds_decorated;
         wparams.placement = ui_wnd_place_popup;
-        wparams.flags |= ui_wndf_popup;
+        wparams.flags |= ui_wndf_popup | ui_wndf_topmost;
+        wparams.idev_id = params->idev_id;
 
         /* Compute position of parent rectangle relative to the screen */
@@ -187 +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.
  *
@@ -200 +213 @@
 }
 
+/** Handle keyboard event in popup window.
+ *
+ * @param window Window
+ * @param arg Argument (ui_popup_t *)
+ * @param event Keyboard event
+ */
+static void ui_popup_window_kbd(ui_window_t *window, void *arg,
+    kbd_event_t *event)
+{
+        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);
+}
+
 /** Handle position event in popup window.
  *
@@ -211 +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);