On Thu, Oct 10, 2013 at 04:11:47PM -0700, Ping Cheng wrote:
> This patch also removes redundant device name in X_PROBED messages.
>
> Reviewed-by: Peter Hutterer <peter.hutte...@who-t.net>
> Signed-off-by: Ping Cheng <pi...@wacom.com>
> ---
> v2: Update commit comments
merged thanks, but please change the subject to [PATCH xf86-input-wacom ]
next time. anything that's within [] will be removed by git.
Cheers,
Peter
> ---
> src/wcmCommon.c | 12 +++++-------
> 1 file changed, 5 insertions(+), 7 deletions(-)
>
> diff --git a/src/wcmCommon.c b/src/wcmCommon.c
> index c81310f..df71842 100644
> --- a/src/wcmCommon.c
> +++ b/src/wcmCommon.c
> @@ -1323,7 +1323,7 @@ int wcmInitTablet(InputInfoPtr pInfo, const char* id,
> float version)
> return !Success;
>
> /* Default threshold value if not set */
> - if (common->wcmThreshold <= 0)
> + if (common->wcmThreshold <= 0 && IsPen(priv))
> {
> /* Threshold for counting pressure as a button */
> common->wcmThreshold = DEFAULT_THRESHOLD;
> @@ -1333,19 +1333,17 @@ int wcmInitTablet(InputInfoPtr pInfo, const char* id,
> float version)
> }
>
> /* output tablet state as probed */
> - if (TabletHasFeature(common, WCM_PEN))
> - xf86Msg(X_PROBED, "%s: Wacom %s tablet maxX=%d maxY=%d maxZ=%d "
> + if (IsPen(priv))
> + xf86Msg(X_PROBED, "%s: 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 maxZ=%d "
> + else if (IsTouch(priv))
> + xf86Msg(X_PROBED, "%s: maxX=%d maxY=%d maxZ=%d "
> "resX=%d resY=%d \n",
> pInfo->name,
> - model->name,
> common->wcmMaxTouchX, common->wcmMaxTouchY,
> common->wcmMaxZ,
> common->wcmTouchResolX, common->wcmTouchResolY);
> --
> 1.8.1.2
>
------------------------------------------------------------------------------
October Webinars: Code for Performance
Free Intel webinars can help you accelerate application performance.
Explore tips for MPI, OpenMP, advanced profiling, and more. Get the most from
the latest Intel processors and coprocessors. See abstracts and register >
http://pubads.g.doubleclick.net/gampad/clk?id=60134071&iu=/4140/ostg.clktrk
_______________________________________________
Linuxwacom-devel mailing list
Linuxwacom-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel
