Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> Reviewed-by: Jason Gerecke <jason.gere...@wacom.com> --- Changes to v2: See v3 06/10 for details.
This is effectively the unifdef HAVE_LIBWACOM version of the v2. test/Makefile.am | 1 + test/litest-device-wacom-cintiq-24hdt-pad.c | 148 ++++++++++++++++++ test/litest.c | 2 + test/litest.h | 1 + test/pad.c | 232 ++++++++++++++++++++++++++++ 5 files changed, 384 insertions(+) create mode 100644 test/litest-device-wacom-cintiq-24hdt-pad.c diff --git a/test/Makefile.am b/test/Makefile.am index f12b2ee..d9223c6 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -50,6 +50,7 @@ liblitest_la_SOURCES = \ litest-device-wacom-bamboo-tablet.c \ litest-device-wacom-cintiq-tablet.c \ litest-device-wacom-cintiq-24hd.c \ + litest-device-wacom-cintiq-24hdt-pad.c \ litest-device-wacom-ekr.c \ litest-device-wacom-intuos-tablet.c \ litest-device-wacom-intuos3-pad.c \ diff --git a/test/litest-device-wacom-cintiq-24hdt-pad.c b/test/litest-device-wacom-cintiq-24hdt-pad.c new file mode 100644 index 0000000..d20fbd5 --- /dev/null +++ b/test/litest-device-wacom-cintiq-24hdt-pad.c @@ -0,0 +1,148 @@ +/* + * Copyright © 2016 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 <errno.h> +#include <fcntl.h> +#include <unistd.h> +#include <sys/stat.h> + +#include "litest.h" +#include "litest-int.h" + +static void litest_wacom_cintiq_pad_setup(void) +{ + struct litest_device *d; + + d = litest_create_device(LITEST_WACOM_CINTIQ_24HDT_PAD); + + litest_set_current_device(d); +} + +static void +litest_wacom_cintiq_pad_teardown(void) +{ + litest_generic_device_teardown(); +} + +static struct input_event down[] = { + { .type = -1, .code = -1 }, +}; + +static struct input_event move[] = { + { .type = -1, .code = -1 }, +}; + +static struct input_event ring_start[] = { + { .type = EV_ABS, .code = ABS_WHEEL, .value = LITEST_AUTO_ASSIGN }, + { .type = EV_ABS, .code = ABS_MISC, .value = 15 }, + { .type = EV_SYN, .code = SYN_REPORT, .value = 0 }, + { .type = -1, .code = -1 }, +} ; + +static struct input_event ring_change[] = { + { .type = EV_ABS, .code = ABS_WHEEL, .value = LITEST_AUTO_ASSIGN }, + { .type = EV_SYN, .code = SYN_REPORT, .value = 0 }, + { .type = -1, .code = -1 }, +} ; + +static struct input_event ring_end[] = { + { .type = EV_ABS, .code = ABS_WHEEL, .value = 0 }, + { .type = EV_ABS, .code = ABS_MISC, .value = 0 }, + { .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, + .pad_ring_start_events = ring_start, + .pad_ring_change_events = ring_change, + .pad_ring_end_events = ring_end, +}; + +static struct input_absinfo absinfo[] = { + { ABS_X, 0, 1, 0, 0, 0 }, + { ABS_Y, 0, 1, 0, 0, 0 }, + { ABS_WHEEL, 0, 71, 0, 0, 0 }, + { ABS_THROTTLE, 0, 71, 0, 0, 0 }, + { ABS_MISC, 0, 0, 0, 0, 0 }, + { .value = -1 }, +}; + +static struct input_id input_id = { + .bustype = 0x3, + .vendor = 0x56a, + .product = 0xf8, + .version = 0x110, +}; + +static int events[] = { + EV_KEY, KEY_PROG1, + EV_KEY, KEY_PROG2, + EV_KEY, KEY_PROG3, + EV_KEY, BTN_0, + EV_KEY, BTN_1, + EV_KEY, BTN_2, + EV_KEY, BTN_3, + EV_KEY, BTN_4, + EV_KEY, BTN_5, + EV_KEY, BTN_6, + EV_KEY, BTN_7, + EV_KEY, BTN_8, + EV_KEY, BTN_9, + EV_KEY, BTN_SOUTH, + EV_KEY, BTN_EAST, + EV_KEY, BTN_C, + EV_KEY, BTN_NORTH, + EV_KEY, BTN_WEST, + EV_KEY, BTN_Z, + EV_KEY, BTN_STYLUS, + -1, -1, +}; + +static const char udev_rule[] = +"ACTION==\"remove\", GOTO=\"pad_end\"\n" +"KERNEL!=\"event*\", GOTO=\"pad_end\"\n" +"\n" +"ATTRS{name}==\"litest Wacom Cintiq 24 HD touch Pad*\",\\\n" +" ENV{ID_INPUT_TABLET_PAD}=\"1\"\n" +"\n" +"LABEL=\"pad_end\""; + +struct litest_test_device litest_wacom_cintiq_24hdt_pad_device = { + .type = LITEST_WACOM_CINTIQ_24HDT_PAD, + .features = LITEST_TABLET_PAD | LITEST_RING, + .shortname = "wacom-cintiq-24hdt-pad", + .setup = litest_wacom_cintiq_pad_setup, + .teardown = litest_wacom_cintiq_pad_teardown, + .interface = &interface, + + .name = "Wacom Cintiq 24 HD touch Pad", + .id = &input_id, + .events = events, + .absinfo = absinfo, + .udev_rule = udev_rule, +}; diff --git a/test/litest.c b/test/litest.c index dbd1106..916677f 100644 --- a/test/litest.c +++ b/test/litest.c @@ -385,6 +385,7 @@ extern struct litest_test_device litest_wacom_intuos5_pad_device; extern struct litest_test_device litest_keyboard_all_codes_device; extern struct litest_test_device litest_magicmouse_device; extern struct litest_test_device litest_wacom_ekr_device; +extern struct litest_test_device litest_wacom_cintiq_24hdt_pad_device; struct litest_test_device* devices[] = { &litest_synaptics_clickpad_device, @@ -436,6 +437,7 @@ struct litest_test_device* devices[] = { &litest_keyboard_all_codes_device, &litest_magicmouse_device, &litest_wacom_ekr_device, + &litest_wacom_cintiq_24hdt_pad_device, NULL, }; diff --git a/test/litest.h b/test/litest.h index 7dfb36b..f9f3f3a 100644 --- a/test/litest.h +++ b/test/litest.h @@ -202,6 +202,7 @@ enum litest_device_type { LITEST_KEYBOARD_ALL_CODES, LITEST_MAGICMOUSE, LITEST_WACOM_EKR, + LITEST_WACOM_CINTIQ_24HDT_PAD, }; enum litest_device_feature { diff --git a/test/pad.c b/test/pad.c index 636c6ea..67caa71 100644 --- a/test/pad.c +++ b/test/pad.c @@ -407,6 +407,230 @@ START_TEST(pad_left_handed_ring) } END_TEST +START_TEST(pad_mode_groups) +{ + struct litest_device *dev = litest_current_device(); + struct libinput_device *device = dev->libinput_device; + struct libinput_tablet_pad_mode_group *group; + int ngroups; + int i; + + ngroups = libinput_device_tablet_pad_get_num_mode_groups(device); + ck_assert_int_eq(ngroups, 1); + + for (i = 0; i < ngroups; i++) { + group = libinput_device_tablet_pad_get_mode_group(device, i); + ck_assert_notnull(group); + ck_assert_int_eq(libinput_tablet_pad_mode_group_get_index(group), + i); + } + + group = libinput_device_tablet_pad_get_mode_group(device, ngroups); + ck_assert(group == NULL); + group = libinput_device_tablet_pad_get_mode_group(device, ngroups + 1); + ck_assert(group == NULL); +} +END_TEST + +START_TEST(pad_mode_groups_userdata) +{ + struct litest_device *dev = litest_current_device(); + struct libinput_device *device = dev->libinput_device; + struct libinput_tablet_pad_mode_group *group; + int rc; + void *userdata = &rc; + + group = libinput_device_tablet_pad_get_mode_group(device, 0); + ck_assert(libinput_tablet_pad_mode_group_get_user_data(group) == + NULL); + libinput_tablet_pad_mode_group_set_user_data(group, userdata); + ck_assert(libinput_tablet_pad_mode_group_get_user_data(group) == + &rc); + + libinput_tablet_pad_mode_group_set_user_data(group, NULL); + ck_assert(libinput_tablet_pad_mode_group_get_user_data(group) == + NULL); +} +END_TEST + +START_TEST(pad_mode_groups_ref) +{ + struct litest_device *dev = litest_current_device(); + struct libinput_device *device = dev->libinput_device; + struct libinput_tablet_pad_mode_group *group, *g; + + group = libinput_device_tablet_pad_get_mode_group(device, 0); + g = libinput_tablet_pad_mode_group_ref(group); + ck_assert_ptr_eq(g, group); + + /* We don't expect this to be freed. Any leaks should be caught by + * valgrind. */ + g = libinput_tablet_pad_mode_group_unref(group); + ck_assert_ptr_eq(g, group); +} +END_TEST + +START_TEST(pad_mode_group_mode) +{ + struct litest_device *dev = litest_current_device(); + struct libinput_device *device = dev->libinput_device; + struct libinput_tablet_pad_mode_group *group; + int ngroups; + unsigned int nmodes, mode; + + ngroups = libinput_device_tablet_pad_get_num_mode_groups(device); + ck_assert_int_ge(ngroups, 1); + + group = libinput_device_tablet_pad_get_mode_group(device, 0); + + nmodes = libinput_tablet_pad_mode_group_get_num_modes(group); + ck_assert_int_eq(nmodes, 1); + + mode = libinput_tablet_pad_mode_group_get_mode(group); + ck_assert_int_lt(mode, nmodes); +} +END_TEST + +START_TEST(pad_mode_group_has) +{ + struct litest_device *dev = litest_current_device(); + struct libinput_device *device = dev->libinput_device; + struct libinput_tablet_pad_mode_group *group; + int ngroups, nbuttons, nrings, nstrips; + int i, b, r, s; + + ngroups = libinput_device_tablet_pad_get_num_mode_groups(device); + ck_assert_int_ge(ngroups, 1); + + nbuttons = libinput_device_tablet_pad_get_num_buttons(device); + nrings = libinput_device_tablet_pad_get_num_rings(device); + nstrips = libinput_device_tablet_pad_get_num_strips(device); + + for (b = 0; b < nbuttons; b++) { + bool found = false; + for (i = 0; i < ngroups; i++) { + group = libinput_device_tablet_pad_get_mode_group(device, + i); + if (libinput_tablet_pad_mode_group_has_button(group, + b)) { + ck_assert(!found); + found = true; + } + } + ck_assert(found); + } + + for (s = 0; s < nstrips; s++) { + bool found = false; + for (i = 0; i < ngroups; i++) { + group = libinput_device_tablet_pad_get_mode_group(device, + i); + if (libinput_tablet_pad_mode_group_has_strip(group, + s)) { + ck_assert(!found); + found = true; + } + } + ck_assert(found); + } + + for (r = 0; r < nrings; r++) { + bool found = false; + for (i = 0; i < ngroups; i++) { + group = libinput_device_tablet_pad_get_mode_group(device, + i); + if (libinput_tablet_pad_mode_group_has_ring(group, + r)) { + ck_assert(!found); + found = true; + } + } + ck_assert(found); + } +} +END_TEST + +START_TEST(pad_mode_group_has_invalid) +{ + struct litest_device *dev = litest_current_device(); + struct libinput_device *device = dev->libinput_device; + struct libinput_tablet_pad_mode_group* group; + int ngroups, nbuttons, nrings, nstrips; + int i; + int rc; + + ngroups = libinput_device_tablet_pad_get_num_mode_groups(device); + ck_assert_int_ge(ngroups, 1); + + nbuttons = libinput_device_tablet_pad_get_num_buttons(device); + nrings = libinput_device_tablet_pad_get_num_rings(device); + nstrips = libinput_device_tablet_pad_get_num_strips(device); + + for (i = 0; i < ngroups; i++) { + group = libinput_device_tablet_pad_get_mode_group(device, i); + rc = libinput_tablet_pad_mode_group_has_button(group, + nbuttons); + ck_assert_int_eq(rc, 0); + rc = libinput_tablet_pad_mode_group_has_button(group, + nbuttons + 1); + ck_assert_int_eq(rc, 0); + rc = libinput_tablet_pad_mode_group_has_button(group, + 0x1000000); + ck_assert_int_eq(rc, 0); + } + + for (i = 0; i < ngroups; i++) { + group = libinput_device_tablet_pad_get_mode_group(device, i); + rc = libinput_tablet_pad_mode_group_has_strip(group, + nstrips); + ck_assert_int_eq(rc, 0); + rc = libinput_tablet_pad_mode_group_has_strip(group, + nstrips + 1); + ck_assert_int_eq(rc, 0); + rc = libinput_tablet_pad_mode_group_has_strip(group, + 0x1000000); + ck_assert_int_eq(rc, 0); + } + + for (i = 0; i < ngroups; i++) { + group = libinput_device_tablet_pad_get_mode_group(device, i); + rc = libinput_tablet_pad_mode_group_has_ring(group, + nrings); + ck_assert_int_eq(rc, 0); + rc = libinput_tablet_pad_mode_group_has_ring(group, + nrings + 1); + ck_assert_int_eq(rc, 0); + rc = libinput_tablet_pad_mode_group_has_ring(group, + 0x1000000); + ck_assert_int_eq(rc, 0); + } +} +END_TEST + +START_TEST(pad_mode_group_has_no_toggle) +{ + struct litest_device *dev = litest_current_device(); + struct libinput_device *device = dev->libinput_device; + struct libinput_tablet_pad_mode_group* group; + int ngroups, nbuttons; + int i, b; + + ngroups = libinput_device_tablet_pad_get_num_mode_groups(device); + ck_assert_int_ge(ngroups, 1); + + /* Button must not be toggle buttons */ + nbuttons = libinput_device_tablet_pad_get_num_buttons(device); + for (i = 0; i < ngroups; i++) { + group = libinput_device_tablet_pad_get_mode_group(device, i); + for (b = 0; b < nbuttons; b++) { + ck_assert(!libinput_tablet_pad_mode_group_button_is_toggle( + group, + b)); + } + } +} +END_TEST + void litest_setup_tests(void) { @@ -428,4 +652,12 @@ litest_setup_tests(void) litest_add_for_device("pad:left_handed", pad_no_left_handed, LITEST_WACOM_INTUOS3_PAD); litest_add_for_device("pad:left_handed", pad_left_handed_ring, LITEST_WACOM_INTUOS5_PAD); /* None of the current strip tablets are left-handed */ + + litest_add("pad:modes", pad_mode_groups, LITEST_TABLET_PAD, LITEST_ANY); + litest_add("pad:modes", pad_mode_groups_userdata, LITEST_TABLET_PAD, LITEST_ANY); + litest_add("pad:modes", pad_mode_groups_ref, LITEST_TABLET_PAD, LITEST_ANY); + litest_add("pad:modes", pad_mode_group_mode, LITEST_TABLET_PAD, LITEST_ANY); + litest_add("pad:modes", pad_mode_group_has, LITEST_TABLET_PAD, LITEST_ANY); + litest_add("pad:modes", pad_mode_group_has_invalid, LITEST_TABLET_PAD, LITEST_ANY); + litest_add("pad:modes", pad_mode_group_has_no_toggle, LITEST_TABLET_PAD, LITEST_ANY); } -- 2.7.4 _______________________________________________ wayland-devel mailing list wayland-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/wayland-devel