quirks: Rename QUIRK_MODEL_LOGITECH_MX_MASTER_3

The Logitech MX Master 2S also triggers accidental scroll events when
the mouse wheel is pressed [1].

Rename the "ModelLogitechMXMaster3" quirk to "ModelScrollOnMiddleClick"
to make it more generic.

[1] https://gitlab.freedesktop.org/libinput/libinput/-/issues/1181

Part-of: <https://gitlab.freedesktop.org/libinput/libinput/-/merge_requests/1343>
This commit is contained in:
José Expósito 2025-10-23 14:56:05 +02:00 committed by Marge Bot
parent d6e1f93812
commit 4a705ba8d7
4 changed files with 8 additions and 8 deletions

View file

@ -93,26 +93,26 @@ ModelInvertHorizontalScrolling=1
MatchVendor=0x046D
MatchProduct=0x4082
ModelInvertHorizontalScrolling=1
ModelLogitechMXMaster3=1
ModelScrollOnMiddleClick=1
# MX Master 3 has a different PID on bluetooth
[Logitech MX Master 3 Bluetooth]
MatchVendor=0x046D
MatchProduct=0xB023
ModelInvertHorizontalScrolling=1
ModelLogitechMXMaster3=1
ModelScrollOnMiddleClick=1
[Logitech MX Master 3S]
MatchVendor=0x046D
MatchProduct=0xB034
ModelInvertHorizontalScrolling=1
ModelLogitechMXMaster3=1
ModelScrollOnMiddleClick=1
[Logitech MX Master 3B]
MatchVendor=0x046D
MatchProduct=0xB028
ModelInvertHorizontalScrolling=1
ModelLogitechMXMaster3=1
ModelScrollOnMiddleClick=1
# Don't add quirks for the Logitech Bolt Receiver:
# MatchVendor=0x046D

View file

@ -471,7 +471,7 @@ wheel_plugin_device_create(struct libinput_plugin *libinput_plugin,
pd->min_movement = ACC_V120_THRESHOLD;
ratelimit_init(&pd->hires_warning_limit, s2us(24 * 60 * 60), 1);
if (libinput_device_has_model_quirk(device, QUIRK_MODEL_LOGITECH_MX_MASTER_3))
if (libinput_device_has_model_quirk(device, QUIRK_MODEL_SCROLL_ON_MIDDLE_CLICK))
pd->ignore_small_hi_res_movements = ALWAYS_ACCUMULATE;
else
pd->ignore_small_hi_res_movements = MAYBE;

View file

@ -274,6 +274,8 @@ quirk_get_name(enum quirk q)
return "ModelLenovoX1Gen6Touchpad";
case QUIRK_MODEL_LENOVO_X230:
return "ModelLenovoX230";
case QUIRK_MODEL_SCROLL_ON_MIDDLE_CLICK:
return "ModelScrollOnMiddleClick";
case QUIRK_MODEL_SYNAPTICS_SERIAL_TOUCHPAD:
return "ModelSynapticsSerialTouchpad";
case QUIRK_MODEL_SYSTEM76_BONOBO:
@ -296,8 +298,6 @@ quirk_get_name(enum quirk q)
return "ModelWacomTouchpad";
case QUIRK_MODEL_PRESSURE_PAD:
return "ModelPressurePad";
case QUIRK_MODEL_LOGITECH_MX_MASTER_3:
return "ModelLogitechMXMaster3";
case QUIRK_ATTR_SIZE_HINT:
return "AttrSizeHint";

View file

@ -83,8 +83,8 @@ enum quirk {
QUIRK_MODEL_LENOVO_T450_TOUCHPAD,
QUIRK_MODEL_LENOVO_X1GEN6_TOUCHPAD,
QUIRK_MODEL_LENOVO_X230,
QUIRK_MODEL_LOGITECH_MX_MASTER_3,
QUIRK_MODEL_PRESSURE_PAD,
QUIRK_MODEL_SCROLL_ON_MIDDLE_CLICK,
QUIRK_MODEL_SYNAPTICS_SERIAL_TOUCHPAD,
QUIRK_MODEL_SYSTEM76_BONOBO,
QUIRK_MODEL_SYSTEM76_GALAGO,