rpms/xorg-x11-server/devel xserver-1.5.99.902-xinerama.patch, NONE, 1.1 xorg-x11-server.spec, 1.395, 1.396

[Peter Hutterer]

Author: whot

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

Modified Files:
	xorg-x11-server.spec 
Added Files:
	xserver-1.5.99.902-xinerama.patch 
Log Message:
* Wed Feb 04 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.5.99.902-2
- xserver-1.5.99.902-xinerama.patch: don't update the sprite root window in
  Xinerama setups (#473825)



xserver-1.5.99.902-xinerama.patch:

--- NEW FILE xserver-1.5.99.902-xinerama.patch ---
>From d06c8a08a432c042748b055638eb7a2a1cc453ea Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer at who-t.net>
Date: Mon, 2 Feb 2009 10:20:13 +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>

Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
---
 mi/mipointer.c |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/mi/mipointer.c b/mi/mipointer.c
index d520281..e3a4656 100644
--- a/mi/mipointer.c
+++ b/mi/mipointer.c
@@ -332,7 +332,14 @@ miPointerWarpCursor (DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y)
 	pPointer->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 (pDev, pScreen) ;
 }
 
-- 
1.6.0.6



Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.395
retrieving revision 1.396
diff -u -r1.395 -r1.396
--- xorg-x11-server.spec	2 Feb 2009 23:02:35 -0000	1.395
+++ xorg-x11-server.spec	3 Feb 2009 23:36:39 -0000	1.396
@@ -19,7 +19,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.5.99.902
-Release:   1%{?dist}
+Release:   2%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -77,6 +77,8 @@
 Patch6007: xserver-1.5.99.3-broken-mtrr-header.patch
 
 Patch6008: xserver-1.5.99.3-fix-core-fonts.patch
+# Pushed to master, should be in 1.6
+Patch6009: xserver-1.5.99.902-xinerama.patch
 
 %define moduledir	%{_libdir}/xorg/modules
 %define drimoduledir	%{_libdir}/dri
@@ -494,6 +496,10 @@
 
 
 %changelog
+* Wed Feb 04 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.5.99.902-2
+- xserver-1.5.99.902-xinerama.patch: don't update the sprite root window in
+  Xinerama setups (#473825)
+
 * Tue Feb 03 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.5.99.902-1
 - xserver 1.6. RC 2