Changeset a6492460 in mainline for uspace/lib

Timestamp:

2022-11-09T16:17:59Z (3 years 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/lib/wndmgt/src

Files:

• wndmgt.c (modified) (2 diffs)
• wndmgt_srv.c (modified) (2 diffs)

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);
 }