rpms/xorg-x11-server/F-10 xserver-1.5.3-xinerama-events.patch, NONE, 1.1 xorg-x11-server.spec, 1.388, 1.389

[Peter Hutterer]

Author: whot

Update of /cvs/pkgs/rpms/xorg-x11-server/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23774

Modified Files:
	xorg-x11-server.spec 
Added Files:
	xserver-1.5.3-xinerama-events.patch 
Log Message:
* Wed Feb 04 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.5.3-10
- xserver-1.5.3-xinerama-events.patch: Don't call UpdateSpriteForScreen if
  Xinerama is present (#473825)



xserver-1.5.3-xinerama-events.patch:

--- NEW FILE xserver-1.5.3-xinerama-events.patch ---
>From 3db0bec7de9d93a6b8d0773c969c760cef51314a Mon Sep 17 00:00:00 2001
From: Fedora X Ninjas <x at 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



Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/F-10/xorg-x11-server.spec,v
retrieving revision 1.388
retrieving revision 1.389
diff -u -r1.388 -r1.389
--- xorg-x11-server.spec	27 Jan 2009 00:55:20 -0000	1.388
+++ xorg-x11-server.spec	3 Feb 2009 23:34:32 -0000	1.389
@@ -19,7 +19,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.5.3
-Release:   9%{?dist}
+Release:   10%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -97,6 +97,9 @@
 
 Patch6007: xserver-1.5.3-aspect-me-harder.patch
 
+# pushed upstream
+Patch6008: xserver-1.5.3-xinerama-events.patch
+
 %define moduledir	%{_libdir}/xorg/modules
 %define drimoduledir	%{_libdir}/dri
 %define sdkdir		%{_includedir}/xorg
@@ -528,6 +531,10 @@
 
 
 %changelog
+* Wed Feb 04 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.5.3-10
+- xserver-1.5.3-xinerama-events.patch: Don't call UpdateSpriteForScreen if
+  Xinerama is present (#473825)
+
 * Tue Jan 27 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.5.3-9
 - replace fedora-setup-keyboard with pure python one (#478431)