This tablet advertises tilt but doesn't actually have it. Let's rule out tilt for all aiptek devices until someone complains.
Recording from: https://bugzilla.redhat.com/show_bug.cgi?id=1535755 Related to: https://bugs.freedesktop.org/show_bug.cgi?id=104911 Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> --- meson.build | 1 + src/evdev.c | 7 ++ src/evdev.h | 1 + test/litest-device-aiptek-tablet.c | 150 +++++++++++++++++++++++++++++++++++++ test/litest.h | 1 + test/test-tablet.c | 11 +++ udev/90-libinput-model-quirks.hwdb | 6 ++ 7 files changed, 177 insertions(+) create mode 100644 test/litest-device-aiptek-tablet.c diff --git a/meson.build b/meson.build index 3d6583eb..e24c8f42 100644 --- a/meson.build +++ b/meson.build @@ -530,6 +530,7 @@ if get_option('tests') 'test/litest-int.h', 'test/litest-device-acer-hawaii-keyboard.c', 'test/litest-device-acer-hawaii-touchpad.c', + 'test/litest-device-aiptek-tablet.c', 'test/litest-device-alps-semi-mt.c', 'test/litest-device-alps-dualpoint.c', 'test/litest-device-anker-mouse-kbd.c', diff --git a/src/evdev.c b/src/evdev.c index d1ca243d..99a82721 100644 --- a/src/evdev.c +++ b/src/evdev.c @@ -1264,6 +1264,7 @@ evdev_read_model_flags(struct evdev_device *device) MODEL(APPLE_TOUCHPAD_ONEBUTTON), MODEL(LOGITECH_MARBLE_MOUSE), MODEL(TABLET_NO_PROXIMITY_OUT), + MODEL(TABLET_NO_TILT), #undef MODEL { "ID_INPUT_TRACKBALL", EVDEV_MODEL_TRACKBALL }, { NULL, EVDEV_MODEL_DEFAULT }, @@ -1860,6 +1861,12 @@ evdev_pre_configure_model_quirks(struct evdev_device *device) /* Logitech Marble Mouse claims to have a middle button */ if (device->model_flags & EVDEV_MODEL_LOGITECH_MARBLE_MOUSE) libevdev_disable_event_code(device->evdev, EV_KEY, BTN_MIDDLE); + + /* Aiptek tablets have tilt but don't send events */ + if (device->model_flags & EVDEV_MODEL_TABLET_NO_TILT) { + libevdev_disable_event_code(device->evdev, EV_ABS, ABS_TILT_X); + libevdev_disable_event_code(device->evdev, EV_ABS, ABS_TILT_Y); + } } static void diff --git a/src/evdev.h b/src/evdev.h index 20a7e352..cc0104d8 100644 --- a/src/evdev.h +++ b/src/evdev.h @@ -124,6 +124,7 @@ enum evdev_device_model { EVDEV_MODEL_APPLE_TOUCHPAD_ONEBUTTON = (1 << 25), EVDEV_MODEL_LOGITECH_MARBLE_MOUSE = (1 << 26), EVDEV_MODEL_TABLET_NO_PROXIMITY_OUT = (1 << 27), + EVDEV_MODEL_TABLET_NO_TILT = (1 << 28), }; enum evdev_button_scroll_state { diff --git a/test/litest-device-aiptek-tablet.c b/test/litest-device-aiptek-tablet.c new file mode 100644 index 00000000..3fa2e269 --- /dev/null +++ b/test/litest-device-aiptek-tablet.c @@ -0,0 +1,150 @@ +/* + * Copyright © 2017 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 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 }, + /* Note: this device does not send tilt, despite claiming it has it */ + { .type = EV_ABS, .code = ABS_PRESSURE, .value = LITEST_AUTO_ASSIGN }, + { .type = EV_SYN, .code = SYN_REPORT, .value = 0 }, + { .type = -1, .code = -1 }, +}; + +static struct input_event proximity_out[] = { + { .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 }, + /* Note: this device does not send tilt, despite claiming it has it */ + { .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_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, 5999, 0, 0, 26 }, + { ABS_Y, 0, 4499, 0, 0, 15 }, + { ABS_WHEEL, 0, 1023, 0, 0, 0 }, /* mute axis */ + { ABS_PRESSURE, 0, 1023, 0, 0, 0 }, + { ABS_TILT_X, -128, 127, 0, 0, 0 }, /* mute axis */ + { ABS_TILT_Y, -128, 127, 0, 0, 0 }, /* mute axis */ + { .value = -1 }, +}; + +static struct input_id input_id = { + .bustype = 0x3, + .vendor = 0x8ca, + .product = 0x10, +}; + +static int events[] = { + EV_KEY, KEY_ESC, + EV_KEY, KEY_F1, + EV_KEY, KEY_F2, + EV_KEY, KEY_F3, + EV_KEY, KEY_F4, + EV_KEY, KEY_F5, + EV_KEY, KEY_F6, + EV_KEY, KEY_F7, + EV_KEY, KEY_F8, + EV_KEY, KEY_F9, + EV_KEY, KEY_F10, + EV_KEY, KEY_F11, + EV_KEY, KEY_F12, + EV_KEY, KEY_STOP, + EV_KEY, KEY_AGAIN, + EV_KEY, KEY_PROPS, + EV_KEY, KEY_UNDO, + EV_KEY, KEY_FRONT, + EV_KEY, KEY_COPY, + EV_KEY, KEY_OPEN, + EV_KEY, KEY_PASTE, + EV_KEY, KEY_F13, + EV_KEY, KEY_F14, + EV_KEY, KEY_F15, + EV_KEY, KEY_F16, + EV_KEY, KEY_F17, + EV_KEY, KEY_F18, + EV_KEY, KEY_F19, + EV_KEY, KEY_F20, + EV_KEY, KEY_F21, + EV_KEY, KEY_F22, + EV_KEY, KEY_F23, + EV_KEY, KEY_F24, + EV_KEY, BTN_LEFT, + EV_KEY, BTN_RIGHT, + EV_KEY, BTN_MIDDLE, + EV_KEY, BTN_TOOL_PEN, + EV_KEY, BTN_TOOL_RUBBER, + EV_KEY, BTN_TOOL_BRUSH, + EV_KEY, BTN_TOOL_PENCIL, + EV_KEY, BTN_TOOL_AIRBRUSH, + EV_KEY, BTN_TOOL_MOUSE, + EV_KEY, BTN_TOOL_LENS, + EV_KEY, BTN_TOUCH, + EV_KEY, BTN_STYLUS, + EV_KEY, BTN_STYLUS2, + EV_REL, REL_X, + EV_REL, REL_Y, + EV_REL, REL_WHEEL, + EV_MSC, MSC_SERIAL, + -1, -1, +}; + +TEST_DEVICE("aiptek-tablet", + .type = LITEST_AIPTEK, + .features = LITEST_TABLET, + .interface = &interface, + + .name = "Aiptek", + .id = &input_id, + .events = events, + .absinfo = absinfo, +) diff --git a/test/litest.h b/test/litest.h index c048e303..64117252 100644 --- a/test/litest.h +++ b/test/litest.h @@ -270,6 +270,7 @@ enum litest_device_type { LITEST_WACOM_BAMBOO_2FG_PEN, LITEST_WACOM_BAMBOO_2FG_FINGER, LITEST_HP_WMI_HOTKEYS, + LITEST_AIPTEK, }; enum litest_device_feature { diff --git a/test/test-tablet.c b/test/test-tablet.c index f8cb0b11..77230ed0 100644 --- a/test/test-tablet.c +++ b/test/test-tablet.c @@ -2478,6 +2478,13 @@ START_TEST(tool_capabilities) } END_TEST +static inline bool +tablet_has_mouse(struct litest_device *dev) +{ + return libevdev_has_event_code(dev->evdev, EV_KEY, BTN_TOOL_MOUSE) && + libevdev_get_id_vendor(dev->evdev) == VENDOR_ID_WACOM; +} + START_TEST(tool_type) { struct litest_device *dev = litest_current_device(); @@ -2516,6 +2523,10 @@ START_TEST(tool_type) tt->code)) continue; + if ((tt->code == BTN_TOOL_MOUSE || tt->code == BTN_TOOL_LENS) && + !tablet_has_mouse(dev)) + continue; + litest_push_event_frame(dev); litest_filter_event(dev, EV_KEY, BTN_TOOL_PEN); litest_tablet_proximity_in(dev, 50, 50, axes); diff --git a/udev/90-libinput-model-quirks.hwdb b/udev/90-libinput-model-quirks.hwdb index c23ef833..4ecc62cb 100644 --- a/udev/90-libinput-model-quirks.hwdb +++ b/udev/90-libinput-model-quirks.hwdb @@ -32,6 +32,12 @@ libinput:name:*Lid Switch*:dmi:*:ct9:* libinput:keyboard:input:b0011v* LIBINPUT_ATTR_KEYBOARD_INTEGRATION=internal +########################################## +# Aiptek +########################################## +libinput:tablet:input:b0003v08CAp* + LIBINPUT_MODEL_TABLET_NO_TILT=1 + ########################################## # ALPS ########################################## -- 2.14.3 _______________________________________________ wayland-devel mailing list wayland-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/wayland-devel
