Fri Jun 11 05:40:00 EST 2004

Committed by: daniel

Update of /cvs/xserver/debrix/dix
In directory pdx:/home/daniel/x/debrix/debrix/dix

Modified Files:
	atom.c colormap.c cursor.c devices.c dispatch.c dispatch.h 
	dixfonts.c dixutils.c events.c extension.c gc.c globals.c 
	glyphcurs.c grabs.c initatoms.c main.c pixmap.c privates.c 
	property.c resource.c swaprep.c swapreq.c tables.c window.c 
	xpstubs.c 
Log Message:
Initial import from modular sources.


Index: atom.c
===================================================================
RCS file: /cvs/xserver/debrix/dix/atom.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3

--- atom.c	23 Apr 2004 19:04:43 -0000	1.2
+++ atom.c	10 Jun 2004 19:39:57 -0000	1.3
@@ -48,8 +48,11 @@
 
 /* $Xorg: atom.c,v 1.4 2001/02/09 02:04:39 xorgcvs Exp $ */
 
-#include "X.h"
-#include "Xatom.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include <X11/X.h>
+#include <X11/Xatom.h>
 #include "misc.h"
 #include "resource.h"
 #include "dix.h"

Index: colormap.c
===================================================================
RCS file: /cvs/xserver/debrix/dix/colormap.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- colormap.c	23 Apr 2004 19:04:43 -0000	1.2
+++ colormap.c	10 Jun 2004 19:39:57 -0000	1.3
@@ -49,9 +49,12 @@
 
 /* $Xorg: colormap.c,v 1.4 2001/02/09 02:04:39 xorgcvs Exp $ */
 
-#include "X.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include <X11/X.h>
 #define NEED_EVENTS
-#include "Xproto.h"
+#include <X11/Xproto.h>
 #include "misc.h"
 #include "dix.h"
 #include "colormapst.h"
@@ -190,7 +193,15 @@
 #define NUMRED(vis) ((vis->redMask >> vis->offsetRed) + 1)
 #define NUMGREEN(vis) ((vis->greenMask >> vis->offsetGreen) + 1)
 #define NUMBLUE(vis) ((vis->blueMask >> vis->offsetBlue) + 1)
-#define RGBMASK(vis) (vis->redMask | vis->greenMask | vis->blueMask)
+#ifdef COMPOSITE
+#define NUMALPHA(vis)   ((vis->alphaMask >> vis->offsetAlpha) + 1)
+#define ALPHAMASK(vis)  (vis->alphaMask)
+#else
+#define NUMALPHA(vis)   0
+#define ALPHAMASK(vis)  0
+#endif
+
+#define RGBMASK(vis) (vis->redMask | vis->greenMask | vis->blueMask | ALPHAMASK(vis))
 
 /* GetNextBitsOrBreak(bits, mask, base)  -- 
  * (Suggestion: First read the macro, then read this explanation.
@@ -866,6 +877,9 @@
 	*pPix = (pixR << pVisual->offsetRed) |
 		(pixG << pVisual->offsetGreen) |
 		(pixB << pVisual->offsetBlue);
+#ifdef COMPOSITE
+	*pPix |= pVisual->alphaMask;
+#endif
 	*pred = pmap->red[pixR].co.local.red;
 	*pgreen = pmap->green[pixG].co.local.green;
 	*pblue = pmap->blue[pixB].co.local.blue;
@@ -956,6 +970,9 @@
 	    return (BadAlloc);
 	}
 	*pPix = pixR | pixG | pixB;
+#ifdef COMPOSITE
+	*pPix |= pVisual->alphaMask;
+#endif
 	break;
     }
 
@@ -1928,6 +1945,10 @@
     }
     pmap->numPixelsBlue[client] += npixB;
     pmap->freeBlue -= npixB;
+#ifdef COMPOSITE
+    for (pDst = pixels; pDst < pixels + c; pDst++)
+        *pDst |= pmap->pVisual->alphaMask;
+#endif
 
     DEALLOCATE_LOCAL(ppixBlue);
     DEALLOCATE_LOCAL(ppixGreen);

Index: cursor.c
===================================================================
RCS file: /cvs/xserver/debrix/dix/cursor.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- cursor.c	23 Apr 2004 19:04:43 -0000	1.2
+++ cursor.c	10 Jun 2004 19:39:57 -0000	1.3
@@ -49,8 +49,11 @@
 
 /* $Xorg: cursor.c,v 1.4 2001/02/09 02:04:39 xorgcvs Exp $ */
 
-#include "X.h"
-#include "Xmd.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include <X11/X.h>
+#include <X11/Xmd.h>
 #include "servermd.h"
 #include "scrnintstr.h"
 #include "dixstruct.h"

Index: devices.c
===================================================================
RCS file: /cvs/xserver/debrix/dix/devices.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- devices.c	23 Apr 2004 19:04:43 -0000	1.2
+++ devices.c	10 Jun 2004 19:39:57 -0000	1.3
@@ -49,12 +49,15 @@
 
 /* $Xorg: devices.c,v 1.4 2001/02/09 02:04:39 xorgcvs Exp $ */
 
-#include "X.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include <X11/X.h>
 #include "misc.h"
 #include "resource.h"
 #define NEED_EVENTS
 #define NEED_REPLIES
-#include "Xproto.h"
+#include <X11/Xproto.h>
 #include "windowstr.h"
 #include "inputstr.h"
 #include "scrnintstr.h"
@@ -63,7 +66,7 @@
 #include "site.h"
 #define	XKB_IN_SERVER
 #ifdef XKB
-#include "XKBsrv.h"
+#include <X11/extensions/XKBsrv.h>
 #endif
 #ifdef XCSECURITY
 #define _SECURITY_SERVER

Index: dispatch.c
===================================================================
RCS file: /cvs/xserver/debrix/dix/dispatch.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- dispatch.c	23 Apr 2004 19:04:44 -0000	1.2
+++ dispatch.c	10 Jun 2004 19:39:57 -0000	1.3
@@ -78,6 +78,9 @@
 
 /* $XFree86: xc/programs/Xserver/dix/dispatch.c,v 3.32 2003/11/10 18:21:45 tsi Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifdef PANORAMIX_DEBUG
 #include <stdio.h>
 int ProcInitialConnection();
@@ -113,7 +116,7 @@
 #ifdef XKB
 #define XKB_IN_SERVER
 #include "inputstr.h"
-#include "XKBsrv.h"
+#include <X11/extensions/XKBsrv.h>
 #endif
 #ifdef LBX
 #include "lbxserve.h"
@@ -132,6 +135,7 @@
 
 Selection *CurrentSelections;
 int NumCurrentSelections;
+CallbackListPtr SelectionCallback = NULL;
 
 static ClientPtr grabClient;
 #define GrabNone 0
@@ -463,6 +467,9 @@
 					  client->errorValue, result);
 		    break;
 	        }
+#ifdef DAMAGEEXT
+		FlushIfCriticalOutputPending ();
+#endif
 	    }
 	    FlushAllOutput();
 #ifdef SMART_SCHEDULE
@@ -628,7 +635,7 @@
         return BadMatch;
     if ((stuff->mode == SetModeInsert) || (stuff->mode == SetModeDelete))
     {
-        result = AlterSaveSetForClient(client, pWin, stuff->mode);
+        result = AlterSaveSetForClient(client, pWin, stuff->mode,FALSE,TRUE);
 	if (client->noClientException != Success)
 	    return(client->noClientException);
 	else
@@ -1041,6 +1048,14 @@
 	CurrentSelections[i].window = stuff->window;
 	CurrentSelections[i].pWin = pWin;
 	CurrentSelections[i].client = (pWin ? client : NullClient);
+	if (SelectionCallback)
+	{
+	    SelectionInfoRec	info;
+
+	    info.selection = &CurrentSelections[i];
+	    info.kind= SelectionSetOwner;
+	    CallCallbacks(&SelectionCallback, &info);
+	}
 	return (client->noClientException);
     }
     else 
@@ -3721,7 +3736,7 @@
     client->lastGC = (GCPtr) NULL;
     client->lastGCID = INVALID;
     client->numSaved = 0;
-    client->saveSet = (pointer *)NULL;
+    client->saveSet = (SaveSetElt *)NULL;
     client->noClientException = Success;
 #ifdef DEBUG
     client->requestLogIndex = 0;
@@ -4054,6 +4069,14 @@
     for (i = 0; i< NumCurrentSelections; i++)
         if (CurrentSelections[i].pWin == pWin)
         {
+	    if (SelectionCallback)
+	    {
+		SelectionInfoRec    info;
+
+		info.selection = &CurrentSelections[i];
+		info.kind = SelectionWindowDestroy;
+		CallCallbacks(&SelectionCallback, &info);
+	    }
             CurrentSelections[i].pWin = (WindowPtr)NULL;
             CurrentSelections[i].window = None;
 	    CurrentSelections[i].client = NullClient;
@@ -4069,6 +4092,14 @@
     for (i = 0; i< NumCurrentSelections; i++)
         if (CurrentSelections[i].client == client)
         {
+	    if (SelectionCallback)
+	    {
+		SelectionInfoRec    info;
+
+		info.selection = &CurrentSelections[i];
+		info.kind = SelectionClientClose;
+		CallCallbacks(&SelectionCallback, &info);
+	    }
             CurrentSelections[i].pWin = (WindowPtr)NULL;
             CurrentSelections[i].window = None;
 	    CurrentSelections[i].client = NullClient;

Index: dispatch.h
===================================================================
RCS file: /cvs/xserver/debrix/dix/dispatch.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- dispatch.h	23 Apr 2004 19:04:44 -0000	1.2
+++ dispatch.h	10 Jun 2004 19:39:57 -0000	1.3
@@ -30,6 +30,9 @@
  * extension.c, property.c. 
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifndef DISPATCH_H
 #define DISPATCH_H 1
 

Index: dixfonts.c
===================================================================
RCS file: /cvs/xserver/debrix/dix/dixfonts.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- dixfonts.c	23 Apr 2004 19:04:44 -0000	1.2
+++ dixfonts.c	10 Jun 2004 19:39:57 -0000	1.3
@@ -51,10 +51,13 @@
 ******************************************************************/
 /* $Xorg: dixfonts.c,v 1.4 2000/08/17 19:48:18 cpqbld Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #define NEED_REPLIES
-#include "X.h"
-#include "Xmd.h"
-#include "Xproto.h"
+#include <X11/X.h>
+#include <X11/Xmd.h>
+#include <X11/Xproto.h>
 #include "scrnintstr.h"
 #include "resource.h"
 #include "dixstruct.h"
@@ -78,7 +81,7 @@
 
 #ifdef XF86BIGFONT
 #define _XF86BIGFONT_SERVER_
-#include "xf86bigfont.h"
+#include <X11/extensions/xf86bigfont.h>
 #endif
 
 #define QUERYCHARINFO(pci, pr)  *(pr) = (pci)->metrics
@@ -1952,7 +1955,9 @@
     if (screenInfo.numScreens > screenInfo.numVideoScreens) {
 	PrinterFontRegisterFpeFunctions();
 	FontFileCheckRegisterFpeFunctions();
+#ifdef XFONT_XC
 	check_fs_register_fpe_functions();
+#endif
     } else 
 #endif
     {
@@ -1960,7 +1965,7 @@
 	BuiltinRegisterFpeFunctions();
 #endif
 	FontFileRegisterFpeFunctions();
-#ifndef NOFONTSERVERACCESS
+#if !defined(NOFONTSERVERACCESS) && defined(XFONT_XC)
 	fs_register_fpe_functions();
 #endif
     }

Index: dixutils.c
===================================================================
RCS file: /cvs/xserver/debrix/dix/dixutils.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- dixutils.c	23 Apr 2004 19:04:44 -0000	1.2
+++ dixutils.c	10 Jun 2004 19:39:57 -0000	1.3
@@ -84,15 +84,18 @@
 
 /* $Xorg: dixutils.c,v 1.4 2001/02/09 02:04:40 xorgcvs Exp $ */
 
-#include "X.h"
-#include "Xmd.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include <X11/X.h>
+#include <X11/Xmd.h>
 #include "misc.h"
 #include "windowstr.h"
 #include "dixstruct.h"
 #include "pixmapstr.h"
 #include "scrnintstr.h"
 #define  XK_LATIN1
-#include "keysymdef.h"
+#include <X11/keysymdef.h>
 #ifdef XCSECURITY
 #define _SECURITY_SERVER
 #include "security.h"
@@ -152,6 +155,21 @@
  * beware of too-small buffers
  */
 
+static unsigned char
+ISOLatin1ToLower (unsigned char source)
+{
+    unsigned char   dest;
+    if ((source >= XK_A) && (source <= XK_Z))
+	dest = source + (XK_a - XK_A);
+    else if ((source >= XK_Agrave) && (source <= XK_Odiaeresis))
+	dest = source + (XK_agrave - XK_Agrave);
+    else if ((source >= XK_Ooblique) && (source <= XK_Thorn))
+	dest = source + (XK_oslash - XK_Ooblique);
+    else
+	dest = source;
+    return dest;
+}
+
 void
 CopyISOLatin1Lowered(dest, source, length)
     register unsigned char *dest, *source;
@@ -160,17 +178,27 @@
     register int i;
 
     for (i = 0; i < length; i++, source++, dest++)
+	*dest = ISOLatin1ToLower (*source);
+    *dest = '\0';
+}
+
+int
+CompareISOLatin1Lowered(unsigned char *s1, int s1len, 
+			unsigned char *s2, int s2len)
+{
+    unsigned char   c1, c2;
+    
+    for (;;) 
     {
-	if ((*source >= XK_A) && (*source <= XK_Z))
-	    *dest = *source + (XK_a - XK_A);
-	else if ((*source >= XK_Agrave) && (*source <= XK_Odiaeresis))
-	    *dest = *source + (XK_agrave - XK_Agrave);
-	else if ((*source >= XK_Ooblique) && (*source <= XK_Thorn))
-	    *dest = *source + (XK_oslash - XK_Ooblique);
-	else
-	    *dest = *source;
+	/* note -- compare against zero so that -1 ignores len */
+	c1 = s1len-- ? *s1++ : '\0';
+	c2 = s2len-- ? *s2++ : '\0';
+	if (!c1 || 
+	    (c1 != c2 && 
+	     (c1 = ISOLatin1ToLower (c1)) != (c2 = ISOLatin1ToLower (c2))))
+	    break;
     }
-    *dest = '\0';
+    return (int) c1 - (int) c2;
 }
 
 #ifdef XCSECURITY
@@ -321,13 +349,18 @@
 
 
 int
-AlterSaveSetForClient(client, pWin, mode)
-    ClientPtr client;
-    WindowPtr pWin;
-    unsigned mode;
+AlterSaveSetForClient(ClientPtr client,
+		      WindowPtr pWin,
+		      unsigned mode,
+		      Bool  toRoot,
+		      Bool  remap)
 {
     int numnow;
+#ifdef XFIXES
+    SaveSetElt *pTmp = NULL;
+#else
     pointer *pTmp = NULL;
+#endif
     int j;
 
     numnow = client->numSaved;
@@ -335,7 +368,7 @@
     if (numnow)
     {
 	pTmp = client->saveSet;
-	while ((j < numnow) && (pTmp[j] != (pointer)pWin))
+	while ((j < numnow) && (SaveSetWindow(pTmp[j]) != (pointer)pWin))
 	    j++;
     }
     if (mode == SetModeInsert)
@@ -343,12 +376,18 @@
 	if (j < numnow)         /* duplicate */
 	   return(Success);
 	numnow++;
+#ifdef XFIXES
+	pTmp = (SaveSetElt *)xrealloc(client->saveSet, sizeof(SaveSetElt) * numnow);
+#else
 	pTmp = (pointer *)xrealloc(client->saveSet, sizeof(pointer) * numnow);
+#endif
 	if (!pTmp)
 	    return(BadAlloc);
 	client->saveSet = pTmp;
        	client->numSaved = numnow;
-	client->saveSet[numnow - 1] = (pointer)pWin;
+	SaveSetAssignWindow(client->saveSet[numnow - 1], pWin);
+	SaveSetAssignToRoot(client->saveSet[numnow - 1], toRoot);
+	SaveSetAssignRemap(client->saveSet[numnow - 1], remap);
 	return(Success);
     }
     else if ((mode == SetModeDelete) && (j < numnow))
@@ -361,15 +400,22 @@
 	numnow--;
         if (numnow)
 	{
-    	    pTmp = (pointer *)xrealloc(client->saveSet,
-				       sizeof(pointer) * numnow);
+#ifdef XFIXES
+	    pTmp = (SaveSetElt *)xrealloc(client->saveSet, sizeof(SaveSetElt) * numnow);
+#else
+	    pTmp = (pointer *)xrealloc(client->saveSet, sizeof(pointer) * numnow);
+#endif
 	    if (pTmp)
 		client->saveSet = pTmp;
 	}
         else
         {
             xfree(client->saveSet);
+#ifdef XFIXES
+	    client->saveSet = (SaveSetElt *)NULL;
+#else
 	    client->saveSet = (pointer *)NULL;
+#endif
 	}
 	client->numSaved = numnow;
 	return(Success);
@@ -388,7 +434,7 @@
     {    
 	client = clients[i];
 	if (client && client->numSaved)
-	    (void)AlterSaveSetForClient(client, pWin, SetModeDelete);
+	    (void)AlterSaveSetForClient(client, pWin, SetModeDelete, FALSE, TRUE);
     }
 }
 

Index: events.c
===================================================================
RCS file: /cvs/xserver/debrix/dix/events.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- events.c	23 Apr 2004 19:04:44 -0000	1.2
+++ events.c	10 Jun 2004 19:39:57 -0000	1.3
@@ -78,12 +78,15 @@
 
 /* $Xorg: events.c,v 1.4 2001/02/09 02:04:40 xorgcvs Exp $ */
 
-#include "X.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include <X11/X.h>
 #include "misc.h"
 #include "resource.h"
 #define NEED_EVENTS
 #define NEED_REPLIES
-#include "Xproto.h"
+#include <X11/Xproto.h>
 #include "windowstr.h"
 #include "inputstr.h"
 #include "scrnintstr.h"
@@ -97,7 +100,7 @@
 #include "globals.h"
 
 #ifdef XKB
-#include "XKBsrv.h"
+#include <X11/extensions/XKBsrv.h>
 extern Bool XkbFilterEvents(ClientPtr, int, xEvent *);
 #endif
 
@@ -106,7 +109,7 @@
 #include "security.h"
 #endif
 
-#include "XIproto.h"
+#include <X11/extensions/XIproto.h>
 #include "exevents.h"
 #include "extnsionst.h"
 
@@ -182,11 +185,6 @@
 static int spriteTraceSize = 0;
 static int spriteTraceGood;
 
-typedef struct {
-    int		x, y;
-    ScreenPtr	pScreen;
-} HotSpot;
-
 static  struct {
     CursorPtr	current;
     BoxRec	hotLimits;	/* logical constraints of hot spot */

Index: extension.c
===================================================================
RCS file: /cvs/xserver/debrix/dix/extension.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- extension.c	23 Apr 2004 19:04:44 -0000	1.2
+++ extension.c	10 Jun 2004 19:39:57 -0000	1.3
@@ -47,10 +47,13 @@
 ******************************************************************/
 /* $Xorg: extension.c,v 1.4 2001/02/09 02:04:40 xorgcvs Exp $ */
 
-#include "X.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include <X11/X.h>
 #define NEED_EVENTS
 #define NEED_REPLIES
-#include "Xproto.h"
+#include <X11/Xproto.h>
 #include "misc.h"
 #include "dixstruct.h"
 #include "extnsionst.h"

Index: gc.c
===================================================================
RCS file: /cvs/xserver/debrix/dix/gc.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- gc.c	23 Apr 2004 19:04:44 -0000	1.2
+++ gc.c	10 Jun 2004 19:39:57 -0000	1.3
@@ -48,9 +48,12 @@
 
 /* $Xorg: gc.c,v 1.4 2001/02/09 02:04:40 xorgcvs Exp $ */
 
-#include "X.h"
-#include "Xmd.h"
-#include "Xproto.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include <X11/X.h>
+#include <X11/Xmd.h>
+#include <X11/Xproto.h>
 #include "misc.h"
 #include "resource.h"
 #include "gcstruct.h"

Index: globals.c
===================================================================
RCS file: /cvs/xserver/debrix/dix/globals.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- globals.c	23 Apr 2004 19:04:44 -0000	1.2
+++ globals.c	10 Jun 2004 19:39:57 -0000	1.3
@@ -49,8 +49,11 @@
 
 /* $Xorg: globals.c,v 1.4 2001/02/09 02:04:40 xorgcvs Exp $ */
 
-#include "X.h"
-#include "Xmd.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include <X11/X.h>
+#include <X11/Xmd.h>
 #include "misc.h"
 #include "windowstr.h"
 #include "scrnintstr.h"

Index: glyphcurs.c
===================================================================
RCS file: /cvs/xserver/debrix/dix/glyphcurs.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- glyphcurs.c	14 Nov 2003 16:48:54 -0000	1.1.1.1
+++ glyphcurs.c	10 Jun 2004 19:39:57 -0000	1.2
@@ -47,6 +47,9 @@
 
 /* $Xorg: glyphcurs.c,v 1.4 2001/02/09 02:04:40 xorgcvs Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "misc.h"
 #include "fontstruct.h"
 #include "dixfontstr.h"

Index: grabs.c
===================================================================
RCS file: /cvs/xserver/debrix/dix/grabs.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- grabs.c	23 Apr 2004 19:04:44 -0000	1.2
+++ grabs.c	10 Jun 2004 19:39:57 -0000	1.3
@@ -48,10 +48,13 @@
 */
 /* $XFree86: xc/programs/Xserver/dix/grabs.c,v 3.4 2002/02/19 11:09:22 alanh Exp $ */
 
-#include "X.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include <X11/X.h>
 #include "misc.h"
 #define NEED_EVENTS
-#include "Xproto.h"
+#include <X11/Xproto.h>
 #include "windowstr.h"
 #include "inputstr.h"
 #include "cursorstr.h"

Index: initatoms.c
===================================================================
RCS file: /cvs/xserver/debrix/dix/initatoms.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- initatoms.c	14 Nov 2003 16:48:54 -0000	1.1.1.1
+++ initatoms.c	10 Jun 2004 19:39:57 -0000	1.2
@@ -3,8 +3,11 @@
  * Do not change!  Changing this file implies a protocol change!
  */
 
-#include "X.h"
-#include "Xatom.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include <X11/X.h>
+#include <X11/Xatom.h>
 #include "misc.h"
 #include "dix.h"
 void MakePredeclaredAtoms()

Index: main.c
===================================================================
RCS file: /cvs/xserver/debrix/dix/main.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- main.c	23 Apr 2004 19:04:44 -0000	1.2
+++ main.c	10 Jun 2004 19:39:57 -0000	1.3
@@ -79,10 +79,13 @@
 
 /* $TOG: main.c /main/86 1998/02/09 14:20:03 kaleb $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #define NEED_EVENTS
-#include "X.h"
-#include "Xos.h"   /* for unistd.h  */
-#include "Xproto.h"
+#include <X11/X.h>
+#include <X11/Xos.h>   /* for unistd.h  */
+#include <X11/Xproto.h>
 #include "scrnintstr.h"
 #include "misc.h"
 #include "os.h"
@@ -109,7 +112,7 @@
 
 #ifdef DPMSExtension
 #define DPMS_SERVER
-#include "dpms.h"
+#include <X11/extensions/dpms.h>
 #include "dpmsproc.h"
 #endif
 

Index: pixmap.c
===================================================================
RCS file: /cvs/xserver/debrix/dix/pixmap.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- pixmap.c	23 Apr 2004 19:04:44 -0000	1.2
+++ pixmap.c	10 Jun 2004 19:39:57 -0000	1.3
@@ -28,7 +28,10 @@
 */
 /* $XFree86: xc/programs/Xserver/dix/pixmap.c,v 3.4 2001/01/17 22:36:44 dawes Exp $ */
 
-#include "X.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include <X11/X.h>
 #include "scrnintstr.h"
 #include "misc.h"
 #include "os.h"

Index: privates.c
===================================================================
RCS file: /cvs/xserver/debrix/dix/privates.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- privates.c	23 Apr 2004 19:04:44 -0000	1.2
+++ privates.c	10 Jun 2004 19:39:57 -0000	1.3
@@ -28,7 +28,10 @@
 */
 /* $XFree86: xc/programs/Xserver/dix/privates.c,v 3.7 2001/01/17 22:36:44 dawes Exp $ */
 
-#include "X.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include <X11/X.h>
 #include "scrnintstr.h"
 #include "misc.h"
 #include "os.h"

Index: property.c
===================================================================
RCS file: /cvs/xserver/debrix/dix/property.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- property.c	23 Apr 2004 19:04:44 -0000	1.2
+++ property.c	10 Jun 2004 19:39:57 -0000	1.3
@@ -47,10 +47,13 @@
 ******************************************************************/
 /* $Xorg: property.c,v 1.4 2001/02/09 02:04:40 xorgcvs Exp $ */
 
-#include "X.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include <X11/X.h>
 #define NEED_REPLIES
 #define NEED_EVENTS
-#include "Xproto.h"
+#include <X11/Xproto.h>
 #include "windowstr.h"
 #include "propertyst.h"
 #include "dixstruct.h"

Index: resource.c
===================================================================
RCS file: /cvs/xserver/debrix/dix/resource.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- resource.c	25 Apr 2004 22:42:09 -0000	1.3
+++ resource.c	10 Jun 2004 19:39:57 -0000	1.4
@@ -101,8 +101,11 @@
  */
 /* $XFree86: xc/programs/Xserver/dix/resource.c,v 3.13 2003/09/24 02:43:13 dawes Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #define NEED_EVENTS
-#include "X.h"
+#include <X11/X.h>
 #include "misc.h"
 #include "os.h"
 #include "resource.h"

Index: swaprep.c
===================================================================
RCS file: /cvs/xserver/debrix/dix/swaprep.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- swaprep.c	23 Apr 2004 19:04:44 -0000	1.2
+++ swaprep.c	10 Jun 2004 19:39:57 -0000	1.3
@@ -48,10 +48,13 @@
 
 /* $Xorg: swaprep.c,v 1.4 2001/02/09 02:04:41 xorgcvs Exp $ */
 
-#include "X.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include <X11/X.h>
 #define NEED_REPLIES
 #define NEED_EVENTS
-#include "Xproto.h"
+#include <X11/Xproto.h>
 #include "misc.h"
 #include "dixstruct.h"
 #include "fontstruct.h"

Index: swapreq.c
===================================================================
RCS file: /cvs/xserver/debrix/dix/swapreq.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- swapreq.c	23 Apr 2004 19:04:44 -0000	1.2
+++ swapreq.c	10 Jun 2004 19:39:57 -0000	1.3
@@ -48,10 +48,13 @@
 
 /* $Xorg: swapreq.c,v 1.4 2001/02/09 02:04:41 xorgcvs Exp $ */
 
-#include "X.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include <X11/X.h>
 #define NEED_EVENTS
-#include "Xproto.h"
-#include "Xprotostr.h"
+#include <X11/Xproto.h>
+#include <X11/Xprotostr.h>
 #include "misc.h"
 #include "dixstruct.h"
 #include "extnsionst.h"	/* for SendEvent */

Index: tables.c
===================================================================
RCS file: /cvs/xserver/debrix/dix/tables.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- tables.c	23 Apr 2004 19:04:44 -0000	1.2
+++ tables.c	10 Jun 2004 19:39:57 -0000	1.3
@@ -47,10 +47,13 @@
 ******************************************************************/
 /* $Xorg: tables.c,v 1.4 2001/02/09 02:04:41 xorgcvs Exp $ */
 
-#include "X.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include <X11/X.h>
 #define NEED_EVENTS
 #define NEED_REPLIES
-#include "Xproto.h"
+#include <X11/Xproto.h>
 #include "windowstr.h"
 #include "extnsionst.h"
 #include "dixstruct.h"

Index: window.c
===================================================================
RCS file: /cvs/xserver/debrix/dix/window.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- window.c	23 Apr 2004 19:04:44 -0000	1.2
+++ window.c	10 Jun 2004 19:39:57 -0000	1.3
@@ -80,6 +80,9 @@
 
 /* $XFree86: xc/programs/Xserver/dix/window.c,v 3.36 2003/11/14 23:52:50 torrey Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "misc.h"
 #include "scrnintstr.h"
 #include "os.h"
@@ -291,6 +294,9 @@
     pWin->srcBuffer = DBE_FRONT_BUFFER;
     pWin->dstBuffer = DBE_FRONT_BUFFER;
 #endif
+#ifdef COMPOSITE
+    pWin->redirectDraw = 0;
+#endif
 }
 
 static void
@@ -1661,6 +1667,19 @@
 SetWinSize (pWin)
     register WindowPtr pWin;
 {
+#ifdef COMPOSITE
+    if (pWin->redirectDraw)
+    {
+        BoxRec  box;
+
+        box.x1 = pWin->drawable.x;
+        box.y1 = pWin->drawable.y;
+        box.x2 = pWin->drawable.x + pWin->drawable.width;
+        box.y2 = pWin->drawable.y + pWin->drawable.height;
+        REGION_RESET (pScreen, &pWin->winSize, &box);
+    }
+    else
+#endif
     ClippedRegionFromBox(pWin->parent, &pWin->winSize,
 			 pWin->drawable.x, pWin->drawable.y,
 			 (int)pWin->drawable.width,
@@ -1691,6 +1710,19 @@
 
     if (HasBorder (pWin)) {
 	bw = wBorderWidth (pWin);
+#ifdef COMPOSITE
+        if (pWin->redirectDraw)
+        {
+            BoxRec      box;
+
+            box.x1 = pWin->drawable.x - bw;
+            box.y1 = pWin->drawable.y - bw;
+            box.x2 = pWin->drawable.x + pWin->drawable.width + bw;
+            box.y2 = pWin->drawable.y + pWin->drawable.height + bw;
+            REGION_RESET (pScreen, &pWin->borderSize, &box);
+        }
+        else
+#endif
 	ClippedRegionFromBox(pWin->parent, &pWin->borderSize,
 		pWin->drawable.x - bw, pWin->drawable.y - bw,
 		(int)(pWin->drawable.width + (bw<<1)),
@@ -3152,10 +3184,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 +3211,11 @@
     }
     xfree(client->saveSet);
     client->numSaved = 0;
+#ifdef XFIXES
+    client->saveSet = (SaveSetElt *)NULL;
+#else
     client->saveSet = (pointer *)NULL;
+#endif
 }
 
 Bool

Index: xpstubs.c
===================================================================
RCS file: /cvs/xserver/debrix/dix/xpstubs.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- xpstubs.c	23 Apr 2004 19:04:44 -0000	1.2
+++ xpstubs.c	10 Jun 2004 19:39:57 -0000	1.3
@@ -27,6 +27,9 @@
 
 /* $Xorg: xpstubs.c,v 1.5 2001/03/08 17:52:08 pookie Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "misc.h"
 #include "font.h"
 


