rpms/xorg-x11-drv-evdev/F-12 0001-Fix-drag-lock-property-handler-for-multiple-draglock.patch, NONE, 1.1 xorg-x11-drv-evdev.spec, 1.63, 1.64

[Peter Hutterer]

Author: whot

Update of /cvs/pkgs/rpms/xorg-x11-drv-evdev/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27884

Modified Files:
	xorg-x11-drv-evdev.spec 
Added Files:
	0001-Fix-drag-lock-property-handler-for-multiple-draglock.patch 
Log Message:
* Mon Nov 02 2009 Peter Hutterer <peter.hutterer at redhat.com> 2.3.0-2
- 0001-Fix-drag-lock-property-handler-for-multiple-draglock.patch
  Fix property handler indexing for multiple draglock buttons
  (#524428).


0001-Fix-drag-lock-property-handler-for-multiple-draglock.patch:
 draglock.c |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

--- NEW FILE 0001-Fix-drag-lock-property-handler-for-multiple-draglock.patch ---
>From 11669d82790fd7c94c44c0d487d3fa5e203528e9 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer at who-t.net>
Date: Mon, 2 Nov 2009 13:57:18 +1000
Subject: [PATCH] Fix drag-lock property handler for multiple draglock buttons.

Parsing of the values was wrong. Given an input of 1 2 3 4, button 1 sets
the lock for button 2 and button 3 sets the lock for button 4.

This also means we need to return BadMatch if the property isn't a multiple
of 2.

Red Hat Bug 524428 <https://bugzilla.redhat.com/show_bug.cgi?id=524428>

Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
---
 src/draglock.c |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/draglock.c b/src/draglock.c
index a8bf079..6157cae 100644
--- a/src/draglock.c
+++ b/src/draglock.c
@@ -256,7 +256,7 @@ EvdevDragLockSetProperty(DeviceIntPtr dev, Atom atom, XIPropertyValuePtr val,
                 pEvdev->dragLock.meta = meta;
                 memset(pEvdev->dragLock.lock_pair, 0, sizeof(pEvdev->dragLock.lock_pair));
             }
-        } else
+        } else if ((val->size % 2) == 0)
         {
             CARD8* vals = (CARD8*)val->data;
 
@@ -269,10 +269,11 @@ EvdevDragLockSetProperty(DeviceIntPtr dev, Atom atom, XIPropertyValuePtr val,
                 pEvdev->dragLock.meta = 0;
                 memset(pEvdev->dragLock.lock_pair, 0, sizeof(pEvdev->dragLock.lock_pair));
 
-                for (i = 0; i < val->size && i < EVDEV_MAXBUTTONS; i++)
-                    pEvdev->dragLock.lock_pair[i] = vals[i];
+                for (i = 0; i < val->size && i < EVDEV_MAXBUTTONS; i += 2)
+                    pEvdev->dragLock.lock_pair[vals[i] - 1] = vals[i + 1];
             }
-        }
+        } else
+            return BadMatch;
     }
 
     return Success;
-- 
1.6.5.1



Index: xorg-x11-drv-evdev.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-evdev/F-12/xorg-x11-drv-evdev.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -p -r1.63 -r1.64
--- xorg-x11-drv-evdev.spec	19 Oct 2009 04:24:57 -0000	1.63
+++ xorg-x11-drv-evdev.spec	2 Nov 2009 04:47:27 -0000	1.64
@@ -7,7 +7,7 @@
 Summary:    Xorg X11 evdev input driver
 Name:	    xorg-x11-drv-evdev
 Version:    2.3.0
-Release:    1%{?dist}
+Release:    2%{?dist}
 URL:	    http://www.x.org
 License:    MIT
 Group:	    User Interface/X Hardware Support
@@ -18,6 +18,9 @@ Source0:   ftp://ftp.x.org/pub/individua
 Source1:    make-git-snapshot.sh
 Source2:    commitid
 
+# Already upstream
+Patch1:     0001-Fix-drag-lock-property-handler-for-multiple-draglock.patch
+
 ExcludeArch: s390 s390x
 
 BuildRequires: autoconf automake libtool
@@ -34,6 +37,8 @@ X.Org X11 evdev input driver.
 #%setup -q -n %{tarball}-%{gitdate}
 %setup -q -n %{tarball}-%{version}
 
+%patch1 -p1
+
 %build
 autoreconf -v --install || exit 1
 %configure --disable-static
@@ -71,6 +76,11 @@ X.Org X11 evdev input driver development
 
 
 %changelog
+* Mon Nov 02 2009 Peter Hutterer <peter.hutterer at redhat.com> 2.3.0-2
+- 0001-Fix-drag-lock-property-handler-for-multiple-draglock.patch
+  Fix property handler indexing for multiple draglock buttons
+  (#524428).
+
 * Mon Oct 19 2009 Peter Hutterer <peter.hutterer at redhat.com> 2.3.0-1
 - evdev 2.3.0