xorg-server: Changes to 'ubuntu'
debian/changelog | 8 +
debian/patches/507_dix_Ensure_touch_events_are_delivered_to_next_client.patch | 76 ----------
debian/patches/series | 1
3 files changed, 8 insertions(+), 77 deletions(-)
New commits:
commit 02c96e18ff5bfc71dffd8c0712b10e0d9c72fea4
Author: Chase Douglas <chase.douglas@ubuntu.com>
Date: Wed Sep 28 15:51:44 2011 -0700
releasing version 2:1.10.4-1ubuntu3
diff --git a/debian/changelog b/debian/changelog
index 33bac61..24b3291 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-xorg-server (2:1.10.4-1ubuntu3) UNRELEASED; urgency=low
+xorg-server (2:1.10.4-1ubuntu3) oneiric; urgency=low
* Fix touch ownership processing for subsequent touch grabs (LP: #861896)
- Remove regressing patch
507_dix_Ensure_touch_events_are_delivered_to_next_client.patch
- -- Chase Douglas <chase.douglas@ubuntu.com> Wed, 28 Sep 2011 15:48:09 -0700
+ -- Chase Douglas <chase.douglas@ubuntu.com> Wed, 28 Sep 2011 15:51:29 -0700
xorg-server (2:1.10.4-1ubuntu2) oneiric; urgency=low
commit 75121927b57e3530011c71bede628354be02bb31
Author: Chase Douglas <chase.douglas@ubuntu.com>
Date: Wed Sep 28 15:51:10 2011 -0700
Fix touch ownership processing for subsequent touch grabs (LP: #861896)
* Fix touch ownership processing for subsequent touch grabs (LP: #861896)
- Remove regressing patch
507_dix_Ensure_touch_events_are_delivered_to_next_client.patch
diff --git a/debian/changelog b/debian/changelog
index 876eb94..33bac61 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xorg-server (2:1.10.4-1ubuntu3) UNRELEASED; urgency=low
+
+ * Fix touch ownership processing for subsequent touch grabs (LP: #861896)
+ - Remove regressing patch
+ 507_dix_Ensure_touch_events_are_delivered_to_next_client.patch
+
+ -- Chase Douglas <chase.douglas@ubuntu.com> Wed, 28 Sep 2011 15:48:09 -0700
+
xorg-server (2:1.10.4-1ubuntu2) oneiric; urgency=low
* debian/patches/221_fix_SendEvent_flag_mask.diff:
diff --git a/debian/patches/507_dix_Ensure_touch_events_are_delivered_to_next_client.patch b/debian/patches/507_dix_Ensure_touch_events_are_delivered_to_next_client.patch
deleted file mode 100644
index 3c65230..0000000
--- a/debian/patches/507_dix_Ensure_touch_events_are_delivered_to_next_client.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From 4b97bab5bfaf823c9c71b828bfb263a995c11cb7 Mon Sep 17 00:00:00 2001
-From: Carlos Garnacho <carlosg@gnome.org>
-Date: Mon, 5 Sep 2011 18:35:25 +0200
-Subject: [PATCH 3/6] dix: Ensure touch events are delivered to the next
- client
-
-ComputeFreezes() would start over in the touch clients stack
-every time it would replay touch events with the PointerEmulated
-flag set. Instead, check the next touch client to forward ownership
-to.
----
- dix/events.c | 32 ++++++++++++++++++--------------
- 1 files changed, 18 insertions(+), 14 deletions(-)
-
-diff --git a/dix/events.c b/dix/events.c
-index cb329e7..5ded834 100644
---- a/dix/events.c
-+++ b/dix/events.c
-@@ -4149,27 +4149,24 @@ CheckDeviceGrabs(DeviceIntPtr device, DeviceEvent *event, WindowPtr ancestor)
- touch_event = &qe->event->device_event;
- }
-
-- for (; i < device->spriteInfo->sprite->spriteTraceGood; i++)
-+ /* Touch grabs are checked before pointer grabs. When a touch grab
-+ * should be checked first, check_grab is TRUE. */
-+ if (touch_event)
- {
-- pWin = device->spriteInfo->sprite->spriteTrace[i];
--
-- if (!pWin->optional)
-- continue;
-+ TouchPointInfoPtr ti = touch_event->touchpoint;
-+ TouchClientPtr tc = &ti->clients[ti->owner];
-+ GrabPtr grab;
-
-- /* Touch grabs are checked before pointer grabs. When a touch grab
-- * should be checked first, check_grab is TRUE. */
-- if (touch_event && touch_event->check_grab)
-+ if (ti->owner >= 0 && touch_event->check_grab)
- {
-- GrabPtr grab;
-+ tc = &ti->clients[ti->owner];
-+ pWin = tc->window;
-
- grab = CheckPassiveGrabsOnWindow(pWin, device,
- (InternalEvent *)touch_event,
- FALSE, FALSE);
- if (grab)
- {
-- TouchPointInfoPtr ti = touch_event->touchpoint;
-- TouchClientPtr tc = &ti->clients[ti->owner];
--
- device->deviceGrab.ActivateGrab(device, grab, currentTime,
- TRUE);
- touch_event->check_grab = FALSE;
-@@ -4178,8 +4175,15 @@ CheckDeviceGrabs(DeviceIntPtr device, DeviceEvent *event, WindowPtr ancestor)
- }
- }
-
-- if (touch_event)
-- touch_event->check_grab = TRUE;
-+ touch_event->check_grab = TRUE;
-+ }
-+
-+ for (; i < device->spriteInfo->sprite->spriteTraceGood; i++)
-+ {
-+ pWin = device->spriteInfo->sprite->spriteTrace[i];
-+
-+ if (!pWin->optional)
-+ continue;
-
- if (pWin->optional &&
- CheckPassiveGrabsOnWindow(pWin, device, (InternalEvent *)event,
---
-1.7.5.4
-
diff --git a/debian/patches/series b/debian/patches/series
index 9c2d775..eca36d1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -39,4 +39,3 @@
504_fix_no_coords.patch
505_Xi_ensure_replayed_touch_events_have_devices.patch
506_Xi_ensure_touch_events_update_currentTime.patch
-507_dix_Ensure_touch_events_are_delivered_to_next_client.patch
Reply to: