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;