Changeset 0e6e77f in mainline for uspace/srv/hid/display/test

Timestamp:

2020-02-28T15:44:55Z (6 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

a8eed5f

Parents:

2a515dcd

git-author:

Jiri Svoboda <jiri@…> (2020-02-26 18:26:13)

git-committer:

Jiri Svoboda <jiri@…> (2020-02-28 15:44:55)

Message:

Window resize by client request

Location:

uspace/srv/hid/display/test

Files:

• display.c (modified) (4 diffs)
• window.c (modified) (1 diff)

uspace/srv/hid/display/test/display.c

@@ -53 +53 @@
         printf("test_ds_ev_pending\n");
         *called_cb = true;
-
 }
 
@@ -265 +264 @@
         event.c = L'\0';
 
-        PCUT_ASSERT_FALSE(called_cb);
+        called_cb = false;
 
         rc = ds_display_post_kbd_event(disp, &event);
@@ -316 +315 @@
         event.c = L'\0';
 
-        PCUT_ASSERT_FALSE(called_cb);
+        called_cb = false;
 
         rc = ds_display_post_kbd_event(disp, &event);
         PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-        PCUT_ASSERT_FALSE(called_cb);
+
+        /* Got gocus/unfocus events */
+        PCUT_ASSERT_TRUE(called_cb);
 
         /* Next window should be focused */
         PCUT_ASSERT_EQUALS(w1, seat->focus);
 
+        called_cb = false;
+
         rc = ds_display_post_kbd_event(disp, &event);
         PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-        PCUT_ASSERT_FALSE(called_cb);
+
+        /* Got gocus/unfocus events */
+        PCUT_ASSERT_TRUE(called_cb);
 
         /* Focus should be back to the first window */
@@ -361 +366 @@
         PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 
+        /*
+         * For PTD_MOVE to work we need to set display dimensions (as pointer
+         * move is clipped to the display rectangle. Here we do it directly
+         * instead of adding a display device.
+         */
+        disp->rect.p0.x = 0;
+        disp->rect.p0.y = 0;
+        disp->rect.p1.x = 500;
+        disp->rect.p1.y = 500;
+
         display_wnd_params_init(&params);
         params.rect.p0.x = params.rect.p0.y = 0;

uspace/srv/hid/display/test/window.c

@@ -49 +49 @@
         .fill_rect = dummy_fill_rect
 };
+
+/** Test ds_window_resize(). */
+PCUT_TEST(window_resize)
+{
+        ds_display_t *disp;
+        ds_client_t *client;
+        ds_window_t *wnd;
+        display_wnd_params_t params;
+        gfx_coord2_t offs;
+        gfx_rect_t nrect;
+        errno_t rc;
+
+        rc = ds_display_create(NULL, &disp);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        rc = ds_client_create(disp, NULL, NULL, &client);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        display_wnd_params_init(&params);
+        params.rect.p0.x = params.rect.p0.y = 0;
+        params.rect.p1.x = params.rect.p1.y = 10;
+
+        rc = ds_window_create(client, &params, &wnd);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        wnd->dpos.x = 100;
+        wnd->dpos.y = 100;
+
+        offs.x = -2;
+        offs.y = -3;
+        params.rect.p0.x = params.rect.p0.y = 0;
+        params.rect.p1.x = 12;
+        params.rect.p1.y = 13;
+        rc = ds_window_resize(wnd, &offs, &nrect);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        PCUT_ASSERT_INT_EQUALS(98, wnd->dpos.x);
+        PCUT_ASSERT_INT_EQUALS(97, wnd->dpos.y);
+
+        ds_window_destroy(wnd);
+        ds_client_destroy(client);
+        ds_display_destroy(disp);
+}
 
 /** Test ds_window_get_ctx(). */