[PATCH libinput 4/7] test: add a device and test for udev-set calibration values
Peter Hutterer
peter.hutterer at who-t.net
Mon Nov 28 05:20:47 UTC 2016
Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
---
test/Makefile.am | 1 +
test/litest-device-calibrated-touchscreen.c | 103 ++++++++++++++++++++++++++++
test/litest.c | 2 +
test/litest.h | 1 +
test/touch.c | 101 +++++++++++++++++++++++++++
5 files changed, 208 insertions(+)
create mode 100644 test/litest-device-calibrated-touchscreen.c
diff --git a/test/Makefile.am b/test/Makefile.am
index 3f63a7a..5c25b58 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -21,6 +21,7 @@ liblitest_la_SOURCES = \
litest-device-asus-rog-gladius.c \
litest-device-atmel-hover.c \
litest-device-bcm5974.c \
+ litest-device-calibrated-touchscreen.c \
litest-device-cyborg-rat-5.c \
litest-device-elantech-touchpad.c \
litest-device-generic-singletouch.c \
diff --git a/test/litest-device-calibrated-touchscreen.c b/test/litest-device-calibrated-touchscreen.c
new file mode 100644
index 0000000..c0cb172
--- /dev/null
+++ b/test/litest-device-calibrated-touchscreen.c
@@ -0,0 +1,103 @@
+/*
+ * Copyright © 2016 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_calibrated_touchscreen_setup(void)
+{
+ struct litest_device *d =
+ litest_create_device(LITEST_CALIBRATED_TOUCHSCREEN);
+ 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_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_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_TRACKING_ID, 0, 65535, 0, 0, 0 },
+ { .value = -1 },
+};
+
+static struct input_id input_id = {
+ .bustype = 0x11,
+ .vendor = 0x22,
+ .product = 0x33,
+};
+
+static int events[] = {
+ EV_KEY, BTN_TOUCH,
+ INPUT_PROP_MAX, INPUT_PROP_DIRECT,
+ -1, -1
+};
+
+static const char udev_rule[] =
+"ACTION==\"remove\", GOTO=\"calibrated_touchscreen_end\"\n"
+"KERNEL!=\"event*\", GOTO=\"calibrated_touchscreen_end\"\n"
+"\n"
+"ATTRS{name}==\"litest Calibrated Touchscreen*\",\\\n"
+" ENV{LIBINPUT_CALIBRATION_MATRIX}=\"1.2 3.4 5.6 7.8 9.10 11.12\"\n"
+"\n"
+"LABEL=\"calibrated_touchscreen_end\"";
+
+struct litest_test_device litest_calibrated_touchscreen_device = {
+ .type = LITEST_CALIBRATED_TOUCHSCREEN,
+ .features = LITEST_TOUCH,
+ .shortname = "calibrated-touchscreen",
+ .setup = litest_calibrated_touchscreen_setup,
+ .interface = &interface,
+
+ .name = "Calibrated Touchscreen",
+ .id = &input_id,
+ .events = events,
+ .absinfo = absinfo,
+ .udev_rule = udev_rule,
+};
diff --git a/test/litest.c b/test/litest.c
index e015140..148dd86 100644
--- a/test/litest.c
+++ b/test/litest.c
@@ -405,6 +405,7 @@ extern struct litest_test_device litest_wacom_cintiq_13hdt_pen_device;
extern struct litest_test_device litest_wacom_cintiq_13hdt_pad_device;
extern struct litest_test_device litest_wacom_hid4800_tablet_device;
extern struct litest_test_device litest_mouse_wheel_click_count_device;
+extern struct litest_test_device litest_calibrated_touchscreen_device;
struct litest_test_device* devices[] = {
&litest_synaptics_clickpad_device,
@@ -462,6 +463,7 @@ struct litest_test_device* devices[] = {
&litest_wacom_cintiq_13hdt_pad_device,
&litest_wacom_hid4800_tablet_device,
&litest_mouse_wheel_click_count_device,
+ &litest_calibrated_touchscreen_device,
NULL,
};
diff --git a/test/litest.h b/test/litest.h
index d52ebd2..7728c02 100644
--- a/test/litest.h
+++ b/test/litest.h
@@ -225,6 +225,7 @@ enum litest_device_type {
LITEST_WACOM_CINTIQ_13HDT_FINGER,
LITEST_WACOM_HID4800_PEN,
LITEST_MOUSE_WHEEL_CLICK_COUNT,
+ LITEST_CALIBRATED_TOUCHSCREEN,
};
enum litest_device_feature {
diff --git a/test/touch.c b/test/touch.c
index ac2f29f..0e091aa 100644
--- a/test/touch.c
+++ b/test/touch.c
@@ -398,6 +398,105 @@ START_TEST(touch_calibration_translation)
}
END_TEST
+START_TEST(touch_calibrated_screen_path)
+{
+ struct litest_device *dev = litest_current_device();
+ float matrix[6];
+ int rc;
+
+ rc = libinput_device_config_calibration_has_matrix(dev->libinput_device);
+ ck_assert_int_eq(rc, 1);
+
+ rc = libinput_device_config_calibration_get_matrix(dev->libinput_device,
+ matrix);
+ ck_assert_int_eq(rc, 1);
+
+ ck_assert_double_eq(matrix[0], 1.2);
+ ck_assert_double_eq(matrix[1], 3.4);
+ ck_assert_double_eq(matrix[2], 5.6);
+ ck_assert_double_eq(matrix[3], 7.8);
+ ck_assert_double_eq(matrix[4], 9.10);
+ ck_assert_double_eq(matrix[5], 11.12);
+}
+END_TEST
+
+static int open_restricted(const char *path, int flags, void *data)
+{
+ int fd;
+ fd = open(path, flags);
+ return fd < 0 ? -errno : fd;
+}
+static void close_restricted(int fd, void *data)
+{
+ close(fd);
+}
+
+static const struct libinput_interface simple_interface = {
+ .open_restricted = open_restricted,
+ .close_restricted = close_restricted,
+};
+
+START_TEST(touch_calibrated_screen_udev)
+{
+ struct libinput *li;
+ struct libinput_event *ev;
+ struct libinput_device *device = NULL;
+ struct udev *udev;
+ float matrix[6];
+ int rc;
+
+ udev = udev_new();
+ ck_assert(udev != NULL);
+
+ li = libinput_udev_create_context(&simple_interface, NULL, udev);
+ ck_assert(li != NULL);
+ ck_assert_int_eq(libinput_udev_assign_seat(li, "seat0"), 0);
+
+ libinput_dispatch(li);
+
+ while ((ev = libinput_get_event(li))) {
+ struct libinput_device *d;
+
+ if (libinput_event_get_type(ev) !=
+ LIBINPUT_EVENT_DEVICE_ADDED) {
+ libinput_event_destroy(ev);
+ continue;
+ }
+
+ d = libinput_event_get_device(ev);
+
+ if (libinput_device_get_id_vendor(d) == 0x22 &&
+ libinput_device_get_id_product(d) == 0x33) {
+ device = libinput_device_ref(d);
+ litest_drain_events(li);
+ }
+ libinput_event_destroy(ev);
+ }
+
+ litest_drain_events(li);
+
+ ck_assert_notnull(device);
+ rc = libinput_device_config_calibration_has_matrix(device);
+ ck_assert_int_eq(rc, 1);
+
+ rc = libinput_device_config_calibration_get_matrix(device, matrix);
+ ck_assert_int_eq(rc, 1);
+
+ ck_assert_double_eq(matrix[0], 1.2);
+ ck_assert_double_eq(matrix[1], 3.4);
+ ck_assert_double_eq(matrix[2], 5.6);
+ ck_assert_double_eq(matrix[3], 7.8);
+ ck_assert_double_eq(matrix[4], 9.10);
+ ck_assert_double_eq(matrix[5], 11.12);
+
+ libinput_device_unref(device);
+
+ libinput_unref(li);
+ udev_unref(udev);
+
+}
+END_TEST
+
START_TEST(touch_no_left_handed)
{
struct litest_device *dev = litest_current_device();
@@ -734,6 +833,8 @@ litest_setup_tests_touch(void)
litest_add("touch:calibration", touch_calibration_rotation, LITEST_SINGLE_TOUCH, LITEST_TOUCHPAD);
litest_add("touch:calibration", touch_calibration_translation, LITEST_TOUCH, LITEST_TOUCHPAD);
litest_add("touch:calibration", touch_calibration_translation, LITEST_SINGLE_TOUCH, LITEST_TOUCHPAD);
+ litest_add_for_device("touch:calibration", touch_calibrated_screen_path, LITEST_CALIBRATED_TOUCHSCREEN);
+ litest_add_for_device("touch:calibration", touch_calibrated_screen_udev, LITEST_CALIBRATED_TOUCHSCREEN);
litest_add("touch:left-handed", touch_no_left_handed, LITEST_TOUCH, LITEST_ANY);
--
2.9.3
More information about the wayland-devel
mailing list