On Tue, Nov 16, 2010 at 01:07:03PM -0800, Ping Cheng wrote:
> From: Ping Cheng <[email protected]>
> 
> Pad tool does not emit motion events. Leave (x,y) alone. Other
> valuators, even the pressure, may be used by pad to pass raw
> data to clients.
> 
> Signed-off-by: Ping Cheng <[email protected]>
> ---
>  src/xf86Wacom.c |   21 ++++++++++++---------
>  1 files changed, 12 insertions(+), 9 deletions(-)
> 
> diff --git a/src/xf86Wacom.c b/src/xf86Wacom.c
> index b421bd4..e906391 100644
> --- a/src/xf86Wacom.c
> +++ b/src/xf86Wacom.c
> @@ -508,18 +508,21 @@ static int wcmDevInit(DeviceIntPtr pWcm)
>               return FALSE;
>       }
>  
> -     wcmInitialToolSize(pInfo);
> -
> -     if (wcmInitArea(pInfo) == FALSE)
> +     if (!IsPad(priv))
>       {
> -             return FALSE;
> -     }
> +             wcmInitialToolSize(pInfo);
> +
> +             if (wcmInitArea(pInfo) == FALSE)
> +             {
> +                     return FALSE;
> +             }
>  
> -     wcmInitialCoordinates(priv->pInfo, 0);
> -     wcmInitialCoordinates(priv->pInfo, 1);
> +             wcmInitialCoordinates(priv->pInfo, 0);
> +             wcmInitialCoordinates(priv->pInfo, 1);
>  
> -     /* Rotation rotates the Max X and Y */
> -     wcmRotateTablet(pInfo, common->wcmRotate);
> +             /* Rotation rotates the Max X and Y */
> +             wcmRotateTablet(pInfo, common->wcmRotate);
> +     }
>  
>       /* pressure normalized to FILTER_PRESSURE_RES */
>       InitValuatorAxisStruct(pInfo->dev, 2,
> -- 
> 1.7.2.3

merged, thanks.

Cheers,
  Peter

------------------------------------------------------------------------------
Beautiful is writing same markup. Internet Explorer 9 supports
standards for HTML5, CSS3, SVG 1.1,  ECMAScript5, and DOM L2 & L3.
Spend less time writing and  rewriting code and more time creating great
experiences on the web. Be a part of the beta today
http://p.sf.net/sfu/msIE9-sfdev2dev
_______________________________________________
Linuxwacom-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel

Reply via email to