Changeset 9901f267 in mainline for uspace/srv/hid/display/test

Timestamp:

2020-05-22T10:38:52Z (5 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

ef20a91

Parents:

9242ad9

git-author:

Jiri Svoboda <jiri@…> (2020-05-21 17:38:41)

git-committer:

Jiri Svoboda <jiri@…> (2020-05-22 10:38:52)

Message:

Display server needs to override cursor when resizing windows

Although the pointer moves, the window is not resized until button
is released. Therefore we need override the cursor from what it
would be just based on where the pointer is located.

Location:

uspace/srv/hid/display/test

Files:

• seat.c (modified) (1 diff)
• window.c (modified) (8 diffs)

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

@@ -353 +353 @@
 }
 
+/** Set WM cursor */
+PCUT_TEST(set_wm_cursor)
+{
+        ds_display_t *disp;
+        ds_client_t *client;
+        ds_seat_t *seat;
+        bool called_cb = false;
+        errno_t rc;
+
+        rc = ds_display_create(NULL, &disp);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        rc = ds_client_create(disp, &test_ds_client_cb, &called_cb, &client);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        rc = ds_seat_create(disp, &seat);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        ds_seat_set_wm_cursor(seat, disp->cursor[dcurs_size_ud]);
+        ds_seat_set_wm_cursor(seat, NULL);
+
+        ds_seat_destroy(seat);
+        ds_client_destroy(client);
+        ds_display_destroy(disp);
+}
+
 PCUT_EXPORT(seat);

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

@@ -36 +36 @@
 #include "../client.h"
 #include "../display.h"
+#include "../seat.h"
 #include "../window.h"
 
@@ -55 +56 @@
         ds_display_t *disp;
         ds_client_t *client;
+        ds_seat_t *seat;
         ds_window_t *wnd;
         display_wnd_params_t params;
@@ -65 +67 @@
 
         rc = ds_client_create(disp, NULL, NULL, &client);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        rc = ds_seat_create(disp, &seat);
         PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 
@@ -89 +94 @@
 
         ds_window_destroy(wnd);
+        ds_seat_destroy(seat);
         ds_client_destroy(client);
         ds_display_destroy(disp);
@@ -288 +294 @@
         ds_display_t *disp;
         ds_client_t *client;
+        ds_seat_t *seat;
         ds_window_t *wnd;
         display_wnd_params_t params;
@@ -300 +307 @@
 
         rc = ds_client_create(disp, NULL, NULL, &client);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        rc = ds_seat_create(disp, &seat);
         PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 
@@ -321 +331 @@
 
         ds_window_destroy(wnd);
+        ds_seat_destroy(seat);
         ds_client_destroy(client);
         ds_display_destroy(disp);
@@ -639 +650 @@
 }
 
-
 static errno_t dummy_set_color(void *arg, gfx_color_t *color)
 {