Changeset 4fbdc3d in mainline for uspace/srv/hid/display/test/display.c

Timestamp:

2019-12-11T16:58:30Z (5 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

4d9c807

Parents:

5bded44

Message:

Movement events from input server, display pointer, focus by click again

File:

• uspace/srv/hid/display/test/display.c (modified) (4 diffs)

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

@@ -309 +309 @@
 }
 
-/** Test ds_display_post_pos_event() with click on window switches focus
+/** Test ds_display_post_ptd_event() with click on window switches focus
  */
-PCUT_TEST(display_post_pos_event_wnd_switch)
+PCUT_TEST(display_post_ptd_event_wnd_switch)
 {
         ds_display_t *disp;
@@ -317 +317 @@
         ds_client_t *client;
         ds_window_t *w0, *w1;
-        pos_event_t event;
+        ptd_event_t event;
         bool called_cb = false;
         errno_t rc;
@@ -342 +342 @@
         w1->dpos.y = 400;
 
+        PCUT_ASSERT_FALSE(called_cb);
+
         ds_seat_set_focus(seat, w0);
 
-        event.type = POS_PRESS;
+        event.type = PTD_MOVE;
+        event.dmove.x = 400;
+        event.dmove.y = 400;
+        rc = ds_display_post_ptd_event(disp, &event);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+        PCUT_ASSERT_FALSE(called_cb);
+
+        event.type = PTD_PRESS;
         event.btn_num = 1;
-
-        PCUT_ASSERT_FALSE(called_cb);
-
-        event.hpos = 400;
-        event.vpos = 400;
-        rc = ds_display_post_pos_event(disp, &event);
+        rc = ds_display_post_ptd_event(disp, &event);
         PCUT_ASSERT_ERRNO_VAL(EOK, rc);
         PCUT_ASSERT_FALSE(called_cb);
@@ -357 +361 @@
         PCUT_ASSERT_EQUALS(w1, seat->focus);
 
-        event.hpos = 10;
-        event.vpos = 10;
-        rc = ds_display_post_pos_event(disp, &event);
+        event.type = PTD_MOVE;
+        event.dmove.x = -400;
+        event.dmove.y = -400;
+        rc = ds_display_post_ptd_event(disp, &event);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+        PCUT_ASSERT_FALSE(called_cb);
+
+        event.type = PTD_PRESS;
+        event.btn_num = 1;
+        rc = ds_display_post_ptd_event(disp, &event);
         PCUT_ASSERT_ERRNO_VAL(EOK, rc);
         PCUT_ASSERT_FALSE(called_cb);