OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xorg-x11-server?expand=0&rev=66

commit-a6a7fad.diff

@@ -0,0 +1,35 @@
+commit a6a7fadbb03ee99312dfb15ac478ab3c414c1c0b
+Author: Kristian Høgsberg <krh@redhat.com>
+Date:   Wed Jan 16 20:24:11 2008 -0500
+
+    Don't break grab and focus state for a window when redirecting it.
+    
+    Composite uses an unmap/map cycle to trigger backing pixmap allocation
+    and cliprect recomputation when a window is redirected or unredirected.
+    To avoid protocol visible side effects, map and unmap events are
+    disabled temporarily.  However, when a window is unmapped it is also
+    removed from grabs and loses focus, but these state changes are not
+    disabled.
+    
+    This change supresses the unmap side effects during the composite
+    unmap/map cycle and fixes this bug:
+    
+      http://bugzilla.gnome.org/show_bug.cgi?id=488264
+    
+    where compiz would cause gnome-screensaver to lose its grab when
+    compiz unredirects the fullscreen lock window.
+
+diff --git a/dix/window.c b/dix/window.c
+index 33cf76b..1ccf126 100644
+--- a/dix/window.c
++++ b/dix/window.c
+@@ -2993,7 +2993,8 @@ UnrealizeTree(
+ 	    } 
+ #endif
+ 	    (* Unrealize)(pChild);
+-	    DeleteWindowFromAnyEvents(pChild, FALSE);
++	    if (MapUnmapEventsEnabled(pWin))
++		DeleteWindowFromAnyEvents(pChild, FALSE);
+ 	    if (pChild->viewable)
+ 	    {
+ #ifdef DO_SAVE_UNDERS

xorg-x11-server.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Mar  7 11:59:54 CET 2008 - sndirsch@suse.de
+
+- commit-a6a7fad.diff
+  * Don't break grab and focus state for a window when redirecting
+    it. (bnc #336219, bfo #488264)
+
 -------------------------------------------------------------------
 Fri Feb 22 04:08:22 CET 2008 - sndirsch@suse.de
 

xorg-x11-server.spec

@@ -22,7 +22,7 @@ BuildRequires:  libjpeg-devel
 Url:            http://xorg.freedesktop.org/
 %define EXPERIMENTAL 0
 Version:        7.3
-Release:        67
+Release:        73
 License:        X11/MIT
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Group:          System/X11/Servers/XF86_4
@@ -105,6 +105,7 @@ Patch96:        CVE-2007-6428-TOG-cup.diff
 Patch97:        CVE-2007-6429-shm_evi.diff
 Patch98:        CVE-2008-0006-pcf_font.diff
 Patch99:        commit-50e80c3.diff
+Patch100:       commit-a6a7fad.diff
 
 %description
 This package contains the X.Org Server.
@@ -236,6 +237,7 @@ popd
 %patch97 -p1
 %patch98 -p1
 %patch99 -p1
+%patch100 -p1
 
 %build
 pushd xorg-docs-*
@@ -542,6 +544,10 @@ exit 0
 %endif
 
 %changelog
+* Fri Mar 07 2008 sndirsch@suse.de
+- commit-a6a7fad.diff
+  * Don't break grab and focus state for a window when redirecting
+  it. (bnc #336219, bfo #488264)
 * Fri Feb 22 2008 sndirsch@suse.de
 - update to Mesa bugfix release 7.0.3 RC2 sources
   * Fixed GLX indirect vertex array rendering bug (14197)