From: Sjoerd Simons <sjo...@greynoise.nl>
In case of a screen integrated tablet with touch support change the
defaults such that multitouch events are used instead of the driver
builtin gesture recognition. This, by default, makes the wacom
touchscreens behave the same as other touchscreens and allows for better
integration with applications.
For external tablets keep the default to recognizing gestures, no real
applications really support indirect touch events so better to keep it
in the driver (just like e.g. the synaptics driver does).
Signed-off-by: Sjoerd Simons <sjo...@greynoise.nl>
---
man/wacom.man | 7 ++++---
src/wcmValidateDevice.c | 8 ++++++--
2 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/man/wacom.man b/man/wacom.man
index 98dec37..9f74ba1 100644
--- a/man/wacom.man
+++ b/man/wacom.man
@@ -232,9 +232,10 @@ The threshold applies to the normalised pressure range of
[0..2048].
The default is 27.
.TP 4
.B Option \fI"Gesture"\fP \fI"bool"\fP
-Enable or disable multi-finger in-driver gesture support on the device.
Default: off
-unless the tablet supports multi-touch. Note that disabling this option may
allow
-the desktop environment to detect multi-finger gestures instead.
+Enable or disable multi-finger in-driver gesture support on the device.
Default: off
+if the tablet is a touchscreen and supports multi-touch, on otherwise. Note
that
+disabling this option allows the desktop environment to detect multi-finger
+gestures instead.
.TP 4
.B Option \fI"ZoomDistance"\fP \fI"number"\fP
If
diff --git a/src/wcmValidateDevice.c b/src/wcmValidateDevice.c
index 81e9a2a..6597158 100644
--- a/src/wcmValidateDevice.c
+++ b/src/wcmValidateDevice.c
@@ -909,9 +909,13 @@ Bool wcmPreInitParseOptions(InputInfoPtr pInfo, Bool
is_primary,
{
int gesture_is_on;
- /* GestureDefault was off for all devices
- * except when multi-touch is supported */
+ /* GestureDefault is off for all devices
+ * except when multi-touch is supported for non-touchscreens */
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 16
+ common->wcmGestureDefault = !TabletHasFeature(common, WCM_LCD);
+#else
common->wcmGestureDefault = 1;
+#endif
gesture_is_on = xf86SetBoolOption(pInfo->options, "Gesture",
common->wcmGestureDefault);
--
1.7.10.4
------------------------------------------------------------------------------
Try New Relic Now & We'll Send You this Cool Shirt
New Relic is the only SaaS-based application performance monitoring service
that delivers powerful full stack analytics. Optimize and monitor your
browser, app, & servers with just a few lines of code. Try New Relic
and get this awesome Nerd Life shirt! http://p.sf.net/sfu/newrelic_d2d_may
_______________________________________________
Linuxwacom-devel mailing list
Linuxwacom-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel
