From: Chris Bagwell <ch...@cnpbagwell.com>
Since wcmKeys can have double meanings (MT Bamboo),
switch to tablet featues.
Signed-off-by: Chris Bagwell <ch...@cnpbagwell.com>
---
src/wcmValidateDevice.c | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/wcmValidateDevice.c b/src/wcmValidateDevice.c
index a22ca3c..b7312a3 100644
--- a/src/wcmValidateDevice.c
+++ b/src/wcmValidateDevice.c
@@ -642,8 +642,9 @@ int wcmParseOptions(InputInfoPtr pInfo, int hotplugged)
xf86Msg(X_WARNING, "%s: TPCButton option can only be set "
"by stylus.\n", pInfo->name);
- /* a single touch device */
- if (ISBITSET (common->wcmKeys, BTN_TOOL_DOUBLETAP))
+ /* a single or double touch device */
+ if (TabletHasFeature(common, WCM_1FGT) ||
+ TabletHasFeature(common, WCM_2FGT))
{
/* TouchDefault was off for all devices
* except when touch is supported */
@@ -669,7 +670,7 @@ int wcmParseOptions(InputInfoPtr pInfo, int hotplugged)
}
/* 2FG touch device */
- if (ISBITSET (common->wcmKeys, BTN_TOOL_TRIPLETAP))
+ if (TabletHasFeature(common, WCM_2FGT))
{
/* GestureDefault was off for all devices
* except when multi-touch is supported */
--
1.7.3.4
------------------------------------------------------------------------------
Learn how Oracle Real Application Clusters (RAC) One Node allows customers
to consolidate database storage, standardize their database environment, and,
should the need arise, upgrade to a full multi-node Oracle RAC database
without downtime or disruption
http://p.sf.net/sfu/oracle-sfdevnl
_______________________________________________
Linuxwacom-devel mailing list
Linuxwacom-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel
