evdev: add three more Logitech K400-like devices to the debouncing quirk

And rename the model flag, no point in having separate flags here, we likely
have to add more devices over time.

https://bugs.freedesktop.org/show_bug.cgi?id=106534

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

diff --git a/src/evdev-debounce.c b/src/evdev-debounce.c
index 6f53cdf838342a4a7c9cf5ccf80e0739d74e9698..d2744f22b0030f64ae054a3bdda8ea6fcf2e29df 100644 (file)
--- a/src/evdev-debounce.c
+++ b/src/evdev-debounce.c
@@ -565,8 +565,7 @@ fallback_init_debounce(struct fallback_dispatch *dispatch)
        struct evdev_device *device = dispatch->device;
        char timer_name[64];
 
-       if (device->model_flags &
-           (EVDEV_MODEL_MS_NANO_TRANSCEIVER|EVDEV_MODEL_LOGITECH_K400)) {
+       if (device->model_flags & EVDEV_MODEL_BOUNCING_KEYS) {
                dispatch->debounce.state = DEBOUNCE_STATE_DISABLED;
                return;
        }

diff --git a/src/evdev.c b/src/evdev.c
index 728b6f108f3dac242ced99c5a55722a985d93b19..c6f76adbbe3ad335a93e7af4c677c1d90a42d717 100644 (file)
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -1292,7 +1292,7 @@ evdev_read_model_flags(struct evdev_device *device)
                MODEL(ALPS_TOUCHPAD),
                MODEL(SYNAPTICS_SERIAL_TOUCHPAD),
                MODEL(JUMPING_SEMI_MT),
-               MODEL(LOGITECH_K400),
+               MODEL(BOUNCING_KEYS),
                MODEL(CYBORG_RAT),
                MODEL(HP_STREAM11_TOUCHPAD),
                MODEL(LENOVO_T450_TOUCHPAD),
@@ -1306,7 +1306,6 @@ evdev_read_model_flags(struct evdev_device *device)
                MODEL(APPLE_TOUCHPAD_ONEBUTTON),
                MODEL(LOGITECH_MARBLE_MOUSE),
                MODEL(TABLET_NO_PROXIMITY_OUT),
-               MODEL(MS_NANO_TRANSCEIVER),
                MODEL(TABLET_NO_TILT),
                MODEL(TABLET_MODE_NO_SUSPEND),
                MODEL(LENOVO_CARBON_X1_6TH),

diff --git a/src/evdev.h b/src/evdev.h
index f22bbdb38ef471ab2bac2c965eba9be5b27a247f..0a7de392099c45d8f6a1765ab5f6a6c8dc086cc8 100644 (file)
--- a/src/evdev.h
+++ b/src/evdev.h
@@ -111,7 +111,7 @@ enum evdev_device_model {
        EVDEV_MODEL_ALPS_TOUCHPAD = (1 << 8),
        EVDEV_MODEL_SYNAPTICS_SERIAL_TOUCHPAD = (1 << 9),
        EVDEV_MODEL_JUMPING_SEMI_MT = (1 << 10),
-       EVDEV_MODEL_LOGITECH_K400 = (1 << 11),
+       EVDEV_MODEL_BOUNCING_KEYS = (1 << 11),
        EVDEV_MODEL_LENOVO_X220_TOUCHPAD_FW81 = (1 << 12),
        EVDEV_MODEL_LENOVO_CARBON_X1_6TH = (1 << 13),
        EVDEV_MODEL_CYBORG_RAT = (1 << 14),
@@ -127,7 +127,6 @@ enum evdev_device_model {
        EVDEV_MODEL_APPLE_TOUCHPAD_ONEBUTTON = (1 << 25),
        EVDEV_MODEL_LOGITECH_MARBLE_MOUSE = (1 << 26),
        EVDEV_MODEL_TABLET_NO_PROXIMITY_OUT = (1 << 27),
-       EVDEV_MODEL_MS_NANO_TRANSCEIVER = (1 << 28),
        EVDEV_MODEL_TABLET_NO_TILT = (1 << 29),
        EVDEV_MODEL_TABLET_MODE_NO_SUSPEND = (1 << 30),
        EVDEV_MODEL_LENOVO_SCROLLPOINT = (1 << 31),

diff --git a/udev/90-libinput-model-quirks.hwdb b/udev/90-libinput-model-quirks.hwdb
index 160fca0d379190f64daa3c65200fbbe4f53048ad..e3ba8929fff60257cebfae188b065ebc5a3d342b 100644 (file)
--- a/udev/90-libinput-model-quirks.hwdb
+++ b/udev/90-libinput-model-quirks.hwdb
@@ -280,7 +280,13 @@ libinput:mouse:input:b0003v046DpC408*
 
 # Logitech K400
 libinput:mouse:input:b0003v046Dp4024*
- LIBINPUT_MODEL_LOGITECH_K400=1
+# Logitech K400r
+libinput:mouse:input:b0003v046Dp404B*
+# Logitech K830
+libinput:mouse:input:b0003v046Dp404C*
+# Logitech K400Plus
+libinput:mouse:input:b0003v046Dp404D*
+ LIBINPUT_MODEL_BOUNCING_KEYS=1
 
 # Logitech Wireless Touchpad
 libinput:touchpad:input:b0003v046Dp4011*
@@ -299,7 +305,7 @@ libinput:name:*Microsoft Surface Type Cover Keyboard*:dmi:*svnMicrosoftCorporati
 
 # Microsoft Microsoft® Nano Transceiver v2.0"
 libinput:mouse:input:b0003v045Ep0800*
- LIBINPUT_MODEL_MS_NANO_TRANSCEIVER=1
+ LIBINPUT_MODEL_BOUNCING_KEYS=1
 
 ##########################################
 # Razer