fdo-mirrors/libinput
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/libinput/libinput.git synced 2026-02-04 00:00:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add trailing commas to prevent clang-format oddities

Browse source 
Part-of: <https://gitlab.freedesktop.org/libinput/libinput/-/merge_requests/1246>
This commit is contained in:
Peter Hutterer 2025-07-01 09:37:25 +10:00
parent 784312a494
commit aebf3cd491
35 changed files with 190 additions and 190 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
test/litest-device-absinfo-override.c
View file

@ -56,7 +56,7 @@ static struct input_absinfo absinfo[] = {
{ ABS_MT_POSITION_X, 0, 2000, 0, 0, 0 },
{ ABS_MT_POSITION_Y, 0, 1400, 0, 0, 0 },
{ ABS_MT_TRACKING_ID, 0, 65535, 0, 0, 0 },
{ .value = -1 }
{ .value = -1 },
};
/* clang-format on */

2
test/litest-device-acer-hawaii-touchpad.c
View file

@ -81,7 +81,7 @@ static struct input_absinfo absinfo[] = {
{ ABS_MT_POSITION_X, 0, 1151, 0, 0, 12 },
{ ABS_MT_POSITION_Y, 0, 738, 0, 0, 14 },
{ ABS_MT_TRACKING_ID, 0, 65535, 0, 0, 0 },
{ .value = -1 }
{ .value = -1 },
};
/* clang-format on */

2
test/litest-device-alps-3fg.c
View file

@ -166,7 +166,7 @@ static struct input_absinfo absinfo[] = {
{ ABS_MT_POSITION_X, 0, 4095, 0, 0, 37 },
{ ABS_MT_POSITION_Y, 0, 2047, 0, 0, 26 },
{ ABS_MT_TRACKING_ID, 0, 65535, 0, 0, 0 },
{ .value = -1 }
{ .value = -1 },
};
/* clang-format on */

2
test/litest-device-alps-dualpoint.c
View file

@ -104,7 +104,7 @@ static struct input_absinfo absinfo[] = {
{ ABS_MT_POSITION_X, 0, 2000, 0, 0, 25 },
{ ABS_MT_POSITION_Y, 0, 1400, 0, 0, 32 },
{ ABS_MT_TRACKING_ID, 0, 65535, 0, 0, 0 },
{ .value = -1 }
{ .value = -1 },
};
/* clang-format on */

2
test/litest-device-alps-semi-mt.c
View file

@ -103,7 +103,7 @@ static struct input_absinfo absinfo[] = {
{ ABS_MT_POSITION_X, 0, 2000, 0, 0, 0 },
{ ABS_MT_POSITION_Y, 0, 1400, 0, 0, 0 },
{ ABS_MT_TRACKING_ID, 0, 65535, 0, 0, 0 },
{ .value = -1 }
{ .value = -1 },
};
/* clang-format on */

2
test/litest-device-apple-appletouch.c
View file

@ -83,7 +83,7 @@ static struct input_absinfo absinfo[] = {
{ ABS_X, 0, 1215, 0, 0, 0 },
{ ABS_Y, 0, 588, 0, 0, 0 },
{ ABS_PRESSURE, 0, 300, 0, 0, 0 },
{ .value = -1 }
{ .value = -1 },
};
/* clang-format on */

2
test/litest-device-apple-magicmouse.c
View file

@ -82,7 +82,7 @@ static struct input_absinfo absinfo[] = {
{ ABS_MT_POSITION_X, -1100, 1258, 4, 0, 26 },
{ ABS_MT_POSITION_Y, -1589, 2047, 4, 0, 26 },
{ ABS_MT_TRACKING_ID, 0, 65535, 0, 0, 0 },
{ .value = -1 }
{ .value = -1 },
};
/* clang-format on */

2
test/litest-device-asus-rog-gladius.c
View file

@ -312,7 +312,7 @@ static int events[] = {
/* clang-format off */
static struct input_absinfo absinfo[] = {
{ ABS_VOLUME, 0, 668, 0, 0, 0 },
{ .value = -1 }
{ .value = -1 },
};
/* clang-format on */

2
test/litest-device-atmel-hover.c
View file

@ -121,7 +121,7 @@ static struct input_absinfo absinfo[] = {
{ ABS_MT_TRACKING_ID, 0, 65535, 0, 0, 0 },
{ ABS_MT_PRESSURE, 0, 255, 0, 0, 0 },
{ ABS_MT_DISTANCE, 0, 1, 0, 0, 0 },
{ .value = -1 }
{ .value = -1 },
};
/* clang-format on */

2
test/litest-device-calibrated-touchscreen.c
View file

@ -85,6 +85,6 @@ TEST_DEVICE(LITEST_CALIBRATED_TOUCHSCREEN,
.udev_properties = {
{ "LIBINPUT_CALIBRATION_MATRIX", "1.2 3.4 5.6 7.8 9.10 11.12" },
{ "WL_OUTPUT", "myOutput" },
{ NULL }
{ NULL },
},
)

2
test/litest-device-elantech-touchpad.c
View file

@ -98,7 +98,7 @@ static struct input_absinfo absinfo[] = {
{ ABS_MT_POSITION_X, 0, 1280, 0, 0, 0 },
{ ABS_MT_POSITION_Y, 0, 704, 0, 0, 0 },
{ ABS_MT_TRACKING_ID, 0, 65535, 0, 0, 0 },
{ .value = -1 }
{ .value = -1 },
};
/* clang-format on */

2
test/litest-device-generic-pressurepad.c
View file

@ -112,7 +112,7 @@ static struct input_absinfo absinfo[] = {
{ ABS_MT_TRACKING_ID, 0, 65535, 0, 0, 0 },
{ ABS_MT_PRESSURE, 0, 255, 0, 0, 40 }, /* some random resolution */
{ ABS_MT_TOOL_TYPE, 0, 2, 0, 0, 0 },
{ .value = -1 }
{ .value = -1 },
};
/* clang-format on */

2
test/litest-device-mouse-roccat.c
View file

@ -184,7 +184,7 @@ static struct input_absinfo absinfo[] = {
{ ABS_MISC + 1, 0, 0, 0, 0, 0 },
{ ABS_MISC + 2, 0, 0, 0, 0, 0 },
{ ABS_MISC + 3, 0, 0, 0, 0, 0 },
{ .value = -1 }
{ .value = -1 },
};
/* clang-format on */

2
test/litest-device-synaptics-hover.c
View file

@ -102,7 +102,7 @@ static struct input_absinfo absinfo[] = {
{ ABS_MT_POSITION_X, 1472, 5472, 0, 0, 60 },
{ ABS_MT_POSITION_Y, 1408, 4498, 0, 0, 85 },
{ ABS_MT_TRACKING_ID, 0, 65535, 0, 0, 0 },
{ .value = -1 }
{ .value = -1 },
};
/* clang-format on */

2
test/litest-device-synaptics-i2c.c
View file

@ -79,7 +79,7 @@ static struct input_absinfo absinfo[] = {
{ ABS_MT_POSITION_X, 0, 1216, 0, 0, 12 },
{ ABS_MT_POSITION_Y, 0, 680, 0, 0, 12 },
{ ABS_MT_TRACKING_ID, 0, 65535, 0, 0, 0 },
{ .value = -1 }
{ .value = -1 },
};
/* clang-format on */

2
test/litest-device-synaptics-phantomclicks.c
View file

@ -82,7 +82,7 @@ static struct input_absinfo absinfo[] = {
{ ABS_MT_POSITION_Y, 0, 2730, 0, 0, 31 },
{ ABS_MT_TOOL_TYPE, 0, 2, 0, 0, 0 },
{ ABS_MT_TRACKING_ID, 0, 65535, 0, 0, 0 },
{ .value = -1 }
{ .value = -1 },
};
/* clang-format on */

2
test/litest-device-synaptics-pressurepad.c
View file

@ -112,7 +112,7 @@ static struct input_absinfo absinfo[] = {
{ ABS_MT_TRACKING_ID, 0, 65535, 0, 0, 0 },
{ ABS_MT_PRESSURE, 0, 255, 0, 0, 0 }, /* note: resolution zero */
{ ABS_MT_TOOL_TYPE, 0, 2, 0, 0, 0 },
{ .value = -1 }
{ .value = -1 },
};
/* clang-format on */

2
test/litest-device-synaptics-rmi4.c
View file

@ -111,7 +111,7 @@ static struct input_absinfo absinfo[] = {
{ ABS_MT_TOOL_TYPE, 0, 2, 0, 0, 0 },
{ ABS_MT_TRACKING_ID, 0, 65535, 0, 0, 0 },
{ ABS_MT_PRESSURE, 0, 255, 0, 0, 0 },
{ .value = -1 }
{ .value = -1 },
};
/* clang-format on */

2
test/litest-device-synaptics-t440.c
View file

@ -103,7 +103,7 @@ static struct input_absinfo absinfo[] = {
{ ABS_MT_POSITION_Y, 2024, 4832, 0, 0, 42 },
{ ABS_MT_TRACKING_ID, 0, 65535, 0, 0, 0 },
{ ABS_MT_PRESSURE, 0, 255, 0, 0, 0 },
{ .value = -1 }
{ .value = -1 },
};
/* clang-format on */

2
test/litest-device-synaptics-x1-carbon-3rd.c
View file

@ -105,7 +105,7 @@ static struct input_absinfo absinfo[] = {
{ ABS_MT_POSITION_Y, 1096, 4758, 0, 0, 68 },
{ ABS_MT_TRACKING_ID, 0, 65535, 0, 0, 0 },
{ ABS_MT_PRESSURE, 0, 255, 0, 0, 0 },
{ .value = -1 }
{ .value = -1 },
};
/* clang-format on */

2
test/litest-device-synaptics-x220.c
View file

@ -102,7 +102,7 @@ static struct input_absinfo absinfo[] = {
{ ABS_MT_POSITION_Y, 1408, 4448, 0, 0, 129 },
{ ABS_MT_TRACKING_ID, 0, 65535, 0, 0, 0 },
{ ABS_MT_PRESSURE, 0, 255, 0, 0, 0 },
{ .value = -1 }
{ .value = -1 },
};
/* clang-format on */

2
test/litest-device-touchpad-palm-threshold-zero.c
View file

@ -105,7 +105,7 @@ static struct input_absinfo absinfo[] = {
{ ABS_MT_POSITION_Y, 1096, 4758, 0, 0, 68 },
{ ABS_MT_TRACKING_ID, 0, 65535, 0, 0, 0 },
{ ABS_MT_PRESSURE, 0, 255, 0, 0, 0 },
{ .value = -1 }
{ .value = -1 },
};
/* clang-format on */

2
test/litest-device-wacom-bamboo-2fg-pad.c
View file

@ -76,6 +76,6 @@ TEST_DEVICE(LITEST_WACOM_BAMBOO_2FG_PAD,
.udev_properties = {
{ .key = "ID_INPUT_TABLET_PAD", .value = "1" },
{ .key = "LIBINPUT_DEVICE_GROUP", .value = "1" },
{ NULL }
{ NULL },
}
)

2
test/litest-device-wacom-calibrated-tablet.c
View file

@ -139,6 +139,6 @@ TEST_DEVICE(LITEST_WACOM_CALIBRATED_TABLET_PEN,
.absinfo = absinfo,
.udev_properties = {
{ "LIBINPUT_CALIBRATION_MATRIX", "-1 0 1 0 -1 1" },
{ NULL }
{ NULL },
},
)

20
test/test-device.c
View file

@ -187,7 +187,7 @@ START_TEST(device_disable_tablet)
struct axis_replacement axes[] = {
{ ABS_DISTANCE, 10 },
{ ABS_PRESSURE, 0 },
{ -1, -1 }
{ -1, -1 },
};
device = dev->libinput_device;
@ -950,7 +950,7 @@ START_TEST(abs_device_no_range)
{ ABS_X, 0, 10, 0, 0, 0 },
{ ABS_Y, 0, 10, 0, 0, 0 },
{ code, 0, 0, 0, 0, 0 },
{ -1, -1, -1, -1, -1, -1 }
{ -1, -1, -1, -1, -1, -1 },
};
_litest_context_destroy_ struct libinput *li = litest_create_context();
@ -974,7 +974,7 @@ START_TEST(abs_mt_device_no_range)
{ ABS_MT_POSITION_X, 0, 10, 0, 0, 0 },
{ ABS_MT_POSITION_Y, 0, 10, 0, 0, 0 },
{ code, 0, 0, 0, 0, 0 },
{ -1, -1, -1, -1, -1, -1 }
{ -1, -1, -1, -1, -1, -1 },
};
_litest_context_destroy_ struct libinput *li = litest_create_context();
@ -993,7 +993,7 @@ START_TEST(abs_device_missing_res)
struct input_absinfo absinfo[] = {
{ ABS_X, 0, 10, 0, 0, 10 },
{ ABS_Y, 0, 10, 0, 0, 10 },
{ -1, -1, -1, -1, -1, -1 }
{ -1, -1, -1, -1, -1, -1 },
};
int axis = litest_test_param_get_i32(test_env->params, "axis");
@ -1022,7 +1022,7 @@ START_TEST(abs_mt_device_missing_res)
{ ABS_MT_TRACKING_ID, 0, 255, 0, 0, 0 },
{ ABS_MT_POSITION_X, 0, 10, 0, 0, 10 },
{ ABS_MT_POSITION_Y, 0, 10, 0, 0, 10 },
{ -1, -1, -1, -1, -1, -1 }
{ -1, -1, -1, -1, -1, -1 },
};
int axis = litest_test_param_get_i32(test_env->params, "axis");
@ -1053,7 +1053,7 @@ START_TEST(ignore_joystick)
{ ABS_RY, 0, 10, 0, 0, 10 },
{ ABS_THROTTLE, 0, 2, 0, 0, 0 },
{ ABS_RUDDER, 0, 255, 0, 0, 0 },
{ -1, -1, -1, -1, -1, -1 }
{ -1, -1, -1, -1, -1, -1 },
};
_litest_context_destroy_ struct libinput *li = litest_create_context();
@ -1094,7 +1094,7 @@ START_TEST(device_accelerometer)
{ ABS_X, 0, 10, 0, 0, 10 },
{ ABS_Y, 0, 10, 0, 0, 10 },
{ ABS_Z, 0, 10, 0, 0, 10 },
{ -1, -1, -1, -1, -1, -1 }
{ -1, -1, -1, -1, -1, -1 },
};
_litest_context_destroy_ struct libinput *li = litest_create_context();
@ -1171,7 +1171,7 @@ START_TEST(device_touchpad_rel)
{ ABS_MT_TRACKING_ID, 0, 255, 0, 0, 0 },
{ ABS_MT_POSITION_X, 0, 10, 0, 0, 10 },
{ ABS_MT_POSITION_Y, 0, 10, 0, 0, 10 },
{ -1, -1, -1, -1, -1, -1 }
{ -1, -1, -1, -1, -1, -1 },
};
int i;
@ -1211,7 +1211,7 @@ START_TEST(device_touch_rel)
{ ABS_MT_TRACKING_ID, 0, 255, 0, 0, 0 },
{ ABS_MT_POSITION_X, 0, 10, 0, 0, 10 },
{ ABS_MT_POSITION_Y, 0, 10, 0, 0, 10 },
{ -1, -1, -1, -1, -1, -1 }
{ -1, -1, -1, -1, -1, -1 },
};
int i;
@ -1248,7 +1248,7 @@ START_TEST(device_abs_rel)
const struct input_absinfo abs[] = {
{ ABS_X, 0, 10, 0, 0, 10 },
{ ABS_Y, 0, 10, 0, 0, 10 },
{ -1, -1, -1, -1, -1, -1 }
{ -1, -1, -1, -1, -1, -1 },
};
int i;

2
test/test-misc.c
View file

@ -413,7 +413,7 @@ START_TEST(event_conversion_tablet)
int events = 0;
struct axis_replacement axes[] = {
{ ABS_DISTANCE, 10 },
{ -1, -1 }
{ -1, -1 },
};
litest_tablet_proximity_in(dev, 50, 50, axes);

144
test/test-tablet.c
View file

@ -67,7 +67,7 @@ START_TEST(button_down_up)
struct axis_replacement axes[] = {
{ ABS_DISTANCE, 10 },
{ ABS_PRESSURE, 0 },
{ -1, -1 }
{ -1, -1 },
};
unsigned int button = pick_stylus_or_btn0(dev);
@ -110,7 +110,7 @@ START_TEST(button_seat_count)
struct axis_replacement axes[] = {
{ ABS_DISTANCE, 10 },
{ ABS_PRESSURE, 0 },
{ -1, -1 }
{ -1, -1 },
};
unsigned int button = pick_stylus_or_btn0(dev);
@ -224,7 +224,7 @@ START_TEST(tip_down_up)
struct axis_replacement axes[] = {
{ ABS_DISTANCE, 10 },
{ ABS_PRESSURE, 0 },
{ -1, -1 }
{ -1, -1 },
};
litest_tablet_proximity_in(dev, 10, 10, axes);
@ -271,7 +271,7 @@ START_TEST(tip_down_up_eraser)
struct axis_replacement axes[] = {
{ ABS_DISTANCE, 10 },
{ ABS_PRESSURE, 0 },
{ -1, -1 }
{ -1, -1 },
};
if (!libevdev_has_event_code(dev->evdev, EV_KEY, BTN_TOOL_RUBBER))
@ -326,7 +326,7 @@ START_TEST(tip_down_prox_in)
struct axis_replacement axes[] = {
{ ABS_DISTANCE, 0 },
{ ABS_PRESSURE, 30 },
{ -1, -1 }
{ -1, -1 },
};
litest_drain_events(li);
@ -365,7 +365,7 @@ START_TEST(tip_up_prox_out)
struct axis_replacement axes[] = {
{ ABS_DISTANCE, 0 },
{ ABS_PRESSURE, 30 },
{ -1, -1 }
{ -1, -1 },
};
litest_tablet_proximity_in(dev, 10, 10, axes);
@ -410,7 +410,7 @@ START_TEST(tip_up_btn_change)
struct axis_replacement axes[] = {
{ ABS_DISTANCE, 0 },
{ ABS_PRESSURE, 30 },
{ -1, -1 }
{ -1, -1 },
};
litest_tablet_proximity_in(dev, 10, 10, axes);
@ -488,7 +488,7 @@ START_TEST(tip_down_btn_change)
struct axis_replacement axes[] = {
{ ABS_DISTANCE, 10 },
{ ABS_PRESSURE, 0 },
{ -1, -1 }
{ -1, -1 },
};
litest_tablet_proximity_in(dev, 10, 10, axes);
@ -567,7 +567,7 @@ START_TEST(tip_down_motion)
struct axis_replacement axes[] = {
{ ABS_DISTANCE, 10 },
{ ABS_PRESSURE, 0 },
{ -1, -1 }
{ -1, -1 },
};
double x, y, last_x, last_y;
@ -614,7 +614,7 @@ START_TEST(tip_up_motion)
struct axis_replacement axes[] = {
{ ABS_DISTANCE, 0 },
{ ABS_PRESSURE, 0 },
{ -1, -1 }
{ -1, -1 },
};
double x, y, last_x, last_y;
@ -663,7 +663,7 @@ START_TEST(tip_up_motion_one_axis)
struct axis_replacement axes[] = {
{ ABS_DISTANCE, 0 },
{ ABS_PRESSURE, 0 },
{ -1, -1 }
{ -1, -1 },
};
double x, y, last_x, last_y;
double start_x = 20,
@ -760,7 +760,7 @@ START_TEST(tip_state_proximity)
struct axis_replacement axes[] = {
{ ABS_DISTANCE, 10 },
{ ABS_PRESSURE, 0 },
{ -1, -1 }
{ -1, -1 },
};
litest_drain_events(li);
@ -806,7 +806,7 @@ START_TEST(tip_state_axis)
struct axis_replacement axes[] = {
{ ABS_DISTANCE, 10 },
{ ABS_PRESSURE, 0 },
{ -1, -1 }
{ -1, -1 },
};
litest_tablet_proximity_in(dev, 10, 10, axes);
@ -865,7 +865,7 @@ START_TEST(tip_state_button)
struct axis_replacement axes[] = {
{ ABS_DISTANCE, 10 },
{ ABS_PRESSURE, 0 },
{ -1, -1 }
{ -1, -1 },
};
unsigned int button = pick_stylus_or_btn0(dev);
@ -935,7 +935,7 @@ START_TEST(tip_up_on_delete)
struct axis_replacement axes[] = {
{ ABS_DISTANCE, 10 },
{ ABS_PRESSURE, 0 },
{ -1, -1 }
{ -1, -1 },
};
litest_tablet_proximity_in(dev, 10, 10, axes);
@ -971,7 +971,7 @@ START_TEST(proximity_in_out)
struct axis_replacement axes[] = {
{ ABS_DISTANCE, 10 },
{ ABS_PRESSURE, 0 },
{ -1, -1 }
{ -1, -1 },
};
litest_drain_events(li);
@ -1033,7 +1033,7 @@ START_TEST(proximity_in_button_down)
struct axis_replacement axes[] = {
{ ABS_DISTANCE, 10 },
{ ABS_PRESSURE, 0 },
{ -1, -1 }
{ -1, -1 },
};
unsigned int button = pick_stylus_or_btn0(dev);
@ -1062,7 +1062,7 @@ START_TEST(proximity_out_button_up)
struct axis_replacement axes[] = {
{ ABS_DISTANCE, 10 },
{ ABS_PRESSURE, 0 },
{ -1, -1 }
{ -1, -1 },
};
unsigned int button = pick_stylus_or_btn0(dev);
@ -1096,7 +1096,7 @@ START_TEST(proximity_out_clear_buttons)
struct axis_replacement axes[] = {
{ ABS_DISTANCE, 10 },
{ ABS_PRESSURE, 0 },
{ -1, -1 }
{ -1, -1 },
};
uint32_t stylus_buttons[] = {BTN_STYLUS, BTN_STYLUS2, BTN_STYLUS3};
bool have_proximity = false;
@ -1306,7 +1306,7 @@ START_TEST(proximity_range_enter)
struct libinput *li = dev->libinput;
struct axis_replacement axes[] = {
{ ABS_DISTANCE, 90 },
{ -1, -1 }
{ -1, -1 },
};
litest_drain_events(li);
@ -1348,7 +1348,7 @@ START_TEST(proximity_range_in_out)
struct libinput *li = dev->libinput;
struct axis_replacement axes[] = {
{ ABS_DISTANCE, 20 },
{ -1, -1 }
{ -1, -1 },
};
litest_drain_events(li);
@ -1397,7 +1397,7 @@ START_TEST(proximity_range_button_click)
struct libinput *li = dev->libinput;
struct axis_replacement axes[] = {
{ ABS_DISTANCE, 90 },
{ -1, -1 }
{ -1, -1 },
};
litest_drain_events(li);
@ -1434,7 +1434,7 @@ START_TEST(proximity_range_button_press)
struct libinput *li = dev->libinput;
struct axis_replacement axes[] = {
{ ABS_DISTANCE, 20 },
{ -1, -1 }
{ -1, -1 },
};
litest_with_event_frame(dev) {
@ -1485,7 +1485,7 @@ START_TEST(proximity_range_button_release)
struct libinput *li = dev->libinput;
struct axis_replacement axes[] = {
{ ABS_DISTANCE, 90 },
{ -1, -1 }
{ -1, -1 },
};
litest_with_event_frame(dev) {
@ -1537,7 +1537,7 @@ START_TEST(proximity_out_slow_event)
struct libinput *li = dev->libinput;
struct axis_replacement axes[] = {
{ ABS_DISTANCE, 90 },
{ -1, -1 }
{ -1, -1 },
};
litest_tablet_proximity_in(dev, 10, 10, axes);
@ -1563,7 +1563,7 @@ START_TEST(proximity_out_not_during_contact)
struct axis_replacement axes[] = {
{ ABS_DISTANCE, 0 },
{ ABS_PRESSURE, 10 },
{ -1, -1 }
{ -1, -1 },
};
litest_tablet_proximity_in(dev, 10, 10, axes);
@ -1599,7 +1599,7 @@ START_TEST(proximity_out_not_during_buttonpress)
struct axis_replacement axes[] = {
{ ABS_DISTANCE, 10 },
{ ABS_PRESSURE, 0 },
{ -1, -1 }
{ -1, -1 },
};
litest_tablet_proximity_in(dev, 10, 10, axes);
@ -1641,7 +1641,7 @@ START_TEST(proximity_out_disables_forced)
struct axis_replacement axes[] = {
{ ABS_DISTANCE, 10 },
{ ABS_PRESSURE, 0 },
{ -1, -1 }
{ -1, -1 },
};
/* A correct proximity out sequence from the device should disable
@ -1671,7 +1671,7 @@ START_TEST(proximity_out_disables_forced_after_forced)
struct axis_replacement axes[] = {
{ ABS_DISTANCE, 10 },
{ ABS_PRESSURE, 0 },
{ -1, -1 }
{ -1, -1 },
};
/* A correct proximity out sequence from the device should disable
@ -1733,7 +1733,7 @@ START_TEST(motion)
struct axis_replacement axes[] = {
{ ABS_DISTANCE, 10 },
{ ABS_PRESSURE, 0 },
{ -1, -1 }
{ -1, -1 },
};
bool x_changed, y_changed;
double reported_x, reported_y;
@ -1816,7 +1816,7 @@ START_TEST(left_handed)
struct axis_replacement axes[] = {
{ ABS_DISTANCE, 10 },
{ ABS_PRESSURE, 0 },
{ -1, -1 }
{ -1, -1 },
};
litest_drain_events(li);
@ -1956,7 +1956,7 @@ START_TEST(left_handed_tilt)
{ ABS_PRESSURE, 0 },
{ ABS_TILT_X, 90 },
{ ABS_TILT_Y, 10 },
{ -1, -1 }
{ -1, -1 },
};
double tx, ty;
@ -2034,7 +2034,7 @@ START_TEST(left_handed_mouse_rotation)
{ ABS_PRESSURE, 0 },
{ ABS_TILT_X, 0 },
{ ABS_TILT_Y, 0 },
{ -1, -1 }
{ -1, -1 },
};
status = libinput_device_config_left_handed_set(dev->libinput_device, 1);
@ -2142,7 +2142,7 @@ START_TEST(motion_event_state)
struct axis_replacement axes[] = {
{ ABS_DISTANCE, 10 },
{ ABS_PRESSURE, 0 },
{ -1, -1 }
{ -1, -1 },
};
unsigned int button = pick_stylus_or_btn0(dev);
@ -2213,7 +2213,7 @@ START_TEST(motion_outside_bounds)
struct axis_replacement axes[] = {
{ ABS_DISTANCE, 10 },
{ ABS_PRESSURE, 0 },
{ -1, -1 }
{ -1, -1 },
};
litest_tablet_proximity_in(dev, 50, 50, axes);
@ -2526,7 +2526,7 @@ START_TEST(pad_buttons_ignored)
struct axis_replacement axes[] = {
{ ABS_DISTANCE, 10 },
{ ABS_PRESSURE, 0 },
{ -1, -1 }
{ -1, -1 },
};
int button;
@ -2812,7 +2812,7 @@ START_TEST(tool_type)
{ ABS_PRESSURE, 0 },
{ ABS_TILT_X, 0 },
{ ABS_TILT_Y, 0 },
{ -1, -1 }
{ -1, -1 },
};
struct tool_type_match {
int code;
@ -2825,7 +2825,7 @@ START_TEST(tool_type)
{ BTN_TOOL_AIRBRUSH, LIBINPUT_TABLET_TOOL_TYPE_AIRBRUSH },
{ BTN_TOOL_MOUSE, LIBINPUT_TABLET_TOOL_TYPE_MOUSE },
{ BTN_TOOL_LENS, LIBINPUT_TABLET_TOOL_TYPE_LENS },
{ -1, -1 }
{ -1, -1 },
};
struct tool_type_match *tt;
double x = 50, y = 50;
@ -2898,7 +2898,7 @@ START_TEST(tool_in_prox_before_start)
{ ABS_PRESSURE, 0 },
{ ABS_TILT_X, 0 },
{ ABS_TILT_Y, 0 },
{ -1, -1 }
{ -1, -1 },
};
const char *devnode;
uint64_t serial;
@ -2958,7 +2958,7 @@ START_TEST(tool_direct_switch_skip_tool_update)
struct axis_replacement axes[] = {
{ ABS_DISTANCE, 10 },
{ ABS_PRESSURE, 0 },
{ -1, -1 }
{ -1, -1 },
};
if (!libevdev_has_event_code(dev->evdev, EV_KEY, BTN_TOOL_RUBBER))
@ -3071,7 +3071,7 @@ START_TEST(tool_direct_switch_with_forced_proxout)
struct axis_replacement axes[] = {
{ ABS_DISTANCE, 10 },
{ ABS_PRESSURE, 0 },
{ -1, -1 }
{ -1, -1 },
};
if (!libevdev_has_event_code(dev->evdev, EV_KEY, BTN_TOOL_RUBBER))
@ -3270,7 +3270,7 @@ START_TEST(mouse_rotation)
{ ABS_PRESSURE, 0 },
{ ABS_TILT_X, 0 },
{ ABS_TILT_Y, 0 },
{ -1, -1 }
{ -1, -1 },
};
litest_drain_events(li);
@ -3566,7 +3566,7 @@ START_TEST(tablet_time_usec)
struct axis_replacement axes[] = {
{ ABS_DISTANCE, 10 },
{ ABS_PRESSURE, 0 },
{ -1, -1 }
{ -1, -1 },
};
uint64_t time_usec;
@ -3701,7 +3701,7 @@ START_TEST(tablet_calibration_set_matrix_delta)
struct axis_replacement axes[] = {
{ ABS_DISTANCE, 0 },
{ ABS_PRESSURE, 10 },
{ -1, -1 }
{ -1, -1 },
};
double x, y, dx, dy, mdx, mdy;
@ -3786,7 +3786,7 @@ START_TEST(tablet_calibration_set_matrix)
struct axis_replacement axes[] = {
{ ABS_DISTANCE, 10 },
{ ABS_PRESSURE, 0 },
{ -1, -1 }
{ -1, -1 },
};
double x, y;
@ -3975,7 +3975,7 @@ START_TEST(tablet_area_set_rectangle)
struct axis_replacement axes[] = {
{ ABS_DISTANCE, 10 },
{ ABS_PRESSURE, 0 },
{ -1, -1 }
{ -1, -1 },
};
double x, y;
double *scaled, *unscaled;
@ -4060,7 +4060,7 @@ START_TEST(tablet_area_set_rectangle_move_outside)
struct axis_replacement axes[] = {
{ ABS_DISTANCE, 10 },
{ ABS_PRESSURE, 0 },
{ -1, -1 }
{ -1, -1 },
};
double x, y;
@ -4132,7 +4132,7 @@ START_TEST(tablet_area_set_rectangle_move_outside_to_inside)
struct axis_replacement axes[] = {
{ ABS_DISTANCE, 10 },
{ ABS_PRESSURE, 0 },
{ -1, -1 }
{ -1, -1 },
};
double x, y;
@ -4199,7 +4199,7 @@ START_TEST(tablet_area_set_rectangle_move_in_margin)
struct axis_replacement axes[] = {
{ ABS_DISTANCE, 10 },
{ ABS_PRESSURE, 0 },
{ -1, -1 }
{ -1, -1 },
};
double x, y;
@ -4247,7 +4247,7 @@ START_TEST(tablet_area_set_rectangle_while_outside)
struct axis_replacement axes[] = {
{ ABS_DISTANCE, 10 },
{ ABS_PRESSURE, 0 },
{ -1, -1 }
{ -1, -1 },
};
double x, y;
@ -5225,7 +5225,7 @@ START_TEST(tilt_available)
{ ABS_PRESSURE, 0 },
{ ABS_TILT_X, 80 },
{ ABS_TILT_Y, 20 },
{ -1, -1 }
{ -1, -1 },
};
litest_drain_events(li);
@ -5255,7 +5255,7 @@ START_TEST(tilt_not_available)
{ ABS_PRESSURE, 0 },
{ ABS_TILT_X, 80 },
{ ABS_TILT_Y, 20 },
{ -1, -1 }
{ -1, -1 },
};
litest_drain_events(li);
@ -5284,7 +5284,7 @@ START_TEST(tilt_x)
{ ABS_PRESSURE, 0 },
{ ABS_TILT_X, 10 },
{ ABS_TILT_Y, 0 },
{ -1, -1 }
{ -1, -1 },
};
double tx, ty;
int tilt;
@ -5358,7 +5358,7 @@ START_TEST(tilt_y)
{ ABS_PRESSURE, 0 },
{ ABS_TILT_X, 0 },
{ ABS_TILT_Y, 10 },
{ -1, -1 }
{ -1, -1 },
};
double tx, ty;
int tilt;
@ -5430,7 +5430,7 @@ START_TEST(tilt_fixed_points)
struct axis_replacement axes[] = {
{ ABS_DISTANCE, 10 },
{ ABS_PRESSURE, 0 },
{ -1, -1 }
{ -1, -1 },
};
/* On devices with a range of [-N, M], make sure we calculate the hw zero position
@ -5538,7 +5538,7 @@ START_TEST(relative_no_delta_prox_in)
struct axis_replacement axes[] = {
{ ABS_DISTANCE, 10 },
{ ABS_PRESSURE, 0 },
{ -1, -1 }
{ -1, -1 },
};
double dx, dy;
@ -5567,7 +5567,7 @@ START_TEST(relative_delta)
struct axis_replacement axes[] = {
{ ABS_DISTANCE, 10 },
{ ABS_PRESSURE, 0 },
{ -1, -1 }
{ -1, -1 },
};
double dx, dy;
@ -5650,7 +5650,7 @@ START_TEST(relative_no_delta_on_tip)
struct axis_replacement axes[] = {
{ ABS_DISTANCE, 10 },
{ ABS_PRESSURE, 0 },
{ -1, -1 }
{ -1, -1 },
};
double dx, dy;
@ -5716,7 +5716,7 @@ START_TEST(relative_calibration)
struct axis_replacement axes[] = {
{ ABS_DISTANCE, 10 },
{ ABS_PRESSURE, 0 },
{ -1, -1 }
{ -1, -1 },
};
double dx, dy;
float calibration[] = { -1, 0, 1, 0, -1, 1 };
@ -5825,7 +5825,7 @@ assert_touch_is_arbitrated(struct litest_device *dev, struct litest_device *fing
{ ABS_TILT_Y, 80 },
{ ABS_DISTANCE, 10 },
{ ABS_PRESSURE, 0 },
{ -1, -1 }
{ -1, -1 },
};
litest_tablet_proximity_in(dev, 10, 10, axes);
@ -5908,7 +5908,7 @@ START_TEST(touch_arbitration_outside_rect)
{ ABS_TILT_Y, 80 },
{ ABS_DISTANCE, 10 },
{ ABS_PRESSURE, 0 },
{ -1, -1 }
{ -1, -1 },
};
double x, y;
bool is_touchpad;
@ -5988,7 +5988,7 @@ START_TEST(touch_arbitration_remove_after)
{ ABS_TILT_Y, 80 },
{ ABS_DISTANCE, 10 },
{ ABS_PRESSURE, 0 },
{ -1, -1 }
{ -1, -1 },
};
bool is_touchpad;
@ -6026,7 +6026,7 @@ START_TEST(touch_arbitration_stop_touch)
struct axis_replacement axes[] = {
{ ABS_DISTANCE, 10 },
{ ABS_PRESSURE, 0 },
{ -1, -1 }
{ -1, -1 },
};
bool is_touchpad;
@ -6115,7 +6115,7 @@ START_TEST(touch_arbitration_suspend_touch_device)
struct axis_replacement axes[] = {
{ ABS_DISTANCE, 10 },
{ ABS_PRESSURE, 0 },
{ -1, -1 }
{ -1, -1 },
};
bool is_touchpad;
@ -6201,7 +6201,7 @@ START_TEST(touch_arbitration_remove_touch)
struct axis_replacement axes[] = {
{ ABS_DISTANCE, 10 },
{ ABS_PRESSURE, 0 },
{ -1, -1 }
{ -1, -1 },
};
other = paired_device(dev);
@ -6242,7 +6242,7 @@ START_TEST(touch_arbitration_remove_tablet)
struct axis_replacement axes[] = {
{ ABS_DISTANCE, 10 },
{ ABS_PRESSURE, 0 },
{ -1, -1 }
{ -1, -1 },
};
bool is_touchpad;
@ -6306,7 +6306,7 @@ START_TEST(touch_arbitration_keep_ignoring)
struct axis_replacement axes[] = {
{ ABS_DISTANCE, 10 },
{ ABS_PRESSURE, 0 },
{ -1, -1 }
{ -1, -1 },
};
other = paired_device(tablet);
@ -6353,7 +6353,7 @@ START_TEST(touch_arbitration_late_touch_lift)
struct axis_replacement axes[] = {
{ ABS_DISTANCE, 10 },
{ ABS_PRESSURE, 0 },
{ -1, -1 }
{ -1, -1 },
};
bool is_touchpad;
@ -6406,7 +6406,7 @@ START_TEST(touch_arbitration_swap_device)
struct axis_replacement axes[] = {
{ ABS_DISTANCE, 10 },
{ ABS_PRESSURE, 0 },
{ -1, -1 }
{ -1, -1 },
};
enum litest_device_type paired = paired_device(tablet);
@ -7118,7 +7118,7 @@ START_TEST(tablet_smoothing)
struct axis_replacement axes[] = {
{ ABS_DISTANCE, 10 },
{ ABS_PRESSURE, 0 },
{ -1, -1 }
{ -1, -1 },
};
litest_drain_events(li);
@ -7194,12 +7194,12 @@ START_TEST(tablet_eraser_button_disabled)
struct axis_replacement axes[] = {
{ ABS_DISTANCE, 10 },
{ ABS_PRESSURE, 0 },
{ -1, -1 }
{ -1, -1 },
};
struct axis_replacement tip_down_axes[] = {
{ ABS_DISTANCE, 0 },
{ ABS_PRESSURE, 30 },
{ -1, -1 }
{ -1, -1 },
};
struct libinput_event *ev;
struct libinput_event_tablet_tool *tev;

2
test/test-totem.c
View file

@ -272,7 +272,7 @@ START_TEST(totem_rotation)
double r, old_r;
struct axis_replacement axes[] = {
{ ABS_MT_ORIENTATION, 50 }, /* mid-point is 0 */
{ -1, -1 }
{ -1, -1 },
};
litest_tablet_proximity_in(dev, 50, 50, axes);

12
test/test-touch.c
View file

@ -1125,7 +1125,7 @@ START_TEST(touch_palm_detect_tool_palm)
struct libinput *li = dev->libinput;
struct axis_replacement axes[] = {
{ ABS_MT_TOOL_TYPE, MT_TOOL_PALM },
{ -1, 0 }
{ -1, 0 },
};
if (!touch_has_tool_palm(dev))
@ -1152,7 +1152,7 @@ START_TEST(touch_palm_detect_tool_palm_on_off)
struct libinput *li = dev->libinput;
struct axis_replacement axes[] = {
{ ABS_MT_TOOL_TYPE, MT_TOOL_PALM },
{ -1, 0 }
{ -1, 0 },
};
if (!touch_has_tool_palm(dev))
@ -1183,7 +1183,7 @@ START_TEST(touch_palm_detect_tool_palm_keep_type)
struct libinput *li = dev->libinput;
struct axis_replacement axes[] = {
{ ABS_MT_TOOL_TYPE, MT_TOOL_PALM },
{ -1, 0 }
{ -1, 0 },
};
if (!touch_has_tool_palm(dev))
@ -1214,7 +1214,7 @@ START_TEST(touch_palm_detect_tool_palm_2fg)
struct libinput *li = dev->libinput;
struct axis_replacement axes[] = {
{ ABS_MT_TOOL_TYPE, MT_TOOL_PALM },
{ -1, 0 }
{ -1, 0 },
};
if (!touch_has_tool_palm(dev))
@ -1250,7 +1250,7 @@ START_TEST(touch_palm_detect_tool_palm_on_off_2fg)
struct libinput *li = dev->libinput;
struct axis_replacement axes[] = {
{ ABS_MT_TOOL_TYPE, MT_TOOL_PALM },
{ -1, 0 }
{ -1, 0 },
};
if (!touch_has_tool_palm(dev))
@ -1294,7 +1294,7 @@ START_TEST(touch_palm_detect_tool_palm_keep_type_2fg)
struct libinput *li = dev->libinput;
struct axis_replacement axes[] = {
{ ABS_MT_TOOL_TYPE, MT_TOOL_PALM },
{ -1, 0 }
{ -1, 0 },
};
if (!touch_has_tool_palm(dev))

42
test/test-touchpad-tap.c
View file

@ -4240,7 +4240,7 @@ START_TEST(touchpad_tap_palm_on_idle)
struct libinput *li = dev->libinput;
struct axis_replacement axes[] = {
{ ABS_MT_PRESSURE, 75 },
{ -1, 0 }
{ -1, 0 },
};
if (!touchpad_has_palm_pressure(dev))
@ -4267,7 +4267,7 @@ START_TEST(touchpad_tap_palm_on_touch)
struct libinput *li = dev->libinput;
struct axis_replacement axes[] = {
{ ABS_MT_PRESSURE, 75 },
{ -1, 0 }
{ -1, 0 },
};
if (!touchpad_has_palm_pressure(dev))
@ -4295,7 +4295,7 @@ START_TEST(touchpad_tap_palm_on_touch_hold_timeout)
struct libinput *li = dev->libinput;
struct axis_replacement axes[] = {
{ ABS_MT_PRESSURE, 75 },
{ -1, 0 }
{ -1, 0 },
};
if (!touchpad_has_palm_pressure(dev))
@ -4324,7 +4324,7 @@ START_TEST(touchpad_tap_palm_on_touch_hold_move)
struct libinput *li = dev->libinput;
struct axis_replacement axes[] = {
{ ABS_MT_PRESSURE, 75 },
{ -1, 0 }
{ -1, 0 },
};
if (!touchpad_has_palm_pressure(dev))
@ -4355,7 +4355,7 @@ START_TEST(touchpad_tap_palm_on_tapped)
struct libinput *li = dev->libinput;
struct axis_replacement axes[] = {
{ ABS_MT_PRESSURE, 75 },
{ -1, 0 }
{ -1, 0 },
};
int nfingers = litest_test_param_get_i32(test_env->params, "fingers");
unsigned int button = 0;
@ -4435,7 +4435,7 @@ START_TEST(touchpad_tap_palm_on_tapped_palm_down)
struct libinput *li = dev->libinput;
struct axis_replacement axes[] = {
{ ABS_MT_PRESSURE, 75 },
{ -1, 0 }
{ -1, 0 },
};
int nfingers = litest_test_param_get_i32(test_env->params, "fingers");
unsigned int button = 0;
@ -4515,7 +4515,7 @@ START_TEST(touchpad_tap_palm_on_tapped_doubletap)
struct libinput *li = dev->libinput;
struct axis_replacement axes[] = {
{ ABS_MT_PRESSURE, 75 },
{ -1, 0 }
{ -1, 0 },
};
int nfingers = litest_test_param_get_i32(test_env->params, "fingers_1st"),
nfingers2 = litest_test_param_get_i32(test_env->params, "fingers_2nd");
@ -4644,7 +4644,7 @@ START_TEST(touchpad_tap_palm_on_drag)
struct libinput *li = dev->libinput;
struct axis_replacement axes[] = {
{ ABS_MT_PRESSURE, 75 },
{ -1, 0 }
{ -1, 0 },
};
int nfingers = litest_test_param_get_i32(test_env->params, "fingers");
unsigned int button = 0;
@ -4725,7 +4725,7 @@ START_TEST(touchpad_tap_palm_on_drag_2fg)
struct libinput *li = dev->libinput;
struct axis_replacement axes[] = {
{ ABS_MT_PRESSURE, 75 },
{ -1, 0 }
{ -1, 0 },
};
int which = litest_test_param_get_i32(test_env->params, "which"),
this = which % 2,
@ -4816,7 +4816,7 @@ START_TEST(touchpad_tap_palm_on_touch_2)
struct libinput *li = dev->libinput;
struct axis_replacement axes[] = {
{ ABS_MT_PRESSURE, 75 },
{ -1, 0 }
{ -1, 0 },
};
int which = litest_test_param_get_i32(test_env->params, "which"),
this = which % 2,
@ -4857,7 +4857,7 @@ START_TEST(touchpad_tap_palm_on_touch_2_retouch)
struct libinput *li = dev->libinput;
struct axis_replacement axes[] = {
{ ABS_MT_PRESSURE, 75 },
{ -1, 0 }
{ -1, 0 },
};
int which = litest_test_param_get_i32(test_env->params, "which"),
this = which % 2,
@ -4902,7 +4902,7 @@ START_TEST(touchpad_tap_palm_on_touch_3)
struct libinput *li = dev->libinput;
struct axis_replacement axes[] = {
{ ABS_MT_PRESSURE, 75 },
{ -1, 0 }
{ -1, 0 },
};
int which = litest_test_param_get_i32(test_env->params, "which"),
this = which % 3;
@ -4949,7 +4949,7 @@ START_TEST(touchpad_tap_palm_on_touch_3_retouch)
struct libinput *li = dev->libinput;
struct axis_replacement axes[] = {
{ ABS_MT_PRESSURE, 75 },
{ -1, 0 }
{ -1, 0 },
};
int which = litest_test_param_get_i32(test_env->params, "which"),
this = which % 3;
@ -5000,7 +5000,7 @@ START_TEST(touchpad_tap_palm_on_touch_4)
struct libinput *li = dev->libinput;
struct axis_replacement axes[] = {
{ ABS_MT_PRESSURE, 75 },
{ -1, 0 }
{ -1, 0 },
};
int which = litest_test_param_get_i32(test_env->params, "which"),
this = which % 4;
@ -5040,7 +5040,7 @@ START_TEST(touchpad_tap_palm_after_tap)
struct libinput *li = dev->libinput;
struct axis_replacement axes[] = {
{ ABS_MT_PRESSURE, 75 },
{ -1, 0 }
{ -1, 0 },
};
int nfingers = litest_test_param_get_i32(test_env->params, "fingers");
unsigned int button = 0;
@ -5118,7 +5118,7 @@ START_TEST(touchpad_tap_palm_multitap)
struct libinput *li = dev->libinput;
struct axis_replacement axes[] = {
{ ABS_MT_PRESSURE, 75 },
{ -1, 0 }
{ -1, 0 },
};
int nfingers = litest_test_param_get_i32(test_env->params, "fingers"),
range = litest_test_param_get_i32(test_env->params, "taps"),
@ -5202,7 +5202,7 @@ START_TEST(touchpad_tap_palm_multitap_timeout)
struct libinput *li = dev->libinput;
struct axis_replacement axes[] = {
{ ABS_MT_PRESSURE, 75 },
{ -1, 0 }
{ -1, 0 },
};
int nfingers = litest_test_param_get_i32(test_env->params, "fingers"),
range = litest_test_param_get_i32(test_env->params, "taps"),
@ -5285,7 +5285,7 @@ START_TEST(touchpad_tap_palm_multitap_down_again)
struct libinput *li = dev->libinput;
struct axis_replacement axes[] = {
{ ABS_MT_PRESSURE, 75 },
{ -1, 0 }
{ -1, 0 },
};
int nfingers = litest_test_param_get_i32(test_env->params, "fingers"),
range = litest_test_param_get_i32(test_env->params, "taps"),
@ -5400,7 +5400,7 @@ START_TEST(touchpad_tap_palm_multitap_click)
struct libinput *li = dev->libinput;
struct axis_replacement axes[] = {
{ ABS_MT_PRESSURE, 75 },
{ -1, 0 }
{ -1, 0 },
};
int nfingers = litest_test_param_get_i32(test_env->params, "fingers"),
range = litest_test_param_get_i32(test_env->params, "taps"),
@ -5496,7 +5496,7 @@ START_TEST(touchpad_tap_palm_click_then_tap)
struct libinput *li = dev->libinput;
struct axis_replacement axes[] = {
{ ABS_MT_PRESSURE, 75 },
{ -1, 0 }
{ -1, 0 },
};
if (!touchpad_has_palm_pressure(dev))
@ -5545,7 +5545,7 @@ START_TEST(touchpad_tap_palm_dwt_tap)
struct libinput *li = dev->libinput;
struct axis_replacement axes[] = {
{ ABS_MT_PRESSURE, 75 },
{ -1, 0 }
{ -1, 0 },
};
if (!touchpad_has_palm_pressure(dev))

62
test/test-touchpad.c
View file

@ -302,7 +302,7 @@ START_TEST(touchpad_2fg_scroll_axis_lock)
{ 7, 40},
{ 7, -40},
{-7, 40},
{-7, -40}
{-7, -40},
};
/* 10 degrees off from horiz/vert should count as straight */
@ -1855,7 +1855,7 @@ START_TEST(touchpad_palm_detect_pressure)
struct libinput *li = dev->libinput;
struct axis_replacement axes[] = {
{ ABS_MT_PRESSURE, 75 },
{ -1, 0 }
{ -1, 0 },
};
if (!touchpad_has_palm_pressure(dev))
@ -1879,7 +1879,7 @@ START_TEST(touchpad_palm_detect_pressure_late_tap)
struct libinput *li = dev->libinput;
struct axis_replacement axes[] = {
{ ABS_MT_PRESSURE, 75 },
{ -1, 0 }
{ -1, 0 },
};
if (!touchpad_has_palm_pressure(dev))
@ -1911,7 +1911,7 @@ START_TEST(touchpad_palm_detect_pressure_tap_hold)
struct libinput *li = dev->libinput;
struct axis_replacement axes[] = {
{ ABS_MT_PRESSURE, 75 },
{ -1, 0 }
{ -1, 0 },
};
if (!touchpad_has_palm_pressure(dev))
@ -1943,7 +1943,7 @@ START_TEST(touchpad_palm_detect_pressure_tap_hold_2ndfg)
struct libinput *li = dev->libinput;
struct axis_replacement axes[] = {
{ ABS_MT_PRESSURE, 75 },
{ -1, 0 }
{ -1, 0 },
};
if (!touchpad_has_palm_pressure(dev))
@ -1987,7 +1987,7 @@ START_TEST(touchpad_palm_detect_move_and_tap)
struct libinput *li = dev->libinput;
struct axis_replacement axes[] = {
{ ABS_MT_PRESSURE, 75 },
{ -1, 0 }
{ -1, 0 },
};
if (!touchpad_has_palm_pressure(dev))
@ -2026,7 +2026,7 @@ START_TEST(touchpad_palm_detect_pressure_late)
struct libinput *li = dev->libinput;
struct axis_replacement axes[] = {
{ ABS_MT_PRESSURE, 75 },
{ -1, 0 }
{ -1, 0 },
};
if (!touchpad_has_palm_pressure(dev))
@ -2053,7 +2053,7 @@ START_TEST(touchpad_palm_detect_pressure_keep_palm)
struct libinput *li = dev->libinput;
struct axis_replacement axes[] = {
{ ABS_MT_PRESSURE, 75 },
{ -1, 0 }
{ -1, 0 },
};
if (!touchpad_has_palm_pressure(dev))
@ -2078,7 +2078,7 @@ START_TEST(touchpad_palm_detect_pressure_after_edge)
struct libinput *li = dev->libinput;
struct axis_replacement axes[] = {
{ ABS_MT_PRESSURE, 75 },
{ -1, 0 }
{ -1, 0 },
};
if (!touchpad_has_palm_pressure(dev) ||
@ -2107,7 +2107,7 @@ START_TEST(touchpad_palm_detect_pressure_after_dwt)
struct libinput *li = touchpad->libinput;
struct axis_replacement axes[] = {
{ ABS_MT_PRESSURE, 75 },
{ -1, 0 }
{ -1, 0 },
};
if (!touchpad_has_palm_pressure(touchpad))
@ -2146,7 +2146,7 @@ START_TEST(touchpad_palm_ignore_threshold_zero)
struct libinput *li = dev->libinput;
struct axis_replacement axes[] = {
{ ABS_MT_PRESSURE, 75 },
{ -1, 0 }
{ -1, 0 },
};
litest_disable_tap(dev->libinput_device);
@ -2168,7 +2168,7 @@ START_TEST(touchpad_palm_clickfinger_pressure)
struct libinput *li = dev->libinput;
struct axis_replacement axes[] = {
{ ABS_MT_PRESSURE, 75 },
{ -1, 0 }
{ -1, 0 },
};
if (!touchpad_has_palm_pressure(dev))
@ -2199,7 +2199,7 @@ START_TEST(touchpad_palm_clickfinger_pressure_2fg)
struct libinput *li = dev->libinput;
struct axis_replacement axes[] = {
{ ABS_MT_PRESSURE, 75 },
{ -1, 0 }
{ -1, 0 },
};
if (!touchpad_has_palm_pressure(dev))
@ -2251,7 +2251,7 @@ START_TEST(touchpad_palm_clickfinger_size)
{ ABS_MT_TOUCH_MAJOR, 0 },
{ ABS_MT_TOUCH_MINOR, 0 },
{ ABS_MT_ORIENTATION, 0 },
{ -1, 0 }
{ -1, 0 },
};
if (!touchpad_has_touch_size(dev))
@ -2284,7 +2284,7 @@ START_TEST(touchpad_palm_clickfinger_size_2fg)
{ ABS_MT_TOUCH_MAJOR, 0 },
{ ABS_MT_TOUCH_MINOR, 0 },
{ ABS_MT_ORIENTATION, 0 },
{ -1, 0 }
{ -1, 0 },
};
if (!touchpad_has_touch_size(dev))
@ -6127,7 +6127,7 @@ START_TEST(touchpad_pressure)
struct axis_replacement axes[] = {
{ ABS_MT_PRESSURE, 1 },
{ ABS_PRESSURE, 1 },
{ -1, 0 }
{ -1, 0 },
};
double pressure; /* in percent */
double threshold = 12.0;
@ -6161,7 +6161,7 @@ START_TEST(touchpad_pressure_2fg)
struct axis_replacement axes[] = {
{ ABS_MT_PRESSURE, 5 },
{ ABS_PRESSURE, 5 },
{ -1, 0 }
{ -1, 0 },
};
if (!touchpad_has_pressure(dev))
@ -6192,7 +6192,7 @@ START_TEST(touchpad_pressure_2fg_st)
struct axis_replacement axes[] = {
{ ABS_MT_PRESSURE, 5 },
{ ABS_PRESSURE, 5 },
{ -1, 0 }
{ -1, 0 },
};
if (!touchpad_has_pressure(dev))
@ -6226,7 +6226,7 @@ START_TEST(touchpad_pressure_tap)
struct axis_replacement axes[] = {
{ ABS_MT_PRESSURE, 5 },
{ ABS_PRESSURE, 5 },
{ -1, 0 }
{ -1, 0 },
};
if (!touchpad_has_pressure(dev))
@ -6250,7 +6250,7 @@ START_TEST(touchpad_pressure_tap_2fg)
struct axis_replacement axes[] = {
{ ABS_MT_PRESSURE, 5 },
{ ABS_PRESSURE, 5 },
{ -1, 0 }
{ -1, 0 },
};
if (!touchpad_has_pressure(dev))
@ -6278,7 +6278,7 @@ START_TEST(touchpad_pressure_tap_2fg_1fg_light)
struct axis_replacement axes[] = {
{ ABS_MT_PRESSURE, 5 },
{ ABS_PRESSURE, 5 },
{ -1, 0 }
{ -1, 0 },
};
if (!touchpad_has_pressure(dev))
@ -6319,7 +6319,7 @@ START_TEST(touchpad_pressure_btntool)
struct axis_replacement axes[] = {
{ ABS_MT_PRESSURE, 5 },
{ ABS_PRESSURE, 5 },
{ -1, 0 }
{ -1, 0 },
};
/* we only have tripletap, can't test 4 slots because nothing will
@ -6383,7 +6383,7 @@ START_TEST(touchpad_pressure_semi_mt_2fg_goes_light)
struct libinput *li = dev->libinput;
struct axis_replacement axes[] = {
{ ABS_PRESSURE, 2 },
{ -1, 0 }
{ -1, 0 },
};
litest_enable_2fg_scroll(dev);
@ -6427,7 +6427,7 @@ START_TEST(touchpad_touch_size)
{ ABS_MT_TOUCH_MAJOR, 0 },
{ ABS_MT_TOUCH_MINOR, 0 },
{ ABS_MT_ORIENTATION, 0 },
{ -1, 0 }
{ -1, 0 },
};
if (!touchpad_has_touch_size(dev))
@ -6460,7 +6460,7 @@ START_TEST(touchpad_touch_size_2fg)
{ ABS_MT_TOUCH_MAJOR, 0 },
{ ABS_MT_TOUCH_MINOR, 0 },
{ ABS_MT_ORIENTATION, 0 },
{ -1, 0 }
{ -1, 0 },
};
if (!touchpad_has_touch_size(dev))
@ -6500,7 +6500,7 @@ START_TEST(touchpad_palm_detect_touch_size)
struct axis_replacement axes[] = {
{ ABS_MT_TOUCH_MAJOR, 0 },
{ ABS_MT_TOUCH_MINOR, 0 },
{ -1, 0 }
{ -1, 0 },
};
if (!touchpad_has_touch_size(dev) ||
@ -6532,7 +6532,7 @@ START_TEST(touchpad_palm_detect_touch_size_late)
struct axis_replacement axes[] = {
{ ABS_MT_TOUCH_MAJOR, 0 },
{ ABS_MT_TOUCH_MINOR, 0 },
{ -1, 0 }
{ -1, 0 },
};
if (!touchpad_has_touch_size(dev) ||
@ -6573,7 +6573,7 @@ START_TEST(touchpad_palm_detect_touch_size_keep_palm)
struct axis_replacement axes[] = {
{ ABS_MT_TOUCH_MAJOR, 0 },
{ ABS_MT_TOUCH_MINOR, 0 },
{ -1, 0 }
{ -1, 0 },
};
if (!touchpad_has_touch_size(dev) ||
@ -6610,7 +6610,7 @@ START_TEST(touchpad_palm_detect_touch_size_after_edge)
struct axis_replacement axes[] = {
{ ABS_MT_TOUCH_MAJOR, 0 },
{ ABS_MT_TOUCH_MINOR, 0 },
{ -1, 0 }
{ -1, 0 },
};
if (!touchpad_has_touch_size(dev) ||
@ -6643,7 +6643,7 @@ START_TEST(touchpad_palm_detect_touch_size_after_dwt)
struct axis_replacement axes[] = {
{ ABS_MT_TOUCH_MAJOR, 0 },
{ ABS_MT_TOUCH_MINOR, 0 },
{ -1, 0 }
{ -1, 0 },
};
if (!touchpad_has_touch_size(touchpad) ||
@ -6774,7 +6774,7 @@ START_TEST(touchpad_speed_ignore_hovering_finger)
struct axis_replacement axes[] = {
{ ABS_MT_TOUCH_MAJOR, 1 },
{ ABS_MT_TOUCH_MINOR, 1 },
{ -1, 0 }
{ -1, 0 },
};
if (!has_thumb_detect(dev))

40
test/test-utils.c
View file

@ -665,7 +665,7 @@ START_TEST(dpi_parser)
{ "", 0 },
{ " ", 0 },
{ "* ", 0 },
{ NULL, 0 }
{ NULL, 0 },
};
/* clang-format on */
int i, dpi;
@ -696,7 +696,7 @@ START_TEST(wheel_click_parser)
{ "10-", 0 },
{ "sadfasfd", 0 },
{ "361", 0 },
{ NULL, 0 }
{ NULL, 0 },
};
/* clang-format on */
@ -765,7 +765,7 @@ START_TEST(dimension_prop_parser)
{ "0xaf", false, 0, 0 },
{ "0x0x", false, 0, 0 },
{ "x10", false, 0, 0 },
{ NULL, false, 0, 0 }
{ NULL, false, 0, 0 },
};
/* clang-format on */
int i;
@ -804,7 +804,7 @@ START_TEST(reliability_prop_parser)
{ "", false, 0 },
{ "0", false, 0 },
{ "1", false, 0 },
{ NULL, false, 0, }
{ NULL, false, 0, },
};
/* clang-format on */
enum switch_reliability r;
@ -849,7 +849,7 @@ START_TEST(calibration_prop_parser)
{ "6.00012 3.244 4.238 5.2421 6.0134 8.860", true,
{ 6.00012, 3.244, 4.238, 5.2421, 6.0134, 8.860 }},
{ "0xff 2 3 4 5 6", false, DEFAULT_VALUES },
{ NULL, false, DEFAULT_VALUES }
{ NULL, false, DEFAULT_VALUES },
};
/* clang-format on */
bool success;
@ -900,7 +900,7 @@ START_TEST(range_prop_parser)
{ "", false, 0, 0 },
{ "abcd", false, 0, 0 },
{ "10:30:10", false, 0, 0 },
{ NULL, false, 0, 0 }
{ NULL, false, 0, 0 },
};
/* clang-format on */
int i;
@ -938,7 +938,7 @@ START_TEST(boolean_prop_parser)
{ "-1", false, false },
{ "2", false, false },
{ "abcd", false, false },
{ NULL, false, false }
{ NULL, false, false },
};
/* clang-format on */
int i;
@ -1235,7 +1235,7 @@ START_TEST(safe_atoi_test)
{ "0xaf", false, 0 },
{ "0x0x", false, 0 },
{ "x10", false, 0 },
{ NULL, false, 0 }
{ NULL, false, 0 },
};
/* clang-format on */
int v;
@ -1270,7 +1270,7 @@ START_TEST(safe_atoi_base_16_test)
{ "0xak", false, 0 },
{ "0x", false, 0 },
{ "x10", false, 0 },
{ NULL, false, 0 }
{ NULL, false, 0 },
};
/* clang-format on */
@ -1309,7 +1309,7 @@ START_TEST(safe_atoi_base_8_test)
{ "0xak", false, 0 },
{ "0x", false, 0 },
{ "x10", false, 0 },
{ NULL, false, 0 }
{ NULL, false, 0 },
};
/* clang-format on */
@ -1352,7 +1352,7 @@ START_TEST(safe_atou_test)
{ "0xaf", false, 0 },
{ "0x0x", false, 0 },
{ "x10", false, 0 },
{ NULL, false, 0 }
{ NULL, false, 0 },
};
/* clang-format on */
unsigned int v;
@ -1387,7 +1387,7 @@ START_TEST(safe_atou_base_16_test)
{ "0xak", false, 0 },
{ "0x", false, 0 },
{ "x10", false, 0 },
{ NULL, false, 0 }
{ NULL, false, 0 },
};
/* clang-format on */
@ -1426,7 +1426,7 @@ START_TEST(safe_atou_base_8_test)
{ "0xak", false, 0 },
{ "0x", false, 0 },
{ "x10", false, 0 },
{ NULL, false, 0 }
{ NULL, false, 0 },
};
/* clang-format on */
@ -1470,7 +1470,7 @@ START_TEST(safe_atou64_test)
{ "0xaf", false, 0 },
{ "0x0x", false, 0 },
{ "x10", false, 0 },
{ NULL, false, 0 }
{ NULL, false, 0 },
};
/* clang-format on */
uint64_t v;
@ -1519,7 +1519,7 @@ START_TEST(safe_atod_test)
{ "abd", false, 0 },
{ "xabd", false, 0 },
{ "0x0x", false, 0 },
{ NULL, false, 0 }
{ NULL, false, 0 },
};
/* clang-format on */
double v;
@ -1563,7 +1563,7 @@ START_TEST(strsplit_test)
{ " ", " ", { NULL }, 0 },
{ " ", " ", { NULL }, 0 },
{ "oneoneone", "one", { NULL} , 0 },
{ NULL, NULL, { NULL }, 0}
{ NULL, NULL, { NULL }, 0},
};
/* clang-format on */
struct strsplit_test *t = tests;
@ -1836,7 +1836,7 @@ START_TEST(double_array_from_string_test)
{ " ", " ", { 0 }, 0 },
{ "", " ", { 0 }, 0 },
{ "oneoneone", "one", { 0 }, 0 },
{ NULL, NULL, { 0 }, 0 }
{ NULL, NULL, { 0 }, 0 },
};
/* clang-format on */
struct double_array_from_string_test *t = tests;
@ -1923,7 +1923,7 @@ START_TEST(kvsplit_double_test)
{ "a:b", "x", ":", -1, {}},
{ "", " ", "x", -1, {}},
{ "1.2.3.4.5", ".", "", -1, {}},
{ NULL }
{ NULL },
};
/* clang-format on */
struct kvsplit_dbl_test *t = tests;
@ -1968,7 +1968,7 @@ START_TEST(strjoin_test)
{ { "a", "b", "c", NULL }, "", "abc" },
{ { "", "b", "c", NULL }, "x", "xbxc" },
{ { "", "", "", NULL }, "", "" },
{ { NULL }, NULL, NULL }
{ { NULL }, NULL, NULL },
};
/* clang-format on */
struct strjoin_test *t = tests;
@ -2014,7 +2014,7 @@ START_TEST(strstrip_test)
{ " foo\n", "foo", " \n" },
{ "", "", "abc" },
{ "", "", "" },
{ NULL , NULL, NULL }
{ NULL , NULL, NULL },
};
/* clang-format on */
struct strstrip_test *t = tests;

2
tools/libinput-test.c
View file

@ -47,7 +47,7 @@ main(int argc, char **argv)
int c;
static struct option opts[] = {
{ "help", no_argument, 0, 'h' },
{ 0, 0, 0, 0}
{ 0, 0, 0, 0},
};
c = getopt_long(argc, argv, "+h", opts, &option_index);

4
udev/libinput-fuzz-extract.c
View file

@ -49,7 +49,7 @@ handle_absfuzz(struct udev_device *device)
unsigned int axes[] = {ABS_X,
ABS_Y,
ABS_MT_POSITION_X,
ABS_MT_POSITION_Y};
ABS_MT_POSITION_Y,};
devnode = udev_device_get_devnode(device);
if (!devnode)
@ -90,7 +90,7 @@ handle_evdev_abs(struct udev_device *device)
unsigned int axes[] = {ABS_X,
ABS_Y,
ABS_MT_POSITION_X,
ABS_MT_POSITION_Y};
ABS_MT_POSITION_Y,};
ARRAY_FOR_EACH(axes, code) {
const char *prop;

2
udev/libinput-fuzz-to-zero.c
View file

@ -42,7 +42,7 @@ reset_absfuzz_to_zero(struct udev_device *device)
unsigned int axes[] = {ABS_X,
ABS_Y,
ABS_MT_POSITION_X,
ABS_MT_POSITION_Y};
ABS_MT_POSITION_Y,};
devnode = udev_device_get_devnode(device);
if (!devnode)