The axis lable describes the physical axis, not how the axis is currently
used. Hence, the labelling for x/y on a wacom device is always for an
absolute axis, even if the usage mode is relative.
Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
---
src/xf86Wacom.c | 15 ++-------------
1 files changed, 2 insertions(+), 13 deletions(-)
diff --git a/src/xf86Wacom.c b/src/xf86Wacom.c
index ad21c28..c70c7da 100644
--- a/src/xf86Wacom.c
+++ b/src/xf86Wacom.c
@@ -332,9 +332,6 @@ void wcmInitialCoordinates(LocalDevicePtr local, int axis)
WacomCommonPtr common = priv->common;
int topx = 0, topy = 0, resolution_x, resolution_y;
int bottomx = priv->maxX, bottomy = priv->maxY;
-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
- Atom label_x, label_y;
-#endif
wcmMappingFactor(local);
@@ -357,14 +354,6 @@ void wcmInitialCoordinates(LocalDevicePtr local, int axis)
bottomy -= priv->tvoffsetY;
}
}
-
-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
- label_x = XIGetKnownProperty(AXIS_LABEL_PROP_ABS_X);
- label_y = XIGetKnownProperty(AXIS_LABEL_PROP_ABS_Y);
- } else {
- label_x = XIGetKnownProperty(AXIS_LABEL_PROP_REL_X);
- label_y = XIGetKnownProperty(AXIS_LABEL_PROP_REL_Y);
-#endif
}
resolution_x = priv->resolX;
resolution_y = priv->resolY;
@@ -386,7 +375,7 @@ void wcmInitialCoordinates(LocalDevicePtr local, int axis)
case 0:
InitValuatorAxisStruct(local->dev, 0,
#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
- label_x,
+
XIGetKnownProperty(AXIS_LABEL_PROP_ABS_X),
#endif
topx, bottomx,
resolution_x, 0, resolution_x);
@@ -394,7 +383,7 @@ void wcmInitialCoordinates(LocalDevicePtr local, int axis)
case 1:
InitValuatorAxisStruct(local->dev, 1,
#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
- label_y,
+
XIGetKnownProperty(AXIS_LABEL_PROP_ABS_Y),
#endif
topy, bottomy,
resolution_y, 0, resolution_y);
--
1.6.6.1
------------------------------------------------------------------------------
Download Intel® 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
