xorg-server: Changes to 'ubuntu'
debian/changelog | 7 +++++++
debian/patches/507_touch_grab_reject_send_ownership.patch | 12 ++++++++++++
debian/patches/series | 1 +
3 files changed, 20 insertions(+)
New commits:
commit 222553afb37e55494bdedfd7d05bbd1d332ca6d2
Author: Chase Douglas <chase.douglas@ubuntu.com>
Date: Wed Sep 28 15:58:15 2011 -0700
releasing version 2:1.10.4-1ubuntu4
diff --git a/debian/changelog b/debian/changelog
index 5f3643c..f93edc6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-xorg-server (2:1.10.4-1ubuntu4) UNRELEASED; urgency=low
+xorg-server (2:1.10.4-1ubuntu4) oneiric; urgency=low
* Send touch ownership event for subsequent touch grabs (LP: #861906)
- Added 507_touch_grab_reject_send_ownership.patch
- -- Chase Douglas <chase.douglas@ubuntu.com> Wed, 28 Sep 2011 15:54:36 -0700
+ -- Chase Douglas <chase.douglas@ubuntu.com> Wed, 28 Sep 2011 15:57:59 -0700
xorg-server (2:1.10.4-1ubuntu3) oneiric; urgency=low
commit 17f09a7e01f89a10d34fb2540e4f999673b78c9b
Author: Chase Douglas <chase.douglas@ubuntu.com>
Date: Wed Sep 28 15:57:32 2011 -0700
Send touch ownership event for subsequent touch grabs (LP: #861906)
* Send touch ownership event for subsequent touch grabs (LP: #861906)
- Added 507_touch_grab_reject_send_ownership.patch
diff --git a/debian/changelog b/debian/changelog
index 24b3291..5f3643c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg-server (2:1.10.4-1ubuntu4) UNRELEASED; urgency=low
+
+ * Send touch ownership event for subsequent touch grabs (LP: #861906)
+ - Added 507_touch_grab_reject_send_ownership.patch
+
+ -- Chase Douglas <chase.douglas@ubuntu.com> Wed, 28 Sep 2011 15:54:36 -0700
+
xorg-server (2:1.10.4-1ubuntu3) oneiric; urgency=low
* Fix touch ownership processing for subsequent touch grabs (LP: #861896)
diff --git a/debian/patches/507_touch_grab_reject_send_ownership.patch b/debian/patches/507_touch_grab_reject_send_ownership.patch
new file mode 100644
index 0000000..368643b
--- /dev/null
+++ b/debian/patches/507_touch_grab_reject_send_ownership.patch
@@ -0,0 +1,12 @@
+--- a/Xi/exevents.c
++++ b/Xi/exevents.c
+@@ -1647,7 +1647,8 @@ ProcessTouchOwnership(DeviceIntPtr dev,
+ if (ev == ti->history + ti->history_size)
+ ev = ti->history;
+ }
+- } else if (tc->type == TOUCH_SELECT_UNOWNED &&
++ } else if ((tc->type == TOUCH_SELECT_UNOWNED ||
++ tc->type == TOUCH_GRAB) &&
+ !ti->emulate_pointer) {
+ DeliverTouchOwnershipEvent(tc, ti);
+ }
diff --git a/debian/patches/series b/debian/patches/series
index eca36d1..4de3891 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -39,3 +39,4 @@
504_fix_no_coords.patch
505_Xi_ensure_replayed_touch_events_have_devices.patch
506_Xi_ensure_touch_events_update_currentTime.patch
+507_touch_grab_reject_send_ownership.patch
Reply to: