svn merge -r541:HEAD "^/branches/released" .

34 files changed, 3321 insertions, 3490 deletions

diff --git a/xorg-server/hw/dmx/dmx.h b/xorg-server/hw/dmx/dmx.h
index 6ebd00efd..fbb8b96ed 100644
--- a/xorg-server/hw/dmx/dmx.h
+++ b/xorg-server/hw/dmx/dmx.h
@@ -62,9 +62,7 @@
 #include "globals.h"
 #include "scrnintstr.h"
 
-#ifdef RENDER
 #include "picturestr.h"
-#endif
 
 #ifdef GLXEXT
 #include <GL/glx.h>
@@ -233,7 +231,6 @@ typedef struct _DMXScreenInfo {
 
     SetShapeProcPtr                SetShape;
 
-#ifdef RENDER
     CreatePictureProcPtr           CreatePicture;
     DestroyPictureProcPtr          DestroyPicture;
     ChangePictureClipProcPtr       ChangePictureClip;
@@ -254,7 +251,6 @@ typedef struct _DMXScreenInfo {
     TrianglesProcPtr               Triangles;
     TriStripProcPtr                TriStrip;
     TriFanProcPtr                  TriFan;
-#endif
 } DMXScreenInfo;
 
 /* Global variables available to all Xserver/hw/dmx routines. */
diff --git a/xorg-server/hw/dmx/dmxclient.h b/xorg-server/hw/dmx/dmxclient.h
index 147d14ed8..c45f71fc0 100644
--- a/xorg-server/hw/dmx/dmxclient.h
+++ b/xorg-server/hw/dmx/dmxclient.h
@@ -86,10 +86,8 @@ typedef XID           KeySym64;
 
 #include <X11/extensions/shape.h>
 
-#ifdef RENDER
 #include <X11/extensions/Xrender.h>
 #undef PictFormatType
-#endif
 
 #include <X11/extensions/XKB.h>
 #include "xkbstr.h"
diff --git a/xorg-server/hw/dmx/dmxextension.c b/xorg-server/hw/dmx/dmxextension.c
index 22660419c..4e555330e 100644
--- a/xorg-server/hw/dmx/dmxextension.c
+++ b/xorg-server/hw/dmx/dmxextension.c
@@ -53,9 +53,7 @@
 #include "dmxgc.h"
 #include "dmxfont.h"
 #include "dmxcmap.h"
-#ifdef RENDER
 #include "dmxpict.h"
-#endif
 #include "dmxinput.h"
 #include "dmxsync.h"
 #include "dmxscrinit.h"
@@ -896,14 +894,12 @@ static void dmxBECreateResources(pointer value, XID id, RESTYPE type,
 	if (pCmap->pScreen->myNum == scrnNum)
 	    (void)dmxBECreateColormap((ColormapPtr)value);
 #if 0
-#ifdef RENDER
     /* TODO: Recreate Picture and GlyphSet resources */
     } else if ((type & TypeMask) == (PictureType & TypeMask)) {
 	/* Picture resources are created when windows are created */
     } else if ((type & TypeMask) == (GlyphSetType & TypeMask)) {
 	dmxBEFreeGlyphSet(pScreen, (GlyphSetPtr)value);
 #endif
-#endif
     } else {
 	/* Other resource types??? */
     }
@@ -1057,7 +1053,6 @@ static Bool dmxCompareScreens(DMXScreenInfo *new, DMXScreenInfo *old)
     return TRUE;
 }
 
-#ifdef RENDER
 /** Restore Render's picture */
 static void dmxBERestoreRenderPict(pointer value, XID id, pointer n)
 {
@@ -1164,7 +1159,6 @@ static void dmxBERestoreRenderGlyph(pointer value, XID id, pointer n)
     free(gids);
     free(glyphs);    
 }
-#endif
 
 /** Reattach previously detached back-end screen. */
 int dmxAttachScreen(int idx, DMXScreenAttributesPtr attr)
@@ -1284,7 +1278,6 @@ int dmxAttachScreen(int idx, DMXScreenAttributesPtr attr)
     /* Create window hierarchy (top down) */
     dmxBECreateWindowTree(idx);
 
-#ifdef RENDER
     /* Restore the picture state for RENDER */
     for (i = currentMaxClients; --i >= 0; )
 	if (clients[i])
@@ -1296,7 +1289,6 @@ int dmxAttachScreen(int idx, DMXScreenAttributesPtr attr)
 	if (clients[i])
 	    FindClientResourcesByType(clients[i],GlyphSetType, 
 				      dmxBERestoreRenderGlyph,(pointer)idx);
-#endif
 
     /* Refresh screen by generating exposure events for all windows */
     dmxForceExposures(idx);
@@ -1482,7 +1474,6 @@ static void dmxBEDestroyResources(pointer value, XID id, RESTYPE type,
 	ColormapPtr  pCmap = value;
 	if (pCmap->pScreen->myNum == scrnNum)
 	    dmxBEFreeColormap((ColormapPtr)value);
-#ifdef RENDER
     } else if ((type & TypeMask) == (PictureType & TypeMask)) {
 	PicturePtr  pPict = value;
 	if (pPict->pDrawable->pScreen->myNum == scrnNum) {
@@ -1496,7 +1487,6 @@ static void dmxBEDestroyResources(pointer value, XID id, RESTYPE type,
 	}
     } else if ((type & TypeMask) == (GlyphSetType & TypeMask)) {
 	dmxBEFreeGlyphSet(pScreen, (GlyphSetPtr)value);
-#endif
     } else {
 	/* Other resource types??? */
     }
diff --git a/xorg-server/hw/dmx/dmxinit.c b/xorg-server/hw/dmx/dmxinit.c
index 739c4ca7f..617ec5e49 100644
--- a/xorg-server/hw/dmx/dmxinit.c
+++ b/xorg-server/hw/dmx/dmxinit.c
@@ -53,9 +53,7 @@
 #include "dmxcb.h"

 #include "dmxprop.h"

 #include "dmxstat.h"

-#ifdef RENDER

 #include "dmxpict.h"

-#endif

 

 #include <X11/Xos.h>                /* For gettimeofday */

 #include "dixstruct.h"

@@ -795,11 +793,9 @@ void InitOutput(ScreenInfo *pScreenInfo, int argc, char *argv[])
      */

     dmxInitFonts();

 

-#ifdef RENDER

     /* Initialize the render extension */

     if (!noRenderExtension)

 	dmxInitRender();

-#endif

 

     /* Initialized things that need timer hooks */

     dmxStatInit();

diff --git a/xorg-server/hw/dmx/dmxscrinit.c b/xorg-server/hw/dmx/dmxscrinit.c
index 09734f56d..c1beb9ba5 100644
--- a/xorg-server/hw/dmx/dmxscrinit.c
+++ b/xorg-server/hw/dmx/dmxscrinit.c
@@ -53,9 +53,7 @@
 #include "dmxprop.h"
 #include "dmxdpms.h"
 
-#ifdef RENDER
 #include "dmxpict.h"
-#endif
 
 #include "fb.h"
 #include "mipointer.h"
@@ -78,12 +76,10 @@ static int dmxScreenPrivateKeyIndex;
 DevPrivateKey dmxScreenPrivateKey = &dmxScreenPrivateKeyIndex; /**< Private index for Screens   */
 static int dmxColormapPrivateKeyIndex;
 DevPrivateKey dmxColormapPrivateKey = &dmxColormapPrivateKeyIndex; /**< Private index for Colormaps */
-#ifdef RENDER
 static int dmxPictPrivateKeyIndex;
 DevPrivateKey dmxPictPrivateKey = &dmxPictPrivateKeyIndex; /**< Private index for Picts     */
 static int dmxGlyphSetPrivateKeyIndex;
 DevPrivateKey dmxGlyphSetPrivateKey = &dmxGlyphSetPrivateKeyIndex; /**< Private index for GlyphSets */
-#endif
 
 /** Initialize the parts of screen \a idx that require access to the
  *  back-end server. */
@@ -278,9 +274,7 @@ Bool dmxScreenInit(int idx, ScreenPtr pScreen, int argc, char *argv[])
 		 dmxScreen->beXDPI,
 		 dmxScreen->scrnWidth,
 		 dmxScreen->beBPP);
-#ifdef RENDER
     (void)dmxPictureInit(pScreen, 0, 0);
-#endif
 
     /* Not yet... */
     pScreen->GetWindowPixmap = NULL;
@@ -435,9 +429,7 @@ Bool dmxCloseScreen(int idx, ScreenPtr pScreen)
 
     /* Reset the proc vectors */
     if (idx == 0) {
-#ifdef RENDER
 	dmxResetRender();
-#endif
 	dmxResetFonts();
     }
 
diff --git a/xorg-server/hw/dmx/dmxwindow.c b/xorg-server/hw/dmx/dmxwindow.c
index f9e46db1e..ea2f2c579 100644
--- a/xorg-server/hw/dmx/dmxwindow.c
+++ b/xorg-server/hw/dmx/dmxwindow.c
@@ -46,9 +46,7 @@
 #include "dmxvisual.h"
 #include "dmxinput.h"
 #include "dmxextension.h"
-#ifdef RENDER
 #include "dmxpict.h"
-#endif
 
 #include "windowstr.h"
 
@@ -288,9 +286,7 @@ void dmxCreateAndRealizeWindow(WindowPtr pWindow, Bool doSync)
     pWinPriv->window = dmxCreateNonRootWindow(pWindow);
     if (pWinPriv->restacked) dmxDoRestackWindow(pWindow);
     if (pWinPriv->isShaped) dmxDoSetShape(pWindow);
-#ifdef RENDER
     if (pWinPriv->hasPict) dmxCreatePictureList(pWindow);
-#endif
     if (pWinPriv->mapped) XMapWindow(dmxScreen->beDisplay,
 				      pWinPriv->window);
     if (doSync) dmxSync(dmxScreen, False);
@@ -320,9 +316,7 @@ Bool dmxCreateWindow(WindowPtr pWindow)
     pWinPriv->restacked  = FALSE;
     pWinPriv->attribMask = 0;
     pWinPriv->isShaped   = FALSE;
-#ifdef RENDER
     pWinPriv->hasPict    = FALSE;
-#endif
 #ifdef GLXEXT
     pWinPriv->swapGroup  = NULL;
     pWinPriv->barrier    = 0;
@@ -405,10 +399,8 @@ Bool dmxDestroyWindow(WindowPtr pWindow)
 
     DMX_UNWRAP(DestroyWindow, dmxScreen, pScreen);
 
-#ifdef RENDER
     /* Destroy any picture list associated with this window */
     needSync |= dmxDestroyPictureList(pWindow);
-#endif
 
     /* Destroy window on back-end server */
     needSync |= dmxBEDestroyWindow(pWindow);
diff --git a/xorg-server/hw/dmx/dmxwindow.h b/xorg-server/hw/dmx/dmxwindow.h
index 353d0a3ba..740a21f0b 100644
--- a/xorg-server/hw/dmx/dmxwindow.h
+++ b/xorg-server/hw/dmx/dmxwindow.h
@@ -49,9 +49,7 @@ typedef struct _dmxWinPriv {
     Colormap       cmap;
     Visual        *visual;
     Bool           isShaped;
-#ifdef RENDER
     Bool           hasPict;
-#endif
 #ifdef GLXEXT
     void          *swapGroup;
     int            barrier;
diff --git a/xorg-server/hw/kdrive/src/kdrive.c b/xorg-server/hw/kdrive/src/kdrive.c
index 84e456be7..a8eb3996b 100644
--- a/xorg-server/hw/kdrive/src/kdrive.c
+++ b/xorg-server/hw/kdrive/src/kdrive.c
@@ -1005,10 +1005,8 @@ KdScreenInit(int index, ScreenPtr pScreen, int argc, char **argv)
     pScreen->BlockHandler	= KdBlockHandler;

     pScreen->WakeupHandler	= KdWakeupHandler;

 

-#ifdef RENDER

     if (!fbPictureInit (pScreen, 0, 0))

 	return FALSE;

-#endif

     if (card->cfuncs->initScreen)

 	if (!(*card->cfuncs->initScreen) (pScreen))

 	    return FALSE;

@@ -1274,9 +1272,7 @@ void
 OsVendorFatalError(void)

 {

 }

-#endif

 

-#ifndef _MSC_VER

 int

 DPMSSet(ClientPtr client, int level)

 {

diff --git a/xorg-server/hw/vfb/InitOutput.c b/xorg-server/hw/vfb/InitOutput.c
index e7dd1d95f..60915fdbf 100644
--- a/xorg-server/hw/vfb/InitOutput.c
+++ b/xorg-server/hw/vfb/InitOutput.c
@@ -248,10 +248,8 @@ ddxUseMsg(void)
 {
     ErrorF("-screen scrn WxHxD     set screen's width, height, depth\n");
     ErrorF("-pixdepths list-of-int support given pixmap depths\n");
-#ifdef RENDER
-    ErrorF("+/-render		   turn on/of RENDER extension support"
+    ErrorF("+/-render		   turn on/off RENDER extension support"
 	   "(default on)\n");
-#endif
     ErrorF("-linebias n            adjust thin line pixelization\n");
     ErrorF("-blackpixel n          pixel value for black\n");
     ErrorF("-whitepixel n          pixel value for white\n");
@@ -904,10 +902,8 @@ vfbScreenInit(int index, ScreenPtr pScreen, int argc, char **argv)
 
     ret = fbScreenInit(pScreen, pbits, pvfb->width, pvfb->height,
 		       dpix, dpiy, pvfb->paddedWidth,pvfb->bitsPerPixel);
-#ifdef RENDER
     if (ret && Render) 
 	fbPictureInit (pScreen, 0, 0);
-#endif
 
     if (!ret) return FALSE;
 
diff --git a/xorg-server/hw/xfree86/common/xf86Config.c b/xorg-server/hw/xfree86/common/xf86Config.c
index 1e9543fa2..9a2837e7b 100644
--- a/xorg-server/hw/xfree86/common/xf86Config.c
+++ b/xorg-server/hw/xfree86/common/xf86Config.c
@@ -67,9 +67,7 @@ extern DeviceAssocRec mouse_assoc;
 
 #include "xkbsrv.h"
 
-#ifdef RENDER
 #include "picture.h"
-#endif
 
 /*
  * These paths define the way the config file search is done.  The escape
@@ -925,7 +923,6 @@ configServerFlags(XF86ConfFlagsPtr flagsconf, XF86OptionPtr layoutopts)
         }
     }
     
-#ifdef RENDER
     {
 	if ((s = xf86GetOptValString(FlagOptions, FLAG_RENDER_COLORMAP_MODE))){
 	    int policy = PictureParseCmapPolicy (s);
@@ -938,7 +935,6 @@ configServerFlags(XF86ConfFlagsPtr flagsconf, XF86OptionPtr layoutopts)
 	    }
 	}
     }
-#endif
 
 #ifdef RANDR
     xf86Info.disableRandR = FALSE;
diff --git a/xorg-server/hw/xfree86/common/xf86Init.c b/xorg-server/hw/xfree86/common/xf86Init.c
index 71ac9a9fe..03a29ea0f 100644
--- a/xorg-server/hw/xfree86/common/xf86Init.c
+++ b/xorg-server/hw/xfree86/common/xf86Init.c
@@ -74,9 +74,7 @@
 #include "xf86DDC.h"
 #include "xf86Xinput.h"
 #include "xf86InPriv.h"
-#ifdef RENDER
 #include "picturestr.h"
-#endif
 
 #include "xf86VGAarbiter.h"
 #include "globals.h"
@@ -110,15 +108,9 @@ static PixmapFormatRec formats[MAXFORMATS] = {
 	{ 15,	16,	BITMAP_SCANLINE_PAD },
 	{ 16,	16,	BITMAP_SCANLINE_PAD },
 	{ 24,	32,	BITMAP_SCANLINE_PAD },
-#ifdef RENDER
 	{ 32,	32,	BITMAP_SCANLINE_PAD },
-#endif
 };
-#ifdef RENDER
 static int numFormats = 7;
-#else
-static int numFormats = 6;
-#endif
 static Bool formatsDone = FALSE;
 
 #ifndef OSNAME
@@ -1082,7 +1074,6 @@ InitOutput(ScreenInfo *pScreenInfo, int argc, char **argv)
 		    xf86Screens[i]->pScreen->CreateWindow);
       xf86Screens[i]->pScreen->CreateWindow = xf86CreateRootWindow;
 
-#ifdef RENDER
     if (PictureGetSubpixelOrder (xf86Screens[i]->pScreen) == SubPixelUnknown)
     {
 	xf86MonPtr DDC = (xf86MonPtr)(xf86Screens[i]->monitor->DDC);
@@ -1092,7 +1083,6 @@ InitOutput(ScreenInfo *pScreenInfo, int argc, char **argv)
 				  SubPixelHorizontalRGB : SubPixelNone) :
 				 SubPixelUnknown);
     }
-#endif
 #ifdef RANDR
     if (!xf86Info.disableRandR)
 	xf86RandRInit (screenInfo.screens[scr_index]);
diff --git a/xorg-server/hw/xfree86/common/xf86VGAarbiter.c b/xorg-server/hw/xfree86/common/xf86VGAarbiter.c
index a3eccdfff..52a8b9a60 100644
--- a/xorg-server/hw/xfree86/common/xf86VGAarbiter.c
+++ b/xorg-server/hw/xfree86/common/xf86VGAarbiter.c
@@ -1,1113 +1,1101 @@
-/*

- * This code was stolen from RAC and adapted to control the legacy vga

- * interface.

- *

- *

- * Copyright (c) 2007 Paulo R. Zanoni, Tiago Vignatti

- *

- * Permission is hereby granted, free of charge, to any person

- * obtaining a copy of this software and associated documentation

- * files (the "Software"), to deal in the Software without

- * restriction, including without limitation the rights to use,

- * copy, modify, merge, publish, distribute, sublicense, and/or sell

- * copies of the Software, and to permit persons to whom the

- * Software is furnished to do so, subject to the following

- * conditions:

- *

- * The above copyright notice and this permission notice shall be

- * included in all copies or substantial portions of the Software.

- *

- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES

- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT

- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,

- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING

- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR

- * OTHER DEALINGS IN THE SOFTWARE.

- *

- */

-

-#include "xorg-config.h"

-

-#include "xf86VGAarbiter.h"

-

-#ifdef HAVE_PCI_DEVICE_VGAARB_INIT

-#include "xf86VGAarbiterPriv.h"

-#include "xf86Bus.h"

-#include "xf86Priv.h"

-#include "pciaccess.h"

-

-

-static GCFuncs VGAarbiterGCFuncs = {

-    VGAarbiterValidateGC, VGAarbiterChangeGC, VGAarbiterCopyGC,

-    VGAarbiterDestroyGC, VGAarbiterChangeClip, VGAarbiterDestroyClip,

-    VGAarbiterCopyClip

-};

-

-static GCOps VGAarbiterGCOps = {

-    VGAarbiterFillSpans, VGAarbiterSetSpans, VGAarbiterPutImage,

-    VGAarbiterCopyArea, VGAarbiterCopyPlane, VGAarbiterPolyPoint,

-    VGAarbiterPolylines, VGAarbiterPolySegment, VGAarbiterPolyRectangle,

-    VGAarbiterPolyArc, VGAarbiterFillPolygon, VGAarbiterPolyFillRect,

-    VGAarbiterPolyFillArc, VGAarbiterPolyText8, VGAarbiterPolyText16,

-    VGAarbiterImageText8, VGAarbiterImageText16, VGAarbiterImageGlyphBlt,

-    VGAarbiterPolyGlyphBlt, VGAarbiterPushPixels,

-    {NULL}      /* devPrivate */

-};

-

-static miPointerSpriteFuncRec VGAarbiterSpriteFuncs = {

-    VGAarbiterSpriteRealizeCursor, VGAarbiterSpriteUnrealizeCursor,

-    VGAarbiterSpriteSetCursor, VGAarbiterSpriteMoveCursor,

-    VGAarbiterDeviceCursorInitialize, VGAarbiterDeviceCursorCleanup

-};

-

-static int VGAarbiterKeyIndex;

-static DevPrivateKey VGAarbiterScreenKey = &VGAarbiterKeyIndex;

-static int VGAarbiterGCIndex;

-static DevPrivateKey VGAarbiterGCKey = &VGAarbiterGCIndex;

-

-static int vga_no_arb = 0;

-void

-xf86VGAarbiterInit(void)

-{

-    if (pci_device_vgaarb_init() != 0) {

-	vga_no_arb = 1;

-        xf86Msg(X_WARNING, "VGA arbiter: cannot open kernel arbiter, no multi-card support\n");

-    }

-}

-

-void

-xf86VGAarbiterFini(void)

-{

-    if (vga_no_arb)

-	return;

-    pci_device_vgaarb_fini();

-}

-

-void

-xf86VGAarbiterLock(ScrnInfoPtr pScrn)

-{

-    if (vga_no_arb)

-	return;

-    pci_device_vgaarb_set_target(pScrn->vgaDev);

-    pci_device_vgaarb_lock();

-}

-

-void

-xf86VGAarbiterUnlock(ScrnInfoPtr pScrn)

-{

-    if (vga_no_arb)

-	return;

-    pci_device_vgaarb_unlock();

-}

-

-Bool xf86VGAarbiterAllowDRI(ScreenPtr pScreen)

-{

-    int vga_count;

-    int rsrc_decodes;

-    ScrnInfoPtr         pScrn = xf86Screens[pScreen->myNum];

-

-    if (vga_no_arb)

-	return TRUE;

-

-    pci_device_vgaarb_get_info(pScrn->vgaDev, &vga_count, &rsrc_decodes);

-    if (vga_count > 1) {

-        if (rsrc_decodes) {

-            return FALSE;

-        }

-    }

-    return TRUE;

-}

-

-void

-xf86VGAarbiterScrnInit(ScrnInfoPtr pScrn)

-{

-    struct pci_device *dev;

-    EntityPtr pEnt;

-

-    if (vga_no_arb)

-	return;

-

-    pEnt = xf86Entities[pScrn->entityList[0]];

-    if (pEnt->bus.type != BUS_PCI)

-	return;

-

-    dev = pEnt->bus.id.pci;

-    pScrn->vgaDev = dev;

-}

-

-void

-xf86VGAarbiterDeviceDecodes(ScrnInfoPtr pScrn)

-{

-    if (vga_no_arb)

-	return;

-    pci_device_vgaarb_decodes(VGA_ARB_RSRC_LEGACY_MEM | VGA_ARB_RSRC_LEGACY_IO);

-}

-

-Bool

-xf86VGAarbiterWrapFunctions(void)

-{

-    ScrnInfoPtr pScrn;

-    VGAarbiterScreenPtr pScreenPriv;

-    miPointerScreenPtr PointPriv;

-#ifdef RENDER

-    PictureScreenPtr    ps;

-#endif

-    ScreenPtr pScreen;

-    int vga_count, i;

-

-    if (vga_no_arb)

-        return FALSE;

-

-    /*

-     * we need to wrap the arbiter if we have more than

-     * one VGA card - hotplug cries.

-     */

-    pci_device_vgaarb_get_info(NULL, &vga_count, NULL);

-    if (vga_count < 2 || !xf86Screens)

-        return FALSE;

-

-    xf86Msg(X_INFO,"Found %d VGA devices: arbiter wrapping enabled\n",

-            vga_count);

-

-    for (i = 0; i < xf86NumScreens; i++) {

-        pScreen = xf86Screens[i]->pScreen;

-#ifdef RENDER

-        ps = GetPictureScreenIfSet(pScreen);

-#endif

-        pScrn = xf86Screens[pScreen->myNum];

-        PointPriv = dixLookupPrivate(&pScreen->devPrivates, miPointerScreenKey);

-

-        if (!dixRequestPrivate(VGAarbiterGCKey, sizeof(VGAarbiterGCRec)))

-            return FALSE;

-

-        if (!(pScreenPriv = xalloc(sizeof(VGAarbiterScreenRec))))

-            return FALSE;

-

-        dixSetPrivate(&pScreen->devPrivates, VGAarbiterScreenKey, pScreenPriv);

-

-        WRAP_SCREEN(CloseScreen, VGAarbiterCloseScreen);

-        WRAP_SCREEN(SaveScreen, VGAarbiterSaveScreen);

-        WRAP_SCREEN(WakeupHandler, VGAarbiterWakeupHandler);

-        WRAP_SCREEN(BlockHandler, VGAarbiterBlockHandler);

-        WRAP_SCREEN(CreateGC, VGAarbiterCreateGC);

-        WRAP_SCREEN(GetImage, VGAarbiterGetImage);

-        WRAP_SCREEN(GetSpans, VGAarbiterGetSpans);

-        WRAP_SCREEN(SourceValidate, VGAarbiterSourceValidate);

-        WRAP_SCREEN(CopyWindow, VGAarbiterCopyWindow);

-        WRAP_SCREEN(ClearToBackground, VGAarbiterClearToBackground);

-        WRAP_SCREEN(CreatePixmap, VGAarbiterCreatePixmap);

-        WRAP_SCREEN(StoreColors, VGAarbiterStoreColors);

-        WRAP_SCREEN(DisplayCursor, VGAarbiterDisplayCursor);

-        WRAP_SCREEN(RealizeCursor, VGAarbiterRealizeCursor);

-        WRAP_SCREEN(UnrealizeCursor, VGAarbiterUnrealizeCursor);

-        WRAP_SCREEN(RecolorCursor, VGAarbiterRecolorCursor);

-        WRAP_SCREEN(SetCursorPosition, VGAarbiterSetCursorPosition);

-#ifdef RENDER

-        WRAP_PICT(Composite,VGAarbiterComposite);

-        WRAP_PICT(Glyphs,VGAarbiterGlyphs);

-        WRAP_PICT(CompositeRects,VGAarbiterCompositeRects);

-#endif

-        WRAP_SCREEN_INFO(AdjustFrame, VGAarbiterAdjustFrame);

-        WRAP_SCREEN_INFO(SwitchMode, VGAarbiterSwitchMode);

-        WRAP_SCREEN_INFO(EnterVT, VGAarbiterEnterVT);

-        WRAP_SCREEN_INFO(LeaveVT, VGAarbiterLeaveVT);

-        WRAP_SCREEN_INFO(FreeScreen, VGAarbiterFreeScreen);

-        WRAP_SPRITE;

-    }

-

-    return TRUE;

-}

-

-/* Screen funcs */

-static Bool

-VGAarbiterCloseScreen (int i, ScreenPtr pScreen)

-{

-    Bool val;

-    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];

-    VGAarbiterScreenPtr pScreenPriv = (VGAarbiterScreenPtr)dixLookupPrivate(

-        &pScreen->devPrivates, VGAarbiterScreenKey);

-    miPointerScreenPtr PointPriv = (miPointerScreenPtr)dixLookupPrivate(

-        &pScreen->devPrivates, miPointerScreenKey);

-#ifdef RENDER

-    PictureScreenPtr    ps = GetPictureScreenIfSet(pScreen);

-#endif

-

-    UNWRAP_SCREEN(CreateGC);

-    UNWRAP_SCREEN(CloseScreen);

-    UNWRAP_SCREEN(GetImage);

-    UNWRAP_SCREEN(GetSpans);

-    UNWRAP_SCREEN(SourceValidate);

-    UNWRAP_SCREEN(CopyWindow);

-    UNWRAP_SCREEN(ClearToBackground);

-    UNWRAP_SCREEN(SaveScreen);

-    UNWRAP_SCREEN(StoreColors);

-    UNWRAP_SCREEN(DisplayCursor);

-    UNWRAP_SCREEN(RealizeCursor);

-    UNWRAP_SCREEN(UnrealizeCursor);

-    UNWRAP_SCREEN(RecolorCursor);

-    UNWRAP_SCREEN(SetCursorPosition);

-#ifdef RENDER

-    UNWRAP_PICT(Composite);

-    UNWRAP_PICT(Glyphs);

-    UNWRAP_PICT(CompositeRects);

-#endif

-    UNWRAP_SCREEN_INFO(AdjustFrame);

-    UNWRAP_SCREEN_INFO(SwitchMode);

-    UNWRAP_SCREEN_INFO(EnterVT);

-    UNWRAP_SCREEN_INFO(LeaveVT);

-    UNWRAP_SCREEN_INFO(FreeScreen);

-    UNWRAP_SPRITE;

-

-    xfree ((pointer) pScreenPriv);

-    xf86VGAarbiterLock(xf86Screens[i]);

-    val = (*pScreen->CloseScreen) (i, pScreen);

-    xf86VGAarbiterUnlock(xf86Screens[i]);

-    return val;

-}

-

-static void

-VGAarbiterBlockHandler(int i,

-                       pointer blockData, pointer pTimeout, pointer pReadmask)

-{

-    ScreenPtr pScreen = screenInfo.screens[i];

-    SCREEN_PROLOG(BlockHandler);

-    VGAGet();

-    pScreen->BlockHandler(i, blockData, pTimeout, pReadmask);

-    VGAPut();

-    SCREEN_EPILOG(BlockHandler, VGAarbiterBlockHandler);

-}

-

-static void

-VGAarbiterWakeupHandler(int i, pointer blockData, unsigned long result, pointer pReadmask)

-{

-    ScreenPtr pScreen = screenInfo.screens[i];

-    SCREEN_PROLOG(WakeupHandler);

-    VGAGet();

-    pScreen->WakeupHandler(i, blockData, result, pReadmask);

-    VGAPut();

-    SCREEN_EPILOG(WakeupHandler, VGAarbiterWakeupHandler);

-}

-

-static void

-VGAarbiterGetImage (

-    DrawablePtr pDrawable,

-    int sx, int sy, int w, int h,

-    unsigned int    format,

-    unsigned long   planemask,

-    char        *pdstLine

-    )

-{

-    ScreenPtr pScreen = pDrawable->pScreen;

-    SCREEN_PROLOG(GetImage);

-//    if (xf86Screens[pScreen->myNum]->vtSema) {

-    VGAGet();

-//    }

-    (*pScreen->GetImage) (pDrawable, sx, sy, w, h,

-              format, planemask, pdstLine);

-    VGAPut();

-    SCREEN_EPILOG (GetImage, VGAarbiterGetImage);

-}

-

-static void

-VGAarbiterGetSpans (

-    DrawablePtr pDrawable,

-    int     wMax,

-    DDXPointPtr ppt,

-    int     *pwidth,

-    int     nspans,

-    char    *pdstStart

-    )

-{

-    ScreenPtr       pScreen = pDrawable->pScreen;

-

-    SCREEN_PROLOG (GetSpans);

-    VGAGet();

-    (*pScreen->GetSpans) (pDrawable, wMax, ppt, pwidth, nspans, pdstStart);

-    VGAPut();

-    SCREEN_EPILOG (GetSpans, VGAarbiterGetSpans);

-}

-

-static void

-VGAarbiterSourceValidate (

-    DrawablePtr pDrawable,

-    int x, int y, int width, int height )

-{

-    ScreenPtr   pScreen = pDrawable->pScreen;

-    SCREEN_PROLOG (SourceValidate);

-    VGAGet();

-    if (pScreen->SourceValidate)

-    (*pScreen->SourceValidate) (pDrawable, x, y, width, height);

-    VGAPut();

-    SCREEN_EPILOG (SourceValidate, VGAarbiterSourceValidate);

-}

-

-static void

-VGAarbiterCopyWindow(

-    WindowPtr pWin,

-    DDXPointRec ptOldOrg,

-    RegionPtr prgnSrc )

-{

-    ScreenPtr pScreen = pWin->drawable.pScreen;

-

-    SCREEN_PROLOG (CopyWindow);

-    VGAGet();

-    (*pScreen->CopyWindow) (pWin, ptOldOrg, prgnSrc);

-    VGAPut();

-    SCREEN_EPILOG (CopyWindow, VGAarbiterCopyWindow);

-}

-

-static void

-VGAarbiterClearToBackground (

-    WindowPtr pWin,

-    int x, int y,

-    int w, int h,

-    Bool generateExposures )

-{

-    ScreenPtr pScreen = pWin->drawable.pScreen;

-

-    SCREEN_PROLOG ( ClearToBackground);

-    VGAGet();

-    (*pScreen->ClearToBackground) (pWin, x, y, w, h, generateExposures);

-    VGAPut();

-    SCREEN_EPILOG (ClearToBackground, VGAarbiterClearToBackground);

-}

-

-static PixmapPtr

-VGAarbiterCreatePixmap(ScreenPtr pScreen, int w, int h, int depth, unsigned usage_hint)

-{

-    PixmapPtr pPix;

-

-    SCREEN_PROLOG ( CreatePixmap);

-    VGAGet();

-    pPix = (*pScreen->CreatePixmap) (pScreen, w, h, depth, usage_hint);

-    VGAPut();

-    SCREEN_EPILOG (CreatePixmap, VGAarbiterCreatePixmap);

-

-    return pPix;

-}

-

-static Bool

-VGAarbiterSaveScreen(ScreenPtr pScreen, Bool unblank)

-{

-    Bool val;

-

-    SCREEN_PROLOG (SaveScreen);

-    VGAGet();

-    val = (*pScreen->SaveScreen) (pScreen, unblank);

-    VGAPut();

-    SCREEN_EPILOG (SaveScreen, VGAarbiterSaveScreen);

-

-    return val;

-}

-

-static void

-VGAarbiterStoreColors (

-    ColormapPtr        pmap,

-    int                ndef,

-    xColorItem         *pdefs)

-{

-    ScreenPtr pScreen = pmap->pScreen;

-

-    SCREEN_PROLOG (StoreColors);

-    VGAGet();

-    (*pScreen->StoreColors) (pmap,ndef,pdefs);

-    VGAPut();

-    SCREEN_EPILOG ( StoreColors, VGAarbiterStoreColors);

-}

-

-static void

-VGAarbiterRecolorCursor (

-    DeviceIntPtr pDev,

-    ScreenPtr pScreen,

-    CursorPtr pCurs,

-    Bool displayed

-    )

-{

-    SCREEN_PROLOG (RecolorCursor);

-    VGAGet();

-    (*pScreen->RecolorCursor) (pDev, pScreen, pCurs, displayed);

-    VGAPut();

-    SCREEN_EPILOG ( RecolorCursor, VGAarbiterRecolorCursor);

-}

-

-static Bool

-VGAarbiterRealizeCursor (

-    DeviceIntPtr pDev,

-    ScreenPtr   pScreen,

-    CursorPtr   pCursor

-    )

-{

-    Bool val;

-

-    SCREEN_PROLOG (RealizeCursor);

-    VGAGet();

-    val = (*pScreen->RealizeCursor) (pDev, pScreen,pCursor);

-    VGAPut();

-    SCREEN_EPILOG ( RealizeCursor, VGAarbiterRealizeCursor);

-    return val;

-}

-

-static Bool

-VGAarbiterUnrealizeCursor (

-    DeviceIntPtr pDev,

-    ScreenPtr   pScreen,

-    CursorPtr   pCursor

-    )

-{

-    Bool val;

-

-    SCREEN_PROLOG (UnrealizeCursor);

-    VGAGet();

-    val = (*pScreen->UnrealizeCursor) (pDev, pScreen, pCursor);

-    VGAPut();

-    SCREEN_EPILOG ( UnrealizeCursor, VGAarbiterUnrealizeCursor);

-    return val;

-}

-

-static Bool

-VGAarbiterDisplayCursor (

-    DeviceIntPtr pDev,

-    ScreenPtr   pScreen,

-    CursorPtr   pCursor

-    )

-{

-    Bool val;

-

-    SCREEN_PROLOG (DisplayCursor);

-    VGAGet();

-    val = (*pScreen->DisplayCursor) (pDev, pScreen, pCursor);

-    VGAPut();

-    SCREEN_EPILOG ( DisplayCursor, VGAarbiterDisplayCursor);

-    return val;

-}

-

-static Bool

-VGAarbiterSetCursorPosition (

-    DeviceIntPtr pDev,

-    ScreenPtr   pScreen,

-    int x, int y,

-    Bool generateEvent)

-{

-    Bool val;

-

-    SCREEN_PROLOG (SetCursorPosition);

-    VGAGet();

-    val = (*pScreen->SetCursorPosition) (pDev, pScreen, x, y, generateEvent);

-    VGAPut();

-    SCREEN_EPILOG ( SetCursorPosition, VGAarbiterSetCursorPosition);

-    return val;

-}

-

-static void

-VGAarbiterAdjustFrame(int index, int x, int y, int flags)

-{

-    ScreenPtr pScreen = screenInfo.screens[index];

-    VGAarbiterScreenPtr pScreenPriv = (VGAarbiterScreenPtr)dixLookupPrivate(

-        &pScreen->devPrivates, VGAarbiterScreenKey);

-

-    VGAGet();

-    (*pScreenPriv->AdjustFrame)(index, x, y, flags);

-    VGAPut();

-}

-

-static Bool

-VGAarbiterSwitchMode(int index, DisplayModePtr mode, int flags)

-{

-    Bool val;

-    ScreenPtr pScreen = screenInfo.screens[index];

-    VGAarbiterScreenPtr pScreenPriv = (VGAarbiterScreenPtr)dixLookupPrivate(

-        &pScreen->devPrivates, VGAarbiterScreenKey);

-

-    VGAGet();

-    val = (*pScreenPriv->SwitchMode)(index, mode, flags);

-    VGAPut();

-    return val;

-}

-

-static Bool

-VGAarbiterEnterVT(int index, int flags)

-{

-    Bool val;

-    ScreenPtr pScreen = screenInfo.screens[index];

-    VGAarbiterScreenPtr pScreenPriv = (VGAarbiterScreenPtr)dixLookupPrivate(

-        &pScreen->devPrivates, VGAarbiterScreenKey);

-

-    VGAGet();

-    val = (*pScreenPriv->EnterVT)(index, flags);

-    VGAPut();

-    return val;

-}

-

-static void

-VGAarbiterLeaveVT(int index, int flags)

-{

-    ScreenPtr pScreen = screenInfo.screens[index];

-    VGAarbiterScreenPtr pScreenPriv = (VGAarbiterScreenPtr)dixLookupPrivate(

-        &pScreen->devPrivates, VGAarbiterScreenKey);

-

-    VGAGet();

-    (*pScreenPriv->LeaveVT)(index, flags);

-    VGAPut();

-}

-

-static void

-VGAarbiterFreeScreen(int index, int flags)

-{

-    ScreenPtr pScreen = screenInfo.screens[index];

-    VGAarbiterScreenPtr pScreenPriv = (VGAarbiterScreenPtr)dixLookupPrivate(

-        &pScreen->devPrivates, VGAarbiterScreenKey);

-

-    VGAGet();

-    (*pScreenPriv->FreeScreen)(index, flags);

-    VGAPut();

-}

-

-static Bool

-VGAarbiterCreateGC(GCPtr pGC)

-{

-    ScreenPtr    pScreen = pGC->pScreen;

-    VGAarbiterGCPtr pGCPriv = (VGAarbiterGCPtr)dixLookupPrivate(&pGC->devPrivates, VGAarbiterGCKey);

-    Bool         ret;

-

-    SCREEN_PROLOG(CreateGC);

-    VGAGet();

-    ret = (*pScreen->CreateGC)(pGC);

-    VGAPut();

-    GC_WRAP(pGC);

-    SCREEN_EPILOG(CreateGC,VGAarbiterCreateGC);

-

-    return ret;

-}

-

-/* GC funcs */

-static void

-VGAarbiterValidateGC(

-   GCPtr         pGC,

-   unsigned long changes,

-   DrawablePtr   pDraw )

-{

-    GC_UNWRAP(pGC);

-    (*pGC->funcs->ValidateGC)(pGC, changes, pDraw);

-    GC_WRAP(pGC);

-}

-

-

-static void

-VGAarbiterDestroyGC(GCPtr pGC)

-{

-    GC_UNWRAP (pGC);

-    (*pGC->funcs->DestroyGC)(pGC);

-    GC_WRAP (pGC);

-}

-

-static void

-VGAarbiterChangeGC (

-    GCPtr       pGC,

-    unsigned long   mask)

-{

-    GC_UNWRAP (pGC);

-    (*pGC->funcs->ChangeGC) (pGC, mask);

-    GC_WRAP (pGC);

-}

-

-static void

-VGAarbiterCopyGC (

-    GCPtr       pGCSrc,

-    unsigned long   mask,

-    GCPtr       pGCDst)

-{

-    GC_UNWRAP (pGCDst);

-    (*pGCDst->funcs->CopyGC) (pGCSrc, mask, pGCDst);

-    GC_WRAP (pGCDst);

-}

-

-static void

-VGAarbiterChangeClip (

-    GCPtr   pGC,

-    int     type,

-    pointer pvalue,

-    int     nrects )

-{

-    GC_UNWRAP (pGC);

-    (*pGC->funcs->ChangeClip) (pGC, type, pvalue, nrects);

-    GC_WRAP (pGC);

-}

-

-static void

-VGAarbiterCopyClip(GCPtr pgcDst, GCPtr pgcSrc)

-{

-    GC_UNWRAP (pgcDst);

-    (* pgcDst->funcs->CopyClip)(pgcDst, pgcSrc);

-    GC_WRAP (pgcDst);

-}

-

-static void

-VGAarbiterDestroyClip(GCPtr pGC)

-{

-    GC_UNWRAP (pGC);

-    (* pGC->funcs->DestroyClip)(pGC);

-    GC_WRAP (pGC);

-}

-

-/* GC Ops */

-static void

-VGAarbiterFillSpans(

-    DrawablePtr pDraw,

-    GC      *pGC,

-    int     nInit,

-    DDXPointPtr pptInit,

-    int *pwidthInit,

-    int fSorted )

-{

-    GC_UNWRAP(pGC);

-    VGAGet_GC();

-    (*pGC->ops->FillSpans)(pDraw, pGC, nInit, pptInit, pwidthInit, fSorted);

-    VGAPut_GC();

-    GC_WRAP(pGC);

-}

-

-static void

-VGAarbiterSetSpans(

-    DrawablePtr     pDraw,

-    GCPtr       pGC,

-    char        *pcharsrc,

-    register DDXPointPtr ppt,

-    int         *pwidth,

-    int         nspans,

-    int         fSorted )

-{

-    GC_UNWRAP(pGC);

-    VGAGet_GC();

-    (*pGC->ops->SetSpans)(pDraw, pGC, pcharsrc, ppt, pwidth, nspans, fSorted);

-    VGAPut_GC();

-    GC_WRAP(pGC);

-}

-

-static void

-VGAarbiterPutImage(

-    DrawablePtr pDraw,

-    GCPtr   pGC,

-    int     depth,

-    int x, int y, int w, int h,

-    int     leftPad,

-    int     format,

-    char    *pImage )

-{

-    GC_UNWRAP(pGC);

-    VGAGet_GC();

-    (*pGC->ops->PutImage)(pDraw, pGC, depth, x, y, w, h,

-              leftPad, format, pImage);

-    VGAPut_GC();

-    GC_WRAP(pGC);

-}

-

-static RegionPtr

-VGAarbiterCopyArea(

-    DrawablePtr pSrc,

-    DrawablePtr pDst,

-    GC *pGC,

-    int srcx, int srcy,

-    int width, int height,

-    int dstx, int dsty )

-{

-    RegionPtr ret;

-

-    GC_UNWRAP(pGC);

-    VGAGet_GC();

-    ret = (*pGC->ops->CopyArea)(pSrc, pDst,

-                pGC, srcx, srcy, width, height, dstx, dsty);

-    VGAPut_GC();

-    GC_WRAP(pGC);

-    return ret;

-}

-

-static RegionPtr

-VGAarbiterCopyPlane(

-    DrawablePtr pSrc,

-    DrawablePtr pDst,

-    GCPtr pGC,

-    int srcx, int srcy,

-    int width, int height,

-    int dstx, int dsty,

-    unsigned long bitPlane )

-{

-    RegionPtr ret;

-

-    GC_UNWRAP(pGC);

-    VGAGet_GC();

-    ret = (*pGC->ops->CopyPlane)(pSrc, pDst, pGC, srcx, srcy,

-                 width, height, dstx, dsty, bitPlane);

-    VGAPut_GC();

-    GC_WRAP(pGC);

-    return ret;

-}

-

-static void

-VGAarbiterPolyPoint(

-    DrawablePtr pDraw,

-    GCPtr pGC,

-    int mode,

-    int npt,

-    xPoint *pptInit )

-{

-    GC_UNWRAP(pGC);

-    VGAGet_GC();

-    (*pGC->ops->PolyPoint)(pDraw, pGC, mode, npt, pptInit);

-    VGAPut_GC();

-    GC_WRAP(pGC);

-}

-

-

-static void

-VGAarbiterPolylines(

-    DrawablePtr pDraw,

-    GCPtr   pGC,

-    int     mode,

-    int     npt,

-    DDXPointPtr pptInit )

-{

-    GC_UNWRAP(pGC);

-    VGAGet_GC();

-    (*pGC->ops->Polylines)(pDraw, pGC, mode, npt, pptInit);

-    VGAPut_GC();

-    GC_WRAP(pGC);

-}

-

-static void

-VGAarbiterPolySegment(

-    DrawablePtr pDraw,

-    GCPtr   pGC,

-    int     nseg,

-    xSegment    *pSeg )

-{

-    GC_UNWRAP(pGC);

-    VGAGet_GC();

-    (*pGC->ops->PolySegment)(pDraw, pGC, nseg, pSeg);

-    VGAPut_GC();

-    GC_WRAP(pGC);

-}

-

-static void

-VGAarbiterPolyRectangle(

-    DrawablePtr  pDraw,

-    GCPtr        pGC,

-    int          nRectsInit,

-    xRectangle  *pRectsInit )

-{

-    GC_UNWRAP(pGC);

-    VGAGet_GC();

-    (*pGC->ops->PolyRectangle)(pDraw, pGC, nRectsInit, pRectsInit);

-    VGAPut_GC();

-    GC_WRAP(pGC);

-}

-

-static void

-VGAarbiterPolyArc(

-    DrawablePtr pDraw,

-    GCPtr   pGC,

-    int     narcs,

-    xArc    *parcs )

-{

-    GC_UNWRAP(pGC);

-    VGAGet_GC();

-    (*pGC->ops->PolyArc)(pDraw, pGC, narcs, parcs);

-    VGAPut_GC();

-    GC_WRAP(pGC);

-}

-

-static void

-VGAarbiterFillPolygon(

-    DrawablePtr pDraw,

-    GCPtr   pGC,

-    int     shape,

-    int     mode,

-    int     count,

-    DDXPointPtr ptsIn )

-{

-    GC_UNWRAP(pGC);

-    VGAGet_GC();

-    (*pGC->ops->FillPolygon)(pDraw, pGC, shape, mode, count, ptsIn);

-    VGAPut_GC();

-    GC_WRAP(pGC);

-}

-

-static void

-VGAarbiterPolyFillRect(

-    DrawablePtr pDraw,

-    GCPtr   pGC,

-    int     nrectFill,

-    xRectangle  *prectInit)

-{

-    GC_UNWRAP(pGC);

-    VGAGet_GC();

-    (*pGC->ops->PolyFillRect)(pDraw, pGC, nrectFill, prectInit);

-    VGAPut_GC();

-    GC_WRAP(pGC);

-}

-

-static void

-VGAarbiterPolyFillArc(

-    DrawablePtr pDraw,

-    GCPtr   pGC,

-    int     narcs,

-    xArc    *parcs )

-{

-    GC_UNWRAP(pGC);

-    VGAGet_GC();

-    (*pGC->ops->PolyFillArc)(pDraw, pGC, narcs, parcs);

-    VGAPut_GC();

-    GC_WRAP(pGC);

-}

-

-static int

-VGAarbiterPolyText8(

-    DrawablePtr pDraw,

-    GCPtr   pGC,

-    int     x,

-    int     y,

-    int     count,

-    char    *chars )

-{

-    int ret;

-

-    GC_UNWRAP(pGC);

-    VGAGet_GC();

-    ret = (*pGC->ops->PolyText8)(pDraw, pGC, x, y, count, chars);

-    VGAPut_GC();

-    GC_WRAP(pGC);

-    return ret;

-}

-

-static int

-VGAarbiterPolyText16(

-    DrawablePtr pDraw,

-    GCPtr   pGC,

-    int     x,

-    int     y,

-    int     count,

-    unsigned short *chars )

-{

-    int ret;

-

-    GC_UNWRAP(pGC);

-    VGAGet_GC();

-    ret = (*pGC->ops->PolyText16)(pDraw, pGC, x, y, count, chars);

-    VGAPut_GC();

-    GC_WRAP(pGC);

-    return ret;

-}

-

-static void

-VGAarbiterImageText8(

-    DrawablePtr pDraw,

-    GCPtr   pGC,

-    int     x,

-    int     y,

-    int     count,

-    char    *chars )

-{

-    GC_UNWRAP(pGC);

-    VGAGet_GC();

-    (*pGC->ops->ImageText8)(pDraw, pGC, x, y, count, chars);

-    VGAPut_GC();

-    GC_WRAP(pGC);

-}

-

-static void

-VGAarbiterImageText16(

-    DrawablePtr pDraw,

-    GCPtr   pGC,

-    int     x,

-    int     y,

-    int     count,

-    unsigned short *chars )

-{

-    GC_UNWRAP(pGC);

-    VGAGet_GC();

-    (*pGC->ops->ImageText16)(pDraw, pGC, x, y, count, chars);

-    VGAPut_GC();

-    GC_WRAP(pGC);

-}

-

-

-static void

-VGAarbiterImageGlyphBlt(

-    DrawablePtr pDraw,

-    GCPtr pGC,

-    int xInit, int yInit,

-    unsigned int nglyph,

-    CharInfoPtr *ppci,

-    pointer pglyphBase )

-{

-    GC_UNWRAP(pGC);

-    VGAGet_GC();

-    (*pGC->ops->ImageGlyphBlt)(pDraw, pGC, xInit, yInit,

-                   nglyph, ppci, pglyphBase);

-    VGAPut_GC();

-    GC_WRAP(pGC);

-}

-

-static void

-VGAarbiterPolyGlyphBlt(

-    DrawablePtr pDraw,

-    GCPtr pGC,

-    int xInit, int yInit,

-    unsigned int nglyph,

-    CharInfoPtr *ppci,

-    pointer pglyphBase )

-{

-    GC_UNWRAP(pGC);

-    VGAGet_GC();

-    (*pGC->ops->PolyGlyphBlt)(pDraw, pGC, xInit, yInit,

-                  nglyph, ppci, pglyphBase);

-    VGAPut_GC();

-    GC_WRAP(pGC);

-}

-

-static void

-VGAarbiterPushPixels(

-    GCPtr   pGC,

-    PixmapPtr   pBitMap,

-    DrawablePtr pDraw,

-    int dx, int dy, int xOrg, int yOrg )

-{

-    GC_UNWRAP(pGC);

-    VGAGet_GC();

-    (*pGC->ops->PushPixels)(pGC, pBitMap, pDraw, dx, dy, xOrg, yOrg);

-    VGAPut_GC();

-    GC_WRAP(pGC);

-}

-

-

-/* miSpriteFuncs */

-static Bool

-VGAarbiterSpriteRealizeCursor(DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCur)

-{

-    Bool val;

-    SPRITE_PROLOG;

-    VGAGet();

-    val = PointPriv->spriteFuncs->RealizeCursor(pDev, pScreen, pCur);

-    VGAPut();

-    SPRITE_EPILOG;

-    return val;

-}

-

-static Bool

-VGAarbiterSpriteUnrealizeCursor(DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCur)

-{

-    Bool val;

-    SPRITE_PROLOG;

-    VGAGet();

-    val = PointPriv->spriteFuncs->UnrealizeCursor(pDev, pScreen, pCur);

-    VGAPut();

-    SPRITE_EPILOG;

-    return val;

-}

-

-static void

-VGAarbiterSpriteSetCursor(DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCur, int x, int y)

-{

-    SPRITE_PROLOG;

-    VGAGet();

-    PointPriv->spriteFuncs->SetCursor(pDev, pScreen, pCur, x, y);

-    VGAPut();

-    SPRITE_EPILOG;

-}

-

-static void

-VGAarbiterSpriteMoveCursor(DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y)

-{

-    SPRITE_PROLOG;

-    VGAGet();

-    PointPriv->spriteFuncs->MoveCursor(pDev, pScreen, x, y);

-    VGAPut();

-    SPRITE_EPILOG;

-}

-

-static Bool

-VGAarbiterDeviceCursorInitialize(DeviceIntPtr pDev, ScreenPtr pScreen)

-{

-    Bool val;

-    SPRITE_PROLOG;

-    VGAGet();

-    val = PointPriv->spriteFuncs->DeviceCursorInitialize(pDev, pScreen);

-    VGAPut();

-    SPRITE_EPILOG;

-    return val;

-}

-

-static void

-VGAarbiterDeviceCursorCleanup(DeviceIntPtr pDev, ScreenPtr pScreen)

-{

-    SPRITE_PROLOG;

-    VGAGet();

-    PointPriv->spriteFuncs->DeviceCursorCleanup(pDev, pScreen);

-    VGAPut();

-    SPRITE_EPILOG;

-}

-

-#ifdef RENDER

-static void

-VGAarbiterComposite(CARD8 op, PicturePtr pSrc, PicturePtr pMask,

-         PicturePtr pDst, INT16 xSrc, INT16 ySrc, INT16 xMask,

-         INT16 yMask, INT16 xDst, INT16 yDst, CARD16 width,

-         CARD16 height)

-{

-    ScreenPtr       pScreen = pDst->pDrawable->pScreen;

-    PictureScreenPtr    ps = GetPictureScreen(pScreen);

-

-    PICTURE_PROLOGUE(Composite);

-

-    VGAGet();

-    (*ps->Composite) (op, pSrc, pMask, pDst, xSrc, ySrc, xMask, yMask, xDst,

-              yDst, width, height);

-    VGAPut();

-    PICTURE_EPILOGUE(Composite, VGAarbiterComposite);

-}

-

-static void

-VGAarbiterGlyphs(CARD8 op, PicturePtr pSrc, PicturePtr pDst,

-      PictFormatPtr maskFormat, INT16 xSrc, INT16 ySrc, int nlist,

-      GlyphListPtr list, GlyphPtr *glyphs)

-{

-    ScreenPtr       pScreen = pDst->pDrawable->pScreen;

-    PictureScreenPtr    ps = GetPictureScreen(pScreen);

-

-    PICTURE_PROLOGUE(Glyphs);

-

-    VGAGet();

-    (*ps->Glyphs)(op, pSrc, pDst, maskFormat, xSrc, ySrc, nlist, list, glyphs);

-    VGAPut();

-    PICTURE_EPILOGUE (Glyphs, VGAarbiterGlyphs);

-}

-

-static void

-VGAarbiterCompositeRects(CARD8 op, PicturePtr pDst, xRenderColor *color, int nRect,

-          xRectangle *rects)

-{

-    ScreenPtr       pScreen = pDst->pDrawable->pScreen;

-    PictureScreenPtr    ps = GetPictureScreen(pScreen);

-

-    PICTURE_PROLOGUE(CompositeRects);

-

-    VGAGet();

-    (*ps->CompositeRects)(op, pDst, color, nRect, rects);

-    VGAPut();

-    PICTURE_EPILOGUE (CompositeRects, VGAarbiterCompositeRects);

-}

-#endif

-#else

-/* dummy functions */

-void xf86VGAarbiterInit(void) {}

-void xf86VGAarbiterFini(void) {}

-

-void xf86VGAarbiterLock(ScrnInfoPtr pScrn) {}

-void xf86VGAarbiterUnlock(ScrnInfoPtr pScrn) {}

-Bool xf86VGAarbiterAllowDRI(ScreenPtr pScreen) { return TRUE; }

-void xf86VGAarbiterScrnInit(ScrnInfoPtr pScrn) {}

-void xf86VGAarbiterDeviceDecodes(ScrnInfoPtr pScrn) {}

-Bool xf86VGAarbiterWrapFunctions(void) { return FALSE; }

-

-#endif

+/*
+ * This code was stolen from RAC and adapted to control the legacy vga
+ * interface.
+ *
+ *
+ * Copyright (c) 2007 Paulo R. Zanoni, Tiago Vignatti
+ *
+ * Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following
+ * conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ */
+
+#include "xorg-config.h"
+
+#include "xf86VGAarbiter.h"
+
+#ifdef HAVE_PCI_DEVICE_VGAARB_INIT
+#include "xf86VGAarbiterPriv.h"
+#include "xf86Bus.h"
+#include "xf86Priv.h"
+#include "pciaccess.h"
+
+
+static GCFuncs VGAarbiterGCFuncs = {
+    VGAarbiterValidateGC, VGAarbiterChangeGC, VGAarbiterCopyGC,
+    VGAarbiterDestroyGC, VGAarbiterChangeClip, VGAarbiterDestroyClip,
+    VGAarbiterCopyClip
+};
+
+static GCOps VGAarbiterGCOps = {
+    VGAarbiterFillSpans, VGAarbiterSetSpans, VGAarbiterPutImage,
+    VGAarbiterCopyArea, VGAarbiterCopyPlane, VGAarbiterPolyPoint,
+    VGAarbiterPolylines, VGAarbiterPolySegment, VGAarbiterPolyRectangle,
+    VGAarbiterPolyArc, VGAarbiterFillPolygon, VGAarbiterPolyFillRect,
+    VGAarbiterPolyFillArc, VGAarbiterPolyText8, VGAarbiterPolyText16,
+    VGAarbiterImageText8, VGAarbiterImageText16, VGAarbiterImageGlyphBlt,
+    VGAarbiterPolyGlyphBlt, VGAarbiterPushPixels,
+    {NULL}      /* devPrivate */
+};
+
+static miPointerSpriteFuncRec VGAarbiterSpriteFuncs = {
+    VGAarbiterSpriteRealizeCursor, VGAarbiterSpriteUnrealizeCursor,
+    VGAarbiterSpriteSetCursor, VGAarbiterSpriteMoveCursor,
+    VGAarbiterDeviceCursorInitialize, VGAarbiterDeviceCursorCleanup
+};
+
+static int VGAarbiterKeyIndex;
+static DevPrivateKey VGAarbiterScreenKey = &VGAarbiterKeyIndex;
+static int VGAarbiterGCIndex;
+static DevPrivateKey VGAarbiterGCKey = &VGAarbiterGCIndex;
+
+static int vga_no_arb = 0;
+void
+xf86VGAarbiterInit(void)
+{
+    if (pci_device_vgaarb_init() != 0) {
+	vga_no_arb = 1;
+        xf86Msg(X_WARNING, "VGA arbiter: cannot open kernel arbiter, no multi-card support\n");
+    }
+}
+
+void
+xf86VGAarbiterFini(void)
+{
+    if (vga_no_arb)
+	return;
+    pci_device_vgaarb_fini();
+}
+
+void
+xf86VGAarbiterLock(ScrnInfoPtr pScrn)
+{
+    if (vga_no_arb)
+	return;
+    pci_device_vgaarb_set_target(pScrn->vgaDev);
+    pci_device_vgaarb_lock();
+}
+
+void
+xf86VGAarbiterUnlock(ScrnInfoPtr pScrn)
+{
+    if (vga_no_arb)
+	return;
+    pci_device_vgaarb_unlock();
+}
+
+Bool xf86VGAarbiterAllowDRI(ScreenPtr pScreen)
+{
+    int vga_count;
+    int rsrc_decodes;
+    ScrnInfoPtr         pScrn = xf86Screens[pScreen->myNum];
+
+    if (vga_no_arb)
+	return TRUE;
+
+    pci_device_vgaarb_get_info(pScrn->vgaDev, &vga_count, &rsrc_decodes);
+    if (vga_count > 1) {
+        if (rsrc_decodes) {
+            return FALSE;
+        }
+    }
+    return TRUE;
+}
+
+void
+xf86VGAarbiterScrnInit(ScrnInfoPtr pScrn)
+{
+    struct pci_device *dev;
+    EntityPtr pEnt;
+
+    if (vga_no_arb)
+	return;
+
+    pEnt = xf86Entities[pScrn->entityList[0]];
+    if (pEnt->bus.type != BUS_PCI)
+	return;
+
+    dev = pEnt->bus.id.pci;
+    pScrn->vgaDev = dev;
+}
+
+void
+xf86VGAarbiterDeviceDecodes(ScrnInfoPtr pScrn)
+{
+    if (vga_no_arb)
+	return;
+    pci_device_vgaarb_decodes(VGA_ARB_RSRC_LEGACY_MEM | VGA_ARB_RSRC_LEGACY_IO);
+}
+
+Bool
+xf86VGAarbiterWrapFunctions(void)
+{
+    ScrnInfoPtr pScrn;
+    VGAarbiterScreenPtr pScreenPriv;
+    miPointerScreenPtr PointPriv;
+    PictureScreenPtr    ps;
+    ScreenPtr pScreen;
+    int vga_count, i;
+
+    if (vga_no_arb)
+        return FALSE;
+
+    /*
+     * we need to wrap the arbiter if we have more than
+     * one VGA card - hotplug cries.
+     */
+    pci_device_vgaarb_get_info(NULL, &vga_count, NULL);
+    if (vga_count < 2 || !xf86Screens)
+        return FALSE;
+
+    xf86Msg(X_INFO,"Found %d VGA devices: arbiter wrapping enabled\n",
+            vga_count);
+
+    for (i = 0; i < xf86NumScreens; i++) {
+        pScreen = xf86Screens[i]->pScreen;
+        ps = GetPictureScreenIfSet(pScreen);
+        pScrn = xf86Screens[pScreen->myNum];
+        PointPriv = dixLookupPrivate(&pScreen->devPrivates, miPointerScreenKey);
+
+        if (!dixRequestPrivate(VGAarbiterGCKey, sizeof(VGAarbiterGCRec)))
+            return FALSE;
+
+        if (!(pScreenPriv = xalloc(sizeof(VGAarbiterScreenRec))))
+            return FALSE;
+
+        dixSetPrivate(&pScreen->devPrivates, VGAarbiterScreenKey, pScreenPriv);
+
+        WRAP_SCREEN(CloseScreen, VGAarbiterCloseScreen);
+        WRAP_SCREEN(SaveScreen, VGAarbiterSaveScreen);
+        WRAP_SCREEN(WakeupHandler, VGAarbiterWakeupHandler);
+        WRAP_SCREEN(BlockHandler, VGAarbiterBlockHandler);
+        WRAP_SCREEN(CreateGC, VGAarbiterCreateGC);
+        WRAP_SCREEN(GetImage, VGAarbiterGetImage);
+        WRAP_SCREEN(GetSpans, VGAarbiterGetSpans);
+        WRAP_SCREEN(SourceValidate, VGAarbiterSourceValidate);
+        WRAP_SCREEN(CopyWindow, VGAarbiterCopyWindow);
+        WRAP_SCREEN(ClearToBackground, VGAarbiterClearToBackground);
+        WRAP_SCREEN(CreatePixmap, VGAarbiterCreatePixmap);
+        WRAP_SCREEN(StoreColors, VGAarbiterStoreColors);
+        WRAP_SCREEN(DisplayCursor, VGAarbiterDisplayCursor);
+        WRAP_SCREEN(RealizeCursor, VGAarbiterRealizeCursor);
+        WRAP_SCREEN(UnrealizeCursor, VGAarbiterUnrealizeCursor);
+        WRAP_SCREEN(RecolorCursor, VGAarbiterRecolorCursor);
+        WRAP_SCREEN(SetCursorPosition, VGAarbiterSetCursorPosition);
+        WRAP_PICT(Composite,VGAarbiterComposite);
+        WRAP_PICT(Glyphs,VGAarbiterGlyphs);
+        WRAP_PICT(CompositeRects,VGAarbiterCompositeRects);
+        WRAP_SCREEN_INFO(AdjustFrame, VGAarbiterAdjustFrame);
+        WRAP_SCREEN_INFO(SwitchMode, VGAarbiterSwitchMode);
+        WRAP_SCREEN_INFO(EnterVT, VGAarbiterEnterVT);
+        WRAP_SCREEN_INFO(LeaveVT, VGAarbiterLeaveVT);
+        WRAP_SCREEN_INFO(FreeScreen, VGAarbiterFreeScreen);
+        WRAP_SPRITE;
+    }
+
+    return TRUE;
+}
+
+/* Screen funcs */
+static Bool
+VGAarbiterCloseScreen (int i, ScreenPtr pScreen)
+{
+    Bool val;
+    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+    VGAarbiterScreenPtr pScreenPriv = (VGAarbiterScreenPtr)dixLookupPrivate(
+        &pScreen->devPrivates, VGAarbiterScreenKey);
+    miPointerScreenPtr PointPriv = (miPointerScreenPtr)dixLookupPrivate(
+        &pScreen->devPrivates, miPointerScreenKey);
+    PictureScreenPtr    ps = GetPictureScreenIfSet(pScreen);
+
+    UNWRAP_SCREEN(CreateGC);
+    UNWRAP_SCREEN(CloseScreen);
+    UNWRAP_SCREEN(GetImage);
+    UNWRAP_SCREEN(GetSpans);
+    UNWRAP_SCREEN(SourceValidate);
+    UNWRAP_SCREEN(CopyWindow);
+    UNWRAP_SCREEN(ClearToBackground);
+    UNWRAP_SCREEN(SaveScreen);
+    UNWRAP_SCREEN(StoreColors);
+    UNWRAP_SCREEN(DisplayCursor);
+    UNWRAP_SCREEN(RealizeCursor);
+    UNWRAP_SCREEN(UnrealizeCursor);
+    UNWRAP_SCREEN(RecolorCursor);
+    UNWRAP_SCREEN(SetCursorPosition);
+    UNWRAP_PICT(Composite);
+    UNWRAP_PICT(Glyphs);
+    UNWRAP_PICT(CompositeRects);
+    UNWRAP_SCREEN_INFO(AdjustFrame);
+    UNWRAP_SCREEN_INFO(SwitchMode);
+    UNWRAP_SCREEN_INFO(EnterVT);
+    UNWRAP_SCREEN_INFO(LeaveVT);
+    UNWRAP_SCREEN_INFO(FreeScreen);
+    UNWRAP_SPRITE;
+
+    xfree ((pointer) pScreenPriv);
+    xf86VGAarbiterLock(xf86Screens[i]);
+    val = (*pScreen->CloseScreen) (i, pScreen);
+    xf86VGAarbiterUnlock(xf86Screens[i]);
+    return val;
+}
+
+static void
+VGAarbiterBlockHandler(int i,
+                       pointer blockData, pointer pTimeout, pointer pReadmask)
+{
+    ScreenPtr pScreen = screenInfo.screens[i];
+    SCREEN_PROLOG(BlockHandler);
+    VGAGet();
+    pScreen->BlockHandler(i, blockData, pTimeout, pReadmask);
+    VGAPut();
+    SCREEN_EPILOG(BlockHandler, VGAarbiterBlockHandler);
+}
+
+static void
+VGAarbiterWakeupHandler(int i, pointer blockData, unsigned long result, pointer pReadmask)
+{
+    ScreenPtr pScreen = screenInfo.screens[i];
+    SCREEN_PROLOG(WakeupHandler);
+    VGAGet();
+    pScreen->WakeupHandler(i, blockData, result, pReadmask);
+    VGAPut();
+    SCREEN_EPILOG(WakeupHandler, VGAarbiterWakeupHandler);
+}
+
+static void
+VGAarbiterGetImage (
+    DrawablePtr pDrawable,
+    int sx, int sy, int w, int h,
+    unsigned int    format,
+    unsigned long   planemask,
+    char        *pdstLine
+    )
+{
+    ScreenPtr pScreen = pDrawable->pScreen;
+    SCREEN_PROLOG(GetImage);
+//    if (xf86Screens[pScreen->myNum]->vtSema) {
+    VGAGet();
+//    }
+    (*pScreen->GetImage) (pDrawable, sx, sy, w, h,
+              format, planemask, pdstLine);
+    VGAPut();
+    SCREEN_EPILOG (GetImage, VGAarbiterGetImage);
+}
+
+static void
+VGAarbiterGetSpans (
+    DrawablePtr pDrawable,
+    int     wMax,
+    DDXPointPtr ppt,
+    int     *pwidth,
+    int     nspans,
+    char    *pdstStart
+    )
+{
+    ScreenPtr       pScreen = pDrawable->pScreen;
+
+    SCREEN_PROLOG (GetSpans);
+    VGAGet();
+    (*pScreen->GetSpans) (pDrawable, wMax, ppt, pwidth, nspans, pdstStart);
+    VGAPut();
+    SCREEN_EPILOG (GetSpans, VGAarbiterGetSpans);
+}
+
+static void
+VGAarbiterSourceValidate (
+    DrawablePtr pDrawable,
+    int x, int y, int width, int height )
+{
+    ScreenPtr   pScreen = pDrawable->pScreen;
+    SCREEN_PROLOG (SourceValidate);
+    VGAGet();
+    if (pScreen->SourceValidate)
+    (*pScreen->SourceValidate) (pDrawable, x, y, width, height);
+    VGAPut();
+    SCREEN_EPILOG (SourceValidate, VGAarbiterSourceValidate);
+}
+
+static void
+VGAarbiterCopyWindow(
+    WindowPtr pWin,
+    DDXPointRec ptOldOrg,
+    RegionPtr prgnSrc )
+{
+    ScreenPtr pScreen = pWin->drawable.pScreen;
+
+    SCREEN_PROLOG (CopyWindow);
+    VGAGet();
+    (*pScreen->CopyWindow) (pWin, ptOldOrg, prgnSrc);
+    VGAPut();
+    SCREEN_EPILOG (CopyWindow, VGAarbiterCopyWindow);
+}
+
+static void
+VGAarbiterClearToBackground (
+    WindowPtr pWin,
+    int x, int y,
+    int w, int h,
+    Bool generateExposures )
+{
+    ScreenPtr pScreen = pWin->drawable.pScreen;
+
+    SCREEN_PROLOG ( ClearToBackground);
+    VGAGet();
+    (*pScreen->ClearToBackground) (pWin, x, y, w, h, generateExposures);
+    VGAPut();
+    SCREEN_EPILOG (ClearToBackground, VGAarbiterClearToBackground);
+}
+
+static PixmapPtr
+VGAarbiterCreatePixmap(ScreenPtr pScreen, int w, int h, int depth, unsigned usage_hint)
+{
+    PixmapPtr pPix;
+
+    SCREEN_PROLOG ( CreatePixmap);
+    VGAGet();
+    pPix = (*pScreen->CreatePixmap) (pScreen, w, h, depth, usage_hint);
+    VGAPut();
+    SCREEN_EPILOG (CreatePixmap, VGAarbiterCreatePixmap);
+
+    return pPix;
+}
+
+static Bool
+VGAarbiterSaveScreen(ScreenPtr pScreen, Bool unblank)
+{
+    Bool val;
+
+    SCREEN_PROLOG (SaveScreen);
+    VGAGet();
+    val = (*pScreen->SaveScreen) (pScreen, unblank);
+    VGAPut();
+    SCREEN_EPILOG (SaveScreen, VGAarbiterSaveScreen);
+
+    return val;
+}
+
+static void
+VGAarbiterStoreColors (
+    ColormapPtr        pmap,
+    int                ndef,
+    xColorItem         *pdefs)
+{
+    ScreenPtr pScreen = pmap->pScreen;
+
+    SCREEN_PROLOG (StoreColors);
+    VGAGet();
+    (*pScreen->StoreColors) (pmap,ndef,pdefs);
+    VGAPut();
+    SCREEN_EPILOG ( StoreColors, VGAarbiterStoreColors);
+}
+
+static void
+VGAarbiterRecolorCursor (
+    DeviceIntPtr pDev,
+    ScreenPtr pScreen,
+    CursorPtr pCurs,
+    Bool displayed
+    )
+{
+    SCREEN_PROLOG (RecolorCursor);
+    VGAGet();
+    (*pScreen->RecolorCursor) (pDev, pScreen, pCurs, displayed);
+    VGAPut();
+    SCREEN_EPILOG ( RecolorCursor, VGAarbiterRecolorCursor);
+}
+
+static Bool
+VGAarbiterRealizeCursor (
+    DeviceIntPtr pDev,
+    ScreenPtr   pScreen,
+    CursorPtr   pCursor
+    )
+{
+    Bool val;
+
+    SCREEN_PROLOG (RealizeCursor);
+    VGAGet();
+    val = (*pScreen->RealizeCursor) (pDev, pScreen,pCursor);
+    VGAPut();
+    SCREEN_EPILOG ( RealizeCursor, VGAarbiterRealizeCursor);
+    return val;
+}
+
+static Bool
+VGAarbiterUnrealizeCursor (
+    DeviceIntPtr pDev,
+    ScreenPtr   pScreen,
+    CursorPtr   pCursor
+    )
+{
+    Bool val;
+
+    SCREEN_PROLOG (UnrealizeCursor);
+    VGAGet();
+    val = (*pScreen->UnrealizeCursor) (pDev, pScreen, pCursor);
+    VGAPut();
+    SCREEN_EPILOG ( UnrealizeCursor, VGAarbiterUnrealizeCursor);
+    return val;
+}
+
+static Bool
+VGAarbiterDisplayCursor (
+    DeviceIntPtr pDev,
+    ScreenPtr   pScreen,
+    CursorPtr   pCursor
+    )
+{
+    Bool val;
+
+    SCREEN_PROLOG (DisplayCursor);
+    VGAGet();
+    val = (*pScreen->DisplayCursor) (pDev, pScreen, pCursor);
+    VGAPut();
+    SCREEN_EPILOG ( DisplayCursor, VGAarbiterDisplayCursor);
+    return val;
+}
+
+static Bool
+VGAarbiterSetCursorPosition (
+    DeviceIntPtr pDev,
+    ScreenPtr   pScreen,
+    int x, int y,
+    Bool generateEvent)
+{
+    Bool val;
+
+    SCREEN_PROLOG (SetCursorPosition);
+    VGAGet();
+    val = (*pScreen->SetCursorPosition) (pDev, pScreen, x, y, generateEvent);
+    VGAPut();
+    SCREEN_EPILOG ( SetCursorPosition, VGAarbiterSetCursorPosition);
+    return val;
+}
+
+static void
+VGAarbiterAdjustFrame(int index, int x, int y, int flags)
+{
+    ScreenPtr pScreen = screenInfo.screens[index];
+    VGAarbiterScreenPtr pScreenPriv = (VGAarbiterScreenPtr)dixLookupPrivate(
+        &pScreen->devPrivates, VGAarbiterScreenKey);
+
+    VGAGet();
+    (*pScreenPriv->AdjustFrame)(index, x, y, flags);
+    VGAPut();
+}
+
+static Bool
+VGAarbiterSwitchMode(int index, DisplayModePtr mode, int flags)
+{
+    Bool val;
+    ScreenPtr pScreen = screenInfo.screens[index];
+    VGAarbiterScreenPtr pScreenPriv = (VGAarbiterScreenPtr)dixLookupPrivate(
+        &pScreen->devPrivates, VGAarbiterScreenKey);
+
+    VGAGet();
+    val = (*pScreenPriv->SwitchMode)(index, mode, flags);
+    VGAPut();
+    return val;
+}
+
+static Bool
+VGAarbiterEnterVT(int index, int flags)
+{
+    Bool val;
+    ScreenPtr pScreen = screenInfo.screens[index];
+    VGAarbiterScreenPtr pScreenPriv = (VGAarbiterScreenPtr)dixLookupPrivate(
+        &pScreen->devPrivates, VGAarbiterScreenKey);
+
+    VGAGet();
+    val = (*pScreenPriv->EnterVT)(index, flags);
+    VGAPut();
+    return val;
+}
+
+static void
+VGAarbiterLeaveVT(int index, int flags)
+{
+    ScreenPtr pScreen = screenInfo.screens[index];
+    VGAarbiterScreenPtr pScreenPriv = (VGAarbiterScreenPtr)dixLookupPrivate(
+        &pScreen->devPrivates, VGAarbiterScreenKey);
+
+    VGAGet();
+    (*pScreenPriv->LeaveVT)(index, flags);
+    VGAPut();
+}
+
+static void
+VGAarbiterFreeScreen(int index, int flags)
+{
+    ScreenPtr pScreen = screenInfo.screens[index];
+    VGAarbiterScreenPtr pScreenPriv = (VGAarbiterScreenPtr)dixLookupPrivate(
+        &pScreen->devPrivates, VGAarbiterScreenKey);
+
+    VGAGet();
+    (*pScreenPriv->FreeScreen)(index, flags);
+    VGAPut();
+}
+
+static Bool
+VGAarbiterCreateGC(GCPtr pGC)
+{
+    ScreenPtr    pScreen = pGC->pScreen;
+    VGAarbiterGCPtr pGCPriv = (VGAarbiterGCPtr)dixLookupPrivate(&pGC->devPrivates, VGAarbiterGCKey);
+    Bool         ret;
+
+    SCREEN_PROLOG(CreateGC);
+    VGAGet();
+    ret = (*pScreen->CreateGC)(pGC);
+    VGAPut();
+    GC_WRAP(pGC);
+    SCREEN_EPILOG(CreateGC,VGAarbiterCreateGC);
+
+    return ret;
+}
+
+/* GC funcs */
+static void
+VGAarbiterValidateGC(
+   GCPtr         pGC,
+   unsigned long changes,
+   DrawablePtr   pDraw )
+{
+    GC_UNWRAP(pGC);
+    (*pGC->funcs->ValidateGC)(pGC, changes, pDraw);
+    GC_WRAP(pGC);
+}
+
+
+static void
+VGAarbiterDestroyGC(GCPtr pGC)
+{
+    GC_UNWRAP (pGC);
+    (*pGC->funcs->DestroyGC)(pGC);
+    GC_WRAP (pGC);
+}
+
+static void
+VGAarbiterChangeGC (
+    GCPtr       pGC,
+    unsigned long   mask)
+{
+    GC_UNWRAP (pGC);
+    (*pGC->funcs->ChangeGC) (pGC, mask);
+    GC_WRAP (pGC);
+}
+
+static void
+VGAarbiterCopyGC (
+    GCPtr       pGCSrc,
+    unsigned long   mask,
+    GCPtr       pGCDst)
+{
+    GC_UNWRAP (pGCDst);
+    (*pGCDst->funcs->CopyGC) (pGCSrc, mask, pGCDst);
+    GC_WRAP (pGCDst);
+}
+
+static void
+VGAarbiterChangeClip (
+    GCPtr   pGC,
+    int     type,
+    pointer pvalue,
+    int     nrects )
+{
+    GC_UNWRAP (pGC);
+    (*pGC->funcs->ChangeClip) (pGC, type, pvalue, nrects);
+    GC_WRAP (pGC);
+}
+
+static void
+VGAarbiterCopyClip(GCPtr pgcDst, GCPtr pgcSrc)
+{
+    GC_UNWRAP (pgcDst);
+    (* pgcDst->funcs->CopyClip)(pgcDst, pgcSrc);
+    GC_WRAP (pgcDst);
+}
+
+static void
+VGAarbiterDestroyClip(GCPtr pGC)
+{
+    GC_UNWRAP (pGC);
+    (* pGC->funcs->DestroyClip)(pGC);
+    GC_WRAP (pGC);
+}
+
+/* GC Ops */
+static void
+VGAarbiterFillSpans(
+    DrawablePtr pDraw,
+    GC      *pGC,
+    int     nInit,
+    DDXPointPtr pptInit,
+    int *pwidthInit,
+    int fSorted )
+{
+    GC_UNWRAP(pGC);
+    VGAGet_GC();
+    (*pGC->ops->FillSpans)(pDraw, pGC, nInit, pptInit, pwidthInit, fSorted);
+    VGAPut_GC();
+    GC_WRAP(pGC);
+}
+
+static void
+VGAarbiterSetSpans(
+    DrawablePtr     pDraw,
+    GCPtr       pGC,
+    char        *pcharsrc,
+    register DDXPointPtr ppt,
+    int         *pwidth,
+    int         nspans,
+    int         fSorted )
+{
+    GC_UNWRAP(pGC);
+    VGAGet_GC();
+    (*pGC->ops->SetSpans)(pDraw, pGC, pcharsrc, ppt, pwidth, nspans, fSorted);
+    VGAPut_GC();
+    GC_WRAP(pGC);
+}
+
+static void
+VGAarbiterPutImage(
+    DrawablePtr pDraw,
+    GCPtr   pGC,
+    int     depth,
+    int x, int y, int w, int h,
+    int     leftPad,
+    int     format,
+    char    *pImage )
+{
+    GC_UNWRAP(pGC);
+    VGAGet_GC();
+    (*pGC->ops->PutImage)(pDraw, pGC, depth, x, y, w, h,
+              leftPad, format, pImage);
+    VGAPut_GC();
+    GC_WRAP(pGC);
+}
+
+static RegionPtr
+VGAarbiterCopyArea(
+    DrawablePtr pSrc,
+    DrawablePtr pDst,
+    GC *pGC,
+    int srcx, int srcy,
+    int width, int height,
+    int dstx, int dsty )
+{
+    RegionPtr ret;
+
+    GC_UNWRAP(pGC);
+    VGAGet_GC();
+    ret = (*pGC->ops->CopyArea)(pSrc, pDst,
+                pGC, srcx, srcy, width, height, dstx, dsty);
+    VGAPut_GC();
+    GC_WRAP(pGC);
+    return ret;
+}
+
+static RegionPtr
+VGAarbiterCopyPlane(
+    DrawablePtr pSrc,
+    DrawablePtr pDst,
+    GCPtr pGC,
+    int srcx, int srcy,
+    int width, int height,
+    int dstx, int dsty,
+    unsigned long bitPlane )
+{
+    RegionPtr ret;
+
+    GC_UNWRAP(pGC);
+    VGAGet_GC();
+    ret = (*pGC->ops->CopyPlane)(pSrc, pDst, pGC, srcx, srcy,
+                 width, height, dstx, dsty, bitPlane);
+    VGAPut_GC();
+    GC_WRAP(pGC);
+    return ret;
+}
+
+static void
+VGAarbiterPolyPoint(
+    DrawablePtr pDraw,
+    GCPtr pGC,
+    int mode,
+    int npt,
+    xPoint *pptInit )
+{
+    GC_UNWRAP(pGC);
+    VGAGet_GC();
+    (*pGC->ops->PolyPoint)(pDraw, pGC, mode, npt, pptInit);
+    VGAPut_GC();
+    GC_WRAP(pGC);
+}
+
+
+static void
+VGAarbiterPolylines(
+    DrawablePtr pDraw,
+    GCPtr   pGC,
+    int     mode,
+    int     npt,
+    DDXPointPtr pptInit )
+{
+    GC_UNWRAP(pGC);
+    VGAGet_GC();
+    (*pGC->ops->Polylines)(pDraw, pGC, mode, npt, pptInit);
+    VGAPut_GC();
+    GC_WRAP(pGC);
+}
+
+static void
+VGAarbiterPolySegment(
+    DrawablePtr pDraw,
+    GCPtr   pGC,
+    int     nseg,
+    xSegment    *pSeg )
+{
+    GC_UNWRAP(pGC);
+    VGAGet_GC();
+    (*pGC->ops->PolySegment)(pDraw, pGC, nseg, pSeg);
+    VGAPut_GC();
+    GC_WRAP(pGC);
+}
+
+static void
+VGAarbiterPolyRectangle(
+    DrawablePtr  pDraw,
+    GCPtr        pGC,
+    int          nRectsInit,
+    xRectangle  *pRectsInit )
+{
+    GC_UNWRAP(pGC);
+    VGAGet_GC();
+    (*pGC->ops->PolyRectangle)(pDraw, pGC, nRectsInit, pRectsInit);
+    VGAPut_GC();
+    GC_WRAP(pGC);
+}
+
+static void
+VGAarbiterPolyArc(
+    DrawablePtr pDraw,
+    GCPtr   pGC,
+    int     narcs,
+    xArc    *parcs )
+{
+    GC_UNWRAP(pGC);
+    VGAGet_GC();
+    (*pGC->ops->PolyArc)(pDraw, pGC, narcs, parcs);
+    VGAPut_GC();
+    GC_WRAP(pGC);
+}
+
+static void
+VGAarbiterFillPolygon(
+    DrawablePtr pDraw,
+    GCPtr   pGC,
+    int     shape,
+    int     mode,
+    int     count,
+    DDXPointPtr ptsIn )
+{
+    GC_UNWRAP(pGC);
+    VGAGet_GC();
+    (*pGC->ops->FillPolygon)(pDraw, pGC, shape, mode, count, ptsIn);
+    VGAPut_GC();
+    GC_WRAP(pGC);
+}
+
+static void
+VGAarbiterPolyFillRect(
+    DrawablePtr pDraw,
+    GCPtr   pGC,
+    int     nrectFill,
+    xRectangle  *prectInit)
+{
+    GC_UNWRAP(pGC);
+    VGAGet_GC();
+    (*pGC->ops->PolyFillRect)(pDraw, pGC, nrectFill, prectInit);
+    VGAPut_GC();
+    GC_WRAP(pGC);
+}
+
+static void
+VGAarbiterPolyFillArc(
+    DrawablePtr pDraw,
+    GCPtr   pGC,
+    int     narcs,
+    xArc    *parcs )
+{
+    GC_UNWRAP(pGC);
+    VGAGet_GC();
+    (*pGC->ops->PolyFillArc)(pDraw, pGC, narcs, parcs);
+    VGAPut_GC();
+    GC_WRAP(pGC);
+}
+
+static int
+VGAarbiterPolyText8(
+    DrawablePtr pDraw,
+    GCPtr   pGC,
+    int     x,
+    int     y,
+    int     count,
+    char    *chars )
+{
+    int ret;
+
+    GC_UNWRAP(pGC);
+    VGAGet_GC();
+    ret = (*pGC->ops->PolyText8)(pDraw, pGC, x, y, count, chars);
+    VGAPut_GC();
+    GC_WRAP(pGC);
+    return ret;
+}
+
+static int
+VGAarbiterPolyText16(
+    DrawablePtr pDraw,
+    GCPtr   pGC,
+    int     x,
+    int     y,
+    int     count,
+    unsigned short *chars )
+{
+    int ret;
+
+    GC_UNWRAP(pGC);
+    VGAGet_GC();
+    ret = (*pGC->ops->PolyText16)(pDraw, pGC, x, y, count, chars);
+    VGAPut_GC();
+    GC_WRAP(pGC);
+    return ret;
+}
+
+static void
+VGAarbiterImageText8(
+    DrawablePtr pDraw,
+    GCPtr   pGC,
+    int     x,
+    int     y,
+    int     count,
+    char    *chars )
+{
+    GC_UNWRAP(pGC);
+    VGAGet_GC();
+    (*pGC->ops->ImageText8)(pDraw, pGC, x, y, count, chars);
+    VGAPut_GC();
+    GC_WRAP(pGC);
+}
+
+static void
+VGAarbiterImageText16(
+    DrawablePtr pDraw,
+    GCPtr   pGC,
+    int     x,
+    int     y,
+    int     count,
+    unsigned short *chars )
+{
+    GC_UNWRAP(pGC);
+    VGAGet_GC();
+    (*pGC->ops->ImageText16)(pDraw, pGC, x, y, count, chars);
+    VGAPut_GC();
+    GC_WRAP(pGC);
+}
+
+
+static void
+VGAarbiterImageGlyphBlt(
+    DrawablePtr pDraw,
+    GCPtr pGC,
+    int xInit, int yInit,
+    unsigned int nglyph,
+    CharInfoPtr *ppci,
+    pointer pglyphBase )
+{
+    GC_UNWRAP(pGC);
+    VGAGet_GC();
+    (*pGC->ops->ImageGlyphBlt)(pDraw, pGC, xInit, yInit,
+                   nglyph, ppci, pglyphBase);
+    VGAPut_GC();
+    GC_WRAP(pGC);
+}
+
+static void
+VGAarbiterPolyGlyphBlt(
+    DrawablePtr pDraw,
+    GCPtr pGC,
+    int xInit, int yInit,
+    unsigned int nglyph,
+    CharInfoPtr *ppci,
+    pointer pglyphBase )
+{
+    GC_UNWRAP(pGC);
+    VGAGet_GC();
+    (*pGC->ops->PolyGlyphBlt)(pDraw, pGC, xInit, yInit,
+                  nglyph, ppci, pglyphBase);
+    VGAPut_GC();
+    GC_WRAP(pGC);
+}
+
+static void
+VGAarbiterPushPixels(
+    GCPtr   pGC,
+    PixmapPtr   pBitMap,
+    DrawablePtr pDraw,
+    int dx, int dy, int xOrg, int yOrg )
+{
+    GC_UNWRAP(pGC);
+    VGAGet_GC();
+    (*pGC->ops->PushPixels)(pGC, pBitMap, pDraw, dx, dy, xOrg, yOrg);
+    VGAPut_GC();
+    GC_WRAP(pGC);
+}
+
+
+/* miSpriteFuncs */
+static Bool
+VGAarbiterSpriteRealizeCursor(DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCur)
+{
+    Bool val;
+    SPRITE_PROLOG;
+    VGAGet();
+    val = PointPriv->spriteFuncs->RealizeCursor(pDev, pScreen, pCur);
+    VGAPut();
+    SPRITE_EPILOG;
+    return val;
+}
+
+static Bool
+VGAarbiterSpriteUnrealizeCursor(DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCur)
+{
+    Bool val;
+    SPRITE_PROLOG;
+    VGAGet();
+    val = PointPriv->spriteFuncs->UnrealizeCursor(pDev, pScreen, pCur);
+    VGAPut();
+    SPRITE_EPILOG;
+    return val;
+}
+
+static void
+VGAarbiterSpriteSetCursor(DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCur, int x, int y)
+{
+    SPRITE_PROLOG;
+    VGAGet();
+    PointPriv->spriteFuncs->SetCursor(pDev, pScreen, pCur, x, y);
+    VGAPut();
+    SPRITE_EPILOG;
+}
+
+static void
+VGAarbiterSpriteMoveCursor(DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y)
+{
+    SPRITE_PROLOG;
+    VGAGet();
+    PointPriv->spriteFuncs->MoveCursor(pDev, pScreen, x, y);
+    VGAPut();
+    SPRITE_EPILOG;
+}
+
+static Bool
+VGAarbiterDeviceCursorInitialize(DeviceIntPtr pDev, ScreenPtr pScreen)
+{
+    Bool val;
+    SPRITE_PROLOG;
+    VGAGet();
+    val = PointPriv->spriteFuncs->DeviceCursorInitialize(pDev, pScreen);
+    VGAPut();
+    SPRITE_EPILOG;
+    return val;
+}
+
+static void
+VGAarbiterDeviceCursorCleanup(DeviceIntPtr pDev, ScreenPtr pScreen)
+{
+    SPRITE_PROLOG;
+    VGAGet();
+    PointPriv->spriteFuncs->DeviceCursorCleanup(pDev, pScreen);
+    VGAPut();
+    SPRITE_EPILOG;
+}
+
+static void
+VGAarbiterComposite(CARD8 op, PicturePtr pSrc, PicturePtr pMask,
+         PicturePtr pDst, INT16 xSrc, INT16 ySrc, INT16 xMask,
+         INT16 yMask, INT16 xDst, INT16 yDst, CARD16 width,
+         CARD16 height)
+{
+    ScreenPtr       pScreen = pDst->pDrawable->pScreen;
+    PictureScreenPtr    ps = GetPictureScreen(pScreen);
+
+    PICTURE_PROLOGUE(Composite);
+
+    VGAGet();
+    (*ps->Composite) (op, pSrc, pMask, pDst, xSrc, ySrc, xMask, yMask, xDst,
+              yDst, width, height);
+    VGAPut();
+    PICTURE_EPILOGUE(Composite, VGAarbiterComposite);
+}
+
+static void
+VGAarbiterGlyphs(CARD8 op, PicturePtr pSrc, PicturePtr pDst,
+      PictFormatPtr maskFormat, INT16 xSrc, INT16 ySrc, int nlist,
+      GlyphListPtr list, GlyphPtr *glyphs)
+{
+    ScreenPtr       pScreen = pDst->pDrawable->pScreen;
+    PictureScreenPtr    ps = GetPictureScreen(pScreen);
+
+    PICTURE_PROLOGUE(Glyphs);
+
+    VGAGet();
+    (*ps->Glyphs)(op, pSrc, pDst, maskFormat, xSrc, ySrc, nlist, list, glyphs);
+    VGAPut();
+    PICTURE_EPILOGUE (Glyphs, VGAarbiterGlyphs);
+}
+
+static void
+VGAarbiterCompositeRects(CARD8 op, PicturePtr pDst, xRenderColor *color, int nRect,
+          xRectangle *rects)
+{
+    ScreenPtr       pScreen = pDst->pDrawable->pScreen;
+    PictureScreenPtr    ps = GetPictureScreen(pScreen);
+
+    PICTURE_PROLOGUE(CompositeRects);
+
+    VGAGet();
+    (*ps->CompositeRects)(op, pDst, color, nRect, rects);
+    VGAPut();
+    PICTURE_EPILOGUE (CompositeRects, VGAarbiterCompositeRects);
+}
+#else
+/* dummy functions */
+void xf86VGAarbiterInit(void) {}
+void xf86VGAarbiterFini(void) {}
+
+void xf86VGAarbiterLock(ScrnInfoPtr pScrn) {}
+void xf86VGAarbiterUnlock(ScrnInfoPtr pScrn) {}
+Bool xf86VGAarbiterAllowDRI(ScreenPtr pScreen) { return TRUE; }
+void xf86VGAarbiterScrnInit(ScrnInfoPtr pScrn) {}
+void xf86VGAarbiterDeviceDecodes(ScrnInfoPtr pScrn) {}
+Bool xf86VGAarbiterWrapFunctions(void) { return FALSE; }
+
+#endif
diff --git a/xorg-server/hw/xfree86/common/xf86VGAarbiterPriv.h b/xorg-server/hw/xfree86/common/xf86VGAarbiterPriv.h
index 40d436856..9b4a59731 100644
--- a/xorg-server/hw/xfree86/common/xf86VGAarbiterPriv.h
+++ b/xorg-server/hw/xfree86/common/xf86VGAarbiterPriv.h
@@ -43,9 +43,7 @@
 #include "xf86str.h"
 #include "mipointer.h"
 #include "mipointrst.h"
-#ifdef RENDER
 # include "picturestr.h"
-#endif
 
 
 #define WRAP_SCREEN(x,y) {pScreenPriv->x = pScreen->x; pScreen->x = y;}
@@ -139,11 +137,9 @@ typedef struct _VGAarbiterScreen {
     void                        (*LeaveVT)(int, int);
     void                        (*FreeScreen)(int, int);
     miPointerSpriteFuncPtr      miSprite;
-#ifdef RENDER
     CompositeProcPtr            Composite;
     GlyphsProcPtr               Glyphs;
     CompositeRectsProcPtr       CompositeRects;
-#endif
 } VGAarbiterScreenRec, *VGAarbiterScreenPtr;
 
 typedef struct _VGAarbiterGC {
@@ -254,7 +250,6 @@ static Bool VGAarbiterDeviceCursorInitialize(DeviceIntPtr pDev, ScreenPtr pScree
 static void VGAarbiterDeviceCursorCleanup(DeviceIntPtr pDev, ScreenPtr pScreen);
 
 
-#ifdef RENDER
 static void VGAarbiterComposite(CARD8 op, PicturePtr pSrc, PicturePtr pMask,
     PicturePtr pDst, INT16 xSrc, INT16 ySrc, INT16 xMask, INT16 yMask,
     INT16 xDst, INT16 yDst, CARD16 width, CARD16 height);
@@ -263,4 +258,3 @@ static void VGAarbiterGlyphs(CARD8 op, PicturePtr pSrc, PicturePtr pDst,
     list, GlyphPtr *glyphs);
 static void VGAarbiterCompositeRects(CARD8 op, PicturePtr pDst, xRenderColor
     *color, int nRect, xRectangle *rects);
-#endif
diff --git a/xorg-server/hw/xfree86/dixmods/extmod/modinit.c b/xorg-server/hw/xfree86/dixmods/extmod/modinit.c
index 299562592..7d2086802 100644
--- a/xorg-server/hw/xfree86/dixmods/extmod/modinit.c
+++ b/xorg-server/hw/xfree86/dixmods/extmod/modinit.c
@@ -47,15 +47,6 @@ static ExtensionModule extensionModules[] = {
 	NULL
     },
 #endif
-#ifdef MULTIBUFFER
-    {
-	MultibufferExtensionInit,
-	MULTIBUFFER_PROTOCOL_NAME,
-	&noMultibufferExtension,
-	NULL,
-	NULL
-    },
-#endif
 #ifdef SCREENSAVER
     {
 	ScreenSaverExtensionInit,
diff --git a/xorg-server/hw/xfree86/dixmods/extmod/modinit.h b/xorg-server/hw/xfree86/dixmods/extmod/modinit.h
index 6210526aa..1154e4601 100644
--- a/xorg-server/hw/xfree86/dixmods/extmod/modinit.h
+++ b/xorg-server/hw/xfree86/dixmods/extmod/modinit.h
@@ -9,11 +9,6 @@
 
 #include <X11/extensions/shapeproto.h>
 
-#ifdef MULTIBUFFER
-extern void MultibufferExtensionInit(INITARGS);
-#include <X11/extensions/multibufproto.h>
-#endif
-
 #ifdef XTEST
 extern void XTestExtensionInit(INITARGS);
 #include <X11/extensions/xtestproto.h>
diff --git a/xorg-server/hw/xfree86/i2c/fi1236.c b/xorg-server/hw/xfree86/i2c/fi1236.c
index 7c39edbee..61224eaa5 100644
--- a/xorg-server/hw/xfree86/i2c/fi1236.c
+++ b/xorg-server/hw/xfree86/i2c/fi1236.c
@@ -398,10 +398,6 @@ int TUNER_get_afc_hint(FI1236Ptr f)
 {
 if(f->afc_timer_installed)return TUNER_STILL_TUNING;
 return f->last_afc_hint;
-if(f->type==TUNER_TYPE_MT2032)
-	return MT2032_get_afc_hint(f);
-	else
-	return FI1236_get_afc_hint(f);
 }
 
 static void MT2032_dump_status(FI1236Ptr f)
diff --git a/xorg-server/hw/xfree86/modes/xf86Crtc.c b/xorg-server/hw/xfree86/modes/xf86Crtc.c
index 860e520ad..1ccaffc10 100644
--- a/xorg-server/hw/xfree86/modes/xf86Crtc.c
+++ b/xorg-server/hw/xfree86/modes/xf86Crtc.c
@@ -42,9 +42,7 @@
 #include "X11/extensions/render.h"
 #include "X11/extensions/dpmsconst.h"
 #include "X11/Xatom.h"
-#ifdef RENDER
 #include "picturestr.h"
-#endif
 
 #include "xf86xv.h"
 
@@ -184,7 +182,6 @@ xf86CrtcInUse (xf86CrtcPtr crtc)
 void
 xf86CrtcSetScreenSubpixelOrder (ScreenPtr pScreen)
 {
-#ifdef RENDER
     int			subpixel_order = SubPixelUnknown;
     Bool		has_none = FALSE;
     ScrnInfoPtr		scrn = xf86Screens[pScreen->myNum];
@@ -243,7 +240,6 @@ xf86CrtcSetScreenSubpixelOrder (ScreenPtr pScreen)
     if (subpixel_order == SubPixelUnknown && has_none)
 	subpixel_order = SubPixelNone;
     PictureSetSubpixelOrder (pScreen, subpixel_order);
-#endif
 }
 
 /**
diff --git a/xorg-server/hw/xfree86/modes/xf86Cursors.c b/xorg-server/hw/xfree86/modes/xf86Cursors.c
index e2e174e59..f90ecc227 100644
--- a/xorg-server/hw/xfree86/modes/xf86Cursors.c
+++ b/xorg-server/hw/xfree86/modes/xf86Cursors.c
@@ -41,9 +41,7 @@
 #include "X11/extensions/render.h"
 #include "X11/extensions/dpmsconst.h"
 #include "X11/Xatom.h"
-#ifdef RENDER
 #include "picturestr.h"
-#endif
 #include "cursorstr.h"
 #include "inputstr.h"
 
diff --git a/xorg-server/hw/xfree86/os-support/shared/posix_tty.c b/xorg-server/hw/xfree86/os-support/shared/posix_tty.c
index 4ba8599ab..da57939cf 100644
--- a/xorg-server/hw/xfree86/os-support/shared/posix_tty.c
+++ b/xorg-server/hw/xfree86/os-support/shared/posix_tty.c
@@ -340,14 +340,9 @@ xf86SetSerial (int fd, pointer options)
 
 	if ((xf86SetBoolOption (options, "ClearRTS", FALSE)))
 	{
-#ifdef CLEARRTS_SUPPORT
-		val = TIOCM_RTS;
-		SYSCALL (ioctl(fd, TIOCMBIC, &val));
-#else
 		xf86Msg (X_WARNING,
 			 "Option ClearRTS not supported on this OS\n");
 			return (-1);
-#endif
 		xf86MarkOptionUsedByName (options, "ClearRTS");
 	}
 
diff --git a/xorg-server/hw/xfree86/parser/read.c b/xorg-server/hw/xfree86/parser/read.c
index 1091be5e5..4e42b24f0 100644
--- a/xorg-server/hw/xfree86/parser/read.c
+++ b/xorg-server/hw/xfree86/parser/read.c
@@ -219,15 +219,15 @@ xf86readConfigFile (void)
 			}
 			else
 			{
-				Error (INVALID_SECTION_MSG, xf86tokenString ());
 				free(val.str);
 				val.str = NULL;
+				Error (INVALID_SECTION_MSG, xf86tokenString ());
 			}
 			break;
 		default:
-			Error (INVALID_KEYWORD_MSG, xf86tokenString ());
 			free(val.str);
 			val.str = NULL;
+			Error (INVALID_KEYWORD_MSG, xf86tokenString ());
 		}
 	}
 
diff --git a/xorg-server/hw/xfree86/parser/scan.c b/xorg-server/hw/xfree86/parser/scan.c
index 8aab0cf41..06710d55a 100644
--- a/xorg-server/hw/xfree86/parser/scan.c
+++ b/xorg-server/hw/xfree86/parser/scan.c
@@ -845,10 +845,13 @@ static int
 ConfigFilter(const struct dirent *de)
 {
 	const char *name = de->d_name;
-	size_t len = strlen(name);
+	size_t len;
 	size_t suflen = strlen(XCONFIGSUFFIX);
 
-	if (!name || name[0] == '.' || len <= suflen)
+	if (!name || name[0] == '.')
+		return 0;
+	len = strlen(name);
+	if(len <= suflen)
 		return 0;
 	if (strcmp(&name[len-suflen], XCONFIGSUFFIX) != 0)
 		return 0;
diff --git a/xorg-server/hw/xfree86/shadowfb/shadow.c b/xorg-server/hw/xfree86/shadowfb/shadow.c
index 9c9aa0d55..1c8170104 100644
--- a/xorg-server/hw/xfree86/shadowfb/shadow.c
+++ b/xorg-server/hw/xfree86/shadowfb/shadow.c
@@ -27,9 +27,7 @@
 #include "xf86str.h"
 #include "shadowfb.h"
 
-#ifdef RENDER
 # include "picturestr.h"
-#endif
 
 static Bool ShadowCloseScreen (int i, ScreenPtr pScreen);
 static void ShadowCopyWindow(
@@ -51,7 +49,6 @@ static Bool ShadowModifyPixmapHeader(
 static Bool ShadowEnterVT(int index, int flags);
 static void ShadowLeaveVT(int index, int flags);
 
-#ifdef RENDER
 static void ShadowComposite(
     CARD8 op,
     PicturePtr pSrc,
@@ -66,7 +63,6 @@ static void ShadowComposite(
     CARD16 width,
     CARD16 height
 );
-#endif /* RENDER */
 
 
 typedef struct {
@@ -77,9 +73,7 @@ typedef struct {
   CopyWindowProcPtr			CopyWindow;
   CreateGCProcPtr			CreateGC;
   ModifyPixmapHeaderProcPtr		ModifyPixmapHeader;
-#ifdef RENDER
   CompositeProcPtr Composite;
-#endif /* RENDER */
   Bool				(*EnterVT)(int, int);
   void				(*LeaveVT)(int, int);
   Bool				vtSema;
@@ -164,9 +158,7 @@ ShadowFBInit2 (
 ){
     ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
     ShadowScreenPtr pPriv;
-#ifdef RENDER
     PictureScreenPtr ps = GetPictureScreenIfSet(pScreen);
-#endif /* RENDER */
 
     if(!preRefreshArea && !postRefreshArea) return FALSE;
     
@@ -199,12 +191,10 @@ ShadowFBInit2 (
     pScrn->EnterVT = ShadowEnterVT;
     pScrn->LeaveVT = ShadowLeaveVT;
 
-#ifdef RENDER
     if(ps) {
       pPriv->Composite = ps->Composite;
       ps->Composite = ShadowComposite;
     }
-#endif /* RENDER */
 
     return TRUE;
 }
@@ -251,9 +241,7 @@ ShadowCloseScreen (int i, ScreenPtr pScreen)
 {
     ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
     ShadowScreenPtr pPriv = GET_SCREEN_PRIVATE(pScreen);
-#ifdef RENDER
     PictureScreenPtr ps = GetPictureScreenIfSet(pScreen);
-#endif /* RENDER */
 
     pScreen->CloseScreen = pPriv->CloseScreen;
     pScreen->CopyWindow = pPriv->CopyWindow;
@@ -263,11 +251,9 @@ ShadowCloseScreen (int i, ScreenPtr pScreen)
     pScrn->EnterVT = pPriv->EnterVT;
     pScrn->LeaveVT = pPriv->LeaveVT;
 
-#ifdef RENDER
     if(ps) {
         ps->Composite = pPriv->Composite;
     }
-#endif /* RENDER */
 
     xfree((pointer)pPriv);
 
@@ -355,7 +341,6 @@ ShadowModifyPixmapHeader(
     return retval;
 }
 
-#ifdef RENDER
 static void
 ShadowComposite(
     CARD8 op,
@@ -408,7 +393,6 @@ ShadowComposite(
         (*pPriv->postRefresh)(pPriv->pScrn, 1, &box);
     }
 }
-#endif /* RENDER */
 
 /**********************************************************/
 
diff --git a/xorg-server/hw/xfree86/xaa/xaa.h b/xorg-server/hw/xfree86/xaa/xaa.h
index 7db6b95d5..2af954fee 100644
--- a/xorg-server/hw/xfree86/xaa/xaa.h
+++ b/xorg-server/hw/xfree86/xaa/xaa.h
@@ -108,9 +108,7 @@
 #include "regionstr.h"
 #include "xf86fbman.h"
 
-#ifdef RENDER
 #include "picturestr.h"
-#endif
 
 /* Flags */
 #define PIXMAP_CACHE			0x00000001
@@ -1251,7 +1249,6 @@ typedef struct _XAAInfoRec {
 
    CARD32 FullPlanemasks[32];
 
-#ifdef RENDER
    Bool (*Composite) (
    	CARD8      op,
         PicturePtr pSrc,
@@ -1336,13 +1333,10 @@ typedef struct _XAAInfoRec {
    CARD32 * CPUToScreenTextureFormats;
 
 
-#endif
-
    /* these were added for 4.3.0 */
    BoxRec SolidLineLimits;
    BoxRec DashedLineLimits;
 
-#ifdef RENDER
    /* These were added for X.Org 6.8.0 */
    Bool (*SetupForCPUToScreenAlphaTexture2) (
 	ScrnInfoPtr	pScrn,
@@ -1373,7 +1367,6 @@ typedef struct _XAAInfoRec {
 	int		flags
    );
    CARD32 *CPUToScreenTextureDstFormats;
-#endif /* RENDER */
 } XAAInfoRec, *XAAInfoRecPtr;
 
 #define SET_SYNC_FLAG(infoRec)	(infoRec)->NeedToSync = TRUE
diff --git a/xorg-server/hw/xfree86/xaa/xaaInit.c b/xorg-server/hw/xfree86/xaa/xaaInit.c
index 2ce2d9085..7d4583dc2 100644
--- a/xorg-server/hw/xfree86/xaa/xaaInit.c
+++ b/xorg-server/hw/xfree86/xaa/xaaInit.c
@@ -100,9 +100,7 @@ XAAInit(ScreenPtr pScreen, XAAInfoRecPtr infoRec)
     ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
     XAAScreenPtr pScreenPriv;
     int i;
-#ifdef RENDER
     PictureScreenPtr    ps = GetPictureScreenIfSet(pScreen);
-#endif
 
     /* Return successfully if no acceleration wanted */
     if (!infoRec)
@@ -173,7 +171,6 @@ XAAInit(ScreenPtr pScreen, XAAInfoRecPtr infoRec)
     pScrn->EnableDisableFBAccess = XAAEnableDisableFBAccess;
 
     pScreenPriv->WindowExposures = pScreen->WindowExposures;
-#ifdef RENDER
     if (ps)
     {
 	pScreenPriv->Composite = ps->Composite;
@@ -181,7 +178,6 @@ XAAInit(ScreenPtr pScreen, XAAInfoRecPtr infoRec)
 	pScreenPriv->Glyphs = ps->Glyphs;
 	ps->Glyphs = XAAGlyphs;
     }
-#endif    
     if(pScrn->overlayFlags & OVERLAY_8_32_PLANAR)
         XAASetupOverlay8_32Planar(pScreen);
 
diff --git a/xorg-server/hw/xfree86/xaa/xaaInitAccel.c b/xorg-server/hw/xfree86/xaa/xaaInitAccel.c
index 157325e4b..6f3d622e1 100644
--- a/xorg-server/hw/xfree86/xaa/xaaInitAccel.c
+++ b/xorg-server/hw/xfree86/xaa/xaaInitAccel.c
@@ -1251,7 +1251,6 @@ XAAInitAccel(ScreenPtr pScreen, XAAInfoRecPtr infoRec)
 	   infoRec->ComputeDash = XAAComputeDash;
     }
 
-#ifdef RENDER
     {
 	Bool haveTexture = infoRec->CPUToScreenTextureFormats &&
 			   infoRec->CPUToScreenTextureDstFormats &&
@@ -1271,7 +1270,6 @@ XAAInitAccel(ScreenPtr pScreen, XAAInfoRecPtr infoRec)
             infoRec->Glyphs = XAADoGlyphs;
         }	
     }
-#endif
 
     /************  Validation Functions **************/
 
diff --git a/xorg-server/hw/xfree86/xaa/xaaStateChange.c b/xorg-server/hw/xfree86/xaa/xaaStateChange.c
index 57d8aa318..f33261453 100644
--- a/xorg-server/hw/xfree86/xaa/xaaStateChange.c
+++ b/xorg-server/hw/xfree86/xaa/xaaStateChange.c
@@ -260,7 +260,6 @@ typedef struct _XAAStateWrapRec {
    GetImageProcPtr GetImage;
    GetSpansProcPtr GetSpans;
    CopyWindowProcPtr CopyWindow;
-#ifdef RENDER
    Bool (*SetupForCPUToScreenAlphaTexture2)(ScrnInfoPtr pScrn, int op,
                                            CARD16 red, CARD16 green,
                                            CARD16 blue, CARD16 alpha,
@@ -271,7 +270,6 @@ typedef struct _XAAStateWrapRec {
                                       CARD32 srcFormat, CARD32 dstFormat,
                                       CARD8 *texPtr, int texPitch,
                                       int width, int height, int flags);
-#endif
 } XAAStateWrapRec, *XAAStateWrapPtr;
 
 static int XAAStateKeyIndex;
@@ -1457,7 +1455,6 @@ static void XAAStateWrapCopyWindow(WindowPtr pWindow, DDXPointRec ptOldOrg,
 			     prgnSrc);
 }
 
-#ifdef RENDER
 static Bool XAAStateWrapSetupForCPUToScreenAlphaTexture2(ScrnInfoPtr pScrn,
                                                          int op, CARD16 red,
                                                          CARD16 green,
@@ -1494,7 +1491,6 @@ static Bool XAAStateWrapSetupForCPUToScreenTexture2(ScrnInfoPtr pScrn, int op,
                                                     dstFormat, texPtr, texPitch,
 						    width, height, flags);
 }
-#endif
 
 /* Setup Function */
 Bool
@@ -1624,9 +1620,7 @@ XAAInitStateWrap(ScreenPtr pScreen, XAAInfoRecPtr infoRec)
    XAA_STATE_WRAP(GetImage);
    XAA_STATE_WRAP(GetSpans);
    XAA_STATE_WRAP(CopyWindow);
-#ifdef RENDER
    XAA_STATE_WRAP(SetupForCPUToScreenAlphaTexture2);
    XAA_STATE_WRAP(SetupForCPUToScreenTexture2);
-#endif
    return TRUE;
 }
diff --git a/xorg-server/hw/xfree86/xaa/xaaWrapper.c b/xorg-server/hw/xfree86/xaa/xaaWrapper.c
index 88418946f..d6409887c 100644
--- a/xorg-server/hw/xfree86/xaa/xaaWrapper.c
+++ b/xorg-server/hw/xfree86/xaa/xaaWrapper.c
@@ -62,10 +62,8 @@ typedef struct {
     UninstallColormapProcPtr	UninstallColormap;
     ListInstalledColormapsProcPtr ListInstalledColormaps;
     StoreColorsProcPtr		StoreColors;
-#ifdef RENDER
     CompositeProcPtr		Composite;
     GlyphsProcPtr		Glyphs;
-#endif    
 
     CloseScreenProcPtr		wrapCloseScreen;
     CreateScreenResourcesProcPtr wrapCreateScreenResources;
@@ -79,10 +77,8 @@ typedef struct {
     UninstallColormapProcPtr	wrapUninstallColormap;
     ListInstalledColormapsProcPtr wrapListInstalledColormaps;
     StoreColorsProcPtr		wrapStoreColors;
-#ifdef RENDER
     CompositeProcPtr		wrapComposite;
     GlyphsProcPtr		wrapGlyphs;
-#endif    
     int depth;
 } xaaWrapperScrPrivRec, *xaaWrapperScrPrivPtr;
 
@@ -270,9 +266,7 @@ xaaSetupWrapper(ScreenPtr pScreen, XAAInfoRecPtr infoPtr, int depth, SyncFunc *f
 {
     Bool ret;
     xaaWrapperScrPrivPtr pScrPriv;
-#ifdef RENDER
     PictureScreenPtr	ps = GetPictureScreenIfSet(pScreen);
-#endif
 
     if (!dixRequestPrivate(xaaWrapperGCPrivateKey, sizeof(xaaWrapperGCPrivRec)))
 	return FALSE;
@@ -293,12 +287,10 @@ xaaSetupWrapper(ScreenPtr pScreen, XAAInfoRecPtr infoPtr, int depth, SyncFunc *f
     get (pScrPriv, pScreen, UninstallColormap, wrapUninstallColormap);
     get (pScrPriv, pScreen, ListInstalledColormaps, wrapListInstalledColormaps);
     get (pScrPriv, pScreen, StoreColors, wrapStoreColors);
-#ifdef RENDER
     if (ps) {
 	get (pScrPriv, ps, Glyphs, wrapGlyphs);
 	get (pScrPriv, ps, Composite, wrapComposite);
     }
-#endif
     if (!(ret = XAAInit(pScreen,infoPtr)))
 	return FALSE;
     
@@ -317,12 +309,10 @@ xaaSetupWrapper(ScreenPtr pScreen, XAAInfoRecPtr infoPtr, int depth, SyncFunc *f
 	  xaaWrapperListInstalledColormaps);
     wrap (pScrPriv, pScreen, StoreColors, xaaWrapperStoreColors);
 
-#ifdef RENDER
     if (ps) {
 	wrap (pScrPriv, ps, Glyphs, xaaWrapperGlyphs);
 	wrap (pScrPriv, ps, Composite, xaaWrapperComposite);
     }
-#endif
     pScrPriv->depth = depth;
     dixSetPrivate(&pScreen->devPrivates, xaaWrapperScrPrivateKey, pScrPriv);
 
@@ -438,7 +428,6 @@ xaaWrapperDestroyClip(GCPtr pGC)
     XAAWRAPPER_GC_FUNC_EPILOGUE (pGC);
 }
 
-#ifdef RENDER
 static void
 xaaWrapperComposite (CARD8 op, PicturePtr pSrc, PicturePtr pMask, PicturePtr pDst,
 	     INT16 xSrc, INT16 ySrc, INT16 xMask, INT16 yMask,
@@ -470,7 +459,6 @@ xaaWrapperGlyphs (CARD8 op, PicturePtr pSrc, PicturePtr pDst,
     wrap (pScrPriv, ps, Glyphs, xaaWrapperGlyphs);
 
 }
-#endif
 
 void
 XAASync(ScreenPtr pScreen)
diff --git a/xorg-server/hw/xfree86/xaa/xaalocal.h b/xorg-server/hw/xfree86/xaa/xaalocal.h
index 5e3d373c6..129c1d6c4 100644
--- a/xorg-server/hw/xfree86/xaa/xaalocal.h
+++ b/xorg-server/hw/xfree86/xaa/xaalocal.h
@@ -10,9 +10,7 @@
 #include "xf86fbman.h"
 #include "xaa.h"
 #include "mi.h"
-#ifdef RENDER
 #include "picturestr.h"
-#endif
 
 #define GCWhenForced		(GCArcMode << 1)
 
@@ -55,10 +53,8 @@ typedef struct _XAAScreen {
    void                		(*LeaveVT)(int, int);
    int				(*SetDGAMode)(int, int, DGADevicePtr);
    void				(*EnableDisableFBAccess)(int, Bool);
-#ifdef RENDER
     CompositeProcPtr            Composite;
     GlyphsProcPtr               Glyphs;
-#endif
 } XAAScreenRec, *XAAScreenPtr;
 
 #define	OPS_ARE_PIXMAP		0x00000001
@@ -1539,7 +1535,6 @@ extern _X_EXPORT void XAARemoveAreaCallback(FBAreaPtr area);
 extern _X_EXPORT void XAAMoveOutOffscreenPixmap(PixmapPtr pPix);
 extern _X_EXPORT Bool XAAInitStateWrap(ScreenPtr pScreen, XAAInfoRecPtr infoRec);
 
-#ifdef RENDER
 extern _X_EXPORT void
 XAAComposite (CARD8      op,
 	      PicturePtr pSrc,
@@ -1627,8 +1622,6 @@ XAAGetPixelFromRGBA (
     CARD32 format
 );
 
-#endif
-
 /* XXX should be static */
 extern _X_EXPORT GCOps XAAFallbackOps;
 extern _X_EXPORT GCOps *XAAGetFallbackOps(void);
diff --git a/xorg-server/hw/xfree86/xaa/xaawrap.h b/xorg-server/hw/xfree86/xaa/xaawrap.h
index 857dbc3ed..86ba003d6 100644
--- a/xorg-server/hw/xfree86/xaa/xaawrap.h
+++ b/xorg-server/hw/xfree86/xaa/xaawrap.h
@@ -61,14 +61,12 @@
 #include <xorg-config.h>
 #endif
 
-#ifdef RENDER
 #define XAA_RENDER_PROLOGUE(pScreen,field)\
     (GetPictureScreen(pScreen)->field = \
      ((XAAScreenPtr)dixLookupPrivate(&(pScreen)->devPrivates, XAAGetScreenKey()))->field)
 
 #define XAA_RENDER_EPILOGUE(pScreen, field, wrapper)\
     (GetPictureScreen(pScreen)->field = wrapper)
-#endif
 
 /* This also works fine for drawables */
 
diff --git a/xorg-server/hw/xquartz/darwin.c b/xorg-server/hw/xquartz/darwin.c
index d3f448820..1fb158b26 100644
--- a/xorg-server/hw/xquartz/darwin.c
+++ b/xorg-server/hw/xquartz/darwin.c
@@ -240,11 +240,9 @@ static Bool DarwinScreenInit(int index, ScreenPtr pScreen, int argc, char **argv
         return FALSE;
     }
 
-#ifdef RENDER
     if (! fbPictureInit(pScreen, 0, 0)) {
         return FALSE;
     }
-#endif
 
 #ifdef MITSHM
     ShmRegisterFbFuncs(pScreen);
diff --git a/xorg-server/hw/xquartz/mach-startup/launchd_fd.h b/xorg-server/hw/xquartz/mach-startup/launchd_fd.h
index 5083fae21..12caf7193 100644
--- a/xorg-server/hw/xquartz/mach-startup/launchd_fd.h
+++ b/xorg-server/hw/xquartz/mach-startup/launchd_fd.h
@@ -33,4 +33,4 @@
 
 int launchd_display_fd(void);
 
-#endif /* _XQUARTZ_LAUNCHD_FD_H_ */
\ No newline at end of file
+#endif /* _XQUARTZ_LAUNCHD_FD_H_ */
diff --git a/xorg-server/hw/xwin/InitOutput.c b/xorg-server/hw/xwin/InitOutput.c
index f65d7c9b0..ffbc44643 100644
--- a/xorg-server/hw/xwin/InitOutput.c
+++ b/xorg-server/hw/xwin/InitOutput.c
@@ -47,7 +47,6 @@ from The Open Group.
 #if defined(WIN32)
 #include "xkbsrv.h"
 #endif
-
 #ifdef RELOCATE_PROJECTROOT
 #undef Status
 #include <shlobj.h>
@@ -160,9 +159,7 @@ static PixmapFormatRec g_PixmapFormats[] = {
   { 15,   16,     BITMAP_SCANLINE_PAD },
   { 16,   16,     BITMAP_SCANLINE_PAD },
   { 24,   32,     BITMAP_SCANLINE_PAD },
-#ifdef RENDER
   { 32,   32,     BITMAP_SCANLINE_PAD }
-#endif
 };
 
 const int NUMFORMATS = sizeof (g_PixmapFormats) / sizeof (g_PixmapFormats[0]);
diff --git a/xorg-server/hw/xwin/win.h b/xorg-server/hw/xwin/win.h
index 3672c135e..1adee2136 100644
--- a/xorg-server/hw/xwin/win.h
+++ b/xorg-server/hw/xwin/win.h
@@ -1,1438 +1,1436 @@
-/*

- *Copyright (C) 1994-2000 The XFree86 Project, Inc. All Rights Reserved.

- *

- *Permission is hereby granted, free of charge, to any person obtaining

- * a copy of this software and associated documentation files (the

- *"Software"), to deal in the Software without restriction, including

- *without limitation the rights to use, copy, modify, merge, publish,

- *distribute, sublicense, and/or sell copies of the Software, and to

- *permit persons to whom the Software is furnished to do so, subject to

- *the following conditions:

- *

- *The above copyright notice and this permission notice shall be

- *included in all copies or substantial portions of the Software.

- *

- *THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

- *EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

- *MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

- *NONINFRINGEMENT. IN NO EVENT SHALL THE XFREE86 PROJECT BE LIABLE FOR

- *ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF

- *CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION

- *WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

- *

- *Except as contained in this notice, the name of the XFree86 Project

- *shall not be used in advertising or otherwise to promote the sale, use

- *or other dealings in this Software without prior written authorization

- *from the XFree86 Project.

- *

- * Authors:	Dakshinamurthy Karra

- *		Suhaib M Siddiqi

- *		Peter Busch

- *		Harold L Hunt II

- *		Kensuke Matsuzaki

- */

-

-#ifndef _WIN_H_

-#define _WIN_H_

-

-#ifndef NO

-#define NO					0

-#endif

-#ifndef YES

-#define YES					1

-#endif

-

-/* WM_XBUTTON Messages. They should go into w32api. */

-#ifndef WM_XBUTTONDOWN

-# define WM_XBUTTONDOWN 523

-#endif

-#ifndef WM_XBUTTONUP

-# define WM_XBUTTONUP 524

-#endif

-#ifndef WM_XBUTTONDBLCLK

-# define WM_XBUTTONDBLCLK 525

-#endif

-

-

-#define WIN_DEFAULT_BPP				0

-#define WIN_DEFAULT_WHITEPIXEL			255

-#define WIN_DEFAULT_BLACKPIXEL			0

-#define WIN_DEFAULT_LINEBIAS			0

-#define WIN_DEFAULT_E3B_TIME			50 /* milliseconds */

-#define WIN_DEFAULT_DPI				75

-#define WIN_DEFAULT_REFRESH			0

-#define WIN_DEFAULT_WIN_KILL			TRUE

-#define WIN_DEFAULT_UNIX_KILL			FALSE

-#define WIN_DEFAULT_CLIP_UPDATES_NBOXES		0

-#ifdef XWIN_EMULATEPSEUDO

-#define WIN_DEFAULT_EMULATE_PSEUDO		FALSE

-#endif

-#define WIN_DEFAULT_USER_GAVE_HEIGHT_AND_WIDTH	FALSE

-

-#define WIN_DIB_MAXIMUM_SIZE	0x08000000 /* 16 MB on Windows 95, 98, Me */

-#define WIN_DIB_MAXIMUM_SIZE_MB (WIN_DIB_MAXIMUM_SIZE / 8 / 1024 / 1024)

-

-/*

- * Windows only supports 256 color palettes

- */

-#define WIN_NUM_PALETTE_ENTRIES			256

-

-/*

- * Number of times to call Restore in an attempt to restore the primary surface

- */

-#define WIN_REGAIN_SURFACE_RETRIES		1

-

-/*

- * Build a supported display depths mask by shifting one to the left

- * by the number of bits in the supported depth.

- */

-#define WIN_SUPPORTED_BPPS	( (1 << (32 - 1)) | (1 << (24 - 1)) \

-				| (1 << (16 - 1)) | (1 << (15 - 1)) \

-				| (1 << ( 8 - 1)))

-#define WIN_CHECK_DEPTH		YES

-

-/*

- * Timer IDs for WM_TIMER

- */

-#define WIN_E3B_TIMER_ID		1

-#define WIN_POLLING_MOUSE_TIMER_ID	2

-

-#define MOUSE_POLLING_INTERVAL		50

-

-#define WIN_E3B_OFF		-1

-#define WIN_FD_INVALID		-1

-

-#define WIN_SERVER_NONE		0x0L	/* 0 */

-#define WIN_SERVER_SHADOW_GDI	0x1L	/* 1 */

-#define WIN_SERVER_SHADOW_DD	0x2L	/* 2 */

-#define WIN_SERVER_SHADOW_DDNL	0x4L	/* 4 */

-#ifdef XWIN_PRIMARYFB

-#define WIN_SERVER_PRIMARY_DD	0x8L	/* 8 */

-#endif

-#ifdef XWIN_NATIVEGDI

-# define WIN_SERVER_NATIVE_GDI	0x10L	/* 16 */

-#endif

-

-#define AltMapIndex		Mod1MapIndex

-#define NumLockMapIndex		Mod2MapIndex

-#define AltLangMapIndex		Mod3MapIndex

-#define KanaMapIndex		Mod4MapIndex

-#define ScrollLockMapIndex	Mod5MapIndex

-

-#define WIN_MOD_LALT		0x00000001

-#define WIN_MOD_RALT		0x00000002

-#define WIN_MOD_LCONTROL	0x00000004

-#define WIN_MOD_RCONTROL	0x00000008

-

-#define WIN_24BPP_MASK_RED	0x00FF0000

-#define WIN_24BPP_MASK_GREEN	0x0000FF00

-#define WIN_24BPP_MASK_BLUE	0x000000FF

-

-#define WIN_MAX_KEYS_PER_KEY	4

-

-#include <sys/types.h>

-#include <sys/stat.h>

-#include <stdio.h>

-

-#include <errno.h>

-#if defined(XWIN_MULTIWINDOWEXTWM) || defined(XWIN_CLIPBOARD) || defined(XWIN_MULTIWINDOW)

-#define HANDLE void *

-#ifdef _MSC_VER

-typedef int pid_t;

-#endif

-#include <pthread.h>

-#undef HANDLE

-#endif

-

-#ifdef HAS_MMAP

-#include <sys/mman.h>

-#ifndef MAP_FILE

-#define MAP_FILE 0

-#endif /* MAP_FILE */

-#endif /* HAS_MMAP */

-

-#include <X11/X.h>

-#include <X11/Xproto.h>

-#include <X11/Xos.h>

-#include <X11/Xprotostr.h>

-#include "scrnintstr.h"

-#include "pixmapstr.h"

-#include "pixmap.h"

-#include "region.h"

-#include "gcstruct.h"

-#include "colormap.h"

-#include "colormapst.h"

-#include "miscstruct.h"

-#include "servermd.h"

-#include "windowstr.h"

-#include "mi.h"

-#include "micmap.h"

-#include "mifillarc.h"

-#include "mifpoly.h"

-#include "mibstore.h"

-#include "input.h"

-#include "mipointer.h"

-#include "X11/keysym.h"

-#include "mibstore.h"

-#include "micoord.h"

-#include "dix.h"

-#include "miline.h"

-#include "shadow.h"

-#include "fb.h"

-#include "rootless.h"

-

-#ifdef RENDER

-#include "mipict.h"

-#include "picturestr.h"

-#endif

-

-#ifdef RANDR

-#include "randrstr.h"

-#endif

-

-/*

- * Windows headers

- */

-#include "winms.h"

-#include "winresource.h"

-

-

-/*

- * Define Windows constants

- */

-

-#define WM_TRAYICON		(WM_USER + 1000)

-#define WM_INIT_SYS_MENU	(WM_USER + 1001)

-#define WM_GIVEUP		(WM_USER + 1002)

-

-

-/* Local includes */

-#include "winwindow.h"

-#include "winmsg.h"

-

-#define PROFILEPOINT(point,thresh)\

-{\

-static unsigned int PROFPT##point = 0;\

-if (++PROFPT##point % thresh == 0)\

-ErrorF (#point ": PROFILEPOINT hit %u times\n", PROFPT##point);\

-}

-

-

-/* We use xor this macro for detecting toggle key state changes */

-#define WIN_XOR(a,b) ((!(a) && (b)) || ((a) && !(b)))

-

-#define DEFINE_ATOM_HELPER(func,atom_name)			\

-static Atom func (void) {					\

-    static int generation;					\

-    static Atom atom;						\

-    if (generation != serverGeneration) {			\

-	generation = serverGeneration;				\

-	atom = MakeAtom (atom_name, strlen (atom_name), TRUE);	\

-    }								\

-    return atom;						\

-}

-

-/*

- * Typedefs for engine dependent function pointers

- */

-

-typedef Bool (*winAllocateFBProcPtr)(ScreenPtr);

-

-typedef void (*winShadowUpdateProcPtr)(ScreenPtr, shadowBufPtr);

-

-typedef Bool (*winCloseScreenProcPtr)(int, ScreenPtr);

-

-typedef Bool (*winInitVisualsProcPtr)(ScreenPtr);

-

-typedef Bool (*winAdjustVideoModeProcPtr)(ScreenPtr);

-

-typedef Bool (*winCreateBoundingWindowProcPtr)(ScreenPtr);

-

-typedef Bool (*winFinishScreenInitProcPtr)(int, ScreenPtr, int, char **);

-

-typedef Bool (*winBltExposedRegionsProcPtr)(ScreenPtr);

-

-typedef Bool (*winActivateAppProcPtr)(ScreenPtr);

-

-typedef Bool (*winRedrawScreenProcPtr)(ScreenPtr pScreen);

-

-typedef Bool (*winRealizeInstalledPaletteProcPtr)(ScreenPtr pScreen);

-

-typedef Bool (*winInstallColormapProcPtr)(ColormapPtr pColormap);

-

-typedef Bool (*winStoreColorsProcPtr)(ColormapPtr pmap, 

-				      int ndef, xColorItem *pdefs);

-

-typedef Bool (*winCreateColormapProcPtr)(ColormapPtr pColormap);

-

-typedef Bool (*winDestroyColormapProcPtr)(ColormapPtr pColormap);

-

-typedef Bool (*winHotKeyAltTabProcPtr)(ScreenPtr);

-

-typedef Bool (*winCreatePrimarySurfaceProcPtr)(ScreenPtr);

-

-typedef Bool (*winReleasePrimarySurfaceProcPtr)(ScreenPtr);

-

-typedef Bool (*winFinishCreateWindowsWindowProcPtr)(WindowPtr pWin);

-

-typedef Bool (*winCreateScreenResourcesProc)(ScreenPtr);

-

-/* Typedef for DIX wrapper functions */

-typedef int (*winDispatchProcPtr) (ClientPtr);

-

-

-/*

- * GC (graphics context) privates

- */

-

-typedef struct

-{

-  HDC			hdc;

-  HDC			hdcMem;

-} winPrivGCRec, *winPrivGCPtr;

-

-

-/*

- * Pixmap privates

- */

-

-typedef struct

-{

-  HDC			hdcSelected;

-  HBITMAP		hBitmap;

-  BYTE			*pbBits;

-  DWORD			dwScanlineBytes;

-  BITMAPINFOHEADER	*pbmih;

-} winPrivPixmapRec, *winPrivPixmapPtr;

-

-

-/*

- * Colormap privates

- */

-

-typedef struct

-{

-  HPALETTE		hPalette;

-  LPDIRECTDRAWPALETTE	lpDDPalette;

-  RGBQUAD		rgbColors[WIN_NUM_PALETTE_ENTRIES];

-  PALETTEENTRY		peColors[WIN_NUM_PALETTE_ENTRIES];

-} winPrivCmapRec, *winPrivCmapPtr;

-

-/*

- * Windows Cursor handling.

- */ 

-  

-typedef struct {

-  /* from GetSystemMetrics */

-  int sm_cx;

-  int sm_cy;

-

-  BOOL visible;

-  HCURSOR handle;

-  QueryBestSizeProcPtr QueryBestSize;

-  miPointerSpriteFuncPtr spriteFuncs;

-} winCursorRec;

-

-/*

- * Screen information structure that we need before privates are available

- * in the server startup sequence.

- */

-

-typedef struct

-{

-  ScreenPtr		pScreen;

-  

-  /* Did the user specify a height and width? */

-  Bool			fUserGaveHeightAndWidth;

-

-  DWORD			dwScreen;

-  DWORD			dwUserWidth;

-  DWORD			dwUserHeight;

-  DWORD			dwWidth;

-  DWORD			dwHeight;

-  DWORD			dwWidth_mm;

-  DWORD			dwHeight_mm;

-  DWORD			dwPaddedWidth;

-

-  /* Did the user specify a screen position? */

-  Bool			fUserGavePosition;

-  DWORD                 dwInitialX;

-  DWORD                 dwInitialY;

-

-  /*

-   * dwStride is the number of whole pixels that occupy a scanline,

-   * including those pixels that are not displayed.  This is basically

-   * a rounding up of the width.

-   */

-  DWORD			dwStride;

-

-  /* Offset of the screen in the window when using scrollbars */

-  DWORD			dwXOffset;

-  DWORD			dwYOffset;

-

-  DWORD			dwBPP;

-  DWORD			dwDepth;

-  DWORD			dwRefreshRate;

-  char			*pfb;

-  DWORD			dwEngine;

-  DWORD			dwEnginePreferred;

-  DWORD			dwClipUpdatesNBoxes;

-#ifdef XWIN_EMULATEPSEUDO

-  Bool			fEmulatePseudo;

-#endif

-  Bool			fFullScreen;

-  Bool			fDecoration;

-#ifdef XWIN_MULTIWINDOWEXTWM

-  Bool			fMWExtWM;

-  Bool			fInternalWM;

-  Bool			fAnotherWMRunning;

-#endif

-  Bool			fRootless;

-#ifdef XWIN_MULTIWINDOW

-  Bool			fMultiWindow;

-#endif

-#if defined(XWIN_MULTIWINDOW) || defined(XWIN_MULTIWINDOWEXTWM)

-  Bool			fMultiMonitorOverride;

-#endif

-  Bool                  fMultipleMonitors;

-  Bool			fLessPointer;

-  Bool			fScrollbars;

-  Bool			fNoTrayIcon;

-  int			iE3BTimeout;

-  /* Windows (Alt+F4) and Unix (Ctrl+Alt+Backspace) Killkey */

-  Bool                  fUseWinKillKey;

-  Bool                  fUseUnixKillKey;

-  Bool			fIgnoreInput;

-

-  /* Did the user explicitly set this screen? */

-  Bool			fExplicitScreen;

-} winScreenInfo, *winScreenInfoPtr;

-

-

-/*

- * Screen privates

- */

-

-typedef struct _winPrivScreenRec

-{

-  winScreenInfoPtr	pScreenInfo;

-

-  Bool			fEnabled;

-  Bool			fClosed;

-  Bool			fActive;

-  Bool			fBadDepth;

-

-  int			iDeltaZ;

-

-  int			iConnectedClients;

-

-  CloseScreenProcPtr	CloseScreen;

-

-  DWORD			dwRedMask;

-  DWORD			dwGreenMask;

-  DWORD			dwBlueMask;

-  DWORD			dwBitsPerRGB;

-

-  DWORD			dwModeKeyStates;

-

-  /* Handle to icons that must be freed */

-  HICON			hiconNotifyIcon;

-

-  /* Last width, height, and depth of the Windows display */

-  DWORD			dwLastWindowsWidth;

-  DWORD			dwLastWindowsHeight;

-  DWORD			dwLastWindowsBitsPixel;

-

-  /* Palette management */

-  ColormapPtr		pcmapInstalled;

-

-  /* Pointer to the root visual so we only have to look it up once */

-  VisualPtr		pRootVisual;

-

-  /* 3 button emulation variables */

-  int			iE3BCachedPress;

-  Bool			fE3BFakeButton2Sent;

-

-  /* Privates used by shadow fb GDI server */

-  HBITMAP		hbmpShadow;

-  HDC			hdcScreen;

-  HDC			hdcShadow;

-  HWND			hwndScreen;

-  

-  /* Privates used by shadow fb and primary fb DirectDraw servers */

-  LPDIRECTDRAW		pdd;

-  LPDIRECTDRAWSURFACE	pddsPrimary;

-  LPDIRECTDRAW2		pdd2;

-

-  /* Privates used by shadow fb DirectDraw server */

-  LPDIRECTDRAWSURFACE	pddsShadow;

-  LPDDSURFACEDESC	pddsdShadow;

-

-#ifdef XWIN_PRIMARYFB

-  /* Privates used by primary fb DirectDraw server */

-  LPDIRECTDRAWSURFACE	pddsOffscreen;

-  LPDDSURFACEDESC	pddsdOffscreen;

-  LPDDSURFACEDESC	pddsdPrimary;

-#endif

-

-  /* Privates used by shadow fb DirectDraw Nonlocking server */

-  LPDIRECTDRAW4		pdd4;

-  LPDIRECTDRAWSURFACE4	pddsShadow4;

-  LPDIRECTDRAWSURFACE4	pddsPrimary4;

-  BOOL			fRetryCreateSurface;

-

-  /* Privates used by both shadow fb DirectDraw servers */

-  LPDIRECTDRAWCLIPPER	pddcPrimary;

-

-#ifdef XWIN_MULTIWINDOWEXTWM

-  /* Privates used by multi-window external window manager */

-  RootlessFrameID	widTop;

-  Bool			fRestacking;

-#endif

-

-#ifdef XWIN_MULTIWINDOW

-  /* Privates used by multi-window */

-  pthread_t		ptWMProc;

-  pthread_t		ptXMsgProc;

-  void			*pWMInfo;

-#endif

-

-#if defined(XWIN_MULTIWINDOW) || defined(XWIN_MULTIWINDOWEXTWM)

-  /* Privates used by both multi-window and rootless */

-  Bool			fRootWindowShown;

-#endif

-

-#if defined(XWIN_CLIPBOARD) || defined(XWIN_MULTIWINDOW)

-  /* Privates used for any module running in a seperate thread */

-  pthread_mutex_t	pmServerStarted;

-  Bool			fServerStarted;

-#endif

-  

-  /* Engine specific functions */

-  winAllocateFBProcPtr			pwinAllocateFB;

-  winShadowUpdateProcPtr		pwinShadowUpdate;

-  winCloseScreenProcPtr			pwinCloseScreen;

-  winInitVisualsProcPtr			pwinInitVisuals;

-  winAdjustVideoModeProcPtr		pwinAdjustVideoMode;

-  winCreateBoundingWindowProcPtr	pwinCreateBoundingWindow;

-  winFinishScreenInitProcPtr		pwinFinishScreenInit;

-  winBltExposedRegionsProcPtr		pwinBltExposedRegions;

-  winActivateAppProcPtr			pwinActivateApp;

-  winRedrawScreenProcPtr		pwinRedrawScreen;

-  winRealizeInstalledPaletteProcPtr	pwinRealizeInstalledPalette;

-  winInstallColormapProcPtr		pwinInstallColormap;

-  winStoreColorsProcPtr			pwinStoreColors;

-  winCreateColormapProcPtr		pwinCreateColormap;

-  winDestroyColormapProcPtr		pwinDestroyColormap;

-  winHotKeyAltTabProcPtr		pwinHotKeyAltTab;

-  winCreatePrimarySurfaceProcPtr	pwinCreatePrimarySurface;

-  winReleasePrimarySurfaceProcPtr	pwinReleasePrimarySurface;

-

-  winCreateScreenResourcesProc       pwinCreateScreenResources;

-

-#ifdef XWIN_MULTIWINDOW

-  /* Window Procedures for MultiWindow mode */

-  winFinishCreateWindowsWindowProcPtr	pwinFinishCreateWindowsWindow;

-#endif

-

-  /* Window Procedures for Rootless mode */

-  CreateWindowProcPtr			CreateWindow;

-  DestroyWindowProcPtr			DestroyWindow;

-  PositionWindowProcPtr			PositionWindow;

-  ChangeWindowAttributesProcPtr		ChangeWindowAttributes;

-  RealizeWindowProcPtr			RealizeWindow;

-  UnrealizeWindowProcPtr		UnrealizeWindow;

-  ValidateTreeProcPtr			ValidateTree;

-  PostValidateTreeProcPtr		PostValidateTree;

-  WindowExposuresProcPtr		WindowExposures;

-  CopyWindowProcPtr			CopyWindow;

-  ClearToBackgroundProcPtr		ClearToBackground;

-  ClipNotifyProcPtr			ClipNotify;

-  RestackWindowProcPtr			RestackWindow;

-  ReparentWindowProcPtr			ReparentWindow;

-  ResizeWindowProcPtr			ResizeWindow;

-  MoveWindowProcPtr			MoveWindow;

-  SetShapeProcPtr			SetShape;

-

-#ifdef XWIN_NATIVEGDI

-  RealizeFontProcPtr                    RealizeFont;

-  UnrealizeFontProcPtr                  UnrealizeFont;

-#endif

-

-  winCursorRec                          cursor;

-} winPrivScreenRec;

-

-

-#ifdef XWIN_MULTIWINDOWEXTWM

-typedef struct {

-  RootlessWindowPtr	pFrame;

-  HWND			hWnd;

-  int			dwWidthBytes;

-  BITMAPINFOHEADER	*pbmihShadow;

-  HBITMAP		hbmpShadow;

-  HDC			hdcShadow;

-  HDC			hdcScreen;

-  BOOL			fResized;

-  BOOL			fRestackingNow;

-  BOOL			fClose;

-  BOOL			fMovingOrSizing;

-  BOOL			fDestroyed;//for debug

-  char			*pfb;

-} win32RootlessWindowRec, *win32RootlessWindowPtr;

-#endif

-

-

-typedef struct {

-  pointer		value;

-  XID			id;

-} WindowIDPairRec, *WindowIDPairPtr;

-

-

-/*

- * Extern declares for general global variables

- */

-

-extern winScreenInfo		g_ScreenInfo[];

-extern miPointerScreenFuncRec	g_winPointerCursorFuncs;

-extern DWORD			g_dwEvents;

-#ifdef HAS_DEVWINDOWS

-extern int			g_fdMessageQueue;

-#endif

-extern DevPrivateKey		g_iScreenPrivateKey;

-extern DevPrivateKey		g_iCmapPrivateKey;

-extern DevPrivateKey		g_iGCPrivateKey;

-extern DevPrivateKey		g_iPixmapPrivateKey;

-extern DevPrivateKey		g_iWindowPrivateKey;

-extern unsigned long		g_ulServerGeneration;

-extern DWORD			g_dwEnginesSupported;

-extern HINSTANCE		g_hInstance;

-extern int                      g_copyROP[];

-extern int                      g_patternROP[];

-extern const char *		g_pszQueryHost;

-extern DeviceIntPtr             g_pwinPointer;

-extern DeviceIntPtr             g_pwinKeyboard;

-

-

-/*

- * Extern declares for dynamically loaded libraries and function pointers

- */

-

-extern HMODULE			g_hmodDirectDraw;

-extern FARPROC			g_fpDirectDrawCreate;

-extern FARPROC			g_fpDirectDrawCreateClipper;

-

-extern HMODULE			g_hmodCommonControls;

-extern FARPROC			g_fpTrackMouseEvent;

-

-

-/*

- * Screen privates macros

- */

-

-#define winGetScreenPriv(pScreen) ((winPrivScreenPtr) \

-    dixLookupPrivate(&(pScreen)->devPrivates, g_iScreenPrivateKey))

-

-#define winSetScreenPriv(pScreen,v) \

-    dixSetPrivate(&(pScreen)->devPrivates, g_iScreenPrivateKey, v)

-

-#define winScreenPriv(pScreen) \

-	winPrivScreenPtr pScreenPriv = winGetScreenPriv(pScreen)

-

-

-/*

- * Colormap privates macros

- */

-

-#define winGetCmapPriv(pCmap) ((winPrivCmapPtr) \

-    dixLookupPrivate(&(pCmap)->devPrivates, g_iCmapPrivateKey))

-

-#define winSetCmapPriv(pCmap,v) \

-    dixSetPrivate(&(pCmap)->devPrivates, g_iCmapPrivateKey, v)

-

-#define winCmapPriv(pCmap) \

-	winPrivCmapPtr pCmapPriv = winGetCmapPriv(pCmap)

-

-

-/*

- * GC privates macros

- */

-

-#define winGetGCPriv(pGC) ((winPrivGCPtr) \

-    dixLookupPrivate(&(pGC)->devPrivates, g_iGCPrivateKey))

-

-#define winSetGCPriv(pGC,v) \

-    dixSetPrivate(&(pGC)->devPrivates, g_iGCPrivateKey, v)

-

-#define winGCPriv(pGC) \

-	winPrivGCPtr pGCPriv = winGetGCPriv(pGC)

-

-

-/*

- * Pixmap privates macros

- */

-

-#define winGetPixmapPriv(pPixmap) ((winPrivPixmapPtr) \

-    dixLookupPrivate(&(pPixmap)->devPrivates, g_iPixmapPrivateKey))

-

-#define winSetPixmapPriv(pPixmap,v) \

-    dixLookupPrivate(&(pPixmap)->devPrivates, g_iPixmapPrivateKey, v)

-

-#define winPixmapPriv(pPixmap) \

-	winPrivPixmapPtr pPixmapPriv = winGetPixmapPriv(pPixmap)

-

-

-/*

- * Window privates macros

- */

-

-#define winGetWindowPriv(pWin) ((winPrivWinPtr) \

-    dixLookupPrivate(&(pWin)->devPrivates, g_iWindowPrivateKey))

-

-#define winSetWindowPriv(pWin,v) \

-    dixLookupPrivate(&(pWin)->devPrivates, g_iWindowPrivateKey, v)

-

-#define winWindowPriv(pWin) \

-	winPrivWinPtr pWinPriv = winGetWindowPriv(pWin)

-

-/*

- * wrapper macros 

- */

-#define _WIN_WRAP(priv, real, mem, func) {\

-    priv->mem = real->mem; \

-    real->mem = func; \

-}

-

-#define _WIN_UNWRAP(priv, real, mem) {\

-    real->mem = priv->mem; \

-}

-

-#define WIN_WRAP(mem, func) _WIN_WRAP(pScreenPriv, pScreen, mem, func) 

-

-#define WIN_UNWRAP(mem) _WIN_UNWRAP(pScreenPriv, pScreen, mem)

-

-/*

- * BEGIN DDX and DIX Function Prototypes

- */

-

-

-/*

- * winallpriv.c

- */

-

-Bool

-winAllocatePrivates (ScreenPtr pScreen);

-

-Bool

-winInitCmapPrivates (ColormapPtr pCmap, int index);

-

-Bool

-winAllocateCmapPrivates (ColormapPtr pCmap);

-

-

-/*

- * winauth.c

- */

-

-#if defined(XWIN_CLIPBOARD) || defined(XWIN_MULTIWINDOW)

-Bool

-winGenerateAuthorization (void);

-void winSetAuthorization(void);

-#endif

-

-

-/*

- * winblock.c

- */

-

-void

-winBlockHandler (int nScreen,

-		 pointer pBlockData,

-		 pointer pTimeout,

-		 pointer pReadMask);

-

-

-#ifdef XWIN_NATIVEGDI

-/*

- * winclip.c

- */

-

-RegionPtr

-winPixmapToRegionNativeGDI (PixmapPtr pPix);

-#endif

-

-

-#ifdef XWIN_CLIPBOARD

-/*

- * winclipboardinit.c

- */

-

-Bool

-winInitClipboard (void);

-

-void

-winFixClipboardChain (void);

-#endif

-

-

-/*

- * wincmap.c

- */

-

-void

-winSetColormapFunctions (ScreenPtr pScreen);

-

-Bool

-winCreateDefColormap (ScreenPtr pScreen);

-

-

-/*

- * wincreatewnd.c

- */

-

-Bool

-winCreateBoundingWindowFullScreen (ScreenPtr pScreen);

-

-Bool

-winCreateBoundingWindowWindowed (ScreenPtr pScreen);

-

-

-/*

- * windialogs.c

- */

-

-int

-GetLiveClients (winPrivScreenPtr pScreenPriv);

-

-void

-winDisplayExitDialog (winPrivScreenPtr pScreenPriv);

-

-void

-winDisplayDepthChangeDialog (winPrivScreenPtr pScreenPriv);

-

-void

-winDisplayAboutDialog (winPrivScreenPtr pScreenPriv);

-

-

-/*

- * winengine.c

- */

-

-void

-winDetectSupportedEngines (void);

-

-Bool

-winSetEngine (ScreenPtr pScreen);

-

-Bool

-winGetDDProcAddresses (void);

-

-

-/*

- * winerror.c

- */

-

-#ifdef DDXOSVERRORF

-void

-OSVenderVErrorF (const char *pszFormat, va_list va_args);

-#endif

-

-void

-winMessageBoxF (const char *pszError, UINT uType, ...);

-

-

-#ifdef XWIN_NATIVEGDI

-/*

- * winfillsp.c

- */

-

-void

-winFillSpansNativeGDI (DrawablePtr	pDrawable,

-		       GCPtr		pGC,

-		       int		nSpans,

-		       DDXPointPtr	pPoints,

-		       int		*pWidths,

-		       int		fSorted);

-#endif

-

-

-#ifdef XWIN_NATIVEGDI

-/*

- * winfont.c

- */

-

-Bool

-winRealizeFontNativeGDI (ScreenPtr pScreen, FontPtr pFont);

-

-Bool

-winUnrealizeFontNativeGDI (ScreenPtr pScreen, FontPtr pFont);

-#endif

-

-

-#ifdef XWIN_NATIVEGDI

-/*

- * wingc.c

- */

-

-Bool

-winCreateGCNativeGDI (GCPtr pGC);

-#endif

-

-

-#ifdef XWIN_NATIVEGDI

-/*

- * wingetsp.c

- */

-

-void

-winGetSpansNativeGDI (DrawablePtr	pDrawable, 

-		      int		wMax, 

-		      DDXPointPtr	pPoints, 

-		      int		*pWidths, 

-		      int		nSpans, 

-		      char		*pDst);

-#endif

-

-

-/*

- * winglobals.c

- */

-

-void

-winInitializeGlobals (void);

-

-

-/*

- * winkeybd.c

- */

-

-void

-winTranslateKey (WPARAM wParam, LPARAM lParam, int *piScanCode);

-

-int

-winKeybdProc (DeviceIntPtr pDeviceInt, int iState);

-

-void

-winInitializeModeKeyStates (void);

-

-void

-winRestoreModeKeyStates (void);

-

-Bool

-winIsFakeCtrl_L (UINT message, WPARAM wParam, LPARAM lParam);

-

-void

-winKeybdReleaseKeys (void);

-

-void

-winSendKeyEvent (DWORD dwKey, Bool fDown);

-

-BOOL

-winCheckKeyPressed(WPARAM wParam, LPARAM lParam);

-

-void

-winFixShiftKeys (int iScanCode);

-

-/*

- * winkeyhook.c

- */

-

-Bool

-winInstallKeyboardHookLL (void);

-

-void

-winRemoveKeyboardHookLL (void);

-

-

-/*

- * winmisc.c

- */

-

-#ifdef XWIN_NATIVEGDI

-void

-winQueryBestSizeNativeGDI (int class, unsigned short *pWidth,

-			   unsigned short *pHeight, ScreenPtr pScreen);

-#endif

-

-CARD8

-winCountBits (DWORD dw);

-

-Bool

-winUpdateFBPointer (ScreenPtr pScreen, void *pbits);

-

-#ifdef XWIN_NATIVEGDI

-BOOL

-winPaintBackground (HWND hwnd, COLORREF colorref);

-#endif

-

-

-/*

- * winmouse.c

- */

-

-int

-winMouseProc (DeviceIntPtr pDeviceInt, int iState);

-

-int

-winMouseWheel (ScreenPtr pScreen, int iDeltaZ);

-

-void

-winMouseButtonsSendEvent (int iEventType, int iButton);

-

-int

-winMouseButtonsHandle (ScreenPtr pScreen,

-		       int iEventType, int iButton,

-		       WPARAM wParam);

-

-void

-winEnqueueMotion(int x, int y);

-

-#ifdef XWIN_NATIVEGDI

-/*

- * winnativegdi.c

- */

-

-HBITMAP

-winCreateDIBNativeGDI (int iWidth, int iHeight, int iDepth,

-		       BYTE **ppbBits, BITMAPINFO **ppbmi);

-

-Bool

-winSetEngineFunctionsNativeGDI (ScreenPtr pScreen);

-#endif

-

-

-#ifdef XWIN_PRIMARYFB

-/*

- * winpfbddd.c

- */

-

-Bool

-winSetEngineFunctionsPrimaryDD (ScreenPtr pScreen);

-#endif

-

-

-#ifdef XWIN_NATIVEGDI

-/*

- * winpixmap.c

- */

-

-PixmapPtr

-winCreatePixmapNativeGDI (ScreenPtr pScreen, int width, int height, int depth,

-			  unsigned usage_hint);

-

-Bool

-winDestroyPixmapNativeGDI (PixmapPtr pPixmap);

-

-Bool

-winModifyPixmapHeaderNativeGDI (PixmapPtr pPixmap,

-				int iWidth, int iHeight,

-				int iDepth,

-				int iBitsPerPixel,

-				int devKind,

-				pointer pPixData);

-#endif

-

-#ifdef XWIN_NATIVEGDI

-/*

- * winpolyline.c

- */

-

-void

-winPolyLineNativeGDI (DrawablePtr	pDrawable,

-		      GCPtr		pGC,

-		      int		mode,

-		      int		npt,

-		      DDXPointPtr	ppt);

-#endif

-

-

-#ifdef XWIN_NATIVEGDI

-/*

- * winpushpxl.c

- */

-

-void

-winPushPixels (GCPtr pGC, PixmapPtr pBitMap, DrawablePtr pDrawable,

-	       int dx, int dy, int xOrg, int yOrg);

-#endif

-

-

-/*

- * winscrinit.c

- */

-

-Bool

-winScreenInit (int index,

-	       ScreenPtr pScreen,

-	       int argc, char **argv);

-

-Bool

-winFinishScreenInitFB (int index,

-		       ScreenPtr pScreen,

-		       int argc, char **argv);

-

-#if defined(XWIN_NATIVEGDI)

-Bool

-winFinishScreenInitNativeGDI (int index,

-			      ScreenPtr pScreen,

-			      int argc, char **argv);

-#endif

-

-

-#ifdef XWIN_NATIVEGDI

-/*

- * winsetsp.c

- */

-

-void

-winSetSpansNativeGDI (DrawablePtr	pDrawable,

-		      GCPtr		pGC,

-		      char		*pSrc,

-		      DDXPointPtr	pPoints,

-		      int		*pWidth,

-		      int		nSpans,

-		      int		fSorted);

-#endif

-

-

-/*

- * winshaddd.c

- */

-

-Bool

-winSetEngineFunctionsShadowDD (ScreenPtr pScreen);

-

-

-/*

- * winshadddnl.c

- */

-

-Bool

-winSetEngineFunctionsShadowDDNL (ScreenPtr pScreen);

-

-

-/*

- * winshadgdi.c

- */

-

-Bool

-winSetEngineFunctionsShadowGDI (ScreenPtr pScreen);

-

-

-/*

- * winwakeup.c

- */

-

-void

-winWakeupHandler (int nScreen,

-		  pointer pWakeupData,

-		  unsigned long ulResult,

-		  pointer pReadmask);

-

-

-/*

- * winwindow.c

- */

-

-#ifdef XWIN_NATIVEGDI

-Bool

-winCreateWindowNativeGDI (WindowPtr pWin);

-

-Bool

-winDestroyWindowNativeGDI (WindowPtr pWin);

-

-Bool

-winPositionWindowNativeGDI (WindowPtr pWin, int x, int y);

-

-void 

-winCopyWindowNativeGDI (WindowPtr pWin,

-			DDXPointRec ptOldOrg,

-			RegionPtr prgnSrc);

-

-Bool

-winChangeWindowAttributesNativeGDI (WindowPtr pWin, unsigned long mask);

-

-Bool

-winUnmapWindowNativeGDI (WindowPtr pWindow);

-

-Bool

-winMapWindowNativeGDI (WindowPtr pWindow);

-#endif

-

-Bool

-winCreateWindowRootless (WindowPtr pWindow);

-

-Bool

-winDestroyWindowRootless (WindowPtr pWindow);

-

-Bool

-winPositionWindowRootless (WindowPtr pWindow, int x, int y);

-

-Bool

-winChangeWindowAttributesRootless (WindowPtr pWindow, unsigned long mask);

-

-Bool

-winUnmapWindowRootless (WindowPtr pWindow);

-

-Bool

-winMapWindowRootless (WindowPtr pWindow);

-

-void

-winSetShapeRootless (WindowPtr pWindow);

-

-

-/*

- * winmultiwindowicons.c - Used by both multi-window and Win32Rootless

- */

-

-HICON

-winXIconToHICON (WindowPtr pWin, int iconSize);

-

-void

-winSelectIcons(WindowPtr pWin, HICON *pIcon, HICON *pSmallIcon);

-

-#ifdef XWIN_MULTIWINDOW

-/*

- * winmultiwindowshape.c

- */

-

-void

-winReshapeMultiWindow (WindowPtr pWin);

-

-void

-winSetShapeMultiWindow (WindowPtr pWindow);

-

-void

-winUpdateRgnMultiWindow (WindowPtr pWindow);

-#endif

-

-

-#ifdef XWIN_MULTIWINDOW

-/*

- * winmultiwindowwindow.c

- */

-

-Bool

-winCreateWindowMultiWindow (WindowPtr pWindow);

-

-Bool

-winDestroyWindowMultiWindow (WindowPtr pWindow);

-

-Bool

-winPositionWindowMultiWindow (WindowPtr pWindow, int x, int y);

-

-Bool

-winChangeWindowAttributesMultiWindow (WindowPtr pWindow, unsigned long mask);

-

-Bool

-winUnmapWindowMultiWindow (WindowPtr pWindow);

-

-Bool

-winMapWindowMultiWindow (WindowPtr pWindow);

-

-void

-winReparentWindowMultiWindow (WindowPtr pWin, WindowPtr pPriorParent);

-

-void

-winRestackWindowMultiWindow (WindowPtr pWin, WindowPtr pOldNextSib);

-

-void

-winReorderWindowsMultiWindow (void);

-

-void

-winResizeWindowMultiWindow (WindowPtr pWin, int x, int y, unsigned int w,

-			    unsigned int h, WindowPtr pSib);

-void

-winMoveWindowMultiWindow (WindowPtr pWin, int x, int y,

-			  WindowPtr pSib, VTKind kind);

-

-void

-winCopyWindowMultiWindow (WindowPtr pWin, DDXPointRec oldpt,

-			  RegionPtr oldRegion);

-

-XID

-winGetWindowID (WindowPtr pWin);

-

-int

-winAdjustXWindow (WindowPtr pWin, HWND hwnd);

-#endif

-

-

-#ifdef XWIN_MULTIWINDOW

-/*

- * winmultiwindowwndproc.c

- */

-

-LRESULT CALLBACK

-winTopLevelWindowProc (HWND hwnd, UINT message, 

-		       WPARAM wParam, LPARAM lParam);

-#endif

-

-

-/*

- * wintrayicon.c

- */

-

-void

-winInitNotifyIcon (winPrivScreenPtr pScreenPriv, Bool Modify);

-

-void

-winDeleteNotifyIcon (winPrivScreenPtr pScreenPriv);

-

-LRESULT

-winHandleIconMessage (HWND hwnd, UINT message,

-		      WPARAM wParam, LPARAM lParam,

-		      winPrivScreenPtr pScreenPriv);

-

-

-/*

- * winwndproc.c

- */

-

-LRESULT CALLBACK

-winWindowProc (HWND hWnd, UINT message, 

-	       WPARAM wParam, LPARAM lParam);

-

-

-#ifdef XWIN_MULTIWINDOWEXTWM

-/*

- * winwin32rootless.c

- */

-

-Bool

-winMWExtWMCreateFrame (RootlessWindowPtr pFrame, ScreenPtr pScreen,

-			     int newX, int newY, RegionPtr pShape);

-

-void

-winMWExtWMDestroyFrame (RootlessFrameID wid);

-

-void

-winMWExtWMMoveFrame (RootlessFrameID wid, ScreenPtr pScreen, int newX, int newY);

-

-void

-winMWExtWMResizeFrame (RootlessFrameID wid, ScreenPtr pScreen,

-			     int newX, int newY, unsigned int newW, unsigned int newH,

-			     unsigned int gravity);

-

-void

-winMWExtWMRestackFrame (RootlessFrameID wid, RootlessFrameID nextWid);

-

-void

-winMWExtWMReshapeFrame (RootlessFrameID wid, RegionPtr pShape);

-

-void

-winMWExtWMUnmapFrame (RootlessFrameID wid);

-

-void

-winMWExtWMStartDrawing (RootlessFrameID wid, char **pixelData, int *bytesPerRow);

-

-void

-winMWExtWMStopDrawing (RootlessFrameID wid, Bool flush);

-

-void

-winMWExtWMUpdateRegion (RootlessFrameID wid, RegionPtr pDamage);

-

-void

-winMWExtWMDamageRects (RootlessFrameID wid, int count, const BoxRec *rects,

-			     int shift_x, int shift_y);

-

-void

-winMWExtWMRootlessSwitchWindow (RootlessWindowPtr pFrame, WindowPtr oldWin);

-

-void

-winMWExtWMCopyBytes (unsigned int width, unsigned int height,

-			   const void *src, unsigned int srcRowBytes,

-			   void *dst, unsigned int dstRowBytes);

-

-void

-winMWExtWMFillBytes (unsigned int width, unsigned int height, unsigned int value,

-			   void *dst, unsigned int dstRowBytes);

-

-int

-winMWExtWMCompositePixels (unsigned int width, unsigned int height, unsigned int function,

-				 void *src[2], unsigned int srcRowBytes[2],

-				 void *mask, unsigned int maskRowBytes,

-				 void *dst[2], unsigned int dstRowBytes[2]);

-

-void

-winMWExtWMCopyWindow (RootlessFrameID wid, int dstNrects, const BoxRec *dstRects,

-			    int dx, int dy);

-#endif

-

-

-#ifdef XWIN_MULTIWINDOWEXTWM

-/*

- * winwin32rootlesswindow.c

- */

-

-void

-winMWExtWMReorderWindows (ScreenPtr pScreen);

-

-void

-winMWExtWMMoveXWindow (WindowPtr pWin, int x, int y);

-

-void

-winMWExtWMResizeXWindow (WindowPtr pWin, int w, int h);

-

-void

-winMWExtWMMoveResizeXWindow (WindowPtr pWin, int x, int y, int w, int h);

-

-void

-winMWExtWMUpdateIcon (Window id);

-

-void

-winMWExtWMUpdateWindowDecoration (win32RootlessWindowPtr pRLWinPriv,

-				  winScreenInfoPtr pScreenInfo);

-

-wBOOL CALLBACK

-winMWExtWMDecorateWindow (HWND hwnd, LPARAM lParam);

-

-Bool

-winIsInternalWMRunning (winScreenInfoPtr pScreenInfo);

-

-void

-winMWExtWMRestackWindows (ScreenPtr pScreen);

-#endif

-

-

-#ifdef XWIN_MULTIWINDOWEXTWM

-/*

- * winwin32rootlesswndproc.c

- */

-

-LRESULT CALLBACK

-winMWExtWMWindowProc (HWND hwnd, UINT message, 

-			    WPARAM wParam, LPARAM lParam);

-#endif

-

-

-/*

- * winwindowswm.c

- */

-

-void

-winWindowsWMSendEvent (int type, unsigned int mask, int which, int arg,

-		       Window window, int x, int y, int w, int h);

-

-void

-winWindowsWMExtensionInit (void);

-

-/*

- * wincursor.c

- */

-

-Bool

-winInitCursor (ScreenPtr pScreen);

-

-/*

- * windisplay.c

- */

-

-void

-winGetDisplayName(char *szDisplay, unsigned int screen);

-

-/*

- * END DDX and DIX Function Prototypes

- */

-

-#endif /* _WIN_H_ */

-

+/*
+ *Copyright (C) 1994-2000 The XFree86 Project, Inc. All Rights Reserved.
+ *
+ *Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ *"Software"), to deal in the Software without restriction, including
+ *without limitation the rights to use, copy, modify, merge, publish,
+ *distribute, sublicense, and/or sell copies of the Software, and to
+ *permit persons to whom the Software is furnished to do so, subject to
+ *the following conditions:
+ *
+ *The above copyright notice and this permission notice shall be
+ *included in all copies or substantial portions of the Software.
+ *
+ *THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *NONINFRINGEMENT. IN NO EVENT SHALL THE XFREE86 PROJECT BE LIABLE FOR
+ *ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
+ *CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ *Except as contained in this notice, the name of the XFree86 Project
+ *shall not be used in advertising or otherwise to promote the sale, use
+ *or other dealings in this Software without prior written authorization
+ *from the XFree86 Project.
+ *
+ * Authors:	Dakshinamurthy Karra
+ *		Suhaib M Siddiqi
+ *		Peter Busch
+ *		Harold L Hunt II
+ *		Kensuke Matsuzaki
+ */
+
+#ifndef _WIN_H_
+#define _WIN_H_
+
+#ifndef NO
+#define NO					0
+#endif
+#ifndef YES
+#define YES					1
+#endif
+
+/* WM_XBUTTON Messages. They should go into w32api. */
+#ifndef WM_XBUTTONDOWN
+# define WM_XBUTTONDOWN 523
+#endif
+#ifndef WM_XBUTTONUP
+# define WM_XBUTTONUP 524
+#endif
+#ifndef WM_XBUTTONDBLCLK
+# define WM_XBUTTONDBLCLK 525
+#endif
+
+
+#define WIN_DEFAULT_BPP				0
+#define WIN_DEFAULT_WHITEPIXEL			255
+#define WIN_DEFAULT_BLACKPIXEL			0
+#define WIN_DEFAULT_LINEBIAS			0
+#define WIN_DEFAULT_E3B_TIME			50 /* milliseconds */
+#define WIN_DEFAULT_DPI				75
+#define WIN_DEFAULT_REFRESH			0
+#define WIN_DEFAULT_WIN_KILL			TRUE
+#define WIN_DEFAULT_UNIX_KILL			FALSE
+#define WIN_DEFAULT_CLIP_UPDATES_NBOXES		0
+#ifdef XWIN_EMULATEPSEUDO
+#define WIN_DEFAULT_EMULATE_PSEUDO		FALSE
+#endif
+#define WIN_DEFAULT_USER_GAVE_HEIGHT_AND_WIDTH	FALSE
+
+#define WIN_DIB_MAXIMUM_SIZE	0x08000000 /* 16 MB on Windows 95, 98, Me */
+#define WIN_DIB_MAXIMUM_SIZE_MB (WIN_DIB_MAXIMUM_SIZE / 8 / 1024 / 1024)
+
+/*
+ * Windows only supports 256 color palettes
+ */
+#define WIN_NUM_PALETTE_ENTRIES			256
+
+/*
+ * Number of times to call Restore in an attempt to restore the primary surface
+ */
+#define WIN_REGAIN_SURFACE_RETRIES		1
+
+/*
+ * Build a supported display depths mask by shifting one to the left
+ * by the number of bits in the supported depth.
+ */
+#define WIN_SUPPORTED_BPPS	( (1 << (32 - 1)) | (1 << (24 - 1)) \
+				| (1 << (16 - 1)) | (1 << (15 - 1)) \
+				| (1 << ( 8 - 1)))
+#define WIN_CHECK_DEPTH		YES
+
+/*
+ * Timer IDs for WM_TIMER
+ */
+#define WIN_E3B_TIMER_ID		1
+#define WIN_POLLING_MOUSE_TIMER_ID	2
+
+#define MOUSE_POLLING_INTERVAL		50
+
+#define WIN_E3B_OFF		-1
+#define WIN_FD_INVALID		-1
+
+#define WIN_SERVER_NONE		0x0L	/* 0 */
+#define WIN_SERVER_SHADOW_GDI	0x1L	/* 1 */
+#define WIN_SERVER_SHADOW_DD	0x2L	/* 2 */
+#define WIN_SERVER_SHADOW_DDNL	0x4L	/* 4 */
+#ifdef XWIN_PRIMARYFB
+#define WIN_SERVER_PRIMARY_DD	0x8L	/* 8 */
+#endif
+#ifdef XWIN_NATIVEGDI
+# define WIN_SERVER_NATIVE_GDI	0x10L	/* 16 */
+#endif
+
+#define AltMapIndex		Mod1MapIndex
+#define NumLockMapIndex		Mod2MapIndex
+#define AltLangMapIndex		Mod3MapIndex
+#define KanaMapIndex		Mod4MapIndex
+#define ScrollLockMapIndex	Mod5MapIndex
+
+#define WIN_MOD_LALT		0x00000001
+#define WIN_MOD_RALT		0x00000002
+#define WIN_MOD_LCONTROL	0x00000004
+#define WIN_MOD_RCONTROL	0x00000008
+
+#define WIN_24BPP_MASK_RED	0x00FF0000
+#define WIN_24BPP_MASK_GREEN	0x0000FF00
+#define WIN_24BPP_MASK_BLUE	0x000000FF
+
+#define WIN_MAX_KEYS_PER_KEY	4
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <stdio.h>
+
+#include <errno.h>
+#if defined(XWIN_MULTIWINDOWEXTWM) || defined(XWIN_CLIPBOARD) || defined(XWIN_MULTIWINDOW)
+#define HANDLE void *
+#ifdef _MSC_VER
+typedef int pid_t;
+#endif
+#include <pthread.h>
+#undef HANDLE
+#endif
+
+#ifdef HAS_MMAP
+#include <sys/mman.h>
+#ifndef MAP_FILE
+#define MAP_FILE 0
+#endif /* MAP_FILE */
+#endif /* HAS_MMAP */
+
+#include <X11/X.h>
+#include <X11/Xproto.h>
+#include <X11/Xos.h>
+#include <X11/Xprotostr.h>
+#include "scrnintstr.h"
+#include "pixmapstr.h"
+#include "pixmap.h"
+#include "region.h"
+#include "gcstruct.h"
+#include "colormap.h"
+#include "colormapst.h"
+#include "miscstruct.h"
+#include "servermd.h"
+#include "windowstr.h"
+#include "mi.h"
+#include "micmap.h"
+#include "mifillarc.h"
+#include "mifpoly.h"
+#include "mibstore.h"
+#include "input.h"
+#include "mipointer.h"
+#include "X11/keysym.h"
+#include "mibstore.h"
+#include "micoord.h"
+#include "dix.h"
+#include "miline.h"
+#include "shadow.h"
+#include "fb.h"
+#include "rootless.h"
+
+#include "mipict.h"
+#include "picturestr.h"
+
+#ifdef RANDR
+#include "randrstr.h"
+#endif
+
+/*
+ * Windows headers
+ */
+#include "winms.h"
+#include "winresource.h"
+
+
+/*
+ * Define Windows constants
+ */
+
+#define WM_TRAYICON		(WM_USER + 1000)
+#define WM_INIT_SYS_MENU	(WM_USER + 1001)
+#define WM_GIVEUP		(WM_USER + 1002)
+
+
+/* Local includes */
+#include "winwindow.h"
+#include "winmsg.h"
+
+#define PROFILEPOINT(point,thresh)\
+{\
+static unsigned int PROFPT##point = 0;\
+if (++PROFPT##point % thresh == 0)\
+ErrorF (#point ": PROFILEPOINT hit %u times\n", PROFPT##point);\
+}
+
+
+/* We use xor this macro for detecting toggle key state changes */
+#define WIN_XOR(a,b) ((!(a) && (b)) || ((a) && !(b)))
+
+#define DEFINE_ATOM_HELPER(func,atom_name)			\
+static Atom func (void) {					\
+    static int generation;					\
+    static Atom atom;						\
+    if (generation != serverGeneration) {			\
+	generation = serverGeneration;				\
+	atom = MakeAtom (atom_name, strlen (atom_name), TRUE);	\
+    }								\
+    return atom;						\
+}
+
+/*
+ * Typedefs for engine dependent function pointers
+ */
+
+typedef Bool (*winAllocateFBProcPtr)(ScreenPtr);
+
+typedef void (*winShadowUpdateProcPtr)(ScreenPtr, shadowBufPtr);
+
+typedef Bool (*winCloseScreenProcPtr)(int, ScreenPtr);
+
+typedef Bool (*winInitVisualsProcPtr)(ScreenPtr);
+
+typedef Bool (*winAdjustVideoModeProcPtr)(ScreenPtr);
+
+typedef Bool (*winCreateBoundingWindowProcPtr)(ScreenPtr);
+
+typedef Bool (*winFinishScreenInitProcPtr)(int, ScreenPtr, int, char **);
+
+typedef Bool (*winBltExposedRegionsProcPtr)(ScreenPtr);
+
+typedef Bool (*winActivateAppProcPtr)(ScreenPtr);
+
+typedef Bool (*winRedrawScreenProcPtr)(ScreenPtr pScreen);
+
+typedef Bool (*winRealizeInstalledPaletteProcPtr)(ScreenPtr pScreen);
+
+typedef Bool (*winInstallColormapProcPtr)(ColormapPtr pColormap);
+
+typedef Bool (*winStoreColorsProcPtr)(ColormapPtr pmap, 
+				      int ndef, xColorItem *pdefs);
+
+typedef Bool (*winCreateColormapProcPtr)(ColormapPtr pColormap);
+
+typedef Bool (*winDestroyColormapProcPtr)(ColormapPtr pColormap);
+
+typedef Bool (*winHotKeyAltTabProcPtr)(ScreenPtr);
+
+typedef Bool (*winCreatePrimarySurfaceProcPtr)(ScreenPtr);
+
+typedef Bool (*winReleasePrimarySurfaceProcPtr)(ScreenPtr);
+
+typedef Bool (*winFinishCreateWindowsWindowProcPtr)(WindowPtr pWin);
+
+typedef Bool (*winCreateScreenResourcesProc)(ScreenPtr);
+
+/* Typedef for DIX wrapper functions */
+typedef int (*winDispatchProcPtr) (ClientPtr);
+
+
+/*
+ * GC (graphics context) privates
+ */
+
+typedef struct
+{
+  HDC			hdc;
+  HDC			hdcMem;
+} winPrivGCRec, *winPrivGCPtr;
+
+
+/*
+ * Pixmap privates
+ */
+
+typedef struct
+{
+  HDC			hdcSelected;
+  HBITMAP		hBitmap;
+  BYTE			*pbBits;
+  DWORD			dwScanlineBytes;
+  BITMAPINFOHEADER	*pbmih;
+} winPrivPixmapRec, *winPrivPixmapPtr;
+
+
+/*
+ * Colormap privates
+ */
+
+typedef struct
+{
+  HPALETTE		hPalette;
+  LPDIRECTDRAWPALETTE	lpDDPalette;
+  RGBQUAD		rgbColors[WIN_NUM_PALETTE_ENTRIES];
+  PALETTEENTRY		peColors[WIN_NUM_PALETTE_ENTRIES];
+} winPrivCmapRec, *winPrivCmapPtr;
+
+/*
+ * Windows Cursor handling.
+ */ 
+  
+typedef struct {
+  /* from GetSystemMetrics */
+  int sm_cx;
+  int sm_cy;
+
+  BOOL visible;
+  HCURSOR handle;
+  QueryBestSizeProcPtr QueryBestSize;
+  miPointerSpriteFuncPtr spriteFuncs;
+} winCursorRec;
+
+/*
+ * Screen information structure that we need before privates are available
+ * in the server startup sequence.
+ */
+
+typedef struct
+{
+  ScreenPtr		pScreen;
+  
+  /* Did the user specify a height and width? */
+  Bool			fUserGaveHeightAndWidth;
+
+  DWORD			dwScreen;
+  DWORD			dwUserWidth;
+  DWORD			dwUserHeight;
+  DWORD			dwWidth;
+  DWORD			dwHeight;
+  DWORD			dwWidth_mm;
+  DWORD			dwHeight_mm;
+  DWORD			dwPaddedWidth;
+
+  /* Did the user specify a screen position? */
+  Bool			fUserGavePosition;
+  DWORD                 dwInitialX;
+  DWORD                 dwInitialY;
+
+  /*
+   * dwStride is the number of whole pixels that occupy a scanline,
+   * including those pixels that are not displayed.  This is basically
+   * a rounding up of the width.
+   */
+  DWORD			dwStride;
+
+  /* Offset of the screen in the window when using scrollbars */
+  DWORD			dwXOffset;
+  DWORD			dwYOffset;
+
+  DWORD			dwBPP;
+  DWORD			dwDepth;
+  DWORD			dwRefreshRate;
+  char			*pfb;
+  DWORD			dwEngine;
+  DWORD			dwEnginePreferred;
+  DWORD			dwClipUpdatesNBoxes;
+#ifdef XWIN_EMULATEPSEUDO
+  Bool			fEmulatePseudo;
+#endif
+  Bool			fFullScreen;
+  Bool			fDecoration;
+#ifdef XWIN_MULTIWINDOWEXTWM
+  Bool			fMWExtWM;
+  Bool			fInternalWM;
+  Bool			fAnotherWMRunning;
+#endif
+  Bool			fRootless;
+#ifdef XWIN_MULTIWINDOW
+  Bool			fMultiWindow;
+#endif
+#if defined(XWIN_MULTIWINDOW) || defined(XWIN_MULTIWINDOWEXTWM)
+  Bool			fMultiMonitorOverride;
+#endif
+  Bool                  fMultipleMonitors;
+  Bool			fLessPointer;
+  Bool			fScrollbars;
+  Bool			fNoTrayIcon;
+  int			iE3BTimeout;
+  /* Windows (Alt+F4) and Unix (Ctrl+Alt+Backspace) Killkey */
+  Bool                  fUseWinKillKey;
+  Bool                  fUseUnixKillKey;
+  Bool			fIgnoreInput;
+
+  /* Did the user explicitly set this screen? */
+  Bool			fExplicitScreen;
+} winScreenInfo, *winScreenInfoPtr;
+
+
+/*
+ * Screen privates
+ */
+
+typedef struct _winPrivScreenRec
+{
+  winScreenInfoPtr	pScreenInfo;
+
+  Bool			fEnabled;
+  Bool			fClosed;
+  Bool			fActive;
+  Bool			fBadDepth;
+
+  int			iDeltaZ;
+
+  int			iConnectedClients;
+
+  CloseScreenProcPtr	CloseScreen;
+
+  DWORD			dwRedMask;
+  DWORD			dwGreenMask;
+  DWORD			dwBlueMask;
+  DWORD			dwBitsPerRGB;
+
+  DWORD			dwModeKeyStates;
+
+  /* Handle to icons that must be freed */
+  HICON			hiconNotifyIcon;
+
+  /* Last width, height, and depth of the Windows display */
+  DWORD			dwLastWindowsWidth;
+  DWORD			dwLastWindowsHeight;
+  DWORD			dwLastWindowsBitsPixel;
+
+  /* Palette management */
+  ColormapPtr		pcmapInstalled;
+
+  /* Pointer to the root visual so we only have to look it up once */
+  VisualPtr		pRootVisual;
+
+  /* 3 button emulation variables */
+  int			iE3BCachedPress;
+  Bool			fE3BFakeButton2Sent;
+
+  /* Privates used by shadow fb GDI server */
+  HBITMAP		hbmpShadow;
+  HDC			hdcScreen;
+  HDC			hdcShadow;
+  HWND			hwndScreen;
+  
+  /* Privates used by shadow fb and primary fb DirectDraw servers */
+  LPDIRECTDRAW		pdd;
+  LPDIRECTDRAWSURFACE	pddsPrimary;
+  LPDIRECTDRAW2		pdd2;
+
+  /* Privates used by shadow fb DirectDraw server */
+  LPDIRECTDRAWSURFACE	pddsShadow;
+  LPDDSURFACEDESC	pddsdShadow;
+
+#ifdef XWIN_PRIMARYFB
+  /* Privates used by primary fb DirectDraw server */
+  LPDIRECTDRAWSURFACE	pddsOffscreen;
+  LPDDSURFACEDESC	pddsdOffscreen;
+  LPDDSURFACEDESC	pddsdPrimary;
+#endif
+
+  /* Privates used by shadow fb DirectDraw Nonlocking server */
+  LPDIRECTDRAW4		pdd4;
+  LPDIRECTDRAWSURFACE4	pddsShadow4;
+  LPDIRECTDRAWSURFACE4	pddsPrimary4;
+  BOOL			fRetryCreateSurface;
+
+  /* Privates used by both shadow fb DirectDraw servers */
+  LPDIRECTDRAWCLIPPER	pddcPrimary;
+
+#ifdef XWIN_MULTIWINDOWEXTWM
+  /* Privates used by multi-window external window manager */
+  RootlessFrameID	widTop;
+  Bool			fRestacking;
+#endif
+
+#ifdef XWIN_MULTIWINDOW
+  /* Privates used by multi-window */
+  pthread_t		ptWMProc;
+  pthread_t		ptXMsgProc;
+  void			*pWMInfo;
+#endif
+
+#if defined(XWIN_MULTIWINDOW) || defined(XWIN_MULTIWINDOWEXTWM)
+  /* Privates used by both multi-window and rootless */
+  Bool			fRootWindowShown;
+#endif
+
+#if defined(XWIN_CLIPBOARD) || defined(XWIN_MULTIWINDOW)
+  /* Privates used for any module running in a seperate thread */
+  pthread_mutex_t	pmServerStarted;
+  Bool			fServerStarted;
+#endif
+  
+  /* Engine specific functions */
+  winAllocateFBProcPtr			pwinAllocateFB;
+  winShadowUpdateProcPtr		pwinShadowUpdate;
+  winCloseScreenProcPtr			pwinCloseScreen;
+  winInitVisualsProcPtr			pwinInitVisuals;
+  winAdjustVideoModeProcPtr		pwinAdjustVideoMode;
+  winCreateBoundingWindowProcPtr	pwinCreateBoundingWindow;
+  winFinishScreenInitProcPtr		pwinFinishScreenInit;
+  winBltExposedRegionsProcPtr		pwinBltExposedRegions;
+  winActivateAppProcPtr			pwinActivateApp;
+  winRedrawScreenProcPtr		pwinRedrawScreen;
+  winRealizeInstalledPaletteProcPtr	pwinRealizeInstalledPalette;
+  winInstallColormapProcPtr		pwinInstallColormap;
+  winStoreColorsProcPtr			pwinStoreColors;
+  winCreateColormapProcPtr		pwinCreateColormap;
+  winDestroyColormapProcPtr		pwinDestroyColormap;
+  winHotKeyAltTabProcPtr		pwinHotKeyAltTab;
+  winCreatePrimarySurfaceProcPtr	pwinCreatePrimarySurface;
+  winReleasePrimarySurfaceProcPtr	pwinReleasePrimarySurface;
+
+  winCreateScreenResourcesProc       pwinCreateScreenResources;
+
+#ifdef XWIN_MULTIWINDOW
+  /* Window Procedures for MultiWindow mode */
+  winFinishCreateWindowsWindowProcPtr	pwinFinishCreateWindowsWindow;
+#endif
+
+  /* Window Procedures for Rootless mode */
+  CreateWindowProcPtr			CreateWindow;
+  DestroyWindowProcPtr			DestroyWindow;
+  PositionWindowProcPtr			PositionWindow;
+  ChangeWindowAttributesProcPtr		ChangeWindowAttributes;
+  RealizeWindowProcPtr			RealizeWindow;
+  UnrealizeWindowProcPtr		UnrealizeWindow;
+  ValidateTreeProcPtr			ValidateTree;
+  PostValidateTreeProcPtr		PostValidateTree;
+  WindowExposuresProcPtr		WindowExposures;
+  CopyWindowProcPtr			CopyWindow;
+  ClearToBackgroundProcPtr		ClearToBackground;
+  ClipNotifyProcPtr			ClipNotify;
+  RestackWindowProcPtr			RestackWindow;
+  ReparentWindowProcPtr			ReparentWindow;
+  ResizeWindowProcPtr			ResizeWindow;
+  MoveWindowProcPtr			MoveWindow;
+  SetShapeProcPtr			SetShape;
+
+#ifdef XWIN_NATIVEGDI
+  RealizeFontProcPtr                    RealizeFont;
+  UnrealizeFontProcPtr                  UnrealizeFont;
+#endif
+
+  winCursorRec                          cursor;
+} winPrivScreenRec;
+
+
+#ifdef XWIN_MULTIWINDOWEXTWM
+typedef struct {
+  RootlessWindowPtr	pFrame;
+  HWND			hWnd;
+  int			dwWidthBytes;
+  BITMAPINFOHEADER	*pbmihShadow;
+  HBITMAP		hbmpShadow;
+  HDC			hdcShadow;
+  HDC			hdcScreen;
+  BOOL			fResized;
+  BOOL			fRestackingNow;
+  BOOL			fClose;
+  BOOL			fMovingOrSizing;
+  BOOL			fDestroyed;//for debug
+  char			*pfb;
+} win32RootlessWindowRec, *win32RootlessWindowPtr;
+#endif
+
+
+typedef struct {
+  pointer		value;
+  XID			id;
+} WindowIDPairRec, *WindowIDPairPtr;
+
+
+/*
+ * Extern declares for general global variables
+ */
+
+extern winScreenInfo		g_ScreenInfo[];
+extern miPointerScreenFuncRec	g_winPointerCursorFuncs;
+extern DWORD			g_dwEvents;
+#ifdef HAS_DEVWINDOWS
+extern int			g_fdMessageQueue;
+#endif
+extern DevPrivateKey		g_iScreenPrivateKey;
+extern DevPrivateKey		g_iCmapPrivateKey;
+extern DevPrivateKey		g_iGCPrivateKey;
+extern DevPrivateKey		g_iPixmapPrivateKey;
+extern DevPrivateKey		g_iWindowPrivateKey;
+extern unsigned long		g_ulServerGeneration;
+extern DWORD			g_dwEnginesSupported;
+extern HINSTANCE		g_hInstance;
+extern int                      g_copyROP[];
+extern int                      g_patternROP[];
+extern const char *		g_pszQueryHost;
+extern DeviceIntPtr             g_pwinPointer;
+extern DeviceIntPtr             g_pwinKeyboard;
+
+
+/*
+ * Extern declares for dynamically loaded libraries and function pointers
+ */
+
+extern HMODULE			g_hmodDirectDraw;
+extern FARPROC			g_fpDirectDrawCreate;
+extern FARPROC			g_fpDirectDrawCreateClipper;
+
+extern HMODULE			g_hmodCommonControls;
+extern FARPROC			g_fpTrackMouseEvent;
+
+
+/*
+ * Screen privates macros
+ */
+
+#define winGetScreenPriv(pScreen) ((winPrivScreenPtr) \
+    dixLookupPrivate(&(pScreen)->devPrivates, g_iScreenPrivateKey))
+
+#define winSetScreenPriv(pScreen,v) \
+    dixSetPrivate(&(pScreen)->devPrivates, g_iScreenPrivateKey, v)
+
+#define winScreenPriv(pScreen) \
+	winPrivScreenPtr pScreenPriv = winGetScreenPriv(pScreen)
+
+
+/*
+ * Colormap privates macros
+ */
+
+#define winGetCmapPriv(pCmap) ((winPrivCmapPtr) \
+    dixLookupPrivate(&(pCmap)->devPrivates, g_iCmapPrivateKey))
+
+#define winSetCmapPriv(pCmap,v) \
+    dixSetPrivate(&(pCmap)->devPrivates, g_iCmapPrivateKey, v)
+
+#define winCmapPriv(pCmap) \
+	winPrivCmapPtr pCmapPriv = winGetCmapPriv(pCmap)
+
+
+/*
+ * GC privates macros
+ */
+
+#define winGetGCPriv(pGC) ((winPrivGCPtr) \
+    dixLookupPrivate(&(pGC)->devPrivates, g_iGCPrivateKey))
+
+#define winSetGCPriv(pGC,v) \
+    dixSetPrivate(&(pGC)->devPrivates, g_iGCPrivateKey, v)
+
+#define winGCPriv(pGC) \
+	winPrivGCPtr pGCPriv = winGetGCPriv(pGC)
+
+
+/*
+ * Pixmap privates macros
+ */
+
+#define winGetPixmapPriv(pPixmap) ((winPrivPixmapPtr) \
+    dixLookupPrivate(&(pPixmap)->devPrivates, g_iPixmapPrivateKey))
+
+#define winSetPixmapPriv(pPixmap,v) \
+    dixLookupPrivate(&(pPixmap)->devPrivates, g_iPixmapPrivateKey, v)
+
+#define winPixmapPriv(pPixmap) \
+	winPrivPixmapPtr pPixmapPriv = winGetPixmapPriv(pPixmap)
+
+
+/*
+ * Window privates macros
+ */
+
+#define winGetWindowPriv(pWin) ((winPrivWinPtr) \
+    dixLookupPrivate(&(pWin)->devPrivates, g_iWindowPrivateKey))
+
+#define winSetWindowPriv(pWin,v) \
+    dixLookupPrivate(&(pWin)->devPrivates, g_iWindowPrivateKey, v)
+
+#define winWindowPriv(pWin) \
+	winPrivWinPtr pWinPriv = winGetWindowPriv(pWin)
+
+/*
+ * wrapper macros 
+ */
+#define _WIN_WRAP(priv, real, mem, func) {\
+    priv->mem = real->mem; \
+    real->mem = func; \
+}
+
+#define _WIN_UNWRAP(priv, real, mem) {\
+    real->mem = priv->mem; \
+}
+
+#define WIN_WRAP(mem, func) _WIN_WRAP(pScreenPriv, pScreen, mem, func) 
+
+#define WIN_UNWRAP(mem) _WIN_UNWRAP(pScreenPriv, pScreen, mem)
+
+/*
+ * BEGIN DDX and DIX Function Prototypes
+ */
+
+
+/*
+ * winallpriv.c
+ */
+
+Bool
+winAllocatePrivates (ScreenPtr pScreen);
+
+Bool
+winInitCmapPrivates (ColormapPtr pCmap, int index);
+
+Bool
+winAllocateCmapPrivates (ColormapPtr pCmap);
+
+
+/*
+ * winauth.c
+ */
+
+#if defined(XWIN_CLIPBOARD) || defined(XWIN_MULTIWINDOW)
+Bool
+winGenerateAuthorization (void);
+void winSetAuthorization(void);
+#endif
+
+
+/*
+ * winblock.c
+ */
+
+void
+winBlockHandler (int nScreen,
+		 pointer pBlockData,
+		 pointer pTimeout,
+		 pointer pReadMask);
+
+
+#ifdef XWIN_NATIVEGDI
+/*
+ * winclip.c
+ */
+
+RegionPtr
+winPixmapToRegionNativeGDI (PixmapPtr pPix);
+#endif
+
+
+#ifdef XWIN_CLIPBOARD
+/*
+ * winclipboardinit.c
+ */
+
+Bool
+winInitClipboard (void);
+
+void
+winFixClipboardChain (void);
+#endif
+
+
+/*
+ * wincmap.c
+ */
+
+void
+winSetColormapFunctions (ScreenPtr pScreen);
+
+Bool
+winCreateDefColormap (ScreenPtr pScreen);
+
+
+/*
+ * wincreatewnd.c
+ */
+
+Bool
+winCreateBoundingWindowFullScreen (ScreenPtr pScreen);
+
+Bool
+winCreateBoundingWindowWindowed (ScreenPtr pScreen);
+
+
+/*
+ * windialogs.c
+ */
+
+int
+GetLiveClients (winPrivScreenPtr pScreenPriv);
+
+void
+winDisplayExitDialog (winPrivScreenPtr pScreenPriv);
+
+void
+winDisplayDepthChangeDialog (winPrivScreenPtr pScreenPriv);
+
+void
+winDisplayAboutDialog (winPrivScreenPtr pScreenPriv);
+
+
+/*
+ * winengine.c
+ */
+
+void
+winDetectSupportedEngines (void);
+
+Bool
+winSetEngine (ScreenPtr pScreen);
+
+Bool
+winGetDDProcAddresses (void);
+
+
+/*
+ * winerror.c
+ */
+
+#ifdef DDXOSVERRORF
+void
+OSVenderVErrorF (const char *pszFormat, va_list va_args);
+#endif
+
+void
+winMessageBoxF (const char *pszError, UINT uType, ...);
+
+
+#ifdef XWIN_NATIVEGDI
+/*
+ * winfillsp.c
+ */
+
+void
+winFillSpansNativeGDI (DrawablePtr	pDrawable,
+		       GCPtr		pGC,
+		       int		nSpans,
+		       DDXPointPtr	pPoints,
+		       int		*pWidths,
+		       int		fSorted);
+#endif
+
+
+#ifdef XWIN_NATIVEGDI
+/*
+ * winfont.c
+ */
+
+Bool
+winRealizeFontNativeGDI (ScreenPtr pScreen, FontPtr pFont);
+
+Bool
+winUnrealizeFontNativeGDI (ScreenPtr pScreen, FontPtr pFont);
+#endif
+
+
+#ifdef XWIN_NATIVEGDI
+/*
+ * wingc.c
+ */
+
+Bool
+winCreateGCNativeGDI (GCPtr pGC);
+#endif
+
+
+#ifdef XWIN_NATIVEGDI
+/*
+ * wingetsp.c
+ */
+
+void
+winGetSpansNativeGDI (DrawablePtr	pDrawable, 
+		      int		wMax, 
+		      DDXPointPtr	pPoints, 
+		      int		*pWidths, 
+		      int		nSpans, 
+		      char		*pDst);
+#endif
+
+
+/*
+ * winglobals.c
+ */
+
+void
+winInitializeGlobals (void);
+
+
+/*
+ * winkeybd.c
+ */
+
+void
+winTranslateKey (WPARAM wParam, LPARAM lParam, int *piScanCode);
+
+int
+winKeybdProc (DeviceIntPtr pDeviceInt, int iState);
+
+void
+winInitializeModeKeyStates (void);
+
+void
+winRestoreModeKeyStates (void);
+
+Bool
+winIsFakeCtrl_L (UINT message, WPARAM wParam, LPARAM lParam);
+
+void
+winKeybdReleaseKeys (void);
+
+void
+winSendKeyEvent (DWORD dwKey, Bool fDown);
+
+BOOL
+winCheckKeyPressed(WPARAM wParam, LPARAM lParam);
+
+void
+winFixShiftKeys (int iScanCode);
+
+/*
+ * winkeyhook.c
+ */
+
+Bool
+winInstallKeyboardHookLL (void);
+
+void
+winRemoveKeyboardHookLL (void);
+
+
+/*
+ * winmisc.c
+ */
+
+#ifdef XWIN_NATIVEGDI
+void
+winQueryBestSizeNativeGDI (int class, unsigned short *pWidth,
+			   unsigned short *pHeight, ScreenPtr pScreen);
+#endif
+
+CARD8
+winCountBits (DWORD dw);
+
+Bool
+winUpdateFBPointer (ScreenPtr pScreen, void *pbits);
+
+#ifdef XWIN_NATIVEGDI
+BOOL
+winPaintBackground (HWND hwnd, COLORREF colorref);
+#endif
+
+
+/*
+ * winmouse.c
+ */
+
+int
+winMouseProc (DeviceIntPtr pDeviceInt, int iState);
+
+int
+winMouseWheel (ScreenPtr pScreen, int iDeltaZ);
+
+void
+winMouseButtonsSendEvent (int iEventType, int iButton);
+
+int
+winMouseButtonsHandle (ScreenPtr pScreen,
+		       int iEventType, int iButton,
+		       WPARAM wParam);
+
+void
+winEnqueueMotion(int x, int y);
+
+#ifdef XWIN_NATIVEGDI
+/*
+ * winnativegdi.c
+ */
+
+HBITMAP
+winCreateDIBNativeGDI (int iWidth, int iHeight, int iDepth,
+		       BYTE **ppbBits, BITMAPINFO **ppbmi);
+
+Bool
+winSetEngineFunctionsNativeGDI (ScreenPtr pScreen);
+#endif
+
+
+#ifdef XWIN_PRIMARYFB
+/*
+ * winpfbddd.c
+ */
+
+Bool
+winSetEngineFunctionsPrimaryDD (ScreenPtr pScreen);
+#endif
+
+
+#ifdef XWIN_NATIVEGDI
+/*
+ * winpixmap.c
+ */
+
+PixmapPtr
+winCreatePixmapNativeGDI (ScreenPtr pScreen, int width, int height, int depth,
+			  unsigned usage_hint);
+
+Bool
+winDestroyPixmapNativeGDI (PixmapPtr pPixmap);
+
+Bool
+winModifyPixmapHeaderNativeGDI (PixmapPtr pPixmap,
+				int iWidth, int iHeight,
+				int iDepth,
+				int iBitsPerPixel,
+				int devKind,
+				pointer pPixData);
+#endif
+
+#ifdef XWIN_NATIVEGDI
+/*
+ * winpolyline.c
+ */
+
+void
+winPolyLineNativeGDI (DrawablePtr	pDrawable,
+		      GCPtr		pGC,
+		      int		mode,
+		      int		npt,
+		      DDXPointPtr	ppt);
+#endif
+
+
+#ifdef XWIN_NATIVEGDI
+/*
+ * winpushpxl.c
+ */
+
+void
+winPushPixels (GCPtr pGC, PixmapPtr pBitMap, DrawablePtr pDrawable,
+	       int dx, int dy, int xOrg, int yOrg);
+#endif
+
+
+/*
+ * winscrinit.c
+ */
+
+Bool
+winScreenInit (int index,
+	       ScreenPtr pScreen,
+	       int argc, char **argv);
+
+Bool
+winFinishScreenInitFB (int index,
+		       ScreenPtr pScreen,
+		       int argc, char **argv);
+
+#if defined(XWIN_NATIVEGDI)
+Bool
+winFinishScreenInitNativeGDI (int index,
+			      ScreenPtr pScreen,
+			      int argc, char **argv);
+#endif
+
+
+#ifdef XWIN_NATIVEGDI
+/*
+ * winsetsp.c
+ */
+
+void
+winSetSpansNativeGDI (DrawablePtr	pDrawable,
+		      GCPtr		pGC,
+		      char		*pSrc,
+		      DDXPointPtr	pPoints,
+		      int		*pWidth,
+		      int		nSpans,
+		      int		fSorted);
+#endif
+
+
+/*
+ * winshaddd.c
+ */
+
+Bool
+winSetEngineFunctionsShadowDD (ScreenPtr pScreen);
+
+
+/*
+ * winshadddnl.c
+ */
+
+Bool
+winSetEngineFunctionsShadowDDNL (ScreenPtr pScreen);
+
+
+/*
+ * winshadgdi.c
+ */
+
+Bool
+winSetEngineFunctionsShadowGDI (ScreenPtr pScreen);
+
+
+/*
+ * winwakeup.c
+ */
+
+void
+winWakeupHandler (int nScreen,
+		  pointer pWakeupData,
+		  unsigned long ulResult,
+		  pointer pReadmask);
+
+
+/*
+ * winwindow.c
+ */
+
+#ifdef XWIN_NATIVEGDI
+Bool
+winCreateWindowNativeGDI (WindowPtr pWin);
+
+Bool
+winDestroyWindowNativeGDI (WindowPtr pWin);
+
+Bool
+winPositionWindowNativeGDI (WindowPtr pWin, int x, int y);
+
+void 
+winCopyWindowNativeGDI (WindowPtr pWin,
+			DDXPointRec ptOldOrg,
+			RegionPtr prgnSrc);
+
+Bool
+winChangeWindowAttributesNativeGDI (WindowPtr pWin, unsigned long mask);
+
+Bool
+winUnmapWindowNativeGDI (WindowPtr pWindow);
+
+Bool
+winMapWindowNativeGDI (WindowPtr pWindow);
+#endif
+
+Bool
+winCreateWindowRootless (WindowPtr pWindow);
+
+Bool
+winDestroyWindowRootless (WindowPtr pWindow);
+
+Bool
+winPositionWindowRootless (WindowPtr pWindow, int x, int y);
+
+Bool
+winChangeWindowAttributesRootless (WindowPtr pWindow, unsigned long mask);
+
+Bool
+winUnmapWindowRootless (WindowPtr pWindow);
+
+Bool
+winMapWindowRootless (WindowPtr pWindow);
+
+void
+winSetShapeRootless (WindowPtr pWindow);
+
+
+/*
+ * winmultiwindowicons.c - Used by both multi-window and Win32Rootless
+ */
+
+HICON
+winXIconToHICON (WindowPtr pWin, int iconSize);
+
+void
+winSelectIcons(WindowPtr pWin, HICON *pIcon, HICON *pSmallIcon);
+
+#ifdef XWIN_MULTIWINDOW
+/*
+ * winmultiwindowshape.c
+ */
+
+void
+winReshapeMultiWindow (WindowPtr pWin);
+
+void
+winSetShapeMultiWindow (WindowPtr pWindow);
+
+void
+winUpdateRgnMultiWindow (WindowPtr pWindow);
+#endif
+
+
+#ifdef XWIN_MULTIWINDOW
+/*
+ * winmultiwindowwindow.c
+ */
+
+Bool
+winCreateWindowMultiWindow (WindowPtr pWindow);
+
+Bool
+winDestroyWindowMultiWindow (WindowPtr pWindow);
+
+Bool
+winPositionWindowMultiWindow (WindowPtr pWindow, int x, int y);
+
+Bool
+winChangeWindowAttributesMultiWindow (WindowPtr pWindow, unsigned long mask);
+
+Bool
+winUnmapWindowMultiWindow (WindowPtr pWindow);
+
+Bool
+winMapWindowMultiWindow (WindowPtr pWindow);
+
+void
+winReparentWindowMultiWindow (WindowPtr pWin, WindowPtr pPriorParent);
+
+void
+winRestackWindowMultiWindow (WindowPtr pWin, WindowPtr pOldNextSib);
+
+void
+winReorderWindowsMultiWindow (void);
+
+void
+winResizeWindowMultiWindow (WindowPtr pWin, int x, int y, unsigned int w,
+			    unsigned int h, WindowPtr pSib);
+void
+winMoveWindowMultiWindow (WindowPtr pWin, int x, int y,
+			  WindowPtr pSib, VTKind kind);
+
+void
+winCopyWindowMultiWindow (WindowPtr pWin, DDXPointRec oldpt,
+			  RegionPtr oldRegion);
+
+XID
+winGetWindowID (WindowPtr pWin);
+
+int
+winAdjustXWindow (WindowPtr pWin, HWND hwnd);
+#endif
+
+
+#ifdef XWIN_MULTIWINDOW
+/*
+ * winmultiwindowwndproc.c
+ */
+
+LRESULT CALLBACK
+winTopLevelWindowProc (HWND hwnd, UINT message, 
+		       WPARAM wParam, LPARAM lParam);
+#endif
+
+
+/*
+ * wintrayicon.c
+ */
+
+void
+winInitNotifyIcon (winPrivScreenPtr pScreenPriv, Bool Modify);
+
+void
+winDeleteNotifyIcon (winPrivScreenPtr pScreenPriv);
+
+LRESULT
+winHandleIconMessage (HWND hwnd, UINT message,
+		      WPARAM wParam, LPARAM lParam,
+		      winPrivScreenPtr pScreenPriv);
+
+
+/*
+ * winwndproc.c
+ */
+
+LRESULT CALLBACK
+winWindowProc (HWND hWnd, UINT message, 
+	       WPARAM wParam, LPARAM lParam);
+
+
+#ifdef XWIN_MULTIWINDOWEXTWM
+/*
+ * winwin32rootless.c
+ */
+
+Bool
+winMWExtWMCreateFrame (RootlessWindowPtr pFrame, ScreenPtr pScreen,
+			     int newX, int newY, RegionPtr pShape);
+
+void
+winMWExtWMDestroyFrame (RootlessFrameID wid);
+
+void
+winMWExtWMMoveFrame (RootlessFrameID wid, ScreenPtr pScreen, int newX, int newY);
+
+void
+winMWExtWMResizeFrame (RootlessFrameID wid, ScreenPtr pScreen,
+			     int newX, int newY, unsigned int newW, unsigned int newH,
+			     unsigned int gravity);
+
+void
+winMWExtWMRestackFrame (RootlessFrameID wid, RootlessFrameID nextWid);
+
+void
+winMWExtWMReshapeFrame (RootlessFrameID wid, RegionPtr pShape);
+
+void
+winMWExtWMUnmapFrame (RootlessFrameID wid);
+
+void
+winMWExtWMStartDrawing (RootlessFrameID wid, char **pixelData, int *bytesPerRow);
+
+void
+winMWExtWMStopDrawing (RootlessFrameID wid, Bool flush);
+
+void
+winMWExtWMUpdateRegion (RootlessFrameID wid, RegionPtr pDamage);
+
+void
+winMWExtWMDamageRects (RootlessFrameID wid, int count, const BoxRec *rects,
+			     int shift_x, int shift_y);
+
+void
+winMWExtWMRootlessSwitchWindow (RootlessWindowPtr pFrame, WindowPtr oldWin);
+
+void
+winMWExtWMCopyBytes (unsigned int width, unsigned int height,
+			   const void *src, unsigned int srcRowBytes,
+			   void *dst, unsigned int dstRowBytes);
+
+void
+winMWExtWMFillBytes (unsigned int width, unsigned int height, unsigned int value,
+			   void *dst, unsigned int dstRowBytes);
+
+int
+winMWExtWMCompositePixels (unsigned int width, unsigned int height, unsigned int function,
+				 void *src[2], unsigned int srcRowBytes[2],
+				 void *mask, unsigned int maskRowBytes,
+				 void *dst[2], unsigned int dstRowBytes[2]);
+
+void
+winMWExtWMCopyWindow (RootlessFrameID wid, int dstNrects, const BoxRec *dstRects,
+			    int dx, int dy);
+#endif
+
+
+#ifdef XWIN_MULTIWINDOWEXTWM
+/*
+ * winwin32rootlesswindow.c
+ */
+
+void
+winMWExtWMReorderWindows (ScreenPtr pScreen);
+
+void
+winMWExtWMMoveXWindow (WindowPtr pWin, int x, int y);
+
+void
+winMWExtWMResizeXWindow (WindowPtr pWin, int w, int h);
+
+void
+winMWExtWMMoveResizeXWindow (WindowPtr pWin, int x, int y, int w, int h);
+
+void
+winMWExtWMUpdateIcon (Window id);
+
+void
+winMWExtWMUpdateWindowDecoration (win32RootlessWindowPtr pRLWinPriv,
+				  winScreenInfoPtr pScreenInfo);
+
+wBOOL CALLBACK
+winMWExtWMDecorateWindow (HWND hwnd, LPARAM lParam);
+
+Bool
+winIsInternalWMRunning (winScreenInfoPtr pScreenInfo);
+
+void
+winMWExtWMRestackWindows (ScreenPtr pScreen);
+#endif
+
+
+#ifdef XWIN_MULTIWINDOWEXTWM
+/*
+ * winwin32rootlesswndproc.c
+ */
+
+LRESULT CALLBACK
+winMWExtWMWindowProc (HWND hwnd, UINT message, 
+			    WPARAM wParam, LPARAM lParam);
+#endif
+
+
+/*
+ * winwindowswm.c
+ */
+
+void
+winWindowsWMSendEvent (int type, unsigned int mask, int which, int arg,
+		       Window window, int x, int y, int w, int h);
+
+void
+winWindowsWMExtensionInit (void);
+
+/*
+ * wincursor.c
+ */
+
+Bool
+winInitCursor (ScreenPtr pScreen);
+
+/*
+ * windisplay.c
+ */
+
+void
+winGetDisplayName(char *szDisplay, unsigned int screen);
+
+/*
+ * END DDX and DIX Function Prototypes
+ */
+
+#endif /* _WIN_H_ */
+
diff --git a/xorg-server/hw/xwin/winscrinit.c b/xorg-server/hw/xwin/winscrinit.c
index 992b277e7..84341c8fb 100644
--- a/xorg-server/hw/xwin/winscrinit.c
+++ b/xorg-server/hw/xwin/winscrinit.c
@@ -1,777 +1,775 @@
-/*

- *Copyright (C) 1994-2000 The XFree86 Project, Inc. All Rights Reserved.

- *

- *Permission is hereby granted, free of charge, to any person obtaining

- * a copy of this software and associated documentation files (the

- *"Software"), to deal in the Software without restriction, including

- *without limitation the rights to use, copy, modify, merge, publish,

- *distribute, sublicense, and/or sell copies of the Software, and to

- *permit persons to whom the Software is furnished to do so, subject to

- *the following conditions:

- *

- *The above copyright notice and this permission notice shall be

- *included in all copies or substantial portions of the Software.

- *

- *THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

- *EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

- *MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

- *NONINFRINGEMENT. IN NO EVENT SHALL THE XFREE86 PROJECT BE LIABLE FOR

- *ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF

- *CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION

- *WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

- *

- *Except as contained in this notice, the name of the XFree86 Project

- *shall not be used in advertising or otherwise to promote the sale, use

- *or other dealings in this Software without prior written authorization

- *from the XFree86 Project.

- *

- * Authors:	Dakshinamurthy Karra

- *		Suhaib M Siddiqi

- *		Peter Busch

- *		Harold L Hunt II

- *		Kensuke Matsuzaki

- */

-

-#ifdef HAVE_XWIN_CONFIG_H

-#include <xwin-config.h>

-#endif

-#include "win.h"

-#include "winmsg.h"

-

-

-#ifdef XWIN_MULTIWINDOWEXTWM

-static RootlessFrameProcsRec

-winMWExtWMProcs = {	

-  winMWExtWMCreateFrame,

-  winMWExtWMDestroyFrame,

-  

-  winMWExtWMMoveFrame,

-  winMWExtWMResizeFrame,

-  winMWExtWMRestackFrame,

-  winMWExtWMReshapeFrame,

-  winMWExtWMUnmapFrame,

-  

-  winMWExtWMStartDrawing,

-  winMWExtWMStopDrawing,

-  winMWExtWMUpdateRegion,

-#ifndef ROOTLESS_TRACK_DAMAGE

-  winMWExtWMDamageRects,

-#endif

-  winMWExtWMRootlessSwitchWindow,

-  NULL,//winMWExtWMDoReorderWindow,

-  NULL,//winMWExtWMHideWindow,

-  NULL,//winMWExtWMUpdateColorMap,

-

-  NULL,//winMWExtWMCopyBytes,

-  NULL,//winMWExtWMFillBytes,

-  NULL,//winMWExtWMCompositePixels,

-  winMWExtWMCopyWindow

-};

-#endif

-

-

-/*

- * References to external symbols

- */

-

-extern Bool                     g_fSoftwareCursor;

-

-

-/*

- * Prototypes

- */

-

-Bool

-winRandRInit (ScreenPtr pScreen);

-

-

-/*

- * Local functions

- */

-

-static Bool

-winSaveScreen (ScreenPtr pScreen, int on);

-

-

-/*

- * Determine what type of screen we are initializing

- * and call the appropriate procedure to intiailize

- * that type of screen.

- */

-

-Bool

-winScreenInit (int index,

-	       ScreenPtr pScreen,

-	       int argc, char **argv)

-{

-  winScreenInfoPtr      pScreenInfo = &g_ScreenInfo[index];

-  winPrivScreenPtr	pScreenPriv;

-  HDC			hdc;

-

-  winDebug ("winScreenInit - dwWidth: %ld dwHeight: %ld\n",

-	  pScreenInfo->dwWidth, pScreenInfo->dwHeight);

-

-  /* Allocate privates for this screen */

-  if (!winAllocatePrivates (pScreen))

-    {

-      ErrorF ("winScreenInit - Couldn't allocate screen privates\n");

-      return FALSE;

-    }

-

-  /* Get a pointer to the privates structure that was allocated */

-  pScreenPriv = winGetScreenPriv (pScreen);

-

-  /* Save a pointer to this screen in the screen info structure */

-  pScreenInfo->pScreen = pScreen;

-

-  /* Save a pointer to the screen info in the screen privates structure */

-  /* This allows us to get back to the screen info from a screen pointer */

-  pScreenPriv->pScreenInfo = pScreenInfo;

-

-  /*

-   * Determine which engine to use.

-   *

-   * NOTE: This is done once per screen because each screen possibly has

-   * a preferred engine specified on the command line.

-   */

-  if (!winSetEngine (pScreen))

-    {

-      ErrorF ("winScreenInit - winSetEngine () failed\n");

-      return FALSE;

-    }

-

-  /* Adjust the video mode for our engine type */

-  if (pScreenPriv->pwinAdjustVideoMode && !(*pScreenPriv->pwinAdjustVideoMode) (pScreen))

-    {

-      ErrorF ("winScreenInit - winAdjustVideoMode () failed\n");

-      return FALSE;

-    }

-

-  /* Check for supported display depth */

-  if (!(WIN_SUPPORTED_BPPS & (1 << (pScreenInfo->dwBPP - 1))))

-    {

-      ErrorF ("winScreenInit - Unsupported display depth: %d\n" \

-	      "Change your Windows display depth to 15, 16, 24, or 32 bits "

-	      "per pixel.\n",

-	      (int) pScreenInfo->dwBPP);

-      ErrorF ("winScreenInit - Supported depths: %08x\n",

-	      WIN_SUPPORTED_BPPS);

-#if WIN_CHECK_DEPTH

-      return FALSE;

-#endif

-    }

-

-  /*

-   * Check that all monitors have the same display depth if we are using

-   * multiple monitors

-   */

-  if (pScreenInfo->fMultipleMonitors 

-      && !GetSystemMetrics (SM_SAMEDISPLAYFORMAT))

-    {

-      ErrorF ("winScreenInit - Monitors do not all have same pixel format / "

-	      "display depth.\n"

-	      "Using primary display only.\n");

-      pScreenInfo->fMultipleMonitors = FALSE;

-    }

-

-  /* Create display window */

-  if (pScreenPriv->pwinCreateBoundingWindow && !(*pScreenPriv->pwinCreateBoundingWindow) (pScreen))

-    {

-      ErrorF ("winScreenInit - pwinCreateBoundingWindow () "

-	      "failed\n");

-      return FALSE;

-    }

-

-  /* Get a device context */

-  hdc = GetDC (pScreenPriv->hwndScreen);

-

-  /* Store the initial height, width, and depth of the display */

-  /* Are we using multiple monitors? */

-  if (pScreenInfo->fMultipleMonitors)

-    {

-      pScreenPriv->dwLastWindowsWidth = GetSystemMetrics (SM_CXVIRTUALSCREEN);

-      pScreenPriv->dwLastWindowsHeight = GetSystemMetrics (SM_CYVIRTUALSCREEN);

-

-      /* 

-       * In this case, some of the defaults set in

-       * winInitializeDefaultScreens () are not correct ...

-       */

-      if (!pScreenInfo->fUserGaveHeightAndWidth)

-	{

-	  pScreenInfo->dwWidth = GetSystemMetrics (SM_CXVIRTUALSCREEN);

-	  pScreenInfo->dwHeight = GetSystemMetrics (SM_CYVIRTUALSCREEN);

-	  pScreenInfo->dwWidth_mm = (pScreenInfo->dwWidth /

-				     WIN_DEFAULT_DPI) * 25.4;

-	  pScreenInfo->dwHeight_mm = (pScreenInfo->dwHeight /

-				      WIN_DEFAULT_DPI) * 25.4;

-	}

-    }

-  else

-    {

-      pScreenPriv->dwLastWindowsWidth = GetSystemMetrics (SM_CXSCREEN);

-      pScreenPriv->dwLastWindowsHeight = GetSystemMetrics (SM_CYSCREEN);

-    }

-

-  /* Save the original bits per pixel */

-  pScreenPriv->dwLastWindowsBitsPixel = GetDeviceCaps (hdc, BITSPIXEL);

-

-  /* Release the device context */

-  ReleaseDC (pScreenPriv->hwndScreen, hdc);

-    

-  /* Clear the visuals list */

-  miClearVisualTypes ();

-  

-  /* Set the padded screen width */

-  pScreenInfo->dwPaddedWidth = PixmapBytePad (pScreenInfo->dwWidth,

-					      pScreenInfo->dwBPP);

-

-  /* Call the engine dependent screen initialization procedure */

-  if (pScreenPriv->pwinFinishScreenInit && !((*pScreenPriv->pwinFinishScreenInit) (index, pScreen, argc, argv)))

-    {

-      ErrorF ("winScreenInit - winFinishScreenInit () failed\n");

-      return FALSE;

-    }

-

-  if (!g_fSoftwareCursor)

-    winInitCursor(pScreen);

-#ifdef WINDBG

-  else

-    winDebug("winScreenInit - Using software cursor\n");  

-#endif

-

-  /*

-     Note the screen origin in a normalized coordinate space where (0,0) is at the top left

-     of the native virtual desktop area

-  */

-  dixScreenOrigins[index].x = pScreenInfo->dwInitialX - GetSystemMetrics(SM_XVIRTUALSCREEN);

-  dixScreenOrigins[index].y = pScreenInfo->dwInitialY - GetSystemMetrics(SM_YVIRTUALSCREEN);

-

-  winDebug("Screen %d added at virtual desktop coordinate (%d,%d).\n",

-            index, dixScreenOrigins[index].x, dixScreenOrigins[index].y);

-  winDebug ("winScreenInit - returning\n");

-

-  return TRUE;

-}

-

-static Bool

-winCreateScreenResources(ScreenPtr pScreen)

-{

-  winScreenPriv(pScreen);

-  Bool result;

-

-  result = pScreenPriv->pwinCreateScreenResources(pScreen);

-

-  /* Now the screen bitmap has been wrapped in a pixmap,

-     add that to the Shadow framebuffer */

-  if (!shadowAdd(pScreen, pScreen->devPrivate,

-		 pScreenPriv->pwinShadowUpdate, NULL, 0, 0))

-    {

-      ErrorF ("winCreateScreenResources - shadowAdd () failed\n");

-      return FALSE;

-    }

-

-  return result;

-}

-

-/* See Porting Layer Definition - p. 20 */

-Bool

-winFinishScreenInitFB (int index,

-		       ScreenPtr pScreen,

-		       int argc, char **argv)

-{

-  winScreenPriv(pScreen);

-  winScreenInfo		*pScreenInfo = pScreenPriv->pScreenInfo;

-  VisualPtr		pVisual = NULL;

-  char			*pbits = NULL;

-#if defined(XWIN_CLIPBOARD) || defined(XWIN_MULTIWINDOW)

-  int			iReturn;

-#endif

-

-  /* Create framebuffer */

-  if (!(*pScreenPriv->pwinAllocateFB) (pScreen))

-    {

-      ErrorF ("winFinishScreenInitFB - Could not allocate framebuffer\n");

-      return FALSE;

-    }

-

-  /*

-   * Grab the number of bits that are used to represent color in each pixel.

-   */

-  if (pScreenInfo->dwBPP == 8)

-    pScreenInfo->dwDepth = 8;

-  else

-    pScreenInfo->dwDepth = winCountBits (pScreenPriv->dwRedMask)

-      + winCountBits (pScreenPriv->dwGreenMask)

-      + winCountBits (pScreenPriv->dwBlueMask);

-  

-  winDebug ("winFinishScreenInitFB - Masks: %08x %08x %08x\n",

-	  (unsigned int) pScreenPriv->dwRedMask,

-	  (unsigned int) pScreenPriv->dwGreenMask,

-	  (unsigned int) pScreenPriv->dwBlueMask);

-

-  /* Init visuals */

-  if (!(*pScreenPriv->pwinInitVisuals) (pScreen))

-    {

-      ErrorF ("winFinishScreenInitFB - winInitVisuals failed\n");

-      return FALSE;

-    }

-

-  /* Setup a local variable to point to the framebuffer */

-  pbits = pScreenInfo->pfb;

-  

-  /* Apparently we need this for the render extension */

-  miSetPixmapDepths ();

-

-  /* Start fb initialization */

-  if (!fbSetupScreen (pScreen,

-		      pScreenInfo->pfb,

-		      pScreenInfo->dwWidth, pScreenInfo->dwHeight,

-		      monitorResolution, monitorResolution,

-		      pScreenInfo->dwStride,

-		      pScreenInfo->dwBPP))

-    {

-      ErrorF ("winFinishScreenInitFB - fbSetupScreen failed\n");

-      return FALSE;

-    }

-

-  /* Override default colormap routines if visual class is dynamic */

-  if (pScreenInfo->dwDepth == 8

-      && (pScreenInfo->dwEngine == WIN_SERVER_SHADOW_GDI

-	  || (pScreenInfo->dwEngine == WIN_SERVER_SHADOW_DDNL

-	      && pScreenInfo->fFullScreen)

-	  || (pScreenInfo->dwEngine == WIN_SERVER_SHADOW_DD

-	      && pScreenInfo->fFullScreen)))

-    {

-      winSetColormapFunctions (pScreen);

-

-      /*

-       * NOTE: Setting whitePixel to 255 causes Magic 7.1 to allocate its

-       * own colormap, as it cannot allocate 7 planes in the default

-       * colormap.  Setting whitePixel to 1 allows Magic to get 7

-       * planes in the default colormap, so it doesn't create its

-       * own colormap.  This latter situation is highly desireable,

-       * as it keeps the Magic window viewable when switching to

-       * other X clients that use the default colormap.

-       */

-      pScreen->blackPixel = 0;

-      pScreen->whitePixel = 1;

-    }

-

-  /* Place our save screen function */

-  pScreen->SaveScreen = winSaveScreen;

-

-  /* Finish fb initialization */

-  if (!fbFinishScreenInit (pScreen,

-			   pScreenInfo->pfb,

-			   pScreenInfo->dwWidth, pScreenInfo->dwHeight,

-			   monitorResolution, monitorResolution,

-			   pScreenInfo->dwStride,

-			   pScreenInfo->dwBPP))

-    {

-      ErrorF ("winFinishScreenInitFB - fbFinishScreenInit failed\n");

-      return FALSE;

-    }

-

-  /* Save a pointer to the root visual */

-  for (pVisual = pScreen->visuals;

-       pVisual->vid != pScreen->rootVisual;

-       pVisual++);

-  pScreenPriv->pRootVisual = pVisual;

-

-  /* 

-   * Setup points to the block and wakeup handlers.  Pass a pointer

-   * to the current screen as pWakeupdata.

-   */

-  pScreen->BlockHandler = winBlockHandler;

-  pScreen->WakeupHandler = winWakeupHandler;

-  pScreen->blockData = pScreen;

-  pScreen->wakeupData = pScreen;

-

-#ifdef RENDER

-  /* Render extension initialization, calls miPictureInit */

-  if (!fbPictureInit (pScreen, NULL, 0))

-    {

-      ErrorF ("winFinishScreenInitFB - fbPictureInit () failed\n");

-      return FALSE;

-    }

-#endif

-

-#ifdef RANDR

-  /* Initialize resize and rotate support */

-  if (!winRandRInit (pScreen))

-    {

-      ErrorF ("winFinishScreenInitFB - winRandRInit () failed\n");

-      return FALSE;

-    }

-#endif

-

-  /*

-   * Backing store support should reduce network traffic and increase

-   * performance.

-   */

-  miInitializeBackingStore (pScreen);

-

-  /* KDrive does miDCInitialize right after miInitializeBackingStore */

-  /* Setup the cursor routines */

-  winDebug ("winFinishScreenInitFB - Calling miDCInitialize ()\n");

-  miDCInitialize (pScreen, &g_winPointerCursorFuncs);

-

-  /* KDrive does winCreateDefColormap right after miDCInitialize */

-  /* Create a default colormap */

-  winDebug ("winFinishScreenInitFB - Calling winCreateDefColormap ()\n");

-  if (!winCreateDefColormap (pScreen))

-    {

-      ErrorF ("winFinishScreenInitFB - Could not create colormap\n");

-      return FALSE;

-    }

-

-  /* Initialize the shadow framebuffer layer */

-  if ((pScreenInfo->dwEngine == WIN_SERVER_SHADOW_GDI

-       || pScreenInfo->dwEngine == WIN_SERVER_SHADOW_DD

-       || pScreenInfo->dwEngine == WIN_SERVER_SHADOW_DDNL)

-#ifdef XWIN_MULTIWINDOWEXTWM

-      && !pScreenInfo->fMWExtWM

-#endif

-      )

-    {

-      winDebug ("winFinishScreenInitFB - Calling shadowSetup ()\n");

-      if (!shadowSetup(pScreen))

-	{

-	  ErrorF ("winFinishScreenInitFB - shadowSetup () failed\n");

-	  return FALSE;

-	}

-

-      /* Wrap CreateScreenResources so we can add the screen pixmap

-         to the Shadow framebuffer after it's been created */

-      pScreenPriv->pwinCreateScreenResources = pScreen->CreateScreenResources;

-      pScreen->CreateScreenResources = winCreateScreenResources;

-    }

-

-#ifdef XWIN_MULTIWINDOWEXTWM

-  /* Handle multi-window external window manager mode */

-  if (pScreenInfo->fMWExtWM)

-    {

-      winDebug ("winScreenInit - MultiWindowExtWM - Calling RootlessInit\n");

-      

-      RootlessInit(pScreen, &winMWExtWMProcs);

-      

-      winDebug ("winScreenInit - MultiWindowExtWM - RootlessInit returned\n");

-      

-      rootless_CopyBytes_threshold = 0;

-      rootless_FillBytes_threshold = 0;

-      rootless_CompositePixels_threshold = 0;

-      /* FIXME: How many? Profiling needed? */

-      rootless_CopyWindow_threshold = 1;

-

-      winWindowsWMExtensionInit ();

-    }

-#endif

-

-  /* Handle rootless mode */

-  if (pScreenInfo->fRootless)

-    {

-      /* Define the WRAP macro temporarily for local use */

-#define WRAP(a) \

-    if (pScreen->a) { \

-        pScreenPriv->a = pScreen->a; \

-    } else { \

-        ErrorF("null screen fn " #a "\n"); \

-        pScreenPriv->a = NULL; \

-    }

-

-      /* Save a pointer to each lower-level window procedure */

-      WRAP(CreateWindow);

-      WRAP(DestroyWindow);

-      WRAP(RealizeWindow);

-      WRAP(UnrealizeWindow);

-      WRAP(PositionWindow);

-      WRAP(ChangeWindowAttributes);

-      WRAP(SetShape);

-

-      /* Assign rootless window procedures to be top level procedures */

-      pScreen->CreateWindow = winCreateWindowRootless;

-      pScreen->DestroyWindow = winDestroyWindowRootless;

-      pScreen->PositionWindow = winPositionWindowRootless;

-      /*pScreen->ChangeWindowAttributes = winChangeWindowAttributesRootless;*/

-      pScreen->RealizeWindow = winMapWindowRootless;

-      pScreen->UnrealizeWindow = winUnmapWindowRootless;

-      pScreen->SetShape = winSetShapeRootless;

-

-      /* Undefine the WRAP macro, as it is not needed elsewhere */

-#undef WRAP

-    }

-

-

-#ifdef XWIN_MULTIWINDOW

-  /* Handle multi window mode */

-  else if (pScreenInfo->fMultiWindow)

-    {

-      /* Define the WRAP macro temporarily for local use */

-#define WRAP(a) \

-    if (pScreen->a) { \

-        pScreenPriv->a = pScreen->a; \

-    } else { \

-        ErrorF("null screen fn " #a "\n"); \

-        pScreenPriv->a = NULL; \

-    }

-

-      /* Save a pointer to each lower-level window procedure */

-      WRAP(CreateWindow);

-      WRAP(DestroyWindow);

-      WRAP(RealizeWindow);

-      WRAP(UnrealizeWindow);

-      WRAP(PositionWindow);

-      WRAP(ChangeWindowAttributes);

-      WRAP(ReparentWindow);

-      WRAP(RestackWindow);

-      WRAP(ResizeWindow);

-      WRAP(MoveWindow);

-      WRAP(CopyWindow);

-      WRAP(SetShape);

-

-      /* Assign multi-window window procedures to be top level procedures */

-      pScreen->CreateWindow = winCreateWindowMultiWindow;

-      pScreen->DestroyWindow = winDestroyWindowMultiWindow;

-      pScreen->PositionWindow = winPositionWindowMultiWindow;

-      /*pScreen->ChangeWindowAttributes = winChangeWindowAttributesMultiWindow;*/

-      pScreen->RealizeWindow = winMapWindowMultiWindow;

-      pScreen->UnrealizeWindow = winUnmapWindowMultiWindow;

-      pScreen->ReparentWindow = winReparentWindowMultiWindow;

-      pScreen->RestackWindow = winRestackWindowMultiWindow;

-      pScreen->ResizeWindow = winResizeWindowMultiWindow;

-      pScreen->MoveWindow = winMoveWindowMultiWindow;

-      pScreen->CopyWindow = winCopyWindowMultiWindow;

-      pScreen->SetShape = winSetShapeMultiWindow;

-

-      /* Undefine the WRAP macro, as it is not needed elsewhere */

-#undef WRAP

-    }

-#endif

-

-  /* Wrap either fb's or shadow's CloseScreen with our CloseScreen */

-  pScreenPriv->CloseScreen = pScreen->CloseScreen;

-  pScreen->CloseScreen = pScreenPriv->pwinCloseScreen;

-

-#if defined(XWIN_CLIPBOARD) || defined(XWIN_MULTIWINDOW)

-  /* Create a mutex for modules in separate threads to wait for */

-  iReturn = pthread_mutex_init (&pScreenPriv->pmServerStarted, NULL);

-  if (iReturn != 0)

-    {

-      ErrorF ("winFinishScreenInitFB - pthread_mutex_init () failed: %d\n",

-	      iReturn);

-      return FALSE;

-    }

-

-  /* Own the mutex for modules in separate threads */

-  iReturn = pthread_mutex_lock (&pScreenPriv->pmServerStarted);

-  if (iReturn != 0)

-    {

-      ErrorF ("winFinishScreenInitFB - pthread_mutex_lock () failed: %d\n",

-	      iReturn);

-      return FALSE;

-    }

-

-  /* Set the ServerStarted flag to false */

-  pScreenPriv->fServerStarted = FALSE;

-#endif

-

-#ifdef XWIN_MULTIWINDOWEXTWM

-  pScreenPriv->fRestacking = FALSE;

-#endif

-

-#if defined(XWIN_MULTIWINDOW) || defined(XWIN_MULTIWINDOWEXTWM)

-  if (FALSE

-#ifdef XWIN_MULTIWINDOW

-      || pScreenInfo->fMultiWindow

-#endif

-#ifdef XWIN_MULTIWINDOWEXTWM

-      || pScreenInfo->fInternalWM

-#endif

-      )

-    { 

-      winDebug ("winFinishScreenInitFB - Calling winInitWM.\n");

-

-      /* Initialize multi window mode */

-      if (!winInitWM (&pScreenPriv->pWMInfo,

-		      &pScreenPriv->ptWMProc,

-		      &pScreenPriv->ptXMsgProc,

-		      &pScreenPriv->pmServerStarted,

-		      pScreenInfo->dwScreen,

-		      (HWND)&pScreenPriv->hwndScreen,

-#ifdef XWIN_MULTIWINDOWEXTWM

-		      pScreenInfo->fInternalWM ||

-#endif

-		      FALSE))

-        {

-          ErrorF ("winFinishScreenInitFB - winInitWM () failed.\n");

-          return FALSE;

-        }

-    }      

-#endif

-

-  /* Tell the server that we are enabled */

-  pScreenPriv->fEnabled = TRUE;

-

-  /* Tell the server that we have a valid depth */

-  pScreenPriv->fBadDepth = FALSE;

-

-  winDebug ("winFinishScreenInitFB - returning\n");

-

-  return TRUE;

-}

-

-#ifdef XWIN_NATIVEGDI

-/* See Porting Layer Definition - p. 20 */

-

-Bool

-winFinishScreenInitNativeGDI (int index,

-			      ScreenPtr pScreen,

-			      int argc, char **argv)

-{

-  winScreenPriv(pScreen);

-  winScreenInfoPtr      pScreenInfo = &g_ScreenInfo[index];

-  VisualPtr		pVisuals = NULL;

-  DepthPtr		pDepths = NULL;

-  VisualID		rootVisual = 0;

-  int			nVisuals = 0, nDepths = 0, nRootDepth = 0;

-

-  /* Ignore user input (mouse, keyboard) */

-  pScreenInfo->fIgnoreInput = FALSE;

-

-  /* Get device contexts for the screen and shadow bitmap */

-  pScreenPriv->hdcScreen = GetDC (pScreenPriv->hwndScreen);

-  if (pScreenPriv->hdcScreen == NULL)

-    FatalError ("winFinishScreenInitNativeGDI - Couldn't get a DC\n");

-

-  /* Init visuals */

-  if (!(*pScreenPriv->pwinInitVisuals) (pScreen))

-    {

-      ErrorF ("winFinishScreenInitNativeGDI - pwinInitVisuals failed\n");

-      return FALSE;

-    }

-

-  /* Initialize the mi visuals */

-  if (!miInitVisuals (&pVisuals, &pDepths, &nVisuals, &nDepths, &nRootDepth,

-		      &rootVisual,

-		      ((unsigned long)1 << (pScreenInfo->dwDepth - 1)), 8,

-		      TrueColor))

-    {

-      ErrorF ("winFinishScreenInitNativeGDI - miInitVisuals () failed\n");

-      return FALSE;

-    }

-

-  /* Initialize the CloseScreen procedure pointer */

-  pScreen->CloseScreen = NULL;

-

-  /* Initialize the mi code */

-  if (!miScreenInit (pScreen,

-		     NULL, /* No framebuffer */

-		     pScreenInfo->dwWidth, pScreenInfo->dwHeight,

-		     monitorResolution, monitorResolution,

-		     pScreenInfo->dwStride,

-		     nRootDepth, nDepths, pDepths, rootVisual,

-		     nVisuals, pVisuals))

-    {

-      ErrorF ("winFinishScreenInitNativeGDI - miScreenInit failed\n");

-      return FALSE;

-    }

-

-  pScreen->defColormap = FakeClientID(0);

-

-  /*

-   * Register our block and wakeup handlers; these procedures

-   * process messages in our Windows message queue; specifically,

-   * they process mouse and keyboard input.

-   */

-  pScreen->BlockHandler = winBlockHandler;

-  pScreen->WakeupHandler = winWakeupHandler;

-  pScreen->blockData = pScreen;

-  pScreen->wakeupData = pScreen;

-

-  /* Place our save screen function */

-  pScreen->SaveScreen = winSaveScreen;

-

-  /* Pixmaps */

-  pScreen->CreatePixmap = winCreatePixmapNativeGDI;

-  pScreen->DestroyPixmap = winDestroyPixmapNativeGDI;

-

-  /* Other Screen Routines */

-  pScreen->QueryBestSize = winQueryBestSizeNativeGDI;

-  pScreen->SaveScreen = winSaveScreen;  

-  pScreen->GetImage = miGetImage;

-  pScreen->GetSpans = winGetSpansNativeGDI;

-

-  /* Window Procedures */

-  pScreen->CreateWindow = winCreateWindowNativeGDI;

-  pScreen->DestroyWindow = winDestroyWindowNativeGDI;

-  pScreen->PositionWindow = winPositionWindowNativeGDI;

-  /*pScreen->ChangeWindowAttributes = winChangeWindowAttributesNativeGDI;*/

-  pScreen->RealizeWindow = winMapWindowNativeGDI;

-  pScreen->UnrealizeWindow = winUnmapWindowNativeGDI;

-

-  /* Paint window */

-  pScreen->CopyWindow = winCopyWindowNativeGDI;

-

-  /* Fonts */

-  pScreen->RealizeFont = winRealizeFontNativeGDI;

-  pScreen->UnrealizeFont = winUnrealizeFontNativeGDI;

-

-  /* GC */

-  pScreen->CreateGC = winCreateGCNativeGDI;

-

-  /* Colormap Routines */

-  pScreen->CreateColormap = miInitializeColormap;

-  pScreen->DestroyColormap = (DestroyColormapProcPtr) (void (*)(void)) NoopDDA;

-  pScreen->InstallColormap = miInstallColormap;

-  pScreen->UninstallColormap = miUninstallColormap;

-  pScreen->ListInstalledColormaps = miListInstalledColormaps;

-  pScreen->StoreColors = (StoreColorsProcPtr) (void (*)(void)) NoopDDA;

-  pScreen->ResolveColor = miResolveColor;

-

-  /* Bitmap */

-  pScreen->BitmapToRegion = winPixmapToRegionNativeGDI;

-

-  winDebug ("winFinishScreenInitNativeGDI - calling miDCInitialize\n");

-

-  /* Set the default white and black pixel positions */

-  pScreen->whitePixel = pScreen->blackPixel = (Pixel) 0;

-

-  /* Initialize the cursor */

-  if (!miDCInitialize (pScreen, &g_winPointerCursorFuncs))

-    {

-      ErrorF ("winFinishScreenInitNativeGDI - miDCInitialize failed\n");

-      return FALSE;

-    }

-  

-  /* Create a default colormap */

-  if (!miCreateDefColormap (pScreen))

-    {

-        ErrorF ("winFinishScreenInitNativeGDI - miCreateDefColormap () "

-		"failed\n");

-	return FALSE;

-    }

-

-  winDebug ("winFinishScreenInitNativeGDI - miCreateDefColormap () "

-	  "returned\n");

-  

-  /* mi doesn't use a CloseScreen procedure, so no need to wrap */

-  pScreen->CloseScreen = pScreenPriv->pwinCloseScreen;

-

-  /* Tell the server that we are enabled */

-  pScreenPriv->fEnabled = TRUE;

-

-  winDebug ("winFinishScreenInitNativeGDI - Successful addition of "

-	  "screen %08x\n",

-	  (unsigned int) pScreen);

-

-  return TRUE;

-}

-#endif

-

-

-/* See Porting Layer Definition - p. 33 */

-static Bool

-winSaveScreen (ScreenPtr pScreen, int on)

-{

-  return TRUE;

-}

+/*
+ *Copyright (C) 1994-2000 The XFree86 Project, Inc. All Rights Reserved.
+ *
+ *Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ *"Software"), to deal in the Software without restriction, including
+ *without limitation the rights to use, copy, modify, merge, publish,
+ *distribute, sublicense, and/or sell copies of the Software, and to
+ *permit persons to whom the Software is furnished to do so, subject to
+ *the following conditions:
+ *
+ *The above copyright notice and this permission notice shall be
+ *included in all copies or substantial portions of the Software.
+ *
+ *THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *NONINFRINGEMENT. IN NO EVENT SHALL THE XFREE86 PROJECT BE LIABLE FOR
+ *ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
+ *CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ *WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ *Except as contained in this notice, the name of the XFree86 Project
+ *shall not be used in advertising or otherwise to promote the sale, use
+ *or other dealings in this Software without prior written authorization
+ *from the XFree86 Project.
+ *
+ * Authors:	Dakshinamurthy Karra
+ *		Suhaib M Siddiqi
+ *		Peter Busch
+ *		Harold L Hunt II
+ *		Kensuke Matsuzaki
+ */
+
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
+#include "win.h"
+#include "winmsg.h"
+
+
+#ifdef XWIN_MULTIWINDOWEXTWM
+static RootlessFrameProcsRec
+winMWExtWMProcs = {	
+  winMWExtWMCreateFrame,
+  winMWExtWMDestroyFrame,
+  
+  winMWExtWMMoveFrame,
+  winMWExtWMResizeFrame,
+  winMWExtWMRestackFrame,
+  winMWExtWMReshapeFrame,
+  winMWExtWMUnmapFrame,
+  
+  winMWExtWMStartDrawing,
+  winMWExtWMStopDrawing,
+  winMWExtWMUpdateRegion,
+#ifndef ROOTLESS_TRACK_DAMAGE
+  winMWExtWMDamageRects,
+#endif
+  winMWExtWMRootlessSwitchWindow,
+  NULL,//winMWExtWMDoReorderWindow,
+  NULL,//winMWExtWMHideWindow,
+  NULL,//winMWExtWMUpdateColorMap,
+
+  NULL,//winMWExtWMCopyBytes,
+  NULL,//winMWExtWMFillBytes,
+  NULL,//winMWExtWMCompositePixels,
+  winMWExtWMCopyWindow
+};
+#endif
+
+
+/*
+ * References to external symbols
+ */
+
+extern Bool                     g_fSoftwareCursor;
+
+
+/*
+ * Prototypes
+ */
+
+Bool
+winRandRInit (ScreenPtr pScreen);
+
+
+/*
+ * Local functions
+ */
+
+static Bool
+winSaveScreen (ScreenPtr pScreen, int on);
+
+
+/*
+ * Determine what type of screen we are initializing
+ * and call the appropriate procedure to intiailize
+ * that type of screen.
+ */
+
+Bool
+winScreenInit (int index,
+	       ScreenPtr pScreen,
+	       int argc, char **argv)
+{
+  winScreenInfoPtr      pScreenInfo = &g_ScreenInfo[index];
+  winPrivScreenPtr	pScreenPriv;
+  HDC			hdc;
+
+  winDebug ("winScreenInit - dwWidth: %ld dwHeight: %ld\n",
+	  pScreenInfo->dwWidth, pScreenInfo->dwHeight);
+
+  /* Allocate privates for this screen */
+  if (!winAllocatePrivates (pScreen))
+    {
+      ErrorF ("winScreenInit - Couldn't allocate screen privates\n");
+      return FALSE;
+    }
+
+  /* Get a pointer to the privates structure that was allocated */
+  pScreenPriv = winGetScreenPriv (pScreen);
+
+  /* Save a pointer to this screen in the screen info structure */
+  pScreenInfo->pScreen = pScreen;
+
+  /* Save a pointer to the screen info in the screen privates structure */
+  /* This allows us to get back to the screen info from a screen pointer */
+  pScreenPriv->pScreenInfo = pScreenInfo;
+
+  /*
+   * Determine which engine to use.
+   *
+   * NOTE: This is done once per screen because each screen possibly has
+   * a preferred engine specified on the command line.
+   */
+  if (!winSetEngine (pScreen))
+    {
+      ErrorF ("winScreenInit - winSetEngine () failed\n");
+      return FALSE;
+    }
+
+  /* Adjust the video mode for our engine type */
+  if (pScreenPriv->pwinAdjustVideoMode && !(*pScreenPriv->pwinAdjustVideoMode) (pScreen))
+    {
+      ErrorF ("winScreenInit - winAdjustVideoMode () failed\n");
+      return FALSE;
+    }
+
+  /* Check for supported display depth */
+  if (!(WIN_SUPPORTED_BPPS & (1 << (pScreenInfo->dwBPP - 1))))
+    {
+      ErrorF ("winScreenInit - Unsupported display depth: %d\n" \
+	      "Change your Windows display depth to 15, 16, 24, or 32 bits "
+	      "per pixel.\n",
+	      (int) pScreenInfo->dwBPP);
+      ErrorF ("winScreenInit - Supported depths: %08x\n",
+	      WIN_SUPPORTED_BPPS);
+#if WIN_CHECK_DEPTH
+      return FALSE;
+#endif
+    }
+
+  /*
+   * Check that all monitors have the same display depth if we are using
+   * multiple monitors
+   */
+  if (pScreenInfo->fMultipleMonitors 
+      && !GetSystemMetrics (SM_SAMEDISPLAYFORMAT))
+    {
+      ErrorF ("winScreenInit - Monitors do not all have same pixel format / "
+	      "display depth.\n"
+	      "Using primary display only.\n");
+      pScreenInfo->fMultipleMonitors = FALSE;
+    }
+
+  /* Create display window */
+  if (pScreenPriv->pwinCreateBoundingWindow && !(*pScreenPriv->pwinCreateBoundingWindow) (pScreen))
+    {
+      ErrorF ("winScreenInit - pwinCreateBoundingWindow () "
+	      "failed\n");
+      return FALSE;
+    }
+
+  /* Get a device context */
+  hdc = GetDC (pScreenPriv->hwndScreen);
+
+  /* Store the initial height, width, and depth of the display */
+  /* Are we using multiple monitors? */
+  if (pScreenInfo->fMultipleMonitors)
+    {
+      pScreenPriv->dwLastWindowsWidth = GetSystemMetrics (SM_CXVIRTUALSCREEN);
+      pScreenPriv->dwLastWindowsHeight = GetSystemMetrics (SM_CYVIRTUALSCREEN);
+
+      /* 
+       * In this case, some of the defaults set in
+       * winInitializeDefaultScreens () are not correct ...
+       */
+      if (!pScreenInfo->fUserGaveHeightAndWidth)
+	{
+	  pScreenInfo->dwWidth = GetSystemMetrics (SM_CXVIRTUALSCREEN);
+	  pScreenInfo->dwHeight = GetSystemMetrics (SM_CYVIRTUALSCREEN);
+	  pScreenInfo->dwWidth_mm = (pScreenInfo->dwWidth /
+				     WIN_DEFAULT_DPI) * 25.4;
+	  pScreenInfo->dwHeight_mm = (pScreenInfo->dwHeight /
+				      WIN_DEFAULT_DPI) * 25.4;
+	}
+    }
+  else
+    {
+      pScreenPriv->dwLastWindowsWidth = GetSystemMetrics (SM_CXSCREEN);
+      pScreenPriv->dwLastWindowsHeight = GetSystemMetrics (SM_CYSCREEN);
+    }
+
+  /* Save the original bits per pixel */
+  pScreenPriv->dwLastWindowsBitsPixel = GetDeviceCaps (hdc, BITSPIXEL);
+
+  /* Release the device context */
+  ReleaseDC (pScreenPriv->hwndScreen, hdc);
+    
+  /* Clear the visuals list */
+  miClearVisualTypes ();
+  
+  /* Set the padded screen width */
+  pScreenInfo->dwPaddedWidth = PixmapBytePad (pScreenInfo->dwWidth,
+					      pScreenInfo->dwBPP);
+
+  /* Call the engine dependent screen initialization procedure */
+  if (pScreenPriv->pwinFinishScreenInit && !((*pScreenPriv->pwinFinishScreenInit) (index, pScreen, argc, argv)))
+    {
+      ErrorF ("winScreenInit - winFinishScreenInit () failed\n");
+      return FALSE;
+    }
+
+  if (!g_fSoftwareCursor)
+    winInitCursor(pScreen);
+#ifdef WINDBG
+  else
+    winDebug("winScreenInit - Using software cursor\n");  
+#endif
+
+  /*
+     Note the screen origin in a normalized coordinate space where (0,0) is at the top left
+     of the native virtual desktop area
+  */
+  dixScreenOrigins[index].x = pScreenInfo->dwInitialX - GetSystemMetrics(SM_XVIRTUALSCREEN);
+  dixScreenOrigins[index].y = pScreenInfo->dwInitialY - GetSystemMetrics(SM_YVIRTUALSCREEN);
+
+  winDebug("Screen %d added at virtual desktop coordinate (%d,%d).\n",
+            index, dixScreenOrigins[index].x, dixScreenOrigins[index].y);
+  winDebug ("winScreenInit - returning\n");
+
+  return TRUE;
+}
+
+static Bool
+winCreateScreenResources(ScreenPtr pScreen)
+{
+  winScreenPriv(pScreen);
+  Bool result;
+
+  result = pScreenPriv->pwinCreateScreenResources(pScreen);
+
+  /* Now the screen bitmap has been wrapped in a pixmap,
+     add that to the Shadow framebuffer */
+  if (!shadowAdd(pScreen, pScreen->devPrivate,
+		 pScreenPriv->pwinShadowUpdate, NULL, 0, 0))
+    {
+      ErrorF ("winCreateScreenResources - shadowAdd () failed\n");
+      return FALSE;
+    }
+
+  return result;
+}
+
+/* See Porting Layer Definition - p. 20 */
+Bool
+winFinishScreenInitFB (int index,
+		       ScreenPtr pScreen,
+		       int argc, char **argv)
+{
+  winScreenPriv(pScreen);
+  winScreenInfo		*pScreenInfo = pScreenPriv->pScreenInfo;
+  VisualPtr		pVisual = NULL;
+  char			*pbits = NULL;
+#if defined(XWIN_CLIPBOARD) || defined(XWIN_MULTIWINDOW)
+  int			iReturn;
+#endif
+
+  /* Create framebuffer */
+  if (!(*pScreenPriv->pwinAllocateFB) (pScreen))
+    {
+      ErrorF ("winFinishScreenInitFB - Could not allocate framebuffer\n");
+      return FALSE;
+    }
+
+  /*
+   * Grab the number of bits that are used to represent color in each pixel.
+   */
+  if (pScreenInfo->dwBPP == 8)
+    pScreenInfo->dwDepth = 8;
+  else
+    pScreenInfo->dwDepth = winCountBits (pScreenPriv->dwRedMask)
+      + winCountBits (pScreenPriv->dwGreenMask)
+      + winCountBits (pScreenPriv->dwBlueMask);
+  
+  winDebug ("winFinishScreenInitFB - Masks: %08x %08x %08x\n",
+	  (unsigned int) pScreenPriv->dwRedMask,
+	  (unsigned int) pScreenPriv->dwGreenMask,
+	  (unsigned int) pScreenPriv->dwBlueMask);
+
+  /* Init visuals */
+  if (!(*pScreenPriv->pwinInitVisuals) (pScreen))
+    {
+      ErrorF ("winFinishScreenInitFB - winInitVisuals failed\n");
+      return FALSE;
+    }
+
+  /* Setup a local variable to point to the framebuffer */
+  pbits = pScreenInfo->pfb;
+  
+  /* Apparently we need this for the render extension */
+  miSetPixmapDepths ();
+
+  /* Start fb initialization */
+  if (!fbSetupScreen (pScreen,
+		      pScreenInfo->pfb,
+		      pScreenInfo->dwWidth, pScreenInfo->dwHeight,
+		      monitorResolution, monitorResolution,
+		      pScreenInfo->dwStride,
+		      pScreenInfo->dwBPP))
+    {
+      ErrorF ("winFinishScreenInitFB - fbSetupScreen failed\n");
+      return FALSE;
+    }
+
+  /* Override default colormap routines if visual class is dynamic */
+  if (pScreenInfo->dwDepth == 8
+      && (pScreenInfo->dwEngine == WIN_SERVER_SHADOW_GDI
+	  || (pScreenInfo->dwEngine == WIN_SERVER_SHADOW_DDNL
+	      && pScreenInfo->fFullScreen)
+	  || (pScreenInfo->dwEngine == WIN_SERVER_SHADOW_DD
+	      && pScreenInfo->fFullScreen)))
+    {
+      winSetColormapFunctions (pScreen);
+
+      /*
+       * NOTE: Setting whitePixel to 255 causes Magic 7.1 to allocate its
+       * own colormap, as it cannot allocate 7 planes in the default
+       * colormap.  Setting whitePixel to 1 allows Magic to get 7
+       * planes in the default colormap, so it doesn't create its
+       * own colormap.  This latter situation is highly desireable,
+       * as it keeps the Magic window viewable when switching to
+       * other X clients that use the default colormap.
+       */
+      pScreen->blackPixel = 0;
+      pScreen->whitePixel = 1;
+    }
+
+  /* Place our save screen function */
+  pScreen->SaveScreen = winSaveScreen;
+
+  /* Finish fb initialization */
+  if (!fbFinishScreenInit (pScreen,
+			   pScreenInfo->pfb,
+			   pScreenInfo->dwWidth, pScreenInfo->dwHeight,
+			   monitorResolution, monitorResolution,
+			   pScreenInfo->dwStride,
+			   pScreenInfo->dwBPP))
+    {
+      ErrorF ("winFinishScreenInitFB - fbFinishScreenInit failed\n");
+      return FALSE;
+    }
+
+  /* Save a pointer to the root visual */
+  for (pVisual = pScreen->visuals;
+       pVisual->vid != pScreen->rootVisual;
+       pVisual++);
+  pScreenPriv->pRootVisual = pVisual;
+
+  /* 
+   * Setup points to the block and wakeup handlers.  Pass a pointer
+   * to the current screen as pWakeupdata.
+   */
+  pScreen->BlockHandler = winBlockHandler;
+  pScreen->WakeupHandler = winWakeupHandler;
+  pScreen->blockData = pScreen;
+  pScreen->wakeupData = pScreen;
+
+  /* Render extension initialization, calls miPictureInit */
+  if (!fbPictureInit (pScreen, NULL, 0))
+    {
+      ErrorF ("winFinishScreenInitFB - fbPictureInit () failed\n");
+      return FALSE;
+    }
+
+#ifdef RANDR
+  /* Initialize resize and rotate support */
+  if (!winRandRInit (pScreen))
+    {
+      ErrorF ("winFinishScreenInitFB - winRandRInit () failed\n");
+      return FALSE;
+    }
+#endif
+
+  /*
+   * Backing store support should reduce network traffic and increase
+   * performance.
+   */
+  miInitializeBackingStore (pScreen);
+
+  /* KDrive does miDCInitialize right after miInitializeBackingStore */
+  /* Setup the cursor routines */
+  winDebug ("winFinishScreenInitFB - Calling miDCInitialize ()\n");
+  miDCInitialize (pScreen, &g_winPointerCursorFuncs);
+
+  /* KDrive does winCreateDefColormap right after miDCInitialize */
+  /* Create a default colormap */
+  winDebug ("winFinishScreenInitFB - Calling winCreateDefColormap ()\n");
+  if (!winCreateDefColormap (pScreen))
+    {
+      ErrorF ("winFinishScreenInitFB - Could not create colormap\n");
+      return FALSE;
+    }
+
+  /* Initialize the shadow framebuffer layer */
+  if ((pScreenInfo->dwEngine == WIN_SERVER_SHADOW_GDI
+       || pScreenInfo->dwEngine == WIN_SERVER_SHADOW_DD
+       || pScreenInfo->dwEngine == WIN_SERVER_SHADOW_DDNL)
+#ifdef XWIN_MULTIWINDOWEXTWM
+      && !pScreenInfo->fMWExtWM
+#endif
+      )
+    {
+      winDebug ("winFinishScreenInitFB - Calling shadowSetup ()\n");
+      if (!shadowSetup(pScreen))
+	{
+	  ErrorF ("winFinishScreenInitFB - shadowSetup () failed\n");
+	  return FALSE;
+	}
+
+      /* Wrap CreateScreenResources so we can add the screen pixmap
+         to the Shadow framebuffer after it's been created */
+      pScreenPriv->pwinCreateScreenResources = pScreen->CreateScreenResources;
+      pScreen->CreateScreenResources = winCreateScreenResources;
+    }
+
+#ifdef XWIN_MULTIWINDOWEXTWM
+  /* Handle multi-window external window manager mode */
+  if (pScreenInfo->fMWExtWM)
+    {
+      winDebug ("winScreenInit - MultiWindowExtWM - Calling RootlessInit\n");
+      
+      RootlessInit(pScreen, &winMWExtWMProcs);
+      
+      winDebug ("winScreenInit - MultiWindowExtWM - RootlessInit returned\n");
+      
+      rootless_CopyBytes_threshold = 0;
+      rootless_FillBytes_threshold = 0;
+      rootless_CompositePixels_threshold = 0;
+      /* FIXME: How many? Profiling needed? */
+      rootless_CopyWindow_threshold = 1;
+
+      winWindowsWMExtensionInit ();
+    }
+#endif
+
+  /* Handle rootless mode */
+  if (pScreenInfo->fRootless)
+    {
+      /* Define the WRAP macro temporarily for local use */
+#define WRAP(a) \
+    if (pScreen->a) { \
+        pScreenPriv->a = pScreen->a; \
+    } else { \
+        ErrorF("null screen fn " #a "\n"); \
+        pScreenPriv->a = NULL; \
+    }
+
+      /* Save a pointer to each lower-level window procedure */
+      WRAP(CreateWindow);
+      WRAP(DestroyWindow);
+      WRAP(RealizeWindow);
+      WRAP(UnrealizeWindow);
+      WRAP(PositionWindow);
+      WRAP(ChangeWindowAttributes);
+      WRAP(SetShape);
+
+      /* Assign rootless window procedures to be top level procedures */
+      pScreen->CreateWindow = winCreateWindowRootless;
+      pScreen->DestroyWindow = winDestroyWindowRootless;
+      pScreen->PositionWindow = winPositionWindowRootless;
+      /*pScreen->ChangeWindowAttributes = winChangeWindowAttributesRootless;*/
+      pScreen->RealizeWindow = winMapWindowRootless;
+      pScreen->UnrealizeWindow = winUnmapWindowRootless;
+      pScreen->SetShape = winSetShapeRootless;
+
+      /* Undefine the WRAP macro, as it is not needed elsewhere */
+#undef WRAP
+    }
+
+
+#ifdef XWIN_MULTIWINDOW
+  /* Handle multi window mode */
+  else if (pScreenInfo->fMultiWindow)
+    {
+      /* Define the WRAP macro temporarily for local use */
+#define WRAP(a) \
+    if (pScreen->a) { \
+        pScreenPriv->a = pScreen->a; \
+    } else { \
+        ErrorF("null screen fn " #a "\n"); \
+        pScreenPriv->a = NULL; \
+    }
+
+      /* Save a pointer to each lower-level window procedure */
+      WRAP(CreateWindow);
+      WRAP(DestroyWindow);
+      WRAP(RealizeWindow);
+      WRAP(UnrealizeWindow);
+      WRAP(PositionWindow);
+      WRAP(ChangeWindowAttributes);
+      WRAP(ReparentWindow);
+      WRAP(RestackWindow);
+      WRAP(ResizeWindow);
+      WRAP(MoveWindow);
+      WRAP(CopyWindow);
+      WRAP(SetShape);
+
+      /* Assign multi-window window procedures to be top level procedures */
+      pScreen->CreateWindow = winCreateWindowMultiWindow;
+      pScreen->DestroyWindow = winDestroyWindowMultiWindow;
+      pScreen->PositionWindow = winPositionWindowMultiWindow;
+      /*pScreen->ChangeWindowAttributes = winChangeWindowAttributesMultiWindow;*/
+      pScreen->RealizeWindow = winMapWindowMultiWindow;
+      pScreen->UnrealizeWindow = winUnmapWindowMultiWindow;
+      pScreen->ReparentWindow = winReparentWindowMultiWindow;
+      pScreen->RestackWindow = winRestackWindowMultiWindow;
+      pScreen->ResizeWindow = winResizeWindowMultiWindow;
+      pScreen->MoveWindow = winMoveWindowMultiWindow;
+      pScreen->CopyWindow = winCopyWindowMultiWindow;
+      pScreen->SetShape = winSetShapeMultiWindow;
+
+      /* Undefine the WRAP macro, as it is not needed elsewhere */
+#undef WRAP
+    }
+#endif
+
+  /* Wrap either fb's or shadow's CloseScreen with our CloseScreen */
+  pScreenPriv->CloseScreen = pScreen->CloseScreen;
+  pScreen->CloseScreen = pScreenPriv->pwinCloseScreen;
+
+#if defined(XWIN_CLIPBOARD) || defined(XWIN_MULTIWINDOW)
+  /* Create a mutex for modules in separate threads to wait for */
+  iReturn = pthread_mutex_init (&pScreenPriv->pmServerStarted, NULL);
+  if (iReturn != 0)
+    {
+      ErrorF ("winFinishScreenInitFB - pthread_mutex_init () failed: %d\n",
+	      iReturn);
+      return FALSE;
+    }
+
+  /* Own the mutex for modules in separate threads */
+  iReturn = pthread_mutex_lock (&pScreenPriv->pmServerStarted);
+  if (iReturn != 0)
+    {
+      ErrorF ("winFinishScreenInitFB - pthread_mutex_lock () failed: %d\n",
+	      iReturn);
+      return FALSE;
+    }
+
+  /* Set the ServerStarted flag to false */
+  pScreenPriv->fServerStarted = FALSE;
+#endif
+
+#ifdef XWIN_MULTIWINDOWEXTWM
+  pScreenPriv->fRestacking = FALSE;
+#endif
+
+#if defined(XWIN_MULTIWINDOW) || defined(XWIN_MULTIWINDOWEXTWM)
+  if (FALSE
+#ifdef XWIN_MULTIWINDOW
+      || pScreenInfo->fMultiWindow
+#endif
+#ifdef XWIN_MULTIWINDOWEXTWM
+      || pScreenInfo->fInternalWM
+#endif
+      )
+    { 
+      winDebug ("winFinishScreenInitFB - Calling winInitWM.\n");
+
+      /* Initialize multi window mode */
+      if (!winInitWM (&pScreenPriv->pWMInfo,
+		      &pScreenPriv->ptWMProc,
+		      &pScreenPriv->ptXMsgProc,
+		      &pScreenPriv->pmServerStarted,
+		      pScreenInfo->dwScreen,
+		      (HWND)&pScreenPriv->hwndScreen,
+#ifdef XWIN_MULTIWINDOWEXTWM
+		      pScreenInfo->fInternalWM ||
+#endif
+		      FALSE))
+        {
+          ErrorF ("winFinishScreenInitFB - winInitWM () failed.\n");
+          return FALSE;
+        }
+    }      
+#endif
+
+  /* Tell the server that we are enabled */
+  pScreenPriv->fEnabled = TRUE;
+
+  /* Tell the server that we have a valid depth */
+  pScreenPriv->fBadDepth = FALSE;
+
+  winDebug ("winFinishScreenInitFB - returning\n");
+
+  return TRUE;
+}
+
+#ifdef XWIN_NATIVEGDI
+/* See Porting Layer Definition - p. 20 */
+
+Bool
+winFinishScreenInitNativeGDI (int index,
+			      ScreenPtr pScreen,
+			      int argc, char **argv)
+{
+  winScreenPriv(pScreen);
+  winScreenInfoPtr      pScreenInfo = &g_ScreenInfo[index];
+  VisualPtr		pVisuals = NULL;
+  DepthPtr		pDepths = NULL;
+  VisualID		rootVisual = 0;
+  int			nVisuals = 0, nDepths = 0, nRootDepth = 0;
+
+  /* Ignore user input (mouse, keyboard) */
+  pScreenInfo->fIgnoreInput = FALSE;
+
+  /* Get device contexts for the screen and shadow bitmap */
+  pScreenPriv->hdcScreen = GetDC (pScreenPriv->hwndScreen);
+  if (pScreenPriv->hdcScreen == NULL)
+    FatalError ("winFinishScreenInitNativeGDI - Couldn't get a DC\n");
+
+  /* Init visuals */
+  if (!(*pScreenPriv->pwinInitVisuals) (pScreen))
+    {
+      ErrorF ("winFinishScreenInitNativeGDI - pwinInitVisuals failed\n");
+      return FALSE;
+    }
+
+  /* Initialize the mi visuals */
+  if (!miInitVisuals (&pVisuals, &pDepths, &nVisuals, &nDepths, &nRootDepth,
+		      &rootVisual,
+		      ((unsigned long)1 << (pScreenInfo->dwDepth - 1)), 8,
+		      TrueColor))
+    {
+      ErrorF ("winFinishScreenInitNativeGDI - miInitVisuals () failed\n");
+      return FALSE;
+    }
+
+  /* Initialize the CloseScreen procedure pointer */
+  pScreen->CloseScreen = NULL;
+
+  /* Initialize the mi code */
+  if (!miScreenInit (pScreen,
+		     NULL, /* No framebuffer */
+		     pScreenInfo->dwWidth, pScreenInfo->dwHeight,
+		     monitorResolution, monitorResolution,
+		     pScreenInfo->dwStride,
+		     nRootDepth, nDepths, pDepths, rootVisual,
+		     nVisuals, pVisuals))
+    {
+      ErrorF ("winFinishScreenInitNativeGDI - miScreenInit failed\n");
+      return FALSE;
+    }
+
+  pScreen->defColormap = FakeClientID(0);
+
+  /*
+   * Register our block and wakeup handlers; these procedures
+   * process messages in our Windows message queue; specifically,
+   * they process mouse and keyboard input.
+   */
+  pScreen->BlockHandler = winBlockHandler;
+  pScreen->WakeupHandler = winWakeupHandler;
+  pScreen->blockData = pScreen;
+  pScreen->wakeupData = pScreen;
+
+  /* Place our save screen function */
+  pScreen->SaveScreen = winSaveScreen;
+
+  /* Pixmaps */
+  pScreen->CreatePixmap = winCreatePixmapNativeGDI;
+  pScreen->DestroyPixmap = winDestroyPixmapNativeGDI;
+
+  /* Other Screen Routines */
+  pScreen->QueryBestSize = winQueryBestSizeNativeGDI;
+  pScreen->SaveScreen = winSaveScreen;  
+  pScreen->GetImage = miGetImage;
+  pScreen->GetSpans = winGetSpansNativeGDI;
+
+  /* Window Procedures */
+  pScreen->CreateWindow = winCreateWindowNativeGDI;
+  pScreen->DestroyWindow = winDestroyWindowNativeGDI;
+  pScreen->PositionWindow = winPositionWindowNativeGDI;
+  /*pScreen->ChangeWindowAttributes = winChangeWindowAttributesNativeGDI;*/
+  pScreen->RealizeWindow = winMapWindowNativeGDI;
+  pScreen->UnrealizeWindow = winUnmapWindowNativeGDI;
+
+  /* Paint window */
+  pScreen->CopyWindow = winCopyWindowNativeGDI;
+
+  /* Fonts */
+  pScreen->RealizeFont = winRealizeFontNativeGDI;
+  pScreen->UnrealizeFont = winUnrealizeFontNativeGDI;
+
+  /* GC */
+  pScreen->CreateGC = winCreateGCNativeGDI;
+
+  /* Colormap Routines */
+  pScreen->CreateColormap = miInitializeColormap;
+  pScreen->DestroyColormap = (DestroyColormapProcPtr) (void (*)(void)) NoopDDA;
+  pScreen->InstallColormap = miInstallColormap;
+  pScreen->UninstallColormap = miUninstallColormap;
+  pScreen->ListInstalledColormaps = miListInstalledColormaps;
+  pScreen->StoreColors = (StoreColorsProcPtr) (void (*)(void)) NoopDDA;
+  pScreen->ResolveColor = miResolveColor;
+
+  /* Bitmap */
+  pScreen->BitmapToRegion = winPixmapToRegionNativeGDI;
+
+  winDebug ("winFinishScreenInitNativeGDI - calling miDCInitialize\n");
+
+  /* Set the default white and black pixel positions */
+  pScreen->whitePixel = pScreen->blackPixel = (Pixel) 0;
+
+  /* Initialize the cursor */
+  if (!miDCInitialize (pScreen, &g_winPointerCursorFuncs))
+    {
+      ErrorF ("winFinishScreenInitNativeGDI - miDCInitialize failed\n");
+      return FALSE;
+    }
+  
+  /* Create a default colormap */
+  if (!miCreateDefColormap (pScreen))
+    {
+        ErrorF ("winFinishScreenInitNativeGDI - miCreateDefColormap () "
+		"failed\n");
+	return FALSE;
+    }
+
+  winDebug ("winFinishScreenInitNativeGDI - miCreateDefColormap () "
+	  "returned\n");
+  
+  /* mi doesn't use a CloseScreen procedure, so no need to wrap */
+  pScreen->CloseScreen = pScreenPriv->pwinCloseScreen;
+
+  /* Tell the server that we are enabled */
+  pScreenPriv->fEnabled = TRUE;
+
+  winDebug ("winFinishScreenInitNativeGDI - Successful addition of "
+	  "screen %08x\n",
+	  (unsigned int) pScreen);
+
+  return TRUE;
+}
+#endif
+
+
+/* See Porting Layer Definition - p. 33 */
+static Bool
+winSaveScreen (ScreenPtr pScreen, int on)
+{
+  return TRUE;
+}