mirror of
https://gitlab.freedesktop.org/libinput/libinput.git
synced 2026-02-03 06:30:27 +01:00
test: add Wacom Cintiq 24HD Pen
One test now gets close enough to 100% of the axis value that ck_assert_double_lt() is not fine-grained enough. Switch to a direct x < 100.0 check. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Peter Hutterer
parent
9356d9b97d
commit
197bad1676
5 changed files with 155 additions and 4 deletions
|
|
@ -46,6 +46,7 @@ liblitest_la_SOURCES = \
|
|||
litest-device-touch-screen.c \
|
||||
litest-device-wacom-bamboo-tablet.c \
|
||||
litest-device-wacom-cintiq-tablet.c \
|
||||
litest-device-wacom-cintiq-24hd.c \
|
||||
litest-device-wacom-intuos-tablet.c \
|
||||
litest-device-wacom-isdv4-tablet.c \
|
||||
litest-device-wacom-touch.c \
|
||||
|
|
|
|||
147
test/litest-device-wacom-cintiq-24hd.c
Normal file
147
test/litest-device-wacom-cintiq-24hd.c
Normal file
|
|
@ -0,0 +1,147 @@
|
|||
/*
|
||||
* 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_cintiq_tablet_setup(void)
|
||||
{
|
||||
struct litest_device *d = litest_create_device(LITEST_WACOM_CINTIQ_24HD);
|
||||
litest_set_current_device(d);
|
||||
}
|
||||
|
||||
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_DISTANCE, .value = LITEST_AUTO_ASSIGN },
|
||||
{ .type = EV_ABS, .code = ABS_PRESSURE, .value = LITEST_AUTO_ASSIGN },
|
||||
{ .type = EV_ABS, .code = ABS_TILT_X, .value = LITEST_AUTO_ASSIGN },
|
||||
{ .type = EV_ABS, .code = ABS_TILT_Y, .value = LITEST_AUTO_ASSIGN },
|
||||
{ .type = EV_ABS, .code = ABS_MISC, .value = 2083 },
|
||||
{ .type = EV_MSC, .code = MSC_SERIAL, .value = 297797542 },
|
||||
{ .type = EV_KEY, .code = BTN_TOOL_PEN, .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_ABS, .code = ABS_DISTANCE, .value = 0 },
|
||||
{ .type = EV_ABS, .code = ABS_TILT_X, .value = 0 },
|
||||
{ .type = EV_ABS, .code = ABS_TILT_Y, .value = 0 },
|
||||
{ .type = EV_ABS, .code = ABS_MISC, .value = 0 },
|
||||
{ .type = EV_MSC, .code = MSC_SERIAL, .value = 297797542 },
|
||||
{ .type = EV_KEY, .code = BTN_TOOL_PEN, .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_DISTANCE, .value = LITEST_AUTO_ASSIGN },
|
||||
{ .type = EV_ABS, .code = ABS_PRESSURE, .value = LITEST_AUTO_ASSIGN },
|
||||
{ .type = EV_ABS, .code = ABS_TILT_X, .value = LITEST_AUTO_ASSIGN },
|
||||
{ .type = EV_ABS, .code = ABS_TILT_Y, .value = LITEST_AUTO_ASSIGN },
|
||||
{ .type = EV_MSC, .code = MSC_SERIAL, .value = 297797542 },
|
||||
{ .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_TILT_X:
|
||||
case ABS_TILT_Y:
|
||||
*value = 0;
|
||||
return 0;
|
||||
case ABS_PRESSURE:
|
||||
*value = 100;
|
||||
return 0;
|
||||
case ABS_DISTANCE:
|
||||
*value = 0;
|
||||
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, 400, 104080, 4, 0, 200 },
|
||||
{ ABS_Y, 400, 65200, 4, 0, 200 },
|
||||
{ ABS_Z, -900, 899, 0, 0, 0 },
|
||||
{ ABS_WHEEL, 0, 1023, 0, 0, 0 },
|
||||
{ ABS_THROTTLE, 0, 71, 0, 0, 0 },
|
||||
{ ABS_PRESSURE, 0, 2047, 0, 0, 0 },
|
||||
{ ABS_DISTANCE, 0, 63, 0, 0, 0 },
|
||||
{ ABS_TILT_X, -64, 63, 0, 0, 57 },
|
||||
{ ABS_TILT_Y, -64, 63, 0, 0, 57 },
|
||||
{ ABS_MISC, 0, 0, 0, 0, 0 },
|
||||
{ .value = -1 },
|
||||
};
|
||||
|
||||
static struct input_id input_id = {
|
||||
.bustype = 0x3,
|
||||
.vendor = 0x56a,
|
||||
.product = 0xf4,
|
||||
.version = 0x113,
|
||||
};
|
||||
|
||||
static int events[] = {
|
||||
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_TOUCH,
|
||||
EV_KEY, BTN_STYLUS,
|
||||
EV_KEY, BTN_STYLUS2,
|
||||
EV_MSC, MSC_SERIAL,
|
||||
INPUT_PROP_MAX, INPUT_PROP_DIRECT,
|
||||
-1, -1,
|
||||
};
|
||||
|
||||
struct litest_test_device litest_wacom_cintiq_24hd_device = {
|
||||
.type = LITEST_WACOM_CINTIQ_24HD,
|
||||
.features = LITEST_TABLET | LITEST_DISTANCE | LITEST_TOOL_SERIAL | LITEST_TILT,
|
||||
.shortname = "wacom-cintiq-24hd-tablet",
|
||||
.setup = litest_wacom_cintiq_tablet_setup,
|
||||
.interface = &interface,
|
||||
|
||||
.name = "Wacom Cintiq 24 HD Pen",
|
||||
.id = &input_id,
|
||||
.events = events,
|
||||
.absinfo = absinfo,
|
||||
};
|
||||
|
|
@ -378,6 +378,7 @@ extern struct litest_test_device litest_huion_tablet_device;
|
|||
extern struct litest_test_device litest_cyborg_rat_device;
|
||||
extern struct litest_test_device litest_yubikey_device;
|
||||
extern struct litest_test_device litest_synaptics_i2c_device;
|
||||
extern struct litest_test_device litest_wacom_cintiq_24hd_device;
|
||||
|
||||
struct litest_test_device* devices[] = {
|
||||
&litest_synaptics_clickpad_device,
|
||||
|
|
@ -422,6 +423,7 @@ struct litest_test_device* devices[] = {
|
|||
&litest_cyborg_rat_device,
|
||||
&litest_yubikey_device,
|
||||
&litest_synaptics_i2c_device,
|
||||
&litest_wacom_cintiq_24hd_device,
|
||||
NULL,
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -195,6 +195,7 @@ enum litest_device_type {
|
|||
LITEST_CYBORG_RAT = -41,
|
||||
LITEST_YUBIKEY = -42,
|
||||
LITEST_SYNAPTICS_I2C = -43,
|
||||
LITEST_WACOM_CINTIQ_24HD = -44,
|
||||
};
|
||||
|
||||
enum litest_device_feature {
|
||||
|
|
|
|||
|
|
@ -2839,10 +2839,10 @@ START_TEST(tablet_calibration_set_matrix)
|
|||
y = libinput_event_tablet_tool_get_y_transformed(tablet_event, 100);
|
||||
libinput_event_destroy(event);
|
||||
|
||||
ck_assert_double_gt(x, 99.0);
|
||||
ck_assert_double_lt(x, 100.0);
|
||||
ck_assert_double_gt(y, 49.0);
|
||||
ck_assert_double_lt(y, 51.0);
|
||||
ck_assert(x > 99.0);
|
||||
ck_assert(x < 100.0);
|
||||
ck_assert(y > 49.0);
|
||||
ck_assert(y < 51.0);
|
||||
|
||||
litest_tablet_proximity_out(dev);
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue