[Linuxwacom-devel] [PATCH 10/13] Only init strip and wheel buttons for the pad.

[Peter Hutterer]

AFAICT, there's no pens with scroll strips out there.

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

diff --git a/src/wcmXCommand.c b/src/wcmXCommand.c
index 4ddddff..b8bdd92 100644
--- a/src/wcmXCommand.c
+++ b/src/wcmXCommand.c
@@ -194,17 +194,19 @@ void InitWcmDeviceProperties(LocalDevicePtr local)
        values[3] = priv->serial;
        prop_serials = InitWcmAtom(local->dev, WACOM_PROP_SERIALIDS, 32, 4, 
values);
 
-       values[0] = priv->striplup;
-       values[1] = priv->stripldn;
-       values[2] = priv->striprup;
-       values[3] = priv->striprdn;
-       prop_strip_buttons = InitWcmAtom(local->dev, WACOM_PROP_STRIPBUTTONS, 
8, 4, values);
-
-       values[0] = priv->relup;
-       values[1] = priv->reldn;
-       values[2] = priv->wheelup;
-       values[3] = priv->wheeldn;
-       prop_wheel_buttons = InitWcmAtom(local->dev, WACOM_PROP_WHEELBUTTONS, 
8, 4, values);
+       if (IsPad(priv)) {
+               values[0] = priv->striplup;
+               values[1] = priv->stripldn;
+               values[2] = priv->striprup;
+               values[3] = priv->striprdn;
+               prop_strip_buttons = InitWcmAtom(local->dev, 
WACOM_PROP_STRIPBUTTONS, 8, 4, values);
+
+               values[0] = priv->relup;
+               values[1] = priv->reldn;
+               values[2] = priv->wheelup;
+               values[3] = priv->wheeldn;
+               prop_wheel_buttons = InitWcmAtom(local->dev, 
WACOM_PROP_WHEELBUTTONS, 8, 4, values);
+       }
 
        values[0] = priv->tvResolution[0];
        values[1] = priv->tvResolution[1];
-- 
1.6.6.1


------------------------------------------------------------------------------
Download Intel&#174; Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
_______________________________________________
Linuxwacom-devel mailing list
Linuxwacom-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel