On Wed, Dec 08, 2010 at 02:27:31PM -0800, Ping Cheng wrote:
> No real code change. Only updated xf86Msg so device specific
> information is posted.
> 
> Signed-off-by: Ping Cheng <[email protected]>
> ---
>  src/wcmCommon.c |   10 +++++++++-
>  src/xf86Wacom.c |    2 +-
>  2 files changed, 10 insertions(+), 2 deletions(-)
> 
> diff --git a/src/wcmCommon.c b/src/wcmCommon.c
> index 37737bb..8ac1184 100644
> --- a/src/wcmCommon.c
> +++ b/src/wcmCommon.c
> @@ -1405,13 +1405,21 @@ int wcmInitTablet(InputInfoPtr pInfo, const char* id, 
> float version)
>       }
>  
>       /* output tablet state as probed */
> -     xf86Msg(X_PROBED, "%s: Wacom %s tablet maxX=%d maxY=%d maxZ=%d "
> +     if (TabletHasFeature(common, WCM_PEN))
> +             xf86Msg(X_PROBED, "%s: Wacom %s tablet maxX=%d maxY=%d maxZ=%d "
>                       "resX=%d resY=%d  tilt=%s\n",
>                       pInfo->name,
>                       model->name,
>                       common->wcmMaxX, common->wcmMaxY, common->wcmMaxZ,
>                       common->wcmResolX, common->wcmResolY,
>                       HANDLE_TILT(common) ? "enabled" : "disabled");
> +     else
> +             xf86Msg(X_PROBED, "%s: Wacom %s tablet maxX=%d maxY=%d "
> +                     "resX=%d resY=%d \n",
> +                     pInfo->name,
> +                     model->name,
> +                     common->wcmMaxTouchX, common->wcmMaxTouchY,
> +                     common->wcmTouchResolX, common->wcmTouchResolY);
>  
>       return Success;
>  }
> diff --git a/src/xf86Wacom.c b/src/xf86Wacom.c
> index 04a9b92..2568c2c 100644
> --- a/src/xf86Wacom.c
> +++ b/src/xf86Wacom.c
> @@ -224,7 +224,7 @@ static int wcmInitArea(InputInfoPtr pInfo)
>                       "resol X=%d resol Y=%d\n",
>                       pInfo->name, priv->topX,
>                       priv->topY, priv->bottomX, priv->bottomY,
> -                     common->wcmResolX, common->wcmResolY);
> +                     priv->resolX, priv->resolY);
>       return TRUE;
>  }
>  
> -- 
> 1.7.2.3

applied, thanks.

Cheers,
  Peter

------------------------------------------------------------------------------
This SF Dev2Dev email is sponsored by:

WikiLeaks The End of the Free Internet
http://p.sf.net/sfu/therealnews-com
_______________________________________________
Linuxwacom-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel

Reply via email to