summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarlos Garnacho <carlosg@gnome.org>2014-12-10 16:51:43 +0100
committerEmmanuele Bassi <ebassi@gnome.org>2015-01-09 11:51:42 +0000
commitbe6ac84cf2e0d60be7ffe6ab0e2ec2880702a7c8 (patch)
tree041b469a6564861f57b0df18d96e3670112d1226
parenta924a74a45f4cd44ee4bbc160f183ec4bcbba6e6 (diff)
downloadclutter-be6ac84cf2e0d60be7ffe6ab0e2ec2880702a7c8.tar.gz
x11: Resort to device name matching for non-mt touchpads
If a touchpad is not multitouch, or does not report MT axes (eg. through the libinput driver), resort to name matching before falling back to CLUTTER_POINTER_DEVICE. https://bugzilla.gnome.org/show_bug.cgi?id=741350 (cherry picked from commit a0e2ba62a185c2db1fb998863f3e2011aebfaf68) Signed-off-by: Emmanuele Bassi <ebassi@gnome.org>
-rw-r--r--clutter/x11/clutter-device-manager-xi2.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/clutter/x11/clutter-device-manager-xi2.c b/clutter/x11/clutter-device-manager-xi2.c
index c05529302..47aa4bfe7 100644
--- a/clutter/x11/clutter-device-manager-xi2.c
+++ b/clutter/x11/clutter-device-manager-xi2.c
@@ -254,6 +254,8 @@ create_device (ClutterDeviceManagerXI2 *manager_xi2,
source = CLUTTER_CURSOR_DEVICE;
else if (strstr (name, "wacom") != NULL || strstr (name, "pen") != NULL)
source = CLUTTER_PEN_DEVICE;
+ else if (strstr (name, "touchpad") != NULL)
+ source = CLUTTER_TOUCHPAD_DEVICE;
else
source = CLUTTER_POINTER_DEVICE;