Changeset 3a6d44b7 in mainline for uspace/lib/wndmgt/test/wndmgt.c

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.

File:

• uspace/lib/wndmgt/test/wndmgt.c (modified) (7 diffs)

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;