rpms/xorg-x11-drv-wacom/F-12 wacom-0.10.6-axis-mode.patch, NONE, 1.1 xorg-x11-drv-wacom.spec, 1.13, 1.14

[Peter Hutterer]

Author: whot

Update of /cvs/pkgs/rpms/xorg-x11-drv-wacom/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv24808

Modified Files:
	xorg-x11-drv-wacom.spec 
Added Files:
	wacom-0.10.6-axis-mode.patch 
Log Message:
* Fri May 21 2010 Peter Hutterer <peter.hutterer at redhat.com> 0.10.6-2
- wacom-0.10.6-axis-mode.patch: Fix axis mode setting, don't set
  OutOfProximity bit.


wacom-0.10.6-axis-mode.patch:
 xf86Wacom.c |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

--- NEW FILE wacom-0.10.6-axis-mode.patch ---
>From 060ad78cf464508f1d123c00b7340838a27f19e3 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer at who-t.net>
Date: Thu, 20 May 2010 16:41:02 +1000
Subject: [PATCH] Don't add the OutOfProximity flag to the axis mode.

The server and many clients tends to check for Absolute and/or Relative, but
don't use Absolute as a flag. The XI protocol spec only allows for 0 or 1
(Relative or Absolute), not for an extra flag.

As a result, a device set up with (Absolute|OutOfProximity) will be
interpreted as Absolute by some clients and relative by others.

Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
Reviewed-by: Ping Cheng <pinglinux at gmail.com>
---
 src/xf86Wacom.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/src/xf86Wacom.c b/src/xf86Wacom.c
index 0b39ce0..761e3b7 100644
--- a/src/xf86Wacom.c
+++ b/src/xf86Wacom.c
@@ -674,8 +674,7 @@ static int wcmRegisterX11Devices (LocalDevicePtr local)
 #endif
 					  GetMotionHistorySize(),
 					  ((priv->flags & ABSOLUTE_FLAG) ?
-					  Absolute : Relative) | 
-					  OutOfProximity ) == FALSE)
+					  Absolute : Relative)) == FALSE)
 	{
 		xf86Msg(X_ERROR, "%s: unable to allocate Valuator class device\n", local->name);
 		return FALSE;
-- 
1.7.0.1



Index: xorg-x11-drv-wacom.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-wacom/F-12/xorg-x11-drv-wacom.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- xorg-x11-drv-wacom.spec	27 Apr 2010 04:06:31 -0000	1.13
+++ xorg-x11-drv-wacom.spec	20 May 2010 23:21:53 -0000	1.14
@@ -5,7 +5,7 @@
 Summary:    Xorg X11 wacom input driver
 Name:       xorg-x11-drv-wacom
 Version:    0.10.6
-Release:    1%{?dist}
+Release:    2%{?dist}
 URL:        http://www.x.org
 License:    GPLv2+
 Group:      User Interface/X Hardware Support
@@ -13,6 +13,8 @@ BuildRoot:  %{_tmppath}/%{name}-%{versio
 
 Source0: http://prdownloads.sourceforge.net/linuxwacom/xf86-input-wacom-%{version}.tar.bz2
 
+Patch01: wacom-0.10.6-axis-mode.patch
+
 ExcludeArch: s390 s390x
 
 BuildRequires: xorg-x11-server-sdk >= 1.7.0
@@ -32,6 +34,8 @@ X.Org X11 wacom input driver for Wacom t
 %prep
 %setup -q -n %{tarball}-%{version}
 
+%patch01 -p1 
+
 %build
 %configure --disable-static
 make %{_smp_mflags}
@@ -81,6 +85,10 @@ X.Org X11 wacom input driver development
 %{_includedir}/xorg/wacom-properties.h
 
 %changelog
+* Fri May 21 2010 Peter Hutterer <peter.hutterer at redhat.com> 0.10.6-2
+- wacom-0.10.6-axis-mode.patch: Fix axis mode setting, don't set
+  OutOfProximity bit.
+
 * Thu Apr 22 2010 Peter Hutterer <peter.hutterer at redhat.com> 0.10.6-1
 - wacom 0.10.6