The touchstrip values are already stored in oldStrip[XY], and appear to
also be stored in oldTilt[XY] as a quirk of history. The value of oldTilt[XY]
itself is only read in wcmSendNonPadEvents (which is not called for the pad
device for obvious reasons ;)). At this point in time, there is absolutely
no reason to store a second copy of the strip values in oldTilt[XY].

Signed-off-by: Jason Gerecke <killert...@gmail.com>
---
 src/wcmCommon.c | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/src/wcmCommon.c b/src/wcmCommon.c
index 87bc76c..b5be156 100644
--- a/src/wcmCommon.c
+++ b/src/wcmCommon.c
@@ -520,27 +520,16 @@ static void wcmUpdateOldState(const InputInfoPtr pInfo,
                              const WacomDeviceState *ds)
 {
        const WacomDevicePtr priv = (WacomDevicePtr) pInfo->private;
-       int tx, ty;
 
        priv->oldWheel = ds->abswheel;
        priv->oldWheel2 = ds->abswheel2;
        priv->oldButtons = ds->buttons;
 
-       if (IsPad(priv))
-       {
-               tx = ds->stripx;
-               ty = ds->stripy;
-       } else
-       {
-               tx = ds->tiltx;
-               ty = ds->tilty;
-       }
-
        priv->oldX = priv->currentX;
        priv->oldY = priv->currentY;
        priv->oldZ = ds->pressure;
-       priv->oldTiltX = tx;
-       priv->oldTiltY = ty;
+       priv->oldTiltX = ds->tiltx;
+       priv->oldTiltY = ds->tilty;
        priv->oldStripX = ds->stripx;
        priv->oldStripY = ds->stripy;
        priv->oldRot = ds->rotation;
-- 
1.9.1


------------------------------------------------------------------------------
Put Bad Developers to Shame
Dominate Development with Jenkins Continuous Integration
Continuously Automate Build, Test & Deployment 
Start a new project now. Try Jenkins in the cloud.
http://p.sf.net/sfu/13600_Cloudbees
_______________________________________________
Linuxwacom-devel mailing list
Linuxwacom-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel

Reply via email to