hardProx stores the old hardware proximity. Say so through the variable name.
Signed-off-by: Peter Hutterer <[email protected]> --- src/wcmCommon.c | 8 ++++---- src/wcmConfig.c | 2 +- src/xf86Wacom.c | 2 +- src/xf86WacomDefs.h | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/wcmCommon.c b/src/wcmCommon.c index 520d449..06e8ace 100644 --- a/src/wcmCommon.c +++ b/src/wcmCommon.c @@ -1139,9 +1139,9 @@ static void commonDispatchDevice(WacomCommonPtr common, unsigned int channel, if (IsUSBDevice(common)) { if (IsTouch(priv) && !ds->proximity) - priv->hardProx = 0; + priv->oldHwProx = 0; else if (IsStylus(priv) || IsEraser(priv)) - priv->hardProx = 1; + priv->oldHwProx = 1; } /* send a touch out for USB Tablet PCs */ @@ -1215,7 +1215,7 @@ static void commonDispatchDevice(WacomCommonPtr common, unsigned int channel, transPressureCurve(priv,&filtered); } - else if (IsCursor(priv) && !priv->hardProx) + else if (IsCursor(priv) && !priv->oldHwProx) { /* initial current max distance for Intuos series */ if ((TabletHasFeature(common, WCM_ROTATION)) || @@ -1227,7 +1227,7 @@ static void commonDispatchDevice(WacomCommonPtr common, unsigned int channel, /* Store current hard prox for next use */ if (!IsTouch(priv)) - priv->hardProx = ds->proximity; + priv->oldHwProx = ds->proximity; /* User-requested filtering comes next */ diff --git a/src/wcmConfig.c b/src/wcmConfig.c index c425b4c..c2d4fba 100644 --- a/src/wcmConfig.c +++ b/src/wcmConfig.c @@ -67,7 +67,7 @@ static int wcmAllocate(InputInfoPtr pInfo) priv->next = NULL; priv->pInfo = pInfo; priv->common = common; /* common info pointer */ - priv->hardProx = 1; /* previous hardware proximity */ + priv->oldHwProx = 1; /* previous hardware proximity */ priv->nPressCtrl [0] = 0; /* pressure curve x0 */ priv->nPressCtrl [1] = 0; /* pressure curve y0 */ priv->nPressCtrl [2] = 100; /* pressure curve x1 */ diff --git a/src/xf86Wacom.c b/src/xf86Wacom.c index b5b03f8..0df6bde 100644 --- a/src/xf86Wacom.c +++ b/src/xf86Wacom.c @@ -574,7 +574,7 @@ static int wcmDevInit(DeviceIntPtr pWcm) if (IsTouch(priv)) { /* hard prox out */ - priv->hardProx = 0; + priv->oldHwProx = 0; } InitWcmDeviceProperties(pInfo); diff --git a/src/xf86WacomDefs.h b/src/xf86WacomDefs.h index ef2908c..69fc204 100644 --- a/src/xf86WacomDefs.h +++ b/src/xf86WacomDefs.h @@ -276,7 +276,7 @@ struct _WacomDeviceRec int oldThrottle; /* previous throttle value */ int oldButtons; /* previous buttons state */ int oldProximity; /* previous proximity */ - int hardProx; /* previous hardware proximity */ + int oldHwProx; /* previous hardware proximity */ int old_device_id; /* last in prox device id */ int old_serial; /* last in prox tool serial number */ int devReverseCount; /* Relative ReverseConvert called twice each movement*/ -- 1.7.3.4 ------------------------------------------------------------------------------ Protect Your Site and Customers from Malware Attacks Learn about various malware tactics and how to avoid them. Understand malware threats, the impact they can have on your business, and how you can protect your company and customers by using code signing. http://p.sf.net/sfu/oracle-sfdevnl _______________________________________________ Linuxwacom-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel
