From 325d3ebb2a044a4417e5ca860048e6104afc9f5a Mon Sep 17 00:00:00 2001 From: Rui Matos Date: Mon, 9 Oct 2017 18:39:52 +0200 Subject: backends/x11: Add a synaptics check for two finger scroll availability Commit "backends/x11: Support synaptics configuration" added support for synaptics two finger scrolling but didn't add the code to check that it is available resulting in the upper layer always assuming it isn't. --- src/backends/x11/meta-input-settings-x11.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/backends/x11/meta-input-settings-x11.c b/src/backends/x11/meta-input-settings-x11.c index 1d84dfccf..5a82edbe6 100644 --- a/src/backends/x11/meta-input-settings-x11.c +++ b/src/backends/x11/meta-input-settings-x11.c @@ -625,6 +625,17 @@ meta_input_settings_x11_has_two_finger_scroll (MetaInputSettings *settings, guchar *available = NULL; gboolean has_two_finger = TRUE; + if (is_device_synaptics (device)) + { + available = get_property (device, "Synaptics Capabilities", + XA_INTEGER, 8, 4); + if (!available || !available[3]) + has_two_finger = FALSE; + + meta_XFree (available); + return has_two_finger; + } + available = get_property (device, "libinput Scroll Methods Available", XA_INTEGER, 8, SCROLL_METHOD_NUM_FIELDS); if (!available || !available[SCROLL_METHOD_FIELD_2FG]) -- cgit v1.2.1