mirror of
https://gitlab.freedesktop.org/libinput/libinput.git
synced 2026-05-03 02:37:58 +02:00
test: add a Wacom Intuos 5 Finger test device
Works as a touchpad but has no buttons. Minor change to one of the touchpad tests: because the touch area is so big the slow-scrolling trigger needs to be adjusted. And because the device is an external device, the "disable on external mouse" test needs to be adjusted. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Hans de Goede <hdegoede@redhat.com>
This commit is contained in:
Peter Hutterer
parent
f8fae70d0c
commit
aa3d09932f
6 changed files with 122 additions and 6 deletions
|
|
@ -28,6 +28,7 @@ liblitest_la_SOURCES = \
|
|||
litest-synaptics-x1-carbon-3rd.c \
|
||||
litest-trackpoint.c \
|
||||
litest-wacom-touch.c \
|
||||
litest-wacom-intuos-finger.c \
|
||||
litest-xen-virtual-pointer.c \
|
||||
litest-vmware-virtual-usb-mouse.c \
|
||||
litest.c
|
||||
|
|
|
|||
|
|
@ -64,14 +64,19 @@ START_TEST(device_sendevents_config_touchpad)
|
|||
{
|
||||
struct litest_device *dev = litest_current_device();
|
||||
struct libinput_device *device;
|
||||
uint32_t modes;
|
||||
uint32_t modes, expected;
|
||||
|
||||
expected = LIBINPUT_CONFIG_SEND_EVENTS_DISABLED;
|
||||
|
||||
/* The wacom devices in the test suite are external */
|
||||
if (libevdev_get_id_vendor(dev->evdev) != 0x56a) /* wacom */
|
||||
expected |=
|
||||
LIBINPUT_CONFIG_SEND_EVENTS_DISABLED_ON_EXTERNAL_MOUSE;
|
||||
|
||||
device = dev->libinput_device;
|
||||
|
||||
modes = libinput_device_config_send_events_get_modes(device);
|
||||
ck_assert_int_eq(modes,
|
||||
LIBINPUT_CONFIG_SEND_EVENTS_DISABLED_ON_EXTERNAL_MOUSE|
|
||||
LIBINPUT_CONFIG_SEND_EVENTS_DISABLED);
|
||||
ck_assert_int_eq(modes, expected);
|
||||
}
|
||||
END_TEST
|
||||
|
||||
|
|
@ -82,6 +87,10 @@ START_TEST(device_sendevents_config_touchpad_superset)
|
|||
enum libinput_config_status status;
|
||||
uint32_t modes;
|
||||
|
||||
/* The wacom devices in the test suite are external */
|
||||
if (libevdev_get_id_vendor(dev->evdev) == 0x56a) /* wacom */
|
||||
return;
|
||||
|
||||
device = dev->libinput_device;
|
||||
|
||||
modes = LIBINPUT_CONFIG_SEND_EVENTS_DISABLED |
|
||||
|
|
|
|||
103
test/litest-wacom-intuos-finger.c
Normal file
103
test/litest-wacom-intuos-finger.c
Normal file
|
|
@ -0,0 +1,103 @@
|
|||
/*
|
||||
* 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"
|
||||
|
||||
static void
|
||||
litest_wacom_finger_setup(void)
|
||||
{
|
||||
struct litest_device *d = litest_create_device(LITEST_WACOM_FINGER);
|
||||
litest_set_current_device(d);
|
||||
}
|
||||
|
||||
static struct input_event down[] = {
|
||||
{ .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_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_X, .value = LITEST_AUTO_ASSIGN },
|
||||
{ .type = EV_ABS, .code = ABS_Y, .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, 4096, 0, 0, 18 },
|
||||
{ ABS_Y, 0, 4096, 0, 0, 29 },
|
||||
{ ABS_MT_SLOT, 0, 15, 0, 0, 0 },
|
||||
{ ABS_MT_TOUCH_MAJOR, 0, 4096, 0, 0, 0 },
|
||||
{ ABS_MT_TOUCH_MINOR, 0, 4096, 0, 0, 0 },
|
||||
{ ABS_MT_POSITION_X, 0, 4096, 0, 0, 18 },
|
||||
{ ABS_MT_POSITION_Y, 0, 4096, 0, 0, 29 },
|
||||
{ ABS_MT_TRACKING_ID, 0, 65535, 0, 0, 0 },
|
||||
{ .value = -1 },
|
||||
};
|
||||
|
||||
static struct input_id input_id = {
|
||||
.bustype = 0x3,
|
||||
.vendor = 0x56a,
|
||||
.product = 0x27,
|
||||
};
|
||||
|
||||
static int events[] = {
|
||||
EV_KEY, BTN_TOOL_FINGER,
|
||||
EV_KEY, BTN_TOOL_QUINTTAP,
|
||||
EV_KEY, BTN_TOUCH,
|
||||
EV_KEY, BTN_TOOL_DOUBLETAP,
|
||||
EV_KEY, BTN_TOOL_TRIPLETAP,
|
||||
EV_KEY, BTN_TOOL_QUADTAP,
|
||||
INPUT_PROP_MAX, INPUT_PROP_POINTER,
|
||||
-1, -1,
|
||||
};
|
||||
|
||||
struct litest_test_device litest_wacom_finger_device = {
|
||||
.type = LITEST_WACOM_FINGER,
|
||||
.features = LITEST_TOUCHPAD,
|
||||
.shortname = "wacom-finger",
|
||||
.setup = litest_wacom_finger_setup,
|
||||
.interface = &interface,
|
||||
|
||||
.name = "Wacom Intuos5 touch M Finger",
|
||||
.id = &input_id,
|
||||
.events = events,
|
||||
.absinfo = absinfo,
|
||||
};
|
||||
|
|
@ -97,6 +97,7 @@ extern struct litest_test_device litest_vmware_virtmouse_device;
|
|||
extern struct litest_test_device litest_synaptics_hover_device;
|
||||
extern struct litest_test_device litest_synaptics_carbon3rd_device;
|
||||
extern struct litest_test_device litest_protocol_a_screen;
|
||||
extern struct litest_test_device litest_wacom_finger_device;
|
||||
|
||||
struct litest_test_device* devices[] = {
|
||||
&litest_synaptics_clickpad_device,
|
||||
|
|
@ -115,6 +116,7 @@ struct litest_test_device* devices[] = {
|
|||
&litest_synaptics_hover_device,
|
||||
&litest_synaptics_carbon3rd_device,
|
||||
&litest_protocol_a_screen,
|
||||
&litest_wacom_finger_device,
|
||||
NULL,
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -52,6 +52,7 @@ enum litest_device_type {
|
|||
LITEST_SYNAPTICS_HOVER_SEMI_MT = -16,
|
||||
LITEST_SYNAPTICS_TRACKPOINT_BUTTONS = -17,
|
||||
LITEST_PROTOCOL_A_SCREEN = -18,
|
||||
LITEST_WACOM_FINGER = -19,
|
||||
};
|
||||
|
||||
enum litest_device_feature {
|
||||
|
|
|
|||
|
|
@ -1869,8 +1869,8 @@ START_TEST(touchpad_2fg_scroll_slow_distance)
|
|||
|
||||
litest_touch_down(dev, 0, 20, 30);
|
||||
litest_touch_down(dev, 1, 40, 30);
|
||||
litest_touch_move_to(dev, 0, 20, 30, 20, 50, 60, 10);
|
||||
litest_touch_move_to(dev, 1, 40, 30, 40, 50, 60, 10);
|
||||
litest_touch_move_to(dev, 0, 20, 30, 20, 40, 70, 10);
|
||||
litest_touch_move_to(dev, 1, 40, 30, 40, 40, 70, 10);
|
||||
litest_touch_up(dev, 1);
|
||||
litest_touch_up(dev, 0);
|
||||
libinput_dispatch(li);
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue