fdo-mirrors/libinput
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/libinput/libinput.git synced 2025-12-20 06:50:05 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
libinput/test/test-gestures.c

1065 lines
27 KiB
C
Raw Permalink Normal View History

test: add a couple of basic gesture tests 3finger swipe, pinch and spread. While we expect the pinch/spread to have a zero angle, the discrete coordinates we use cause some angle, but below 1 degree. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2015-07-07 11:52:05 +10:00
/*
* Copyright © 2015 Red Hat, Inc.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice (including the next
* paragraph) shall be included in all copies or substantial portions of the
* Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
* DEALINGS IN THE SOFTWARE.
*/
#include <config.h>
#include <check.h>
#include <libinput.h>
#include "libinput-util.h"
#include "litest.h"
START_TEST(gestures_cap)
{
struct litest_device *dev = litest_current_device();
struct libinput_device *device = dev->libinput_device;
touchpad: disable MT for all semi-mt devices Synaptics, Elantech and Alps semi-mt devices all have issues with reporting correct MT data, even the bounding box which semi-mt devices are supposed to report is wrong. Synaptics devices have massive jumps with two fingers down. Elantech devices may open slots without coordinate data. Alps devices may send 0/0 coordinates as initial slot position. All these may be addressable with specific quirks, but the actual benefit is largely restricted to better palm detection (though even with quirks this is unlikely to work) and support for pinch gestures (again, lack of coordinates makes supporting those hard anyway). Elantech: https://bugs.freedesktop.org/show_bug.cgi?id=93583 Alps: https://bugzilla.redhat.com/show_bug.cgi?id=1295073 Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Hans de Goede <hdegoede@redhat.com>
2016-01-19 09:05:31 +10:00
if (libevdev_has_property(dev->evdev, INPUT_PROP_SEMI_MT))
touchpad: disable gestures on Synaptics semi-mt touchpads Follow-up to eb146677e, if we disable 2fg scrolling on those touchpads we should also disable gestures. The data doesn't magically become more useful. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Hans de Goede <hdegoede@redhat.com>
2015-07-30 11:07:58 +10:00
ck_assert(!libinput_device_has_capability(device,
LIBINPUT_DEVICE_CAP_GESTURE));
else
ck_assert(libinput_device_has_capability(device,
LIBINPUT_DEVICE_CAP_GESTURE));
test: add a couple of basic gesture tests 3finger swipe, pinch and spread. While we expect the pinch/spread to have a zero angle, the discrete coordinates we use cause some angle, but below 1 degree. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2015-07-07 11:52:05 +10:00
}
END_TEST
START_TEST(gestures_nocap)
{
struct litest_device *dev = litest_current_device();
struct libinput_device *device = dev->libinput_device;
ck_assert(!libinput_device_has_capability(device,
LIBINPUT_DEVICE_CAP_GESTURE));
}
END_TEST
START_TEST(gestures_swipe_3fg)
{
struct litest_device *dev = litest_current_device();
struct libinput *li = dev->libinput;
struct libinput_event *event;
struct libinput_event_gesture *gevent;
double dx, dy;
int cardinal = _i; /* ranged test */
double dir_x, dir_y;
int cardinals[8][2] = {
{ 0, 30 },
{ 30, 30 },
{ 30, 0 },
{ 30, -30 },
{ 0, -30 },
{ -30, -30 },
{ -30, 0 },
{ -30, 30 },
};
if (libevdev_get_num_slots(dev->evdev) < 3)
return;
dir_x = cardinals[cardinal][0];
dir_y = cardinals[cardinal][1];
litest_drain_events(li);
litest_touch_down(dev, 0, 40, 40);
test: rearrange fingers for gesture tests Prep work for the coming patch, arrange the fingers horizontally rather than vertically. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2016-01-08 11:06:49 +10:00
litest_touch_down(dev, 1, 50, 40);
litest_touch_down(dev, 2, 60, 40);
test: add a couple of basic gesture tests 3finger swipe, pinch and spread. While we expect the pinch/spread to have a zero angle, the discrete coordinates we use cause some angle, but below 1 degree. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2015-07-07 11:52:05 +10:00
libinput_dispatch(li);
test: drop the sleep_ms argument This forces events for every ~10ms now. If we want a slower movement, we need more steps - just like a real touchpad does it. Cocinelle spatch files were variants of: @@ expression A, B, C, D, E, F, G, H, I, J, K; @@ - litest_touch_move_two_touches(A, B, C, D, E, F, G, H, I) + litest_touch_move_two_touches(A, B, C, D, E, F, G, H) The only test that needed a real fix was touchpad_no_palm_detect_2fg_scroll, it used 12ms before, now it's using 10ms so on the bcm5974 touchpad the second finger was a speed-thumb. Increasing the events and thus slowing down the pointer means it's a normal finger and the test succeeds again. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2018-08-28 09:16:52 +10:00
litest_touch_move_three_touches(dev, 40, 40, 50, 40, 60, 40, dir_x,
dir_y, 10);
test: add a couple of basic gesture tests 3finger swipe, pinch and spread. While we expect the pinch/spread to have a zero angle, the discrete coordinates we use cause some angle, but below 1 degree. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2015-07-07 11:52:05 +10:00
libinput_dispatch(li);
event = libinput_get_event(li);
gevent = litest_is_gesture_event(event,
LIBINPUT_EVENT_GESTURE_SWIPE_BEGIN,
3);
dx = libinput_event_gesture_get_dx(gevent);
dy = libinput_event_gesture_get_dy(gevent);
ck_assert(dx == 0.0);
ck_assert(dy == 0.0);
libinput_event_destroy(event);
while ((event = libinput_get_event(li)) != NULL) {
gevent = litest_is_gesture_event(event,
LIBINPUT_EVENT_GESTURE_SWIPE_UPDATE,
3);
dx = libinput_event_gesture_get_dx(gevent);
dy = libinput_event_gesture_get_dy(gevent);
if (dir_x == 0.0)
ck_assert(dx == 0.0);
else if (dir_x < 0.0)
ck_assert(dx < 0.0);
else if (dir_x > 0.0)
ck_assert(dx > 0.0);
if (dir_y == 0.0)
ck_assert(dy == 0.0);
else if (dir_y < 0.0)
ck_assert(dy < 0.0);
else if (dir_y > 0.0)
ck_assert(dy > 0.0);
dx = libinput_event_gesture_get_dx_unaccelerated(gevent);
dy = libinput_event_gesture_get_dy_unaccelerated(gevent);
if (dir_x == 0.0)
ck_assert(dx == 0.0);
else if (dir_x < 0.0)
ck_assert(dx < 0.0);
else if (dir_x > 0.0)
ck_assert(dx > 0.0);
if (dir_y == 0.0)
ck_assert(dy == 0.0);
else if (dir_y < 0.0)
ck_assert(dy < 0.0);
else if (dir_y > 0.0)
ck_assert(dy > 0.0);
libinput_event_destroy(event);
}
litest_touch_up(dev, 0);
litest_touch_up(dev, 1);
litest_touch_up(dev, 2);
libinput_dispatch(li);
event = libinput_get_event(li);
gevent = litest_is_gesture_event(event,
LIBINPUT_EVENT_GESTURE_SWIPE_END,
3);
ck_assert(!libinput_event_gesture_get_cancelled(gevent));
libinput_event_destroy(event);
}
END_TEST
test: add more gesture tests Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2016-01-07 15:00:53 +10:00
START_TEST(gestures_swipe_3fg_btntool)
{
struct litest_device *dev = litest_current_device();
struct libinput *li = dev->libinput;
struct libinput_event *event;
struct libinput_event_gesture *gevent;
double dx, dy;
int cardinal = _i; /* ranged test */
double dir_x, dir_y;
int cardinals[8][2] = {
{ 0, 30 },
{ 30, 30 },
{ 30, 0 },
{ 30, -30 },
{ 0, -30 },
{ -30, -30 },
{ -30, 0 },
{ -30, 30 },
};
if (libevdev_get_num_slots(dev->evdev) > 2 ||
test: fix a bunch of tests expecting BTN_TOOL_TRIPLETAP A device may have 1 or 2 slots without setting BTN_TOOL_TRIPLETAP, those devices will fail those tests. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> (cherry picked from commit 803a99ac05821f3dc43f6daf54eb33b57fda8b0b)
2019-05-08 13:59:27 +10:00
!libevdev_has_event_code(dev->evdev, EV_KEY, BTN_TOOL_TRIPLETAP) ||
test: add more gesture tests Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2016-01-07 15:00:53 +10:00
!libinput_device_has_capability(dev->libinput_device,
LIBINPUT_DEVICE_CAP_GESTURE))
return;
dir_x = cardinals[cardinal][0];
dir_y = cardinals[cardinal][1];
litest_drain_events(li);
litest_touch_down(dev, 0, 40, 40);
litest_touch_down(dev, 1, 50, 40);
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);
test: drop the sleep_ms argument This forces events for every ~10ms now. If we want a slower movement, we need more steps - just like a real touchpad does it. Cocinelle spatch files were variants of: @@ expression A, B, C, D, E, F, G, H, I, J, K; @@ - litest_touch_move_two_touches(A, B, C, D, E, F, G, H, I) + litest_touch_move_two_touches(A, B, C, D, E, F, G, H) The only test that needed a real fix was touchpad_no_palm_detect_2fg_scroll, it used 12ms before, now it's using 10ms so on the bcm5974 touchpad the second finger was a speed-thumb. Increasing the events and thus slowing down the pointer means it's a normal finger and the test succeeds again. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2018-08-28 09:16:52 +10:00
litest_touch_move_two_touches(dev, 40, 40, 50, 40, dir_x, dir_y, 10);
test: add more gesture tests Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2016-01-07 15:00:53 +10:00
libinput_dispatch(li);
event = libinput_get_event(li);
gevent = litest_is_gesture_event(event,
LIBINPUT_EVENT_GESTURE_SWIPE_BEGIN,
3);
dx = libinput_event_gesture_get_dx(gevent);
dy = libinput_event_gesture_get_dy(gevent);
ck_assert(dx == 0.0);
ck_assert(dy == 0.0);
libinput_event_destroy(event);
while ((event = libinput_get_event(li)) != NULL) {
gevent = litest_is_gesture_event(event,
LIBINPUT_EVENT_GESTURE_SWIPE_UPDATE,
3);
dx = libinput_event_gesture_get_dx(gevent);
dy = libinput_event_gesture_get_dy(gevent);
if (dir_x == 0.0)
ck_assert(dx == 0.0);
else if (dir_x < 0.0)
ck_assert(dx < 0.0);
else if (dir_x > 0.0)
ck_assert(dx > 0.0);
if (dir_y == 0.0)
ck_assert(dy == 0.0);
else if (dir_y < 0.0)
ck_assert(dy < 0.0);
else if (dir_y > 0.0)
ck_assert(dy > 0.0);
dx = libinput_event_gesture_get_dx_unaccelerated(gevent);
dy = libinput_event_gesture_get_dy_unaccelerated(gevent);
if (dir_x == 0.0)
ck_assert(dx == 0.0);
else if (dir_x < 0.0)
ck_assert(dx < 0.0);
else if (dir_x > 0.0)
ck_assert(dx > 0.0);
if (dir_y == 0.0)
ck_assert(dy == 0.0);
else if (dir_y < 0.0)
ck_assert(dy < 0.0);
else if (dir_y > 0.0)
ck_assert(dy > 0.0);
libinput_event_destroy(event);
}
litest_touch_up(dev, 0);
litest_touch_up(dev, 1);
libinput_dispatch(li);
event = libinput_get_event(li);
gevent = litest_is_gesture_event(event,
LIBINPUT_EVENT_GESTURE_SWIPE_END,
3);
ck_assert(!libinput_event_gesture_get_cancelled(gevent));
libinput_event_destroy(event);
}
END_TEST
START_TEST(gestures_swipe_4fg)
{
struct litest_device *dev = litest_current_device();
struct libinput *li = dev->libinput;
struct libinput_event *event;
struct libinput_event_gesture *gevent;
double dx, dy;
int cardinal = _i; /* ranged test */
double dir_x, dir_y;
int cardinals[8][2] = {
{ 0, 3 },
{ 3, 3 },
{ 3, 0 },
{ 3, -3 },
{ 0, -3 },
{ -3, -3 },
{ -3, 0 },
{ -3, 3 },
};
int i;
if (libevdev_get_num_slots(dev->evdev) < 4)
return;
dir_x = cardinals[cardinal][0];
dir_y = cardinals[cardinal][1];
litest_drain_events(li);
litest_touch_down(dev, 0, 40, 40);
litest_touch_down(dev, 1, 50, 40);
litest_touch_down(dev, 2, 60, 40);
litest_touch_down(dev, 3, 70, 40);
libinput_dispatch(li);
for (i = 0; i < 8; i++) {
litest_push_event_frame(dev);
dir_x += cardinals[cardinal][0];
dir_y += cardinals[cardinal][1];
litest_touch_move(dev,
0,
40 + dir_x,
40 + dir_y);
litest_touch_move(dev,
1,
50 + dir_x,
40 + dir_y);
litest_touch_move(dev,
2,
60 + dir_x,
40 + dir_y);
litest_touch_move(dev,
3,
70 + dir_x,
40 + dir_y);
litest_pop_event_frame(dev);
libinput_dispatch(li);
}
libinput_dispatch(li);
event = libinput_get_event(li);
gevent = litest_is_gesture_event(event,
LIBINPUT_EVENT_GESTURE_SWIPE_BEGIN,
4);
dx = libinput_event_gesture_get_dx(gevent);
dy = libinput_event_gesture_get_dy(gevent);
ck_assert(dx == 0.0);
ck_assert(dy == 0.0);
libinput_event_destroy(event);
while ((event = libinput_get_event(li)) != NULL) {
gevent = litest_is_gesture_event(event,
LIBINPUT_EVENT_GESTURE_SWIPE_UPDATE,
4);
dx = libinput_event_gesture_get_dx(gevent);
dy = libinput_event_gesture_get_dy(gevent);
if (dir_x == 0.0)
ck_assert(dx == 0.0);
else if (dir_x < 0.0)
ck_assert(dx < 0.0);
else if (dir_x > 0.0)
ck_assert(dx > 0.0);
if (dir_y == 0.0)
ck_assert(dy == 0.0);
else if (dir_y < 0.0)
ck_assert(dy < 0.0);
else if (dir_y > 0.0)
ck_assert(dy > 0.0);
dx = libinput_event_gesture_get_dx_unaccelerated(gevent);
dy = libinput_event_gesture_get_dy_unaccelerated(gevent);
if (dir_x == 0.0)
ck_assert(dx == 0.0);
else if (dir_x < 0.0)
ck_assert(dx < 0.0);
else if (dir_x > 0.0)
ck_assert(dx > 0.0);
if (dir_y == 0.0)
ck_assert(dy == 0.0);
else if (dir_y < 0.0)
ck_assert(dy < 0.0);
else if (dir_y > 0.0)
ck_assert(dy > 0.0);
libinput_event_destroy(event);
}
litest_touch_up(dev, 0);
litest_touch_up(dev, 1);
litest_touch_up(dev, 2);
litest_touch_up(dev, 3);
libinput_dispatch(li);
event = libinput_get_event(li);
gevent = litest_is_gesture_event(event,
LIBINPUT_EVENT_GESTURE_SWIPE_END,
4);
ck_assert(!libinput_event_gesture_get_cancelled(gevent));
libinput_event_destroy(event);
}
END_TEST
START_TEST(gestures_swipe_4fg_btntool)
{
struct litest_device *dev = litest_current_device();
struct libinput *li = dev->libinput;
struct libinput_event *event;
struct libinput_event_gesture *gevent;
double dx, dy;
int cardinal = _i; /* ranged test */
double dir_x, dir_y;
int cardinals[8][2] = {
{ 0, 30 },
{ 30, 30 },
{ 30, 0 },
{ 30, -30 },
{ 0, -30 },
{ -30, -30 },
{ -30, 0 },
{ -30, 30 },
};
if (libevdev_get_num_slots(dev->evdev) > 2 ||
test: check for BTN_TOOL_QUADTAP in the 4fg btntool tests Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2016-02-04 13:35:08 +10:00
!libevdev_has_event_code(dev->evdev, EV_KEY, BTN_TOOL_QUADTAP) ||
test: add more gesture tests Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2016-01-07 15:00:53 +10:00
!libinput_device_has_capability(dev->libinput_device,
LIBINPUT_DEVICE_CAP_GESTURE))
return;
dir_x = cardinals[cardinal][0];
dir_y = cardinals[cardinal][1];
litest_drain_events(li);
litest_touch_down(dev, 0, 40, 40);
litest_touch_down(dev, 1, 50, 40);
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);
test: drop the sleep_ms argument This forces events for every ~10ms now. If we want a slower movement, we need more steps - just like a real touchpad does it. Cocinelle spatch files were variants of: @@ expression A, B, C, D, E, F, G, H, I, J, K; @@ - litest_touch_move_two_touches(A, B, C, D, E, F, G, H, I) + litest_touch_move_two_touches(A, B, C, D, E, F, G, H) The only test that needed a real fix was touchpad_no_palm_detect_2fg_scroll, it used 12ms before, now it's using 10ms so on the bcm5974 touchpad the second finger was a speed-thumb. Increasing the events and thus slowing down the pointer means it's a normal finger and the test succeeds again. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2018-08-28 09:16:52 +10:00
litest_touch_move_two_touches(dev, 40, 40, 50, 40, dir_x, dir_y, 10);
test: add more gesture tests Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2016-01-07 15:00:53 +10:00
libinput_dispatch(li);
event = libinput_get_event(li);
gevent = litest_is_gesture_event(event,
LIBINPUT_EVENT_GESTURE_SWIPE_BEGIN,
4);
dx = libinput_event_gesture_get_dx(gevent);
dy = libinput_event_gesture_get_dy(gevent);
ck_assert(dx == 0.0);
ck_assert(dy == 0.0);
libinput_event_destroy(event);
while ((event = libinput_get_event(li)) != NULL) {
gevent = litest_is_gesture_event(event,
LIBINPUT_EVENT_GESTURE_SWIPE_UPDATE,
4);
dx = libinput_event_gesture_get_dx(gevent);
dy = libinput_event_gesture_get_dy(gevent);
if (dir_x == 0.0)
ck_assert(dx == 0.0);
else if (dir_x < 0.0)
ck_assert(dx < 0.0);
else if (dir_x > 0.0)
ck_assert(dx > 0.0);
if (dir_y == 0.0)
ck_assert(dy == 0.0);
else if (dir_y < 0.0)
ck_assert(dy < 0.0);
else if (dir_y > 0.0)
ck_assert(dy > 0.0);
dx = libinput_event_gesture_get_dx_unaccelerated(gevent);
dy = libinput_event_gesture_get_dy_unaccelerated(gevent);
if (dir_x == 0.0)
ck_assert(dx == 0.0);
else if (dir_x < 0.0)
ck_assert(dx < 0.0);
else if (dir_x > 0.0)
ck_assert(dx > 0.0);
if (dir_y == 0.0)
ck_assert(dy == 0.0);
else if (dir_y < 0.0)
ck_assert(dy < 0.0);
else if (dir_y > 0.0)
ck_assert(dy > 0.0);
libinput_event_destroy(event);
}
litest_touch_up(dev, 0);
litest_touch_up(dev, 1);
libinput_dispatch(li);
event = libinput_get_event(li);
gevent = litest_is_gesture_event(event,
LIBINPUT_EVENT_GESTURE_SWIPE_END,
4);
ck_assert(!libinput_event_gesture_get_cancelled(gevent));
libinput_event_destroy(event);
}
END_TEST
test: fix typo in test case name Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2017-08-17 02:02:56 +02:00
START_TEST(gestures_pinch_vertical_position)
test: add test for the vertical position-dependent pinch Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Hans de Goede <hdegoede@redhat.com>
2016-12-21 09:44:27 +10:00
{
struct litest_device *dev = litest_current_device();
struct libinput *li = dev->libinput;
struct libinput_event *event;
int nfingers = _i; /* ranged test */
if (libevdev_get_num_slots(dev->evdev) < nfingers ||
!libinput_device_has_capability(dev->libinput_device,
LIBINPUT_DEVICE_CAP_GESTURE))
return;
litest_disable_tap(dev->libinput_device);
litest_drain_events(li);
litest_touch_down(dev, 0, 40, 30);
litest_touch_down(dev, 1, 50, 70);
litest_touch_down(dev, 2, 60, 70);
if (nfingers > 3)
litest_touch_down(dev, 3, 70, 70);
libinput_dispatch(li);
litest_timeout_gesture_scroll();
libinput_dispatch(li);
/* This is actually a small swipe gesture, all three fingers moving
* down but we're checking for the code that triggers based on
* finger position. */
test: don't use move_to for a single-step movement If we only want one event anyway... Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2018-08-27 14:28:58 +10:00
litest_touch_move(dev, 0, 40, 30.5);
litest_touch_move(dev, 1, 50, 70.5);
litest_touch_move(dev, 2, 60, 70.5);
test: add test for the vertical position-dependent pinch Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Hans de Goede <hdegoede@redhat.com>
2016-12-21 09:44:27 +10:00
if (nfingers > 3)
test: don't use move_to for a single-step movement If we only want one event anyway... Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2018-08-27 14:28:58 +10:00
litest_touch_move(dev, 3, 70, 70.5);
test: add test for the vertical position-dependent pinch Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Hans de Goede <hdegoede@redhat.com>
2016-12-21 09:44:27 +10:00
libinput_dispatch(li);
event = libinput_get_event(li);
litest_is_gesture_event(event,
LIBINPUT_EVENT_GESTURE_PINCH_BEGIN,
nfingers);
libinput_event_destroy(event);
test: drop the sleep_ms argument This forces events for every ~10ms now. If we want a slower movement, we need more steps - just like a real touchpad does it. Cocinelle spatch files were variants of: @@ expression A, B, C, D, E, F, G, H, I, J, K; @@ - litest_touch_move_two_touches(A, B, C, D, E, F, G, H, I) + litest_touch_move_two_touches(A, B, C, D, E, F, G, H) The only test that needed a real fix was touchpad_no_palm_detect_2fg_scroll, it used 12ms before, now it's using 10ms so on the bcm5974 touchpad the second finger was a speed-thumb. Increasing the events and thus slowing down the pointer means it's a normal finger and the test succeeds again. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2018-08-28 09:16:52 +10:00
litest_touch_move_to(dev, 0, 40, 30.5, 40, 36, 5);
litest_touch_move_to(dev, 1, 50, 70.5, 50, 76, 5);
litest_touch_move_to(dev, 2, 60, 70.5, 60, 76, 5);
test: add test for the vertical position-dependent pinch Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Hans de Goede <hdegoede@redhat.com>
2016-12-21 09:44:27 +10:00
if (nfingers > 3)
test: drop the sleep_ms argument This forces events for every ~10ms now. If we want a slower movement, we need more steps - just like a real touchpad does it. Cocinelle spatch files were variants of: @@ expression A, B, C, D, E, F, G, H, I, J, K; @@ - litest_touch_move_two_touches(A, B, C, D, E, F, G, H, I) + litest_touch_move_two_touches(A, B, C, D, E, F, G, H) The only test that needed a real fix was touchpad_no_palm_detect_2fg_scroll, it used 12ms before, now it's using 10ms so on the bcm5974 touchpad the second finger was a speed-thumb. Increasing the events and thus slowing down the pointer means it's a normal finger and the test succeeds again. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2018-08-28 09:16:52 +10:00
litest_touch_move_to(dev, 3, 70, 70.5, 60, 76, 5);
test: add test for the vertical position-dependent pinch Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Hans de Goede <hdegoede@redhat.com>
2016-12-21 09:44:27 +10:00
libinput_dispatch(li);
litest_assert_only_typed_events(li,
LIBINPUT_EVENT_GESTURE_PINCH_UPDATE);
}
END_TEST
test: add a couple of basic gesture tests 3finger swipe, pinch and spread. While we expect the pinch/spread to have a zero angle, the discrete coordinates we use cause some angle, but below 1 degree. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2015-07-07 11:52:05 +10:00
START_TEST(gestures_pinch)
{
struct litest_device *dev = litest_current_device();
struct libinput *li = dev->libinput;
struct libinput_event *event;
struct libinput_event_gesture *gevent;
double dx, dy;
int cardinal = _i; /* ranged test */
double dir_x, dir_y;
int i;
double scale, oldscale;
double angle;
int cardinals[8][2] = {
{ 0, 30 },
{ 30, 30 },
{ 30, 0 },
{ 30, -30 },
{ 0, -30 },
{ -30, -30 },
{ -30, 0 },
{ -30, 30 },
};
test: add more gesture tests Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2016-01-07 15:00:53 +10:00
if (libevdev_get_num_slots(dev->evdev) < 2 ||
!libinput_device_has_capability(dev->libinput_device,
LIBINPUT_DEVICE_CAP_GESTURE))
return;
dir_x = cardinals[cardinal][0];
dir_y = cardinals[cardinal][1];
litest_drain_events(li);
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);
for (i = 0; i < 8; i++) {
litest_push_event_frame(dev);
if (dir_x > 0.0)
dir_x -= 2;
else if (dir_x < 0.0)
dir_x += 2;
if (dir_y > 0.0)
dir_y -= 2;
else if (dir_y < 0.0)
dir_y += 2;
litest_touch_move(dev,
0,
50 + dir_x,
50 + dir_y);
litest_touch_move(dev,
1,
50 - dir_x,
50 - dir_y);
litest_pop_event_frame(dev);
libinput_dispatch(li);
}
event = libinput_get_event(li);
gevent = litest_is_gesture_event(event,
LIBINPUT_EVENT_GESTURE_PINCH_BEGIN,
2);
dx = libinput_event_gesture_get_dx(gevent);
dy = libinput_event_gesture_get_dy(gevent);
scale = libinput_event_gesture_get_scale(gevent);
ck_assert(dx == 0.0);
ck_assert(dy == 0.0);
ck_assert(scale == 1.0);
libinput_event_destroy(event);
while ((event = libinput_get_event(li)) != NULL) {
gevent = litest_is_gesture_event(event,
LIBINPUT_EVENT_GESTURE_PINCH_UPDATE,
2);
oldscale = scale;
scale = libinput_event_gesture_get_scale(gevent);
ck_assert(scale < oldscale);
angle = libinput_event_gesture_get_angle_delta(gevent);
ck_assert_double_le(fabs(angle), 1.0);
libinput_event_destroy(event);
libinput_dispatch(li);
}
litest_touch_up(dev, 0);
litest_touch_up(dev, 1);
libinput_dispatch(li);
event = libinput_get_event(li);
gevent = litest_is_gesture_event(event,
LIBINPUT_EVENT_GESTURE_PINCH_END,
2);
ck_assert(!libinput_event_gesture_get_cancelled(gevent));
libinput_event_destroy(event);
}
END_TEST
START_TEST(gestures_pinch_3fg)
{
struct litest_device *dev = litest_current_device();
struct libinput *li = dev->libinput;
struct libinput_event *event;
struct libinput_event_gesture *gevent;
double dx, dy;
int cardinal = _i; /* ranged test */
double dir_x, dir_y;
int i;
double scale, oldscale;
double angle;
int cardinals[8][2] = {
{ 0, 30 },
{ 30, 30 },
{ 30, 0 },
{ 30, -30 },
{ 0, -30 },
{ -30, -30 },
{ -30, 0 },
{ -30, 30 },
};
if (libevdev_get_num_slots(dev->evdev) < 3)
return;
dir_x = cardinals[cardinal][0];
dir_y = cardinals[cardinal][1];
litest_drain_events(li);
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);
for (i = 0; i < 8; i++) {
litest_push_event_frame(dev);
if (dir_x > 0.0)
dir_x -= 2;
else if (dir_x < 0.0)
dir_x += 2;
if (dir_y > 0.0)
dir_y -= 2;
else if (dir_y < 0.0)
dir_y += 2;
litest_touch_move(dev,
0,
50 + dir_x,
50 + dir_y);
litest_touch_move(dev,
1,
50 - dir_x,
50 - dir_y);
litest_touch_move(dev,
2,
51 - dir_x,
51 - dir_y);
litest_pop_event_frame(dev);
libinput_dispatch(li);
}
event = libinput_get_event(li);
gevent = litest_is_gesture_event(event,
LIBINPUT_EVENT_GESTURE_PINCH_BEGIN,
3);
dx = libinput_event_gesture_get_dx(gevent);
dy = libinput_event_gesture_get_dy(gevent);
scale = libinput_event_gesture_get_scale(gevent);
ck_assert(dx == 0.0);
ck_assert(dy == 0.0);
ck_assert(scale == 1.0);
libinput_event_destroy(event);
while ((event = libinput_get_event(li)) != NULL) {
gevent = litest_is_gesture_event(event,
LIBINPUT_EVENT_GESTURE_PINCH_UPDATE,
3);
oldscale = scale;
scale = libinput_event_gesture_get_scale(gevent);
ck_assert(scale < oldscale);
angle = libinput_event_gesture_get_angle_delta(gevent);
ck_assert_double_le(fabs(angle), 1.0);
libinput_event_destroy(event);
libinput_dispatch(li);
}
litest_touch_up(dev, 0);
litest_touch_up(dev, 1);
litest_touch_up(dev, 2);
libinput_dispatch(li);
event = libinput_get_event(li);
gevent = litest_is_gesture_event(event,
LIBINPUT_EVENT_GESTURE_PINCH_END,
3);
ck_assert(!libinput_event_gesture_get_cancelled(gevent));
libinput_event_destroy(event);
}
END_TEST
START_TEST(gestures_pinch_4fg)
{
struct litest_device *dev = litest_current_device();
struct libinput *li = dev->libinput;
struct libinput_event *event;
struct libinput_event_gesture *gevent;
double dx, dy;
int cardinal = _i; /* ranged test */
double dir_x, dir_y;
int i;
double scale, oldscale;
double angle;
int cardinals[8][2] = {
{ 0, 30 },
{ 30, 30 },
{ 30, 0 },
{ 30, -30 },
{ 0, -30 },
{ -30, -30 },
{ -30, 0 },
{ -30, 30 },
};
if (libevdev_get_num_slots(dev->evdev) < 4)
return;
dir_x = cardinals[cardinal][0];
dir_y = cardinals[cardinal][1];
litest_drain_events(li);
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);
litest_touch_down(dev, 3, 52 - dir_x, 52 - dir_y);
libinput_dispatch(li);
for (i = 0; i < 8; i++) {
litest_push_event_frame(dev);
if (dir_x > 0.0)
dir_x -= 2;
else if (dir_x < 0.0)
dir_x += 2;
if (dir_y > 0.0)
dir_y -= 2;
else if (dir_y < 0.0)
dir_y += 2;
litest_touch_move(dev,
0,
50 + dir_x,
50 + dir_y);
litest_touch_move(dev,
1,
50 - dir_x,
50 - dir_y);
litest_touch_move(dev,
2,
51 - dir_x,
51 - dir_y);
litest_touch_move(dev,
3,
52 - dir_x,
52 - dir_y);
litest_pop_event_frame(dev);
libinput_dispatch(li);
}
event = libinput_get_event(li);
gevent = litest_is_gesture_event(event,
LIBINPUT_EVENT_GESTURE_PINCH_BEGIN,
4);
dx = libinput_event_gesture_get_dx(gevent);
dy = libinput_event_gesture_get_dy(gevent);
scale = libinput_event_gesture_get_scale(gevent);
ck_assert(dx == 0.0);
ck_assert(dy == 0.0);
ck_assert(scale == 1.0);
libinput_event_destroy(event);
while ((event = libinput_get_event(li)) != NULL) {
gevent = litest_is_gesture_event(event,
LIBINPUT_EVENT_GESTURE_PINCH_UPDATE,
4);
oldscale = scale;
scale = libinput_event_gesture_get_scale(gevent);
ck_assert(scale < oldscale);
angle = libinput_event_gesture_get_angle_delta(gevent);
ck_assert_double_le(fabs(angle), 1.0);
libinput_event_destroy(event);
libinput_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);
event = libinput_get_event(li);
gevent = litest_is_gesture_event(event,
LIBINPUT_EVENT_GESTURE_PINCH_END,
4);
ck_assert(!libinput_event_gesture_get_cancelled(gevent));
libinput_event_destroy(event);
}
END_TEST
test: add a couple of basic gesture tests 3finger swipe, pinch and spread. While we expect the pinch/spread to have a zero angle, the discrete coordinates we use cause some angle, but below 1 degree. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2015-07-07 11:52:05 +10:00
START_TEST(gestures_spread)
{
struct litest_device *dev = litest_current_device();
struct libinput *li = dev->libinput;
struct libinput_event *event;
struct libinput_event_gesture *gevent;
double dx, dy;
int cardinal = _i; /* ranged test */
double dir_x, dir_y;
int i;
double scale, oldscale;
double angle;
int cardinals[8][2] = {
test: run pinch gesture tests for 2-slot touchpads Some of the 2-slot touchpads don't do gestures though (e.g. semi-mt) so skip those. And change the movement granularity for the pinch and spread tests so we stay under one degree angle for lower-resolution touchpads too. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2016-01-07 14:39:52 +10:00
{ 0, 30 },
{ 30, 30 },
{ 30, 0 },
{ 30, -30 },
{ 0, -30 },
{ -30, -30 },
{ -30, 0 },
{ -30, 30 },
test: add a couple of basic gesture tests 3finger swipe, pinch and spread. While we expect the pinch/spread to have a zero angle, the discrete coordinates we use cause some angle, but below 1 degree. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2015-07-07 11:52:05 +10:00
};
test: run pinch gesture tests for 2-slot touchpads Some of the 2-slot touchpads don't do gestures though (e.g. semi-mt) so skip those. And change the movement granularity for the pinch and spread tests so we stay under one degree angle for lower-resolution touchpads too. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2016-01-07 14:39:52 +10:00
if (libevdev_get_num_slots(dev->evdev) < 2 ||
!libinput_device_has_capability(dev->libinput_device,
LIBINPUT_DEVICE_CAP_GESTURE))
test: add a couple of basic gesture tests 3finger swipe, pinch and spread. While we expect the pinch/spread to have a zero angle, the discrete coordinates we use cause some angle, but below 1 degree. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2015-07-07 11:52:05 +10:00
return;
dir_x = cardinals[cardinal][0];
dir_y = cardinals[cardinal][1];
litest_drain_events(li);
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);
touchpad: reduce 2fg scroll threshold to 2mm 3mm is too large, especially on fine-grained scroll motions. Since we already use the hysteresis to defuzz the current touchpad point, having a slower threshold here should not cause any adverse motions. This affects the pinch gestures too and needs a minor test adjustment. The atmel hover device's resolution is low enough that we trigger a >1 degree angle now, make the movement a bit more finegrained. https://bugs.freedesktop.org/show_bug.cgi?id=91364 Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Hans de Goede <hdegoede@redhat.com>
2015-07-20 11:13:55 +10:00
for (i = 0; i < 15; i++) {
test: add a couple of basic gesture tests 3finger swipe, pinch and spread. While we expect the pinch/spread to have a zero angle, the discrete coordinates we use cause some angle, but below 1 degree. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2015-07-07 11:52:05 +10:00
litest_push_event_frame(dev);
if (dir_x > 0.0)
touchpad: reduced the 2fg scroll threshold to 1mm At least on the t440, this is enough to trigger correct detection between pinch and scroll 90% of the time. Since scrolling is significantly more prevalent than gesturing, erring on the side of scrolling at the cost of misdetecting some gestures is acceptable. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Hans de Goede <hdegoede@redhat.com>
2015-11-09 16:21:36 +10:00
dir_x += 1;
test: add a couple of basic gesture tests 3finger swipe, pinch and spread. While we expect the pinch/spread to have a zero angle, the discrete coordinates we use cause some angle, but below 1 degree. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2015-07-07 11:52:05 +10:00
else if (dir_x < 0.0)
touchpad: reduced the 2fg scroll threshold to 1mm At least on the t440, this is enough to trigger correct detection between pinch and scroll 90% of the time. Since scrolling is significantly more prevalent than gesturing, erring on the side of scrolling at the cost of misdetecting some gestures is acceptable. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Hans de Goede <hdegoede@redhat.com>
2015-11-09 16:21:36 +10:00
dir_x -= 1;
test: add a couple of basic gesture tests 3finger swipe, pinch and spread. While we expect the pinch/spread to have a zero angle, the discrete coordinates we use cause some angle, but below 1 degree. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2015-07-07 11:52:05 +10:00
if (dir_y > 0.0)
touchpad: reduced the 2fg scroll threshold to 1mm At least on the t440, this is enough to trigger correct detection between pinch and scroll 90% of the time. Since scrolling is significantly more prevalent than gesturing, erring on the side of scrolling at the cost of misdetecting some gestures is acceptable. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Hans de Goede <hdegoede@redhat.com>
2015-11-09 16:21:36 +10:00
dir_y += 1;
test: add a couple of basic gesture tests 3finger swipe, pinch and spread. While we expect the pinch/spread to have a zero angle, the discrete coordinates we use cause some angle, but below 1 degree. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2015-07-07 11:52:05 +10:00
else if (dir_y < 0.0)
touchpad: reduced the 2fg scroll threshold to 1mm At least on the t440, this is enough to trigger correct detection between pinch and scroll 90% of the time. Since scrolling is significantly more prevalent than gesturing, erring on the side of scrolling at the cost of misdetecting some gestures is acceptable. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Hans de Goede <hdegoede@redhat.com>
2015-11-09 16:21:36 +10:00
dir_y -= 1;
test: add a couple of basic gesture tests 3finger swipe, pinch and spread. While we expect the pinch/spread to have a zero angle, the discrete coordinates we use cause some angle, but below 1 degree. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2015-07-07 11:52:05 +10:00
litest_touch_move(dev,
0,
50 + dir_x,
50 + dir_y);
litest_touch_move(dev,
1,
50 - dir_x,
50 - dir_y);
litest_pop_event_frame(dev);
libinput_dispatch(li);
}
event = libinput_get_event(li);
gevent = litest_is_gesture_event(event,
LIBINPUT_EVENT_GESTURE_PINCH_BEGIN,
2);
dx = libinput_event_gesture_get_dx(gevent);
dy = libinput_event_gesture_get_dy(gevent);
scale = libinput_event_gesture_get_scale(gevent);
ck_assert(dx == 0.0);
ck_assert(dy == 0.0);
ck_assert(scale == 1.0);
libinput_event_destroy(event);
while ((event = libinput_get_event(li)) != NULL) {
gevent = litest_is_gesture_event(event,
LIBINPUT_EVENT_GESTURE_PINCH_UPDATE,
2);
oldscale = scale;
scale = libinput_event_gesture_get_scale(gevent);
ck_assert(scale > oldscale);
angle = libinput_event_gesture_get_angle_delta(gevent);
ck_assert_double_le(fabs(angle), 1.0);
libinput_event_destroy(event);
libinput_dispatch(li);
}
litest_touch_up(dev, 0);
litest_touch_up(dev, 1);
libinput_dispatch(li);
event = libinput_get_event(li);
gevent = litest_is_gesture_event(event,
LIBINPUT_EVENT_GESTURE_PINCH_END,
2);
ck_assert(!libinput_event_gesture_get_cancelled(gevent));
libinput_event_destroy(event);
}
END_TEST
Change to micro seconds for measuring time internally In order to provide higher precision event time stamps, change the internal time measuring from milliseconds to microseconds. Microseconds are chosen because it is the most fine grained time stamp we can get from evdev. The API is extended with high precision getters whenever the given information is available. Signed-off-by: Jonas Ådahl <jadahl@gmail.com> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
2015-07-27 17:51:52 +08:00
START_TEST(gestures_time_usec)
{
struct litest_device *dev = litest_current_device();
struct libinput *li = dev->libinput;
struct libinput_event *event;
struct libinput_event_gesture *gevent;
test: Handle 32 bit msec time overflows The libinput_*_get_time() returns a 32 bit unsigned integer, but in the tests we compared them to a 64 bit unsigned integer. This means that when the 32 bit integer overflowed, we'd still compare to a non-overflowed 64 bit integer, causing the tests to fail. This commit fixes this by always casting the millisecond 64 bit unsigned integer to a 32 unsigned integer, triggering the same overflow. Signed-off-by: Jonas Ådahl <jadahl@gmail.com> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2016-04-08 15:51:26 +08:00
uint64_t time_usec;
Change to micro seconds for measuring time internally In order to provide higher precision event time stamps, change the internal time measuring from milliseconds to microseconds. Microseconds are chosen because it is the most fine grained time stamp we can get from evdev. The API is extended with high precision getters whenever the given information is available. Signed-off-by: Jonas Ådahl <jadahl@gmail.com> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
2015-07-27 17:51:52 +08:00
if (libevdev_get_num_slots(dev->evdev) < 3)
return;
litest_drain_events(li);
litest_touch_down(dev, 0, 40, 40);
test: rearrange fingers for gesture tests Prep work for the coming patch, arrange the fingers horizontally rather than vertically. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2016-01-08 11:06:49 +10:00
litest_touch_down(dev, 1, 50, 40);
litest_touch_down(dev, 2, 60, 40);
Change to micro seconds for measuring time internally In order to provide higher precision event time stamps, change the internal time measuring from milliseconds to microseconds. Microseconds are chosen because it is the most fine grained time stamp we can get from evdev. The API is extended with high precision getters whenever the given information is available. Signed-off-by: Jonas Ådahl <jadahl@gmail.com> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
2015-07-27 17:51:52 +08:00
libinput_dispatch(li);
test: drop the sleep_ms argument This forces events for every ~10ms now. If we want a slower movement, we need more steps - just like a real touchpad does it. Cocinelle spatch files were variants of: @@ expression A, B, C, D, E, F, G, H, I, J, K; @@ - litest_touch_move_two_touches(A, B, C, D, E, F, G, H, I) + litest_touch_move_two_touches(A, B, C, D, E, F, G, H) The only test that needed a real fix was touchpad_no_palm_detect_2fg_scroll, it used 12ms before, now it's using 10ms so on the bcm5974 touchpad the second finger was a speed-thumb. Increasing the events and thus slowing down the pointer means it's a normal finger and the test succeeds again. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2018-08-28 09:16:52 +10:00
litest_touch_move_three_touches(dev, 40, 40, 50, 40, 60, 40, 0, 30,
30);
Change to micro seconds for measuring time internally In order to provide higher precision event time stamps, change the internal time measuring from milliseconds to microseconds. Microseconds are chosen because it is the most fine grained time stamp we can get from evdev. The API is extended with high precision getters whenever the given information is available. Signed-off-by: Jonas Ådahl <jadahl@gmail.com> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
2015-07-27 17:51:52 +08:00
test: remove a wait loop from the usec gesture test We know we (should) have events when we get here. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2016-01-07 14:33:26 +10:00
libinput_dispatch(li);
Change to micro seconds for measuring time internally In order to provide higher precision event time stamps, change the internal time measuring from milliseconds to microseconds. Microseconds are chosen because it is the most fine grained time stamp we can get from evdev. The API is extended with high precision getters whenever the given information is available. Signed-off-by: Jonas Ådahl <jadahl@gmail.com> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
2015-07-27 17:51:52 +08:00
event = libinput_get_event(li);
gevent = litest_is_gesture_event(event,
LIBINPUT_EVENT_GESTURE_SWIPE_BEGIN,
3);
test: Handle 32 bit msec time overflows The libinput_*_get_time() returns a 32 bit unsigned integer, but in the tests we compared them to a 64 bit unsigned integer. This means that when the 32 bit integer overflowed, we'd still compare to a non-overflowed 64 bit integer, causing the tests to fail. This commit fixes this by always casting the millisecond 64 bit unsigned integer to a 32 unsigned integer, triggering the same overflow. Signed-off-by: Jonas Ådahl <jadahl@gmail.com> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2016-04-08 15:51:26 +08:00
time_usec = libinput_event_gesture_get_time_usec(gevent);
Change to micro seconds for measuring time internally In order to provide higher precision event time stamps, change the internal time measuring from milliseconds to microseconds. Microseconds are chosen because it is the most fine grained time stamp we can get from evdev. The API is extended with high precision getters whenever the given information is available. Signed-off-by: Jonas Ådahl <jadahl@gmail.com> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
2015-07-27 17:51:52 +08:00
ck_assert_int_eq(libinput_event_gesture_get_time(gevent),
test: Handle 32 bit msec time overflows The libinput_*_get_time() returns a 32 bit unsigned integer, but in the tests we compared them to a 64 bit unsigned integer. This means that when the 32 bit integer overflowed, we'd still compare to a non-overflowed 64 bit integer, causing the tests to fail. This commit fixes this by always casting the millisecond 64 bit unsigned integer to a 32 unsigned integer, triggering the same overflow. Signed-off-by: Jonas Ådahl <jadahl@gmail.com> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2016-04-08 15:51:26 +08:00
(uint32_t) (time_usec / 1000));
Change to micro seconds for measuring time internally In order to provide higher precision event time stamps, change the internal time measuring from milliseconds to microseconds. Microseconds are chosen because it is the most fine grained time stamp we can get from evdev. The API is extended with high precision getters whenever the given information is available. Signed-off-by: Jonas Ådahl <jadahl@gmail.com> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
2015-07-27 17:51:52 +08:00
libinput_event_destroy(event);
}
END_TEST
test: add two gesture tests for scrolling with a thumb in the btnarea If a finger is resting in the software button area, it must not be counted towards the gesture. So a two-finger movement must be a scroll event, not a three-finger pinch. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Hans de Goede <hdegoede@redhat.com>
2016-01-29 11:18:35 +10:00
START_TEST(gestures_3fg_buttonarea_scroll)
{
struct litest_device *dev = litest_current_device();
struct libinput *li = dev->libinput;
if (libevdev_get_num_slots(dev->evdev) < 3)
return;
litest_enable_buttonareas(dev);
litest_enable_2fg_scroll(dev);
litest_drain_events(li);
litest_touch_down(dev, 0, 40, 20);
litest_touch_down(dev, 1, 30, 20);
/* third finger in btnarea */
litest_touch_down(dev, 2, 50, 99);
libinput_dispatch(li);
test: drop the sleep_ms argument This forces events for every ~10ms now. If we want a slower movement, we need more steps - just like a real touchpad does it. Cocinelle spatch files were variants of: @@ expression A, B, C, D, E, F, G, H, I, J, K; @@ - litest_touch_move_two_touches(A, B, C, D, E, F, G, H, I) + litest_touch_move_two_touches(A, B, C, D, E, F, G, H) The only test that needed a real fix was touchpad_no_palm_detect_2fg_scroll, it used 12ms before, now it's using 10ms so on the bcm5974 touchpad the second finger was a speed-thumb. Increasing the events and thus slowing down the pointer means it's a normal finger and the test succeeds again. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2018-08-28 09:16:52 +10:00
litest_touch_move_two_touches(dev, 40, 20, 30, 20, 0, 40, 10);
test: add two gesture tests for scrolling with a thumb in the btnarea If a finger is resting in the software button area, it must not be counted towards the gesture. So a two-finger movement must be a scroll event, not a three-finger pinch. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Hans de Goede <hdegoede@redhat.com>
2016-01-29 11:18:35 +10:00
litest_touch_up(dev, 0);
litest_touch_up(dev, 1);
libinput_dispatch(li);
litest_assert_scroll(li, LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL, 4);
}
END_TEST
START_TEST(gestures_3fg_buttonarea_scroll_btntool)
{
struct litest_device *dev = litest_current_device();
struct libinput *li = dev->libinput;
if (libevdev_get_num_slots(dev->evdev) > 2)
return;
litest_enable_buttonareas(dev);
litest_enable_2fg_scroll(dev);
litest_drain_events(li);
/* first finger in btnarea */
litest_touch_down(dev, 0, 20, 99);
litest_touch_down(dev, 1, 30, 20);
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);
test: drop the sleep_ms argument This forces events for every ~10ms now. If we want a slower movement, we need more steps - just like a real touchpad does it. Cocinelle spatch files were variants of: @@ expression A, B, C, D, E, F, G, H, I, J, K; @@ - litest_touch_move_two_touches(A, B, C, D, E, F, G, H, I) + litest_touch_move_two_touches(A, B, C, D, E, F, G, H) The only test that needed a real fix was touchpad_no_palm_detect_2fg_scroll, it used 12ms before, now it's using 10ms so on the bcm5974 touchpad the second finger was a speed-thumb. Increasing the events and thus slowing down the pointer means it's a normal finger and the test succeeds again. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2018-08-28 09:16:52 +10:00
litest_touch_move_to(dev, 1, 30, 20, 30, 70, 10);
test: add two gesture tests for scrolling with a thumb in the btnarea If a finger is resting in the software button area, it must not be counted towards the gesture. So a two-finger movement must be a scroll event, not a three-finger pinch. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Hans de Goede <hdegoede@redhat.com>
2016-01-29 11:18:35 +10:00
litest_touch_up(dev, 1);
libinput_dispatch(li);
litest_assert_scroll(li, LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL, 4);
}
END_TEST
test: move all the _setup() functions into a special section This way we can loop through them instead of having to add them manually. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2018-03-21 12:54:10 +10:00
TEST_COLLECTION(gestures)
test: add a couple of basic gesture tests 3finger swipe, pinch and spread. While we expect the pinch/spread to have a zero angle, the discrete coordinates we use cause some angle, but below 1 degree. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2015-07-07 11:52:05 +10:00
{
/* N, NE, ... */
struct range cardinals = { 0, 8 };
test: add test for the vertical position-dependent pinch Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Hans de Goede <hdegoede@redhat.com>
2016-12-21 09:44:27 +10:00
struct range fingers = { 3, 5 };
test: add a couple of basic gesture tests 3finger swipe, pinch and spread. While we expect the pinch/spread to have a zero angle, the discrete coordinates we use cause some angle, but below 1 degree. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2015-07-07 11:52:05 +10:00
litest_add("gestures:cap", gestures_cap, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH);
litest_add("gestures:cap", gestures_nocap, LITEST_ANY, LITEST_TOUCHPAD);
litest_add_ranged("gestures:swipe", gestures_swipe_3fg, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH, &cardinals);
test: add more gesture tests Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2016-01-07 15:00:53 +10:00
litest_add_ranged("gestures:swipe", gestures_swipe_3fg_btntool, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH, &cardinals);
litest_add_ranged("gestures:swipe", gestures_swipe_4fg, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH, &cardinals);
litest_add_ranged("gestures:swipe", gestures_swipe_4fg_btntool, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH, &cardinals);
test: add a couple of basic gesture tests 3finger swipe, pinch and spread. While we expect the pinch/spread to have a zero angle, the discrete coordinates we use cause some angle, but below 1 degree. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2015-07-07 11:52:05 +10:00
litest_add_ranged("gestures:pinch", gestures_pinch, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH, &cardinals);
test: add more gesture tests Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2016-01-07 15:00:53 +10:00
litest_add_ranged("gestures:pinch", gestures_pinch_3fg, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH, &cardinals);
litest_add_ranged("gestures:pinch", gestures_pinch_4fg, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH, &cardinals);
test: add a couple of basic gesture tests 3finger swipe, pinch and spread. While we expect the pinch/spread to have a zero angle, the discrete coordinates we use cause some angle, but below 1 degree. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2015-07-07 11:52:05 +10:00
litest_add_ranged("gestures:pinch", gestures_spread, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH, &cardinals);
test: fix typo in test case name Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2017-08-17 02:02:56 +02:00
litest_add_ranged("gestures:pinch", gestures_pinch_vertical_position, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH, &fingers);
Change to micro seconds for measuring time internally In order to provide higher precision event time stamps, change the internal time measuring from milliseconds to microseconds. Microseconds are chosen because it is the most fine grained time stamp we can get from evdev. The API is extended with high precision getters whenever the given information is available. Signed-off-by: Jonas Ådahl <jadahl@gmail.com> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
2015-07-27 17:51:52 +08:00
test: add two gesture tests for scrolling with a thumb in the btnarea If a finger is resting in the software button area, it must not be counted towards the gesture. So a two-finger movement must be a scroll event, not a three-finger pinch. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Hans de Goede <hdegoede@redhat.com>
2016-01-29 11:18:35 +10:00
litest_add("gestures:swipe", gestures_3fg_buttonarea_scroll, LITEST_CLICKPAD, LITEST_SINGLE_TOUCH);
litest_add("gestures:swipe", gestures_3fg_buttonarea_scroll_btntool, LITEST_CLICKPAD, LITEST_SINGLE_TOUCH);
test: fix prefix for the gestures time test No real effect, just for consistency. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2016-07-22 15:26:45 +10:00
litest_add("gestures:time", gestures_time_usec, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH);
test: add a couple of basic gesture tests 3finger swipe, pinch and spread. While we expect the pinch/spread to have a zero angle, the discrete coordinates we use cause some angle, but below 1 degree. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2015-07-07 11:52:05 +10:00
}
Reference in a new issue Copy permalink