summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2016-04-21 15:08:23 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2016-04-22 12:13:26 +1000
commit248912f1ef2dff4cf37a00d6580468b605598b54 (patch)
treeceaf098b84b3b58285062a1830941c89ab3ae52b
parent46c2fdd522892c99950cb4875922247ef2cd61a2 (diff)
touchpad: exclude Logitech touchpads from disable-while-typing
Logitech does not sell internal touchpads, the closest ones are the TK820 and the K400 series devices. Neither of which need DWT, the touchpad is next to the keyboard. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Hans de Goede <hdegoede@redhat.com>
-rw-r--r--src/evdev-mt-touchpad.c4
-rw-r--r--src/libinput-util.h1
2 files changed, 5 insertions, 0 deletions
diff --git a/src/evdev-mt-touchpad.c b/src/evdev-mt-touchpad.c
index 40c51c68..1974e2a0 100644
--- a/src/evdev-mt-touchpad.c
+++ b/src/evdev-mt-touchpad.c
@@ -1335,6 +1335,10 @@ tp_want_dwt(struct evdev_device *touchpad,
if (bus_tp == BUS_I8042 && bus_kbd != bus_tp)
return false;
+ /* Logitech does not have internal touchpads */
+ if (vendor_tp == VENDOR_ID_LOGITECH)
+ return false;
+
/* For Apple touchpads, always use its internal keyboard */
if (vendor_tp == VENDOR_ID_APPLE) {
return vendor_kbd == vendor_tp &&
diff --git a/src/libinput-util.h b/src/libinput-util.h
index 66748eac..8f814cc7 100644
--- a/src/libinput-util.h
+++ b/src/libinput-util.h
@@ -37,6 +37,7 @@
#include "libinput.h"
#define VENDOR_ID_APPLE 0x5ac
+#define VENDOR_ID_LOGITECH 0x46d
#define VENDOR_ID_WACOM 0x56a
#define VENDOR_ID_SYNAPTICS_SERIAL 0x002
#define PRODUCT_ID_APPLE_KBD_TOUCHPAD 0x273