Changeset 3be5366 in mainline for uspace/lib/display

Timestamp:

2023-01-19T12:09:34Z (3 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

6828a56

Parents:

aaa3b855

git-author:

Jiri Svoboda <jiri@…> (2023-01-19 18:09:23)

git-committer:

Jiri Svoboda <jiri@…> (2023-01-19 12:09:34)

Message:

Add pos_id information to move request, too

This will become useful momentarily.

Location:

uspace/lib/display

Files:

• include/disp_srv.h (modified) (1 diff)
• include/display.h (modified) (1 diff)
• src/disp_srv.c (modified) (3 diffs)
• src/display.c (modified) (1 diff)
• test/display.c (modified) (10 diffs)

uspace/lib/display/include/disp_srv.h

@@ -57 +57 @@
         errno_t (*window_create)(void *, display_wnd_params_t *, sysarg_t *);
         errno_t (*window_destroy)(void *, sysarg_t);
-        errno_t (*window_move_req)(void *, sysarg_t, gfx_coord2_t *);
+        errno_t (*window_move_req)(void *, sysarg_t, gfx_coord2_t *,
+            sysarg_t);
         errno_t (*window_resize_req)(void *, sysarg_t, display_wnd_rsztype_t,
             gfx_coord2_t *, sysarg_t);

uspace/lib/display/include/display.h

@@ -54 +54 @@
 extern errno_t display_window_destroy(display_window_t *);
 extern errno_t display_window_get_gc(display_window_t *, gfx_context_t **);
-extern errno_t display_window_move_req(display_window_t *, gfx_coord2_t *);
+extern errno_t display_window_move_req(display_window_t *, gfx_coord2_t *,
+    sysarg_t);
 extern errno_t display_window_resize_req(display_window_t *,
     display_wnd_rsztype_t, gfx_coord2_t *, sysarg_t);

uspace/lib/display/src/disp_srv.c

@@ -152 +152 @@
 {
         sysarg_t wnd_id;
+        sysarg_t pos_id;
         ipc_call_t call;
         gfx_coord2_t pos;
@@ -158 +159 @@
 
         wnd_id = ipc_get_arg1(icall);
+        pos_id = ipc_get_arg2(icall);
 
         if (!async_data_write_receive(&call, &size)) {
@@ -183 +185 @@
         }
 
-        rc = srv->ops->window_move_req(srv->arg, wnd_id, &pos);
+        rc = srv->ops->window_move_req(srv->arg, wnd_id, &pos, pos_id);
         async_answer_0(icall, rc);
 }

uspace/lib/display/src/display.c

@@ -284 +284 @@
  * @param window Window
  * @param pos Position in the window where the button was pressed
- * @return EOK on success or an error code
- */
-errno_t display_window_move_req(display_window_t *window, gfx_coord2_t *pos)
-{
-        async_exch_t *exch;
-        aid_t req;
-        ipc_call_t answer;
-        errno_t rc;
-
-        exch = async_exchange_begin(window->display->sess);
-        req = async_send_1(exch, DISPLAY_WINDOW_MOVE_REQ, window->id, &answer);
+ * @param pos_id Positioning device ID
+ * @return EOK on success or an error code
+ */
+errno_t display_window_move_req(display_window_t *window, gfx_coord2_t *pos,
+    sysarg_t pos_id)
+{
+        async_exch_t *exch;
+        aid_t req;
+        ipc_call_t answer;
+        errno_t rc;
+
+        exch = async_exchange_begin(window->display->sess);
+        req = async_send_2(exch, DISPLAY_WINDOW_MOVE_REQ, window->id,
+            pos_id, &answer);
         rc = async_data_write_start(exch, (void *)pos, sizeof (gfx_coord2_t));
         async_exchange_end(exch);

uspace/lib/display/test/display.c

@@ -58 +58 @@
 static errno_t test_window_create(void *, display_wnd_params_t *, sysarg_t *);
 static errno_t test_window_destroy(void *, sysarg_t);
-static errno_t test_window_move_req(void *, sysarg_t, gfx_coord2_t *);
+static errno_t test_window_move_req(void *, sysarg_t, gfx_coord2_t *, sysarg_t);
 static errno_t test_window_move(void *, sysarg_t, gfx_coord2_t *);
 static errno_t test_window_get_pos(void *, sysarg_t, gfx_coord2_t *);
@@ -124 +124 @@
         sysarg_t move_req_wnd_id;
         gfx_coord2_t move_req_pos;
+        sysarg_t move_req_pos_id;
 
         bool window_move_called;
@@ -379 +380 @@
         test_response_t resp;
         gfx_coord2_t pos;
+        sysarg_t pos_id;
 
         async_set_fallback_port_handler(test_display_conn, &resp);
@@ -410 +412 @@
         pos.x = 42;
         pos.y = 43;
-
-        rc = display_window_move_req(wnd, &pos);
+        pos_id = 44;
+
+        rc = display_window_move_req(wnd, &pos, pos_id);
         PCUT_ASSERT_TRUE(resp.window_move_req_called);
         PCUT_ASSERT_ERRNO_VAL(resp.rc, rc);
@@ -417 +420 @@
         PCUT_ASSERT_INT_EQUALS(pos.x, resp.move_req_pos.x);
         PCUT_ASSERT_INT_EQUALS(pos.y, resp.move_req_pos.y);
+        PCUT_ASSERT_INT_EQUALS(pos_id, resp.move_req_pos_id);
 
         display_window_destroy(wnd);
@@ -434 +438 @@
         test_response_t resp;
         gfx_coord2_t pos;
+        sysarg_t pos_id;
 
         async_set_fallback_port_handler(test_display_conn, &resp);
@@ -465 +470 @@
         pos.x = 42;
         pos.y = 43;
-
-        rc = display_window_move_req(wnd, &pos);
+        pos_id = 44;
+
+        rc = display_window_move_req(wnd, &pos, pos_id);
         PCUT_ASSERT_TRUE(resp.window_move_req_called);
         PCUT_ASSERT_ERRNO_VAL(resp.rc, rc);
@@ -472 +478 @@
         PCUT_ASSERT_INT_EQUALS(pos.x, resp.move_req_pos.x);
         PCUT_ASSERT_INT_EQUALS(pos.y, resp.move_req_pos.y);
+        PCUT_ASSERT_INT_EQUALS(pos_id, resp.move_req_pos_id);
 
         display_window_destroy(wnd);
@@ -2147 +2154 @@
 
 static errno_t test_window_move_req(void *arg, sysarg_t wnd_id,
-    gfx_coord2_t *pos)
+    gfx_coord2_t *pos, sysarg_t pos_id)
 {
         test_response_t *resp = (test_response_t *) arg;
@@ -2154 +2161 @@
         resp->move_req_wnd_id = wnd_id;
         resp->move_req_pos = *pos;
+        resp->move_req_pos_id = pos_id;
         return resp->rc;
 }