Adds a device with various touch related axes and respective device features
to litest. And additional routines to simulate pressure orientation and
touch major/minor changes.
Signed-off-by: Andreas Pokorny <andreas.poko...@canonical.com>
---
test/Makefile.am | 1 +
test/litest-touch-screen.c | 104 +++++++++++++++++++++++++++++++++++++++++++++
test/litest.c | 2 +
test/litest.h | 2 +
4 files changed, 109 insertions(+)
create mode 100644 test/litest-touch-screen.c
diff --git a/test/Makefile.am b/test/Makefile.am
index 2dfd5c1..5f8639d 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -31,6 +31,7 @@ liblitest_la_SOURCES = \
litest-synaptics-t440.c \
litest-synaptics-x1-carbon-3rd.c \
litest-trackpoint.c \
+ litest-touch-screen.c \
litest-wacom-touch.c \
litest-wacom-intuos-finger.c \
litest-wheel-only.c \
diff --git a/test/litest-touch-screen.c b/test/litest-touch-screen.c
new file mode 100644
index 0000000..45da7fc
--- /dev/null
+++ b/test/litest-touch-screen.c
@@ -0,0 +1,104 @@
+/*
+ * Copyright © 2015 Canonical, Ltd.
+ *
+ * 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_generic_mt_setup(void)
+{
+ struct litest_device *d =
litest_create_device(LITEST_GENERIC_MULTITOUCH_SCREEN);
+ litest_set_current_device(d);
+}
+
+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, 0, 1500, 0, 0, 0 },
+ { ABS_Y, 0, 2500, 0, 0, 0 },
+ { ABS_MT_SLOT, 0, 9, 0, 0, 0 },
+ { ABS_MT_POSITION_X, 0, 1500, 0, 0, 0 },
+ { ABS_MT_POSITION_Y, 0, 2500, 0, 0, 0 },
+ { ABS_MT_ORIENTATION, -256, 255, 0, 0, 0 },
+ { ABS_MT_TOUCH_MAJOR, 0, 255, 1, 0, 0 },
+ { ABS_MT_TOUCH_MINOR, 0, 255, 1, 0, 0 },
+ { ABS_MT_PRESSURE, 0, 255, 0, 0, 0 },
+ { 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
+};
+
+struct litest_test_device litest_generic_multitouch_screen_device = {
+ .type = LITEST_GENERIC_MULTITOUCH_SCREEN,
+ .features = LITEST_TOUCH|LITEST_ELLIPSE,
+ .shortname = "generic-mt",
+ .setup = litest_generic_mt_setup,
+ .interface = &interface,
+
+ .name = "generic-mt",
+ .id = &input_id,
+ .events = events,
+ .absinfo = absinfo,
+};
diff --git a/test/litest.c b/test/litest.c
index 2d4a37a..579a1fb 100644
--- a/test/litest.c
+++ b/test/litest.c
@@ -351,6 +351,7 @@ extern struct litest_test_device litest_mouse_roccat_device;
extern struct litest_test_device litest_ms_surface_cover_device;
extern struct litest_test_device litest_logitech_trackball_device;
extern struct litest_test_device litest_atmel_hover_device;
+extern struct litest_test_device litest_generic_multitouch_screen_device;
struct litest_test_device* devices[] = {
&litest_synaptics_clickpad_device,
@@ -376,6 +377,7 @@ struct litest_test_device* devices[] = {
&litest_ms_surface_cover_device,
&litest_logitech_trackball_device,
&litest_atmel_hover_device,
+ &litest_generic_multitouch_screen_device,
NULL,
};
diff --git a/test/litest.h b/test/litest.h
index 3c4c88a..455ff22 100644
--- a/test/litest.h
+++ b/test/litest.h
@@ -136,6 +136,7 @@ enum litest_device_type {
LITEST_MOUSE_ROCCAT = -22,
LITEST_LOGITECH_TRACKBALL = -23,
LITEST_ATMEL_HOVER = -24,
+ LITEST_GENERIC_MULTITOUCH_SCREEN= -25,
};
enum litest_device_feature {
@@ -157,6 +158,7 @@ enum litest_device_feature {
LITEST_ABSOLUTE = 1 << 13,
LITEST_PROTOCOL_A = 1 << 14,
LITEST_HOVER = 1 << 15,
+ LITEST_ELLIPSE = 1 << 16,
};
struct litest_device {
--
2.1.4
_______________________________________________
wayland-devel mailing list
wayland-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/wayland-devel
