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

quirks: rename the alps touchpad quirk to note it's a serial TP quirk

Browse source 
This quirk only applies to serial ALPS touchpads, so let's name it
accordingly.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Peter Hutterer 2020-02-27 15:27:46 +10:00
parent cd574ed5ef
commit c7f06b0bdd
6 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
quirks/30-vendor-alps.quirks
View file

@ -17,7 +17,7 @@ MatchUdevType=touchpad
MatchBus=ps2
MatchVendor=0x0002
MatchProduct=0x0008
ModelALPSTouchpad=1
ModelALPSSerialTouchpad=1
[ALPS v8 Touchpads]
MatchUdevType=touchpad

2
src/evdev-mt-touchpad-buttons.c
View file

@ -906,7 +906,7 @@ tp_init_middlebutton_emulation(struct tp_dispatch *tp,
enable_by_default = true;
want_config_option = false;
} else if (evdev_device_has_model_quirk(device,
QUIRK_MODEL_ALPS_TOUCHPAD)) {
QUIRK_MODEL_ALPS_SERIAL_TOUCHPAD)) {
enable_by_default = true;
want_config_option = true;
} else

4
src/quirks.c
View file

@ -229,7 +229,7 @@ const char *
quirk_get_name(enum quirk q)
{
switch(q) {
case QUIRK_MODEL_ALPS_TOUCHPAD: return "ModelALPSTouchpad";
case QUIRK_MODEL_ALPS_SERIAL_TOUCHPAD: return "ModelALPSSerialTouchpad";
case QUIRK_MODEL_APPLE_TOUCHPAD: return "ModelAppleTouchpad";
case QUIRK_MODEL_APPLE_TOUCHPAD_ONEBUTTON: return "ModelAppleTouchpadOneButton";
case QUIRK_MODEL_BOUNCING_KEYS: return "ModelBouncingKeys";
@ -574,7 +574,7 @@ parse_model(struct quirks_context *ctx,
const char *value)
{
bool b;
enum quirk q = QUIRK_MODEL_ALPS_TOUCHPAD;
enum quirk q = QUIRK_MODEL_ALPS_SERIAL_TOUCHPAD;
assert(strneq(key, "Model", 5));

2
src/quirks.h
View file

@ -62,7 +62,7 @@ struct quirk_tuples {
* Quirks known to libinput
*/
enum quirk {
QUIRK_MODEL_ALPS_TOUCHPAD = 100,
QUIRK_MODEL_ALPS_SERIAL_TOUCHPAD = 100,
QUIRK_MODEL_APPLE_TOUCHPAD,
QUIRK_MODEL_APPLE_TOUCHPAD_ONEBUTTON,
QUIRK_MODEL_BOUNCING_KEYS,

2
test/test-quirks.c
View file

@ -1313,7 +1313,7 @@ START_TEST(quirks_model_alps)
bool exists, value = false;
q = dev->quirks;
exists = quirks_get_bool(q, QUIRK_MODEL_ALPS_TOUCHPAD, &value);
exists = quirks_get_bool(q, QUIRK_MODEL_ALPS_SERIAL_TOUCHPAD, &value);
if (strstr(libinput_device_get_name(device), "ALPS")) {
ck_assert(exists);

2
tools/shared.c
View file

@ -616,7 +616,7 @@ tools_list_device_quirks(struct quirks_context *ctx,
if (!quirks)
return;
q = QUIRK_MODEL_ALPS_TOUCHPAD;
q = QUIRK_MODEL_ALPS_SERIAL_TOUCHPAD;
do {
if (quirks_has_quirk(quirks, q)) {
const char *name;