quirks: Remove Lenovo Trackpoint Keyboard II quirk

The device sends its own scroll events when its trackpoint is moved
while the middle button is pressed.

Because scroll events are not going to be inhibited after a certain
amount of scroll is detected in a follow up commit, remove the quirk.

This reverts 53bd70f4c7e2 ("quirks: Lenovo Trackpoint Keyboard II")

Signed-off-by: José Expósito <jose.exposito89@gmail.com>

diff --git a/quirks/50-system-lenovo.quirks b/quirks/50-system-lenovo.quirks
index 8b195ed..3b436e3 100644 (file)
--- a/quirks/50-system-lenovo.quirks
+++ b/quirks/50-system-lenovo.quirks
@@ -260,19 +260,6 @@ MatchName=AT Raw Set 2 keyboard
 MatchDMIModalias=dmi:*svnLENOVO:*pvrYogaDuet713IML05:*
 ModelTabletModeNoSuspend=1
 
-# https://gitlab.freedesktop.org/libinput/libinput/-/issues/651
-[Lenovo TrackPoint Keyboard II USB]
-MatchBus=usb
-MatchVendor=0x17EF
-MatchProduct=0x60EE
-ModelLenovoTrackpointKeyboard2=1
-
-[Lenovo TrackPoint Keyboard II Bluetooth]
-MatchBus=bluetooth
-MatchVendor=0x17EF
-MatchProduct=0x60E1
-ModelLenovoTrackpointKeyboard2=1
-
 # Modifies pressure range to avoid random jumps.
 # https://gitlab.freedesktop.org/libinput/libinput/-/issues/407
 [Lenovo Yoga 2 Pro touchpad]

diff --git a/src/evdev-wheel.c b/src/evdev-wheel.c
index 5ba0c63..36db281 100644 (file)
--- a/src/evdev-wheel.c
+++ b/src/evdev-wheel.c
@@ -410,15 +410,6 @@ fallback_wheel_notify_physical_button(struct fallback_dispatch *dispatch,
                                      int button,
                                      enum libinput_button_state state)
 {
-       /* Lenovo TrackPoint Keyboard II sends its own scroll events when its
-        * trackpoint is moved while the middle button is pressed.
-        * Do not inhibit the scroll events.
-        * https://gitlab.freedesktop.org/libinput/libinput/-/issues/651
-        */
-       if (evdev_device_has_model_quirk(device,
-                                        QUIRK_MODEL_LENOVO_TRACKPOINT_KEYBOARD_2))
-               return;
-
        if (button == BTN_MIDDLE) {
                if (state == LIBINPUT_BUTTON_STATE_PRESSED)
                        wheel_handle_event(dispatch, WHEEL_EVENT_PRESS, time);

diff --git a/src/quirks.c b/src/quirks.c
index 795d292..bccbaa2 100644 (file)
--- a/src/quirks.c
+++ b/src/quirks.c
@@ -254,7 +254,6 @@ quirk_get_name(enum quirk q)
        case QUIRK_MODEL_INVERT_HORIZONTAL_SCROLLING:   return "ModelInvertHorizontalScrolling";
        case QUIRK_MODEL_LENOVO_SCROLLPOINT:            return "ModelLenovoScrollPoint";
        case QUIRK_MODEL_LENOVO_T450_TOUCHPAD:          return "ModelLenovoT450Touchpad";
-       case QUIRK_MODEL_LENOVO_TRACKPOINT_KEYBOARD_2:  return "ModelLenovoTrackpointKeyboard2";
        case QUIRK_MODEL_LENOVO_X1GEN6_TOUCHPAD:        return "ModelLenovoX1Gen6Touchpad";
        case QUIRK_MODEL_LENOVO_X230:                   return "ModelLenovoX230";
        case QUIRK_MODEL_SYNAPTICS_SERIAL_TOUCHPAD:     return "ModelSynapticsSerialTouchpad";

diff --git a/src/quirks.h b/src/quirks.h
index 4713118..4a970b9 100644 (file)
--- a/src/quirks.h
+++ b/src/quirks.h
@@ -74,7 +74,6 @@ enum quirk {
        QUIRK_MODEL_INVERT_HORIZONTAL_SCROLLING,
        QUIRK_MODEL_LENOVO_SCROLLPOINT,
        QUIRK_MODEL_LENOVO_T450_TOUCHPAD,
-       QUIRK_MODEL_LENOVO_TRACKPOINT_KEYBOARD_2,
        QUIRK_MODEL_LENOVO_X1GEN6_TOUCHPAD,
        QUIRK_MODEL_LENOVO_X230,
        QUIRK_MODEL_SYNAPTICS_SERIAL_TOUCHPAD,