[PATCH libinput 5/7] test: add a Wacom Intuos 5 Finger test device
Peter Hutterer
peter.hutterer at who-t.net
Tue Mar 3 20:18:35 PST 2015
Works as a touchpad but has no buttons.
Minor change to one of the touchpad tests: because the touch area is so big
the slow-scrolling trigger needs to be adjusted.
And because the device is an external device, the "disable on external mouse"
test needs to be adjusted.
Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
---
test/Makefile.am | 1 +
test/device.c | 17 +++++--
test/litest-wacom-intuos-finger.c | 103 ++++++++++++++++++++++++++++++++++++++
test/litest.c | 2 +
test/litest.h | 1 +
test/touchpad.c | 4 +-
6 files changed, 122 insertions(+), 6 deletions(-)
create mode 100644 test/litest-wacom-intuos-finger.c
diff --git a/test/Makefile.am b/test/Makefile.am
index 4bafe98..38d632d 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -28,6 +28,7 @@ liblitest_la_SOURCES = \
litest-synaptics-x1-carbon-3rd.c \
litest-trackpoint.c \
litest-wacom-touch.c \
+ litest-wacom-intuos-finger.c \
litest-xen-virtual-pointer.c \
litest-vmware-virtual-usb-mouse.c \
litest.c
diff --git a/test/device.c b/test/device.c
index 0839bfa..0420533 100644
--- a/test/device.c
+++ b/test/device.c
@@ -64,14 +64,19 @@ START_TEST(device_sendevents_config_touchpad)
{
struct litest_device *dev = litest_current_device();
struct libinput_device *device;
- uint32_t modes;
+ uint32_t modes, expected;
+
+ expected = LIBINPUT_CONFIG_SEND_EVENTS_DISABLED;
+
+ /* The wacom devices in the test suite are external */
+ if (libevdev_get_id_vendor(dev->evdev) != 0x56a) /* wacom */
+ expected |=
+ LIBINPUT_CONFIG_SEND_EVENTS_DISABLED_ON_EXTERNAL_MOUSE;
device = dev->libinput_device;
modes = libinput_device_config_send_events_get_modes(device);
- ck_assert_int_eq(modes,
- LIBINPUT_CONFIG_SEND_EVENTS_DISABLED_ON_EXTERNAL_MOUSE|
- LIBINPUT_CONFIG_SEND_EVENTS_DISABLED);
+ ck_assert_int_eq(modes, expected);
}
END_TEST
@@ -82,6 +87,10 @@ START_TEST(device_sendevents_config_touchpad_superset)
enum libinput_config_status status;
uint32_t modes;
+ /* The wacom devices in the test suite are external */
+ if (libevdev_get_id_vendor(dev->evdev) == 0x56a) /* wacom */
+ return;
+
device = dev->libinput_device;
modes = LIBINPUT_CONFIG_SEND_EVENTS_DISABLED |
diff --git a/test/litest-wacom-intuos-finger.c b/test/litest-wacom-intuos-finger.c
new file mode 100644
index 0000000..7310cbd
--- /dev/null
+++ b/test/litest-wacom-intuos-finger.c
@@ -0,0 +1,103 @@
+/*
+ * Copyright © 2014 Red Hat, Inc.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that copyright
+ * notice and this permission notice appear in supporting documentation, and
+ * that the name of the copyright holders not be used in advertising or
+ * publicity pertaining to distribution of the software without specific,
+ * written prior permission. The copyright holders make no representations
+ * about the suitability of this software for any purpose. It is provided "as
+ * is" without express or implied warranty.
+ *
+ * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+ * OF THIS SOFTWARE.
+ */
+
+#if HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "litest.h"
+#include "litest-int.h"
+
+static void
+litest_wacom_finger_setup(void)
+{
+ struct litest_device *d = litest_create_device(LITEST_WACOM_FINGER);
+ 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_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_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, 0, 4096, 0, 0, 18 },
+ { ABS_Y, 0, 4096, 0, 0, 29 },
+ { ABS_MT_SLOT, 0, 15, 0, 0, 0 },
+ { ABS_MT_TOUCH_MAJOR, 0, 4096, 0, 0, 0 },
+ { ABS_MT_TOUCH_MINOR, 0, 4096, 0, 0, 0 },
+ { ABS_MT_POSITION_X, 0, 4096, 0, 0, 18 },
+ { ABS_MT_POSITION_Y, 0, 4096, 0, 0, 29 },
+ { ABS_MT_TRACKING_ID, 0, 65535, 0, 0, 0 },
+ { .value = -1 },
+};
+
+static struct input_id input_id = {
+ .bustype = 0x3,
+ .vendor = 0x56a,
+ .product = 0x27,
+};
+
+static int events[] = {
+ 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_POINTER,
+ -1, -1,
+};
+
+struct litest_test_device litest_wacom_finger_device = {
+ .type = LITEST_WACOM_FINGER,
+ .features = LITEST_TOUCHPAD,
+ .shortname = "wacom-finger",
+ .setup = litest_wacom_finger_setup,
+ .interface = &interface,
+
+ .name = "Wacom Intuos5 touch M Finger",
+ .id = &input_id,
+ .events = events,
+ .absinfo = absinfo,
+};
diff --git a/test/litest.c b/test/litest.c
index 7585859..4d04b52 100644
--- a/test/litest.c
+++ b/test/litest.c
@@ -97,6 +97,7 @@ extern struct litest_test_device litest_vmware_virtmouse_device;
extern struct litest_test_device litest_synaptics_hover_device;
extern struct litest_test_device litest_synaptics_carbon3rd_device;
extern struct litest_test_device litest_protocol_a_screen;
+extern struct litest_test_device litest_wacom_finger_device;
struct litest_test_device* devices[] = {
&litest_synaptics_clickpad_device,
@@ -115,6 +116,7 @@ struct litest_test_device* devices[] = {
&litest_synaptics_hover_device,
&litest_synaptics_carbon3rd_device,
&litest_protocol_a_screen,
+ &litest_wacom_finger_device,
NULL,
};
diff --git a/test/litest.h b/test/litest.h
index df5dd75..8f16851 100644
--- a/test/litest.h
+++ b/test/litest.h
@@ -52,6 +52,7 @@ enum litest_device_type {
LITEST_SYNAPTICS_HOVER_SEMI_MT = -16,
LITEST_SYNAPTICS_TRACKPOINT_BUTTONS = -17,
LITEST_PROTOCOL_A_SCREEN = -18,
+ LITEST_WACOM_FINGER = -19,
};
enum litest_device_feature {
diff --git a/test/touchpad.c b/test/touchpad.c
index 35178de..6741fa3 100644
--- a/test/touchpad.c
+++ b/test/touchpad.c
@@ -1869,8 +1869,8 @@ START_TEST(touchpad_2fg_scroll_slow_distance)
litest_touch_down(dev, 0, 20, 30);
litest_touch_down(dev, 1, 40, 30);
- litest_touch_move_to(dev, 0, 20, 30, 20, 50, 60, 10);
- litest_touch_move_to(dev, 1, 40, 30, 40, 50, 60, 10);
+ litest_touch_move_to(dev, 0, 20, 30, 20, 40, 70, 10);
+ litest_touch_move_to(dev, 1, 40, 30, 40, 40, 70, 10);
litest_touch_up(dev, 1);
litest_touch_up(dev, 0);
libinput_dispatch(li);
--
2.1.0
More information about the wayland-devel
mailing list