xorg-server: Changes to 'ubuntu'
debian/changelog | 5 +
debian/patches/163_no_updatespriteforscreen_if_xinerama.patch | 37 ++++++++++
debian/patches/series | 1
3 files changed, 42 insertions(+), 1 deletion(-)
New commits:
commit a89df73382fab6013829d811d319d4214a2e7ffe
Author: Bryce Harrington <bryce@bryceharrington.org>
Date: Tue Mar 3 17:40:40 2009 -0800
Add fix for bug 296167
diff --git a/debian/changelog b/debian/changelog
index 053abf5..6d0dc5f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,13 +10,16 @@ xorg-server (2:1.6.0-0ubuntu1) UNRELEASED; urgency=low
separate cards are attached. X doesn't work with multiple cards yet,
but crashing is not an appropriate way to handle such a situation.
(LP: #139990)
+ * Add 163_no_updatespriteforscreen_if_xinerama.patch: Fixes issue where
+ X stops responding to mouse clicks after some time if using Xinerama.
+ (LP: #296167)
[ Timo Aaltonen ]
* 159_xinerama_focus.patch,
161_force_paired_kbd_device.patch:
- Dropped, applied upstream
- -- Bryce Harrington <bryce@ubuntu.com> Tue, 03 Mar 2009 13:38:22 -0800
+ -- Bryce Harrington <bryce@ubuntu.com> Tue, 03 Mar 2009 17:39:25 -0800
xorg-server (2:1.6.0-1) UNRELEASED; urgency=low
diff --git a/debian/patches/163_no_updatespriteforscreen_if_xinerama.patch b/debian/patches/163_no_updatespriteforscreen_if_xinerama.patch
new file mode 100644
index 0000000..e3d1ae4
--- /dev/null
+++ b/debian/patches/163_no_updatespriteforscreen_if_xinerama.patch
@@ -0,0 +1,37 @@
+From 7dfc941eee8261355ea2f8a82a77bece45fbde66 Mon Sep 17 00:00:00 2001
+From: Fedora X Ninjas <x@fedoraproject.org>
+Date: Fri, 30 Jan 2009 10:19:01 +1000
+Subject: [PATCH] mi: don't call UpdateSpriteForScreen if we have Xinerama enabled. #18668
+
+In Xinerama all windows hang off the first root window. Crossing the screens
+must not reset the spriteTrace, otherwise picking fails and events are sent to
+the root window.
+
+X.Org Bug 18668 <http://bugs.freedesktop.org/show_bug.cgi?id=18668>
+---
+ mi/mipointer.c | 9 ++++++++-
+ 1 files changed, 8 insertions(+), 1 deletions(-)
+
+diff --git a/mi/mipointer.c b/mi/mipointer.c
+index b55e68b..195243d 100644
+--- a/mi/mipointer.c
++++ b/mi/mipointer.c
+@@ -260,7 +260,14 @@ miPointerWarpCursor (pScreen, x, y)
+ miPointer.pScreen = pScreen;
+ }
+
+- if (changedScreen)
++ /* Don't call USFS if we use Xinerama, otherwise the root window is
++ * updated to the second screen, and we never receive any events.
++ * (FDO bug #18668) */
++ if (changedScreen
++#ifdef PANORAMIX
++ && noPanoramiXExtension
++#endif
++ )
+ UpdateSpriteForScreen (pScreen) ;
+ }
+
+--
+1.6.0.6
+
diff --git a/debian/patches/series b/debian/patches/series
index 353b282..c591632 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -19,3 +19,4 @@
160_log_timestamping.patch
162_null_crtc_in_rotation.patch
999_default_modedebug_on.patch
+163_no_updatespriteforscreen_if_xinerama.patch
Reply to: