Changeset a2e104e in mainline for uspace/lib/display/test/display.c

Timestamp:

2020-03-05T11:23:41Z (5 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

1e4a937

Parents:

338d0935

git-author:

Jiri Svoboda <jiri@…> (2020-03-04 19:23:29)

git-committer:

Jiri Svoboda <jiri@…> (2020-03-05 11:23:41)

Message:

Move windows by dragging decoration

Or dragging anywhere with button 2. Need to add Ctrl/Alt/Shift state
to pos_event_t and change the latter to Alt-drag/Shift-drag.

File:

• uspace/lib/display/test/display.c (modified) (5 diffs)

uspace/lib/display/test/display.c

@@ -56 +56 @@
 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_resize(void *, sysarg_t, gfx_coord2_t *,
     gfx_rect_t *);
@@ -65 +66 @@
         .window_create = test_window_create,
         .window_destroy = test_window_destroy,
+        .window_move_req = test_window_move_req,
         .window_resize = test_window_resize,
         .get_event = test_get_event
@@ -94 +96 @@
         bool window_destroy_called;
         sysarg_t destroy_wnd_id;
+
+        bool window_move_req_called;
+        sysarg_t move_req_wnd_id;
+        gfx_coord2_t move_req_pos;
 
         bool window_resize_called;
@@ -294 +300 @@
 }
 
+/** display_window_move_req() with server returning error response works. */
+PCUT_TEST(window_move_req_failure)
+{
+        errno_t rc;
+        service_id_t sid;
+        display_t *disp = NULL;
+        display_wnd_params_t params;
+        display_window_t *wnd;
+        test_response_t resp;
+        gfx_coord2_t pos;
+
+        async_set_fallback_port_handler(test_display_conn, &resp);
+
+        // FIXME This causes this test to be non-reentrant!
+        rc = loc_server_register(test_display_server);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        rc = loc_service_register(test_display_svc, &sid);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        rc = display_open(test_display_svc, &disp);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+        PCUT_ASSERT_NOT_NULL(disp);
+
+        resp.rc = EOK;
+        display_wnd_params_init(&params);
+        params.rect.p0.x = 0;
+        params.rect.p0.y = 0;
+        params.rect.p0.x = 100;
+        params.rect.p0.y = 100;
+
+        rc = display_window_create(disp, &params, &test_display_wnd_cb,
+            (void *) &resp, &wnd);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+        PCUT_ASSERT_NOT_NULL(wnd);
+
+        resp.rc = EIO;
+        resp.window_move_req_called = false;
+
+        pos.x = 42;
+        pos.y = 43;
+
+        rc = display_window_move_req(wnd, &pos);
+        PCUT_ASSERT_TRUE(resp.window_move_req_called);
+        PCUT_ASSERT_ERRNO_VAL(resp.rc, rc);
+        PCUT_ASSERT_INT_EQUALS(wnd->id, resp.move_req_wnd_id);
+        PCUT_ASSERT_INT_EQUALS(pos.x, resp.move_req_pos.x);
+        PCUT_ASSERT_INT_EQUALS(pos.y, resp.move_req_pos.y);
+
+        display_window_destroy(wnd);
+        display_close(disp);
+        rc = loc_service_unregister(sid);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+}
+
+/** display_window_move_req() with server returning success response works. */
+PCUT_TEST(window_move_req_success)
+{
+        errno_t rc;
+        service_id_t sid;
+        display_t *disp = NULL;
+        display_wnd_params_t params;
+        display_window_t *wnd;
+        test_response_t resp;
+        gfx_coord2_t pos;
+
+        async_set_fallback_port_handler(test_display_conn, &resp);
+
+        // FIXME This causes this test to be non-reentrant!
+        rc = loc_server_register(test_display_server);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        rc = loc_service_register(test_display_svc, &sid);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        rc = display_open(test_display_svc, &disp);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+        PCUT_ASSERT_NOT_NULL(disp);
+
+        resp.rc = EOK;
+        display_wnd_params_init(&params);
+        params.rect.p0.x = 0;
+        params.rect.p0.y = 0;
+        params.rect.p0.x = 100;
+        params.rect.p0.y = 100;
+
+        rc = display_window_create(disp, &params, &test_display_wnd_cb,
+            (void *) &resp, &wnd);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+        PCUT_ASSERT_NOT_NULL(wnd);
+
+        resp.rc = EOK;
+        resp.window_move_req_called = false;
+
+        pos.x = 42;
+        pos.y = 43;
+
+        rc = display_window_move_req(wnd, &pos);
+        PCUT_ASSERT_TRUE(resp.window_move_req_called);
+        PCUT_ASSERT_ERRNO_VAL(resp.rc, rc);
+        PCUT_ASSERT_INT_EQUALS(wnd->id, resp.move_req_wnd_id);
+        PCUT_ASSERT_INT_EQUALS(pos.x, resp.move_req_pos.x);
+        PCUT_ASSERT_INT_EQUALS(pos.y, resp.move_req_pos.y);
+
+        display_window_destroy(wnd);
+        display_close(disp);
+        rc = loc_service_unregister(sid);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+}
+
 /** display_window_resize() with server returning error response works. */
 PCUT_TEST(window_resize_failure)
@@ -1013 +1129 @@
 }
 
+static errno_t test_window_move_req(void *arg, sysarg_t wnd_id,
+    gfx_coord2_t *pos)
+{
+        test_response_t *resp = (test_response_t *) arg;
+
+        resp->window_move_req_called = true;
+        resp->move_req_wnd_id = wnd_id;
+        resp->move_req_pos = *pos;
+        return resp->rc;
+}
+
 static errno_t test_window_resize(void *arg, sysarg_t wnd_id,
     gfx_coord2_t *offs, gfx_rect_t *nrect)