fdo-mirrors/libinput
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/libinput/libinput.git synced 2026-05-07 03:48:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

test: change tablet matrix test to use absolute x/y values

Browse source 
Prep work for dropping delta coordinates.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Peter Hutterer 2015-12-14 10:28:05 +10:00
parent 72249f8a16
commit f0a57fc97a
1 changed files with 29 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
test/tablet.c
View file

@ -2406,15 +2406,25 @@ START_TEST(tablet_calibration_set_matrix_delta)
{ -1, -1 } { -1, -1 }
}; };
int has_calibration; int has_calibration;
double dx, dy, mdx, mdy; double x, y, dx, dy, mdx, mdy;
has_calibration = libevdev_has_property(dev->evdev, INPUT_PROP_DIRECT); has_calibration = libevdev_has_property(dev->evdev, INPUT_PROP_DIRECT);
if (!has_calibration) if (!has_calibration)
return; return;
litest_tablet_proximity_in(dev, 100, 100, axes);
litest_drain_events(li); litest_drain_events(li);
litest_tablet_proximity_in(dev, 100, 100, axes);
libinput_dispatch(li);
event = libinput_get_event(li);
tablet_event = litest_is_tablet_event(event,
LIBINPUT_EVENT_TABLET_TOOL_PROXIMITY);
x = libinput_event_tablet_tool_get_axis_value(tablet_event,
LIBINPUT_TABLET_TOOL_AXIS_X);
y = libinput_event_tablet_tool_get_axis_value(tablet_event,
LIBINPUT_TABLET_TOOL_AXIS_Y);
libinput_event_destroy(event);
litest_tablet_motion(dev, 80, 80, axes); litest_tablet_motion(dev, 80, 80, axes);
libinput_dispatch(li); libinput_dispatch(li);
@ -2422,10 +2432,10 @@ START_TEST(tablet_calibration_set_matrix_delta)
tablet_event = litest_is_tablet_event(event, tablet_event = litest_is_tablet_event(event,
LIBINPUT_EVENT_TABLET_TOOL_AXIS); LIBINPUT_EVENT_TABLET_TOOL_AXIS);
dx = libinput_event_tablet_tool_get_axis_delta(tablet_event, dx = libinput_event_tablet_tool_get_axis_value(tablet_event,
LIBINPUT_TABLET_TOOL_AXIS_X); LIBINPUT_TABLET_TOOL_AXIS_X) - x;
dy = libinput_event_tablet_tool_get_axis_delta(tablet_event, dy = libinput_event_tablet_tool_get_axis_value(tablet_event,
LIBINPUT_TABLET_TOOL_AXIS_Y); LIBINPUT_TABLET_TOOL_AXIS_Y) - y;
libinput_event_destroy(event); libinput_event_destroy(event);
litest_tablet_proximity_out(dev); litest_tablet_proximity_out(dev);
litest_drain_events(li); litest_drain_events(li);
@ -2435,7 +2445,15 @@ START_TEST(tablet_calibration_set_matrix_delta)
ck_assert_int_eq(status, LIBINPUT_CONFIG_STATUS_SUCCESS); ck_assert_int_eq(status, LIBINPUT_CONFIG_STATUS_SUCCESS);
litest_tablet_proximity_in(dev, 100, 100, axes); litest_tablet_proximity_in(dev, 100, 100, axes);
litest_drain_events(li); libinput_dispatch(li);
event = libinput_get_event(li);
tablet_event = litest_is_tablet_event(event,
LIBINPUT_EVENT_TABLET_TOOL_PROXIMITY);
x = libinput_event_tablet_tool_get_axis_value(tablet_event,
LIBINPUT_TABLET_TOOL_AXIS_X);
y = libinput_event_tablet_tool_get_axis_value(tablet_event,
LIBINPUT_TABLET_TOOL_AXIS_Y);
libinput_event_destroy(event);
litest_tablet_motion(dev, 80, 80, axes); litest_tablet_motion(dev, 80, 80, axes);
libinput_dispatch(li); libinput_dispatch(li);
@ -2444,10 +2462,10 @@ START_TEST(tablet_calibration_set_matrix_delta)
tablet_event = litest_is_tablet_event(event, tablet_event = litest_is_tablet_event(event,
LIBINPUT_EVENT_TABLET_TOOL_AXIS); LIBINPUT_EVENT_TABLET_TOOL_AXIS);
mdx = libinput_event_tablet_tool_get_axis_delta(tablet_event, mdx = libinput_event_tablet_tool_get_axis_value(tablet_event,
LIBINPUT_TABLET_TOOL_AXIS_X); LIBINPUT_TABLET_TOOL_AXIS_X) - x;
mdy = libinput_event_tablet_tool_get_axis_delta(tablet_event, mdy = libinput_event_tablet_tool_get_axis_value(tablet_event,
LIBINPUT_TABLET_TOOL_AXIS_Y); LIBINPUT_TABLET_TOOL_AXIS_Y) - y;
libinput_event_destroy(event); libinput_event_destroy(event);
litest_drain_events(li); litest_drain_events(li);