On Sat, Jun 25, 2011 at 01:05:51PM -0500, ch...@cnpbagwell.com wrote:
> From: Chris Bagwell <ch...@cnpbagwell.com>
>
> Signed-off-by: Chris Bagwell <ch...@cnpbagwell.com>
Reviewed-by: Peter Hutterer <peter.hutte...@who-t.net>
Cheers,
Peter
> ---
> src/wcmCommon.c | 8 +++++---
> src/wcmValidateDevice.c | 2 +-
> src/wcmXCommand.c | 4 ++--
> 3 files changed, 8 insertions(+), 6 deletions(-)
>
> diff --git a/src/wcmCommon.c b/src/wcmCommon.c
> index d3a3458..bb15411 100644
> --- a/src/wcmCommon.c
> +++ b/src/wcmCommon.c
> @@ -1167,13 +1167,15 @@ static void commonDispatchDevice(WacomCommonPtr
> common, unsigned int channel,
> return;
> }
>
> - if (IsPen(priv))
> + if (IsPen(priv) || IsTouch(priv))
> {
> priv->minPressure = rebasePressure(priv, &filtered);
> filtered.pressure = normalizePressure(priv, &filtered);
> - filtered.buttons = setPressureButton(priv, &filtered);
> + if (IsPen(priv))
> + filtered.buttons = setPressureButton(priv, &filtered);
> filtered.pressure = applyPressureCurve(priv,&filtered);
> - common->wcmPenInProx = filtered.proximity;
> + if (IsPen(priv))
> + common->wcmPenInProx = filtered.proximity;
> }
>
> else if (IsCursor(priv) && !priv->oldCursorHwProx)
> diff --git a/src/wcmValidateDevice.c b/src/wcmValidateDevice.c
> index 12a0c2e..77ac813 100644
> --- a/src/wcmValidateDevice.c
> +++ b/src/wcmValidateDevice.c
> @@ -771,7 +771,7 @@ Bool wcmParseOptions(InputInfoPtr pInfo, Bool is_primary,
> Bool is_dependent)
> * Slightly raised curve might be 0,5,95,100
> */
> s = xf86SetStrOption(pInfo->options, "PressCurve", "0,0,100,100");
> - if (s && (IsStylus(priv) || IsEraser(priv)))
> + if (s && (IsPen(priv) || IsTouch(priv)))
> {
> int a,b,c,d;
> if ((sscanf(s,"%d,%d,%d,%d",&a,&b,&c,&d) != 4) ||
> diff --git a/src/wcmXCommand.c b/src/wcmXCommand.c
> index 18e5b61..5666bac 100644
> --- a/src/wcmXCommand.c
> +++ b/src/wcmXCommand.c
> @@ -169,7 +169,7 @@ void InitWcmDeviceProperties(InputInfoPtr pInfo)
> values[0] = common->wcmRotate;
> prop_rotation = InitWcmAtom(pInfo->dev, WACOM_PROP_ROTATION, 8, 1,
> values);
>
> - if (IsStylus(priv) || IsEraser(priv)) {
> + if (IsPen(priv) || IsTouch(priv)) {
> values[0] = priv->nPressCtrl[0];
> values[1] = priv->nPressCtrl[1];
> values[2] = priv->nPressCtrl[2];
> @@ -650,7 +650,7 @@ int wcmSetProperty(DeviceIntPtr dev, Atom property,
> XIPropertyValuePtr prop,
> pcurve[2], pcurve[3]))
> return BadValue;
>
> - if (IsCursor(priv) || IsPad (priv) || IsTouch (priv))
> + if (IsCursor(priv) || IsPad (priv))
> return BadValue;
>
> if (!checkonly)
> --
> 1.7.5.2
>
>
> ------------------------------------------------------------------------------
> All the data continuously generated in your IT infrastructure contains a
> definitive record of customers, application performance, security
> threats, fraudulent activity and more. Splunk takes this data and makes
> sense of it. Business sense. IT sense. Common sense..
> http://p.sf.net/sfu/splunk-d2d-c1
> _______________________________________________
> Linuxwacom-devel mailing list
> Linuxwacom-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel
>
------------------------------------------------------------------------------
All of the data generated in your IT infrastructure is seriously valuable.
Why? It contains a definitive record of application performance, security
threats, fraudulent activity, and more. Splunk takes this data and makes
sense of it. IT sense. And common sense.
http://p.sf.net/sfu/splunk-d2d-c2
_______________________________________________
Linuxwacom-devel mailing list
Linuxwacom-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel
