[xorg-x11-server/f16] xserver 1.11.3 xserver-1.11.2-dix-button-state-must-show-the-logical-buttons-not-p.patch: XI2 button

[Peter Hutterer]

commit 2f1a3e2905e6bb62d8242ac3ac7ae095c3ffae74
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Mon Dec 19 12:17:37 2011 +1000

    xserver 1.11.3
    xserver-1.11.2-dix-button-state-must-show-the-logical-buttons-not-p.patch:
    XI2 button state was wrong

 .gitignore                                         |    1 +
 sources                                            |    1 +
 xorg-x11-server.spec                               |   11 +++++-
 ...state-must-show-the-logical-buttons-not-p.patch |   38 ++++++++++++++++++++
 4 files changed, 50 insertions(+), 1 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1106c21..2024d18 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ xorg-server-1.9.1.tar.bz2
 /xorg-server-1.11.1.tar.bz2
 /xorg-server-1.11.2.tar.bz2
 /xorg-server-1.11.2.902.tar.bz2
+/xorg-server-1.11.3.tar.bz2
diff --git a/sources b/sources
index 96f403d..6050665 100644
--- a/sources
+++ b/sources
@@ -2,3 +2,4 @@
 4cdf54dc569b6a5548257c93a45dcd3d  xorg-server-1.11.1.tar.bz2
 8796fff441e5435ee36a72579008af24  xorg-server-1.11.2.tar.bz2
 010fbad269075ebfc0bb6c6061645f3a  xorg-server-1.11.2.902.tar.bz2
+a7194c437963627e1db0dd2d6c1a1984  xorg-server-1.11.3.tar.bz2
diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index 9bf4df4..6c59834 100644
--- a/xorg-x11-server.spec
+++ b/xorg-x11-server.spec
@@ -29,7 +29,7 @@
 
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
-Version:   1.11.2.902
+Version:   1.11.3
 Release:   1%{?gitdate:.%{gitdate}}%{dist}
 URL:       http://www.x.org
 License:   MIT
@@ -90,6 +90,10 @@ Patch7009: xserver-1.10.99-config-add-udev-systemd-multi-seat-support.patch
 # BUg #714746: Xorg crash in record when ProcDRI2WaitMSCReply called
 Patch7012: xserver-1.11.2-record-crasher.patch
 
+# https://bugzilla.gnome.org/show_bug.cgi?id=655928, XI2 button state is
+# incorrect if the pointer is mapped
+Patch7013: xserver-1.11.2-dix-button-state-must-show-the-logical-buttons-not-p.patch
+
 %define moduledir	%{_libdir}/xorg/modules
 %define drimoduledir	%{_libdir}/dri
 %define sdkdir		%{_includedir}/xorg
@@ -554,6 +558,11 @@ rm -rf $RPM_BUILD_ROOT
 %{xserver_source_dir}
 
 %changelog
+* Mon Dec 19 2011 Peter Hutterer <peter.hutterer at redhat.com> 1.11.3-1
+- xserver 1.11.3
+- xserver-1.11.2-dix-button-state-must-show-the-logical-buttons-not-p.patch:
+  XI2 button state was wrong
+
 * Thu Dec 15 2011 Adam Jackson <ajax at redhat.com> 1.11.2.902-1
 - xserver 1.11.3 RC3
 - 0001-Xi-allow-passive-keygrabs-on-the-XIAll-Master-Device.patch,
diff --git a/xserver-1.11.2-dix-button-state-must-show-the-logical-buttons-not-p.patch b/xserver-1.11.2-dix-button-state-must-show-the-logical-buttons-not-p.patch
new file mode 100644
index 0000000..2546bf3
--- /dev/null
+++ b/xserver-1.11.2-dix-button-state-must-show-the-logical-buttons-not-p.patch
@@ -0,0 +1,38 @@
+From 94f48f7ee94bd117d46c8aa1333883ac2f431921 Mon Sep 17 00:00:00 2001
+From: Peter Hutterer <peter.hutterer at who-t.net>
+Date: Fri, 16 Dec 2011 12:41:08 +1000
+Subject: [PATCH] dix: button state must show the logical buttons, not
+ physical buttons
+
+If the device is mapped 3 2 1, a click on physical button 1 sends a button 3
+press, but the state was set for button 1. Fix this, the state must be set
+for that button's logical mapping.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=655928
+
+Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
+(cherry picked from commit 9567d21e85b99febe805263a4d93b15fd1f7ab42)
+
+Conflicts:
+
+	dix/inpututils.c
+---
+ Xi/exevents.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/Xi/exevents.c b/Xi/exevents.c
+index dcb496f..9d43564 100644
+--- a/Xi/exevents.c
++++ b/Xi/exevents.c
+@@ -927,7 +927,7 @@ ProcessOtherEvent(InternalEvent *ev, DeviceIntPtr device)
+ 
+     for (i = 0; mouse && mouse->button && i < mouse->button->numButtons; i++)
+         if (BitIsOn(mouse->button->down, i))
+-            SetBit(event->buttons, i);
++            SetBit(event->buttons, mouse->button->map[i]);
+ 
+     if (kbd && kbd->key)
+     {
+-- 
+1.7.7.1
+