From 55435a707f1f252539cd17ecf497dce6bd72a94c Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Fri, 10 Jul 2015 12:01:15 +1000 Subject: [PATCH] test: add an Apple Magic Trackpad test device Signed-off-by: Peter Hutterer --- test/Makefile.am | 1 + test/device.c | 6 +- test/litest-magic-trackpad.c | 110 +++++++++++++++++++++++++++++++++++ test/litest.c | 2 + test/litest.h | 1 + test/touchpad.c | 2 + 6 files changed, 120 insertions(+), 2 deletions(-) create mode 100644 test/litest-magic-trackpad.c diff --git a/test/Makefile.am b/test/Makefile.am index 457c2971..d3c573a4 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -22,6 +22,7 @@ liblitest_la_SOURCES = \ litest-keyboard-razer-blackwidow.c \ litest-logitech-trackball.c \ litest-nexus4-touch-screen.c \ + litest-magic-trackpad.c \ litest-mouse.c \ litest-mouse-roccat.c \ litest-mouse-low-dpi.c \ diff --git a/test/device.c b/test/device.c index 24d59590..f43228c6 100644 --- a/test/device.c +++ b/test/device.c @@ -70,7 +70,8 @@ START_TEST(device_sendevents_config_touchpad) expected = LIBINPUT_CONFIG_SEND_EVENTS_DISABLED; /* The wacom devices in the test suite are external */ - if (libevdev_get_id_vendor(dev->evdev) != VENDOR_ID_WACOM) + if (libevdev_get_id_vendor(dev->evdev) != VENDOR_ID_WACOM && + libevdev_get_id_bustype(dev->evdev) != BUS_BLUETOOTH) expected |= LIBINPUT_CONFIG_SEND_EVENTS_DISABLED_ON_EXTERNAL_MOUSE; @@ -89,7 +90,8 @@ START_TEST(device_sendevents_config_touchpad_superset) uint32_t modes; /* The wacom devices in the test suite are external */ - if (libevdev_get_id_vendor(dev->evdev) == VENDOR_ID_WACOM) + if (libevdev_get_id_vendor(dev->evdev) == VENDOR_ID_WACOM || + libevdev_get_id_bustype(dev->evdev) == BUS_BLUETOOTH) return; device = dev->libinput_device; diff --git a/test/litest-magic-trackpad.c b/test/litest-magic-trackpad.c new file mode 100644 index 00000000..588d6f5a --- /dev/null +++ b/test/litest-magic-trackpad.c @@ -0,0 +1,110 @@ +/* + * 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. + */ + +#if HAVE_CONFIG_H +#include "config.h" +#endif + +#include "litest.h" +#include "litest-int.h" + +static void litest_magicpad_setup(void) +{ + struct litest_device *d = litest_create_device(LITEST_MAGIC_TRACKPAD); + litest_set_current_device(d); +} + +static struct input_event down[] = { + { .type = EV_ABS, .code = ABS_X, .value = LITEST_AUTO_ASSIGN }, + { .type = EV_ABS, .code = ABS_Y, .value = LITEST_AUTO_ASSIGN }, + { .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_TOUCH_MAJOR, .value = 272 }, + { .type = EV_ABS, .code = ABS_MT_TOUCH_MINOR, .value = 400 }, + { .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_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_X, .value = LITEST_AUTO_ASSIGN }, + { .type = EV_ABS, .code = ABS_Y, .value = LITEST_AUTO_ASSIGN }, + { .type = EV_ABS, .code = ABS_MT_TOUCH_MAJOR, .value = 272 }, + { .type = EV_ABS, .code = ABS_MT_TOUCH_MINOR, .value = 400 }, + { .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_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, -2909, 3167, 4, 0, 46 }, + { ABS_Y, -2456, 2565, 4, 0, 45 }, + { ABS_MT_SLOT, 0, 15, 0, 0, 0 }, + { ABS_MT_POSITION_X, -2909, 3167, 4, 0, 46 }, + { ABS_MT_POSITION_Y, -2456, 2565, 4, 0, 45 }, + { ABS_MT_ORIENTATION, -31, 32, 1, 0, 0 }, + { ABS_MT_TOUCH_MAJOR, 0, 1020, 4, 0, 0 }, + { ABS_MT_TOUCH_MINOR, 0, 1020, 4, 0, 0 }, + { ABS_MT_TRACKING_ID, 0, 65535, 0, 0, 0 }, + { .value = -1 }, +}; + +static struct input_id input_id = { + .bustype = 0x5, + .vendor = 0x5ac, + .product = 0x30e, +}; + +static int events[] = { + EV_KEY, BTN_LEFT, + EV_KEY, BTN_TOOL_FINGER, + EV_KEY, BTN_TOOL_QUINTTAP, + EV_KEY, BTN_TOUCH, + EV_KEY, BTN_TOOL_DOUBLETAP, + EV_KEY, BTN_TOOL_TRIPLETAP, + EV_KEY, BTN_TOOL_QUADTAP, + INPUT_PROP_MAX, INPUT_PROP_BUTTONPAD, + -1, -1 +}; + +struct litest_test_device litest_magicpad_device = { + .type = LITEST_MAGIC_TRACKPAD, + .features = LITEST_TOUCHPAD | LITEST_CLICKPAD | + LITEST_BUTTON | LITEST_APPLE_CLICKPAD, + .shortname = "magic trackpad", + .setup = litest_magicpad_setup, + .interface = &interface, + + .name = "Apple Wireless Trackpad", + .id = &input_id, + .events = events, + .absinfo = absinfo, +}; diff --git a/test/litest.c b/test/litest.c index 8cde52fe..8d63d64d 100644 --- a/test/litest.c +++ b/test/litest.c @@ -356,6 +356,7 @@ extern struct litest_test_device litest_alps_dualpoint_device; extern struct litest_test_device litest_mouse_low_dpi_device; extern struct litest_test_device litest_generic_multitouch_screen_device; extern struct litest_test_device litest_nexus4_device; +extern struct litest_test_device litest_magicpad_device; struct litest_test_device* devices[] = { &litest_synaptics_clickpad_device, @@ -385,6 +386,7 @@ struct litest_test_device* devices[] = { &litest_mouse_low_dpi_device, &litest_generic_multitouch_screen_device, &litest_nexus4_device, + &litest_magicpad_device, NULL, }; diff --git a/test/litest.h b/test/litest.h index 8981f13d..6c69090e 100644 --- a/test/litest.h +++ b/test/litest.h @@ -140,6 +140,7 @@ enum litest_device_type { LITEST_MOUSE_LOW_DPI = -26, LITEST_GENERIC_MULTITOUCH_SCREEN = -27, LITEST_NEXUS4_TOUCH_SCREEN = -28, + LITEST_MAGIC_TRACKPAD = -29, }; enum litest_device_feature { diff --git a/test/touchpad.c b/test/touchpad.c index d3452118..78c084e1 100644 --- a/test/touchpad.c +++ b/test/touchpad.c @@ -3331,6 +3331,8 @@ has_disable_while_typing(struct litest_device *device) { if (libevdev_get_id_vendor(device->evdev) == VENDOR_ID_WACOM) return false; + if (libevdev_get_id_bustype(device->evdev) == BUS_BLUETOOTH) + return false; return true; }