From: Peter Hutterer Date: Thu, 11 May 2023 04:30:38 +0000 (+1000) Subject: test: add a calibrated (swapped) tablet device X-Git-Tag: accepted/tizen/unified/20240105.013022~95 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=00fbb84727c786d9b217719df12fdb99f66ab930;p=platform%2Fupstream%2Flibinput.git test: add a calibrated (swapped) tablet device Swap any input for both x/y and default to a calibration matrix that swaps it back. In theory, that device will then behave as every other device. Signed-off-by: Peter Hutterer --- diff --git a/meson.build b/meson.build index e6488eb4..facdc76a 100644 --- a/meson.build +++ b/meson.build @@ -804,6 +804,7 @@ if get_option('tests') 'test/litest-device-wacom-bamboo-2fg-pad.c', 'test/litest-device-wacom-bamboo-2fg-pen.c', 'test/litest-device-wacom-bamboo-16fg-pen.c', + 'test/litest-device-wacom-calibrated-tablet.c', 'test/litest-device-wacom-cintiq-12wx-pen.c', 'test/litest-device-wacom-cintiq-13hdt-finger.c', 'test/litest-device-wacom-cintiq-13hdt-pad.c', diff --git a/test/litest-device-wacom-calibrated-tablet.c b/test/litest-device-wacom-calibrated-tablet.c new file mode 100644 index 00000000..fc983cc7 --- /dev/null +++ b/test/litest-device-wacom-calibrated-tablet.c @@ -0,0 +1,140 @@ +/* + * Copyright © 2023 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. + */ + +#include "config.h" + +#include "litest.h" +#include "litest-int.h" + +static bool +inverter(struct litest_device *dev, + double *x, double *y, + struct axis_replacement *axes) +{ + /* Input data is in percent (0-100), so let's swap x and y around. + * With our matrix this should be undone by libinput later + * and the tablet behaves as if normal */ + *x = 100 - *x; + *y = 100 - *y; + + /* let the generic code handle the event */ + return false; +} + +static bool +proximity_in_handler(struct litest_device *dev, + unsigned int tool_type, + double *x, double *y, + struct axis_replacement *axes) +{ + /* let the generic code handle the event */ + return inverter(dev, x, y, axes); +} + +static struct input_event proximity_in[] = { + { .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_PRESSURE, .value = LITEST_AUTO_ASSIGN }, + { .type = EV_KEY, .code = LITEST_BTN_TOOL_AUTO, .value = 1 }, + { .type = EV_SYN, .code = SYN_REPORT, .value = 0 }, + { .type = -1, .code = -1 }, +}; + +static struct input_event proximity_out[] = { + { .type = EV_ABS, .code = ABS_X, .value = 0 }, + { .type = EV_ABS, .code = ABS_Y, .value = 0 }, + { .type = EV_KEY, .code = LITEST_BTN_TOOL_AUTO, .value = 0 }, + { .type = EV_SYN, .code = SYN_REPORT, .value = 0 }, + { .type = -1, .code = -1 }, +}; + +static struct input_event motion[] = { + { .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_PRESSURE, .value = LITEST_AUTO_ASSIGN }, + { .type = EV_SYN, .code = SYN_REPORT, .value = 0 }, + { .type = -1, .code = -1 }, +}; + +static int +get_axis_default(struct litest_device *d, unsigned int evcode, int32_t *value) +{ + switch (evcode) { + case ABS_PRESSURE: + *value = 100; + return 0; + } + return 1; +} + +static struct litest_device_interface interface = { + .tablet_proximity_in = proximity_in_handler, + .tablet_tip_down = inverter, + .tablet_tip_up = inverter, + .tablet_motion = inverter, + + .tablet_proximity_in_events = proximity_in, + .tablet_proximity_out_events = proximity_out, + .tablet_motion_events = motion, + + .get_axis_default = get_axis_default, +}; + +static struct input_absinfo absinfo[] = { + { ABS_X, 0, 29476, 4, 0, 100 }, + { ABS_Y, 0, 16624, 4, 0, 100 }, + { ABS_PRESSURE, 0, 1023, 0, 0, 0 }, + { .value = -1 }, +}; + +static struct input_id input_id = { + .bustype = 0x3, + .vendor = 0x56a, + .product = 0x501e, + .version = 0x111, +}; + +static int events[] = { + EV_KEY, BTN_TOOL_PEN, + EV_KEY, BTN_TOOL_RUBBER, + EV_KEY, BTN_TOUCH, + EV_KEY, BTN_STYLUS, + EV_KEY, BTN_STYLUS2, + INPUT_PROP_MAX, INPUT_PROP_DIRECT, + -1, -1, +}; + +TEST_DEVICE("wacom-calibrated-tablet", + .type = LITEST_WACOM_CALIBRATED_TABLET, + .features = LITEST_TABLET|LITEST_PRECALIBRATED, + .interface = &interface, + + .name = "Wacom MultiTouch Sensor Pen", + .id = &input_id, + .events = events, + .absinfo = absinfo, + .udev_properties = { + { "LIBINPUT_CALIBRATION_MATRIX", "-1 0 1 0 -1 1" }, + { NULL } + }, +) diff --git a/test/litest.h b/test/litest.h index 9d968d63..a69217b7 100644 --- a/test/litest.h +++ b/test/litest.h @@ -328,6 +328,7 @@ enum litest_device_type { LITEST_MOUSE_FORMAT_STRING, LITEST_LENOVO_SCROLLPOINT, LITEST_SYNAPTICS_PHANTOMCLICKS, + LITEST_WACOM_CALIBRATED_TABLET, }; #define LITEST_DEVICELESS -2