debrix/include Imakefile, 1.2, 1.3 XIstubs.h, 1.2, 1.3 bstore.h, 1.2, 1.3 bstorestr.h, 1.2, 1.3 closestr.h, 1.2, 1.3 closure.h, 1.1.1.1, 1.2 colormap.h, 1.2, 1.3 colormapst.h, 1.1.1.1, 1.2 cursor.h, 1.2, 1.3 cursorstr.h, 1.2, 1.3 dix.h, 1.2, 1.3 dixevents.h, 1.2, 1.3 dixfont.h, 1.2, 1.3 dixfontstr.h, 1.1.1.1, 1.2 dixgrabs.h, 1.2, 1.3 dixstruct.h, 1.2, 1.3 exevents.h, 1.2, 1.3 extension.h, 1.2, 1.3 extinit.h, 1.2, 1.3 extnsionst.h, 1.2, 1.3 gc.h, 1.2, 1.3 gcstruct.h, 1.2, 1.3 globals.h, 1.2, 1.3 input.h, 1.2, 1.3 inputstr.h, 1.2, 1.3 misc.h, 1.2, 1.3 miscstruct.h, 1.2, 1.3 opaque.h, 1.2, 1.3 os.h, 1.2, 1.3 pixmap.h, 1.2, 1.3 pixmapstr.h, 1.2, 1.3 property.h, 1.2, 1.3 propertyst.h, 1.2, 1.3 region.h, 1.1.1.1, 1.2 regionstr.h, 1.2, 1.3 resource.h, 1.2, 1.3 rgb.h, 1.1.1.1, 1.2 screenint.h, 1.2, 1.3 scrnintstr.h, 1.2, 1.3 selection.h, 1.1.1.1, 1.2 servermd.h, 1.2, 1.3 site.h, 1.2, 1.3 swaprep.h, 1.2, 1.3 swapreq.h, 1.2, 1.3 validate.h, 1.2, 1.3 window.h, 1.2, 1.3 windowstr.h, 1.2, 1.3

Daniel Stone xserver-commit at pdx.freedesktop.org
Fri Jun 11 05:41:39 EST 2004 

Committed by: daniel

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

Modified Files:
	Imakefile XIstubs.h bstore.h bstorestr.h closestr.h closure.h 
	colormap.h colormapst.h cursor.h cursorstr.h dix.h dixevents.h 
	dixfont.h dixfontstr.h dixgrabs.h dixstruct.h exevents.h 
	extension.h extinit.h extnsionst.h gc.h gcstruct.h globals.h 
	input.h inputstr.h misc.h miscstruct.h opaque.h os.h pixmap.h 
	pixmapstr.h property.h propertyst.h region.h regionstr.h 
	resource.h rgb.h screenint.h scrnintstr.h selection.h 
	servermd.h site.h swaprep.h swapreq.h validate.h window.h 
	windowstr.h 
Log Message:
Initial import from modular sources.


Index: Imakefile
===================================================================
RCS file: /cvs/xserver/debrix/include/Imakefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Imakefile	23 Apr 2004 19:54:23 -0000	1.2
+++ Imakefile	10 Jun 2004 19:41:35 -0000	1.3
@@ -48,6 +48,8 @@
 InstallDriverSDKNonExecFile(miscstruct.h,$(DRIVERSDKINCLUDEDIR))
 InstallDriverSDKNonExecFile(opaque.h,$(DRIVERSDKINCLUDEDIR))
 InstallDriverSDKNonExecFile(os.h,$(DRIVERSDKINCLUDEDIR))
+InstallDriverSDKNonExecFile(picture.h,$(DRIVERSDKINCLUDEDIR))
+InstallDriverSDKNonExecFile(picturestr.h,$(DRIVERSDKINCLUDEDIR))
 InstallDriverSDKNonExecFile(pixmap.h,$(DRIVERSDKINCLUDEDIR))
 InstallDriverSDKNonExecFile(pixmapstr.h,$(DRIVERSDKINCLUDEDIR))
 InstallDriverSDKNonExecFile(property.h,$(DRIVERSDKINCLUDEDIR))

Index: XIstubs.h
===================================================================
RCS file: /cvs/xserver/debrix/include/XIstubs.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- XIstubs.h	23 Apr 2004 19:54:23 -0000	1.2
+++ XIstubs.h	10 Jun 2004 19:41:35 -0000	1.3
@@ -24,6 +24,9 @@
 
 ********************************************************/
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifndef XI_STUBS_H
 #define XI_STUBS_H 1
 

Index: bstore.h
===================================================================
RCS file: /cvs/xserver/debrix/include/bstore.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- bstore.h	23 Apr 2004 19:54:23 -0000	1.2
+++ bstore.h	10 Jun 2004 19:41:35 -0000	1.3
@@ -15,6 +15,9 @@
  * -- 1997.10.27  Marc Aurele La France (tsi at xfree86.org)
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifndef _BSTORE_H_
 #define _BSTORE_H_
 

Index: bstorestr.h
===================================================================
RCS file: /cvs/xserver/debrix/include/bstorestr.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- bstorestr.h	23 Apr 2004 19:54:23 -0000	1.2
+++ bstorestr.h	10 Jun 2004 19:41:35 -0000	1.3
@@ -15,6 +15,9 @@
  * -- 1997.10.27  Marc Aurele La France (tsi at xfree86.org)
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifndef _BSTORESTR_H_
 #define _BSTORESTR_H_
 

Index: closestr.h
===================================================================
RCS file: /cvs/xserver/debrix/include/closestr.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- closestr.h	23 Apr 2004 19:54:23 -0000	1.2
+++ closestr.h	10 Jun 2004 19:41:35 -0000	1.3
@@ -29,11 +29,14 @@
 /* $XFree86: xc/programs/Xserver/include/closestr.h,v 3.4 2001/12/14 19:59:53 dawes Exp $ */
 
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifndef CLOSESTR_H
 #define CLOSESTR_H
 
 #define	NEED_REPLIES
-#include "Xproto.h"
+#include <X11/Xproto.h>
 #include "closure.h"
 #include "dix.h"
 #include "misc.h"

Index: closure.h
===================================================================
RCS file: /cvs/xserver/debrix/include/closure.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- closure.h	14 Nov 2003 16:48:57 -0000	1.1.1.1
+++ closure.h	10 Jun 2004 19:41:35 -0000	1.2
@@ -45,6 +45,9 @@
 SOFTWARE.
 
 ******************************************************************/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifndef CLOSURE_H
 #define CLOSURE_H 1
 

Index: colormap.h
===================================================================
RCS file: /cvs/xserver/debrix/include/colormap.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- colormap.h	23 Apr 2004 19:54:23 -0000	1.2
+++ colormap.h	10 Jun 2004 19:41:35 -0000	1.3
@@ -47,6 +47,9 @@
 */
 /* $Xorg: colormap.h,v 1.4 2001/02/09 02:05:14 xorgcvs Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifndef CMAP_H
 #define CMAP_H 1
 

Index: colormapst.h
===================================================================
RCS file: /cvs/xserver/debrix/include/colormapst.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- colormapst.h	14 Nov 2003 16:48:57 -0000	1.1.1.1
+++ colormapst.h	10 Jun 2004 19:41:35 -0000	1.2
@@ -45,6 +45,9 @@
 
 */
 /* $Xorg: colormapst.h,v 1.4 2001/02/09 02:05:14 xorgcvs Exp $ */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifndef CMAPSTRUCT_H
 #define CMAPSTRUCT_H 1
 

Index: cursor.h
===================================================================
RCS file: /cvs/xserver/debrix/include/cursor.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- cursor.h	23 Apr 2004 19:54:23 -0000	1.2
+++ cursor.h	10 Jun 2004 19:41:35 -0000	1.3
@@ -47,6 +47,9 @@
 
 ******************************************************************/
 /* $Xorg: cursor.h,v 1.4 2001/02/09 02:05:15 xorgcvs Exp $ */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifndef CURSOR_H
 #define CURSOR_H 
 

Index: cursorstr.h
===================================================================
RCS file: /cvs/xserver/debrix/include/cursorstr.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- cursorstr.h	23 Apr 2004 19:54:23 -0000	1.2
+++ cursorstr.h	10 Jun 2004 19:41:35 -0000	1.3
@@ -47,6 +47,9 @@
 ******************************************************************/
 /* $XFree86: xc/programs/Xserver/include/cursorstr.h,v 1.8 2002/11/30 06:21:51 keithp Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifndef CURSORSTRUCT_H
 #define CURSORSTRUCT_H 
 
@@ -77,10 +80,18 @@
     unsigned short backRed, backGreen, backBlue; /* device-independent color */
     int refcnt;
     pointer devPriv[MAXSCREENS];		/* set by pScr->RealizeCursor*/
+#ifdef XFIXES
+    CARD32 serialNumber;
+    Atom name;
+#endif
 } CursorRec;
 
 typedef struct _CursorMetric {
     unsigned short width, height, xhot, yhot;
 } CursorMetricRec;
 
+typedef struct {
+    int		x, y;
+    ScreenPtr	pScreen;
+} HotSpot;
 #endif /* CURSORSTRUCT_H */

Index: dix.h
===================================================================
RCS file: /cvs/xserver/debrix/include/dix.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- dix.h	23 Apr 2004 19:54:23 -0000	1.2
+++ dix.h	10 Jun 2004 19:41:35 -0000	1.3
@@ -47,6 +47,9 @@
 ******************************************************************/
 /* $Xorg: dix.h,v 1.4 2001/02/09 02:05:15 xorgcvs Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifndef DIX_H
 #define DIX_H
 
@@ -379,6 +382,12 @@
     unsigned char * /*source*/,
     int /*length*/);
 
+extern int CompareISOLatin1Lowered(
+    unsigned char * /*a*/,
+    int alen,
+    unsigned char * /*b*/,
+    int blen);
+
 #ifdef XCSECURITY
 
 extern WindowPtr SecurityLookupWindow(
@@ -423,12 +432,14 @@
 
 extern void NoopDDA(void);
 
-extern int AlterSaveSetForClient(
+int AlterSaveSetForClient(
     ClientPtr /*client*/,
     WindowPtr /*pWin*/,
-    unsigned /*mode*/);
-
-extern void DeleteWindowFromAnySaveSet(
+    unsigned /*mode*/,
+    Bool /*toRoot*/,
+    Bool /*remap*/);
+  
+void DeleteWindowFromAnySaveSet(
     WindowPtr /*pWin*/);
 
 extern void BlockHandler(
@@ -785,4 +796,21 @@
     int count;
 } DeviceEventInfoRec;
 
+/*
+ * SelectionCallback stuff
+ */
+
+extern CallbackListPtr SelectionCallback;
+
+typedef enum {
+    SelectionSetOwner,
+    SelectionWindowDestroy,
+    SelectionClientClose
+} SelectionCallbackKind;
+
+typedef struct {
+    struct _Selection	    *selection;
+    SelectionCallbackKind   kind;
+} SelectionInfoRec;
+
 #endif /* DIX_H */

Index: dixevents.h
===================================================================
RCS file: /cvs/xserver/debrix/include/dixevents.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- dixevents.h	23 Apr 2004 19:54:23 -0000	1.2
+++ dixevents.h	10 Jun 2004 19:41:35 -0000	1.3
@@ -24,6 +24,9 @@
 
 ********************************************************/
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifndef DIXEVENTS_H
 #define DIXEVENTS_H
 

Index: dixfont.h
===================================================================
RCS file: /cvs/xserver/debrix/include/dixfont.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- dixfont.h	23 Apr 2004 19:54:23 -0000	1.2
+++ dixfont.h	10 Jun 2004 19:41:35 -0000	1.3
@@ -23,6 +23,9 @@
 ******************************************************************/
 /* $XFree86: xc/programs/Xserver/include/dixfont.h,v 3.7 2001/02/02 21:39:02 herrb Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifndef DIXFONT_H
 #define DIXFONT_H 1
 

Index: dixfontstr.h
===================================================================
RCS file: /cvs/xserver/debrix/include/dixfontstr.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- dixfontstr.h	14 Nov 2003 16:48:57 -0000	1.1.1.1
+++ dixfontstr.h	10 Jun 2004 19:41:35 -0000	1.2
@@ -22,6 +22,9 @@
 
 ******************************************************************/
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifndef DIXFONTSTRUCT_H
 #define DIXFONTSTRUCT_H
 

Index: dixgrabs.h
===================================================================
RCS file: /cvs/xserver/debrix/include/dixgrabs.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- dixgrabs.h	23 Apr 2004 19:54:23 -0000	1.2
+++ dixgrabs.h	10 Jun 2004 19:41:35 -0000	1.3
@@ -24,6 +24,9 @@
 
 ********************************************************/
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifndef DIXGRABS_H
 #define DIXGRABS_H 1
 

Index: dixstruct.h
===================================================================
RCS file: /cvs/xserver/debrix/include/dixstruct.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- dixstruct.h	23 Apr 2004 19:54:23 -0000	1.2
+++ dixstruct.h	10 Jun 2004 19:41:35 -0000	1.3
@@ -23,6 +23,9 @@
 ******************************************************************/
 /* $Xorg: dixstruct.h,v 1.3 2000/08/17 19:53:29 cpqbld Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifndef DIXSTRUCT_H
 #define DIXSTRUCT_H
 
@@ -68,6 +71,28 @@
 	      ClientStateCheckingSecurity,
 	      ClientStateCheckedSecurity} ClientState;
 
+#ifdef XFIXES
+typedef struct _saveSet {
+    struct _Window  *windowPtr;
+    Bool	    toRoot;
+    Bool	    remap;
+} SaveSetElt;
+#define SaveSetWindow(ss)   ((ss).windowPtr)
+#define SaveSetToRoot(ss)   ((ss).toRoot)
+#define SaveSetRemap(ss)    ((ss).remap)
+#define SaveSetAssignWindow(ss,w)   ((ss).windowPtr = (w))
+#define SaveSetAssignToRoot(ss,tr)  ((ss).toRoot = (tr))
+#define SaveSetAssignRemap(ss,rm)  ((ss).remap = (rm))
+#else
+typedef struct _Window *SaveSetElt;
+#define SaveSetWindow(ss)   (ss)
+#define SaveSetToRoot(ss)   FALSE
+#define SaveSetRemap(ss)    TRUE
+#define SaveSetAssignWindow(ss,w)   ((ss) = (w))
+#define SaveSetAssignToRoot(ss,tr)
+#define SaveSetAssignRemap(ss,rm)
+#endif
+
 typedef struct _Client {
     int         index;
     Mask        clientAsMask;
@@ -85,7 +110,7 @@
     Drawable    lastDrawableID;
     GCPtr       lastGC;
     GContext    lastGCID;
-    pointer    *saveSet;
+    SaveSetElt	*saveSet;
     int         numSaved;
     pointer     screenPrivate[MAXSCREENS];
     int         (**requestVector) (
@@ -148,8 +173,8 @@
 extern Bool SmartScheduleIdle;
 extern Bool SmartScheduleTimerStopped;
 extern Bool SmartScheduleStartTimer(void);
-#define SMART_MAX_PRIORITY  (20)
-#define SMART_MIN_PRIORITY  (-20)
+#define SMART_MAX_PRIORITY  20
+#define SMART_MIN_PRIORITY  -20
 
 extern Bool SmartScheduleInit(void);
 

Index: exevents.h
===================================================================
RCS file: /cvs/xserver/debrix/include/exevents.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- exevents.h	23 Apr 2004 19:54:23 -0000	1.2
+++ exevents.h	10 Jun 2004 19:41:35 -0000	1.3
@@ -28,6 +28,9 @@
  * Interface of 'exevents.c'
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifndef EXEVENTS_H
 #define EXEVENTS_H
 

Index: extension.h
===================================================================
RCS file: /cvs/xserver/debrix/include/extension.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- extension.h	23 Apr 2004 19:54:23 -0000	1.2
+++ extension.h	10 Jun 2004 19:41:35 -0000	1.3
@@ -47,6 +47,9 @@
 ******************************************************************/
 /* $XFree86: xc/programs/Xserver/include/extension.h,v 1.5 2001/12/14 19:59:54 dawes Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifndef EXTENSION_H
 #define EXTENSION_H 
 

Index: extinit.h
===================================================================
RCS file: /cvs/xserver/debrix/include/extinit.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- extinit.h	23 Apr 2004 19:54:23 -0000	1.2
+++ extinit.h	10 Jun 2004 19:41:35 -0000	1.3
@@ -28,6 +28,9 @@
  * Interface of extinit.c
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifndef EXTINIT_H
 #define EXTINIT_H
 

Index: extnsionst.h
===================================================================
RCS file: /cvs/xserver/debrix/include/extnsionst.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- extnsionst.h	23 Apr 2004 19:54:23 -0000	1.2
+++ extnsionst.h	10 Jun 2004 19:41:35 -0000	1.3
@@ -47,6 +47,9 @@
 ******************************************************************/
 /* $XFree86: xc/programs/Xserver/include/extnsionst.h,v 3.8 2003/04/27 21:31:04 herrb Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifndef EXTENSIONSTRUCT_H
 #define EXTENSIONSTRUCT_H 
 

Index: gc.h
===================================================================
RCS file: /cvs/xserver/debrix/include/gc.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- gc.h	23 Apr 2004 19:54:23 -0000	1.2
+++ gc.h	10 Jun 2004 19:41:35 -0000	1.3
@@ -47,11 +47,14 @@
 ******************************************************************/
 /* $Xorg: gc.h,v 1.4 2001/02/09 02:05:15 xorgcvs Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifndef GC_H
 #define GC_H 
 
 #include "X11/X.h"	/* for GContext, Mask */
-#include "Xdefs.h"	/* for Bool */
+#include <X11/Xdefs.h>	/* for Bool */
 #include "X11/Xproto.h"
 #include "screenint.h"	/* for ScreenPtr */
 #include "pixmap.h"	/* for DrawablePtr */

Index: gcstruct.h
===================================================================
RCS file: /cvs/xserver/debrix/include/gcstruct.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- gcstruct.h	23 Apr 2004 19:54:23 -0000	1.2
+++ gcstruct.h	10 Jun 2004 19:41:35 -0000	1.3
@@ -49,6 +49,9 @@
 
 /* $XFree86: xc/programs/Xserver/include/gcstruct.h,v 1.7 2003/04/27 21:31:04 herrb Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifndef GCSTRUCT_H
 #define GCSTRUCT_H
 
@@ -58,7 +61,7 @@
 #include "region.h"
 #include "pixmap.h"
 #include "screenint.h"
-#include "Xprotostr.h"
+#include <X11/Xprotostr.h>
 
 /*
  * functions which modify the state of the GC

Index: globals.h
===================================================================
RCS file: /cvs/xserver/debrix/include/globals.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- globals.h	23 Apr 2004 19:54:23 -0000	1.2
+++ globals.h	10 Jun 2004 19:41:35 -0000	1.3
@@ -1,6 +1,9 @@
 /* $XdotOrg$ */
 /* $XFree86: xc/programs/Xserver/include/globals.h,v 1.3 1999/09/25 14:38:21 dawes Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifndef _XSERV_GLOBAL_H_
 #define _XSERV_GLOBAL_H_
 

Index: input.h
===================================================================
RCS file: /cvs/xserver/debrix/include/input.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- input.h	23 Apr 2004 19:54:23 -0000	1.2
+++ input.h	10 Jun 2004 19:41:35 -0000	1.3
@@ -47,6 +47,9 @@
 ********************************************************/
 /* $XFree86: xc/programs/Xserver/include/input.h,v 3.7 2001/12/14 19:59:54 dawes Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifndef INPUT_H
 #define INPUT_H
 

Index: inputstr.h
===================================================================
RCS file: /cvs/xserver/debrix/include/inputstr.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- inputstr.h	23 Apr 2004 19:54:23 -0000	1.2
+++ inputstr.h	10 Jun 2004 19:41:35 -0000	1.3
@@ -48,6 +48,9 @@
 
 /* $Xorg: inputstr.h,v 1.4 2001/02/09 02:05:15 xorgcvs Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifndef INPUTSTRUCT_H
 #define INPUTSTRUCT_H
 

Index: misc.h
===================================================================
RCS file: /cvs/xserver/debrix/include/misc.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- misc.h	23 Apr 2004 19:54:23 -0000	1.2
+++ misc.h	10 Jun 2004 19:41:35 -0000	1.3
@@ -67,6 +67,9 @@
 
 ******************************************************************/
 /* $Xorg: misc.h,v 1.5 2001/02/09 02:05:15 xorgcvs Exp $ */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifndef MISC_H
 #define MISC_H 1
 /*

Index: miscstruct.h
===================================================================
RCS file: /cvs/xserver/debrix/include/miscstruct.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- miscstruct.h	23 Apr 2004 19:54:23 -0000	1.2
+++ miscstruct.h	10 Jun 2004 19:41:35 -0000	1.3
@@ -47,6 +47,9 @@
 ******************************************************************/
 /* $XFree86: xc/programs/Xserver/include/miscstruct.h,v 3.4 2003/04/27 21:31:04 herrb Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifndef MISCSTRUCT_H
 #define MISCSTRUCT_H 1
 

Index: opaque.h
===================================================================
RCS file: /cvs/xserver/debrix/include/opaque.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- opaque.h	23 Apr 2004 19:54:23 -0000	1.2
+++ opaque.h	10 Jun 2004 19:41:35 -0000	1.3
@@ -28,6 +28,9 @@
 */
 /* $XFree86: xc/programs/Xserver/include/opaque.h,v 1.13 2003/07/24 13:50:25 eich Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifndef OPAQUE_H
 #define OPAQUE_H
 

Index: os.h
===================================================================
RCS file: /cvs/xserver/debrix/include/os.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- os.h	23 Apr 2004 19:54:23 -0000	1.2
+++ os.h	10 Jun 2004 19:41:35 -0000	1.3
@@ -48,13 +48,16 @@
 
 /* $Xorg: os.h,v 1.4 2001/02/09 02:05:15 xorgcvs Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifndef OS_H
 #define OS_H
 
 #include "misc.h"
 #define ALLOCATE_LOCAL_FALLBACK(_size) Xalloc((unsigned long)(_size))
 #define DEALLOCATE_LOCAL_FALLBACK(_ptr) Xfree((pointer)(_ptr))
-#include "Xalloca.h"
+#include <X11/Xalloca.h>
 #ifndef IN_MODULE
 #include <stdarg.h>
 #else

Index: pixmap.h
===================================================================
RCS file: /cvs/xserver/debrix/include/pixmap.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- pixmap.h	23 Apr 2004 19:54:23 -0000	1.2
+++ pixmap.h	10 Jun 2004 19:41:35 -0000	1.3
@@ -47,6 +47,9 @@
 ******************************************************************/
 /* $XFree86$ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifndef PIXMAP_H
 #define PIXMAP_H
 

Index: pixmapstr.h
===================================================================
RCS file: /cvs/xserver/debrix/include/pixmapstr.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- pixmapstr.h	23 Apr 2004 19:54:23 -0000	1.2
+++ pixmapstr.h	10 Jun 2004 19:41:35 -0000	1.3
@@ -47,6 +47,9 @@
 ******************************************************************/
 /* $XFree86$ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifndef PIXMAPSTRUCT_H
 #define PIXMAPSTRUCT_H
 #include "pixmap.h"
@@ -79,6 +82,10 @@
 #ifdef PIXPRIV
     DevUnion		*devPrivates; /* real devPrivates like gcs & windows */
 #endif
+#ifdef COMPOSITE
+    short		screen_x;
+    short		screen_y;
+#endif
 } PixmapRec;
 
 #endif /* PIXMAPSTRUCT_H */

Index: property.h
===================================================================
RCS file: /cvs/xserver/debrix/include/property.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- property.h	23 Apr 2004 19:54:23 -0000	1.2
+++ property.h	10 Jun 2004 19:41:35 -0000	1.3
@@ -47,6 +47,9 @@
 ******************************************************************/
 /* $XFree86: xc/programs/Xserver/include/property.h,v 1.3 2001/12/14 19:59:55 dawes Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifndef PROPERTY_H
 #define PROPERTY_H 
 

Index: propertyst.h
===================================================================
RCS file: /cvs/xserver/debrix/include/propertyst.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- propertyst.h	23 Apr 2004 19:54:23 -0000	1.2
+++ propertyst.h	10 Jun 2004 19:41:35 -0000	1.3
@@ -47,6 +47,9 @@
 ******************************************************************/
 /* $XFree86: xc/programs/Xserver/include/propertyst.h,v 3.2 2001/01/17 22:36:57 dawes Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifndef PROPERTYSTRUCT_H
 #define PROPERTYSTRUCT_H 
 #include "misc.h"

Index: region.h
===================================================================
RCS file: /cvs/xserver/debrix/include/region.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- region.h	14 Nov 2003 16:48:57 -0000	1.1.1.1
+++ region.h	10 Jun 2004 19:41:35 -0000	1.2
@@ -45,6 +45,9 @@
 SOFTWARE.
 
 ******************************************************************/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifndef REGION_H
 #define REGION_H
 

Index: regionstr.h
===================================================================
RCS file: /cvs/xserver/debrix/include/regionstr.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- regionstr.h	23 Apr 2004 19:54:23 -0000	1.2
+++ regionstr.h	10 Jun 2004 19:41:35 -0000	1.3
@@ -1,4 +1,4 @@
-/* $XdotOrg: xc/programs/Xserver/include/regionstr.h,v 1.1.4.6 2003/12/06 13:24:29 kaleb Exp $ */
+/* $XdotOrg: xc/programs/Xserver/include/regionstr.h,v 1.1.4.7.4.1 2004/03/04 17:48:21 eich Exp $ */
 /* $Xorg: regionstr.h,v 1.4 2001/02/09 02:05:15 xorgcvs Exp $ */
 /***********************************************************
 
@@ -48,6 +48,9 @@
 ******************************************************************/
 /* $XFree86: xc/programs/Xserver/include/regionstr.h,v 1.12tsi Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifndef REGIONSTRUCT_H
 #define REGIONSTRUCT_H
 
@@ -95,81 +98,84 @@
 #define REGION_END(reg) REGION_BOX(reg, (reg)->data->numRects - 1)
 #define REGION_SZOF(n) (sizeof(RegDataRec) + ((n) * sizeof(BoxRec)))
 
+/* Keith recommends weaning the region code of pScreen argument */
+#define REG_pScreen	screenInfo.screens[0]
+
 #ifdef NEED_SCREEN_REGIONS
 
 #define REGION_CREATE(_pScreen, _rect, _size) \
-    (*(_pScreen)->RegionCreate)(_rect, _size)
+    (*(REG_pScreen)->RegionCreate)(_rect, _size)
 
 #define REGION_INIT(_pScreen, _pReg, _rect, _size) \
-    (*(_pScreen)->RegionInit)(_pReg, _rect, _size)
+    (*(REG_pScreen)->RegionInit)(_pReg, _rect, _size)
 
 #define REGION_COPY(_pScreen, dst, src) \
-    (*(_pScreen)->RegionCopy)(dst, src)
+    (*(REG_pScreen)->RegionCopy)(dst, src)
 
 #define REGION_DESTROY(_pScreen, _pReg) \
-    (*(_pScreen)->RegionDestroy)(_pReg)
+    (*(REG_pScreen)->RegionDestroy)(_pReg)
 
 #define REGION_UNINIT(_pScreen, _pReg) \
-    (*(_pScreen)->RegionUninit)(_pReg)
+    (*(REG_pScreen)->RegionUninit)(_pReg)
 
 #define REGION_INTERSECT(_pScreen, newReg, reg1, reg2) \
-    (*(_pScreen)->Intersect)(newReg, reg1, reg2)
+    (*(REG_pScreen)->Intersect)(newReg, reg1, reg2)
 
 #define REGION_UNION(_pScreen, newReg, reg1, reg2) \
-    (*(_pScreen)->Union)(newReg, reg1, reg2)
+    (*(REG_pScreen)->Union)(newReg, reg1, reg2)
 
 #define REGION_SUBTRACT(_pScreen, newReg, reg1, reg2) \
-    (*(_pScreen)->Subtract)(newReg, reg1, reg2)
+    (*(REG_pScreen)->Subtract)(newReg, reg1, reg2)
 
 #define REGION_INVERSE(_pScreen, newReg, reg1, invRect) \
-    (*(_pScreen)->Inverse)(newReg, reg1, invRect)
+    (*(REG_pScreen)->Inverse)(newReg, reg1, invRect)
 
 #define REGION_RESET(_pScreen, _pReg, _pBox) \
-    (*(_pScreen)->RegionReset)(_pReg, _pBox)
+    (*(REG_pScreen)->RegionReset)(_pReg, _pBox)
 
 #define REGION_TRANSLATE(_pScreen, _pReg, _x, _y) \
-    (*(_pScreen)->TranslateRegion)(_pReg, _x, _y)
+    (*(REG_pScreen)->TranslateRegion)(_pReg, _x, _y)
 
 #define RECT_IN_REGION(_pScreen, _pReg, prect) \
-    (*(_pScreen)->RectIn)(_pReg, prect)
+    (*(REG_pScreen)->RectIn)(_pReg, prect)
 
 #define POINT_IN_REGION(_pScreen, _pReg, _x, _y, prect) \
-    (*(_pScreen)->PointInRegion)(_pReg, _x, _y, prect)
+    (*(REG_pScreen)->PointInRegion)(_pReg, _x, _y, prect)
 
 #define REGION_NOTEMPTY(_pScreen, _pReg) \
-    (*(_pScreen)->RegionNotEmpty)(_pReg)
+    (*(REG_pScreen)->RegionNotEmpty)(_pReg)
 
 #define REGION_EQUAL(_pScreen, _pReg1, _pReg2) \
-    (*(_pScreen)->RegionEqual)(_pReg1, _pReg2)
+    (*(REG_pScreen)->RegionEqual)(_pReg1, _pReg2)
 
 #define REGION_BROKEN(_pScreen, _pReg) \
-    (*(_pScreen)->RegionBroken)(_pReg)
+    (*(REG_pScreen)->RegionBroken)(_pReg)
 
 #define REGION_BREAK(_pScreen, _pReg) \
-    (*(_pScreen)->RegionBreak)(_pReg)
+    (*(REG_pScreen)->RegionBreak)(_pReg)
 
 #define REGION_EMPTY(_pScreen, _pReg) \
-    (*(_pScreen)->RegionEmpty)(_pReg)
+    (*(REG_pScreen)->RegionEmpty)(_pReg)
 
 #define REGION_EXTENTS(_pScreen, _pReg) \
-    (*(_pScreen)->RegionExtents)(_pReg)
+    (*(REG_pScreen)->RegionExtents)(_pReg)
 
 #define REGION_APPEND(_pScreen, dstrgn, rgn) \
-    (*(_pScreen)->RegionAppend)(dstrgn, rgn)
+    (*(REG_pScreen)->RegionAppend)(dstrgn, rgn)
 
 #define REGION_VALIDATE(_pScreen, badreg, pOverlap) \
-    (*(_pScreen)->RegionValidate)(badreg, pOverlap)
+    (*(REG_pScreen)->RegionValidate)(badreg, pOverlap)
 
 #define BITMAP_TO_REGION(_pScreen, pPix) \
-    (*(_pScreen)->BitmapToRegion)(pPix)
+    (*(REG_pScreen)->BitmapToRegion)(pPix)
 
 #define RECTS_TO_REGION(_pScreen, nrects, prect, ctype) \
-    (*(_pScreen)->RectsToRegion)(nrects, prect, ctype)
+    (*(REG_pScreen)->RectsToRegion)(nrects, prect, ctype)
 
 #else /* !NEED_SCREEN_REGIONS */
 
 /* Reference _pScreen macro argument and check its type */
-#define REGION_SCREEN(_pScreen_) (void)((_pScreen_)->myNum)
+#define REGION_SCREEN(_pScreen) (void)((REG_pScreen)->myNum)
 
 #define REGION_CREATE(_pScreen, _rect, _size) \
     (REGION_SCREEN(_pScreen), miRegionCreate(_rect, _size))

Index: resource.h
===================================================================
RCS file: /cvs/xserver/debrix/include/resource.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- resource.h	23 Apr 2004 19:54:23 -0000	1.2
+++ resource.h	10 Jun 2004 19:41:35 -0000	1.3
@@ -47,6 +47,9 @@
 ******************************************************************/
 /* $XFree86: xc/programs/Xserver/include/resource.h,v 1.11 2002/03/06 21:14:04 mvojkovi Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifndef RESOURCE_H
 #define RESOURCE_H 1
 #include "misc.h"

Index: rgb.h
===================================================================
RCS file: /cvs/xserver/debrix/include/rgb.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- rgb.h	14 Nov 2003 16:48:57 -0000	1.1.1.1
+++ rgb.h	10 Jun 2004 19:41:35 -0000	1.2
@@ -46,6 +46,9 @@
 ******************************************************************/
 /* $Xorg: rgb.h,v 1.4 2001/02/09 02:05:15 xorgcvs Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifndef RGB_H
 #define RGB_H
 typedef struct _RGB {

Index: screenint.h
===================================================================
RCS file: /cvs/xserver/debrix/include/screenint.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- screenint.h	23 Apr 2004 19:54:23 -0000	1.2
+++ screenint.h	10 Jun 2004 19:41:35 -0000	1.3
@@ -46,6 +46,9 @@
 
 ******************************************************************/
 /* $XFree86: xc/programs/Xserver/include/screenint.h,v 1.5 2001/12/14 19:59:56 dawes Exp $ */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifndef SCREENINT_H
 #define SCREENINT_H
 

Index: scrnintstr.h
===================================================================
RCS file: /cvs/xserver/debrix/include/scrnintstr.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- scrnintstr.h	23 Apr 2004 19:54:23 -0000	1.2
+++ scrnintstr.h	10 Jun 2004 19:41:35 -0000	1.3
@@ -47,6 +47,9 @@
 ******************************************************************/
 /* $XFree86: xc/programs/Xserver/include/scrnintstr.h,v 1.12 2003/04/27 21:31:05 herrb Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifndef SCREENINTSTRUCT_H
 #define SCREENINTSTRUCT_H
 
@@ -75,6 +78,10 @@
 				 * it may have more or fewer */
     unsigned long	redMask, greenMask, blueMask;
     int			offsetRed, offsetGreen, offsetBlue;
+#ifdef COMPOSITE
+    unsigned long	alphaMask;
+    int			offsetAlpha;
+#endif
   } VisualRec;
 
 typedef struct _Depth {

Index: selection.h
===================================================================
RCS file: /cvs/xserver/debrix/include/selection.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- selection.h	14 Nov 2003 16:48:57 -0000	1.1.1.1
+++ selection.h	10 Jun 2004 19:41:35 -0000	1.2
@@ -1,4 +1,7 @@
 /* $Xorg: selection.h,v 1.4 2001/02/09 02:05:16 xorgcvs Exp $ */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifndef SELECTION_H
 #define SELECTION_H 1
 

Index: servermd.h
===================================================================
RCS file: /cvs/xserver/debrix/include/servermd.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- servermd.h	23 Apr 2004 19:54:23 -0000	1.2
+++ servermd.h	10 Jun 2004 19:41:35 -0000	1.3
@@ -47,6 +47,9 @@
 ******************************************************************/
 /* $Xorg: servermd.h,v 1.3 2000/08/17 19:53:31 cpqbld Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifndef SERVERMD_H
 #define SERVERMD_H 1
 

Index: site.h
===================================================================
RCS file: /cvs/xserver/debrix/include/site.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- site.h	23 Apr 2004 19:54:23 -0000	1.2
+++ site.h	10 Jun 2004 19:41:35 -0000	1.3
@@ -47,6 +47,9 @@
 ********************************************************/
 /* $XFree86: xc/programs/Xserver/include/site.h,v 1.8 2001/12/19 21:37:35 dawes Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifndef SITE_H
 #define SITE_H
 /*

Index: swaprep.h
===================================================================
RCS file: /cvs/xserver/debrix/include/swaprep.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- swaprep.h	23 Apr 2004 19:54:23 -0000	1.2
+++ swaprep.h	10 Jun 2004 19:41:36 -0000	1.3
@@ -24,6 +24,9 @@
 
 ********************************************************/
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifndef SWAPREP_H
 #define SWAPREP_H 1
 

Index: swapreq.h
===================================================================
RCS file: /cvs/xserver/debrix/include/swapreq.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- swapreq.h	23 Apr 2004 19:54:23 -0000	1.2
+++ swapreq.h	10 Jun 2004 19:41:36 -0000	1.3
@@ -24,6 +24,9 @@
 
 ********************************************************/
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifndef SWAPREQ_H
 #define SWAPREQ_H 1
 

Index: validate.h
===================================================================
RCS file: /cvs/xserver/debrix/include/validate.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- validate.h	23 Apr 2004 19:54:23 -0000	1.2
+++ validate.h	10 Jun 2004 19:41:36 -0000	1.3
@@ -26,6 +26,9 @@
 */
 /* $XFree86: xc/programs/Xserver/include/validate.h,v 1.4 2001/01/17 22:36:58 dawes Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifndef VALIDATE_H
 #define VALIDATE_H
 

Index: window.h
===================================================================
RCS file: /cvs/xserver/debrix/include/window.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- window.h	23 Apr 2004 19:54:23 -0000	1.2
+++ window.h	10 Jun 2004 19:41:36 -0000	1.3
@@ -47,6 +47,9 @@
 ******************************************************************/
 /* $XFree86$ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifndef WINDOW_H
 #define WINDOW_H
 
@@ -252,4 +255,10 @@
     int /*dw*/,
     int /*dh*/);
 
+RegionPtr
+CreateBoundingShape (WindowPtr pWin);
+
+RegionPtr
+CreateClipShape (WindowPtr pWin);
+
 #endif /* WINDOW_H */

Index: windowstr.h
===================================================================
RCS file: /cvs/xserver/debrix/include/windowstr.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- windowstr.h	23 Apr 2004 19:54:23 -0000	1.2
+++ windowstr.h	10 Jun 2004 19:41:36 -0000	1.3
@@ -47,6 +47,9 @@
 ******************************************************************/
 /* $XFree86: xc/programs/Xserver/include/windowstr.h,v 1.6 2001/12/14 19:59:57 dawes Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifndef WINDOWSTRUCT_H
 #define WINDOWSTRUCT_H
 
@@ -136,6 +139,9 @@
     unsigned		dstBuffer:1;	/* destination buffer for rendering */
     unsigned		srcBuffer:1;	/* source buffer for rendering */
 #endif
+#ifdef COMPOSITE
+    unsigned		redirectDraw:1;	/* rendering is redirected from here */
+#endif
     DevUnion		*devPrivates;
 } WindowRec;

More information about the xserver-commit mailing list