Changeset 3a6d44b7 in mainline for uspace/lib/wndmgt

Timestamp:

2022-11-07T17:42:51Z (3 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

60ebe63

Parents:

f1f433d

Message:

Activate window by pushing window button on taskbar

Note that with multiple seats, one would need to know which seat pushed
the button and set the appropriate focus.

Location:

uspace/lib/wndmgt

Files:

• include/wndmgt.h (modified) (1 diff)
• include/wndmgt_srv.h (modified) (1 diff)
• src/wndmgt.c (modified) (2 diffs)
• src/wndmgt_srv.c (modified) (2 diffs)
• test/wndmgt.c (modified) (7 diffs)

uspace/lib/wndmgt/include/wndmgt.h

@@ -47 +47 @@
     wndmgt_window_info_t **);
 extern void wndmgt_free_window_info(wndmgt_window_info_t *);
-extern errno_t wndmgt_activate_window(wndmgt_t *, sysarg_t);
+extern errno_t wndmgt_activate_window(wndmgt_t *, sysarg_t, sysarg_t);
 extern errno_t wndmgt_close_window(wndmgt_t *, sysarg_t);
 

uspace/lib/wndmgt/include/wndmgt_srv.h

@@ -52 +52 @@
         errno_t (*get_window_list)(void *, wndmgt_window_list_t **);
         errno_t (*get_window_info)(void *, sysarg_t, wndmgt_window_info_t **);
-        errno_t (*activate_window)(void *, sysarg_t);
+        errno_t (*activate_window)(void *, sysarg_t, sysarg_t);
         errno_t (*close_window)(void *, sysarg_t);
         errno_t (*get_event)(void *, wndmgt_ev_t *);

uspace/lib/wndmgt/src/wndmgt.c

@@ -287 +287 @@
  *
  * @param wndmgt Window management session
+ * @param seat_id Seat ID
  * @param wnd_id Window ID
  * @return EOK on success or an error code
  */
-errno_t wndmgt_activate_window(wndmgt_t *wndmgt, sysarg_t wnd_id)
+errno_t wndmgt_activate_window(wndmgt_t *wndmgt, sysarg_t seat_id,
+    sysarg_t wnd_id)
 {
         async_exch_t *exch;
@@ -296 +298 @@
 
         exch = async_exchange_begin(wndmgt->sess);
-        rc = async_req_1_0(exch, WNDMGT_ACTIVATE_WINDOW, wnd_id);
+        rc = async_req_2_0(exch, WNDMGT_ACTIVATE_WINDOW, seat_id,
+            wnd_id);
 
         async_exchange_end(exch);

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 wnd_id;
         errno_t rc;
 
-        wnd_id = ipc_get_arg1(icall);
+        seat_id = ipc_get_arg1(icall);
+        wnd_id = ipc_get_arg2(icall);
 
         if (srv->ops->activate_window == NULL) {
@@ -214 +216 @@
         }
 
-        rc = srv->ops->activate_window(srv->arg, wnd_id);
+        rc = srv->ops->activate_window(srv->arg, seat_id, wnd_id);
         async_answer_0(icall, rc);
 }

uspace/lib/wndmgt/test/wndmgt.c

@@ -48 +48 @@
 static errno_t test_get_window_list(void *, wndmgt_window_list_t **);
 static errno_t test_get_window_info(void *, sysarg_t, wndmgt_window_info_t **);
-static errno_t test_activate_window(void *, sysarg_t);
+static errno_t test_activate_window(void *, sysarg_t, sysarg_t);
 static errno_t test_close_window(void *, sysarg_t);
 static errno_t test_get_event(void *, wndmgt_ev_t *);
@@ -88 +88 @@
 
         bool activate_window_called;
+        sysarg_t activate_window_seat_id;
         sysarg_t activate_window_wnd_id;
 
@@ -302 +303 @@
         service_id_t sid;
         wndmgt_t *wndmgt = NULL;
+        sysarg_t seat_id;
         sysarg_t wnd_id;
         test_response_t resp;
@@ -318 +320 @@
         PCUT_ASSERT_NOT_NULL(wndmgt);
 
+        seat_id = 13;
         wnd_id = 42;
         resp.rc = ENOMEM;
         resp.activate_window_called = false;
 
-        rc = wndmgt_activate_window(wndmgt, wnd_id);
+        rc = wndmgt_activate_window(wndmgt, seat_id, wnd_id);
         PCUT_ASSERT_TRUE(resp.activate_window_called);
+        PCUT_ASSERT_INT_EQUALS(seat_id, resp.activate_window_seat_id);
         PCUT_ASSERT_INT_EQUALS(wnd_id, resp.activate_window_wnd_id);
         PCUT_ASSERT_ERRNO_VAL(resp.rc, rc);
@@ -338 +342 @@
         service_id_t sid;
         wndmgt_t *wndmgt = NULL;
+        sysarg_t seat_id;
         sysarg_t wnd_id;
         test_response_t resp;
@@ -354 +359 @@
         PCUT_ASSERT_NOT_NULL(wndmgt);
 
+        seat_id = 13;
         wnd_id = 42;
         resp.rc = EOK;
         resp.activate_window_called = false;
 
-        rc = wndmgt_activate_window(wndmgt, wnd_id);
+        rc = wndmgt_activate_window(wndmgt, seat_id, wnd_id);
         PCUT_ASSERT_TRUE(resp.activate_window_called);
+        PCUT_ASSERT_INT_EQUALS(seat_id, resp.activate_window_seat_id);
         PCUT_ASSERT_INT_EQUALS(wnd_id, resp.activate_window_wnd_id);
         PCUT_ASSERT_ERRNO_VAL(resp.rc, rc);
@@ -666 +673 @@
 }
 
-static errno_t test_activate_window(void *arg, sysarg_t wnd_id)
+static errno_t test_activate_window(void *arg, sysarg_t seat_id,
+    sysarg_t wnd_id)
 {
         test_response_t *resp = (test_response_t *) arg;
 
         resp->activate_window_called = true;
+        resp->activate_window_seat_id = seat_id;
         resp->activate_window_wnd_id = wnd_id;
         return resp->rc;