Hi Chris,
Thanks for the patch, I just have one minor comment below.
On Sun, Feb 14, 2010 at 07:35:57PM -0600, ch...@cnpbagwell.com wrote:
> From: Chris Bagwell <ch...@cnpbagwell.com>
>
> Setting relative mode default for bamboo was delayed only
> because common->tablet_id wasn't avaliable early enough.
> Now that its value is around, move setting default values to
> single location.
>
> Signed-off-by: Chris Bagwell <ch...@cnpbagwell.com>
> ---
> src/wcmConfig.c | 12 +++++++++---
> src/wcmValidateDevice.c | 8 --------
> 2 files changed, 9 insertions(+), 11 deletions(-)
>
> diff --git a/src/wcmConfig.c b/src/wcmConfig.c
> index b5d07f2..20d2d7d 100644
> --- a/src/wcmConfig.c
> +++ b/src/wcmConfig.c
> @@ -176,7 +176,8 @@ error:
> return 0;
> }
>
> -static int wcmAllocateByType(LocalDevicePtr local, const char *type)
> +static int wcmAllocateByType(LocalDevicePtr local, const char *type,
> + int tablet_id)
> {
> int rc = 0;
>
> @@ -191,7 +192,12 @@ static int wcmAllocateByType(LocalDevicePtr local, const
> char *type)
> if (xf86NameCmp(type, "stylus") == 0)
> rc = wcmAllocate(local, XI_STYLUS, ABSOLUTE_FLAG|STYLUS_ID);
> else if (xf86NameCmp(type, "touch") == 0)
> - rc = wcmAllocate(local, XI_TOUCH, ABSOLUTE_FLAG|TOUCH_ID);
> + {
> + if (tablet_id >= 0xd0 && tablet_id <= 0xd3)
> + rc = wcmAllocate(local, XI_TOUCH, TOUCH_ID);
> + else
> + rc = wcmAllocate(local, XI_TOUCH,
> ABSOLUTE_FLAG|TOUCH_ID);
can we change this to the following code to ease readability (and
debugability):
int flags = TOUCH_ID;
if (tablet_id ...)
flags |= ABSOLUTE_FLAG
rc = wcmAllocate(local, XI_TOUCH, flags);
other than that, looks fine to me
Cheers,
Peter
------------------------------------------------------------------------------
SOLARIS 10 is the OS for Data Centers - provides features such as DTrace,
Predictive Self Healing and Award Winning ZFS. Get Solaris 10 NOW
http://p.sf.net/sfu/solaris-dev2dev
_______________________________________________
Linuxwacom-devel mailing list
Linuxwacom-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel
