xserver/dix dispatch.c, 3.37, 3.38 events.c, 3.55, 3.56 glyphcurs.c, 1.3, 1.4 main.c, 3.45, 3.46 swaprep.c, 3.10, 3.11 xpstubs.c, 1.6, 1.7

Committed by: keithp

Update of /cvs/xserver/xserver/dix
In directory gabe:/tmp/cvs-serv25750/dix

Modified Files:
	dispatch.c events.c glyphcurs.c main.c swaprep.c xpstubs.c 
Log Message:
2005-08-07  Keith Packard  <[email protected]>

	* configure.ac:
	* dix/dispatch.c:
	* dix/events.c:
	* dix/glyphcurs.c:
	* dix/main.c:
	* dix/swaprep.c:
	* dix/xpstubs.c:
	* fb/fbglyph.c:
	* hw/kdrive/chips/chipsdraw.c:
	* hw/kdrive/ephyr/hostx.c: (hostx_screen_init):
	* hw/kdrive/epson/epson13806draw.c:
	* hw/kdrive/i810/i810draw.c:
	* hw/kdrive/mach64/mach64draw.c:
	* hw/kdrive/nvidia/nvidiadraw.c:
	* hw/kdrive/smi/smidraw.c:
	* hw/kdrive/src/kaa.c:
	* hw/kdrive/src/kinput.c: (KdMouseAccelerate):
	* include/dixfont.h:
	* include/dixfontstr.h:
	* mi/mi.h:
	* mi/mibstore.c:
	* mi/miglblt.c:
	* mi/mipolytext.c:
	* mi/misprite.c:
	* mi/miwideline.c:
	* miext/damage/damage.c:
	* miext/shadow/shadow.c:
	* miext/shadow/shalloc.c:
	* miext/shadow/shpacked.c:
	* miext/shadow/shplanar.c:
	* miext/shadow/shplanar8.c:
	* miext/shadow/shrotate.c:
	* miext/shadow/shrotpack.h:
	* miext/shadow/shrotpackYX.h:
	* os/xstrans.c:
	* os/xstrans.h:
	Build with modular X.org libraries and headers.

	* composite/compwindow.c
	Don't damage unmoved windows.
	Let border clip reset leave damage alone,
	pending actual damage for painting.


Index: dispatch.c
===================================================================
RCS file: /cvs/xserver/xserver/dix/dispatch.c,v
retrieving revision 3.37
retrieving revision 3.38
diff -u -d -r3.37 -r3.38
--- dispatch.c	8 Feb 2005 21:51:41 -0000	3.37
+++ dispatch.c	8 Aug 2005 06:25:20 -0000	3.38
@@ -79,7 +79,6 @@
 #endif
 
 #include "windowstr.h"
-#include "fontstruct.h"
 #include "dixfontstr.h"
 #include "gcstruct.h"
 #include "selection.h"

Index: events.c
===================================================================
RCS file: /cvs/xserver/xserver/dix/events.c,v
retrieving revision 3.55
retrieving revision 3.56
diff -u -d -r3.55 -r3.56
--- events.c	8 Feb 2005 21:51:41 -0000	3.55
+++ events.c	8 Aug 2005 06:25:20 -0000	3.56
@@ -95,7 +95,7 @@
 #include <X11/extensions/XKBsrv.h>
 extern Bool XkbFilterEvents(ClientPtr, int, xEvent *);
 #else
-#include <X11/extensions/XKBsrv.h>
+/* #include <X11/extensions/XKBsrv.h> */
 #endif
 
 #ifdef XCSECURITY

Index: glyphcurs.c
===================================================================
RCS file: /cvs/xserver/xserver/dix/glyphcurs.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- glyphcurs.c	11 Sep 2003 05:12:50 -0000	1.3
+++ glyphcurs.c	8 Aug 2005 06:25:20 -0000	1.4
@@ -51,7 +51,6 @@
 #include <config.h>
 #endif
 #include "misc.h"
-#include "fontstruct.h"
 #include "dixfontstr.h"
 #include "scrnintstr.h"
 #include "gcstruct.h"

Index: main.c
===================================================================
RCS file: /cvs/xserver/xserver/dix/main.c,v
retrieving revision 3.45
retrieving revision 3.46
diff -u -d -r3.45 -r3.46
--- main.c	18 Feb 2004 03:23:36 -0000	3.45
+++ main.c	8 Aug 2005 06:25:20 -0000	3.46
@@ -89,7 +89,6 @@
 #include "colormap.h"
 #include "colormapst.h"
 #include "cursorstr.h"
-#include "font.h"
 #include "opaque.h"
 #include "servermd.h"
 #include "site.h"

Index: swaprep.c
===================================================================
RCS file: /cvs/xserver/xserver/dix/swaprep.c,v
retrieving revision 3.10
retrieving revision 3.11
diff -u -d -r3.10 -r3.11
--- swaprep.c	18 Feb 2004 03:23:36 -0000	3.10
+++ swaprep.c	8 Aug 2005 06:25:20 -0000	3.11
@@ -57,7 +57,7 @@
 #include <X11/Xproto.h>
 #include "misc.h"
 #include "dixstruct.h"
-#include "fontstruct.h"
+#include "dixfont.h"
 #include "scrnintstr.h"
 #include "swaprep.h"
 #include "globals.h"

Index: xpstubs.c
===================================================================
RCS file: /cvs/xserver/xserver/dix/xpstubs.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- xpstubs.c	2 Nov 2003 19:56:10 -0000	1.6
+++ xpstubs.c	8 Aug 2005 06:25:20 -0000	1.7
@@ -31,7 +31,7 @@
 #include <config.h>
 #endif
 #include "misc.h"
-#include "font.h"
+#include "dixfont.h"
 
 Bool
 XpClientIsBitmapClient(ClientPtr client)