[PATCH libinput 3/6] test: add QEMU tablet as test device

Peter Hutterer peter.hutterer at who-t.net
Thu Nov 6 16:42:18 PST 2014


Re-uses the touch_down interface for now, but requires the slot is always 0.
That's easier for now than adding a new interface for abs event, at least
until we have more than one device that needs it.

This device, along with a couple of similar ones have a tendency to break in
the X.Org stack without people noticing. They're special in that they have
absolute x/y axes but relative wheels. For libinput that's not as much of a
problem as it is in X but let's add them anyway.

Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
---
 test/Makefile.am              |   1 +
 test/litest-qemu-usb-tablet.c | 101 ++++++++++++++++++++++++++++++++++++++++++
 test/litest.c                 |   2 +
 test/litest.h                 |   2 +
 test/pointer.c                |   2 +-
 5 files changed, 107 insertions(+), 1 deletion(-)
 create mode 100644 test/litest-qemu-usb-tablet.c

diff --git a/test/Makefile.am b/test/Makefile.am
index d932961..c810a5d 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -21,6 +21,7 @@ liblitest_la_SOURCES = \
 	litest-keyboard.c \
 	litest-mouse.c \
 	litest-ms-surface-cover.c \
+	litest-qemu-usb-tablet.c \
 	litest-synaptics.c \
 	litest-synaptics-st.c \
 	litest-synaptics-t440.c \
diff --git a/test/litest-qemu-usb-tablet.c b/test/litest-qemu-usb-tablet.c
new file mode 100644
index 0000000..4f03e24
--- /dev/null
+++ b/test/litest-qemu-usb-tablet.c
@@ -0,0 +1,101 @@
+/*
+ * 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"
+#include <assert.h>
+
+static void
+litest_qemu_tablet_touch_setup(void)
+{
+	struct litest_device *d = litest_create_device(LITEST_QEMU_TABLET);
+	litest_set_current_device(d);
+}
+
+static void touch_down(struct litest_device *d, unsigned int slot,
+		       double x, double y)
+{
+	assert(slot == 0);
+
+	litest_event(d, EV_ABS, ABS_X, litest_scale(d, ABS_X, x));
+	litest_event(d, EV_ABS, ABS_Y, litest_scale(d, ABS_Y, y));
+	litest_event(d, EV_SYN, SYN_REPORT, 0);
+}
+
+static void touch_move(struct litest_device *d, unsigned int slot,
+		       double x, double y)
+{
+	assert(slot == 0);
+
+	litest_event(d, EV_ABS, ABS_X, litest_scale(d, ABS_X, x));
+	litest_event(d, EV_ABS, ABS_Y, litest_scale(d, ABS_Y, y));
+	litest_event(d, EV_SYN, SYN_REPORT, 0);
+}
+
+static void touch_up(struct litest_device *d, unsigned int slot)
+{
+	assert(slot == 0);
+	litest_event(d, EV_SYN, SYN_REPORT, 0);
+}
+
+static struct litest_device_interface interface = {
+	.touch_down = touch_down,
+	.touch_move = touch_move,
+	.touch_up = touch_up,
+};
+
+static struct input_absinfo absinfo[] = {
+	{ ABS_X, 0, 32767, 0, 0, 0 },
+	{ ABS_Y, 0, 32767, 0, 0, 0 },
+	{ .value = -1 },
+};
+
+static struct input_id input_id = {
+	.bustype = 0x03,
+	.vendor = 0x627,
+	.product = 0x01,
+};
+
+static int events[] = {
+	EV_KEY, BTN_LEFT,
+	EV_KEY, BTN_RIGHT,
+	EV_KEY, BTN_MIDDLE,
+	EV_REL, REL_WHEEL,
+	-1, -1,
+};
+
+struct litest_test_device litest_qemu_tablet_device = {
+	.type = LITEST_QEMU_TABLET,
+	.features = LITEST_WHEEL | LITEST_BUTTON | LITEST_ABSOLUTE,
+	.shortname = "qemu tablet",
+	.setup = litest_qemu_tablet_touch_setup,
+	.interface = &interface,
+
+	.name = "QEMU 0.12.1 QEMU USB Tablet",
+	.id = &input_id,
+	.events = events,
+	.absinfo = absinfo,
+};
diff --git a/test/litest.c b/test/litest.c
index b786671..47bb953 100644
--- a/test/litest.c
+++ b/test/litest.c
@@ -87,6 +87,7 @@ extern struct litest_test_device litest_mouse_device;
 extern struct litest_test_device litest_wacom_touch_device;
 extern struct litest_test_device litest_alps_device;
 extern struct litest_test_device litest_generic_singletouch_device;
+extern struct litest_test_device litest_qemu_tablet_device;
 
 struct litest_test_device* devices[] = {
 	&litest_synaptics_clickpad_device,
@@ -99,6 +100,7 @@ struct litest_test_device* devices[] = {
 	&litest_wacom_touch_device,
 	&litest_alps_device,
 	&litest_generic_singletouch_device,
+	&litest_qemu_tablet_device,
 	NULL,
 };
 
diff --git a/test/litest.h b/test/litest.h
index a2d4190..fc3485d 100644
--- a/test/litest.h
+++ b/test/litest.h
@@ -46,6 +46,7 @@ enum litest_device_type {
 	LITEST_ALPS_SEMI_MT = -10,
 	LITEST_GENERIC_SINGLETOUCH = -11,
 	LITEST_MS_SURFACE_COVER = -12,
+	LITEST_QEMU_TABLET = -13,
 };
 
 enum litest_device_feature {
@@ -64,6 +65,7 @@ enum litest_device_feature {
 	LITEST_SEMI_MT = 1 << 10,
 	LITEST_POINTINGSTICK = 1 << 11,
 	LITEST_FAKE_MT = 1 << 12,
+	LITEST_ABSOLUTE = 1 << 13,
 };
 
 struct litest_device {
diff --git a/test/pointer.c b/test/pointer.c
index fb3135d..4387526 100644
--- a/test/pointer.c
+++ b/test/pointer.c
@@ -526,7 +526,7 @@ int main (int argc, char **argv) {
 	litest_add("pointer:scroll", pointer_scroll_wheel, LITEST_WHEEL, LITEST_ANY);
 	litest_add_no_device("pointer:seat button count", pointer_seat_button_count);
 
-	litest_add("pointer:calibration", pointer_no_calibration, LITEST_ANY, LITEST_TOUCH|LITEST_SINGLE_TOUCH);
+	litest_add("pointer:calibration", pointer_no_calibration, LITEST_ANY, LITEST_TOUCH|LITEST_SINGLE_TOUCH|LITEST_ABSOLUTE);
 
 									/* tests touchpads too */
 	litest_add("pointer:left-handed", pointer_left_handed_defaults, LITEST_BUTTON, LITEST_ANY);
-- 
2.1.0



More information about the wayland-devel mailing list