This behaviour applies only to stylus devices, not for any others.

Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
---
 src/wcmXCommand.c |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/wcmXCommand.c b/src/wcmXCommand.c
index d01054d..7c9d7de 100644
--- a/src/wcmXCommand.c
+++ b/src/wcmXCommand.c
@@ -197,8 +197,10 @@ void InitWcmDeviceProperties(InputInfoPtr pInfo)
        values[0] = common->wcmTouch;
        prop_touch = InitWcmAtom(pInfo->dev, WACOM_PROP_TOUCH, 8, 1, values);
 
-       values[0] = common->wcmTPCButton;
-       prop_hover = InitWcmAtom(pInfo->dev, WACOM_PROP_HOVER, 8, 1, values);
+       if (IsStylus(priv)) {
+               values[0] = common->wcmTPCButton;
+               prop_hover = InitWcmAtom(pInfo->dev, WACOM_PROP_HOVER, 8, 1, 
values);
+       }
 
        values[0] = common->wcmGesture;
        prop_gesture = InitWcmAtom(pInfo->dev, WACOM_PROP_ENABLE_GESTURE, 8, 1, 
values);
@@ -765,6 +767,9 @@ int wcmSetProperty(DeviceIntPtr dev, Atom property, 
XIPropertyValuePtr prop,
                if ((values[0] != 0) && (values[0] != 1))
                        return BadValue;
 
+               if (!IsStylus(priv))
+                       return BadMatch;
+
                if (!checkonly && common->wcmTPCButton != !values[0])
                        common->wcmTPCButton = values[0];
 #ifdef DEBUG
-- 
1.7.3.4


------------------------------------------------------------------------------
Gaining the trust of online customers is vital for the success of any company
that requires sensitive data to be transmitted over the Web.   Learn how to 
best implement a security strategy that keeps consumers' information secure 
and instills the confidence they need to proceed with transactions.
http://p.sf.net/sfu/oracle-sfdevnl 
_______________________________________________
Linuxwacom-devel mailing list
Linuxwacom-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel

Reply via email to