debrix/mi Imakefile, 1.2, 1.3 mi.h, 1.2, 1.3 miarc.c, 1.2, 1.3 mibank.c, 1.2, 1.3 mibank.h, 1.2, 1.3 mibitblt.c, 1.2, 1.3 mibstore.c, 1.2, 1.3 mibstore.h, 1.2, 1.3 mibstorest.h, 1.2, 1.3 miclipn.c, 1.2, 1.3 micmap.c, 1.2, 1.3 micmap.h, 1.2, 1.3 micoord.h, 1.2, 1.3 micursor.c, 1.2, 1.3 midash.c, 1.2, 1.3 midispcur.c, 1.2, 1.3 mieq.c, 1.2, 1.3 miexpose.c, 1.2, 1.3 mifillarc.c, 1.2, 1.3 mifillarc.h, 1.2, 1.3 mifillrct.c, 1.2, 1.3 mifpoly.h, 1.2, 1.3 mifpolycon.c, 1.2, 1.3 migc.c, 1.2, 1.3 miglblt.c, 1.2, 1.3 miinitext.c, 1.3, 1.4 miline.h, 1.2, 1.3 mioverlay.c, 1.2, 1.3 mioverlay.h, 1.2, 1.3 mipointer.c, 1.2, 1.3 mipointer.h, 1.2, 1.3 mipointrst.h, 1.2, 1.3 mipoly.c, 1.2, 1.3 mipoly.h, 1.2, 1.3 mipolycon.c, 1.2, 1.3 mipolygen.c, 1.2, 1.3 mipolypnt.c, 1.2, 1.3 mipolyrect.c, 1.2, 1.3 mipolyseg.c, 1.2, 1.3 mipolytext.c, 1.2, 1.3 mipolyutil.c, 1.2, 1.3 mipushpxl.c, 1.2, 1.3 miregion.c, 1.2, 1.3 miscanfill.h, 1.1.1.1, 1.2 miscrinit.c, 1.2, 1.3 mispans.c, 1.2, 1.3 mispans.h, 1.2, 1.3 misprite.c, 1.2, 1.3 mispritest.h, 1.2, 1.3 mistruct.h, 1.2, 1.3 mivalidate.h, 1.2, 1.3 mivaltree.c, 1.2, 1.3 miwideline.c, 1.2, 1.3 miwideline.h, 1.2, 1.3 miwindow.c, 1.2, 1.3 mizerarc.c, 1.2, 1.3 mizerarc.h, 1.2, 1.3 mizerclip.c, 1.2, 1.3 mizerline.c, 1.2, 1.3

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

Committed by: daniel

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

Modified Files:
	Imakefile mi.h miarc.c mibank.c mibank.h mibitblt.c mibstore.c 
	mibstore.h mibstorest.h miclipn.c micmap.c micmap.h micoord.h 
	micursor.c midash.c midispcur.c mieq.c miexpose.c mifillarc.c 
	mifillarc.h mifillrct.c mifpoly.h mifpolycon.c migc.c 
	miglblt.c miinitext.c miline.h mioverlay.c mioverlay.h 
	mipointer.c mipointer.h mipointrst.h mipoly.c mipoly.h 
	mipolycon.c mipolygen.c mipolypnt.c mipolyrect.c mipolyseg.c 
	mipolytext.c mipolyutil.c mipushpxl.c miregion.c miscanfill.h 
	miscrinit.c mispans.c mispans.h misprite.c mispritest.h 
	mistruct.h mivalidate.h mivaltree.c miwideline.c miwideline.h 
	miwindow.c mizerarc.c mizerarc.h mizerclip.c mizerline.c 
Log Message:
Initial import from modular sources.


Index: Imakefile
===================================================================
RCS file: /cvs/xserver/debrix/mi/Imakefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Imakefile	23 Apr 2004 19:54:26 -0000	1.2
+++ Imakefile	10 Jun 2004 19:41:41 -0000	1.3
@@ -51,6 +51,7 @@
 #endif
 
 INCLUDES = -I. -I../include -I../../../include/fonts -I../render \
+	    -I../xfixes -I../damageext \
            -I$(XINCLUDESRC) -I$(FONTINCSRC) -I$(EXTINCSRC) -I$(SERVERSRC)/Xext
 LINTLIBS = ../dix/llib-ldix.ln ../os/llib-los.ln
 

Index: mi.h
===================================================================
RCS file: /cvs/xserver/debrix/mi/mi.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- mi.h	23 Apr 2004 19:54:26 -0000	1.2
+++ mi.h	10 Jun 2004 19:41:41 -0000	1.3
@@ -47,6 +47,9 @@
 ******************************************************************/
 /* $XFree86: xc/programs/Xserver/mi/mi.h,v 3.9 2001/08/06 20:51:16 dawes Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifndef MI_H
 #define MI_H
 #include "X11/X.h"
@@ -495,6 +498,16 @@
     int /*y*/
 );
 
+typedef void 
+(*SetRedirectBorderClipProcPtr) (WindowPtr pWindow, RegionPtr pRegion);
+
+typedef RegionPtr
+(*GetRedirectBorderClipProcPtr) (WindowPtr pWindow);
+
+void
+miRegisterRedirectBorderClipProc (SetRedirectBorderClipProcPtr setBorderClip,
+				  GetRedirectBorderClipProcPtr getBorderClip);
+
 extern int miValidateTree(
     WindowPtr /*pParent*/,
     WindowPtr /*pChild*/,

Index: miarc.c
===================================================================
RCS file: /cvs/xserver/debrix/mi/miarc.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- miarc.c	23 Apr 2004 19:54:26 -0000	1.2
+++ miarc.c	10 Jun 2004 19:41:41 -0000	1.3
@@ -50,6 +50,9 @@
 /* Author: Keith Packard and Bob Scheifler */
 /* Warning: this code is toxic, do not dally very long here. */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #if defined(_XOPEN_SOURCE) || defined(__QNXNTO__) \
 	|| (defined(sun) && defined(__SVR4))
 #include <math.h>
@@ -58,8 +61,8 @@
 #include <math.h>
 #undef _XOPEN_SOURCE
 #endif
-#include "X.h"
-#include "Xprotostr.h"
+#include <X11/X.h>
+#include <X11/Xprotostr.h>
 #include "misc.h"
 #include "gcstruct.h"
 #include "scrnintstr.h"
@@ -68,7 +71,7 @@
 #include "mifpoly.h"
 #include "mi.h"
 #include "mifillarc.h"
-#include "Xfuncproto.h"
+#include <X11/Xfuncproto.h>
 
 static double miDsin(double a);
 static double miDcos(double a);

Index: mibank.c
===================================================================
RCS file: /cvs/xserver/debrix/mi/mibank.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- mibank.c	23 Apr 2004 19:54:26 -0000	1.2
+++ mibank.c	10 Jun 2004 19:41:41 -0000	1.3
@@ -77,6 +77,9 @@
 
 /* #define NO_ALLOCA 1 */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "servermd.h"
 #include "gcstruct.h"
 #include "pixmapstr.h"

Index: mibank.h
===================================================================
RCS file: /cvs/xserver/debrix/mi/mibank.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- mibank.h	23 Apr 2004 19:54:26 -0000	1.2
+++ mibank.h	10 Jun 2004 19:41:41 -0000	1.3
@@ -22,6 +22,9 @@
 
 /* $XFree86: xc/programs/Xserver/mi/mibank.h,v 1.10 2003/01/01 19:16:42 tsi Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifndef __MIBANK_H__
 #define __MIBANK_H__ 1
 

Index: mibitblt.c
===================================================================
RCS file: /cvs/xserver/debrix/mi/mibitblt.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- mibitblt.c	23 Apr 2004 19:54:26 -0000	1.2
+++ mibitblt.c	10 Jun 2004 19:41:41 -0000	1.3
@@ -48,8 +48,11 @@
 /* $Xorg: mibitblt.c,v 1.5 2001/02/09 02:05:20 xorgcvs Exp $ */
 /* Author: Todd Newman  (aided and abetted by Mr. Drewry) */
 
-#include "X.h"
-#include "Xprotostr.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include <X11/X.h>
+#include <X11/Xprotostr.h>
 
 #include "misc.h"
 #include "gcstruct.h"
@@ -58,7 +61,7 @@
 #include "scrnintstr.h"
 #include "mi.h"
 #include "regionstr.h"
-#include "Xmd.h"
+#include <X11/Xmd.h>
 #include "servermd.h"
 
 /* MICOPYAREA -- public entry for the CopyArea request 

Index: mibstore.c
===================================================================
RCS file: /cvs/xserver/debrix/mi/mibstore.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- mibstore.c	23 Apr 2004 19:54:26 -0000	1.2
+++ mibstore.c	10 Jun 2004 19:41:41 -0000	1.3
@@ -44,10 +44,13 @@
 
 /* $XFree86: xc/programs/Xserver/mi/mibstore.c,v 1.10tsi Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #define NEED_EVENTS
-#include "X.h"
-#include "Xmd.h"
-#include "Xproto.h"
+#include <X11/X.h>
+#include <X11/Xmd.h>
+#include <X11/Xproto.h>
 #include "misc.h"
 #include "regionstr.h"
 #include "scrnintstr.h"

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

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

Index: miclipn.c
===================================================================
RCS file: /cvs/xserver/debrix/mi/miclipn.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- miclipn.c	23 Apr 2004 19:54:26 -0000	1.2
+++ miclipn.c	10 Jun 2004 19:41:41 -0000	1.3
@@ -28,7 +28,10 @@
 */
 /* $XFree86: xc/programs/Xserver/mi/miclipn.c,v 1.3 2001/08/06 21:46:04 dawes Exp $ */
 
-#include "X.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include <X11/X.h>
 #include "windowstr.h"
 #include "scrnintstr.h"
 #include "mi.h"

Index: micmap.c
===================================================================
RCS file: /cvs/xserver/debrix/mi/micmap.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- micmap.c	23 Apr 2004 19:54:26 -0000	1.2
+++ micmap.c	10 Jun 2004 19:41:41 -0000	1.3
@@ -36,8 +36,11 @@
  */
 
 
-#include "X.h"
-#include "Xproto.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include <X11/X.h>
+#include <X11/Xproto.h>
 #include "scrnintstr.h"
 #include "colormapst.h"
 #include "resource.h"

Index: micmap.h
===================================================================
RCS file: /cvs/xserver/debrix/mi/micmap.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- micmap.h	23 Apr 2004 19:54:26 -0000	1.2
+++ micmap.h	10 Jun 2004 19:41:41 -0000	1.3
@@ -1,5 +1,8 @@
 /* $XFree86: xc/programs/Xserver/mi/micmap.h,v 1.5 1999/06/14 07:32:11 dawes Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "colormapst.h"
 
 #ifndef _MICMAP_H_

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

Index: micursor.c
===================================================================
RCS file: /cvs/xserver/debrix/mi/micursor.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- micursor.c	23 Apr 2004 19:54:26 -0000	1.2
+++ micursor.c	10 Jun 2004 19:41:41 -0000	1.3
@@ -46,6 +46,9 @@
 
 ******************************************************************/
 /* $Xorg: micursor.c,v 1.4 2001/02/09 02:05:20 xorgcvs Exp $ */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "scrnintstr.h"
 #include "cursor.h"
 #include "misc.h"

Index: midash.c
===================================================================
RCS file: /cvs/xserver/debrix/mi/midash.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- midash.c	23 Apr 2004 19:54:26 -0000	1.2
+++ midash.c	10 Jun 2004 19:41:41 -0000	1.3
@@ -46,6 +46,9 @@
 
 ******************************************************************/
 /* $Xorg: midash.c,v 1.4 2001/02/09 02:05:20 xorgcvs Exp $ */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "regionstr.h"
 #include "mistruct.h"
 #include "mifpoly.h"

Index: midispcur.c
===================================================================
RCS file: /cvs/xserver/debrix/mi/midispcur.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- midispcur.c	23 Apr 2004 19:54:26 -0000	1.2
+++ midispcur.c	10 Jun 2004 19:41:41 -0000	1.3
@@ -32,8 +32,11 @@
 */
 /* $XFree86: xc/programs/Xserver/mi/midispcur.c,v 1.9 2002/12/09 04:10:57 tsi Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #define NEED_EVENTS
-# include   "X.h"
+# include   <X11/X.h>
 # include   "misc.h"
 # include   "input.h"
 # include   "cursorstr.h"

Index: mieq.c
===================================================================
RCS file: /cvs/xserver/debrix/mi/mieq.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- mieq.c	23 Apr 2004 19:54:26 -0000	1.2
+++ mieq.c	10 Jun 2004 19:41:41 -0000	1.3
@@ -34,10 +34,13 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 # define NEED_EVENTS
-# include   "X.h"
-# include   "Xmd.h"
-# include   "Xproto.h"
+# include   <X11/X.h>
+# include   <X11/Xmd.h>
+# include   <X11/Xproto.h>
 # include   "misc.h"
 # include   "windowstr.h"
 # include   "pixmapstr.h"

Index: miexpose.c
===================================================================
RCS file: /cvs/xserver/debrix/mi/miexpose.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- miexpose.c	23 Apr 2004 19:54:26 -0000	1.2
+++ miexpose.c	10 Jun 2004 19:41:41 -0000	1.3
@@ -76,10 +76,13 @@
 
 /* $Xorg: miexpose.c,v 1.4 2001/02/09 02:05:20 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 "regionstr.h"
@@ -91,7 +94,7 @@
 
 #include "dixstruct.h"
 #include "mi.h"
-#include "Xmd.h"
+#include <X11/Xmd.h>
 
 #include "globals.h"
 

Index: mifillarc.c
===================================================================
RCS file: /cvs/xserver/debrix/mi/mifillarc.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- mifillarc.c	23 Apr 2004 19:54:26 -0000	1.2
+++ mifillarc.c	10 Jun 2004 19:41:41 -0000	1.3
@@ -29,9 +29,12 @@
 
 /* $Xorg: mifillarc.c,v 1.4 2001/02/09 02:05:20 xorgcvs Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <math.h>
-#include "X.h"
-#include "Xprotostr.h"
+#include <X11/X.h>
+#include <X11/Xprotostr.h>
 #include "regionstr.h"
 #include "gcstruct.h"
 #include "pixmapstr.h"

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

Index: mifillrct.c
===================================================================
RCS file: /cvs/xserver/debrix/mi/mifillrct.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- mifillrct.c	23 Apr 2004 19:54:26 -0000	1.2
+++ mifillrct.c	10 Jun 2004 19:41:41 -0000	1.3
@@ -47,8 +47,11 @@
 ******************************************************************/
 /* $Xorg: mifillrct.c,v 1.4 2001/02/09 02:05:20 xorgcvs Exp $ */
 
-#include "X.h"
-#include "Xprotostr.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include <X11/X.h>
+#include <X11/Xprotostr.h>
 #include "gcstruct.h"
 #include "windowstr.h"
 #include "pixmap.h"

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

Index: mifpolycon.c
===================================================================
RCS file: /cvs/xserver/debrix/mi/mifpolycon.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- mifpolycon.c	23 Apr 2004 19:54:26 -0000	1.2
+++ mifpolycon.c	10 Jun 2004 19:41:41 -0000	1.3
@@ -46,8 +46,11 @@
 
 ******************************************************************/
 /* $Xorg: mifpolycon.c,v 1.4 2001/02/09 02:05:21 xorgcvs Exp $ */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <math.h>
-#include "X.h"
+#include <X11/X.h>
 #include "gcstruct.h"
 #include "windowstr.h"
 #include "pixmapstr.h"

Index: migc.c
===================================================================
RCS file: /cvs/xserver/debrix/mi/migc.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- migc.c	23 Apr 2004 19:54:26 -0000	1.2
+++ migc.c	10 Jun 2004 19:41:41 -0000	1.3
@@ -29,6 +29,9 @@
 
 /* $XFree86: xc/programs/Xserver/mi/migc.c,v 1.8 2001/08/06 20:51:18 dawes Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "scrnintstr.h"
 #include "gcstruct.h"
 #include "pixmapstr.h"

Index: miglblt.c
===================================================================
RCS file: /cvs/xserver/debrix/mi/miglblt.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- miglblt.c	23 Apr 2004 19:54:26 -0000	1.2
+++ miglblt.c	10 Jun 2004 19:41:41 -0000	1.3
@@ -48,9 +48,12 @@
 
 /* $Xorg: miglblt.c,v 1.4 2001/02/09 02:05:21 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	"fontstruct.h"
 #include	"dixfontstr.h"

Index: miinitext.c
===================================================================
RCS file: /cvs/xserver/debrix/mi/miinitext.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- miinitext.c	26 Apr 2004 11:07:03 -0000	1.3
+++ miinitext.c	10 Jun 2004 19:41:41 -0000	1.4
@@ -48,6 +48,9 @@
 ******************************************************************/
 /* $Xorg: miinitext.c,v 1.4 2001/02/09 02:05:21 xorgcvs Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "misc.h"
 #include "extension.h"
 #include "micmap.h"
@@ -102,38 +105,38 @@
 
 #ifdef MITSHM
 #define _XSHM_SERVER_
-#include "shmstr.h"
+#include <X11/extensions/shmstr.h>
 #endif
 #ifdef XTEST
 #define _XTEST_SERVER_
-#include "XTest.h"
+#include <X11/extensions/XTest.h>
 #endif
 #ifdef XKB
-#include "XKB.h"
+#include <X11/extensions/XKB.h>
 #endif
 #ifdef LBX
 #define _XLBX_SERVER_
-#include "lbxstr.h"
+#include <X11/extensionslbxstr.h>
 #endif
 #ifdef XPRINT
-#include "Print.h"
+#include <X11/extensions/Print.h>
 #endif
 #ifdef XAPPGROUP
 #define _XAG_SERVER_
-#include "Xagstr.h"
+#include <X11/extensions/Xagstr.h>
 #endif
 #ifdef XCSECURITY
 #define _SECURITY_SERVER
-#include "securstr.h"
+#include <X11/extensions/securstr.h>
 #endif
 #ifdef PANORAMIX
-#include "panoramiXproto.h"
+#include <X11/extensions/panoramiXproto.h>
 #endif
 #ifdef XF86BIGFONT
-#include "xf86bigfstr.h"
+#include <X11/extensions/xf86bigfstr.h>
 #endif
 #ifdef RES
-#include "XResproto.h"
+#include <X11/extensions/XResproto.h>
 #endif
 
 /* FIXME: this whole block of externs should be from the appropriate headers */
@@ -261,6 +264,15 @@
 #ifdef RES
 extern void ResExtensionInit(INITARGS);
 #endif
+#ifdef XFIXES
+extern void XFixesExtensionInit(INITARGS);
+#endif
+#ifdef DAMAGEEXT
+extern void DamageExtensionInit(INITARGS);
+#endif
+#ifdef COMPOSITE
+extern void CompositeExtensionInit(INITARGS);
+#endif
 
 #ifndef XFree86LOADER
 
@@ -398,6 +410,15 @@
 #ifdef RES
     ResExtensionInit();
 #endif
+#ifdef XFIXES
+    XFixesExtensionInit();
+#endif
+#ifdef DAMAGEEXT
+    DamageExtensionInit();
+#endif
+#ifdef COMPOSITE
+    CompositeExtensionInit();
+#endif
 }
 
 void
@@ -519,6 +540,18 @@
 #ifdef RANDR
     { RRExtensionInit, "RANDR", NULL, NULL, NULL },
 #endif
+#ifdef DAMAGEEXT
+    { DamageExtensionInit, "DAMAGE", NULL, NULL },
+#endif
+#ifdef XFIXES
+    { XFixesExtensionInit, "XFIXES", NULL, NULL },
+#endif 
+#ifdef COMPOSITE
+    { CompositeExtensionInit, "Composite", NULL, NULL },
+#endif
+#ifdef SHAPE
+    { ShapeExtensionInit, "SHAPE", NULL, NULL },
+#endif
     { NULL, NULL, NULL, NULL, NULL }
 };
     

Index: miline.h
===================================================================
RCS file: /cvs/xserver/debrix/mi/miline.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- miline.h	23 Apr 2004 19:54:26 -0000	1.2
+++ miline.h	10 Jun 2004 19:41:41 -0000	1.3
@@ -27,6 +27,9 @@
 */
 /* $XFree86: xc/programs/Xserver/mi/miline.h,v 1.6 2001/08/06 20:51:19 dawes Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifndef MILINE_H
 
 #include "screenint.h"

Index: mioverlay.c
===================================================================
RCS file: /cvs/xserver/debrix/mi/mioverlay.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- mioverlay.c	23 Apr 2004 19:54:26 -0000	1.2
+++ mioverlay.c	10 Jun 2004 19:41:41 -0000	1.3
@@ -1,6 +1,9 @@
 /* $XFree86: xc/programs/Xserver/mi/mioverlay.c,v 3.15tsi Exp $ */
 
-#include "X.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include <X11/X.h>
 #include "scrnintstr.h"
 #include "validate.h"
 #include "windowstr.h"

Index: mioverlay.h
===================================================================
RCS file: /cvs/xserver/debrix/mi/mioverlay.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- mioverlay.h	23 Apr 2004 19:54:26 -0000	1.2
+++ mioverlay.h	10 Jun 2004 19:41:41 -0000	1.3
@@ -1,5 +1,8 @@
 /* $XFree86: xc/programs/Xserver/mi/mioverlay.h,v 3.3 2000/02/29 00:16:03 mvojkovi Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifndef __MIOVERLAY_H
 #define __MIOVERLAY_H
 

Index: mipointer.c
===================================================================
RCS file: /cvs/xserver/debrix/mi/mipointer.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- mipointer.c	23 Apr 2004 19:54:26 -0000	1.2
+++ mipointer.c	10 Jun 2004 19:41:41 -0000	1.3
@@ -30,10 +30,13 @@
 */
 /* $XFree86: xc/programs/Xserver/mi/mipointer.c,v 3.9 2001/09/04 14:03:28 dawes Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 # define NEED_EVENTS
-# include   "X.h"
-# include   "Xmd.h"
-# include   "Xproto.h"
+# include   <X11/X.h>
+# include   <X11/Xmd.h>
+# include   <X11/Xproto.h>
 # include   "misc.h"
 # include   "windowstr.h"
 # include   "pixmapstr.h"

Index: mipointer.h
===================================================================
RCS file: /cvs/xserver/debrix/mi/mipointer.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- mipointer.h	23 Apr 2004 19:54:26 -0000	1.2
+++ mipointer.h	10 Jun 2004 19:41:41 -0000	1.3
@@ -31,6 +31,9 @@
 */
 /* $XFree86: xc/programs/Xserver/mi/mipointer.h,v 3.8 2001/08/06 20:51:19 dawes Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifndef MIPOINTER_H
 #define MIPOINTER_H
 

Index: mipointrst.h
===================================================================
RCS file: /cvs/xserver/debrix/mi/mipointrst.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- mipointrst.h	23 Apr 2004 19:54:26 -0000	1.2
+++ mipointrst.h	10 Jun 2004 19:41:41 -0000	1.3
@@ -31,6 +31,9 @@
 */
 /* $XFree86: xc/programs/Xserver/mi/mipointrst.h,v 1.3 2001/04/19 14:14:07 tsi Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "mipointer.h"
 #include "scrnintstr.h"
 

Index: mipoly.c
===================================================================
RCS file: /cvs/xserver/debrix/mi/mipoly.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- mipoly.c	23 Apr 2004 19:54:26 -0000	1.2
+++ mipoly.c	10 Jun 2004 19:41:41 -0000	1.3
@@ -56,7 +56,10 @@
  *  to the appropriate routine to actually scan convert the
  *  polygon.
  */
-#include "X.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include <X11/X.h>
 #include "windowstr.h"
 #include "gcstruct.h"
 #include "pixmapstr.h"

Index: mipoly.h
===================================================================
RCS file: /cvs/xserver/debrix/mi/mipoly.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- mipoly.h	23 Apr 2004 19:54:26 -0000	1.2
+++ mipoly.h	10 Jun 2004 19:41:41 -0000	1.3
@@ -84,6 +84,9 @@
 /*
  * for the winding number rule
  */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #define CLOCKWISE          1
 #define COUNTERCLOCKWISE  -1 
 

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

Index: mipolygen.c
===================================================================
RCS file: /cvs/xserver/debrix/mi/mipolygen.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- mipolygen.c	23 Apr 2004 19:54:26 -0000	1.2
+++ mipolygen.c	10 Jun 2004 19:41:41 -0000	1.3
@@ -46,7 +46,10 @@
 
 ******************************************************************/
 /* $Xorg: mipolygen.c,v 1.4 2001/02/09 02:05:21 xorgcvs Exp $ */
-#include "X.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include <X11/X.h>
 #include "gcstruct.h"
 #include "miscanfill.h"
 #include "mipoly.h"

Index: mipolypnt.c
===================================================================
RCS file: /cvs/xserver/debrix/mi/mipolypnt.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- mipolypnt.c	23 Apr 2004 19:54:26 -0000	1.2
+++ mipolypnt.c	10 Jun 2004 19:41:41 -0000	1.3
@@ -46,8 +46,11 @@
 
 ******************************************************************/
 /* $Xorg: mipolypnt.c,v 1.4 2001/02/09 02:05:21 xorgcvs Exp $ */
-#include "X.h"
-#include "Xprotostr.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include <X11/X.h>
+#include <X11/Xprotostr.h>
 #include "pixmapstr.h"
 #include "gcstruct.h"
 #include "windowstr.h"

Index: mipolyrect.c
===================================================================
RCS file: /cvs/xserver/debrix/mi/mipolyrect.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- mipolyrect.c	23 Apr 2004 19:54:26 -0000	1.2
+++ mipolyrect.c	10 Jun 2004 19:41:41 -0000	1.3
@@ -46,8 +46,11 @@
 
 ******************************************************************/
 /* $Xorg: mipolyrect.c,v 1.4 2001/02/09 02:05:21 xorgcvs Exp $ */
-#include "X.h"
-#include "Xprotostr.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include <X11/X.h>
+#include <X11/Xprotostr.h>
 #include "regionstr.h"
 #include "gcstruct.h"
 #include "pixmap.h"

Index: mipolyseg.c
===================================================================
RCS file: /cvs/xserver/debrix/mi/mipolyseg.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- mipolyseg.c	23 Apr 2004 19:54:26 -0000	1.2
+++ mipolyseg.c	10 Jun 2004 19:41:41 -0000	1.3
@@ -46,8 +46,11 @@
 
 ******************************************************************/
 /* $Xorg: mipolyseg.c,v 1.4 2001/02/09 02:05:21 xorgcvs Exp $ */
-#include "X.h"
-#include "Xprotostr.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include <X11/X.h>
+#include <X11/Xprotostr.h>
 #include "regionstr.h"
 #include "gcstruct.h"
 #include "pixmap.h"

Index: mipolytext.c
===================================================================
RCS file: /cvs/xserver/debrix/mi/mipolytext.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- mipolytext.c	23 Apr 2004 19:54:26 -0000	1.2
+++ mipolytext.c	10 Jun 2004 19:41:41 -0000	1.3
@@ -55,9 +55,12 @@
  * Date:	Thu Feb  5 1987
  */
 
-#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	"gcstruct.h"
 #include	"fontstruct.h"

Index: mipolyutil.c
===================================================================
RCS file: /cvs/xserver/debrix/mi/mipolyutil.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- mipolyutil.c	23 Apr 2004 19:54:26 -0000	1.2
+++ mipolyutil.c	10 Jun 2004 19:41:41 -0000	1.3
@@ -46,6 +46,9 @@
 
 ******************************************************************/
 /* $Xorg: mipolyutil.c,v 1.4 2001/02/09 02:05:21 xorgcvs Exp $ */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "regionstr.h"
 #include "gc.h"
 #include "miscanfill.h"

Index: mipushpxl.c
===================================================================
RCS file: /cvs/xserver/debrix/mi/mipushpxl.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- mipushpxl.c	23 Apr 2004 19:54:26 -0000	1.2
+++ mipushpxl.c	10 Jun 2004 19:41:41 -0000	1.3
@@ -46,7 +46,10 @@
 
 ******************************************************************/
 /* $Xorg: mipushpxl.c,v 1.4 2001/02/09 02:05:21 xorgcvs Exp $ */
-#include "X.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include <X11/X.h>
 #include "gcstruct.h"
 #include "scrnintstr.h"
 #include "pixmapstr.h"

Index: miregion.c
===================================================================
RCS file: /cvs/xserver/debrix/mi/miregion.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- miregion.c	23 Apr 2004 19:54:26 -0000	1.2
+++ miregion.c	10 Jun 2004 19:41:41 -0000	1.3
@@ -77,8 +77,11 @@
 
 ******************************************************************/
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "regionstr.h"
-#include "Xprotostr.h"
+#include <X11/Xprotostr.h>
 #include "gc.h"
 #include "mi.h"
 #include "mispans.h"

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

Index: miscrinit.c
===================================================================
RCS file: /cvs/xserver/debrix/mi/miscrinit.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- miscrinit.c	23 Apr 2004 19:54:26 -0000	1.2
+++ miscrinit.c	10 Jun 2004 19:41:41 -0000	1.3
@@ -28,7 +28,10 @@
 */
 /* $XFree86: xc/programs/Xserver/mi/miscrinit.c,v 3.15tsi Exp $ */
 
-#include "X.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include <X11/X.h>
 #include "servermd.h"
 #include "misc.h"
 #include "mi.h"
@@ -38,7 +41,7 @@
 #include "miline.h"
 #ifdef MITSHM
 #define _XSHM_SERVER_
-#include "XShm.h"
+#include <X11/extensions/XShm.h>
 #endif
 
 /* We use this structure to propogate some information from miScreenInit to

Index: mispans.c
===================================================================
RCS file: /cvs/xserver/debrix/mi/mispans.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- mispans.c	23 Apr 2004 19:54:26 -0000	1.2
+++ mispans.c	10 Jun 2004 19:41:41 -0000	1.3
@@ -48,6 +48,9 @@
 
 /* $Xorg: mispans.c,v 1.4 2001/02/09 02:05:21 xorgcvs Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "misc.h"
 #include "pixmapstr.h"
 #include "gcstruct.h"

Index: mispans.h
===================================================================
RCS file: /cvs/xserver/debrix/mi/mispans.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- mispans.h	23 Apr 2004 19:54:26 -0000	1.2
+++ mispans.h	10 Jun 2004 19:41:41 -0000	1.3
@@ -112,6 +112,9 @@
 );
 
 /* Rops which must use span groups */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #define miSpansCarefulRop(rop)	(((rop) & 0xc) == 0x8 || ((rop) & 0x3) == 0x2)
 #define miSpansEasyRop(rop)	(!miSpansCarefulRop(rop))
 

Index: misprite.c
===================================================================
RCS file: /cvs/xserver/debrix/mi/misprite.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- misprite.c	23 Apr 2004 19:54:26 -0000	1.2
+++ misprite.c	10 Jun 2004 19:41:41 -0000	1.3
@@ -32,8 +32,11 @@
 */
 /* $XFree86: xc/programs/Xserver/mi/misprite.c,v 3.10tsi Exp $ */
 
-# include   "X.h"
-# include   "Xproto.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+# include   <X11/X.h>
+# include   <X11/Xproto.h>
 # include   "misc.h"
 # include   "pixmapstr.h"
 # include   "input.h"

Index: mispritest.h
===================================================================
RCS file: /cvs/xserver/debrix/mi/mispritest.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- mispritest.h	23 Apr 2004 19:54:26 -0000	1.2
+++ mispritest.h	10 Jun 2004 19:41:41 -0000	1.3
@@ -32,6 +32,9 @@
 */
 /* $XFree86: xc/programs/Xserver/mi/mispritest.h,v 1.4 2001/01/17 22:37:07 dawes Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 # include   "misprite.h"
 #ifdef RENDER
 # include   "picturestr.h"

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

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

Index: mivaltree.c
===================================================================
RCS file: /cvs/xserver/debrix/mi/mivaltree.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- mivaltree.c	23 Apr 2004 19:54:26 -0000	1.2
+++ mivaltree.c	10 Jun 2004 19:41:41 -0000	1.3
@@ -1,5 +1,5 @@
 /* $Xorg: mivaltree.c,v 1.4 2001/02/09 02:05:22 xorgcvs Exp $ */
-/* $XdotOrg$ */
+/* $XdotOrg: xc/programs/Xserver/mi/mivaltree.c,v 1.1.4.2.6.2 2004/03/08 00:36:57 alanc Exp $ */
 /*
  * mivaltree.c --
  *	Functions for recalculating window clip lists. Main function
@@ -92,7 +92,10 @@
   *		Bob Scheifler -- avoid miComputeClips for unmapped windows,
   *				 valdata changes
   */
-#include    "X.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include    <X11/X.h>
 #include    "scrnintstr.h"
 #include    "validate.h"
 #include    "windowstr.h"
@@ -102,7 +105,6 @@
 
 #include    "globals.h"
 
-#ifdef SHAPE
 /*
  * Compute the visibility of a shaped window
  */
@@ -165,7 +167,17 @@
 	return rgnIN;
     return rgnOUT;
 }
-#endif
+
+static GetRedirectBorderClipProcPtr    miGetRedirectBorderClipProc;
+static SetRedirectBorderClipProcPtr    miSetRedirectBorderClipProc;
+
+void
+miRegisterRedirectBorderClipProc (SetRedirectBorderClipProcPtr setBorderClip,
+                                 GetRedirectBorderClipProcPtr getBorderClip)
+{
+    miSetRedirectBorderClipProc = setBorderClip;
+    miGetRedirectBorderClipProc = getBorderClip;
+}
 
 #define HasParentRelativeBorder(w) (!(w)->borderIsPixel && \
 				    HasBorder(w) && \
@@ -233,7 +245,6 @@
 	    break;
 	case rgnPART:
 	    newVis = VisibilityPartiallyObscured;
-#ifdef SHAPE
 	    {
 		RegionPtr   pBounding;
 
@@ -253,7 +264,6 @@
 		    }
 		}
 	    }
-#endif
 	    break;
 	default:
 	    newVis = VisibilityFullyObscured;
@@ -264,6 +274,18 @@
 	((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;
 
@@ -640,7 +662,12 @@
 	    {
 		if (pWin->valdata)
 		{
-		    REGION_APPEND( pScreen, &totalClip, &pWin->borderClip);
+                    RegionPtr   pBorderClip = &pWin->borderClip;
+#ifdef COMPOSITE
+                    if (pWin->redirectDraw && miGetRedirectBorderClipProc)
+                        pBorderClip = (*miGetRedirectBorderClipProc)(pWin);
+#endif
+                    REGION_APPEND( pScreen, &totalClip, pBorderClip );
 		    if (pWin->viewable)
 			viewvals++;
 		}
@@ -654,7 +681,12 @@
 	    {
 		if (pWin->valdata)
 		{
-		    REGION_APPEND( pScreen, &totalClip, &pWin->borderClip);
+                    RegionPtr   pBorderClip = &pWin->borderClip;
+#ifdef COMPOSITE
+                    if (pWin->redirectDraw && miGetRedirectBorderClipProc)
+                        pBorderClip = (*miGetRedirectBorderClipProc)(pWin);
+#endif
+                    REGION_APPEND( pScreen, &totalClip, pBorderClip );
 		    if (pWin->viewable)
 			viewvals++;
 		}

Index: miwideline.c
===================================================================
RCS file: /cvs/xserver/debrix/mi/miwideline.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- miwideline.c	23 Apr 2004 19:54:26 -0000	1.2
+++ miwideline.c	10 Jun 2004 19:41:41 -0000	1.3
@@ -35,6 +35,9 @@
  * bresenham zero-width lines, except walks an X edge
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <stdio.h>
 #ifdef _XOPEN_SOURCE
 #include <math.h>
@@ -43,7 +46,7 @@
 #include <math.h>
 #undef _XOPEN_SOURCE
 #endif
-#include "X.h"
+#include <X11/X.h>
 #include "windowstr.h"
 #include "gcstruct.h"
 #include "regionstr.h"

Index: miwideline.h
===================================================================
RCS file: /cvs/xserver/debrix/mi/miwideline.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- miwideline.h	23 Apr 2004 19:54:26 -0000	1.2
+++ miwideline.h	10 Jun 2004 19:41:41 -0000	1.3
@@ -30,6 +30,9 @@
 
 /* Author:  Keith Packard, MIT X Consortium */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "mispans.h"
 #include "mifpoly.h" /* for ICEIL */
 

Index: miwindow.c
===================================================================
RCS file: /cvs/xserver/debrix/mi/miwindow.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- miwindow.c	23 Apr 2004 19:54:26 -0000	1.2
+++ miwindow.c	10 Jun 2004 19:41:41 -0000	1.3
@@ -46,7 +46,10 @@
 
 ******************************************************************/
 /* $Xorg: miwindow.c,v 1.4 2001/02/09 02:05:22 xorgcvs Exp $ */
-#include "X.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include <X11/X.h>
 #include "regionstr.h"
 #include "region.h"
 #include "mi.h"

Index: mizerarc.c
===================================================================
RCS file: /cvs/xserver/debrix/mi/mizerarc.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- mizerarc.c	23 Apr 2004 19:54:26 -0000	1.2
+++ mizerarc.c	10 Jun 2004 19:41:41 -0000	1.3
@@ -35,9 +35,12 @@
  * The Computer Journal, November 1967, Volume 10, Number 3, pp. 282-289
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <math.h>
-#include "X.h"
-#include "Xprotostr.h"
+#include <X11/X.h>
+#include <X11/Xprotostr.h>
 #include "regionstr.h"
 #include "gcstruct.h"
 #include "pixmapstr.h"

Index: mizerarc.h
===================================================================
RCS file: /cvs/xserver/debrix/mi/mizerarc.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- mizerarc.h	23 Apr 2004 19:54:26 -0000	1.2
+++ mizerarc.h	10 Jun 2004 19:41:41 -0000	1.3
@@ -45,6 +45,9 @@
     int startAngle, endAngle;
 } miZeroArcRec;
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #define miCanZeroArc(arc) (((arc)->width == (arc)->height) || \
 			   (((arc)->width <= 800) && ((arc)->height <= 800)))
 

Index: mizerclip.c
===================================================================
RCS file: /cvs/xserver/debrix/mi/mizerclip.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- mizerclip.c	23 Apr 2004 19:54:26 -0000	1.2
+++ mizerclip.c	10 Jun 2004 19:41:41 -0000	1.3
@@ -45,7 +45,10 @@
 SOFTWARE.
 
 ******************************************************************/
-#include "X.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include <X11/X.h>
 
 #include "misc.h"
 #include "scrnintstr.h"

Index: mizerline.c
===================================================================
RCS file: /cvs/xserver/debrix/mi/mizerline.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- mizerline.c	23 Apr 2004 19:54:26 -0000	1.2
+++ mizerline.c	10 Jun 2004 19:41:41 -0000	1.3
@@ -46,7 +46,10 @@
 
 ******************************************************************/
 /* $Xorg: mizerline.c,v 1.4 2001/02/09 02:05:22 xorgcvs Exp $ */
-#include "X.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include <X11/X.h>
 
 #include "misc.h"
 #include "scrnintstr.h"

More information about the xserver-commit mailing list