- Add some XFIXES bits apparently missed in the DAMAGE-XFIXES merge

- Add missing XCSECURITY ifdef.
- Sync some whitespace to xserver CVS and surrounding style.

3 files changed, 32 insertions, 16 deletions

diff --git a/dix/cursor.c b/dix/cursor.c
index fc81a5197..9e0724fb4 100644
--- a/dix/cursor.c
+++ b/dix/cursor.c
@@ -68,6 +68,10 @@ typedef struct _GlyphShare {
 
 static GlyphSharePtr sharedGlyphs = (GlyphSharePtr)NULL;
 
+#ifdef XFIXES
+static CARD32	cursorSerial;
+#endif
+
 static void
 FreeCursorBits(CursorBitsPtr bits)
 {
@@ -189,6 +193,10 @@ AllocCursorARGB(psrcbits, pmaskbits, argb, cm,
 
     pCurs->bits = bits;
     pCurs->refcnt = 1;		
+#ifdef XFIXES
+    pCurs->serialNumber = ++cursorSerial;
+    pCurs->name = None;
+#endif
 
     pCurs->foreRed = foreRed;
     pCurs->foreGreen = foreGreen;
@@ -379,6 +387,10 @@ AllocGlyphCursor(source, sourceChar, mask, maskChar,
     CheckForEmptyMask(bits);
     pCurs->bits = bits;
     pCurs->refcnt = 1;
+#ifdef XFIXES
+    pCurs->serialNumber = ++cursorSerial;
+    pCurs->name = None;
+#endif
 
     pCurs->foreRed = foreRed;
     pCurs->foreGreen = foreGreen;
diff --git a/dix/dispatch.c b/dix/dispatch.c
index fca0de709..08d523441 100644
--- a/dix/dispatch.c
+++ b/dix/dispatch.c
@@ -1,4 +1,4 @@
-/* $XdotOrg: xc/programs/Xserver/dix/dispatch.c,v 1.3 2004/06/21 13:40:25 ago Exp $ */
+/* $XdotOrg: xc/programs/Xserver/dix/dispatch.c,v 1.4 2004/07/29 18:43:58 stukreit Exp $ */
 /* $Xorg: dispatch.c,v 1.5 2001/02/09 02:04:40 xorgcvs Exp $ */
 /************************************************************
 
@@ -1050,13 +1050,12 @@ ProcSetSelectionOwner(client)
 	CurrentSelections[i].client = (pWin ? client : NullClient);
 	if (SelectionCallback)
 	{
-	   SelectionInfoRec    info;
+	    SelectionInfoRec	info;
 
-	   info.selection = &CurrentSelections[i];
-	   info.kind= SelectionSetOwner;
-	   CallCallbacks(&SelectionCallback, &info);
+	    info.selection = &CurrentSelections[i];
+	    info.kind= SelectionSetOwner;
+	    CallCallbacks(&SelectionCallback, &info);
 	}
-
 	return (client->noClientException);
     }
     else 
@@ -2130,7 +2129,9 @@ DoGetImage(client, format, drawable, x, y, width, height, planemask, im_return)
     Mask		plane = 0;
     char		*pBuf;
     xGetImageReply	xgi;
+#ifdef XCSECURITY
     RegionPtr pVisibleRegion = NULL;
+#endif
 
     if ((format != XYPixmap) && (format != ZPixmap))
     {
diff --git a/dix/window.c b/dix/window.c
index f737e0f01..af2d449f6 100644
--- a/dix/window.c
+++ b/dix/window.c
@@ -1,4 +1,4 @@
-/* $XdotOrg: xc/programs/Xserver/dix/window.c,v 1.3 2004/07/29 18:43:58 stukreit Exp $ */
+/* $XdotOrg: xc/programs/Xserver/dix/window.c,v 1.4 2004/07/29 23:43:39 kem Exp $ */
 /* $Xorg: window.c,v 1.4 2001/02/09 02:04:41 xorgcvs Exp $ */
 /*
 
@@ -3154,15 +3154,15 @@ HandleSaveSet(client)
     {
 	pWin = SaveSetWindow(client->saveSet[j]);
 #ifdef XFIXES
-        if (SaveSetToRoot(client->saveSet[j]))
-            pParent = WindowTable[pWin->drawable.pScreen->myNum];
-        else
+	if (SaveSetToRoot(client->saveSet[j]))
+	    pParent = WindowTable[pWin->drawable.pScreen->myNum];
+	else
 #endif
-        {
-            pParent = pWin->parent;
-            while (pParent && (wClient (pParent) == client))
-                pParent = pParent->parent;
-        }
+	{
+	    pParent = pWin->parent;
+	    while (pParent && (wClient (pParent) == client))
+		pParent = pParent->parent;
+	}
 	if (pParent)
 	{
 	    if (pParent != pWin->parent)
@@ -3174,7 +3174,10 @@ HandleSaveSet(client)
 		if(!pWin->realized && pWin->mapped)
 		    pWin->mapped = FALSE;
 	    }
-	    MapWindow(pWin, client);
+#ifdef XFIXES
+	    if (SaveSetRemap (client->saveSet[j]))
+#endif
+		MapWindow(pWin, client);
 	}
     }
     xfree(client->saveSet);