[xorg-commit-diffs] xc/programs/Xserver/dix window.c, 1.1.4.6, 1.1.4.6.2.1

[Stuart Kreitman]

Committed by: stukreit

Update of /cvs/xorg/xc/programs/Xserver/dix
In directory pdx:/tmp/cvs-serv3945

Modified Files:
      Tag: DAMAGE-XFIXES
	window.c 
Log Message:
Integration from modular tree.
Modified Files:
  Tag: DAMAGE-XFIXES
 	window.c 


Index: window.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/dix/window.c,v
retrieving revision 1.1.4.6
retrieving revision 1.1.4.6.2.1
diff -u -d -r1.1.4.6 -r1.1.4.6.2.1
--- a/window.c	7 Mar 2004 23:45:09 -0000	1.1.4.6
+++ b/window.c	30 Mar 2004 16:38:13 -0000	1.1.4.6.2.1
@@ -3152,10 +3152,17 @@
 
     for (j=0; j<client->numSaved; j++)
     {
-	pWin = (WindowPtr)client->saveSet[j];
-	pParent = pWin->parent;
-	while (pParent && (wClient (pParent) == client))
-	    pParent = pParent->parent;
+	pWin = SaveSetWindow(client->saveSet[j]);
+#ifdef XFIXES
+        if (SaveSetToRoot(client->saveSet[j]))
+            pParent = WindowTable[pWin->drawable.pScreen->myNum];
+        else
+#endif
+        {
+            pParent = pWin->parent;
+            while (pParent && (wClient (pParent) == client))
+                pParent = pParent->parent;
+        }
 	if (pParent)
 	{
 	    if (pParent != pWin->parent)
@@ -3172,7 +3179,7 @@
     }
     xfree(client->saveSet);
     client->numSaved = 0;
-    client->saveSet = (pointer *)NULL;
+    client->saveSet = (SaveSetElt *)NULL;
 }
 
 Bool