From: Peter Hutterer Date: Fri, 13 Sep 2024 05:13:38 +0000 (+1000) Subject: test: add litest_dispatch() for better test debugging X-Git-Tag: 1.27.0~136 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=86c47be816c6e809fa2f09fac3f92326f1ba301d;p=platform%2Fupstream%2Flibinput.git test: add litest_dispatch() for better test debugging Wraps libinput_dispatch() with a location which will make things a bit easier to track. Output (in --verbose) is something like: gestures_swipe_3fg_unaccel_fn():1346 - dispatching Which makes it easier to associate the various calls to libinput dispatch with the other output from libinput. This patch switches all uses of libinput_dispatch() in test cases over but not the litest functions that may call dispatch too. Remains to be seen if that is necessary. Part-of: --- diff --git a/test/litest.c b/test/litest.c index c2b21bdb..3f256f77 100644 --- a/test/litest.c +++ b/test/litest.c @@ -283,6 +283,30 @@ struct litest_device *litest_current_device(void) return current_device; } +int +_litest_dispatch(struct libinput *li, + const char *func, + int line) +{ + static int dispatch_counter = 0; + + ++dispatch_counter; + + _litest_checkpoint(func, line, + "┌──────────────────── dispatch %3d ────────────────────┐", + dispatch_counter); + int rc = libinput_dispatch(li); + enum libinput_event_type type = libinput_next_event_type(li); + + + const char *evtype = type == LIBINPUT_EVENT_NONE ? "NONE" : litest_event_type_str(type); + _litest_checkpoint(func, line, + "└──────────────────── /dispatch %3d ────────────────────┘ pending %s", + dispatch_counter, + evtype); + return rc; +} + static void grab_device(struct litest_device *device, bool mode) { @@ -3115,7 +3139,7 @@ _litest_drain_events_of_type(struct libinput *li, ...) } } -static const char * +const char * litest_event_type_str(enum libinput_event_type type) { const char *str = NULL; diff --git a/test/litest.h b/test/litest.h index e12ec89b..0848bda4 100644 --- a/test/litest.h +++ b/test/litest.h @@ -586,6 +586,15 @@ litest_ungrab_device(struct litest_device *d); void litest_delete_device(struct litest_device *d); +const char * +litest_event_type_str(enum libinput_event_type type); + +int +_litest_dispatch(struct libinput *li, const char *func, int line); + +#define litest_dispatch(li_) \ + _litest_dispatch(li_, __func__, __LINE__) + void litest_event(struct litest_device *t, unsigned int type, diff --git a/test/test-device.c b/test/test-device.c index 32635d8d..89e4cf5b 100644 --- a/test/test-device.c +++ b/test/test-device.c @@ -168,7 +168,7 @@ START_TEST(device_disable) litest_event(dev, EV_REL, REL_X, 10); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); ck_assert_notnull(event); ck_assert_int_eq(libinput_event_get_type(event), @@ -205,7 +205,7 @@ START_TEST(device_disable_tablet) litest_tablet_proximity_in(dev, 60, 60, axes); for (int i = 60; i < 70; i++) { litest_tablet_motion(dev, i, i, axes); - libinput_dispatch(li); + litest_dispatch(li); } litest_tablet_proximity_out(dev); @@ -302,7 +302,7 @@ START_TEST(device_disable_touch_during_touch) ck_assert_int_eq(status, LIBINPUT_CONFIG_STATUS_SUCCESS); /* after disabling sendevents we require a touch up */ - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); litest_is_touch_event(event, LIBINPUT_EVENT_TOUCH_CANCEL); libinput_event_destroy(event); @@ -349,7 +349,7 @@ START_TEST(device_disable_events_pending) litest_event(dev, EV_REL, REL_X, 10); litest_event(dev, EV_SYN, SYN_REPORT, 0); } - libinput_dispatch(li); + litest_dispatch(li); status = libinput_device_config_send_events_set_mode(device, LIBINPUT_CONFIG_SEND_EVENTS_DISABLED); @@ -446,7 +446,7 @@ START_TEST(device_reenable_syspath_changed) litest_event(litest_device, EV_REL, REL_Y, 1); litest_event(litest_device, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); while ((event = libinput_get_event(li))) { ck_assert(libinput_event_get_device(event) != device1); libinput_event_destroy(event); @@ -577,7 +577,7 @@ START_TEST(device_disable_release_tap) litest_touch_down(dev, 0, 50, 50); litest_touch_up(dev, 0); - libinput_dispatch(li); + litest_dispatch(li); status = libinput_device_config_send_events_set_mode(device, LIBINPUT_CONFIG_SEND_EVENTS_DISABLED); @@ -599,7 +599,7 @@ START_TEST(device_disable_release_tap) status = libinput_device_config_send_events_set_mode(device, LIBINPUT_CONFIG_SEND_EVENTS_ENABLED); ck_assert_int_eq(status, LIBINPUT_CONFIG_STATUS_SUCCESS); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_empty_queue(li); } @@ -622,15 +622,15 @@ START_TEST(device_disable_release_tap_n_drag) litest_touch_down(dev, 0, 50, 50); litest_touch_up(dev, 0); litest_touch_down(dev, 0, 50, 50); - libinput_dispatch(li); + litest_dispatch(li); litest_timeout_tap(); - libinput_dispatch(li); + litest_dispatch(li); status = libinput_device_config_send_events_set_mode(device, LIBINPUT_CONFIG_SEND_EVENTS_DISABLED); ck_assert_int_eq(status, LIBINPUT_CONFIG_STATUS_SUCCESS); - libinput_dispatch(li); + litest_dispatch(li); litest_touch_up(dev, 0); litest_assert_button_event(li, @@ -682,7 +682,7 @@ START_TEST(device_disable_release_softbutton) status = libinput_device_config_send_events_set_mode(device, LIBINPUT_CONFIG_SEND_EVENTS_ENABLED); ck_assert_int_eq(status, LIBINPUT_CONFIG_STATUS_SUCCESS); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_empty_queue(li); } @@ -1208,7 +1208,7 @@ START_TEST(device_nonpointer_rel) libevdev_uinput_write_event(uinput, EV_REL, REL_X, 1); libevdev_uinput_write_event(uinput, EV_REL, REL_Y, -1); libevdev_uinput_write_event(uinput, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); } litest_restore_log_handler(li); @@ -1249,7 +1249,7 @@ START_TEST(device_touchpad_rel) libevdev_uinput_write_event(uinput, EV_REL, REL_X, 1); libevdev_uinput_write_event(uinput, EV_REL, REL_Y, -1); libevdev_uinput_write_event(uinput, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); } litest_destroy_context(li); @@ -1289,7 +1289,7 @@ START_TEST(device_touch_rel) libevdev_uinput_write_event(uinput, EV_REL, REL_X, 1); libevdev_uinput_write_event(uinput, EV_REL, REL_Y, -1); libevdev_uinput_write_event(uinput, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); } litest_restore_log_handler(li); @@ -1326,7 +1326,7 @@ START_TEST(device_abs_rel) libevdev_uinput_write_event(uinput, EV_REL, REL_X, 1); libevdev_uinput_write_event(uinput, EV_REL, REL_Y, -1); libevdev_uinput_write_event(uinput, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); } litest_destroy_context(li); @@ -1350,7 +1350,7 @@ START_TEST(device_quirks_no_abs_mt_y) litest_event(dev, EV_REL, REL_HWHEEL, 1); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); /* both high and low scroll end events must be sent */ for (i = 0; i < 2; i++) { @@ -1711,15 +1711,15 @@ START_TEST(device_button_down_remove) * press */ if (libevdev_has_property(lidev->evdev, INPUT_PROP_BUTTONPAD)) { litest_touch_down(dev, 0, 20, 90); - libinput_dispatch(li); + litest_dispatch(li); } litest_event(dev, EV_KEY, code, 1); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_delete_device(dev); - libinput_dispatch(li); + litest_dispatch(li); while ((event = libinput_get_event(li))) { if (libinput_event_get_type(event) != diff --git a/test/test-gestures.c b/test/test-gestures.c index e8fed317..1264e7ae 100644 --- a/test/test-gestures.c +++ b/test/test-gestures.c @@ -70,14 +70,14 @@ test_gesture_swipe_3fg(int cardinal, enum hold_gesture_behaviour hold) litest_touch_down(dev, 0, 40, 40); litest_touch_down(dev, 1, 50, 40); litest_touch_down(dev, 2, 60, 40); - libinput_dispatch(li); + litest_dispatch(li); if (hold == HOLD_GESTURE_REQUIRE) litest_timeout_gesture_hold(); litest_touch_move_three_touches(dev, 40, 40, 50, 40, 60, 40, dir_x, dir_y, 10); - libinput_dispatch(li); + litest_dispatch(li); if (hold == HOLD_GESTURE_REQUIRE) { litest_assert_gesture_event(li, @@ -141,7 +141,7 @@ test_gesture_swipe_3fg(int cardinal, enum hold_gesture_behaviour hold) litest_touch_up(dev, 0); litest_touch_up(dev, 1); litest_touch_up(dev, 2); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); gevent = litest_is_gesture_event(event, LIBINPUT_EVENT_GESTURE_SWIPE_END, @@ -183,7 +183,7 @@ test_gesture_swipe_4fg(int cardinal, enum hold_gesture_behaviour hold) litest_touch_down(dev, 1, 50, 40); litest_touch_down(dev, 2, 60, 40); litest_touch_down(dev, 3, 70, 40); - libinput_dispatch(li); + litest_dispatch(li); if (hold == HOLD_GESTURE_REQUIRE) litest_timeout_gesture_hold(); @@ -211,10 +211,10 @@ test_gesture_swipe_4fg(int cardinal, enum hold_gesture_behaviour hold) 70 + dir_x, 40 + dir_y); litest_pop_event_frame(dev); - libinput_dispatch(li); + litest_dispatch(li); } - libinput_dispatch(li); + litest_dispatch(li); if (hold == HOLD_GESTURE_REQUIRE) { litest_assert_gesture_event(li, @@ -279,7 +279,7 @@ test_gesture_swipe_4fg(int cardinal, enum hold_gesture_behaviour hold) litest_touch_up(dev, 1); litest_touch_up(dev, 2); litest_touch_up(dev, 3); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); gevent = litest_is_gesture_event(event, LIBINPUT_EVENT_GESTURE_SWIPE_END, @@ -334,7 +334,7 @@ test_gesture_pinch_2fg(int cardinal, enum hold_gesture_behaviour hold) litest_touch_down(dev, 0, 50 + dir_x, 50 + dir_y); litest_touch_down(dev, 1, 50 - dir_x, 50 - dir_y); - libinput_dispatch(li); + litest_dispatch(li); if (hold == HOLD_GESTURE_REQUIRE) litest_timeout_gesture_hold(); @@ -358,7 +358,7 @@ test_gesture_pinch_2fg(int cardinal, enum hold_gesture_behaviour hold) 50 - dir_x, 50 - dir_y); litest_pop_event_frame(dev); - libinput_dispatch(li); + litest_dispatch(li); } if (hold == HOLD_GESTURE_REQUIRE) { @@ -397,12 +397,12 @@ test_gesture_pinch_2fg(int cardinal, enum hold_gesture_behaviour hold) ck_assert_double_le(fabs(angle), 1.0); libinput_event_destroy(event); - libinput_dispatch(li); + litest_dispatch(li); } litest_touch_up(dev, 0); litest_touch_up(dev, 1); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); gevent = litest_is_gesture_event(event, LIBINPUT_EVENT_GESTURE_PINCH_END, @@ -445,7 +445,7 @@ test_gesture_pinch_3fg(int cardinal, enum hold_gesture_behaviour hold) litest_touch_down(dev, 0, 50 + dir_x, 50 + dir_y); litest_touch_down(dev, 1, 50 - dir_x, 50 - dir_y); litest_touch_down(dev, 2, 51 - dir_x, 51 - dir_y); - libinput_dispatch(li); + litest_dispatch(li); if (hold == HOLD_GESTURE_REQUIRE) litest_timeout_gesture_hold(); @@ -473,7 +473,7 @@ test_gesture_pinch_3fg(int cardinal, enum hold_gesture_behaviour hold) 51 - dir_x, 51 - dir_y); litest_pop_event_frame(dev); - libinput_dispatch(li); + litest_dispatch(li); } if (hold == HOLD_GESTURE_REQUIRE) { @@ -511,13 +511,13 @@ test_gesture_pinch_3fg(int cardinal, enum hold_gesture_behaviour hold) ck_assert_double_le(fabs(angle), 1.0); libinput_event_destroy(event); - libinput_dispatch(li); + litest_dispatch(li); } litest_touch_up(dev, 0); litest_touch_up(dev, 1); litest_touch_up(dev, 2); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); gevent = litest_is_gesture_event(event, LIBINPUT_EVENT_GESTURE_PINCH_END, @@ -561,7 +561,7 @@ test_gesture_pinch_4fg(int cardinal, enum hold_gesture_behaviour hold) litest_touch_down(dev, 1, 50 - dir_x, 50 - dir_y); litest_touch_down(dev, 2, 51 - dir_x, 51 - dir_y); litest_touch_down(dev, 3, 52 - dir_x, 52 - dir_y); - libinput_dispatch(li); + litest_dispatch(li); if (hold == HOLD_GESTURE_REQUIRE) litest_timeout_gesture_hold(); @@ -593,7 +593,7 @@ test_gesture_pinch_4fg(int cardinal, enum hold_gesture_behaviour hold) 52 - dir_x, 52 - dir_y); litest_pop_event_frame(dev); - libinput_dispatch(li); + litest_dispatch(li); } if (hold == HOLD_GESTURE_REQUIRE) { @@ -632,14 +632,14 @@ test_gesture_pinch_4fg(int cardinal, enum hold_gesture_behaviour hold) ck_assert_double_le(fabs(angle), 1.0); libinput_event_destroy(event); - libinput_dispatch(li); + litest_dispatch(li); } litest_touch_up(dev, 0); litest_touch_up(dev, 1); litest_touch_up(dev, 2); litest_touch_up(dev, 3); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); gevent = litest_is_gesture_event(event, LIBINPUT_EVENT_GESTURE_PINCH_END, @@ -694,7 +694,7 @@ test_gesture_spread(int cardinal, enum hold_gesture_behaviour hold) litest_touch_down(dev, 0, 50 + dir_x, 50 + dir_y); litest_touch_down(dev, 1, 50 - dir_x, 50 - dir_y); - libinput_dispatch(li); + litest_dispatch(li); if (hold == HOLD_GESTURE_REQUIRE) litest_timeout_gesture_hold(); @@ -718,7 +718,7 @@ test_gesture_spread(int cardinal, enum hold_gesture_behaviour hold) 50 - dir_x, 50 - dir_y); litest_pop_event_frame(dev); - libinput_dispatch(li); + litest_dispatch(li); } if (hold == HOLD_GESTURE_REQUIRE) { @@ -755,12 +755,12 @@ test_gesture_spread(int cardinal, enum hold_gesture_behaviour hold) ck_assert_double_le(fabs(angle), 1.0); libinput_event_destroy(event); - libinput_dispatch(li); + litest_dispatch(li); } litest_touch_up(dev, 0); litest_touch_up(dev, 1); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); gevent = litest_is_gesture_event(event, LIBINPUT_EVENT_GESTURE_PINCH_END, @@ -786,7 +786,7 @@ test_gesture_3fg_buttonarea_scroll(enum hold_gesture_behaviour hold) litest_touch_down(dev, 1, 30, 20); /* third finger in btnarea */ litest_touch_down(dev, 2, 50, 99); - libinput_dispatch(li); + litest_dispatch(li); if (hold == HOLD_GESTURE_REQUIRE) litest_timeout_gesture_hold(); @@ -795,7 +795,7 @@ test_gesture_3fg_buttonarea_scroll(enum hold_gesture_behaviour hold) litest_touch_up(dev, 0); litest_touch_up(dev, 1); - libinput_dispatch(li); + litest_dispatch(li); if (hold == HOLD_GESTURE_REQUIRE) { litest_assert_gesture_event(li, @@ -838,7 +838,7 @@ test_gesture_hold(int nfingers) break; } - libinput_dispatch(li); + litest_dispatch(li); litest_timeout_gesture_hold(); if (libinput_device_has_capability(dev->libinput_device, @@ -865,7 +865,7 @@ test_gesture_hold(int nfingers) break; } - libinput_dispatch(li); + litest_dispatch(li); if (libinput_device_has_capability(dev->libinput_device, LIBINPUT_DEVICE_CAP_GESTURE)) { litest_assert_gesture_event(li, @@ -903,7 +903,7 @@ test_gesture_hold_cancel(int nfingers) break; } - libinput_dispatch(li); + litest_dispatch(li); litest_timeout_gesture_hold(); litest_touch_up(dev, last_finger); @@ -989,9 +989,9 @@ START_TEST(gestures_swipe_3fg_btntool) litest_event(dev, EV_KEY, BTN_TOOL_TRIPLETAP, 1); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_touch_move_two_touches(dev, 40, 40, 50, 40, dir_x, dir_y, 10); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); gevent = litest_is_gesture_event(event, @@ -1045,7 +1045,7 @@ START_TEST(gestures_swipe_3fg_btntool) litest_touch_up(dev, 0); litest_touch_up(dev, 1); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); gevent = litest_is_gesture_event(event, LIBINPUT_EVENT_GESTURE_SWIPE_END, @@ -1078,9 +1078,9 @@ START_TEST(gestures_swipe_3fg_btntool_pinch_like) litest_event(dev, EV_KEY, BTN_TOOL_TRIPLETAP, 1); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_touch_move_to(dev, 0, 20, 60, 10, 80, 20); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); litest_is_gesture_event(event, LIBINPUT_EVENT_GESTURE_SWIPE_BEGIN, 3); @@ -1095,7 +1095,7 @@ START_TEST(gestures_swipe_3fg_btntool_pinch_like) litest_touch_up(dev, 0); litest_touch_up(dev, 1); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); gevent = litest_is_gesture_event(event, LIBINPUT_EVENT_GESTURE_SWIPE_END, @@ -1149,9 +1149,9 @@ START_TEST(gestures_swipe_4fg_btntool) litest_event(dev, EV_KEY, BTN_TOOL_QUADTAP, 1); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_touch_move_two_touches(dev, 40, 40, 50, 40, dir_x, dir_y, 10); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); gevent = litest_is_gesture_event(event, @@ -1205,7 +1205,7 @@ START_TEST(gestures_swipe_4fg_btntool) litest_touch_up(dev, 0); litest_touch_up(dev, 1); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); gevent = litest_is_gesture_event(event, LIBINPUT_EVENT_GESTURE_SWIPE_END, @@ -1259,11 +1259,11 @@ START_TEST(gestures_time_usec) litest_touch_down(dev, 0, 40, 40); litest_touch_down(dev, 1, 50, 40); litest_touch_down(dev, 2, 60, 40); - libinput_dispatch(li); + litest_dispatch(li); litest_touch_move_three_touches(dev, 40, 40, 50, 40, 60, 40, 0, 30, 30); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); gevent = litest_is_gesture_event(event, LIBINPUT_EVENT_GESTURE_SWIPE_BEGIN, @@ -1299,11 +1299,11 @@ START_TEST(gestures_3fg_buttonarea_scroll_btntool) litest_event(dev, EV_KEY, BTN_TOOL_DOUBLETAP, 0); litest_event(dev, EV_KEY, BTN_TOOL_TRIPLETAP, 1); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_touch_move_to(dev, 1, 30, 20, 30, 70, 10); litest_touch_up(dev, 1); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_scroll(li, LIBINPUT_EVENT_POINTER_SCROLL_FINGER, LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL, @@ -1343,14 +1343,14 @@ START_TEST(gestures_swipe_3fg_unaccel) litest_touch_down(dev, 0, 40, 20); litest_touch_down(dev, 1, 50, 20); litest_touch_down(dev, 2, 60, 20); - libinput_dispatch(li); + litest_dispatch(li); litest_touch_move_three_touches(dev, 40, 20, 50, 20, 60, 20, 30, 40, 10); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); litest_is_gesture_event(event, @@ -1594,10 +1594,10 @@ START_TEST(gestures_hold_once_on_double_tap) /* First tap, a hold gesture must be generated */ litest_touch_down(dev, 0, 50, 50); - libinput_dispatch(li); + litest_dispatch(li); litest_timeout_gesture_quick_hold(); litest_touch_up(dev, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_gesture_event(li, LIBINPUT_EVENT_GESTURE_HOLD_BEGIN, @@ -1614,7 +1614,7 @@ START_TEST(gestures_hold_once_on_double_tap) /* Double tap, don't generate an extra hold gesture */ litest_touch_down(dev, 0, 50, 50); litest_touch_up(dev, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_timeout_gesture_quick_hold(); litest_assert_button_event(li, BTN_LEFT, @@ -1669,7 +1669,7 @@ START_TEST(gestures_hold_once_tap_n_drag) litest_touch_down(dev, 0, 40, 30); break; } - libinput_dispatch(li); + litest_dispatch(li); litest_timeout_gesture_quick_hold(); switch (nfingers) { @@ -1683,7 +1683,7 @@ START_TEST(gestures_hold_once_tap_n_drag) litest_touch_up(dev, 0); break; } - libinput_dispatch(li); + litest_dispatch(li); /* "Quick" hold gestures are only generated when using 1 or 2 fingers */ if (nfingers == 1 || nfingers == 2) { @@ -1698,14 +1698,14 @@ START_TEST(gestures_hold_once_tap_n_drag) /* Tap and drag, don't generate an extra hold gesture */ litest_touch_down(dev, 0, 50, 50); litest_touch_move_to(dev, 0, 50, 50, 80, 80, 20); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_button_event(li, button, LIBINPUT_BUTTON_STATE_PRESSED); litest_assert_only_typed_events(li, LIBINPUT_EVENT_POINTER_MOTION); litest_touch_up(dev, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_button_event(li, button, LIBINPUT_BUTTON_STATE_RELEASED); @@ -1725,11 +1725,11 @@ START_TEST(gestures_hold_and_motion_before_timeout) litest_drain_events(li); litest_touch_down(dev, 0, 50, 50); - libinput_dispatch(li); + litest_dispatch(li); litest_touch_move_to(dev, 0, 50, 50, 51, 51, 1); litest_touch_move_to(dev, 0, 51, 51, 50, 50, 1); - libinput_dispatch(li); + litest_dispatch(li); litest_timeout_gesture_quick_hold(); @@ -1740,7 +1740,7 @@ START_TEST(gestures_hold_and_motion_before_timeout) 1); litest_touch_up(dev, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_gesture_event(li, LIBINPUT_EVENT_GESTURE_HOLD_END, @@ -1761,7 +1761,7 @@ START_TEST(gestures_hold_and_motion_after_timeout) litest_drain_events(li); litest_touch_down(dev, 0, 50, 50); - libinput_dispatch(li); + litest_dispatch(li); litest_timeout_gesture_quick_hold(); litest_assert_gesture_event(li, @@ -1770,11 +1770,11 @@ START_TEST(gestures_hold_and_motion_after_timeout) litest_touch_move_to(dev, 0, 50, 50, 51, 51, 1); litest_touch_move_to(dev, 0, 51, 51, 50, 50, 1); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_only_typed_events(li, LIBINPUT_EVENT_POINTER_MOTION); litest_touch_up(dev, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_gesture_event(li, LIBINPUT_EVENT_GESTURE_HOLD_END, diff --git a/test/test-keyboard.c b/test/test-keyboard.c index 257470f9..82aa598e 100644 --- a/test/test-keyboard.c +++ b/test/test-keyboard.c @@ -55,7 +55,7 @@ START_TEST(keyboard_seat_key_count) for (i = 0; i < num_devices; ++i) litest_keyboard_key(devices[i], KEY_A, true); - libinput_dispatch(libinput); + litest_dispatch(libinput); while ((ev = libinput_get_event(libinput))) { kev = litest_is_keyboard_event(ev, KEY_A, @@ -67,7 +67,7 @@ START_TEST(keyboard_seat_key_count) ck_assert_int_eq(expected_key_button_count, seat_key_count); libinput_event_destroy(ev); - libinput_dispatch(libinput); + litest_dispatch(libinput); } ck_assert_int_eq(seat_key_count, num_devices); @@ -75,7 +75,7 @@ START_TEST(keyboard_seat_key_count) for (i = 0; i < num_devices; ++i) litest_keyboard_key(devices[i], KEY_A, false); - libinput_dispatch(libinput); + litest_dispatch(libinput); while ((ev = libinput_get_event(libinput))) { kev = libinput_event_get_keyboard_event(ev); ck_assert_notnull(kev); @@ -89,7 +89,7 @@ START_TEST(keyboard_seat_key_count) ck_assert_int_eq(expected_key_button_count, seat_key_count); libinput_event_destroy(ev); - libinput_dispatch(libinput); + litest_dispatch(libinput); } ck_assert_int_eq(seat_key_count, 0); @@ -138,7 +138,7 @@ START_TEST(keyboard_ignore_no_pressed_release) litest_keyboard_key(dev, KEY_A, true); litest_keyboard_key(dev, KEY_A, false); - libinput_dispatch(libinput); + litest_dispatch(libinput); ARRAY_FOR_EACH(expected_states, state) { event = libinput_get_event(libinput); @@ -151,7 +151,7 @@ START_TEST(keyboard_ignore_no_pressed_release) ck_assert_int_eq(libinput_event_keyboard_get_key_state(kevent), *state); libinput_event_destroy(event); - libinput_dispatch(libinput); + litest_dispatch(libinput); } litest_assert_empty_queue(libinput); @@ -209,7 +209,7 @@ START_TEST(keyboard_key_auto_release) litest_event(dev, EV_KEY, key, 1); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(libinput); + litest_dispatch(libinput); event = libinput_get_event(libinput); litest_is_keyboard_event(event, @@ -312,7 +312,7 @@ START_TEST(keyboard_time_usec) litest_drain_events(dev->libinput); litest_keyboard_key(dev, KEY_A, true); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); kev = litest_is_keyboard_event(event, @@ -348,7 +348,7 @@ START_TEST(keyboard_no_buttons) litest_keyboard_key(dev, code, true); litest_keyboard_key(dev, code, false); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); litest_is_keyboard_event(event, @@ -378,7 +378,7 @@ START_TEST(keyboard_frame_order) litest_event(dev, EV_KEY, KEY_LEFTSHIFT, 1); litest_event(dev, EV_KEY, KEY_A, 1); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_key_event(li, KEY_LEFTSHIFT, @@ -388,7 +388,7 @@ START_TEST(keyboard_frame_order) litest_event(dev, EV_KEY, KEY_LEFTSHIFT, 0); litest_event(dev, EV_KEY, KEY_A, 0); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_key_event(li, KEY_LEFTSHIFT, @@ -398,7 +398,7 @@ START_TEST(keyboard_frame_order) litest_event(dev, EV_KEY, KEY_A, 1); litest_event(dev, EV_KEY, KEY_LEFTSHIFT, 1); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_key_event(li, KEY_A, LIBINPUT_KEY_STATE_PRESSED); litest_assert_key_event(li, @@ -408,14 +408,14 @@ START_TEST(keyboard_frame_order) litest_event(dev, EV_KEY, KEY_A, 0); litest_event(dev, EV_KEY, KEY_LEFTSHIFT, 0); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_key_event(li, KEY_A, LIBINPUT_KEY_STATE_RELEASED); litest_assert_key_event(li, KEY_LEFTSHIFT, LIBINPUT_KEY_STATE_RELEASED); - libinput_dispatch(li); + litest_dispatch(li); } END_TEST diff --git a/test/test-log.c b/test/test-log.c index 0f344f5b..1c753aa6 100644 --- a/test/test-log.c +++ b/test/test-log.c @@ -189,7 +189,7 @@ START_TEST(log_axisrange_warning) abs->maximum * 2 + i); litest_event(dev, EV_ABS, axis, abs->maximum * 2); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); } /* Expect only one message per 5 min */ diff --git a/test/test-misc.c b/test/test-misc.c index 301af712..417c7cc0 100644 --- a/test/test-misc.c +++ b/test/test-misc.c @@ -109,7 +109,7 @@ START_TEST(event_conversion_device_notify) litest_restore_log_handler(li); /* use the default litest handler */ libinput_path_add_device(li, libevdev_uinput_get_devnode(uinput)); - libinput_dispatch(li); + litest_dispatch(li); libinput_suspend(li); libinput_resume(li); @@ -169,7 +169,7 @@ START_TEST(event_conversion_pointer) litest_event(dev, EV_KEY, BTN_LEFT, 1); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); while ((event = libinput_get_event(li))) { enum libinput_event_type type; @@ -221,7 +221,7 @@ START_TEST(event_conversion_pointer_abs) litest_event(dev, EV_ABS, ABS_Y, 30); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); while ((event = libinput_get_event(li))) { enum libinput_event_type type; @@ -270,7 +270,7 @@ START_TEST(event_conversion_key) litest_event(dev, EV_KEY, KEY_A, 0); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); while ((event = libinput_get_event(li))) { enum libinput_event_type type; @@ -309,7 +309,7 @@ START_TEST(event_conversion_touch) struct libinput_event *event; int touch = 0; - libinput_dispatch(li); + litest_dispatch(li); litest_event(dev, EV_KEY, BTN_TOOL_FINGER, 1); litest_event(dev, EV_KEY, BTN_TOUCH, 1); @@ -321,7 +321,7 @@ START_TEST(event_conversion_touch) litest_event(dev, EV_ABS, ABS_MT_POSITION_Y, 10); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); while ((event = libinput_get_event(li))) { enum libinput_event_type type; @@ -362,11 +362,11 @@ START_TEST(event_conversion_gesture) int gestures = 0; int i; - libinput_dispatch(li); + litest_dispatch(li); litest_touch_down(dev, 0, 70, 30); litest_touch_down(dev, 1, 30, 70); - libinput_dispatch(li); + litest_dispatch(li); litest_timeout_gesture_hold(); for (i = 0; i < 8; i++) { @@ -374,7 +374,7 @@ START_TEST(event_conversion_gesture) litest_touch_move(dev, 0, 70 - i * 5, 30 + i * 5); litest_touch_move(dev, 1, 30 + i * 5, 70 - i * 5); litest_pop_event_frame(dev); - libinput_dispatch(li); + litest_dispatch(li); } while ((event = libinput_get_event(li))) { @@ -423,7 +423,7 @@ START_TEST(event_conversion_tablet) litest_button_click(dev, BTN_STYLUS, true); litest_button_click(dev, BTN_STYLUS, false); - libinput_dispatch(li); + litest_dispatch(li); while ((event = libinput_get_event(li))) { enum libinput_event_type type; @@ -466,7 +466,7 @@ START_TEST(event_conversion_tablet_pad) litest_pad_ring_start(dev, 10); litest_pad_ring_end(dev); - libinput_dispatch(li); + litest_dispatch(li); while ((event = libinput_get_event(li))) { enum libinput_event_type type; @@ -512,7 +512,7 @@ START_TEST(event_conversion_switch) litest_switch_action(dev, LIBINPUT_SWITCH_LID, LIBINPUT_SWITCH_STATE_OFF); - libinput_dispatch(li); + litest_dispatch(li); while ((event = libinput_get_event(li))) { enum libinput_event_type type; @@ -630,7 +630,7 @@ START_TEST(fd_no_event_leak) libevdev_uinput_write_event(uinput, EV_REL, REL_X, 1); libevdev_uinput_write_event(uinput, EV_SYN, SYN_REPORT, 0); libinput_path_remove_device(device); - libinput_dispatch(li); + litest_dispatch(li); litest_drain_events(li); /* Device is removed, but fd is still open. Queue an event, add a @@ -638,10 +638,10 @@ START_TEST(fd_no_event_leak) * by libinput */ libevdev_uinput_write_event(uinput, EV_REL, REL_Y, 1); libevdev_uinput_write_event(uinput, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); libinput_path_add_device(li, path); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); ck_assert_int_eq(libinput_event_get_type(event), LIBINPUT_EVENT_DEVICE_ADDED); @@ -685,7 +685,7 @@ START_TEST(timer_offset_bug_warning) user_data->private = &warning_triggered; libinput_log_set_handler(li, timer_offset_warning); - libinput_dispatch(li); + litest_dispatch(li); /* triggered for touch down and touch up */ ck_assert_int_eq(warning_triggered, 2); @@ -722,7 +722,7 @@ START_TEST(timer_delay_bug_warning) litest_event(dev, EV_REL, REL_X, -1); litest_event(dev, EV_SYN, SYN_REPORT, 0); msleep(21); - libinput_dispatch(li); + litest_dispatch(li); } ck_assert_int_ge(warning_triggered, 1); @@ -739,17 +739,17 @@ START_TEST(timer_flush) touchpad = litest_add_device(li, LITEST_SYNAPTICS_TOUCHPAD); litest_enable_tap(touchpad->libinput_device); - libinput_dispatch(li); + litest_dispatch(li); keyboard = litest_add_device(li, LITEST_KEYBOARD); - libinput_dispatch(li); + litest_dispatch(li); litest_drain_events(li); /* make sure tapping works */ litest_touch_down(touchpad, 0, 50, 50); litest_touch_up(touchpad, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_timeout_tap(); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_button_event(li, BTN_LEFT, LIBINPUT_BUTTON_STATE_PRESSED); @@ -760,12 +760,12 @@ START_TEST(timer_flush) /* make sure dwt-tap is ignored */ litest_keyboard_key(keyboard, KEY_A, true); litest_keyboard_key(keyboard, KEY_A, false); - libinput_dispatch(li); + litest_dispatch(li); litest_touch_down(touchpad, 0, 50, 50); litest_touch_up(touchpad, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_timeout_tap(); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_only_typed_events(li, LIBINPUT_EVENT_KEYBOARD_KEY); /* Ignore 'timer offset negative' warnings */ @@ -775,7 +775,7 @@ START_TEST(timer_flush) - send a key event - expire dwt - send a tap - and then call libinput_dispatch(). libinput should notice that + and then call litest_dispatch(). libinput should notice that the tap event came in after the timeout and thus acknowledge the tap. */ @@ -784,9 +784,9 @@ START_TEST(timer_flush) litest_timeout_dwt_long(); litest_touch_down(touchpad, 0, 50, 50); litest_touch_up(touchpad, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_timeout_tap(); - libinput_dispatch(li); + litest_dispatch(li); litest_restore_log_handler(li); litest_assert_key_event(li, KEY_A, LIBINPUT_KEY_STATE_PRESSED); diff --git a/test/test-pad.c b/test/test-pad.c index 59e8b312..b8f5a405 100644 --- a/test/test-pad.c +++ b/test/test-pad.c @@ -78,7 +78,7 @@ START_TEST(pad_time) litest_button_click(dev, code, 1); litest_button_click(dev, code, 0); - libinput_dispatch(li); + litest_dispatch(li); break; } @@ -104,7 +104,7 @@ START_TEST(pad_time) litest_button_click(dev, code, 1); litest_button_click(dev, code, 0); - libinput_dispatch(li); + litest_dispatch(li); ev = libinput_get_event(li); ck_assert_int_eq(libinput_event_get_type(ev), @@ -206,7 +206,7 @@ START_TEST(pad_button_intuos) litest_button_click(dev, code, 1); litest_button_click(dev, code, 0); - libinput_dispatch(li); + litest_dispatch(li); count++; @@ -256,7 +256,7 @@ START_TEST(pad_button_bamboo) litest_button_click(dev, code, 1); litest_button_click(dev, code, 0); - libinput_dispatch(li); + litest_dispatch(li); count++; @@ -310,7 +310,7 @@ START_TEST(pad_button_libwacom) litest_button_click(dev, code, 1); litest_button_click(dev, code, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_pad_button_event(li, i, @@ -345,7 +345,7 @@ START_TEST(pad_button_mode_groups) litest_button_click(dev, code, 1); litest_button_click(dev, code, 0); - libinput_dispatch(li); + litest_dispatch(li); switch (code) { case BTN_STYLUS: @@ -431,7 +431,7 @@ START_TEST(pad_ring) */ for (val = 0; val < 100.0; val += 1) { litest_pad_ring_change(dev, val); - libinput_dispatch(li); + litest_dispatch(li); ev = libinput_get_event(li); if (!ev) @@ -471,7 +471,7 @@ START_TEST(pad_ring_finger_up) litest_drain_events(li); litest_pad_ring_end(dev); - libinput_dispatch(li); + litest_dispatch(li); ev = libinput_get_event(li); pev = litest_is_pad_ring_event(ev, @@ -520,7 +520,7 @@ START_TEST(pad_dial_low_res) if (code == REL_WHEEL) litest_event(dev, EV_REL, REL_WHEEL_HI_RES, direction * 120); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); struct libinput_event *ev = libinput_get_event(li); struct libinput_event_tablet_pad *pev = litest_is_pad_dial_event(ev, 0); @@ -559,7 +559,7 @@ START_TEST(pad_dial_hi_res) if (accumulated % 120 == 0) litest_event(dev, EV_REL, REL_WHEEL, 1); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); struct libinput_event *ev = libinput_get_event(li); struct libinput_event_tablet_pad *pev = litest_is_pad_dial_event(ev, 0); @@ -601,7 +601,7 @@ START_TEST(pad_strip) * value. */ for (val = 0; val < 100; val += 9.5) { litest_pad_strip_change(dev, val); - libinput_dispatch(li); + litest_dispatch(li); ev = libinput_get_event(li); pev = litest_is_pad_strip_event(ev, @@ -622,7 +622,7 @@ START_TEST(pad_strip) } litest_pad_strip_change(dev, 100); - libinput_dispatch(li); + litest_dispatch(li); ev = libinput_get_event(li); pev = litest_is_pad_strip_event(ev, @@ -648,7 +648,7 @@ START_TEST(pad_strip_finger_up) litest_drain_events(li); litest_pad_strip_end(dev); - libinput_dispatch(li); + litest_dispatch(li); ev = libinput_get_event(li); pev = litest_is_pad_strip_event(ev, @@ -756,7 +756,7 @@ START_TEST(pad_left_handed_ring) for (val = 0; val < 100; val += 10) { litest_pad_ring_change(dev, val); - libinput_dispatch(li); + litest_dispatch(li); ev = libinput_get_event(li); pev = litest_is_pad_ring_event(ev, @@ -1044,29 +1044,29 @@ START_TEST(pad_keys) key = KEY_BUTTONCONFIG; pad_key_down(dev, key); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_pad_key_event(li, key, LIBINPUT_KEY_STATE_PRESSED); pad_key_up(dev, key); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_pad_key_event(li, key, LIBINPUT_KEY_STATE_RELEASED); key = KEY_ONSCREEN_KEYBOARD; pad_key_down(dev, key); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_pad_key_event(li, key, LIBINPUT_KEY_STATE_PRESSED); pad_key_up(dev, key); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_pad_key_event(li, key, LIBINPUT_KEY_STATE_RELEASED); key = KEY_CONTROLPANEL; pad_key_down(dev, key); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_pad_key_event(li, key, LIBINPUT_KEY_STATE_PRESSED); pad_key_up(dev, key); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_pad_key_event(li, key, LIBINPUT_KEY_STATE_RELEASED); } END_TEST diff --git a/test/test-path.c b/test/test-path.c index e4c48b1d..0ee10c03 100644 --- a/test/test-path.c +++ b/test/test-path.c @@ -301,7 +301,7 @@ START_TEST(path_added_seat) const char *seat_name; enum libinput_event_type type; - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); ck_assert_notnull(event); @@ -331,7 +331,7 @@ START_TEST(path_seat_change) const char *seat2_name = "new seat"; int rc; - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); ck_assert_int_eq(libinput_event_get_type(event), @@ -352,7 +352,7 @@ START_TEST(path_seat_change) seat2_name); ck_assert_int_eq(rc, 0); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); ck_assert_notnull(event); @@ -396,7 +396,7 @@ START_TEST(path_added_device) struct libinput_device *device; enum libinput_event_type type; - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); ck_assert_notnull(event); @@ -418,7 +418,7 @@ START_TEST(path_add_device) char *sysname1 = NULL, *sysname2 = NULL; enum libinput_event_type type; - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); ck_assert_notnull(event); @@ -435,7 +435,7 @@ START_TEST(path_add_device) libevdev_uinput_get_devnode(dev->uinput)); ck_assert_notnull(device); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); ck_assert_notnull(event); @@ -465,7 +465,7 @@ START_TEST(path_add_invalid_path) litest_restore_log_handler(li); ck_assert(device == NULL); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_empty_queue(li); @@ -481,7 +481,7 @@ START_TEST(path_device_sysname) const char *sysname; enum libinput_event_type type; - libinput_dispatch(dev->libinput); + litest_dispatch(dev->libinput); ev = libinput_get_event(dev->libinput); ck_assert_notnull(ev); @@ -514,7 +514,7 @@ START_TEST(path_remove_device) litest_drain_events(li); libinput_path_remove_device(device); - libinput_dispatch(li); + litest_dispatch(li); while ((event = libinput_get_event(li))) { enum libinput_event_type type; @@ -545,7 +545,7 @@ START_TEST(path_double_remove_device) libinput_path_remove_device(device); libinput_path_remove_device(device); - libinput_dispatch(li); + litest_dispatch(li); while ((event = libinput_get_event(li))) { enum libinput_event_type type; @@ -684,7 +684,7 @@ START_TEST(path_add_device_suspend_resume) ck_assert_notnull(device); libinput_path_add_device(li, libevdev_uinput_get_devnode(uinput2)); - libinput_dispatch(li); + litest_dispatch(li); nevents = 0; while ((event = libinput_get_event(li))) { @@ -698,7 +698,7 @@ START_TEST(path_add_device_suspend_resume) ck_assert_int_eq(nevents, 2); libinput_suspend(li); - libinput_dispatch(li); + litest_dispatch(li); nevents = 0; while ((event = libinput_get_event(li))) { @@ -712,7 +712,7 @@ START_TEST(path_add_device_suspend_resume) ck_assert_int_eq(nevents, 2); libinput_resume(li); - libinput_dispatch(li); + litest_dispatch(li); nevents = 0; while ((event = libinput_get_event(li))) { @@ -764,7 +764,7 @@ START_TEST(path_add_device_suspend_resume_fail) libevdev_uinput_get_devnode(uinput2)); ck_assert_notnull(device); - libinput_dispatch(li); + litest_dispatch(li); nevents = 0; while ((event = libinput_get_event(li))) { @@ -778,7 +778,7 @@ START_TEST(path_add_device_suspend_resume_fail) ck_assert_int_eq(nevents, 2); libinput_suspend(li); - libinput_dispatch(li); + litest_dispatch(li); nevents = 0; while ((event = libinput_get_event(li))) { @@ -796,7 +796,7 @@ START_TEST(path_add_device_suspend_resume_fail) rc = libinput_resume(li); ck_assert_int_eq(rc, -1); - libinput_dispatch(li); + litest_dispatch(li); nevents = 0; while ((event = libinput_get_event(li))) { @@ -851,7 +851,7 @@ START_TEST(path_add_device_suspend_resume_remove_device) libevdev_uinput_get_devnode(uinput2)); libinput_device_ref(device); - libinput_dispatch(li); + litest_dispatch(li); nevents = 0; while ((event = libinput_get_event(li))) { @@ -865,7 +865,7 @@ START_TEST(path_add_device_suspend_resume_remove_device) ck_assert_int_eq(nevents, 2); libinput_suspend(li); - libinput_dispatch(li); + litest_dispatch(li); nevents = 0; while ((event = libinput_get_event(li))) { @@ -886,7 +886,7 @@ START_TEST(path_add_device_suspend_resume_remove_device) rc = libinput_resume(li); ck_assert_int_eq(rc, 0); - libinput_dispatch(li); + litest_dispatch(li); nevents = 0; while ((event = libinput_get_event(li))) { @@ -929,7 +929,7 @@ START_TEST(path_device_gone) libevdev_uinput_destroy(uinput); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); ck_assert_notnull(event); @@ -969,7 +969,7 @@ START_TEST(path_seat_recycle) libevdev_uinput_get_devnode(uinput)); ck_assert_notnull(device); - libinput_dispatch(li); + litest_dispatch(li); ev = libinput_get_event(li); ck_assert_notnull(ev); @@ -991,7 +991,7 @@ START_TEST(path_seat_recycle) libinput_resume(li); - libinput_dispatch(li); + litest_dispatch(li); ev = libinput_get_event(li); ck_assert_notnull(ev); type = libinput_event_get_type(ev); diff --git a/test/test-pointer.c b/test/test-pointer.c index fbddaf58..82ceed5a 100644 --- a/test/test-pointer.c +++ b/test/test-pointer.c @@ -54,7 +54,7 @@ test_relative_event(struct litest_device *dev, double dx, double dy) litest_event(dev, EV_REL, REL_Y, dy); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); ptrev = litest_is_motion_event(event); @@ -119,7 +119,7 @@ START_TEST(pointer_motion_relative) litest_event(dev, EV_REL, REL_X, 1); litest_event(dev, EV_REL, REL_Y, 0); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(dev->libinput); + litest_dispatch(dev->libinput); litest_drain_events(dev->libinput); @@ -151,7 +151,7 @@ START_TEST(pointer_motion_relative_zero) litest_event(dev, EV_REL, REL_X, 0); litest_event(dev, EV_REL, REL_Y, 0); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); } litest_assert_empty_queue(li); @@ -160,7 +160,7 @@ START_TEST(pointer_motion_relative_zero) litest_event(dev, EV_REL, REL_X, 1); litest_event(dev, EV_REL, REL_Y, 0); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); libinput_event_destroy(libinput_get_event(li)); litest_assert_empty_queue(li); @@ -169,7 +169,7 @@ START_TEST(pointer_motion_relative_zero) litest_event(dev, EV_REL, REL_X, 0); litest_event(dev, EV_REL, REL_Y, 0); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(dev->libinput); + litest_dispatch(dev->libinput); } litest_assert_empty_queue(li); @@ -207,7 +207,7 @@ START_TEST(pointer_motion_relative_min_decel) litest_event(dev, EV_REL, REL_X, dx); litest_event(dev, EV_REL, REL_Y, dy); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); ptrev = litest_is_motion_event(event); @@ -234,7 +234,7 @@ test_absolute_event(struct litest_device *dev, double x, double y) enum libinput_event_type type = LIBINPUT_EVENT_POINTER_MOTION_ABSOLUTE; litest_touch_down(dev, 0, x, y); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); litest_assert_notnull(event); @@ -329,7 +329,7 @@ test_unaccel_event(struct litest_device *dev, int dx, int dy) litest_event(dev, EV_REL, REL_Y, dy); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); ptrev = litest_is_motion_event(event); @@ -677,7 +677,7 @@ test_wheel_event(struct litest_device *dev, int which, int amount) litest_event(dev, EV_REL, which, event_amount); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); test_high_and_low_wheel_events_value(dev, which, amount * 120); } @@ -731,7 +731,7 @@ test_hi_res_wheel_event(struct litest_device *dev, int which, int v120_amount) abort(); } - libinput_dispatch(li); + litest_dispatch(li); test_high_and_low_wheel_events_value(dev, which, v120_amount); } @@ -799,17 +799,17 @@ START_TEST(pointer_scroll_wheel_hires_send_only_lores) litest_event(dev, EV_REL, lores_code, 1); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); test_high_and_low_wheel_events_value(dev, lores_code, direction * 120); litest_event(dev, EV_REL, lores_code, -1); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); test_high_and_low_wheel_events_value(dev, lores_code, direction * -120); litest_event(dev, EV_REL, lores_code, 2); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); test_high_and_low_wheel_events_value(dev, lores_code, direction * 240); litest_assert_empty_queue(li); @@ -832,19 +832,19 @@ START_TEST(pointer_scroll_wheel_inhibit_small_deltas) litest_event(dev, EV_REL, REL_WHEEL_HI_RES, 15); litest_event(dev, EV_REL, REL_WHEEL_HI_RES, 15); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_empty_queue(li); /* The accumulated scroll is 30, add 30 to trigger scroll */ litest_event(dev, EV_REL, REL_WHEEL_HI_RES, 30); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); test_high_and_low_wheel_events_value(dev, REL_WHEEL_HI_RES, -60); /* Once the threshold is reached, small scroll deltas are reported */ litest_event(dev, EV_REL, REL_WHEEL_HI_RES, 5); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); test_high_and_low_wheel_events_value(dev, REL_WHEEL_HI_RES, -5); /* When the scroll timeout is triggered, ignore small deltas again */ @@ -853,13 +853,13 @@ START_TEST(pointer_scroll_wheel_inhibit_small_deltas) litest_event(dev, EV_REL, REL_WHEEL_HI_RES, -15); litest_event(dev, EV_REL, REL_WHEEL_HI_RES, -15); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_empty_queue(li); litest_event(dev, EV_REL, REL_HWHEEL_HI_RES, 15); litest_event(dev, EV_REL, REL_HWHEEL_HI_RES, 15); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_empty_queue(li); } END_TEST @@ -879,25 +879,25 @@ START_TEST(pointer_scroll_wheel_inhibit_dir_change) litest_event(dev, EV_REL, REL_WHEEL_HI_RES, 120); litest_event(dev, EV_REL, REL_WHEEL_HI_RES, 30); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); test_high_and_low_wheel_events_value(dev, REL_WHEEL_HI_RES, -150); /* Scroll below the threshold in the oposite direction should be ignored */ litest_event(dev, EV_REL, REL_WHEEL_HI_RES, -30); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_empty_queue(li); /* But should be triggered if the scroll continues in the same direction */ litest_event(dev, EV_REL, REL_WHEEL_HI_RES, -120); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); test_high_and_low_wheel_events_value(dev, REL_WHEEL_HI_RES, 150); /* Scroll above the threshold in the same dir should be triggered */ litest_event(dev, EV_REL, REL_WHEEL_HI_RES, 80); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); test_high_and_low_wheel_events_value(dev, REL_WHEEL_HI_RES, -80); } END_TEST @@ -919,7 +919,7 @@ START_TEST(pointer_scroll_wheel_lenovo_scrollpoint) litest_event(dev, EV_SYN, SYN_REPORT, 0); litest_event(dev, EV_REL, REL_WHEEL, -60); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); /* Hi-res scroll event first */ event = libinput_get_event(li); @@ -1052,7 +1052,7 @@ START_TEST(pointer_scroll_has_axis_invalid) litest_event(dev, EV_REL, REL_WHEEL, 1); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); pev = litest_is_axis_event(event, LIBINPUT_EVENT_POINTER_SCROLL_WHEEL, @@ -1126,12 +1126,12 @@ START_TEST(pointer_seat_button_count) BTN_LEFT, true); - libinput_dispatch(libinput); + litest_dispatch(libinput); while ((ev = libinput_get_event(libinput))) { if (libinput_event_get_type(ev) != LIBINPUT_EVENT_POINTER_BUTTON) { libinput_event_destroy(ev); - libinput_dispatch(libinput); + litest_dispatch(libinput); continue; } @@ -1148,7 +1148,7 @@ START_TEST(pointer_seat_button_count) ck_assert_int_eq(expected_seat_button_count, seat_button_count); libinput_event_destroy(ev); - libinput_dispatch(libinput); + litest_dispatch(libinput); } ck_assert_int_eq(seat_button_count, num_devices); @@ -1159,12 +1159,12 @@ START_TEST(pointer_seat_button_count) BTN_LEFT, false); - libinput_dispatch(libinput); + litest_dispatch(libinput); while ((ev = libinput_get_event(libinput))) { if (libinput_event_get_type(ev) != LIBINPUT_EVENT_POINTER_BUTTON) { libinput_event_destroy(ev); - libinput_dispatch(libinput); + litest_dispatch(libinput); continue; } @@ -1181,7 +1181,7 @@ START_TEST(pointer_seat_button_count) ck_assert_int_eq(expected_seat_button_count, seat_button_count); libinput_event_destroy(ev); - libinput_dispatch(libinput); + litest_dispatch(libinput); } ck_assert_int_eq(seat_button_count, 0); @@ -1287,7 +1287,7 @@ START_TEST(pointer_left_handed_during_click) litest_drain_events(li); litest_button_click_debounced(dev, li, BTN_LEFT, 1); - libinput_dispatch(li); + litest_dispatch(li); /* Change while button is down, expect correct release event */ status = libinput_device_config_left_handed_set(d, 1); @@ -1318,7 +1318,7 @@ START_TEST(pointer_left_handed_during_click_multiple_buttons) litest_drain_events(li); litest_button_click_debounced(dev, li, BTN_LEFT, 1); - libinput_dispatch(li); + litest_dispatch(li); status = libinput_device_config_left_handed_set(d, 1); ck_assert_int_eq(status, LIBINPUT_CONFIG_STATUS_SUCCESS); @@ -1354,13 +1354,13 @@ START_TEST(pointer_left_handed_disable_with_button_down) litest_drain_events(li); litest_button_click_debounced(dev, li, BTN_LEFT, 1); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_button_event(li, BTN_RIGHT, LIBINPUT_BUTTON_STATE_PRESSED); litest_delete_device(dev); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_button_event(li, BTN_RIGHT, @@ -1481,7 +1481,7 @@ START_TEST(pointer_scroll_button_no_event_before_timeout) litest_assert_empty_queue(li); litest_timeout_buttonscroll(); - libinput_dispatch(li); + litest_dispatch(li); litest_button_click_debounced(device, li, BTN_LEFT, false); litest_assert_button_event(li, BTN_LEFT, @@ -1517,20 +1517,20 @@ START_TEST(pointer_scroll_button_middle_emulation) litest_button_click(dev, BTN_LEFT, 1); litest_button_click(dev, BTN_RIGHT, 1); - libinput_dispatch(li); + litest_dispatch(li); litest_timeout_buttonscroll(); - libinput_dispatch(li); + litest_dispatch(li); for (i = 0; i < 10; i++) { litest_event(dev, EV_REL, REL_Y, -1); litest_event(dev, EV_SYN, SYN_REPORT, 0); } - libinput_dispatch(li); + litest_dispatch(li); litest_button_click(dev, BTN_LEFT, 0); litest_button_click(dev, BTN_RIGHT, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_scroll(li, LIBINPUT_EVENT_POINTER_SCROLL_CONTINUOUS, @@ -1564,11 +1564,11 @@ START_TEST(pointer_scroll_button_device_remove_while_down) litest_event(dev, EV_KEY, BTN_LEFT, 1); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); /* delete the device while the timer is still active */ litest_delete_device(dev); - libinput_dispatch(li); + litest_dispatch(li); litest_destroy_context(li); } @@ -1609,7 +1609,7 @@ START_TEST(pointer_scroll_button_lock) litest_assert_empty_queue(li); litest_timeout_buttonscroll(); - libinput_dispatch(li); + litest_dispatch(li); for (int i = 0; i < 10; i++) { litest_event(dev, EV_REL, REL_X, 1); @@ -1617,11 +1617,11 @@ START_TEST(pointer_scroll_button_lock) litest_event(dev, EV_SYN, SYN_REPORT, 0); } - libinput_dispatch(li); + litest_dispatch(li); litest_button_click_debounced(dev, li, BTN_LEFT, true); litest_button_click_debounced(dev, li, BTN_LEFT, false); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_scroll(li, LIBINPUT_EVENT_POINTER_SCROLL_CONTINUOUS, @@ -1714,9 +1714,9 @@ START_TEST(pointer_scroll_button_lock_enable_while_down) /* but on the next button press we scroll lock */ litest_button_click_debounced(dev, li, BTN_LEFT, true); litest_button_click_debounced(dev, li, BTN_LEFT, false); - libinput_dispatch(li); + litest_dispatch(li); litest_timeout_buttonscroll(); - libinput_dispatch(li); + litest_dispatch(li); for (int i = 0; i < 10; i++) { litest_event(dev, EV_REL, REL_X, 1); @@ -1780,9 +1780,9 @@ START_TEST(pointer_scroll_button_lock_enable_while_down_just_lock) /* but on the next button press we scroll lock */ litest_button_click_debounced(dev, li, BTN_LEFT, true); litest_button_click_debounced(dev, li, BTN_LEFT, false); - libinput_dispatch(li); + litest_dispatch(li); litest_timeout_buttonscroll(); - libinput_dispatch(li); + litest_dispatch(li); for (int i = 0; i < 10; i++) { litest_event(dev, EV_REL, REL_X, 1); @@ -1824,7 +1824,7 @@ START_TEST(pointer_scroll_button_lock_otherbutton) litest_button_click_debounced(dev, li, BTN_LEFT, false); litest_assert_empty_queue(li); litest_timeout_buttonscroll(); - libinput_dispatch(li); + litest_dispatch(li); /* other button passes on normally */ litest_button_click_debounced(dev, li, BTN_RIGHT, true); @@ -1997,10 +1997,10 @@ START_TEST(pointer_scroll_button_lock_middlebutton) abort(); } - libinput_dispatch(li); + litest_dispatch(li); litest_timeout_middlebutton(); litest_timeout_buttonscroll(); - libinput_dispatch(li); + litest_dispatch(li); /* motion events are the same for all of them */ for (int i = 0; i < 10; i++) { @@ -2009,7 +2009,7 @@ START_TEST(pointer_scroll_button_lock_middlebutton) litest_event(dev, EV_SYN, SYN_REPORT, 0); } - libinput_dispatch(li); + litest_dispatch(li); switch (buttonorder) { case LLRR: @@ -2021,7 +2021,7 @@ START_TEST(pointer_scroll_button_lock_middlebutton) break; } - libinput_dispatch(li); + litest_dispatch(li); switch (buttonorder) { case LLRR: @@ -2253,7 +2253,7 @@ START_TEST(pointer_accel_direction_change) } litest_event(dev, EV_REL, REL_X, 1); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); do { @@ -2962,23 +2962,23 @@ START_TEST(middlebutton_button_scrolling) litest_event(dev, EV_KEY, BTN_LEFT, 1); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); /* middle emulation discards */ litest_assert_empty_queue(li); litest_timeout_middlebutton(); - libinput_dispatch(li); + litest_dispatch(li); /* scroll discards */ litest_assert_empty_queue(li); litest_timeout_buttonscroll(); - libinput_dispatch(li); + litest_dispatch(li); for (i = 0; i < 10; i++) { litest_event(dev, EV_REL, REL_Y, 1); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); } ev = libinput_get_event(li); @@ -2996,7 +2996,7 @@ START_TEST(middlebutton_button_scrolling) litest_event(dev, EV_KEY, BTN_LEFT, 0); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_axis_end_sequence(li, LIBINPUT_EVENT_POINTER_SCROLL_CONTINUOUS, @@ -3038,7 +3038,7 @@ START_TEST(middlebutton_button_scrolling_middle) litest_event(dev, EV_SYN, SYN_REPORT, 0); litest_event(dev, EV_KEY, BTN_RIGHT, 1); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_button_event(li, BTN_MIDDLE, @@ -3048,7 +3048,7 @@ START_TEST(middlebutton_button_scrolling_middle) litest_event(dev, EV_SYN, SYN_REPORT, 0); litest_event(dev, EV_KEY, BTN_RIGHT, 0); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_button_event(li, BTN_MIDDLE, @@ -3079,7 +3079,7 @@ START_TEST(middlebutton_device_remove_while_down) litest_event(dev, EV_SYN, SYN_REPORT, 0); litest_event(dev, EV_KEY, BTN_RIGHT, 1); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_button_event(li, BTN_MIDDLE, @@ -3108,7 +3108,7 @@ START_TEST(middlebutton_device_remove_while_one_is_down) litest_event(dev, EV_KEY, BTN_RIGHT, 1); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_empty_queue(li); } @@ -3162,9 +3162,9 @@ START_TEST(debounce_bounce) litest_event(dev, EV_SYN, SYN_REPORT, 0); litest_event(dev, EV_KEY, button, 1); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_timeout_debounce(); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_button_event(li, button, @@ -3177,9 +3177,9 @@ START_TEST(debounce_bounce) litest_event(dev, EV_SYN, SYN_REPORT, 0); litest_event(dev, EV_KEY, button, 0); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_timeout_debounce(); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_button_event(li, button, @@ -3208,17 +3208,17 @@ START_TEST(debounce_bounce_high_delay) * each single event. */ litest_event(dev, EV_KEY, button, 1); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); msleep(15); litest_event(dev, EV_KEY, button, 0); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); msleep(15); litest_event(dev, EV_KEY, button, 1); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_timeout_debounce(); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_button_event(li, button, @@ -3227,17 +3227,17 @@ START_TEST(debounce_bounce_high_delay) litest_event(dev, EV_KEY, button, 0); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); msleep(15); litest_event(dev, EV_KEY, button, 1); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); msleep(15); litest_event(dev, EV_KEY, button, 0); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_timeout_debounce(); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_button_event(li, button, @@ -3285,9 +3285,9 @@ debounce_trigger_spurious(struct litest_device *dev, struct libinput *li) { litest_event(dev, EV_KEY, BTN_LEFT, 1); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_timeout_debounce(); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_button_event(li, BTN_LEFT, @@ -3295,13 +3295,13 @@ debounce_trigger_spurious(struct litest_device *dev, struct libinput *li) litest_event(dev, EV_KEY, BTN_LEFT, 0); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_event(dev, EV_KEY, BTN_LEFT, 1); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_timeout_debounce(); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_button_event(li, BTN_LEFT, @@ -3313,9 +3313,9 @@ debounce_trigger_spurious(struct litest_device *dev, struct libinput *li) /* gets filtered now */ litest_event(dev, EV_KEY, BTN_LEFT, 0); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_timeout_debounce(); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_button_event(li, BTN_LEFT, LIBINPUT_BUTTON_STATE_RELEASED); @@ -3341,16 +3341,16 @@ START_TEST(debounce_spurious) for (int i = 0; i < 3; i++) { litest_event(dev, EV_KEY, button, 1); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_timeout_debounce(); - libinput_dispatch(li); + litest_dispatch(li); /* Not all devices can disable middle button emulation, time out on * middle button here to make sure the initial button press event * was flushed. */ litest_timeout_middlebutton(); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_button_event(li, button, @@ -3365,9 +3365,9 @@ START_TEST(debounce_spurious) litest_event(dev, EV_KEY, button, 0); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_timeout_debounce(); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_button_event(li, button, LIBINPUT_BUTTON_STATE_RELEASED); @@ -3396,16 +3396,16 @@ START_TEST(debounce_spurious_multibounce) litest_event(dev, EV_KEY, BTN_LEFT, 1); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_timeout_debounce(); /* Not all devices can disable middle button emulation, time out on * middle button here to make sure the initial button press event * was flushed. */ - libinput_dispatch(li); + litest_dispatch(li); litest_timeout_middlebutton(); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_button_event(li, BTN_LEFT, LIBINPUT_BUTTON_STATE_PRESSED); @@ -3446,9 +3446,9 @@ START_TEST(debounce_spurious_trigger_high_delay) litest_event(dev, EV_KEY, BTN_LEFT, 1); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_timeout_debounce(); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_button_event(li, BTN_LEFT, @@ -3459,22 +3459,22 @@ START_TEST(debounce_spurious_trigger_high_delay) * each single event. */ litest_event(dev, EV_KEY, BTN_LEFT, 0); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); msleep(5); litest_event(dev, EV_KEY, BTN_LEFT, 1); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); msleep(5); litest_event(dev, EV_KEY, BTN_LEFT, 0); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); msleep(5); litest_event(dev, EV_KEY, BTN_LEFT, 1); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_timeout_debounce(); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_button_event(li, BTN_LEFT, @@ -3486,18 +3486,18 @@ START_TEST(debounce_spurious_trigger_high_delay) /* gets filtered now */ litest_event(dev, EV_KEY, BTN_LEFT, 0); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_event(dev, EV_KEY, BTN_LEFT, 1); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_timeout_debounce(); litest_assert_empty_queue(li); litest_event(dev, EV_KEY, BTN_LEFT, 0); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_timeout_debounce(); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_button_event(li, BTN_LEFT, LIBINPUT_BUTTON_STATE_RELEASED); @@ -3521,9 +3521,9 @@ START_TEST(debounce_spurious_dont_enable_on_otherbutton) /* Don't trigger spurious debouncing on otherbutton events */ litest_event(dev, EV_KEY, BTN_LEFT, 1); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_timeout_debounce(); - libinput_dispatch(li); + litest_dispatch(li); litest_event(dev, EV_KEY, BTN_LEFT, 0); litest_event(dev, EV_SYN, SYN_REPORT, 0); @@ -3536,7 +3536,7 @@ START_TEST(debounce_spurious_dont_enable_on_otherbutton) litest_event(dev, EV_KEY, BTN_RIGHT, 0); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_button_event(li, BTN_LEFT, @@ -3563,13 +3563,13 @@ START_TEST(debounce_spurious_dont_enable_on_otherbutton) /* Expect release to be immediate */ litest_event(dev, EV_KEY, BTN_LEFT, 1); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_timeout_debounce(); - libinput_dispatch(li); + litest_dispatch(li); litest_event(dev, EV_KEY, BTN_LEFT, 0); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_button_event(li, BTN_LEFT, LIBINPUT_BUTTON_STATE_PRESSED); @@ -3596,9 +3596,9 @@ START_TEST(debounce_spurious_cancel_debounce_otherbutton) litest_event(dev, EV_KEY, BTN_LEFT, 1); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_timeout_debounce(); - libinput_dispatch(li); + litest_dispatch(li); /* spurious debouncing is on but the release should get flushed by * the other button */ @@ -3613,7 +3613,7 @@ START_TEST(debounce_spurious_cancel_debounce_otherbutton) litest_event(dev, EV_KEY, BTN_RIGHT, 0); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_button_event(li, BTN_LEFT, @@ -3653,9 +3653,9 @@ START_TEST(debounce_spurious_switch_to_otherbutton) litest_event(dev, EV_KEY, BTN_LEFT, 1); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_timeout_debounce(); - libinput_dispatch(li); + litest_dispatch(li); litest_event(dev, EV_KEY, BTN_LEFT, 0); litest_event(dev, EV_SYN, SYN_REPORT, 0); @@ -3672,7 +3672,7 @@ START_TEST(debounce_spurious_switch_to_otherbutton) litest_event(dev, EV_KEY, BTN_RIGHT, 0); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_button_event(li, BTN_LEFT, @@ -3706,14 +3706,14 @@ START_TEST(debounce_remove_device_button_up) litest_event(dev, EV_SYN, SYN_REPORT, 0); litest_event(dev, EV_KEY, BTN_LEFT, 0); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); /* delete the device while the timer is still active */ litest_delete_device(dev); - libinput_dispatch(li); + litest_dispatch(li); litest_timeout_debounce(); - libinput_dispatch(li); + litest_dispatch(li); litest_destroy_context(li); } @@ -3731,14 +3731,14 @@ START_TEST(debounce_remove_device_button_down) litest_event(dev, EV_KEY, BTN_LEFT, 1); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); /* delete the device the timer is still active */ litest_delete_device(dev); - libinput_dispatch(li); + litest_dispatch(li); litest_timeout_debounce(); - libinput_dispatch(li); + litest_dispatch(li); litest_destroy_context(li); } diff --git a/test/test-switch.c b/test/test-switch.c index 3e832e1f..15dbee7b 100644 --- a/test/test-switch.c +++ b/test/test-switch.c @@ -116,7 +116,7 @@ START_TEST(switch_toggle) litest_grab_device(dev); litest_switch_action(dev, sw, LIBINPUT_SWITCH_STATE_ON); - libinput_dispatch(li); + litest_dispatch(li); if (libinput_device_switch_has_switch(dev->libinput_device, sw) > 0) { event = libinput_get_event(li); @@ -127,7 +127,7 @@ START_TEST(switch_toggle) } litest_switch_action(dev, sw, LIBINPUT_SWITCH_STATE_OFF); - libinput_dispatch(li); + litest_dispatch(li); if (libinput_device_switch_has_switch(dev->libinput_device, sw) > 0) { event = libinput_get_event(li); @@ -154,7 +154,7 @@ START_TEST(switch_toggle_double) litest_grab_device(dev); litest_switch_action(dev, sw, LIBINPUT_SWITCH_STATE_ON); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); litest_is_switch_event(event, sw, LIBINPUT_SWITCH_STATE_ON); @@ -163,7 +163,7 @@ START_TEST(switch_toggle_double) /* This will be filtered by the kernel, so this test is a bit * useless */ litest_switch_action(dev, sw, LIBINPUT_SWITCH_STATE_ON); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_empty_queue(li); litest_ungrab_device(dev); @@ -207,7 +207,7 @@ START_TEST(switch_down_on_init) li = litest_create_context(); libinput_path_add_device(li, libevdev_uinput_get_devnode(dev->uinput)); - libinput_dispatch(li); + litest_dispatch(li); litest_wait_for_event_of_type(li, LIBINPUT_EVENT_SWITCH_TOGGLE); event = libinput_get_event(li); @@ -221,7 +221,7 @@ START_TEST(switch_down_on_init) } litest_switch_action(dev, sw, LIBINPUT_SWITCH_STATE_OFF); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); litest_is_switch_event(event, sw, LIBINPUT_SWITCH_STATE_OFF); libinput_event_destroy(event); @@ -252,7 +252,7 @@ START_TEST(switch_not_down_on_init) li = litest_create_context(); libinput_path_add_device(li, libevdev_uinput_get_devnode(dev->uinput)); - libinput_dispatch(li); + litest_dispatch(li); while ((event = libinput_get_event(li)) != NULL) { ck_assert_int_ne(libinput_event_get_type(event), @@ -367,18 +367,18 @@ START_TEST(switch_disable_touchpad_edge_scroll) litest_ungrab_device(sw); litest_touch_down(touchpad, 0, 99, 20); - libinput_dispatch(li); + litest_dispatch(li); litest_timeout_edgescroll(); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_empty_queue(li); litest_touch_move_to(touchpad, 0, 99, 20, 99, 80, 60); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_empty_queue(li); litest_touch_move_to(touchpad, 0, 99, 80, 99, 20, 60); litest_touch_up(touchpad, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_empty_queue(li); litest_delete_device(touchpad); @@ -402,16 +402,16 @@ START_TEST(switch_disable_touchpad_edge_scroll_interrupt) litest_drain_events(li); litest_touch_down(touchpad, 0, 99, 20); - libinput_dispatch(li); + litest_dispatch(li); litest_timeout_edgescroll(); litest_touch_move_to(touchpad, 0, 99, 20, 99, 30, 10); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_only_axis_events(li, LIBINPUT_EVENT_POINTER_SCROLL_FINGER); litest_grab_device(sw); litest_switch_action(sw, which, LIBINPUT_SWITCH_STATE_ON); litest_ungrab_device(sw); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_axis_end_sequence(li, LIBINPUT_EVENT_POINTER_SCROLL_FINGER, @@ -573,7 +573,7 @@ START_TEST(lid_open_on_key) litest_event(keyboard, EV_SYN, SYN_REPORT, 0); litest_event(keyboard, EV_KEY, KEY_A, 0); litest_event(keyboard, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); litest_is_switch_event(event, @@ -625,7 +625,7 @@ START_TEST(lid_open_on_key_touchpad_enabled) litest_touch_down(touchpad, 0, 50, 50); litest_touch_move_to(touchpad, 0, 50, 50, 70, 70, 10); litest_touch_up(touchpad, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_only_typed_events(li, LIBINPUT_EVENT_POINTER_MOTION); @@ -654,10 +654,10 @@ START_TEST(switch_suspend_with_keyboard) abort(); } - libinput_dispatch(li); + litest_dispatch(li); keyboard = litest_add_device(li, LITEST_KEYBOARD); - libinput_dispatch(li); + litest_dispatch(li); litest_grab_device(sw); litest_switch_action(sw, which, LIBINPUT_SWITCH_STATE_ON); @@ -670,7 +670,7 @@ START_TEST(switch_suspend_with_keyboard) litest_drain_events(li); litest_delete_device(sw); - libinput_dispatch(li); + litest_dispatch(li); litest_destroy_context(li); } @@ -854,10 +854,10 @@ START_TEST(lid_update_hw_on_key_multiple_keyboards) keyboard1 = litest_add_device(li, LITEST_KEYBOARD_BLADE_STEALTH_VIDEOSWITCH); - libinput_dispatch(li); + litest_dispatch(li); keyboard2 = litest_add_device(li, LITEST_KEYBOARD_BLADE_STEALTH); - libinput_dispatch(li); + litest_dispatch(li); litest_grab_device(sw); litest_switch_action(sw, @@ -909,7 +909,7 @@ START_TEST(lid_key_press) litest_keyboard_key(sw, KEY_VOLUMEUP, true); litest_keyboard_key(sw, KEY_VOLUMEUP, false); - libinput_dispatch(li); + litest_dispatch(li); /* Check that we're routing key events from a lid device too */ litest_assert_only_typed_events(li, LIBINPUT_EVENT_KEYBOARD_KEY); @@ -979,7 +979,7 @@ START_TEST(tablet_mode_disable_touchpad_on_resume) LIBINPUT_SWITCH_STATE_ON); litest_drain_events(li); libinput_resume(li); - libinput_dispatch(li); + litest_dispatch(li); while ((event = libinput_get_event(li))) { enum libinput_event_type type; @@ -1010,7 +1010,7 @@ START_TEST(tablet_mode_disable_touchpad_on_resume) litest_switch_action(sw, LIBINPUT_SWITCH_TABLET_MODE, LIBINPUT_SWITCH_STATE_OFF); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); litest_is_switch_event(event, LIBINPUT_SWITCH_TABLET_MODE, @@ -1051,7 +1051,7 @@ START_TEST(tablet_mode_enable_touchpad_on_resume) LIBINPUT_SWITCH_STATE_OFF); libinput_resume(li); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_only_typed_events(li, LIBINPUT_EVENT_DEVICE_ADDED); @@ -1066,7 +1066,7 @@ START_TEST(tablet_mode_enable_touchpad_on_resume) litest_switch_action(sw, LIBINPUT_SWITCH_TABLET_MODE, LIBINPUT_SWITCH_STATE_ON); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); litest_is_switch_event(event, LIBINPUT_SWITCH_TABLET_MODE, @@ -1097,7 +1097,7 @@ START_TEST(tablet_mode_disable_keyboard) litest_keyboard_key(keyboard, KEY_A, true); litest_keyboard_key(keyboard, KEY_A, false); litest_keyboard_key(keyboard, KEY_B, true); /* KEY_B down but not up */ - libinput_dispatch(li); + litest_dispatch(li); litest_assert_key_event(li, KEY_A, LIBINPUT_KEY_STATE_PRESSED); litest_assert_key_event(li, KEY_A, LIBINPUT_KEY_STATE_RELEASED); @@ -1196,7 +1196,7 @@ START_TEST(tablet_mode_disable_keyboard_on_resume) litest_drain_events(li); libinput_resume(li); - libinput_dispatch(li); + litest_dispatch(li); while ((event = libinput_get_event(li))) { enum libinput_event_type type; @@ -1262,7 +1262,7 @@ START_TEST(tablet_mode_enable_keyboard_on_resume) LIBINPUT_SWITCH_STATE_OFF); libinput_resume(li); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_only_typed_events(li, LIBINPUT_EVENT_DEVICE_ADDED); litest_keyboard_key(keyboard, KEY_A, true); @@ -1381,10 +1381,10 @@ START_TEST(dock_toggle) litest_grab_device(sw); litest_event(sw, EV_SW, SW_DOCK, 1); - libinput_dispatch(li); + litest_dispatch(li); litest_event(sw, EV_SW, SW_DOCK, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_ungrab_device(sw); litest_assert_empty_queue(li); diff --git a/test/test-tablet.c b/test/test-tablet.c index fe2d9acb..5712dfe3 100644 --- a/test/test-tablet.c +++ b/test/test-tablet.c @@ -76,7 +76,7 @@ START_TEST(button_down_up) litest_drain_events(li); litest_button_click(dev, button, true); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); tev = litest_is_tablet_event(event, LIBINPUT_EVENT_TABLET_TOOL_BUTTON); @@ -88,7 +88,7 @@ START_TEST(button_down_up) litest_assert_empty_queue(li); litest_button_click(dev, button, false); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); tev = litest_is_tablet_event(event, LIBINPUT_EVENT_TABLET_TOOL_BUTTON); @@ -132,7 +132,7 @@ START_TEST(button_seat_count) litest_button_click(dev, button, true); litest_button_click(dev2, button, true); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); tev = litest_is_tablet_event(event, LIBINPUT_EVENT_TABLET_TOOL_BUTTON); @@ -154,7 +154,7 @@ START_TEST(button_seat_count) litest_button_click(dev2, button, false); litest_button_click(dev, button, false); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); tev = litest_is_tablet_event(event, LIBINPUT_EVENT_TABLET_TOOL_BUTTON); @@ -194,12 +194,12 @@ START_TEST(button_up_on_delete) libevdev_enable_event_code(evdev, EV_KEY, code, NULL); litest_event(dev, EV_KEY, code, 1); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); } litest_drain_events(li); litest_delete_device(dev); - libinput_dispatch(li); + litest_dispatch(li); for (code = BTN_LEFT; code <= BTN_TASK; code++) { if (!libevdev_has_event_code(evdev, EV_KEY, code)) @@ -236,7 +236,7 @@ START_TEST(tip_down_up) litest_axis_set_value(axes, ABS_PRESSURE, 30); litest_tablet_tip_down(dev, 10, 10, axes); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); tablet_event = litest_is_tablet_event(event, @@ -250,7 +250,7 @@ START_TEST(tip_down_up) litest_axis_set_value(axes, ABS_PRESSURE, 0); litest_tablet_tip_up(dev, 10, 10, axes); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); tablet_event = litest_is_tablet_event(event, LIBINPUT_EVENT_TABLET_TOOL_TIP); @@ -288,7 +288,7 @@ START_TEST(tip_down_up_eraser) litest_axis_set_value(axes, ABS_PRESSURE, 30); litest_tablet_tip_down(dev, 10, 10, axes); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); tablet_event = litest_is_tablet_event(event, @@ -304,7 +304,7 @@ START_TEST(tip_down_up_eraser) litest_axis_set_value(axes, ABS_PRESSURE, 0); litest_tablet_tip_up(dev, 10, 10, axes); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); tablet_event = litest_is_tablet_event(event, LIBINPUT_EVENT_TABLET_TOOL_TIP); @@ -338,7 +338,7 @@ START_TEST(tip_down_prox_in) litest_tablet_tip_down(dev, 10, 10, axes); litest_pop_event_frame(dev); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); tablet_event = litest_is_tablet_event(event, LIBINPUT_EVENT_TABLET_TOOL_PROXIMITY); @@ -381,7 +381,7 @@ START_TEST(tip_up_prox_out) litest_tablet_proximity_out(dev); litest_pop_event_frame(dev); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); tablet_event = litest_is_tablet_event(event, LIBINPUT_EVENT_TABLET_TOOL_TIP); @@ -390,7 +390,7 @@ START_TEST(tip_up_prox_out) libinput_event_destroy(event); litest_timeout_tablet_proxout(); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); tablet_event = litest_is_tablet_event(event, LIBINPUT_EVENT_TABLET_TOOL_PROXIMITY); @@ -426,7 +426,7 @@ START_TEST(tip_up_btn_change) litest_event(dev, EV_KEY, BTN_STYLUS, 1); litest_pop_event_frame(dev); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); tablet_event = litest_is_tablet_event(event, @@ -459,7 +459,7 @@ START_TEST(tip_up_btn_change) litest_event(dev, EV_KEY, BTN_STYLUS, 0); litest_pop_event_frame(dev); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); tablet_event = litest_is_tablet_event(event, @@ -503,7 +503,7 @@ START_TEST(tip_down_btn_change) litest_event(dev, EV_KEY, BTN_STYLUS, 1); litest_pop_event_frame(dev); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); tablet_event = litest_is_tablet_event(event, @@ -512,7 +512,7 @@ START_TEST(tip_down_btn_change) LIBINPUT_TABLET_TOOL_TIP_DOWN); libinput_event_destroy(event); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); tablet_event = litest_is_tablet_event(event, LIBINPUT_EVENT_TABLET_TOOL_BUTTON); @@ -537,7 +537,7 @@ START_TEST(tip_down_btn_change) litest_event(dev, EV_KEY, BTN_STYLUS, 0); litest_pop_event_frame(dev); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); tablet_event = litest_is_tablet_event(event, @@ -546,7 +546,7 @@ START_TEST(tip_down_btn_change) LIBINPUT_TABLET_TOOL_TIP_DOWN); libinput_event_destroy(event); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); tablet_event = litest_is_tablet_event(event, LIBINPUT_EVENT_TABLET_TOOL_BUTTON); @@ -576,7 +576,7 @@ START_TEST(tip_down_motion) litest_drain_events(li); litest_tablet_proximity_in(dev, 10, 10, axes); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); tablet_event = litest_is_tablet_event(event, LIBINPUT_EVENT_TABLET_TOOL_PROXIMITY); @@ -589,7 +589,7 @@ START_TEST(tip_down_motion) litest_axis_set_value(axes, ABS_PRESSURE, 20); litest_tablet_tip_down(dev, 70, 70, axes); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); tablet_event = litest_is_tablet_event(event, LIBINPUT_EVENT_TABLET_TOOL_TIP); @@ -626,7 +626,7 @@ START_TEST(tip_up_motion) litest_axis_set_value(axes, ABS_PRESSURE, 20); litest_tablet_tip_down(dev, 70, 70, axes); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); tablet_event = litest_is_tablet_event(event, LIBINPUT_EVENT_TABLET_TOOL_TIP); @@ -638,7 +638,7 @@ START_TEST(tip_up_motion) litest_axis_set_value(axes, ABS_PRESSURE, 0); litest_tablet_tip_up(dev, 40, 40, axes); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); tablet_event = litest_is_tablet_event(event, LIBINPUT_EVENT_TABLET_TOOL_TIP); @@ -705,7 +705,7 @@ START_TEST(tip_up_motion_one_axis) litest_drain_events(li); litest_tablet_motion(dev, 20, 20, axes); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); tablet_event = litest_is_tablet_event(event, LIBINPUT_EVENT_TABLET_TOOL_AXIS); @@ -724,7 +724,7 @@ START_TEST(tip_up_motion_one_axis) break; } - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); tablet_event = litest_is_tablet_event(event, LIBINPUT_EVENT_TABLET_TOOL_TIP); @@ -769,7 +769,7 @@ START_TEST(tip_state_proximity) litest_drain_events(li); litest_tablet_proximity_in(dev, 10, 10, axes); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); tablet_event = litest_is_tablet_event(event, @@ -789,10 +789,10 @@ START_TEST(tip_state_proximity) litest_drain_events(li); litest_tablet_proximity_out(dev); - libinput_dispatch(li); + litest_dispatch(li); litest_timeout_tablet_proxout(); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); tablet_event = litest_is_tablet_event(event, @@ -819,7 +819,7 @@ START_TEST(tip_state_axis) litest_drain_events(li); litest_tablet_motion(dev, 70, 70, axes); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); tablet_event = litest_is_tablet_event(event, @@ -834,7 +834,7 @@ START_TEST(tip_state_axis) litest_drain_events(li); litest_tablet_motion(dev, 30, 30, axes); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); tablet_event = litest_is_tablet_event(event, @@ -849,7 +849,7 @@ START_TEST(tip_state_axis) litest_drain_events(li); litest_tablet_motion(dev, 40, 80, axes); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); tablet_event = litest_is_tablet_event(event, @@ -879,7 +879,7 @@ START_TEST(tip_state_button) litest_drain_events(li); litest_button_click(dev, button, true); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); tablet_event = litest_is_tablet_event(event, @@ -894,7 +894,7 @@ START_TEST(tip_state_button) litest_drain_events(li); litest_button_click(dev, button, false); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); tablet_event = litest_is_tablet_event(event, @@ -909,7 +909,7 @@ START_TEST(tip_state_button) litest_drain_events(li); litest_button_click(dev, button, true); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); tablet_event = litest_is_tablet_event(event, @@ -919,7 +919,7 @@ START_TEST(tip_state_button) libinput_event_destroy(event); litest_button_click(dev, button, false); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); tablet_event = litest_is_tablet_event(event, @@ -953,7 +953,7 @@ START_TEST(tip_up_on_delete) litest_drain_events(li); litest_delete_device(dev); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); tablet_event = litest_is_tablet_event(event, @@ -994,7 +994,7 @@ START_TEST(proximity_in_out) } litest_tablet_proximity_in(dev, 10, 10, axes); - libinput_dispatch(li); + litest_dispatch(li); while ((event = libinput_get_event(li))) { if (libinput_event_get_type(event) == @@ -1012,10 +1012,10 @@ START_TEST(proximity_in_out) ck_assert(have_tool_update); litest_tablet_proximity_out(dev); - libinput_dispatch(li); + litest_dispatch(li); litest_timeout_tablet_proxout(); - libinput_dispatch(li); + litest_dispatch(li); while ((event = libinput_get_event(li))) { if (libinput_event_get_type(event) == @@ -1054,7 +1054,7 @@ START_TEST(proximity_in_button_down) litest_tablet_proximity_in(dev, 10, 10, axes); litest_event(dev, EV_KEY, button, 1); litest_pop_event_frame(dev); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_tablet_proximity_event(li, LIBINPUT_TABLET_TOOL_PROXIMITY_STATE_IN); @@ -1086,10 +1086,10 @@ START_TEST(proximity_out_button_up) litest_tablet_proximity_out(dev); litest_event(dev, EV_KEY, button, 0); litest_pop_event_frame(dev); - libinput_dispatch(li); + litest_dispatch(li); litest_timeout_tablet_proxout(); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_tablet_button_event(li, button, @@ -1135,7 +1135,7 @@ START_TEST(proximity_out_clear_buttons) litest_event(dev, EV_KEY, *button, 1); litest_event(dev, EV_SYN, SYN_REPORT, 0); litest_tablet_proximity_out(dev); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); ck_assert_notnull(event); @@ -1197,7 +1197,7 @@ START_TEST(proximity_has_axes) litest_drain_events(li); litest_tablet_proximity_in(dev, 10, 10, axes); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); tablet_event = litest_is_tablet_event(event, @@ -1250,7 +1250,7 @@ START_TEST(proximity_has_axes) litest_drain_events(li); litest_tablet_motion(dev, 20, 30, axes); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); tablet_event = litest_is_tablet_event(event, LIBINPUT_EVENT_TABLET_TOOL_AXIS); @@ -1268,10 +1268,10 @@ START_TEST(proximity_has_axes) /* Make sure that the axes are still present on proximity out */ litest_tablet_proximity_out(dev); - libinput_dispatch(li); + litest_dispatch(li); litest_timeout_tablet_proxout(); - libinput_dispatch(li); + litest_dispatch(li); litest_drain_events_of_type(li, LIBINPUT_EVENT_TABLET_TOOL_TIP); @@ -1338,14 +1338,14 @@ START_TEST(proximity_range_enter) litest_axis_set_value(axes, ABS_DISTANCE, 20); litest_tablet_motion(dev, 10, 10, axes); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_tablet_proximity_event(li, LIBINPUT_TABLET_TOOL_PROXIMITY_STATE_IN); litest_axis_set_value(axes, ABS_DISTANCE, 90); litest_tablet_motion(dev, 10, 10, axes); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_tablet_proximity_event(li, LIBINPUT_TABLET_TOOL_PROXIMITY_STATE_OUT); @@ -1376,13 +1376,13 @@ START_TEST(proximity_range_in_out) litest_event(dev, EV_KEY, BTN_TOOL_MOUSE, 1); litest_unfilter_event(dev, EV_KEY, BTN_TOOL_PEN); litest_pop_event_frame(dev); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_tablet_proximity_event(li, LIBINPUT_TABLET_TOOL_PROXIMITY_STATE_IN); litest_axis_set_value(axes, ABS_DISTANCE, 90); litest_tablet_motion(dev, 10, 10, axes); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_tablet_proximity_event(li, LIBINPUT_TABLET_TOOL_PROXIMITY_STATE_OUT); @@ -1391,7 +1391,7 @@ START_TEST(proximity_range_in_out) litest_axis_set_value(axes, ABS_DISTANCE, 20); litest_tablet_motion(dev, 10, 10, axes); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_tablet_proximity_event(li, LIBINPUT_TABLET_TOOL_PROXIMITY_STATE_IN); @@ -1428,10 +1428,10 @@ START_TEST(proximity_range_button_click) litest_event(dev, EV_KEY, BTN_STYLUS, 1); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_event(dev, EV_KEY, BTN_STYLUS, 0); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_push_event_frame(dev); litest_filter_event(dev, EV_KEY, BTN_TOOL_PEN); @@ -1462,7 +1462,7 @@ START_TEST(proximity_range_button_press) litest_event(dev, EV_KEY, BTN_STYLUS, 1); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_tablet_button_event(li, BTN_STYLUS, @@ -1470,7 +1470,7 @@ START_TEST(proximity_range_button_press) litest_axis_set_value(axes, ABS_DISTANCE, 90); litest_tablet_motion(dev, 15, 15, axes); - libinput_dispatch(li); + litest_dispatch(li); /* expect fake button release */ litest_assert_tablet_button_event(li, @@ -1481,7 +1481,7 @@ START_TEST(proximity_range_button_press) litest_event(dev, EV_KEY, BTN_STYLUS, 0); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_push_event_frame(dev); litest_filter_event(dev, EV_KEY, BTN_TOOL_PEN); @@ -1516,7 +1516,7 @@ START_TEST(proximity_range_button_release) litest_axis_set_value(axes, ABS_DISTANCE, 20); litest_tablet_motion(dev, 15, 15, axes); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_tablet_proximity_event(li, LIBINPUT_TABLET_TOOL_PROXIMITY_STATE_IN); @@ -1528,7 +1528,7 @@ START_TEST(proximity_range_button_release) litest_event(dev, EV_KEY, BTN_STYLUS, 0); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_tablet_button_event(li, BTN_STYLUS, LIBINPUT_BUTTON_STATE_RELEASED); @@ -1558,7 +1558,7 @@ START_TEST(proximity_out_slow_event) litest_drain_events(li); litest_timeout_tablet_proxout(); - libinput_dispatch(li); + litest_dispatch(li); /* The forced prox out */ litest_assert_tablet_proximity_event(li, @@ -1585,7 +1585,7 @@ START_TEST(proximity_out_not_during_contact) litest_drain_events(li); litest_timeout_tablet_proxout(); - libinput_dispatch(li); + litest_dispatch(li); /* No forced proxout yet */ litest_assert_empty_queue(li); @@ -1595,7 +1595,7 @@ START_TEST(proximity_out_not_during_contact) litest_drain_events(li); litest_timeout_tablet_proxout(); - libinput_dispatch(li); + litest_dispatch(li); /* The forced prox out */ litest_assert_tablet_proximity_event(li, @@ -1622,24 +1622,24 @@ START_TEST(proximity_out_not_during_buttonpress) litest_event(dev, EV_KEY, BTN_STYLUS, 1); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_only_typed_events(li, LIBINPUT_EVENT_TABLET_TOOL_BUTTON); litest_timeout_tablet_proxout(); - libinput_dispatch(li); + litest_dispatch(li); /* No forced proxout yet */ litest_assert_empty_queue(li); litest_event(dev, EV_KEY, BTN_STYLUS, 0); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_only_typed_events(li, LIBINPUT_EVENT_TABLET_TOOL_BUTTON); litest_timeout_tablet_proxout(); - libinput_dispatch(li); + litest_dispatch(li); /* The forced prox out */ litest_assert_tablet_proximity_event(li, @@ -1671,13 +1671,13 @@ START_TEST(proximity_out_disables_forced) litest_drain_events(li); litest_timeout_tablet_proxout(); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_empty_queue(li); litest_tablet_proximity_out(dev); litest_assert_tablet_proximity_event(li, LIBINPUT_TABLET_TOOL_PROXIMITY_STATE_OUT); - libinput_dispatch(li); + litest_dispatch(li); } END_TEST @@ -1698,7 +1698,7 @@ START_TEST(proximity_out_disables_forced_after_forced) /* timeout-based forced prox out */ litest_timeout_tablet_proxout(); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_tablet_proximity_event(li, LIBINPUT_TABLET_TOOL_PROXIMITY_STATE_OUT); litest_assert_empty_queue(li); @@ -1706,7 +1706,7 @@ START_TEST(proximity_out_disables_forced_after_forced) /* now send the real prox out (we're already in proximity out) and * that should disable the proxout quirk */ litest_tablet_proximity_out(dev); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_empty_queue(li); /* same again, but this time we expect no timeout-based prox out */ @@ -1714,13 +1714,13 @@ START_TEST(proximity_out_disables_forced_after_forced) litest_drain_events(li); litest_timeout_tablet_proxout(); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_empty_queue(li); litest_tablet_proximity_out(dev); litest_assert_tablet_proximity_event(li, LIBINPUT_TABLET_TOOL_PROXIMITY_STATE_OUT); - libinput_dispatch(li); + litest_dispatch(li); } END_TEST @@ -1733,7 +1733,7 @@ START_TEST(proximity_out_on_delete) litest_drain_events(li); litest_delete_device(dev); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_tablet_proximity_event(li, LIBINPUT_TABLET_TOOL_PROXIMITY_STATE_OUT); @@ -1761,7 +1761,7 @@ START_TEST(motion) litest_drain_events(li); litest_tablet_proximity_in(dev, 5, 100, axes); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); tablet_event = litest_is_tablet_event(event, @@ -1788,7 +1788,7 @@ START_TEST(motion) double reported_x, reported_y; litest_tablet_motion(dev, test_x, test_y, axes); - libinput_dispatch(li); + litest_dispatch(li); while ((event = libinput_get_event(li))) { tablet_event = libinput_event_get_tablet_tool_event(event); @@ -1853,7 +1853,7 @@ START_TEST(left_handed) * proximity events so that it updates it's internal tablet state, and * then try setting it to left-handed mode. */ litest_tablet_proximity_in(dev, 0, 100, axes); - libinput_dispatch(li); + litest_dispatch(li); libinput_device_config_left_handed_set(dev->libinput_device, 1); event = libinput_get_event(li); @@ -1879,7 +1879,7 @@ START_TEST(left_handed) litest_axis_set_value(axes, ABS_DISTANCE, 5); litest_tablet_motion(dev, 100, 0, axes); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); tablet_event = litest_is_tablet_event(event, @@ -1904,7 +1904,7 @@ START_TEST(left_handed) * mode, so the axes should be inverted once we bring it back into * proximity */ litest_tablet_proximity_in(dev, 0, 100, axes); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); tablet_event = litest_is_tablet_event(event, @@ -1929,7 +1929,7 @@ START_TEST(left_handed) litest_axis_set_value(axes, ABS_DISTANCE, 5); litest_tablet_motion(dev, 100, 0, axes); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); tablet_event = litest_is_tablet_event(event, @@ -1985,7 +1985,7 @@ START_TEST(left_handed_tilt) litest_drain_events(li); litest_tablet_proximity_in(dev, 10, 10, axes); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); tev = litest_is_tablet_event(event, LIBINPUT_EVENT_TABLET_TOOL_PROXIMITY); @@ -2026,7 +2026,7 @@ rotate_event(struct litest_device *dev, int angle_degrees) litest_event(dev, EV_ABS, ABS_TILT_X, x); litest_event(dev, EV_ABS, ABS_TILT_Y, y); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); tev = litest_is_tablet_event(event, @@ -2132,7 +2132,7 @@ START_TEST(left_handed_artpen_rotation) litest_event(dev, EV_ABS, ABS_Z, a); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); tev = litest_is_tablet_event(event, LIBINPUT_EVENT_TABLET_TOOL_AXIS); @@ -2173,7 +2173,7 @@ START_TEST(motion_event_state) for (test_x = 0, test_y = 100; test_x < 100; test_x += 10, test_y -= 10) litest_tablet_motion(dev, test_x, test_y, axes); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); tablet_event = litest_is_tablet_event(event, LIBINPUT_EVENT_TABLET_TOOL_AXIS); @@ -2188,7 +2188,7 @@ START_TEST(motion_event_state) litest_tablet_motion(dev, test_x, test_y, axes); libinput_event_destroy(event); - libinput_dispatch(li); + litest_dispatch(li); ck_assert_int_eq(libinput_next_event_type(li), LIBINPUT_EVENT_TABLET_TOOL_AXIS); @@ -2243,7 +2243,7 @@ START_TEST(motion_outside_bounds) litest_event(dev, EV_ABS, ABS_X, 0 + 5 * i); litest_event(dev, EV_ABS, ABS_Y, 1000); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); } litest_drain_events(li); @@ -2251,7 +2251,7 @@ START_TEST(motion_outside_bounds) litest_event(dev, EV_ABS, ABS_X, 0); litest_event(dev, EV_ABS, ABS_Y, 1000); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); tablet_event = litest_is_tablet_event(event, @@ -2271,7 +2271,7 @@ START_TEST(motion_outside_bounds) litest_event(dev, EV_ABS, ABS_X, 1000); litest_event(dev, EV_ABS, ABS_Y, 0 + 5 * i); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); } litest_drain_events(li); @@ -2279,7 +2279,7 @@ START_TEST(motion_outside_bounds) litest_event(dev, EV_ABS, ABS_X, 1000); litest_event(dev, EV_ABS, ABS_Y, 0); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); tablet_event = litest_is_tablet_event(event, @@ -2335,7 +2335,7 @@ START_TEST(tool_unique) litest_event(dev, EV_MSC, MSC_SERIAL, 1000); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); tablet_event = litest_is_tablet_event(event, LIBINPUT_EVENT_TABLET_TOOL_PROXIMITY); @@ -2358,7 +2358,7 @@ START_TEST(tool_serial) litest_event(dev, EV_KEY, BTN_TOOL_PEN, 1); litest_event(dev, EV_MSC, MSC_SERIAL, 1000); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); tablet_event = litest_is_tablet_event(event, @@ -2381,7 +2381,7 @@ START_TEST(tool_id) litest_drain_events(li); litest_tablet_proximity_in(dev, 10, 10, NULL); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); tablet_event = litest_is_tablet_event(event, @@ -2430,7 +2430,7 @@ START_TEST(serial_changes_tool) litest_event(dev, EV_KEY, BTN_TOOL_PEN, 1); litest_event(dev, EV_MSC, MSC_SERIAL, 2000); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); tablet_event = litest_is_tablet_event(event, @@ -2463,7 +2463,7 @@ START_TEST(invalid_serials) litest_event(dev, EV_MSC, MSC_SERIAL, -1); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); while ((event = libinput_get_event(li))) { if (libinput_event_get_type(event) == LIBINPUT_EVENT_TABLET_TOOL_PROXIMITY) { @@ -2491,7 +2491,7 @@ START_TEST(tool_ref) litest_event(dev, EV_KEY, BTN_TOOL_PEN, 1); litest_event(dev, EV_MSC, MSC_SERIAL, 1000); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); tablet_event = litest_is_tablet_event(event, @@ -2521,7 +2521,7 @@ START_TEST(tool_user_data) litest_event(dev, EV_KEY, BTN_TOOL_PEN, 1); litest_event(dev, EV_MSC, MSC_SERIAL, 1000); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); tablet_event = litest_is_tablet_event(event, @@ -2557,7 +2557,7 @@ START_TEST(pad_buttons_ignored) litest_event(dev, EV_SYN, SYN_REPORT, 0); litest_event(dev, EV_KEY, button, 0); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); } litest_assert_empty_queue(li); @@ -2570,13 +2570,13 @@ START_TEST(pad_buttons_ignored) litest_event(dev, EV_KEY, button, 1); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); for (button = BTN_0; button < BTN_MOUSE; button++) litest_event(dev, EV_KEY, button, 0); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_empty_queue(li); } @@ -2605,7 +2605,7 @@ START_TEST(tools_with_serials) litest_event(dev[i], EV_MSC, MSC_SERIAL, 100); litest_pop_event_frame(dev[i]); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); tev = litest_is_tablet_event(event, LIBINPUT_EVENT_TABLET_TOOL_PROXIMITY); tool[i] = libinput_event_tablet_tool_get_tool(tev); @@ -2649,7 +2649,7 @@ START_TEST(tools_without_serials) litest_tablet_proximity_in(dev[i], 10, 10, NULL); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); tev = litest_is_tablet_event(event, LIBINPUT_EVENT_TABLET_TOOL_PROXIMITY); tool[i] = libinput_event_tablet_tool_get_tool(tev); @@ -2683,7 +2683,7 @@ START_TEST(tool_delayed_serial) litest_event(dev, EV_MSC, MSC_SERIAL, 0); litest_event(dev, EV_KEY, BTN_TOOL_PEN, 1); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); tev = litest_is_tablet_event(event, @@ -2698,7 +2698,7 @@ START_TEST(tool_delayed_serial) litest_event(dev, EV_ABS, ABS_Y, 2000); litest_event(dev, EV_MSC, MSC_SERIAL, 0); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); } litest_drain_events(li); @@ -2707,7 +2707,7 @@ START_TEST(tool_delayed_serial) litest_event(dev, EV_ABS, ABS_Y, 2000); litest_event(dev, EV_MSC, MSC_SERIAL, 1234566); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); tev = litest_is_tablet_event(event, @@ -2722,7 +2722,7 @@ START_TEST(tool_delayed_serial) litest_event(dev, EV_ABS, ABS_Y, 2000); litest_event(dev, EV_MSC, MSC_SERIAL, 1234566); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); } event = libinput_get_event(li); @@ -2742,7 +2742,7 @@ START_TEST(tool_delayed_serial) litest_event(dev, EV_MSC, MSC_SERIAL, 0); litest_event(dev, EV_KEY, BTN_TOOL_PEN, 0); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); tev = litest_is_tablet_event(event, @@ -2782,7 +2782,7 @@ START_TEST(tool_capabilities) litest_event(bamboo, EV_KEY, BTN_TOOL_PEN, 1); litest_event(bamboo, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); t = litest_is_tablet_event(event, LIBINPUT_EVENT_TABLET_TOOL_PROXIMITY); @@ -2797,7 +2797,7 @@ START_TEST(tool_capabilities) litest_event(intuos, EV_KEY, BTN_TOOL_PEN, 1); litest_event(intuos, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); t = litest_is_tablet_event(event, LIBINPUT_EVENT_TABLET_TOOL_PROXIMITY); @@ -2869,7 +2869,7 @@ START_TEST(tool_type) litest_tablet_set_tool_type(dev, tt->code); litest_tablet_proximity_in(dev, x, y, axes); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); t = litest_is_tablet_event(event, @@ -2938,7 +2938,7 @@ START_TEST(tool_in_prox_before_start) litest_assert_empty_queue(li); litest_tablet_motion(dev, 10, 20, axes); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); tev = litest_is_tablet_event(event, LIBINPUT_EVENT_TABLET_TOOL_PROXIMITY); @@ -2949,7 +2949,7 @@ START_TEST(tool_in_prox_before_start) litest_drain_events_of_type(li, LIBINPUT_EVENT_TABLET_TOOL_TIP); litest_tablet_motion(dev, 30, 40, axes); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); tev = litest_is_tablet_event(event, LIBINPUT_EVENT_TABLET_TOOL_AXIS); @@ -2963,10 +2963,10 @@ START_TEST(tool_in_prox_before_start) litest_button_click(dev, BTN_STYLUS, false); litest_assert_only_typed_events(li, LIBINPUT_EVENT_TABLET_TOOL_BUTTON); litest_tablet_proximity_out(dev); - libinput_dispatch(li); + litest_dispatch(li); litest_timeout_tablet_proxout(); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); litest_is_tablet_event(event, LIBINPUT_EVENT_TABLET_TOOL_PROXIMITY); @@ -2995,7 +2995,7 @@ START_TEST(tool_direct_switch_skip_tool_update) litest_drain_events(li); litest_tablet_proximity_in(dev, 10, 10, axes); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); tev = litest_is_tablet_event(event, @@ -3006,7 +3006,7 @@ START_TEST(tool_direct_switch_skip_tool_update) litest_event(dev, EV_KEY, BTN_TOOL_RUBBER, 1); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); tev = litest_is_tablet_event(event, @@ -3028,7 +3028,7 @@ START_TEST(tool_direct_switch_skip_tool_update) libinput_event_destroy(event); litest_tablet_motion(dev, 20, 30, axes); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); tev = litest_is_tablet_event(event, @@ -3039,7 +3039,7 @@ START_TEST(tool_direct_switch_skip_tool_update) litest_event(dev, EV_KEY, BTN_TOOL_RUBBER, 0); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); tev = litest_is_tablet_event(event, @@ -3054,7 +3054,7 @@ START_TEST(tool_direct_switch_skip_tool_update) litest_event(dev, EV_KEY, BTN_TOOL_RUBBER, 1); litest_tablet_motion(dev, 30, 40, axes); litest_pop_event_frame(dev); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); tev = litest_is_tablet_event(event, @@ -3066,7 +3066,7 @@ START_TEST(tool_direct_switch_skip_tool_update) libinput_event_destroy(event); litest_tablet_motion(dev, 40, 30, axes); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); tev = litest_is_tablet_event(event, @@ -3079,9 +3079,9 @@ START_TEST(tool_direct_switch_skip_tool_update) litest_event(dev, EV_KEY, BTN_TOOL_RUBBER, 0); litest_tablet_proximity_out(dev); litest_pop_event_frame(dev); - libinput_dispatch(li); + litest_dispatch(li); litest_timeout_tablet_proxout(); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); tev = litest_is_tablet_event(event, @@ -3123,7 +3123,7 @@ START_TEST(tool_direct_switch_with_forced_proxout) /* pen prox in */ litest_tablet_proximity_in(dev, 10, 10, axes); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); litest_is_proximity_event(event, LIBINPUT_TABLET_TOOL_PROXIMITY_STATE_IN); @@ -3131,7 +3131,7 @@ START_TEST(tool_direct_switch_with_forced_proxout) /* pen motion */ litest_tablet_motion(dev, 20, 30, axes); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); litest_is_tablet_event(event, LIBINPUT_EVENT_TABLET_TOOL_AXIS); @@ -3139,11 +3139,11 @@ START_TEST(tool_direct_switch_with_forced_proxout) /* pen forced prox out */ litest_timeout_tablet_proxout(); - libinput_dispatch(li); + litest_dispatch(li); /* actual prox out for tablets that don't do forced prox out */ litest_tablet_proximity_out(dev); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); litest_is_proximity_event(event, @@ -3153,7 +3153,7 @@ START_TEST(tool_direct_switch_with_forced_proxout) /* eraser prox in without axes */ litest_event(dev, EV_KEY, BTN_TOOL_RUBBER, 1); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); litest_is_proximity_event(event, LIBINPUT_TABLET_TOOL_PROXIMITY_STATE_IN); @@ -3162,7 +3162,7 @@ START_TEST(tool_direct_switch_with_forced_proxout) /* eraser motion */ litest_tablet_motion(dev, 30, 40, axes); litest_tablet_motion(dev, 40, 50, axes); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); litest_is_tablet_event(event, LIBINPUT_EVENT_TABLET_TOOL_AXIS); @@ -3191,7 +3191,7 @@ START_TEST(stylus_buttons) litest_event(dev, EV_ABS, ABS_MISC, 0x200); /* 3-button stylus tool_id */ litest_event(dev, EV_MSC, MSC_SERIAL, 1000); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); tev = litest_is_tablet_event(event, @@ -3205,10 +3205,10 @@ START_TEST(stylus_buttons) ARRAY_FOR_EACH(stylus_buttons, code) { litest_event(dev, EV_KEY, *code, 1); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_event(dev, EV_KEY, *code, 0); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_tablet_button_event(li, *code, @@ -3235,7 +3235,7 @@ START_TEST(mouse_tool) litest_event(dev, EV_KEY, BTN_TOOL_MOUSE, 1); litest_event(dev, EV_MSC, MSC_SERIAL, 1000); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); tev = litest_is_tablet_event(event, @@ -3264,7 +3264,7 @@ START_TEST(mouse_buttons) litest_event(dev, EV_ABS, ABS_MISC, 0x806); /* 5-button mouse tool_id */ litest_event(dev, EV_MSC, MSC_SERIAL, 1000); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); tev = litest_is_tablet_event(event, @@ -3287,10 +3287,10 @@ START_TEST(mouse_buttons) litest_event(dev, EV_KEY, code, 1); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_event(dev, EV_KEY, code, 0); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_tablet_button_event(li, code, @@ -3368,7 +3368,7 @@ START_TEST(mouse_wheel) litest_event(dev, EV_ABS, ABS_MISC, 0x806); /* 5-button mouse tool_id */ litest_event(dev, EV_MSC, MSC_SERIAL, 1000); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); tev = litest_is_tablet_event(event, @@ -3384,7 +3384,7 @@ START_TEST(mouse_wheel) for (i = 0; i < 3; i++) { litest_event(dev, EV_REL, REL_WHEEL, -1); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); tev = litest_is_tablet_event(event, @@ -3409,7 +3409,7 @@ START_TEST(mouse_wheel) abs = libevdev_get_abs_info(dev->evdev, ABS_Y); litest_event(dev, EV_ABS, ABS_Y, absinfo_range(abs)/i); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); tev = litest_is_tablet_event(event, @@ -3449,7 +3449,7 @@ START_TEST(airbrush_tool) litest_event(dev, EV_KEY, BTN_TOOL_AIRBRUSH, 1); litest_event(dev, EV_MSC, MSC_SERIAL, 1000); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); tev = litest_is_tablet_event(event, @@ -3500,7 +3500,7 @@ START_TEST(airbrush_slider) double expected = absinfo_normalize_value(abs, v) * 2 - 1; litest_event(dev, EV_ABS, ABS_WHEEL, v); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); tev = litest_is_tablet_event(event, LIBINPUT_EVENT_TABLET_TOOL_AXIS); @@ -3535,7 +3535,7 @@ START_TEST(artpen_tool) litest_event(dev, EV_ABS, ABS_MISC, 0x804); /* Art Pen */ litest_event(dev, EV_MSC, MSC_SERIAL, 1000); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); tev = litest_is_tablet_event(event, LIBINPUT_EVENT_TABLET_TOOL_PROXIMITY); @@ -3586,7 +3586,7 @@ START_TEST(artpen_rotation) litest_event(dev, EV_ABS, ABS_Z, a); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); tev = litest_is_tablet_event(event, LIBINPUT_EVENT_TABLET_TOOL_AXIS); @@ -3619,7 +3619,7 @@ START_TEST(tablet_time_usec) litest_drain_events(li); litest_tablet_proximity_in(dev, 5, 100, axes); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); tev = litest_is_tablet_event(event, @@ -3651,7 +3651,7 @@ START_TEST(tablet_pressure_distance_exclusive) * the tip threshold */ litest_axis_set_value(axes, ABS_PRESSURE, 1.1); litest_tablet_motion(dev, 70, 70, axes); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); tev = litest_is_tablet_event(event, LIBINPUT_EVENT_TABLET_TOOL_AXIS); @@ -3666,7 +3666,7 @@ START_TEST(tablet_pressure_distance_exclusive) /* We have pressure and we're above the tip threshold now */ litest_axis_set_value(axes, ABS_PRESSURE, 5.5); litest_tablet_motion(dev, 70, 70, axes); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); tev = litest_is_tablet_event(event, LIBINPUT_EVENT_TABLET_TOOL_TIP); @@ -3753,7 +3753,7 @@ START_TEST(tablet_calibration_set_matrix_delta) litest_drain_events(li); litest_tablet_proximity_in(dev, 100, 100, axes); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); tablet_event = litest_is_tablet_event(event, LIBINPUT_EVENT_TABLET_TOOL_PROXIMITY); @@ -3766,7 +3766,7 @@ START_TEST(tablet_calibration_set_matrix_delta) libinput_event_destroy(event); litest_tablet_motion(dev, 80, 80, axes); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); tablet_event = litest_is_tablet_event(event, @@ -3783,7 +3783,7 @@ START_TEST(tablet_calibration_set_matrix_delta) ck_assert_int_eq(status, LIBINPUT_CONFIG_STATUS_SUCCESS); litest_tablet_proximity_in(dev, 100, 100, axes); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); tablet_event = litest_is_tablet_event(event, LIBINPUT_EVENT_TABLET_TOOL_PROXIMITY); @@ -3796,7 +3796,7 @@ START_TEST(tablet_calibration_set_matrix_delta) libinput_event_destroy(event); litest_tablet_motion(dev, 80, 80, axes); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); tablet_event = litest_is_tablet_event(event, @@ -3840,7 +3840,7 @@ START_TEST(tablet_calibration_set_matrix) ck_assert_int_eq(status, LIBINPUT_CONFIG_STATUS_SUCCESS); litest_tablet_proximity_in(dev, 100, 100, axes); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); tablet_event = litest_is_tablet_event(event, @@ -3855,7 +3855,7 @@ START_TEST(tablet_calibration_set_matrix) ck_assert_double_lt(y, 100.0); litest_tablet_proximity_out(dev); - libinput_dispatch(li); + litest_dispatch(li); litest_tablet_proximity_in(dev, 50, 50, axes); litest_tablet_proximity_out(dev); litest_drain_events(li); @@ -3867,7 +3867,7 @@ START_TEST(tablet_calibration_set_matrix) ck_assert_int_eq(status, LIBINPUT_CONFIG_STATUS_SUCCESS); litest_tablet_proximity_in(dev, 100, 100, axes); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); tablet_event = litest_is_tablet_event(event, @@ -3913,7 +3913,7 @@ START_TEST(tablet_pressure_offset_set) * us ~10% pressure */ for (int i = 0; i < 2; i++) { litest_tablet_proximity_in(dev, 5, 100, axes); - libinput_dispatch(li); + litest_dispatch(li); assert_pressure(li, LIBINPUT_EVENT_TABLET_TOOL_PROXIMITY, 0.20); assert_pressure(li, LIBINPUT_EVENT_TABLET_TOOL_TIP, 0.20); @@ -3935,7 +3935,7 @@ START_TEST(tablet_pressure_offset_set) * the litest motion helper here to avoid false positives caused by * BTN_TOUCH */ litest_tablet_motion(dev, 70, 70, axes); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); litest_is_tablet_event(event, LIBINPUT_EVENT_TABLET_TOOL_TIP); libinput_event_destroy(event); @@ -3944,7 +3944,7 @@ START_TEST(tablet_pressure_offset_set) * the tip up event again */ litest_axis_set_value(axes, ABS_PRESSURE, 20.1); litest_tablet_motion(dev, 70, 70, axes); - libinput_dispatch(li); + litest_dispatch(li); /* we can't actually get a real 0.0 because that would trigger a tip up. but it's close enough to zero. */ @@ -3954,7 +3954,7 @@ START_TEST(tablet_pressure_offset_set) litest_axis_set_value(axes, ABS_PRESSURE, 21); litest_tablet_motion(dev, 70, 70, axes); - libinput_dispatch(li); + litest_dispatch(li); assert_pressure(li, LIBINPUT_EVENT_TABLET_TOOL_AXIS, 0.015); @@ -3962,7 +3962,7 @@ START_TEST(tablet_pressure_offset_set) litest_axis_set_value(axes, ABS_PRESSURE, 100); litest_tablet_motion(dev, 70, 70, axes); - libinput_dispatch(li); + litest_dispatch(li); assert_pressure(li, LIBINPUT_EVENT_TABLET_TOOL_AXIS, 1.0); /* Tablet motion at offset should trigger tip up. Use @@ -3970,7 +3970,7 @@ START_TEST(tablet_pressure_offset_set) * BTN_TOUCH */ litest_axis_set_value(axes, ABS_PRESSURE, 20); litest_tablet_motion(dev, 71, 71, axes); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); litest_is_tablet_event(event, LIBINPUT_EVENT_TABLET_TOOL_TIP); libinput_event_destroy(event); @@ -4007,14 +4007,14 @@ START_TEST(tablet_pressure_offset_decrease) litest_drain_events(li); litest_tablet_proximity_in(dev, 5, 100, axes); - libinput_dispatch(li); + litest_dispatch(li); assert_pressure(li, LIBINPUT_EVENT_TABLET_TOOL_PROXIMITY, 0.0); litest_drain_events(li); /* trigger the pressure threshold */ litest_axis_set_value(axes, ABS_PRESSURE, 15); litest_tablet_tip_down(dev, 70, 70, axes); - libinput_dispatch(li); + litest_dispatch(li); /* offset 10 + lower threshold of ~1% of original range, * value 15 is 5% over original range but with the above taken into @@ -4030,7 +4030,7 @@ START_TEST(tablet_pressure_offset_decrease) */ litest_axis_set_value(axes, ABS_PRESSURE, 5); litest_tablet_motion(dev, 75, 75, axes); - libinput_dispatch(li); + litest_dispatch(li); assert_pressure(li, LIBINPUT_EVENT_TABLET_TOOL_TIP, 0.0); litest_drain_events(li); @@ -4038,7 +4038,7 @@ START_TEST(tablet_pressure_offset_decrease) * offset */ litest_axis_set_value(axes, ABS_PRESSURE, 10); litest_tablet_motion(dev, 75, 75, axes); - libinput_dispatch(li); + litest_dispatch(li); assert_pressure(li, LIBINPUT_EVENT_TABLET_TOOL_TIP, 0.05); litest_drain_events(li); } @@ -4073,12 +4073,12 @@ START_TEST(tablet_pressure_offset_increase) litest_axis_set_value(axes, ABS_DISTANCE, 0); litest_axis_set_value(axes, ABS_PRESSURE, 31); litest_tablet_tip_down(dev, 70, 70, axes); - libinput_dispatch(li); + litest_dispatch(li); litest_drain_events(li); litest_axis_set_value(axes, ABS_PRESSURE, 30); litest_tablet_motion(dev, 70, 70, axes); - libinput_dispatch(li); + litest_dispatch(li); /* offset 20 + lower threshold of 1% of original range, * value 30 is 5% over original range but with the above taken into @@ -4090,7 +4090,7 @@ START_TEST(tablet_pressure_offset_increase) litest_axis_set_value(axes, ABS_PRESSURE, 20); litest_tablet_motion(dev, 70, 70, axes); - libinput_dispatch(li); + litest_dispatch(li); assert_pressure(li, LIBINPUT_EVENT_TABLET_TOOL_TIP, 0.0); } @@ -4111,13 +4111,13 @@ START_TEST(tablet_pressure_min_max) litest_tablet_proximity_in(dev, 5, 50, axes); litest_drain_events(li); - libinput_dispatch(li); + litest_dispatch(li); litest_axis_set_value(axes, ABS_DISTANCE, 0); /* Default pressure threshold is 1% of range */ litest_axis_set_value(axes, ABS_PRESSURE, 1.1); litest_tablet_motion(dev, 5, 50, axes); - libinput_dispatch(li); + litest_dispatch(li); assert_pressure(li, LIBINPUT_EVENT_TABLET_TOOL_AXIS, 0.0); /* skip over pressure-based tip down */ @@ -4134,7 +4134,7 @@ START_TEST(tablet_pressure_min_max) litest_drain_events(li); litest_tablet_motion(dev, 5, 50, axes); - libinput_dispatch(li); + litest_dispatch(li); assert_pressure(li, LIBINPUT_EVENT_TABLET_TOOL_AXIS, 1.0); } END_TEST @@ -4155,12 +4155,12 @@ START_TEST(tablet_pressure_range) litest_tablet_proximity_in(dev, 5, 100, axes); litest_drain_events(li); - libinput_dispatch(li); + litest_dispatch(li); for (pressure = 10; pressure <= 100; pressure += 10) { litest_axis_set_value(axes, ABS_PRESSURE, pressure); litest_tablet_motion(dev, 70, 70, axes); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); tev = litest_is_tablet_event(event, LIBINPUT_EVENT_TABLET_TOOL_AXIS); @@ -4186,10 +4186,10 @@ START_TEST(tablet_pressure_config) litest_tablet_proximity_in(dev, 5, 100, axes); litest_drain_events(li); - libinput_dispatch(li); + litest_dispatch(li); litest_tablet_motion(dev, 70, 70, axes); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); tev = litest_is_tablet_event(event, LIBINPUT_EVENT_TABLET_TOOL_AXIS); @@ -4240,10 +4240,10 @@ START_TEST(tablet_pressure_config_set_minimum) litest_tablet_proximity_in(dev, 5, 100, axes); litest_drain_events(li); - libinput_dispatch(li); + litest_dispatch(li); litest_tablet_motion(dev, 70, 70, axes); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); tev = litest_is_tablet_event(event, LIBINPUT_EVENT_TABLET_TOOL_AXIS); @@ -4260,7 +4260,7 @@ START_TEST(tablet_pressure_config_set_minimum) /* config doesn't take effect until we're out of prox */ for (int pos = 71; pos < 80; pos++) { litest_tablet_motion(dev, pos, pos, axes); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); tev = litest_is_tablet_event(event, LIBINPUT_EVENT_TABLET_TOOL_AXIS); p = libinput_event_tablet_tool_get_pressure(tev); @@ -4279,7 +4279,7 @@ START_TEST(tablet_pressure_config_set_minimum) for (int pos = 71; pos < 80; pos++) { litest_tablet_motion(dev, pos, pos, axes); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); tev = litest_is_tablet_event(event, LIBINPUT_EVENT_TABLET_TOOL_AXIS); p = libinput_event_tablet_tool_get_pressure(tev); @@ -4291,7 +4291,7 @@ START_TEST(tablet_pressure_config_set_minimum) plus the 1% minimum offset, so our output pressure is actually ~15% */ litest_axis_set_value(axes, ABS_PRESSURE, 50); litest_tablet_motion(dev, 70, 70, axes); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); tev = litest_is_tablet_event(event, LIBINPUT_EVENT_TABLET_TOOL_TIP); p = libinput_event_tablet_tool_get_pressure(tev); @@ -4301,7 +4301,7 @@ START_TEST(tablet_pressure_config_set_minimum) for (int pos = 71; pos < 80; pos++) { litest_tablet_motion(dev, pos, pos, axes); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); tev = litest_is_tablet_event(event, LIBINPUT_EVENT_TABLET_TOOL_AXIS); p = libinput_event_tablet_tool_get_pressure(tev); @@ -4328,10 +4328,10 @@ START_TEST(tablet_pressure_config_set_maximum) litest_tablet_proximity_in(dev, 5, 100, axes); litest_drain_events(li); - libinput_dispatch(li); + litest_dispatch(li); litest_tablet_motion(dev, 70, 70, axes); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); tev = litest_is_tablet_event(event, LIBINPUT_EVENT_TABLET_TOOL_AXIS); @@ -4348,7 +4348,7 @@ START_TEST(tablet_pressure_config_set_maximum) /* config doesn't take effect until we're out of prox */ for (int pos = 71; pos < 80; pos++) { litest_tablet_motion(dev, pos, pos, axes); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); tev = litest_is_tablet_event(event, LIBINPUT_EVENT_TABLET_TOOL_AXIS); p = libinput_event_tablet_tool_get_pressure(tev); @@ -4358,7 +4358,7 @@ START_TEST(tablet_pressure_config_set_maximum) litest_tablet_proximity_out(dev); litest_timeout_tablet_proxout(); - libinput_dispatch(li); + litest_dispatch(li); litest_axis_set_value(axes, ABS_PRESSURE, 10); litest_tablet_proximity_in(dev, 70, 70, axes); @@ -4368,7 +4368,7 @@ START_TEST(tablet_pressure_config_set_maximum) plus the 1% minimum offset so our output pressure is actually ~15% */ for (int pos = 71; pos < 80; pos++) { litest_tablet_motion(dev, pos, pos, axes); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); tev = litest_is_tablet_event(event, LIBINPUT_EVENT_TABLET_TOOL_AXIS); p = libinput_event_tablet_tool_get_pressure(tev); @@ -4384,7 +4384,7 @@ START_TEST(tablet_pressure_config_set_maximum) for (int pos = 71; pos < 80; pos++) { litest_tablet_motion(dev, pos, pos, axes); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); tev = litest_is_tablet_event(event, LIBINPUT_EVENT_TABLET_TOOL_AXIS); p = libinput_event_tablet_tool_get_pressure(tev); @@ -4398,7 +4398,7 @@ START_TEST(tablet_pressure_config_set_maximum) for (int pos = 71; pos < 80; pos++) { litest_tablet_motion(dev, pos, pos, axes); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); tev = litest_is_tablet_event(event, LIBINPUT_EVENT_TABLET_TOOL_AXIS); p = libinput_event_tablet_tool_get_pressure(tev); @@ -4425,10 +4425,10 @@ START_TEST(tablet_pressure_config_set_range) litest_tablet_proximity_in(dev, 5, 100, axes); litest_drain_events(li); - libinput_dispatch(li); + litest_dispatch(li); litest_tablet_motion(dev, 70, 70, axes); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); tev = litest_is_tablet_event(event, LIBINPUT_EVENT_TABLET_TOOL_AXIS); @@ -4445,7 +4445,7 @@ START_TEST(tablet_pressure_config_set_range) /* config doesn't take effect until we're out of prox */ for (int i = 71; i < 80; i++) { litest_tablet_motion(dev, i, i, axes); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); tev = litest_is_tablet_event(event, LIBINPUT_EVENT_TABLET_TOOL_AXIS); p = libinput_event_tablet_tool_get_pressure(tev); @@ -4463,7 +4463,7 @@ START_TEST(tablet_pressure_config_set_range) for (double pressure = 0.0, i = 71; pressure <= 100; pressure += 5, i += 0.2) { litest_axis_set_value(axes, ABS_PRESSURE, pressure); litest_tablet_motion(dev, i, i, axes); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); if (libinput_event_get_type(event) == LIBINPUT_EVENT_TABLET_TOOL_AXIS) tev = litest_is_tablet_event(event, LIBINPUT_EVENT_TABLET_TOOL_AXIS); @@ -4514,7 +4514,7 @@ START_TEST(tablet_pressure_offset_exceed_threshold) for (int i = 0; i < 2; i++) { litest_tablet_proximity_in(dev, 5, 100, axes); litest_tablet_proximity_out(dev); - libinput_dispatch(li); + litest_dispatch(li); } } @@ -4524,7 +4524,7 @@ START_TEST(tablet_pressure_offset_exceed_threshold) libinput_log_set_handler(li, pressure_threshold_warning); litest_tablet_proximity_in(dev, 5, 100, axes); - libinput_dispatch(li); + litest_dispatch(li); assert_pressure(li, LIBINPUT_EVENT_TABLET_TOOL_PROXIMITY, 0.60); ck_assert_int_eq(warning_triggered, 1); @@ -4550,7 +4550,7 @@ START_TEST(tablet_pressure_offset_none_for_zero_distance) litest_tablet_proximity_in(dev, 5, 100, axes); litest_tablet_tip_down(dev, 5, 100, axes); litest_pop_event_frame(dev); - libinput_dispatch(li); + litest_dispatch(li); assert_pressure(li, LIBINPUT_EVENT_TABLET_TOOL_PROXIMITY, 0.20); } @@ -4570,7 +4570,7 @@ START_TEST(tablet_pressure_offset_none_for_small_distance) * pressure offset */ litest_tablet_proximity_in(dev, 5, 100, axes); litest_drain_events(li); - libinput_dispatch(li); + litest_dispatch(li); litest_axis_set_value(axes, ABS_DISTANCE, 0); litest_axis_set_value(axes, ABS_PRESSURE, 21); @@ -4579,7 +4579,7 @@ START_TEST(tablet_pressure_offset_none_for_small_distance) litest_axis_set_value(axes, ABS_PRESSURE, 20); litest_tablet_motion(dev, 70, 70, axes); - libinput_dispatch(li); + litest_dispatch(li); assert_pressure(li, LIBINPUT_EVENT_TABLET_TOOL_AXIS, 0.20); } @@ -4601,12 +4601,12 @@ START_TEST(tablet_distance_range) litest_tablet_proximity_in(dev, 5, 100, axes); litest_drain_events(li); - libinput_dispatch(li); + litest_dispatch(li); for (distance = 0; distance <= 100; distance += 10) { litest_axis_set_value(axes, ABS_DISTANCE, distance); litest_tablet_motion(dev, 70, 70, axes); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); tev = litest_is_tablet_event(event, LIBINPUT_EVENT_TABLET_TOOL_AXIS); @@ -4636,7 +4636,7 @@ START_TEST(tilt_available) litest_drain_events(li); litest_tablet_proximity_in(dev, 10, 10, axes); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); tev = litest_is_tablet_event(event, LIBINPUT_EVENT_TABLET_TOOL_PROXIMITY); @@ -4666,7 +4666,7 @@ START_TEST(tilt_not_available) litest_drain_events(li); litest_tablet_proximity_in(dev, 10, 10, axes); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); tev = litest_is_tablet_event(event, LIBINPUT_EVENT_TABLET_TOOL_PROXIMITY); @@ -4698,7 +4698,7 @@ START_TEST(tilt_x) litest_drain_events(li); litest_tablet_proximity_in(dev, 10, 10, axes); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); tev = litest_is_tablet_event(event, LIBINPUT_EVENT_TABLET_TOOL_PROXIMITY); @@ -4728,7 +4728,7 @@ START_TEST(tilt_x) litest_tablet_motion(dev, 10, 10, axes); litest_drain_events(li); litest_tablet_motion(dev, 10, 11, axes); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); tev = litest_is_tablet_event(event, LIBINPUT_EVENT_TABLET_TOOL_AXIS); @@ -4772,7 +4772,7 @@ START_TEST(tilt_y) litest_drain_events(li); litest_tablet_proximity_in(dev, 10, 10, axes); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); tev = litest_is_tablet_event(event, LIBINPUT_EVENT_TABLET_TOOL_PROXIMITY); @@ -4802,7 +4802,7 @@ START_TEST(tilt_y) litest_tablet_motion(dev, 10, 11, axes); litest_drain_events(li); litest_tablet_motion(dev, 10, 10, axes); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); tev = litest_is_tablet_event(event, LIBINPUT_EVENT_TABLET_TOOL_AXIS); @@ -4881,7 +4881,7 @@ START_TEST(tilt_fixed_points) litest_event(dev, EV_ABS, ABS_TILT_Y, axis_value); litest_pop_event_frame(dev); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); tev = litest_is_tablet_event(event, LIBINPUT_EVENT_TABLET_TOOL_PROXIMITY); @@ -4950,7 +4950,7 @@ START_TEST(relative_no_delta_prox_in) litest_drain_events(li); litest_tablet_proximity_in(dev, 10, 10, axes); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); tev = litest_is_tablet_event(event, LIBINPUT_EVENT_TABLET_TOOL_PROXIMITY); @@ -4985,7 +4985,7 @@ START_TEST(relative_delta) litest_drain_events(li); litest_tablet_motion(dev, 20, 10, axes); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); tev = litest_is_tablet_event(event, @@ -5002,7 +5002,7 @@ START_TEST(relative_delta) litest_drain_events(li); litest_tablet_motion(dev, 5, 10, axes); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); tev = litest_is_tablet_event(event, LIBINPUT_EVENT_TABLET_TOOL_AXIS); @@ -5018,7 +5018,7 @@ START_TEST(relative_delta) litest_drain_events(li); litest_tablet_motion(dev, 5, 20, axes); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); tev = litest_is_tablet_event(event, LIBINPUT_EVENT_TABLET_TOOL_AXIS); @@ -5035,7 +5035,7 @@ START_TEST(relative_delta) litest_drain_events(li); litest_tablet_motion(dev, 5, 10, axes); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); tev = litest_is_tablet_event(event, LIBINPUT_EVENT_TABLET_TOOL_AXIS); @@ -5071,7 +5071,7 @@ START_TEST(relative_no_delta_on_tip) litest_axis_set_value(axes, ABS_PRESSURE, 30); litest_tablet_tip_down(dev, 30, 20, axes); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); tev = litest_is_tablet_event(event, LIBINPUT_EVENT_TABLET_TOOL_TIP); @@ -5085,7 +5085,7 @@ START_TEST(relative_no_delta_on_tip) /* normal motion */ litest_tablet_motion(dev, 40, 30, axes); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); tev = litest_is_tablet_event(event, LIBINPUT_EVENT_TABLET_TOOL_AXIS); @@ -5099,7 +5099,7 @@ START_TEST(relative_no_delta_on_tip) litest_axis_set_value(axes, ABS_DISTANCE, 10); litest_axis_set_value(axes, ABS_PRESSURE, 0); litest_tablet_tip_up(dev, 50, 40, axes); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); tev = litest_is_tablet_event(event, LIBINPUT_EVENT_TABLET_TOOL_TIP); @@ -5140,7 +5140,7 @@ START_TEST(relative_calibration) litest_drain_events(li); litest_tablet_motion(dev, 20, 10, axes); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); tev = litest_is_tablet_event(event, @@ -5158,7 +5158,7 @@ START_TEST(relative_calibration) litest_drain_events(li); litest_tablet_motion(dev, 5, 10, axes); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); tev = litest_is_tablet_event(event, LIBINPUT_EVENT_TABLET_TOOL_AXIS); @@ -5175,7 +5175,7 @@ START_TEST(relative_calibration) litest_drain_events(li); litest_tablet_motion(dev, 5, 20, axes); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); tev = litest_is_tablet_event(event, LIBINPUT_EVENT_TABLET_TOOL_AXIS); @@ -5192,7 +5192,7 @@ START_TEST(relative_calibration) litest_drain_events(li); litest_tablet_motion(dev, 5, 5, axes); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); tev = litest_is_tablet_event(event, LIBINPUT_EVENT_TABLET_TOOL_AXIS); @@ -5258,7 +5258,7 @@ assert_touch_is_arbitrated(struct litest_device *dev, struct litest_device *fing LIBINPUT_EVENT_TABLET_TOOL_PROXIMITY); litest_timeout_touch_arbitration(); - libinput_dispatch(li); + litest_dispatch(li); /* finger still down */ litest_touch_move_to(finger, 0, 80, 80, 30, 30, 10); @@ -5266,13 +5266,13 @@ assert_touch_is_arbitrated(struct litest_device *dev, struct litest_device *fing litest_assert_empty_queue(li); litest_timeout_touch_arbitration(); - libinput_dispatch(li); + litest_dispatch(li); /* lift finger, expect expect events */ litest_touch_down(finger, 0, 30, 30); litest_touch_move_to(finger, 0, 30, 30, 80, 80, 10); litest_touch_up(finger, 0); - libinput_dispatch(li); + litest_dispatch(li); if (is_touchpad) litest_assert_only_typed_events(li, @@ -5349,17 +5349,17 @@ START_TEST(touch_arbitration_outside_rect) /* left of rect */ litest_touch_sequence(finger, 0, x - 10, y + 2, x - 10, y + 20, 3); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_touch_sequence(li); /* above rect */ litest_touch_sequence(finger, 0, x + 2, y - 65, x + 20, y - 40, 3); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_touch_sequence(li); /* right of rect */ litest_touch_sequence(finger, 0, x + 80, y + 2, x + 20, y + 10, 3); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_touch_sequence(li); #if 0 @@ -5374,7 +5374,7 @@ START_TEST(touch_arbitration_outside_rect) /* below rect */ litest_touch_sequence(finger, 0, x + 2, y + 80, x + 20, y + 20, 30); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_touch_sequence(li); #endif @@ -5414,7 +5414,7 @@ START_TEST(touch_arbitration_remove_after) litest_touch_down(finger, 0, 70, 70); litest_drain_events(li); litest_tablet_proximity_out(dev); - libinput_dispatch(li); + litest_dispatch(li); /* Delete the device immediately after the tablet goes out of prox. * This merely tests that the arbitration timer gets cleaned up */ @@ -5491,12 +5491,12 @@ START_TEST(touch_arbitration_stop_touch) litest_touch_move_to(finger, 1, 30, 30, 80, 80, 3); litest_assert_empty_queue(li); litest_touch_up(finger, 1); - libinput_dispatch(li); + litest_dispatch(li); litest_touch_down(finger, 0, 30, 30); litest_touch_move_to(finger, 0, 30, 30, 80, 80, 3); litest_touch_up(finger, 0); - libinput_dispatch(li); + litest_dispatch(li); if (is_touchpad) litest_assert_only_typed_events(li, @@ -5560,7 +5560,7 @@ START_TEST(touch_arbitration_suspend_touch_device) litest_assert_only_typed_events(li, LIBINPUT_EVENT_DEVICE_REMOVED); litest_timeout_touch_arbitration(); - libinput_dispatch(li); + litest_dispatch(li); litest_touch_down(dev, 0, 30, 30); litest_touch_move_to(dev, 0, 30, 30, 80, 80, 10); @@ -5581,7 +5581,7 @@ START_TEST(touch_arbitration_suspend_touch_device) litest_touch_down(dev, 0, 30, 30); litest_touch_move_to(dev, 0, 30, 30, 80, 80, 10); litest_touch_up(dev, 0); - libinput_dispatch(li); + litest_dispatch(li); if (is_touchpad) litest_assert_only_typed_events(li, @@ -5615,7 +5615,7 @@ START_TEST(touch_arbitration_remove_touch) litest_drain_events(li); litest_delete_device(finger); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_only_typed_events(li, LIBINPUT_EVENT_DEVICE_REMOVED); litest_assert_empty_queue(li); @@ -5650,7 +5650,7 @@ START_TEST(touch_arbitration_remove_tablet) if (is_touchpad) litest_disable_hold_gestures(dev->libinput_device); - libinput_dispatch(li); + litest_dispatch(li); litest_tablet_proximity_in(tablet, 10, 10, axes); litest_tablet_motion(tablet, 10, 10, axes); litest_tablet_motion(tablet, 20, 40, axes); @@ -5666,7 +5666,7 @@ START_TEST(touch_arbitration_remove_tablet) litest_assert_only_typed_events(li, LIBINPUT_EVENT_DEVICE_REMOVED); litest_timeout_touch_arbitration(); - libinput_dispatch(li); + litest_dispatch(li); /* Touch is still down, don't enable */ litest_touch_move_to(dev, 0, 80, 80, 30, 30, 10); @@ -5676,7 +5676,7 @@ START_TEST(touch_arbitration_remove_tablet) litest_touch_down(dev, 0, 30, 30); litest_touch_move_to(dev, 0, 30, 30, 80, 80, 10); litest_touch_up(dev, 0); - libinput_dispatch(li); + litest_dispatch(li); if (is_touchpad) litest_assert_only_typed_events(li, LIBINPUT_EVENT_POINTER_MOTION); @@ -5716,7 +5716,7 @@ START_TEST(touch_arbitration_keep_ignoring) */ litest_touch_move_to(finger, 0, 30, 30, 80, 80, 10); litest_touch_up(finger, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_empty_queue(li); @@ -5765,9 +5765,9 @@ START_TEST(touch_arbitration_late_touch_lift) */ litest_touch_down(finger, 0, 30, 30); litest_touch_up(finger, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_timeout_tap(); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_empty_queue(li); @@ -5817,7 +5817,7 @@ verify_left_handed_tablet_motion(struct litest_device *tablet, for (int i = 5; i < 25; i += 5) { litest_tablet_motion(tablet, x + i, y - i, NULL); - libinput_dispatch(li); + litest_dispatch(li); } event = libinput_get_event(li); @@ -5862,11 +5862,11 @@ verify_left_handed_tablet_sequence(struct litest_device *tablet, x = 60; y = 60; litest_tablet_proximity_in(tablet, x, y, NULL); - libinput_dispatch(li); + litest_dispatch(li); litest_drain_events(li); verify_left_handed_tablet_motion(tablet, li, x, y, left_handed); litest_tablet_proximity_out(tablet); - libinput_dispatch(li); + litest_dispatch(li); litest_timeout_tablet_proxout(); litest_drain_events(li); } @@ -5883,7 +5883,7 @@ verify_left_handed_touch_motion(struct litest_device *finger, /* touch down/up must be handled by caller */ litest_touch_move_to(finger, 0, x + 1, y - 1, x + 20, y - 20, 10); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); ck_assert_notnull(event); @@ -5921,7 +5921,7 @@ verify_left_handed_touch_sequence(struct litest_device *finger, litest_drain_events(li); verify_left_handed_touch_motion(finger, li, x, y, left_handed); litest_touch_up(finger, 0); - libinput_dispatch(li); + litest_dispatch(li); } #endif @@ -6009,7 +6009,7 @@ START_TEST(tablet_rotation_left_handed_configuration) libinput_device_config_left_handed_set(tablet_dev, tablet_from); libinput_device_config_left_handed_set(touch_dev, touch_from); - libinput_dispatch(li); + litest_dispatch(li); tablet_enabled = libinput_device_config_left_handed_get(tablet_dev); touch_enabled = libinput_device_config_left_handed_get(touch_dev); ck_assert_int_eq(tablet_enabled, tablet_from); @@ -6017,7 +6017,7 @@ START_TEST(tablet_rotation_left_handed_configuration) libinput_device_config_left_handed_set(tablet_dev, tablet_to); libinput_device_config_left_handed_set(touch_dev, touch_to); - libinput_dispatch(li); + litest_dispatch(li); tablet_enabled = libinput_device_config_left_handed_get(tablet_dev); touch_enabled = libinput_device_config_left_handed_get(touch_dev); ck_assert_int_eq(tablet_enabled, tablet_to); @@ -6071,7 +6071,7 @@ START_TEST(tablet_rotation_left_handed_while_in_prox) tx = 60; ty = 60; litest_tablet_proximity_in(tablet, tx, ty, NULL); - libinput_dispatch(li); + litest_dispatch(li); litest_drain_events(li); libinput_device_config_left_handed_set(tablet->libinput_device, @@ -6103,13 +6103,13 @@ START_TEST(tablet_rotation_left_handed_while_in_prox) } litest_touch_up(finger, 0); - libinput_dispatch(li); + litest_dispatch(li); /* this will fail once we have location-based touch arbitration on * touchpads */ litest_assert_only_typed_events(li, LIBINPUT_EVENT_TABLET_TOOL_AXIS); #endif litest_tablet_proximity_out(tablet); - libinput_dispatch(li); + litest_dispatch(li); litest_timeout_tablet_proxout(); litest_drain_events(li); @@ -6164,7 +6164,7 @@ START_TEST(tablet_rotation_left_handed_while_touch_down) x = 10; y = 30; litest_touch_down(finger, 0, x, y); - libinput_dispatch(li); + litest_dispatch(li); litest_drain_events(li); libinput_device_config_left_handed_set(tablet->libinput_device, @@ -6319,46 +6319,46 @@ START_TEST(huion_static_btn_tool_pen) litest_event(dev, EV_ABS, ABS_X, 20000 + 10 * i); litest_event(dev, EV_ABS, ABS_Y, 20000 - 10 * i); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); } litest_assert_only_typed_events(li, LIBINPUT_EVENT_TABLET_TOOL_AXIS); /* Wait past the timeout to expect a proximity out */ litest_timeout_tablet_proxout(); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_tablet_proximity_event(li, LIBINPUT_TABLET_TOOL_PROXIMITY_STATE_OUT); - libinput_dispatch(li); + litest_dispatch(li); /* New events should fake a proximity in again */ litest_event(dev, EV_ABS, ABS_X, 20000); litest_event(dev, EV_ABS, ABS_Y, 20000); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_tablet_proximity_event(li, LIBINPUT_TABLET_TOOL_PROXIMITY_STATE_IN); - libinput_dispatch(li); + litest_dispatch(li); for (i = 0; i < 10; i++) { litest_event(dev, EV_ABS, ABS_X, 20000 + 10 * i); litest_event(dev, EV_ABS, ABS_Y, 20000 - 10 * i); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); } litest_assert_only_typed_events(li, LIBINPUT_EVENT_TABLET_TOOL_AXIS); litest_timeout_tablet_proxout(); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_tablet_proximity_event(li, LIBINPUT_TABLET_TOOL_PROXIMITY_STATE_OUT); - libinput_dispatch(li); + litest_dispatch(li); /* New events, just to ensure cleanup paths are correct */ litest_event(dev, EV_ABS, ABS_X, 20000); litest_event(dev, EV_ABS, ABS_Y, 20000); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); } END_TEST @@ -6382,16 +6382,16 @@ START_TEST(huion_static_btn_tool_pen_no_timeout_during_usage) litest_event(dev, EV_ABS, ABS_X, 20000 + 10 * i); litest_event(dev, EV_ABS, ABS_Y, 20000 - 10 * i); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); msleep(5); } litest_assert_only_typed_events(li, LIBINPUT_EVENT_TABLET_TOOL_AXIS); litest_timeout_tablet_proxout(); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_tablet_proximity_event(li, LIBINPUT_TABLET_TOOL_PROXIMITY_STATE_OUT); - libinput_dispatch(li); + litest_dispatch(li); } END_TEST @@ -6420,7 +6420,7 @@ START_TEST(huion_static_btn_tool_pen_disable_quirk_on_prox_out) litest_event(dev, EV_ABS, ABS_X, 20000 + 10 * i); litest_event(dev, EV_ABS, ABS_Y, 20000 - 10 * i); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); } litest_assert_only_typed_events(li, LIBINPUT_EVENT_TABLET_TOOL_AXIS); @@ -6428,7 +6428,7 @@ START_TEST(huion_static_btn_tool_pen_disable_quirk_on_prox_out) /* Wait past the timeout to expect a proximity out */ if (with_timeout) { litest_timeout_tablet_proxout(); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_tablet_proximity_event(li, LIBINPUT_TABLET_TOOL_PROXIMITY_STATE_OUT); } @@ -6436,7 +6436,7 @@ START_TEST(huion_static_btn_tool_pen_disable_quirk_on_prox_out) /* Send a real prox out, expect quirk to be disabled */ litest_event(dev, EV_KEY, BTN_TOOL_PEN, 0); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); if (with_timeout) { /* we got the proximity event above already */ @@ -6447,21 +6447,21 @@ START_TEST(huion_static_btn_tool_pen_disable_quirk_on_prox_out) } litest_tablet_proximity_in(dev, 50, 50, NULL); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_tablet_proximity_event(li, LIBINPUT_TABLET_TOOL_PROXIMITY_STATE_IN); for (i = 0; i < 10; i++) { litest_tablet_motion(dev, 50 + i, 50 + i, NULL); - libinput_dispatch(li); + litest_dispatch(li); } litest_assert_only_typed_events(li, LIBINPUT_EVENT_TABLET_TOOL_AXIS); - libinput_dispatch(li); + litest_dispatch(li); litest_timeout_tablet_proxout(); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_empty_queue(li); @@ -6470,7 +6470,7 @@ START_TEST(huion_static_btn_tool_pen_disable_quirk_on_prox_out) litest_event(dev, EV_KEY, BTN_TOOL_PEN, 0); litest_event(dev, EV_SYN, SYN_REPORT, 0); litest_pop_event_frame(dev); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_tablet_proximity_event(li, LIBINPUT_TABLET_TOOL_PROXIMITY_STATE_OUT); @@ -6498,7 +6498,7 @@ START_TEST(tablet_smoothing) litest_drain_events(li); litest_tablet_proximity_in(dev, 10, 10, axes); - libinput_dispatch(li); + litest_dispatch(li); litest_drain_events(li); /* Move in a straight line, collect the resulting points */ @@ -6510,7 +6510,7 @@ START_TEST(tablet_smoothing) litest_assert(npoints <= ARRAY_LENGTH(coordinates)); litest_tablet_motion(dev, x, y, axes); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); tev = litest_is_tablet_event(event, @@ -6523,7 +6523,7 @@ START_TEST(tablet_smoothing) litest_tablet_proximity_out(dev); litest_tablet_proximity_in(dev, 10, 10, axes); - libinput_dispatch(li); + litest_dispatch(li); litest_drain_events(li); /* Move in a wobbly line, collect every second point */ @@ -6537,14 +6537,14 @@ START_TEST(tablet_smoothing) /* point off position */ litest_tablet_motion(dev, x - 2, y + 1, axes); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); litest_is_tablet_event(event, LIBINPUT_EVENT_TABLET_TOOL_AXIS); libinput_event_destroy(event); /* same position as before */ litest_tablet_motion(dev, x, y, axes); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); tev = litest_is_tablet_event(event, LIBINPUT_EVENT_TABLET_TOOL_AXIS); diff --git a/test/test-totem.c b/test/test-totem.c index 8bd70fcd..7527961f 100644 --- a/test/test-totem.c +++ b/test/test-totem.c @@ -47,7 +47,7 @@ START_TEST(totem_type) litest_drain_events(li); litest_tablet_proximity_in(dev, 50, 50, NULL); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); t = litest_is_tablet_event(event, @@ -71,7 +71,7 @@ START_TEST(totem_axes) litest_drain_events(li); litest_tablet_proximity_in(dev, 50, 50, NULL); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); t = litest_is_tablet_event(event, @@ -96,7 +96,7 @@ START_TEST(totem_proximity_in_out) litest_drain_events(li); litest_tablet_proximity_in(dev, 50, 50, NULL); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); t = litest_is_tablet_event(event, @@ -114,7 +114,7 @@ START_TEST(totem_proximity_in_out) litest_assert_empty_queue(li); litest_tablet_proximity_out(dev); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); t = litest_is_tablet_event(event, @@ -154,7 +154,7 @@ START_TEST(totem_proximity_in_on_init) devnode = libevdev_uinput_get_devnode(dev->uinput); li = litest_create_context(); libinput_path_add_device(li, devnode); - libinput_dispatch(li); + litest_dispatch(li); litest_wait_for_event_of_type(li, LIBINPUT_EVENT_DEVICE_ADDED); event = libinput_get_event(li); @@ -214,7 +214,7 @@ START_TEST(totem_proximity_out_on_suspend) libinput_suspend(li); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); t = litest_is_tablet_event(event, LIBINPUT_EVENT_TABLET_TOOL_TIP); @@ -249,7 +249,7 @@ START_TEST(totem_motion) struct libinput_event_tablet_tool *t; litest_tablet_motion(dev, x + 1, y + 1, NULL); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); t = litest_is_tablet_event(event, LIBINPUT_EVENT_TABLET_TOOL_AXIS); @@ -293,7 +293,7 @@ START_TEST(totem_rotation) litest_axis_set_value(axes, ABS_MT_ORIENTATION, 50 + i); litest_tablet_motion(dev, 50, 50, axes); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); t = litest_is_tablet_event(event, LIBINPUT_EVENT_TABLET_TOOL_AXIS); @@ -317,7 +317,7 @@ START_TEST(totem_rotation) litest_axis_set_value(axes, ABS_MT_ORIENTATION, 50 - i); litest_tablet_motion(dev, 50, 50, axes); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); t = litest_is_tablet_event(event, LIBINPUT_EVENT_TABLET_TOOL_AXIS); @@ -346,7 +346,7 @@ START_TEST(totem_size) litest_drain_events(li); litest_tablet_proximity_in(dev, 50, 50, NULL); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); t = litest_is_tablet_event(event, LIBINPUT_EVENT_TABLET_TOOL_PROXIMITY); @@ -374,7 +374,7 @@ START_TEST(totem_button) litest_drain_events(li); litest_button_click(dev, BTN_0, true); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); t = litest_is_tablet_event(event, LIBINPUT_EVENT_TABLET_TOOL_BUTTON); ck_assert_int_eq(libinput_event_tablet_tool_get_button(t), BTN_0); @@ -385,7 +385,7 @@ START_TEST(totem_button) libinput_event_destroy(event); litest_button_click(dev, BTN_0, false); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); t = litest_is_tablet_event(event, LIBINPUT_EVENT_TABLET_TOOL_BUTTON); @@ -413,7 +413,7 @@ START_TEST(totem_button_down_on_init) devnode = libevdev_uinput_get_devnode(dev->uinput); li = litest_create_context(); libinput_path_add_device(li, devnode); - libinput_dispatch(li); + litest_dispatch(li); litest_wait_for_event_of_type(li, LIBINPUT_EVENT_DEVICE_ADDED); event = libinput_get_event(li); @@ -439,15 +439,15 @@ START_TEST(totem_button_down_on_init) litest_assert_empty_queue(li); litest_button_click(dev, BTN_0, false); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_empty_queue(li); /* but buttons after this should be sent */ litest_button_click(dev, BTN_0, true); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_tablet_button_event(li, BTN_0, LIBINPUT_BUTTON_STATE_PRESSED); litest_button_click(dev, BTN_0, false); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_tablet_button_event(li, BTN_0, LIBINPUT_BUTTON_STATE_RELEASED); litest_destroy_context(li); @@ -467,7 +467,7 @@ START_TEST(totem_button_up_on_delete) litest_drain_events(li); litest_delete_device(dev); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_tablet_button_event(li, BTN_0, @@ -492,16 +492,16 @@ START_TEST(totem_arbitration_below) /* touches below the totem, cancelled once the totem is down */ litest_touch_down(touch, 0, 50, 50); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_touch_down_frame(li); litest_touch_move_to(touch, 0, 50, 50, 50, 70, 10); - libinput_dispatch(li); + litest_dispatch(li); while (libinput_next_event_type(li)) { litest_assert_touch_motion_frame(li); } litest_tablet_proximity_in(totem, 50, 70, NULL); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_tablet_proximity_event(li, LIBINPUT_TABLET_TOOL_PROXIMITY_STATE_IN); litest_assert_tablet_tip_event(li, LIBINPUT_TABLET_TOOL_TIP_DOWN); @@ -530,7 +530,7 @@ START_TEST(totem_arbitration_during) litest_drain_events(li); litest_tablet_proximity_in(totem, 50, 50, NULL); - libinput_dispatch(li); + litest_dispatch(li); litest_drain_events(li); @@ -556,7 +556,7 @@ START_TEST(totem_arbitration_outside_rect) litest_drain_events(li); litest_tablet_proximity_in(totem, 50, 50, NULL); - libinput_dispatch(li); + litest_dispatch(li); litest_drain_events(li); @@ -564,7 +564,7 @@ START_TEST(totem_arbitration_outside_rect) litest_touch_down(touch, 0, 81, 51); litest_touch_move_to(touch, 0, 81, 50, 90, 80, 10); litest_touch_up(touch, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_touch_sequence(li); } @@ -573,7 +573,7 @@ START_TEST(totem_arbitration_outside_rect) litest_touch_down(touch, 0, 81, 51); litest_touch_move_to(touch, 0, 81, 50, 50, 50, 10); litest_touch_up(touch, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_touch_sequence(li); diff --git a/test/test-touch.c b/test/test-touch.c index 73f4f031..3973f8d7 100644 --- a/test/test-touch.c +++ b/test/test-touch.c @@ -43,7 +43,7 @@ START_TEST(touch_frame_events) litest_drain_events(dev->libinput); litest_touch_down(dev, 0, 10, 10); - libinput_dispatch(li); + litest_dispatch(li); while ((event = libinput_get_event(li))) { if (libinput_event_get_type(event) == LIBINPUT_EVENT_TOUCH_FRAME) @@ -53,7 +53,7 @@ START_TEST(touch_frame_events) ck_assert_int_eq(have_frame_event, 1); litest_touch_down(dev, 1, 10, 10); - libinput_dispatch(li); + litest_dispatch(li); while ((event = libinput_get_event(li))) { if (libinput_event_get_type(event) == LIBINPUT_EVENT_TOUCH_FRAME) @@ -72,12 +72,12 @@ START_TEST(touch_downup_no_motion) litest_drain_events(li); litest_touch_down(dev, 0, 10, 10); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_touch_down_frame(li); litest_touch_up(dev, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_touch_up_frame(li); } @@ -108,7 +108,7 @@ START_TEST(touch_abs_transform) litest_touch_down(dev, 0, 100, 100); - libinput_dispatch(libinput); + litest_dispatch(libinput); while ((ev = libinput_get_event(libinput))) { if (libinput_event_get_type(ev) != LIBINPUT_EVENT_TOUCH_DOWN) { @@ -142,7 +142,7 @@ touch_assert_seat_slot(struct libinput *li, struct libinput_event *ev; struct libinput_event_touch *tev; - libinput_dispatch(li); + litest_dispatch(li); ev = libinput_get_event(li); tev = litest_is_touch_event(ev, type); slot = libinput_event_touch_get_slot(tev); @@ -227,7 +227,7 @@ START_TEST(touch_many_slots) for (slot = 0; slot < num_tps; ++slot) litest_touch_up(dev, slot); - libinput_dispatch(libinput); + litest_dispatch(libinput); while ((ev = libinput_get_event(libinput))) { type = libinput_event_get_type(ev); @@ -237,13 +237,13 @@ START_TEST(touch_many_slots) break; libinput_event_destroy(ev); - libinput_dispatch(libinput); + litest_dispatch(libinput); } ck_assert_notnull(ev); ck_assert_int_gt(slot_count, 0); - libinput_dispatch(libinput); + litest_dispatch(libinput); do { type = libinput_event_get_type(ev); ck_assert_int_ne(type, LIBINPUT_EVENT_TOUCH_DOWN); @@ -251,7 +251,7 @@ START_TEST(touch_many_slots) slot_count--; libinput_event_destroy(ev); - libinput_dispatch(libinput); + litest_dispatch(libinput); } while ((ev = libinput_get_event(libinput))); ck_assert_int_eq(slot_count, 0); @@ -278,7 +278,7 @@ START_TEST(touch_double_touch_down_up) litest_touch_down(dev, 0, 0, 0); litest_touch_up(dev, 0); litest_touch_up(dev, 0); - libinput_dispatch(libinput); + litest_dispatch(libinput); litest_restore_log_handler(libinput); while ((ev = libinput_get_event(libinput))) { @@ -297,7 +297,7 @@ START_TEST(touch_double_touch_down_up) } libinput_event_destroy(ev); - libinput_dispatch(libinput); + litest_dispatch(libinput); } ck_assert(got_down); @@ -330,7 +330,7 @@ START_TEST(touch_calibration_scale) litest_touch_down(dev, 0, 100, 100); litest_touch_up(dev, 0); - libinput_dispatch(li); + litest_dispatch(li); ev = libinput_get_event(li); tev = litest_is_touch_event(ev, LIBINPUT_EVENT_TOUCH_DOWN); @@ -400,7 +400,7 @@ START_TEST(touch_calibration_rotation) litest_touch_down(dev, 0, 80, 20); litest_touch_up(dev, 0); - libinput_dispatch(li); + litest_dispatch(li); ev = libinput_get_event(li); tev = litest_is_touch_event(ev, LIBINPUT_EVENT_TOUCH_DOWN); @@ -464,7 +464,7 @@ START_TEST(touch_calibration_translation) litest_touch_down(dev, 0, 100, 100); litest_touch_up(dev, 0); - libinput_dispatch(li); + litest_dispatch(li); ev = libinput_get_event(li); tev = litest_is_touch_event(ev, LIBINPUT_EVENT_TOUCH_DOWN); @@ -568,7 +568,7 @@ START_TEST(touch_calibrated_screen_udev) ck_assert_notnull(li); ck_assert_int_eq(libinput_udev_assign_seat(li, "seat0"), 0); - libinput_dispatch(li); + litest_dispatch(li); while ((ev = libinput_get_event(li))) { struct libinput_device *d; @@ -641,7 +641,7 @@ START_TEST(fake_mt_exists) struct libinput_event *event; struct libinput_device *device; - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); device = libinput_event_get_device(event); @@ -706,7 +706,7 @@ START_TEST(touch_protocol_a_touch) litest_drain_events(li); litest_touch_down(dev, 0, 5, 95); - libinput_dispatch(li); + litest_dispatch(li); ev = libinput_get_event(li); tev = litest_is_touch_event(ev, LIBINPUT_EVENT_TOUCH_DOWN); @@ -721,7 +721,7 @@ START_TEST(touch_protocol_a_touch) libinput_event_destroy(ev); litest_touch_move_to(dev, 0, 10, 90, 90, 10, 20); - libinput_dispatch(li); + litest_dispatch(li); while ((ev = libinput_get_event(li))) { if (libinput_event_get_type(ev) == @@ -746,7 +746,7 @@ START_TEST(touch_protocol_a_touch) } litest_touch_up(dev, 0); - libinput_dispatch(li); + litest_dispatch(li); ev = libinput_get_event(li); litest_is_touch_event(ev, LIBINPUT_EVENT_TOUCH_UP); libinput_event_destroy(ev); @@ -766,7 +766,7 @@ START_TEST(touch_protocol_a_2fg_touch) litest_touch_down(dev, 0, 5, 95); litest_touch_down(dev, 1, 95, 5); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_touch_down_frame(li); ev = libinput_get_event(li); @@ -780,7 +780,7 @@ START_TEST(touch_protocol_a_2fg_touch) for (pos = 10; pos < 100; pos += 10) { litest_touch_move(dev, 0, pos, 100 - pos); litest_touch_move(dev, 1, 100 - pos, pos); - libinput_dispatch(li); + litest_dispatch(li); ev = libinput_get_event(li); tev = libinput_event_get_touch_event(ev); @@ -802,11 +802,11 @@ START_TEST(touch_protocol_a_2fg_touch) } litest_touch_up(dev, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_touch_up_frame(li); litest_touch_up(dev, 1); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_touch_up_frame(li); } END_TEST @@ -847,8 +847,8 @@ START_TEST(touch_initial_state) litest_touch_down(dev, 0, 70, 60); litest_touch_up(dev, 0); - libinput_dispatch(libinput1); - libinput_dispatch(libinput2); + litest_dispatch(libinput1); + litest_dispatch(libinput2); while (libinput_next_event_type(libinput1)) { ev1 = libinput_get_event(libinput1); @@ -893,7 +893,7 @@ START_TEST(touch_time_usec) litest_drain_events(dev->libinput); litest_touch_down(dev, 0, 10, 10); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); tev = litest_is_touch_event(event, LIBINPUT_EVENT_TOUCH_DOWN); @@ -920,7 +920,7 @@ START_TEST(touch_fuzz) litest_event(dev, EV_ABS, ABS_MT_POSITION_Y, y); litest_event(dev, EV_KEY, BTN_TOUCH, 1); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); litest_is_touch_event(event, LIBINPUT_EVENT_TOUCH_DOWN); @@ -942,7 +942,7 @@ START_TEST(touch_fuzz) litest_event(dev, EV_ABS, ABS_MT_POSITION_X, x); litest_event(dev, EV_ABS, ABS_MT_POSITION_Y, y); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_empty_queue(li); } } @@ -989,7 +989,7 @@ START_TEST(touch_release_on_unplug) /* Touch is still down when device is removed, expect a release */ litest_delete_device(dev); - libinput_dispatch(li); + litest_dispatch(li); ev = libinput_get_event(li); litest_is_touch_event(ev, LIBINPUT_EVENT_TOUCH_CANCEL); @@ -1026,7 +1026,7 @@ START_TEST(touch_invalid_range_over) litest_event(dev, EV_ABS, ABS_MT_POSITION_Y, 5000); litest_event(dev, EV_KEY, BTN_TOUCH, 1); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); /* Expect the mm to be correct regardless */ ev = libinput_get_event(li); @@ -1065,7 +1065,7 @@ START_TEST(touch_invalid_range_under) litest_event(dev, EV_ABS, ABS_MT_POSITION_Y, 1000); litest_event(dev, EV_KEY, BTN_TOUCH, 1); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); /* Expect the mm to be correct regardless */ ev = libinput_get_event(li); @@ -1146,7 +1146,7 @@ START_TEST(touch_palm_detect_tool_palm) litest_drain_events(li); litest_touch_move_to_extended(dev, 0, 50, 50, 70, 70, axes, 10); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_touch_cancel(li); litest_touch_move_to(dev, 0, 70, 70, 50, 40, 10); @@ -1173,7 +1173,7 @@ START_TEST(touch_palm_detect_tool_palm_on_off) litest_drain_events(li); litest_touch_move_to_extended(dev, 0, 50, 50, 70, 70, axes, 10); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_touch_cancel(li); litest_touch_move_to(dev, 0, 70, 70, 50, 40, 10); @@ -1236,15 +1236,15 @@ START_TEST(touch_palm_detect_tool_palm_2fg) litest_drain_events(li); litest_touch_move_to_extended(dev, 0, 50, 50, 70, 70, axes, 10); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_touch_cancel(li); litest_touch_move_to(dev, 1, 50, 50, 70, 70, 10); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_touch_motion_frame(li); litest_touch_up(dev, 1); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_touch_up_frame(li); litest_touch_move_to(dev, 0, 70, 70, 50, 40, 10); @@ -1272,11 +1272,11 @@ START_TEST(touch_palm_detect_tool_palm_on_off_2fg) litest_drain_events(li); litest_touch_move_to_extended(dev, 0, 50, 50, 70, 70, axes, 10); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_touch_cancel(li); litest_touch_move_to(dev, 1, 50, 50, 70, 70, 10); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_touch_motion_frame(li); litest_axis_set_value(axes, ABS_MT_TOOL_TYPE, MT_TOOL_FINGER); @@ -1284,11 +1284,11 @@ START_TEST(touch_palm_detect_tool_palm_on_off_2fg) litest_assert_empty_queue(li); litest_touch_move_to(dev, 1, 70, 70, 50, 40, 10); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_touch_motion_frame(li); litest_touch_up(dev, 1); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_touch_up_frame(li); litest_touch_move_to(dev, 0, 70, 70, 50, 40, 10); @@ -1318,7 +1318,7 @@ START_TEST(touch_palm_detect_tool_palm_keep_type_2fg) litest_drain_events(li); litest_touch_move_to(dev, 1, 50, 50, 70, 70, 10); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_touch_motion_frame(li); /* ABS_MT_TOOL_TYPE never reset to finger, so a new touch @@ -1333,7 +1333,7 @@ START_TEST(touch_palm_detect_tool_palm_keep_type_2fg) litest_assert_empty_queue(li); litest_touch_up(dev, 1); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_touch_up_frame(li); } END_TEST diff --git a/test/test-touchpad-buttons.c b/test/test-touchpad-buttons.c index 3bc9fff4..a8122803 100644 --- a/test/test-touchpad-buttons.c +++ b/test/test-touchpad-buttons.c @@ -43,12 +43,12 @@ START_TEST(touchpad_button) litest_drain_events(li); litest_button_click(dev, BTN_LEFT, true); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_button_event(li, BTN_LEFT, LIBINPUT_BUTTON_STATE_PRESSED); litest_button_click(dev, BTN_LEFT, false); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_button_event(li, BTN_LEFT, LIBINPUT_BUTTON_STATE_RELEASED); @@ -197,7 +197,7 @@ START_TEST(touchpad_1fg_clickfinger) litest_event(dev, EV_SYN, SYN_REPORT, 0); litest_touch_up(dev, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_button_event(li, BTN_LEFT, LIBINPUT_BUTTON_STATE_PRESSED); @@ -226,7 +226,7 @@ START_TEST(touchpad_1fg_clickfinger_no_touch) litest_event(dev, EV_KEY, BTN_LEFT, 0); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_button_event(li, BTN_LEFT, LIBINPUT_BUTTON_STATE_PRESSED); @@ -249,7 +249,7 @@ START_TEST(touchpad_1fg_clickfinger_no_touch_phantomclicks) litest_event(dev, EV_KEY, BTN_LEFT, 0); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_empty_queue(li); } @@ -287,7 +287,7 @@ START_TEST(touchpad_2fg_clickfinger) litest_touch_up(dev, 0); litest_touch_up(dev, 1); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_button_event(li, button, LIBINPUT_BUTTON_STATE_PRESSED); @@ -333,7 +333,7 @@ START_TEST(touchpad_3fg_clickfinger) litest_touch_up(dev, 1); litest_touch_up(dev, 2); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_button_event(li, button, @@ -386,7 +386,7 @@ START_TEST(touchpad_3fg_clickfinger_btntool) litest_touch_up(dev, 0); litest_touch_up(dev, 1); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_button_event(li, button, @@ -422,7 +422,7 @@ START_TEST(touchpad_4fg_clickfinger) litest_touch_up(dev, 2); litest_touch_up(dev, 3); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_empty_queue(li); } @@ -490,7 +490,7 @@ START_TEST(touchpad_4fg_clickfinger_btntool_3slots) litest_touch_up(dev, 1); litest_touch_up(dev, 2); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_empty_queue(li); } @@ -639,11 +639,11 @@ START_TEST(touchpad_3fg_clickfinger_distance_btntool) litest_touch_down(dev, 0, 90, 15); litest_touch_down(dev, 1, 10, 15); - libinput_dispatch(li); + litest_dispatch(li); litest_event(dev, EV_KEY, BTN_TOOL_DOUBLETAP, 0); litest_event(dev, EV_KEY, BTN_TOOL_TRIPLETAP, 1); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_event(dev, EV_KEY, BTN_LEFT, 1); litest_event(dev, EV_SYN, SYN_REPORT, 0); litest_event(dev, EV_KEY, BTN_LEFT, 0); @@ -745,7 +745,7 @@ START_TEST(touchpad_clickfinger_to_area_method) litest_event(dev, EV_KEY, BTN_LEFT, 0); litest_event(dev, EV_SYN, SYN_REPORT, 0); litest_touch_up(dev, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_button_event(li, BTN_RIGHT, LIBINPUT_BUTTON_STATE_PRESSED); @@ -763,7 +763,7 @@ START_TEST(touchpad_clickfinger_to_area_method) litest_event(dev, EV_KEY, BTN_LEFT, 0); litest_event(dev, EV_SYN, SYN_REPORT, 0); litest_touch_up(dev, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_button_event(li, BTN_LEFT, LIBINPUT_BUTTON_STATE_PRESSED); @@ -785,7 +785,7 @@ START_TEST(touchpad_clickfinger_to_area_method_while_down) litest_touch_down(dev, 0, 95, 95); litest_event(dev, EV_KEY, BTN_LEFT, 1); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_button_event(li, BTN_RIGHT, LIBINPUT_BUTTON_STATE_PRESSED); @@ -794,7 +794,7 @@ START_TEST(touchpad_clickfinger_to_area_method_while_down) litest_event(dev, EV_KEY, BTN_LEFT, 0); litest_event(dev, EV_SYN, SYN_REPORT, 0); litest_touch_up(dev, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_button_event(li, BTN_RIGHT, LIBINPUT_BUTTON_STATE_RELEASED); @@ -808,7 +808,7 @@ START_TEST(touchpad_clickfinger_to_area_method_while_down) litest_event(dev, EV_KEY, BTN_LEFT, 0); litest_event(dev, EV_SYN, SYN_REPORT, 0); litest_touch_up(dev, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_button_event(li, BTN_LEFT, LIBINPUT_BUTTON_STATE_PRESSED); @@ -834,7 +834,7 @@ START_TEST(touchpad_area_to_clickfinger_method) litest_event(dev, EV_KEY, BTN_LEFT, 0); litest_event(dev, EV_SYN, SYN_REPORT, 0); litest_touch_up(dev, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_button_event(li, BTN_LEFT, LIBINPUT_BUTTON_STATE_PRESSED); @@ -849,7 +849,7 @@ START_TEST(touchpad_area_to_clickfinger_method) litest_event(dev, EV_KEY, BTN_LEFT, 0); litest_event(dev, EV_SYN, SYN_REPORT, 0); litest_touch_up(dev, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_button_event(li, BTN_RIGHT, LIBINPUT_BUTTON_STATE_PRESSED); @@ -880,7 +880,7 @@ START_TEST(touchpad_area_to_clickfinger_method_while_down) litest_event(dev, EV_KEY, BTN_LEFT, 0); litest_event(dev, EV_SYN, SYN_REPORT, 0); litest_touch_up(dev, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_button_event(li, BTN_LEFT, LIBINPUT_BUTTON_STATE_RELEASED); @@ -891,7 +891,7 @@ START_TEST(touchpad_area_to_clickfinger_method_while_down) litest_event(dev, EV_KEY, BTN_LEFT, 0); litest_event(dev, EV_SYN, SYN_REPORT, 0); litest_touch_up(dev, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_button_event(li, BTN_RIGHT, LIBINPUT_BUTTON_STATE_PRESSED); @@ -916,13 +916,13 @@ START_TEST(touchpad_clickfinger_3fg_tool_position) litest_event(dev, EV_KEY, BTN_TOOL_DOUBLETAP, 0); litest_event(dev, EV_KEY, BTN_TOOL_TRIPLETAP, 1); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_event(dev, EV_KEY, BTN_LEFT, 1); litest_event(dev, EV_SYN, SYN_REPORT, 0); litest_event(dev, EV_KEY, BTN_LEFT, 0); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_button_event(li, BTN_RIGHT, LIBINPUT_BUTTON_STATE_PRESSED); @@ -944,13 +944,13 @@ START_TEST(touchpad_clickfinger_4fg_tool_position) litest_event(dev, EV_KEY, BTN_TOOL_DOUBLETAP, 0); litest_event(dev, EV_KEY, BTN_TOOL_QUADTAP, 1); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_event(dev, EV_KEY, BTN_LEFT, 1); litest_event(dev, EV_SYN, SYN_REPORT, 0); litest_event(dev, EV_KEY, BTN_LEFT, 0); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_button_event(li, BTN_MIDDLE, @@ -1000,7 +1000,7 @@ START_TEST(touchpad_clickfinger_appletouch_1fg) litest_event(dev, EV_SYN, SYN_REPORT, 0); litest_touch_up(dev, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_button_event(li, BTN_LEFT, LIBINPUT_BUTTON_STATE_PRESSED); @@ -1027,7 +1027,7 @@ START_TEST(touchpad_clickfinger_appletouch_2fg) litest_touch_up(dev, 0); litest_touch_up(dev, 1); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_button_event(li, BTN_RIGHT, LIBINPUT_BUTTON_STATE_PRESSED); @@ -1056,7 +1056,7 @@ START_TEST(touchpad_clickfinger_appletouch_3fg) litest_touch_up(dev, 1); litest_touch_up(dev, 2); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_button_event(li, BTN_MIDDLE, LIBINPUT_BUTTON_STATE_PRESSED); @@ -1100,7 +1100,7 @@ START_TEST(touchpad_clickfinger_click_drag) litest_button_click(dev, BTN_LEFT, true); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_button_event(li, button, LIBINPUT_BUTTON_STATE_PRESSED); @@ -1120,7 +1120,7 @@ START_TEST(touchpad_clickfinger_click_drag) break; } litest_pop_event_frame(dev); - libinput_dispatch(li); + litest_dispatch(li); } litest_assert_only_typed_events(li, LIBINPUT_EVENT_POINTER_MOTION); @@ -1149,7 +1149,7 @@ START_TEST(touchpad_clickfinger_click_drag) litest_touch_up(dev, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_empty_queue(li); } END_TEST @@ -1166,7 +1166,7 @@ START_TEST(touchpad_btn_left) litest_event(dev, EV_KEY, BTN_LEFT, 0); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_button_event(li, BTN_LEFT, LIBINPUT_BUTTON_STATE_PRESSED); @@ -1191,7 +1191,7 @@ START_TEST(clickpad_btn_left) litest_event(dev, EV_KEY, BTN_LEFT, 0); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); ck_assert_int_eq(libinput_next_event_type(li), LIBINPUT_EVENT_NONE); } END_TEST @@ -1207,11 +1207,11 @@ START_TEST(clickpad_click_n_drag) litest_event(dev, EV_KEY, BTN_LEFT, 1); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_button_event(li, BTN_LEFT, LIBINPUT_BUTTON_STATE_PRESSED); - libinput_dispatch(li); + litest_dispatch(li); ck_assert_int_eq(libinput_next_event_type(li), LIBINPUT_EVENT_NONE); /* now put a second finger down */ @@ -1307,7 +1307,7 @@ START_TEST(clickpad_softbutton_left) BTN_LEFT, LIBINPUT_BUTTON_STATE_RELEASED); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_empty_queue(li); } @@ -1336,7 +1336,7 @@ START_TEST(clickpad_softbutton_middle) BTN_MIDDLE, LIBINPUT_BUTTON_STATE_RELEASED); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_empty_queue(li); } @@ -1365,7 +1365,7 @@ START_TEST(clickpad_softbutton_right) BTN_RIGHT, LIBINPUT_BUTTON_STATE_RELEASED); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_empty_queue(li); } @@ -1485,15 +1485,15 @@ START_TEST(clickpad_softbutton_left_1st_fg_move) /* move out of the area, then wait for softbutton timer */ litest_touch_move_to(dev, 0, 20, 90, 50, 50, 20); - libinput_dispatch(li); + litest_dispatch(li); litest_timeout_softbuttons(); - libinput_dispatch(li); + litest_dispatch(li); litest_drain_events(li); /* move down left, expect motion */ litest_touch_move_to(dev, 0, 50, 50, 20, 90, 20); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); ck_assert_notnull(event); while (event) { @@ -1512,7 +1512,7 @@ START_TEST(clickpad_softbutton_left_1st_fg_move) nevents++; libinput_event_destroy(event); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); } @@ -1559,7 +1559,7 @@ START_TEST(clickpad_softbutton_left_2nd_fg_move) litest_touch_down(dev, 1, 20, 20); litest_touch_move_to(dev, 1, 20, 20, 80, 20, 25); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); ck_assert_notnull(event); while (event) { @@ -1581,7 +1581,7 @@ START_TEST(clickpad_softbutton_left_2nd_fg_move) } libinput_event_destroy(event); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); } litest_touch_up(dev, 1); @@ -1590,7 +1590,7 @@ START_TEST(clickpad_softbutton_left_2nd_fg_move) litest_touch_down(dev, 1, 20, 20); litest_touch_move_to(dev, 1, 20, 20, 20, 80, 15); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); ck_assert_notnull(event); while (event) { @@ -1608,7 +1608,7 @@ START_TEST(clickpad_softbutton_left_2nd_fg_move) ck_assert(y > 0); libinput_event_destroy(event); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); } @@ -1706,14 +1706,14 @@ START_TEST(clickpad_softbutton_hover_into_buttons) litest_drain_events(li); litest_hover_start(dev, 0, 50, 50); - libinput_dispatch(li); + litest_dispatch(li); litest_hover_move_to(dev, 0, 50, 50, 90, 90, 20); - libinput_dispatch(li); + litest_dispatch(li); litest_touch_move_to(dev, 0, 90, 90, 91, 91, 1); litest_button_click(dev, BTN_LEFT, true); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_button_event(li, BTN_RIGHT, @@ -1827,13 +1827,13 @@ START_TEST(clickpad_topsoftbuttons_move_out_leftclick_before_timeout) litest_drain_events(li); litest_touch_down(dev, 0, 80, 5); - libinput_dispatch(li); + litest_dispatch(li); litest_timeout_softbuttons(); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_empty_queue(li); litest_touch_move_to(dev, 0, 80, 5, 80, 90, 20); - libinput_dispatch(li); + litest_dispatch(li); litest_event(dev, EV_KEY, BTN_LEFT, 1); litest_event(dev, EV_SYN, SYN_REPORT, 0); @@ -1861,15 +1861,15 @@ START_TEST(clickpad_topsoftbuttons_move_out_leftclick) litest_drain_events(li); litest_touch_down(dev, 0, 80, 5); - libinput_dispatch(li); + litest_dispatch(li); litest_timeout_softbuttons(); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_empty_queue(li); litest_touch_move_to(dev, 0, 80, 5, 80, 90, 20); - libinput_dispatch(li); + litest_dispatch(li); litest_timeout_softbuttons(); - libinput_dispatch(li); + litest_dispatch(li); litest_event(dev, EV_KEY, BTN_LEFT, 1); litest_event(dev, EV_SYN, SYN_REPORT, 0); @@ -1988,7 +1988,7 @@ START_TEST(clickpad_middleemulation_config_delayed) litest_touch_down(dev, 0, 30, 95); litest_event(dev, EV_KEY, BTN_LEFT, 1); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); /* actual config is delayed, but status is immediate */ status = libinput_device_config_middle_emulation_set_enabled(device, @@ -2033,7 +2033,7 @@ START_TEST(clickpad_middleemulation_click) BTN_MIDDLE, LIBINPUT_BUTTON_STATE_RELEASED); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_empty_queue(li); } @@ -2064,7 +2064,7 @@ START_TEST(clickpad_middleemulation_click_middle_left) BTN_LEFT, LIBINPUT_BUTTON_STATE_RELEASED); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_empty_queue(li); } @@ -2095,7 +2095,7 @@ START_TEST(clickpad_middleemulation_click_middle_right) BTN_RIGHT, LIBINPUT_BUTTON_STATE_RELEASED); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_empty_queue(li); } @@ -2127,7 +2127,7 @@ START_TEST(clickpad_middleemulation_click_enable_while_down) BTN_MIDDLE, LIBINPUT_BUTTON_STATE_RELEASED); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_empty_queue(li); @@ -2145,7 +2145,7 @@ START_TEST(clickpad_middleemulation_click_enable_while_down) BTN_LEFT, LIBINPUT_BUTTON_STATE_RELEASED); - libinput_dispatch(li); + litest_dispatch(li); } END_TEST @@ -2178,7 +2178,7 @@ START_TEST(clickpad_middleemulation_click_disable_while_down) litest_assert_button_event(li, BTN_MIDDLE, LIBINPUT_BUTTON_STATE_RELEASED); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_empty_queue(li); @@ -2196,7 +2196,7 @@ START_TEST(clickpad_middleemulation_click_disable_while_down) BTN_MIDDLE, LIBINPUT_BUTTON_STATE_RELEASED); - libinput_dispatch(li); + litest_dispatch(li); } END_TEST diff --git a/test/test-touchpad-tap.c b/test/test-touchpad-tap.c index 8cf539f9..87de1baa 100644 --- a/test/test-touchpad-tap.c +++ b/test/test-touchpad-tap.c @@ -44,7 +44,7 @@ START_TEST(touchpad_1fg_tap) litest_touch_down(dev, 0, 50, 50); litest_touch_up(dev, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_button_event(li, BTN_LEFT, LIBINPUT_BUTTON_STATE_PRESSED); @@ -155,11 +155,11 @@ START_TEST(touchpad_doubletap) litest_touch_up(dev, 0); break; } - libinput_dispatch(li); + litest_dispatch(li); litest_timeout_tap(); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); ptrev = litest_is_button_event(event, button, @@ -256,12 +256,12 @@ START_TEST(touchpad_multitap) break; } - libinput_dispatch(li); + litest_dispatch(li); msleep(10); } litest_timeout_tapndrag(); - libinput_dispatch(li); + litest_dispatch(li); for (ntaps = 0; ntaps <= range; ntaps++) { event = libinput_get_event(li); @@ -345,14 +345,14 @@ START_TEST(touchpad_multitap_n_drag_move) litest_touch_up(dev, 0); break; } - libinput_dispatch(li); + litest_dispatch(li); msleep(10); } - libinput_dispatch(li); + litest_dispatch(li); litest_touch_down(dev, 0, 50, 50); litest_touch_move_to(dev, 0, 50, 50, 70, 50, 10); - libinput_dispatch(li); + litest_dispatch(li); for (ntaps = 0; ntaps < range; ntaps++) { event = libinput_get_event(li); @@ -385,7 +385,7 @@ START_TEST(touchpad_multitap_n_drag_move) LIBINPUT_EVENT_POINTER_MOTION); litest_touch_up(dev, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_timeout_tapndrag(); litest_assert_button_event(li, button, @@ -458,15 +458,15 @@ START_TEST(touchpad_multitap_n_drag_2fg) break; } - libinput_dispatch(li); + litest_dispatch(li); msleep(10); } - libinput_dispatch(li); + litest_dispatch(li); litest_touch_down(dev, 0, 50, 50); litest_touch_move_to(dev, 0, 50, 50, 30, 50, 10); litest_touch_down(dev, 1, 70, 50); - libinput_dispatch(li); + litest_dispatch(li); for (ntaps = 0; ntaps < range; ntaps++) { event = libinput_get_event(li); @@ -502,7 +502,7 @@ START_TEST(touchpad_multitap_n_drag_2fg) litest_touch_up(dev, 1); litest_touch_up(dev, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_timeout_tapndrag(); litest_assert_button_event(li, button, @@ -572,15 +572,15 @@ START_TEST(touchpad_multitap_n_drag_click) break; } - libinput_dispatch(li); + litest_dispatch(li); msleep(10); } litest_touch_down(dev, 0, 50, 50); - libinput_dispatch(li); + litest_dispatch(li); litest_button_click(dev, BTN_LEFT, true); litest_button_click(dev, BTN_LEFT, false); - libinput_dispatch(li); + litest_dispatch(li); for (ntaps = 0; ntaps <= range; ntaps++) { event = libinput_get_event(li); @@ -674,13 +674,13 @@ START_TEST(touchpad_multitap_timeout) break; } - libinput_dispatch(li); + litest_dispatch(li); msleep(10); } - libinput_dispatch(li); + litest_dispatch(li); litest_timeout_tapndrag(); - libinput_dispatch(li); + litest_dispatch(li); for (ntaps = 0; ntaps <= range; ntaps++) { event = libinput_get_event(li); @@ -764,16 +764,16 @@ START_TEST(touchpad_multitap_n_drag_timeout) break; } - libinput_dispatch(li); + litest_dispatch(li); msleep(10); } - libinput_dispatch(li); + litest_dispatch(li); litest_touch_down(dev, 0, 50, 50); - libinput_dispatch(li); + litest_dispatch(li); litest_timeout_tap(); - libinput_dispatch(li); + litest_dispatch(li); for (ntaps = 0; ntaps < range; ntaps++) { event = libinput_get_event(li); @@ -808,7 +808,7 @@ START_TEST(touchpad_multitap_n_drag_timeout) LIBINPUT_EVENT_POINTER_MOTION); litest_touch_up(dev, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_timeout_tapndrag(); litest_assert_button_event(li, button, @@ -865,7 +865,7 @@ START_TEST(touchpad_multitap_n_drag_high_delay) litest_touch_down(dev, 0, 40, 30); break; } - libinput_dispatch(li); + litest_dispatch(li); msleep(100); switch (nfingers) { @@ -879,14 +879,14 @@ START_TEST(touchpad_multitap_n_drag_high_delay) litest_touch_up(dev, 0); break; } - libinput_dispatch(li); + litest_dispatch(li); msleep(100); } - libinput_dispatch(li); + litest_dispatch(li); litest_touch_down(dev, 0, 50, 50); litest_touch_move_to(dev, 0, 50, 50, 50, 70, 10); - libinput_dispatch(li); + litest_dispatch(li); for (ntaps = 0; ntaps < range; ntaps++) { litest_assert_button_event(li, button, @@ -901,7 +901,7 @@ START_TEST(touchpad_multitap_n_drag_high_delay) LIBINPUT_EVENT_POINTER_MOTION); litest_touch_up(dev, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_timeout_tapndrag(); litest_assert_button_event(li, button, LIBINPUT_BUTTON_STATE_RELEASED); @@ -971,16 +971,16 @@ START_TEST(touchpad_multitap_n_drag_tap) break; } - libinput_dispatch(li); + litest_dispatch(li); msleep(10); } - libinput_dispatch(li); + litest_dispatch(li); litest_touch_down(dev, 0, 50, 50); - libinput_dispatch(li); + litest_dispatch(li); litest_timeout_tap(); - libinput_dispatch(li); + litest_dispatch(li); for (ntaps = 0; ntaps < range; ntaps++) { event = libinput_get_event(li); @@ -1086,16 +1086,16 @@ START_TEST(touchpad_multitap_n_drag_tap_click) break; } - libinput_dispatch(li); + litest_dispatch(li); msleep(10); } - libinput_dispatch(li); + litest_dispatch(li); litest_touch_down(dev, 0, 50, 50); - libinput_dispatch(li); + litest_dispatch(li); litest_timeout_tap(); - libinput_dispatch(li); + litest_dispatch(li); for (ntaps = 0; ntaps < range; ntaps++) { event = libinput_get_event(li); @@ -1133,7 +1133,7 @@ START_TEST(touchpad_multitap_n_drag_tap_click) litest_touch_down(dev, 0, 70, 50); litest_button_click(dev, BTN_LEFT, true); litest_button_click(dev, BTN_LEFT, false); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_button_event(li, button, @@ -1208,12 +1208,12 @@ START_TEST(touchpad_tap_n_drag) litest_touch_down(dev, 0, 50, 50); litest_touch_move_to(dev, 0, 50, 50, 80, 80, 20); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_button_event(li, button, LIBINPUT_BUTTON_STATE_PRESSED); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_only_typed_events(li, LIBINPUT_EVENT_POINTER_MOTION); @@ -1223,7 +1223,7 @@ START_TEST(touchpad_tap_n_drag) * immediately, not after a timeout that the helper functions may * trigger. */ - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); ck_assert_notnull(event); litest_is_button_event(event, @@ -1291,12 +1291,12 @@ START_TEST(touchpad_tap_n_drag_draglock) litest_touch_move_to(dev, 0, 50, 50, 80, 80, 20); litest_touch_up(dev, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_button_event(li, button, LIBINPUT_BUTTON_STATE_PRESSED); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_only_typed_events(li, LIBINPUT_EVENT_POINTER_MOTION); @@ -1376,12 +1376,12 @@ START_TEST(touchpad_tap_n_drag_draglock_tap) litest_touch_move_to(dev, 0, 50, 50, 80, 80, 20); litest_touch_up(dev, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_button_event(li, button, LIBINPUT_BUTTON_STATE_PRESSED); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_only_typed_events(li, LIBINPUT_EVENT_POINTER_MOTION); @@ -1477,12 +1477,12 @@ START_TEST(touchpad_tap_n_drag_draglock_tap_click) } litest_touch_down(dev, 0, 50, 50); litest_touch_move_to(dev, 0, 50, 50, 80, 80, 20); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_button_event(li, button, LIBINPUT_BUTTON_STATE_PRESSED); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_only_typed_events(li, LIBINPUT_EVENT_POINTER_MOTION); @@ -1490,7 +1490,7 @@ START_TEST(touchpad_tap_n_drag_draglock_tap_click) litest_touch_down(dev, 0, 50, 50); litest_button_click(dev, BTN_LEFT, true); litest_button_click(dev, BTN_LEFT, false); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_button_event(li, button, LIBINPUT_BUTTON_STATE_RELEASED); @@ -1561,7 +1561,7 @@ START_TEST(touchpad_tap_n_drag_draglock_timeout) break; } litest_touch_down(dev, 0, 50, 50); - libinput_dispatch(li); + litest_dispatch(li); litest_timeout_tap(); litest_assert_button_event(li, button, @@ -1569,7 +1569,7 @@ START_TEST(touchpad_tap_n_drag_draglock_timeout) litest_assert_empty_queue(li); litest_touch_up(dev, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_timeout_tapndrag(); litest_assert_button_event(li, button, @@ -1632,7 +1632,7 @@ START_TEST(touchpad_tap_n_drag_draglock_sticky) break; } litest_touch_down(dev, 0, 50, 50); - libinput_dispatch(li); + litest_dispatch(li); litest_timeout_tap(); litest_assert_button_event(li, button, @@ -1640,7 +1640,7 @@ START_TEST(touchpad_tap_n_drag_draglock_sticky) litest_assert_empty_queue(li); litest_touch_up(dev, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_timeout_tapndrag(); litest_assert_empty_queue(li); @@ -1715,12 +1715,12 @@ START_TEST(touchpad_tap_n_drag_2fg) break; } litest_touch_down(dev, 0, 30, 70); - libinput_dispatch(li); + litest_dispatch(li); litest_timeout_tap(); - libinput_dispatch(li); + litest_dispatch(li); litest_touch_down(dev, 1, 80, 70); litest_touch_move_to(dev, 0, 30, 70, 30, 30, 10); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_button_event(li, button, LIBINPUT_BUTTON_STATE_PRESSED); @@ -1795,15 +1795,15 @@ START_TEST(touchpad_tap_n_drag_2fg_scroll) } /* Two fingers down + move to trigger scrolling */ - libinput_dispatch(li); + litest_dispatch(li); litest_touch_down(dev, 0, 50, 50); litest_touch_down(dev, 1, 70, 50); - libinput_dispatch(li); + litest_dispatch(li); litest_touch_move_two_touches(dev, 50, 50, 70, 50, 0, 20, 10); - libinput_dispatch(li); + litest_dispatch(li); litest_touch_up(dev, 0); litest_touch_up(dev, 1); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_button_event(li, button, LIBINPUT_BUTTON_STATE_PRESSED); @@ -1886,15 +1886,15 @@ START_TEST(touchpad_tap_n_drag_draglock_2fg_scroll) litest_touch_up(dev, 0); /* Two fingers down + move to trigger scrolling */ - libinput_dispatch(li); + litest_dispatch(li); litest_touch_down(dev, 0, 50, 50); litest_touch_down(dev, 1, 70, 50); - libinput_dispatch(li); + litest_dispatch(li); litest_touch_move_two_touches(dev, 50, 50, 70, 50, 0, 20, 10); - libinput_dispatch(li); + litest_dispatch(li); litest_touch_up(dev, 0); litest_touch_up(dev, 1); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_button_event(li, button, LIBINPUT_BUTTON_STATE_RELEASED); @@ -1964,12 +1964,12 @@ START_TEST(touchpad_tap_n_drag_3fg_btntool) break; } litest_touch_down(dev, 0, 30, 70); - libinput_dispatch(li); + litest_dispatch(li); litest_timeout_tap(); - libinput_dispatch(li); + litest_dispatch(li); litest_touch_down(dev, 1, 80, 90); litest_touch_move_to(dev, 0, 30, 70, 30, 30, 5); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_button_event(li, button, LIBINPUT_BUTTON_STATE_PRESSED); @@ -1980,7 +1980,7 @@ START_TEST(touchpad_tap_n_drag_3fg_btntool) litest_event(dev, EV_KEY, BTN_TOOL_TRIPLETAP, 1); litest_event(dev, EV_KEY, BTN_TOOL_DOUBLETAP, 0); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_button_event(li, button, LIBINPUT_BUTTON_STATE_RELEASED); @@ -2057,13 +2057,13 @@ START_TEST(touchpad_tap_n_drag_3fg) } /* 1fg down triggers the drag */ litest_touch_down(dev, 0, 30, 70); - libinput_dispatch(li); + litest_dispatch(li); litest_timeout_tap(); - libinput_dispatch(li); + litest_dispatch(li); /* 2fg is allowed now without cancelling the drag */ litest_touch_down(dev, 1, 80, 90); litest_touch_move_to(dev, 0, 30, 70, 30, 30, 10); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_button_event(li, button, LIBINPUT_BUTTON_STATE_PRESSED); @@ -2073,7 +2073,7 @@ START_TEST(touchpad_tap_n_drag_3fg) /* Putting down a third finger should end the drag */ litest_touch_down(dev, 2, 50, 50); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_button_event(li, button, LIBINPUT_BUTTON_STATE_RELEASED); @@ -2146,14 +2146,14 @@ START_TEST(touchpad_tap_n_drag_3fg_swipe) litest_touch_down(dev, 0, 30, 50); litest_touch_down(dev, 1, 50, 50); litest_touch_down(dev, 2, 80, 50); - libinput_dispatch(li); + litest_dispatch(li); litest_touch_move_three_touches(dev, 30, 50, 50, 50, 80, 50, 0, 20, 10); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_button_event(li, button, LIBINPUT_BUTTON_STATE_PRESSED); @@ -2248,14 +2248,14 @@ START_TEST(touchpad_tap_n_drag_draglock_3fg_swipe) litest_touch_down(dev, 0, 30, 50); litest_touch_down(dev, 1, 50, 50); litest_touch_down(dev, 2, 80, 50); - libinput_dispatch(li); + litest_dispatch(li); litest_touch_move_three_touches(dev, 30, 50, 50, 50, 80, 50, 0, 20, 10); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_button_event(li, button, LIBINPUT_BUTTON_STATE_RELEASED); @@ -2309,9 +2309,9 @@ START_TEST(touchpad_2fg_tap) litest_touch_up(dev, 0); litest_touch_up(dev, 1); - libinput_dispatch(li); + litest_dispatch(li); litest_timeout_tap(); - libinput_dispatch(li); + litest_dispatch(li); ev = libinput_get_event(li); ptrev = litest_is_button_event(ev, @@ -2364,9 +2364,9 @@ START_TEST(touchpad_2fg_tap_inverted) litest_touch_up(dev, 1); litest_touch_up(dev, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_timeout_tap(); - libinput_dispatch(li); + litest_dispatch(li); ev = libinput_get_event(li); ptrev = litest_is_button_event(ev, @@ -2406,7 +2406,7 @@ START_TEST(touchpad_2fg_tap_move_on_release) litest_touch_up(dev, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_button_event(li, BTN_RIGHT, @@ -2432,7 +2432,7 @@ START_TEST(touchpad_2fg_tap_n_hold_first) litest_touch_down(dev, 1, 70, 70); litest_touch_up(dev, 1); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_empty_queue(li); litest_timeout_tap(); @@ -2454,7 +2454,7 @@ START_TEST(touchpad_2fg_tap_n_hold_second) litest_touch_down(dev, 1, 70, 70); litest_touch_up(dev, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_empty_queue(li); litest_timeout_tap(); @@ -2482,7 +2482,7 @@ START_TEST(touchpad_2fg_tap_quickrelease) litest_event(dev, EV_KEY, BTN_TOUCH, 0); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_button_event(li, BTN_RIGHT, LIBINPUT_BUTTON_STATE_PRESSED); @@ -2512,10 +2512,10 @@ START_TEST(touchpad_1fg_tap_click) litest_event(dev, EV_SYN, SYN_REPORT, 0); litest_event(dev, EV_KEY, BTN_LEFT, 0); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_timeout_tap(); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_button_event(li, BTN_LEFT, LIBINPUT_BUTTON_STATE_PRESSED); @@ -2546,7 +2546,7 @@ START_TEST(touchpad_2fg_tap_click) litest_touch_up(dev, 1); litest_touch_up(dev, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_button_event(li, BTN_LEFT, LIBINPUT_BUTTON_STATE_PRESSED); @@ -2581,7 +2581,7 @@ START_TEST(clickpad_2fg_tap_click) litest_touch_up(dev, 1); litest_touch_up(dev, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_button_event(li, BTN_LEFT, LIBINPUT_BUTTON_STATE_PRESSED); @@ -2613,7 +2613,7 @@ START_TEST(touchpad_2fg_tap_click_apple) litest_touch_up(dev, 1); litest_touch_up(dev, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_button_event(li, BTN_RIGHT, LIBINPUT_BUTTON_STATE_PRESSED); @@ -2662,9 +2662,9 @@ START_TEST(touchpad_no_2fg_tap_after_timeout) -> no event */ litest_touch_down(dev, 0, 50, 50); - libinput_dispatch(dev->libinput); + litest_dispatch(dev->libinput); litest_timeout_tap(); - libinput_dispatch(dev->libinput); + litest_dispatch(dev->libinput); litest_drain_events(dev->libinput); litest_touch_down(dev, 1, 70, 50); @@ -2691,12 +2691,12 @@ START_TEST(touchpad_no_first_fg_tap_after_move) */ litest_touch_down(dev, 0, 50, 50); litest_touch_down(dev, 1, 70, 50); - libinput_dispatch(dev->libinput); + litest_dispatch(dev->libinput); litest_touch_move_to(dev, 1, 70, 50, 90, 90, 10); - libinput_dispatch(dev->libinput); + litest_dispatch(dev->libinput); litest_touch_up(dev, 0); litest_touch_up(dev, 1); - libinput_dispatch(dev->libinput); + litest_dispatch(dev->libinput); while ((event = libinput_get_event(li))) { ck_assert_int_ne(libinput_event_get_type(event), @@ -2766,7 +2766,7 @@ START_TEST(touchpad_double_tap_click) litest_event(dev, EV_SYN, SYN_REPORT, 0); litest_touch_up(dev, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_button_event(li, button, LIBINPUT_BUTTON_STATE_PRESSED); @@ -2855,7 +2855,7 @@ START_TEST(touchpad_tap_n_drag_click) litest_event(dev, EV_SYN, SYN_REPORT, 0); litest_touch_up(dev, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_button_event(li, BTN_LEFT, LIBINPUT_BUTTON_STATE_RELEASED); @@ -2908,9 +2908,9 @@ START_TEST(touchpad_3fg_tap) litest_touch_up(dev, (i + 1) % 3); litest_touch_up(dev, (i + 0) % 3); - libinput_dispatch(li); + litest_dispatch(li); litest_timeout_tap(); - libinput_dispatch(li); + litest_dispatch(li); ev = libinput_get_event(li); ptrev = litest_is_button_event(ev, @@ -2963,9 +2963,9 @@ START_TEST(touchpad_3fg_tap_tap_again) litest_touch_up(dev, 1); litest_touch_up(dev, 2); - libinput_dispatch(li); + litest_dispatch(li); litest_timeout_tap(); - libinput_dispatch(li); + litest_dispatch(li); for (i = 0; i < 2; i++) { ev = libinput_get_event(li); @@ -3011,7 +3011,7 @@ START_TEST(touchpad_3fg_tap_quickrelease) litest_event(dev, EV_KEY, BTN_TOUCH, 0); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_button_event(li, BTN_MIDDLE, LIBINPUT_BUTTON_STATE_PRESSED); @@ -3019,7 +3019,7 @@ START_TEST(touchpad_3fg_tap_quickrelease) litest_assert_button_event(li, BTN_MIDDLE, LIBINPUT_BUTTON_STATE_RELEASED); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_empty_queue(li); } END_TEST @@ -3047,10 +3047,10 @@ START_TEST(touchpad_3fg_tap_pressure_btntool) litest_touch_down(dev, 0, 50, 50); litest_touch_down(dev, 1, 70, 50); - libinput_dispatch(li); + litest_dispatch(li); litest_timeout_tap(); - libinput_dispatch(li); + litest_dispatch(li); litest_drain_events(li); /* drop below the pressure threshold in the same frame as starting a @@ -3063,7 +3063,7 @@ START_TEST(touchpad_3fg_tap_pressure_btntool) litest_event(dev, EV_KEY, BTN_TOOL_DOUBLETAP, 0); litest_event(dev, EV_KEY, BTN_TOOL_TRIPLETAP, 1); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_push_event_frame(dev); litest_event(dev, EV_KEY, BTN_TOOL_DOUBLETAP, 1); @@ -3072,9 +3072,9 @@ START_TEST(touchpad_3fg_tap_pressure_btntool) litest_touch_up(dev, 0); litest_touch_up(dev, 1); - libinput_dispatch(li); + litest_dispatch(li); litest_timeout_tap(); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_button_event(li, BTN_MIDDLE, @@ -3112,7 +3112,7 @@ START_TEST(touchpad_3fg_tap_hover_btntool) litest_touch_down(dev, 0, 50, 50); litest_touch_down(dev, 1, 70, 50); - libinput_dispatch(li); + litest_dispatch(li); litest_touch_move_to(dev, 0, 50, 50, 50, 70, 10); litest_touch_move_to(dev, 1, 70, 50, 50, 70, 10); @@ -3124,7 +3124,7 @@ START_TEST(touchpad_3fg_tap_hover_btntool) litest_event(dev, EV_KEY, BTN_TOOL_DOUBLETAP, 0); litest_event(dev, EV_KEY, BTN_TOOL_TRIPLETAP, 1); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_push_event_frame(dev); litest_event(dev, EV_KEY, BTN_TOOL_DOUBLETAP, 1); @@ -3176,7 +3176,7 @@ START_TEST(touchpad_3fg_tap_btntool) litest_touch_up(dev, 1); litest_touch_up(dev, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_button_event(li, button, LIBINPUT_BUTTON_STATE_PRESSED); @@ -3227,7 +3227,7 @@ START_TEST(touchpad_3fg_tap_btntool_inverted) litest_touch_up(dev, 0); litest_touch_up(dev, 1); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_button_event(li, button, LIBINPUT_BUTTON_STATE_PRESSED); @@ -3274,14 +3274,14 @@ START_TEST(touchpad_3fg_tap_btntool_pointerjump) litest_event(dev, EV_SYN, SYN_REPORT, 0); /* Pointer jump should be ignored */ litest_touch_move_to(dev, 0, 50, 50, 20, 20, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_event(dev, EV_KEY, BTN_TOOL_TRIPLETAP, 0); litest_event(dev, EV_KEY, BTN_TOOL_DOUBLETAP, 1); litest_event(dev, EV_SYN, SYN_REPORT, 0); litest_touch_up(dev, 1); litest_touch_up(dev, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_button_event(li, button, LIBINPUT_BUTTON_STATE_PRESSED); @@ -3318,7 +3318,7 @@ START_TEST(touchpad_3fg_tap_slot_release_btntool) litest_event(dev, EV_KEY, BTN_TOOL_FINGER, 1); litest_event(dev, EV_KEY, BTN_TOUCH, 1); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); msleep(2); /* touch 2 and TRIPLETAP down */ @@ -3330,7 +3330,7 @@ START_TEST(touchpad_3fg_tap_slot_release_btntool) litest_event(dev, EV_KEY, BTN_TOOL_FINGER, 0); litest_event(dev, EV_KEY, BTN_TOOL_TRIPLETAP, 1); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); msleep(2); /* touch 2 up, coordinate jump + ends slot 1, TRIPLETAP stays */ @@ -3345,7 +3345,7 @@ START_TEST(touchpad_3fg_tap_slot_release_btntool) litest_event(dev, EV_ABS, ABS_Y, 3800); litest_event(dev, EV_ABS, ABS_PRESSURE, 78); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); msleep(2); /* slot 2 reactivated @@ -3363,7 +3363,7 @@ START_TEST(touchpad_3fg_tap_slot_release_btntool) litest_event(dev, EV_ABS, ABS_Y, 3200); litest_event(dev, EV_ABS, ABS_PRESSURE, 78); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_restore_log_handler(li); /* now end all three */ @@ -3375,7 +3375,7 @@ START_TEST(touchpad_3fg_tap_slot_release_btntool) litest_event(dev, EV_KEY, BTN_TOOL_TRIPLETAP, 0); litest_event(dev, EV_SYN, SYN_REPORT, 0); litest_timeout_tap(); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_button_event(li, BTN_MIDDLE, LIBINPUT_BUTTON_STATE_PRESSED); @@ -3407,16 +3407,16 @@ START_TEST(touchpad_3fg_tap_after_scroll) litest_drain_events(li); litest_timeout_tap(); - libinput_dispatch(li); + litest_dispatch(li); /* third finger tap without the other two fingers moving */ litest_touch_down(dev, 2, 60, 40); - libinput_dispatch(li); + litest_dispatch(li); litest_touch_up(dev, 2); - libinput_dispatch(li); + litest_dispatch(li); litest_timeout_tap(); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_empty_queue(li); } @@ -3447,7 +3447,7 @@ START_TEST(touchpad_4fg_tap) litest_touch_up(dev, (i + 1) % 4); litest_touch_up(dev, (i + 0) % 4); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_empty_queue(li); litest_timeout_tap(); litest_assert_empty_queue(li); @@ -3484,7 +3484,7 @@ START_TEST(touchpad_4fg_tap_quickrelease) litest_event(dev, EV_KEY, BTN_TOUCH, 0); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_empty_queue(li); litest_timeout_tap(); litest_assert_empty_queue(li); @@ -3526,15 +3526,15 @@ START_TEST(touchpad_move_after_touch) } /* move finger 1 */ - libinput_dispatch(li); + litest_dispatch(li); litest_touch_move_to(dev, 0, 70, 30, 70, 60, 10); - libinput_dispatch(li); + litest_dispatch(li); /* lift finger 1, put it back */ litest_touch_up(dev, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_touch_down(dev, 0, 40, 30); - libinput_dispatch(li); + litest_dispatch(li); /* lift fingers up */ switch(nfingers) { @@ -3554,9 +3554,9 @@ START_TEST(touchpad_move_after_touch) litest_touch_up(dev, 0); break; } - libinput_dispatch(li); + litest_dispatch(li); litest_timeout_tap(); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_no_typed_events(li, LIBINPUT_EVENT_POINTER_BUTTON); } @@ -3589,7 +3589,7 @@ START_TEST(touchpad_5fg_tap) litest_touch_up(dev, (i + 1) % 5); litest_touch_up(dev, (i + 0) % 5); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_empty_queue(li); litest_timeout_tap(); litest_assert_empty_queue(li); @@ -3629,7 +3629,7 @@ START_TEST(touchpad_5fg_tap_quickrelease) litest_event(dev, EV_KEY, BTN_TOUCH, 0); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_empty_queue(li); litest_timeout_tap(); litest_assert_empty_queue(li); @@ -3653,10 +3653,10 @@ START_TEST(clickpad_1fg_tap_click) litest_event(dev, EV_KEY, BTN_LEFT, 0); litest_event(dev, EV_SYN, SYN_REPORT, 0); litest_touch_up(dev, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_timeout_tap(); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_button_event(li, BTN_LEFT, LIBINPUT_BUTTON_STATE_PRESSED); @@ -3843,7 +3843,7 @@ START_TEST(touchpad_tap_map_delayed) litest_touch_down(dev, 0, 50, 50); litest_touch_down(dev, 1, 70, 70); - libinput_dispatch(li); + litest_dispatch(li); litest_set_tap_map(dev->libinput_device, LIBINPUT_CONFIG_TAP_MAP_LMR); @@ -3853,7 +3853,7 @@ START_TEST(touchpad_tap_map_delayed) litest_touch_up(dev, 0); litest_touch_up(dev, 1); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_button_event(li, BTN_RIGHT, @@ -4005,11 +4005,11 @@ START_TEST(touchpad_drag_disabled) break; } - libinput_dispatch(li); + litest_dispatch(li); litest_touch_down(dev, 0, 50, 50); litest_touch_move_to(dev, 0, 50, 50, 90, 90, 10); litest_touch_up(dev, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_button_event(li, button, @@ -4068,7 +4068,7 @@ START_TEST(touchpad_drag_disabled_immediate) break; } msleep(10); /* to force a time difference */ - libinput_dispatch(li); + litest_dispatch(li); switch (nfingers) { case 3: litest_touch_up(dev, 2); @@ -4080,7 +4080,7 @@ START_TEST(touchpad_drag_disabled_immediate) litest_touch_up(dev, 0); break; } - libinput_dispatch(li); + litest_dispatch(li); ev = libinput_get_event(li); ptrev = litest_is_button_event(ev, @@ -4160,14 +4160,14 @@ START_TEST(touchpad_drag_disabled_multitap_no_drag) break; } - libinput_dispatch(li); + litest_dispatch(li); msleep(10); } - libinput_dispatch(li); + litest_dispatch(li); litest_touch_down(dev, 0, 50, 50); litest_touch_move_to(dev, 0, 50, 50, 70, 50, 10); - libinput_dispatch(li); + litest_dispatch(li); for (ntaps = 0; ntaps <= range; ntaps++) { event = libinput_get_event(li); @@ -4305,7 +4305,7 @@ START_TEST(touchpad_tap_palm_on_idle) litest_touch_down_extended(dev, 0, 50, 50, axes); litest_touch_up(dev, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_empty_queue(li); } @@ -4333,7 +4333,7 @@ START_TEST(touchpad_tap_palm_on_touch) litest_touch_move_to_extended(dev, 0, 50, 50, 50, 50, axes, 1); litest_touch_up(dev, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_empty_queue(li); } @@ -4358,13 +4358,13 @@ START_TEST(touchpad_tap_palm_on_touch_hold_timeout) /* Finger down is palm after tap timeout */ litest_touch_down(dev, 0, 50, 50); - libinput_dispatch(li); + litest_dispatch(li); litest_timeout_tap(); - libinput_dispatch(li); + litest_dispatch(li); litest_touch_move_to_extended(dev, 0, 50, 50, 50, 50, axes, 1); litest_touch_up(dev, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_empty_queue(li); } @@ -4395,7 +4395,7 @@ START_TEST(touchpad_tap_palm_on_touch_hold_move) litest_touch_move_to_extended(dev, 0, 60, 60, 60, 60, axes, 1); litest_touch_up(dev, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_empty_queue(li); } @@ -4461,7 +4461,7 @@ START_TEST(touchpad_tap_palm_on_tapped) litest_touch_up(dev, 0); break; } - libinput_dispatch(li); + litest_dispatch(li); litest_assert_button_event(li, button, @@ -4471,9 +4471,9 @@ START_TEST(touchpad_tap_palm_on_tapped) litest_touch_move_to_extended(dev, 0, 50, 50, 50, 50, axes, 1); litest_touch_up(dev, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_timeout_tap(); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_button_event(li, button, @@ -4543,7 +4543,7 @@ START_TEST(touchpad_tap_palm_on_tapped_palm_down) litest_touch_up(dev, 0); break; } - libinput_dispatch(li); + litest_dispatch(li); litest_assert_button_event(li, button, @@ -4553,9 +4553,9 @@ START_TEST(touchpad_tap_palm_on_tapped_palm_down) litest_touch_move_to_extended(dev, 0, 50, 50, 50, 50, axes, 1); litest_touch_up(dev, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_timeout_tap(); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_button_event(li, button, @@ -4643,7 +4643,7 @@ START_TEST(touchpad_tap_palm_on_tapped_doubletap) litest_touch_up(dev, 0); break; } - libinput_dispatch(li); + litest_dispatch(li); litest_assert_button_event(li, button, @@ -4652,7 +4652,7 @@ START_TEST(touchpad_tap_palm_on_tapped_doubletap) litest_touch_down(dev, 0, 50, 50); litest_touch_move_to_extended(dev, 0, 50, 50, 50, 50, axes, 1); - libinput_dispatch(li); + litest_dispatch(li); switch (nfingers2) { case 3: @@ -4676,10 +4676,10 @@ START_TEST(touchpad_tap_palm_on_tapped_doubletap) litest_touch_up(dev, 1); break; } - libinput_dispatch(li); + litest_dispatch(li); litest_timeout_tap(); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_button_event(li, button, @@ -4756,19 +4756,19 @@ START_TEST(touchpad_tap_palm_on_drag) litest_touch_up(dev, 0); break; } - libinput_dispatch(li); + litest_dispatch(li); litest_assert_button_event(li, button, LIBINPUT_BUTTON_STATE_PRESSED); litest_touch_down(dev, 0, 50, 50); - libinput_dispatch(li); + litest_dispatch(li); litest_timeout_tap(); - libinput_dispatch(li); + litest_dispatch(li); litest_touch_move_to_extended(dev, 0, 50, 50, 50, 50, axes, 1); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_button_event(li, button, @@ -4841,21 +4841,21 @@ START_TEST(touchpad_tap_palm_on_drag_2fg) litest_touch_up(dev, 0); break; } - libinput_dispatch(li); + litest_dispatch(li); litest_assert_button_event(li, button, LIBINPUT_BUTTON_STATE_PRESSED); litest_touch_down(dev, this, 50, 50); - libinput_dispatch(li); + litest_dispatch(li); litest_timeout_tap(); - libinput_dispatch(li); + litest_dispatch(li); litest_touch_down(dev, other, 60, 50); - libinput_dispatch(li); + litest_dispatch(li); litest_touch_move_to_extended(dev, this, 50, 50, 50, 50, axes, 1); - libinput_dispatch(li); + litest_dispatch(li); litest_touch_move_to(dev, other, 60, 50, 65, 50, 10); litest_assert_only_typed_events(li, @@ -4899,7 +4899,7 @@ START_TEST(touchpad_tap_palm_on_touch_2) litest_touch_up(dev, this); litest_touch_up(dev, other); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_button_event(li, BTN_LEFT, LIBINPUT_BUTTON_STATE_PRESSED); @@ -4938,13 +4938,13 @@ START_TEST(touchpad_tap_palm_on_touch_2_retouch) litest_drain_events(li); litest_touch_move_to_extended(dev, this, 50, 50, 50, 50, axes, 1); litest_touch_up(dev, this); - libinput_dispatch(li); + litest_dispatch(li); litest_touch_down(dev, this, 70, 70); litest_touch_up(dev, this); litest_touch_up(dev, other); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_button_event(li, BTN_RIGHT, LIBINPUT_BUTTON_STATE_PRESSED); @@ -4986,12 +4986,12 @@ START_TEST(touchpad_tap_palm_on_touch_3) litest_drain_events(li); litest_touch_move_to_extended(dev, this, 50, 50, 50, 50, axes, 1); litest_touch_up(dev, this); - libinput_dispatch(li); + litest_dispatch(li); litest_touch_up(dev, (this + 1) % 3); litest_touch_up(dev, (this + 2) % 3); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_button_event(li, BTN_RIGHT, LIBINPUT_BUTTON_STATE_PRESSED); @@ -5032,18 +5032,18 @@ START_TEST(touchpad_tap_palm_on_touch_3_retouch) litest_touch_down(dev, (this + 2) % 3, 70, 50); litest_drain_events(li); litest_timeout_tap(); - libinput_dispatch(li); + litest_dispatch(li); litest_touch_move_to_extended(dev, this, 50, 50, 50, 50, axes, 1); litest_touch_up(dev, this); - libinput_dispatch(li); + litest_dispatch(li); litest_touch_down(dev, this, 50, 50); litest_touch_up(dev, this); litest_touch_up(dev, (this + 1) % 3); litest_touch_up(dev, (this + 2) % 3); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_button_event(li, BTN_MIDDLE, LIBINPUT_BUTTON_STATE_PRESSED); @@ -5086,7 +5086,7 @@ START_TEST(touchpad_tap_palm_on_touch_4) litest_drain_events(li); litest_touch_move_to_extended(dev, this, 50, 50, 50, 50, axes, 1); litest_touch_up(dev, this); - libinput_dispatch(li); + litest_dispatch(li); litest_touch_up(dev, (this + 1) % 4); litest_touch_up(dev, (this + 2) % 4); @@ -5154,9 +5154,9 @@ START_TEST(touchpad_tap_palm_after_tap) litest_touch_up(dev, 0); break; } - libinput_dispatch(li); + litest_dispatch(li); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_button_event(li, button, LIBINPUT_BUTTON_STATE_PRESSED); @@ -5164,7 +5164,7 @@ START_TEST(touchpad_tap_palm_after_tap) litest_touch_down(dev, 0, 50, 50); litest_touch_move_to_extended(dev, 0, 50, 50, 50, 50, axes, 1); litest_touch_up(dev, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_timeout_tap(); litest_assert_button_event(li, @@ -5237,16 +5237,16 @@ START_TEST(touchpad_tap_palm_multitap) break; } - libinput_dispatch(li); + litest_dispatch(li); msleep(10); } litest_touch_down(dev, 0, 50, 50); litest_touch_move_to_extended(dev, 0, 50, 50, 50, 50, axes, 1); litest_touch_up(dev, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_timeout_tap(); - libinput_dispatch(li); + litest_dispatch(li); for (ntaps = 0; ntaps <= range; ntaps++) { litest_assert_button_event(li, @@ -5323,15 +5323,15 @@ START_TEST(touchpad_tap_palm_multitap_timeout) break; } - libinput_dispatch(li); + litest_dispatch(li); msleep(10); } litest_touch_down(dev, 0, 50, 50); litest_touch_move_to_extended(dev, 0, 50, 50, 50, 50, axes, 1); - libinput_dispatch(li); + litest_dispatch(li); litest_timeout_tap(); - libinput_dispatch(li); + litest_dispatch(li); for (ntaps = 0; ntaps <= range; ntaps++) { litest_assert_button_event(li, @@ -5408,13 +5408,13 @@ START_TEST(touchpad_tap_palm_multitap_down_again) break; } - libinput_dispatch(li); + litest_dispatch(li); msleep(10); } litest_touch_down(dev, 0, 50, 50); litest_touch_move_to_extended(dev, 0, 50, 50, 50, 50, axes, 1); - libinput_dispatch(li); + litest_dispatch(li); /* keep palm finger down */ for (ntaps = 0; ntaps <= range; ntaps++) { @@ -5441,12 +5441,12 @@ START_TEST(touchpad_tap_palm_multitap_down_again) break; } - libinput_dispatch(li); + litest_dispatch(li); msleep(10); } litest_timeout_tap(); - libinput_dispatch(li); + litest_dispatch(li); for (ntaps = 0; ntaps <= 2 * range + 1; ntaps++) { litest_assert_button_event(li, @@ -5524,18 +5524,18 @@ START_TEST(touchpad_tap_palm_multitap_click) break; } - libinput_dispatch(li); + litest_dispatch(li); msleep(10); } litest_touch_down(dev, 0, 50, 50); litest_touch_move_to_extended(dev, 0, 50, 50, 50, 50, axes, 1); - libinput_dispatch(li); + litest_dispatch(li); /* keep palm finger down */ litest_button_click(dev, BTN_LEFT, true); litest_button_click(dev, BTN_LEFT, false); - libinput_dispatch(li); + litest_dispatch(li); for (ntaps = 0; ntaps <= range; ntaps++) { litest_assert_button_event(li, @@ -5575,11 +5575,11 @@ START_TEST(touchpad_tap_palm_click_then_tap) litest_drain_events(li); litest_touch_down_extended(dev, 0, 50, 50, axes); - libinput_dispatch(li); + litest_dispatch(li); litest_button_click(dev, BTN_LEFT, true); litest_button_click(dev, BTN_LEFT, false); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_button_event(li, BTN_LEFT, @@ -5593,9 +5593,9 @@ START_TEST(touchpad_tap_palm_click_then_tap) litest_touch_down(dev, 0, 50, 50); litest_touch_up(dev, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_timeout_tap(); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_button_event(li, BTN_LEFT, @@ -5633,19 +5633,19 @@ START_TEST(touchpad_tap_palm_dwt_tap) litest_drain_events(li); litest_touch_down(dev, 0, 50, 50); - libinput_dispatch(li); + litest_dispatch(li); litest_keyboard_key(keyboard, KEY_B, false); litest_drain_events(li); litest_timeout_dwt_long(); - libinput_dispatch(li); + litest_dispatch(li); /* Changes to palm after dwt timeout */ litest_touch_move_to_extended(dev, 0, 50, 50, 50, 50, axes, 1); - libinput_dispatch(li); + litest_dispatch(li); litest_touch_up(dev, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_empty_queue(li); @@ -5671,7 +5671,7 @@ START_TEST(touchpad_tap_palm_3fg_start) litest_touch_down(dev, 1, 55, 55); litest_touch_down(dev, 2, 99, 55); /* edge palm */ litest_pop_event_frame(dev); - libinput_dispatch(li); + litest_dispatch(li); litest_touch_up(dev, 2); /* release the palm */ litest_assert_empty_queue(li); @@ -5679,7 +5679,7 @@ START_TEST(touchpad_tap_palm_3fg_start) litest_touch_up(dev, 0); litest_touch_up(dev, 1); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_button_event(li, BTN_RIGHT, LIBINPUT_BUTTON_STATE_PRESSED); litest_assert_button_event(li, BTN_RIGHT, diff --git a/test/test-touchpad.c b/test/test-touchpad.c index 876bd9b7..3b253915 100644 --- a/test/test-touchpad.c +++ b/test/test-touchpad.c @@ -67,7 +67,7 @@ START_TEST(touchpad_1fg_motion) litest_touch_move_to(dev, 0, 50, 50, 80, 50, 20); litest_touch_up(dev, 0); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); ck_assert_notnull(event); @@ -101,7 +101,7 @@ START_TEST(touchpad_2fg_no_motion) litest_touch_up(dev, 1); litest_touch_up(dev, 0); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); while (event) { @@ -125,15 +125,15 @@ test_2fg_scroll(struct litest_device *dev, double dx, double dy, bool want_sleep /* Avoid a small scroll being seen as a tap */ if (want_sleep) { - libinput_dispatch(li); + litest_dispatch(li); litest_timeout_tap(); - libinput_dispatch(li); + litest_dispatch(li); } litest_touch_up(dev, 1); litest_touch_up(dev, 0); - libinput_dispatch(li); + litest_dispatch(li); } START_TEST(touchpad_2fg_scroll) @@ -200,7 +200,7 @@ START_TEST(touchpad_2fg_scroll_initially_diagonal) /* start diagonally */ ydelta = 15 * ratio; litest_touch_move_two_touches(dev, 45, 30, 55, 30, 15, ydelta, 10); - libinput_dispatch(li); + litest_dispatch(li); litest_wait_for_event_of_type(li, LIBINPUT_EVENT_POINTER_AXIS); litest_drain_events(li); @@ -219,7 +219,7 @@ START_TEST(touchpad_2fg_scroll_initially_diagonal) /* both high-resolution and low-resolution events are generated */ expected_nevents *= 2; - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); do { @@ -240,7 +240,7 @@ START_TEST(touchpad_2fg_scroll_initially_diagonal) litest_touch_up(dev, 1); litest_touch_up(dev, 0); - libinput_dispatch(li); + litest_dispatch(li); } END_TEST @@ -348,7 +348,7 @@ START_TEST(touchpad_2fg_scroll_axis_lock_switch) /* Move roughly straight horizontally for >100ms to set axis lock */ litest_touch_move_two_touches(dev, 20, 20, 25, 20, 55, 10, 15); - libinput_dispatch(li); + litest_dispatch(li); litest_wait_for_event_of_type(li, LIBINPUT_EVENT_POINTER_AXIS); axis = LIBINPUT_POINTER_AXIS_SCROLL_HORIZONTAL; @@ -356,20 +356,20 @@ START_TEST(touchpad_2fg_scroll_axis_lock_switch) litest_drain_events(li); msleep(200); - libinput_dispatch(li); + litest_dispatch(li); /* Move roughly vertically for >100ms to switch axis lock. This will * contain some horizontal movement while the lock changes; don't * check for single-axis yet */ litest_touch_move_two_touches(dev, 75, 30, 80, 30, 2, 20, 15); - libinput_dispatch(li); + litest_dispatch(li); litest_wait_for_event_of_type(li, LIBINPUT_EVENT_POINTER_AXIS); litest_drain_events(li); /* Move some more, roughly vertically, and check new axis lock */ litest_touch_move_two_touches(dev, 77, 50, 82, 50, 1, 40, 15); - libinput_dispatch(li); + litest_dispatch(li); litest_wait_for_event_of_type(li, LIBINPUT_EVENT_POINTER_AXIS); axis = LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL; @@ -378,7 +378,7 @@ START_TEST(touchpad_2fg_scroll_axis_lock_switch) /* Move in a clear diagonal direction to ensure the lock releases */ litest_touch_move_two_touches(dev, 78, 90, 83, 90, -60, -60, 20); - libinput_dispatch(li); + litest_dispatch(li); litest_wait_for_event_of_type(li, LIBINPUT_EVENT_POINTER_AXIS); axis = LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL; @@ -386,7 +386,7 @@ START_TEST(touchpad_2fg_scroll_axis_lock_switch) litest_touch_up(dev, 1); litest_touch_up(dev, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_drain_events(li); } END_TEST @@ -421,7 +421,7 @@ START_TEST(touchpad_2fg_scroll_slow_distance) litest_touch_move_two_touches(dev, 49, 50, 51, 50, 0, y_move, 100); litest_touch_up(dev, 1); litest_touch_up(dev, 0); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); ck_assert_notnull(event); @@ -503,7 +503,7 @@ START_TEST(touchpad_2fg_scroll_semi_mt) litest_touch_down(dev, 0, 20, 20); litest_touch_down(dev, 1, 30, 20); - libinput_dispatch(li); + litest_dispatch(li); litest_touch_move_two_touches(dev, 20, 20, 30, 20, @@ -534,9 +534,9 @@ START_TEST(touchpad_2fg_scroll_return_to_motion) litest_touch_down(dev, 1, 51, 50); litest_touch_move_two_touches(dev, 49, 50, 51, 50, 0, 20, 5); litest_touch_up(dev, 1); - libinput_dispatch(li); + litest_dispatch(li); litest_timeout_finger_switch(); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_only_axis_events(li, LIBINPUT_EVENT_POINTER_SCROLL_FINGER); litest_touch_move_to(dev, 0, 49, 70, 49, 50, 10); @@ -546,9 +546,9 @@ START_TEST(touchpad_2fg_scroll_return_to_motion) litest_touch_down(dev, 1, 51, 50); litest_touch_move_two_touches(dev, 49, 50, 51, 50, 0, 20, 5); litest_touch_up(dev, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_timeout_finger_switch(); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_only_axis_events(li, LIBINPUT_EVENT_POINTER_SCROLL_FINGER); /* move with second finger */ @@ -575,20 +575,20 @@ START_TEST(touchpad_2fg_scroll_from_btnareas) litest_touch_down(dev, 0, 30, 95); litest_touch_down(dev, 1, 50, 95); - libinput_dispatch(li); + litest_dispatch(li); /* First finger moves out of the area first but it's a scroll * motion, should not trigger POINTER_MOTION */ for (int i = 0; i < 5; i++) { litest_touch_move(dev, 0, 30, 95 - i); } - libinput_dispatch(li); + litest_dispatch(li); for (int i = 0; i < 20; i++) { litest_touch_move(dev, 0, 30, 90 - i); litest_touch_move(dev, 1, 50, 95 - i); } - libinput_dispatch(li); + litest_dispatch(li); litest_touch_up(dev, 0); litest_touch_up(dev, 1); @@ -675,7 +675,7 @@ START_TEST(touchpad_scroll_natural_edge) litest_touch_move_to(dev, 0, 99, 20, 99, 80, 10); litest_touch_up(dev, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_scroll(li, LIBINPUT_EVENT_POINTER_SCROLL_FINGER, LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL, @@ -686,7 +686,7 @@ START_TEST(touchpad_scroll_natural_edge) litest_touch_move_to(dev, 0, 99, 80, 99, 20, 10); litest_touch_up(dev, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_scroll(li, LIBINPUT_EVENT_POINTER_SCROLL_FINGER, LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL, @@ -712,7 +712,7 @@ START_TEST(touchpad_edge_scroll_vert) litest_touch_move_to(dev, 0, 99, 20, 99, 80, 10); litest_touch_up(dev, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_scroll(li, LIBINPUT_EVENT_POINTER_SCROLL_FINGER, LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL, @@ -723,7 +723,7 @@ START_TEST(touchpad_edge_scroll_vert) litest_touch_move_to(dev, 0, 99, 80, 99, 20, 10); litest_touch_up(dev, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_scroll(li, LIBINPUT_EVENT_POINTER_SCROLL_FINGER, LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL, @@ -762,7 +762,7 @@ START_TEST(touchpad_edge_scroll_horiz) litest_touch_move_to(dev, 0, 20, 99, 70, 99, 10); litest_touch_up(dev, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_scroll(li, LIBINPUT_EVENT_POINTER_SCROLL_FINGER, LIBINPUT_POINTER_AXIS_SCROLL_HORIZONTAL, @@ -773,7 +773,7 @@ START_TEST(touchpad_edge_scroll_horiz) litest_touch_move_to(dev, 0, 70, 99, 20, 99, 10); litest_touch_up(dev, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_scroll(li, LIBINPUT_EVENT_POINTER_SCROLL_FINGER, LIBINPUT_POINTER_AXIS_SCROLL_HORIZONTAL, @@ -794,7 +794,7 @@ START_TEST(touchpad_edge_scroll_horiz_clickpad) litest_touch_move_to(dev, 0, 20, 99, 70, 99, 15); litest_touch_up(dev, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_scroll(li, LIBINPUT_EVENT_POINTER_SCROLL_FINGER, LIBINPUT_POINTER_AXIS_SCROLL_HORIZONTAL, @@ -805,7 +805,7 @@ START_TEST(touchpad_edge_scroll_horiz_clickpad) litest_touch_move_to(dev, 0, 70, 99, 20, 99, 15); litest_touch_up(dev, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_scroll(li, LIBINPUT_EVENT_POINTER_SCROLL_FINGER, LIBINPUT_POINTER_AXIS_SCROLL_HORIZONTAL, @@ -910,23 +910,23 @@ START_TEST(touchpad_edge_scroll_timeout) /* move 0.5mm, enough to load up the motion history, but less than * the scroll threshold of 2mm */ litest_touch_down(dev, 0, 99, 20); - libinput_dispatch(li); + litest_dispatch(li); litest_timeout_hysteresis(); - libinput_dispatch(li); + litest_dispatch(li); litest_touch_move_to(dev, 0, 99, 20, 99, 20 + mm/2, 8); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_empty_queue(li); litest_timeout_edgescroll(); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_empty_queue(li); /* now move slowly up to the 2mm scroll threshold. we expect events */ litest_touch_move_to(dev, 0, 99, 20 + mm/2, 99, 20 + mm * 2, 20); litest_touch_up(dev, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_wait_for_event_of_type(li, LIBINPUT_EVENT_POINTER_AXIS); @@ -969,7 +969,7 @@ START_TEST(touchpad_edge_scroll_no_motion) /* moving down outside edge once scrolling had started -> scroll */ litest_touch_move_to(dev, 0, 20, 70, 40, 99, 12); litest_touch_up(dev, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_scroll(li, LIBINPUT_EVENT_POINTER_SCROLL_FINGER, @@ -992,7 +992,7 @@ START_TEST(touchpad_edge_scroll_no_edge_after_motion) litest_touch_move_to(dev, 0, 20, 20, 99, 20, 22); litest_touch_move_to(dev, 0, 99, 20, 99, 80, 22); litest_touch_up(dev, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_only_typed_events(li, LIBINPUT_EVENT_POINTER_MOTION); litest_assert_empty_queue(li); @@ -1038,10 +1038,10 @@ START_TEST(touchpad_edge_scroll_no_2fg) litest_touch_down(dev, 0, 49, 50); litest_touch_down(dev, 1, 51, 50); litest_touch_move_two_touches(dev, 49, 50, 51, 50, 20, 30, 10); - libinput_dispatch(li); + litest_dispatch(li); litest_touch_up(dev, 0); litest_touch_up(dev, 1); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_empty_queue(li); } @@ -1119,7 +1119,7 @@ START_TEST(touchpad_edge_scroll_buttonareas_click_stops_scroll) litest_assert_only_axis_events(li, LIBINPUT_EVENT_POINTER_SCROLL_FINGER); litest_button_click(dev, BTN_LEFT, true); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_axis_end_sequence(li, LIBINPUT_EVENT_POINTER_SCROLL_FINGER, @@ -1169,7 +1169,7 @@ START_TEST(touchpad_edge_scroll_clickfinger_click_stops_scroll) litest_assert_only_axis_events(li, LIBINPUT_EVENT_POINTER_SCROLL_FINGER); litest_button_click(dev, BTN_LEFT, true); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_axis_end_sequence(li, LIBINPUT_EVENT_POINTER_SCROLL_FINGER, @@ -1426,7 +1426,7 @@ START_TEST(touchpad_palm_detect_palm_becomes_pointer) litest_touch_move_to(dev, 0, 99, 50, 0, 70, 25); litest_touch_up(dev, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_only_typed_events(li, LIBINPUT_EVENT_POINTER_MOTION); @@ -1450,7 +1450,7 @@ START_TEST(touchpad_palm_detect_top_palm_becomes_pointer) litest_touch_move_to(dev, 0, 50, 1, 50, 60, 20); litest_touch_up(dev, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_only_typed_events(li, LIBINPUT_EVENT_POINTER_MOTION); @@ -1478,12 +1478,12 @@ START_TEST(touchpad_palm_detect_no_palm_moving_into_edges) litest_drain_events(li); litest_touch_move_to(dev, 0, 99, 50, 99, 90, 15); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_only_typed_events(li, LIBINPUT_EVENT_POINTER_MOTION); litest_touch_up(dev, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_empty_queue(li); } END_TEST @@ -1508,12 +1508,12 @@ START_TEST(touchpad_palm_detect_no_palm_moving_into_top) litest_drain_events(li); litest_touch_move_to(dev, 0, 0, 2, 50, 50, 15); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_only_typed_events(li, LIBINPUT_EVENT_POINTER_MOTION); litest_touch_up(dev, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_empty_queue(li); } END_TEST @@ -1532,7 +1532,7 @@ START_TEST(touchpad_palm_detect_no_tap_top_edge) litest_touch_down(dev, 0, 50, 1); litest_touch_up(dev, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_timeout_tap(); litest_assert_empty_queue(li); @@ -1553,28 +1553,28 @@ START_TEST(touchpad_palm_detect_tap_hardbuttons) litest_touch_down(dev, 0, 95, 5); litest_touch_up(dev, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_timeout_tap(); litest_assert_empty_queue(li); litest_touch_down(dev, 0, 5, 5); litest_touch_up(dev, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_timeout_tap(); litest_assert_empty_queue(li); litest_touch_down(dev, 0, 5, 99); litest_touch_up(dev, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_timeout_tap(); litest_assert_empty_queue(li); litest_touch_down(dev, 0, 95, 99); litest_touch_up(dev, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_timeout_tap(); litest_assert_empty_queue(li); @@ -1598,14 +1598,14 @@ START_TEST(touchpad_palm_detect_tap_softbuttons) * the palm detection edge zone -> expect palm detection */ litest_touch_down(dev, 0, 99, 99); litest_touch_up(dev, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_timeout_tap(); litest_assert_empty_queue(li); litest_touch_down(dev, 0, 1, 99); litest_touch_up(dev, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_timeout_tap(); litest_assert_empty_queue(li); @@ -1614,7 +1614,7 @@ START_TEST(touchpad_palm_detect_tap_softbuttons) * not in the palm detection edge zone -> expect taps */ litest_touch_down(dev, 0, 10, 99); litest_touch_up(dev, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_timeout_tap(); litest_assert_button_event(li, @@ -1627,7 +1627,7 @@ START_TEST(touchpad_palm_detect_tap_softbuttons) litest_touch_down(dev, 0, 90, 99); litest_touch_up(dev, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_timeout_tap(); litest_assert_button_event(li, @@ -1657,28 +1657,28 @@ START_TEST(touchpad_palm_detect_tap_clickfinger) * inside the palm detection edge zone*/ litest_touch_down(dev, 0, 95, 5); litest_touch_up(dev, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_timeout_tap(); litest_assert_empty_queue(li); litest_touch_down(dev, 0, 5, 5); litest_touch_up(dev, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_timeout_tap(); litest_assert_empty_queue(li); litest_touch_down(dev, 0, 5, 99); litest_touch_up(dev, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_timeout_tap(); litest_assert_empty_queue(li); litest_touch_down(dev, 0, 95, 99); litest_touch_up(dev, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_timeout_tap(); litest_assert_empty_queue(li); @@ -1812,10 +1812,10 @@ START_TEST(touchpad_palm_detect_tool_palm_tap_after) litest_event(dev, EV_ABS, ABS_MT_TOOL_TYPE, MT_TOOL_PALM); litest_touch_down(dev, 0, 50, 50); litest_pop_event_frame(dev); - libinput_dispatch(li); + litest_dispatch(li); litest_touch_move_to(dev, 0, 50, 50, 50, 80, 10); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_empty_queue(li); @@ -1823,14 +1823,14 @@ START_TEST(touchpad_palm_detect_tool_palm_tap_after) litest_event(dev, EV_ABS, ABS_MT_TOOL_TYPE, MT_TOOL_FINGER); litest_touch_up(dev, 0); litest_pop_event_frame(dev); - libinput_dispatch(li); + litest_dispatch(li); litest_timeout_tap(); litest_assert_empty_queue(li); litest_touch_down(dev, 0, 50, 50); - libinput_dispatch(li); + litest_dispatch(li); litest_touch_up(dev, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_timeout_tap(); litest_assert_button_event(li, BTN_LEFT, LIBINPUT_BUTTON_STATE_PRESSED); @@ -1855,11 +1855,11 @@ START_TEST(touchpad_palm_detect_tool_palm_tap) litest_event(dev, EV_ABS, ABS_MT_TOOL_TYPE, MT_TOOL_PALM); litest_touch_down(dev, 0, 50, 50); litest_pop_event_frame(dev); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_empty_queue(li); litest_touch_up(dev, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_timeout_tap(); litest_assert_empty_queue(li); @@ -1926,14 +1926,14 @@ START_TEST(touchpad_palm_detect_pressure_late_tap) litest_touch_down(dev, 0, 50, 80); litest_touch_move_extended(dev, 0, 51, 99, axes); litest_touch_up(dev, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_timeout_tap(); litest_assert_empty_queue(li); /* make sure normal tap still works */ litest_touch_down(dev, 0, 50, 99); litest_touch_up(dev, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_timeout_tap(); litest_assert_only_typed_events(li, LIBINPUT_EVENT_POINTER_BUTTON); } @@ -1958,9 +1958,9 @@ START_TEST(touchpad_palm_detect_pressure_tap_hold) /* event in state HOLD is thumb */ litest_touch_down(dev, 0, 50, 99); - libinput_dispatch(li); + litest_dispatch(li); litest_timeout_tap(); - libinput_dispatch(li); + litest_dispatch(li); litest_touch_move_extended(dev, 0, 51, 99, axes); litest_touch_up(dev, 0); litest_assert_empty_queue(li); @@ -1968,7 +1968,7 @@ START_TEST(touchpad_palm_detect_pressure_tap_hold) /* make sure normal tap still works */ litest_touch_down(dev, 0, 50, 99); litest_touch_up(dev, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_timeout_tap(); litest_assert_only_typed_events(li, LIBINPUT_EVENT_POINTER_BUTTON); } @@ -1993,9 +1993,9 @@ START_TEST(touchpad_palm_detect_pressure_tap_hold_2ndfg) /* event in state HOLD is thumb */ litest_touch_down(dev, 0, 50, 99); - libinput_dispatch(li); + litest_dispatch(li); litest_timeout_tap(); - libinput_dispatch(li); + litest_dispatch(li); litest_touch_move_extended(dev, 0, 51, 99, axes); litest_assert_empty_queue(li); @@ -2008,16 +2008,16 @@ START_TEST(touchpad_palm_detect_pressure_tap_hold_2ndfg) litest_assert_empty_queue(li); /* timeout -> into HOLD, no event on release */ - libinput_dispatch(li); + litest_dispatch(li); litest_timeout_tap(); - libinput_dispatch(li); + litest_dispatch(li); litest_touch_up(dev, 1); litest_assert_empty_queue(li); /* make sure normal tap still works */ litest_touch_down(dev, 0, 50, 99); litest_touch_up(dev, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_timeout_tap(); litest_assert_only_typed_events(li, LIBINPUT_EVENT_POINTER_BUTTON); } @@ -2043,14 +2043,14 @@ START_TEST(touchpad_palm_detect_move_and_tap) litest_touch_down(dev, 0, 50, 99); litest_touch_move(dev, 0, 51, 99); litest_touch_move_extended(dev, 0, 55, 99, axes); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_empty_queue(li); /* thumb is resting, check if tapping still works */ litest_touch_down(dev, 1, 50, 50); litest_touch_up(dev, 1); - libinput_dispatch(li); + litest_dispatch(li); litest_timeout_tap(); litest_assert_button_event(li, @@ -2082,7 +2082,7 @@ START_TEST(touchpad_palm_detect_pressure_late) litest_touch_down(dev, 0, 50, 50); litest_touch_move_to(dev, 0, 50, 70, 80, 90, 10); litest_drain_events(li); - libinput_dispatch(li); + litest_dispatch(li); litest_touch_move_to_extended(dev, 0, 80, 90, 50, 20, axes, 10); litest_touch_up(dev, 0); @@ -2137,7 +2137,7 @@ START_TEST(touchpad_palm_detect_pressure_after_edge) litest_touch_down(dev, 0, 99, 50); litest_touch_move_to_extended(dev, 0, 99, 50, 20, 50, axes, 20); litest_touch_up(dev, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_empty_queue(li); } @@ -2171,7 +2171,7 @@ START_TEST(touchpad_palm_detect_pressure_after_dwt) litest_assert_empty_queue(li); litest_timeout_dwt_short(); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_empty_queue(li); /* after dwt timeout, pressure blocks events */ @@ -2201,7 +2201,7 @@ START_TEST(touchpad_palm_ignore_threshold_zero) litest_touch_move_to(dev, 0, 50, 50, 80, 99, 10); litest_touch_up(dev, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_only_typed_events(li, LIBINPUT_EVENT_POINTER_MOTION); } END_TEST @@ -2540,9 +2540,9 @@ START_TEST(touchpad_left_handed_tapping) litest_touch_down(dev, 0, 50, 50); litest_touch_up(dev, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_timeout_tap(); - libinput_dispatch(li); + litest_dispatch(li); /* Tapping is unaffected by left-handed setting */ litest_assert_button_event(li, @@ -2577,9 +2577,9 @@ START_TEST(touchpad_left_handed_tapping_2fg) litest_touch_up(dev, 1); litest_touch_up(dev, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_timeout_tap(); - libinput_dispatch(li); + litest_dispatch(li); /* Tapping is unaffected by left-handed setting */ litest_assert_button_event(li, @@ -2603,7 +2603,7 @@ START_TEST(touchpad_left_handed_delayed) litest_drain_events(li); litest_button_click(dev, BTN_LEFT, 1); - libinput_dispatch(li); + litest_dispatch(li); status = libinput_device_config_left_handed_set(d, 1); ck_assert_int_eq(status, LIBINPUT_CONFIG_STATUS_SUCCESS); @@ -2619,11 +2619,11 @@ START_TEST(touchpad_left_handed_delayed) /* left-handed takes effect now */ litest_button_click(dev, BTN_RIGHT, 1); - libinput_dispatch(li); + litest_dispatch(li); litest_timeout_middlebutton(); - libinput_dispatch(li); + litest_dispatch(li); litest_button_click(dev, BTN_LEFT, 1); - libinput_dispatch(li); + litest_dispatch(li); status = libinput_device_config_left_handed_set(d, 0); ck_assert_int_eq(status, LIBINPUT_CONFIG_STATUS_SUCCESS); @@ -2659,7 +2659,7 @@ START_TEST(touchpad_left_handed_clickpad_delayed) litest_drain_events(li); litest_touch_down(dev, 0, 10, 90); litest_button_click(dev, BTN_LEFT, 1); - libinput_dispatch(li); + litest_dispatch(li); status = libinput_device_config_left_handed_set(d, 1); ck_assert_int_eq(status, LIBINPUT_CONFIG_STATUS_SUCCESS); @@ -2678,7 +2678,7 @@ START_TEST(touchpad_left_handed_clickpad_delayed) litest_drain_events(li); litest_touch_down(dev, 0, 90, 90); litest_button_click(dev, BTN_LEFT, 1); - libinput_dispatch(li); + litest_dispatch(li); status = libinput_device_config_left_handed_set(d, 0); ck_assert_int_eq(status, LIBINPUT_CONFIG_STATUS_SUCCESS); @@ -2724,7 +2724,7 @@ START_TEST(touchpad_left_handed_rotation) litest_touch_down(dev, 0, 20, 80); litest_touch_move_to(dev, 0, 20, 80, 80, 20, 20); litest_touch_up(dev, 0); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); ck_assert_notnull(event); @@ -2846,7 +2846,7 @@ START_TEST(touchpad_semi_mt_hover_down) litest_event(dev, EV_ABS, ABS_PRESSURE, 50); litest_event(dev, EV_KEY, BTN_TOUCH, 1); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); for (i = 0; i < 10; i++) { x -= 200; y += 200; @@ -2857,7 +2857,7 @@ START_TEST(touchpad_semi_mt_hover_down) litest_event(dev, EV_SYN, SYN_REPORT, 0); } - libinput_dispatch(li); + litest_dispatch(li); ck_assert_int_ne(libinput_next_event_type(li), LIBINPUT_EVENT_NONE); @@ -2865,7 +2865,7 @@ START_TEST(touchpad_semi_mt_hover_down) ck_assert_int_eq(libinput_event_get_type(event), LIBINPUT_EVENT_POINTER_MOTION); libinput_event_destroy(event); - libinput_dispatch(li); + litest_dispatch(li); } /* go back to hover */ @@ -2914,7 +2914,7 @@ START_TEST(touchpad_semi_mt_hover_down_hover_down) litest_event(dev, EV_ABS, ABS_PRESSURE, 50); litest_event(dev, EV_KEY, BTN_TOUCH, 1); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); for (j = 0; j < 5; j++) { x += 200; @@ -2926,7 +2926,7 @@ START_TEST(touchpad_semi_mt_hover_down_hover_down) litest_event(dev, EV_SYN, SYN_REPORT, 0); } - libinput_dispatch(li); + litest_dispatch(li); litest_assert_only_typed_events(li, LIBINPUT_EVENT_POINTER_MOTION); @@ -2964,7 +2964,7 @@ START_TEST(touchpad_semi_mt_hover_down_hover_down) litest_touch_move_to(dev, 0, 50, 50, 70, 70, 10); litest_touch_up(dev, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_only_typed_events(li, LIBINPUT_EVENT_POINTER_MOTION); } @@ -3012,7 +3012,7 @@ START_TEST(touchpad_semi_mt_hover_down_up) litest_event(dev, EV_ABS, ABS_PRESSURE, 50); litest_event(dev, EV_KEY, BTN_TOUCH, 1); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); /* now move the finger */ for (i = 0; i < 10; i++) { @@ -3033,7 +3033,7 @@ START_TEST(touchpad_semi_mt_hover_down_up) litest_event(dev, EV_KEY, BTN_TOOL_FINGER, 0); litest_event(dev, EV_KEY, BTN_TOUCH, 0); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); } END_TEST @@ -3119,7 +3119,7 @@ START_TEST(touchpad_semi_mt_hover_2fg_1fg_down) litest_event(dev, EV_KEY, BTN_TOOL_FINGER, 0); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_only_typed_events(li, LIBINPUT_EVENT_POINTER_MOTION); } @@ -3183,7 +3183,7 @@ START_TEST(touchpad_hover_down) /* touch the finger on the sensor */ litest_touch_move_to(dev, 0, 70, 70, 50, 50, 10); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_only_typed_events(li, LIBINPUT_EVENT_POINTER_MOTION); @@ -3215,7 +3215,7 @@ START_TEST(touchpad_hover_down_hover_down) /* touch the finger */ litest_touch_move_to(dev, 0, 70, 70, 50, 50, 10); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_only_typed_events(li, LIBINPUT_EVENT_POINTER_MOTION); @@ -3332,7 +3332,7 @@ START_TEST(touchpad_hover_1fg_tap) litest_hover_start(dev, 0, 50, 50); litest_hover_end(dev, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_empty_queue(li); } @@ -3346,7 +3346,7 @@ assert_btnevent_from_device(struct litest_device *device, struct libinput *li = device->libinput; struct libinput_event *e; - libinput_dispatch(li); + litest_dispatch(li); e = libinput_get_event(li); litest_is_button_event(e, button, state); @@ -3404,9 +3404,9 @@ START_TEST(touchpad_trackpoint_mb_scroll) litest_drain_events(li); litest_button_click(touchpad, BTN_2, true); /* middle */ - libinput_dispatch(li); + litest_dispatch(li); litest_timeout_buttonscroll(); - libinput_dispatch(li); + litest_dispatch(li); litest_event(trackpoint, EV_REL, REL_Y, -2); litest_event(trackpoint, EV_SYN, SYN_REPORT, 0); litest_event(trackpoint, EV_REL, REL_Y, -2); @@ -3524,7 +3524,7 @@ START_TEST(touchpad_trackpoint_buttons_2fg_scroll) litest_touch_down(touchpad, 1, 60, 70); litest_touch_move_two_touches(touchpad, 40, 70, 60, 70, 0, -40, 10); - libinput_dispatch(li); + litest_dispatch(li); litest_wait_for_event(li); /* Make sure we get scroll events but _not_ the scroll release */ @@ -3584,7 +3584,7 @@ START_TEST(touchpad_trackpoint_buttons_2fg_scroll) litest_touch_up(touchpad, 0); litest_touch_up(touchpad, 1); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_scroll(li, LIBINPUT_EVENT_POINTER_SCROLL_FINGER, @@ -3646,8 +3646,8 @@ START_TEST(touchpad_initial_state) litest_touch_down(dev, 0, x, y); litest_touch_move_to(dev, 0, x, y, 70, 70, 10); litest_touch_up(dev, 0); - libinput_dispatch(libinput1); - libinput_dispatch(libinput2); + litest_dispatch(libinput1); + litest_dispatch(libinput2); litest_wait_for_event(libinput1); litest_wait_for_event(libinput2); @@ -3713,9 +3713,9 @@ START_TEST(touchpad_fingers_down_before_init) break; litest_touch_move(dev, i, 20 + 10 * i + x, 30); } - libinput_dispatch(li); + litest_dispatch(li); } - libinput_dispatch(li); + litest_dispatch(li); litest_assert_empty_queue(li); for (int i = 0; i < finger_count; i++) { @@ -3724,7 +3724,7 @@ START_TEST(touchpad_fingers_down_before_init) } else { litest_event(dev, EV_KEY, map[finger_count], 0); } - libinput_dispatch(li); + litest_dispatch(li); } litest_assert_empty_queue(li); @@ -3762,7 +3762,7 @@ START_TEST(touchpad_state_after_syn_dropped_2fg_change) litest_disable_hold_gestures(dev->libinput_device); litest_touch_down(dev, 0, 10, 10); - libinput_dispatch(li); + litest_dispatch(li); /* Force a SYN_DROPPED */ for (int i = 0; i < 500; i++) @@ -3773,7 +3773,7 @@ START_TEST(touchpad_state_after_syn_dropped_2fg_change) litest_touch_down(dev, 0, 50, 50); litest_touch_down(dev, 1, 70, 50); - libinput_dispatch(li); + litest_dispatch(li); litest_drain_events(li); litest_touch_up(dev, 0); @@ -3812,7 +3812,7 @@ START_TEST(touchpad_dwt) litest_keyboard_key(keyboard, KEY_A, true); litest_keyboard_key(keyboard, KEY_A, false); - libinput_dispatch(li); + litest_dispatch(li); litest_touch_down(touchpad, 0, 50, 50); litest_touch_move_to(touchpad, 0, 50, 50, 70, 50, 10); litest_touch_up(touchpad, 0); @@ -3820,7 +3820,7 @@ START_TEST(touchpad_dwt) litest_assert_only_typed_events(li, LIBINPUT_EVENT_KEYBOARD_KEY); litest_timeout_dwt_short(); - libinput_dispatch(li); + litest_dispatch(li); /* after timeout - motion events*/ litest_touch_down(touchpad, 0, 50, 50); @@ -3854,7 +3854,7 @@ START_TEST(touchpad_dwt_ext_and_int_keyboard) litest_keyboard_key(keyboard, KEY_A, true); litest_keyboard_key(keyboard, KEY_A, false); - libinput_dispatch(li); + litest_dispatch(li); litest_touch_down(touchpad, 0, 50, 50); litest_touch_move_to(touchpad, 0, 50, 50, 70, 50, 10); litest_touch_up(touchpad, 0); @@ -3862,7 +3862,7 @@ START_TEST(touchpad_dwt_ext_and_int_keyboard) litest_assert_only_typed_events(li, LIBINPUT_EVENT_KEYBOARD_KEY); litest_timeout_dwt_short(); - libinput_dispatch(li); + litest_dispatch(li); /* after timeout - motion events*/ litest_touch_down(touchpad, 0, 50, 50); @@ -3892,7 +3892,7 @@ START_TEST(touchpad_dwt_enable_touch) litest_keyboard_key(keyboard, KEY_A, true); litest_keyboard_key(keyboard, KEY_A, false); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_only_typed_events(li, LIBINPUT_EVENT_KEYBOARD_KEY); /* finger down after last key event, but @@ -3903,7 +3903,7 @@ START_TEST(touchpad_dwt_enable_touch) litest_assert_empty_queue(li); litest_timeout_dwt_short(); - libinput_dispatch(li); + litest_dispatch(li); /* same touch after timeout - motion events*/ litest_touch_move_to(touchpad, 0, 70, 50, 50, 50, 10); @@ -3938,13 +3938,13 @@ START_TEST(touchpad_dwt_touch_hold) /* touch still down - no events */ litest_keyboard_key(keyboard, KEY_A, false); - libinput_dispatch(li); + litest_dispatch(li); litest_touch_move_to(touchpad, 0, 70, 50, 30, 50, 5); litest_assert_only_typed_events(li, LIBINPUT_EVENT_KEYBOARD_KEY); /* touch still down - no events */ litest_timeout_dwt_short(); - libinput_dispatch(li); + litest_dispatch(li); litest_touch_move_to(touchpad, 0, 30, 50, 50, 50, 5); litest_touch_up(touchpad, 0); litest_assert_only_typed_events(li, LIBINPUT_EVENT_POINTER_MOTION); @@ -3968,7 +3968,7 @@ START_TEST(touchpad_dwt_key_hold) litest_drain_events(li); litest_keyboard_key(keyboard, KEY_A, true); - libinput_dispatch(li); + litest_dispatch(li); litest_touch_down(touchpad, 0, 50, 50); litest_touch_move_to(touchpad, 0, 50, 50, 70, 50, 5); litest_touch_up(touchpad, 0); @@ -3996,10 +3996,10 @@ START_TEST(touchpad_dwt_key_hold_timeout) litest_drain_events(li); litest_keyboard_key(keyboard, KEY_A, true); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_only_typed_events(li, LIBINPUT_EVENT_KEYBOARD_KEY); litest_timeout_dwt_long(); - libinput_dispatch(li); + litest_dispatch(li); litest_touch_down(touchpad, 0, 50, 50); litest_touch_move_to(touchpad, 0, 50, 50, 70, 50, 5); litest_touch_up(touchpad, 0); @@ -4016,7 +4016,7 @@ START_TEST(touchpad_dwt_key_hold_timeout) /* expire timeout */ litest_timeout_dwt_long(); - libinput_dispatch(li); + litest_dispatch(li); litest_touch_down(touchpad, 0, 50, 50); litest_touch_move_to(touchpad, 0, 50, 50, 70, 50, 5); litest_touch_up(touchpad, 0); @@ -4046,10 +4046,10 @@ START_TEST(touchpad_dwt_key_hold_timeout_existing_touch_cornercase) litest_drain_events(li); litest_keyboard_key(keyboard, KEY_A, true); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_only_typed_events(li, LIBINPUT_EVENT_KEYBOARD_KEY); litest_timeout_dwt_long(); - libinput_dispatch(li); + litest_dispatch(li); /* Touch starting after re-issuing the dwt timeout */ litest_touch_down(touchpad, 0, 50, 50); @@ -4097,13 +4097,13 @@ START_TEST(touchpad_dwt_key_hold_timeout_existing_touch) litest_drain_events(li); litest_keyboard_key(keyboard, KEY_A, true); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_only_typed_events(li, LIBINPUT_EVENT_KEYBOARD_KEY); litest_touch_down(touchpad, 0, 50, 50); litest_touch_move_to(touchpad, 0, 50, 50, 70, 50, 5); - libinput_dispatch(li); + litest_dispatch(li); litest_timeout_dwt_long(); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_empty_queue(li); @@ -4141,7 +4141,7 @@ START_TEST(touchpad_dwt_type) for (i = 0; i < 5; i++) { litest_keyboard_key(keyboard, KEY_A, true); litest_keyboard_key(keyboard, KEY_A, false); - libinput_dispatch(li); + litest_dispatch(li); } litest_assert_only_typed_events(li, LIBINPUT_EVENT_KEYBOARD_KEY); @@ -4152,7 +4152,7 @@ START_TEST(touchpad_dwt_type) litest_assert_empty_queue(li); litest_timeout_dwt_long(); - libinput_dispatch(li); + litest_dispatch(li); litest_touch_down(touchpad, 0, 50, 50); litest_touch_move_to(touchpad, 0, 50, 50, 70, 50, 5); litest_touch_up(touchpad, 0); @@ -4180,7 +4180,7 @@ START_TEST(touchpad_dwt_type_short_timeout) for (i = 0; i < 5; i++) { litest_keyboard_key(keyboard, KEY_A, true); litest_keyboard_key(keyboard, KEY_A, false); - libinput_dispatch(li); + litest_dispatch(li); } litest_assert_only_typed_events(li, LIBINPUT_EVENT_KEYBOARD_KEY); @@ -4191,7 +4191,7 @@ START_TEST(touchpad_dwt_type_short_timeout) litest_assert_empty_queue(li); litest_timeout_dwt_short(); - libinput_dispatch(li); + litest_dispatch(li); litest_touch_down(touchpad, 0, 50, 50); litest_touch_move_to(touchpad, 0, 50, 50, 70, 50, 5); litest_touch_up(touchpad, 0); @@ -4235,7 +4235,7 @@ START_TEST(touchpad_dwt_modifier_no_dwt) ARRAY_FOR_EACH(modifiers, key) { litest_keyboard_key(keyboard, *key, true); litest_keyboard_key(keyboard, *key, false); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_only_typed_events(li, LIBINPUT_EVENT_KEYBOARD_KEY); @@ -4272,7 +4272,7 @@ START_TEST(touchpad_dwt_shift_combo_triggers_dwt) litest_keyboard_key(keyboard, KEY_A, true); litest_keyboard_key(keyboard, KEY_A, false); litest_keyboard_key(keyboard, *key, false); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_only_typed_events(li, LIBINPUT_EVENT_KEYBOARD_KEY); @@ -4283,7 +4283,7 @@ START_TEST(touchpad_dwt_shift_combo_triggers_dwt) } litest_timeout_dwt_long(); - libinput_dispatch(li); + litest_dispatch(li); litest_touch_down(touchpad, 0, 50, 50); litest_touch_move_to(touchpad, 0, 50, 50, 70, 50, 5); litest_touch_up(touchpad, 0); @@ -4326,7 +4326,7 @@ START_TEST(touchpad_dwt_modifier_combo_no_dwt) litest_keyboard_key(keyboard, KEY_B, true); litest_keyboard_key(keyboard, KEY_B, false); litest_keyboard_key(keyboard, *key, false); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_only_typed_events(li, LIBINPUT_EVENT_KEYBOARD_KEY); @@ -4371,11 +4371,11 @@ START_TEST(touchpad_dwt_modifier_combo_dwt_after) litest_keyboard_key(keyboard, KEY_A, true); litest_keyboard_key(keyboard, KEY_A, false); litest_keyboard_key(keyboard, *key, false); - libinput_dispatch(li); + litest_dispatch(li); litest_keyboard_key(keyboard, KEY_A, true); litest_keyboard_key(keyboard, KEY_A, false); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_only_typed_events(li, LIBINPUT_EVENT_KEYBOARD_KEY); litest_touch_down(touchpad, 0, 50, 50); @@ -4384,7 +4384,7 @@ START_TEST(touchpad_dwt_modifier_combo_dwt_after) litest_assert_empty_queue(li); litest_timeout_dwt_long(); - libinput_dispatch(li); + litest_dispatch(li); } litest_delete_device(keyboard); @@ -4420,7 +4420,7 @@ START_TEST(touchpad_dwt_modifier_combo_dwt_remains) ARRAY_FOR_EACH(modifiers, key) { litest_keyboard_key(keyboard, KEY_A, true); litest_keyboard_key(keyboard, KEY_A, false); - libinput_dispatch(li); + litest_dispatch(li); /* this can't really be tested directly. The above key * should enable dwt, the next key continues and extends the @@ -4433,7 +4433,7 @@ START_TEST(touchpad_dwt_modifier_combo_dwt_remains) litest_keyboard_key(keyboard, KEY_A, true); litest_keyboard_key(keyboard, KEY_A, false); litest_keyboard_key(keyboard, *key, false); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_only_typed_events(li, LIBINPUT_EVENT_KEYBOARD_KEY); @@ -4443,7 +4443,7 @@ START_TEST(touchpad_dwt_modifier_combo_dwt_remains) litest_assert_empty_queue(li); litest_timeout_dwt_long(); - libinput_dispatch(li); + litest_dispatch(li); } litest_delete_device(keyboard); @@ -4472,7 +4472,7 @@ START_TEST(touchpad_dwt_fkeys_no_dwt) litest_keyboard_key(keyboard, key, true); litest_keyboard_key(keyboard, key, false); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_only_typed_events(li, LIBINPUT_EVENT_KEYBOARD_KEY); @@ -4501,7 +4501,7 @@ START_TEST(touchpad_dwt_tap) litest_drain_events(li); litest_keyboard_key(keyboard, KEY_A, true); - libinput_dispatch(li); + litest_dispatch(li); litest_touch_down(touchpad, 0, 50, 50); litest_touch_up(touchpad, 0); @@ -4532,7 +4532,7 @@ START_TEST(touchpad_dwt_tap_drag) litest_drain_events(li); litest_keyboard_key(keyboard, KEY_A, true); - libinput_dispatch(li); + litest_dispatch(li); msleep(1); /* make sure touch starts after key press */ litest_touch_down(touchpad, 0, 50, 50); litest_touch_up(touchpad, 0); @@ -4543,7 +4543,7 @@ START_TEST(touchpad_dwt_tap_drag) litest_assert_only_typed_events(li, LIBINPUT_EVENT_KEYBOARD_KEY); litest_timeout_dwt_short(); - libinput_dispatch(li); + litest_dispatch(li); litest_touch_move_to(touchpad, 0, 70, 50, 50, 50, 5); litest_touch_up(touchpad, 0); litest_assert_only_typed_events(li, LIBINPUT_EVENT_POINTER_MOTION); @@ -4572,7 +4572,7 @@ START_TEST(touchpad_dwt_click) litest_touch_down(touchpad, 0, 50, 50); litest_button_click(touchpad, BTN_LEFT, true); litest_button_click(touchpad, BTN_LEFT, false); - libinput_dispatch(li); + litest_dispatch(li); litest_touch_up(touchpad, 0); litest_assert_only_typed_events(li, LIBINPUT_EVENT_POINTER_BUTTON); @@ -4605,25 +4605,25 @@ START_TEST(touchpad_dwt_edge_scroll) litest_assert_only_typed_events(li, LIBINPUT_EVENT_KEYBOARD_KEY); litest_touch_down(touchpad, 0, 99, 20); - libinput_dispatch(li); + litest_dispatch(li); litest_timeout_edgescroll(); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_empty_queue(li); /* edge scroll timeout is 300ms atm, make sure we don't accidentally exit the DWT timeout */ litest_keyboard_key(keyboard, KEY_A, true); litest_keyboard_key(keyboard, KEY_A, false); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_only_typed_events(li, LIBINPUT_EVENT_KEYBOARD_KEY); litest_touch_move_to(touchpad, 0, 99, 20, 99, 80, 60); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_empty_queue(li); litest_touch_move_to(touchpad, 0, 99, 80, 99, 20, 60); litest_touch_up(touchpad, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_empty_queue(li); litest_delete_device(keyboard); @@ -4645,10 +4645,10 @@ START_TEST(touchpad_dwt_edge_scroll_interrupt) litest_drain_events(li); litest_touch_down(touchpad, 0, 99, 20); - libinput_dispatch(li); + litest_dispatch(li); litest_timeout_edgescroll(); litest_touch_move_to(touchpad, 0, 99, 20, 99, 30, 10); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_only_axis_events(li, LIBINPUT_EVENT_POINTER_SCROLL_FINGER); litest_keyboard_key(keyboard, KEY_A, true); @@ -4869,7 +4869,7 @@ START_TEST(touchpad_dwt_disable_during_touch) litest_assert_empty_queue(li); litest_timeout_dwt_long(); - libinput_dispatch(li); + litest_dispatch(li); disable_dwt(touchpad); @@ -4904,7 +4904,7 @@ START_TEST(touchpad_dwt_disable_before_touch) litest_assert_only_typed_events(li, LIBINPUT_EVENT_KEYBOARD_KEY); disable_dwt(touchpad); - libinput_dispatch(li); + litest_dispatch(li); /* touch down during timeout -> still discarded */ litest_touch_down(touchpad, 0, 50, 50); @@ -4935,13 +4935,13 @@ START_TEST(touchpad_dwt_disable_during_key_release) litest_assert_only_typed_events(li, LIBINPUT_EVENT_KEYBOARD_KEY); disable_dwt(touchpad); - libinput_dispatch(li); + litest_dispatch(li); litest_keyboard_key(keyboard, KEY_A, false); litest_assert_only_typed_events(li, LIBINPUT_EVENT_KEYBOARD_KEY); /* touch down during timeout, wait, should generate events */ litest_touch_down(touchpad, 0, 50, 50); - libinput_dispatch(li); + litest_dispatch(li); litest_timeout_dwt_long(); litest_touch_move_to(touchpad, 0, 50, 50, 70, 50, 10); litest_assert_only_typed_events(li, LIBINPUT_EVENT_POINTER_MOTION); @@ -4970,11 +4970,11 @@ START_TEST(touchpad_dwt_disable_during_key_hold) litest_assert_only_typed_events(li, LIBINPUT_EVENT_KEYBOARD_KEY); disable_dwt(touchpad); - libinput_dispatch(li); + litest_dispatch(li); /* touch down during timeout, wait, should generate events */ litest_touch_down(touchpad, 0, 50, 50); - libinput_dispatch(li); + litest_dispatch(li); litest_timeout_dwt_long(); litest_touch_move_to(touchpad, 0, 50, 50, 70, 50, 10); litest_assert_only_typed_events(li, LIBINPUT_EVENT_POINTER_MOTION); @@ -5039,7 +5039,7 @@ START_TEST(touchpad_dwt_enable_before_touch) litest_assert_only_typed_events(li, LIBINPUT_EVENT_KEYBOARD_KEY); enable_dwt(touchpad); - libinput_dispatch(li); + litest_dispatch(li); litest_touch_down(touchpad, 0, 50, 50); litest_touch_move_to(touchpad, 0, 50, 50, 70, 50, 10); @@ -5070,11 +5070,11 @@ START_TEST(touchpad_dwt_enable_during_tap) litest_assert_only_typed_events(li, LIBINPUT_EVENT_KEYBOARD_KEY); litest_touch_down(touchpad, 0, 50, 50); - libinput_dispatch(li); + litest_dispatch(li); enable_dwt(touchpad); - libinput_dispatch(li); + litest_dispatch(li); litest_touch_up(touchpad, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_timeout_tap(); litest_assert_only_typed_events(li, LIBINPUT_EVENT_POINTER_BUTTON); @@ -5106,10 +5106,10 @@ START_TEST(touchpad_dwt_remove_kbd_while_active) litest_keyboard_key(keyboard, KEY_A, true); litest_keyboard_key(keyboard, KEY_A, false); - libinput_dispatch(li); + litest_dispatch(li); litest_touch_down(touchpad, 0, 50, 50); - libinput_dispatch(li); + litest_dispatch(li); litest_keyboard_key(keyboard, KEY_A, true); litest_keyboard_key(keyboard, KEY_A, false); @@ -5148,7 +5148,7 @@ START_TEST(touchpad_dwt_apple) litest_touch_down(touchpad, 0, 50, 50); litest_touch_move_to(touchpad, 0, 50, 50, 70, 50, 10); litest_touch_up(touchpad, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_empty_queue(li); litest_delete_device(apple_keyboard); @@ -5186,7 +5186,7 @@ START_TEST(touchpad_dwt_acer_hawaii) litest_touch_down(touchpad, 0, 50, 50); litest_touch_move_to(touchpad, 0, 50, 50, 70, 50, 10); litest_touch_up(touchpad, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_empty_queue(li); litest_delete_device(keyboard); @@ -5243,7 +5243,7 @@ START_TEST(touchpad_dwt_remove_before_keyboard) touchpad = litest_add_device(li, LITEST_SYNAPTICS_RMI4); ck_assert(has_disable_while_typing(touchpad)); - libinput_dispatch(li); + litest_dispatch(li); /* remove the touchpad before the keyboard. * this test can fail in valgrind only */ @@ -5444,15 +5444,15 @@ START_TEST(touchpad_thumb_speed_empty_slots) * despite slot 0 exceeding the speed threshold earlier */ litest_touch_down(dev, 1, 50, 50); litest_touch_down(dev, 2, 55, 50); - libinput_dispatch(li); + litest_dispatch(li); for (int i = 0, y = 50; i < 10; i++, y++) { litest_touch_move_to(dev, 1, 50, y, 50, y + 1, 1); litest_touch_move_to(dev, 2, 55, y, 55, y + 1, 1); } - libinput_dispatch(li); + litest_dispatch(li); litest_touch_up(dev, 1); litest_touch_up(dev, 2); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_scroll(li, LIBINPUT_EVENT_POINTER_SCROLL_FINGER, LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL, @@ -5479,12 +5479,12 @@ START_TEST(touchpad_thumb_area_clickfinger) litest_drain_events(li); litest_touch_down(dev, 0, 50, 99); /* thumb */ - libinput_dispatch(li); + litest_dispatch(li); litest_touch_down(dev, 1, 60, 50); - libinput_dispatch(li); + litest_dispatch(li); litest_button_click(dev, BTN_LEFT, true); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); litest_is_button_event(event, BTN_LEFT, @@ -5500,12 +5500,12 @@ START_TEST(touchpad_thumb_area_clickfinger) litest_drain_events(li); litest_touch_down(dev, 1, 60, 99); /* thumb */ - libinput_dispatch(li); + litest_dispatch(li); litest_touch_down(dev, 0, 50, 50); - libinput_dispatch(li); + litest_dispatch(li); litest_button_click(dev, BTN_LEFT, true); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); litest_is_button_event(event, BTN_LEFT, @@ -5534,12 +5534,12 @@ START_TEST(touchpad_thumb_area_btnarea) litest_drain_events(li); litest_touch_down(dev, 0, 90, 99); /* thumb */ - libinput_dispatch(li); + litest_dispatch(li); litest_button_click(dev, BTN_LEFT, true); /* button areas work as usual with a thumb */ - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); litest_is_button_event(event, BTN_RIGHT, @@ -5573,9 +5573,9 @@ START_TEST(touchpad_thumb_no_doublethumb) * detection. */ msleep(200); - libinput_dispatch(li); + litest_dispatch(li); litest_touch_down(dev, 1, 70, 99); - libinput_dispatch(li); + litest_dispatch(li); litest_touch_move_two_touches(dev, 50, 99, 70, 99, 0, -20, 10); litest_touch_up(dev, 0); @@ -5610,7 +5610,7 @@ START_TEST(touchpad_tool_tripletap_touch_count) litest_event(dev, EV_KEY, BTN_TOOL_FINGER, 1); litest_event(dev, EV_KEY, BTN_TOUCH, 1); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); msleep(2); /* touch 2 down */ @@ -5622,7 +5622,7 @@ START_TEST(touchpad_tool_tripletap_touch_count) litest_event(dev, EV_KEY, BTN_TOOL_FINGER, 0); litest_event(dev, EV_KEY, BTN_TOOL_DOUBLETAP, 1); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); msleep(2); /* touch 3 down, coordinate jump + ends slot 1 */ @@ -5638,7 +5638,7 @@ START_TEST(touchpad_tool_tripletap_touch_count) litest_event(dev, EV_KEY, BTN_TOOL_DOUBLETAP, 0); litest_event(dev, EV_KEY, BTN_TOOL_TRIPLETAP, 1); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); msleep(2); /* slot 2 reactivated */ @@ -5655,16 +5655,16 @@ START_TEST(touchpad_tool_tripletap_touch_count) litest_event(dev, EV_ABS, ABS_Y, 4000); litest_event(dev, EV_ABS, ABS_PRESSURE, 78); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); msleep(2); /* now a click should trigger middle click */ litest_event(dev, EV_KEY, BTN_LEFT, 1); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_event(dev, EV_KEY, BTN_LEFT, 0); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_wait_for_event(li); event = libinput_get_event(li); @@ -5716,7 +5716,7 @@ START_TEST(touchpad_tool_tripletap_touch_count_late) litest_event(dev, EV_KEY, BTN_TOOL_FINGER, 1); litest_event(dev, EV_KEY, BTN_TOUCH, 1); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); msleep(10); /* touch 2 and TRIPLETAP down */ @@ -5728,7 +5728,7 @@ START_TEST(touchpad_tool_tripletap_touch_count_late) litest_event(dev, EV_KEY, BTN_TOOL_FINGER, 0); litest_event(dev, EV_KEY, BTN_TOOL_TRIPLETAP, 1); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); msleep(10); /* touch 2 up, coordinate jump + ends slot 1, TRIPLETAP stays */ @@ -5743,7 +5743,7 @@ START_TEST(touchpad_tool_tripletap_touch_count_late) litest_event(dev, EV_ABS, ABS_Y, 4000); litest_event(dev, EV_ABS, ABS_PRESSURE, 78); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); msleep(10); /* slot 2 reactivated */ @@ -5760,17 +5760,17 @@ START_TEST(touchpad_tool_tripletap_touch_count_late) litest_event(dev, EV_ABS, ABS_Y, 4000); litest_event(dev, EV_ABS, ABS_PRESSURE, 78); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); msleep(10); litest_restore_log_handler(li); /* now a click should trigger middle click */ litest_event(dev, EV_KEY, BTN_LEFT, 1); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_event(dev, EV_KEY, BTN_LEFT, 0); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_wait_for_event(li); event = libinput_get_event(li); @@ -5816,9 +5816,9 @@ START_TEST(touchpad_slot_swap) second = 1 - first; litest_touch_down(dev, 0, start[0][0], start[0][1]); - libinput_dispatch(li); + litest_dispatch(li); litest_touch_down(dev, 1, start[1][0], start[1][1]); - libinput_dispatch(li); + litest_dispatch(li); litest_touch_move_two_touches(dev, start[first][0], @@ -5835,7 +5835,7 @@ START_TEST(touchpad_slot_swap) start[second][0] + 30, start[second][1] + 30.1); litest_pop_event_frame(dev); - libinput_dispatch(li); + litest_dispatch(li); /* If a gesture was detected, we need to go past the gesture * timeout to trigger events. So let's move a bit first to * make sure it looks continuous, then wait, then move again @@ -5844,13 +5844,13 @@ START_TEST(touchpad_slot_swap) start[first][0] + 30, start[first][1] + 30, 50, 21, 10); - libinput_dispatch(li); + litest_dispatch(li); litest_timeout_gesture(); - libinput_dispatch(li); + litest_dispatch(li); /* drain a potential scroll stop */ litest_drain_events(li); litest_touch_move_to(dev, second, 50, 21, 50, 11, 20); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); do { struct libinput_event_pointer *ptrev; @@ -5906,7 +5906,7 @@ START_TEST(touchpad_time_usec) litest_touch_move_to(dev, 0, 50, 50, 80, 50, 20); litest_touch_up(dev, 0); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); ck_assert_notnull(event); @@ -5947,7 +5947,7 @@ START_TEST(touchpad_jump_finger_motion) litest_touch_up(dev, 0); /* expect lots of little events, no big jump */ - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); do { struct libinput_event_pointer *ptrev; @@ -5987,7 +5987,7 @@ START_TEST(touchpad_jump_delta) litest_touch_up(dev, 0); /* expect lots of little events, no big jump */ - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); do { struct libinput_event_pointer *ptrev; @@ -6253,9 +6253,9 @@ START_TEST(touchpad_pressure_2fg) litest_touch_down(dev, 0, 30, 50); litest_touch_down_extended(dev, 1, 50, 50, axes); - libinput_dispatch(li); + litest_dispatch(li); litest_touch_move_to(dev, 0, 30, 50, 80, 80, 10); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_only_typed_events(li, LIBINPUT_EVENT_POINTER_MOTION); litest_touch_move_to_extended(dev, 1, 50, 50, 80, 80, axes, 10); @@ -6291,11 +6291,11 @@ START_TEST(touchpad_pressure_2fg_st) litest_drain_events(li); litest_touch_down_extended(dev, 0, 50, 50, axes); - libinput_dispatch(li); + litest_dispatch(li); litest_event(dev, EV_KEY, BTN_TOOL_FINGER, 0); litest_event(dev, EV_KEY, BTN_TOOL_DOUBLETAP, 1); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_touch_move_to_extended(dev, 0, 50, 50, 80, 80, axes, 10); litest_assert_empty_queue(li); } @@ -6319,7 +6319,7 @@ START_TEST(touchpad_pressure_tap) litest_drain_events(li); litest_touch_down_extended(dev, 0, 50, 50, axes); - libinput_dispatch(li); + litest_dispatch(li); litest_touch_up(dev, 0); litest_assert_empty_queue(li); } @@ -6345,7 +6345,7 @@ START_TEST(touchpad_pressure_tap_2fg) /* tap but too light */ litest_touch_down_extended(dev, 0, 40, 50, axes); litest_touch_down_extended(dev, 1, 50, 50, axes); - libinput_dispatch(li); + litest_dispatch(li); litest_touch_up(dev, 0); litest_touch_up(dev, 1); litest_assert_empty_queue(li); @@ -6373,10 +6373,10 @@ START_TEST(touchpad_pressure_tap_2fg_1fg_light) /* double-tap with one finger too light */ litest_touch_down(dev, 0, 40, 50); litest_touch_down_extended(dev, 1, 50, 50, axes); - libinput_dispatch(li); + litest_dispatch(li); litest_touch_up(dev, 0); litest_touch_up(dev, 1); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); litest_is_button_event(event, @@ -6385,7 +6385,7 @@ START_TEST(touchpad_pressure_tap_2fg_1fg_light) libinput_event_destroy(event); litest_timeout_tap(); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); litest_is_button_event(event, @@ -6420,7 +6420,7 @@ START_TEST(touchpad_pressure_btntool) /* Two light touches down, doesn't count */ litest_touch_down_extended(dev, 0, 40, 50, axes); litest_touch_down_extended(dev, 1, 45, 50, axes); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_empty_queue(li); /* Tripletap but since no finger is logically down, it doesn't count */ @@ -6433,7 +6433,7 @@ START_TEST(touchpad_pressure_btntool) litest_event(dev, EV_KEY, BTN_TOOL_DOUBLETAP, 1); litest_event(dev, EV_KEY, BTN_TOOL_TRIPLETAP, 0); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); /* make one finger real */ litest_touch_move(dev, 0, 40, 50); @@ -6443,15 +6443,15 @@ START_TEST(touchpad_pressure_btntool) litest_event(dev, EV_KEY, BTN_TOOL_DOUBLETAP, 0); litest_event(dev, EV_KEY, BTN_TOOL_TRIPLETAP, 1); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_event(dev, EV_KEY, BTN_TOOL_DOUBLETAP, 1); litest_event(dev, EV_KEY, BTN_TOOL_TRIPLETAP, 0); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_timeout_tap(); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_button_event(li, BTN_MIDDLE, @@ -6483,7 +6483,7 @@ START_TEST(touchpad_pressure_semi_mt_2fg_goes_light) litest_touch_move_extended(dev, 0, 40, 31, axes); litest_touch_move_extended(dev, 1, 60, 31, axes); litest_pop_event_frame(dev); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_scroll(li, LIBINPUT_EVENT_POINTER_SCROLL_FINGER, @@ -6499,7 +6499,7 @@ START_TEST(touchpad_pressure_semi_mt_2fg_goes_light) litest_touch_move_extended(dev, 0, 40, 40, axes); litest_touch_move_extended(dev, 1, 60, 40, axes); litest_pop_event_frame(dev); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_empty_queue(li); } END_TEST @@ -6632,7 +6632,7 @@ START_TEST(touchpad_palm_detect_touch_size_late) litest_touch_down(dev, 0, 50, 50); litest_touch_move_to(dev, 0, 50, 70, 80, 90, 10); litest_drain_events(li); - libinput_dispatch(li); + litest_dispatch(li); litest_touch_move_to_extended(dev, 0, 80, 90, 50, 20, axes, 10); litest_touch_up(dev, 0); litest_assert_only_typed_events(li, @@ -6644,7 +6644,7 @@ START_TEST(touchpad_palm_detect_touch_size_late) litest_touch_down(dev, 0, 50, 50); litest_touch_move_to(dev, 0, 50, 70, 80, 90, 10); litest_drain_events(li); - libinput_dispatch(li); + litest_dispatch(li); litest_touch_move_to_extended(dev, 0, 80, 90, 50, 20, axes, 10); litest_touch_up(dev, 0); litest_assert_empty_queue(li); @@ -6713,7 +6713,7 @@ START_TEST(touchpad_palm_detect_touch_size_after_edge) litest_touch_down(dev, 0, 99, 50); litest_touch_move_to_extended(dev, 0, 99, 50, 20, 50, axes, 20); litest_touch_up(dev, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_only_typed_events(li, LIBINPUT_EVENT_POINTER_MOTION); @@ -6752,7 +6752,7 @@ START_TEST(touchpad_palm_detect_touch_size_after_dwt) litest_assert_empty_queue(li); litest_timeout_dwt_short(); - libinput_dispatch(li); + litest_dispatch(li); litest_assert_empty_queue(li); /* after dwt timeout, pressure blocks events */ @@ -6782,7 +6782,7 @@ START_TEST(touchpad_speed_ignore_finger) litest_touch_move_to(dev, 0, 20, 20, 85, 80, 20); litest_touch_down(dev, 1, 20, 80); litest_touch_move_two_touches(dev, 85, 80, 20, 80, -20, -20, 10); - libinput_dispatch(li); + litest_dispatch(li); litest_touch_up(dev, 0); litest_touch_up(dev, 1); @@ -6814,7 +6814,7 @@ START_TEST(touchpad_speed_allow_nearby_finger) litest_drain_events(li); litest_touch_down(dev, 1, 79, 80); litest_touch_move_two_touches(dev, 80, 80, 79, 80, -20, -20, 10); - libinput_dispatch(li); + litest_dispatch(li); litest_touch_up(dev, 0); litest_touch_up(dev, 1); @@ -6842,10 +6842,10 @@ START_TEST(touchpad_speed_ignore_finger_edgescroll) litest_drain_events(li); litest_touch_down(dev, 1, 59, 80); litest_touch_move_two_touches(dev, 60, 80, 59, 80, -20, -20, 10); - libinput_dispatch(li); + litest_dispatch(li); litest_touch_up(dev, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_touch_up(dev, 1); litest_assert_only_typed_events(li, LIBINPUT_EVENT_POINTER_MOTION); @@ -6880,10 +6880,10 @@ START_TEST(touchpad_speed_ignore_hovering_finger) litest_pop_event_frame(dev); litest_touch_move_two_touches(dev, 59, 70, 65, 70, 0, 30, 10); - libinput_dispatch(li); + litest_dispatch(li); litest_touch_up(dev, 2); - libinput_dispatch(li); + litest_dispatch(li); litest_touch_up(dev, 1); litest_touch_up(dev, 0); @@ -7228,7 +7228,7 @@ START_TEST(touchpad_end_start_touch) litest_touch_down(dev, 0, 50, 50); litest_touch_move(dev, 0, 50.1, 50.1); - libinput_dispatch(li); + litest_dispatch(li); litest_push_event_frame(dev); litest_touch_up(dev, 0); @@ -7236,13 +7236,13 @@ START_TEST(touchpad_end_start_touch) litest_pop_event_frame(dev); litest_disable_log_handler(li); - libinput_dispatch(li); + litest_dispatch(li); litest_restore_log_handler(li); litest_assert_empty_queue(li); litest_timeout_tap(); - libinput_dispatch(li); + litest_dispatch(li); litest_touch_move_to(dev, 0, 50.2, 50.2, 50, 70, 10); litest_touch_up(dev, 0); diff --git a/test/test-trackball.c b/test/test-trackball.c index 033aef9a..b0503179 100644 --- a/test/test-trackball.c +++ b/test/test-trackball.c @@ -139,7 +139,7 @@ START_TEST(trackball_rotation_x) litest_event(dev, EV_REL, REL_X, 1); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); ptrev = litest_is_motion_event(event); @@ -189,7 +189,7 @@ START_TEST(trackball_rotation_y) litest_event(dev, EV_REL, REL_Y, 1); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); ptrev = litest_is_motion_event(event); @@ -241,7 +241,7 @@ START_TEST(trackball_rotation_accel) litest_event(dev, EV_REL, REL_Y, 1); litest_event(dev, EV_REL, REL_X, 1); litest_event(dev, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); ptrev = litest_is_motion_event(event); diff --git a/test/test-trackpoint.c b/test/test-trackpoint.c index a96e6605..9c1e9384 100644 --- a/test/test-trackpoint.c +++ b/test/test-trackpoint.c @@ -192,9 +192,9 @@ START_TEST(trackpoint_topsoftbuttons_left_handed_trackpoint) ck_assert_int_eq(status, LIBINPUT_CONFIG_STATUS_SUCCESS); litest_touch_down(touchpad, 0, 5, 5); - libinput_dispatch(li); + litest_dispatch(li); litest_button_click_debounced(touchpad, li, BTN_LEFT, true); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); litest_is_button_event(event, @@ -205,7 +205,7 @@ START_TEST(trackpoint_topsoftbuttons_left_handed_trackpoint) libinput_event_destroy(event); litest_button_click_debounced(touchpad, li, BTN_LEFT, false); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); litest_is_button_event(event, BTN_RIGHT, @@ -237,9 +237,9 @@ START_TEST(trackpoint_topsoftbuttons_left_handed_touchpad) ck_assert_int_eq(status, LIBINPUT_CONFIG_STATUS_SUCCESS); litest_touch_down(touchpad, 0, 5, 5); - libinput_dispatch(li); + litest_dispatch(li); litest_button_click_debounced(touchpad, li, BTN_LEFT, true); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); litest_is_button_event(event, BTN_LEFT, LIBINPUT_BUTTON_STATE_PRESSED); @@ -248,7 +248,7 @@ START_TEST(trackpoint_topsoftbuttons_left_handed_touchpad) libinput_event_destroy(event); litest_button_click_debounced(touchpad, li, BTN_LEFT, false); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); litest_is_button_event(event, BTN_LEFT, @@ -283,9 +283,9 @@ START_TEST(trackpoint_topsoftbuttons_left_handed_both) ck_assert_int_eq(status, LIBINPUT_CONFIG_STATUS_SUCCESS); litest_touch_down(touchpad, 0, 5, 5); - libinput_dispatch(li); + litest_dispatch(li); litest_button_click_debounced(touchpad, li, BTN_LEFT, true); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); litest_is_button_event(event, @@ -296,7 +296,7 @@ START_TEST(trackpoint_topsoftbuttons_left_handed_both) libinput_event_destroy(event); litest_button_click_debounced(touchpad, li, BTN_LEFT, false); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); litest_is_button_event(event, BTN_RIGHT, @@ -348,7 +348,7 @@ START_TEST(trackpoint_palmdetect) litest_event(trackpoint, EV_REL, REL_X, 1); litest_event(trackpoint, EV_REL, REL_Y, 1); litest_event(trackpoint, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); } litest_drain_events(li); @@ -358,7 +358,7 @@ START_TEST(trackpoint_palmdetect) litest_assert_empty_queue(li); litest_timeout_trackpoint(); - libinput_dispatch(li); + litest_dispatch(li); litest_touch_down(touchpad, 0, 30, 30); litest_touch_move_to(touchpad, 0, 30, 30, 80, 80, 10); @@ -387,7 +387,7 @@ START_TEST(trackpoint_palmdetect_dwtp_disabled) litest_event(trackpoint, EV_REL, REL_X, 1); litest_event(trackpoint, EV_REL, REL_Y, 1); litest_event(trackpoint, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); } litest_drain_events(li); @@ -419,7 +419,7 @@ START_TEST(trackpoint_palmdetect_resume_touch) litest_event(trackpoint, EV_REL, REL_X, 1); litest_event(trackpoint, EV_REL, REL_Y, 1); litest_event(trackpoint, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); } litest_drain_events(li); @@ -428,7 +428,7 @@ START_TEST(trackpoint_palmdetect_resume_touch) litest_assert_empty_queue(li); litest_timeout_trackpoint(); - libinput_dispatch(li); + litest_dispatch(li); /* touch started after last tp event, expect resume */ litest_touch_move_to(touchpad, 0, 80, 80, 30, 30, 10); @@ -457,7 +457,7 @@ START_TEST(trackpoint_palmdetect_require_min_events) litest_event(trackpoint, EV_REL, REL_X, 1); litest_event(trackpoint, EV_REL, REL_Y, 1); litest_event(trackpoint, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_drain_events(li); litest_touch_down(touchpad, 0, 30, 30); @@ -488,7 +488,7 @@ START_TEST(trackpoint_palmdetect_require_min_events_timeout) litest_event(trackpoint, EV_REL, REL_X, 1); litest_event(trackpoint, EV_REL, REL_Y, 1); litest_event(trackpoint, EV_SYN, SYN_REPORT, 0); - libinput_dispatch(li); + litest_dispatch(li); litest_drain_events(li); litest_touch_down(touchpad, 0, 30, 30); diff --git a/test/test-udev.c b/test/test-udev.c index d903a74f..8e80f322 100644 --- a/test/test-udev.c +++ b/test/test-udev.c @@ -92,7 +92,7 @@ START_TEST(udev_create_seat0) ck_assert_int_ge(fd, 0); /* expect at least one event */ - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); ck_assert_notnull(event); @@ -120,7 +120,7 @@ START_TEST(udev_create_empty_seat) fd = libinput_get_fd(li); ck_assert_int_ge(fd, 0); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); ck_assert(event == NULL); @@ -191,7 +191,7 @@ START_TEST(udev_added_seat_default) li = libinput_udev_create_context(&simple_interface, NULL, udev); ck_assert_notnull(li); ck_assert_int_eq(libinput_udev_assign_seat(li, "seat0"), 0); - libinput_dispatch(li); + litest_dispatch(li); /* Drop any events from other devices */ litest_drain_events(li); @@ -235,7 +235,7 @@ START_TEST(udev_change_seat) li = libinput_udev_create_context(&simple_interface, NULL, udev); ck_assert_notnull(li); ck_assert_int_eq(libinput_udev_assign_seat(li, "seat0"), 0); - libinput_dispatch(li); + litest_dispatch(li); /* Drop any events from other devices */ litest_drain_events(li); @@ -262,7 +262,7 @@ START_TEST(udev_change_seat) seat2_name); ck_assert_int_eq(rc, 0); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); ck_assert_int_eq(libinput_event_get_type(event), @@ -313,7 +313,7 @@ START_TEST(udev_double_suspend) ck_assert_int_ge(fd, 0); /* expect at least one event */ - ck_assert_int_ge(libinput_dispatch(li), 0); + ck_assert_int_ge(litest_dispatch(li), 0); event = libinput_get_event(li); ck_assert_notnull(event); @@ -345,7 +345,7 @@ START_TEST(udev_double_resume) ck_assert_int_ge(fd, 0); /* expect at least one event */ - ck_assert_int_ge(libinput_dispatch(li), 0); + ck_assert_int_ge(litest_dispatch(li), 0); event = libinput_get_event(li); ck_assert_notnull(event); @@ -397,19 +397,19 @@ START_TEST(udev_suspend_resume) ck_assert_int_ge(fd, 0); /* Check that at least one device was discovered after creation. */ - ck_assert_int_ge(libinput_dispatch(li), 0); + ck_assert_int_ge(litest_dispatch(li), 0); process_events_count_devices(li, &num_devices); ck_assert_int_gt(num_devices, 0); /* Check that after a suspend, no devices are left. */ libinput_suspend(li); - ck_assert_int_ge(libinput_dispatch(li), 0); + ck_assert_int_ge(litest_dispatch(li), 0); process_events_count_devices(li, &num_devices); ck_assert_int_eq(num_devices, 0); /* Check that after a resume, at least one device is discovered. */ libinput_resume(li); - ck_assert_int_ge(libinput_dispatch(li), 0); + ck_assert_int_ge(litest_dispatch(li), 0); process_events_count_devices(li, &num_devices); ck_assert_int_gt(num_devices, 0); @@ -474,7 +474,7 @@ START_TEST(udev_device_sysname) ck_assert_notnull(li); ck_assert_int_eq(libinput_udev_assign_seat(li, "seat0"), 0); - libinput_dispatch(li); + litest_dispatch(li); while ((ev = libinput_get_event(li))) { if (libinput_event_get_type(ev) != @@ -516,7 +516,7 @@ START_TEST(udev_seat_recycle) ck_assert_notnull(li); ck_assert_int_eq(libinput_udev_assign_seat(li, "seat0"), 0); - libinput_dispatch(li); + litest_dispatch(li); while ((ev = libinput_get_event(li))) { switch (libinput_event_get_type(ev)) { case LIBINPUT_EVENT_DEVICE_ADDED: @@ -544,7 +544,7 @@ START_TEST(udev_seat_recycle) libinput_resume(li); - libinput_dispatch(li); + litest_dispatch(li); while ((ev = libinput_get_event(li))) { switch (libinput_event_get_type(ev)) { case LIBINPUT_EVENT_DEVICE_ADDED: @@ -608,7 +608,7 @@ START_TEST(udev_path_remove_device) li = libinput_udev_create_context(&simple_interface, NULL, udev); ck_assert_notnull(li); ck_assert_int_eq(libinput_udev_assign_seat(li, "seat0"), 0); - libinput_dispatch(li); + litest_dispatch(li); litest_wait_for_event_of_type(li, LIBINPUT_EVENT_DEVICE_ADDED); event = libinput_get_event(li); @@ -646,7 +646,7 @@ START_TEST(udev_ignore_device) litest_restore_log_handler(li); ck_assert_int_eq(libinput_udev_assign_seat(li, "seat0"), 0); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); ck_assert_notnull(event); @@ -660,7 +660,7 @@ START_TEST(udev_ignore_device) ck_assert_str_ne(devname, name); } libinput_event_destroy(event); - libinput_dispatch(li); + litest_dispatch(li); event = libinput_get_event(li); }