xorg-server: Changes to 'ubuntu+1'
debian/changelog | 7 +++++
debian/patches/220_grab_event_time.patch | 38 +++++++++++++++++++++++++++++++
debian/patches/series | 1
3 files changed, 46 insertions(+)
New commits:
commit e21842b45edd2f22960e25c7b888aa79dacae6cf
Author: Chase Douglas <chase.douglas@ubuntu.com>
Date: Wed Jan 11 07:41:22 2012 -0800
releasing version 2:1.11.3-0ubuntu3
diff --git a/debian/changelog b/debian/changelog
index 1bcf56e..0c3f380 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-xorg-server (2:1.11.3-0ubuntu3) UNRELEASED; urgency=low
+xorg-server (2:1.11.3-0ubuntu3) precise; urgency=low
* Add temporary patch for fixing grab time bug
- Add 220_grab_event_time.patch
- -- Chase Douglas <chase.douglas@ubuntu.com> Wed, 11 Jan 2012 07:39:47 -0800
+ -- Chase Douglas <chase.douglas@ubuntu.com> Wed, 11 Jan 2012 07:41:04 -0800
xorg-server (2:1.11.3-0ubuntu2) precise; urgency=low
commit c7e97584d99fe510aa4f50ca0b587383de1dae5e
Author: Chase Douglas <chase.douglas@ubuntu.com>
Date: Wed Jan 11 07:40:58 2012 -0800
Add temporary patch for fixing grab time bug
* Add temporary patch for fixing grab time bug
- Add 220_grab_event_time.patch
diff --git a/debian/changelog b/debian/changelog
index 11cb531..1bcf56e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg-server (2:1.11.3-0ubuntu3) UNRELEASED; urgency=low
+
+ * Add temporary patch for fixing grab time bug
+ - Add 220_grab_event_time.patch
+
+ -- Chase Douglas <chase.douglas@ubuntu.com> Wed, 11 Jan 2012 07:39:47 -0800
+
xorg-server (2:1.11.3-0ubuntu2) precise; urgency=low
* Merge in input changes from upstream master through commit 8722ad6
diff --git a/debian/patches/220_grab_event_time.patch b/debian/patches/220_grab_event_time.patch
new file mode 100644
index 0000000..e28920f
--- /dev/null
+++ b/debian/patches/220_grab_event_time.patch
@@ -0,0 +1,38 @@
+From 7aca9306a2ef3c9df5abfb1c0a2e86b2022d00f8 Mon Sep 17 00:00:00 2001
+From: Chase Douglas <chase.douglas@canonical.com>
+Date: Wed, 11 Jan 2012 07:31:06 -0800
+Subject: [PATCH 2/2] Use event time instead of CurrentTime for grab times
+
+When {XI,X,}AllowEvents is called, the timestamp is compared against the
+grab time to ensure that the request pertains to the current grab in the
+server. While many clients may use CurrentTime (client-side), the
+timestamp of the event causing the grab is also valid.
+
+This change ensures that the server's notion of the grab time is the
+time of the event that activated the grab rather than the time that the
+grab is actually activated.
+
+This bug was exposed through nested touch then pointer grabs.
+
+Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
+---
+ dix/events.c | 3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/dix/events.c b/dix/events.c
+index 5360267..d4b00e0 100644
+--- a/dix/events.c
++++ b/dix/events.c
+@@ -3723,7 +3723,8 @@ ActivatePassiveGrab(DeviceIntPtr device, GrabPtr grab, InternalEvent *event,
+ }
+ }
+
+- (*grabinfo->ActivateGrab)(device, grab, currentTime, TRUE);
++ (*grabinfo->ActivateGrab)(device, grab,
++ ClientTimeToServerTime(event->any.time), TRUE);
+
+ if (xE)
+ {
+--
+1.7.7.3
+
diff --git a/debian/patches/series b/debian/patches/series
index a37033e..d9abe51 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -27,3 +27,4 @@
208_switch_on_release.diff
209_add_legacy_bgnone_option.patch
214_glx_dri_searchdirs.patch
+220_grab_event_time.patch
Reply to: