From b0cfcfab34c7f069cad6f49f7f5a05827dd6eede Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Wed, 12 Mar 2025 09:34:47 +1000 Subject: [PATCH] test: standardize the wacom device names Consistently use the pen/pad/finger suffix for the subdevices, both in the device's name and the device type. Part-of: --- test/litest-device-wacom-bamboo-16fg-pen.c | 4 +- test/litest-device-wacom-calibrated-tablet.c | 4 +- test/litest-device-wacom-cintiq-12wx-pen.c | 4 +- test/litest-device-wacom-cintiq-13hdt-pen.c | 2 +- test/litest-device-wacom-cintiq-24hd-pen.c | 4 +- test/litest-device-wacom-hid4800-pen.c | 2 +- test/litest-device-wacom-intuos5-finger.c | 2 +- test/litest-device-wacom-intuos5-pen.c | 4 +- test/litest-device-wacom-isdv4-4200-pen.c | 2 +- test/litest-device-wacom-isdv4-524c-pen.c | 2 +- test/litest-device-wacom-isdv4-e6-finger.c | 4 +- test/litest-device-wacom-isdv4-e6-pen.c | 4 +- test/litest.h | 16 +++--- test/test-misc.c | 4 +- test/test-tablet.c | 52 ++++++++++---------- test/test-touch.c | 6 +-- test/test-touchpad.c | 2 +- 17 files changed, 59 insertions(+), 59 deletions(-) diff --git a/test/litest-device-wacom-bamboo-16fg-pen.c b/test/litest-device-wacom-bamboo-16fg-pen.c index cc65afea..63aabffa 100644 --- a/test/litest-device-wacom-bamboo-16fg-pen.c +++ b/test/litest-device-wacom-bamboo-16fg-pen.c @@ -101,8 +101,8 @@ static int events[] = { -1, -1, }; -TEST_DEVICE("wacom-bamboo-tablet", - .type = LITEST_WACOM_BAMBOO, +TEST_DEVICE("wacom-bamboo-16fg-pen", + .type = LITEST_WACOM_BAMBOO_16FG_PEN, .features = LITEST_TABLET | LITEST_DISTANCE | LITEST_HOVER, .interface = &interface, diff --git a/test/litest-device-wacom-calibrated-tablet.c b/test/litest-device-wacom-calibrated-tablet.c index fc983cc7..1ffb6c8c 100644 --- a/test/litest-device-wacom-calibrated-tablet.c +++ b/test/litest-device-wacom-calibrated-tablet.c @@ -124,8 +124,8 @@ static int events[] = { -1, -1, }; -TEST_DEVICE("wacom-calibrated-tablet", - .type = LITEST_WACOM_CALIBRATED_TABLET, +TEST_DEVICE("wacom-calibrated-tablet-pen", + .type = LITEST_WACOM_CALIBRATED_TABLET_PEN, .features = LITEST_TABLET|LITEST_PRECALIBRATED, .interface = &interface, diff --git a/test/litest-device-wacom-cintiq-12wx-pen.c b/test/litest-device-wacom-cintiq-12wx-pen.c index 0e900c97..cf816a06 100644 --- a/test/litest-device-wacom-cintiq-12wx-pen.c +++ b/test/litest-device-wacom-cintiq-12wx-pen.c @@ -137,8 +137,8 @@ static int events[] = { -1, -1, }; -TEST_DEVICE("wacom-cintiq-12wx", - .type = LITEST_WACOM_CINTIQ_12WX, +TEST_DEVICE("wacom-cintiq-12wx-pen", + .type = LITEST_WACOM_CINTIQ_12WX_PEN, .features = LITEST_TABLET | LITEST_DISTANCE | LITEST_TOOL_SERIAL | LITEST_TILT | LITEST_DIRECT | LITEST_HOVER, .interface = &interface, diff --git a/test/litest-device-wacom-cintiq-13hdt-pen.c b/test/litest-device-wacom-cintiq-13hdt-pen.c index 4adf0efd..19ff55da 100644 --- a/test/litest-device-wacom-cintiq-13hdt-pen.c +++ b/test/litest-device-wacom-cintiq-13hdt-pen.c @@ -126,7 +126,7 @@ static int events[] = { -1, -1, }; -TEST_DEVICE("wacom-cintiq-13hdt-pen-tablet", +TEST_DEVICE("wacom-cintiq-13hdt-pen", .type = LITEST_WACOM_CINTIQ_13HDT_PEN, .features = LITEST_TABLET | LITEST_DISTANCE | LITEST_TOOL_SERIAL | LITEST_TILT | LITEST_DIRECT | LITEST_HOVER, .interface = &interface, diff --git a/test/litest-device-wacom-cintiq-24hd-pen.c b/test/litest-device-wacom-cintiq-24hd-pen.c index f8b9a57a..21e58b0f 100644 --- a/test/litest-device-wacom-cintiq-24hd-pen.c +++ b/test/litest-device-wacom-cintiq-24hd-pen.c @@ -126,8 +126,8 @@ static int events[] = { -1, -1, }; -TEST_DEVICE("wacom-cintiq-24hd-tablet", - .type = LITEST_WACOM_CINTIQ_24HD, +TEST_DEVICE("wacom-cintiq-24hd-pen", + .type = LITEST_WACOM_CINTIQ_24HD_PEN, .features = LITEST_TABLET | LITEST_DISTANCE | LITEST_TOOL_SERIAL | LITEST_TILT | LITEST_DIRECT | LITEST_HOVER, .interface = &interface, diff --git a/test/litest-device-wacom-hid4800-pen.c b/test/litest-device-wacom-hid4800-pen.c index 85f091be..edc73704 100644 --- a/test/litest-device-wacom-hid4800-pen.c +++ b/test/litest-device-wacom-hid4800-pen.c @@ -98,7 +98,7 @@ static int events[] = { -1, -1, }; -TEST_DEVICE("wacom-hid4800-tablet", +TEST_DEVICE("wacom-hid4800-pen", .type = LITEST_WACOM_HID4800_PEN, .features = LITEST_TABLET | LITEST_HOVER, .interface = &interface, diff --git a/test/litest-device-wacom-intuos5-finger.c b/test/litest-device-wacom-intuos5-finger.c index 4b5d8f65..d94a8e29 100644 --- a/test/litest-device-wacom-intuos5-finger.c +++ b/test/litest-device-wacom-intuos5-finger.c @@ -104,7 +104,7 @@ static int events[] = { }; TEST_DEVICE("wacom-intuos5-finger", - .type = LITEST_WACOM_FINGER, + .type = LITEST_WACOM_INTUOS5_FINGER, .features = LITEST_TOUCHPAD, .interface = &interface, diff --git a/test/litest-device-wacom-intuos5-pen.c b/test/litest-device-wacom-intuos5-pen.c index 49709093..283d1290 100644 --- a/test/litest-device-wacom-intuos5-pen.c +++ b/test/litest-device-wacom-intuos5-pen.c @@ -142,8 +142,8 @@ static int events[] = { -1, -1, }; -TEST_DEVICE("wacom-intuos5-tablet", - .type = LITEST_WACOM_INTUOS, +TEST_DEVICE("wacom-intuos5-tablet-pen", + .type = LITEST_WACOM_INTUOS5_PEN, .features = LITEST_TABLET | LITEST_DISTANCE | LITEST_TOOL_SERIAL | LITEST_TILT | LITEST_TOOL_MOUSE | LITEST_HOVER, .interface = &interface, diff --git a/test/litest-device-wacom-isdv4-4200-pen.c b/test/litest-device-wacom-isdv4-4200-pen.c index 59bf8662..366363d9 100644 --- a/test/litest-device-wacom-isdv4-4200-pen.c +++ b/test/litest-device-wacom-isdv4-4200-pen.c @@ -98,7 +98,7 @@ static int events[] = { -1, -1, }; -TEST_DEVICE("wacom-isdv4-4200-tablet", +TEST_DEVICE("wacom-isdv4-4200-pen", .type = LITEST_WACOM_ISDV4_4200_PEN, .features = LITEST_TABLET|LITEST_HOVER, .interface = &interface, diff --git a/test/litest-device-wacom-isdv4-524c-pen.c b/test/litest-device-wacom-isdv4-524c-pen.c index 864f23ca..f2054d05 100644 --- a/test/litest-device-wacom-isdv4-524c-pen.c +++ b/test/litest-device-wacom-isdv4-524c-pen.c @@ -152,7 +152,7 @@ static int events[] = { -1, -1, }; -TEST_DEVICE("wacom-isdv4-524c-tablet", +TEST_DEVICE("wacom-isdv4-524c-pen", .type = LITEST_WACOM_ISDV4_524C_PEN, .features = LITEST_TABLET|LITEST_HOVER, .interface = &interface, diff --git a/test/litest-device-wacom-isdv4-e6-finger.c b/test/litest-device-wacom-isdv4-e6-finger.c index 68cd1fe9..cfcde44e 100644 --- a/test/litest-device-wacom-isdv4-e6-finger.c +++ b/test/litest-device-wacom-isdv4-e6-finger.c @@ -76,8 +76,8 @@ static int events[] = { -1, -1, }; -TEST_DEVICE("wacom-touch", - .type = LITEST_WACOM_TOUCH, +TEST_DEVICE("wacom-isdv4-e6-finger", + .type = LITEST_WACOM_ISDV4_E6_FINGER, .features = LITEST_TOUCH, .interface = &interface, diff --git a/test/litest-device-wacom-isdv4-e6-pen.c b/test/litest-device-wacom-isdv4-e6-pen.c index d1e291cf..7597681c 100644 --- a/test/litest-device-wacom-isdv4-e6-pen.c +++ b/test/litest-device-wacom-isdv4-e6-pen.c @@ -91,8 +91,8 @@ static int events[] = { -1, -1, }; -TEST_DEVICE("wacom-isdv4-tablet", - .type = LITEST_WACOM_ISDV4, +TEST_DEVICE("wacom-isdv4-e6-pen", + .type = LITEST_WACOM_ISDV4_E6_PEN, .features = LITEST_TABLET | LITEST_HOVER, .interface = &interface, diff --git a/test/litest.h b/test/litest.h index 8171e081..08c7de0d 100644 --- a/test/litest.h +++ b/test/litest.h @@ -382,7 +382,7 @@ enum litest_device_type { LITEST_SYNAPTICS_TOPBUTTONPAD, LITEST_SYNAPTICS_TOUCHPAD, LITEST_TOUCHPAD_PALMPRESSURE_ZERO, - LITEST_WACOM_FINGER, + LITEST_WACOM_INTUOS5_FINGER, /* Touchscreens */ LITEST_CALIBRATED_TOUCHSCREEN, @@ -394,7 +394,7 @@ enum litest_device_type { LITEST_PROTOCOL_A_SCREEN, LITEST_TOUCHSCREEN_INVALID_RANGE, LITEST_TOUCHSCREEN_MT_TOOL_TYPE, - LITEST_WACOM_TOUCH, + LITEST_WACOM_ISDV4_E6_FINGER, /* Pointing devices and keyboards */ LITEST_MOUSE, @@ -450,26 +450,26 @@ enum litest_device_type { LITEST_TABLET_REL_DIAL_PAD, LITEST_QEMU_TABLET, LITEST_UCLOGIC_TABLET, - LITEST_WACOM_BAMBOO, + LITEST_WACOM_BAMBOO_16FG_PEN, LITEST_WACOM_BAMBOO_2FG_FINGER, LITEST_WACOM_BAMBOO_2FG_PAD, LITEST_WACOM_BAMBOO_2FG_PEN, - LITEST_WACOM_CALIBRATED_TABLET, - LITEST_WACOM_CINTIQ_12WX, + LITEST_WACOM_CALIBRATED_TABLET_PEN, + LITEST_WACOM_CINTIQ_12WX_PEN, LITEST_WACOM_CINTIQ_13HDT_FINGER, LITEST_WACOM_CINTIQ_13HDT_PAD, LITEST_WACOM_CINTIQ_13HDT_PEN, - LITEST_WACOM_CINTIQ_24HD, + LITEST_WACOM_CINTIQ_24HD_PEN, LITEST_WACOM_CINTIQ_24HDT_PAD, LITEST_WACOM_CINTIQ_PRO16_FINGER, LITEST_WACOM_CINTIQ_PRO16_PAD, LITEST_WACOM_CINTIQ_PRO16_PEN, LITEST_WACOM_EKR, LITEST_WACOM_HID4800_PEN, - LITEST_WACOM_INTUOS, LITEST_WACOM_INTUOS3_PAD, LITEST_WACOM_INTUOS5_PAD, - LITEST_WACOM_ISDV4, + LITEST_WACOM_INTUOS5_PEN, + LITEST_WACOM_ISDV4_E6_PEN, LITEST_WACOM_ISDV4_4200_PEN, LITEST_WACOM_ISDV4_524C_PEN, LITEST_WACOM_MOBILESTUDIO_PRO_16_PAD, diff --git a/test/test-misc.c b/test/test-misc.c index 7ab27164..62b8a9a6 100644 --- a/test/test-misc.c +++ b/test/test-misc.c @@ -885,9 +885,9 @@ TEST_COLLECTION(misc) litest_add_for_device(event_conversion_pointer, LITEST_MOUSE); litest_add_for_device(event_conversion_pointer_abs, LITEST_XEN_VIRTUAL_POINTER); litest_add_for_device(event_conversion_key, LITEST_KEYBOARD); - litest_add_for_device(event_conversion_touch, LITEST_WACOM_TOUCH); + litest_add_for_device(event_conversion_touch, LITEST_WACOM_ISDV4_E6_FINGER); litest_add_for_device(event_conversion_gesture, LITEST_BCM5974); - litest_add_for_device(event_conversion_tablet, LITEST_WACOM_CINTIQ_12WX); + litest_add_for_device(event_conversion_tablet, LITEST_WACOM_CINTIQ_12WX_PEN); litest_add_for_device(event_conversion_tablet_pad, LITEST_WACOM_INTUOS5_PAD); litest_add_for_device(event_conversion_switch, LITEST_LID_SWITCH); diff --git a/test/test-tablet.c b/test/test-tablet.c index 21ba098a..8c61d1cf 100644 --- a/test/test-tablet.c +++ b/test/test-tablet.c @@ -179,7 +179,7 @@ END_TEST START_TEST(button_up_on_delete) { struct libinput *li = litest_create_context(); - struct litest_device *dev = litest_add_device(li, LITEST_WACOM_INTUOS); + struct litest_device *dev = litest_add_device(li, LITEST_WACOM_INTUOS5_PEN); struct libevdev *evdev = libevdev_new(); unsigned int code; @@ -934,7 +934,7 @@ END_TEST START_TEST(tip_up_on_delete) { struct libinput *li = litest_create_context(); - struct litest_device *dev = litest_add_device(li, LITEST_WACOM_INTUOS); + struct litest_device *dev = litest_add_device(li, LITEST_WACOM_INTUOS5_PEN); struct libinput_event *event; struct libinput_event_tablet_tool *tablet_event; struct axis_replacement axes[] = { @@ -1726,7 +1726,7 @@ END_TEST START_TEST(proximity_out_on_delete) { struct libinput *li = litest_create_context(); - struct litest_device *dev = litest_add_device(li, LITEST_WACOM_INTUOS); + struct litest_device *dev = litest_add_device(li, LITEST_WACOM_INTUOS5_PEN); litest_tablet_proximity_in(dev, 10, 10, NULL); litest_drain_events(li); @@ -2591,7 +2591,7 @@ START_TEST(tools_with_serials) int i; for (i = 0; i < 2; i++) { - dev[i] = litest_add_device(li, LITEST_WACOM_INTUOS); + dev[i] = litest_add_device(li, LITEST_WACOM_INTUOS5_PEN); litest_drain_events(li); /* WARNING: this test fails if UI_GET_SYSNAME isn't @@ -2633,7 +2633,7 @@ START_TEST(tools_without_serials) for (i = 0; i < 2; i++) { dev[i] = litest_add_device_with_overrides(li, - LITEST_WACOM_ISDV4, + LITEST_WACOM_ISDV4_E6_PEN, NULL, NULL, NULL, @@ -2774,8 +2774,8 @@ START_TEST(tool_capabilities) /* The axis capabilities of a tool can differ depending on the type of * tablet the tool is being used with */ - bamboo = litest_add_device(li, LITEST_WACOM_BAMBOO); - intuos = litest_add_device(li, LITEST_WACOM_INTUOS); + bamboo = litest_add_device(li, LITEST_WACOM_BAMBOO_16FG_PEN); + intuos = litest_add_device(li, LITEST_WACOM_INTUOS5_PEN); litest_drain_events(li); litest_event(bamboo, EV_KEY, BTN_TOOL_PEN, 1); @@ -5769,10 +5769,10 @@ static enum litest_device_type paired_device(struct litest_device *dev) { switch(dev->which) { - case LITEST_WACOM_INTUOS: - return LITEST_WACOM_FINGER; - case LITEST_WACOM_FINGER: - return LITEST_WACOM_INTUOS; + case LITEST_WACOM_INTUOS5_PEN: + return LITEST_WACOM_INTUOS5_FINGER; + case LITEST_WACOM_INTUOS5_FINGER: + return LITEST_WACOM_INTUOS5_PEN; case LITEST_WACOM_CINTIQ_13HDT_PEN: return LITEST_WACOM_CINTIQ_13HDT_FINGER; case LITEST_WACOM_CINTIQ_13HDT_FINGER: @@ -7187,7 +7187,7 @@ TEST_COLLECTION(tablet) litest_add_no_device(tip_up_on_delete); litest_add(motion, LITEST_TABLET, LITEST_ANY); litest_add(motion_event_state, LITEST_TABLET, LITEST_ANY); - litest_add_for_device(motion_outside_bounds, LITEST_WACOM_CINTIQ_24HD); + litest_add_for_device(motion_outside_bounds, LITEST_WACOM_CINTIQ_24HD_PEN); litest_add(tilt_available, LITEST_TABLET|LITEST_TILT, LITEST_ANY); litest_add(tilt_not_available, LITEST_TABLET, LITEST_TILT); litest_add(tilt_x, LITEST_TABLET|LITEST_TILT, LITEST_ANY); @@ -7230,13 +7230,13 @@ TEST_COLLECTION(tablet) litest_add(tablet_pressure_min_max, LITEST_TABLET, LITEST_ANY); /* Tests for pressure offset with distance */ - litest_add_for_device(tablet_pressure_range, LITEST_WACOM_INTUOS); - litest_add_for_device(tablet_pressure_offset_set, LITEST_WACOM_INTUOS); - litest_add_for_device(tablet_pressure_offset_decrease, LITEST_WACOM_INTUOS); - litest_add_for_device(tablet_pressure_offset_increase, LITEST_WACOM_INTUOS); - litest_add_for_device(tablet_pressure_offset_exceed_threshold, LITEST_WACOM_INTUOS); - litest_add_for_device(tablet_pressure_offset_none_for_zero_distance, LITEST_WACOM_INTUOS); - litest_add_for_device(tablet_pressure_offset_none_for_small_distance, LITEST_WACOM_INTUOS); + litest_add_for_device(tablet_pressure_range, LITEST_WACOM_INTUOS5_PEN); + litest_add_for_device(tablet_pressure_offset_set, LITEST_WACOM_INTUOS5_PEN); + litest_add_for_device(tablet_pressure_offset_decrease, LITEST_WACOM_INTUOS5_PEN); + litest_add_for_device(tablet_pressure_offset_increase, LITEST_WACOM_INTUOS5_PEN); + litest_add_for_device(tablet_pressure_offset_exceed_threshold, LITEST_WACOM_INTUOS5_PEN); + litest_add_for_device(tablet_pressure_offset_none_for_zero_distance, LITEST_WACOM_INTUOS5_PEN); + litest_add_for_device(tablet_pressure_offset_none_for_small_distance, LITEST_WACOM_INTUOS5_PEN); /* Tests for pressure offset without distance */ litest_add_for_device(tablet_pressure_range, LITEST_WACOM_HID4800_PEN); litest_add_for_device(tablet_pressure_offset_set, LITEST_WACOM_HID4800_PEN); @@ -7244,14 +7244,14 @@ TEST_COLLECTION(tablet) litest_add_for_device(tablet_pressure_offset_increase, LITEST_WACOM_HID4800_PEN); litest_add_for_device(tablet_pressure_offset_exceed_threshold, LITEST_WACOM_HID4800_PEN); litest_with_parameters(params, "8k-to-1k", 'b') - litest_add_parametrized_for_device(tablet_pressure_across_multiple_tablets, LITEST_WACOM_CINTIQ_12WX, params); + litest_add_parametrized_for_device(tablet_pressure_across_multiple_tablets, LITEST_WACOM_CINTIQ_12WX_PEN, params); litest_add(tablet_pressure_config, LITEST_TABLET, LITEST_TOTEM); litest_add(tablet_pressure_config_set_minimum, LITEST_TABLET, LITEST_TOTEM); litest_add(tablet_pressure_config_set_maximum, LITEST_TABLET, LITEST_TOTEM); litest_add(tablet_pressure_config_set_range, LITEST_TABLET, LITEST_TOTEM); - litest_add_for_device(tablet_distance_range, LITEST_WACOM_INTUOS); + litest_add_for_device(tablet_distance_range, LITEST_WACOM_INTUOS5_PEN); litest_add(relative_no_profile, LITEST_TABLET, LITEST_ANY); litest_add(relative_no_delta_prox_in, LITEST_TABLET, LITEST_ANY); @@ -7282,11 +7282,11 @@ TEST_COLLECTION(tablet) TEST_COLLECTION(tablet_left_handed) { - litest_add_for_device(left_handed, LITEST_WACOM_INTUOS); - litest_add_for_device(left_handed_tilt, LITEST_WACOM_INTUOS); - litest_add_for_device(left_handed_mouse_rotation, LITEST_WACOM_INTUOS); - litest_add_for_device(left_handed_artpen_rotation, LITEST_WACOM_INTUOS); - litest_add_for_device(no_left_handed, LITEST_WACOM_CINTIQ_12WX); + litest_add_for_device(left_handed, LITEST_WACOM_INTUOS5_PEN); + litest_add_for_device(left_handed_tilt, LITEST_WACOM_INTUOS5_PEN); + litest_add_for_device(left_handed_mouse_rotation, LITEST_WACOM_INTUOS5_PEN); + litest_add_for_device(left_handed_artpen_rotation, LITEST_WACOM_INTUOS5_PEN); + litest_add_for_device(no_left_handed, LITEST_WACOM_CINTIQ_12WX_PEN); litest_with_parameters(params, "tablet_from", 'b', diff --git a/test/test-touch.c b/test/test-touch.c index 95007172..870b2446 100644 --- a/test/test-touch.c +++ b/test/test-touch.c @@ -99,7 +99,7 @@ START_TEST(touch_abs_transform) { .value = -1 }, }; - dev = litest_create_device_with_overrides(LITEST_WACOM_TOUCH, + dev = litest_create_device_with_overrides(LITEST_WACOM_ISDV4_E6_FINGER, "litest Highres touch device", NULL, abs, NULL); @@ -163,7 +163,7 @@ START_TEST(touch_seat_slot) struct litest_device *dev2; struct libinput *li = dev1->libinput; - dev2 = litest_add_device(li, LITEST_WACOM_TOUCH); + dev2 = litest_add_device(li, LITEST_WACOM_ISDV4_E6_FINGER); litest_drain_events(li); @@ -218,7 +218,7 @@ START_TEST(touch_many_slots) { .value = -1 }, }; - dev = litest_create_device_with_overrides(LITEST_WACOM_TOUCH, + dev = litest_create_device_with_overrides(LITEST_WACOM_ISDV4_E6_FINGER, "litest Multi-touch device", NULL, abs, NULL); libinput = dev->libinput; diff --git a/test/test-touchpad.c b/test/test-touchpad.c index 07342271..8e09b981 100644 --- a/test/test-touchpad.c +++ b/test/test-touchpad.c @@ -7388,7 +7388,7 @@ TEST_COLLECTION(touchpad) /* Happens on the "Wacom Intuos Pro M Finger" but our test device * has the same properties */ - litest_add_for_device(touchpad_end_start_touch, LITEST_WACOM_FINGER); + litest_add_for_device(touchpad_end_start_touch, LITEST_WACOM_INTUOS5_FINGER); litest_add(touchpad_fuzz, LITEST_TOUCHPAD, LITEST_ANY); }