Changeset a6492460 in mainline

Timestamp:

2022-11-09T16:17:59Z (18 months ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

88d828e

Parents:

54593f3

Message:

Pass ID of device that clicked the window button to activate window

To ensure the correct seat's focus is switched.

Location:

uspace

Files:

• app/taskbar/taskbar.c (modified) (4 diffs)
• app/taskbar/types/taskbar.h (modified) (1 diff)
• app/taskbar/types/wndlist.h (modified) (1 diff)
• app/taskbar/wndlist.c (modified) (1 diff)
• lib/wndmgt/src/wndmgt.c (modified) (2 diffs)
• lib/wndmgt/src/wndmgt_srv.c (modified) (2 diffs)
• srv/hid/display/wmops.c (modified) (2 diffs)

uspace/app/taskbar/taskbar.c

@@ -34 +34 @@
 
 #include <gfx/coord.h>
+#include <io/pos_event.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -47 +48 @@
 #include "wndlist.h"
 
-static void wnd_close(ui_window_t *, void *);
+static void taskbar_wnd_close(ui_window_t *, void *);
+static void taskbar_wnd_pos(ui_window_t *, void *, pos_event_t *);
 
 static ui_window_cb_t window_cb = {
-        .close = wnd_close
+        .close = taskbar_wnd_close,
+        .pos = taskbar_wnd_pos
 };
 
@@ -58 +61 @@
  * @param arg Argument (taskbar)
  */
-static void wnd_close(ui_window_t *window, void *arg)
+static void taskbar_wnd_close(ui_window_t *window, void *arg)
 {
         taskbar_t *taskbar = (taskbar_t *) arg;
 
         ui_quit(taskbar->ui);
+}
+
+/** Window received position event.
+ *
+ * @param window Window
+ * @param arg Argument (taskbar)
+ * @param event Position event
+ */
+static void taskbar_wnd_pos(ui_window_t *window, void *arg, pos_event_t *event)
+{
+        taskbar_t *taskbar = (taskbar_t *) arg;
+
+        /* Remember ID of device that sent the last event */
+        taskbar->wndlist->ev_pos_id = event->pos_id;
+
+        ui_window_def_pos(window, event);
 }
 
@@ -130 +149 @@
         }
 
-        ui_window_set_cb(taskbar->window, &window_cb, (void *) &taskbar);
+        ui_window_set_cb(taskbar->window, &window_cb, (void *)taskbar);
         ui_res = ui_window_get_res(taskbar->window);
 

uspace/app/taskbar/types/taskbar.h

@@ -37 +37 @@
 #define TYPES_TASKBAR_H
 
+#include <types/common.h>
 #include <ui/fixed.h>
 #include <ui/label.h>

uspace/app/taskbar/types/wndlist.h

@@ -75 +75 @@
         /** Window management service */
         wndmgt_t *wndmgt;
+
+        /** Position ID of last position event */
+        sysarg_t ev_pos_id;
 } wndlist_t;
 

uspace/app/taskbar/wndlist.c

@@ -448 +448 @@
  *
  * @param pbutton Push button
- * @param arg Argument (wdnlist_entry_t *)
+ * @param arg Argument (wndlist_entry_t *)
  */
 static void wndlist_button_clicked(ui_pbutton_t *pbutton, void *arg)
 {
         wndlist_entry_t *entry = (wndlist_entry_t *)arg;
-        sysarg_t seat_id;
-
-        seat_id = 0; // TODO Multi-seat
+        sysarg_t dev_id;
+
+        /* ID of device that clicked the button */
+        dev_id = entry->wndlist->ev_pos_id;
 
         (void) wndmgt_activate_window(entry->wndlist->wndmgt,
-            seat_id, entry->wnd_id);
+            dev_id, entry->wnd_id);
 }
 

uspace/lib/wndmgt/src/wndmgt.c

@@ -287 +287 @@
  *
  * @param wndmgt Window management session
- * @param seat_id Seat ID
+ * @param dev_id ID of input device belonging to seat whose
+ *               focus is to be switched
  * @param wnd_id Window ID
  * @return EOK on success or an error code
  */
-errno_t wndmgt_activate_window(wndmgt_t *wndmgt, sysarg_t seat_id,
+errno_t wndmgt_activate_window(wndmgt_t *wndmgt, sysarg_t dev_id,
     sysarg_t wnd_id)
 {
@@ -298 +299 @@
 
         exch = async_exchange_begin(wndmgt->sess);
-        rc = async_req_2_0(exch, WNDMGT_ACTIVATE_WINDOW, seat_id,
+        rc = async_req_2_0(exch, WNDMGT_ACTIVATE_WINDOW, dev_id,
             wnd_id);
 

uspace/lib/wndmgt/src/wndmgt_srv.c

@@ -204 +204 @@
 static void wndmgt_activate_window_srv(wndmgt_srv_t *srv, ipc_call_t *icall)
 {
-        sysarg_t seat_id;
+        sysarg_t dev_id;
         sysarg_t wnd_id;
         errno_t rc;
 
-        seat_id = ipc_get_arg1(icall);
+        dev_id = ipc_get_arg1(icall);
         wnd_id = ipc_get_arg2(icall);
 
@@ -216 +216 @@
         }
 
-        rc = srv->ops->activate_window(srv->arg, seat_id, wnd_id);
+        rc = srv->ops->activate_window(srv->arg, dev_id, wnd_id);
         async_answer_0(icall, rc);
 }

uspace/srv/hid/display/wmops.c

@@ -151 +151 @@
  *
  * @param arg Argument (WM client)
- * @param seat_id Seat ID
+ * @param dev_id Input device ID
  * @param wnd_id Window ID
  * @return EOK on success or an error code
  */
-static errno_t dispwm_activate_window(void *arg, sysarg_t seat_id,
+static errno_t dispwm_activate_window(void *arg, sysarg_t dev_id,
     sysarg_t wnd_id)
 {
@@ -172 +172 @@
 
         // TODO Multi-seat
-        (void) seat_id;
+        (void) dev_id;
         seat = ds_display_first_seat(wnd->display);