HID: lenovo: set INPUT_PROP_POINTING_STICK
authorAndreas Fleig <andreasfleig@gmail.com>
Thu, 23 Apr 2015 08:25:58 +0000 (10:25 +0200)
committerJiri Kosina <jkosina@suse.cz>
Thu, 23 Apr 2015 08:25:58 +0000 (10:25 +0200)
Set flags INPUT_PROP_POINTER and INPUT_PROP_POINTING_STICK for the trackpoint
integrated in Lenovo USB and Bluetooth keyboards. Libinput checks these flags
to enable features such as middle-button-scrolling by default.

Signed-off-by: Andreas Fleig <andreasfleig@gmail.com>
Reviewed-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
drivers/hid/hid-lenovo.c

index c4c3f0952521f975fb914580f2fe0f086013038b..78608d646007fbb61b2e3e65e8c25224e5af0e6c 100644 (file)
@@ -762,6 +762,24 @@ static void lenovo_remove(struct hid_device *hdev)
        hid_hw_stop(hdev);
 }
 
+static void lenovo_input_configured(struct hid_device *hdev,
+               struct hid_input *hi)
+{
+       switch (hdev->product) {
+               case USB_DEVICE_ID_LENOVO_TPKBD:
+               case USB_DEVICE_ID_LENOVO_CUSBKBD:
+               case USB_DEVICE_ID_LENOVO_CBTKBD:
+                       if (test_bit(EV_REL, hi->input->evbit)) {
+                               /* set only for trackpoint device */
+                               __set_bit(INPUT_PROP_POINTER, hi->input->propbit);
+                               __set_bit(INPUT_PROP_POINTING_STICK,
+                                               hi->input->propbit);
+                       }
+                       break;
+       }
+}
+
+
 static const struct hid_device_id lenovo_devices[] = {
        { HID_USB_DEVICE(USB_VENDOR_ID_LENOVO, USB_DEVICE_ID_LENOVO_TPKBD) },
        { HID_USB_DEVICE(USB_VENDOR_ID_LENOVO, USB_DEVICE_ID_LENOVO_CUSBKBD) },
@@ -774,6 +792,7 @@ MODULE_DEVICE_TABLE(hid, lenovo_devices);
 static struct hid_driver lenovo_driver = {
        .name = "lenovo",
        .id_table = lenovo_devices,
+       .input_configured = lenovo_input_configured,
        .input_mapping = lenovo_input_mapping,
        .probe = lenovo_probe,
        .remove = lenovo_remove,