From a08e5e0c68baaf85b0fc3ecde74a6bcf80bcd4bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B8ren=20Sandmann=20Pedersen?= <sandmann@daimi.au.dk>
Date: Wed, 22 Mar 2006 18:44:26 +0000
Subject: [PATCH] =?UTF-8?q?Wed=20Mar=2022=2013:42:44=202006=20S=C3=B8ren?=
 =?UTF-8?q?=20Sandmann=20<sandmann@redhat.com>=20Patch=20by=20Keith=20Pack?=
 =?UTF-8?q?ard=20to=20make=20sure=20redirected=20windows=20don't=20get=20c?=
 =?UTF-8?q?onsidered=20=20=20=20=20"FullyObscured".?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ChangeLog      |  5 +++++
 mi/mivaltree.c | 26 +++++++++++++-------------
 2 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8a91b88b0..4c2681f21 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Mar 22 13:42:44 2006  Søren Sandmann  <sandmann@redhat.com>
+
+	* mi/mivaltree.c (miComputeClips): Patch by Keith Packard to make
+	sure redirected windows don't get considered "FullyObscured".
+
 2006-03-21  Kristian Høgsberg  <krh@redhat.com>
 
 	Make the server distcheck and tag 1.0.99.1 snapshot.
diff --git a/mi/mivaltree.c b/mi/mivaltree.c
index dd3214524..08ad4acae 100644
--- a/mi/mivaltree.c
+++ b/mi/mivaltree.c
@@ -1,5 +1,5 @@
 /* $Xorg: mivaltree.c,v 1.4 2001/02/09 02:05:22 xorgcvs Exp $ */
-/* $XdotOrg: xserver/xorg/mi/mivaltree.c,v 1.6 2005/07/03 07:01:51 daniels Exp $ */
+/* $XdotOrg: xserver/xorg/mi/mivaltree.c,v 1.7 2006/02/15 19:05:54 ajax Exp $ */
 /*
  * mivaltree.c --
  *	Functions for recalculating window clip lists. Main function
@@ -240,6 +240,18 @@ miComputeClips (
 	dy = 32767;
     borderSize.y2 = dy;
 
+#ifdef COMPOSITE
+    /*
+     * In redirected drawing case, reset universe to borderSize
+     */
+    if (pParent->redirectDraw)
+    {
+	if (miSetRedirectBorderClipProc)
+	    (*miSetRedirectBorderClipProc) (pParent, universe);
+	REGION_COPY(pScreen, universe, &pParent->borderSize);
+    }
+#endif
+
     oldVis = pParent->visibility;
     switch (RECT_IN_REGION( pScreen, universe, &borderSize)) 
     {
@@ -279,18 +291,6 @@ miComputeClips (
 	((pParent->eventMask | wOtherEventMasks(pParent)) & VisibilityChangeMask))
 	SendVisibilityNotify(pParent);
 
-#ifdef COMPOSITE
-    /*
-     * In redirected drawing case, reset universe to borderSize
-     */
-    if (pParent->redirectDraw)
-    {
-	if (miSetRedirectBorderClipProc)
-	    (*miSetRedirectBorderClipProc) (pParent, universe);
-	REGION_COPY(pScreen, universe, &pParent->borderSize);
-    }
-#endif
-
     dx = pParent->drawable.x - pParent->valdata->before.oldAbsCorner.x;
     dy = pParent->drawable.y - pParent->valdata->before.oldAbsCorner.y;