diff --git a/meson.build b/meson.build index 66695537..5c0f6a99 100644 --- a/meson.build +++ b/meson.build @@ -627,6 +627,7 @@ if get_option('tests') 'test/litest-device-thinkpad-extrabuttons.c', 'test/litest-device-trackpoint.c', 'test/litest-device-touch-screen.c', + 'test/litest-device-touchscreen-invalid-range.c', 'test/litest-device-touchscreen-fuzz.c', 'test/litest-device-uclogic-tablet.c', 'test/litest-device-wacom-bamboo-2fg-finger.c', diff --git a/test/litest-device-touchscreen-invalid-range.c b/test/litest-device-touchscreen-invalid-range.c new file mode 100644 index 00000000..4b2ce23e --- /dev/null +++ b/test/litest-device-touchscreen-invalid-range.c @@ -0,0 +1,91 @@ +/* + * Copyright © 2015 Canonical, Ltd. + * Copyright © 2018 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 "litest.h" +#include "litest-int.h" + +static struct input_event down[] = { + { .type = EV_ABS, .code = ABS_MT_SLOT, .value = LITEST_AUTO_ASSIGN }, + { .type = EV_ABS, .code = ABS_MT_TRACKING_ID, .value = LITEST_AUTO_ASSIGN }, + { .type = EV_ABS, .code = ABS_MT_POSITION_X, .value = LITEST_AUTO_ASSIGN }, + { .type = EV_ABS, .code = ABS_MT_POSITION_Y, .value = LITEST_AUTO_ASSIGN }, + { .type = EV_ABS, .code = ABS_MT_PRESSURE, .value = LITEST_AUTO_ASSIGN }, + { .type = EV_ABS, .code = ABS_MT_TOUCH_MAJOR, .value = LITEST_AUTO_ASSIGN }, + { .type = EV_ABS, .code = ABS_MT_TOUCH_MINOR, .value = LITEST_AUTO_ASSIGN }, + { .type = EV_ABS, .code = ABS_MT_ORIENTATION, .value = LITEST_AUTO_ASSIGN }, + { .type = EV_SYN, .code = SYN_REPORT, .value = 0 }, + { .type = -1, .code = -1 }, +}; + +static struct input_event move[] = { + { .type = EV_ABS, .code = ABS_MT_SLOT, .value = LITEST_AUTO_ASSIGN }, + { .type = EV_ABS, .code = ABS_MT_POSITION_X, .value = LITEST_AUTO_ASSIGN }, + { .type = EV_ABS, .code = ABS_MT_POSITION_Y, .value = LITEST_AUTO_ASSIGN }, + { .type = EV_ABS, .code = ABS_MT_PRESSURE, .value = LITEST_AUTO_ASSIGN }, + { .type = EV_ABS, .code = ABS_MT_TOUCH_MAJOR, .value = LITEST_AUTO_ASSIGN }, + { .type = EV_ABS, .code = ABS_MT_TOUCH_MINOR, .value = LITEST_AUTO_ASSIGN }, + { .type = EV_ABS, .code = ABS_MT_ORIENTATION, .value = LITEST_AUTO_ASSIGN }, + { .type = EV_SYN, .code = SYN_REPORT, .value = 0 }, + { .type = -1, .code = -1 }, +}; + +static struct litest_device_interface interface = { + .touch_down_events = down, + .touch_move_events = move, +}; + +static struct input_absinfo absinfo[] = { + { ABS_X, 1000, 2500, 0, 0, 10 }, + { ABS_Y, 2000, 4500, 0, 0, 10 }, + { ABS_MT_SLOT, 0, 9, 0, 0, 0 }, + { ABS_MT_POSITION_X, 1000, 2500, 0, 0, 10 }, + { ABS_MT_POSITION_Y, 2000, 4500, 0, 0, 10 }, + { ABS_MT_TRACKING_ID, 0, 65535, 0, 0, 0 }, + { .value = -1 }, +}; + +static struct input_id input_id = { + .bustype = 0x1, + .vendor = 0x0, + .product = 0x25, +}; + +static int events[] = { + EV_KEY, BTN_TOUCH, + INPUT_PROP_MAX, INPUT_PROP_DIRECT, + -1, -1 +}; + +TEST_DEVICE("touchscreen-invalid-range", + .type = LITEST_TOUCHSCREEN_INVALID_RANGE, + .features = LITEST_TOUCH, + .interface = &interface, + + .name = "touchscreen-invalid-range", + .id = &input_id, + .events = events, + .absinfo = absinfo, +) diff --git a/test/litest.h b/test/litest.h index 05ea2d7f..acd298db 100644 --- a/test/litest.h +++ b/test/litest.h @@ -286,6 +286,7 @@ enum litest_device_type { LITEST_HP_WMI_HOTKEYS, LITEST_MS_NANO_TRANSCEIVER_MOUSE, LITEST_AIPTEK, + LITEST_TOUCHSCREEN_INVALID_RANGE, }; enum litest_device_feature { diff --git a/test/test-touch.c b/test/test-touch.c index 53ec11f0..5ce97c23 100644 --- a/test/test-touch.c +++ b/test/test-touch.c @@ -945,6 +945,84 @@ START_TEST(touch_release_on_unplug) } END_TEST +START_TEST(touch_invalid_range_over) +{ + struct litest_device *dev = litest_current_device(); + struct libinput *li = dev->libinput; + struct libinput_event *ev; + struct libinput_event_touch *t; + double x, y; + + litest_drain_events(li); + + /* Touch outside the valid area */ + litest_event(dev, EV_ABS, ABS_MT_SLOT, 0); + litest_event(dev, EV_ABS, ABS_MT_TRACKING_ID, 1); + litest_event(dev, EV_ABS, ABS_X, 4000); + litest_event(dev, EV_ABS, ABS_Y, 5000); + litest_event(dev, EV_ABS, ABS_MT_POSITION_X, 4000); + 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); + + /* Expect the mm to be correct regardless */ + ev = libinput_get_event(li); + t = litest_is_touch_event(ev, LIBINPUT_EVENT_TOUCH_DOWN); + x = libinput_event_touch_get_x(t); + y = libinput_event_touch_get_y(t); + ck_assert_double_eq(x, 300); /* device has resolution 10 */ + ck_assert_double_eq(y, 300); /* device has resolution 10 */ + + /* Expect the percentage to be correct too, even if > 100% */ + x = libinput_event_touch_get_x_transformed(t, 100); + y = libinput_event_touch_get_y_transformed(t, 100); + ck_assert_double_eq(round(x), 200); + ck_assert_double_eq(round(y), 120); + + libinput_event_destroy(ev); +} +END_TEST + +START_TEST(touch_invalid_range_under) +{ + struct litest_device *dev = litest_current_device(); + struct libinput *li = dev->libinput; + struct libinput_event *ev; + struct libinput_event_touch *t; + double x, y; + + litest_drain_events(li); + + /* Touch outside the valid area */ + litest_event(dev, EV_ABS, ABS_MT_SLOT, 0); + litest_event(dev, EV_ABS, ABS_MT_TRACKING_ID, 1); + litest_event(dev, EV_ABS, ABS_X, -500); + litest_event(dev, EV_ABS, ABS_Y, 1000); + litest_event(dev, EV_ABS, ABS_MT_POSITION_X, -500); + 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); + + /* Expect the mm to be correct regardless */ + ev = libinput_get_event(li); + t = litest_is_touch_event(ev, LIBINPUT_EVENT_TOUCH_DOWN); + x = libinput_event_touch_get_x(t); + y = libinput_event_touch_get_y(t); + ck_assert_double_eq(x, -150); /* device has resolution 10 */ + ck_assert_double_eq(y, -100); /* device has resolution 10 */ + + /* Expect the percentage to be correct too, even if > 100% */ + x = libinput_event_touch_get_x_transformed(t, 100); + y = libinput_event_touch_get_y_transformed(t, 100); + ck_assert_double_eq(round(x), -100); + ck_assert_double_eq(round(y), -40); + + libinput_event_destroy(ev); +} +END_TEST + TEST_COLLECTION(touch) { struct range axes = { ABS_X, ABS_Y + 1}; @@ -979,4 +1057,7 @@ TEST_COLLECTION(touch) litest_add_for_device("touch:fuzz", touch_fuzz, LITEST_MULTITOUCH_FUZZ_SCREEN); litest_add_no_device("touch:release", touch_release_on_unplug); + + litest_add_for_device("touch:range", touch_invalid_range_over, LITEST_TOUCHSCREEN_INVALID_RANGE); + litest_add_for_device("touch:range", touch_invalid_range_under, LITEST_TOUCHSCREEN_INVALID_RANGE); }