On Tue, Jan 25, 2011 at 11:48:49AM -0800, Ping Cheng wrote:
> Resolution uses different units in the kernel (point/mm), XInput
> (point/m), and the hardware protocol (point/cm/1000 for touch and
> point/inch for pen).
>
> We have a resolution table for pen in the X driver. But we get the
> touch resolution directly from the kernel through HID descriptor.
>
> For kernels older than 2.6.30, resolution is not part of absinfo.
> For kernels older than 2.6.35, kernel does not pass resolution to
> the userland.
>
> This patch addresses those issues and correct a conversion bug
> introduced by the RX/RY workaround.
>
> Signed-off-by: Ping Cheng <pingli...@gmail.com>
> Reviewed-by: Chris Bagwell <ch...@cnpbagwell.com>
merged, thanks.
Cheers,
Peter
> ---
> src/wcmUSB.c | 33 +++++++++++++++++++++------------
> src/xf86WacomDefs.h | 8 ++++----
> 2 files changed, 25 insertions(+), 16 deletions(-)
>
> diff --git a/src/wcmUSB.c b/src/wcmUSB.c
> index cfaf920..8343032 100644
> --- a/src/wcmUSB.c
> +++ b/src/wcmUSB.c
> @@ -27,6 +27,7 @@
> #include <asm/types.h>
> #include <linux/input.h>
> #include <sys/utsname.h>
> +#include <linux/version.h>
>
> #define MAX_USB_EVENTS 32
>
> @@ -463,8 +464,14 @@ int usbWcmGetRanges(InputInfoPtr pInfo)
> if (!is_touch)
> common->wcmMaxX = absinfo.maximum;
> else
> + {
> common->wcmMaxTouchX = absinfo.maximum;
>
> +#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,30)
> + common->wcmTouchResolX = absinfo.resolution * 1000;
> +#endif
> + }
> +
> /* max y */
> if (ioctl(pInfo->fd, EVIOCGABS(ABS_Y), &absinfo) < 0)
> {
> @@ -480,36 +487,38 @@ int usbWcmGetRanges(InputInfoPtr pInfo)
> if (!is_touch)
> common->wcmMaxY = absinfo.maximum;
> else
> + {
> common->wcmMaxTouchY = absinfo.maximum;
>
> +#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,30)
> + common->wcmTouchResolY = absinfo.resolution * 1000;
> +#endif
> + }
> +
> /* max finger strip X for tablets with Expresskeys
> - * or touch physical X for TabletPCs with touch */
> + * or physical X for touch devices in hundredths of a mm */
> if (ioctl(pInfo->fd, EVIOCGABS(ABS_RX), &absinfo) == 0)
> {
> if (is_touch)
> - common->wcmTouchResolX = absinfo.maximum;
> + common->wcmTouchResolX =
> + (int)(((double)common->wcmMaxTouchX * 10.0
> + / (double)absinfo.maximum) + 0.5);
> else
> common->wcmMaxStripX = absinfo.maximum;
> }
>
> /* max finger strip Y for tablets with Expresskeys
> - * or touch physical Y for TabletPCs with touch */
> + * or physical Y for touch devices in hundredths of a mm */
> if (ioctl(pInfo->fd, EVIOCGABS(ABS_RY), &absinfo) == 0)
> {
> if (is_touch)
> - common->wcmTouchResolY = absinfo.maximum;
> + common->wcmTouchResolY =
> + (int)(((double)common->wcmMaxTouchY * 10.0
> + / (double)absinfo.maximum) + 0.5);
> else
> common->wcmMaxStripY = absinfo.maximum;
> }
>
> - if (is_touch && common->wcmTouchResolX && common->wcmMaxTouchX)
> - {
> - common->wcmTouchResolX = (int)(((double)common->wcmTouchResolX)
> - / ((double)common->wcmMaxTouchX) + 0.5);
> - common->wcmTouchResolY = (int)(((double)common->wcmTouchResolY)
> - / ((double)common->wcmMaxTouchY) + 0.5);
> - }
> -
> /* max z cannot be configured */
> if (ioctl(pInfo->fd, EVIOCGABS(ABS_PRESSURE), &absinfo) == 0)
> common->wcmMaxZ = absinfo.maximum;
> diff --git a/src/xf86WacomDefs.h b/src/xf86WacomDefs.h
> index 186694b..91adf72 100644
> --- a/src/xf86WacomDefs.h
> +++ b/src/xf86WacomDefs.h
> @@ -426,10 +426,10 @@ struct _WacomCommonRec
> int wcmMaxZ; /* tablet max Z value */
> int wcmMaxTouchX; /* touch panel max X value */
> int wcmMaxTouchY; /* touch panel max Y value */
> - int wcmResolX; /* pen tool X resolution in points/inch */
> - int wcmResolY; /* pen tool Y resolution in points/inch */
> - int wcmTouchResolX; /* touch X resolution in points/mm */
> - int wcmTouchResolY; /* touch Y resolution in points/mm */
> + int wcmResolX; /* pen tool X resolution in points/m */
> + int wcmResolY; /* pen tool Y resolution in points/m */
> + int wcmTouchResolX; /* touch X resolution in points/m */
> + int wcmTouchResolY; /* touch Y resolution in points/m */
> /* tablet Z resolution is equivalent
> * to wcmMaxZ which is equal to 100%
> pressure */
> int wcmMaxCapacity; /* max capacity value */
> --
> 1.7.3.4
>
------------------------------------------------------------------------------
Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)!
Finally, a world-class log management solution at an even better price-free!
Download using promo code Free_Logger_4_Dev2Dev. Offer expires
February 28th, so secure your free ArcSight Logger TODAY!
http://p.sf.net/sfu/arcsight-sfd2d
_______________________________________________
Linuxwacom-devel mailing list
Linuxwacom-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel
