More 682 merge

11 files changed, 597 insertions, 608 deletions

diff --git a/hw/xfree86/os-support/linux/lnx_io.c b/hw/xfree86/os-support/linux/lnx_io.c
index dda1ff8ef..1eebc757a 100644
--- a/hw/xfree86/os-support/linux/lnx_io.c
+++ b/hw/xfree86/os-support/linux/lnx_io.c
@@ -114,6 +114,8 @@ KDKBDREP_ioctl_ok(int rate, int delay) {
 #endif /* KDKBDREP */
 }
 
+#undef rate
+
 static int
 KIOCSRATE_ioctl_ok(int rate, int delay) {
 #ifdef KIOCSRATE
@@ -141,8 +143,6 @@ KIOCSRATE_ioctl_ok(int rate, int delay) {
 #endif /* KIOCSRATE */
 }
 
-#undef rate
-
 void xf86SetKbdRepeat(char rad)
 {
 #ifdef __sparc__
diff --git a/hw/xfree86/utils/xorgcfg/interface.c b/hw/xfree86/utils/xorgcfg/interface.c
index 2595fd376..c05ea2605 100644
--- a/hw/xfree86/utils/xorgcfg/interface.c
+++ b/hw/xfree86/utils/xorgcfg/interface.c
@@ -300,7 +300,7 @@ main(int argc, char *argv[])
     
     startedx = startx();
     if (XF86Config_path == NULL)
-	XF86Config_path = XtNewString(__XCONFIGFILE__"-4");
+	XF86Config_path = XtNewString(__XCONFIGFILE__);
     if (XkbConfig_path == NULL) {
 	XmuSnprintf(XkbConfig_path_static, sizeof(XkbConfig_path_static),
 		    "%s/%s%s", XFree86Dir, XkbConfigDir, XkbConfigFile);
@@ -536,9 +536,9 @@ main(int argc, char *argv[])
 # endif
 #else
 # ifdef XF86CONFIGDIR
-	XF86Config_path = XtNewString(XF86CONFIGDIR "/"__XCONFIGFILE__"-4");
+	XF86Config_path = XtNewString(XF86CONFIGDIR "/"__XCONFIGFILE__);
 # else
-	XF86Config_path = XtNewString("/etc/X11/"__XCONFIGFILE__"-4");
+	XF86Config_path = XtNewString("/etc/X11/"__XCONFIGFILE__);
 # endif
 #endif
     }
diff --git a/hw/xfree86/utils/xorgcfg/loader.h b/hw/xfree86/utils/xorgcfg/loader.h
index 3ba5b937a..acf18aa97 100644
--- a/hw/xfree86/utils/xorgcfg/loader.h
+++ b/hw/xfree86/utils/xorgcfg/loader.h
@@ -75,7 +75,7 @@ typedef union {
     unsigned long       num;
     char *              str;
     double              realnum;
-    Bool		bool;
+    Bool		xbool;
     OptFrequency	freq;
 } ValueUnion;
 
diff --git a/hw/xfree86/utils/xorgconfig/xorgconfig.c b/hw/xfree86/utils/xorgconfig/xorgconfig.c
index 62ab9e94b..bb5568522 100644
--- a/hw/xfree86/utils/xorgconfig/xorgconfig.c
+++ b/hw/xfree86/utils/xorgconfig/xorgconfig.c
@@ -94,7 +94,7 @@
  *  Chisato Yamauchi(cyamauch@phyas.aichi-edu.ac.jp)
  */
 /* $XConsortium: xf86config.c /main/21 1996/10/28 05:43:57 kaleb $ */
-/* $XdotOrg: xc/programs/Xserver/hw/xfree86/xf86config/xorgconfig.c,v 1.5 2004/08/11 20:25:13 krh Exp $ */
+/* $XdotOrg: xc/programs/Xserver/hw/xfree86/xf86config/xorgconfig.c,v 1.6.2.3 2005/02/02 03:38:05 gisburn Exp $ */
 
 #include <stdlib.h>
 #include <stdio.h>
@@ -225,7 +225,7 @@ char *config_keyboard_dev = "/dev/wskbd0";
 #endif
 int config_xkbdisable = 0;
 char *config_xkbrules;
-char *config_xkbmodel = "pc101";
+char *config_xkbmodel = "pc105";
 char *config_xkblayout = "us";
 char *config_xkbvariant = (char *) 0;
 char *config_xkboptions = (char *) 0;
@@ -679,7 +679,7 @@ mouse_configuration(void) {
 static char *xkbmodeltext = 
 "Please select one of the following keyboard types that is the better\n"
 "description of your keyboard. If nothing really matches,\n"
-"choose 1 (Generic 101-key PC)\n\n";
+"choose \"Generic 104-key PC\"\n\n";
 
 static char *xkblayouttext = 
 "Please select the layout corresponding to your keyboard\n";
@@ -2076,7 +2076,7 @@ static char *keyboardchunk3_text =
 "# To customise the XKB settings to suit your keyboard, modify the\n"
 "# lines below (which are the defaults).  For example, for a non-U.S.\n"
 "# keyboard, you will probably want to use:\n"
-"#    Option \"XkbModel\"    \"pc102\"\n"
+"#    Option \"XkbModel\"    \"pc105\"\n"
 "# If you have a US Microsoft Natural keyboard, you can use:\n"
 "#    Option \"XkbModel\"    \"microsoft\"\n"
 "#\n"
@@ -2093,7 +2093,7 @@ static char *keyboardchunk3_text =
 "\n"
 "# These are the default XKB settings for "__XSERVERNAME__"\n"
 "#    Option \"XkbRules\"    \""__XKBDEFRULES__"\"\n"
-"#    Option \"XkbModel\"    \"pc101\"\n"
+"#    Option \"XkbModel\"    \"pc105\"\n"
 "#    Option \"XkbLayout\"   \"us\"\n"
 "#    Option \"XkbVariant\"  \"\"\n"
 "#    Option \"XkbOptions\"  \"\"\n"
diff --git a/hw/xfree86/xaa/xaaWrapper.c b/hw/xfree86/xaa/xaaWrapper.c
index 3bc2db34f..9c5befcd2 100644
--- a/hw/xfree86/xaa/xaaWrapper.c
+++ b/hw/xfree86/xaa/xaaWrapper.c
@@ -16,16 +16,14 @@ void XAASync(ScreenPtr pScreen);
 
 /* #include "render.h" */
 
-#if 0
+#if 1
 #define COND(pDraw) \
         ((pDraw)->depth \
                       != (xaaWrapperGetScrPriv(((DrawablePtr)(pDraw))->pScreen))->depth)
-#endif
+#else
 #define COND(pDraw) 1
-
-#if 0
-static Bool xaaWrapperPreCreateGC(GCPtr pGC);
 #endif
+
 static Bool xaaWrapperCreateGC(GCPtr pGC);
 static void xaaWrapperValidateGC(GCPtr pGC, unsigned long changes, DrawablePtr pDraw);
 static void xaaWrapperDestroyGC(GCPtr pGC);
@@ -36,53 +34,7 @@ static void xaaWrapperChangeClip (GCPtr pGC, int type, pointer pvalue, int nrect
 static void xaaWrapperCopyClip(GCPtr pgcDst, GCPtr pgcSrc);
 static void xaaWrapperDestroyClip(GCPtr pGC);
 
-#if 0
-static void xaaWrapperFillSpans(DrawablePtr pDraw, GC *pGC, int nInit,
-			DDXPointPtr pptInit, int *pwidthInit, int fSorted);
-static void xaaWrapperSetSpans(DrawablePtr pDraw, GCPtr	pGC, char *pcharsrc,
-		       DDXPointPtr pptInit, int	*pwidthInit, int nspans,
-		       int fSorted);
-static void xaaWrapperPutImage(DrawablePtr pDraw, GCPtr	pGC, int depth, int x, int y,
-		       int w, int h,int	leftPad, int format, char *pImage);
-static RegionPtr xaaWrapperCopyPlane(DrawablePtr pSrc,
-			     DrawablePtr pDst, GCPtr pGC,int srcx, int srcy,
-			     int width, int height, int	dstx, int dsty,
-			     unsigned long bitPlane);
-static void xaaWrapperPolyPoint(DrawablePtr pDraw, GCPtr pGC, int mode, int npt,
-			xPoint *pptInit);
-static void xaaWrapperPolylines(DrawablePtr pDraw, GCPtr pGC, int mode,
-			int npt, DDXPointPtr pptInit);
-static void xaaWrapperPolySegment(DrawablePtr pDraw, GCPtr pGC, int nseg,
-			  xSegment *pSeg);
-static void xaaWrapperPolyRectangle(DrawablePtr  pDraw, GCPtr pGC, int nRects,
-			    xRectangle  *pRects);
-static void xaaWrapperPolyArc( DrawablePtr pDraw, GCPtr	pGC, int narcs, xArc *parcs);
-static void xaaWrapperFillPolygon(DrawablePtr pDraw, GCPtr pGC, int shape,
-			  int mode, int count, DDXPointPtr pptInit);
-static void xaaWrapperPolyFillRect(DrawablePtr pDraw, GCPtr pGC, int nRectsInit, 
-			   xRectangle *pRectsInit);
-static RegionPtr xaaWrapperCopyArea(DrawablePtr pSrc, DrawablePtr pDst, GC *pGC,
-			    int srcx, int srcy, int width, int height,
-			    int dstx, int dsty);
-static void xaaWrapperPolyFillArc(DrawablePtr pDraw, GCPtr pGC, int narcs,
-			  xArc *parcs);
-static int xaaWrapperPolyText8(DrawablePtr pDraw, GCPtr	pGC, int x, int	y, int count,
-		       char *chars);
-static int xaaWrapperPolyText16(DrawablePtr pDraw, GCPtr pGC, int x, int y,
-			int count, unsigned short *chars);
-static void xaaWrapperImageText8(DrawablePtr pDraw, GCPtr pGC, int x, 
-			 int y, int count, char	*chars);
-static void xaaWrapperImageText16(DrawablePtr pDraw, GCPtr pGC, int x, int y,
-			  int count, unsigned short *chars);
-static void xaaWrapperImageGlyphBlt(DrawablePtr pDraw, GCPtr pGC, int x, int y,
-			    unsigned int nglyph, CharInfoPtr *ppci,
-			    pointer pglyphBase);
-static void xaaWrapperPolyGlyphBlt(DrawablePtr pDraw, GCPtr pGC, int x, int y,
-			   unsigned int nglyph, CharInfoPtr *ppci,
-			   pointer pglyphBase);
-static void xaaWrapperPushPixels(GCPtr pGC, PixmapPtr pBitMap, DrawablePtr pDraw,
-			 int	dx, int dy, int xOrg, int yOrg);
-#endif
+
 static void
 xaaWrapperComposite (CARD8 op, PicturePtr pSrc, PicturePtr pMask, PicturePtr pDst,
 	     INT16 xSrc, INT16 ySrc, INT16 xMask, INT16 yMask,
@@ -145,25 +97,27 @@ typedef struct {
     real->mem = func; \
 }
 
-#if 0
-#define wrap_pre(priv,real,real_func,mem,func) {\
-    priv->mem = real->real_func; \
-    real->real_func = func; \
-}
-#endif
-
-#define get(priv,real,func,wrap) \
-    priv->wrap = real->func;
-
 #define unwrap(priv,real,mem) {\
     real->mem = priv->mem; \
 }
 
-#if 0
-#define unwrap_pre(priv,real,real_func,mem) {\
-    real->real_func = priv->mem; \
+#define cond_wrap(priv,cond,real,mem,wrapmem,func) {\
+    if (COND(cond)) \
+        priv->wrapmem = real->mem; \
+    else  \
+	priv->mem = real->mem; \
+    real->mem = func; \
+}
+
+#define cond_unwrap(priv,cond,real,mem,wrapmem) {\
+    if (COND(cond)) \
+        real->mem = priv->wrapmem; \
+    else \
+        real->mem = priv->mem; \
 }
-#endif
+
+#define get(priv,real,func,wrap) \
+    priv->wrap = real->func;
 
 typedef struct _xaaWrapperGCPriv {
     GCOps   *ops;
@@ -210,12 +164,11 @@ xaaWrapperCreateWindow(WindowPtr pWin)
     xaaWrapperScrPriv(pWin->drawable.pScreen);
     Bool ret;
     
-    unwrap (pScrPriv, pWin->drawable.pScreen, CreateWindow);
-    if (COND(&pWin->drawable))
-	pWin->drawable.pScreen->CreateWindow
-	    = pScrPriv->wrapCreateWindow;
+    cond_unwrap(pScrPriv, &pWin->drawable, pWin->drawable.pScreen,
+		CreateWindow, wrapCreateWindow);
     ret = pWin->drawable.pScreen->CreateWindow(pWin);
-    wrap(pScrPriv, pWin->drawable.pScreen, CreateWindow, xaaWrapperCreateWindow);
+    cond_wrap(pScrPriv, &pWin->drawable, pWin->drawable.pScreen, CreateWindow,
+	      wrapCreateWindow, xaaWrapperCreateWindow);
 
     return ret;
 }
@@ -244,11 +197,11 @@ xaaWrapperWindowExposures (WindowPtr	pWin,
 {
     xaaWrapperScrPriv(pWin->drawable.pScreen);
 
-    unwrap (pScrPriv, pWin->drawable.pScreen, WindowExposures);
-    if (COND(&pWin->drawable))
-	pWin->drawable.pScreen->WindowExposures = pScrPriv->wrapWindowExposures;
+    cond_unwrap(pScrPriv, &pWin->drawable, pWin->drawable.pScreen,
+		WindowExposures, wrapWindowExposures);
     pWin->drawable.pScreen->WindowExposures(pWin, prgn, other_exposed);
-    wrap(pScrPriv, pWin->drawable.pScreen, WindowExposures, xaaWrapperWindowExposures);
+    cond_wrap(pScrPriv, &pWin->drawable, pWin->drawable.pScreen,
+	      WindowExposures, wrapWindowExposures, xaaWrapperWindowExposures);
 }
 
 static void
@@ -258,29 +211,24 @@ xaaWrapperPaintWindow(WindowPtr pWin, RegionPtr pRegion, int what)
 
     switch (what) {
 	case PW_BORDER:
-	    unwrap (pScrPriv, pWin->drawable.pScreen, PaintWindowBorder);
-	    if (COND(&pWin->drawable)) {
-		pWin->drawable.pScreen->PaintWindowBorder
-		    = pScrPriv->wrapPaintWindowBorder;
-				XAASync(pWin->drawable.pScreen);
-	    }
+	    cond_unwrap(pScrPriv, &pWin->drawable, pWin->drawable.pScreen,
+			PaintWindowBorder, wrapPaintWindowBorder);
+
 	    pWin->drawable.pScreen->PaintWindowBorder (pWin, pRegion, what);
-	    wrap(pScrPriv, pWin->drawable.pScreen, PaintWindowBorder,
-		 xaaWrapperPaintWindow);
+	    cond_wrap(pScrPriv, &pWin->drawable, pWin->drawable.pScreen,
+		      PaintWindowBorder, wrapPaintWindowBorder,
+		      xaaWrapperPaintWindow);
 	    break;
 	case PW_BACKGROUND:
-	    unwrap (pScrPriv, pWin->drawable.pScreen, PaintWindowBackground);
-	    if (COND(&pWin->drawable)) {
-		pWin->drawable.pScreen->PaintWindowBackground
-		    = pScrPriv->wrapPaintWindowBackground;
-		XAASync(pWin->drawable.pScreen);
-	    }
+	    cond_unwrap(pScrPriv, &pWin->drawable, pWin->drawable.pScreen,
+			PaintWindowBackground, wrapPaintWindowBackground);
+
 	    pWin->drawable.pScreen->PaintWindowBackground (pWin, pRegion, what);
-	    wrap(pScrPriv, pWin->drawable.pScreen, PaintWindowBackground,
-		 xaaWrapperPaintWindow);
+	    cond_wrap(pScrPriv, &pWin->drawable, pWin->drawable.pScreen,
+		      PaintWindowBackground, wrapPaintWindowBackground,
+		      xaaWrapperPaintWindow);
 	    break;
     }
-
 }
 
 static Bool
@@ -378,11 +326,7 @@ xaaSetupWrapper(ScreenPtr pScreen, XAAInfoRecPtr infoPtr, int depth, SyncFunc *f
     get (pScrPriv, pScreen, PaintWindowBorder, wrapPaintWindowBorder);
     get (pScrPriv, pScreen, PaintWindowBackground, wrapPaintWindowBackground);
     get (pScrPriv, pScreen, WindowExposures, wrapWindowExposures);
-#if 0
-    wrap_pre (pScrPriv, pScreen, CreateGC, wrapCreateGC, xaaWrapperPreCreateGC);
-#else
     get (pScrPriv, pScreen, CreateGC, wrapCreateGC);
-#endif
     get (pScrPriv, pScreen, CreateColormap, wrapCreateColormap);
     get (pScrPriv, pScreen, DestroyColormap, wrapDestroyColormap);
     get (pScrPriv, pScreen, InstallColormap, wrapInstallColormap);
@@ -435,25 +379,6 @@ GCFuncs xaaWrapperGCFuncs = {
     xaaWrapperCopyClip
 };
 
-#if 0
-GCOps xaaWrapperGCOps = {
-    xaaWrapperFillSpans, xaaWrapperSetSpans, 
-    xaaWrapperPutImage, xaaWrapperCopyArea, 
-    xaaWrapperCopyPlane, xaaWrapperPolyPoint, 
-    xaaWrapperPolylines, xaaWrapperPolySegment, 
-    xaaWrapperPolyRectangle, xaaWrapperPolyArc, 
-    xaaWrapperFillPolygon, xaaWrapperPolyFillRect, 
-    xaaWrapperPolyFillArc, xaaWrapperPolyText8, 
-    xaaWrapperPolyText16, xaaWrapperImageText8, 
-    xaaWrapperImageText16, xaaWrapperImageGlyphBlt, 
-    xaaWrapperPolyGlyphBlt, xaaWrapperPushPixels,
-#ifdef NEED_LINEHELPER
-    NULL,
-#endif
-    {NULL}		/* devPrivate */
-};
-#endif
-
 #define XAAWRAPPER_GC_FUNC_PROLOGUE(pGC) \
     xaaWrapperGCPriv(pGC); \
     unwrap(pGCPriv, pGC, funcs); \
@@ -463,23 +388,6 @@ GCOps xaaWrapperGCOps = {
     wrap(pGCPriv, pGC, funcs, &xaaWrapperGCFuncs);  \
     if (pGCPriv->wrap) wrap(pGCPriv, pGC, ops, pGCPriv->wrapops)
 
-#if 0
-static Bool
-xaaWrapperPreCreateGC(GCPtr pGC)
-{
-    ScreenPtr		pScreen = pGC->pScreen;
-    xaaWrapperScrPriv(pScreen);
-    xaaWrapperGCPriv(pGC);
-    Bool ret;
-
-    unwrap_pre (pScrPriv, pScreen, CreateGC, wrapCreateGC);
-    ret = (*pScreen->CreateGC) (pGC);
-    wrap_pre (pScrPriv, pScreen, CreateGC, wrapCreateGC, xaaWrapperPreCreateGC);
-
-    return ret;
-}
-#endif
-
 static Bool
 xaaWrapperCreateGC(GCPtr pGC)
 {
@@ -572,310 +480,6 @@ xaaWrapperDestroyClip(GCPtr pGC)
     XAAWRAPPER_GC_FUNC_EPILOGUE (pGC);
 }
 
-#if 0
-#define XAAWRAPPER_GC_OP_PROLOGUE(pGC,pDraw) \
-/*     xaaWrapperScrPriv(pDraw->pScreen); */\
-    xaaWrapperGCPriv(pGC);  \
-    GCFuncs *oldFuncs = pGC->funcs; \
-    unwrap(pGCPriv, pGC, funcs);  \
-    unwrap(pGCPriv, pGC, ops); \
-	
-#define XAAWRAPPER_GC_OP_EPILOGUE(pGC,pDraw) \
-    wrap(pGCPriv, pGC, funcs, oldFuncs); \
-    wrap(pGCPriv, pGC, ops, &xaaWrapperGCOps)
-
-static void
-xaaWrapperFillSpans(
-    DrawablePtr pDraw,
-    GC		*pGC,
-    int		nInit,	
-    DDXPointPtr pptInit,	
-    int 	*pwidthInit,		
-    int 	fSorted 
-){
-    XAAWRAPPER_GC_OP_PROLOGUE(pGC, pDraw);
-    (*pGC->ops->FillSpans)(pDraw, pGC, nInit, pptInit, pwidthInit, fSorted);
-    XAAWRAPPER_GC_OP_EPILOGUE(pGC, pDraw);
-}
-
-static void
-xaaWrapperSetSpans(
-    DrawablePtr		pDraw,
-    GCPtr		pGC,
-    char		*pcharsrc,
-    DDXPointPtr 	pptInit,
-    int			*pwidthInit,
-    int			nspans,
-    int			fSorted 
-){
-    XAAWRAPPER_GC_OP_PROLOGUE(pGC, pDraw);
-
-    (*pGC->ops->SetSpans)(pDraw, pGC, pcharsrc, pptInit, 
-			  pwidthInit, nspans, fSorted);
-    XAAWRAPPER_GC_OP_EPILOGUE(pGC, pDraw);
-}
-
-
-static void
-xaaWrapperPutImage(
-    DrawablePtr pDraw,
-    GCPtr	pGC,
-    int		depth, 
-    int x, int y, int w, int h,
-    int		leftPad,
-    int		format,
-    char 	*pImage 
-){
-    XAAWRAPPER_GC_OP_PROLOGUE(pGC, pDraw);
-    (*pGC->ops->PutImage)(pDraw, pGC, depth, x, y, w, h, 
-		leftPad, format, pImage);
-    XAAWRAPPER_GC_OP_EPILOGUE(pGC, pDraw);
-}
-
-static RegionPtr
-xaaWrapperCopyArea(
-    DrawablePtr pSrc,
-    DrawablePtr pDst,
-    GC *pGC,
-    int srcx, int srcy,
-    int width, int height,
-    int dstx, int dsty 
-){
-    RegionPtr ret;
-    XAAWRAPPER_GC_OP_PROLOGUE(pGC, pDst);
-    ret = (*pGC->ops->CopyArea)(pSrc, pDst,
-            pGC, srcx, srcy, width, height, dstx, dsty);
-    XAAWRAPPER_GC_OP_EPILOGUE(pGC, pDst);
-
-    return ret;
-}
-
-
-static RegionPtr
-xaaWrapperCopyPlane(
-    DrawablePtr	pSrc,
-    DrawablePtr	pDst,
-    GCPtr pGC,
-    int	srcx, int srcy,
-    int	width, int height,
-    int	dstx, int dsty,
-    unsigned long bitPlane 
-){
-    RegionPtr ret;
-    XAAWRAPPER_GC_OP_PROLOGUE(pGC, pDst);
-    ret = (*pGC->ops->CopyPlane)(pSrc, pDst,
-	       pGC, srcx, srcy, width, height, dstx, dsty, bitPlane);
-    XAAWRAPPER_GC_OP_EPILOGUE(pGC, pDst);
-    return ret;
-}
-
-static void
-xaaWrapperPolyPoint(
-    DrawablePtr pDraw,
-    GCPtr pGC,
-    int mode,
-    int npt,
-    xPoint *pptInit 
-){
-    XAAWRAPPER_GC_OP_PROLOGUE(pGC, pDraw);
-    (*pGC->ops->PolyPoint)(pDraw, pGC, mode, npt, pptInit);
-    XAAWRAPPER_GC_OP_EPILOGUE(pGC, pDraw);
-}
-
-static void
-xaaWrapperPolylines(
-    DrawablePtr pDraw,
-    GCPtr	pGC,
-    int		mode,		
-    int		npt,		
-    DDXPointPtr pptInit 
-){
-    XAAWRAPPER_GC_OP_PROLOGUE(pGC, pDraw);
-    (*pGC->ops->Polylines)(pDraw, pGC, mode, npt, pptInit);
-    XAAWRAPPER_GC_OP_EPILOGUE(pGC, pDraw);
-}
-
-static void 
-xaaWrapperPolySegment(
-    DrawablePtr	pDraw,
-    GCPtr	pGC,
-    int		nseg,
-    xSegment	*pSeg
-    ){
-    XAAWRAPPER_GC_OP_PROLOGUE(pGC, pDraw);
-    (*pGC->ops->PolySegment)(pDraw, pGC, nseg, pSeg);
-    XAAWRAPPER_GC_OP_EPILOGUE(pGC, pDraw);
-}
-
-static void
-xaaWrapperPolyRectangle(
-    DrawablePtr  pDraw,
-    GCPtr        pGC,
-    int	         nRects,
-    xRectangle  *pRects 
-){
-    XAAWRAPPER_GC_OP_PROLOGUE(pGC, pDraw);
-    (*pGC->ops->PolyRectangle)(pDraw, pGC, nRects, pRects);
-    XAAWRAPPER_GC_OP_EPILOGUE(pGC, pDraw);
-}
-
-static void
-xaaWrapperPolyArc(
-    DrawablePtr	pDraw,
-    GCPtr	pGC,
-    int		narcs,
-    xArc	*parcs 
-){
-    XAAWRAPPER_GC_OP_PROLOGUE(pGC, pDraw);
-    (*pGC->ops->PolyArc)(pDraw, pGC, narcs, parcs);
-    XAAWRAPPER_GC_OP_EPILOGUE(pGC, pDraw);
-}
-
-static void
-xaaWrapperFillPolygon(
-    DrawablePtr	pDraw,
-    GCPtr	pGC,
-    int		shape,
-    int		mode,
-    int		count,
-    DDXPointPtr	pptInit 
-){
-    XAAWRAPPER_GC_OP_PROLOGUE(pGC, pDraw);
-    (*pGC->ops->FillPolygon)(pDraw, pGC, shape, mode, count, pptInit);
-    XAAWRAPPER_GC_OP_EPILOGUE(pGC, pDraw);
-}
-
-static void 
-xaaWrapperPolyFillRect(
-    DrawablePtr	pDraw,
-    GCPtr	pGC,
-    int		nRectsInit, 
-    xRectangle	*pRectsInit 
-){
-    XAAWRAPPER_GC_OP_PROLOGUE(pGC, pDraw);
-    (*pGC->ops->PolyFillRect)(pDraw, pGC, nRectsInit, pRectsInit);
-    XAAWRAPPER_GC_OP_EPILOGUE(pGC, pDraw);
-}
-
-static void
-xaaWrapperPolyFillArc(
-    DrawablePtr	pDraw,
-    GCPtr	pGC,
-    int		narcs,
-    xArc	*parcs 
-){
-    XAAWRAPPER_GC_OP_PROLOGUE(pGC, pDraw);
-    (*pGC->ops->PolyFillArc)(pDraw, pGC, narcs, parcs);
-    XAAWRAPPER_GC_OP_EPILOGUE(pGC, pDraw);
-}
-
-static int
-xaaWrapperPolyText8(
-    DrawablePtr pDraw,
-    GCPtr	pGC,
-    int		x, 
-    int 	y,
-    int 	count,
-    char	*chars 
-){
-    int width;
-    
-    XAAWRAPPER_GC_OP_PROLOGUE(pGC, pDraw);
-    width = (*pGC->ops->PolyText8)(pDraw, pGC, x, y, count, chars);
-    XAAWRAPPER_GC_OP_EPILOGUE(pGC, pDraw);
-
-    return width;
-}
-
-static int
-xaaWrapperPolyText16(
-    DrawablePtr pDraw,
-    GCPtr	pGC,
-    int		x,
-    int		y,
-    int 	count,
-    unsigned short *chars 
-){
-    int width;
-    
-    XAAWRAPPER_GC_OP_PROLOGUE(pGC, pDraw);
-    width = (*pGC->ops->PolyText16)(pDraw, pGC, x, y, count, chars);
-    XAAWRAPPER_GC_OP_EPILOGUE(pGC, pDraw);
-
-    return width;
-}
-
-static void
-xaaWrapperImageText8(
-    DrawablePtr pDraw,
-    GCPtr	pGC,
-    int		x, 
-    int		y,
-    int 	count,
-    char	*chars 
-){
-    XAAWRAPPER_GC_OP_PROLOGUE(pGC, pDraw);
-    (*pGC->ops->ImageText8)(pDraw, pGC, x, y, count, chars);
-    XAAWRAPPER_GC_OP_EPILOGUE(pGC, pDraw);
-}
-
-static void
-xaaWrapperImageText16(
-    DrawablePtr pDraw,
-    GCPtr	pGC,
-    int		x,
-    int		y,
-    int 	count,
-    unsigned short *chars 
-){
-    XAAWRAPPER_GC_OP_PROLOGUE(pGC, pDraw);
-    (*pGC->ops->ImageText16)(pDraw, pGC, x, y, count, chars);
-    XAAWRAPPER_GC_OP_EPILOGUE(pGC, pDraw);
-}
-
-static void
-xaaWrapperImageGlyphBlt(
-    DrawablePtr pDraw,
-    GCPtr pGC,
-    int x, int y,
-    unsigned int nglyph,
-    CharInfoPtr *ppci,
-    pointer pglyphBase 
-){
-    XAAWRAPPER_GC_OP_PROLOGUE(pGC, pDraw);
-    (*pGC->ops->ImageGlyphBlt)(pDraw, pGC, x, y, nglyph, 
-					ppci, pglyphBase);
-    XAAWRAPPER_GC_OP_EPILOGUE(pGC, pDraw);
-}
-
-static void
-xaaWrapperPolyGlyphBlt(
-    DrawablePtr pDraw,
-    GCPtr pGC,
-    int x, int y,
-    unsigned int nglyph,
-    CharInfoPtr *ppci,
-    pointer pglyphBase 
-){
-    XAAWRAPPER_GC_OP_PROLOGUE(pGC, pDraw);
-    (*pGC->ops->PolyGlyphBlt)(pDraw, pGC, x, y, nglyph, 
-				ppci, pglyphBase);
-    XAAWRAPPER_GC_OP_EPILOGUE(pGC, pDraw);
-}
-
-static void
-xaaWrapperPushPixels(
-    GCPtr	pGC,
-    PixmapPtr	pBitMap,
-    DrawablePtr pDraw,
-    int	dx, int dy, int xOrg, int yOrg 
-){
-    XAAWRAPPER_GC_OP_PROLOGUE(pGC, pDraw);
-    (*pGC->ops->PushPixels)(pGC, pBitMap, pDraw, dx, dy, xOrg, yOrg);
-    XAAWRAPPER_GC_OP_EPILOGUE(pGC, pDraw);
-}
-#endif
-
 #ifdef RENDER
 static void
 xaaWrapperComposite (CARD8 op, PicturePtr pSrc, PicturePtr pMask, PicturePtr pDst,
diff --git a/include/globals.h b/include/globals.h
index 7a2188e25..9fc6aa242 100644
--- a/include/globals.h
+++ b/include/globals.h
@@ -1,4 +1,4 @@
-/* $XdotOrg: xc/programs/Xserver/include/globals.h,v 1.4 2004/07/31 09:14:06 kem Exp $ */
+/* $XdotOrg: xc/programs/Xserver/include/globals.h,v 1.4.4.1 2004/09/16 23:37:22 deronj Exp $ */
 /* $XFree86: xc/programs/Xserver/include/globals.h,v 1.3 1999/09/25 14:38:21 dawes Exp $ */
 
 #ifndef _XSERV_GLOBAL_H_
@@ -42,27 +42,168 @@ extern Bool DPMSCapableFlag;
 #endif
 
 #ifdef PANORAMIX
-extern Bool noPanoramiXExtension;
 extern Bool PanoramiXMapped;
 extern Bool PanoramiXVisibilityNotifySent;
 extern Bool PanoramiXWindowExposureSent;
 extern Bool PanoramiXOneExposeRequest;
 #endif
 
+#ifdef BEZIER
+extern Bool noBezierExtension;
+#endif
+
+#ifdef BIGREQS
+extern Bool noBigReqExtension;
+#endif
+
+#ifdef COMPOSITE
+extern Bool noCompositeExtension;
+#endif
+
+#ifdef DAMAGE
+extern Bool noDamageExtension;
+#endif
+
+#ifdef DBE
+extern Bool noDbeExtension;
+#endif
+
+#ifdef DPSEXT
+extern Bool noDPSExtension;
+#endif
+
+#ifdef DPMSExtension
+extern Bool noDPMSExtension;
+#endif
+
+#ifdef EVI
+extern Bool noEVIExtension;
+#endif
+
+#ifdef FONTCACHE
+extern Bool noFontCacheExtension;
+#endif
+
+#ifdef GLXEXT
+extern Bool noGlxExtension;
+#endif
+
+#ifdef LBX
+extern Bool noLbxExtension;
+#endif
+
+#ifdef SCREENSAVER
+extern Bool noScreenSaverExtension;
+#endif
+
+#ifdef MITSHM
+extern Bool noMITShmExtension;
+#endif
+
+#ifdef MITMISC
+extern Bool noMITMiscExtension;
+#endif
+
+#ifdef MULTIBUFFER
+extern Bool noMultibufferExtension;
+#endif
+
+#ifdef RANDR
+extern Bool noRRExtension;
+#endif
+
 #ifdef RENDER
 extern Bool noRenderExtension;
 #endif
 
+#ifdef SHAPE
+extern Bool noShapeExtension;
+#endif
+
+#ifdef XCSECURITY
+extern Bool noSecurityExtension;
+#endif
+
+#ifdef XSYNC
+extern Bool noSyncExtension;
+#endif
+
+#ifdef TOGCUP
+extern Bool noXcupExtension;
+#endif
+
+#ifdef PEXEXT
+extern Bool noPexExtension;
+#endif
+
+#ifdef RES
+extern Bool noResExtension;
+#endif
+
+#ifdef XAPPGROUP
+extern Bool noXagExtension;
+#endif
+
+#ifdef XCMISC
+extern Bool noXCMiscExtension;
+#endif
+
 #ifdef XEVIE
 extern Bool noXevieExtension;
 #endif
 
-#ifdef COMPOSITE
-extern Bool noCompositeExtension;
+#ifdef XIE
+extern Bool noXie;
+#endif
+
+#ifdef XF86BIGFONT
+extern Bool noXFree86BigfontExtension;
+#endif
+
+#ifdef XFreeXDGA
+extern Bool noXFree86DGAExtension;
+#endif
+
+#ifdef XF86DRI
+extern Bool noXFree86DRIExtension;
+#endif
+
+#ifdef XF86MISC
+extern Bool noXFree86MiscExtension;
+#endif
+
+#ifdef XF86VIDMODE
+extern Bool noXFree86VidModeExtension;
+#endif
+
+#ifdef XFIXES
+extern Bool noXFixesExtension;
+#endif
+
+#ifdef XKB
+/* |noXkbExtension| is defined in xc/programs/Xserver/xkb/xkbInit.c */
+extern Bool noXkbExtension;
+#endif
+
+#ifdef PANORAMIX
+extern Bool noPanoramiXExtension;
+#endif
+
+#ifdef XINPUT
+extern Bool noXInputExtension;
+#endif
+
+#ifdef XIDLE
+extern Bool noXIdleExtension;
+#endif
+
+#ifdef XV
+extern Bool noXvExtension;
 #endif
 
 #ifdef LG3D
 extern Bool noLgeExtension;
 #endif
 
-#endif /* _XSERV_GLOBAL_H_ */
+#endif /* !_XSERV_GLOBAL_H_ */
+
diff --git a/mi/micmap.c b/mi/micmap.c
index 45f8e1ed6..2018a093a 100644
--- a/mi/micmap.c
+++ b/mi/micmap.c
@@ -55,10 +55,11 @@ miInitVisualsProcPtr miInitVisualsProc = miDoInitVisuals;
 int
 miListInstalledColormaps(ScreenPtr pScreen, Colormap *pmaps)
 {
-    /* By the time we are processing requests, we can guarantee that there
-     * is always a colormap installed */
-    *pmaps = miInstalledMaps[pScreen->myNum]->mid;
-    return (1);
+    if (miInstalledMaps[pScreen->myNum]) {
+	*pmaps = miInstalledMaps[pScreen->myNum]->mid;
+	return (1);
+    }
+    return 0;
 }
 
 void
diff --git a/mi/miinitext.c b/mi/miinitext.c
index 5a5d4a265..ac6a42cc4 100644
--- a/mi/miinitext.c
+++ b/mi/miinitext.c
@@ -1,4 +1,4 @@
-/* $XdotOrg: xc/programs/Xserver/mi/miinitext.c,v 1.12 2004/08/12 08:45:33 anholt Exp $ */
+/* $XdotOrg: xc/programs/Xserver/mi/miinitext.c,v 1.12.4.1 2004/09/16 23:37:23 deronj Exp $ */
 /* $XFree86: xc/programs/Xserver/mi/miinitext.c,v 3.67 2003/01/12 02:44:27 dawes Exp $ */
 /***********************************************************
 
@@ -96,7 +96,6 @@ SOFTWARE.
 #undef SCREENSAVER
 #undef XIDLE
 #undef XRECORD
-#undef DBE
 #undef XF86VIDMODE
 #undef XF86MISC
 #undef XFreeXDGA
@@ -111,21 +110,123 @@ SOFTWARE.
 #undef LG3D
 #endif /* PRINT_ONLY_SERVER */
 
-#ifdef PANORAMIX
-extern Bool noPanoramiXExtension;
-#endif
+
 extern Bool noTestExtensions;
-#ifdef XKB
-extern Bool noXkbExtension;
+
+#ifdef BEZIER
+extern Bool noBezierExtension;
+#endif
+#ifdef BIGREQS
+extern Bool noBigReqExtension;
+#endif
+#ifdef COMPOSITE
+extern Bool noCompositeExtension;
+#endif
+#ifdef DAMAGE
+extern Bool noDamageExtension;
+#endif
+#ifdef DBE
+extern Bool noDbeExtension;
+#endif
+#ifdef DPSEXT
+extern Bool noDPSExtension;
+#endif
+#ifdef DPMSExtension
+extern Bool noDPMSExtension;
+#endif
+#ifdef EVI
+extern Bool noEVIExtension;
+#endif
+#ifdef FONTCACHE
+extern Bool noFontCacheExtension;
+#endif
+#ifdef GLXEXT
+extern Bool noGlxExtension;
+#endif
+#ifdef LBX
+extern Bool noLbxExtension;
+#endif
+#ifdef SCREENSAVER
+extern Bool noScreenSaverExtension;
+#endif
+#ifdef MITSHM
+extern Bool noMITShmExtension;
+#endif
+#ifdef MITMISC
+extern Bool noMITMiscExtension;
+#endif
+#ifdef MULTIBUFFER
+extern Bool noMultibufferExtension;
+#endif
+#ifdef RANDR
+extern Bool noRRExtension;
 #endif
 #ifdef RENDER
 extern Bool noRenderExtension;
 #endif
+#ifdef SHAPE
+extern Bool noShapeExtension;
+#endif
+#ifdef XCSECURITY
+extern Bool noSecurityExtension;
+#endif
+#ifdef XSYNC
+extern Bool noSyncExtension;
+#endif
+#ifdef TOGCUP
+extern Bool noXcupExtension;
+#endif
+#ifdef PEXEXT
+extern Bool noPexExtension;
+#endif
+#ifdef RES
+extern Bool noResExtension;
+#endif
+#ifdef XAPPGROUP
+extern Bool noXagExtension;
+#endif
+#ifdef XCMISC
+extern Bool noXCMiscExtension;
+#endif
 #ifdef XEVIE
 extern Bool noXevieExtension;
 #endif
-#ifdef COMPOSITE
-extern Bool noCompositeExtension;
+#ifdef XIE
+extern Bool noXie;
+#endif
+#ifdef XF86BIGFONT
+extern Bool noXFree86BigfontExtension;
+#endif
+#ifdef XFreeXDGA
+extern Bool noXFree86DGAExtension;
+#endif
+#ifdef XF86DRI
+extern Bool noXFree86DRIExtension;
+#endif
+#ifdef XF86MISC
+extern Bool noXFree86MiscExtension;
+#endif
+#ifdef XF86VIDMODE
+extern Bool noXFree86VidModeExtension;
+#endif
+#ifdef XFIXES
+extern Bool noXFixesExtension;
+#endif
+#ifdef XKB
+/* |noXkbExtension| is defined in xc/programs/Xserver/xkb/xkbInit.c */
+extern Bool noXkbExtension;
+#endif
+#ifdef PANORAMIX
+extern Bool noPanoramiXExtension;
+#endif
+#ifdef XINPUT
+extern Bool noXInputExtension;
+#endif
+#ifdef XIDLE
+extern Bool noXIdleExtension;
+#endif
+#ifdef XV
+extern Bool noXvExtension;
 #endif
 #ifdef LG3D
 extern Bool noLgeExtension;
@@ -328,21 +429,118 @@ typedef struct {
 
 static ExtensionToggle ExtensionToggleList[] =
 {
-    { "XTEST", &noTestExtensions },
-#ifdef PANORAMIX
-    { "XINERAMA", &noPanoramiXExtension },
+    /* sort order is extension name string as shown in xdpyinfo */
+#ifdef BEZIER
+    { "BEZIER", &noBezierExtension },
+#endif
+#ifdef BIGREQS
+    { "BIG-REQUESTS", &noBigReqExtension },
+#endif
+#ifdef COMPOSITE
+    { "Composite", &noCompositeExtension },
+#endif
+#ifdef DAMAGE
+    { "DAMAGE", &noDamageExtension },
+#endif
+#ifdef DBE
+    { "DOUBLE-BUFFER", &noDbeExtension },
+#endif
+#ifdef DPSEXT
+    { "DPSExtension", &noDPSExtension },
+#endif
+#ifdef DPMSExtension
+    { "DPMS", &noDPMSExtension },
+#endif
+#ifdef EVI
+    { "Extended-Visual-Information", &noEVIExtension },
+#endif
+#ifdef FONTCACHE
+    { "FontCache", &noFontCacheExtension },
+#endif
+#ifdef GLXEXT
+    { "GLX", &noGlxExtension },
+#endif
+#ifdef LBX
+    { "LBX", &noLbxExtension },
+#endif
+#ifdef SCREENSAVER
+    { "MIT-SCREEN-SAVER", &noScreenSaverExtension },
+#endif
+#ifdef MITSHM
+    { SHMNAME, &noMITShmExtension },
+#endif
+#ifdef MITMISC
+    { "MIT-SUNDRY-NONSTANDARD", &noMITMiscExtension },
+#endif
+#ifdef MULTIBUFFER
+    { "Multi-Buffering", &noMultibufferExtension },
+#endif
+#ifdef RANDR
+    { "RANDR", &noRRExtension },
 #endif
 #ifdef RENDER
     { "RENDER", &noRenderExtension },
 #endif
-#ifdef XKB
-    { "XKEYBOARD", &noXkbExtension },
+#ifdef SHAPE
+    { "SHAPE", &noShapeExtension },
+#endif
+#ifdef XCSECURITY
+    { "SECURITY", &noSecurityExtension },
+#endif
+#ifdef XSYNC
+    { "SYNC", &noSyncExtension },
+#endif
+#ifdef TOGCUP
+    { "TOG-CUP", &noXcupExtension },
+#endif
+#ifdef PEXEXT
+    { "X3D-PEX", &noPexExtension },
+#endif
+#ifdef RES
+    { "X-Resource", &noResExtension },
+#endif
+#ifdef XAPPGROUP
+    { "XC-APPGROUP", &noXagExtension },
+#endif
+#ifdef XCMISC
+    { "XC-MISC", &noXCMiscExtension },
 #endif
 #ifdef XEVIE
     { "XEVIE", &noXevieExtension },
 #endif
-#ifdef COMPOSITE
-    { "Composite", &noCompositeExtension },
+#ifdef XF86BIGFONT
+    { "XFree86-Bigfont", &noXFree86BigfontExtension },
+#endif
+#ifdef XFreeXDGA
+    { "XFree86-DGA", &noXFree86DGAExtension },
+#endif
+#ifdef XF86DRI
+    { "XFree86-DRI", &noXFree86DRIExtension },
+#endif
+#ifdef XF86MISC
+    { "XFree86-Misc", &noXFree86MiscExtension },
+#endif
+#ifdef XF86VIDMODE
+    { "XFree86-VidModeExtension", &noXFree86VidModeExtension },
+#endif
+#ifdef XFIXES
+    { "XFIXES", &noXFixesExtension },
+#endif
+#ifdef XIE
+    { "XIE", &noXie },
+#endif
+#ifdef PANORAMIX
+    { "XINERAMA", &noPanoramiXExtension },
+#endif
+#ifdef XINPUT
+    { "XInputExtension", &noXInputExtension },
+#endif
+#ifdef XKB
+    { "XKEYBOARD", &noXkbExtension },
+#endif
+    { "XTEST", &noTestExtensions },
+#ifdef XV
+    { "XVideo", &noXvExtension },
 #endif
 #ifdef LG3D
     { "LGE", &noLgeExtension },
@@ -389,134 +587,136 @@ InitExtensions(argc, argv)
 # endif
 #endif
 #ifdef BEZIER
-    BezierExtensionInit();
+    if (!noBezierExtension) BezierExtensionInit();
 #endif
 #ifdef XTESTEXT1
     if (!noTestExtensions) XTestExtension1Init();
 #endif
 #ifdef SHAPE
-    ShapeExtensionInit();
+    if (!noShapeExtension) ShapeExtensionInit();
 #endif
 #ifdef MITSHM
-    ShmExtensionInit();
+    if (!noMITShmExtension) ShmExtensionInit();
 #endif
 #ifdef EVI
-    EVIExtensionInit();
+    if (!noEVIExtension) EVIExtensionInit();
 #endif
 #ifdef PEXEXT
-    PexExtensionInit();
+    if (!noPexExtension) PexExtensionInit();
 #endif
 #ifdef MULTIBUFFER
-    MultibufferExtensionInit();
+    if (!noMultibufferExtension) MultibufferExtensionInit();
 #endif
 #if defined(XINPUT) && !defined(NO_HW_ONLY_EXTS)
-    XInputExtensionInit();
+    if (!noXInputExtension) XInputExtensionInit();
 #endif
 #ifdef XTEST
     if (!noTestExtensions) XTestExtensionInit();
 #endif
 #ifdef BIGREQS
-    BigReqExtensionInit();
+    if (!noBigReqExtension) BigReqExtensionInit();
 #endif
 #ifdef MITMISC
-    MITMiscExtensionInit();
+    if (!noMITMiscExtension) MITMiscExtensionInit();
 #endif
 #ifdef XIDLE
-    XIdleExtensionInit();
+    if (!noXIdleExtension) XIdleExtensionInit();
 #endif
 #ifdef XTRAP
     if (!noTestExtensions) DEC_XTRAPInit();
 #endif
 #if defined(SCREENSAVER) && !defined(PRINT_ONLY_SERVER)
-    ScreenSaverExtensionInit ();
+    if (!noScreenSaverExtension) ScreenSaverExtensionInit ();
 #endif
 #ifdef XV
-    XvExtensionInit();
-    XvMCExtensionInit();
+    if (!noXvExtension) {
+      XvExtensionInit();
+      XvMCExtensionInit();
+    }
 #endif
 #ifdef XIE
-    XieInit();
+    if (!noXie) XieInit();
 #endif
 #ifdef XSYNC
-    SyncExtensionInit();
+    if (!noSyncExtension) SyncExtensionInit();
 #endif
 #if defined(XKB) && !defined(PRINT_ONLY_SERVER) && !defined(NO_HW_ONLY_EXTS)
     if (!noXkbExtension) XkbExtensionInit();
 #endif
 #ifdef XCMISC
-    XCMiscExtensionInit();
+    if (!noXCMiscExtension) XCMiscExtensionInit();
 #endif
 #ifdef XRECORD
     if (!noTestExtensions) RecordExtensionInit(); 
 #endif
 #ifdef LBX
-    LbxExtensionInit();
+    if (!noLbxExtension) LbxExtensionInit();
 #endif
 #ifdef DBE
-    DbeExtensionInit();
+    if (!noDbeExtension) DbeExtensionInit();
 #endif
 #ifdef XAPPGROUP
-    XagExtensionInit();
+    if (!noXagExtension) XagExtensionInit();
 #endif
 #ifdef XCSECURITY
-    SecurityExtensionInit();
+    if (!noSecurityExtension) SecurityExtensionInit();
 #endif
 #ifdef XPRINT
-    XpExtensionInit();
+    XpExtensionInit(); /* server-specific extension, cannot be disabled */
 #endif
 #ifdef TOGCUP
-    XcupExtensionInit();
+    if (!noXcupExtension) XcupExtensionInit();
 #endif
 #if defined(DPMSExtension) && !defined(NO_HW_ONLY_EXTS)
-    DPMSExtensionInit();
+    if (!noDPMSExtension) DPMSExtensionInit();
 #endif
 #ifdef FONTCACHE
-    FontCacheExtensionInit();
+    if (!noFontCacheExtension) FontCacheExtensionInit();
 #endif
 #ifdef XF86BIGFONT
-    XFree86BigfontExtensionInit();
+    if (!noXFree86BigfontExtension) XFree86BigfontExtensionInit();
 #endif
 #if !defined(PRINT_ONLY_SERVER) && !defined(NO_HW_ONLY_EXTS)
 #if defined(XF86VIDMODE)
-    XFree86VidModeExtensionInit();
+    if (!noXFree86VidModeExtension) XFree86VidModeExtensionInit();
 #endif
 #if defined(XF86MISC)
-    XFree86MiscExtensionInit();
+    if (!noXFree86MiscExtension) XFree86MiscExtensionInit();
 #endif
 #if defined(XFreeXDGA)
-    XFree86DGAExtensionInit();
+    if (!noXFree86DGAExtension) XFree86DGAExtensionInit();
 #endif
 #ifdef XF86DRI
-    XFree86DRIExtensionInit();
+    if (!noXFree86DRIExtension) XFree86DRIExtensionInit();
 #endif
 #endif
 #ifdef GLXEXT
 #ifndef __DARWIN__
-    GlxExtensionInit();
+    if (!noGlxExtension) GlxExtensionInit();
 #else
-    DarwinGlxExtensionInit();
+    if (!noGlxExtension) DarwinGlxExtensionInit();
 #endif
 #endif
 #ifdef DPSEXT
 #ifndef XPRINT
-    DPSExtensionInit();
+    if (!noDPSExtension) DPSExtensionInit();
 #endif
 #endif
 #ifdef XFIXES
     /* must be before Render to layer DisplayCursor correctly */
-    XFixesExtensionInit();
+    if (!noXFixesExtension) XFixesExtensionInit();
 #endif
 #ifdef RENDER
     if (!noRenderExtension) RenderExtensionInit();
 #endif
 #ifdef RANDR
-    RRExtensionInit();
+    if (!noRRExtension) RRExtensionInit();
 #endif
 #ifdef RES
-    ResExtensionInit();
+    if (!noResExtension) ResExtensionInit();
 #endif
 #ifdef DMXEXT
-    DMXExtensionInit();
+    DMXExtensionInit(); /* server-specific extension, cannot be disabled */
 #endif
 #ifdef XEVIE
     if (!noXevieExtension) XevieExtensionInit();
@@ -525,7 +725,7 @@ InitExtensions(argc, argv)
     if (!noCompositeExtension) CompositeExtensionInit();
 #endif
 #ifdef DAMAGE
-    DamageExtensionInit();
+    if (!noDamageExtension) DamageExtensionInit();
 #endif
 #ifdef LG3D
     if (!noLgeExtension) LgeExtensionInit();
@@ -546,96 +746,37 @@ InitVisualWrap()
 }
 
 #else /* XFree86LOADER */
-#if 0
-/* FIXME:The names here must come from the headers. those with ?? are 
-   not included in X11R6.3 sample implementation, so there's a problem... */
-/* XXX use the correct #ifdefs for symbols not present when an extension
-   is disabled */
-ExtensionModule extension[] =
-{
-    { NULL, "BEZIER", NULL, NULL },	/* ?? */
-    { NULL, "XTEST1", &noTestExtensions, NULL }, /* ?? */
-    { NULL, "SHAPE", NULL, NULL },
-    { NULL, "MIT-SHM", NULL, NULL },
-    { NULL, "X3D-PEX", NULL, NULL },
-    { NULL, "Multi-Buffering", NULL, NULL },
-    { NULL, "XInputExtension", NULL, NULL },
-    { NULL, "XTEST", &noTestExtensions, NULL },
-    { NULL, "BIG-REQUESTS", NULL, NULL },
-    { NULL, "MIT-SUNDRY-NONSTANDARD", NULL, NULL },
-    { NULL, "XIDLE", NULL, NULL },	/* ?? */
-    { NULL, "XTRAP", &noTestExtensions, NULL }, /* ?? */
-    { NULL, "MIT-SCREEN-SAVER", NULL, NULL },
-    { NULL, "XVideo", NULL, NULL },	/* ?? */
-    { NULL, "XIE", NULL, NULL },
-    { NULL, "SYNC", NULL, NULL },
-#ifdef XKB
-    { NULL, "XKEYBOARD", &noXkbExtension, NULL },
-#else
-    { NULL, "NOXKEYBOARD", NULL, NULL },
-#endif
-    { NULL, "XC-MISC", NULL, NULL },
-    { NULL, "RECORD", &noTestExtensions, NULL },
-    { NULL, "LBX", NULL, NULL },
-    { NULL, "DOUBLE-BUFFER", NULL, NULL },
-    { NULL, "XC-APPGROUP", NULL, NULL },
-    { NULL, "SECURITY", NULL, NULL },
-    { NULL, "XpExtension", NULL, NULL },
-    { NULL, "XFree86-VidModeExtension", NULL, NULL },
-    { NULL, "XFree86-Misc", NULL, NULL },
-    { NULL, "XFree86-DGA", NULL, NULL },
-    { NULL, "DPMS", NULL, NULL },
-    { NULL, "GLX", NULL, NULL },
-    { NULL, "TOG-CUP", NULL, NULL },
-    { NULL, "Extended-Visual-Information", NULL, NULL },
-#ifdef PANORAMIX
-    { NULL, "XINERAMA", &noPanoramiXExtension, NULL },
-#else
-    { NULL, "NOXINERAMA", NULL, NULL },
-#endif
-    { NULL, "XFree86-Bigfont", NULL, NULL },
-    { NULL, "XFree86-DRI", NULL, NULL },
-    { NULL, "Adobe-DPS-Extension", NULL, NULL },
-    { NULL, "FontCache", NULL, NULL },
-    { NULL, "RENDER", NULL, NULL },
-    { NULL, "RANDR", NULL, NULL },
-    { NULL, "X-Resource", NULL, NULL },
-    { NULL, "DMX", NULL, NULL },
-    { NULL, NULL, NULL, NULL }
-};
-#endif
-
 /* List of built-in (statically linked) extensions */
 static ExtensionModule staticExtensions[] = {
 #ifdef BEZIER
-    { BezierExtensionInit, "BEZIER", NULL, NULL, NULL },
+    { BezierExtensionInit, "BEZIER", &noBezierExtension, NULL, NULL },
 #endif
 #ifdef XTESTEXT1
     { XTestExtension1Init, "XTEST1", &noTestExtensions, NULL, NULL },
 #endif
 #ifdef MITSHM
-    { ShmExtensionInit, SHMNAME, NULL, NULL, NULL },
+    { ShmExtensionInit, SHMNAME, &noMITShmExtension, NULL, NULL },
 #endif
 #ifdef XINPUT
-    { XInputExtensionInit, "XInputExtension", NULL, NULL, NULL },
+    { XInputExtensionInit, "XInputExtension", &noXInputExtension, NULL, NULL },
 #endif
 #ifdef XTEST
     { XTestExtensionInit, XTestExtensionName, &noTestExtensions, NULL, NULL },
 #endif
 #ifdef XIDLE
-    { XIdleExtensionInit, "XIDLE", NULL, NULL, NULL },
+    { XIdleExtensionInit, "XIDLE", &noXIdleExtension, NULL, NULL },
 #endif
 #ifdef XKB
     { XkbExtensionInit, XkbName, &noXkbExtension, NULL, NULL },
 #endif
 #ifdef LBX
-    { LbxExtensionInit, LBXNAME, NULL, NULL, NULL },
+    { LbxExtensionInit, LBXNAME, &noLbxExtension, NULL, NULL },
 #endif
 #ifdef XAPPGROUP
-    { XagExtensionInit, XAGNAME, NULL, NULL, NULL },
+    { XagExtensionInit, XAGNAME, &noXagExtension, NULL, NULL },
 #endif
 #ifdef XCSECURITY
-    { SecurityExtensionInit, SECURITY_EXTENSION_NAME, NULL, NULL, NULL },
+    { SecurityExtensionInit, SECURITY_EXTENSION_NAME, &noSecurityExtension, NULL, NULL },
 #endif
 #ifdef XPRINT
     { XpExtensionInit, XP_PRINTNAME, NULL, NULL, NULL },
@@ -645,22 +786,22 @@ static ExtensionModule staticExtensions[] = {
 #endif
 #ifdef XFIXES
     /* must be before Render to layer DisplayCursor correctly */
-    { XFixesExtensionInit, "XFIXES", NULL, NULL, NULL },
+    { XFixesExtensionInit, "XFIXES", &noXFixesExtension, NULL, NULL },
 #endif
 #ifdef XF86BIGFONT
-    { XFree86BigfontExtensionInit, XF86BIGFONTNAME, NULL, NULL, NULL },
+    { XFree86BigfontExtensionInit, XF86BIGFONTNAME, &noXFree86BigfontExtension, NULL, NULL },
 #endif
 #ifdef RENDER
     { RenderExtensionInit, "RENDER", &noRenderExtension, NULL, NULL },
 #endif
 #ifdef RANDR
-    { RRExtensionInit, "RANDR", NULL, NULL, NULL },
+    { RRExtensionInit, "RANDR", &noRRExtension, NULL, NULL },
 #endif
 #ifdef COMPOSITE
     { CompositeExtensionInit, "COMPOSITE", &noCompositeExtension, NULL },
 #endif
 #ifdef DAMAGE
-    { DamageExtensionInit, "DAMAGE", NULL, NULL },
+    { DamageExtensionInit, "DAMAGE", &noDamageExtension, NULL },
 #endif
 #ifdef XEVIE
     { XevieExtensionInit, "XEVIE", &noXevieExtension, NULL },
diff --git a/miext/damage/damage.c b/miext/damage/damage.c
index 02be613e3..d92ab8581 100755
--- a/miext/damage/damage.c
+++ b/miext/damage/damage.c
@@ -1370,7 +1370,7 @@ damagePolyText8(DrawablePtr pDrawable,
     DAMAGE_GC_OP_PROLOGUE(pGC, pDrawable);
 
     if (checkGCDamage (pDrawable, pGC))
-	damageText (pDrawable, pGC, x, y, (unsigned long) count, chars,
+	x = damageText (pDrawable, pGC, x, y, (unsigned long) count, chars,
 		    Linear8Bit, TT_POLY8);
     else
 	x = (*pGC->ops->PolyText8)(pDrawable, pGC, x, y, count, chars);
@@ -1389,7 +1389,7 @@ damagePolyText16(DrawablePtr	pDrawable,
     DAMAGE_GC_OP_PROLOGUE(pGC, pDrawable);
 
     if (checkGCDamage (pDrawable, pGC))
-	damageText (pDrawable, pGC, x, y, (unsigned long) count, (char *) chars,
+	x = damageText (pDrawable, pGC, x, y, (unsigned long) count, (char *) chars,
 		    FONTLASTROW(pGC->font) == 0 ? Linear16Bit : TwoD16Bit,
 		    TT_POLY16);
     else
diff --git a/os/WaitFor.c b/os/WaitFor.c
index 3283dd5cf..4c4628552 100644
--- a/os/WaitFor.c
+++ b/os/WaitFor.c
@@ -663,17 +663,11 @@ SetDPMSTimers(void)
     if (!DPMSEnabled)
         return;
 
-    if (DPMSStandbyTime > 0) {
-        DPMSStandbyTimer = TimerSet(DPMSStandbyTimer, 0, DPMSStandbyTime,
-                                    DPMSStandbyTimerExpire, NULL);
-    }
-    if (DPMSSuspendTime > 0) {
-        DPMSSuspendTimer = TimerSet(DPMSSuspendTimer, 0, DPMSSuspendTime,
-                                    DPMSSuspendTimerExpire, NULL);
-    }
-    if (DPMSOffTime > 0) {
-        DPMSOffTimer = TimerSet(DPMSOffTimer, 0, DPMSOffTime,
-                                DPMSOffTimerExpire, NULL);
-    }
+    DPMSStandbyTimer = TimerSet(DPMSStandbyTimer, 0, DPMSStandbyTime,
+				DPMSStandbyTimerExpire, NULL);
+    DPMSSuspendTimer = TimerSet(DPMSSuspendTimer, 0, DPMSSuspendTime,
+				DPMSSuspendTimerExpire, NULL);
+    DPMSOffTimer = TimerSet(DPMSOffTimer, 0, DPMSOffTime,
+			    DPMSOffTimerExpire, NULL);
 }
 #endif
diff --git a/os/utils.c b/os/utils.c
index 8d1dd5ab6..6c5964201 100644
--- a/os/utils.c
+++ b/os/utils.c
@@ -1,4 +1,4 @@
-/* $XdotOrg: xc/programs/Xserver/os/utils.c,v 1.6 2004/08/11 22:27:50 kem Exp $ */
+/* $XdotOrg: xc/programs/Xserver/os/utils.c,v 1.6.4.1 2004/09/16 23:37:23 deronj Exp $ */
 /* $Xorg: utils.c,v 1.5 2001/02/09 02:05:24 xorgcvs Exp $ */
 /*
 
@@ -119,8 +119,126 @@ OR PERFORMANCE OF THIS SOFTWARE.
 
 #ifdef RENDER
 #include "picture.h"
+#endif
+
+Bool noTestExtensions;
+#ifdef BEZIER
+Bool noBezierExtension = FALSE;
+#endif
+#ifdef BIGREQS
+Bool noBigReqExtension = FALSE;
+#endif
+#ifdef COMPOSITE
+/* COMPOSITE is disabled by default for now until the
+ * interface is stable */
+Bool noCompositeExtension = TRUE;
+#endif
+#ifdef DAMAGE
+Bool noDamageExtension = FALSE;
+#endif
+#ifdef DBE
+Bool noDbeExtension = FALSE;
+#endif
+#ifdef DPSEXT
+Bool noDPSExtension = FALSE;
+#endif
+#ifdef DPMSExtension
+Bool noDPMSExtension = FALSE;
+#endif
+#ifdef EVI
+Bool noEVIExtension = FALSE;
+#endif
+#ifdef FONTCACHE
+Bool noFontCacheExtension = FALSE;
+#endif
+#ifdef GLXEXT
+Bool noGlxExtension = FALSE;
+#endif
+#ifdef LBX
+Bool noLbxExtension = FALSE;
+#endif
+#ifdef SCREENSAVER
+Bool noScreenSaverExtension = FALSE;
+#endif
+#ifdef MITSHM
+Bool noMITShmExtension = FALSE;
+#endif
+#ifdef MITMISC
+Bool noMITMiscExtension = FALSE;
+#endif
+#ifdef MULTIBUFFER
+Bool noMultibufferExtension = FALSE;
+#endif
+#ifdef RANDR
+Bool noRRExtension = FALSE;
+#endif
+#ifdef RENDER
 Bool noRenderExtension = FALSE;
 #endif
+#ifdef SHAPE
+Bool noShapeExtension = FALSE;
+#endif
+#ifdef XCSECURITY
+Bool noSecurityExtension = FALSE;
+#endif
+#ifdef XSYNC
+Bool noSyncExtension = FALSE;
+#endif
+#ifdef TOGCUP
+Bool noXcupExtension = FALSE;
+#endif
+#ifdef PEXEXT
+Bool noPexExtension = FALSE;
+#endif
+#ifdef RES
+Bool noResExtension = FALSE;
+#endif
+#ifdef XAPPGROUP
+Bool noXagExtension = FALSE;
+#endif
+#ifdef XCMISC
+Bool noXCMiscExtension = FALSE;
+#endif
+#ifdef XEVIE
+/* Xevie is disabled by default for now until the
+ * interface is stable */
+Bool noXevieExtension = TRUE;
+#endif
+#ifdef XIE
+Bool noXie = FALSE;
+#endif
+#ifdef XF86BIGFONT
+Bool noXFree86BigfontExtension = FALSE;
+#endif
+#ifdef XFreeXDGA
+Bool noXFree86DGAExtension = FALSE;
+#endif
+#ifdef XF86DRI
+Bool noXFree86DRIExtension = FALSE;
+#endif
+#ifdef XF86MISC
+Bool noXFree86MiscExtension = FALSE;
+#endif
+#ifdef XF86VIDMODE
+Bool noXFree86VidModeExtension = FALSE;
+#endif
+#ifdef XFIXES
+Bool noXFixesExtension = FALSE;
+#endif
+/* |noXkbExtension| is defined in xc/programs/Xserver/xkb/xkbInit.c */
+#ifdef PANORAMIX
+/* Xinerama is disabled by default unless enabled via +xinerama */
+Bool noPanoramiXExtension = TRUE;
+#endif
+#ifdef XINPUT
+Bool noXInputExtension = FALSE;
+#endif
+#ifdef XIDLE
+Bool noXIdleExtension = FALSE;
+#endif
+#ifdef XV
+Bool noXvExtension = FALSE;
+#endif
 
 #define X_INCLUDE_NETDB_H
 #include <X11/Xos_r.h>
@@ -128,24 +246,14 @@ Bool noRenderExtension = FALSE;
 #include <errno.h>
 
 Bool CoreDump;
-Bool noTestExtensions;
 
 #ifdef PANORAMIX
-Bool noPanoramiXExtension = TRUE;
 Bool PanoramiXVisibilityNotifySent = FALSE;
 Bool PanoramiXMapped = FALSE;
 Bool PanoramiXWindowExposureSent = FALSE;
 Bool PanoramiXOneExposeRequest = FALSE;
 #endif
 
-#ifdef XEVIE
-Bool noXevieExtension = TRUE;
-#endif
-
-#ifdef COMPOSITE
-Bool noCompositeExtension = TRUE;
-#endif
-
 #ifdef LG3D
 Bool noLgeExtension = TRUE;
 #endif 
@@ -557,7 +665,7 @@ void UseMsg(void)
     ErrorF("-v                     screen-saver without video blanking\n");
     ErrorF("-wm                    WhenMapped default backing-store\n");
     ErrorF("-x string              loads named extension at init time \n");
-    ErrorF("-maxbigreqsize	   set maximal bigrequest size \n");
+    ErrorF("-maxbigreqsize         set maximal bigrequest size \n");
 #ifdef PANORAMIX
     ErrorF("+xinerama              Enable XINERAMA extension\n");
     ErrorF("-xinerama              Disable XINERAMA extension\n");
@@ -904,11 +1012,11 @@ ProcessCommandLine(int argc, char *argv[])
 	    defaultBackingStore = WhenMapped;
         else if ( strcmp( argv[i], "-maxbigreqsize") == 0) {
              if(++i < argc) {
-                 int reqSizeArg = atoi(argv[i]);
+                 long reqSizeArg = atol(argv[i]);
 
                  /* Request size > 128MB does not make much sense... */
-                 if( reqSizeArg > 0 && reqSizeArg < 128 ) {
-                     maxBigRequestSize = (reqSizeArg * 1048576) - 1;
+                 if( reqSizeArg > 0L && reqSizeArg < 128L ) {
+                     maxBigRequestSize = (reqSizeArg * 1048576L) - 1L;
                  }
                  else
                  {