rpms/xorg-x11-server/F-9 xserver-1.5.3-xinerama-events.patch, NONE, 1.1 xorg-x11-server.spec, 1.349, 1.350

[Peter Hutterer]

Author: whot

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

Modified Files:
	xorg-x11-server.spec 
Added Files:
	xserver-1.5.3-xinerama-events.patch 
Log Message:
* Wed Mar 18 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.5.2-6
- xserver-1.5.3-xinerama-events.patch: Don't call UpdateSpriteForScreen if
  Xinerama is present (#473825)
- add freetype-devel to build requires.



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-9/xorg-x11-server.spec,v
retrieving revision 1.349
retrieving revision 1.350
diff -u -r1.349 -r1.350
--- xorg-x11-server.spec	24 Dec 2008 15:44:34 -0000	1.349
+++ xorg-x11-server.spec	17 Mar 2009 23:33:33 -0000	1.350
@@ -19,7 +19,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.5.2
-Release:   5%{?dist}
+Release:   6%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -63,6 +63,9 @@
 # http://cgit.freedesktop.org/xorg/xserver/diff/?id=24e863b0eb6ff11010a14cfd252a39df87a09d0e
 Patch5013: xserver-1.5.2-sbusAutoDetection.patch
 
+# From upstream.
+Patch5014: xserver-1.5.3-xinerama-events.patch
+
 %define moduledir	%{_libdir}/xorg/modules
 %define drimoduledir	%{_libdir}/dri
 %define sdkdir		%{_includedir}/xorg
@@ -85,6 +88,7 @@
 BuildRequires: git-core
 BuildRequires: automake autoconf libtool pkgconfig
 BuildRequires: xorg-x11-util-macros >= 1.1.5
+BuildRequires: freetype-devel
 
 BuildRequires: xorg-x11-proto-devel >= 7.3-10
 BuildRequires: damageproto >= 1.1
@@ -467,6 +471,11 @@
 
 
 %changelog
+* Wed Mar 18 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.5.2-6
+- xserver-1.5.3-xinerama-events.patch: Don't call UpdateSpriteForScreen if
+  Xinerama is present (#473825)
+- add freetype-devel to build requires.
+
 * Mon Dec 22 2008 Adam Jackson <ajax at redhat.com> 1.5.2-5
 - xserver-1.5.0-bad-fbdev-thats-mine.patch: Do the same for sbus that we do
   for pci.