xserver mesa xkbcomp libxcb git update 21 jan 2011

25 files changed, 16477 insertions, 16185 deletions

diff --git a/xorg-server/hw/dmx/config/xdmxconfig.c b/xorg-server/hw/dmx/config/xdmxconfig.c
index 033b52512..c67077aec 100644
--- a/xorg-server/hw/dmx/config/xdmxconfig.c
+++ b/xorg-server/hw/dmx/config/xdmxconfig.c
@@ -142,7 +142,7 @@ static void dmxConfigGetDims(int *maxWidth, int *maxHeight)
     DMXConfigEntryPtr e;
     
     *maxWidth = dmxConfigWallWidth  = 0;
-    *maxWidth = dmxConfigWallHeight = 0;
+    *maxHeight = dmxConfigWallHeight = 0;
     if (!dmxConfigCurrent) return;
     
     dmxConfigWallWidth  = dmxConfigCurrent->width;
diff --git a/xorg-server/hw/dmx/dmxextension.c b/xorg-server/hw/dmx/dmxextension.c
index 97f2a04b0..bd326ce2a 100644
--- a/xorg-server/hw/dmx/dmxextension.c
+++ b/xorg-server/hw/dmx/dmxextension.c
@@ -1,1618 +1,1620 @@
-/*

- * Copyright 2003-2004 Red Hat Inc., Durham, North Carolina.

- *

- * 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 on 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 (including the

- * next paragraph) 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

- * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS

- * 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.

- */

-

-/*

- * Author:

- *   Rickard E. (Rik) Faith <faith@redhat.com>

- *   Kevin E. Martin <kem@redhat.com>

- *

- */

-

-/** \file

- * This file provides the only interface to the X server extension support

- * in programs/Xserver/Xext.  Those programs should only include dmxext.h

- */

-

-#ifdef HAVE_DMX_CONFIG_H

-#include <dmx-config.h>

-#endif

-

-#include <stdlib.h>

-

-#include "dmx.h"

-#include "dmxinit.h"

-#include "dmxextension.h"

-#include "dmxwindow.h"

-#include "dmxcb.h"

-#include "dmxcursor.h"

-#include "dmxpixmap.h"

-#include "dmxgc.h"

-#include "dmxfont.h"

-#include "dmxcmap.h"

-#include "dmxpict.h"

-#include "dmxinput.h"

-#include "dmxsync.h"

-#include "dmxscrinit.h"

-#include "input/dmxinputinit.h"

-

-#include "windowstr.h"

-#include "inputstr.h"                 /* For DeviceIntRec */

-#include <X11/extensions/dmxproto.h>  /* For DMX_BAD_* */

-#include "cursorstr.h"

-

-/* The default font is declared in dix/globals.c, but is not included in

- * _any_ header files. */

-extern FontPtr  defaultFont;

-    

-/** This routine provides information to the DMX protocol extension

- * about a particular screen. */

-Bool dmxGetScreenAttributes(int physical, DMXScreenAttributesPtr attr)

-{

-    DMXScreenInfo *dmxScreen;

-

-    if (physical < 0 || physical >= dmxNumScreens) return FALSE;

-

-    dmxScreen = &dmxScreens[physical];

-    attr->displayName         = dmxScreen->name;

-#ifdef PANORAMIX

-    attr->logicalScreen       = noPanoramiXExtension ? dmxScreen->index : 0;

-#else

-    attr->logicalScreen       = dmxScreen->index;

-#endif

-

-    attr->screenWindowWidth   = dmxScreen->scrnWidth;

-    attr->screenWindowHeight  = dmxScreen->scrnHeight;

-    attr->screenWindowXoffset = dmxScreen->scrnX;

-    attr->screenWindowYoffset = dmxScreen->scrnY;

-

-    attr->rootWindowWidth     = dmxScreen->rootWidth;

-    attr->rootWindowHeight    = dmxScreen->rootHeight;

-    attr->rootWindowXoffset   = dmxScreen->rootX;

-    attr->rootWindowYoffset   = dmxScreen->rootY;

-

-    attr->rootWindowXorigin   = dmxScreen->rootXOrigin;

-    attr->rootWindowYorigin   = dmxScreen->rootYOrigin;

-

-    return TRUE;

-}

-

-/** This routine provides information to the DMX protocol extension

- * about a particular window. */

-Bool dmxGetWindowAttributes(WindowPtr pWindow, DMXWindowAttributesPtr attr)

-{

-    dmxWinPrivPtr pWinPriv = DMX_GET_WINDOW_PRIV(pWindow);

-

-    attr->screen         = pWindow->drawable.pScreen->myNum;

-    attr->window         = pWinPriv->window;

-

-    attr->pos.x          = pWindow->drawable.x;

-    attr->pos.y          = pWindow->drawable.y;

-    attr->pos.width      = pWindow->drawable.width;

-    attr->pos.height     = pWindow->drawable.height;

-

-    if (!pWinPriv->window || pWinPriv->offscreen) {

-        attr->vis.x      = 0;

-        attr->vis.y      = 0;

-        attr->vis.height = 0;

-        attr->vis.width  = 0;

-        return pWinPriv->window ? TRUE : FALSE;

-    }

-

-                                /* Compute display-relative coordinates */

-    attr->vis.x          = pWindow->drawable.x;

-    attr->vis.y          = pWindow->drawable.y;

-    attr->vis.width      = pWindow->drawable.width;

-    attr->vis.height     = pWindow->drawable.height;

-

-    if (attr->pos.x < 0) {

-        attr->vis.x     -= attr->pos.x;

-        attr->vis.width  = attr->pos.x + attr->pos.width - attr->vis.x;

-    }

-    if (attr->pos.x + attr->pos.width > pWindow->drawable.pScreen->width) {

-        if (attr->pos.x < 0)

-            attr->vis.width  = pWindow->drawable.pScreen->width;

-        else

-            attr->vis.width  = pWindow->drawable.pScreen->width - attr->pos.x;

-    }

-    if (attr->pos.y < 0) {

-        attr->vis.y     -= attr->pos.y;

-        attr->vis.height = attr->pos.y + attr->pos.height - attr->vis.y;

-    }

-    if (attr->pos.y + attr->pos.height > pWindow->drawable.pScreen->height) {

-        if (attr->pos.y < 0)

-            attr->vis.height = pWindow->drawable.pScreen->height;

-        else

-            attr->vis.height = pWindow->drawable.pScreen->height - attr->pos.y;

-    }

-

-                                /* Convert to window-relative coordinates */

-    attr->vis.x -= attr->pos.x;

-    attr->vis.y -= attr->pos.y;

-

-    return TRUE;

-}

-

-void dmxGetDesktopAttributes(DMXDesktopAttributesPtr attr)

-{

-    attr->width  = dmxGlobalWidth;

-    attr->height = dmxGlobalHeight;

-    attr->shiftX = 0;            /* NOTE: The upper left hand corner of */

-    attr->shiftY = 0;            /*       the desktop is always <0,0>. */

-}

-

-/** Return the total number of devices, not just #dmxNumInputs.  The

- * number returned should be the same as that returned by

- * XListInputDevices. */

-int dmxGetInputCount(void)

-{

-    int i, total;

-    

-    for (total = i = 0; i < dmxNumInputs; i++) total += dmxInputs[i].numDevs;

-    return total;

-}

-

-/** Return information about the device with id = \a deviceId.  This

- * information is primarily for the #ProcDMXGetInputAttributes()

- * function, which does not have access to the appropriate data

- * structure. */

-int dmxGetInputAttributes(int deviceId, DMXInputAttributesPtr attr)

-{

-    int          i, j;

-    DMXInputInfo *dmxInput;

-

-    if (deviceId < 0) return -1;

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

-        dmxInput = &dmxInputs[i];

-        for (j = 0; j < dmxInput->numDevs; j++) {

-            DMXLocalInputInfoPtr dmxLocal = dmxInput->devs[j];

-            if (deviceId != dmxLocal->pDevice->id) continue;

-            attr->isCore             = !!dmxLocal->isCore;

-            attr->sendsCore          = !!dmxLocal->sendsCore;

-            attr->detached           = !!dmxInput->detached;

-            attr->physicalScreen     = -1;

-            attr->physicalId         = -1;

-            attr->name               = NULL;

-            switch (dmxLocal->extType) {

-            case DMX_LOCAL_TYPE_LOCAL:

-                attr->inputType      = 0;

-                break;

-            case DMX_LOCAL_TYPE_CONSOLE:

-                attr->inputType      = 1;

-                attr->name           = dmxInput->name;

-                attr->physicalId     = dmxLocal->deviceId;

-                break;

-            case DMX_LOCAL_TYPE_BACKEND:

-            case DMX_LOCAL_TYPE_COMMON:

-                attr->inputType      = 2;

-                attr->physicalScreen = dmxInput->scrnIdx;

-                attr->name           = dmxInput->name;

-                attr->physicalId     = dmxLocal->deviceId;

-                break;

-            }

-            return 0;           /* Success */

-        }

-    }

-    return -1;                  /* Failure */

-}

-

-/** Reinitialized the cursor boundaries. */

-static void dmxAdjustCursorBoundaries(void)

-{

-    int           i;

-

-    dmxReInitOrigins();

-    dmxInitOverlap();

-    dmxComputeWidthHeight(DMX_NO_RECOMPUTE_BOUNDING_BOX);

-    dmxConnectionBlockCallback();

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

-        DMXInputInfo *dmxInput = &dmxInputs[i];

-	if (!dmxInput->detached) dmxInputReInit(dmxInput);

-    }

-

-    dmxCheckCursor();

-

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

-        DMXInputInfo *dmxInput = &dmxInputs[i];

-	if (!dmxInput->detached) dmxInputLateReInit(dmxInput);

-    }

-}

-

-/** Add an input with the specified attributes.  If the input is added,

- * the physical id is returned in \a deviceId. */

-int dmxAddInput(DMXInputAttributesPtr attr, int *id)

-{

-    int retcode = BadValue;

-

-    if (attr->inputType == 1)   /* console */

-        retcode = dmxInputAttachConsole(attr->name, attr->sendsCore, id);

-    else if (attr->inputType == 2)   /* backend */

-        retcode = dmxInputAttachBackend(attr->physicalScreen,

-                                        attr->sendsCore,id);

-

-    if (retcode == Success) {

-        /* Adjust the cursor boundaries */

-        dmxAdjustCursorBoundaries();

-

-        /* Force completion of the changes */

-        dmxSync(NULL, TRUE);

-    }

-

-    return retcode;

-}

-

-/** Remove the input with physical id \a id. */

-int dmxRemoveInput(int id)

-{

-    return dmxInputDetachId(id);

-}

-

-/** Return the value of #dmxNumScreens -- the total number of backend

- * screens in use (these are logical screens and may be larger than the

- * number of backend displays). */

-unsigned long dmxGetNumScreens(void)

-{

-    return dmxNumScreens;

-}

-

-/** Make sure that #dmxCreateAndRealizeWindow has been called for \a

- * pWindow. */

-void dmxForceWindowCreation(WindowPtr pWindow)

-{

-    dmxWinPrivPtr pWinPriv = DMX_GET_WINDOW_PRIV(pWindow);

-    if (!pWinPriv->window) dmxCreateAndRealizeWindow(pWindow, TRUE);

-}

-

-/** Flush pending syncs for all screens. */

-void dmxFlushPendingSyncs(void)

-{

-    dmxSync(NULL, TRUE);

-}

-

-/** Update DMX's screen resources to match those of the newly moved

- *  and/or resized "root" window. */

-void dmxUpdateScreenResources(ScreenPtr pScreen, int x, int y, int w, int h)

-{

-    DMXScreenInfo *dmxScreen = &dmxScreens[pScreen->myNum];

-    WindowPtr      pRoot     = pScreen->root;

-    WindowPtr      pChild;

-    Bool           anyMarked = FALSE;

-

-    /* Handle special case where width and/or height are zero */

-    if (w == 0 || h == 0) {

-	w = 1;

-	h = 1;

-    }

-

-    /* Change screen size */

-    pScreen->width  = w;

-    pScreen->height = h;

-

-    /* Reset the root window's drawable's size */

-    pRoot->drawable.width  = w;

-    pRoot->drawable.height = h;

-

-    /* Set the root window's new winSize and borderSize */

-    pRoot->winSize.extents.x1 = 0;

-    pRoot->winSize.extents.y1 = 0;

-    pRoot->winSize.extents.x2 = w;

-    pRoot->winSize.extents.y2 = h;

-

-    pRoot->borderSize.extents.x1 = 0;

-    pRoot->borderSize.extents.y1 = 0;

-    pRoot->borderSize.extents.x2 = w;

-    pRoot->borderSize.extents.y2 = h;

-

-    /* Recompute this screen's mmWidth & mmHeight */

-    pScreen->mmWidth =

-	(w * 254 + dmxScreen->beXDPI * 5) / (dmxScreen->beXDPI * 10);

-    pScreen->mmHeight =

-	(h * 254 + dmxScreen->beYDPI * 5) / (dmxScreen->beYDPI * 10);

-

-    /* Recompute this screen's window's clip rects as follows: */

-    /*   1. Mark all of root's children's windows */

-    for (pChild = pRoot->firstChild; pChild; pChild = pChild->nextSib)

-	anyMarked |= pScreen->MarkOverlappedWindows(pChild, pChild,

-						    (WindowPtr *)NULL);

-

-    /*   2. Set the root window's borderClip */

-    pRoot->borderClip.extents.x1 = 0;

-    pRoot->borderClip.extents.y1 = 0;

-    pRoot->borderClip.extents.x2 = w;

-    pRoot->borderClip.extents.y2 = h;

-

-    /*   3. Set the root window's clipList */

-    if (anyMarked) {

-	/* If any windows have been marked, set the root window's

-	 * clipList to be broken since it will be recalculated in

-	 * ValidateTree()

-	 */

-	RegionBreak(&pRoot->clipList);

-    } else {

-	/* Otherwise, we just set it directly since there are no

-	 * windows visible on this screen

-	 */

-	pRoot->clipList.extents.x1 = 0;

-	pRoot->clipList.extents.y1 = 0;

-	pRoot->clipList.extents.x2 = w;

-	pRoot->clipList.extents.y2 = h;

-    }

-

-    /*   4. Revalidate all clip rects and generate expose events */

-    if (anyMarked) {

-	pScreen->ValidateTree(pRoot, NULL, VTBroken);

-	pScreen->HandleExposures(pRoot);

-	if (pScreen->PostValidateTree)

-	    pScreen->PostValidateTree(pRoot, NULL, VTBroken);

-    }

-}

-

-#ifdef PANORAMIX

-#include "panoramiXsrv.h"

-

-/** Change the "screen" window attributes by resizing the actual window

- *  on the back-end display (if necessary). */

-static void dmxConfigureScreenWindow(int idx,

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

-{

-    DMXScreenInfo *dmxScreen = &dmxScreens[idx];

-    ScreenPtr      pScreen   = screenInfo.screens[idx];

-

-    /* Resize "screen" window */

-    if (dmxScreen->scrnX      != x ||

-	dmxScreen->scrnY      != y ||

-	dmxScreen->scrnWidth  != w ||

-	dmxScreen->scrnHeight != h) {

-	dmxResizeScreenWindow(pScreen, x, y, w, h);

-    }

-

-    /* Change "screen" window values */

-    dmxScreen->scrnX      = x;

-    dmxScreen->scrnY      = y;

-    dmxScreen->scrnWidth  = w;

-    dmxScreen->scrnHeight = h;

-}

-				     

-/** Change the "root" window position and size by resizing the actual

- *  window on the back-end display (if necessary) and updating all of

- *  DMX's resources by calling #dmxUpdateScreenResources. */

-static void dmxConfigureRootWindow(int idx, int x, int y, int w, int h)

-{

-    DMXScreenInfo *dmxScreen = &dmxScreens[idx];

-    WindowPtr      pRoot     = screenInfo.screens[idx]->root;

-

-    /* NOTE: Either this function or the ones that it calls must handle

-     * the case where w == 0 || h == 0.  Currently, the functions that

-     * this one calls handle that case. */

-

-    /* 1. Resize "root" window */

-    if (dmxScreen->rootX      != x ||

-	dmxScreen->rootY      != y ||

-	dmxScreen->rootWidth  != w ||

-	dmxScreen->rootHeight != h) {

-	dmxResizeRootWindow(pRoot, x, y, w, h);

-    }

-

-    /* 2. Update all of the screen's resources associated with this root

-     *    window */

-    if (dmxScreen->rootWidth  != w ||

-	dmxScreen->rootHeight != h) {

-	dmxUpdateScreenResources(screenInfo.screens[idx], x, y, w, h);

-    }

-

-    /* Change "root" window values */

-    dmxScreen->rootX      = x;

-    dmxScreen->rootY      = y;

-    dmxScreen->rootWidth  = w;

-    dmxScreen->rootHeight = h;

-}

-

-/** Change the "root" window's origin by updating DMX's internal data

- *  structures (dix and Xinerama) to use the new origin and adjust the

- *  positions of windows that overlap this "root" window. */

-static void dmxSetRootWindowOrigin(int idx, int x, int y)

-{

-    DMXScreenInfo *dmxScreen = &dmxScreens[idx];

-    ScreenPtr      pScreen   = screenInfo.screens[idx];

-    WindowPtr      pRoot     = pScreen->root;

-    WindowPtr      pChild;

-    int            xoff;

-    int            yoff;

-

-    /* Change "root" window's origin */

-    dmxScreen->rootXOrigin = x;

-    dmxScreen->rootYOrigin = y;

-

-    /* Compute offsets here in case <x,y> has been changed above */

-    xoff = x - pScreen->x;

-    yoff = y - pScreen->y;

-

-    /* Adjust the root window's position */

-    pScreen->x = dmxScreen->rootXOrigin;

-    pScreen->y = dmxScreen->rootYOrigin;

-

-    /* Recalculate the Xinerama regions and data structs */

-    XineramaReinitData(pScreen);

-

-    /* Adjust each of the root window's children */

-    if (!idx) ReinitializeRootWindow(screenInfo.screens[0]->root, xoff, yoff);

-    pChild = pRoot->firstChild;

-    while (pChild) {

-	/* Adjust child window's position */

-	pScreen->MoveWindow(pChild,

-			    pChild->origin.x - wBorderWidth(pChild) - xoff,

-			    pChild->origin.y - wBorderWidth(pChild) - yoff,

-			    pChild->nextSib,

-			    VTMove);

-

-	/* Note that the call to MoveWindow will eventually call

-	 * dmxPositionWindow which will automatically create a

-	 * window if it is now exposed on screen (for lazy window

-	 * creation optimization) and it will properly set the

-	 * offscreen flag.

-	 */

-

-	pChild = pChild->nextSib;

-    }

-}

-

-/** Configure the attributes of each "screen" and "root" window. */

-int dmxConfigureScreenWindows(int nscreens,

-			      CARD32 *screens,

-			      DMXScreenAttributesPtr attribs,

-			      int *errorScreen)

-{

-    int           i;

-

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

-	DMXScreenAttributesPtr  attr      = &attribs[i];

-	int                     idx       = screens[i];

-	DMXScreenInfo          *dmxScreen = &dmxScreens[idx];

-

-	if (errorScreen) *errorScreen = i;

-

-	if (!dmxScreen->beDisplay) return DMX_BAD_VALUE;

-

-	/* Check for illegal values */

-	if (idx < 0 || idx >= dmxNumScreens) return BadValue;

-

-	/* The "screen" and "root" windows must have valid sizes */

-	if (attr->screenWindowWidth <= 0 || attr->screenWindowHeight <= 0 ||

-	    attr->rootWindowWidth   <  0 || attr->rootWindowHeight   <  0)

-	    return DMX_BAD_VALUE;

-

-	/* The "screen" window must fit entirely within the BE display */

-	if (attr->screenWindowXoffset < 0 ||

-	    attr->screenWindowYoffset < 0 ||

-	    attr->screenWindowXoffset

-	    + attr->screenWindowWidth  > (unsigned)dmxScreen->beWidth ||

-	    attr->screenWindowYoffset

-	    + attr->screenWindowHeight > (unsigned)dmxScreen->beHeight)

-	    return DMX_BAD_VALUE;

-

-	/* The "root" window must fit entirely within the "screen" window */

-	if (attr->rootWindowXoffset < 0 ||

-	    attr->rootWindowYoffset < 0 ||

-	    attr->rootWindowXoffset

-	    + attr->rootWindowWidth  > attr->screenWindowWidth ||

-	    attr->rootWindowYoffset

-	    + attr->rootWindowHeight > attr->screenWindowHeight)

-	    return DMX_BAD_VALUE;

-

-	/* The "root" window must not expose unaddressable coordinates */

-	if (attr->rootWindowXorigin < 0 ||

-	    attr->rootWindowYorigin < 0 ||

-	    attr->rootWindowXorigin + attr->rootWindowWidth  > 32767 ||

-	    attr->rootWindowYorigin + attr->rootWindowHeight > 32767)

-	    return DMX_BAD_VALUE;

-

-	/* The "root" window must fit within the global bounding box */

-	if (attr->rootWindowXorigin

-	    + attr->rootWindowWidth > (unsigned)dmxGlobalWidth ||

-	    attr->rootWindowYorigin

-	    + attr->rootWindowHeight > (unsigned)dmxGlobalHeight)

-	    return DMX_BAD_VALUE;

-

-	/* FIXME: Handle the rest of the illegal value checking */

-    }

-

-    /* No illegal values found */

-    if (errorScreen) *errorScreen = 0;

-

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

-	DMXScreenAttributesPtr  attr      = &attribs[i];

-	int                     idx       = screens[i];

-	DMXScreenInfo          *dmxScreen = &dmxScreens[idx];

-

-	dmxLog(dmxInfo, "Changing screen #%d attributes "

-	       "from %dx%d+%d+%d %dx%d+%d+%d +%d+%d "

-	       "to %dx%d+%d+%d %dx%d+%d+%d +%d+%d\n",

-	       idx,

-	       dmxScreen->scrnWidth,      dmxScreen->scrnHeight,

-	       dmxScreen->scrnX,          dmxScreen->scrnY,

-	       dmxScreen->rootWidth,      dmxScreen->rootHeight,

-	       dmxScreen->rootX,          dmxScreen->rootY,

-	       dmxScreen->rootXOrigin,    dmxScreen->rootYOrigin,

-	       attr->screenWindowWidth,   attr->screenWindowHeight,

-	       attr->screenWindowXoffset, attr->screenWindowYoffset,

-	       attr->rootWindowWidth,     attr->rootWindowHeight,

-	       attr->rootWindowXoffset,   attr->rootWindowYoffset,

-	       attr->rootWindowXorigin,   attr->rootWindowYorigin);

-

-	/* Configure "screen" window */

-	dmxConfigureScreenWindow(idx,

-				 attr->screenWindowXoffset,

-				 attr->screenWindowYoffset,

-				 attr->screenWindowWidth,

-				 attr->screenWindowHeight);

-

-	/* Configure "root" window */

-	dmxConfigureRootWindow(idx,

-			       attr->rootWindowXoffset,

-			       attr->rootWindowYoffset,

-			       attr->rootWindowWidth,

-			       attr->rootWindowHeight);

-

-

-	/* Set "root" window's origin */

-	dmxSetRootWindowOrigin(idx,

-			       attr->rootWindowXorigin,

-			       attr->rootWindowYorigin);

-    }

-

-    /* Adjust the cursor boundaries */

-    dmxAdjustCursorBoundaries();

-

-    /* Force completion of the changes */

-    dmxSync(NULL, TRUE);

-

-    return Success;

-}

-

-/** Configure the attributes of the global desktop. */

-int dmxConfigureDesktop(DMXDesktopAttributesPtr attribs)

-{

-    if (attribs->width  <= 0 || attribs->width  >= 32767 ||

-	attribs->height <= 0 || attribs->height >= 32767)

-	return DMX_BAD_VALUE;

-

-    /* If the desktop is shrinking, adjust the "root" windows on each

-     * "screen" window to only show the visible desktop.  Also, handle

-     * the special case where the desktop shrinks such that the it no

-     * longer overlaps an portion of a "screen" window. */

-    if (attribs->width < dmxGlobalWidth || attribs->height < dmxGlobalHeight) {

-	int   i;

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

-	    DMXScreenInfo *dmxScreen = &dmxScreens[i];

-	    if (dmxScreen->rootXOrigin

-		+ dmxScreen->rootWidth  > attribs->width ||

-		dmxScreen->rootYOrigin

-		+ dmxScreen->rootHeight > attribs->height) {

-		int  w, h;

-		if ((w = attribs->width  - dmxScreen->rootXOrigin) < 0) w = 0;

-		if ((h = attribs->height - dmxScreen->rootYOrigin) < 0) h = 0;

-		if (w > dmxScreen->scrnWidth)  w = dmxScreen->scrnWidth;

-		if (h > dmxScreen->scrnHeight) h = dmxScreen->scrnHeight;

-		if (w > dmxScreen->rootWidth)  w = dmxScreen->rootWidth;

-		if (h > dmxScreen->rootHeight) h = dmxScreen->rootHeight;

-		dmxConfigureRootWindow(i,

-				       dmxScreen->rootX,

-				       dmxScreen->rootY,

-				       w, h);

-	    }

-	}

-    }

-

-    /* Set the global width/height */

-    dmxSetWidthHeight(attribs->width, attribs->height);

-

-    /* Handle shift[XY] changes */

-    if (attribs->shiftX || attribs->shiftY) {

-	int   i;

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

-	    ScreenPtr  pScreen = screenInfo.screens[i];

-	    WindowPtr  pChild  = pScreen->root->firstChild;

-	    while (pChild) {

-		/* Adjust child window's position */

-		pScreen->MoveWindow(pChild,

-				    pChild->origin.x - wBorderWidth(pChild)

-				    - attribs->shiftX,

-				    pChild->origin.y - wBorderWidth(pChild)

-				    - attribs->shiftY,

-				    pChild->nextSib,

-				    VTMove);

-

-		/* Note that the call to MoveWindow will eventually call

-		 * dmxPositionWindow which will automatically create a

-		 * window if it is now exposed on screen (for lazy

-		 * window creation optimization) and it will properly

-		 * set the offscreen flag.

-		 */

-

-		pChild = pChild->nextSib;

-	    }

-	}

-    }

-

-    /* Update connection block, Xinerama, etc. -- these appears to

-     * already be handled in dmxConnectionBlockCallback(), which is

-     * called from dmxAdjustCursorBoundaries() [below]. */

-

-    /* Adjust the cursor boundaries */

-    dmxAdjustCursorBoundaries();

-

-    /* Force completion of the changes */

-    dmxSync(NULL, TRUE);

-

-    return Success;

-}

-#endif

-

-/** Create the scratch GCs per depth. */

-static void dmxBECreateScratchGCs(int scrnNum)

-{

-    ScreenPtr  pScreen = screenInfo.screens[scrnNum];

-    GCPtr     *ppGC    = pScreen->GCperDepth;

-    int        i;

-

-    for (i = 0; i <= pScreen->numDepths; i++)

-	dmxBECreateGC(pScreen, ppGC[i]);

-}

-

-#ifdef PANORAMIX

-static Bool FoundPixImage;

-

-/** Search the Xinerama XRT_PIXMAP resources for the pixmap that needs

- *  to have its image restored.  When it is found, see if there is

- *  another screen with the same image.  If so, copy the pixmap image

- *  from the existing screen to the newly created pixmap. */

-static void dmxBERestorePixmapImage(pointer value, XID id, RESTYPE type,

-				    pointer p)

-{

-    if ((type & TypeMask) == (XRT_PIXMAP & TypeMask)) {

-	PixmapPtr      pDst     = (PixmapPtr)p;

-	int            idx      = pDst->drawable.pScreen->myNum;

-	PanoramiXRes  *pXinPix  = (PanoramiXRes *)value;

-	PixmapPtr      pPix;

-	int            i;

-

-	dixLookupResourceByType((pointer*) &pPix, pXinPix->info[idx].id,

-				RT_PIXMAP, NullClient, DixUnknownAccess);

-	if (pPix != pDst) return; /* Not a match.... Next! */

-

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

-	    PixmapPtr      pSrc;

-	    dmxPixPrivPtr  pSrcPriv = NULL;

-

-	    if (i == idx) continue; /* Self replication is bad */

-

-	    dixLookupResourceByType((pointer*) &pSrc, pXinPix->info[i].id,

-				    RT_PIXMAP, NullClient, DixUnknownAccess);

-	    pSrcPriv = DMX_GET_PIXMAP_PRIV(pSrc);

-	    if (pSrcPriv->pixmap) {

-		DMXScreenInfo *dmxSrcScreen = &dmxScreens[i];

-		DMXScreenInfo *dmxDstScreen = &dmxScreens[idx];

-		dmxPixPrivPtr  pDstPriv = DMX_GET_PIXMAP_PRIV(pDst);

-		XImage        *img;

-		int            j;

-		XlibGC         gc = NULL;

-

-		/* This should never happen, but just in case.... */

-		if (pSrc->drawable.width  != pDst->drawable.width ||

-		    pSrc->drawable.height != pDst->drawable.height)

-		    return;

-

-		/* Copy from src pixmap to dst pixmap */

-		img = XGetImage(dmxSrcScreen->beDisplay,

-				pSrcPriv->pixmap,

-				0, 0,

-				pSrc->drawable.width, pSrc->drawable.height,

-				-1,

-				ZPixmap);

-

-		for (j = 0; j < dmxDstScreen->beNumPixmapFormats; j++) {

-		    if (dmxDstScreen->bePixmapFormats[j].depth == img->depth) {

-			unsigned long  m;

-			XGCValues      v;

-

-			m = GCFunction | GCPlaneMask | GCClipMask;

-			v.function = GXcopy;

-			v.plane_mask = AllPlanes;

-			v.clip_mask = None;

-

-			gc = XCreateGC(dmxDstScreen->beDisplay,

-				       dmxDstScreen->scrnDefDrawables[j],

-				       m, &v);

-			break;

-		    }

-		}

-

-		if (gc) {

-		    XPutImage(dmxDstScreen->beDisplay,

-			      pDstPriv->pixmap,

-			      gc, img, 0, 0, 0, 0,

-			      pDst->drawable.width, pDst->drawable.height);

-		    XFreeGC(dmxDstScreen->beDisplay, gc);

-		    FoundPixImage = True;

-		} else {

-		    dmxLog(dmxWarning, "Could not create GC\n");

-		}

-

-		XDestroyImage(img);

-		return;

-	    }

-	}

-    }

-}

-#endif

-

-/** Restore the pixmap image either from another screen or from an image

- *  that was saved when the screen was previously detached. */

-static void dmxBERestorePixmap(PixmapPtr pPixmap)

-{

-#ifdef PANORAMIX

-    int i;

-

-    /* If Xinerama is not active, there's nothing we can do (see comment

-     * in #else below for more info). */

-    if (noPanoramiXExtension) {

-	dmxLog(dmxWarning, "Cannot restore pixmap image\n");

-	return;

-    }

-

-    FoundPixImage = False;

-    for (i = currentMaxClients; --i >= 0; )

-	if (clients[i])

-	    FindAllClientResources(clients[i], dmxBERestorePixmapImage,

-				   (pointer)pPixmap);

-

-    /* No corresponding pixmap image was found on other screens, so we

-     * need to copy it from the saved image when the screen was detached

-     * (if available). */

-    if (!FoundPixImage) {

-	dmxPixPrivPtr  pPixPriv = DMX_GET_PIXMAP_PRIV(pPixmap);

-

-	if (pPixPriv->detachedImage) {

-	    ScreenPtr      pScreen   = pPixmap->drawable.pScreen;

-	    DMXScreenInfo *dmxScreen = &dmxScreens[pScreen->myNum];

-	    XlibGC         gc        = NULL;

-

-	    for (i = 0; i < dmxScreen->beNumPixmapFormats; i++) {

-		if (dmxScreen->bePixmapFormats[i].depth ==

-		    pPixPriv->detachedImage->depth) {

-		    unsigned long  m;

-		    XGCValues      v;

-

-		    m = GCFunction | GCPlaneMask | GCClipMask;

-		    v.function = GXcopy;

-		    v.plane_mask = AllPlanes;

-		    v.clip_mask = None;

-

-		    gc = XCreateGC(dmxScreen->beDisplay,

-				   dmxScreen->scrnDefDrawables[i],

-				   m, &v);

-		    break;

-		}

-	    }

-

-	    if (gc) {

-		XPutImage(dmxScreen->beDisplay,

-			  pPixPriv->pixmap,

-			  gc,

-			  pPixPriv->detachedImage,

-			  0, 0, 0, 0,

-		      pPixmap->drawable.width, pPixmap->drawable.height);

-		XFreeGC(dmxScreen->beDisplay, gc);

-	    } else {

-		dmxLog(dmxWarning, "Cannot restore pixmap image\n");

-	    }

-

-	    XDestroyImage(pPixPriv->detachedImage);

-	    pPixPriv->detachedImage = NULL;

-	} else {

-	    dmxLog(dmxWarning, "Cannot restore pixmap image\n");

-	}

-    }

-#else

-    /* If Xinerama is not enabled, then there is no other copy of the

-     * pixmap image that we can restore.  Saving all pixmap data is not

-     * a feasible option since there is no mechanism for updating pixmap

-     * data when a screen is detached, which means that the data that

-     * was previously saved would most likely be out of date. */

-    dmxLog(dmxWarning, "Cannot restore pixmap image\n");

-    return;

-#endif

-}

-

-/** Create resources on the back-end server.  This function is called

- *  from #dmxAttachScreen() via the dix layer's FindAllResources

- *  function.  It walks all resources, compares them to the screen

- *  number passed in as \a n and calls the appropriate DMX function to

- *  create the associated resource on the back-end server. */

-static void dmxBECreateResources(pointer value, XID id, RESTYPE type,

-				 pointer n)

-{

-    int        scrnNum = (int)n;

-    ScreenPtr  pScreen = screenInfo.screens[scrnNum];

-

-    if ((type & TypeMask) == (RT_WINDOW & TypeMask)) {

-	/* Window resources are created below in dmxBECreateWindowTree */

-    } else if ((type & TypeMask) == (RT_PIXMAP & TypeMask)) {

-	PixmapPtr  pPix = value;

-	if (pPix->drawable.pScreen->myNum == scrnNum) {

-	    dmxBECreatePixmap(pPix);

-	    dmxBERestorePixmap(pPix);

-	}

-    } else if ((type & TypeMask) == (RT_GC & TypeMask)) {

-	GCPtr  pGC = value;

-	if (pGC->pScreen->myNum == scrnNum) {

-	    /* Create the GC on the back-end server */

-	    dmxBECreateGC(pScreen, pGC);

-	    /* Create any pixmaps associated with this GC */

-	    if (!pGC->tileIsPixel) {

-		dmxBECreatePixmap(pGC->tile.pixmap);

-		dmxBERestorePixmap(pGC->tile.pixmap);

-	    }

-	    if (pGC->stipple != pScreen->PixmapPerDepth[0]) {

-		dmxBECreatePixmap(pGC->stipple);

-		dmxBERestorePixmap(pGC->stipple);

-	    }

-	    if (pGC->font != defaultFont) {

-		(void)dmxBELoadFont(pScreen, pGC->font);

-	    }

-	    /* Update the GC on the back-end server */

-	    dmxChangeGC(pGC, -1L);

-	}

-    } else if ((type & TypeMask) == (RT_FONT & TypeMask)) {

-	(void)dmxBELoadFont(pScreen, (FontPtr)value);

-    } else if ((type & TypeMask) == (RT_CURSOR & TypeMask)) {

-	dmxBECreateCursor(pScreen, (CursorPtr)value);

-    } else if ((type & TypeMask) == (RT_COLORMAP & TypeMask)) {

-	ColormapPtr  pCmap = value;

-	if (pCmap->pScreen->myNum == scrnNum)

-	    (void)dmxBECreateColormap((ColormapPtr)value);

-#if 0

-    /* 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

-    } else {

-	/* Other resource types??? */

-    }

-}

-

-/** Create window hierachy on back-end server.  The window tree is

- *  created in a special order (bottom most subwindow first) so that the

- *  #dmxCreateNonRootWindow() function does not need to recursively call

- *  itself to create each window's parents.  This is required so that we

- *  have the opportunity to create each window's border and background

- *  pixmaps (where appropriate) before the window is created. */

-static void dmxBECreateWindowTree(int idx)

-{

-    DMXScreenInfo *dmxScreen = &dmxScreens[idx];

-    WindowPtr      pRoot     = screenInfo.screens[idx]->root;

-    dmxWinPrivPtr  pWinPriv  = DMX_GET_WINDOW_PRIV(pRoot);

-    WindowPtr      pWin;

-

-    /* Create the pixmaps associated with the root window */

-    if (!pRoot->borderIsPixel) {

-	dmxBECreatePixmap(pRoot->border.pixmap);

-	dmxBERestorePixmap(pRoot->border.pixmap);

-    }

-    if (pRoot->backgroundState == BackgroundPixmap) {

-	dmxBECreatePixmap(pRoot->background.pixmap);

-	dmxBERestorePixmap(pRoot->background.pixmap);

-    }

-

-    /* Create root window first */

-    dmxScreen->rootWin = pWinPriv->window = dmxCreateRootWindow(pRoot);

-    XMapWindow(dmxScreen->beDisplay, dmxScreen->rootWin);

-

-    pWin = pRoot->lastChild;

-    while (pWin) {

-	pWinPriv = DMX_GET_WINDOW_PRIV(pWin);

-

-	/* Create the pixmaps regardless of whether or not the

-	 * window is created or not due to lazy window creation.

-	 */

-	if (!pWin->borderIsPixel) {

-	    dmxBECreatePixmap(pWin->border.pixmap);

-	    dmxBERestorePixmap(pWin->border.pixmap);

-	}

-	if (pWin->backgroundState == BackgroundPixmap) {

-	    dmxBECreatePixmap(pWin->background.pixmap);

-	    dmxBERestorePixmap(pWin->background.pixmap);

-	}

-

-	/* Reset the window attributes */

-	dmxGetDefaultWindowAttributes(pWin,

-				      &pWinPriv->cmap,

-				      &pWinPriv->visual);

-

-	/* Create the window */

-	if (pWinPriv->mapped && !pWinPriv->offscreen)

-	    dmxCreateAndRealizeWindow(pWin, TRUE);

-

-	/* Next, create the bottom-most child */

-	if (pWin->lastChild) {

-	    pWin = pWin->lastChild;

-	    continue;

-	}

-

-	/* If the window has no children, move on to the next higher window */

-	while (!pWin->prevSib && (pWin != pRoot))

-	    pWin = pWin->parent;

-

-	if (pWin->prevSib) {

-	    pWin = pWin->prevSib;

-	    continue;

-	}

-

-	/* When we reach the root window, we are finished */

-	if (pWin == pRoot)

-	    break;

-    }

-}

-

-/* Refresh screen by generating exposure events for all windows */

-static void dmxForceExposures(int idx)

-{

-    ScreenPtr      pScreen   = screenInfo.screens[idx];

-    WindowPtr  pRoot     = pScreen->root;

-    Bool       anyMarked = FALSE;

-    WindowPtr  pChild;

-

-    for (pChild = pRoot->firstChild; pChild; pChild = pChild->nextSib)

-	anyMarked |= pScreen->MarkOverlappedWindows(pChild, pChild,

-						    (WindowPtr *)NULL);

-    if (anyMarked) {

-	/* If any windows have been marked, set the root window's

-	 * clipList to be broken since it will be recalculated in

-	 * ValidateTree()

-	 */

-	RegionBreak(&pRoot->clipList);

-	pScreen->ValidateTree(pRoot, NULL, VTBroken);

-	pScreen->HandleExposures(pRoot);

-	if (pScreen->PostValidateTree)

-	    pScreen->PostValidateTree(pRoot, NULL, VTBroken);

-    }

-}

-

-/** Compare the new and old screens to see if they are compatible. */

-static Bool dmxCompareScreens(DMXScreenInfo *new, DMXScreenInfo *old)

-{

-    int i;

-

-    if (new->beWidth != old->beWidth) return FALSE;

-    if (new->beHeight != old->beHeight) return FALSE;

-    if (new->beDepth != old->beDepth) return FALSE;

-    if (new->beBPP != old->beBPP) return FALSE;

-

-    if (new->beNumDepths != old->beNumDepths) return FALSE;

-    for (i = 0; i < old->beNumDepths; i++)

-	if (new->beDepths[i] != old->beDepths[i]) return FALSE;

-

-    if (new->beNumPixmapFormats != old->beNumPixmapFormats) return FALSE;

-    for (i = 0; i < old->beNumPixmapFormats; i++) {

-	if (new->bePixmapFormats[i].depth !=

-	    old->bePixmapFormats[i].depth) return FALSE;

-	if (new->bePixmapFormats[i].bits_per_pixel !=

-	    old->bePixmapFormats[i].bits_per_pixel) return FALSE;

-	if (new->bePixmapFormats[i].scanline_pad !=

-	    old->bePixmapFormats[i].scanline_pad) return FALSE;

-    }

-

-    if (new->beNumVisuals != old->beNumVisuals) return FALSE;

-    for (i = 0; i < old->beNumVisuals; i++) {

-	if (new->beVisuals[i].visualid !=

-	    old->beVisuals[i].visualid) return FALSE;

-	if (new->beVisuals[i].screen !=

-	    old->beVisuals[i].screen) return FALSE;

-	if (new->beVisuals[i].depth !=

-	    old->beVisuals[i].depth) return FALSE;

-	if (new->beVisuals[i].class !=

-	    old->beVisuals[i].class) return FALSE;

-	if (new->beVisuals[i].red_mask !=

-	    old->beVisuals[i].red_mask) return FALSE;

-	if (new->beVisuals[i].green_mask !=

-	    old->beVisuals[i].green_mask) return FALSE;

-	if (new->beVisuals[i].blue_mask !=

-	    old->beVisuals[i].blue_mask) return FALSE;

-	if (new->beVisuals[i].colormap_size !=

-	    old->beVisuals[i].colormap_size) return FALSE;

-	if (new->beVisuals[i].bits_per_rgb !=

-	    old->beVisuals[i].bits_per_rgb) return FALSE;

-    }

-

-    if (new->beDefVisualIndex != old->beDefVisualIndex) return FALSE;

-

-    return TRUE;

-}

-

-/** Restore Render's picture */

-static void dmxBERestoreRenderPict(pointer value, XID id, pointer n)

-{

-    PicturePtr   pPicture = value;               /* The picture */

-    DrawablePtr  pDraw    = pPicture->pDrawable; /* The picture's drawable */

-    int          scrnNum  = (int)n;

-

-    if (pDraw->pScreen->myNum != scrnNum) {

-	/* Picture not on the screen we are restoring*/

-	return;

-    }

-

-    if (pDraw->type == DRAWABLE_PIXMAP) {

-	PixmapPtr  pPixmap = (PixmapPtr)pDraw;

-	

-	/* Create and restore the pixmap drawable */

-	dmxBECreatePixmap(pPixmap);

-	dmxBERestorePixmap(pPixmap);

-    }

-

-    dmxBECreatePicture(pPicture);

-}

-

-/** Restore Render's glyphs */

-static void dmxBERestoreRenderGlyph(pointer value, XID id, pointer n)

-{

-    GlyphSetPtr      glyphSet   = value;

-    int              scrnNum    = (int)n;

-    dmxGlyphPrivPtr  glyphPriv  = DMX_GET_GLYPH_PRIV(glyphSet);

-    DMXScreenInfo   *dmxScreen  = &dmxScreens[scrnNum];

-    GlyphRefPtr      table;

-    char            *images;

-    Glyph           *gids;

-    XGlyphInfo      *glyphs;

-    char            *pos;

-    int              beret;

-    int              len_images = 0;

-    int              i;

-    int              ctr;

-

-    if (glyphPriv->glyphSets[scrnNum]) {

-	/* Only restore glyphs on the screen we are attaching */

-	return;

-    }

-

-    /* First we must create the glyph set on the backend. */

-    if ((beret = dmxBECreateGlyphSet(scrnNum, glyphSet)) != Success) {

-	dmxLog(dmxWarning,

-	       "\tdmxBERestoreRenderGlyph failed to create glyphset!\n");

-	return;

-    }

-

-    /* Now for the complex part, restore the glyph data */

-    table = glyphSet->hash.table;

-

-    /* We need to know how much memory to allocate for this part */

-    for (i = 0; i < glyphSet->hash.hashSet->size; i++) {

-	GlyphRefPtr  gr = &table[i];

-	GlyphPtr     gl = gr->glyph;

-

-	if (!gl || gl == DeletedGlyph) continue;

-	len_images += gl->size - sizeof(gl->info);

-    }

-

-    /* Now allocate the memory we need */

-    images = calloc(len_images, sizeof(char));

-    gids   = malloc(glyphSet->hash.tableEntries*sizeof(Glyph));

-    glyphs = malloc(glyphSet->hash.tableEntries*sizeof(XGlyphInfo));

-

-    pos = images;

-    ctr = 0;

-    

-    /* Fill the allocated memory with the proper data */

-    for (i = 0; i < glyphSet->hash.hashSet->size; i++) {

-	GlyphRefPtr  gr = &table[i];

-	GlyphPtr     gl = gr->glyph;

-

-	if (!gl || gl == DeletedGlyph) continue;

-

-	/* First lets put the data into gids */

-	gids[ctr] = gr->signature;

-

-	/* Next do the glyphs data structures */

-	glyphs[ctr].width  = gl->info.width;

-	glyphs[ctr].height = gl->info.height;

-	glyphs[ctr].x      = gl->info.x;

-	glyphs[ctr].y      = gl->info.y;

-	glyphs[ctr].xOff   = gl->info.xOff;

-	glyphs[ctr].yOff   = gl->info.yOff;

-

-	/* Copy the images from the DIX's data into the buffer */

-	memcpy(pos, gl+1, gl->size - sizeof(gl->info));

-	pos += gl->size - sizeof(gl->info);

-	ctr++;

-    }

-    

-    /* Now restore the glyph data */

-    XRenderAddGlyphs(dmxScreen->beDisplay, glyphPriv->glyphSets[scrnNum],

-		     gids,glyphs, glyphSet->hash.tableEntries, images,

-		     len_images);

-

-    /* Clean up */

-    free(images);

-    free(gids);

-    free(glyphs);    

-}

-

-/** Reattach previously detached back-end screen. */

-int dmxAttachScreen(int idx, DMXScreenAttributesPtr attr)

-{

-    ScreenPtr      pScreen;

-    DMXScreenInfo *dmxScreen;

-    CARD32         scrnNum   = idx;

-    DMXScreenInfo  oldDMXScreen;

-    int            i;

-

-    /* Return failure if dynamic addition/removal of screens is disabled */

-    if (!dmxAddRemoveScreens) {

-	dmxLog(dmxWarning,

-	       "Attempting to add a screen, but the AddRemoveScreen\n");

-	dmxLog(dmxWarning,

-	       "extension has not been enabled.  To enable this extension\n");

-	dmxLog(dmxWarning,

-	       "add the \"-addremovescreens\" option either to the command\n");

-	dmxLog(dmxWarning,

-	       "line or in the configuration file.\n");

-	return 1;

-    }

-

-    /* Cannot add a screen that does not exist */

-    if (idx < 0 || idx >= dmxNumScreens) return 1;

-    pScreen = screenInfo.screens[idx];

-    dmxScreen = &dmxScreens[idx];

-

-    /* Cannot attach to a screen that is already opened */

-    if (dmxScreen->beDisplay) {

-	dmxLog(dmxWarning,

-	       "Attempting to add screen #%d but a screen already exists\n",

-	       idx);

-	return 1;

-    }

-

-    dmxLogOutput(dmxScreen, "Attaching screen #%d\n", idx);

-

-    /* Save old info */

-    oldDMXScreen = *dmxScreen;

-

-    /* Copy the name to the new screen */

-    dmxScreen->name = strdup(attr->displayName);

-

-    /* Open display and get all of the screen info */

-    if (!dmxOpenDisplay(dmxScreen)) {

-	dmxLog(dmxWarning,

-               "dmxOpenDisplay: Unable to open display %s\n",

-               dmxScreen->name);

-

-	/* Restore the old screen */

-	*dmxScreen = oldDMXScreen;

-	return 1;

-    }

-

-    dmxSetErrorHandler(dmxScreen);

-    dmxCheckForWM(dmxScreen);

-    dmxGetScreenAttribs(dmxScreen);

-

-    if (!dmxGetVisualInfo(dmxScreen)) {

-	dmxLog(dmxWarning, "dmxGetVisualInfo: No matching visuals found\n");

-	XFree(dmxScreen->beVisuals);

-	XCloseDisplay(dmxScreen->beDisplay);

-

-	/* Restore the old screen */

-	*dmxScreen = oldDMXScreen;

-	return 1;

-    }

-

-    dmxGetColormaps(dmxScreen);

-    dmxGetPixmapFormats(dmxScreen);

-

-    /* Verify that the screen to be added has the same info as the

-     * previously added screen. */

-    if (!dmxCompareScreens(dmxScreen, &oldDMXScreen)) {

-	dmxLog(dmxWarning,

-	       "New screen data (%s) does not match previously\n",

-	       dmxScreen->name);

-	dmxLog(dmxWarning,

-	       "attached screen data (%s)\n",

-	       oldDMXScreen.name);

-	dmxLog(dmxWarning,

-	       "All data must match in order to attach to screen #%d\n",

-	       idx);

-	XFree(dmxScreen->beVisuals);

-	XFree(dmxScreen->beDepths);

-	XFree(dmxScreen->bePixmapFormats);

-	XCloseDisplay(dmxScreen->beDisplay);

-

-	/* Restore the old screen */

-	*dmxScreen = oldDMXScreen;

-	return 1;

-    }

-

-    /* Initialize the BE screen resources */

-    dmxBEScreenInit(idx, screenInfo.screens[idx]);

-

-    /* TODO: Handle GLX visual initialization.  GLXProxy needs to be

-     * updated to handle dynamic addition/removal of screens. */

-

-    /* Create default stipple */

-    dmxBECreatePixmap(pScreen->PixmapPerDepth[0]);

-    dmxBERestorePixmap(pScreen->PixmapPerDepth[0]);

-

-    /* Create the scratch GCs */

-    dmxBECreateScratchGCs(idx);

-

-    /* Create the default font */

-    (void)dmxBELoadFont(pScreen, defaultFont);

-

-    /* Create all resources that don't depend on windows */

-    for (i = currentMaxClients; --i >= 0; )

-	if (clients[i])

-	    FindAllClientResources(clients[i], dmxBECreateResources,

-				   (pointer)idx);

-

-    /* Create window hierarchy (top down) */

-    dmxBECreateWindowTree(idx);

-

-    /* Restore the picture state for RENDER */

-    for (i = currentMaxClients; --i >= 0; )

-	if (clients[i])

-	    FindClientResourcesByType(clients[i],PictureType, 

-				      dmxBERestoreRenderPict,(pointer)idx);

-

-    /* Restore the glyph state for RENDER */

-    for (i = currentMaxClients; --i >= 0; )

-	if (clients[i])

-	    FindClientResourcesByType(clients[i],GlyphSetType, 

-				      dmxBERestoreRenderGlyph,(pointer)idx);

-

-    /* Refresh screen by generating exposure events for all windows */

-    dmxForceExposures(idx);

-

-    dmxSync(&dmxScreens[idx], TRUE);

-

-    /* We used these to compare the old and new screens.  They are no

-     * longer needed since we have a newly attached screen, so we can

-     * now free the old screen's resources. */

-    XFree(oldDMXScreen.beVisuals);

-    XFree(oldDMXScreen.beDepths);

-    XFree(oldDMXScreen.bePixmapFormats);

-    /* TODO: should oldDMXScreen.name be freed?? */

-

-#ifdef PANORAMIX

-    if (!noPanoramiXExtension)

-	return dmxConfigureScreenWindows(1, &scrnNum, attr, NULL);

-    else

-#endif

-	return 0; /* Success */

-}

-

-/*

- * Resources that may have state on the BE server and need to be freed:

- *

- * RT_NONE

- * RT_WINDOW

- * RT_PIXMAP

- * RT_GC

- * RT_FONT

- * RT_CURSOR

- * RT_COLORMAP

- * RT_CMAPENTRY

- * RT_OTHERCLIENT

- * RT_PASSIVEGRAB

- * XRT_WINDOW

- * XRT_PIXMAP

- * XRT_GC

- * XRT_COLORMAP

- * XRT_PICTURE

- * PictureType

- * PictFormatType

- * GlyphSetType

- * ClientType

- * EventType

- * RT_INPUTCLIENT

- * XETrapType

- * RTCounter

- * RTAwait

- * RTAlarmClient

- * RT_XKBCLIENT

- * RTContext

- * TagResType

- * StalledResType

- * SecurityAuthorizationResType

- * RTEventClient

- * __glXContextRes

- * __glXClientRes

- * __glXPixmapRes

- * __glXWindowRes

- * __glXPbufferRes

- */

-

-#ifdef PANORAMIX

-/** Search the Xinerama XRT_PIXMAP resources for the pixmap that needs

- *  to have its image saved. */

-static void dmxBEFindPixmapImage(pointer value, XID id, RESTYPE type,

-				 pointer p)

-{

-    if ((type & TypeMask) == (XRT_PIXMAP & TypeMask)) {

-	PixmapPtr      pDst     = (PixmapPtr)p;

-	int            idx      = pDst->drawable.pScreen->myNum;

-	PanoramiXRes  *pXinPix  = (PanoramiXRes *)value;

-	PixmapPtr      pPix;

-	int            i;

-

-	dixLookupResourceByType((pointer*) &pPix, pXinPix->info[idx].id,

-				RT_PIXMAP, NullClient, DixUnknownAccess);

-	if (pPix != pDst) return; /* Not a match.... Next! */

-

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

-	    PixmapPtr      pSrc;

-	    dmxPixPrivPtr  pSrcPriv = NULL;

-

-	    if (i == idx) continue; /* Self replication is bad */

-

-	    dixLookupResourceByType((pointer*) &pSrc, pXinPix->info[i].id,

-				    RT_PIXMAP, NullClient, DixUnknownAccess);

-	    pSrcPriv = DMX_GET_PIXMAP_PRIV(pSrc);

-	    if (pSrcPriv->pixmap) {

-		FoundPixImage = True;

-		return;

-	    }

-	}

-    }

-}

-#endif

-

-/** Save the pixmap image only when there is not another screen with

- *  that pixmap from which the image can be read when the screen is

- *  reattached.  To do this, we first try to find a pixmap on another

- *  screen corresponding to the one we are trying to save.  If we find

- *  one, then we do not need to save the image data since during

- *  reattachment, the image data can be read from that other pixmap.

- *  However, if we do not find one, then we need to save the image data.

- *  The common case for these are for the default stipple and root

- *  tile. */

-static void dmxBESavePixmap(PixmapPtr pPixmap)

-{

-#ifdef PANORAMIX

-    int i;

-

-    /* If Xinerama is not active, there's nothing we can do (see comment

-     * in #else below for more info). */

-    if (noPanoramiXExtension) return;

-

-    FoundPixImage = False;

-    for (i = currentMaxClients; --i >= 0; )

-	if (clients[i])

-	    FindAllClientResources(clients[i], dmxBEFindPixmapImage,

-				   (pointer)pPixmap);

-

-    /* Save the image only if there is no other screens that have a

-     * pixmap that corresponds to the one we are trying to save. */

-    if (!FoundPixImage) {

-	dmxPixPrivPtr  pPixPriv = DMX_GET_PIXMAP_PRIV(pPixmap);

-

-	if (!pPixPriv->detachedImage) {

-	    ScreenPtr      pScreen   = pPixmap->drawable.pScreen;

-	    DMXScreenInfo *dmxScreen = &dmxScreens[pScreen->myNum];

-

-	    pPixPriv->detachedImage = XGetImage(dmxScreen->beDisplay,

-						pPixPriv->pixmap,

-						0, 0,

-						pPixmap->drawable.width,

-						pPixmap->drawable.height,

-						-1,

-						ZPixmap);

-	    if (!pPixPriv->detachedImage)

-		dmxLog(dmxWarning, "Cannot save pixmap image\n");

-	}

-    }

-#else

-    /* NOTE: The only time there is a pixmap on another screen that

-     * corresponds to the one we are trying to save is when Xinerama is

-     * active.  Otherwise, the pixmap image data is only stored on a

-     * single screen, which means that once it is detached, that data is

-     * lost.  We could save the data here, but then that would require

-     * us to implement the ability for Xdmx to keep the pixmap up to

-     * date while the screen is detached, which is beyond the scope of

-     * the current project. */

-    return;

-#endif

-}

-

-/** Destroy resources on the back-end server.  This function is called

- *  from #dmxDetachScreen() via the dix layer's FindAllResources

- *  function.  It walks all resources, compares them to the screen

- *  number passed in as \a n and calls the appropriate DMX function to

- *  free the associated resource on the back-end server. */

-static void dmxBEDestroyResources(pointer value, XID id, RESTYPE type,

-				  pointer n)

-{

-    int        scrnNum = (int)n;

-    ScreenPtr  pScreen = screenInfo.screens[scrnNum];

-

-    if ((type & TypeMask) == (RT_WINDOW & TypeMask)) {

-	/* Window resources are destroyed below in dmxBEDestroyWindowTree */

-    } else if ((type & TypeMask) == (RT_PIXMAP & TypeMask)) {

-	PixmapPtr  pPix = value;

-	if (pPix->drawable.pScreen->myNum == scrnNum) {

-	    dmxBESavePixmap(pPix);

-	    dmxBEFreePixmap(pPix);

-	}

-    } else if ((type & TypeMask) == (RT_GC & TypeMask)) {

-	GCPtr  pGC = value;

-	if (pGC->pScreen->myNum == scrnNum)

-	    dmxBEFreeGC(pGC);

-    } else if ((type & TypeMask) == (RT_FONT & TypeMask)) {

-	dmxBEFreeFont(pScreen, (FontPtr)value);

-    } else if ((type & TypeMask) == (RT_CURSOR & TypeMask)) {

-	dmxBEFreeCursor(pScreen, (CursorPtr)value);

-    } else if ((type & TypeMask) == (RT_COLORMAP & TypeMask)) {

-	ColormapPtr  pCmap = value;

-	if (pCmap->pScreen->myNum == scrnNum)

-	    dmxBEFreeColormap((ColormapPtr)value);

-    } else if ((type & TypeMask) == (PictureType & TypeMask)) {

-	PicturePtr  pPict = value;

-	if (pPict->pDrawable->pScreen->myNum == scrnNum) {

-	    /* Free the pixmaps on the backend if needed */

-	    if (pPict->pDrawable->type == DRAWABLE_PIXMAP) {

-		PixmapPtr pPixmap = (PixmapPtr)(pPict->pDrawable);

-		dmxBESavePixmap(pPixmap);

-		dmxBEFreePixmap(pPixmap);

-	    }

-	    dmxBEFreePicture((PicturePtr)value);

-	}

-    } else if ((type & TypeMask) == (GlyphSetType & TypeMask)) {

-	dmxBEFreeGlyphSet(pScreen, (GlyphSetPtr)value);

-    } else {

-	/* Other resource types??? */

-    }

-}

-

-/** Destroy the scratch GCs that are created per depth. */

-static void dmxBEDestroyScratchGCs(int scrnNum)

-{

-    ScreenPtr  pScreen = screenInfo.screens[scrnNum];

-    GCPtr     *ppGC    = pScreen->GCperDepth;

-    int        i;

-

-    for (i = 0; i <= pScreen->numDepths; i++)

-	dmxBEFreeGC(ppGC[i]);

-}

-

-/** Destroy window hierachy on back-end server.  To ensure that all

- *  XDestroyWindow() calls succeed, they must be performed in a bottom

- *  up order so that windows are not destroyed before their children.

- *  XDestroyWindow(), which is called from #dmxBEDestroyWindow(), will

- *  destroy a window as well as all of it's children. */

-static void dmxBEDestroyWindowTree(int idx)

-{

-    WindowPtr  pWin   = screenInfo.screens[idx]->root;

-    WindowPtr  pChild = pWin;

-

-    while (1) {

-	if (pChild->firstChild) {

-	    pChild = pChild->firstChild;

-	    continue;

-	}

-

-	/* Destroy the window */

-	dmxBEDestroyWindow(pChild);

-

-	/* Make sure we destroy the window's border and background

-	 * pixmaps if they exist */

-	if (!pChild->borderIsPixel) {

-	    dmxBESavePixmap(pChild->border.pixmap);

-	    dmxBEFreePixmap(pChild->border.pixmap);

-	}

-	if (pChild->backgroundState == BackgroundPixmap) {

-	    dmxBESavePixmap(pChild->background.pixmap);

-	    dmxBEFreePixmap(pChild->background.pixmap);

-	}

-

-	while (!pChild->nextSib && (pChild != pWin)) {

-	    pChild = pChild->parent;

-	    dmxBEDestroyWindow(pChild);

-	    if (!pChild->borderIsPixel) {

-		dmxBESavePixmap(pChild->border.pixmap);

-		dmxBEFreePixmap(pChild->border.pixmap);

-	    }

-	    if (pChild->backgroundState == BackgroundPixmap) {

-		dmxBESavePixmap(pChild->background.pixmap);

-		dmxBEFreePixmap(pChild->background.pixmap);

-	    }

-	}

-

-	if (pChild == pWin)

-	    break;

-

-	pChild = pChild->nextSib;

-    }

-}

-

-/** Detach back-end screen. */

-int dmxDetachScreen(int idx)

-{

-    DMXScreenInfo *dmxScreen = &dmxScreens[idx];

-    int            i;

-

-    /* Return failure if dynamic addition/removal of screens is disabled */

-    if (!dmxAddRemoveScreens) {

-	dmxLog(dmxWarning,

-	       "Attempting to remove a screen, but the AddRemoveScreen\n");

-	dmxLog(dmxWarning,

-	       "extension has not been enabled.  To enable this extension\n");

-	dmxLog(dmxWarning,

-	       "add the \"-addremovescreens\" option either to the command\n");

-	dmxLog(dmxWarning,

-	       "line or in the configuration file.\n");

-	return 1;

-    }

-

-    /* Cannot remove a screen that does not exist */

-    if (idx < 0 || idx >= dmxNumScreens) return 1;

-

-    /* Cannot detach from a screen that is not opened */

-    if (!dmxScreen->beDisplay) {

-	dmxLog(dmxWarning,

-	       "Attempting to remove screen #%d but it has not been opened\n",

-	       idx);

-	return 1;

-    }

-

-    dmxLogOutput(dmxScreen, "Detaching screen #%d\n", idx);

-

-    /* Detach input */

-    dmxInputDetachAll(dmxScreen);

-

-    /* Save all relevant state (TODO) */

-

-    /* Free all non-window resources related to this screen */

-    for (i = currentMaxClients; --i >= 0; )

-	if (clients[i])

-	    FindAllClientResources(clients[i], dmxBEDestroyResources,

-				   (pointer)idx);

-

-    /* Free scratch GCs */

-    dmxBEDestroyScratchGCs(idx);

-

-    /* Free window resources related to this screen */

-    dmxBEDestroyWindowTree(idx);

-

-    /* Free default stipple */

-    dmxBESavePixmap(screenInfo.screens[idx]->PixmapPerDepth[0]);

-    dmxBEFreePixmap(screenInfo.screens[idx]->PixmapPerDepth[0]);

-

-    /* Free the remaining screen resources and close the screen */

-    dmxBECloseScreen(screenInfo.screens[idx]);

-

-    /* Adjust the cursor boundaries (paints detached console window) */

-    dmxAdjustCursorBoundaries();

-

-    return 0; /* Success */

-}

+/*
+ * Copyright 2003-2004 Red Hat Inc., Durham, North Carolina.
+ *
+ * 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 on 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 (including the
+ * next paragraph) 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
+ * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS
+ * 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.
+ */
+
+/*
+ * Author:
+ *   Rickard E. (Rik) Faith <faith@redhat.com>
+ *   Kevin E. Martin <kem@redhat.com>
+ *
+ */
+
+/** \file
+ * This file provides the only interface to the X server extension support
+ * in programs/Xserver/Xext.  Those programs should only include dmxext.h
+ */
+
+#ifdef HAVE_DMX_CONFIG_H
+#include <dmx-config.h>
+#endif
+
+#include <stdlib.h>
+
+#include "dmx.h"
+#include "dmxinit.h"
+#include "dmxextension.h"
+#include "dmxwindow.h"
+#include "dmxcb.h"
+#include "dmxcursor.h"
+#include "dmxpixmap.h"
+#include "dmxgc.h"
+#include "dmxfont.h"
+#include "dmxcmap.h"
+#include "dmxpict.h"
+#include "dmxinput.h"
+#include "dmxsync.h"
+#include "dmxscrinit.h"
+#include "input/dmxinputinit.h"
+
+#include "windowstr.h"
+#include "inputstr.h"                 /* For DeviceIntRec */
+#include <X11/extensions/dmxproto.h>  /* For DMX_BAD_* */
+#include "cursorstr.h"
+
+/* The default font is declared in dix/globals.c, but is not included in
+ * _any_ header files. */
+extern FontPtr  defaultFont;
+    
+/** This routine provides information to the DMX protocol extension
+ * about a particular screen. */
+Bool dmxGetScreenAttributes(int physical, DMXScreenAttributesPtr attr)
+{
+    DMXScreenInfo *dmxScreen;
+
+    if (physical < 0 || physical >= dmxNumScreens) return FALSE;
+
+    dmxScreen = &dmxScreens[physical];
+    attr->displayName         = dmxScreen->name;
+#ifdef PANORAMIX
+    attr->logicalScreen       = noPanoramiXExtension ? dmxScreen->index : 0;
+#else
+    attr->logicalScreen       = dmxScreen->index;
+#endif
+
+    attr->screenWindowWidth   = dmxScreen->scrnWidth;
+    attr->screenWindowHeight  = dmxScreen->scrnHeight;
+    attr->screenWindowXoffset = dmxScreen->scrnX;
+    attr->screenWindowYoffset = dmxScreen->scrnY;
+
+    attr->rootWindowWidth     = dmxScreen->rootWidth;
+    attr->rootWindowHeight    = dmxScreen->rootHeight;
+    attr->rootWindowXoffset   = dmxScreen->rootX;
+    attr->rootWindowYoffset   = dmxScreen->rootY;
+
+    attr->rootWindowXorigin   = dmxScreen->rootXOrigin;
+    attr->rootWindowYorigin   = dmxScreen->rootYOrigin;
+
+    return TRUE;
+}
+
+/** This routine provides information to the DMX protocol extension
+ * about a particular window. */
+Bool dmxGetWindowAttributes(WindowPtr pWindow, DMXWindowAttributesPtr attr)
+{
+    dmxWinPrivPtr pWinPriv = DMX_GET_WINDOW_PRIV(pWindow);
+
+    attr->screen         = pWindow->drawable.pScreen->myNum;
+    attr->window         = pWinPriv->window;
+
+    attr->pos.x          = pWindow->drawable.x;
+    attr->pos.y          = pWindow->drawable.y;
+    attr->pos.width      = pWindow->drawable.width;
+    attr->pos.height     = pWindow->drawable.height;
+
+    if (!pWinPriv->window || pWinPriv->offscreen) {
+        attr->vis.x      = 0;
+        attr->vis.y      = 0;
+        attr->vis.height = 0;
+        attr->vis.width  = 0;
+        return pWinPriv->window ? TRUE : FALSE;
+    }
+
+                                /* Compute display-relative coordinates */
+    attr->vis.x          = pWindow->drawable.x;
+    attr->vis.y          = pWindow->drawable.y;
+    attr->vis.width      = pWindow->drawable.width;
+    attr->vis.height     = pWindow->drawable.height;
+
+    if (attr->pos.x < 0) {
+        attr->vis.x     -= attr->pos.x;
+        attr->vis.width  = attr->pos.x + attr->pos.width - attr->vis.x;
+    }
+    if (attr->pos.x + attr->pos.width > pWindow->drawable.pScreen->width) {
+        if (attr->pos.x < 0)
+            attr->vis.width  = pWindow->drawable.pScreen->width;
+        else
+            attr->vis.width  = pWindow->drawable.pScreen->width - attr->pos.x;
+    }
+    if (attr->pos.y < 0) {
+        attr->vis.y     -= attr->pos.y;
+        attr->vis.height = attr->pos.y + attr->pos.height - attr->vis.y;
+    }
+    if (attr->pos.y + attr->pos.height > pWindow->drawable.pScreen->height) {
+        if (attr->pos.y < 0)
+            attr->vis.height = pWindow->drawable.pScreen->height;
+        else
+            attr->vis.height = pWindow->drawable.pScreen->height - attr->pos.y;
+    }
+
+                                /* Convert to window-relative coordinates */
+    attr->vis.x -= attr->pos.x;
+    attr->vis.y -= attr->pos.y;
+
+    return TRUE;
+}
+
+void dmxGetDesktopAttributes(DMXDesktopAttributesPtr attr)
+{
+    attr->width  = dmxGlobalWidth;
+    attr->height = dmxGlobalHeight;
+    attr->shiftX = 0;            /* NOTE: The upper left hand corner of */
+    attr->shiftY = 0;            /*       the desktop is always <0,0>. */
+}
+
+/** Return the total number of devices, not just #dmxNumInputs.  The
+ * number returned should be the same as that returned by
+ * XListInputDevices. */
+int dmxGetInputCount(void)
+{
+    int i, total;
+    
+    for (total = i = 0; i < dmxNumInputs; i++) total += dmxInputs[i].numDevs;
+    return total;
+}
+
+/** Return information about the device with id = \a deviceId.  This
+ * information is primarily for the #ProcDMXGetInputAttributes()
+ * function, which does not have access to the appropriate data
+ * structure. */
+int dmxGetInputAttributes(int deviceId, DMXInputAttributesPtr attr)
+{
+    int          i, j;
+    DMXInputInfo *dmxInput;
+
+    if (deviceId < 0) return -1;
+    for (i = 0; i < dmxNumInputs; i++) {
+        dmxInput = &dmxInputs[i];
+        for (j = 0; j < dmxInput->numDevs; j++) {
+            DMXLocalInputInfoPtr dmxLocal = dmxInput->devs[j];
+            if (deviceId != dmxLocal->pDevice->id) continue;
+            attr->isCore             = !!dmxLocal->isCore;
+            attr->sendsCore          = !!dmxLocal->sendsCore;
+            attr->detached           = !!dmxInput->detached;
+            attr->physicalScreen     = -1;
+            attr->physicalId         = -1;
+            attr->name               = NULL;
+            switch (dmxLocal->extType) {
+            case DMX_LOCAL_TYPE_LOCAL:
+                attr->inputType      = 0;
+                break;
+            case DMX_LOCAL_TYPE_CONSOLE:
+                attr->inputType      = 1;
+                attr->name           = dmxInput->name;
+                attr->physicalId     = dmxLocal->deviceId;
+                break;
+            case DMX_LOCAL_TYPE_BACKEND:
+            case DMX_LOCAL_TYPE_COMMON:
+                attr->inputType      = 2;
+                attr->physicalScreen = dmxInput->scrnIdx;
+                attr->name           = dmxInput->name;
+                attr->physicalId     = dmxLocal->deviceId;
+                break;
+            }
+            return 0;           /* Success */
+        }
+    }
+    return -1;                  /* Failure */
+}
+
+/** Reinitialized the cursor boundaries. */
+static void dmxAdjustCursorBoundaries(void)
+{
+    int           i;
+
+    dmxReInitOrigins();
+    dmxInitOverlap();
+    dmxComputeWidthHeight(DMX_NO_RECOMPUTE_BOUNDING_BOX);
+    dmxConnectionBlockCallback();
+    for (i = 0; i < dmxNumInputs; i++) {
+        DMXInputInfo *dmxInput = &dmxInputs[i];
+	if (!dmxInput->detached) dmxInputReInit(dmxInput);
+    }
+
+    dmxCheckCursor();
+
+    for (i = 0; i < dmxNumInputs; i++) {
+        DMXInputInfo *dmxInput = &dmxInputs[i];
+	if (!dmxInput->detached) dmxInputLateReInit(dmxInput);
+    }
+}
+
+/** Add an input with the specified attributes.  If the input is added,
+ * the physical id is returned in \a deviceId. */
+int dmxAddInput(DMXInputAttributesPtr attr, int *id)
+{
+    int retcode = BadValue;
+
+    if (attr->inputType == 1)   /* console */
+        retcode = dmxInputAttachConsole(attr->name, attr->sendsCore, id);
+    else if (attr->inputType == 2)   /* backend */
+        retcode = dmxInputAttachBackend(attr->physicalScreen,
+                                        attr->sendsCore,id);
+
+    if (retcode == Success) {
+        /* Adjust the cursor boundaries */
+        dmxAdjustCursorBoundaries();
+
+        /* Force completion of the changes */
+        dmxSync(NULL, TRUE);
+    }
+
+    return retcode;
+}
+
+/** Remove the input with physical id \a id. */
+int dmxRemoveInput(int id)
+{
+    return dmxInputDetachId(id);
+}
+
+/** Return the value of #dmxNumScreens -- the total number of backend
+ * screens in use (these are logical screens and may be larger than the
+ * number of backend displays). */
+unsigned long dmxGetNumScreens(void)
+{
+    return dmxNumScreens;
+}
+
+/** Make sure that #dmxCreateAndRealizeWindow has been called for \a
+ * pWindow. */
+void dmxForceWindowCreation(WindowPtr pWindow)
+{
+    dmxWinPrivPtr pWinPriv = DMX_GET_WINDOW_PRIV(pWindow);
+    if (!pWinPriv->window) dmxCreateAndRealizeWindow(pWindow, TRUE);
+}
+
+/** Flush pending syncs for all screens. */
+void dmxFlushPendingSyncs(void)
+{
+    dmxSync(NULL, TRUE);
+}
+
+/** Update DMX's screen resources to match those of the newly moved
+ *  and/or resized "root" window. */
+void dmxUpdateScreenResources(ScreenPtr pScreen, int x, int y, int w, int h)
+{
+    DMXScreenInfo *dmxScreen = &dmxScreens[pScreen->myNum];
+    WindowPtr      pRoot     = pScreen->root;
+    WindowPtr      pChild;
+    Bool           anyMarked = FALSE;
+
+    /* Handle special case where width and/or height are zero */
+    if (w == 0 || h == 0) {
+	w = 1;
+	h = 1;
+    }
+
+    /* Change screen size */
+    pScreen->width  = w;
+    pScreen->height = h;
+
+    /* Reset the root window's drawable's size */
+    pRoot->drawable.width  = w;
+    pRoot->drawable.height = h;
+
+    /* Set the root window's new winSize and borderSize */
+    pRoot->winSize.extents.x1 = 0;
+    pRoot->winSize.extents.y1 = 0;
+    pRoot->winSize.extents.x2 = w;
+    pRoot->winSize.extents.y2 = h;
+
+    pRoot->borderSize.extents.x1 = 0;
+    pRoot->borderSize.extents.y1 = 0;
+    pRoot->borderSize.extents.x2 = w;
+    pRoot->borderSize.extents.y2 = h;
+
+    /* Recompute this screen's mmWidth & mmHeight */
+    pScreen->mmWidth =
+	(w * 254 + dmxScreen->beXDPI * 5) / (dmxScreen->beXDPI * 10);
+    pScreen->mmHeight =
+	(h * 254 + dmxScreen->beYDPI * 5) / (dmxScreen->beYDPI * 10);
+
+    /* Recompute this screen's window's clip rects as follows: */
+    /*   1. Mark all of root's children's windows */
+    for (pChild = pRoot->firstChild; pChild; pChild = pChild->nextSib)
+	anyMarked |= pScreen->MarkOverlappedWindows(pChild, pChild,
+						    (WindowPtr *)NULL);
+
+    /*   2. Set the root window's borderClip */
+    pRoot->borderClip.extents.x1 = 0;
+    pRoot->borderClip.extents.y1 = 0;
+    pRoot->borderClip.extents.x2 = w;
+    pRoot->borderClip.extents.y2 = h;
+
+    /*   3. Set the root window's clipList */
+    if (anyMarked) {
+	/* If any windows have been marked, set the root window's
+	 * clipList to be broken since it will be recalculated in
+	 * ValidateTree()
+	 */
+	RegionBreak(&pRoot->clipList);
+    } else {
+	/* Otherwise, we just set it directly since there are no
+	 * windows visible on this screen
+	 */
+	pRoot->clipList.extents.x1 = 0;
+	pRoot->clipList.extents.y1 = 0;
+	pRoot->clipList.extents.x2 = w;
+	pRoot->clipList.extents.y2 = h;
+    }
+
+    /*   4. Revalidate all clip rects and generate expose events */
+    if (anyMarked) {
+	pScreen->ValidateTree(pRoot, NULL, VTBroken);
+	pScreen->HandleExposures(pRoot);
+	if (pScreen->PostValidateTree)
+	    pScreen->PostValidateTree(pRoot, NULL, VTBroken);
+    }
+}
+
+#ifdef PANORAMIX
+#include "panoramiXsrv.h"
+
+/** Change the "screen" window attributes by resizing the actual window
+ *  on the back-end display (if necessary). */
+static void dmxConfigureScreenWindow(int idx,
+				     int x, int y, int w, int h)
+{
+    DMXScreenInfo *dmxScreen = &dmxScreens[idx];
+    ScreenPtr      pScreen   = screenInfo.screens[idx];
+
+    /* Resize "screen" window */
+    if (dmxScreen->scrnX      != x ||
+	dmxScreen->scrnY      != y ||
+	dmxScreen->scrnWidth  != w ||
+	dmxScreen->scrnHeight != h) {
+	dmxResizeScreenWindow(pScreen, x, y, w, h);
+    }
+
+    /* Change "screen" window values */
+    dmxScreen->scrnX      = x;
+    dmxScreen->scrnY      = y;
+    dmxScreen->scrnWidth  = w;
+    dmxScreen->scrnHeight = h;
+}
+				     
+/** Change the "root" window position and size by resizing the actual
+ *  window on the back-end display (if necessary) and updating all of
+ *  DMX's resources by calling #dmxUpdateScreenResources. */
+static void dmxConfigureRootWindow(int idx, int x, int y, int w, int h)
+{
+    DMXScreenInfo *dmxScreen = &dmxScreens[idx];
+    WindowPtr      pRoot     = screenInfo.screens[idx]->root;
+
+    /* NOTE: Either this function or the ones that it calls must handle
+     * the case where w == 0 || h == 0.  Currently, the functions that
+     * this one calls handle that case. */
+
+    /* 1. Resize "root" window */
+    if (dmxScreen->rootX      != x ||
+	dmxScreen->rootY      != y ||
+	dmxScreen->rootWidth  != w ||
+	dmxScreen->rootHeight != h) {
+	dmxResizeRootWindow(pRoot, x, y, w, h);
+    }
+
+    /* 2. Update all of the screen's resources associated with this root
+     *    window */
+    if (dmxScreen->rootWidth  != w ||
+	dmxScreen->rootHeight != h) {
+	dmxUpdateScreenResources(screenInfo.screens[idx], x, y, w, h);
+    }
+
+    /* Change "root" window values */
+    dmxScreen->rootX      = x;
+    dmxScreen->rootY      = y;
+    dmxScreen->rootWidth  = w;
+    dmxScreen->rootHeight = h;
+}
+
+/** Change the "root" window's origin by updating DMX's internal data
+ *  structures (dix and Xinerama) to use the new origin and adjust the
+ *  positions of windows that overlap this "root" window. */
+static void dmxSetRootWindowOrigin(int idx, int x, int y)
+{
+    DMXScreenInfo *dmxScreen = &dmxScreens[idx];
+    ScreenPtr      pScreen   = screenInfo.screens[idx];
+    WindowPtr      pRoot     = pScreen->root;
+    WindowPtr      pChild;
+    int            xoff;
+    int            yoff;
+
+    /* Change "root" window's origin */
+    dmxScreen->rootXOrigin = x;
+    dmxScreen->rootYOrigin = y;
+
+    /* Compute offsets here in case <x,y> has been changed above */
+    xoff = x - pScreen->x;
+    yoff = y - pScreen->y;
+
+    /* Adjust the root window's position */
+    pScreen->x = dmxScreen->rootXOrigin;
+    pScreen->y = dmxScreen->rootYOrigin;
+
+    /* Recalculate the Xinerama regions and data structs */
+    XineramaReinitData(pScreen);
+
+    /* Adjust each of the root window's children */
+    if (!idx) ReinitializeRootWindow(screenInfo.screens[0]->root, xoff, yoff);
+    pChild = pRoot->firstChild;
+    while (pChild) {
+	/* Adjust child window's position */
+	pScreen->MoveWindow(pChild,
+			    pChild->origin.x - wBorderWidth(pChild) - xoff,
+			    pChild->origin.y - wBorderWidth(pChild) - yoff,
+			    pChild->nextSib,
+			    VTMove);
+
+	/* Note that the call to MoveWindow will eventually call
+	 * dmxPositionWindow which will automatically create a
+	 * window if it is now exposed on screen (for lazy window
+	 * creation optimization) and it will properly set the
+	 * offscreen flag.
+	 */
+
+	pChild = pChild->nextSib;
+    }
+}
+
+/** Configure the attributes of each "screen" and "root" window. */
+int dmxConfigureScreenWindows(int nscreens,
+			      CARD32 *screens,
+			      DMXScreenAttributesPtr attribs,
+			      int *errorScreen)
+{
+    int           i;
+
+    for (i = 0; i < nscreens; i++) {
+	DMXScreenAttributesPtr  attr      = &attribs[i];
+	int                     idx       = screens[i];
+	DMXScreenInfo          *dmxScreen = &dmxScreens[idx];
+
+	if (errorScreen) *errorScreen = i;
+
+	if (!dmxScreen->beDisplay) return DMX_BAD_VALUE;
+
+	/* Check for illegal values */
+	if (idx < 0 || idx >= dmxNumScreens) return BadValue;
+
+	/* The "screen" and "root" windows must have valid sizes */
+	if (attr->screenWindowWidth <= 0 || attr->screenWindowHeight <= 0 ||
+	    attr->rootWindowWidth   <  0 || attr->rootWindowHeight   <  0)
+	    return DMX_BAD_VALUE;
+
+	/* The "screen" window must fit entirely within the BE display */
+	if (attr->screenWindowXoffset < 0 ||
+	    attr->screenWindowYoffset < 0 ||
+	    attr->screenWindowXoffset
+	    + attr->screenWindowWidth  > (unsigned)dmxScreen->beWidth ||
+	    attr->screenWindowYoffset
+	    + attr->screenWindowHeight > (unsigned)dmxScreen->beHeight)
+	    return DMX_BAD_VALUE;
+
+	/* The "root" window must fit entirely within the "screen" window */
+	if (attr->rootWindowXoffset < 0 ||
+	    attr->rootWindowYoffset < 0 ||
+	    attr->rootWindowXoffset
+	    + attr->rootWindowWidth  > attr->screenWindowWidth ||
+	    attr->rootWindowYoffset
+	    + attr->rootWindowHeight > attr->screenWindowHeight)
+	    return DMX_BAD_VALUE;
+
+	/* The "root" window must not expose unaddressable coordinates */
+	if (attr->rootWindowXorigin < 0 ||
+	    attr->rootWindowYorigin < 0 ||
+	    attr->rootWindowXorigin + attr->rootWindowWidth  > 32767 ||
+	    attr->rootWindowYorigin + attr->rootWindowHeight > 32767)
+	    return DMX_BAD_VALUE;
+
+	/* The "root" window must fit within the global bounding box */
+	if (attr->rootWindowXorigin
+	    + attr->rootWindowWidth > (unsigned)dmxGlobalWidth ||
+	    attr->rootWindowYorigin
+	    + attr->rootWindowHeight > (unsigned)dmxGlobalHeight)
+	    return DMX_BAD_VALUE;
+
+	/* FIXME: Handle the rest of the illegal value checking */
+    }
+
+    /* No illegal values found */
+    if (errorScreen) *errorScreen = 0;
+
+    for (i = 0; i < nscreens; i++) {
+	DMXScreenAttributesPtr  attr      = &attribs[i];
+	int                     idx       = screens[i];
+	DMXScreenInfo          *dmxScreen = &dmxScreens[idx];
+
+	dmxLog(dmxInfo, "Changing screen #%d attributes "
+	       "from %dx%d+%d+%d %dx%d+%d+%d +%d+%d "
+	       "to %dx%d+%d+%d %dx%d+%d+%d +%d+%d\n",
+	       idx,
+	       dmxScreen->scrnWidth,      dmxScreen->scrnHeight,
+	       dmxScreen->scrnX,          dmxScreen->scrnY,
+	       dmxScreen->rootWidth,      dmxScreen->rootHeight,
+	       dmxScreen->rootX,          dmxScreen->rootY,
+	       dmxScreen->rootXOrigin,    dmxScreen->rootYOrigin,
+	       attr->screenWindowWidth,   attr->screenWindowHeight,
+	       attr->screenWindowXoffset, attr->screenWindowYoffset,
+	       attr->rootWindowWidth,     attr->rootWindowHeight,
+	       attr->rootWindowXoffset,   attr->rootWindowYoffset,
+	       attr->rootWindowXorigin,   attr->rootWindowYorigin);
+
+	/* Configure "screen" window */
+	dmxConfigureScreenWindow(idx,
+				 attr->screenWindowXoffset,
+				 attr->screenWindowYoffset,
+				 attr->screenWindowWidth,
+				 attr->screenWindowHeight);
+
+	/* Configure "root" window */
+	dmxConfigureRootWindow(idx,
+			       attr->rootWindowXoffset,
+			       attr->rootWindowYoffset,
+			       attr->rootWindowWidth,
+			       attr->rootWindowHeight);
+
+
+	/* Set "root" window's origin */
+	dmxSetRootWindowOrigin(idx,
+			       attr->rootWindowXorigin,
+			       attr->rootWindowYorigin);
+    }
+
+    /* Adjust the cursor boundaries */
+    dmxAdjustCursorBoundaries();
+
+    /* Force completion of the changes */
+    dmxSync(NULL, TRUE);
+
+    return Success;
+}
+
+/** Configure the attributes of the global desktop. */
+int dmxConfigureDesktop(DMXDesktopAttributesPtr attribs)
+{
+    if (attribs->width  <= 0 || attribs->width  >= 32767 ||
+	attribs->height <= 0 || attribs->height >= 32767)
+	return DMX_BAD_VALUE;
+
+    /* If the desktop is shrinking, adjust the "root" windows on each
+     * "screen" window to only show the visible desktop.  Also, handle
+     * the special case where the desktop shrinks such that the it no
+     * longer overlaps an portion of a "screen" window. */
+    if (attribs->width < dmxGlobalWidth || attribs->height < dmxGlobalHeight) {
+	int   i;
+	for (i = 0; i < dmxNumScreens; i++) {
+	    DMXScreenInfo *dmxScreen = &dmxScreens[i];
+	    if (dmxScreen->rootXOrigin
+		+ dmxScreen->rootWidth  > attribs->width ||
+		dmxScreen->rootYOrigin
+		+ dmxScreen->rootHeight > attribs->height) {
+		int  w, h;
+		if ((w = attribs->width  - dmxScreen->rootXOrigin) < 0) w = 0;
+		if ((h = attribs->height - dmxScreen->rootYOrigin) < 0) h = 0;
+		if (w > dmxScreen->scrnWidth)  w = dmxScreen->scrnWidth;
+		if (h > dmxScreen->scrnHeight) h = dmxScreen->scrnHeight;
+		if (w > dmxScreen->rootWidth)  w = dmxScreen->rootWidth;
+		if (h > dmxScreen->rootHeight) h = dmxScreen->rootHeight;
+		dmxConfigureRootWindow(i,
+				       dmxScreen->rootX,
+				       dmxScreen->rootY,
+				       w, h);
+	    }
+	}
+    }
+
+    /* Set the global width/height */
+    dmxSetWidthHeight(attribs->width, attribs->height);
+
+    /* Handle shift[XY] changes */
+    if (attribs->shiftX || attribs->shiftY) {
+	int   i;
+	for (i = 0; i < dmxNumScreens; i++) {
+	    ScreenPtr  pScreen = screenInfo.screens[i];
+	    WindowPtr  pChild  = pScreen->root->firstChild;
+	    while (pChild) {
+		/* Adjust child window's position */
+		pScreen->MoveWindow(pChild,
+				    pChild->origin.x - wBorderWidth(pChild)
+				    - attribs->shiftX,
+				    pChild->origin.y - wBorderWidth(pChild)
+				    - attribs->shiftY,
+				    pChild->nextSib,
+				    VTMove);
+
+		/* Note that the call to MoveWindow will eventually call
+		 * dmxPositionWindow which will automatically create a
+		 * window if it is now exposed on screen (for lazy
+		 * window creation optimization) and it will properly
+		 * set the offscreen flag.
+		 */
+
+		pChild = pChild->nextSib;
+	    }
+	}
+    }
+
+    /* Update connection block, Xinerama, etc. -- these appears to
+     * already be handled in dmxConnectionBlockCallback(), which is
+     * called from dmxAdjustCursorBoundaries() [below]. */
+
+    /* Adjust the cursor boundaries */
+    dmxAdjustCursorBoundaries();
+
+    /* Force completion of the changes */
+    dmxSync(NULL, TRUE);
+
+    return Success;
+}
+#endif
+
+/** Create the scratch GCs per depth. */
+static void dmxBECreateScratchGCs(int scrnNum)
+{
+    ScreenPtr  pScreen = screenInfo.screens[scrnNum];
+    GCPtr     *ppGC    = pScreen->GCperDepth;
+    int        i;
+
+    for (i = 0; i <= pScreen->numDepths; i++)
+	dmxBECreateGC(pScreen, ppGC[i]);
+}
+
+#ifdef PANORAMIX
+static Bool FoundPixImage;
+
+/** Search the Xinerama XRT_PIXMAP resources for the pixmap that needs
+ *  to have its image restored.  When it is found, see if there is
+ *  another screen with the same image.  If so, copy the pixmap image
+ *  from the existing screen to the newly created pixmap. */
+static void dmxBERestorePixmapImage(pointer value, XID id, RESTYPE type,
+				    pointer p)
+{
+    if ((type & TypeMask) == (XRT_PIXMAP & TypeMask)) {
+	PixmapPtr      pDst     = (PixmapPtr)p;
+	int            idx      = pDst->drawable.pScreen->myNum;
+	PanoramiXRes  *pXinPix  = (PanoramiXRes *)value;
+	PixmapPtr      pPix;
+	int            i;
+
+	dixLookupResourceByType((pointer*) &pPix, pXinPix->info[idx].id,
+				RT_PIXMAP, NullClient, DixUnknownAccess);
+	if (pPix != pDst) return; /* Not a match.... Next! */
+
+	for (i = 0; i < PanoramiXNumScreens; i++) {
+	    PixmapPtr      pSrc;
+	    dmxPixPrivPtr  pSrcPriv = NULL;
+
+	    if (i == idx) continue; /* Self replication is bad */
+
+	    dixLookupResourceByType((pointer*) &pSrc, pXinPix->info[i].id,
+				    RT_PIXMAP, NullClient, DixUnknownAccess);
+	    pSrcPriv = DMX_GET_PIXMAP_PRIV(pSrc);
+	    if (pSrcPriv->pixmap) {
+		DMXScreenInfo *dmxSrcScreen = &dmxScreens[i];
+		DMXScreenInfo *dmxDstScreen = &dmxScreens[idx];
+		dmxPixPrivPtr  pDstPriv = DMX_GET_PIXMAP_PRIV(pDst);
+		XImage        *img;
+		int            j;
+		XlibGC         gc = NULL;
+
+		/* This should never happen, but just in case.... */
+		if (pSrc->drawable.width  != pDst->drawable.width ||
+		    pSrc->drawable.height != pDst->drawable.height)
+		    return;
+
+		/* Copy from src pixmap to dst pixmap */
+		img = XGetImage(dmxSrcScreen->beDisplay,
+				pSrcPriv->pixmap,
+				0, 0,
+				pSrc->drawable.width, pSrc->drawable.height,
+				-1,
+				ZPixmap);
+
+		for (j = 0; j < dmxDstScreen->beNumPixmapFormats; j++) {
+		    if (dmxDstScreen->bePixmapFormats[j].depth == img->depth) {
+			unsigned long  m;
+			XGCValues      v;
+
+			m = GCFunction | GCPlaneMask | GCClipMask;
+			v.function = GXcopy;
+			v.plane_mask = AllPlanes;
+			v.clip_mask = None;
+
+			gc = XCreateGC(dmxDstScreen->beDisplay,
+				       dmxDstScreen->scrnDefDrawables[j],
+				       m, &v);
+			break;
+		    }
+		}
+
+		if (gc) {
+		    XPutImage(dmxDstScreen->beDisplay,
+			      pDstPriv->pixmap,
+			      gc, img, 0, 0, 0, 0,
+			      pDst->drawable.width, pDst->drawable.height);
+		    XFreeGC(dmxDstScreen->beDisplay, gc);
+		    FoundPixImage = True;
+		} else {
+		    dmxLog(dmxWarning, "Could not create GC\n");
+		}
+
+		XDestroyImage(img);
+		return;
+	    }
+	}
+    }
+}
+#endif
+
+/** Restore the pixmap image either from another screen or from an image
+ *  that was saved when the screen was previously detached. */
+static void dmxBERestorePixmap(PixmapPtr pPixmap)
+{
+#ifdef PANORAMIX
+    int i;
+
+    /* If Xinerama is not active, there's nothing we can do (see comment
+     * in #else below for more info). */
+    if (noPanoramiXExtension) {
+	dmxLog(dmxWarning, "Cannot restore pixmap image\n");
+	return;
+    }
+
+    FoundPixImage = False;
+    for (i = currentMaxClients; --i >= 0; )
+	if (clients[i])
+	    FindAllClientResources(clients[i], dmxBERestorePixmapImage,
+				   (pointer)pPixmap);
+
+    /* No corresponding pixmap image was found on other screens, so we
+     * need to copy it from the saved image when the screen was detached
+     * (if available). */
+    if (!FoundPixImage) {
+	dmxPixPrivPtr  pPixPriv = DMX_GET_PIXMAP_PRIV(pPixmap);
+
+	if (pPixPriv->detachedImage) {
+	    ScreenPtr      pScreen   = pPixmap->drawable.pScreen;
+	    DMXScreenInfo *dmxScreen = &dmxScreens[pScreen->myNum];
+	    XlibGC         gc        = NULL;
+
+	    for (i = 0; i < dmxScreen->beNumPixmapFormats; i++) {
+		if (dmxScreen->bePixmapFormats[i].depth ==
+		    pPixPriv->detachedImage->depth) {
+		    unsigned long  m;
+		    XGCValues      v;
+
+		    m = GCFunction | GCPlaneMask | GCClipMask;
+		    v.function = GXcopy;
+		    v.plane_mask = AllPlanes;
+		    v.clip_mask = None;
+
+		    gc = XCreateGC(dmxScreen->beDisplay,
+				   dmxScreen->scrnDefDrawables[i],
+				   m, &v);
+		    break;
+		}
+	    }
+
+	    if (gc) {
+		XPutImage(dmxScreen->beDisplay,
+			  pPixPriv->pixmap,
+			  gc,
+			  pPixPriv->detachedImage,
+			  0, 0, 0, 0,
+		      pPixmap->drawable.width, pPixmap->drawable.height);
+		XFreeGC(dmxScreen->beDisplay, gc);
+	    } else {
+		dmxLog(dmxWarning, "Cannot restore pixmap image\n");
+	    }
+
+	    XDestroyImage(pPixPriv->detachedImage);
+	    pPixPriv->detachedImage = NULL;
+	} else {
+	    dmxLog(dmxWarning, "Cannot restore pixmap image\n");
+	}
+    }
+#else
+    /* If Xinerama is not enabled, then there is no other copy of the
+     * pixmap image that we can restore.  Saving all pixmap data is not
+     * a feasible option since there is no mechanism for updating pixmap
+     * data when a screen is detached, which means that the data that
+     * was previously saved would most likely be out of date. */
+    dmxLog(dmxWarning, "Cannot restore pixmap image\n");
+    return;
+#endif
+}
+
+/** Create resources on the back-end server.  This function is called
+ *  from #dmxAttachScreen() via the dix layer's FindAllResources
+ *  function.  It walks all resources, compares them to the screen
+ *  number passed in as \a n and calls the appropriate DMX function to
+ *  create the associated resource on the back-end server. */
+static void dmxBECreateResources(pointer value, XID id, RESTYPE type,
+				 pointer n)
+{
+    int        scrnNum = (uintptr_t)n;
+    ScreenPtr  pScreen = screenInfo.screens[scrnNum];
+
+    if ((type & TypeMask) == (RT_WINDOW & TypeMask)) {
+	/* Window resources are created below in dmxBECreateWindowTree */
+    } else if ((type & TypeMask) == (RT_PIXMAP & TypeMask)) {
+	PixmapPtr  pPix = value;
+	if (pPix->drawable.pScreen->myNum == scrnNum) {
+	    dmxBECreatePixmap(pPix);
+	    dmxBERestorePixmap(pPix);
+	}
+    } else if ((type & TypeMask) == (RT_GC & TypeMask)) {
+	GCPtr  pGC = value;
+	if (pGC->pScreen->myNum == scrnNum) {
+	    /* Create the GC on the back-end server */
+	    dmxBECreateGC(pScreen, pGC);
+	    /* Create any pixmaps associated with this GC */
+	    if (!pGC->tileIsPixel) {
+		dmxBECreatePixmap(pGC->tile.pixmap);
+		dmxBERestorePixmap(pGC->tile.pixmap);
+	    }
+	    if (pGC->stipple != pScreen->PixmapPerDepth[0]) {
+		dmxBECreatePixmap(pGC->stipple);
+		dmxBERestorePixmap(pGC->stipple);
+	    }
+	    if (pGC->font != defaultFont) {
+		(void)dmxBELoadFont(pScreen, pGC->font);
+	    }
+	    /* Update the GC on the back-end server */
+	    dmxChangeGC(pGC, -1L);
+	}
+    } else if ((type & TypeMask) == (RT_FONT & TypeMask)) {
+	(void)dmxBELoadFont(pScreen, (FontPtr)value);
+    } else if ((type & TypeMask) == (RT_CURSOR & TypeMask)) {
+	dmxBECreateCursor(pScreen, (CursorPtr)value);
+    } else if ((type & TypeMask) == (RT_COLORMAP & TypeMask)) {
+	ColormapPtr  pCmap = value;
+	if (pCmap->pScreen->myNum == scrnNum)
+	    (void)dmxBECreateColormap((ColormapPtr)value);
+#if 0
+    /* 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
+    } else {
+	/* Other resource types??? */
+    }
+}
+
+/** Create window hierachy on back-end server.  The window tree is
+ *  created in a special order (bottom most subwindow first) so that the
+ *  #dmxCreateNonRootWindow() function does not need to recursively call
+ *  itself to create each window's parents.  This is required so that we
+ *  have the opportunity to create each window's border and background
+ *  pixmaps (where appropriate) before the window is created. */
+static void dmxBECreateWindowTree(int idx)
+{
+    DMXScreenInfo *dmxScreen = &dmxScreens[idx];
+    WindowPtr      pRoot     = screenInfo.screens[idx]->root;
+    dmxWinPrivPtr  pWinPriv  = DMX_GET_WINDOW_PRIV(pRoot);
+    WindowPtr      pWin;
+
+    /* Create the pixmaps associated with the root window */
+    if (!pRoot->borderIsPixel) {
+	dmxBECreatePixmap(pRoot->border.pixmap);
+	dmxBERestorePixmap(pRoot->border.pixmap);
+    }
+    if (pRoot->backgroundState == BackgroundPixmap) {
+	dmxBECreatePixmap(pRoot->background.pixmap);
+	dmxBERestorePixmap(pRoot->background.pixmap);
+    }
+
+    /* Create root window first */
+    dmxScreen->rootWin = pWinPriv->window = dmxCreateRootWindow(pRoot);
+    XMapWindow(dmxScreen->beDisplay, dmxScreen->rootWin);
+
+    pWin = pRoot->lastChild;
+    while (pWin) {
+	pWinPriv = DMX_GET_WINDOW_PRIV(pWin);
+
+	/* Create the pixmaps regardless of whether or not the
+	 * window is created or not due to lazy window creation.
+	 */
+	if (!pWin->borderIsPixel) {
+	    dmxBECreatePixmap(pWin->border.pixmap);
+	    dmxBERestorePixmap(pWin->border.pixmap);
+	}
+	if (pWin->backgroundState == BackgroundPixmap) {
+	    dmxBECreatePixmap(pWin->background.pixmap);
+	    dmxBERestorePixmap(pWin->background.pixmap);
+	}
+
+	/* Reset the window attributes */
+	dmxGetDefaultWindowAttributes(pWin,
+				      &pWinPriv->cmap,
+				      &pWinPriv->visual);
+
+	/* Create the window */
+	if (pWinPriv->mapped && !pWinPriv->offscreen)
+	    dmxCreateAndRealizeWindow(pWin, TRUE);
+
+	/* Next, create the bottom-most child */
+	if (pWin->lastChild) {
+	    pWin = pWin->lastChild;
+	    continue;
+	}
+
+	/* If the window has no children, move on to the next higher window */
+	while (!pWin->prevSib && (pWin != pRoot))
+	    pWin = pWin->parent;
+
+	if (pWin->prevSib) {
+	    pWin = pWin->prevSib;
+	    continue;
+	}
+
+	/* When we reach the root window, we are finished */
+	if (pWin == pRoot)
+	    break;
+    }
+}
+
+/* Refresh screen by generating exposure events for all windows */
+static void dmxForceExposures(int idx)
+{
+    ScreenPtr      pScreen   = screenInfo.screens[idx];
+    WindowPtr  pRoot     = pScreen->root;
+    Bool       anyMarked = FALSE;
+    WindowPtr  pChild;
+
+    for (pChild = pRoot->firstChild; pChild; pChild = pChild->nextSib)
+	anyMarked |= pScreen->MarkOverlappedWindows(pChild, pChild,
+						    (WindowPtr *)NULL);
+    if (anyMarked) {
+	/* If any windows have been marked, set the root window's
+	 * clipList to be broken since it will be recalculated in
+	 * ValidateTree()
+	 */
+	RegionBreak(&pRoot->clipList);
+	pScreen->ValidateTree(pRoot, NULL, VTBroken);
+	pScreen->HandleExposures(pRoot);
+	if (pScreen->PostValidateTree)
+	    pScreen->PostValidateTree(pRoot, NULL, VTBroken);
+    }
+}
+
+/** Compare the new and old screens to see if they are compatible. */
+static Bool dmxCompareScreens(DMXScreenInfo *new, DMXScreenInfo *old)
+{
+    int i;
+
+    if (new->beWidth != old->beWidth) return FALSE;
+    if (new->beHeight != old->beHeight) return FALSE;
+    if (new->beDepth != old->beDepth) return FALSE;
+    if (new->beBPP != old->beBPP) return FALSE;
+
+    if (new->beNumDepths != old->beNumDepths) return FALSE;
+    for (i = 0; i < old->beNumDepths; i++)
+	if (new->beDepths[i] != old->beDepths[i]) return FALSE;
+
+    if (new->beNumPixmapFormats != old->beNumPixmapFormats) return FALSE;
+    for (i = 0; i < old->beNumPixmapFormats; i++) {
+	if (new->bePixmapFormats[i].depth !=
+	    old->bePixmapFormats[i].depth) return FALSE;
+	if (new->bePixmapFormats[i].bits_per_pixel !=
+	    old->bePixmapFormats[i].bits_per_pixel) return FALSE;
+	if (new->bePixmapFormats[i].scanline_pad !=
+	    old->bePixmapFormats[i].scanline_pad) return FALSE;
+    }
+
+    if (new->beNumVisuals != old->beNumVisuals) return FALSE;
+    for (i = 0; i < old->beNumVisuals; i++) {
+	if (new->beVisuals[i].visualid !=
+	    old->beVisuals[i].visualid) return FALSE;
+	if (new->beVisuals[i].screen !=
+	    old->beVisuals[i].screen) return FALSE;
+	if (new->beVisuals[i].depth !=
+	    old->beVisuals[i].depth) return FALSE;
+	if (new->beVisuals[i].class !=
+	    old->beVisuals[i].class) return FALSE;
+	if (new->beVisuals[i].red_mask !=
+	    old->beVisuals[i].red_mask) return FALSE;
+	if (new->beVisuals[i].green_mask !=
+	    old->beVisuals[i].green_mask) return FALSE;
+	if (new->beVisuals[i].blue_mask !=
+	    old->beVisuals[i].blue_mask) return FALSE;
+	if (new->beVisuals[i].colormap_size !=
+	    old->beVisuals[i].colormap_size) return FALSE;
+	if (new->beVisuals[i].bits_per_rgb !=
+	    old->beVisuals[i].bits_per_rgb) return FALSE;
+    }
+
+    if (new->beDefVisualIndex != old->beDefVisualIndex) return FALSE;
+
+    return TRUE;
+}
+
+/** Restore Render's picture */
+static void dmxBERestoreRenderPict(pointer value, XID id, pointer n)
+{
+    PicturePtr   pPicture = value;               /* The picture */
+    DrawablePtr  pDraw    = pPicture->pDrawable; /* The picture's drawable */
+    int          scrnNum  = (uintptr_t)n;
+
+    if (pDraw->pScreen->myNum != scrnNum) {
+	/* Picture not on the screen we are restoring*/
+	return;
+    }
+
+    if (pDraw->type == DRAWABLE_PIXMAP) {
+	PixmapPtr  pPixmap = (PixmapPtr)pDraw;
+	
+	/* Create and restore the pixmap drawable */
+	dmxBECreatePixmap(pPixmap);
+	dmxBERestorePixmap(pPixmap);
+    }
+
+    dmxBECreatePicture(pPicture);
+}
+
+/** Restore Render's glyphs */
+static void dmxBERestoreRenderGlyph(pointer value, XID id, pointer n)
+{
+    GlyphSetPtr      glyphSet   = value;
+    int              scrnNum    = (uintptr_t)n;
+    dmxGlyphPrivPtr  glyphPriv  = DMX_GET_GLYPH_PRIV(glyphSet);
+    DMXScreenInfo   *dmxScreen  = &dmxScreens[scrnNum];
+    GlyphRefPtr      table;
+    char            *images;
+    Glyph           *gids;
+    XGlyphInfo      *glyphs;
+    char            *pos;
+    int              beret;
+    int              len_images = 0;
+    int              i;
+    int              ctr;
+
+    if (glyphPriv->glyphSets[scrnNum]) {
+	/* Only restore glyphs on the screen we are attaching */
+	return;
+    }
+
+    /* First we must create the glyph set on the backend. */
+    if ((beret = dmxBECreateGlyphSet(scrnNum, glyphSet)) != Success) {
+	dmxLog(dmxWarning,
+	       "\tdmxBERestoreRenderGlyph failed to create glyphset!\n");
+	return;
+    }
+
+    /* Now for the complex part, restore the glyph data */
+    table = glyphSet->hash.table;
+
+    /* We need to know how much memory to allocate for this part */
+    for (i = 0; i < glyphSet->hash.hashSet->size; i++) {
+	GlyphRefPtr  gr = &table[i];
+	GlyphPtr     gl = gr->glyph;
+
+	if (!gl || gl == DeletedGlyph) continue;
+	len_images += gl->size - sizeof(gl->info);
+    }
+
+    /* Now allocate the memory we need */
+    images = calloc(len_images, sizeof(char));
+    gids   = malloc(glyphSet->hash.tableEntries*sizeof(Glyph));
+    glyphs = malloc(glyphSet->hash.tableEntries*sizeof(XGlyphInfo));
+
+    pos = images;
+    ctr = 0;
+    
+    /* Fill the allocated memory with the proper data */
+    for (i = 0; i < glyphSet->hash.hashSet->size; i++) {
+	GlyphRefPtr  gr = &table[i];
+	GlyphPtr     gl = gr->glyph;
+
+	if (!gl || gl == DeletedGlyph) continue;
+
+	/* First lets put the data into gids */
+	gids[ctr] = gr->signature;
+
+	/* Next do the glyphs data structures */
+	glyphs[ctr].width  = gl->info.width;
+	glyphs[ctr].height = gl->info.height;
+	glyphs[ctr].x      = gl->info.x;
+	glyphs[ctr].y      = gl->info.y;
+	glyphs[ctr].xOff   = gl->info.xOff;
+	glyphs[ctr].yOff   = gl->info.yOff;
+
+	/* Copy the images from the DIX's data into the buffer */
+	memcpy(pos, gl+1, gl->size - sizeof(gl->info));
+	pos += gl->size - sizeof(gl->info);
+	ctr++;
+    }
+    
+    /* Now restore the glyph data */
+    XRenderAddGlyphs(dmxScreen->beDisplay, glyphPriv->glyphSets[scrnNum],
+		     gids,glyphs, glyphSet->hash.tableEntries, images,
+		     len_images);
+
+    /* Clean up */
+    free(images);
+    free(gids);
+    free(glyphs);    
+}
+
+/** Reattach previously detached back-end screen. */
+int dmxAttachScreen(int idx, DMXScreenAttributesPtr attr)
+{
+    ScreenPtr      pScreen;
+    DMXScreenInfo *dmxScreen;
+    CARD32         scrnNum   = idx;
+    DMXScreenInfo  oldDMXScreen;
+    int            i;
+
+    /* Return failure if dynamic addition/removal of screens is disabled */
+    if (!dmxAddRemoveScreens) {
+	dmxLog(dmxWarning,
+	       "Attempting to add a screen, but the AddRemoveScreen\n");
+	dmxLog(dmxWarning,
+	       "extension has not been enabled.  To enable this extension\n");
+	dmxLog(dmxWarning,
+	       "add the \"-addremovescreens\" option either to the command\n");
+	dmxLog(dmxWarning,
+	       "line or in the configuration file.\n");
+	return 1;
+    }
+
+    /* Cannot add a screen that does not exist */
+    if (idx < 0 || idx >= dmxNumScreens) return 1;
+    pScreen = screenInfo.screens[idx];
+    dmxScreen = &dmxScreens[idx];
+
+    /* Cannot attach to a screen that is already opened */
+    if (dmxScreen->beDisplay) {
+	dmxLog(dmxWarning,
+	       "Attempting to add screen #%d but a screen already exists\n",
+	       idx);
+	return 1;
+    }
+
+    dmxLogOutput(dmxScreen, "Attaching screen #%d\n", idx);
+
+    /* Save old info */
+    oldDMXScreen = *dmxScreen;
+
+    /* Copy the name to the new screen */
+    dmxScreen->name = strdup(attr->displayName);
+
+    /* Open display and get all of the screen info */
+    if (!dmxOpenDisplay(dmxScreen)) {
+	dmxLog(dmxWarning,
+               "dmxOpenDisplay: Unable to open display %s\n",
+               dmxScreen->name);
+
+	/* Restore the old screen */
+	*dmxScreen = oldDMXScreen;
+	return 1;
+    }
+
+    dmxSetErrorHandler(dmxScreen);
+    dmxCheckForWM(dmxScreen);
+    dmxGetScreenAttribs(dmxScreen);
+
+    if (!dmxGetVisualInfo(dmxScreen)) {
+	dmxLog(dmxWarning, "dmxGetVisualInfo: No matching visuals found\n");
+	XFree(dmxScreen->beVisuals);
+	XCloseDisplay(dmxScreen->beDisplay);
+
+	/* Restore the old screen */
+	*dmxScreen = oldDMXScreen;
+	return 1;
+    }
+
+    dmxGetColormaps(dmxScreen);
+    dmxGetPixmapFormats(dmxScreen);
+
+    /* Verify that the screen to be added has the same info as the
+     * previously added screen. */
+    if (!dmxCompareScreens(dmxScreen, &oldDMXScreen)) {
+	dmxLog(dmxWarning,
+	       "New screen data (%s) does not match previously\n",
+	       dmxScreen->name);
+	dmxLog(dmxWarning,
+	       "attached screen data (%s)\n",
+	       oldDMXScreen.name);
+	dmxLog(dmxWarning,
+	       "All data must match in order to attach to screen #%d\n",
+	       idx);
+	XFree(dmxScreen->beVisuals);
+	XFree(dmxScreen->beDepths);
+	XFree(dmxScreen->bePixmapFormats);
+	XCloseDisplay(dmxScreen->beDisplay);
+
+	/* Restore the old screen */
+	*dmxScreen = oldDMXScreen;
+	return 1;
+    }
+
+    /* Initialize the BE screen resources */
+    dmxBEScreenInit(idx, screenInfo.screens[idx]);
+
+    /* TODO: Handle GLX visual initialization.  GLXProxy needs to be
+     * updated to handle dynamic addition/removal of screens. */
+
+    /* Create default stipple */
+    dmxBECreatePixmap(pScreen->PixmapPerDepth[0]);
+    dmxBERestorePixmap(pScreen->PixmapPerDepth[0]);
+
+    /* Create the scratch GCs */
+    dmxBECreateScratchGCs(idx);
+
+    /* Create the default font */
+    (void)dmxBELoadFont(pScreen, defaultFont);
+
+    /* Create all resources that don't depend on windows */
+    for (i = currentMaxClients; --i >= 0; )
+	if (clients[i])
+	    FindAllClientResources(clients[i], dmxBECreateResources,
+				   (pointer)(uintptr_t)idx);
+
+    /* Create window hierarchy (top down) */
+    dmxBECreateWindowTree(idx);
+
+    /* Restore the picture state for RENDER */
+    for (i = currentMaxClients; --i >= 0; )
+	if (clients[i])
+	    FindClientResourcesByType(clients[i],PictureType, 
+				      dmxBERestoreRenderPict,
+				      (pointer)(uintptr_t)idx);
+
+    /* Restore the glyph state for RENDER */
+    for (i = currentMaxClients; --i >= 0; )
+	if (clients[i])
+	    FindClientResourcesByType(clients[i],GlyphSetType, 
+				      dmxBERestoreRenderGlyph,
+				      (pointer)(uintptr_t)idx);
+
+    /* Refresh screen by generating exposure events for all windows */
+    dmxForceExposures(idx);
+
+    dmxSync(&dmxScreens[idx], TRUE);
+
+    /* We used these to compare the old and new screens.  They are no
+     * longer needed since we have a newly attached screen, so we can
+     * now free the old screen's resources. */
+    XFree(oldDMXScreen.beVisuals);
+    XFree(oldDMXScreen.beDepths);
+    XFree(oldDMXScreen.bePixmapFormats);
+    /* TODO: should oldDMXScreen.name be freed?? */
+
+#ifdef PANORAMIX
+    if (!noPanoramiXExtension)
+	return dmxConfigureScreenWindows(1, &scrnNum, attr, NULL);
+    else
+#endif
+	return 0; /* Success */
+}
+
+/*
+ * Resources that may have state on the BE server and need to be freed:
+ *
+ * RT_NONE
+ * RT_WINDOW
+ * RT_PIXMAP
+ * RT_GC
+ * RT_FONT
+ * RT_CURSOR
+ * RT_COLORMAP
+ * RT_CMAPENTRY
+ * RT_OTHERCLIENT
+ * RT_PASSIVEGRAB
+ * XRT_WINDOW
+ * XRT_PIXMAP
+ * XRT_GC
+ * XRT_COLORMAP
+ * XRT_PICTURE
+ * PictureType
+ * PictFormatType
+ * GlyphSetType
+ * ClientType
+ * EventType
+ * RT_INPUTCLIENT
+ * XETrapType
+ * RTCounter
+ * RTAwait
+ * RTAlarmClient
+ * RT_XKBCLIENT
+ * RTContext
+ * TagResType
+ * StalledResType
+ * SecurityAuthorizationResType
+ * RTEventClient
+ * __glXContextRes
+ * __glXClientRes
+ * __glXPixmapRes
+ * __glXWindowRes
+ * __glXPbufferRes
+ */
+
+#ifdef PANORAMIX
+/** Search the Xinerama XRT_PIXMAP resources for the pixmap that needs
+ *  to have its image saved. */
+static void dmxBEFindPixmapImage(pointer value, XID id, RESTYPE type,
+				 pointer p)
+{
+    if ((type & TypeMask) == (XRT_PIXMAP & TypeMask)) {
+	PixmapPtr      pDst     = (PixmapPtr)p;
+	int            idx      = pDst->drawable.pScreen->myNum;
+	PanoramiXRes  *pXinPix  = (PanoramiXRes *)value;
+	PixmapPtr      pPix;
+	int            i;
+
+	dixLookupResourceByType((pointer*) &pPix, pXinPix->info[idx].id,
+				RT_PIXMAP, NullClient, DixUnknownAccess);
+	if (pPix != pDst) return; /* Not a match.... Next! */
+
+	for (i = 0; i < PanoramiXNumScreens; i++) {
+	    PixmapPtr      pSrc;
+	    dmxPixPrivPtr  pSrcPriv = NULL;
+
+	    if (i == idx) continue; /* Self replication is bad */
+
+	    dixLookupResourceByType((pointer*) &pSrc, pXinPix->info[i].id,
+				    RT_PIXMAP, NullClient, DixUnknownAccess);
+	    pSrcPriv = DMX_GET_PIXMAP_PRIV(pSrc);
+	    if (pSrcPriv->pixmap) {
+		FoundPixImage = True;
+		return;
+	    }
+	}
+    }
+}
+#endif
+
+/** Save the pixmap image only when there is not another screen with
+ *  that pixmap from which the image can be read when the screen is
+ *  reattached.  To do this, we first try to find a pixmap on another
+ *  screen corresponding to the one we are trying to save.  If we find
+ *  one, then we do not need to save the image data since during
+ *  reattachment, the image data can be read from that other pixmap.
+ *  However, if we do not find one, then we need to save the image data.
+ *  The common case for these are for the default stipple and root
+ *  tile. */
+static void dmxBESavePixmap(PixmapPtr pPixmap)
+{
+#ifdef PANORAMIX
+    int i;
+
+    /* If Xinerama is not active, there's nothing we can do (see comment
+     * in #else below for more info). */
+    if (noPanoramiXExtension) return;
+
+    FoundPixImage = False;
+    for (i = currentMaxClients; --i >= 0; )
+	if (clients[i])
+	    FindAllClientResources(clients[i], dmxBEFindPixmapImage,
+				   (pointer)pPixmap);
+
+    /* Save the image only if there is no other screens that have a
+     * pixmap that corresponds to the one we are trying to save. */
+    if (!FoundPixImage) {
+	dmxPixPrivPtr  pPixPriv = DMX_GET_PIXMAP_PRIV(pPixmap);
+
+	if (!pPixPriv->detachedImage) {
+	    ScreenPtr      pScreen   = pPixmap->drawable.pScreen;
+	    DMXScreenInfo *dmxScreen = &dmxScreens[pScreen->myNum];
+
+	    pPixPriv->detachedImage = XGetImage(dmxScreen->beDisplay,
+						pPixPriv->pixmap,
+						0, 0,
+						pPixmap->drawable.width,
+						pPixmap->drawable.height,
+						-1,
+						ZPixmap);
+	    if (!pPixPriv->detachedImage)
+		dmxLog(dmxWarning, "Cannot save pixmap image\n");
+	}
+    }
+#else
+    /* NOTE: The only time there is a pixmap on another screen that
+     * corresponds to the one we are trying to save is when Xinerama is
+     * active.  Otherwise, the pixmap image data is only stored on a
+     * single screen, which means that once it is detached, that data is
+     * lost.  We could save the data here, but then that would require
+     * us to implement the ability for Xdmx to keep the pixmap up to
+     * date while the screen is detached, which is beyond the scope of
+     * the current project. */
+    return;
+#endif
+}
+
+/** Destroy resources on the back-end server.  This function is called
+ *  from #dmxDetachScreen() via the dix layer's FindAllResources
+ *  function.  It walks all resources, compares them to the screen
+ *  number passed in as \a n and calls the appropriate DMX function to
+ *  free the associated resource on the back-end server. */
+static void dmxBEDestroyResources(pointer value, XID id, RESTYPE type,
+				  pointer n)
+{
+    int        scrnNum = (uintptr_t)n;
+    ScreenPtr  pScreen = screenInfo.screens[scrnNum];
+
+    if ((type & TypeMask) == (RT_WINDOW & TypeMask)) {
+	/* Window resources are destroyed below in dmxBEDestroyWindowTree */
+    } else if ((type & TypeMask) == (RT_PIXMAP & TypeMask)) {
+	PixmapPtr  pPix = value;
+	if (pPix->drawable.pScreen->myNum == scrnNum) {
+	    dmxBESavePixmap(pPix);
+	    dmxBEFreePixmap(pPix);
+	}
+    } else if ((type & TypeMask) == (RT_GC & TypeMask)) {
+	GCPtr  pGC = value;
+	if (pGC->pScreen->myNum == scrnNum)
+	    dmxBEFreeGC(pGC);
+    } else if ((type & TypeMask) == (RT_FONT & TypeMask)) {
+	dmxBEFreeFont(pScreen, (FontPtr)value);
+    } else if ((type & TypeMask) == (RT_CURSOR & TypeMask)) {
+	dmxBEFreeCursor(pScreen, (CursorPtr)value);
+    } else if ((type & TypeMask) == (RT_COLORMAP & TypeMask)) {
+	ColormapPtr  pCmap = value;
+	if (pCmap->pScreen->myNum == scrnNum)
+	    dmxBEFreeColormap((ColormapPtr)value);
+    } else if ((type & TypeMask) == (PictureType & TypeMask)) {
+	PicturePtr  pPict = value;
+	if (pPict->pDrawable->pScreen->myNum == scrnNum) {
+	    /* Free the pixmaps on the backend if needed */
+	    if (pPict->pDrawable->type == DRAWABLE_PIXMAP) {
+		PixmapPtr pPixmap = (PixmapPtr)(pPict->pDrawable);
+		dmxBESavePixmap(pPixmap);
+		dmxBEFreePixmap(pPixmap);
+	    }
+	    dmxBEFreePicture((PicturePtr)value);
+	}
+    } else if ((type & TypeMask) == (GlyphSetType & TypeMask)) {
+	dmxBEFreeGlyphSet(pScreen, (GlyphSetPtr)value);
+    } else {
+	/* Other resource types??? */
+    }
+}
+
+/** Destroy the scratch GCs that are created per depth. */
+static void dmxBEDestroyScratchGCs(int scrnNum)
+{
+    ScreenPtr  pScreen = screenInfo.screens[scrnNum];
+    GCPtr     *ppGC    = pScreen->GCperDepth;
+    int        i;
+
+    for (i = 0; i <= pScreen->numDepths; i++)
+	dmxBEFreeGC(ppGC[i]);
+}
+
+/** Destroy window hierachy on back-end server.  To ensure that all
+ *  XDestroyWindow() calls succeed, they must be performed in a bottom
+ *  up order so that windows are not destroyed before their children.
+ *  XDestroyWindow(), which is called from #dmxBEDestroyWindow(), will
+ *  destroy a window as well as all of it's children. */
+static void dmxBEDestroyWindowTree(int idx)
+{
+    WindowPtr  pWin   = screenInfo.screens[idx]->root;
+    WindowPtr  pChild = pWin;
+
+    while (1) {
+	if (pChild->firstChild) {
+	    pChild = pChild->firstChild;
+	    continue;
+	}
+
+	/* Destroy the window */
+	dmxBEDestroyWindow(pChild);
+
+	/* Make sure we destroy the window's border and background
+	 * pixmaps if they exist */
+	if (!pChild->borderIsPixel) {
+	    dmxBESavePixmap(pChild->border.pixmap);
+	    dmxBEFreePixmap(pChild->border.pixmap);
+	}
+	if (pChild->backgroundState == BackgroundPixmap) {
+	    dmxBESavePixmap(pChild->background.pixmap);
+	    dmxBEFreePixmap(pChild->background.pixmap);
+	}
+
+	while (!pChild->nextSib && (pChild != pWin)) {
+	    pChild = pChild->parent;
+	    dmxBEDestroyWindow(pChild);
+	    if (!pChild->borderIsPixel) {
+		dmxBESavePixmap(pChild->border.pixmap);
+		dmxBEFreePixmap(pChild->border.pixmap);
+	    }
+	    if (pChild->backgroundState == BackgroundPixmap) {
+		dmxBESavePixmap(pChild->background.pixmap);
+		dmxBEFreePixmap(pChild->background.pixmap);
+	    }
+	}
+
+	if (pChild == pWin)
+	    break;
+
+	pChild = pChild->nextSib;
+    }
+}
+
+/** Detach back-end screen. */
+int dmxDetachScreen(int idx)
+{
+    DMXScreenInfo *dmxScreen = &dmxScreens[idx];
+    int            i;
+
+    /* Return failure if dynamic addition/removal of screens is disabled */
+    if (!dmxAddRemoveScreens) {
+	dmxLog(dmxWarning,
+	       "Attempting to remove a screen, but the AddRemoveScreen\n");
+	dmxLog(dmxWarning,
+	       "extension has not been enabled.  To enable this extension\n");
+	dmxLog(dmxWarning,
+	       "add the \"-addremovescreens\" option either to the command\n");
+	dmxLog(dmxWarning,
+	       "line or in the configuration file.\n");
+	return 1;
+    }
+
+    /* Cannot remove a screen that does not exist */
+    if (idx < 0 || idx >= dmxNumScreens) return 1;
+
+    /* Cannot detach from a screen that is not opened */
+    if (!dmxScreen->beDisplay) {
+	dmxLog(dmxWarning,
+	       "Attempting to remove screen #%d but it has not been opened\n",
+	       idx);
+	return 1;
+    }
+
+    dmxLogOutput(dmxScreen, "Detaching screen #%d\n", idx);
+
+    /* Detach input */
+    dmxInputDetachAll(dmxScreen);
+
+    /* Save all relevant state (TODO) */
+
+    /* Free all non-window resources related to this screen */
+    for (i = currentMaxClients; --i >= 0; )
+	if (clients[i])
+	    FindAllClientResources(clients[i], dmxBEDestroyResources,
+				   (pointer)(uintptr_t)idx);
+
+    /* Free scratch GCs */
+    dmxBEDestroyScratchGCs(idx);
+
+    /* Free window resources related to this screen */
+    dmxBEDestroyWindowTree(idx);
+
+    /* Free default stipple */
+    dmxBESavePixmap(screenInfo.screens[idx]->PixmapPerDepth[0]);
+    dmxBEFreePixmap(screenInfo.screens[idx]->PixmapPerDepth[0]);
+
+    /* Free the remaining screen resources and close the screen */
+    dmxBECloseScreen(screenInfo.screens[idx]);
+
+    /* Adjust the cursor boundaries (paints detached console window) */
+    dmxAdjustCursorBoundaries();
+
+    return 0; /* Success */
+}
diff --git a/xorg-server/hw/dmx/dmxgc.c b/xorg-server/hw/dmx/dmxgc.c
index 10e93c110..f10f9a074 100644
--- a/xorg-server/hw/dmx/dmxgc.c
+++ b/xorg-server/hw/dmx/dmxgc.c
@@ -1,421 +1,416 @@
-/*

- * Copyright 2001-2004 Red Hat Inc., Durham, North Carolina.

- *

- * 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 on 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 (including the

- * next paragraph) 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

- * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS

- * 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.

- */

-

-/*

- * Authors:

- *   Kevin E. Martin <kem@redhat.com>

- *

- */

-

-/** \file

- * This file provides support for GCs. */

-

-#ifdef HAVE_DMX_CONFIG_H

-#include <dmx-config.h>

-#endif

-

-#include "dmx.h"

-#include "dmxsync.h"

-#include "dmxgc.h"

-#include "dmxgcops.h"

-#include "dmxpixmap.h"

-#include "dmxfont.h"

-

-#include "gcstruct.h"

-#include "pixmapstr.h"

-#include "migc.h"

-

-static GCFuncs dmxGCFuncs = {

-    dmxValidateGC,

-    dmxChangeGC,

-    dmxCopyGC,

-    dmxDestroyGC,

-    dmxChangeClip,

-    dmxDestroyClip,

-    dmxCopyClip,

-};

-

-static GCOps dmxGCOps = {

-    dmxFillSpans,

-    dmxSetSpans,

-    dmxPutImage,

-    dmxCopyArea,

-    dmxCopyPlane,

-    dmxPolyPoint,

-    dmxPolylines,

-    dmxPolySegment,

-    dmxPolyRectangle,

-    dmxPolyArc,

-    dmxFillPolygon,

-    dmxPolyFillRect,

-    dmxPolyFillArc,

-    dmxPolyText8,

-    dmxPolyText16,

-    dmxImageText8,

-    dmxImageText16,

-    dmxImageGlyphBlt,

-    dmxPolyGlyphBlt,

-    dmxPushPixels

-};

-

-/** Initialize the GC on \a pScreen */

-Bool dmxInitGC(ScreenPtr pScreen)

-{

-    if (!dixRegisterPrivateKey(&dmxGCPrivateKeyRec, PRIVATE_GC, sizeof(dmxGCPrivRec)))

-            return FALSE;

-    return TRUE;

-}

-

-/** Create the GC on the back-end server. */

-void dmxBECreateGC(ScreenPtr pScreen, GCPtr pGC)

-{

-    DMXScreenInfo *dmxScreen = &dmxScreens[pScreen->myNum];

-    dmxGCPrivPtr   pGCPriv = DMX_GET_GC_PRIV(pGC);

-    int            i;

-

-    for (i = 0; i < dmxScreen->beNumPixmapFormats; i++) {

-	if (pGC->depth == dmxScreen->bePixmapFormats[i].depth) {

-	    unsigned long  mask;

-	    XGCValues      gcvals;

-

-	    mask = GCGraphicsExposures;

-	    gcvals.graphics_exposures = FALSE;

-

-	    /* Create GC in the back-end servers */

-	    pGCPriv->gc = XCreateGC(dmxScreen->beDisplay,

-				    dmxScreen->scrnDefDrawables[i],

-				    mask, &gcvals);

-	    break;

-	}

-    }

-}

-

-/** Create a graphics context on the back-end server associated /a pGC's

- *  screen. */

-Bool dmxCreateGC(GCPtr pGC)

-{

-    ScreenPtr      pScreen = pGC->pScreen;

-    DMXScreenInfo *dmxScreen = &dmxScreens[pScreen->myNum];

-    dmxGCPrivPtr   pGCPriv = DMX_GET_GC_PRIV(pGC);

-    Bool           ret;

-

-    DMX_UNWRAP(CreateGC, dmxScreen, pScreen);

-    if ((ret = pScreen->CreateGC(pGC))) {

-	/* Save the old funcs */

-	pGCPriv->funcs = pGC->funcs;

-	pGCPriv->ops   = NULL;

-

-	pGC->funcs = &dmxGCFuncs;

-

-	if (dmxScreen->beDisplay) {

-	    dmxBECreateGC(pScreen, pGC);

-	} else {

-	    pGCPriv->gc = NULL;

-	}

-

-	/* Check for "magic special case"

-	 * 1. see CreateGC in dix/gc.c for more info

-	 * 2. see dmxChangeGC for more info

-	 */

-	pGCPriv->msc = (!pGC->tileIsPixel && !pGC->tile.pixmap);

-    }

-    DMX_WRAP(CreateGC, dmxCreateGC, dmxScreen, pScreen);

-

-    return ret;

-}

-

-/** Validate a graphics context, \a pGC, locally in the DMX server and

- *  recompute the composite clip, if necessary. */

-void dmxValidateGC(GCPtr pGC, unsigned long changes, DrawablePtr pDrawable)

-{

-    dmxGCPrivPtr pGCPriv = DMX_GET_GC_PRIV(pGC);

-

-    DMX_GC_FUNC_PROLOGUE(pGC);

-#if 0

-    pGC->funcs->ValidateGC(pGC, changes, pDrawable);

-#endif

-

-    if (pDrawable->type == DRAWABLE_WINDOW ||

-	pDrawable->type == DRAWABLE_PIXMAP) {

-	/* Save the old ops, since we're about to change the ops in the

-	 * epilogue.

-	 */

-	pGCPriv->ops = pGC->ops;

-    } else {

-	pGCPriv->ops = NULL;

-    }

-

-    /* If the client clip is different or moved OR the subwindowMode has

-     * changed OR the window's clip has changed since the last

-     * validation, then we need to recompute the composite clip.

-     */

-    if ((changes & (GCClipXOrigin |

-		    GCClipYOrigin |

-		    GCClipMask |

-		    GCSubwindowMode)) ||

-	(pDrawable->serialNumber !=

-	 (pGC->serialNumber & DRAWABLE_SERIAL_BITS))) {

-	miComputeCompositeClip(pGC, pDrawable);

-    }

-

-    DMX_GC_FUNC_EPILOGUE(pGC);

-}

-

-/** Set the values in the graphics context on the back-end server

- *  associated with \a pGC's screen. */

-void dmxChangeGC(GCPtr pGC, unsigned long mask)

-{

-    ScreenPtr      pScreen = pGC->pScreen;

-    DMXScreenInfo *dmxScreen = &dmxScreens[pScreen->myNum];

-    dmxGCPrivPtr   pGCPriv = DMX_GET_GC_PRIV(pGC);

-    XGCValues      v;

-

-    DMX_GC_FUNC_PROLOGUE(pGC);

-#if 0

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

-#endif

-

-    /* Handle "magic special case" from CreateGC */

-    if (pGCPriv->msc) {

-	/* The "magic special case" is used to handle the case where a

-	 * foreground pixel is set when the GC is created so that a

-	 * "pseudo default-tile" can be created and used in case the

-	 * fillstyle was set to FillTiled.  This specific case is tested

-	 * in xtest (XCreateGC test #3).  What has happened in dix by

-	 * the time it reaches here is (1) the pGC->tile.pixel has been

-	 * set to pGC->fgPixel and pGC->tileIsPixel is set, (2) if a

-	 * tile has also been set, then pGC->tileIsPixel is unset and

-	 * pGC->tile.pixmap is initialized; else, the default tile is

-	 * created and pGC->tileIsPixel is unset and pGC->tile.pixmap is

-	 * initialized to the "pseudo default-tile".  In either case,

-	 * pGC->tile.pixmap is set; however, in the "magic special case"

-	 * the mask is not updated to allow us to detect that we should

-	 * initialize the GCTile in the back-end server.  Thus, we catch

-	 * this case in dmxCreateGC and add GCTile to the mask here.

-	 * Are there any cases that I've missed?

-	 */

-

-	/* Make sure that the tile.pixmap is set, just in case the user

-         * set GCTile in the mask but forgot to set vals.pixmap

-	 */

-	if (pGC->tile.pixmap) mask |= GCTile;

-

-	/* This only happens once when the GC is created */

-	pGCPriv->msc = FALSE;

-    }

-

-    /* Update back-end server's gc */

-    if (mask & GCFunction)          v.function = pGC->alu;

-    if (mask & GCPlaneMask)         v.plane_mask = pGC->planemask;

-    if (mask & GCForeground)        v.foreground = pGC->fgPixel;

-    if (mask & GCBackground)        v.background = pGC->bgPixel;

-    if (mask & GCLineWidth)         v.line_width = pGC->lineWidth;

-    if (mask & GCLineStyle)         v.line_style = pGC->lineStyle;

-    if (mask & GCCapStyle)          v.cap_style = pGC->capStyle;

-    if (mask & GCJoinStyle)         v.join_style = pGC->joinStyle;

-    if (mask & GCFillStyle)         v.fill_style = pGC->fillStyle;

-    if (mask & GCFillRule)          v.fill_rule = pGC->fillRule;

-    if (mask & GCTile) {

-	if (pGC->tileIsPixel) {

-	    mask &= ~GCTile;

-	} else {

-	    dmxPixPrivPtr  pPixPriv = DMX_GET_PIXMAP_PRIV(pGC->tile.pixmap);

-	    v.tile = (Drawable)pPixPriv->pixmap;

-	}

-    }

-    if (mask & GCStipple) {

-	dmxPixPrivPtr  pPixPriv = DMX_GET_PIXMAP_PRIV(pGC->stipple);

-	v.stipple = (Drawable)pPixPriv->pixmap;

-    }

-    if (mask & GCTileStipXOrigin)   v.ts_x_origin = pGC->patOrg.x; 

-    if (mask & GCTileStipYOrigin)   v.ts_y_origin = pGC->patOrg.y;

-    if (mask & GCFont) {

-	if (dmxScreen->beDisplay) {

-	    dmxFontPrivPtr  pFontPriv;

-	    pFontPriv = FontGetPrivate(pGC->font, dmxFontPrivateIndex);

-	    v.font = pFontPriv->font[pScreen->myNum]->fid;

-	} else {

-	    mask &= ~GCFont;

-	}

-    }

-    if (mask & GCSubwindowMode)     v.subwindow_mode = pGC->subWindowMode;

-

-    /* Graphics exposures are not needed on the back-ends since they can

-       be generated on the front-end thereby saving bandwidth. */

-    if (mask & GCGraphicsExposures) mask &= ~GCGraphicsExposures;

-

-    if (mask & GCClipXOrigin)       v.clip_x_origin = pGC->clipOrg.x;

-    if (mask & GCClipYOrigin)       v.clip_y_origin = pGC->clipOrg.y;

-    if (mask & GCClipMask)          mask &= ~GCClipMask; /* See ChangeClip */

-    if (mask & GCDashOffset)        v.dash_offset = pGC->dashOffset;

-    if (mask & GCDashList) {

-	mask &= ~GCDashList;

-	if (dmxScreen->beDisplay)

-	    XSetDashes(dmxScreen->beDisplay, pGCPriv->gc,

-		       pGC->dashOffset, (char *)pGC->dash,

-		       pGC->numInDashList);

-    }

-    if (mask & GCArcMode)           v.arc_mode = pGC->arcMode;

-

-    if (mask && dmxScreen->beDisplay) {

-	XChangeGC(dmxScreen->beDisplay, pGCPriv->gc, mask, &v);

-	dmxSync(dmxScreen, FALSE);

-    }

-

-    DMX_GC_FUNC_EPILOGUE(pGC);

-}

-

-/** Copy \a pGCSrc to \a pGCDst on the back-end server associated with

- *  \a pGCSrc's screen. */

-void dmxCopyGC(GCPtr pGCSrc, unsigned long changes, GCPtr pGCDst)

-{

-    ScreenPtr      pScreen = pGCSrc->pScreen;

-    DMXScreenInfo *dmxScreen = &dmxScreens[pScreen->myNum];

-    dmxGCPrivPtr   pGCSrcPriv = DMX_GET_GC_PRIV(pGCSrc);

-    dmxGCPrivPtr   pGCDstPriv = DMX_GET_GC_PRIV(pGCDst);

-

-    DMX_GC_FUNC_PROLOGUE(pGCDst);

-    pGCDst->funcs->CopyGC(pGCSrc, changes, pGCDst);

-

-    /* Copy the GC on the back-end server */

-    if (dmxScreen->beDisplay)

-	XCopyGC(dmxScreen->beDisplay, pGCSrcPriv->gc, changes, pGCDstPriv->gc);

-

-    DMX_GC_FUNC_EPILOGUE(pGCDst);

-}

-

-/** Free the \a pGC on the back-end server. */

-Bool dmxBEFreeGC(GCPtr pGC)

-{

-    ScreenPtr      pScreen   = pGC->pScreen;

-    DMXScreenInfo *dmxScreen = &dmxScreens[pScreen->myNum];

-    dmxGCPrivPtr   pGCPriv   = DMX_GET_GC_PRIV(pGC);

-

-    if (pGCPriv->gc) {

-	XFreeGC(dmxScreen->beDisplay, pGCPriv->gc);

-	pGCPriv->gc = NULL;

-	return TRUE;

-    }

-

-    return FALSE;

-}

-

-/** Destroy the graphics context, \a pGC and free the corresponding GC

- *  on the back-end server. */

-void dmxDestroyGC(GCPtr pGC)

-{

-    ScreenPtr      pScreen   = pGC->pScreen;

-    DMXScreenInfo *dmxScreen = &dmxScreens[pScreen->myNum];

-

-    DMX_GC_FUNC_PROLOGUE(pGC);

-

-    /* Free the GC on the back-end server */

-    if (dmxScreen->beDisplay)

-	dmxBEFreeGC(pGC);

-

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

-    DMX_GC_FUNC_EPILOGUE(pGC);

-}

-

-/** Change the clip rects for a GC. */

-void dmxChangeClip(GCPtr pGC, int type, pointer pvalue, int nrects)

-{

-    ScreenPtr      pScreen = pGC->pScreen;

-    DMXScreenInfo *dmxScreen = &dmxScreens[pScreen->myNum];

-    dmxGCPrivPtr   pGCPriv = DMX_GET_GC_PRIV(pGC);

-    XRectangle    *pRects;

-    BoxPtr         pBox;

-    int            i, nRects;

-

-    DMX_GC_FUNC_PROLOGUE(pGC);

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

-

-    /* Set the client clip on the back-end server */

-    switch (pGC->clientClipType) {

-    case CT_NONE:

-	if (dmxScreen->beDisplay)

-	    XSetClipMask(dmxScreen->beDisplay, pGCPriv->gc, None);

-	break;

-

-    case CT_REGION:

-	if (dmxScreen->beDisplay) {

-	    nRects = RegionNumRects((RegionPtr)pGC->clientClip);

-	    pRects = malloc(nRects * sizeof(*pRects));

-	    pBox   = RegionRects((RegionPtr)pGC->clientClip);

-

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

-		pRects[i].x      = pBox[i].x1;

-		pRects[i].y      = pBox[i].y1;

-		pRects[i].width  = pBox[i].x2 - pBox[i].x1;

-		pRects[i].height = pBox[i].y2 - pBox[i].y1;

-	    }

-

-	    XSetClipRectangles(dmxScreen->beDisplay, pGCPriv->gc,

-			       pGC->clipOrg.x, pGC->clipOrg.y,

-			       pRects, nRects, Unsorted);

-

-	    free(pRects);

-	}

-	break;

-

-    case CT_PIXMAP:

-    case CT_UNSORTED:

-    case CT_YSORTED:

-    case CT_YXSORTED:

-    case CT_YXBANDED:

-	/* These clip types are condensed down to either NONE or REGION

-           in the mi code */

-	break;

-    }

-

-    DMX_GC_FUNC_EPILOGUE(pGC);

-}

-

-/** Destroy a GC's clip rects. */

-void dmxDestroyClip(GCPtr pGC)

-{

-    ScreenPtr      pScreen = pGC->pScreen;

-    DMXScreenInfo *dmxScreen = &dmxScreens[pScreen->myNum];

-    dmxGCPrivPtr   pGCPriv = DMX_GET_GC_PRIV(pGC);

-

-    DMX_GC_FUNC_PROLOGUE(pGC);

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

-

-    /* Set the client clip on the back-end server to None */

-    if (dmxScreen->beDisplay)

-	XSetClipMask(dmxScreen->beDisplay, pGCPriv->gc, None);

-

-    DMX_GC_FUNC_EPILOGUE(pGC);

-}

-

-/** Copy a GC's clip rects. */

-void dmxCopyClip(GCPtr pGCDst, GCPtr pGCSrc)

-{

-    DMX_GC_FUNC_PROLOGUE(pGCDst);

-    pGCDst->funcs->CopyClip(pGCDst, pGCSrc);

-    DMX_GC_FUNC_EPILOGUE(pGCDst);

-}

+/*
+ * Copyright 2001-2004 Red Hat Inc., Durham, North Carolina.
+ *
+ * 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 on 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 (including the
+ * next paragraph) 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
+ * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS
+ * 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.
+ */
+
+/*
+ * Authors:
+ *   Kevin E. Martin <kem@redhat.com>
+ *
+ */
+
+/** \file
+ * This file provides support for GCs. */
+
+#ifdef HAVE_DMX_CONFIG_H
+#include <dmx-config.h>
+#endif
+
+#include "dmx.h"
+#include "dmxsync.h"
+#include "dmxgc.h"
+#include "dmxgcops.h"
+#include "dmxpixmap.h"
+#include "dmxfont.h"
+
+#include "gcstruct.h"
+#include "pixmapstr.h"
+#include "migc.h"
+
+static GCFuncs dmxGCFuncs = {
+    dmxValidateGC,
+    dmxChangeGC,
+    dmxCopyGC,
+    dmxDestroyGC,
+    dmxChangeClip,
+    dmxDestroyClip,
+    dmxCopyClip,
+};
+
+static GCOps dmxGCOps = {
+    dmxFillSpans,
+    dmxSetSpans,
+    dmxPutImage,
+    dmxCopyArea,
+    dmxCopyPlane,
+    dmxPolyPoint,
+    dmxPolylines,
+    dmxPolySegment,
+    dmxPolyRectangle,
+    dmxPolyArc,
+    dmxFillPolygon,
+    dmxPolyFillRect,
+    dmxPolyFillArc,
+    dmxPolyText8,
+    dmxPolyText16,
+    dmxImageText8,
+    dmxImageText16,
+    dmxImageGlyphBlt,
+    dmxPolyGlyphBlt,
+    dmxPushPixels
+};
+
+/** Initialize the GC on \a pScreen */
+Bool dmxInitGC(ScreenPtr pScreen)
+{
+    if (!dixRegisterPrivateKey(&dmxGCPrivateKeyRec, PRIVATE_GC, sizeof(dmxGCPrivRec)))
+            return FALSE;
+    return TRUE;
+}
+
+/** Create the GC on the back-end server. */
+void dmxBECreateGC(ScreenPtr pScreen, GCPtr pGC)
+{
+    DMXScreenInfo *dmxScreen = &dmxScreens[pScreen->myNum];
+    dmxGCPrivPtr   pGCPriv = DMX_GET_GC_PRIV(pGC);
+    int            i;
+
+    for (i = 0; i < dmxScreen->beNumPixmapFormats; i++) {
+	if (pGC->depth == dmxScreen->bePixmapFormats[i].depth) {
+	    unsigned long  mask;
+	    XGCValues      gcvals;
+
+	    mask = GCGraphicsExposures;
+	    gcvals.graphics_exposures = FALSE;
+
+	    /* Create GC in the back-end servers */
+	    pGCPriv->gc = XCreateGC(dmxScreen->beDisplay,
+				    dmxScreen->scrnDefDrawables[i],
+				    mask, &gcvals);
+	    break;
+	}
+    }
+}
+
+/** Create a graphics context on the back-end server associated /a pGC's
+ *  screen. */
+Bool dmxCreateGC(GCPtr pGC)
+{
+    ScreenPtr      pScreen = pGC->pScreen;
+    DMXScreenInfo *dmxScreen = &dmxScreens[pScreen->myNum];
+    dmxGCPrivPtr   pGCPriv = DMX_GET_GC_PRIV(pGC);
+    Bool           ret;
+
+    DMX_UNWRAP(CreateGC, dmxScreen, pScreen);
+    if ((ret = pScreen->CreateGC(pGC))) {
+	/* Save the old funcs */
+	pGCPriv->funcs = pGC->funcs;
+	pGCPriv->ops   = NULL;
+
+	pGC->funcs = &dmxGCFuncs;
+
+	if (dmxScreen->beDisplay) {
+	    dmxBECreateGC(pScreen, pGC);
+	} else {
+	    pGCPriv->gc = NULL;
+	}
+
+	/* Check for "magic special case"
+	 * 1. see CreateGC in dix/gc.c for more info
+	 * 2. see dmxChangeGC for more info
+	 */
+	pGCPriv->msc = (!pGC->tileIsPixel && !pGC->tile.pixmap);
+    }
+    DMX_WRAP(CreateGC, dmxCreateGC, dmxScreen, pScreen);
+
+    return ret;
+}
+
+/** Validate a graphics context, \a pGC, locally in the DMX server and
+ *  recompute the composite clip, if necessary. */
+void dmxValidateGC(GCPtr pGC, unsigned long changes, DrawablePtr pDrawable)
+{
+    dmxGCPrivPtr pGCPriv = DMX_GET_GC_PRIV(pGC);
+
+    DMX_GC_FUNC_PROLOGUE(pGC);
+#if 0
+    pGC->funcs->ValidateGC(pGC, changes, pDrawable);
+#endif
+
+    if (pDrawable->type == DRAWABLE_WINDOW ||
+	pDrawable->type == DRAWABLE_PIXMAP) {
+	/* Save the old ops, since we're about to change the ops in the
+	 * epilogue.
+	 */
+	pGCPriv->ops = pGC->ops;
+    } else {
+	pGCPriv->ops = NULL;
+    }
+
+    /* If the client clip is different or moved OR the subwindowMode has
+     * changed OR the window's clip has changed since the last
+     * validation, then we need to recompute the composite clip.
+     */
+    if ((changes & (GCClipXOrigin |
+		    GCClipYOrigin |
+		    GCClipMask |
+		    GCSubwindowMode)) ||
+	(pDrawable->serialNumber !=
+	 (pGC->serialNumber & DRAWABLE_SERIAL_BITS))) {
+	miComputeCompositeClip(pGC, pDrawable);
+    }
+
+    DMX_GC_FUNC_EPILOGUE(pGC);
+}
+
+/** Set the values in the graphics context on the back-end server
+ *  associated with \a pGC's screen. */
+void dmxChangeGC(GCPtr pGC, unsigned long mask)
+{
+    ScreenPtr      pScreen = pGC->pScreen;
+    DMXScreenInfo *dmxScreen = &dmxScreens[pScreen->myNum];
+    dmxGCPrivPtr   pGCPriv = DMX_GET_GC_PRIV(pGC);
+    XGCValues      v;
+
+    DMX_GC_FUNC_PROLOGUE(pGC);
+#if 0
+    pGC->funcs->ChangeGC(pGC, mask);
+#endif
+
+    /* Handle "magic special case" from CreateGC */
+    if (pGCPriv->msc) {
+	/* The "magic special case" is used to handle the case where a
+	 * foreground pixel is set when the GC is created so that a
+	 * "pseudo default-tile" can be created and used in case the
+	 * fillstyle was set to FillTiled.  This specific case is tested
+	 * in xtest (XCreateGC test #3).  What has happened in dix by
+	 * the time it reaches here is (1) the pGC->tile.pixel has been
+	 * set to pGC->fgPixel and pGC->tileIsPixel is set, (2) if a
+	 * tile has also been set, then pGC->tileIsPixel is unset and
+	 * pGC->tile.pixmap is initialized; else, the default tile is
+	 * created and pGC->tileIsPixel is unset and pGC->tile.pixmap is
+	 * initialized to the "pseudo default-tile".  In either case,
+	 * pGC->tile.pixmap is set; however, in the "magic special case"
+	 * the mask is not updated to allow us to detect that we should
+	 * initialize the GCTile in the back-end server.  Thus, we catch
+	 * this case in dmxCreateGC and add GCTile to the mask here.
+	 * Are there any cases that I've missed?
+	 */
+
+	/* Make sure that the tile.pixmap is set, just in case the user
+         * set GCTile in the mask but forgot to set vals.pixmap
+	 */
+	if (pGC->tile.pixmap) mask |= GCTile;
+
+	/* This only happens once when the GC is created */
+	pGCPriv->msc = FALSE;
+    }
+
+    /* Update back-end server's gc */
+    if (mask & GCFunction)          v.function = pGC->alu;
+    if (mask & GCPlaneMask)         v.plane_mask = pGC->planemask;
+    if (mask & GCForeground)        v.foreground = pGC->fgPixel;
+    if (mask & GCBackground)        v.background = pGC->bgPixel;
+    if (mask & GCLineWidth)         v.line_width = pGC->lineWidth;
+    if (mask & GCLineStyle)         v.line_style = pGC->lineStyle;
+    if (mask & GCCapStyle)          v.cap_style = pGC->capStyle;
+    if (mask & GCJoinStyle)         v.join_style = pGC->joinStyle;
+    if (mask & GCFillStyle)         v.fill_style = pGC->fillStyle;
+    if (mask & GCFillRule)          v.fill_rule = pGC->fillRule;
+    if (mask & GCTile) {
+	if (pGC->tileIsPixel) {
+	    mask &= ~GCTile;
+	} else {
+	    dmxPixPrivPtr  pPixPriv = DMX_GET_PIXMAP_PRIV(pGC->tile.pixmap);
+	    v.tile = (Drawable)pPixPriv->pixmap;
+	}
+    }
+    if (mask & GCStipple) {
+	dmxPixPrivPtr  pPixPriv = DMX_GET_PIXMAP_PRIV(pGC->stipple);
+	v.stipple = (Drawable)pPixPriv->pixmap;
+    }
+    if (mask & GCTileStipXOrigin)   v.ts_x_origin = pGC->patOrg.x; 
+    if (mask & GCTileStipYOrigin)   v.ts_y_origin = pGC->patOrg.y;
+    if (mask & GCFont) {
+	if (dmxScreen->beDisplay) {
+	    dmxFontPrivPtr  pFontPriv;
+	    pFontPriv = FontGetPrivate(pGC->font, dmxFontPrivateIndex);
+	    v.font = pFontPriv->font[pScreen->myNum]->fid;
+	} else {
+	    mask &= ~GCFont;
+	}
+    }
+    if (mask & GCSubwindowMode)     v.subwindow_mode = pGC->subWindowMode;
+
+    /* Graphics exposures are not needed on the back-ends since they can
+       be generated on the front-end thereby saving bandwidth. */
+    if (mask & GCGraphicsExposures) mask &= ~GCGraphicsExposures;
+
+    if (mask & GCClipXOrigin)       v.clip_x_origin = pGC->clipOrg.x;
+    if (mask & GCClipYOrigin)       v.clip_y_origin = pGC->clipOrg.y;
+    if (mask & GCClipMask)          mask &= ~GCClipMask; /* See ChangeClip */
+    if (mask & GCDashOffset)        v.dash_offset = pGC->dashOffset;
+    if (mask & GCDashList) {
+	mask &= ~GCDashList;
+	if (dmxScreen->beDisplay)
+	    XSetDashes(dmxScreen->beDisplay, pGCPriv->gc,
+		       pGC->dashOffset, (char *)pGC->dash,
+		       pGC->numInDashList);
+    }
+    if (mask & GCArcMode)           v.arc_mode = pGC->arcMode;
+
+    if (mask && dmxScreen->beDisplay) {
+	XChangeGC(dmxScreen->beDisplay, pGCPriv->gc, mask, &v);
+	dmxSync(dmxScreen, FALSE);
+    }
+
+    DMX_GC_FUNC_EPILOGUE(pGC);
+}
+
+/** Copy \a pGCSrc to \a pGCDst on the back-end server associated with
+ *  \a pGCSrc's screen. */
+void dmxCopyGC(GCPtr pGCSrc, unsigned long changes, GCPtr pGCDst)
+{
+    ScreenPtr      pScreen = pGCSrc->pScreen;
+    DMXScreenInfo *dmxScreen = &dmxScreens[pScreen->myNum];
+    dmxGCPrivPtr   pGCSrcPriv = DMX_GET_GC_PRIV(pGCSrc);
+    dmxGCPrivPtr   pGCDstPriv = DMX_GET_GC_PRIV(pGCDst);
+
+    DMX_GC_FUNC_PROLOGUE(pGCDst);
+    pGCDst->funcs->CopyGC(pGCSrc, changes, pGCDst);
+
+    /* Copy the GC on the back-end server */
+    if (dmxScreen->beDisplay)
+	XCopyGC(dmxScreen->beDisplay, pGCSrcPriv->gc, changes, pGCDstPriv->gc);
+
+    DMX_GC_FUNC_EPILOGUE(pGCDst);
+}
+
+/** Free the \a pGC on the back-end server. */
+Bool dmxBEFreeGC(GCPtr pGC)
+{
+    ScreenPtr      pScreen   = pGC->pScreen;
+    DMXScreenInfo *dmxScreen = &dmxScreens[pScreen->myNum];
+    dmxGCPrivPtr   pGCPriv   = DMX_GET_GC_PRIV(pGC);
+
+    if (pGCPriv->gc) {
+	XFreeGC(dmxScreen->beDisplay, pGCPriv->gc);
+	pGCPriv->gc = NULL;
+	return TRUE;
+    }
+
+    return FALSE;
+}
+
+/** Destroy the graphics context, \a pGC and free the corresponding GC
+ *  on the back-end server. */
+void dmxDestroyGC(GCPtr pGC)
+{
+    ScreenPtr      pScreen   = pGC->pScreen;
+    DMXScreenInfo *dmxScreen = &dmxScreens[pScreen->myNum];
+
+    DMX_GC_FUNC_PROLOGUE(pGC);
+
+    /* Free the GC on the back-end server */
+    if (dmxScreen->beDisplay)
+	dmxBEFreeGC(pGC);
+
+    pGC->funcs->DestroyGC(pGC);
+    DMX_GC_FUNC_EPILOGUE(pGC);
+}
+
+/** Change the clip rects for a GC. */
+void dmxChangeClip(GCPtr pGC, int type, pointer pvalue, int nrects)
+{
+    ScreenPtr      pScreen = pGC->pScreen;
+    DMXScreenInfo *dmxScreen = &dmxScreens[pScreen->myNum];
+    dmxGCPrivPtr   pGCPriv = DMX_GET_GC_PRIV(pGC);
+    XRectangle    *pRects;
+    BoxPtr         pBox;
+    int            i, nRects;
+
+    DMX_GC_FUNC_PROLOGUE(pGC);
+    pGC->funcs->ChangeClip(pGC, type, pvalue, nrects);
+
+    /* Set the client clip on the back-end server */
+    switch (pGC->clientClipType) {
+    case CT_NONE:
+	if (dmxScreen->beDisplay)
+	    XSetClipMask(dmxScreen->beDisplay, pGCPriv->gc, None);
+	break;
+
+    case CT_REGION:
+	if (dmxScreen->beDisplay) {
+	    nRects = RegionNumRects((RegionPtr)pGC->clientClip);
+	    pRects = malloc(nRects * sizeof(*pRects));
+	    pBox   = RegionRects((RegionPtr)pGC->clientClip);
+
+	    for (i = 0; i < nRects; i++) {
+		pRects[i].x      = pBox[i].x1;
+		pRects[i].y      = pBox[i].y1;
+		pRects[i].width  = pBox[i].x2 - pBox[i].x1;
+		pRects[i].height = pBox[i].y2 - pBox[i].y1;
+	    }
+
+	    XSetClipRectangles(dmxScreen->beDisplay, pGCPriv->gc,
+			       pGC->clipOrg.x, pGC->clipOrg.y,
+			       pRects, nRects, Unsorted);
+
+	    free(pRects);
+	}
+	break;
+
+    case CT_PIXMAP:
+	/* Condensed down to REGION in the mi code */
+	break;
+    }
+
+    DMX_GC_FUNC_EPILOGUE(pGC);
+}
+
+/** Destroy a GC's clip rects. */
+void dmxDestroyClip(GCPtr pGC)
+{
+    ScreenPtr      pScreen = pGC->pScreen;
+    DMXScreenInfo *dmxScreen = &dmxScreens[pScreen->myNum];
+    dmxGCPrivPtr   pGCPriv = DMX_GET_GC_PRIV(pGC);
+
+    DMX_GC_FUNC_PROLOGUE(pGC);
+    pGC->funcs->DestroyClip(pGC);
+
+    /* Set the client clip on the back-end server to None */
+    if (dmxScreen->beDisplay)
+	XSetClipMask(dmxScreen->beDisplay, pGCPriv->gc, None);
+
+    DMX_GC_FUNC_EPILOGUE(pGC);
+}
+
+/** Copy a GC's clip rects. */
+void dmxCopyClip(GCPtr pGCDst, GCPtr pGCSrc)
+{
+    DMX_GC_FUNC_PROLOGUE(pGCDst);
+    pGCDst->funcs->CopyClip(pGCDst, pGCSrc);
+    DMX_GC_FUNC_EPILOGUE(pGCDst);
+}
diff --git a/xorg-server/hw/dmx/input/dmxinputinit.c b/xorg-server/hw/dmx/input/dmxinputinit.c
index 4b10ecb17..5cbd620c9 100644
--- a/xorg-server/hw/dmx/input/dmxinputinit.c
+++ b/xorg-server/hw/dmx/input/dmxinputinit.c
@@ -1,1306 +1,1274 @@
-/*

- * Copyright 2002-2003 Red Hat Inc., Durham, North Carolina.

- *

- * 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 on 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 (including the

- * next paragraph) 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

- * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS

- * 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.

- */

-

-/*

- * Authors:

- *   Rickard E. (Rik) Faith <faith@redhat.com>

- *

- */

-

-/** \file

- * This file provides generic input support.  Functions here set up

- * input and lead to the calling of low-level device drivers for

- * input. */

-

-#ifdef HAVE_DMX_CONFIG_H

-#include <dmx-config.h>

-#endif

-

-#define DMX_WINDOW_DEBUG 0

-

-#include "dmxinputinit.h"

-#include "dmxextension.h"       /* For dmxInputCount */

-

-#include "dmxdummy.h"

-#include "dmxbackend.h"

-#include "dmxconsole.h"

-#include "dmxcommon.h"

-#include "dmxevents.h"

-#include "dmxmotion.h"

-#include "dmxprop.h"

-#include "config/dmxconfig.h"

-#include "dmxcursor.h"

-

-#include "lnx-keyboard.h"

-#include "lnx-ms.h"

-#include "lnx-ps2.h"

-#include "usb-keyboard.h"

-#include "usb-mouse.h"

-#include "usb-other.h"

-#include "usb-common.h"

-

-#include "dmxsigio.h"

-#include "dmxarg.h"

-

-#include "inputstr.h"

-#include "input.h"

-#include "mipointer.h"

-#include "windowstr.h"

-#include "mi.h"

-#include "xkbsrv.h"

-

-#include <X11/extensions/XI.h>

-#include <X11/extensions/XIproto.h>

-#include "exevents.h"

-#include "extinit.h"

-

-DMXLocalInputInfoPtr dmxLocalCorePointer, dmxLocalCoreKeyboard;

-

-static DMXLocalInputInfoRec DMXDummyMou = {

-    "dummy-mou", DMX_LOCAL_MOUSE, DMX_LOCAL_TYPE_LOCAL, 1,

-    NULL, NULL, NULL, NULL, NULL, dmxDummyMouGetInfo

-};

-

-static DMXLocalInputInfoRec DMXDummyKbd = {

-    "dummy-kbd", DMX_LOCAL_KEYBOARD, DMX_LOCAL_TYPE_LOCAL, 1,

-    NULL, NULL, NULL, NULL, NULL, dmxDummyKbdGetInfo

-};

-

-static DMXLocalInputInfoRec DMXBackendMou = {

-    "backend-mou", DMX_LOCAL_MOUSE, DMX_LOCAL_TYPE_BACKEND, 2,

-    dmxBackendCreatePrivate, dmxBackendDestroyPrivate,

-    dmxBackendInit, NULL, dmxBackendLateReInit, dmxBackendMouGetInfo,

-    dmxCommonMouOn, dmxCommonMouOff, dmxBackendUpdatePosition,

-    NULL, NULL, NULL,

-    dmxBackendCollectEvents, dmxBackendProcessInput, dmxBackendFunctions, NULL,

-    dmxCommonMouCtrl

-};

-

-static DMXLocalInputInfoRec DMXBackendKbd = {

-    "backend-kbd", DMX_LOCAL_KEYBOARD, DMX_LOCAL_TYPE_BACKEND,

-    1, /* With backend-mou or console-mou */

-    dmxCommonCopyPrivate, NULL,

-    dmxBackendInit, NULL, NULL, dmxBackendKbdGetInfo,

-    dmxCommonKbdOn, dmxCommonKbdOff, NULL,

-    NULL, NULL, NULL,

-    NULL, NULL, NULL, NULL,

-    NULL, dmxCommonKbdCtrl, dmxCommonKbdBell

-};

-

-static DMXLocalInputInfoRec DMXConsoleMou = {

-    "console-mou", DMX_LOCAL_MOUSE, DMX_LOCAL_TYPE_CONSOLE, 2,

-    dmxConsoleCreatePrivate, dmxConsoleDestroyPrivate,

-    dmxConsoleInit, dmxConsoleReInit, NULL, dmxConsoleMouGetInfo,

-    dmxCommonMouOn, dmxCommonMouOff, dmxConsoleUpdatePosition,

-    NULL, NULL, NULL,

-    dmxConsoleCollectEvents, NULL, dmxConsoleFunctions, dmxConsoleUpdateInfo,

-    dmxCommonMouCtrl

-};

-

-static DMXLocalInputInfoRec DMXConsoleKbd = {

-    "console-kbd", DMX_LOCAL_KEYBOARD, DMX_LOCAL_TYPE_CONSOLE,

-    1, /* With backend-mou or console-mou */

-    dmxCommonCopyPrivate, NULL,

-    dmxConsoleInit, dmxConsoleReInit, NULL, dmxConsoleKbdGetInfo,

-    dmxCommonKbdOn, dmxCommonKbdOff, NULL,

-    NULL, NULL, NULL,

-    NULL, NULL, NULL, NULL,

-    NULL, dmxCommonKbdCtrl, dmxCommonKbdBell

-};

-

-static DMXLocalInputInfoRec DMXCommonOth = {

-    "common-oth", DMX_LOCAL_OTHER, DMX_LOCAL_TYPE_COMMON, 1,

-    dmxCommonCopyPrivate, NULL,

-    NULL, NULL, NULL, dmxCommonOthGetInfo,

-    dmxCommonOthOn, dmxCommonOthOff

-};

-

-

-static DMXLocalInputInfoRec DMXLocalDevices[] = {

-                                /* Dummy drivers that can compile on any OS */

-#ifdef __linux__

-                                /* Linux-specific drivers */

-    {

-        "kbd", DMX_LOCAL_KEYBOARD, DMX_LOCAL_TYPE_LOCAL, 1,

-        kbdLinuxCreatePrivate, kbdLinuxDestroyPrivate,

-        kbdLinuxInit, NULL, NULL, kbdLinuxGetInfo,

-        kbdLinuxOn, kbdLinuxOff, NULL,

-        kbdLinuxVTPreSwitch, kbdLinuxVTPostSwitch, kbdLinuxVTSwitch,

-        kbdLinuxRead, NULL, NULL, NULL,

-        NULL, kbdLinuxCtrl, kbdLinuxBell

-    },

-    {

-        "ms", DMX_LOCAL_MOUSE, DMX_LOCAL_TYPE_LOCAL, 1,

-        msLinuxCreatePrivate, msLinuxDestroyPrivate,

-        msLinuxInit, NULL, NULL, msLinuxGetInfo,

-        msLinuxOn, msLinuxOff, NULL,

-        msLinuxVTPreSwitch, msLinuxVTPostSwitch, NULL,

-        msLinuxRead

-    },

-    {

-        "ps2", DMX_LOCAL_MOUSE, DMX_LOCAL_TYPE_LOCAL, 1,

-        ps2LinuxCreatePrivate, ps2LinuxDestroyPrivate,

-        ps2LinuxInit, NULL, NULL, ps2LinuxGetInfo,

-        ps2LinuxOn, ps2LinuxOff, NULL,

-        ps2LinuxVTPreSwitch, ps2LinuxVTPostSwitch, NULL,

-        ps2LinuxRead

-    },

-#endif

-#ifdef __linux__

-                                /* USB drivers, currently only for

-                                   Linux, but relatively easy to port to

-                                   other OSs */

-    {

-        "usb-kbd", DMX_LOCAL_KEYBOARD, DMX_LOCAL_TYPE_LOCAL, 1,

-        usbCreatePrivate, usbDestroyPrivate,

-        kbdUSBInit, NULL, NULL, kbdUSBGetInfo,

-        kbdUSBOn, usbOff, NULL,

-        NULL, NULL, NULL,

-        kbdUSBRead, NULL, NULL, NULL,

-        NULL, kbdUSBCtrl

-    },

-    {

-        "usb-mou", DMX_LOCAL_MOUSE, DMX_LOCAL_TYPE_LOCAL, 1,

-        usbCreatePrivate, usbDestroyPrivate,

-        mouUSBInit, NULL, NULL, mouUSBGetInfo,

-        mouUSBOn, usbOff, NULL,

-        NULL, NULL, NULL,

-        mouUSBRead

-    },

-    {

-        "usb-oth", DMX_LOCAL_OTHER, DMX_LOCAL_TYPE_LOCAL, 1,

-        usbCreatePrivate, usbDestroyPrivate,

-        othUSBInit, NULL, NULL, othUSBGetInfo,

-        othUSBOn, usbOff, NULL,

-        NULL, NULL, NULL,

-        othUSBRead

-    },

-#endif

-    {

-        "dummy-mou", DMX_LOCAL_MOUSE, DMX_LOCAL_TYPE_LOCAL, 1,

-        NULL, NULL, NULL, NULL, NULL, dmxDummyMouGetInfo

-    },

-    {

-        "dummy-kbd", DMX_LOCAL_KEYBOARD, DMX_LOCAL_TYPE_LOCAL, 1,

-        NULL, NULL, NULL, NULL, NULL, dmxDummyKbdGetInfo

-    },

-    { NULL }                    /* Must be last */

-};

-

-

-#if 11 /*BP*/

-void

-DDXRingBell(int volume, int pitch, int duration)

-{

-   /* NO-OP */

-}

-

-/* taken from kdrive/src/kinput.c: */

-static void

-dmxKbdCtrl (DeviceIntPtr pDevice, KeybdCtrl *ctrl)

-{

-#if 0

-    KdKeyboardInfo *ki;

-

-    for (ki = kdKeyboards; ki; ki = ki->next) {

-        if (ki->dixdev && ki->dixdev->id == pDevice->id)

-            break;

-    }

-

-    if (!ki || !ki->dixdev || ki->dixdev->id != pDevice->id || !ki->driver)

-        return;

-

-    KdSetLeds(ki, ctrl->leds);

-    ki->bellPitch = ctrl->bell_pitch;

-    ki->bellDuration = ctrl->bell_duration; 

-#endif

-}

-

-/* taken from kdrive/src/kinput.c: */

-static void

-dmxBell(int volume, DeviceIntPtr pDev, pointer arg, int something)

-{

-#if 0

-    KeybdCtrl *ctrl = arg;

-    KdKeyboardInfo *ki = NULL;

-    

-    for (ki = kdKeyboards; ki; ki = ki->next) {

-        if (ki->dixdev && ki->dixdev->id == pDev->id)

-            break;

-    }

-

-    if (!ki || !ki->dixdev || ki->dixdev->id != pDev->id || !ki->driver)

-        return;

-    

-    KdRingBell(ki, volume, ctrl->bell_pitch, ctrl->bell_duration);

-#endif

-}

-

-#endif /*BP*/

-

-static void _dmxChangePointerControl(DMXLocalInputInfoPtr dmxLocal,

-                                     PtrCtrl *ctrl)

-{

-    if (!dmxLocal) return;

-    dmxLocal->mctrl = *ctrl;

-    if (dmxLocal->mCtrl) dmxLocal->mCtrl(&dmxLocal->pDevice->public, ctrl);

-}

-

-/** Change the pointer control information for the \a pDevice.  If the

- * device sends core events, then also change the control information

- * for all of the pointer devices that send core events. */

-void dmxChangePointerControl(DeviceIntPtr pDevice, PtrCtrl *ctrl)

-{

-    GETDMXLOCALFROMPDEVICE;

-    int i, j;

-

-    if (dmxLocal->sendsCore) {       /* Do for all core devices */

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

-            DMXInputInfo *dmxInput = &dmxInputs[i];

-            if (dmxInput->detached) continue;

-            for (j = 0; j < dmxInput->numDevs; j++)

-                if (dmxInput->devs[j]->sendsCore)

-                    _dmxChangePointerControl(dmxInput->devs[j], ctrl);

-        }

-    } else {                    /* Do for this device only */

-        _dmxChangePointerControl(dmxLocal, ctrl);

-    }

-}

-

-static void _dmxKeyboardKbdCtrlProc(DMXLocalInputInfoPtr dmxLocal,

-                                    KeybdCtrl *ctrl)

-{

-    dmxLocal->kctrl = *ctrl;

-    if (dmxLocal->kCtrl) {

-        dmxLocal->kCtrl(&dmxLocal->pDevice->public, ctrl);

-        if (dmxLocal->pDevice->kbdfeed) {

-            XkbEventCauseRec cause;

-            XkbSetCauseUnknown(&cause);

-            /* Generate XKB events, as necessary */

-            XkbUpdateIndicators(dmxLocal->pDevice, XkbAllIndicatorsMask, False,

-                                NULL, &cause);

-        }

-    }

-}

-

-

-/** Change the keyboard control information for the \a pDevice.  If the

- * device sends core events, then also change the control information

- * for all of the keyboard devices that send core events. */

-void dmxKeyboardKbdCtrlProc(DeviceIntPtr pDevice, KeybdCtrl *ctrl)

-{

-    GETDMXLOCALFROMPDEVICE;

-    int i, j;

-

-    if (dmxLocal->sendsCore) {       /* Do for all core devices */

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

-            DMXInputInfo *dmxInput = &dmxInputs[i];

-            if (dmxInput->detached) continue;

-            for (j = 0; j < dmxInput->numDevs; j++)

-                if (dmxInput->devs[j]->sendsCore)

-                    _dmxKeyboardKbdCtrlProc(dmxInput->devs[j], ctrl);

-        }

-    } else {                    /* Do for this device only */

-        _dmxKeyboardKbdCtrlProc(dmxLocal, ctrl);

-    }

-}

-

-static void _dmxKeyboardBellProc(DMXLocalInputInfoPtr dmxLocal, int percent)

-{

-    if (dmxLocal->kBell) dmxLocal->kBell(&dmxLocal->pDevice->public,

-                                         percent,

-                                         dmxLocal->kctrl.bell,

-                                         dmxLocal->kctrl.bell_pitch,

-                                         dmxLocal->kctrl.bell_duration);

-}

-

-/** Sound the bell on the device.  If the device send core events, then

- * sound the bell on all of the devices that send core events. */

-void dmxKeyboardBellProc(int percent, DeviceIntPtr pDevice,

-                         pointer ctrl, int unknown)

-{

-    GETDMXLOCALFROMPDEVICE;

-    int i, j;

-

-    if (dmxLocal->sendsCore) {       /* Do for all core devices */

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

-            DMXInputInfo *dmxInput = &dmxInputs[i];

-            if (dmxInput->detached) continue;

-            for (j = 0; j < dmxInput->numDevs; j++)

-                if (dmxInput->devs[j]->sendsCore)

-                    _dmxKeyboardBellProc(dmxInput->devs[j], percent);

-        }

-    } else {                    /* Do for this device only */

-        _dmxKeyboardBellProc(dmxLocal, percent);

-    }

-}

-

-static void dmxKeyboardFreeNames(XkbComponentNamesPtr names)

-{

-    if (names->keycodes) XFree(names->keycodes);

-    if (names->types)    XFree(names->types);

-    if (names->compat)   XFree(names->compat);

-    if (names->symbols)  XFree(names->symbols);

-    if (names->geometry) XFree(names->geometry);

-}

-

-

-static int dmxKeyboardOn(DeviceIntPtr pDevice, DMXLocalInitInfo *info)

-{

-    GETDMXINPUTFROMPDEVICE;

-    XkbRMLVOSet rmlvo;

-

-    rmlvo.rules = dmxConfigGetXkbRules();

-    rmlvo.model = dmxConfigGetXkbModel();

-    rmlvo.layout = dmxConfigGetXkbLayout();

-    rmlvo.variant = dmxConfigGetXkbVariant();

-    rmlvo.options = dmxConfigGetXkbOptions();

-

-    XkbSetRulesDflts(&rmlvo);

-    if (!info->force && (dmxInput->keycodes

-                         || dmxInput->symbols

-                         || dmxInput->geometry)) {

-        if (info->freenames) dmxKeyboardFreeNames(&info->names);

-        info->freenames      = 0;

-        info->names.keycodes = dmxInput->keycodes;

-        info->names.types    = NULL;

-        info->names.compat   = NULL;

-        info->names.symbols  = dmxInput->symbols;

-        info->names.geometry = dmxInput->geometry;

-

-        dmxLogInput(dmxInput, "XKEYBOARD: From command line: %s",

-                    info->names.keycodes);

-        if (info->names.symbols && *info->names.symbols)

-            dmxLogInputCont(dmxInput, " %s", info->names.symbols);

-        if (info->names.geometry && *info->names.geometry)

-            dmxLogInputCont(dmxInput, " %s", info->names.geometry);

-        dmxLogInputCont(dmxInput, "\n");

-    } else if (info->names.keycodes) {

-        dmxLogInput(dmxInput, "XKEYBOARD: From device: %s",

-                    info->names.keycodes);

-        if (info->names.symbols && *info->names.symbols)

-            dmxLogInputCont(dmxInput, " %s", info->names.symbols);

-        if (info->names.geometry && *info->names.geometry)

-            dmxLogInputCont(dmxInput, " %s", info->names.geometry);

-        dmxLogInputCont(dmxInput, "\n");

-    } else {

-        dmxLogInput(dmxInput, "XKEYBOARD: Defaults: %s %s %s %s %s\n",

-                    dmxConfigGetXkbRules(),

-                    dmxConfigGetXkbLayout(),

-                    dmxConfigGetXkbModel(),

-                    dmxConfigGetXkbVariant()

-                    ? dmxConfigGetXkbVariant() : "",

-                    dmxConfigGetXkbOptions()

-                    ? dmxConfigGetXkbOptions() : "");

-    }

-    InitKeyboardDeviceStruct(pDevice, &rmlvo,

-                                dmxKeyboardBellProc,

-                                dmxKeyboardKbdCtrlProc);

-

-    if (info->freenames) dmxKeyboardFreeNames(&info->names);

-

-    return Success;

-}

-

-    

-static int dmxDeviceOnOff(DeviceIntPtr pDevice, int what)

-{

-    GETDMXINPUTFROMPDEVICE;

-    int              fd;

-    DMXLocalInitInfo info;

-    int              i;

-    Atom             btn_labels[MAX_BUTTONS] = {0}; /* FIXME */

-    Atom             axis_labels[MAX_VALUATORS] = {0}; /* FIXME */

-

-    if (dmxInput->detached) return Success;

-

-    memset(&info, 0, sizeof(info));

-    switch (what) {

-    case DEVICE_INIT:

-        if (dmxLocal->init)

-            dmxLocal->init(pDev);

-        if (dmxLocal->get_info)

-            dmxLocal->get_info(pDev, &info);

-        if (info.keyboard) {    /* XKEYBOARD makes this a special case */

-            dmxKeyboardOn(pDevice, &info);

-            break;

-        }

-        if (info.keyClass) {

-            XkbRMLVOSet rmlvo;

-

-            rmlvo.rules = dmxConfigGetXkbRules();

-            rmlvo.model = dmxConfigGetXkbModel();

-            rmlvo.layout = dmxConfigGetXkbLayout();

-            rmlvo.variant = dmxConfigGetXkbVariant();

-            rmlvo.options = dmxConfigGetXkbOptions();

-

-            InitKeyboardDeviceStruct(pDevice,

-                                     &rmlvo,

-                                     dmxBell, dmxKbdCtrl);

-        }

-        if (info.buttonClass) {

-            InitButtonClassDeviceStruct(pDevice, info.numButtons,

-                                        btn_labels, info.map);

-        }

-        if (info.valuatorClass) {

-            if (info.numRelAxes && dmxLocal->sendsCore) {

-                InitValuatorClassDeviceStruct(pDevice, info.numRelAxes,

-                                              axis_labels,

-                                              GetMaximumEventsNum(),

-                                              Relative);

-                for (i = 0; i < info.numRelAxes; i++)

-                    InitValuatorAxisStruct(pDevice, i, axis_labels[i],

-                                           info.minval[i], info.maxval[i],

-                                           info.res[i],

-                                           info.minres[i], info.maxres[i],

-                                           Relative);

-            } else if (info.numRelAxes) {

-                InitValuatorClassDeviceStruct(pDevice, info.numRelAxes,

-                                              axis_labels,

-                                              dmxPointerGetMotionBufferSize(),

-                                              Relative);

-                for (i = 0; i < info.numRelAxes; i++)

-                    InitValuatorAxisStruct(pDevice, i, axis_labels[i],

-                                           info.minval[i],

-                                           info.maxval[i], info.res[i],

-                                           info.minres[i], info.maxres[i],

-                                           Relative);

-            } else if (info.numAbsAxes) {

-                InitValuatorClassDeviceStruct(pDevice, info.numAbsAxes,

-                                              axis_labels,

-                                              dmxPointerGetMotionBufferSize(),

-                                              Absolute);

-                for (i = 0; i < info.numAbsAxes; i++)

-                    InitValuatorAxisStruct(pDevice, i,

-                                           axis_labels[i],

-                                           info.minval[i], info.maxval[i],

-                                           info.res[i], info.minres[i],

-                                           info.maxres[i], Absolute);

-            }

-        }

-        if (info.focusClass)       InitFocusClassDeviceStruct(pDevice);

-        if (info.proximityClass)   InitProximityClassDeviceStruct(pDevice);

-        if (info.ptrFeedbackClass)

-            InitPtrFeedbackClassDeviceStruct(pDevice, dmxChangePointerControl);

-        if (info.intFeedbackClass || info.strFeedbackClass)

-            dmxLog(dmxWarning,

-                   "Integer and string feedback not supported for %s\n",

-                   pDevice->name);

-        if (!info.keyboard && (info.ledFeedbackClass || info.belFeedbackClass))

-            dmxLog(dmxWarning,

-                   "Led and bel feedback not supported for non-keyboard %s\n",

-                   pDevice->name);

-        break;

-    case DEVICE_ON:

-        if (!pDev->on) {

-            if (dmxLocal->on && (fd = dmxLocal->on(pDev)) >= 0)

-                dmxSigioRegister(dmxInput, fd);

-            pDev->on = TRUE;

-        }

-        break;

-    case DEVICE_OFF:

-    case DEVICE_CLOSE:

-            /* This can get called twice consecutively: once for a

-             * detached screen (DEVICE_OFF), and then again at server

-             * generation time (DEVICE_CLOSE). */

-        if (pDev->on) {

-            dmxSigioUnregister(dmxInput);

-            if (dmxLocal->off) dmxLocal->off(pDev);

-            pDev->on = FALSE;

-        }

-        break;

-    }

-    if (info.keySyms.map && info.freemap) {

-        XFree(info.keySyms.map);

-        info.keySyms.map = NULL;

-    }

-    if (info.xkb) XkbFreeKeyboard(info.xkb, 0, True);

-    return Success;

-}

-

-static void dmxProcessInputEvents(DMXInputInfo *dmxInput)

-{

-    int i;

-

-    mieqProcessInputEvents();

-#if 00 /*BP*/

-    miPointerUpdate();

-#endif

-    if (dmxInput->detached)

-        return;

-    for (i = 0; i < dmxInput->numDevs; i += dmxInput->devs[i]->binding)

-        if (dmxInput->devs[i]->process_input) {

-#if 11 /*BP*/

-            miPointerUpdateSprite(dmxInput->devs[i]->pDevice);

-#endif

-            dmxInput->devs[i]->process_input(dmxInput->devs[i]->private);

-        }

-

-#if 11 /*BP*/

-    mieqProcessInputEvents();

-#endif

-}

-

-static void dmxUpdateWindowInformation(DMXInputInfo *dmxInput,

-                                       DMXUpdateType type,

-                                       WindowPtr pWindow)

-{

-    int i;

-

-#ifdef PANORAMIX

-    if (!noPanoramiXExtension && pWindow && pWindow->parent != screenInfo.screens[0]->root)

-        return;

-#endif

-#if DMX_WINDOW_DEBUG

-    {

-        const char *name = "Unknown";

-        switch (type) {

-        case DMX_UPDATE_REALIZE:            name = "Realize";         break;

-        case DMX_UPDATE_UNREALIZE:          name = "Unrealize";       break;

-        case DMX_UPDATE_RESTACK:            name = "Restack";         break;

-        case DMX_UPDATE_COPY:               name = "Copy";            break;

-        case DMX_UPDATE_RESIZE:             name = "Resize";          break;

-        case DMX_UPDATE_REPARENT:           name = "Repaint";         break;

-        }

-        dmxLog(dmxDebug, "Window %p changed: %s\n", pWindow, name);

-    }

-#endif

-

-    if (dmxInput->detached)

-        return;

-    for (i = 0; i < dmxInput->numDevs; i += dmxInput->devs[i]->binding)

-        if (dmxInput->devs[i]->update_info)

-            dmxInput->devs[i]->update_info(dmxInput->devs[i]->private,

-                                           type, pWindow);

-}

-

-static void dmxCollectAll(DMXInputInfo *dmxInput)

-{

-    int i;

-

-    if (dmxInput->detached)

-        return;

-    for (i = 0; i < dmxInput->numDevs; i += dmxInput->devs[i]->binding)

-        if (dmxInput->devs[i]->collect_events)

-            dmxInput->devs[i]->collect_events(&dmxInput->devs[i]->pDevice->public,

-                                              dmxMotion,

-                                              dmxEnqueue,

-                                              dmxCheckSpecialKeys, DMX_BLOCK);

-}

-

-static void dmxBlockHandler(pointer blockData, OSTimePtr pTimeout,

-                            pointer pReadMask)

-{

-    DMXInputInfo    *dmxInput = &dmxInputs[(int)blockData];

-    static unsigned long generation = 0;

-    

-    if (generation != serverGeneration) {

-        generation = serverGeneration;

-        dmxCollectAll(dmxInput);

-    }

-}

-

-static void dmxSwitchReturn(pointer p)

-{

-    DMXInputInfo *dmxInput = p;

-    int          i;

-    

-    dmxLog(dmxInfo, "Returning from VT %d\n", dmxInput->vt_switched);

-

-    if (!dmxInput->vt_switched)

-        dmxLog(dmxFatal, "dmxSwitchReturn called, but not switched\n");

-    dmxSigioEnableInput();

-    for (i = 0; i < dmxInput->numDevs; i++)

-        if (dmxInput->devs[i]->vt_post_switch)

-            dmxInput->devs[i]->vt_post_switch(dmxInput->devs[i]->private);

-    dmxInput->vt_switched = 0;

-}

-

-static void dmxWakeupHandler(pointer blockData, int result, pointer pReadMask)

-{

-    DMXInputInfo *dmxInput = &dmxInputs[(int)blockData];

-    int          i;

-

-    if (dmxInput->vt_switch_pending) {

-        dmxLog(dmxInfo, "Switching to VT %d\n", dmxInput->vt_switch_pending);

-        for (i = 0; i < dmxInput->numDevs; i++)

-            if (dmxInput->devs[i]->vt_pre_switch)

-                dmxInput->devs[i]->vt_pre_switch(dmxInput->devs[i]->private);

-        dmxInput->vt_switched       = dmxInput->vt_switch_pending;

-        dmxInput->vt_switch_pending = 0;

-        for (i = 0; i < dmxInput->numDevs; i++) {

-            if (dmxInput->devs[i]->vt_switch) {

-                dmxSigioDisableInput();

-                if (!dmxInput->devs[i]->vt_switch(dmxInput->devs[i]->private,

-                                                  dmxInput->vt_switched,

-                                                  dmxSwitchReturn,

-                                                  dmxInput))

-                    dmxSwitchReturn(dmxInput);

-                break;          /* Only call one vt_switch routine */

-            }

-        }

-    }

-    dmxCollectAll(dmxInput);

-}

-

-static char *dmxMakeUniqueDeviceName(DMXLocalInputInfoPtr dmxLocal)

-{

-    static int           k = 0;

-    static int           m = 0;

-    static int           o = 0;

-    static unsigned long dmxGeneration = 0;

-#define LEN  32

-    char *               buf = malloc(LEN);

-

-    if (dmxGeneration != serverGeneration) {

-        k = m = o     = 0;

-        dmxGeneration = serverGeneration;

-    }

-

-    switch (dmxLocal->type) {

-    case DMX_LOCAL_KEYBOARD: XmuSnprintf(buf, LEN, "Keyboard%d", k++); break;

-    case DMX_LOCAL_MOUSE:    XmuSnprintf(buf, LEN, "Mouse%d", m++);    break;

-    default:                 XmuSnprintf(buf, LEN, "Other%d", o++);    break;

-    }

-

-    return buf;

-}

-

-static DeviceIntPtr dmxAddDevice(DMXLocalInputInfoPtr dmxLocal)

-{

-    DeviceIntPtr pDevice;

-    Atom         atom;

-    const char   *name = NULL;

-    char         *devname;

-    DMXInputInfo *dmxInput;

-

-    if (!dmxLocal)

-        return NULL;

-    dmxInput = &dmxInputs[dmxLocal->inputIdx];

-

-    if (dmxLocal->sendsCore) {

-        if (dmxLocal->type == DMX_LOCAL_KEYBOARD && !dmxLocalCoreKeyboard) {

-            dmxLocal->isCore     = 1;

-            dmxLocalCoreKeyboard = dmxLocal;

-            name                 = "keyboard";

-        }

-        if (dmxLocal->type == DMX_LOCAL_MOUSE && !dmxLocalCorePointer) {

-            dmxLocal->isCore     = 1;

-            dmxLocalCorePointer  = dmxLocal;

-            name                 = "pointer";

-        }

-    }

-

-    if (!name) {

-        name            = "extension";

-    }

-

-    if (!name)

-        dmxLog(dmxFatal, "Cannot add device %s\n", dmxLocal->name);

-

-    pDevice                       = AddInputDevice(serverClient, dmxDeviceOnOff, TRUE);

-    if (!pDevice) {

-        dmxLog(dmxError, "Too many devices -- cannot add device %s\n",

-               dmxLocal->name);

-        return NULL;

-    }

-    pDevice->public.devicePrivate = dmxLocal;

-    dmxLocal->pDevice             = pDevice;

-

-    devname       = dmxMakeUniqueDeviceName(dmxLocal);

-    atom          = MakeAtom((char *)devname, strlen(devname), TRUE);

-    pDevice->type = atom;

-    pDevice->name = devname;

-

-    if (dmxLocal->isCore && dmxLocal->type == DMX_LOCAL_MOUSE) {

-#if 00 /*BP*/

-        miRegisterPointerDevice(screenInfo.screens[0], pDevice);

-#else

-        /* Nothing? dmxDeviceOnOff() should get called to init, right? */

-#endif

-    }

-

-    if (dmxLocal->create_private)

-        dmxLocal->private = dmxLocal->create_private(pDevice);

-

-    dmxLogInput(dmxInput, "Added %s as %s device called %s%s\n",

-                dmxLocal->name, name, devname,

-                dmxLocal->isCore

-                ? " [core]"

-                : (dmxLocal->sendsCore

-                   ? " [sends core events]"

-                   : ""));

-

-    return pDevice;

-}

-

-static DMXLocalInputInfoPtr dmxLookupLocal(const char *name)

-{

-    DMXLocalInputInfoPtr pt;

-    

-    for (pt = &DMXLocalDevices[0]; pt->name; ++pt)

-        if (!strcmp(pt->name, name)) return pt; /* search for device name */

-    return NULL;

-}

-

-/** Copy the local input information from \a s into a new \a devs slot

- * in \a dmxInput. */

-DMXLocalInputInfoPtr dmxInputCopyLocal(DMXInputInfo *dmxInput,

-                                       DMXLocalInputInfoPtr s)

-{

-    DMXLocalInputInfoPtr dmxLocal = malloc(sizeof(*dmxLocal));

-    

-    if (!dmxLocal)

-        dmxLog(dmxFatal, "DMXLocalInputInfoPtr: out of memory\n");

-

-    memcpy(dmxLocal, s, sizeof(*dmxLocal));

-    dmxLocal->inputIdx       = dmxInput->inputIdx;

-    dmxLocal->sendsCore      = dmxInput->core;

-    dmxLocal->savedSendsCore = dmxInput->core;

-    dmxLocal->deviceId       = -1;

-

-    ++dmxInput->numDevs;

-    dmxInput->devs = realloc(dmxInput->devs,

-                              dmxInput->numDevs * sizeof(*dmxInput->devs));

-    dmxInput->devs[dmxInput->numDevs-1] = dmxLocal;

-    

-    return dmxLocal;

-}

-

-static void dmxPopulateLocal(DMXInputInfo *dmxInput, dmxArg a)

-{

-    int                  i;

-    int                  help = 0;

-    DMXLocalInputInfoRec *pt;

-

-    for (i = 1; i < dmxArgC(a); i++) {

-        const char *name = dmxArgV(a, i);

-        if ((pt = dmxLookupLocal(name))) {

-            dmxInputCopyLocal(dmxInput, pt);

-        } else {

-            if (strlen(name))

-                dmxLog(dmxWarning,

-                       "Could not find a driver called %s\n", name);

-            ++help;

-        }

-    }

-    if (help) {

-        dmxLog(dmxInfo, "Available local device drivers:\n");

-        for (pt = &DMXLocalDevices[0]; pt->name; ++pt) {

-            const char *type;

-            switch (pt->type) {

-            case DMX_LOCAL_KEYBOARD: type = "keyboard"; break;

-            case DMX_LOCAL_MOUSE:    type = "pointer";  break;

-            default:                 type = "unknown";  break;

-            }

-            dmxLog(dmxInfo, "   %s (%s)\n", pt->name, type);

-        }

-        dmxLog(dmxFatal, "Must have valid local device driver\n");

-    }

-}

-

-int dmxInputExtensionErrorHandler(Display *dsp, _Xconst char *name, _Xconst char *reason)

-{

-    return 0;

-}

-

-static void dmxInputScanForExtensions(DMXInputInfo *dmxInput, int doXI)

-{

-    XExtensionVersion    *ext;

-    XDeviceInfo          *devices;

-    Display              *display;

-    int                  num;

-    int                  i, j;

-    XextErrorHandler     handler;

-

-    if (!(display = XOpenDisplay(dmxInput->name))) return;

-    

-    /* Print out information about the XInput Extension. */

-    handler = XSetExtensionErrorHandler(dmxInputExtensionErrorHandler);

-    ext     = XGetExtensionVersion(display, INAME);

-    XSetExtensionErrorHandler(handler);

-    

-    if (!ext || ext == (XExtensionVersion *)NoSuchExtension) {

-        dmxLogInput(dmxInput, "%s is not available\n", INAME);

-    } else {

-        dmxLogInput(dmxInput, "Locating devices on %s (%s version %d.%d)\n",

-                    dmxInput->name, INAME,

-                    ext->major_version, ext->minor_version);

-        devices = XListInputDevices(display, &num);

-

-        XFree(ext);

-        ext = NULL;

-

-                                /* Print a list of all devices */

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

-            const char *use = "Unknown";

-            switch (devices[i].use) {

-            case IsXPointer:           use = "XPointer";         break;

-            case IsXKeyboard:          use = "XKeyboard";        break;

-            case IsXExtensionDevice:   use = "XExtensionDevice"; break;

-            case IsXExtensionPointer:  use = "XExtensionPointer"; break;

-            case IsXExtensionKeyboard: use = "XExtensionKeyboard"; break;

-            }

-            dmxLogInput(dmxInput, "  %2d %-10.10s %-16.16s\n",

-                        devices[i].id,

-                        devices[i].name ? devices[i].name : "",

-                        use);

-        }

-

-                                /* Search for extensions */

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

-            switch (devices[i].use) {

-            case IsXKeyboard:

-                for (j = 0; j < dmxInput->numDevs; j++) {

-                    DMXLocalInputInfoPtr dmxL = dmxInput->devs[j];

-                    if (dmxL->type == DMX_LOCAL_KEYBOARD

-                        && dmxL->deviceId < 0) {

-                        dmxL->deviceId   = devices[i].id;

-                        dmxL->deviceName = (devices[i].name

-                                            ? strdup(devices[i].name)

-                                            : NULL);

-                    }

-                }

-                break;

-            case IsXPointer:

-                for (j = 0; j < dmxInput->numDevs; j++) {

-                    DMXLocalInputInfoPtr dmxL = dmxInput->devs[j];

-                    if (dmxL->type == DMX_LOCAL_MOUSE && dmxL->deviceId < 0) {

-                        dmxL->deviceId   = devices[i].id;

-                        dmxL->deviceName = (devices[i].name

-                                            ? xstrdup(devices[i].name)

-                                            : NULL);

-                    }

-                }

-                break;

-#if 0

-            case IsXExtensionDevice:

-            case IsXExtensionKeyboard:

-            case IsXExtensionPointer:

-                if (doXI) {

-                    if (!dmxInput->numDevs) {

-                        dmxLog(dmxWarning,

-                               "Cannot use remote (%s) XInput devices if"

-                               " not also using core devices\n",

-                               dmxInput->name);

-                    } else {

-                        dmxLocal             = dmxInputCopyLocal(dmxInput,

-                                                                &DMXCommonOth);

-                        dmxLocal->isCore     = FALSE;

-                        dmxLocal->sendsCore  = FALSE;

-                        dmxLocal->deviceId   = devices[i].id;

-                        dmxLocal->deviceName = (devices[i].name

-                                                ? strdup(devices[i].name)

-                                                : NULL);

-                    }

-                }

-                break;

-#endif

-            }

-        }

-        XFreeDeviceList(devices);

-    }

-    XCloseDisplay(display);

-}

-

-/** Re-initialize all the devices described in \a dmxInput.  Called from

-    #dmxAdjustCursorBoundaries before the cursor is redisplayed. */

-void dmxInputReInit(DMXInputInfo *dmxInput)

-{

-    int i;

-

-    for (i = 0; i < dmxInput->numDevs; i++) {

-        DMXLocalInputInfoPtr dmxLocal = dmxInput->devs[i];

-        if (dmxLocal->reinit)

-            dmxLocal->reinit(&dmxLocal->pDevice->public);

-    }

-}

-

-/** Re-initialize all the devices described in \a dmxInput.  Called from

-    #dmxAdjustCursorBoundaries after the cursor is redisplayed. */

-void dmxInputLateReInit(DMXInputInfo *dmxInput)

-{

-    int i;

-

-    for (i = 0; i < dmxInput->numDevs; i++) {

-        DMXLocalInputInfoPtr dmxLocal = dmxInput->devs[i];

-        if (dmxLocal->latereinit)

-            dmxLocal->latereinit(&dmxLocal->pDevice->public);

-    }

-}

-

-/** Initialize all of the devices described in \a dmxInput. */

-void dmxInputInit(DMXInputInfo *dmxInput)

-{

-    DeviceIntPtr         pPointer = NULL, pKeyboard = NULL;

-    dmxArg               a;

-    const char           *name;

-    int                  i;

-    int                  doXI               = 1; /* Include by default */

-    int                  forceConsole       = 0;

-    int                  doWindows          = 1; /* On by default */

-    int                  hasXkb             = 0;

-

-    a = dmxArgParse(dmxInput->name);

-

-    for (i = 1; i < dmxArgC(a); i++) {

-        switch (hasXkb) {

-        case 1:

-            dmxInput->keycodes = xstrdup(dmxArgV(a, i));

-            ++hasXkb;

-            break;

-        case 2:

-            dmxInput->symbols  = xstrdup(dmxArgV(a, i));

-            ++hasXkb;

-            break;

-        case 3:

-            dmxInput->geometry = xstrdup(dmxArgV(a, i));

-            hasXkb = 0;

-            break;

-        case 0:

-            if      (!strcmp(dmxArgV(a, i), "noxi"))      doXI         = 0;

-            else if (!strcmp(dmxArgV(a, i), "xi"))        doXI         = 1;

-            else if (!strcmp(dmxArgV(a, i), "console"))   forceConsole = 1;

-            else if (!strcmp(dmxArgV(a, i), "noconsole")) forceConsole = 0;

-            else if (!strcmp(dmxArgV(a, i), "windows"))   doWindows    = 1;

-            else if (!strcmp(dmxArgV(a, i), "nowindows")) doWindows    = 0;

-            else if (!strcmp(dmxArgV(a, i), "xkb"))       hasXkb       = 1;

-            else {

-                dmxLog(dmxFatal,

-                       "Unknown input argument: %s\n", dmxArgV(a, i));

-            }

-        }

-    }

-

-    name = dmxArgV(a, 0);

-

-    if (!strcmp(name, "local")) {

-        dmxPopulateLocal(dmxInput, a);

-    } else if (!strcmp(name, "dummy")) {

-        dmxInputCopyLocal(dmxInput, &DMXDummyMou);

-        dmxInputCopyLocal(dmxInput, &DMXDummyKbd);

-        dmxLogInput(dmxInput, "Using dummy input\n");

-    } else {

-        int found;

-

-        for (found = 0, i = 0; i < dmxNumScreens; i++) {

-            if (dmxPropertySameDisplay(&dmxScreens[i], name)) {

-                if (dmxScreens[i].shared)

-                    dmxLog(dmxFatal,

-                           "Cannot take input from shared backend (%s)\n",

-                           name);

-                if (!dmxInput->core) {

-                    dmxLog(dmxWarning,

-                           "Cannot use core devices on a backend (%s)"

-                           " as XInput devices\n", name);

-                } else {

-                    char *pt;

-                    for (pt = (char *)dmxInput->name; pt && *pt; pt++)

-                        if (*pt == ',') *pt = '\0';

-                    dmxInputCopyLocal(dmxInput, &DMXBackendMou);

-                    dmxInputCopyLocal(dmxInput, &DMXBackendKbd);

-                    dmxInput->scrnIdx = i;

-                    dmxLogInput(dmxInput,

-                                "Using backend input from %s\n", name);

-                }

-                ++found;

-                break;

-            }

-        }

-        if (!found || forceConsole) {

-            char *pt;

-            if (found) dmxInput->console = TRUE;

-            for (pt = (char *)dmxInput->name; pt && *pt; pt++)

-                if (*pt == ',') *pt = '\0';

-            dmxInputCopyLocal(dmxInput, &DMXConsoleMou);

-            dmxInputCopyLocal(dmxInput, &DMXConsoleKbd);

-            if (doWindows) {

-                dmxInput->windows          = TRUE;

-                dmxInput->updateWindowInfo = dmxUpdateWindowInformation;

-            }

-            dmxLogInput(dmxInput,

-                        "Using console input from %s (%s windows)\n",

-                        name, doWindows ? "with" : "without");

-        }

-    }

-

-    dmxArgFree(a);

-

-                                /* Locate extensions we may be interested in */

-    dmxInputScanForExtensions(dmxInput, doXI);

-    

-    for (i = 0; i < dmxInput->numDevs; i++) {

-        DMXLocalInputInfoPtr dmxLocal = dmxInput->devs[i];

-        dmxLocal->pDevice = dmxAddDevice(dmxLocal);

-        if (dmxLocal->isCore) {

-            if (dmxLocal->type == DMX_LOCAL_MOUSE)

-                pPointer  = dmxLocal->pDevice;

-            if (dmxLocal->type == DMX_LOCAL_KEYBOARD)

-                pKeyboard = dmxLocal->pDevice;

-        }

-    }

-    

-    dmxInput->processInputEvents    = dmxProcessInputEvents;

-    dmxInput->detached              = False;

-    

-    RegisterBlockAndWakeupHandlers(dmxBlockHandler,

-                                   dmxWakeupHandler,

-                                   (void *)dmxInput->inputIdx);

-}

-

-static void dmxInputFreeLocal(DMXLocalInputInfoRec *local)

-{

-    if (!local) return;

-    if (local->isCore && local->type == DMX_LOCAL_MOUSE)

-        dmxLocalCorePointer  = NULL;

-    if (local->isCore && local->type == DMX_LOCAL_KEYBOARD)

-        dmxLocalCoreKeyboard = NULL;

-    if (local->destroy_private) local->destroy_private(local->private);

-    free(local->history);

-    free(local->valuators);

-    free(local->deviceName);

-    local->private    = NULL;

-    local->history    = NULL;

-    local->deviceName = NULL;

-    free(local);

-}

-

-/** Free all of the memory associated with \a dmxInput */

-void dmxInputFree(DMXInputInfo *dmxInput)

-{

-    int i;

-    

-    if (!dmxInput) return;

-

-    free(dmxInput->keycodes);

-    free(dmxInput->symbols);

-    free(dmxInput->geometry);

-

-    for (i = 0; i < dmxInput->numDevs; i++) {

-        dmxInputFreeLocal(dmxInput->devs[i]);

-        dmxInput->devs[i] = NULL;

-    }

-    free(dmxInput->devs);

-    dmxInput->devs    = NULL;

-    dmxInput->numDevs = 0;

-    if (dmxInput->freename) free(dmxInput->name);

-    dmxInput->name    = NULL;

-}

-

-/** Log information about all of the known devices using #dmxLog(). */

-void dmxInputLogDevices(void)

-{

-    int i, j;

-

-    dmxLog(dmxInfo, "%d devices:\n", dmxGetInputCount());

-    dmxLog(dmxInfo, "  Id  Name                 Classes\n");

-    for (j = 0; j < dmxNumInputs; j++) {

-        DMXInputInfo *dmxInput = &dmxInputs[j];

-        const char   *pt = strchr(dmxInput->name, ',');

-        int          len = (pt

-                            ? (size_t)(pt-dmxInput->name)

-                            : strlen(dmxInput->name));

-

-        for (i = 0; i < dmxInput->numDevs; i++) {

-            DeviceIntPtr pDevice = dmxInput->devs[i]->pDevice;

-            if (pDevice) {

-                dmxLog(dmxInfo, "  %2d%c %-20.20s",

-                       pDevice->id,

-                       dmxInput->detached ? 'D' : ' ',

-                       pDevice->name);

-                if (pDevice->key)        dmxLogCont(dmxInfo, " key");

-                if (pDevice->valuator)   dmxLogCont(dmxInfo, " val");

-                if (pDevice->button)     dmxLogCont(dmxInfo, " btn");

-                if (pDevice->focus)      dmxLogCont(dmxInfo, " foc");

-                if (pDevice->kbdfeed)    dmxLogCont(dmxInfo, " fb/kbd");

-                if (pDevice->ptrfeed)    dmxLogCont(dmxInfo, " fb/ptr");

-                if (pDevice->intfeed)    dmxLogCont(dmxInfo, " fb/int");

-                if (pDevice->stringfeed) dmxLogCont(dmxInfo, " fb/str");

-                if (pDevice->bell)       dmxLogCont(dmxInfo, " fb/bel");

-                if (pDevice->leds)       dmxLogCont(dmxInfo, " fb/led");

-                if (!pDevice->key && !pDevice->valuator && !pDevice->button

-                    && !pDevice->focus && !pDevice->kbdfeed

-                    && !pDevice->ptrfeed && !pDevice->intfeed

-                    && !pDevice->stringfeed && !pDevice->bell

-                    && !pDevice->leds)   dmxLogCont(dmxInfo, " (none)");

-                                                                 

-                dmxLogCont(dmxInfo, "\t[i%d/%*.*s",

-                           dmxInput->inputIdx, len, len, dmxInput->name);

-                if (dmxInput->devs[i]->deviceId >= 0)

-                    dmxLogCont(dmxInfo, "/id%d", dmxInput->devs[i]->deviceId);

-                if (dmxInput->devs[i]->deviceName)

-                    dmxLogCont(dmxInfo, "=%s", dmxInput->devs[i]->deviceName);

-                dmxLogCont(dmxInfo, "] %s\n",

-                           dmxInput->devs[i]->isCore

-                           ? "core"

-                           : (dmxInput->devs[i]->sendsCore

-                              ? "extension (sends core events)"

-                              : "extension"));

-            }

-        }

-    }

-}

-

-/** Detach an input */

-int dmxInputDetach(DMXInputInfo *dmxInput)

-{

-    int i;

-

-    if (dmxInput->detached) return BadAccess;

-    

-    for (i = 0; i < dmxInput->numDevs; i++) {

-        DMXLocalInputInfoPtr dmxLocal = dmxInput->devs[i];

-        dmxLogInput(dmxInput, "Detaching device id %d: %s%s\n",

-                    dmxLocal->pDevice->id,

-                    dmxLocal->pDevice->name,

-                    dmxLocal->isCore

-                    ? " [core]"

-                    : (dmxLocal->sendsCore

-                       ? " [sends core events]"

-                       : ""));

-        DisableDevice(dmxLocal->pDevice, TRUE);

-    }

-    dmxInput->detached = True;

-    dmxInputLogDevices();

-    return 0;

-}

-

-/** Search for input associated with \a dmxScreen, and detach. */

-void dmxInputDetachAll(DMXScreenInfo *dmxScreen)

-{

-    int i;

-

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

-        DMXInputInfo *dmxInput = &dmxInputs[i];

-        if (dmxInput->scrnIdx == dmxScreen->index) dmxInputDetach(dmxInput);

-    }

-}

-

-/** Search for input associated with \a deviceId, and detach. */

-int dmxInputDetachId(int id)

-{

-    DMXInputInfo *dmxInput = dmxInputLocateId(id);

-

-    if (!dmxInput) return BadValue;

-    

-    return dmxInputDetach(dmxInput);

-}

-

-DMXInputInfo *dmxInputLocateId(int id)

-{

-    int i, j;

-    

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

-        DMXInputInfo *dmxInput = &dmxInputs[i];

-        for (j = 0; j < dmxInput->numDevs; j++) {

-            DMXLocalInputInfoPtr dmxLocal = dmxInput->devs[j];

-            if (dmxLocal->pDevice->id == id) return dmxInput;

-        }

-    }

-    return NULL;

-}

-

-static int dmxInputAttachNew(DMXInputInfo *dmxInput, int *id)

-{

-    dmxInputInit(dmxInput);

-    InitAndStartDevices();

-    if (id && dmxInput->devs) *id = dmxInput->devs[0]->pDevice->id;

-    dmxInputLogDevices();

-    return 0;

-}

-

-static int dmxInputAttachOld(DMXInputInfo *dmxInput, int *id)

-{

-    int i;

-    

-    dmxInput->detached = False;

-    for (i = 0; i < dmxInput->numDevs; i++) {

-        DMXLocalInputInfoPtr dmxLocal = dmxInput->devs[i];

-        if (id) *id = dmxLocal->pDevice->id;

-        dmxLogInput(dmxInput,

-                    "Attaching device id %d: %s%s\n",

-                    dmxLocal->pDevice->id,

-                    dmxLocal->pDevice->name,

-                    dmxLocal->isCore

-                    ? " [core]"

-                    : (dmxLocal->sendsCore

-                       ? " [sends core events]"

-                       : ""));

-        EnableDevice(dmxLocal->pDevice, TRUE);

-    }

-    dmxInputLogDevices();

-    return 0;

-}

-

-int dmxInputAttachConsole(const char *name, int isCore, int *id)

-{

-    DMXInputInfo  *dmxInput;

-    int           i;

-

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

-        dmxInput = &dmxInputs[i];

-        if (dmxInput->scrnIdx == -1

-            && dmxInput->detached

-            && !strcmp(dmxInput->name, name)) {

-                                /* Found match */

-            dmxLogInput(dmxInput, "Reattaching detached console input\n");

-            return dmxInputAttachOld(dmxInput, id);

-        }

-    }

-

-                                /* No match found */

-    dmxInput = dmxConfigAddInput(xstrdup(name), isCore);

-    dmxInput->freename = TRUE;

-    dmxLogInput(dmxInput, "Attaching new console input\n");

-    return dmxInputAttachNew(dmxInput, id);

-}

-

-int dmxInputAttachBackend(int physicalScreen, int isCore, int *id)

-{

-    DMXInputInfo  *dmxInput;

-    DMXScreenInfo *dmxScreen;

-    int           i;

-    

-    if (physicalScreen < 0 || physicalScreen >= dmxNumScreens) return BadValue;

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

-        dmxInput = &dmxInputs[i];

-        if (dmxInput->scrnIdx != -1 && dmxInput->scrnIdx == physicalScreen) {

-                                /* Found match */

-            if (!dmxInput->detached) return BadAccess; /* Already attached */

-            dmxScreen = &dmxScreens[physicalScreen];

-            if (!dmxScreen->beDisplay) return BadAccess; /* Screen detached */

-            dmxLogInput(dmxInput, "Reattaching detached backend input\n");

-            return dmxInputAttachOld(dmxInput, id);

-        }

-    }

-                                /* No match found */

-    dmxScreen = &dmxScreens[physicalScreen];

-    if (!dmxScreen->beDisplay) return BadAccess; /* Screen detached */

-    dmxInput = dmxConfigAddInput(dmxScreen->name, isCore);

-    dmxLogInput(dmxInput, "Attaching new backend input\n");

-    return dmxInputAttachNew(dmxInput, id);

-}

+/*
+ * Copyright 2002-2003 Red Hat Inc., Durham, North Carolina.
+ *
+ * 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 on 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 (including the
+ * next paragraph) 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
+ * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS
+ * 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.
+ */
+
+/*
+ * Authors:
+ *   Rickard E. (Rik) Faith <faith@redhat.com>
+ *
+ */
+
+/** \file
+ * This file provides generic input support.  Functions here set up
+ * input and lead to the calling of low-level device drivers for
+ * input. */
+
+#ifdef HAVE_DMX_CONFIG_H
+#include <dmx-config.h>
+#endif
+
+#define DMX_WINDOW_DEBUG 0
+
+#include "dmxinputinit.h"
+#include "dmxextension.h"       /* For dmxInputCount */
+
+#include "dmxdummy.h"
+#include "dmxbackend.h"
+#include "dmxconsole.h"
+#include "dmxcommon.h"
+#include "dmxevents.h"
+#include "dmxmotion.h"
+#include "dmxprop.h"
+#include "config/dmxconfig.h"
+#include "dmxcursor.h"
+
+#include "lnx-keyboard.h"
+#include "lnx-ms.h"
+#include "lnx-ps2.h"
+#include "usb-keyboard.h"
+#include "usb-mouse.h"
+#include "usb-other.h"
+#include "usb-common.h"
+
+#include "dmxsigio.h"
+#include "dmxarg.h"
+
+#include "inputstr.h"
+#include "input.h"
+#include "mipointer.h"
+#include "windowstr.h"
+#include "mi.h"
+#include "xkbsrv.h"
+
+#include <X11/extensions/XI.h>
+#include <X11/extensions/XIproto.h>
+#include "exevents.h"
+#include "extinit.h"
+
+DMXLocalInputInfoPtr dmxLocalCorePointer, dmxLocalCoreKeyboard;
+
+static DMXLocalInputInfoRec DMXDummyMou = {
+    "dummy-mou", DMX_LOCAL_MOUSE, DMX_LOCAL_TYPE_LOCAL, 1,
+    NULL, NULL, NULL, NULL, NULL, dmxDummyMouGetInfo
+};
+
+static DMXLocalInputInfoRec DMXDummyKbd = {
+    "dummy-kbd", DMX_LOCAL_KEYBOARD, DMX_LOCAL_TYPE_LOCAL, 1,
+    NULL, NULL, NULL, NULL, NULL, dmxDummyKbdGetInfo
+};
+
+static DMXLocalInputInfoRec DMXBackendMou = {
+    "backend-mou", DMX_LOCAL_MOUSE, DMX_LOCAL_TYPE_BACKEND, 2,
+    dmxBackendCreatePrivate, dmxBackendDestroyPrivate,
+    dmxBackendInit, NULL, dmxBackendLateReInit, dmxBackendMouGetInfo,
+    dmxCommonMouOn, dmxCommonMouOff, dmxBackendUpdatePosition,
+    NULL, NULL, NULL,
+    dmxBackendCollectEvents, dmxBackendProcessInput, dmxBackendFunctions, NULL,
+    dmxCommonMouCtrl
+};
+
+static DMXLocalInputInfoRec DMXBackendKbd = {
+    "backend-kbd", DMX_LOCAL_KEYBOARD, DMX_LOCAL_TYPE_BACKEND,
+    1, /* With backend-mou or console-mou */
+    dmxCommonCopyPrivate, NULL,
+    dmxBackendInit, NULL, NULL, dmxBackendKbdGetInfo,
+    dmxCommonKbdOn, dmxCommonKbdOff, NULL,
+    NULL, NULL, NULL,
+    NULL, NULL, NULL, NULL,
+    NULL, dmxCommonKbdCtrl, dmxCommonKbdBell
+};
+
+static DMXLocalInputInfoRec DMXConsoleMou = {
+    "console-mou", DMX_LOCAL_MOUSE, DMX_LOCAL_TYPE_CONSOLE, 2,
+    dmxConsoleCreatePrivate, dmxConsoleDestroyPrivate,
+    dmxConsoleInit, dmxConsoleReInit, NULL, dmxConsoleMouGetInfo,
+    dmxCommonMouOn, dmxCommonMouOff, dmxConsoleUpdatePosition,
+    NULL, NULL, NULL,
+    dmxConsoleCollectEvents, NULL, dmxConsoleFunctions, dmxConsoleUpdateInfo,
+    dmxCommonMouCtrl
+};
+
+static DMXLocalInputInfoRec DMXConsoleKbd = {
+    "console-kbd", DMX_LOCAL_KEYBOARD, DMX_LOCAL_TYPE_CONSOLE,
+    1, /* With backend-mou or console-mou */
+    dmxCommonCopyPrivate, NULL,
+    dmxConsoleInit, dmxConsoleReInit, NULL, dmxConsoleKbdGetInfo,
+    dmxCommonKbdOn, dmxCommonKbdOff, NULL,
+    NULL, NULL, NULL,
+    NULL, NULL, NULL, NULL,
+    NULL, dmxCommonKbdCtrl, dmxCommonKbdBell
+};
+
+static DMXLocalInputInfoRec DMXLocalDevices[] = {
+                                /* Dummy drivers that can compile on any OS */
+#ifdef __linux__
+                                /* Linux-specific drivers */
+    {
+        "kbd", DMX_LOCAL_KEYBOARD, DMX_LOCAL_TYPE_LOCAL, 1,
+        kbdLinuxCreatePrivate, kbdLinuxDestroyPrivate,
+        kbdLinuxInit, NULL, NULL, kbdLinuxGetInfo,
+        kbdLinuxOn, kbdLinuxOff, NULL,
+        kbdLinuxVTPreSwitch, kbdLinuxVTPostSwitch, kbdLinuxVTSwitch,
+        kbdLinuxRead, NULL, NULL, NULL,
+        NULL, kbdLinuxCtrl, kbdLinuxBell
+    },
+    {
+        "ms", DMX_LOCAL_MOUSE, DMX_LOCAL_TYPE_LOCAL, 1,
+        msLinuxCreatePrivate, msLinuxDestroyPrivate,
+        msLinuxInit, NULL, NULL, msLinuxGetInfo,
+        msLinuxOn, msLinuxOff, NULL,
+        msLinuxVTPreSwitch, msLinuxVTPostSwitch, NULL,
+        msLinuxRead
+    },
+    {
+        "ps2", DMX_LOCAL_MOUSE, DMX_LOCAL_TYPE_LOCAL, 1,
+        ps2LinuxCreatePrivate, ps2LinuxDestroyPrivate,
+        ps2LinuxInit, NULL, NULL, ps2LinuxGetInfo,
+        ps2LinuxOn, ps2LinuxOff, NULL,
+        ps2LinuxVTPreSwitch, ps2LinuxVTPostSwitch, NULL,
+        ps2LinuxRead
+    },
+#endif
+#ifdef __linux__
+                                /* USB drivers, currently only for
+                                   Linux, but relatively easy to port to
+                                   other OSs */
+    {
+        "usb-kbd", DMX_LOCAL_KEYBOARD, DMX_LOCAL_TYPE_LOCAL, 1,
+        usbCreatePrivate, usbDestroyPrivate,
+        kbdUSBInit, NULL, NULL, kbdUSBGetInfo,
+        kbdUSBOn, usbOff, NULL,
+        NULL, NULL, NULL,
+        kbdUSBRead, NULL, NULL, NULL,
+        NULL, kbdUSBCtrl
+    },
+    {
+        "usb-mou", DMX_LOCAL_MOUSE, DMX_LOCAL_TYPE_LOCAL, 1,
+        usbCreatePrivate, usbDestroyPrivate,
+        mouUSBInit, NULL, NULL, mouUSBGetInfo,
+        mouUSBOn, usbOff, NULL,
+        NULL, NULL, NULL,
+        mouUSBRead
+    },
+    {
+        "usb-oth", DMX_LOCAL_OTHER, DMX_LOCAL_TYPE_LOCAL, 1,
+        usbCreatePrivate, usbDestroyPrivate,
+        othUSBInit, NULL, NULL, othUSBGetInfo,
+        othUSBOn, usbOff, NULL,
+        NULL, NULL, NULL,
+        othUSBRead
+    },
+#endif
+    {
+        "dummy-mou", DMX_LOCAL_MOUSE, DMX_LOCAL_TYPE_LOCAL, 1,
+        NULL, NULL, NULL, NULL, NULL, dmxDummyMouGetInfo
+    },
+    {
+        "dummy-kbd", DMX_LOCAL_KEYBOARD, DMX_LOCAL_TYPE_LOCAL, 1,
+        NULL, NULL, NULL, NULL, NULL, dmxDummyKbdGetInfo
+    },
+    { NULL }                    /* Must be last */
+};
+
+
+#if 11 /*BP*/
+void
+DDXRingBell(int volume, int pitch, int duration)
+{
+   /* NO-OP */
+}
+
+/* taken from kdrive/src/kinput.c: */
+static void
+dmxKbdCtrl (DeviceIntPtr pDevice, KeybdCtrl *ctrl)
+{
+#if 0
+    KdKeyboardInfo *ki;
+
+    for (ki = kdKeyboards; ki; ki = ki->next) {
+        if (ki->dixdev && ki->dixdev->id == pDevice->id)
+            break;
+    }
+
+    if (!ki || !ki->dixdev || ki->dixdev->id != pDevice->id || !ki->driver)
+        return;
+
+    KdSetLeds(ki, ctrl->leds);
+    ki->bellPitch = ctrl->bell_pitch;
+    ki->bellDuration = ctrl->bell_duration; 
+#endif
+}
+
+/* taken from kdrive/src/kinput.c: */
+static void
+dmxBell(int volume, DeviceIntPtr pDev, pointer arg, int something)
+{
+#if 0
+    KeybdCtrl *ctrl = arg;
+    KdKeyboardInfo *ki = NULL;
+    
+    for (ki = kdKeyboards; ki; ki = ki->next) {
+        if (ki->dixdev && ki->dixdev->id == pDev->id)
+            break;
+    }
+
+    if (!ki || !ki->dixdev || ki->dixdev->id != pDev->id || !ki->driver)
+        return;
+    
+    KdRingBell(ki, volume, ctrl->bell_pitch, ctrl->bell_duration);
+#endif
+}
+
+#endif /*BP*/
+
+static void _dmxChangePointerControl(DMXLocalInputInfoPtr dmxLocal,
+                                     PtrCtrl *ctrl)
+{
+    if (!dmxLocal) return;
+    dmxLocal->mctrl = *ctrl;
+    if (dmxLocal->mCtrl) dmxLocal->mCtrl(&dmxLocal->pDevice->public, ctrl);
+}
+
+/** Change the pointer control information for the \a pDevice.  If the
+ * device sends core events, then also change the control information
+ * for all of the pointer devices that send core events. */
+void dmxChangePointerControl(DeviceIntPtr pDevice, PtrCtrl *ctrl)
+{
+    GETDMXLOCALFROMPDEVICE;
+    int i, j;
+
+    if (dmxLocal->sendsCore) {       /* Do for all core devices */
+        for (i = 0; i < dmxNumInputs; i++) {
+            DMXInputInfo *dmxInput = &dmxInputs[i];
+            if (dmxInput->detached) continue;
+            for (j = 0; j < dmxInput->numDevs; j++)
+                if (dmxInput->devs[j]->sendsCore)
+                    _dmxChangePointerControl(dmxInput->devs[j], ctrl);
+        }
+    } else {                    /* Do for this device only */
+        _dmxChangePointerControl(dmxLocal, ctrl);
+    }
+}
+
+static void _dmxKeyboardKbdCtrlProc(DMXLocalInputInfoPtr dmxLocal,
+                                    KeybdCtrl *ctrl)
+{
+    dmxLocal->kctrl = *ctrl;
+    if (dmxLocal->kCtrl) {
+        dmxLocal->kCtrl(&dmxLocal->pDevice->public, ctrl);
+        if (dmxLocal->pDevice->kbdfeed) {
+            XkbEventCauseRec cause;
+            XkbSetCauseUnknown(&cause);
+            /* Generate XKB events, as necessary */
+            XkbUpdateIndicators(dmxLocal->pDevice, XkbAllIndicatorsMask, False,
+                                NULL, &cause);
+        }
+    }
+}
+
+
+/** Change the keyboard control information for the \a pDevice.  If the
+ * device sends core events, then also change the control information
+ * for all of the keyboard devices that send core events. */
+void dmxKeyboardKbdCtrlProc(DeviceIntPtr pDevice, KeybdCtrl *ctrl)
+{
+    GETDMXLOCALFROMPDEVICE;
+    int i, j;
+
+    if (dmxLocal->sendsCore) {       /* Do for all core devices */
+        for (i = 0; i < dmxNumInputs; i++) {
+            DMXInputInfo *dmxInput = &dmxInputs[i];
+            if (dmxInput->detached) continue;
+            for (j = 0; j < dmxInput->numDevs; j++)
+                if (dmxInput->devs[j]->sendsCore)
+                    _dmxKeyboardKbdCtrlProc(dmxInput->devs[j], ctrl);
+        }
+    } else {                    /* Do for this device only */
+        _dmxKeyboardKbdCtrlProc(dmxLocal, ctrl);
+    }
+}
+
+static void _dmxKeyboardBellProc(DMXLocalInputInfoPtr dmxLocal, int percent)
+{
+    if (dmxLocal->kBell) dmxLocal->kBell(&dmxLocal->pDevice->public,
+                                         percent,
+                                         dmxLocal->kctrl.bell,
+                                         dmxLocal->kctrl.bell_pitch,
+                                         dmxLocal->kctrl.bell_duration);
+}
+
+/** Sound the bell on the device.  If the device send core events, then
+ * sound the bell on all of the devices that send core events. */
+void dmxKeyboardBellProc(int percent, DeviceIntPtr pDevice,
+                         pointer ctrl, int unknown)
+{
+    GETDMXLOCALFROMPDEVICE;
+    int i, j;
+
+    if (dmxLocal->sendsCore) {       /* Do for all core devices */
+        for (i = 0; i < dmxNumInputs; i++) {
+            DMXInputInfo *dmxInput = &dmxInputs[i];
+            if (dmxInput->detached) continue;
+            for (j = 0; j < dmxInput->numDevs; j++)
+                if (dmxInput->devs[j]->sendsCore)
+                    _dmxKeyboardBellProc(dmxInput->devs[j], percent);
+        }
+    } else {                    /* Do for this device only */
+        _dmxKeyboardBellProc(dmxLocal, percent);
+    }
+}
+
+static void dmxKeyboardFreeNames(XkbComponentNamesPtr names)
+{
+    if (names->keycodes) XFree(names->keycodes);
+    if (names->types)    XFree(names->types);
+    if (names->compat)   XFree(names->compat);
+    if (names->symbols)  XFree(names->symbols);
+    if (names->geometry) XFree(names->geometry);
+}
+
+
+static int dmxKeyboardOn(DeviceIntPtr pDevice, DMXLocalInitInfo *info)
+{
+    GETDMXINPUTFROMPDEVICE;
+    XkbRMLVOSet rmlvo;
+
+    rmlvo.rules = dmxConfigGetXkbRules();
+    rmlvo.model = dmxConfigGetXkbModel();
+    rmlvo.layout = dmxConfigGetXkbLayout();
+    rmlvo.variant = dmxConfigGetXkbVariant();
+    rmlvo.options = dmxConfigGetXkbOptions();
+
+    XkbSetRulesDflts(&rmlvo);
+    if (!info->force && (dmxInput->keycodes
+                         || dmxInput->symbols
+                         || dmxInput->geometry)) {
+        if (info->freenames) dmxKeyboardFreeNames(&info->names);
+        info->freenames      = 0;
+        info->names.keycodes = dmxInput->keycodes;
+        info->names.types    = NULL;
+        info->names.compat   = NULL;
+        info->names.symbols  = dmxInput->symbols;
+        info->names.geometry = dmxInput->geometry;
+
+        dmxLogInput(dmxInput, "XKEYBOARD: From command line: %s",
+                    info->names.keycodes);
+        if (info->names.symbols && *info->names.symbols)
+            dmxLogInputCont(dmxInput, " %s", info->names.symbols);
+        if (info->names.geometry && *info->names.geometry)
+            dmxLogInputCont(dmxInput, " %s", info->names.geometry);
+        dmxLogInputCont(dmxInput, "\n");
+    } else if (info->names.keycodes) {
+        dmxLogInput(dmxInput, "XKEYBOARD: From device: %s",
+                    info->names.keycodes);
+        if (info->names.symbols && *info->names.symbols)
+            dmxLogInputCont(dmxInput, " %s", info->names.symbols);
+        if (info->names.geometry && *info->names.geometry)
+            dmxLogInputCont(dmxInput, " %s", info->names.geometry);
+        dmxLogInputCont(dmxInput, "\n");
+    } else {
+        dmxLogInput(dmxInput, "XKEYBOARD: Defaults: %s %s %s %s %s\n",
+                    dmxConfigGetXkbRules(),
+                    dmxConfigGetXkbLayout(),
+                    dmxConfigGetXkbModel(),
+                    dmxConfigGetXkbVariant()
+                    ? dmxConfigGetXkbVariant() : "",
+                    dmxConfigGetXkbOptions()
+                    ? dmxConfigGetXkbOptions() : "");
+    }
+    InitKeyboardDeviceStruct(pDevice, &rmlvo,
+                                dmxKeyboardBellProc,
+                                dmxKeyboardKbdCtrlProc);
+
+    if (info->freenames) dmxKeyboardFreeNames(&info->names);
+
+    return Success;
+}
+
+    
+static int dmxDeviceOnOff(DeviceIntPtr pDevice, int what)
+{
+    GETDMXINPUTFROMPDEVICE;
+    int              fd;
+    DMXLocalInitInfo info;
+    int              i;
+    Atom             btn_labels[MAX_BUTTONS] = {0}; /* FIXME */
+    Atom             axis_labels[MAX_VALUATORS] = {0}; /* FIXME */
+
+    if (dmxInput->detached) return Success;
+
+    memset(&info, 0, sizeof(info));
+    switch (what) {
+    case DEVICE_INIT:
+        if (dmxLocal->init)
+            dmxLocal->init(pDev);
+        if (dmxLocal->get_info)
+            dmxLocal->get_info(pDev, &info);
+        if (info.keyboard) {    /* XKEYBOARD makes this a special case */
+            dmxKeyboardOn(pDevice, &info);
+            break;
+        }
+        if (info.keyClass) {
+            XkbRMLVOSet rmlvo;
+
+            rmlvo.rules = dmxConfigGetXkbRules();
+            rmlvo.model = dmxConfigGetXkbModel();
+            rmlvo.layout = dmxConfigGetXkbLayout();
+            rmlvo.variant = dmxConfigGetXkbVariant();
+            rmlvo.options = dmxConfigGetXkbOptions();
+
+            InitKeyboardDeviceStruct(pDevice,
+                                     &rmlvo,
+                                     dmxBell, dmxKbdCtrl);
+        }
+        if (info.buttonClass) {
+            InitButtonClassDeviceStruct(pDevice, info.numButtons,
+                                        btn_labels, info.map);
+        }
+        if (info.valuatorClass) {
+            if (info.numRelAxes && dmxLocal->sendsCore) {
+                InitValuatorClassDeviceStruct(pDevice, info.numRelAxes,
+                                              axis_labels,
+                                              GetMaximumEventsNum(),
+                                              Relative);
+                for (i = 0; i < info.numRelAxes; i++)
+                    InitValuatorAxisStruct(pDevice, i, axis_labels[i],
+                                           info.minval[i], info.maxval[i],
+                                           info.res[i],
+                                           info.minres[i], info.maxres[i],
+                                           Relative);
+            } else if (info.numRelAxes) {
+                InitValuatorClassDeviceStruct(pDevice, info.numRelAxes,
+                                              axis_labels,
+                                              dmxPointerGetMotionBufferSize(),
+                                              Relative);
+                for (i = 0; i < info.numRelAxes; i++)
+                    InitValuatorAxisStruct(pDevice, i, axis_labels[i],
+                                           info.minval[i],
+                                           info.maxval[i], info.res[i],
+                                           info.minres[i], info.maxres[i],
+                                           Relative);
+            } else if (info.numAbsAxes) {
+                InitValuatorClassDeviceStruct(pDevice, info.numAbsAxes,
+                                              axis_labels,
+                                              dmxPointerGetMotionBufferSize(),
+                                              Absolute);
+                for (i = 0; i < info.numAbsAxes; i++)
+                    InitValuatorAxisStruct(pDevice, i,
+                                           axis_labels[i],
+                                           info.minval[i], info.maxval[i],
+                                           info.res[i], info.minres[i],
+                                           info.maxres[i], Absolute);
+            }
+        }
+        if (info.focusClass)       InitFocusClassDeviceStruct(pDevice);
+        if (info.proximityClass)   InitProximityClassDeviceStruct(pDevice);
+        if (info.ptrFeedbackClass)
+            InitPtrFeedbackClassDeviceStruct(pDevice, dmxChangePointerControl);
+        if (info.intFeedbackClass || info.strFeedbackClass)
+            dmxLog(dmxWarning,
+                   "Integer and string feedback not supported for %s\n",
+                   pDevice->name);
+        if (!info.keyboard && (info.ledFeedbackClass || info.belFeedbackClass))
+            dmxLog(dmxWarning,
+                   "Led and bel feedback not supported for non-keyboard %s\n",
+                   pDevice->name);
+        break;
+    case DEVICE_ON:
+        if (!pDev->on) {
+            if (dmxLocal->on && (fd = dmxLocal->on(pDev)) >= 0)
+                dmxSigioRegister(dmxInput, fd);
+            pDev->on = TRUE;
+        }
+        break;
+    case DEVICE_OFF:
+    case DEVICE_CLOSE:
+            /* This can get called twice consecutively: once for a
+             * detached screen (DEVICE_OFF), and then again at server
+             * generation time (DEVICE_CLOSE). */
+        if (pDev->on) {
+            dmxSigioUnregister(dmxInput);
+            if (dmxLocal->off) dmxLocal->off(pDev);
+            pDev->on = FALSE;
+        }
+        break;
+    }
+    if (info.keySyms.map && info.freemap) {
+        XFree(info.keySyms.map);
+        info.keySyms.map = NULL;
+    }
+    if (info.xkb) XkbFreeKeyboard(info.xkb, 0, True);
+    return Success;
+}
+
+static void dmxProcessInputEvents(DMXInputInfo *dmxInput)
+{
+    int i;
+
+    mieqProcessInputEvents();
+#if 00 /*BP*/
+    miPointerUpdate();
+#endif
+    if (dmxInput->detached)
+        return;
+    for (i = 0; i < dmxInput->numDevs; i += dmxInput->devs[i]->binding)
+        if (dmxInput->devs[i]->process_input) {
+#if 11 /*BP*/
+            miPointerUpdateSprite(dmxInput->devs[i]->pDevice);
+#endif
+            dmxInput->devs[i]->process_input(dmxInput->devs[i]->private);
+        }
+
+#if 11 /*BP*/
+    mieqProcessInputEvents();
+#endif
+}
+
+static void dmxUpdateWindowInformation(DMXInputInfo *dmxInput,
+                                       DMXUpdateType type,
+                                       WindowPtr pWindow)
+{
+    int i;
+
+#ifdef PANORAMIX
+    if (!noPanoramiXExtension && pWindow && pWindow->parent != screenInfo.screens[0]->root)
+        return;
+#endif
+#if DMX_WINDOW_DEBUG
+    {
+        const char *name = "Unknown";
+        switch (type) {
+        case DMX_UPDATE_REALIZE:            name = "Realize";         break;
+        case DMX_UPDATE_UNREALIZE:          name = "Unrealize";       break;
+        case DMX_UPDATE_RESTACK:            name = "Restack";         break;
+        case DMX_UPDATE_COPY:               name = "Copy";            break;
+        case DMX_UPDATE_RESIZE:             name = "Resize";          break;
+        case DMX_UPDATE_REPARENT:           name = "Repaint";         break;
+        }
+        dmxLog(dmxDebug, "Window %p changed: %s\n", pWindow, name);
+    }
+#endif
+
+    if (dmxInput->detached)
+        return;
+    for (i = 0; i < dmxInput->numDevs; i += dmxInput->devs[i]->binding)
+        if (dmxInput->devs[i]->update_info)
+            dmxInput->devs[i]->update_info(dmxInput->devs[i]->private,
+                                           type, pWindow);
+}
+
+static void dmxCollectAll(DMXInputInfo *dmxInput)
+{
+    int i;
+
+    if (dmxInput->detached)
+        return;
+    for (i = 0; i < dmxInput->numDevs; i += dmxInput->devs[i]->binding)
+        if (dmxInput->devs[i]->collect_events)
+            dmxInput->devs[i]->collect_events(&dmxInput->devs[i]->pDevice->public,
+                                              dmxMotion,
+                                              dmxEnqueue,
+                                              dmxCheckSpecialKeys, DMX_BLOCK);
+}
+
+static void dmxBlockHandler(pointer blockData, OSTimePtr pTimeout,
+                            pointer pReadMask)
+{
+    DMXInputInfo    *dmxInput = &dmxInputs[(uintptr_t)blockData];
+    static unsigned long generation = 0;
+    
+    if (generation != serverGeneration) {
+        generation = serverGeneration;
+        dmxCollectAll(dmxInput);
+    }
+}
+
+static void dmxSwitchReturn(pointer p)
+{
+    DMXInputInfo *dmxInput = p;
+    int          i;
+    
+    dmxLog(dmxInfo, "Returning from VT %d\n", dmxInput->vt_switched);
+
+    if (!dmxInput->vt_switched)
+        dmxLog(dmxFatal, "dmxSwitchReturn called, but not switched\n");
+    dmxSigioEnableInput();
+    for (i = 0; i < dmxInput->numDevs; i++)
+        if (dmxInput->devs[i]->vt_post_switch)
+            dmxInput->devs[i]->vt_post_switch(dmxInput->devs[i]->private);
+    dmxInput->vt_switched = 0;
+}
+
+static void dmxWakeupHandler(pointer blockData, int result, pointer pReadMask)
+{
+    DMXInputInfo *dmxInput = &dmxInputs[(uintptr_t)blockData];
+    int          i;
+
+    if (dmxInput->vt_switch_pending) {
+        dmxLog(dmxInfo, "Switching to VT %d\n", dmxInput->vt_switch_pending);
+        for (i = 0; i < dmxInput->numDevs; i++)
+            if (dmxInput->devs[i]->vt_pre_switch)
+                dmxInput->devs[i]->vt_pre_switch(dmxInput->devs[i]->private);
+        dmxInput->vt_switched       = dmxInput->vt_switch_pending;
+        dmxInput->vt_switch_pending = 0;
+        for (i = 0; i < dmxInput->numDevs; i++) {
+            if (dmxInput->devs[i]->vt_switch) {
+                dmxSigioDisableInput();
+                if (!dmxInput->devs[i]->vt_switch(dmxInput->devs[i]->private,
+                                                  dmxInput->vt_switched,
+                                                  dmxSwitchReturn,
+                                                  dmxInput))
+                    dmxSwitchReturn(dmxInput);
+                break;          /* Only call one vt_switch routine */
+            }
+        }
+    }
+    dmxCollectAll(dmxInput);
+}
+
+static char *dmxMakeUniqueDeviceName(DMXLocalInputInfoPtr dmxLocal)
+{
+    static int           k = 0;
+    static int           m = 0;
+    static int           o = 0;
+    static unsigned long dmxGeneration = 0;
+#define LEN  32
+    char *               buf = malloc(LEN);
+
+    if (dmxGeneration != serverGeneration) {
+        k = m = o     = 0;
+        dmxGeneration = serverGeneration;
+    }
+
+    switch (dmxLocal->type) {
+    case DMX_LOCAL_KEYBOARD: XmuSnprintf(buf, LEN, "Keyboard%d", k++); break;
+    case DMX_LOCAL_MOUSE:    XmuSnprintf(buf, LEN, "Mouse%d", m++);    break;
+    default:                 XmuSnprintf(buf, LEN, "Other%d", o++);    break;
+    }
+
+    return buf;
+}
+
+static DeviceIntPtr dmxAddDevice(DMXLocalInputInfoPtr dmxLocal)
+{
+    DeviceIntPtr pDevice;
+    Atom         atom;
+    const char   *name = NULL;
+    char         *devname;
+    DMXInputInfo *dmxInput;
+
+    if (!dmxLocal)
+        return NULL;
+    dmxInput = &dmxInputs[dmxLocal->inputIdx];
+
+    if (dmxLocal->sendsCore) {
+        if (dmxLocal->type == DMX_LOCAL_KEYBOARD && !dmxLocalCoreKeyboard) {
+            dmxLocal->isCore     = 1;
+            dmxLocalCoreKeyboard = dmxLocal;
+            name                 = "keyboard";
+        }
+        if (dmxLocal->type == DMX_LOCAL_MOUSE && !dmxLocalCorePointer) {
+            dmxLocal->isCore     = 1;
+            dmxLocalCorePointer  = dmxLocal;
+            name                 = "pointer";
+        }
+    }
+
+    if (!name) {
+        name            = "extension";
+    }
+
+    if (!name)
+        dmxLog(dmxFatal, "Cannot add device %s\n", dmxLocal->name);
+
+    pDevice                       = AddInputDevice(serverClient, dmxDeviceOnOff, TRUE);
+    if (!pDevice) {
+        dmxLog(dmxError, "Too many devices -- cannot add device %s\n",
+               dmxLocal->name);
+        return NULL;
+    }
+    pDevice->public.devicePrivate = dmxLocal;
+    dmxLocal->pDevice             = pDevice;
+
+    devname       = dmxMakeUniqueDeviceName(dmxLocal);
+    atom          = MakeAtom((char *)devname, strlen(devname), TRUE);
+    pDevice->type = atom;
+    pDevice->name = devname;
+
+    if (dmxLocal->isCore && dmxLocal->type == DMX_LOCAL_MOUSE) {
+#if 00 /*BP*/
+        miRegisterPointerDevice(screenInfo.screens[0], pDevice);
+#else
+        /* Nothing? dmxDeviceOnOff() should get called to init, right? */
+#endif
+    }
+
+    if (dmxLocal->create_private)
+        dmxLocal->private = dmxLocal->create_private(pDevice);
+
+    dmxLogInput(dmxInput, "Added %s as %s device called %s%s\n",
+                dmxLocal->name, name, devname,
+                dmxLocal->isCore
+                ? " [core]"
+                : (dmxLocal->sendsCore
+                   ? " [sends core events]"
+                   : ""));
+
+    return pDevice;
+}
+
+static DMXLocalInputInfoPtr dmxLookupLocal(const char *name)
+{
+    DMXLocalInputInfoPtr pt;
+    
+    for (pt = &DMXLocalDevices[0]; pt->name; ++pt)
+        if (!strcmp(pt->name, name)) return pt; /* search for device name */
+    return NULL;
+}
+
+/** Copy the local input information from \a s into a new \a devs slot
+ * in \a dmxInput. */
+DMXLocalInputInfoPtr dmxInputCopyLocal(DMXInputInfo *dmxInput,
+                                       DMXLocalInputInfoPtr s)
+{
+    DMXLocalInputInfoPtr dmxLocal = malloc(sizeof(*dmxLocal));
+    
+    if (!dmxLocal)
+        dmxLog(dmxFatal, "DMXLocalInputInfoPtr: out of memory\n");
+
+    memcpy(dmxLocal, s, sizeof(*dmxLocal));
+    dmxLocal->inputIdx       = dmxInput->inputIdx;
+    dmxLocal->sendsCore      = dmxInput->core;
+    dmxLocal->savedSendsCore = dmxInput->core;
+    dmxLocal->deviceId       = -1;
+
+    ++dmxInput->numDevs;
+    dmxInput->devs = realloc(dmxInput->devs,
+                              dmxInput->numDevs * sizeof(*dmxInput->devs));
+    dmxInput->devs[dmxInput->numDevs-1] = dmxLocal;
+    
+    return dmxLocal;
+}
+
+static void dmxPopulateLocal(DMXInputInfo *dmxInput, dmxArg a)
+{
+    int                  i;
+    int                  help = 0;
+    DMXLocalInputInfoRec *pt;
+
+    for (i = 1; i < dmxArgC(a); i++) {
+        const char *name = dmxArgV(a, i);
+        if ((pt = dmxLookupLocal(name))) {
+            dmxInputCopyLocal(dmxInput, pt);
+        } else {
+            if (strlen(name))
+                dmxLog(dmxWarning,
+                       "Could not find a driver called %s\n", name);
+            ++help;
+        }
+    }
+    if (help) {
+        dmxLog(dmxInfo, "Available local device drivers:\n");
+        for (pt = &DMXLocalDevices[0]; pt->name; ++pt) {
+            const char *type;
+            switch (pt->type) {
+            case DMX_LOCAL_KEYBOARD: type = "keyboard"; break;
+            case DMX_LOCAL_MOUSE:    type = "pointer";  break;
+            default:                 type = "unknown";  break;
+            }
+            dmxLog(dmxInfo, "   %s (%s)\n", pt->name, type);
+        }
+        dmxLog(dmxFatal, "Must have valid local device driver\n");
+    }
+}
+
+int dmxInputExtensionErrorHandler(Display *dsp, _Xconst char *name, _Xconst char *reason)
+{
+    return 0;
+}
+
+static void dmxInputScanForExtensions(DMXInputInfo *dmxInput, int doXI)
+{
+    XExtensionVersion    *ext;
+    XDeviceInfo          *devices;
+    Display              *display;
+    int                  num;
+    int                  i, j;
+    XextErrorHandler     handler;
+
+    if (!(display = XOpenDisplay(dmxInput->name))) return;
+    
+    /* Print out information about the XInput Extension. */
+    handler = XSetExtensionErrorHandler(dmxInputExtensionErrorHandler);
+    ext     = XGetExtensionVersion(display, INAME);
+    XSetExtensionErrorHandler(handler);
+    
+    if (!ext || ext == (XExtensionVersion *)NoSuchExtension) {
+        dmxLogInput(dmxInput, "%s is not available\n", INAME);
+    } else {
+        dmxLogInput(dmxInput, "Locating devices on %s (%s version %d.%d)\n",
+                    dmxInput->name, INAME,
+                    ext->major_version, ext->minor_version);
+        devices = XListInputDevices(display, &num);
+
+        XFree(ext);
+        ext = NULL;
+
+                                /* Print a list of all devices */
+        for (i = 0; i < num; i++) {
+            const char *use = "Unknown";
+            switch (devices[i].use) {
+            case IsXPointer:           use = "XPointer";         break;
+            case IsXKeyboard:          use = "XKeyboard";        break;
+            case IsXExtensionDevice:   use = "XExtensionDevice"; break;
+            case IsXExtensionPointer:  use = "XExtensionPointer"; break;
+            case IsXExtensionKeyboard: use = "XExtensionKeyboard"; break;
+            }
+            dmxLogInput(dmxInput, "  %2d %-10.10s %-16.16s\n",
+                        devices[i].id,
+                        devices[i].name ? devices[i].name : "",
+                        use);
+        }
+
+                                /* Search for extensions */
+        for (i = 0; i < num; i++) {
+            switch (devices[i].use) {
+            case IsXKeyboard:
+                for (j = 0; j < dmxInput->numDevs; j++) {
+                    DMXLocalInputInfoPtr dmxL = dmxInput->devs[j];
+                    if (dmxL->type == DMX_LOCAL_KEYBOARD
+                        && dmxL->deviceId < 0) {
+                        dmxL->deviceId   = devices[i].id;
+                        dmxL->deviceName = (devices[i].name
+                                            ? strdup(devices[i].name)
+                                            : NULL);
+                    }
+                }
+                break;
+            case IsXPointer:
+                for (j = 0; j < dmxInput->numDevs; j++) {
+                    DMXLocalInputInfoPtr dmxL = dmxInput->devs[j];
+                    if (dmxL->type == DMX_LOCAL_MOUSE && dmxL->deviceId < 0) {
+                        dmxL->deviceId   = devices[i].id;
+                        dmxL->deviceName = (devices[i].name
+                                            ? xstrdup(devices[i].name)
+                                            : NULL);
+                    }
+                }
+                break;
+            }
+        }
+        XFreeDeviceList(devices);
+    }
+    XCloseDisplay(display);
+}
+
+/** Re-initialize all the devices described in \a dmxInput.  Called from
+    #dmxAdjustCursorBoundaries before the cursor is redisplayed. */
+void dmxInputReInit(DMXInputInfo *dmxInput)
+{
+    int i;
+
+    for (i = 0; i < dmxInput->numDevs; i++) {
+        DMXLocalInputInfoPtr dmxLocal = dmxInput->devs[i];
+        if (dmxLocal->reinit)
+            dmxLocal->reinit(&dmxLocal->pDevice->public);
+    }
+}
+
+/** Re-initialize all the devices described in \a dmxInput.  Called from
+    #dmxAdjustCursorBoundaries after the cursor is redisplayed. */
+void dmxInputLateReInit(DMXInputInfo *dmxInput)
+{
+    int i;
+
+    for (i = 0; i < dmxInput->numDevs; i++) {
+        DMXLocalInputInfoPtr dmxLocal = dmxInput->devs[i];
+        if (dmxLocal->latereinit)
+            dmxLocal->latereinit(&dmxLocal->pDevice->public);
+    }
+}
+
+/** Initialize all of the devices described in \a dmxInput. */
+void dmxInputInit(DMXInputInfo *dmxInput)
+{
+    DeviceIntPtr         pPointer = NULL, pKeyboard = NULL;
+    dmxArg               a;
+    const char           *name;
+    int                  i;
+    int                  doXI               = 1; /* Include by default */
+    int                  forceConsole       = 0;
+    int                  doWindows          = 1; /* On by default */
+    int                  hasXkb             = 0;
+
+    a = dmxArgParse(dmxInput->name);
+
+    for (i = 1; i < dmxArgC(a); i++) {
+        switch (hasXkb) {
+        case 1:
+            dmxInput->keycodes = xstrdup(dmxArgV(a, i));
+            ++hasXkb;
+            break;
+        case 2:
+            dmxInput->symbols  = xstrdup(dmxArgV(a, i));
+            ++hasXkb;
+            break;
+        case 3:
+            dmxInput->geometry = xstrdup(dmxArgV(a, i));
+            hasXkb = 0;
+            break;
+        case 0:
+            if      (!strcmp(dmxArgV(a, i), "noxi"))      doXI         = 0;
+            else if (!strcmp(dmxArgV(a, i), "xi"))        doXI         = 1;
+            else if (!strcmp(dmxArgV(a, i), "console"))   forceConsole = 1;
+            else if (!strcmp(dmxArgV(a, i), "noconsole")) forceConsole = 0;
+            else if (!strcmp(dmxArgV(a, i), "windows"))   doWindows    = 1;
+            else if (!strcmp(dmxArgV(a, i), "nowindows")) doWindows    = 0;
+            else if (!strcmp(dmxArgV(a, i), "xkb"))       hasXkb       = 1;
+            else {
+                dmxLog(dmxFatal,
+                       "Unknown input argument: %s\n", dmxArgV(a, i));
+            }
+        }
+    }
+
+    name = dmxArgV(a, 0);
+
+    if (!strcmp(name, "local")) {
+        dmxPopulateLocal(dmxInput, a);
+    } else if (!strcmp(name, "dummy")) {
+        dmxInputCopyLocal(dmxInput, &DMXDummyMou);
+        dmxInputCopyLocal(dmxInput, &DMXDummyKbd);
+        dmxLogInput(dmxInput, "Using dummy input\n");
+    } else {
+        int found;
+
+        for (found = 0, i = 0; i < dmxNumScreens; i++) {
+            if (dmxPropertySameDisplay(&dmxScreens[i], name)) {
+                if (dmxScreens[i].shared)
+                    dmxLog(dmxFatal,
+                           "Cannot take input from shared backend (%s)\n",
+                           name);
+                if (!dmxInput->core) {
+                    dmxLog(dmxWarning,
+                           "Cannot use core devices on a backend (%s)"
+                           " as XInput devices\n", name);
+                } else {
+                    char *pt;
+                    for (pt = (char *)dmxInput->name; pt && *pt; pt++)
+                        if (*pt == ',') *pt = '\0';
+                    dmxInputCopyLocal(dmxInput, &DMXBackendMou);
+                    dmxInputCopyLocal(dmxInput, &DMXBackendKbd);
+                    dmxInput->scrnIdx = i;
+                    dmxLogInput(dmxInput,
+                                "Using backend input from %s\n", name);
+                }
+                ++found;
+                break;
+            }
+        }
+        if (!found || forceConsole) {
+            char *pt;
+            if (found) dmxInput->console = TRUE;
+            for (pt = (char *)dmxInput->name; pt && *pt; pt++)
+                if (*pt == ',') *pt = '\0';
+            dmxInputCopyLocal(dmxInput, &DMXConsoleMou);
+            dmxInputCopyLocal(dmxInput, &DMXConsoleKbd);
+            if (doWindows) {
+                dmxInput->windows          = TRUE;
+                dmxInput->updateWindowInfo = dmxUpdateWindowInformation;
+            }
+            dmxLogInput(dmxInput,
+                        "Using console input from %s (%s windows)\n",
+                        name, doWindows ? "with" : "without");
+        }
+    }
+
+    dmxArgFree(a);
+
+                                /* Locate extensions we may be interested in */
+    dmxInputScanForExtensions(dmxInput, doXI);
+    
+    for (i = 0; i < dmxInput->numDevs; i++) {
+        DMXLocalInputInfoPtr dmxLocal = dmxInput->devs[i];
+        dmxLocal->pDevice = dmxAddDevice(dmxLocal);
+        if (dmxLocal->isCore) {
+            if (dmxLocal->type == DMX_LOCAL_MOUSE)
+                pPointer  = dmxLocal->pDevice;
+            if (dmxLocal->type == DMX_LOCAL_KEYBOARD)
+                pKeyboard = dmxLocal->pDevice;
+        }
+    }
+    
+    dmxInput->processInputEvents    = dmxProcessInputEvents;
+    dmxInput->detached              = False;
+    
+    RegisterBlockAndWakeupHandlers(dmxBlockHandler, dmxWakeupHandler,
+                                   (void *)(uintptr_t)dmxInput->inputIdx);
+}
+
+static void dmxInputFreeLocal(DMXLocalInputInfoRec *local)
+{
+    if (!local) return;
+    if (local->isCore && local->type == DMX_LOCAL_MOUSE)
+        dmxLocalCorePointer  = NULL;
+    if (local->isCore && local->type == DMX_LOCAL_KEYBOARD)
+        dmxLocalCoreKeyboard = NULL;
+    if (local->destroy_private) local->destroy_private(local->private);
+    free(local->history);
+    free(local->valuators);
+    free(local->deviceName);
+    local->private    = NULL;
+    local->history    = NULL;
+    local->deviceName = NULL;
+    free(local);
+}
+
+/** Free all of the memory associated with \a dmxInput */
+void dmxInputFree(DMXInputInfo *dmxInput)
+{
+    int i;
+    
+    if (!dmxInput) return;
+
+    free(dmxInput->keycodes);
+    free(dmxInput->symbols);
+    free(dmxInput->geometry);
+
+    for (i = 0; i < dmxInput->numDevs; i++) {
+        dmxInputFreeLocal(dmxInput->devs[i]);
+        dmxInput->devs[i] = NULL;
+    }
+    free(dmxInput->devs);
+    dmxInput->devs    = NULL;
+    dmxInput->numDevs = 0;
+    if (dmxInput->freename) free(dmxInput->name);
+    dmxInput->name    = NULL;
+}
+
+/** Log information about all of the known devices using #dmxLog(). */
+void dmxInputLogDevices(void)
+{
+    int i, j;
+
+    dmxLog(dmxInfo, "%d devices:\n", dmxGetInputCount());
+    dmxLog(dmxInfo, "  Id  Name                 Classes\n");
+    for (j = 0; j < dmxNumInputs; j++) {
+        DMXInputInfo *dmxInput = &dmxInputs[j];
+        const char   *pt = strchr(dmxInput->name, ',');
+        int          len = (pt
+                            ? (size_t)(pt-dmxInput->name)
+                            : strlen(dmxInput->name));
+
+        for (i = 0; i < dmxInput->numDevs; i++) {
+            DeviceIntPtr pDevice = dmxInput->devs[i]->pDevice;
+            if (pDevice) {
+                dmxLog(dmxInfo, "  %2d%c %-20.20s",
+                       pDevice->id,
+                       dmxInput->detached ? 'D' : ' ',
+                       pDevice->name);
+                if (pDevice->key)        dmxLogCont(dmxInfo, " key");
+                if (pDevice->valuator)   dmxLogCont(dmxInfo, " val");
+                if (pDevice->button)     dmxLogCont(dmxInfo, " btn");
+                if (pDevice->focus)      dmxLogCont(dmxInfo, " foc");
+                if (pDevice->kbdfeed)    dmxLogCont(dmxInfo, " fb/kbd");
+                if (pDevice->ptrfeed)    dmxLogCont(dmxInfo, " fb/ptr");
+                if (pDevice->intfeed)    dmxLogCont(dmxInfo, " fb/int");
+                if (pDevice->stringfeed) dmxLogCont(dmxInfo, " fb/str");
+                if (pDevice->bell)       dmxLogCont(dmxInfo, " fb/bel");
+                if (pDevice->leds)       dmxLogCont(dmxInfo, " fb/led");
+                if (!pDevice->key && !pDevice->valuator && !pDevice->button
+                    && !pDevice->focus && !pDevice->kbdfeed
+                    && !pDevice->ptrfeed && !pDevice->intfeed
+                    && !pDevice->stringfeed && !pDevice->bell
+                    && !pDevice->leds)   dmxLogCont(dmxInfo, " (none)");
+                                                                 
+                dmxLogCont(dmxInfo, "\t[i%d/%*.*s",
+                           dmxInput->inputIdx, len, len, dmxInput->name);
+                if (dmxInput->devs[i]->deviceId >= 0)
+                    dmxLogCont(dmxInfo, "/id%d", dmxInput->devs[i]->deviceId);
+                if (dmxInput->devs[i]->deviceName)
+                    dmxLogCont(dmxInfo, "=%s", dmxInput->devs[i]->deviceName);
+                dmxLogCont(dmxInfo, "] %s\n",
+                           dmxInput->devs[i]->isCore
+                           ? "core"
+                           : (dmxInput->devs[i]->sendsCore
+                              ? "extension (sends core events)"
+                              : "extension"));
+            }
+        }
+    }
+}
+
+/** Detach an input */
+int dmxInputDetach(DMXInputInfo *dmxInput)
+{
+    int i;
+
+    if (dmxInput->detached) return BadAccess;
+    
+    for (i = 0; i < dmxInput->numDevs; i++) {
+        DMXLocalInputInfoPtr dmxLocal = dmxInput->devs[i];
+        dmxLogInput(dmxInput, "Detaching device id %d: %s%s\n",
+                    dmxLocal->pDevice->id,
+                    dmxLocal->pDevice->name,
+                    dmxLocal->isCore
+                    ? " [core]"
+                    : (dmxLocal->sendsCore
+                       ? " [sends core events]"
+                       : ""));
+        DisableDevice(dmxLocal->pDevice, TRUE);
+    }
+    dmxInput->detached = True;
+    dmxInputLogDevices();
+    return 0;
+}
+
+/** Search for input associated with \a dmxScreen, and detach. */
+void dmxInputDetachAll(DMXScreenInfo *dmxScreen)
+{
+    int i;
+
+    for (i = 0; i < dmxNumInputs; i++) {
+        DMXInputInfo *dmxInput = &dmxInputs[i];
+        if (dmxInput->scrnIdx == dmxScreen->index) dmxInputDetach(dmxInput);
+    }
+}
+
+/** Search for input associated with \a deviceId, and detach. */
+int dmxInputDetachId(int id)
+{
+    DMXInputInfo *dmxInput = dmxInputLocateId(id);
+
+    if (!dmxInput) return BadValue;
+    
+    return dmxInputDetach(dmxInput);
+}
+
+DMXInputInfo *dmxInputLocateId(int id)
+{
+    int i, j;
+    
+    for (i = 0; i < dmxNumInputs; i++) {
+        DMXInputInfo *dmxInput = &dmxInputs[i];
+        for (j = 0; j < dmxInput->numDevs; j++) {
+            DMXLocalInputInfoPtr dmxLocal = dmxInput->devs[j];
+            if (dmxLocal->pDevice->id == id) return dmxInput;
+        }
+    }
+    return NULL;
+}
+
+static int dmxInputAttachNew(DMXInputInfo *dmxInput, int *id)
+{
+    dmxInputInit(dmxInput);
+    InitAndStartDevices();
+    if (id && dmxInput->devs) *id = dmxInput->devs[0]->pDevice->id;
+    dmxInputLogDevices();
+    return 0;
+}
+
+static int dmxInputAttachOld(DMXInputInfo *dmxInput, int *id)
+{
+    int i;
+    
+    dmxInput->detached = False;
+    for (i = 0; i < dmxInput->numDevs; i++) {
+        DMXLocalInputInfoPtr dmxLocal = dmxInput->devs[i];
+        if (id) *id = dmxLocal->pDevice->id;
+        dmxLogInput(dmxInput,
+                    "Attaching device id %d: %s%s\n",
+                    dmxLocal->pDevice->id,
+                    dmxLocal->pDevice->name,
+                    dmxLocal->isCore
+                    ? " [core]"
+                    : (dmxLocal->sendsCore
+                       ? " [sends core events]"
+                       : ""));
+        EnableDevice(dmxLocal->pDevice, TRUE);
+    }
+    dmxInputLogDevices();
+    return 0;
+}
+
+int dmxInputAttachConsole(const char *name, int isCore, int *id)
+{
+    DMXInputInfo  *dmxInput;
+    int           i;
+
+    for (i = 0; i < dmxNumInputs; i++) {
+        dmxInput = &dmxInputs[i];
+        if (dmxInput->scrnIdx == -1
+            && dmxInput->detached
+            && !strcmp(dmxInput->name, name)) {
+                                /* Found match */
+            dmxLogInput(dmxInput, "Reattaching detached console input\n");
+            return dmxInputAttachOld(dmxInput, id);
+        }
+    }
+
+                                /* No match found */
+    dmxInput = dmxConfigAddInput(xstrdup(name), isCore);
+    dmxInput->freename = TRUE;
+    dmxLogInput(dmxInput, "Attaching new console input\n");
+    return dmxInputAttachNew(dmxInput, id);
+}
+
+int dmxInputAttachBackend(int physicalScreen, int isCore, int *id)
+{
+    DMXInputInfo  *dmxInput;
+    DMXScreenInfo *dmxScreen;
+    int           i;
+    
+    if (physicalScreen < 0 || physicalScreen >= dmxNumScreens) return BadValue;
+    for (i = 0; i < dmxNumInputs; i++) {
+        dmxInput = &dmxInputs[i];
+        if (dmxInput->scrnIdx != -1 && dmxInput->scrnIdx == physicalScreen) {
+                                /* Found match */
+            if (!dmxInput->detached) return BadAccess; /* Already attached */
+            dmxScreen = &dmxScreens[physicalScreen];
+            if (!dmxScreen->beDisplay) return BadAccess; /* Screen detached */
+            dmxLogInput(dmxInput, "Reattaching detached backend input\n");
+            return dmxInputAttachOld(dmxInput, id);
+        }
+    }
+                                /* No match found */
+    dmxScreen = &dmxScreens[physicalScreen];
+    if (!dmxScreen->beDisplay) return BadAccess; /* Screen detached */
+    dmxInput = dmxConfigAddInput(dmxScreen->name, isCore);
+    dmxLogInput(dmxInput, "Attaching new backend input\n");
+    return dmxInputAttachNew(dmxInput, id);
+}
diff --git a/xorg-server/hw/xfree86/doc/man/Makefile.am b/xorg-server/hw/xfree86/doc/man/Makefile.am
index fe330a72c..80e22cbab 100644
--- a/xorg-server/hw/xfree86/doc/man/Makefile.am
+++ b/xorg-server/hw/xfree86/doc/man/Makefile.am
@@ -1,3 +1,3 @@
 include $(top_srcdir)/manpages.am
 appman_PRE = Xorg.man
-fileman_PRE = xorg.conf.man
+fileman_PRE = xorg.conf.man xorg.conf.d.man
diff --git a/xorg-server/hw/xfree86/doc/man/xorg.conf.d.man b/xorg-server/hw/xfree86/doc/man/xorg.conf.d.man
new file mode 100644
index 000000000..6b3379ece
--- /dev/null
+++ b/xorg-server/hw/xfree86/doc/man/xorg.conf.d.man
@@ -0,0 +1 @@
+.so man__filemansuffix__/xorg.conf.__filemansuffix__
diff --git a/xorg-server/hw/xwin/InitOutput.c b/xorg-server/hw/xwin/InitOutput.c
index fea4a34f9..7faed0170 100644
--- a/xorg-server/hw/xwin/InitOutput.c
+++ b/xorg-server/hw/xwin/InitOutput.c
@@ -1,1108 +1,1111 @@
-

-/*

-

-Copyright 1993, 1998  The Open Group

-Copyright (C) Colin Harrison 2005-2008

-

-Permission to use, copy, modify, distribute, and sell this software and its

-documentation for any purpose is hereby granted without fee, provided that

-the above copyright notice appear in all copies and that both that

-copyright notice and this permission notice appear in supporting

-documentation.

-

-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 OPEN GROUP 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 Open Group 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 Open Group.

-

-*/

-

-#ifdef HAVE_XWIN_CONFIG_H

-#include <xwin-config.h>

-#endif

-#include "win.h"

-#include "winmsg.h"

-#include "winconfig.h"

-#include "winprefs.h"

-#ifdef XWIN_CLIPBOARD

-#include "X11/Xlocale.h"

-#endif

-#ifdef DPMSExtension

-#include "dpmsproc.h"

-#endif

-#ifdef __CYGWIN__

-#include <mntent.h>

-#endif

-#if defined(WIN32)

-#include "xkbsrv.h"

-#endif

-#ifdef RELOCATE_PROJECTROOT

-#include <shlobj.h>

-typedef HRESULT (*SHGETFOLDERPATHPROC)(

-    HWND hwndOwner,

-    int nFolder,

-    HANDLE hToken,

-    DWORD dwFlags,

-    LPTSTR pszPath

-);

-#endif

-

-/*

- * References to external symbols

- */

-#ifdef XWIN_CLIPBOARD

-extern Bool			g_fUnicodeClipboard;

-extern Bool			g_fClipboardLaunched;

-extern Bool			g_fClipboardStarted;

-extern pthread_t		g_ptClipboardProc;

-extern HWND			g_hwndClipboard;

-extern Bool			g_fClipboard;

-#endif

-

-

-/*

-  module handle for dynamically loaded comctl32 library

-*/

-static HMODULE g_hmodCommonControls = NULL;

-

-/*

- * Function prototypes

- */

-

-#ifdef XWIN_CLIPBOARD

-static void

-winClipboardShutdown (void);

-#endif

-

-#if defined(DDXOSVERRORF)

-void

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

-#endif

-

-static Bool

-winCheckDisplayNumber (void);

-

-void

-winLogCommandLine (int argc, char *argv[]);

-

-void

-winLogVersionInfo (void);

-

-Bool

-winValidateArgs (void);

-

-#ifdef RELOCATE_PROJECTROOT

-const char *

-winGetBaseDir(void);

-#endif

-

-/*

- * For the depth 24 pixmap we default to 32 bits per pixel, but

- * we change this pixmap format later if we detect that the display

- * is going to be running at 24 bits per pixel.

- *

- * FIXME: On second thought, don't DIBs only support 32 bits per pixel?

- * DIBs are the underlying bitmap used for DirectDraw surfaces, so it

- * seems that all pixmap formats with depth 24 would be 32 bits per pixel.

- * Confirm whether depth 24 DIBs can have 24 bits per pixel, then remove/keep

- * the bits per pixel adjustment and update this comment to reflect the

- * situation.  Harold Hunt - 2002/07/02

- */

-

-static PixmapFormatRec g_PixmapFormats[] = {

-  { 1,    1,      BITMAP_SCANLINE_PAD },

-  { 4,    8,      BITMAP_SCANLINE_PAD },

-  { 8,    8,      BITMAP_SCANLINE_PAD },

-  { 15,   16,     BITMAP_SCANLINE_PAD },

-  { 16,   16,     BITMAP_SCANLINE_PAD },

-  { 24,   32,     BITMAP_SCANLINE_PAD },

-  { 32,   32,     BITMAP_SCANLINE_PAD }

-};

-

-const int NUMFORMATS = sizeof (g_PixmapFormats) / sizeof (g_PixmapFormats[0]);

-

-#ifdef XWIN_CLIPBOARD

-static void

-winClipboardShutdown (void)

-{

-  /* Close down clipboard resources */

-  if (g_fClipboard && g_fClipboardLaunched && g_fClipboardStarted)

-    {

-      /* Synchronously destroy the clipboard window */

-      if (g_hwndClipboard != NULL)

-	{

-	  SendMessage (g_hwndClipboard, WM_DESTROY, 0, 0);

-	  /* NOTE: g_hwndClipboard is set to NULL in winclipboardthread.c */

-	}

-      else

-	return;

-      

-      /* Wait for the clipboard thread to exit */

-      pthread_join (g_ptClipboardProc, NULL);

-

-      g_fClipboardLaunched = FALSE;

-      g_fClipboardStarted = FALSE;

-

-      winDebug ("winClipboardShutdown - Clipboard thread has exited.\n");

-    }

-}

-#endif

-

-void

-ddxPushProviders(void)

-{

-#ifdef XWIN_GLX_WINDOWS

-  if (g_fNativeGl)

-    {

-      /* install the native GL provider */

-      glxWinPushNativeProvider();

-    }

-#endif

-}

-

-#if defined(DDXBEFORERESET)

-/*

- * Called right before KillAllClients when the server is going to reset,

- * allows us to shutdown our seperate threads cleanly.

- */

-

-void

-ddxBeforeReset (void)

-{

-  winDebug ("ddxBeforeReset - Hello\n");

-

-#ifdef XWIN_CLIPBOARD

-  winClipboardShutdown ();

-#endif

-}

-#endif

-

-

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

-void

-ddxGiveUp (void)

-{

-  int		i;

-

-#if CYGDEBUG

-  winDebug ("ddxGiveUp\n");

-#endif

-

-  /* Perform per-screen deinitialization */

-  for (i = 0; i < g_iNumScreens; ++i)

-    {

-      /* Delete the tray icon */

-      if (!g_ScreenInfo[i].fNoTrayIcon && g_ScreenInfo[i].pScreen)

- 	winDeleteNotifyIcon (winGetScreenPriv (g_ScreenInfo[i].pScreen));

-    }

-

-#ifdef XWIN_MULTIWINDOW

-  /* Notify the worker threads we're exiting */

-  winDeinitMultiWindowWM ();

-#endif

-

-#ifdef HAS_DEVWINDOWS

-  /* Close our handle to our message queue */

-  if (g_fdMessageQueue != WIN_FD_INVALID)

-    {

-      /* Close /dev/windows */

-      close (g_fdMessageQueue);

-

-      /* Set the file handle to invalid */

-      g_fdMessageQueue = WIN_FD_INVALID;

-    }

-#endif

-

-  if (!g_fLogInited) {

-    g_pszLogFile = LogInit (g_pszLogFile, NULL);

-    g_fLogInited = TRUE;

-  }  

-  LogClose ();

-

-  /*

-   * At this point we aren't creating any new screens, so

-   * we are guaranteed to not need the DirectDraw functions.

-   */

-  winReleaseDDProcAddresses();

-

-  /* Unload our TrackMouseEvent function pointer */

-  if (g_hmodCommonControls != NULL)

-    {

-      FreeLibrary (g_hmodCommonControls);

-      g_hmodCommonControls = NULL;

-      g_fpTrackMouseEvent = (FARPROC) (void (*)(void))NoopDDA;

-    }

-  

-  /* Free concatenated command line */

-  free(g_pszCommandLine);

-  g_pszCommandLine = NULL;

-

-  /* Remove our keyboard hook if it is installed */

-  winRemoveKeyboardHookLL ();

-

-  /* Tell Windows that we want to end the app */

-  PostQuitMessage (0);

-}

-

-

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

-void

-AbortDDX (void)

-{

-#if CYGDEBUG

-  winDebug ("AbortDDX\n");

-#endif

-  ddxGiveUp ();

-}

-

-#ifdef __CYGWIN__

-/* hasmntopt is currently not implemented for cygwin */

-static const char *winCheckMntOpt(const struct mntent *mnt, const char *opt)

-{

-    const char *s;

-    size_t len;

-    if (mnt == NULL)

-        return NULL;

-    if (opt == NULL)

-        return NULL;

-    if (mnt->mnt_opts == NULL)

-        return NULL;

-

-    len = strlen(opt);

-    s = strstr(mnt->mnt_opts, opt);

-    if (s == NULL)

-        return NULL;

-    if ((s == mnt->mnt_opts || *(s-1) == ',') &&  (s[len] == 0 || s[len] == ','))

-        return (char *)opt;

-    return NULL;

-}

-

-static void

-winCheckMount(void)

-{

-  FILE *mnt;

-  struct mntent *ent;

-

-  enum { none = 0, sys_root, user_root, sys_tmp, user_tmp } 

-    level = none, curlevel;

-  BOOL binary = TRUE;

-

-  mnt = setmntent("/etc/mtab", "r");

-  if (mnt == NULL)

-  {

-    ErrorF("setmntent failed");

-    return;

-  }

-

-  while ((ent = getmntent(mnt)) != NULL)

-  {

-    BOOL system = (winCheckMntOpt(ent, "user") != NULL);

-    BOOL root = (strcmp(ent->mnt_dir, "/") == 0);

-    BOOL tmp = (strcmp(ent->mnt_dir, "/tmp") == 0);

-    

-    if (system)

-    {

-      if (root)

-        curlevel = sys_root;

-      else if (tmp)

-        curlevel = sys_tmp;

-      else

-        continue;

-    }

-    else

-    {

-      if (root)

-        curlevel = user_root;

-      else if (tmp) 

-        curlevel = user_tmp;

-      else

-        continue;

-    }

-

-    if (curlevel <= level)

-      continue;

-    level = curlevel;

-

-    if ((winCheckMntOpt(ent, "binary") == NULL) &&

-        (winCheckMntOpt(ent, "binmode") == NULL))

-      binary = FALSE;

-    else

-      binary = TRUE;

-  }

-    

-  if (endmntent(mnt) != 1)

-  {

-    ErrorF("endmntent failed");

-    return;

-  }

-  

- if (!binary) 

-   winMsg(X_WARNING, "/tmp mounted in textmode\n");

-}

-#else

-static void

-winCheckMount(void) 

-{

-}

-#endif

-

-#ifdef RELOCATE_PROJECTROOT

-const char * 

-winGetBaseDir(void)

-{

-    static BOOL inited = FALSE;

-    static char buffer[MAX_PATH];

-    if (!inited)

-    {

-        char *fendptr;

-        HMODULE module = GetModuleHandle(NULL);

-        DWORD size = GetModuleFileName(module, buffer, sizeof(buffer));

-        if (sizeof(buffer) > 0)

-            buffer[sizeof(buffer)-1] = 0;

-    

-        fendptr = buffer + size;

-        while (fendptr > buffer)

-        {

-            if (*fendptr == '\\' || *fendptr == '/')

-            {

-                *fendptr = 0;

-                break;

-            }

-            fendptr--;

-        }

-        inited = TRUE;

-    }

-    return buffer;

-}

-#endif

-

-static void

-winFixupPaths (void)

-{

-    BOOL changed_fontpath = FALSE;

-    MessageType font_from = X_DEFAULT;

-#ifdef RELOCATE_PROJECTROOT

-    const char *basedir = winGetBaseDir();

-    size_t basedirlen = strlen(basedir);

-#endif

-

-#ifdef READ_FONTDIRS

-    {

-        /* Open fontpath configuration file */

-        FILE *fontdirs = fopen(ETCX11DIR "/font-dirs", "rt");

-        if (fontdirs != NULL)

-        {

-            char buffer[256];

-            int needs_sep = TRUE; 

-            int comment_block = FALSE;

-

-            /* get default fontpath */

-            char *fontpath = strdup(defaultFontPath);

-            size_t size = strlen(fontpath);

-

-            /* read all lines */

-            while (!feof(fontdirs))

-            {

-                size_t blen;

-                char *hashchar;

-                char *str;

-                int has_eol = FALSE;

-

-                /* read one line */

-                str = fgets(buffer, sizeof(buffer), fontdirs);

-                if (str == NULL) /* stop on error or eof */

-                    break;

-

-                if (strchr(str, '\n') != NULL)

-                    has_eol = TRUE;

-

-                /* check if block is continued comment */

-                if (comment_block)

-                {

-                    /* ignore all input */

-                    *str = 0; 

-                    blen = 0; 

-                    if (has_eol) /* check if line ended in this block */

-                        comment_block = FALSE;

-                }

-                else 

-                {

-                    /* find comment character. ignore all trailing input */

-                    hashchar = strchr(str, '#');

-                    if (hashchar != NULL)

-                    {

-                        *hashchar = 0;

-                        if (!has_eol) /* mark next block as continued comment */

-                            comment_block = TRUE;

-                    }

-                }

-

-                /* strip whitespaces from beginning */

-                while (*str == ' ' || *str == '\t')

-                    str++;

-

-                /* get size, strip whitespaces from end */ 

-                blen = strlen(str);

-                while (blen > 0 && (str[blen-1] == ' ' || 

-                            str[blen-1] == '\t' || str[blen-1] == '\n'))

-                {

-                    str[--blen] = 0;

-                }

-

-                /* still something left to add? */ 

-                if (blen > 0)

-                {

-                    size_t newsize = size + blen;

-                    /* reserve one character more for ',' */

-                    if (needs_sep)

-                        newsize++;

-

-                    /* allocate memory */

-                    if (fontpath == NULL)

-                        fontpath = malloc(newsize+1);

-                    else

-                        fontpath = realloc(fontpath, newsize+1);

-

-                    /* add separator */

-                    if (needs_sep)

-                    {

-                        fontpath[size] = ',';

-                        size++;

-                        needs_sep = FALSE;

-                    }

-

-                    /* mark next line as new entry */

-                    if (has_eol)

-                        needs_sep = TRUE;

-

-                    /* add block */

-                    strncpy(fontpath + size, str, blen);

-                    fontpath[newsize] = 0;

-                    size = newsize;

-                }

-            }

-

-            /* cleanup */

-            fclose(fontdirs);  

-            defaultFontPath = strdup(fontpath);

-            free(fontpath);

-            changed_fontpath = TRUE;

-            font_from = X_CONFIG;

-        }

-    }

-#endif /* READ_FONTDIRS */

-#ifdef RELOCATE_PROJECTROOT

-    {

-        const char *libx11dir = PROJECTROOT "/lib/X11";

-        size_t libx11dir_len = strlen(libx11dir);

-        char *newfp = NULL;

-        size_t newfp_len = 0;

-        const char *endptr, *ptr, *oldptr = defaultFontPath;

-

-        endptr = oldptr + strlen(oldptr);

-        ptr = strchr(oldptr, ',');

-        if (ptr == NULL)

-            ptr = endptr;

-        while (ptr != NULL)

-        {

-            size_t oldfp_len = (ptr - oldptr);

-            size_t newsize = oldfp_len;

-            char *newpath = malloc(newsize + 1);

-            strncpy(newpath, oldptr, newsize);

-            newpath[newsize] = 0;

-

-

-            if (strncmp(libx11dir, newpath, libx11dir_len) == 0)

-            {

-                char *compose;

-                newsize = newsize - libx11dir_len + basedirlen;

-                compose = malloc(newsize + 1);  

-                strcpy(compose, basedir);

-                strncat(compose, newpath + libx11dir_len, newsize - basedirlen);

-                compose[newsize] = 0;

-                free(newpath);

-                newpath = compose;

-            }

-

-            oldfp_len = newfp_len;

-            if (oldfp_len > 0)

-                newfp_len ++; /* space for separator */

-            newfp_len += newsize;

-

-            if (newfp == NULL)

-                newfp = malloc(newfp_len + 1);

-            else

-                newfp = realloc(newfp, newfp_len + 1);

-

-            if (oldfp_len > 0)

-            {

-                strcpy(newfp + oldfp_len, ",");

-                oldfp_len++;

-            }

-            strcpy(newfp + oldfp_len, newpath);

-

-            free(newpath);

-

-            if (*ptr == 0)

-            {

-                oldptr = ptr;

-                ptr = NULL;

-            } else

-            {

-                oldptr = ptr + 1;

-                ptr = strchr(oldptr, ',');

-                if (ptr == NULL)

-                    ptr = endptr;

-            }

-        } 

-

-        defaultFontPath = strdup(newfp);

-        free(newfp);

-        changed_fontpath = TRUE;

-    }

-#endif /* RELOCATE_PROJECTROOT */

-    if (changed_fontpath)

-        winMsg (font_from, "FontPath set to \"%s\"\n", defaultFontPath);

-

-#ifdef RELOCATE_PROJECTROOT

-    if (getenv("XKEYSYMDB") == NULL)

-    {

-        char buffer[MAX_PATH];

-        snprintf(buffer, sizeof(buffer), "XKEYSYMDB=%s\\XKeysymDB",

-                basedir);

-        buffer[sizeof(buffer)-1] = 0;

-        putenv(buffer);

-    }

-    if (getenv("XERRORDB") == NULL)

-    {

-        char buffer[MAX_PATH];

-        snprintf(buffer, sizeof(buffer), "XERRORDB=%s\\XErrorDB",

-                basedir);

-        buffer[sizeof(buffer)-1] = 0;

-        putenv(buffer);

-    }

-    if (getenv("XLOCALEDIR") == NULL)

-    {

-        char buffer[MAX_PATH];

-        snprintf(buffer, sizeof(buffer), "XLOCALEDIR=%s\\locale",

-                basedir);

-        buffer[sizeof(buffer)-1] = 0;

-        putenv(buffer);

-    }

-    if (getenv("HOME") == NULL)

-    {

-        HMODULE shfolder;

-        SHGETFOLDERPATHPROC shgetfolderpath = NULL;

-        char buffer[MAX_PATH + 5];

-        strncpy(buffer, "HOME=", 5);

-

-        /* Try to load SHGetFolderPath from shfolder.dll and shell32.dll */

-        

-        shfolder = LoadLibrary("shfolder.dll");

-        /* fallback to shell32.dll */

-        if (shfolder == NULL)

-            shfolder = LoadLibrary("shell32.dll");

-

-        /* resolve SHGetFolderPath */

-        if (shfolder != NULL)

-            shgetfolderpath = (SHGETFOLDERPATHPROC)GetProcAddress(shfolder, "SHGetFolderPathA");

-

-        /* query appdata directory */

-        if (shgetfolderpath &&

-                shgetfolderpath(NULL, CSIDL_APPDATA|CSIDL_FLAG_CREATE, NULL, 0, 

-                    buffer + 5) == 0)

-        { 

-            putenv(buffer);

-        } else

-        {

-            winMsg (X_ERROR, "Can not determine HOME directory\n");

-        } 

-        if (shfolder != NULL)

-            FreeLibrary(shfolder);

-    }

-    if (!g_fLogFileChanged) {

-        static char buffer[MAX_PATH];

-        DWORD size = GetTempPath(sizeof(buffer), buffer);

-        if (size && size < sizeof(buffer))

-        {

-            snprintf(buffer + size, sizeof(buffer) - size, 

-                    "XWin.%s.log", display); 

-            buffer[sizeof(buffer)-1] = 0;

-            g_pszLogFile = buffer;

-            winMsg (X_DEFAULT, "Logfile set to \"%s\"\n", g_pszLogFile);

-        }

-    }

-    {

-        static char xkbbasedir[MAX_PATH];

-

-        snprintf(xkbbasedir, sizeof(xkbbasedir), "%s\\xkb", basedir);

-        if (sizeof(xkbbasedir) > 0)

-            xkbbasedir[sizeof(xkbbasedir)-1] = 0;

-        XkbBaseDirectory = xkbbasedir;

-	XkbBinDirectory = basedir;

-    }

-#endif /* RELOCATE_PROJECTROOT */

-}

-

-void

-OsVendorInit (void)

-{

-  /* Re-initialize global variables on server reset */

-  winInitializeGlobals ();

-

-  winFixupPaths();

-

-#ifdef DDXOSVERRORF

-  if (!OsVendorVErrorFProc)

-    OsVendorVErrorFProc = OsVendorVErrorF;

-#endif

-

-  if (!g_fLogInited) {

-    /* keep this order. If LogInit fails it calls Abort which then calls

-     * ddxGiveUp where LogInit is called again and creates an infinite 

-     * recursion. If we set g_fLogInited to TRUE before the init we 

-     * avoid the second call 

-     */  

-    g_fLogInited = TRUE;

-    g_pszLogFile = LogInit (g_pszLogFile, NULL);

-  } 

-  LogSetParameter (XLOG_FLUSH, 1);

-  LogSetParameter (XLOG_VERBOSITY, g_iLogVerbose);

-  LogSetParameter (XLOG_FILE_VERBOSITY, g_iLogVerbose);

-

-  /* Log the version information */

-  if (serverGeneration == 1)

-    winLogVersionInfo ();

-

-  winCheckMount();  

-

-  /* Add a default screen if no screens were specified */

-  if (g_iNumScreens == 0)

-    {

-      winDebug ("OsVendorInit - Creating default screen 0\n");

-

-      /*

-       * We need to initialize the default screen 0 if no -screen

-       * arguments were processed.

-       *

-       * Add a screen 0 using the defaults set by winInitializeDefaultScreens()

-       * and any additional default screen parameters given

-       */

-      winInitializeScreens(1);

-

-      /* We have to flag this as an explicit screen, even though it isn't */

-      g_ScreenInfo[0].fExplicitScreen = TRUE;

-    }

-}

-

-

-static void

-winUseMsg (void)

-{

-  ErrorF("\n");

-  ErrorF("\n");

-  ErrorF(EXECUTABLE_NAME " Device Dependent Usage:\n");

-  ErrorF("\n");

-

-#ifdef XWIN_CLIPBOARD

-  ErrorF ("-[no]clipboard\n"

-	  "\tEnable [disable] the clipboard integration. Default is enabled.\n");

-#endif

-

-  ErrorF ("-clipupdates num_boxes\n"

-	  "\tUse a clipping region to constrain shadow update blits to\n"

-	  "\tthe updated region when num_boxes, or more, are in the\n"

-	  "\tupdated region.\n");

-

-#ifdef XWIN_XF86CONFIG

-  ErrorF ("-config\n"

-          "\tSpecify a configuration file.\n");

-

-  ErrorF ("-configdir\n"

-          "\tSpecify a configuration directory.\n");

-#endif

-

-  ErrorF ("-depth bits_per_pixel\n"

-	  "\tSpecify an optional bitdepth to use in fullscreen mode\n"

-	  "\twith a DirectDraw engine.\n");

-

-  ErrorF ("-emulate3buttons [timeout]\n"

-	  "\tEmulate 3 button mouse with an optional timeout in\n"

-	  "\tmilliseconds.\n");

-

-#ifdef XWIN_EMULATEPSEUDO

-  ErrorF ("-emulatepseudo\n"

-	  "\tCreate a depth 8 PseudoColor visual when running in\n"

-	  "\tdepths 15, 16, 24, or 32, collectively known as TrueColor\n"

-	  "\tdepths.  The PseudoColor visual does not have correct colors,\n"

-	  "\tand it may crash, but it at least allows you to run your\n"

-	  "\tapplication in TrueColor modes.\n");

-#endif

-

-  ErrorF ("-engine engine_type_id\n"

-	  "\tOverride the server's automatically selected engine type:\n"

-	  "\t\t1 - Shadow GDI\n"

-	  "\t\t2 - Shadow DirectDraw\n"

-	  "\t\t4 - Shadow DirectDraw4 Non-Locking\n"

-#ifdef XWIN_NATIVEGDI

-	  "\t\t16 - Native GDI - experimental\n"

-#endif

-	  );

-

-  ErrorF ("-fullscreen\n"

-	  "\tRun the server in fullscreen mode.\n");

-

-  ErrorF ("-ignoreinput\n"

-	  "\tIgnore keyboard and mouse input.\n");

-

-#ifdef XWIN_MULTIWINDOWEXTWM

-  ErrorF ("-internalwm\n"

-	  "\tRun the internal window manager.\n");

-#endif

-

-#ifdef XWIN_XF86CONFIG

-  ErrorF ("-keyboard\n"

-	  "\tSpecify a keyboard device from the configuration file.\n");

-#endif

-

-  ErrorF ("-[no]keyhook\n"

-	  "\tGrab special Windows keypresses like Alt-Tab or the Menu "

-          "key.\n");

-

-  ErrorF ("-lesspointer\n"

-	  "\tHide the windows mouse pointer when it is over any\n"

-          "\t" EXECUTABLE_NAME " window.  This prevents ghost cursors appearing when\n"

-	  "\tthe Windows cursor is drawn on top of the X cursor\n");

-

-  ErrorF ("-logfile filename\n"

-	  "\tWrite log messages to <filename>.\n");

-

-  ErrorF ("-logverbose verbosity\n"

-	  "\tSet the verbosity of log messages. [NOTE: Only a few messages\n"

-	  "\trespect the settings yet]\n"

-	  "\t\t0 - only print fatal error.\n"

-	  "\t\t1 - print additional configuration information.\n"

-	  "\t\t2 - print additional runtime information [default].\n"

-	  "\t\t3 - print debugging and tracing information.\n");

-

-  ErrorF ("-[no]multimonitors or -[no]multiplemonitors\n"

-	  "\tUse the entire virtual screen if multiple\n"

-	  "\tmonitors are present.\n");

-

-#ifdef XWIN_MULTIWINDOW

-  ErrorF ("-multiwindow\n"

-	  "\tRun the server in multi-window mode.\n");

-#endif

-

-#ifdef XWIN_MULTIWINDOWEXTWM

-  ErrorF ("-mwextwm\n"

-	  "\tRun the server in multi-window external window manager mode.\n");

-#endif

-

-  ErrorF ("-nodecoration\n"

-          "\tDo not draw a window border, title bar, etc.  Windowed\n"

-	  "\tmode only.\n");

-

-#ifdef XWIN_CLIPBOARD

-  ErrorF ("-nounicodeclipboard\n"

-	  "\tDo not use Unicode clipboard even if on a NT-based platform.\n");

-#endif

-

-  ErrorF ("-refresh rate_in_Hz\n"

-	  "\tSpecify an optional refresh rate to use in fullscreen mode\n"

-	  "\twith a DirectDraw engine.\n");

-

-  ErrorF ("-rootless\n"

-	  "\tRun the server in rootless mode.\n");

-

-  ErrorF ("-screen scr_num [width height [x y] | [[WxH[+X+Y]][@m]] ]\n"

-	  "\tEnable screen scr_num and optionally specify a width and\n"

-	  "\theight and initial position for that screen. Additionally\n"

-	  "\ta monitor number can be specified to start the server on,\n"

-	  "\tat which point, all coordinates become relative to that\n"

-      "\tmonitor (Not for Windows NT4 and 95). Examples:\n"

-      "\t -screen 0 800x600+100+100@2 ; 2nd monitor offset 100,100 size 800x600\n"

-      "\t -screen 0 1024x768@3        ; 3rd monitor size 1024x768\n"

-      "\t -screen 0 @1 ; on 1st monitor using its full resolution (the default)\n");

-

-  ErrorF ("-scrollbars\n"

-	  "\tIn windowed mode, allow screens bigger than the Windows desktop.\n"

-	  "\tMoreover, if the window has decorations, one can now resize\n"

-	  "\tit.\n");

-

-  ErrorF ("-silent-dup-error\n"

-	  "\tIf another instance of " EXECUTABLE_NAME " with the same display number is running\n"

-	  "\texit silently and don't display any error message.\n");

-

-  ErrorF ("-swcursor\n"

-	  "\tDisable the usage of the Windows cursor and use the X11 software\n"

-	  "\tcursor instead.\n");

-

-  ErrorF ("-[no]trayicon\n"

-          "\tDo not create a tray icon.  Default is to create one\n"

-	  "\ticon per screen.  You can globally disable tray icons with\n"

-	  "\t-notrayicon, then enable it for specific screens with\n"

-	  "\t-trayicon for those screens.\n");

-

-  ErrorF ("-[no]unixkill\n"

-          "\tCtrl+Alt+Backspace exits the X Server.\n");

-

-#ifdef XWIN_GLX_WINDOWS

-  ErrorF ("-[no]wgl\n"

-	  "\tEnable the GLX extension to use the native Windows WGL interface for accelerated OpenGL\n");

-#endif

-

-  ErrorF ("-[no]winkill\n"

-          "\tAlt+F4 exits the X Server.\n");

-

-  ErrorF ("-xkblayout XKBLayout\n"

-	  "\tEquivalent to XKBLayout in XF86Config files.\n"

-	  "\tFor example: -xkblayout de\n");

-

-  ErrorF ("-xkbmodel XKBModel\n"

-	  "\tEquivalent to XKBModel in XF86Config files.\n");

-

-  ErrorF ("-xkboptions XKBOptions\n"

-	  "\tEquivalent to XKBOptions in XF86Config files.\n");

-

-  ErrorF ("-xkbrules XKBRules\n"

-	  "\tEquivalent to XKBRules in XF86Config files.\n");

-

-  ErrorF ("-xkbvariant XKBVariant\n"

-	  "\tEquivalent to XKBVariant in XF86Config files.\n"

-	  "\tFor example: -xkbvariant nodeadkeys\n");

-}

-

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

-void

-ddxUseMsg(void)

-{

-  /* Set a flag so that FatalError won't give duplicate warning message */

-  g_fSilentFatalError = TRUE;

-  

-  winUseMsg();  

-

-  /* Log file will not be opened for UseMsg unless we open it now */

-  if (!g_fLogInited) {

-    g_pszLogFile = LogInit (g_pszLogFile, NULL);

-    g_fLogInited = TRUE;

-  }  

-  LogClose ();

-

-  /* Notify user where UseMsg text can be found.*/

-  if (!g_fNoHelpMessageBox)

-    winMessageBoxF ("The " PROJECT_NAME " help text has been printed to "

-		  "%s.\n"

-		  "Please open %s to read the help text.\n",

-		  MB_ICONINFORMATION, g_pszLogFile, g_pszLogFile);

-}

-

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

-/*

- * Do any global initialization, then initialize each screen.

- * 

- * NOTE: We use ddxProcessArgument, so we don't need to touch argc and argv

- */

-

-void

-InitOutput (ScreenInfo *screenInfo, int argc, char *argv[])

-{

-  int		i;

-

-  /* Log the command line */

-  winLogCommandLine (argc, argv);

-

-#if CYGDEBUG

-  winDebug ("InitOutput\n");

-#endif

-

-  /* Validate command-line arguments */

-  if (serverGeneration == 1 && !winValidateArgs ())

-    {

-      FatalError ("InitOutput - Invalid command-line arguments found.  "

-		  "Exiting.\n");

-    }

-

-  /* Check for duplicate invocation on same display number.*/

-  if (serverGeneration == 1 && !winCheckDisplayNumber ())

-    {

-      if (g_fSilentDupError)

-        g_fSilentFatalError = TRUE;  

-      FatalError ("InitOutput - Duplicate invocation on display "

-		  "number: %s.  Exiting.\n", display);

-    }

-

-#ifdef XWIN_XF86CONFIG

-  /* Try to read the xorg.conf-style configuration file */

-  if (!winReadConfigfile ())

-    winErrorFVerb (1, "InitOutput - Error reading config file\n");

-#else

-  winMsg(X_INFO, "xorg.conf is not supported\n");

-  winMsg(X_INFO, "See http://x.cygwin.com/docs/faq/cygwin-x-faq.html "

-         "for more information\n");

-  winConfigFiles ();

-#endif

-

-  /* Load preferences from XWinrc file */

-  LoadPreferences();

-

-  /* Setup global screen info parameters */

-  screenInfo->imageByteOrder = IMAGE_BYTE_ORDER;

-  screenInfo->bitmapScanlinePad = BITMAP_SCANLINE_PAD;

-  screenInfo->bitmapScanlineUnit = BITMAP_SCANLINE_UNIT;

-  screenInfo->bitmapBitOrder = BITMAP_BIT_ORDER;

-  screenInfo->numPixmapFormats = NUMFORMATS;

-  

-  /* Describe how we want common pixmap formats padded */

-  for (i = 0; i < NUMFORMATS; i++)

-    {

-      screenInfo->formats[i] = g_PixmapFormats[i];

-    }

-

-  /* Load pointers to DirectDraw functions */

-  winGetDDProcAddresses ();

-  

-  /* Detect supported engines */

-  winDetectSupportedEngines ();

-

-  /* Load common controls library */

-  g_hmodCommonControls = LoadLibraryEx ("comctl32.dll", NULL, 0);

-

-  /* Load TrackMouseEvent function pointer */  

-  g_fpTrackMouseEvent = GetProcAddress (g_hmodCommonControls,

-					 "_TrackMouseEvent");

-  if (g_fpTrackMouseEvent == NULL)

-    {

-      winErrorFVerb (1, "InitOutput - Could not get pointer to function\n"

-	      "\t_TrackMouseEvent in comctl32.dll.  Try installing\n"

-	      "\tInternet Explorer 3.0 or greater if you have not\n"

-	      "\talready.\n");

-

-      /* Free the library since we won't need it */

-      FreeLibrary (g_hmodCommonControls);

-      g_hmodCommonControls = NULL;

-

-      /* Set function pointer to point to no operation function */

-      g_fpTrackMouseEvent = (FARPROC) (void (*)(void))NoopDDA;

-    }

-

-  /* Store the instance handle */

-  g_hInstance = GetModuleHandle (NULL);

-

-  /* Initialize each screen */

-  for (i = 0; i < g_iNumScreens; ++i)

-    {

-      /* Initialize the screen */

-      if (-1 == AddScreen (winScreenInit, argc, argv))

-	{

-	  FatalError ("InitOutput - Couldn't add screen %d", i);

-	}

-    }

-

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

-

-  /* Generate a cookie used by internal clients for authorization */

-  if (g_fXdmcpEnabled || g_fAuthEnabled)

-    winGenerateAuthorization ();

-

-  /* Perform some one time initialization */

-  if (1 == serverGeneration)

-    {

-      /*

-       * setlocale applies to all threads in the current process.

-       * Apply locale specified in LANG environment variable.

-       */

-      setlocale (LC_ALL, "");

-    }

-#endif

-

-#if CYGDEBUG || YES

-  winDebug ("InitOutput - Returning.\n");

-#endif

-}

-

-

-/*

- * winCheckDisplayNumber - Check if another instance of Cygwin/X is

- * already running on the same display number.  If no one exists,

- * make a mutex to prevent new instances from running on the same display.

- *

- * return FALSE if the display number is already used.

- */

-

-static Bool

-winCheckDisplayNumber (void)

-{

-  int			nDisp;

-  HANDLE		mutex;

-  char			name[MAX_PATH];

-  char *		pszPrefix = '\0';

-  OSVERSIONINFO		osvi = {0};

-

-  /* Check display range */

-  nDisp = atoi (display);

-  if (nDisp < 0 || nDisp > 65535)

-    {

-      ErrorF ("winCheckDisplayNumber - Bad display number: %d\n", nDisp);

-      return FALSE;

-    }

-

-  /* Set first character of mutex name to null */

-  name[0] = '\0';

-

-  /* Get operating system version information */

-  osvi.dwOSVersionInfoSize = sizeof (osvi);

-  GetVersionEx (&osvi);

-

-  /* Want a mutex shared among all terminals on NT > 4.0 */

-  if (osvi.dwPlatformId == VER_PLATFORM_WIN32_NT

-      && osvi.dwMajorVersion >= 5)

-    {

-      pszPrefix = "Global\\";

-    }

-

-  /* Setup Cygwin/X specific part of name */

-  snprintf (name, sizeof(name), "%sCYGWINX_DISPLAY:%d", pszPrefix, nDisp);

-

-  /* Windows automatically releases the mutex when this process exits */

-  mutex = CreateMutex (NULL, FALSE, name);

-  if (!mutex)

-    {

-      LPVOID lpMsgBuf;

-

-      /* Display a fancy error message */

-      FormatMessage (FORMAT_MESSAGE_ALLOCATE_BUFFER | 

-		     FORMAT_MESSAGE_FROM_SYSTEM | 

-		     FORMAT_MESSAGE_IGNORE_INSERTS,

-		     NULL,

-		     GetLastError (),

-		     MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),

-		     (LPTSTR) &lpMsgBuf,

-		     0, NULL);

-      ErrorF ("winCheckDisplayNumber - CreateMutex failed: %s\n",

-	      (LPSTR)lpMsgBuf);

-      LocalFree (lpMsgBuf);

-

-      return FALSE;

-    }

-  if (GetLastError () == ERROR_ALREADY_EXISTS)

-    {

-      ErrorF ("winCheckDisplayNumber - "

-	      PROJECT_NAME " is already running on display %d\n",

-	      nDisp);

-      return FALSE;

-    }

-

-  return TRUE;

-}

+
+/*
+
+Copyright 1993, 1998  The Open Group
+Copyright (C) Colin Harrison 2005-2008
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.
+
+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 OPEN GROUP 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 Open Group 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 Open Group.
+
+*/
+
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
+#include "win.h"
+#include "winmsg.h"
+#include "winconfig.h"
+#include "winprefs.h"
+#ifdef XWIN_CLIPBOARD
+#include "X11/Xlocale.h"
+#endif
+#ifdef DPMSExtension
+#include "dpmsproc.h"
+#endif
+#ifdef __CYGWIN__
+#include <mntent.h>
+#endif
+#if defined(WIN32)
+#include "xkbsrv.h"
+#endif
+#ifdef RELOCATE_PROJECTROOT
+#include <shlobj.h>
+typedef HRESULT (*SHGETFOLDERPATHPROC)(
+    HWND hwndOwner,
+    int nFolder,
+    HANDLE hToken,
+    DWORD dwFlags,
+    LPTSTR pszPath
+);
+#endif
+
+/*
+ * References to external symbols
+ */
+#ifdef XWIN_CLIPBOARD
+extern Bool			g_fUnicodeClipboard;
+extern Bool			g_fClipboardLaunched;
+extern Bool			g_fClipboardStarted;
+extern pthread_t		g_ptClipboardProc;
+extern HWND			g_hwndClipboard;
+extern Bool			g_fClipboard;
+#endif
+
+
+/*
+  module handle for dynamically loaded comctl32 library
+*/
+static HMODULE g_hmodCommonControls = NULL;
+
+/*
+ * Function prototypes
+ */
+
+#ifdef XWIN_CLIPBOARD
+static void
+winClipboardShutdown (void);
+#endif
+
+#if defined(DDXOSVERRORF)
+void
+OsVendorVErrorF (const char *pszFormat, va_list va_args);
+#endif
+
+static Bool
+winCheckDisplayNumber (void);
+
+void
+winLogCommandLine (int argc, char *argv[]);
+
+void
+winLogVersionInfo (void);
+
+Bool
+winValidateArgs (void);
+
+#ifdef RELOCATE_PROJECTROOT
+const char *
+winGetBaseDir(void);
+#endif
+
+/*
+ * For the depth 24 pixmap we default to 32 bits per pixel, but
+ * we change this pixmap format later if we detect that the display
+ * is going to be running at 24 bits per pixel.
+ *
+ * FIXME: On second thought, don't DIBs only support 32 bits per pixel?
+ * DIBs are the underlying bitmap used for DirectDraw surfaces, so it
+ * seems that all pixmap formats with depth 24 would be 32 bits per pixel.
+ * Confirm whether depth 24 DIBs can have 24 bits per pixel, then remove/keep
+ * the bits per pixel adjustment and update this comment to reflect the
+ * situation.  Harold Hunt - 2002/07/02
+ */
+
+static PixmapFormatRec g_PixmapFormats[] = {
+  { 1,    1,      BITMAP_SCANLINE_PAD },
+  { 4,    8,      BITMAP_SCANLINE_PAD },
+  { 8,    8,      BITMAP_SCANLINE_PAD },
+  { 15,   16,     BITMAP_SCANLINE_PAD },
+  { 16,   16,     BITMAP_SCANLINE_PAD },
+  { 24,   32,     BITMAP_SCANLINE_PAD },
+  { 32,   32,     BITMAP_SCANLINE_PAD }
+};
+
+const int NUMFORMATS = sizeof (g_PixmapFormats) / sizeof (g_PixmapFormats[0]);
+
+#ifdef XWIN_CLIPBOARD
+static void
+winClipboardShutdown (void)
+{
+  /* Close down clipboard resources */
+  if (g_fClipboard && g_fClipboardLaunched && g_fClipboardStarted)
+    {
+      /* Synchronously destroy the clipboard window */
+      if (g_hwndClipboard != NULL)
+	{
+	  SendMessage (g_hwndClipboard, WM_DESTROY, 0, 0);
+	  /* NOTE: g_hwndClipboard is set to NULL in winclipboardthread.c */
+	}
+      else
+	return;
+      
+      /* Wait for the clipboard thread to exit */
+      pthread_join (g_ptClipboardProc, NULL);
+
+      g_fClipboardLaunched = FALSE;
+      g_fClipboardStarted = FALSE;
+
+      winDebug ("winClipboardShutdown - Clipboard thread has exited.\n");
+    }
+}
+#endif
+
+void
+ddxPushProviders(void)
+{
+#ifdef XWIN_GLX_WINDOWS
+  if (g_fNativeGl)
+    {
+      /* install the native GL provider */
+      glxWinPushNativeProvider();
+    }
+#endif
+}
+
+#if defined(DDXBEFORERESET)
+/*
+ * Called right before KillAllClients when the server is going to reset,
+ * allows us to shutdown our seperate threads cleanly.
+ */
+
+void
+ddxBeforeReset (void)
+{
+  winDebug ("ddxBeforeReset - Hello\n");
+
+#ifdef XWIN_CLIPBOARD
+  winClipboardShutdown ();
+#endif
+}
+#endif
+
+
+/* See Porting Layer Definition - p. 57 */
+void
+ddxGiveUp (void)
+{
+  int		i;
+
+#if CYGDEBUG
+  winDebug ("ddxGiveUp\n");
+#endif
+
+  /* Perform per-screen deinitialization */
+  for (i = 0; i < g_iNumScreens; ++i)
+    {
+      /* Delete the tray icon */
+      if (!g_ScreenInfo[i].fNoTrayIcon && g_ScreenInfo[i].pScreen)
+ 	winDeleteNotifyIcon (winGetScreenPriv (g_ScreenInfo[i].pScreen));
+    }
+
+#ifdef XWIN_MULTIWINDOW
+  /* Notify the worker threads we're exiting */
+  winDeinitMultiWindowWM ();
+#endif
+
+#ifdef HAS_DEVWINDOWS
+  /* Close our handle to our message queue */
+  if (g_fdMessageQueue != WIN_FD_INVALID)
+    {
+      /* Close /dev/windows */
+      close (g_fdMessageQueue);
+
+      /* Set the file handle to invalid */
+      g_fdMessageQueue = WIN_FD_INVALID;
+    }
+#endif
+
+  if (!g_fLogInited) {
+    g_pszLogFile = LogInit (g_pszLogFile, NULL);
+    g_fLogInited = TRUE;
+  }  
+  LogClose ();
+
+  /*
+   * At this point we aren't creating any new screens, so
+   * we are guaranteed to not need the DirectDraw functions.
+   */
+  winReleaseDDProcAddresses();
+
+  /* Unload our TrackMouseEvent function pointer */
+  if (g_hmodCommonControls != NULL)
+    {
+      FreeLibrary (g_hmodCommonControls);
+      g_hmodCommonControls = NULL;
+      g_fpTrackMouseEvent = (FARPROC) (void (*)(void))NoopDDA;
+    }
+  
+  /* Free concatenated command line */
+  free(g_pszCommandLine);
+  g_pszCommandLine = NULL;
+
+  /* Remove our keyboard hook if it is installed */
+  winRemoveKeyboardHookLL ();
+
+  /* Tell Windows that we want to end the app */
+  PostQuitMessage (0);
+}
+
+
+/* See Porting Layer Definition - p. 57 */
+void
+AbortDDX (void)
+{
+#if CYGDEBUG
+  winDebug ("AbortDDX\n");
+#endif
+  ddxGiveUp ();
+}
+
+#ifdef __CYGWIN__
+/* hasmntopt is currently not implemented for cygwin */
+static const char *winCheckMntOpt(const struct mntent *mnt, const char *opt)
+{
+    const char *s;
+    size_t len;
+    if (mnt == NULL)
+        return NULL;
+    if (opt == NULL)
+        return NULL;
+    if (mnt->mnt_opts == NULL)
+        return NULL;
+
+    len = strlen(opt);
+    s = strstr(mnt->mnt_opts, opt);
+    if (s == NULL)
+        return NULL;
+    if ((s == mnt->mnt_opts || *(s-1) == ',') &&  (s[len] == 0 || s[len] == ','))
+        return (char *)opt;
+    return NULL;
+}
+
+static void
+winCheckMount(void)
+{
+  FILE *mnt;
+  struct mntent *ent;
+
+  enum { none = 0, sys_root, user_root, sys_tmp, user_tmp } 
+    level = none, curlevel;
+  BOOL binary = TRUE;
+
+  mnt = setmntent("/etc/mtab", "r");
+  if (mnt == NULL)
+  {
+    ErrorF("setmntent failed");
+    return;
+  }
+
+  while ((ent = getmntent(mnt)) != NULL)
+  {
+    BOOL system = (winCheckMntOpt(ent, "user") != NULL);
+    BOOL root = (strcmp(ent->mnt_dir, "/") == 0);
+    BOOL tmp = (strcmp(ent->mnt_dir, "/tmp") == 0);
+    
+    if (system)
+    {
+      if (root)
+        curlevel = sys_root;
+      else if (tmp)
+        curlevel = sys_tmp;
+      else
+        continue;
+    }
+    else
+    {
+      if (root)
+        curlevel = user_root;
+      else if (tmp) 
+        curlevel = user_tmp;
+      else
+        continue;
+    }
+
+    if (curlevel <= level)
+      continue;
+    level = curlevel;
+
+    if ((winCheckMntOpt(ent, "binary") == NULL) &&
+        (winCheckMntOpt(ent, "binmode") == NULL))
+      binary = FALSE;
+    else
+      binary = TRUE;
+  }
+    
+  if (endmntent(mnt) != 1)
+  {
+    ErrorF("endmntent failed");
+    return;
+  }
+  
+ if (!binary) 
+   winMsg(X_WARNING, "/tmp mounted in textmode\n");
+}
+#else
+static void
+winCheckMount(void) 
+{
+}
+#endif
+
+#ifdef RELOCATE_PROJECTROOT
+const char * 
+winGetBaseDir(void)
+{
+    static BOOL inited = FALSE;
+    static char buffer[MAX_PATH];
+    if (!inited)
+    {
+        char *fendptr;
+        HMODULE module = GetModuleHandle(NULL);
+        DWORD size = GetModuleFileName(module, buffer, sizeof(buffer));
+        if (sizeof(buffer) > 0)
+            buffer[sizeof(buffer)-1] = 0;
+    
+        fendptr = buffer + size;
+        while (fendptr > buffer)
+        {
+            if (*fendptr == '\\' || *fendptr == '/')
+            {
+                *fendptr = 0;
+                break;
+            }
+            fendptr--;
+        }
+        inited = TRUE;
+    }
+    return buffer;
+}
+#endif
+
+static void
+winFixupPaths (void)
+{
+    BOOL changed_fontpath = FALSE;
+    MessageType font_from = X_DEFAULT;
+#ifdef RELOCATE_PROJECTROOT
+    const char *basedir = winGetBaseDir();
+    size_t basedirlen = strlen(basedir);
+#endif
+
+#ifdef READ_FONTDIRS
+    {
+        /* Open fontpath configuration file */
+        FILE *fontdirs = fopen(ETCX11DIR "/font-dirs", "rt");
+        if (fontdirs != NULL)
+        {
+            char buffer[256];
+            int needs_sep = TRUE; 
+            int comment_block = FALSE;
+
+            /* get default fontpath */
+            char *fontpath = strdup(defaultFontPath);
+            size_t size = strlen(fontpath);
+
+            /* read all lines */
+            while (!feof(fontdirs))
+            {
+                size_t blen;
+                char *hashchar;
+                char *str;
+                int has_eol = FALSE;
+
+                /* read one line */
+                str = fgets(buffer, sizeof(buffer), fontdirs);
+                if (str == NULL) /* stop on error or eof */
+                    break;
+
+                if (strchr(str, '\n') != NULL)
+                    has_eol = TRUE;
+
+                /* check if block is continued comment */
+                if (comment_block)
+                {
+                    /* ignore all input */
+                    *str = 0; 
+                    blen = 0; 
+                    if (has_eol) /* check if line ended in this block */
+                        comment_block = FALSE;
+                }
+                else 
+                {
+                    /* find comment character. ignore all trailing input */
+                    hashchar = strchr(str, '#');
+                    if (hashchar != NULL)
+                    {
+                        *hashchar = 0;
+                        if (!has_eol) /* mark next block as continued comment */
+                            comment_block = TRUE;
+                    }
+                }
+
+                /* strip whitespaces from beginning */
+                while (*str == ' ' || *str == '\t')
+                    str++;
+
+                /* get size, strip whitespaces from end */ 
+                blen = strlen(str);
+                while (blen > 0 && (str[blen-1] == ' ' || 
+                            str[blen-1] == '\t' || str[blen-1] == '\n'))
+                {
+                    str[--blen] = 0;
+                }
+
+                /* still something left to add? */ 
+                if (blen > 0)
+                {
+                    size_t newsize = size + blen;
+                    /* reserve one character more for ',' */
+                    if (needs_sep)
+                        newsize++;
+
+                    /* allocate memory */
+                    if (fontpath == NULL)
+                        fontpath = malloc(newsize+1);
+                    else
+                        fontpath = realloc(fontpath, newsize+1);
+
+                    /* add separator */
+                    if (needs_sep)
+                    {
+                        fontpath[size] = ',';
+                        size++;
+                        needs_sep = FALSE;
+                    }
+
+                    /* mark next line as new entry */
+                    if (has_eol)
+                        needs_sep = TRUE;
+
+                    /* add block */
+                    strncpy(fontpath + size, str, blen);
+                    fontpath[newsize] = 0;
+                    size = newsize;
+                }
+            }
+
+            /* cleanup */
+            fclose(fontdirs);  
+            defaultFontPath = strdup(fontpath);
+            free(fontpath);
+            changed_fontpath = TRUE;
+            font_from = X_CONFIG;
+        }
+    }
+#endif /* READ_FONTDIRS */
+#ifdef RELOCATE_PROJECTROOT
+    {
+        const char *libx11dir = PROJECTROOT "/lib/X11";
+        size_t libx11dir_len = strlen(libx11dir);
+        char *newfp = NULL;
+        size_t newfp_len = 0;
+        const char *endptr, *ptr, *oldptr = defaultFontPath;
+
+        endptr = oldptr + strlen(oldptr);
+        ptr = strchr(oldptr, ',');
+        if (ptr == NULL)
+            ptr = endptr;
+        while (ptr != NULL)
+        {
+            size_t oldfp_len = (ptr - oldptr);
+            size_t newsize = oldfp_len;
+            char *newpath = malloc(newsize + 1);
+            strncpy(newpath, oldptr, newsize);
+            newpath[newsize] = 0;
+
+
+            if (strncmp(libx11dir, newpath, libx11dir_len) == 0)
+            {
+                char *compose;
+                newsize = newsize - libx11dir_len + basedirlen;
+                compose = malloc(newsize + 1);  
+                strcpy(compose, basedir);
+                strncat(compose, newpath + libx11dir_len, newsize - basedirlen);
+                compose[newsize] = 0;
+                free(newpath);
+                newpath = compose;
+            }
+
+            oldfp_len = newfp_len;
+            if (oldfp_len > 0)
+                newfp_len ++; /* space for separator */
+            newfp_len += newsize;
+
+            if (newfp == NULL)
+                newfp = malloc(newfp_len + 1);
+            else
+                newfp = realloc(newfp, newfp_len + 1);
+
+            if (oldfp_len > 0)
+            {
+                strcpy(newfp + oldfp_len, ",");
+                oldfp_len++;
+            }
+            strcpy(newfp + oldfp_len, newpath);
+
+            free(newpath);
+
+            if (*ptr == 0)
+            {
+                oldptr = ptr;
+                ptr = NULL;
+            } else
+            {
+                oldptr = ptr + 1;
+                ptr = strchr(oldptr, ',');
+                if (ptr == NULL)
+                    ptr = endptr;
+            }
+        } 
+
+        defaultFontPath = strdup(newfp);
+        free(newfp);
+        changed_fontpath = TRUE;
+    }
+#endif /* RELOCATE_PROJECTROOT */
+    if (changed_fontpath)
+        winMsg (font_from, "FontPath set to \"%s\"\n", defaultFontPath);
+
+#ifdef RELOCATE_PROJECTROOT
+    if (getenv("XKEYSYMDB") == NULL)
+    {
+        char buffer[MAX_PATH];
+        snprintf(buffer, sizeof(buffer), "XKEYSYMDB=%s\\XKeysymDB",
+                basedir);
+        buffer[sizeof(buffer)-1] = 0;
+        putenv(buffer);
+    }
+    if (getenv("XERRORDB") == NULL)
+    {
+        char buffer[MAX_PATH];
+        snprintf(buffer, sizeof(buffer), "XERRORDB=%s\\XErrorDB",
+                basedir);
+        buffer[sizeof(buffer)-1] = 0;
+        putenv(buffer);
+    }
+    if (getenv("XLOCALEDIR") == NULL)
+    {
+        char buffer[MAX_PATH];
+        snprintf(buffer, sizeof(buffer), "XLOCALEDIR=%s\\locale",
+                basedir);
+        buffer[sizeof(buffer)-1] = 0;
+        putenv(buffer);
+    }
+    if (getenv("HOME") == NULL)
+    {
+        HMODULE shfolder;
+        SHGETFOLDERPATHPROC shgetfolderpath = NULL;
+        char buffer[MAX_PATH + 5];
+        strncpy(buffer, "HOME=", 5);
+
+        /* Try to load SHGetFolderPath from shfolder.dll and shell32.dll */
+        
+        shfolder = LoadLibrary("shfolder.dll");
+        /* fallback to shell32.dll */
+        if (shfolder == NULL)
+            shfolder = LoadLibrary("shell32.dll");
+
+        /* resolve SHGetFolderPath */
+        if (shfolder != NULL)
+            shgetfolderpath = (SHGETFOLDERPATHPROC)GetProcAddress(shfolder, "SHGetFolderPathA");
+
+        /* query appdata directory */
+        if (shgetfolderpath &&
+                shgetfolderpath(NULL, CSIDL_APPDATA|CSIDL_FLAG_CREATE, NULL, 0, 
+                    buffer + 5) == 0)
+        { 
+            putenv(buffer);
+        } else
+        {
+            winMsg (X_ERROR, "Can not determine HOME directory\n");
+        } 
+        if (shfolder != NULL)
+            FreeLibrary(shfolder);
+    }
+    if (!g_fLogFileChanged) {
+        static char buffer[MAX_PATH];
+        DWORD size = GetTempPath(sizeof(buffer), buffer);
+        if (size && size < sizeof(buffer))
+        {
+            snprintf(buffer + size, sizeof(buffer) - size, 
+                    "XWin.%s.log", display); 
+            buffer[sizeof(buffer)-1] = 0;
+            g_pszLogFile = buffer;
+            winMsg (X_DEFAULT, "Logfile set to \"%s\"\n", g_pszLogFile);
+        }
+    }
+    {
+        static char xkbbasedir[MAX_PATH];
+
+        snprintf(xkbbasedir, sizeof(xkbbasedir), "%s\\xkb", basedir);
+        if (sizeof(xkbbasedir) > 0)
+            xkbbasedir[sizeof(xkbbasedir)-1] = 0;
+        XkbBaseDirectory = xkbbasedir;
+	XkbBinDirectory = basedir;
+    }
+#endif /* RELOCATE_PROJECTROOT */
+}
+
+void
+OsVendorInit (void)
+{
+  /* Re-initialize global variables on server reset */
+  winInitializeGlobals ();
+
+  winFixupPaths();
+
+#ifdef DDXOSVERRORF
+  if (!OsVendorVErrorFProc)
+    OsVendorVErrorFProc = OsVendorVErrorF;
+#endif
+
+  if (!g_fLogInited) {
+    /* keep this order. If LogInit fails it calls Abort which then calls
+     * ddxGiveUp where LogInit is called again and creates an infinite 
+     * recursion. If we set g_fLogInited to TRUE before the init we 
+     * avoid the second call 
+     */  
+    g_fLogInited = TRUE;
+    g_pszLogFile = LogInit (g_pszLogFile, NULL);
+  } 
+  LogSetParameter (XLOG_FLUSH, 1);
+  LogSetParameter (XLOG_VERBOSITY, g_iLogVerbose);
+  LogSetParameter (XLOG_FILE_VERBOSITY, g_iLogVerbose);
+
+  /* Log the version information */
+  if (serverGeneration == 1)
+    winLogVersionInfo ();
+
+  winCheckMount();  
+
+  /* Add a default screen if no screens were specified */
+  if (g_iNumScreens == 0)
+    {
+      winDebug ("OsVendorInit - Creating default screen 0\n");
+
+      /*
+       * We need to initialize the default screen 0 if no -screen
+       * arguments were processed.
+       *
+       * Add a screen 0 using the defaults set by winInitializeDefaultScreens()
+       * and any additional default screen parameters given
+       */
+      winInitializeScreens(1);
+
+      /* We have to flag this as an explicit screen, even though it isn't */
+      g_ScreenInfo[0].fExplicitScreen = TRUE;
+    }
+}
+
+
+static void
+winUseMsg (void)
+{
+  ErrorF("\n");
+  ErrorF("\n");
+  ErrorF(EXECUTABLE_NAME " Device Dependent Usage:\n");
+  ErrorF("\n");
+
+#ifdef XWIN_CLIPBOARD
+  ErrorF ("-[no]clipboard\n"
+	  "\tEnable [disable] the clipboard integration. Default is enabled.\n");
+#endif
+
+  ErrorF ("-clipupdates num_boxes\n"
+	  "\tUse a clipping region to constrain shadow update blits to\n"
+	  "\tthe updated region when num_boxes, or more, are in the\n"
+	  "\tupdated region.\n");
+
+#ifdef XWIN_XF86CONFIG
+  ErrorF ("-config\n"
+          "\tSpecify a configuration file.\n");
+
+  ErrorF ("-configdir\n"
+          "\tSpecify a configuration directory.\n");
+#endif
+
+  ErrorF ("-depth bits_per_pixel\n"
+	  "\tSpecify an optional bitdepth to use in fullscreen mode\n"
+	  "\twith a DirectDraw engine.\n");
+
+  ErrorF ("-emulate3buttons [timeout]\n"
+	  "\tEmulate 3 button mouse with an optional timeout in\n"
+	  "\tmilliseconds.\n");
+
+#ifdef XWIN_EMULATEPSEUDO
+  ErrorF ("-emulatepseudo\n"
+	  "\tCreate a depth 8 PseudoColor visual when running in\n"
+	  "\tdepths 15, 16, 24, or 32, collectively known as TrueColor\n"
+	  "\tdepths.  The PseudoColor visual does not have correct colors,\n"
+	  "\tand it may crash, but it at least allows you to run your\n"
+	  "\tapplication in TrueColor modes.\n");
+#endif
+
+  ErrorF ("-engine engine_type_id\n"
+	  "\tOverride the server's automatically selected engine type:\n"
+	  "\t\t1 - Shadow GDI\n"
+	  "\t\t2 - Shadow DirectDraw\n"
+	  "\t\t4 - Shadow DirectDraw4 Non-Locking\n"
+#ifdef XWIN_PRIMARYFB
+	  "\t\t8 - Primary DirectDraw - obsolete\n"
+#endif
+#ifdef XWIN_NATIVEGDI
+	  "\t\t16 - Native GDI - experimental\n"
+#endif
+	  );
+
+  ErrorF ("-fullscreen\n"
+	  "\tRun the server in fullscreen mode.\n");
+
+  ErrorF ("-ignoreinput\n"
+	  "\tIgnore keyboard and mouse input.\n");
+
+#ifdef XWIN_MULTIWINDOWEXTWM
+  ErrorF ("-internalwm\n"
+	  "\tRun the internal window manager.\n");
+#endif
+
+#ifdef XWIN_XF86CONFIG
+  ErrorF ("-keyboard\n"
+	  "\tSpecify a keyboard device from the configuration file.\n");
+#endif
+
+  ErrorF ("-[no]keyhook\n"
+	  "\tGrab special Windows keypresses like Alt-Tab or the Menu "
+          "key.\n");
+
+  ErrorF ("-lesspointer\n"
+	  "\tHide the windows mouse pointer when it is over any\n"
+          "\t" EXECUTABLE_NAME " window.  This prevents ghost cursors appearing when\n"
+	  "\tthe Windows cursor is drawn on top of the X cursor\n");
+
+  ErrorF ("-logfile filename\n"
+	  "\tWrite log messages to <filename>.\n");
+
+  ErrorF ("-logverbose verbosity\n"
+	  "\tSet the verbosity of log messages. [NOTE: Only a few messages\n"
+	  "\trespect the settings yet]\n"
+	  "\t\t0 - only print fatal error.\n"
+	  "\t\t1 - print additional configuration information.\n"
+	  "\t\t2 - print additional runtime information [default].\n"
+	  "\t\t3 - print debugging and tracing information.\n");
+
+  ErrorF ("-[no]multimonitors or -[no]multiplemonitors\n"
+	  "\tUse the entire virtual screen if multiple\n"
+	  "\tmonitors are present.\n");
+
+#ifdef XWIN_MULTIWINDOW
+  ErrorF ("-multiwindow\n"
+	  "\tRun the server in multi-window mode.\n");
+#endif
+
+#ifdef XWIN_MULTIWINDOWEXTWM
+  ErrorF ("-mwextwm\n"
+	  "\tRun the server in multi-window external window manager mode.\n");
+#endif
+
+  ErrorF ("-nodecoration\n"
+          "\tDo not draw a window border, title bar, etc.  Windowed\n"
+	  "\tmode only.\n");
+
+#ifdef XWIN_CLIPBOARD
+  ErrorF ("-nounicodeclipboard\n"
+	  "\tDo not use Unicode clipboard even if on a NT-based platform.\n");
+#endif
+
+  ErrorF ("-refresh rate_in_Hz\n"
+	  "\tSpecify an optional refresh rate to use in fullscreen mode\n"
+	  "\twith a DirectDraw engine.\n");
+
+  ErrorF ("-resize=none|scrollbars|randr"
+	  "\tIn windowed mode, [don't] allow resizing of the window. 'scrollbars'\n"
+	  "\tmode gives the window scrollbars as needed, 'randr' mode uses the RANR\n"
+	  "\textension to resize the X screen.\n");
+
+  ErrorF ("-rootless\n"
+	  "\tRun the server in rootless mode.\n");
+
+  ErrorF ("-screen scr_num [width height [x y] | [[WxH[+X+Y]][@m]] ]\n"
+	  "\tEnable screen scr_num and optionally specify a width and\n"
+	  "\theight and initial position for that screen. Additionally\n"
+	  "\ta monitor number can be specified to start the server on,\n"
+	  "\tat which point, all coordinates become relative to that\n"
+      "\tmonitor (Not for Windows NT4 and 95). Examples:\n"
+      "\t -screen 0 800x600+100+100@2 ; 2nd monitor offset 100,100 size 800x600\n"
+      "\t -screen 0 1024x768@3        ; 3rd monitor size 1024x768\n"
+      "\t -screen 0 @1 ; on 1st monitor using its full resolution (the default)\n");
+
+  ErrorF ("-silent-dup-error\n"
+	  "\tIf another instance of " EXECUTABLE_NAME " with the same display number is running\n"
+	  "\texit silently and don't display any error message.\n");
+
+  ErrorF ("-swcursor\n"
+	  "\tDisable the usage of the Windows cursor and use the X11 software\n"
+	  "\tcursor instead.\n");
+
+  ErrorF ("-[no]trayicon\n"
+          "\tDo not create a tray icon.  Default is to create one\n"
+	  "\ticon per screen.  You can globally disable tray icons with\n"
+	  "\t-notrayicon, then enable it for specific screens with\n"
+	  "\t-trayicon for those screens.\n");
+
+  ErrorF ("-[no]unixkill\n"
+          "\tCtrl+Alt+Backspace exits the X Server.\n");
+
+#ifdef XWIN_GLX_WINDOWS
+  ErrorF ("-[no]wgl\n"
+	  "\tEnable the GLX extension to use the native Windows WGL interface for accelerated OpenGL\n");
+#endif
+
+  ErrorF ("-[no]winkill\n"
+          "\tAlt+F4 exits the X Server.\n");
+
+  ErrorF ("-xkblayout XKBLayout\n"
+	  "\tEquivalent to XKBLayout in XF86Config files.\n"
+	  "\tFor example: -xkblayout de\n");
+
+  ErrorF ("-xkbmodel XKBModel\n"
+	  "\tEquivalent to XKBModel in XF86Config files.\n");
+
+  ErrorF ("-xkboptions XKBOptions\n"
+	  "\tEquivalent to XKBOptions in XF86Config files.\n");
+
+  ErrorF ("-xkbrules XKBRules\n"
+	  "\tEquivalent to XKBRules in XF86Config files.\n");
+
+  ErrorF ("-xkbvariant XKBVariant\n"
+	  "\tEquivalent to XKBVariant in XF86Config files.\n"
+	  "\tFor example: -xkbvariant nodeadkeys\n");
+}
+
+/* See Porting Layer Definition - p. 57 */
+void
+ddxUseMsg(void)
+{
+  /* Set a flag so that FatalError won't give duplicate warning message */
+  g_fSilentFatalError = TRUE;
+  
+  winUseMsg();  
+
+  /* Log file will not be opened for UseMsg unless we open it now */
+  if (!g_fLogInited) {
+    g_pszLogFile = LogInit (g_pszLogFile, NULL);
+    g_fLogInited = TRUE;
+  }  
+  LogClose ();
+
+  /* Notify user where UseMsg text can be found.*/
+  if (!g_fNoHelpMessageBox)
+    winMessageBoxF ("The " PROJECT_NAME " help text has been printed to "
+		  "%s.\n"
+		  "Please open %s to read the help text.\n",
+		  MB_ICONINFORMATION, g_pszLogFile, g_pszLogFile);
+}
+
+/* See Porting Layer Definition - p. 20 */
+/*
+ * Do any global initialization, then initialize each screen.
+ * 
+ * NOTE: We use ddxProcessArgument, so we don't need to touch argc and argv
+ */
+
+void
+InitOutput (ScreenInfo *screenInfo, int argc, char *argv[])
+{
+  int		i;
+
+  /* Log the command line */
+  winLogCommandLine (argc, argv);
+
+#if CYGDEBUG
+  winDebug ("InitOutput\n");
+#endif
+
+  /* Validate command-line arguments */
+  if (serverGeneration == 1 && !winValidateArgs ())
+    {
+      FatalError ("InitOutput - Invalid command-line arguments found.  "
+		  "Exiting.\n");
+    }
+
+  /* Check for duplicate invocation on same display number.*/
+  if (serverGeneration == 1 && !winCheckDisplayNumber ())
+    {
+      if (g_fSilentDupError)
+        g_fSilentFatalError = TRUE;  
+      FatalError ("InitOutput - Duplicate invocation on display "
+		  "number: %s.  Exiting.\n", display);
+    }
+
+#ifdef XWIN_XF86CONFIG
+  /* Try to read the xorg.conf-style configuration file */
+  if (!winReadConfigfile ())
+    winErrorFVerb (1, "InitOutput - Error reading config file\n");
+#else
+  winMsg(X_INFO, "xorg.conf is not supported\n");
+  winMsg(X_INFO, "See http://x.cygwin.com/docs/faq/cygwin-x-faq.html "
+         "for more information\n");
+  winConfigFiles ();
+#endif
+
+  /* Load preferences from XWinrc file */
+  LoadPreferences();
+
+  /* Setup global screen info parameters */
+  screenInfo->imageByteOrder = IMAGE_BYTE_ORDER;
+  screenInfo->bitmapScanlinePad = BITMAP_SCANLINE_PAD;
+  screenInfo->bitmapScanlineUnit = BITMAP_SCANLINE_UNIT;
+  screenInfo->bitmapBitOrder = BITMAP_BIT_ORDER;
+  screenInfo->numPixmapFormats = NUMFORMATS;
+  
+  /* Describe how we want common pixmap formats padded */
+  for (i = 0; i < NUMFORMATS; i++)
+    {
+      screenInfo->formats[i] = g_PixmapFormats[i];
+    }
+
+  /* Load pointers to DirectDraw functions */
+  winGetDDProcAddresses ();
+  
+  /* Detect supported engines */
+  winDetectSupportedEngines ();
+
+  /* Load common controls library */
+  g_hmodCommonControls = LoadLibraryEx ("comctl32.dll", NULL, 0);
+
+  /* Load TrackMouseEvent function pointer */  
+  g_fpTrackMouseEvent = GetProcAddress (g_hmodCommonControls,
+					 "_TrackMouseEvent");
+  if (g_fpTrackMouseEvent == NULL)
+    {
+      winErrorFVerb (1, "InitOutput - Could not get pointer to function\n"
+	      "\t_TrackMouseEvent in comctl32.dll.  Try installing\n"
+	      "\tInternet Explorer 3.0 or greater if you have not\n"
+	      "\talready.\n");
+
+      /* Free the library since we won't need it */
+      FreeLibrary (g_hmodCommonControls);
+      g_hmodCommonControls = NULL;
+
+      /* Set function pointer to point to no operation function */
+      g_fpTrackMouseEvent = (FARPROC) (void (*)(void))NoopDDA;
+    }
+
+  /* Store the instance handle */
+  g_hInstance = GetModuleHandle (NULL);
+
+  /* Initialize each screen */
+  for (i = 0; i < g_iNumScreens; ++i)
+    {
+      /* Initialize the screen */
+      if (-1 == AddScreen (winScreenInit, argc, argv))
+	{
+	  FatalError ("InitOutput - Couldn't add screen %d", i);
+	}
+    }
+
+#if defined(XWIN_CLIPBOARD) || defined(XWIN_MULTIWINDOW)
+
+  /* Generate a cookie used by internal clients for authorization */
+  if (g_fXdmcpEnabled || g_fAuthEnabled)
+    winGenerateAuthorization ();
+
+  /* Perform some one time initialization */
+  if (1 == serverGeneration)
+    {
+      /*
+       * setlocale applies to all threads in the current process.
+       * Apply locale specified in LANG environment variable.
+       */
+      setlocale (LC_ALL, "");
+    }
+#endif
+
+#if CYGDEBUG || YES
+  winDebug ("InitOutput - Returning.\n");
+#endif
+}
+
+
+/*
+ * winCheckDisplayNumber - Check if another instance of Cygwin/X is
+ * already running on the same display number.  If no one exists,
+ * make a mutex to prevent new instances from running on the same display.
+ *
+ * return FALSE if the display number is already used.
+ */
+
+static Bool
+winCheckDisplayNumber (void)
+{
+  int			nDisp;
+  HANDLE		mutex;
+  char			name[MAX_PATH];
+  char *		pszPrefix = '\0';
+  OSVERSIONINFO		osvi = {0};
+
+  /* Check display range */
+  nDisp = atoi (display);
+  if (nDisp < 0 || nDisp > 65535)
+    {
+      ErrorF ("winCheckDisplayNumber - Bad display number: %d\n", nDisp);
+      return FALSE;
+    }
+
+  /* Set first character of mutex name to null */
+  name[0] = '\0';
+
+  /* Get operating system version information */
+  osvi.dwOSVersionInfoSize = sizeof (osvi);
+  GetVersionEx (&osvi);
+
+  /* Want a mutex shared among all terminals on NT > 4.0 */
+  if (osvi.dwPlatformId == VER_PLATFORM_WIN32_NT
+      && osvi.dwMajorVersion >= 5)
+    {
+      pszPrefix = "Global\\";
+    }
+
+  /* Setup Cygwin/X specific part of name */
+  snprintf (name, sizeof(name), "%sCYGWINX_DISPLAY:%d", pszPrefix, nDisp);
+
+  /* Windows automatically releases the mutex when this process exits */
+  mutex = CreateMutex (NULL, FALSE, name);
+  if (!mutex)
+    {
+      LPVOID lpMsgBuf;
+
+      /* Display a fancy error message */
+      FormatMessage (FORMAT_MESSAGE_ALLOCATE_BUFFER | 
+		     FORMAT_MESSAGE_FROM_SYSTEM | 
+		     FORMAT_MESSAGE_IGNORE_INSERTS,
+		     NULL,
+		     GetLastError (),
+		     MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
+		     (LPTSTR) &lpMsgBuf,
+		     0, NULL);
+      ErrorF ("winCheckDisplayNumber - CreateMutex failed: %s\n",
+	      (LPSTR)lpMsgBuf);
+      LocalFree (lpMsgBuf);
+
+      return FALSE;
+    }
+  if (GetLastError () == ERROR_ALREADY_EXISTS)
+    {
+      ErrorF ("winCheckDisplayNumber - "
+	      PROJECT_NAME " is already running on display %d\n",
+	      nDisp);
+      return FALSE;
+    }
+
+  return TRUE;
+}
diff --git a/xorg-server/hw/xwin/Makefile.am b/xorg-server/hw/xwin/Makefile.am
index f6a75df2c..ce2edb2e6 100644
--- a/xorg-server/hw/xwin/Makefile.am
+++ b/xorg-server/hw/xwin/Makefile.am
@@ -87,6 +87,7 @@ SRCS =	InitInput.c \
 	winkeybd.c \
 	winkeyhook.c \
 	winmisc.c \
+	winmonitors.c \
 	winmouse.c \
 	winmsg.c \
 	winmultiwindowclass.c \
diff --git a/xorg-server/hw/xwin/man/XWin.man b/xorg-server/hw/xwin/man/XWin.man
index 51268f69a..e7933c9c8 100644
--- a/xorg-server/hw/xwin/man/XWin.man
+++ b/xorg-server/hw/xwin/man/XWin.man
@@ -103,7 +103,7 @@ Examples:
 
 .SH OPTIONS CONTROLLING THE APPEARANCE OF THE X SCREEN WINDOWS
 These parameters only apply to windowed mode screens i.e. not
-in \fB-multwindow\fP or \fB-rootless\fP mode
+in \fB-multiwindow\fP or \fB-rootless\fP mode.
 .TP 8
 .B "\-fullscreen"
 The X server window takes the full screen, covering completely the
@@ -115,10 +115,52 @@ etc.
 This parameter is ignored when the \fB\-fullscreen\fP parameter is specified.
 .TP 8
 .B \-scrollbars
-In windowed mode, allow screens bigger than the \fIWindows\fP desktop.
-Moreover, if the window has decorations, one can now resize it.
-This parameter is ignored when the \fB\-fullscreen\fP parameter is specified.
+Alternative name for \fB\-resize=scrollbars\fP.
+
+.SH OPTIONS CONTROLLING RESIZE BEHAVIOUR
+.TP 8
+.B \-resize[=none|scrollbars|randr]
+Select the resize mode of an X screen.
+
+.RS
+.IP \fB\-resize=none\fP 8
+(default). The screen is not resizable.
+
+In windowed mode, if the window has decorations, a fixed frame is used.
+
+.IP \fB\-resize=scrollbars\fP 8
+The screen window is resizeable, but the screen is not resizable.
+
+In windowed mode, if the window has decorations, a resizing frame is used.
+Scrollbars are drawn when needed to allow the entire X screen
+to viewed by adjusting them.
+
+This also permits screens bigger than the \fIWindows\fP virtual desktop to be used.
+
+This parameter is ignored in \fB-multiwindow\fP or \fB-rootless\fP mode.
+Alternative name is \fB\-scrollbars\fP.
+
+.IP \fB\-resize=randr\fP 8
+The screen is resizable and the screen window is resizeable.
 
+In windowed mode, if the window has decorations, a resizing frame is used.
+
+Resizing the  \fIWindows\fP window will use the RANDR extension to change
+the size of the X screen.  Likewise, changing the size of
+the X screen using the RANDR extension will cause the size
+of the \fIWindows\fP window containing the X screen to be changed.
+
+In \fB-multiwindow\fP or \fB-rootless\fP mode, if the X screen is
+of the same dimensions as a Windows monitor or the virtual desktop,
+the X server will respond to the WM_DISPLAYCHANGED sent when those
+dimensions change by resizing the X screen.  Changing the size
+of the X screen using the RANDR extension is not permitted.
+
+The maximum dimensions of the screen are the dimensions of the \fIWindows\fP virtual desktop.
+
+.IP \fB\--resize\fP 8
+on its own is equivalent to \fB\--resize=randr\fP
+.RE
 
 .SH OPTIONS CONTROLLING WINDOWS INTEGRATION
 .TP 8
@@ -190,15 +232,27 @@ respectively).
 .TP 8
 .B "\-engine \fIengine_type_id\fP"
 This option, which is intended for Cygwin/X developers,
-overrides the server's automatically selected engine type.  This
-parameter will be ignored if the specified engine type is not
-supported on the current system.  The supported engine type ids are 1
-- Shadow GDI, 2 - Shadow DirectDraw, and 4 - Shadow DirectDraw Non-Locking.
-Additionally, there are engines with type ids
-8 - Primary DirectDraw (obsolete) and 16 - Native GDI (experimental and barely functional).
-Default behavior is to determine the engine with optimum performance that
+overrides the server's automatically selected drawing engine type.  This
+parameter will be ignored if the specified drawing engine type is not
+supported on the current system.
+
+Default behavior is to select the drawing engine with optimum performance that
 supports the specified depth and window configuration.
 
+The engine type ids are:
+.RS
+.IP 1 4
+Shadow GDI
+.IP 2 4
+Shadow DirectDraw
+.IP 4 4
+Shadow DirectDraw Non-Locking
+.IP 8 4
+Primary DirectDraw (unsupported, obsolete)
+.IP 16 4
+Native GDI (unsupported, experimental and barely functional)
+.RE
+
 .SH FULLSCREEN OPTIONS
 .TP 8
 .B "\-depth \fIdepth\fP"
@@ -322,12 +376,9 @@ X(__miscmansuffix__), Xserver(1), xdm(1), xinit(1), XWinrc(__filemansuffix__), s
 
 .SH BUGS
 .I XWin
-and this man page still have many limitations.  Some of the more obvious
-ones are:
-.br
-- The display mode can not be changed once the X server has started.
-.br
-- The \fIXWin\fP software is continuously developing; it is therefore possible that
+and this man page still have many limitations.
+
+The \fIXWin\fP software is continuously developing; it is therefore possible that
 this man page is not up to date.  It is always prudent to
 look also at the output of \fIXWin -help\fP in order to
 check the options that are operative.
diff --git a/xorg-server/hw/xwin/win.h b/xorg-server/hw/xwin/win.h
index e790d2d73..3f40fdbe0 100644
--- a/xorg-server/hw/xwin/win.h
+++ b/xorg-server/hw/xwin/win.h
@@ -1,1459 +1,1491 @@
-/*

- *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

-

-/* Turn debug messages on or off */

-#ifndef CYGDEBUG

-#define CYGDEBUG				NO

-#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 *

-#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"

-

-

-/*

- * Debugging macros

- */

-

-#if CYGDEBUG

-#define DEBUG_MSG(str,...) \

-if (fDebugProcMsg) \

-{ \

-  char *pszTemp; \

-  int iLength; \

-  if (asprintf (&pszTemp, str, ##__VA_ARGS__) != -1) { \

-    MessageBox (NULL, pszTemp, szFunctionName, MB_OK); \

-    free (pszTemp); \

-  } \

-}

-#else

-#define DEBUG_MSG(str,...)

-#endif

-

-#if CYGDEBUG

-#define DEBUG_FN_NAME(str) PTSTR szFunctionName = str

-#else

-#define DEBUG_FN_NAME(str)

-#endif

-

-#if CYGDEBUG || YES

-#define DEBUGVARS BOOL fDebugProcMsg = FALSE

-#else

-#define DEBUGVARS

-#endif

-

-#if CYGDEBUG || YES

-#define DEBUGPROC_MSG fDebugProcMsg = TRUE

-#else

-#define DEBUGPROC_MSG

-#endif

-

-#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);

-

-

-/*

- * 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;

-  LPDIRECTDRAWSURFACE2	pddsPrimary;

-  LPDIRECTDRAW2		pdd2;

-

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

-  LPDIRECTDRAWSURFACE2	pddsShadow;

-  LPDDSURFACEDESC	pddsdShadow;

-

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

-  LPDIRECTDRAWSURFACE2	pddsOffscreen;

-  LPDDSURFACEDESC	pddsdOffscreen;

-  LPDDSURFACEDESC	pddsdPrimary;

-

-  /* 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;

-

-  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

- */

-

-#include "winglobals.h"

-

-extern winScreenInfo *		g_ScreenInfo;

-extern miPointerScreenFuncRec	g_winPointerCursorFuncs;

-extern DWORD			g_dwEvents;

-#ifdef HAS_DEVWINDOWS

-extern int			g_fdMessageQueue;

-#endif

-extern DevPrivateKeyRec		g_iScreenPrivateKeyRec;

-#define g_iScreenPrivateKey  	(&g_iScreenPrivateKeyRec)

-extern DevPrivateKeyRec		g_iCmapPrivateKeyRec;

-#define g_iCmapPrivateKey 	(&g_iCmapPrivateKeyRec)

-extern DevPrivateKeyRec		g_iGCPrivateKeyRec;

-#define g_iGCPrivateKey 	(&g_iGCPrivateKeyRec)

-extern DevPrivateKeyRec		g_iPixmapPrivateKeyRec;

-#define g_iPixmapPrivateKey 	(&g_iPixmapPrivateKeyRec)

-extern DevPrivateKeyRec		g_iWindowPrivateKeyRec;

-#define g_iWindowPrivateKey 	(&g_iWindowPrivateKeyRec)

-

-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 library function pointers

- */

-

-extern FARPROC			g_fpDirectDrawCreate;

-extern FARPROC			g_fpDirectDrawCreateClipper;

-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

- */

-

-void

-winDisplayExitDialog (winPrivScreenPtr pScreenPriv);

-

-void

-winDisplayDepthChangeDialog (winPrivScreenPtr pScreenPriv);

-

-void

-winDisplayAboutDialog (winPrivScreenPtr pScreenPriv);

-

-

-/*

- * winengine.c

- */

-

-void

-winDetectSupportedEngines (void);

-

-Bool

-winSetEngine (ScreenPtr pScreen);

-

-Bool

-winGetDDProcAddresses (void);

-

-void

-winReleaseDDProcAddresses(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, int kind);

-

-

-/*

- * 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, int kind);

-

-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);

-

-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

-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);

-

-/*

- * winprocarg.c

- */

-void

-winInitializeScreens(int maxscreens);

-

-/*

- * 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
+
+/* Turn debug messages on or off */
+#ifndef CYGDEBUG
+#define CYGDEBUG				NO
+#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
+
+/*
+ * 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 *
+#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"
+
+
+/*
+ * Debugging macros
+ */
+
+#if CYGDEBUG
+#define DEBUG_MSG(str,...) \
+if (fDebugProcMsg) \
+{ \
+  char *pszTemp; \
+  int iLength; \
+  if (asprintf (&pszTemp, str, ##__VA_ARGS__) != -1) { \
+    MessageBox (NULL, pszTemp, szFunctionName, MB_OK); \
+    free (pszTemp); \
+  } \
+}
+#else
+#define DEBUG_MSG(str,...)
+#endif
+
+#if CYGDEBUG
+#define DEBUG_FN_NAME(str) PTSTR szFunctionName = str
+#else
+#define DEBUG_FN_NAME(str)
+#endif
+
+#if CYGDEBUG || YES
+#define DEBUGVARS BOOL fDebugProcMsg = FALSE
+#else
+#define DEBUGVARS
+#endif
+
+#if CYGDEBUG || YES
+#define DEBUGPROC_MSG fDebugProcMsg = TRUE
+#else
+#define DEBUGPROC_MSG
+#endif
+
+#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 (*winFreeFBProcPtr)(ScreenPtr);
+
+typedef void (*winShadowUpdateProcPtr)(ScreenPtr, shadowBufPtr);
+
+typedef Bool (*winInitScreenProcPtr)(ScreenPtr);
+
+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);
+
+#ifdef XWIN_NATIVEGDI
+/* Typedefs for native GDI wrappers */
+typedef Bool (*RealizeFontPtr) (ScreenPtr pScreen, FontPtr pFont);
+typedef Bool (*UnrealizeFontPtr)(ScreenPtr pScreen, FontPtr pFont);
+#endif
+
+
+/*
+ * 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;
+
+/*
+ * Resize modes
+ */
+typedef enum {
+  notAllowed,
+  resizeWithScrollbars,
+  resizeWithRandr
+} winResizeMode;
+
+/*
+ * 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;
+
+  int			iMonitor;
+  DWORD			dwUserWidth;
+  DWORD			dwUserHeight;
+  DWORD			dwWidth;
+  DWORD			dwHeight;
+  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;
+  winResizeMode		iResizeMode;
+  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;
+
+  /* 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;
+  BITMAPINFOHEADER      *pbmih;
+
+  /* Privates used by shadow fb and primary fb DirectDraw servers */
+  LPDIRECTDRAW		pdd;
+  LPDIRECTDRAWSURFACE2	pddsPrimary;
+  LPDIRECTDRAW2		pdd2;
+
+  /* Privates used by shadow fb DirectDraw server */
+  LPDIRECTDRAWSURFACE2	pddsShadow;
+  LPDDSURFACEDESC	pddsdShadow;
+
+  /* Privates used by primary fb DirectDraw server */
+  LPDIRECTDRAWSURFACE2	pddsOffscreen;
+  LPDDSURFACEDESC	pddsdOffscreen;
+  LPDDSURFACEDESC	pddsdPrimary;
+
+  /* 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;
+  winFreeFBProcPtr			pwinFreeFB;
+  winShadowUpdateProcPtr		pwinShadowUpdate;
+  winInitScreenProcPtr			pwinInitScreen;
+  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;
+
+  winCursorRec                          cursor;
+
+#ifdef XWIN_NATIVEGDI
+  RealizeFontPtr                        RealizeFont;
+  UnrealizeFontPtr                      UnrealizeFont;
+#endif
+
+} 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
+ */
+
+#include "winglobals.h"
+
+extern winScreenInfo *		g_ScreenInfo;
+extern miPointerScreenFuncRec	g_winPointerCursorFuncs;
+extern DWORD			g_dwEvents;
+#ifdef HAS_DEVWINDOWS
+extern int			g_fdMessageQueue;
+#endif
+extern DevPrivateKeyRec		g_iScreenPrivateKeyRec;
+#define g_iScreenPrivateKey  	(&g_iScreenPrivateKeyRec)
+extern DevPrivateKeyRec		g_iCmapPrivateKeyRec;
+#define g_iCmapPrivateKey 	(&g_iCmapPrivateKeyRec)
+extern DevPrivateKeyRec		g_iGCPrivateKeyRec;
+#define g_iGCPrivateKey 	(&g_iGCPrivateKeyRec)
+extern DevPrivateKeyRec		g_iPixmapPrivateKeyRec;
+#define g_iPixmapPrivateKey 	(&g_iPixmapPrivateKeyRec)
+extern DevPrivateKeyRec		g_iWindowPrivateKeyRec;
+#define g_iWindowPrivateKey 	(&g_iWindowPrivateKeyRec)
+
+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 library function pointers
+ */
+
+extern FARPROC			g_fpDirectDrawCreate;
+extern FARPROC			g_fpDirectDrawCreateClipper;
+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
+ */
+
+void
+winDisplayExitDialog (winPrivScreenPtr pScreenPriv);
+
+void
+winDisplayDepthChangeDialog (winPrivScreenPtr pScreenPriv);
+
+void
+winDisplayAboutDialog (winPrivScreenPtr pScreenPriv);
+
+
+/*
+ * winengine.c
+ */
+
+void
+winDetectSupportedEngines (void);
+
+Bool
+winSetEngine (ScreenPtr pScreen);
+
+Bool
+winGetDDProcAddresses (void);
+
+void
+winReleaseDDProcAddresses(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, int kind);
+
+
+/*
+ * 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, int kind);
+
+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);
+
+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
+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);
+
+/*
+ * winprocarg.c
+ */
+void
+winInitializeScreens(int maxscreens);
+
+/*
+ * winrandr.c
+ */
+Bool
+winRandRInit (ScreenPtr pScreen);
+void
+winDoRandRScreenSetSize (ScreenPtr  pScreen,
+                         CARD16	    width,
+                         CARD16	    height,
+                         CARD32	    mmWidth,
+                         CARD32	    mmHeight);
+
+/*
+ * END DDX and DIX Function Prototypes
+ */
+
+#endif /* _WIN_H_ */
+
diff --git a/xorg-server/hw/xwin/wincreatewnd.c b/xorg-server/hw/xwin/wincreatewnd.c
index 0c342e1ae..755373965 100644
--- a/xorg-server/hw/xwin/wincreatewnd.c
+++ b/xorg-server/hw/xwin/wincreatewnd.c
@@ -192,7 +192,7 @@ winCreateBoundingWindowWindowed (ScreenPtr pScreen)
           fForceShowWindow = TRUE;
         } 
         dwWindowStyle |= WS_CAPTION;
-        if (pScreenInfo->fScrollbars)
+        if (pScreenInfo->iResizeMode != notAllowed)
             dwWindowStyle |= WS_THICKFRAME | WS_MAXIMIZEBOX;
     }
   else
@@ -233,6 +233,22 @@ winCreateBoundingWindowWindowed (ScreenPtr pScreen)
       iPosY = rcWorkArea.top;
     }
 
+  /* Clean up the scrollbars flag, if necessary */
+  if ((!pScreenInfo->fDecoration
+#ifdef XWIN_MULTIWINDOWEXTWM
+       || pScreenInfo->fMWExtWM
+#endif
+       || pScreenInfo->fRootless
+#ifdef XWIN_MULTIWINDOW
+       || pScreenInfo->fMultiWindow
+#endif
+       )
+      && (pScreenInfo->iResizeMode == resizeWithScrollbars))
+    {
+      /* We cannot have scrollbars if we do not have a window border */
+      pScreenInfo->iResizeMode = notAllowed;
+    }
+
   /* Did the user specify a height and width? */
   if (pScreenInfo->fUserGaveHeightAndWidth)
     {
@@ -256,12 +272,12 @@ winCreateBoundingWindowWindowed (ScreenPtr pScreen)
 #if CYGDEBUG
 	  winDebug ("winCreateBoundingWindowWindowed - Window has decoration\n");
 #endif
-	  /* Are we using scrollbars? */
-	  if (pScreenInfo->fScrollbars)
+
+          /* Are we resizable */
+          if (pScreenInfo->iResizeMode != notAllowed)
 	    {
 #if CYGDEBUG
-	      winDebug ("winCreateBoundingWindowWindowed - Window has "
-		      "scrollbars\n");
+	      winDebug ("winCreateBoundingWindowWindowed - Window is resizable\n");
 #endif
 
 	      iWidth += 2 * GetSystemMetrics (SM_CXSIZEFRAME);
@@ -271,8 +287,7 @@ winCreateBoundingWindowWindowed (ScreenPtr pScreen)
 	  else
 	    {
 #if CYGDEBUG
-	      winDebug ("winCreateBoundingWindowWindowed - Window does not have "
-		      "scrollbars\n");
+	      winDebug ("winCreateBoundingWindowWindowed - Window is not resizable\n");
 #endif
 
 	      iWidth += 2 * GetSystemMetrics (SM_CXFIXEDFRAME);
@@ -296,22 +311,7 @@ winCreateBoundingWindowWindowed (ScreenPtr pScreen)
 	}
     }
 
-  /* Clean up the scrollbars flag, if necessary */
-  if ((!pScreenInfo->fDecoration
-#ifdef XWIN_MULTIWINDOWEXTWM
-       || pScreenInfo->fMWExtWM
-#endif
-       || pScreenInfo->fRootless
-#ifdef XWIN_MULTIWINDOW
-       || pScreenInfo->fMultiWindow
-#endif
-       )
-      && pScreenInfo->fScrollbars)
-    {
-      /* We cannot have scrollbars if we do not have a window border */
-      pScreenInfo->fScrollbars = FALSE;
-    }
- 
+  /* Make sure window is no bigger than work area */
   if (TRUE 
 #ifdef XWIN_MULTIWINDOWEXTWM
        && !pScreenInfo->fMWExtWM
@@ -396,7 +396,7 @@ winCreateBoundingWindowWindowed (ScreenPtr pScreen)
 	  rcClient.bottom, rcClient.top);
   
   /* We adjust the visual size if the user did not specify it */
-  if (!(pScreenInfo->fScrollbars && pScreenInfo->fUserGaveHeightAndWidth))
+  if (!((pScreenInfo->iResizeMode == resizeWithScrollbars) && pScreenInfo->fUserGaveHeightAndWidth))
     {
       /*
        * User did not give a height and width with scrollbars enabled,
diff --git a/xorg-server/hw/xwin/windialogs.c b/xorg-server/hw/xwin/windialogs.c
index 8c648e84a..c3a149762 100644
--- a/xorg-server/hw/xwin/windialogs.c
+++ b/xorg-server/hw/xwin/windialogs.c
@@ -1,774 +1,773 @@
-/*

- *Copyright (C) 2003-2004 Harold L Hunt II 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 HAROLD L HUNT II 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 Harold L Hunt II

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

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

- *from Harold L Hunt II.

- *

- * Authors:	Harold L Hunt II

- *              Earle F. Philhower III

- */

-

-#ifdef HAVE_XWIN_CONFIG_H

-#include <xwin-config.h>

-#endif

-#include "win.h"

-#ifdef __CYGWIN__

-#include <sys/cygwin.h>

-#endif

-#include <shellapi.h>

-#include "winprefs.h"

-

-

-/*

- * References to external globals

- */

-

-#ifdef XWIN_CLIPBOARD

-extern Bool			g_fClipboardStarted;

-#endif

-/*

- * Local function prototypes

- */

-

-static wBOOL CALLBACK

-winExitDlgProc (HWND hDialog, UINT message,

-		WPARAM wParam, LPARAM lParam);

-

-static wBOOL CALLBACK

-winChangeDepthDlgProc (HWND hDialog, UINT message,

-		       WPARAM wParam, LPARAM lParam);

-

-static wBOOL CALLBACK

-winAboutDlgProc (HWND hDialog, UINT message,

-		 WPARAM wParam, LPARAM lParam);

-

-

-static void

-winDrawURLWindow (LPARAM lParam);

-

-static LRESULT CALLBACK

-winURLWndProc (HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam);

-

-static void

-winOverrideURLButton (HWND hdlg, int id);

-

-static void

-winUnoverrideURLButton (HWND hdlg, int id);

-

-

-/*

- * Owner-draw a button as a URL

- */

-

-static void

-winDrawURLWindow (LPARAM lParam)

-{

-  DRAWITEMSTRUCT *draw;

-  char str[256];

-  RECT rect;

-  HFONT font;

-  COLORREF crText;

-  

-  draw = (DRAWITEMSTRUCT *) lParam;

-  GetWindowText (draw->hwndItem, str, sizeof(str));

-  str[255] = 0;

-  GetClientRect (draw->hwndItem, &rect);

-  

-  /* Color the button depending upon its state */

-  if (draw->itemState & ODS_SELECTED)

-    crText = RGB(128+64,0,0);

-  else if (draw->itemState & ODS_FOCUS)

-    crText = RGB(0,128+64,0);

-  else

-    crText = RGB(0,0,128+64);

-  SetTextColor (draw->hDC, crText);

-  

-  /* Create font 8 high, standard dialog font */

-  font = CreateFont (-8, 0, 0, 0, FW_DONTCARE, FALSE, FALSE, FALSE,

-		     0, 0, 0, 0, 0, "MS Sans Serif");

-  if (!font)

-    {

-      ErrorF ("winDrawURLWindow: Unable to create URL font, bailing.\n");

-      return;

-    }

-  /* Draw it */

-  SetBkMode (draw->hDC, OPAQUE);

-  SelectObject (draw->hDC, font);

-  DrawText (draw->hDC, str, strlen (str),&rect,DT_CENTER | DT_VCENTER);

-  /* Delete the created font, replace it with stock font */

-  DeleteObject (SelectObject (draw->hDC, GetStockObject (ANSI_VAR_FONT)));

-}

-

-

-/*

- * WndProc for overridden buttons

- */

-

-static LRESULT CALLBACK

-winURLWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)

-{

-  WNDPROC origCB = NULL;

-  HCURSOR cursor;

-  

-  /* If it's a SetCursor message, tell it to the hand */

-  if (msg==WM_SETCURSOR) {

-    cursor = LoadCursor (NULL, IDC_HAND);

-    if (cursor)

-      SetCursor (cursor);

-    return TRUE;

-  }

-  origCB = (WNDPROC)GetWindowLongPtr(hwnd, GWLP_USERDATA);

-  /* Otherwise fall through to original WndProc */

-  if (origCB)

-    return CallWindowProc (origCB, hwnd, msg, wParam, lParam);

-  else

-    return FALSE;

-}

-

-

-/*

- * Register and unregister the custom WndProc

- */

-

-static void

-winOverrideURLButton (HWND hwnd, int id)

-{

-  WNDPROC origCB;

-  origCB = (WNDPROC)SetWindowLongPtr(GetDlgItem (hwnd, id),

-                                     GWLP_WNDPROC, (LONG_PTR)winURLWndProc);

-  SetWindowLongPtr(GetDlgItem (hwnd, id), GWLP_USERDATA, (LONG_PTR)origCB);

-}

-

-static void

-winUnoverrideURLButton (HWND hwnd, int id)

-{

-  WNDPROC origCB;

-  origCB = (WNDPROC)SetWindowLongPtr(GetDlgItem (hwnd, id),

-                                     GWLP_USERDATA, 0);

-  if (origCB)

-    SetWindowLongPtr(GetDlgItem (hwnd, id), GWLP_WNDPROC, (LONG_PTR)origCB);

-}

-

-

-/*

- * Center a dialog window in the desktop window

- * and set small and large icons to X icons.

- */

-

-static void

-winInitDialog (HWND hwndDlg)

-{

-  HWND hwndDesk; 

-  RECT rc, rcDlg, rcDesk;

-  HICON hIcon, hIconSmall;

- 

-  hwndDesk = GetParent (hwndDlg);

-  if (!hwndDesk || IsIconic (hwndDesk))

-    hwndDesk = GetDesktopWindow (); 

-  

-  /* Remove minimize and maximize buttons */

-  SetWindowLongPtr(hwndDlg, GWL_STYLE,

-                   GetWindowLongPtr(hwndDlg, GWL_STYLE)

-                   & ~(WS_MAXIMIZEBOX | WS_MINIMIZEBOX));

-

-  /* Set Window not to show in the task bar */

-  SetWindowLongPtr(hwndDlg, GWL_EXSTYLE,

-                   GetWindowLongPtr(hwndDlg, GWL_EXSTYLE) & ~WS_EX_APPWINDOW );

-

-  /* Center dialog window in the screen. Not done for multi-monitor systems, where

-   * it is likely to end up split across the screens. In that case, it appears

-   * near the Tray icon.

-   */

-  if (GetSystemMetrics(SM_CMONITORS)>1) {

-    /* Still need to refresh the frame change. */

-    SetWindowPos (hwndDlg, HWND_TOPMOST, 0,0,0,0,

-		SWP_NOMOVE | SWP_NOSIZE | SWP_FRAMECHANGED);

-  } else {

-    GetWindowRect (hwndDesk, &rcDesk);

-    GetWindowRect (hwndDlg, &rcDlg);

-    CopyRect (&rc, &rcDesk);

-

-    OffsetRect (&rcDlg, -rcDlg.left, -rcDlg.top);

-    OffsetRect (&rc, -rc.left, -rc.top);

-    OffsetRect (&rc, -rcDlg.right, -rcDlg.bottom);

-

-    SetWindowPos (hwndDlg,

-		HWND_TOPMOST,

-		rcDesk.left + (rc.right / 2),

-		rcDesk.top + (rc.bottom / 2),

-		0, 0,

-		SWP_NOSIZE | SWP_FRAMECHANGED);

-  }

-

-#ifdef XWIN_MULTIWINDOW

-  if (g_hIconX) hIcon=g_hIconX;

-  else

-#endif

-  hIcon = LoadIcon (g_hInstance, MAKEINTRESOURCE(IDI_XWIN));

-

-#ifdef XWIN_MULTIWINDOW

-  if (g_hSmallIconX) hIconSmall=g_hSmallIconX;

-  else

-#endif

-  hIconSmall = LoadImage (g_hInstance,

-                        MAKEINTRESOURCE(IDI_XWIN), IMAGE_ICON,

-                        GetSystemMetrics(SM_CXSMICON),

-                        GetSystemMetrics(SM_CYSMICON),

-                        LR_SHARED);

-

-  PostMessage (hwndDlg, WM_SETICON, ICON_BIG, (LPARAM) hIcon);

-  PostMessage (hwndDlg, WM_SETICON, ICON_SMALL, (LPARAM) hIconSmall);

-}

-

-

-/*

- * Display the Exit dialog box

- */

-

-void

-winDisplayExitDialog (winPrivScreenPtr pScreenPriv)

-{

-  int i;

-  int liveClients = 0;

-

-  /* Count up running clients (clients[0] is serverClient) */

-  for (i = 1; i < currentMaxClients; i++)

-    if (clients[i] != NullClient)	

-      liveClients++;

-#if defined(XWIN_MULTIWINDOW)

-  /* Count down server internal clients */

-  if (pScreenPriv->pScreenInfo->fMultiWindow)

-    liveClients -= 2; /* multiwindow window manager & XMsgProc  */

-#endif

-#if defined(XWIN_CLIPBOARD)

-  if (g_fClipboardStarted)

-    liveClients--; /* clipboard manager */

-#endif

-

-  /* A user reported that this sometimes drops below zero. just eye-candy. */ 

-  if (liveClients < 0)

-    liveClients = 0;      

-

-  /* Don't show the exit confirmation dialog if SilentExit & no clients,

-     or ForceExit, is enabled */

-  if ((pref.fSilentExit && liveClients <= 0) || pref.fForceExit)

-    {

-      if (g_hDlgExit != NULL)

-	{

-	  DestroyWindow (g_hDlgExit);

-	  g_hDlgExit = NULL;

-	}

-      PostMessage (pScreenPriv->hwndScreen, WM_GIVEUP, 0, 0);

-      return;

-    }

-

-  pScreenPriv->iConnectedClients = liveClients;

-  

-  /* Check if dialog already exists */

-  if (g_hDlgExit != NULL)

-    {

-      /* Dialog box already exists, display it */

-      ShowWindow (g_hDlgExit, SW_SHOWDEFAULT);

-

-      /* User has lost the dialog.  Show them where it is. */

-      SetForegroundWindow (g_hDlgExit);

-

-      return;

-    }

-

-  /* Create dialog box */

-  g_hDlgExit = CreateDialogParam (g_hInstance,

-				  "EXIT_DIALOG",

-				  pScreenPriv->hwndScreen,

-				  winExitDlgProc,

-				  (int) pScreenPriv);

-

-  /* Show the dialog box */

-  ShowWindow (g_hDlgExit, SW_SHOW);

-  

-  /* Needed to get keyboard controls (tab, arrows, enter, esc) to work */

-  SetForegroundWindow (g_hDlgExit);

-  

-  /* Set focus to the Cancel button */

-  PostMessage (g_hDlgExit, WM_NEXTDLGCTL,

-	       (WPARAM)GetDlgItem (g_hDlgExit, IDCANCEL), TRUE);

-}

-

-#define CONNECTED_CLIENTS_FORMAT	"There %s currently %d client%s connected."

-

-

-/*

- * Exit dialog window procedure

- */

-

-static wBOOL CALLBACK

-winExitDlgProc (HWND hDialog, UINT message,

-		WPARAM wParam, LPARAM lParam)

-{

-  static winPrivScreenPtr	s_pScreenPriv = NULL;

-

-  /* Branch on message type */

-  switch (message)

-    {

-    case WM_INITDIALOG:

-      {

-	char			*pszConnectedClients;

-

-	/* Store pointers to private structures for future use */

-	s_pScreenPriv = (winPrivScreenPtr) lParam;

-	

-	winInitDialog (hDialog);

-

-	/* Format the connected clients string */

-	if (asprintf (&pszConnectedClients, CONNECTED_CLIENTS_FORMAT,

-           (s_pScreenPriv->iConnectedClients == 1) ? "is" : "are",

-            s_pScreenPriv->iConnectedClients,

-           (s_pScreenPriv->iConnectedClients == 1) ? "" : "s") == -1)

-	    return TRUE;

-     

-        

-	

-	/* Set the number of connected clients */

-	SetWindowText (GetDlgItem (hDialog, IDC_CLIENTS_CONNECTED),

-		       pszConnectedClients);

-	free(pszConnectedClients);

-      }

-      return TRUE;

-

-    case WM_COMMAND:

-      switch (LOWORD (wParam))

-	{

-	case IDOK:

-	  /* Send message to call the GiveUp function */

-	  PostMessage (s_pScreenPriv->hwndScreen, WM_GIVEUP, 0, 0);

-	  DestroyWindow (g_hDlgExit);

-	  g_hDlgExit = NULL;

-

-	  /* Fix to make sure keyboard focus isn't trapped */

-	  PostMessage (s_pScreenPriv->hwndScreen, WM_NULL, 0, 0);

-	  return TRUE;

-

-	case IDCANCEL:

-	  DestroyWindow (g_hDlgExit);

-	  g_hDlgExit = NULL;

-

-	  /* Fix to make sure keyboard focus isn't trapped */

-	  PostMessage (s_pScreenPriv->hwndScreen, WM_NULL, 0, 0);

-	  return TRUE;

-	}

-      break;

-

-    case WM_MOUSEMOVE:

-    case WM_NCMOUSEMOVE:

-      /* Show the cursor if it is hidden */

-      if (g_fSoftwareCursor && !g_fCursor)

-	{

-	  g_fCursor = TRUE;

-	  ShowCursor (TRUE);

-	}

-      return TRUE;

-

-    case WM_CLOSE:

-      DestroyWindow (g_hDlgExit);

-      g_hDlgExit = NULL;

-

-      /* Fix to make sure keyboard focus isn't trapped */

-      PostMessage (s_pScreenPriv->hwndScreen, WM_NULL, 0, 0);

-      return TRUE;

-    }

-

-  return FALSE;

-}

-

-

-/*

- * Display the Depth Change dialog box

- */

-

-void

-winDisplayDepthChangeDialog (winPrivScreenPtr pScreenPriv)

-{

-  /* Check if dialog already exists */

-  if (g_hDlgDepthChange != NULL)

-    {

-      /* Dialog box already exists, display it */

-      ShowWindow (g_hDlgDepthChange, SW_SHOWDEFAULT);

-

-      /* User has lost the dialog.  Show them where it is. */

-      SetForegroundWindow (g_hDlgDepthChange);

-

-      return;

-    }

-

-  /*

-   * Display a notification to the user that the visual 

-   * will not be displayed until the Windows display depth 

-   * is restored to the original value.

-   */

-  g_hDlgDepthChange = CreateDialogParam (g_hInstance,

-					 "DEPTH_CHANGE_BOX",

-					 pScreenPriv->hwndScreen,

-					 winChangeDepthDlgProc,

-					 (int) pScreenPriv);

-  /* Show the dialog box */

-  ShowWindow (g_hDlgDepthChange, SW_SHOW);

-  

-  ErrorF ("winDisplayDepthChangeDialog - DialogBox returned: %d\n",

-	  (int) g_hDlgDepthChange);

-  ErrorF ("winDisplayDepthChangeDialog - GetLastError: %d\n",

-	  (int) GetLastError ());

-	      

-  /* Minimize the display window */

-  ShowWindow (pScreenPriv->hwndScreen, SW_MINIMIZE);

-}

-

-

-/*

- * Process messages for the dialog that is displayed for

- * disruptive screen depth changes. 

- */

-

-static wBOOL CALLBACK

-winChangeDepthDlgProc (HWND hwndDialog, UINT message,

-		       WPARAM wParam, LPARAM lParam)

-{

-  static winPrivScreenPtr	s_pScreenPriv = NULL;

-  static winScreenInfo		*s_pScreenInfo = NULL;

-  static ScreenPtr		s_pScreen = NULL;

-

-#if CYGDEBUG

-  winDebug ("winChangeDepthDlgProc\n");

-#endif

-

-  /* Branch on message type */

-  switch (message)

-    {

-    case WM_INITDIALOG:

-#if CYGDEBUG

-      winDebug ("winChangeDepthDlgProc - WM_INITDIALOG\n");

-#endif

-

-      /* Store pointers to private structures for future use */

-      s_pScreenPriv = (winPrivScreenPtr) lParam;

-      s_pScreenInfo = s_pScreenPriv->pScreenInfo;

-      s_pScreen = s_pScreenInfo->pScreen;

-

-#if CYGDEBUG

-      winDebug ("winChangeDepthDlgProc - WM_INITDIALOG - s_pScreenPriv: %08x, "

-	      "s_pScreenInfo: %08x, s_pScreen: %08x\n",

-	      s_pScreenPriv, s_pScreenInfo, s_pScreen);

-#endif

-

-#if CYGDEBUG

-      winDebug ("winChangeDepthDlgProc - WM_INITDIALOG - orig bpp: %d, "

-	      "last bpp: %d\n",

-	      s_pScreenInfo->dwBPP,

-	      s_pScreenPriv->dwLastWindowsBitsPixel);

-#endif

-      

-      winInitDialog( hwndDialog );

-

-      return TRUE;

-

-    case WM_DISPLAYCHANGE:

-#if CYGDEBUG

-      winDebug ("winChangeDepthDlgProc - WM_DISPLAYCHANGE - orig bpp: %d, "

-	      "last bpp: %d, new bpp: %d\n",

-	      s_pScreenInfo->dwBPP,

-	      s_pScreenPriv->dwLastWindowsBitsPixel,

-	      wParam);

-#endif

-

-      /* Dismiss the dialog if the display returns to the original depth */

-      if (wParam == s_pScreenInfo->dwBPP)

-	{

-	  ErrorF ("winChangeDelthDlgProc - wParam == s_pScreenInfo->dwBPP\n");

-

-	  /* Depth has been restored, dismiss dialog */

-	  DestroyWindow (g_hDlgDepthChange);

-	  g_hDlgDepthChange = NULL;

-

-	  /* Flag that we have a valid screen depth */

-	  s_pScreenPriv->fBadDepth = FALSE;

-	}

-      return TRUE;

-

-    case WM_COMMAND:

-      switch (LOWORD (wParam))

-	{

-	case IDOK:

-	case IDCANCEL:

-	  ErrorF ("winChangeDepthDlgProc - WM_COMMAND - IDOK or IDCANCEL\n");

-

-	  /* 

-	   * User dismissed the dialog, hide it until the

-	   * display mode is restored.

-	   */

-	  ShowWindow (g_hDlgDepthChange, SW_HIDE);

-	  return TRUE;

-	}

-      break;

-

-    case WM_CLOSE:

-      ErrorF ("winChangeDepthDlgProc - WM_CLOSE\n");

-

-      DestroyWindow (g_hDlgAbout);

-      g_hDlgAbout = NULL;

-

-      /* Fix to make sure keyboard focus isn't trapped */

-      PostMessage (s_pScreenPriv->hwndScreen, WM_NULL, 0, 0);

-      return TRUE;

-    }

-

-  return FALSE;

-}

-

-

-/*

- * Display the About dialog box

- */

-

-void

-winDisplayAboutDialog (winPrivScreenPtr pScreenPriv)

-{

-  /* Check if dialog already exists */

-  if (g_hDlgAbout != NULL)

-    {

-      /* Dialog box already exists, display it */

-      ShowWindow (g_hDlgAbout, SW_SHOWDEFAULT);

-

-      /* User has lost the dialog.  Show them where it is. */

-      SetForegroundWindow (g_hDlgAbout);

-

-      return;

-    }

-

-  /*

-   * Display the about box

-   */

-  g_hDlgAbout = CreateDialogParam (g_hInstance,

-				   "ABOUT_BOX",

-				   pScreenPriv->hwndScreen,

-				   winAboutDlgProc,

-				   (int) pScreenPriv);

- 

-  /* Show the dialog box */

-  ShowWindow (g_hDlgAbout, SW_SHOW);

-

-  /* Needed to get keyboard controls (tab, arrows, enter, esc) to work */

-  SetForegroundWindow (g_hDlgAbout);

-  

-  /* Set focus to the OK button */

-  PostMessage (g_hDlgAbout, WM_NEXTDLGCTL,

-	       (WPARAM)GetDlgItem (g_hDlgAbout, IDOK), TRUE);

-}

-

-

-/*

- * Process messages for the about dialog.

- */

-

-static wBOOL CALLBACK

-winAboutDlgProc (HWND hwndDialog, UINT message,

-		 WPARAM wParam, LPARAM lParam)

-{

-  static winPrivScreenPtr	s_pScreenPriv = NULL;

-  static winScreenInfo		*s_pScreenInfo = NULL;

-  static ScreenPtr		s_pScreen = NULL;

-

-#if CYGDEBUG

-  winDebug ("winAboutDlgProc\n");

-#endif

-

-  /* Branch on message type */

-  switch (message)

-    {

-    case WM_INITDIALOG:

-#if CYGDEBUG

-      winDebug ("winAboutDlgProc - WM_INITDIALOG\n");

-#endif

-

-      /* Store pointers to private structures for future use */

-      s_pScreenPriv = (winPrivScreenPtr) lParam;

-      s_pScreenInfo = s_pScreenPriv->pScreenInfo;

-      s_pScreen = s_pScreenInfo->pScreen;

-

-      winInitDialog (hwndDialog);

-

-      /* Override the URL buttons */

-      winOverrideURLButton (hwndDialog, ID_ABOUT_CHANGELOG);

-      winOverrideURLButton (hwndDialog, ID_ABOUT_WEBSITE);

-      winOverrideURLButton (hwndDialog, ID_ABOUT_UG);

-      winOverrideURLButton (hwndDialog, ID_ABOUT_FAQ);

-

-      return TRUE;

-

-    case WM_DRAWITEM:

-      /* Draw the URL buttons as needed */

-      winDrawURLWindow (lParam);

-      return TRUE;

-

-    case WM_MOUSEMOVE:

-    case WM_NCMOUSEMOVE:

-      /* Show the cursor if it is hidden */

-      if (g_fSoftwareCursor && !g_fCursor)

-	{

-	  g_fCursor = TRUE;

-	  ShowCursor (TRUE);

-	}

-      return TRUE;

-

-    case WM_COMMAND:

-      switch (LOWORD (wParam))

-	{

-	case IDOK:

-	case IDCANCEL:

-	  ErrorF ("winAboutDlgProc - WM_COMMAND - IDOK or IDCANCEL\n");

-

-	  DestroyWindow (g_hDlgAbout);

-	  g_hDlgAbout = NULL;

-

-	  /* Fix to make sure keyboard focus isn't trapped */

-	  PostMessage (s_pScreenPriv->hwndScreen, WM_NULL, 0, 0);

-

-	  /* Restore window procedures for URL buttons */

-	  winUnoverrideURLButton (hwndDialog, ID_ABOUT_CHANGELOG);

-	  winUnoverrideURLButton (hwndDialog, ID_ABOUT_WEBSITE);

-	  winUnoverrideURLButton (hwndDialog, ID_ABOUT_UG);

-	  winUnoverrideURLButton (hwndDialog, ID_ABOUT_FAQ);

-

-	  return TRUE;

-

-	case ID_ABOUT_CHANGELOG:

-	  {

-	    int iReturn;

-#ifdef __CYGWIN__

-	    const char *	pszCygPath = "/usr/X11R6/share/doc/"

-	      "xorg-x11-xwin/changelog.html";

-	    char		pszWinPath[MAX_PATH + 1];

-

-	    /* Convert the POSIX path to a Win32 path */

-	    cygwin_conv_to_win32_path (pszCygPath, pszWinPath);

-#else

-	    const char *	pszWinPath = "http://x.cygwin.com/"

-		    "devel/server/changelog.html";

-#endif

-	    

-	    iReturn = (int)ShellExecute (NULL,

-                                    "open",

-                                    pszWinPath,

-                                    NULL,

-                                    NULL,

-                                    SW_MAXIMIZE);

-	    if (iReturn < 32)

-	      {

-		ErrorF ("winAboutDlgProc - WM_COMMAND - ID_ABOUT_CHANGELOG - "

-			"ShellExecute failed: %d\n",

-			iReturn);

-	      }	    

-	  }

-	  return TRUE;

-

-	case ID_ABOUT_WEBSITE:

-	  {

-	    const char *	pszPath = __VENDORDWEBSUPPORT__;

-	    int			iReturn;

-	    

-	    iReturn = (int)ShellExecute (NULL,

-                                    "open",

-                                    pszPath,

-                                    NULL,

-                                    NULL,

-                                    SW_MAXIMIZE);

-	    if (iReturn < 32)

-	      {

-		ErrorF ("winAboutDlgProc - WM_COMMAND - ID_ABOUT_WEBSITE - "

-			"ShellExecute failed: %d\n",

-			iReturn);

-	      }	    

-	  }

-	  return TRUE;

-

-	case ID_ABOUT_UG:

-	  {

-	    const char *	pszPath = "http://x.cygwin.com/docs/ug/";

-	    int			iReturn;

-	    

-	    iReturn = (int)ShellExecute (NULL,

-                                    "open",

-                                    pszPath,

-                                    NULL,

-                                    NULL,

-                                    SW_MAXIMIZE);

-	    if (iReturn < 32)

-	      {

-		ErrorF ("winAboutDlgProc - WM_COMMAND - ID_ABOUT_UG - "

-			"ShellExecute failed: %d\n",

-			iReturn);

-	      }	    

-	  }

-	  return TRUE;

-

-	case ID_ABOUT_FAQ:

-	  {

-	    const char *	pszPath = "http://x.cygwin.com/docs/faq/";

-	    int			iReturn;

-	    

-	    iReturn = (int)ShellExecute (NULL,

-                                    "open",

-                                    pszPath,

-                                    NULL,

-                                    NULL,

-                                    SW_MAXIMIZE);

-	    if (iReturn < 32)

-	      {

-		ErrorF ("winAboutDlgProc - WM_COMMAND - ID_ABOUT_FAQ - "

-			"ShellExecute failed: %d\n",

-			iReturn);

-	      }	    

-	  }

-	  return TRUE;

-	}

-      break;

-

-    case WM_CLOSE:

-      ErrorF ("winAboutDlgProc - WM_CLOSE\n");

-

-      DestroyWindow (g_hDlgAbout);

-      g_hDlgAbout = NULL;

-

-      /* Fix to make sure keyboard focus isn't trapped */

-      PostMessage (s_pScreenPriv->hwndScreen, WM_NULL, 0, 0);

-

-      /* Restore window procedures for URL buttons */

-      winUnoverrideURLButton (hwndDialog, ID_ABOUT_CHANGELOG);

-      winUnoverrideURLButton (hwndDialog, ID_ABOUT_WEBSITE);

-      winUnoverrideURLButton (hwndDialog, ID_ABOUT_UG);

-      winUnoverrideURLButton (hwndDialog, ID_ABOUT_FAQ);

-

-      return TRUE;

-    }

-

-  return FALSE;

-}

+/*
+ *Copyright (C) 2003-2004 Harold L Hunt II 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 HAROLD L HUNT II 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 Harold L Hunt II
+ *shall not be used in advertising or otherwise to promote the sale, use
+ *or other dealings in this Software without prior written authorization
+ *from Harold L Hunt II.
+ *
+ * Authors:	Harold L Hunt II
+ *              Earle F. Philhower III
+ */
+
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
+#include "win.h"
+#ifdef __CYGWIN__
+#include <sys/cygwin.h>
+#endif
+#include <shellapi.h>
+#include "winprefs.h"
+
+
+/*
+ * References to external globals
+ */
+
+#ifdef XWIN_CLIPBOARD
+extern Bool			g_fClipboardStarted;
+#endif
+/*
+ * Local function prototypes
+ */
+
+static wBOOL CALLBACK
+winExitDlgProc (HWND hDialog, UINT message,
+		WPARAM wParam, LPARAM lParam);
+
+static wBOOL CALLBACK
+winChangeDepthDlgProc (HWND hDialog, UINT message,
+		       WPARAM wParam, LPARAM lParam);
+
+static wBOOL CALLBACK
+winAboutDlgProc (HWND hDialog, UINT message,
+		 WPARAM wParam, LPARAM lParam);
+
+
+static void
+winDrawURLWindow (LPARAM lParam);
+
+static LRESULT CALLBACK
+winURLWndProc (HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam);
+
+static void
+winOverrideURLButton (HWND hdlg, int id);
+
+static void
+winUnoverrideURLButton (HWND hdlg, int id);
+
+
+/*
+ * Owner-draw a button as a URL
+ */
+
+static void
+winDrawURLWindow (LPARAM lParam)
+{
+  DRAWITEMSTRUCT *draw;
+  char str[256];
+  RECT rect;
+  HFONT font;
+  COLORREF crText;
+  
+  draw = (DRAWITEMSTRUCT *) lParam;
+  GetWindowText (draw->hwndItem, str, sizeof(str));
+  str[255] = 0;
+  GetClientRect (draw->hwndItem, &rect);
+  
+  /* Color the button depending upon its state */
+  if (draw->itemState & ODS_SELECTED)
+    crText = RGB(128+64,0,0);
+  else if (draw->itemState & ODS_FOCUS)
+    crText = RGB(0,128+64,0);
+  else
+    crText = RGB(0,0,128+64);
+  SetTextColor (draw->hDC, crText);
+  
+  /* Create font 8 high, standard dialog font */
+  font = CreateFont (-8, 0, 0, 0, FW_DONTCARE, FALSE, FALSE, FALSE,
+		     0, 0, 0, 0, 0, "MS Sans Serif");
+  if (!font)
+    {
+      ErrorF ("winDrawURLWindow: Unable to create URL font, bailing.\n");
+      return;
+    }
+  /* Draw it */
+  SetBkMode (draw->hDC, OPAQUE);
+  SelectObject (draw->hDC, font);
+  DrawText (draw->hDC, str, strlen (str),&rect,DT_CENTER | DT_VCENTER);
+  /* Delete the created font, replace it with stock font */
+  DeleteObject (SelectObject (draw->hDC, GetStockObject (ANSI_VAR_FONT)));
+}
+
+
+/*
+ * WndProc for overridden buttons
+ */
+
+static LRESULT CALLBACK
+winURLWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
+{
+  WNDPROC origCB = NULL;
+  HCURSOR cursor;
+  
+  /* If it's a SetCursor message, tell it to the hand */
+  if (msg==WM_SETCURSOR) {
+    cursor = LoadCursor (NULL, IDC_HAND);
+    if (cursor)
+      SetCursor (cursor);
+    return TRUE;
+  }
+  origCB = (WNDPROC)GetWindowLongPtr(hwnd, GWLP_USERDATA);
+  /* Otherwise fall through to original WndProc */
+  if (origCB)
+    return CallWindowProc (origCB, hwnd, msg, wParam, lParam);
+  else
+    return FALSE;
+}
+
+
+/*
+ * Register and unregister the custom WndProc
+ */
+
+static void
+winOverrideURLButton (HWND hwnd, int id)
+{
+  WNDPROC origCB;
+  origCB = (WNDPROC)SetWindowLongPtr(GetDlgItem (hwnd, id),
+                                     GWLP_WNDPROC, (LONG_PTR)winURLWndProc);
+  SetWindowLongPtr(GetDlgItem (hwnd, id), GWLP_USERDATA, (LONG_PTR)origCB);
+}
+
+static void
+winUnoverrideURLButton (HWND hwnd, int id)
+{
+  WNDPROC origCB;
+  origCB = (WNDPROC)SetWindowLongPtr(GetDlgItem (hwnd, id),
+                                     GWLP_USERDATA, 0);
+  if (origCB)
+    SetWindowLongPtr(GetDlgItem (hwnd, id), GWLP_WNDPROC, (LONG_PTR)origCB);
+}
+
+
+/*
+ * Center a dialog window in the desktop window
+ * and set small and large icons to X icons.
+ */
+
+static void
+winInitDialog (HWND hwndDlg)
+{
+  HWND hwndDesk; 
+  RECT rc, rcDlg, rcDesk;
+  HICON hIcon, hIconSmall;
+ 
+  hwndDesk = GetParent (hwndDlg);
+  if (!hwndDesk || IsIconic (hwndDesk))
+    hwndDesk = GetDesktopWindow (); 
+  
+  /* Remove minimize and maximize buttons */
+  SetWindowLongPtr(hwndDlg, GWL_STYLE,
+                   GetWindowLongPtr(hwndDlg, GWL_STYLE)
+                   & ~(WS_MAXIMIZEBOX | WS_MINIMIZEBOX));
+
+  /* Set Window not to show in the task bar */
+  SetWindowLongPtr(hwndDlg, GWL_EXSTYLE,
+                   GetWindowLongPtr(hwndDlg, GWL_EXSTYLE) & ~WS_EX_APPWINDOW );
+
+  /* Center dialog window in the screen. Not done for multi-monitor systems, where
+   * it is likely to end up split across the screens. In that case, it appears
+   * near the Tray icon.
+   */
+  if (GetSystemMetrics(SM_CMONITORS)>1) {
+    /* Still need to refresh the frame change. */
+    SetWindowPos (hwndDlg, HWND_TOPMOST, 0,0,0,0,
+		SWP_NOMOVE | SWP_NOSIZE | SWP_FRAMECHANGED);
+  } else {
+    GetWindowRect (hwndDesk, &rcDesk);
+    GetWindowRect (hwndDlg, &rcDlg);
+    CopyRect (&rc, &rcDesk);
+
+    OffsetRect (&rcDlg, -rcDlg.left, -rcDlg.top);
+    OffsetRect (&rc, -rc.left, -rc.top);
+    OffsetRect (&rc, -rcDlg.right, -rcDlg.bottom);
+
+    SetWindowPos (hwndDlg,
+		HWND_TOPMOST,
+		rcDesk.left + (rc.right / 2),
+		rcDesk.top + (rc.bottom / 2),
+		0, 0,
+		SWP_NOSIZE | SWP_FRAMECHANGED);
+  }
+
+#ifdef XWIN_MULTIWINDOW
+  if (g_hIconX) hIcon=g_hIconX;
+  else
+#endif
+  hIcon = LoadIcon (g_hInstance, MAKEINTRESOURCE(IDI_XWIN));
+
+#ifdef XWIN_MULTIWINDOW
+  if (g_hSmallIconX) hIconSmall=g_hSmallIconX;
+  else
+#endif
+  hIconSmall = LoadImage (g_hInstance,
+                        MAKEINTRESOURCE(IDI_XWIN), IMAGE_ICON,
+                        GetSystemMetrics(SM_CXSMICON),
+                        GetSystemMetrics(SM_CYSMICON),
+                        LR_SHARED);
+
+  PostMessage (hwndDlg, WM_SETICON, ICON_BIG, (LPARAM) hIcon);
+  PostMessage (hwndDlg, WM_SETICON, ICON_SMALL, (LPARAM) hIconSmall);
+}
+
+
+/*
+ * Display the Exit dialog box
+ */
+
+void
+winDisplayExitDialog (winPrivScreenPtr pScreenPriv)
+{
+  int i;
+  int liveClients = 0;
+
+  /* Count up running clients (clients[0] is serverClient) */
+  for (i = 1; i < currentMaxClients; i++)
+    if (clients[i] != NullClient)	
+      liveClients++;
+#if defined(XWIN_MULTIWINDOW)
+  /* Count down server internal clients */
+  if (pScreenPriv->pScreenInfo->fMultiWindow)
+    liveClients -= 2; /* multiwindow window manager & XMsgProc  */
+#endif
+#if defined(XWIN_CLIPBOARD)
+  if (g_fClipboardStarted)
+    liveClients--; /* clipboard manager */
+#endif
+
+  /* A user reported that this sometimes drops below zero. just eye-candy. */ 
+  if (liveClients < 0)
+    liveClients = 0;      
+
+  /* Don't show the exit confirmation dialog if SilentExit & no clients,
+     or ForceExit, is enabled */
+  if ((pref.fSilentExit && liveClients <= 0) || pref.fForceExit)
+    {
+      if (g_hDlgExit != NULL)
+	{
+	  DestroyWindow (g_hDlgExit);
+	  g_hDlgExit = NULL;
+	}
+      PostMessage (pScreenPriv->hwndScreen, WM_GIVEUP, 0, 0);
+      return;
+    }
+
+  pScreenPriv->iConnectedClients = liveClients;
+  
+  /* Check if dialog already exists */
+  if (g_hDlgExit != NULL)
+    {
+      /* Dialog box already exists, display it */
+      ShowWindow (g_hDlgExit, SW_SHOWDEFAULT);
+
+      /* User has lost the dialog.  Show them where it is. */
+      SetForegroundWindow (g_hDlgExit);
+
+      return;
+    }
+
+  /* Create dialog box */
+  g_hDlgExit = CreateDialogParam (g_hInstance,
+				  "EXIT_DIALOG",
+				  pScreenPriv->hwndScreen,
+				  winExitDlgProc,
+				  (int) pScreenPriv);
+
+  /* Show the dialog box */
+  ShowWindow (g_hDlgExit, SW_SHOW);
+  
+  /* Needed to get keyboard controls (tab, arrows, enter, esc) to work */
+  SetForegroundWindow (g_hDlgExit);
+  
+  /* Set focus to the Cancel button */
+  PostMessage (g_hDlgExit, WM_NEXTDLGCTL,
+	       (WPARAM)GetDlgItem (g_hDlgExit, IDCANCEL), TRUE);
+}
+
+#define CONNECTED_CLIENTS_FORMAT	"There %s currently %d client%s connected."
+
+
+/*
+ * Exit dialog window procedure
+ */
+
+static wBOOL CALLBACK
+winExitDlgProc (HWND hDialog, UINT message,
+		WPARAM wParam, LPARAM lParam)
+{
+  static winPrivScreenPtr	s_pScreenPriv = NULL;
+
+  /* Branch on message type */
+  switch (message)
+    {
+    case WM_INITDIALOG:
+      {
+	char			*pszConnectedClients;
+
+	/* Store pointers to private structures for future use */
+	s_pScreenPriv = (winPrivScreenPtr) lParam;
+	
+	winInitDialog (hDialog);
+
+	/* Format the connected clients string */
+	if (asprintf (&pszConnectedClients, CONNECTED_CLIENTS_FORMAT,
+           (s_pScreenPriv->iConnectedClients == 1) ? "is" : "are",
+            s_pScreenPriv->iConnectedClients,
+           (s_pScreenPriv->iConnectedClients == 1) ? "" : "s") == -1)
+	    return TRUE;
+     
+        
+	
+	/* Set the number of connected clients */
+	SetWindowText (GetDlgItem (hDialog, IDC_CLIENTS_CONNECTED),
+		       pszConnectedClients);
+	free(pszConnectedClients);
+      }
+      return TRUE;
+
+    case WM_COMMAND:
+      switch (LOWORD (wParam))
+	{
+	case IDOK:
+	  /* Send message to call the GiveUp function */
+	  PostMessage (s_pScreenPriv->hwndScreen, WM_GIVEUP, 0, 0);
+	  DestroyWindow (g_hDlgExit);
+	  g_hDlgExit = NULL;
+
+	  /* Fix to make sure keyboard focus isn't trapped */
+	  PostMessage (s_pScreenPriv->hwndScreen, WM_NULL, 0, 0);
+	  return TRUE;
+
+	case IDCANCEL:
+	  DestroyWindow (g_hDlgExit);
+	  g_hDlgExit = NULL;
+
+	  /* Fix to make sure keyboard focus isn't trapped */
+	  PostMessage (s_pScreenPriv->hwndScreen, WM_NULL, 0, 0);
+	  return TRUE;
+	}
+      break;
+
+    case WM_MOUSEMOVE:
+    case WM_NCMOUSEMOVE:
+      /* Show the cursor if it is hidden */
+      if (g_fSoftwareCursor && !g_fCursor)
+	{
+	  g_fCursor = TRUE;
+	  ShowCursor (TRUE);
+	}
+      return TRUE;
+
+    case WM_CLOSE:
+      DestroyWindow (g_hDlgExit);
+      g_hDlgExit = NULL;
+
+      /* Fix to make sure keyboard focus isn't trapped */
+      PostMessage (s_pScreenPriv->hwndScreen, WM_NULL, 0, 0);
+      return TRUE;
+    }
+
+  return FALSE;
+}
+
+
+/*
+ * Display the Depth Change dialog box
+ */
+
+void
+winDisplayDepthChangeDialog (winPrivScreenPtr pScreenPriv)
+{
+  /* Check if dialog already exists */
+  if (g_hDlgDepthChange != NULL)
+    {
+      /* Dialog box already exists, display it */
+      ShowWindow (g_hDlgDepthChange, SW_SHOWDEFAULT);
+
+      /* User has lost the dialog.  Show them where it is. */
+      SetForegroundWindow (g_hDlgDepthChange);
+
+      return;
+    }
+
+  /*
+   * Display a notification to the user that the visual 
+   * will not be displayed until the Windows display depth 
+   * is restored to the original value.
+   */
+  g_hDlgDepthChange = CreateDialogParam (g_hInstance,
+					 "DEPTH_CHANGE_BOX",
+					 pScreenPriv->hwndScreen,
+					 winChangeDepthDlgProc,
+					 (int) pScreenPriv);
+  /* Show the dialog box */
+  ShowWindow (g_hDlgDepthChange, SW_SHOW);
+  
+  ErrorF ("winDisplayDepthChangeDialog - DialogBox returned: %d\n",
+	  (int) g_hDlgDepthChange);
+  ErrorF ("winDisplayDepthChangeDialog - GetLastError: %d\n",
+	  (int) GetLastError ());
+	      
+  /* Minimize the display window */
+  ShowWindow (pScreenPriv->hwndScreen, SW_MINIMIZE);
+}
+
+
+/*
+ * Process messages for the dialog that is displayed for
+ * disruptive screen depth changes. 
+ */
+
+static wBOOL CALLBACK
+winChangeDepthDlgProc (HWND hwndDialog, UINT message,
+		       WPARAM wParam, LPARAM lParam)
+{
+  static winPrivScreenPtr	s_pScreenPriv = NULL;
+  static winScreenInfo		*s_pScreenInfo = NULL;
+  static ScreenPtr		s_pScreen = NULL;
+
+#if CYGDEBUG
+  winDebug ("winChangeDepthDlgProc\n");
+#endif
+
+  /* Branch on message type */
+  switch (message)
+    {
+    case WM_INITDIALOG:
+#if CYGDEBUG
+      winDebug ("winChangeDepthDlgProc - WM_INITDIALOG\n");
+#endif
+
+      /* Store pointers to private structures for future use */
+      s_pScreenPriv = (winPrivScreenPtr) lParam;
+      s_pScreenInfo = s_pScreenPriv->pScreenInfo;
+      s_pScreen = s_pScreenInfo->pScreen;
+
+#if CYGDEBUG
+      winDebug ("winChangeDepthDlgProc - WM_INITDIALOG - s_pScreenPriv: %08x, "
+	      "s_pScreenInfo: %08x, s_pScreen: %08x\n",
+	      s_pScreenPriv, s_pScreenInfo, s_pScreen);
+#endif
+
+#if CYGDEBUG
+      winDebug ("winChangeDepthDlgProc - WM_INITDIALOG - orig bpp: %d, "
+	      "current bpp: %d\n",
+	      s_pScreenInfo->dwBPP,
+              GetDeviceCaps(s_pScreenPriv->hdcScreen, BITSPIXEL));
+#endif
+
+      winInitDialog( hwndDialog );
+
+      return TRUE;
+
+    case WM_DISPLAYCHANGE:
+#if CYGDEBUG
+      winDebug ("winChangeDepthDlgProc - WM_DISPLAYCHANGE - orig bpp: %d, "
+	      "new bpp: %d\n",
+	      s_pScreenInfo->dwBPP,
+              GetDeviceCaps(s_pScreenPriv->hdcScreen, BITSPIXEL));
+#endif
+
+      /* Dismiss the dialog if the display returns to the original depth */
+      if (GetDeviceCaps(s_pScreenPriv->hdcScreen, BITSPIXEL) == s_pScreenInfo->dwBPP)
+	{
+	  ErrorF ("winChangeDelthDlgProc - wParam == s_pScreenInfo->dwBPP\n");
+
+	  /* Depth has been restored, dismiss dialog */
+	  DestroyWindow (g_hDlgDepthChange);
+	  g_hDlgDepthChange = NULL;
+
+	  /* Flag that we have a valid screen depth */
+	  s_pScreenPriv->fBadDepth = FALSE;
+	}
+      return TRUE;
+
+    case WM_COMMAND:
+      switch (LOWORD (wParam))
+	{
+	case IDOK:
+	case IDCANCEL:
+	  ErrorF ("winChangeDepthDlgProc - WM_COMMAND - IDOK or IDCANCEL\n");
+
+	  /* 
+	   * User dismissed the dialog, hide it until the
+	   * display mode is restored.
+	   */
+	  ShowWindow (g_hDlgDepthChange, SW_HIDE);
+	  return TRUE;
+	}
+      break;
+
+    case WM_CLOSE:
+      ErrorF ("winChangeDepthDlgProc - WM_CLOSE\n");
+
+      DestroyWindow (g_hDlgAbout);
+      g_hDlgAbout = NULL;
+
+      /* Fix to make sure keyboard focus isn't trapped */
+      PostMessage (s_pScreenPriv->hwndScreen, WM_NULL, 0, 0);
+      return TRUE;
+    }
+
+  return FALSE;
+}
+
+
+/*
+ * Display the About dialog box
+ */
+
+void
+winDisplayAboutDialog (winPrivScreenPtr pScreenPriv)
+{
+  /* Check if dialog already exists */
+  if (g_hDlgAbout != NULL)
+    {
+      /* Dialog box already exists, display it */
+      ShowWindow (g_hDlgAbout, SW_SHOWDEFAULT);
+
+      /* User has lost the dialog.  Show them where it is. */
+      SetForegroundWindow (g_hDlgAbout);
+
+      return;
+    }
+
+  /*
+   * Display the about box
+   */
+  g_hDlgAbout = CreateDialogParam (g_hInstance,
+				   "ABOUT_BOX",
+				   pScreenPriv->hwndScreen,
+				   winAboutDlgProc,
+				   (int) pScreenPriv);
+ 
+  /* Show the dialog box */
+  ShowWindow (g_hDlgAbout, SW_SHOW);
+
+  /* Needed to get keyboard controls (tab, arrows, enter, esc) to work */
+  SetForegroundWindow (g_hDlgAbout);
+  
+  /* Set focus to the OK button */
+  PostMessage (g_hDlgAbout, WM_NEXTDLGCTL,
+	       (WPARAM)GetDlgItem (g_hDlgAbout, IDOK), TRUE);
+}
+
+
+/*
+ * Process messages for the about dialog.
+ */
+
+static wBOOL CALLBACK
+winAboutDlgProc (HWND hwndDialog, UINT message,
+		 WPARAM wParam, LPARAM lParam)
+{
+  static winPrivScreenPtr	s_pScreenPriv = NULL;
+  static winScreenInfo		*s_pScreenInfo = NULL;
+  static ScreenPtr		s_pScreen = NULL;
+
+#if CYGDEBUG
+  winDebug ("winAboutDlgProc\n");
+#endif
+
+  /* Branch on message type */
+  switch (message)
+    {
+    case WM_INITDIALOG:
+#if CYGDEBUG
+      winDebug ("winAboutDlgProc - WM_INITDIALOG\n");
+#endif
+
+      /* Store pointers to private structures for future use */
+      s_pScreenPriv = (winPrivScreenPtr) lParam;
+      s_pScreenInfo = s_pScreenPriv->pScreenInfo;
+      s_pScreen = s_pScreenInfo->pScreen;
+
+      winInitDialog (hwndDialog);
+
+      /* Override the URL buttons */
+      winOverrideURLButton (hwndDialog, ID_ABOUT_CHANGELOG);
+      winOverrideURLButton (hwndDialog, ID_ABOUT_WEBSITE);
+      winOverrideURLButton (hwndDialog, ID_ABOUT_UG);
+      winOverrideURLButton (hwndDialog, ID_ABOUT_FAQ);
+
+      return TRUE;
+
+    case WM_DRAWITEM:
+      /* Draw the URL buttons as needed */
+      winDrawURLWindow (lParam);
+      return TRUE;
+
+    case WM_MOUSEMOVE:
+    case WM_NCMOUSEMOVE:
+      /* Show the cursor if it is hidden */
+      if (g_fSoftwareCursor && !g_fCursor)
+	{
+	  g_fCursor = TRUE;
+	  ShowCursor (TRUE);
+	}
+      return TRUE;
+
+    case WM_COMMAND:
+      switch (LOWORD (wParam))
+	{
+	case IDOK:
+	case IDCANCEL:
+	  ErrorF ("winAboutDlgProc - WM_COMMAND - IDOK or IDCANCEL\n");
+
+	  DestroyWindow (g_hDlgAbout);
+	  g_hDlgAbout = NULL;
+
+	  /* Fix to make sure keyboard focus isn't trapped */
+	  PostMessage (s_pScreenPriv->hwndScreen, WM_NULL, 0, 0);
+
+	  /* Restore window procedures for URL buttons */
+	  winUnoverrideURLButton (hwndDialog, ID_ABOUT_CHANGELOG);
+	  winUnoverrideURLButton (hwndDialog, ID_ABOUT_WEBSITE);
+	  winUnoverrideURLButton (hwndDialog, ID_ABOUT_UG);
+	  winUnoverrideURLButton (hwndDialog, ID_ABOUT_FAQ);
+
+	  return TRUE;
+
+	case ID_ABOUT_CHANGELOG:
+	  {
+	    int iReturn;
+#ifdef __CYGWIN__
+	    const char *	pszCygPath = "/usr/X11R6/share/doc/"
+	      "xorg-x11-xwin/changelog.html";
+	    char		pszWinPath[MAX_PATH + 1];
+
+	    /* Convert the POSIX path to a Win32 path */
+	    cygwin_conv_to_win32_path (pszCygPath, pszWinPath);
+#else
+	    const char *	pszWinPath = "http://x.cygwin.com/"
+		    "devel/server/changelog.html";
+#endif
+	    
+	    iReturn = (int)ShellExecute (NULL,
+                                    "open",
+                                    pszWinPath,
+                                    NULL,
+                                    NULL,
+                                    SW_MAXIMIZE);
+	    if (iReturn < 32)
+	      {
+		ErrorF ("winAboutDlgProc - WM_COMMAND - ID_ABOUT_CHANGELOG - "
+			"ShellExecute failed: %d\n",
+			iReturn);
+	      }	    
+	  }
+	  return TRUE;
+
+	case ID_ABOUT_WEBSITE:
+	  {
+	    const char *	pszPath = __VENDORDWEBSUPPORT__;
+	    int			iReturn;
+	    
+	    iReturn = (int)ShellExecute (NULL,
+                                    "open",
+                                    pszPath,
+                                    NULL,
+                                    NULL,
+                                    SW_MAXIMIZE);
+	    if (iReturn < 32)
+	      {
+		ErrorF ("winAboutDlgProc - WM_COMMAND - ID_ABOUT_WEBSITE - "
+			"ShellExecute failed: %d\n",
+			iReturn);
+	      }	    
+	  }
+	  return TRUE;
+
+	case ID_ABOUT_UG:
+	  {
+	    const char *	pszPath = "http://x.cygwin.com/docs/ug/";
+	    int			iReturn;
+	    
+	    iReturn = (int)ShellExecute (NULL,
+                                    "open",
+                                    pszPath,
+                                    NULL,
+                                    NULL,
+                                    SW_MAXIMIZE);
+	    if (iReturn < 32)
+	      {
+		ErrorF ("winAboutDlgProc - WM_COMMAND - ID_ABOUT_UG - "
+			"ShellExecute failed: %d\n",
+			iReturn);
+	      }	    
+	  }
+	  return TRUE;
+
+	case ID_ABOUT_FAQ:
+	  {
+	    const char *	pszPath = "http://x.cygwin.com/docs/faq/";
+	    int			iReturn;
+	    
+	    iReturn = (int)ShellExecute (NULL,
+                                    "open",
+                                    pszPath,
+                                    NULL,
+                                    NULL,
+                                    SW_MAXIMIZE);
+	    if (iReturn < 32)
+	      {
+		ErrorF ("winAboutDlgProc - WM_COMMAND - ID_ABOUT_FAQ - "
+			"ShellExecute failed: %d\n",
+			iReturn);
+	      }	    
+	  }
+	  return TRUE;
+	}
+      break;
+
+    case WM_CLOSE:
+      ErrorF ("winAboutDlgProc - WM_CLOSE\n");
+
+      DestroyWindow (g_hDlgAbout);
+      g_hDlgAbout = NULL;
+
+      /* Fix to make sure keyboard focus isn't trapped */
+      PostMessage (s_pScreenPriv->hwndScreen, WM_NULL, 0, 0);
+
+      /* Restore window procedures for URL buttons */
+      winUnoverrideURLButton (hwndDialog, ID_ABOUT_CHANGELOG);
+      winUnoverrideURLButton (hwndDialog, ID_ABOUT_WEBSITE);
+      winUnoverrideURLButton (hwndDialog, ID_ABOUT_UG);
+      winUnoverrideURLButton (hwndDialog, ID_ABOUT_FAQ);
+
+      return TRUE;
+    }
+
+  return FALSE;
+}
diff --git a/xorg-server/hw/xwin/winmonitors.c b/xorg-server/hw/xwin/winmonitors.c
new file mode 100644
index 000000000..63af803d0
--- /dev/null
+++ b/xorg-server/hw/xwin/winmonitors.c
@@ -0,0 +1,92 @@
+/*
+
+Copyright 1993, 1998  The Open Group
+Copyright (C) Colin Harrison 2005-2008
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.
+
+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 OPEN GROUP 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 Open Group 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 Open Group.
+
+*/
+
+
+#include "win.h"
+#include "winmonitors.h"
+
+/*
+ * getMonitorInfo - callback function used to return information from the enumeration of monitors attached
+ */
+
+static
+wBOOL CALLBACK getMonitorInfo(HMONITOR hMonitor, HDC hdc, LPRECT rect, LPARAM _data)
+{
+  struct GetMonitorInfoData* data = (struct GetMonitorInfoData*)_data;
+  // only get data for monitor number specified in <data>
+  data->monitorNum++;
+  if (data->monitorNum == data->requestedMonitor)
+  {
+	data->bMonitorSpecifiedExists = TRUE;
+	data->monitorOffsetX = rect->left;
+	data->monitorOffsetY = rect->top;
+	data->monitorHeight  = rect->bottom - rect->top;
+	data->monitorWidth   = rect->right  - rect->left;
+    return FALSE;
+  }
+  return TRUE;
+}
+
+typedef wBOOL (*ENUMDISPLAYMONITORSPROC)(HDC,LPCRECT,MONITORENUMPROC,LPARAM);
+ENUMDISPLAYMONITORSPROC _EnumDisplayMonitors;
+
+wBOOL CALLBACK getMonitorInfo(HMONITOR hMonitor, HDC hdc, LPRECT rect, LPARAM _data);
+
+Bool QueryMonitor(int index, struct GetMonitorInfoData *data)
+{
+    /* Load EnumDisplayMonitors from DLL */
+    HMODULE user32;
+    FARPROC func;
+    user32 = LoadLibrary("user32.dll");
+    if (user32 == NULL)
+    {
+        winW32Error(2, "Could not open user32.dll");
+        return FALSE;
+    }
+    func = GetProcAddress(user32, "EnumDisplayMonitors");
+    if (func == NULL)
+    {
+        winW32Error(2, "Could not resolve EnumDisplayMonitors: ");
+        return FALSE;
+    }
+    _EnumDisplayMonitors = (ENUMDISPLAYMONITORSPROC)func;
+
+    /* prepare data */
+    if (data == NULL)
+        return FALSE;
+    memset(data, 0, sizeof(*data));
+    data->requestedMonitor = index;
+
+    /* query information */
+    _EnumDisplayMonitors(NULL, NULL, getMonitorInfo, (LPARAM) data);
+
+    /* cleanup */
+    FreeLibrary(user32);
+    return TRUE;
+}
diff --git a/xorg-server/hw/xwin/winmonitors.h b/xorg-server/hw/xwin/winmonitors.h
new file mode 100644
index 000000000..180566b00
--- /dev/null
+++ b/xorg-server/hw/xwin/winmonitors.h
@@ -0,0 +1,14 @@
+
+/* data returned for monitor information */
+struct GetMonitorInfoData {
+    int  requestedMonitor;
+    int  monitorNum;
+    Bool bUserSpecifiedMonitor;
+    Bool bMonitorSpecifiedExists;
+    int  monitorOffsetX;
+    int  monitorOffsetY;
+    int  monitorHeight;
+    int  monitorWidth;
+};
+
+Bool QueryMonitor(int index, struct GetMonitorInfoData *data);
diff --git a/xorg-server/hw/xwin/winnativegdi.c b/xorg-server/hw/xwin/winnativegdi.c
index 1a41bb484..4d7afe898 100644
--- a/xorg-server/hw/xwin/winnativegdi.c
+++ b/xorg-server/hw/xwin/winnativegdi.c
@@ -1,539 +1,534 @@
-/*

- *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:	Harold L Hunt II

- */

-

-#ifdef HAVE_XWIN_CONFIG_H

-#include <xwin-config.h>

-#endif

-#include "win.h"

-

-

-/*

- * Local function prototypes

- */

-

-static Bool

-winAllocateFBNativeGDI (ScreenPtr pScreen);

-

-static void

-winShadowUpdateNativeGDI (ScreenPtr pScreen, 

-			  shadowBufPtr pBuf);

-

-static Bool

-winCloseScreenNativeGDI (int nIndex, ScreenPtr pScreen);

-

-static Bool

-winInitVisualsNativeGDI (ScreenPtr pScreen);

-

-static Bool

-winAdjustVideoModeNativeGDI (ScreenPtr pScreen);

-

-#if 0

-static Bool

-winBltExposedRegionsNativeGDI (ScreenPtr pScreen);

-#endif

-

-static Bool

-winActivateAppNativeGDI (ScreenPtr pScreen);

-

-static Bool

-winRedrawScreenNativeGDI (ScreenPtr pScreen);

-

-static Bool

-winRealizeInstalledPaletteNativeGDI (ScreenPtr pScreen);

-

-static Bool

-winInstallColormapNativeGDI (ColormapPtr pColormap);

-

-static Bool

-winStoreColorsNativeGDI (ColormapPtr pmap, 

-			 int ndef,

-			 xColorItem *pdefs);

-

-static Bool

-winCreateColormapNativeGDI (ColormapPtr pColormap);

-

-static Bool

-winDestroyColormapNativeGDI (ColormapPtr pColormap);

-

-

-

-static Bool

-winAllocateFBNativeGDI (ScreenPtr pScreen)

-{

-  FatalError ("winAllocateFBNativeGDI\n");

-

-  return TRUE;

-}

-

-

-/*

- * We wrap whatever CloseScreen procedure was specified by fb;

- * a pointer to said procedure is stored in our privates.

- */

-

-static Bool

-winCloseScreenNativeGDI (int nIndex, ScreenPtr pScreen)

-{

-  winScreenPriv(pScreen);

-  winScreenInfo		*pScreenInfo = pScreenPriv->pScreenInfo;

-

-  ErrorF ("winCloseScreenNativeGDI - Freeing screen resources\n");

-

-  /* Flag that the screen is closed */

-  pScreenPriv->fClosed = TRUE;

-  pScreenPriv->fActive = FALSE;

-

-  /* 

-   * NOTE: mi doesn't use a CloseScreen procedure, so we do not

-   * need to call a wrapped procedure here.

-   */

-

-  /* Delete the window property */

-  RemoveProp (pScreenPriv->hwndScreen, WIN_SCR_PROP);

-  

-  ErrorF ("winCloseScreenNativeGDI - Destroying window\n");

-  

-  /* Delete tray icon, if we have one */

-  if (!pScreenInfo->fNoTrayIcon)

-    winDeleteNotifyIcon (pScreenPriv);

-

-  /* Free the exit confirmation dialog box, if it exists */

-  if (g_hDlgExit != NULL)

-    {

-      DestroyWindow (g_hDlgExit);

-      g_hDlgExit = NULL;

-    }

-

-  /* Kill our window */

-  if (pScreenPriv->hwndScreen)

-    {

-      DestroyWindow (pScreenPriv->hwndScreen);

-      pScreenPriv->hwndScreen = NULL;

-    }

-

-  /* Invalidate our screeninfo's pointer to the screen */

-  pScreenInfo->pScreen = NULL;

-

-  /* Free the screen privates for this screen */

-  free (pScreenPriv);

-

-  ErrorF ("winCloseScreenNativeGDI - Returning\n");

-

-  return TRUE;

-}

-

-

-static void

-winShadowUpdateNativeGDI (ScreenPtr pScreen, 

-			  shadowBufPtr pBuf)

-{

-  FatalError ("winShadowUpdateNativeGDI\n");

-  return;

-}

-

-

-static Bool

-winInitVisualsNativeGDI (ScreenPtr pScreen)

-{

-  winScreenPriv(pScreen);

-  winScreenInfo		*pScreenInfo = pScreenPriv->pScreenInfo;

-

-  /* Set the bitsPerRGB and bit masks */

-  switch (pScreenInfo->dwDepth)

-    {

-    case 24:

-      pScreenPriv->dwBitsPerRGB = 8;

-      pScreenPriv->dwRedMask = 0x00FF0000;

-      pScreenPriv->dwGreenMask = 0x0000FF00;

-      pScreenPriv->dwBlueMask = 0x000000FF;

-      break;

-      

-    case 16:

-      pScreenPriv->dwBitsPerRGB = 6;

-      pScreenPriv->dwRedMask = 0xF800;

-      pScreenPriv->dwGreenMask = 0x07E0;

-      pScreenPriv->dwBlueMask = 0x001F;

-      break;

-      

-    case 15:

-      pScreenPriv->dwBitsPerRGB = 5;

-      pScreenPriv->dwRedMask = 0x7C00;

-      pScreenPriv->dwGreenMask = 0x03E0;

-      pScreenPriv->dwBlueMask = 0x001F;

-      break;

-      

-    case 8:

-      pScreenPriv->dwBitsPerRGB = 8;

-      pScreenPriv->dwRedMask = 0;

-      pScreenPriv->dwGreenMask = 0;

-      pScreenPriv->dwBlueMask = 0;

-      break;

-

-    default:

-      ErrorF ("winInitVisualsNativeGDI - Unknown screen depth\n");

-      return FALSE;

-      break;

-    }

-

-  /* Tell the user how many bits per RGB we are using */

-  ErrorF ("winInitVisualsNativeGDI - Using dwBitsPerRGB: %d\n",

-	  (int) pScreenPriv->dwBitsPerRGB);

-

-  /* Create a single visual according to the Windows screen depth */

-  switch (pScreenInfo->dwDepth)

-    {

-    case 24:

-    case 16:

-    case 15:

-      if (!miSetVisualTypesAndMasks (pScreenInfo->dwDepth,

-				     TrueColorMask,

-				     pScreenPriv->dwBitsPerRGB,

-				     TrueColor,

-				     pScreenPriv->dwRedMask,

-				     pScreenPriv->dwGreenMask,

-				     pScreenPriv->dwBlueMask))

-	{

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

-	  return FALSE;

-	}

-      break;

-

-    case 8:

-      ErrorF ("winInitVisuals - Calling miSetVisualTypesAndMasks\n");

-      if (!miSetVisualTypesAndMasks (pScreenInfo->dwDepth,

-				     StaticColorMask,

-				     pScreenPriv->dwBitsPerRGB,

-				     StaticColor,

-				     pScreenPriv->dwRedMask,

-				     pScreenPriv->dwGreenMask,

-				     pScreenPriv->dwBlueMask))

-	{

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

-	  return FALSE;

-	}

-      break;

-

-    default:

-      ErrorF ("winInitVisualsNativeGDI - Unknown screen depth\n");

-      return FALSE;

-    }

-

-#if 1

-  ErrorF ("winInitVisualsNativeGDI - Returning\n");

-#endif

-

-  return TRUE;

-}

-

-

-/* Adjust the video mode */

-static Bool

-winAdjustVideoModeNativeGDI (ScreenPtr pScreen)

-{

-  winScreenPriv(pScreen);

-  winScreenInfo		*pScreenInfo = pScreenPriv->pScreenInfo;

-  HDC			hdc = NULL;

-  DWORD			dwBPP;

-  

-  hdc = GetDC (NULL);

-

-  /* We're in serious trouble if we can't get a DC */

-  if (hdc == NULL)

-    {

-      ErrorF ("winAdjustVideoModeNativeGDI - GetDC () failed\n");

-      return FALSE;

-    }

-

-  /* Query GDI for current display depth */

-  dwBPP = GetDeviceCaps (hdc, BITSPIXEL);

-  pScreenInfo->dwDepth = GetDeviceCaps (hdc, PLANES);

-

-  switch (pScreenInfo->dwDepth) {

-    case 24:

-    case 16:

-    case 15:

-    case 8:

-      break;

-    default:

-      if (dwBPP == 32)

-        pScreenInfo->dwDepth = 24;

-      else

-        pScreenInfo->dwDepth = dwBPP; 

-      break;

-  }

-

-  /* GDI cannot change the screen depth */

-  if (pScreenInfo->dwBPP == WIN_DEFAULT_BPP)

-    {

-      /* No -depth parameter passed, let the user know the depth being used */

-      ErrorF ("winAdjustVideoModeNativeGDI - Using Windows display "

-	      "depth of %d bits per pixel, %d depth\n",

-	      (int) dwBPP, (int) pScreenInfo->dwDepth);

-

-      /* Use GDI's depth */

-      pScreenInfo->dwBPP = dwBPP;

-    }

-  else if (dwBPP != pScreenInfo->dwBPP)

-    {

-      /* Warn user if GDI depth is different than -depth parameter */

-      ErrorF ("winAdjustVideoModeNativeGDI - Command line bpp: %d, "\

-	      "using bpp: %d\n",

-	      (int) pScreenInfo->dwBPP, (int) dwBPP);

-

-      /* We'll use GDI's depth */

-      pScreenInfo->dwBPP = dwBPP;

-    }

-  

-  /* Release our DC */

-  ReleaseDC (NULL, hdc);

-

-  return TRUE;

-}

-

-

-static Bool

-winActivateAppNativeGDI (ScreenPtr pScreen)

-{

-  winScreenPriv(pScreen);

-  winScreenInfo		*pScreenInfo = pScreenPriv->pScreenInfo;

-

-  /*

-   * Are we active?

-   * Are we fullscreen?

-   */

-  if (pScreenPriv != NULL

-      && pScreenPriv->fActive

-      && pScreenInfo->fFullScreen)

-    {

-      /*

-       * Activating, attempt to bring our window 

-       * to the top of the display

-       */

-      ShowWindow (pScreenPriv->hwndScreen, SW_RESTORE);

-    }

-

-  /*

-   * Are we inactive?

-   * Are we fullscreen?

-   */

-  if (pScreenPriv != NULL

-      && !pScreenPriv->fActive

-      && pScreenInfo->fFullScreen)

-    {

-      /*

-       * Deactivating, stuff our window onto the

-       * task bar.

-       */

-      ShowWindow (pScreenPriv->hwndScreen, SW_MINIMIZE);

-    }

-

-  return TRUE;

-}

-

-

-HBITMAP

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

-		       BYTE **ppbBits, BITMAPINFO **ppbmi)

-{

-  BITMAPINFOHEADER	*pbmih = NULL;

-  HBITMAP		hBitmap = NULL;

-  BITMAPINFO		*pbmi = NULL;

-

-  /* Don't create an invalid bitmap */

-  if (iWidth == 0

-      || iHeight == 0

-      || iDepth == 0)

-    {

-      ErrorF ("\nwinCreateDIBNativeGDI - Invalid specs w %d h %d d %d\n\n",

-	      iWidth, iHeight, iDepth);

-      return NULL;

-    }

-

-  /* Allocate bitmap info header */

-  pbmih = (BITMAPINFOHEADER*) malloc (sizeof (BITMAPINFOHEADER)

-				      + 256 * sizeof (RGBQUAD));

-  if (pbmih == NULL)

-    {

-      ErrorF ("winCreateDIBNativeGDI - malloc () failed\n");

-      return FALSE;

-    }

-  ZeroMemory (pbmih, sizeof(BITMAPINFOHEADER) + 256 * sizeof (RGBQUAD));

-

-  /* Describe bitmap to be created */

-  pbmih->biSize = sizeof (BITMAPINFOHEADER);

-  pbmih->biWidth = iWidth;

-  pbmih->biHeight = -iHeight;

-  pbmih->biPlanes = 1;

-  pbmih->biBitCount = iDepth;

-  pbmih->biCompression = BI_RGB;

-  pbmih->biSizeImage = 0;

-  pbmih->biXPelsPerMeter = 0;

-  pbmih->biYPelsPerMeter = 0;

-  pbmih->biClrUsed = 0;

-  pbmih->biClrImportant = 0;

-

-  /* Setup color table for mono DIBs */

-  if (iDepth == 1)

-    {

-      pbmi = (BITMAPINFO*) pbmih;

-      pbmi->bmiColors[1].rgbBlue = 255;

-      pbmi->bmiColors[1].rgbGreen = 255;

-      pbmi->bmiColors[1].rgbRed = 255;

-    }

-

-  /* Create a DIB with a bit pointer */

-  hBitmap = CreateDIBSection (NULL,

-			      (BITMAPINFO *) pbmih,

-			      DIB_RGB_COLORS,

-			      (void **) ppbBits,

-			      NULL,

-			      0);

-  if (hBitmap == NULL)

-    {

-      ErrorF ("winCreateDIBNativeGDI - CreateDIBSection () failed\n");

-      return NULL;

-    }

-

-  /* Free the bitmap info header memory */

-  if (ppbmi != NULL)

-    {

-      /* Store the address of the BMIH in the ppbmih parameter */

-      *ppbmi = (BITMAPINFO *) pbmih;

-    }

-  else

-    {

-      free (pbmih);

-      pbmih = NULL;

-    }

-

-  return hBitmap;

-}

-

-

-#if 0

-static Bool

-winBltExposedRegionsNativeGDI (ScreenPtr pScreen)

-{

-  

-  return TRUE;

-}

-#endif

-

-

-static Bool

-winRedrawScreenNativeGDI (ScreenPtr pScreen)

-{

-  FatalError ("winRedrawScreenNativeGDI\n");

-  return TRUE;

-}

-

-

-static Bool

-winRealizeInstalledPaletteNativeGDI (ScreenPtr pScreen)

-{

-  FatalError ("winRealizeInstalledPaletteNativeGDI\n");

-  return TRUE;

-}

-

-

-static Bool

-winInstallColormapNativeGDI (ColormapPtr pColormap)

-{

-  FatalError ("winInstallColormapNativeGDI\n");

-  return TRUE;

-}

-

-

-static Bool

-winStoreColorsNativeGDI (ColormapPtr pmap, 

-			 int ndef,

-			 xColorItem *pdefs)

-{

-  FatalError ("winStoreColorsNativeGDI\n");

-  return TRUE;

-}

-

-

-static Bool

-winCreateColormapNativeGDI (ColormapPtr pColormap)

-{

-  FatalError ("winCreateColormapNativeGDI\n");

-  return TRUE;

-}

-

-

-static Bool

-winDestroyColormapNativeGDI (ColormapPtr pColormap)

-{

-  FatalError ("winDestroyColormapNativeGDI\n");

-  return TRUE;

-}

-

-

-/* Set engine specific funtions */

-Bool

-winSetEngineFunctionsNativeGDI (ScreenPtr pScreen)

-{

-  winScreenPriv(pScreen);

-  winScreenInfo		*pScreenInfo = pScreenPriv->pScreenInfo;

-  

-  /* Set our pointers */

-  pScreenPriv->pwinAllocateFB = winAllocateFBNativeGDI;

-  pScreenPriv->pwinShadowUpdate = winShadowUpdateNativeGDI;

-  pScreenPriv->pwinCloseScreen = winCloseScreenNativeGDI;

-  pScreenPriv->pwinInitVisuals = winInitVisualsNativeGDI;

-  pScreenPriv->pwinAdjustVideoMode = winAdjustVideoModeNativeGDI;

-  if (pScreenInfo->fFullScreen)

-    pScreenPriv->pwinCreateBoundingWindow = winCreateBoundingWindowFullScreen;

-  else

-    pScreenPriv->pwinCreateBoundingWindow = winCreateBoundingWindowWindowed;

-  pScreenPriv->pwinFinishScreenInit = winFinishScreenInitNativeGDI;

-  /*

-   * WARNING: Do not set the BltExposedRegions procedure pointer to anything

-   * other than NULL until a working painting procedure is in place.

-   * Else, winWindowProc will get stuck in an infinite loop because

-   * Windows expects the BeginPaint and EndPaint functions to be called

-   * before a WM_PAINT message can be removed from the queue.  We are

-   * using NULL here as a signal for winWindowProc that it should

-   * not signal that the WM_PAINT message has been processed.

-   */

-  pScreenPriv->pwinBltExposedRegions = NULL;

-  pScreenPriv->pwinActivateApp = winActivateAppNativeGDI;

-  pScreenPriv->pwinRedrawScreen = winRedrawScreenNativeGDI;

-  pScreenPriv->pwinRealizeInstalledPalette = 

-    winRealizeInstalledPaletteNativeGDI;

-  pScreenPriv->pwinInstallColormap = winInstallColormapNativeGDI;

-  pScreenPriv->pwinStoreColors = winStoreColorsNativeGDI;

-  pScreenPriv->pwinCreateColormap = winCreateColormapNativeGDI;

-  pScreenPriv->pwinDestroyColormap = winDestroyColormapNativeGDI;

-  pScreenPriv->pwinHotKeyAltTab = (winHotKeyAltTabProcPtr) (void (*)(void))NoopDDA;

-

-  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:	Harold L Hunt II
+ */
+
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
+#include "win.h"
+
+
+/*
+ * Local function prototypes
+ */
+
+static Bool
+winAllocateFBNativeGDI (ScreenPtr pScreen);
+
+static void
+winShadowUpdateNativeGDI (ScreenPtr pScreen, 
+			  shadowBufPtr pBuf);
+
+static Bool
+winCloseScreenNativeGDI (int nIndex, ScreenPtr pScreen);
+
+static Bool
+winInitVisualsNativeGDI (ScreenPtr pScreen);
+
+static Bool
+winAdjustVideoModeNativeGDI (ScreenPtr pScreen);
+
+#if 0
+static Bool
+winBltExposedRegionsNativeGDI (ScreenPtr pScreen);
+#endif
+
+static Bool
+winActivateAppNativeGDI (ScreenPtr pScreen);
+
+static Bool
+winRedrawScreenNativeGDI (ScreenPtr pScreen);
+
+static Bool
+winRealizeInstalledPaletteNativeGDI (ScreenPtr pScreen);
+
+static Bool
+winInstallColormapNativeGDI (ColormapPtr pColormap);
+
+static Bool
+winStoreColorsNativeGDI (ColormapPtr pmap, 
+			 int ndef,
+			 xColorItem *pdefs);
+
+static Bool
+winCreateColormapNativeGDI (ColormapPtr pColormap);
+
+static Bool
+winDestroyColormapNativeGDI (ColormapPtr pColormap);
+
+
+
+static Bool
+winAllocateFBNativeGDI (ScreenPtr pScreen)
+{
+  FatalError ("winAllocateFBNativeGDI\n");
+
+  return TRUE;
+}
+
+static void
+winFreeFBNativeGDI (ScreenPtr pScreen)
+{
+  FatalError ("winFreeFBNativeGDI\n");
+}
+
+
+static Bool
+winInitScreenNativeGDI(ScreenPtr pScreen)
+{
+  FatalError ("winInitScreenNativeGDI\n");
+}
+
+/*
+ * We wrap whatever CloseScreen procedure was specified by fb;
+ * a pointer to said procedure is stored in our privates.
+ */
+
+static Bool
+winCloseScreenNativeGDI (int nIndex, ScreenPtr pScreen)
+{
+  winScreenPriv(pScreen);
+  winScreenInfo		*pScreenInfo = pScreenPriv->pScreenInfo;
+
+  ErrorF ("winCloseScreenNativeGDI - Freeing screen resources\n");
+
+  /* Flag that the screen is closed */
+  pScreenPriv->fClosed = TRUE;
+  pScreenPriv->fActive = FALSE;
+
+  /* 
+   * NOTE: mi doesn't use a CloseScreen procedure, so we do not
+   * need to call a wrapped procedure here.
+   */
+
+  /* Delete the window property */
+  RemoveProp (pScreenPriv->hwndScreen, WIN_SCR_PROP);
+  
+  ErrorF ("winCloseScreenNativeGDI - Destroying window\n");
+  
+  /* Delete tray icon, if we have one */
+  if (!pScreenInfo->fNoTrayIcon)
+    winDeleteNotifyIcon (pScreenPriv);
+
+  /* Free the exit confirmation dialog box, if it exists */
+  if (g_hDlgExit != NULL)
+    {
+      DestroyWindow (g_hDlgExit);
+      g_hDlgExit = NULL;
+    }
+
+  /* Kill our window */
+  if (pScreenPriv->hwndScreen)
+    {
+      DestroyWindow (pScreenPriv->hwndScreen);
+      pScreenPriv->hwndScreen = NULL;
+    }
+
+  /* Invalidate our screeninfo's pointer to the screen */
+  pScreenInfo->pScreen = NULL;
+
+  /* Free the screen privates for this screen */
+  free (pScreenPriv);
+
+  ErrorF ("winCloseScreenNativeGDI - Returning\n");
+
+  return TRUE;
+}
+
+
+static void
+winShadowUpdateNativeGDI (ScreenPtr pScreen, 
+			  shadowBufPtr pBuf)
+{
+  FatalError ("winShadowUpdateNativeGDI\n");
+  return;
+}
+
+
+static Bool
+winInitVisualsNativeGDI (ScreenPtr pScreen)
+{
+  winScreenPriv(pScreen);
+  winScreenInfo		*pScreenInfo = pScreenPriv->pScreenInfo;
+
+  /* Set the bitsPerRGB and bit masks */
+  switch (pScreenInfo->dwDepth)
+    {
+    case 24:
+      pScreenPriv->dwBitsPerRGB = 8;
+      pScreenPriv->dwRedMask = 0x00FF0000;
+      pScreenPriv->dwGreenMask = 0x0000FF00;
+      pScreenPriv->dwBlueMask = 0x000000FF;
+      break;
+      
+    case 16:
+      pScreenPriv->dwBitsPerRGB = 6;
+      pScreenPriv->dwRedMask = 0xF800;
+      pScreenPriv->dwGreenMask = 0x07E0;
+      pScreenPriv->dwBlueMask = 0x001F;
+      break;
+      
+    case 15:
+      pScreenPriv->dwBitsPerRGB = 5;
+      pScreenPriv->dwRedMask = 0x7C00;
+      pScreenPriv->dwGreenMask = 0x03E0;
+      pScreenPriv->dwBlueMask = 0x001F;
+      break;
+      
+    case 8:
+      pScreenPriv->dwBitsPerRGB = 8;
+      pScreenPriv->dwRedMask = 0;
+      pScreenPriv->dwGreenMask = 0;
+      pScreenPriv->dwBlueMask = 0;
+      break;
+
+    default:
+      ErrorF ("winInitVisualsNativeGDI - Unknown screen depth\n");
+      return FALSE;
+      break;
+    }
+
+  /* Tell the user how many bits per RGB we are using */
+  ErrorF ("winInitVisualsNativeGDI - Using dwBitsPerRGB: %d\n",
+	  (int) pScreenPriv->dwBitsPerRGB);
+
+  /* Create a single visual according to the Windows screen depth */
+  switch (pScreenInfo->dwDepth)
+    {
+    case 24:
+    case 16:
+    case 15:
+      if (!miSetVisualTypesAndMasks (pScreenInfo->dwDepth,
+				     TrueColorMask,
+				     pScreenPriv->dwBitsPerRGB,
+				     TrueColor,
+				     pScreenPriv->dwRedMask,
+				     pScreenPriv->dwGreenMask,
+				     pScreenPriv->dwBlueMask))
+	{
+	  ErrorF ("winInitVisuals - miSetVisualTypesAndMasks failed\n");
+	  return FALSE;
+	}
+      break;
+
+    case 8:
+      ErrorF ("winInitVisuals - Calling miSetVisualTypesAndMasks\n");
+      if (!miSetVisualTypesAndMasks (pScreenInfo->dwDepth,
+				     StaticColorMask,
+				     pScreenPriv->dwBitsPerRGB,
+				     StaticColor,
+				     pScreenPriv->dwRedMask,
+				     pScreenPriv->dwGreenMask,
+				     pScreenPriv->dwBlueMask))
+	{
+	  ErrorF ("winInitVisuals - miSetVisualTypesAndMasks failed\n");
+	  return FALSE;
+	}
+      break;
+
+    default:
+      ErrorF ("winInitVisualsNativeGDI - Unknown screen depth\n");
+      return FALSE;
+    }
+
+#if 1
+  ErrorF ("winInitVisualsNativeGDI - Returning\n");
+#endif
+
+  return TRUE;
+}
+
+
+/* Adjust the video mode */
+static Bool
+winAdjustVideoModeNativeGDI (ScreenPtr pScreen)
+{
+  winScreenPriv(pScreen);
+  winScreenInfo		*pScreenInfo = pScreenPriv->pScreenInfo;
+  HDC			hdc = NULL;
+  DWORD			dwBPP;
+  
+  hdc = GetDC (NULL);
+
+  /* We're in serious trouble if we can't get a DC */
+  if (hdc == NULL)
+    {
+      ErrorF ("winAdjustVideoModeNativeGDI - GetDC () failed\n");
+      return FALSE;
+    }
+
+  /* Query GDI for current display depth */
+  dwBPP = GetDeviceCaps (hdc, BITSPIXEL);
+  pScreenInfo->dwDepth = GetDeviceCaps (hdc, PLANES);
+
+  switch (pScreenInfo->dwDepth) {
+    case 24:
+    case 16:
+    case 15:
+    case 8:
+      break;
+    default:
+      if (dwBPP == 32)
+        pScreenInfo->dwDepth = 24;
+      else
+        pScreenInfo->dwDepth = dwBPP; 
+      break;
+  }
+
+  /* GDI cannot change the screen depth, so we'll use GDI's depth */
+  pScreenInfo->dwBPP = dwBPP;
+
+  /* Release our DC */
+  ReleaseDC (NULL, hdc);
+
+  return TRUE;
+}
+
+
+static Bool
+winActivateAppNativeGDI (ScreenPtr pScreen)
+{
+  winScreenPriv(pScreen);
+  winScreenInfo		*pScreenInfo = pScreenPriv->pScreenInfo;
+
+  /*
+   * Are we active?
+   * Are we fullscreen?
+   */
+  if (pScreenPriv != NULL
+      && pScreenPriv->fActive
+      && pScreenInfo->fFullScreen)
+    {
+      /*
+       * Activating, attempt to bring our window 
+       * to the top of the display
+       */
+      ShowWindow (pScreenPriv->hwndScreen, SW_RESTORE);
+    }
+
+  /*
+   * Are we inactive?
+   * Are we fullscreen?
+   */
+  if (pScreenPriv != NULL
+      && !pScreenPriv->fActive
+      && pScreenInfo->fFullScreen)
+    {
+      /*
+       * Deactivating, stuff our window onto the
+       * task bar.
+       */
+      ShowWindow (pScreenPriv->hwndScreen, SW_MINIMIZE);
+    }
+
+  return TRUE;
+}
+
+
+HBITMAP
+winCreateDIBNativeGDI (int iWidth, int iHeight, int iDepth,
+		       BYTE **ppbBits, BITMAPINFO **ppbmi)
+{
+  BITMAPINFOHEADER	*pbmih = NULL;
+  HBITMAP		hBitmap = NULL;
+  BITMAPINFO		*pbmi = NULL;
+
+  /* Don't create an invalid bitmap */
+  if (iWidth == 0
+      || iHeight == 0
+      || iDepth == 0)
+    {
+      ErrorF ("\nwinCreateDIBNativeGDI - Invalid specs w %d h %d d %d\n\n",
+	      iWidth, iHeight, iDepth);
+      return NULL;
+    }
+
+  /* Allocate bitmap info header */
+  pbmih = (BITMAPINFOHEADER*) malloc (sizeof (BITMAPINFOHEADER)
+				      + 256 * sizeof (RGBQUAD));
+  if (pbmih == NULL)
+    {
+      ErrorF ("winCreateDIBNativeGDI - malloc () failed\n");
+      return FALSE;
+    }
+  ZeroMemory (pbmih, sizeof(BITMAPINFOHEADER) + 256 * sizeof (RGBQUAD));
+
+  /* Describe bitmap to be created */
+  pbmih->biSize = sizeof (BITMAPINFOHEADER);
+  pbmih->biWidth = iWidth;
+  pbmih->biHeight = -iHeight;
+  pbmih->biPlanes = 1;
+  pbmih->biBitCount = iDepth;
+  pbmih->biCompression = BI_RGB;
+  pbmih->biSizeImage = 0;
+  pbmih->biXPelsPerMeter = 0;
+  pbmih->biYPelsPerMeter = 0;
+  pbmih->biClrUsed = 0;
+  pbmih->biClrImportant = 0;
+
+  /* Setup color table for mono DIBs */
+  if (iDepth == 1)
+    {
+      pbmi = (BITMAPINFO*) pbmih;
+      pbmi->bmiColors[1].rgbBlue = 255;
+      pbmi->bmiColors[1].rgbGreen = 255;
+      pbmi->bmiColors[1].rgbRed = 255;
+    }
+
+  /* Create a DIB with a bit pointer */
+  hBitmap = CreateDIBSection (NULL,
+			      (BITMAPINFO *) pbmih,
+			      DIB_RGB_COLORS,
+			      (void **) ppbBits,
+			      NULL,
+			      0);
+  if (hBitmap == NULL)
+    {
+      ErrorF ("winCreateDIBNativeGDI - CreateDIBSection () failed\n");
+      return NULL;
+    }
+
+  /* Free the bitmap info header memory */
+  if (ppbmi != NULL)
+    {
+      /* Store the address of the BMIH in the ppbmih parameter */
+      *ppbmi = (BITMAPINFO *) pbmih;
+    }
+  else
+    {
+      free (pbmih);
+      pbmih = NULL;
+    }
+
+  return hBitmap;
+}
+
+
+#if 0
+static Bool
+winBltExposedRegionsNativeGDI (ScreenPtr pScreen)
+{
+  
+  return TRUE;
+}
+#endif
+
+
+static Bool
+winRedrawScreenNativeGDI (ScreenPtr pScreen)
+{
+  FatalError ("winRedrawScreenNativeGDI\n");
+  return TRUE;
+}
+
+
+static Bool
+winRealizeInstalledPaletteNativeGDI (ScreenPtr pScreen)
+{
+  FatalError ("winRealizeInstalledPaletteNativeGDI\n");
+  return TRUE;
+}
+
+
+static Bool
+winInstallColormapNativeGDI (ColormapPtr pColormap)
+{
+  FatalError ("winInstallColormapNativeGDI\n");
+  return TRUE;
+}
+
+
+static Bool
+winStoreColorsNativeGDI (ColormapPtr pmap, 
+			 int ndef,
+			 xColorItem *pdefs)
+{
+  FatalError ("winStoreColorsNativeGDI\n");
+  return TRUE;
+}
+
+
+static Bool
+winCreateColormapNativeGDI (ColormapPtr pColormap)
+{
+  FatalError ("winCreateColormapNativeGDI\n");
+  return TRUE;
+}
+
+
+static Bool
+winDestroyColormapNativeGDI (ColormapPtr pColormap)
+{
+  FatalError ("winDestroyColormapNativeGDI\n");
+  return TRUE;
+}
+
+
+/* Set engine specific funtions */
+Bool
+winSetEngineFunctionsNativeGDI (ScreenPtr pScreen)
+{
+  winScreenPriv(pScreen);
+  winScreenInfo		*pScreenInfo = pScreenPriv->pScreenInfo;
+  
+  /* Set our pointers */
+  pScreenPriv->pwinAllocateFB = winAllocateFBNativeGDI;
+  pScreenPriv->pwinFreeFB = winFreeFBNativeGDI;
+  pScreenPriv->pwinShadowUpdate = winShadowUpdateNativeGDI;
+  pScreenPriv->pwinInitScreen = winInitScreenNativeGDI;
+  pScreenPriv->pwinCloseScreen = winCloseScreenNativeGDI;
+  pScreenPriv->pwinInitVisuals = winInitVisualsNativeGDI;
+  pScreenPriv->pwinAdjustVideoMode = winAdjustVideoModeNativeGDI;
+  if (pScreenInfo->fFullScreen)
+    pScreenPriv->pwinCreateBoundingWindow = winCreateBoundingWindowFullScreen;
+  else
+    pScreenPriv->pwinCreateBoundingWindow = winCreateBoundingWindowWindowed;
+  pScreenPriv->pwinFinishScreenInit = winFinishScreenInitNativeGDI;
+  /*
+   * WARNING: Do not set the BltExposedRegions procedure pointer to anything
+   * other than NULL until a working painting procedure is in place.
+   * Else, winWindowProc will get stuck in an infinite loop because
+   * Windows expects the BeginPaint and EndPaint functions to be called
+   * before a WM_PAINT message can be removed from the queue.  We are
+   * using NULL here as a signal for winWindowProc that it should
+   * not signal that the WM_PAINT message has been processed.
+   */
+  pScreenPriv->pwinBltExposedRegions = NULL;
+  pScreenPriv->pwinActivateApp = winActivateAppNativeGDI;
+  pScreenPriv->pwinRedrawScreen = winRedrawScreenNativeGDI;
+  pScreenPriv->pwinRealizeInstalledPalette = 
+    winRealizeInstalledPaletteNativeGDI;
+  pScreenPriv->pwinInstallColormap = winInstallColormapNativeGDI;
+  pScreenPriv->pwinStoreColors = winStoreColorsNativeGDI;
+  pScreenPriv->pwinCreateColormap = winCreateColormapNativeGDI;
+  pScreenPriv->pwinDestroyColormap = winDestroyColormapNativeGDI;
+  pScreenPriv->pwinHotKeyAltTab = (winHotKeyAltTabProcPtr) (void (*)(void))NoopDDA;
+
+  return TRUE;
+}
diff --git a/xorg-server/hw/xwin/winpfbdd.c b/xorg-server/hw/xwin/winpfbdd.c
index 840a839f0..c0bca71e3 100644
--- a/xorg-server/hw/xwin/winpfbdd.c
+++ b/xorg-server/hw/xwin/winpfbdd.c
@@ -1,676 +1,678 @@
-/*

- *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

- */

-

-#ifdef HAVE_XWIN_CONFIG_H

-#include <xwin-config.h>

-#endif

-#include "win.h"

-

-

-/*

- * Local function prototypes

- */

-

-static Bool

-winAllocateFBPrimaryDD (ScreenPtr pScreen);

-

-static Bool

-winCloseScreenPrimaryDD (int nIndex, ScreenPtr pScreen);

-

-static Bool

-winInitVisualsPrimaryDD (ScreenPtr pScreen);

-

-static Bool

-winAdjustVideoModePrimaryDD (ScreenPtr pScreen);

-

-static Bool

-winActivateAppPrimaryDD (ScreenPtr pScreen);

-

-static Bool

-winHotKeyAltTabPrimaryDD (ScreenPtr pScreen);

-

-

-/*

- * Create a DirectDraw primary surface 

- */

-

-static Bool

-winAllocateFBPrimaryDD (ScreenPtr pScreen)

-{

-  winScreenPriv(pScreen);

-  winScreenInfo		*pScreenInfo = pScreenPriv->pScreenInfo;  

-  HRESULT		ddrval = DD_OK;

-  DDSURFACEDESC		ddsd;

-  DDSURFACEDESC		*pddsdPrimary = NULL;

-  DDSURFACEDESC		*pddsdOffscreen = NULL;

-  RECT			rcClient;

-

-  ErrorF ("winAllocateFBPrimaryDD\n");

-

-  /* Get client area location in screen coords */

-  GetClientRect (pScreenPriv->hwndScreen, &rcClient);

-  MapWindowPoints (pScreenPriv->hwndScreen,

-		   HWND_DESKTOP,

-		   (LPPOINT)&rcClient, 2);

-

-  /* Create a DirectDraw object, store the address at lpdd */

-  ddrval = (*g_fpDirectDrawCreate) (NULL, &pScreenPriv->pdd, NULL);

-  if (ddrval != DD_OK)

-    FatalError ("winAllocateFBPrimaryDD - Could not start DirectDraw\n");

-  

-  /* Get a DirectDraw2 interface pointer */

-  ddrval = IDirectDraw_QueryInterface (pScreenPriv->pdd,

-				       &IID_IDirectDraw2,

-				       (LPVOID*) &pScreenPriv->pdd2);

-  if (FAILED (ddrval))

-    {

-      ErrorF ("winAllocateFBShadowDD - Failed DD2 query: %08x\n",

-	      (unsigned int) ddrval);

-      return FALSE;

-    }

-

-

-  ErrorF ("winAllocateFBPrimaryDD - Created and initialized DD\n");

-

-  /* Are we windowed or fullscreen? */

-  if (pScreenInfo->fFullScreen)

-    {

-      /* Full screen mode */

-      ddrval = IDirectDraw2_SetCooperativeLevel (pScreenPriv->pdd2,

-						 pScreenPriv->hwndScreen,

-						 DDSCL_FULLSCREEN

-						 | DDSCL_EXCLUSIVE);

-      if (FAILED (ddrval))

-	FatalError ("winAllocateFBPrimaryDD - Could not set "

-		    "cooperative level\n");

-

-      /* Change the video mode to the mode requested */

-      ddrval = IDirectDraw2_SetDisplayMode (pScreenPriv->pdd2,

-					    pScreenInfo->dwWidth,

-					    pScreenInfo->dwHeight,

-					    pScreenInfo->dwBPP,

-					    pScreenInfo->dwRefreshRate,

-					    0);

-       if (FAILED (ddrval))

-	FatalError ("winAllocateFBPrimaryDD - Could not set "

-		    "full screen display mode\n");

-    }

-  else

-    {

-      /* Windowed mode */

-      ddrval = IDirectDraw2_SetCooperativeLevel (pScreenPriv->pdd2,

-						 pScreenPriv->hwndScreen,

-						 DDSCL_NORMAL);

-      if (FAILED (ddrval))

-	FatalError ("winAllocateFBPrimaryDD - Could not set "

-		    "cooperative level\n");

-    }

-

-  /* Describe the primary surface */

-  ZeroMemory (&ddsd, sizeof (ddsd));

-  ddsd.dwSize = sizeof (ddsd);

-  ddsd.dwFlags = DDSD_CAPS;

-  ddsd.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE;

-  

-  /* Create the primary surface */

-  ddrval = IDirectDraw2_CreateSurface (pScreenPriv->pdd2,

-				       &ddsd,

-				       &pScreenPriv->pddsPrimary,

-				       NULL);

-  if (FAILED (ddrval))

-       FatalError ("winAllocateFBPrimaryDD - Could not create primary "

-		  "surface %08x\n", (unsigned int) ddrval);

-

-  ErrorF ("winAllocateFBPrimaryDD - Created primary\n");

-

-  /* Allocate a DD surface description for our screen privates */

-  pddsdPrimary = pScreenPriv->pddsdPrimary

-    = malloc (sizeof (DDSURFACEDESC));

-  if (pddsdPrimary == NULL)

-    FatalError ("winAllocateFBPrimaryDD - Could not allocate surface "

-		"description memory\n");

-  ZeroMemory (pddsdPrimary, sizeof (*pddsdPrimary));

-  pddsdPrimary->dwSize = sizeof (*pddsdPrimary);

-

-  /* Describe the offscreen surface to be created */

-  /*

-   * NOTE: Do not use a DDSCAPS_VIDEOMEMORY surface,

-   * as drawing, locking, and unlocking take forever

-   * with video memory surfaces.  In addition,

-   * video memory is a somewhat scarce resource,

-   * so you shouldn't be allocating video memory when

-   * you have the option of using system memory instead.

-   */

-  ZeroMemory (&ddsd, sizeof (ddsd));

-  ddsd.dwSize = sizeof (ddsd);

-  ddsd.dwFlags = DDSD_CAPS | DDSD_HEIGHT | DDSD_WIDTH;

-  ddsd.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN | DDSCAPS_SYSTEMMEMORY;

-  ddsd.dwHeight = pScreenInfo->dwHeight;

-  ddsd.dwWidth = pScreenInfo->dwWidth;

-

-  /* Create the shadow surface */

-  ddrval = IDirectDraw2_CreateSurface (pScreenPriv->pdd2,

-				       &ddsd,

-				       &pScreenPriv->pddsOffscreen,

-				       NULL);

-  if (ddrval != DD_OK)

-    FatalError ("winAllocateFBPrimaryDD - Could not create shadow "

-		"surface\n");

-  

-  ErrorF ("winAllocateFBPrimaryDD - Created offscreen\n");

-

-  /* Allocate a DD surface description for our screen privates */

-  pddsdOffscreen = pScreenPriv->pddsdOffscreen

-    = malloc (sizeof (DDSURFACEDESC));

-  if (pddsdOffscreen == NULL)

-    FatalError ("winAllocateFBPrimaryDD - Could not allocate surface "

-		"description memory\n");

-  ZeroMemory (pddsdOffscreen, sizeof (*pddsdOffscreen));

-  pddsdOffscreen->dwSize = sizeof (*pddsdOffscreen);

-

-  ErrorF ("winAllocateFBPrimaryDD - Locking primary\n");

-

-  /* Lock the primary surface */

-  ddrval = IDirectDrawSurface2_Lock (pScreenPriv->pddsPrimary,

-				    pScreenInfo->fFullScreen ? NULL:&rcClient,

-				    pddsdPrimary,

-				    DDLOCK_WAIT,

-				    NULL);

-  if (ddrval != DD_OK || pddsdPrimary->lpSurface == NULL)

-    FatalError ("winAllocateFBPrimaryDD - Could not lock "

-		"primary surface\n");

-

-  ErrorF ("winAllocateFBPrimaryDD - Locked primary\n");

-

-  /* We don't know how to deal with anything other than RGB */

-  if (!(pddsdPrimary->ddpfPixelFormat.dwFlags & DDPF_RGB))

-    FatalError ("winAllocateFBPrimaryDD - Color format other than RGB\n");

-

-  /* Grab the pitch from the surface desc */

-  pScreenInfo->dwStride = (pddsdPrimary->u1.lPitch * 8)

-    / pScreenInfo->dwBPP;

-

-  /* Save the pointer to our surface memory */

-  pScreenInfo->pfb = pddsdPrimary->lpSurface;

-  

-  /* Grab the color depth and masks from the surface description */

-  pScreenPriv->dwRedMask = pddsdPrimary->ddpfPixelFormat.u2.dwRBitMask;

-  pScreenPriv->dwGreenMask = pddsdPrimary->ddpfPixelFormat.u3.dwGBitMask;

-  pScreenPriv->dwBlueMask = pddsdPrimary->ddpfPixelFormat.u4.dwBBitMask;

-

-  ErrorF ("winAllocateFBPrimaryDD - Returning\n");

-

-  return TRUE;

-}

-

-

-/*

- * Call the wrapped CloseScreen function.

- * 

- * Free our resources and private structures.

- */

-

-static Bool

-winCloseScreenPrimaryDD (int nIndex, ScreenPtr pScreen)

-{

-  winScreenPriv(pScreen);

-  winScreenInfo		*pScreenInfo = pScreenPriv->pScreenInfo;

-  Bool			fReturn;

-  

-  ErrorF ("winCloseScreenPrimaryDD - Freeing screen resources\n");

-

-  /* Flag that the screen is closed */

-  pScreenPriv->fClosed = TRUE;

-  pScreenPriv->fActive = FALSE;

-

-  /* Call the wrapped CloseScreen procedure */

-  WIN_UNWRAP(CloseScreen);

-  fReturn = (*pScreen->CloseScreen) (nIndex, pScreen);

-

-  /* Delete the window property */

-  RemoveProp (pScreenPriv->hwndScreen, WIN_SCR_PROP);

-

-  /* Free the offscreen surface, if there is one */

-  if (pScreenPriv->pddsOffscreen)

-    {

-      IDirectDrawSurface2_Unlock (pScreenPriv->pddsOffscreen, NULL);

-      IDirectDrawSurface2_Release (pScreenPriv->pddsOffscreen);

-      pScreenPriv->pddsOffscreen = NULL;

-    }

-

-  /* Release the primary surface, if there is one */

-  if (pScreenPriv->pddsPrimary)

-    {

-      IDirectDrawSurface2_Unlock (pScreenPriv->pddsPrimary, NULL);

-      IDirectDrawSurface2_Release (pScreenPriv->pddsPrimary);

-      pScreenPriv->pddsPrimary = NULL;

-    }

-

-  /* Free the DirectDraw object, if there is one */

-  if (pScreenPriv->pdd)

-    {

-      IDirectDraw2_RestoreDisplayMode (pScreenPriv->pdd);

-      IDirectDraw2_Release (pScreenPriv->pdd);

-      pScreenPriv->pdd = NULL;

-    }

-

-  /* Delete tray icon, if we have one */

-  if (!pScreenInfo->fNoTrayIcon)

-    winDeleteNotifyIcon (pScreenPriv);

-

-  /* Free the exit confirmation dialog box, if it exists */

-  if (g_hDlgExit != NULL)

-    {

-      DestroyWindow (g_hDlgExit);

-      g_hDlgExit = NULL;

-    }

-

-  /* Kill our window */

-  if (pScreenPriv->hwndScreen)

-    {

-      DestroyWindow (pScreenPriv->hwndScreen);

-      pScreenPriv->hwndScreen = NULL;

-    }

-

-  /* Kill our screeninfo's pointer to the screen */

-  pScreenInfo->pScreen = NULL;

-

-  /* Invalidate the ScreenInfo's fb pointer */

-  pScreenInfo->pfb = NULL;

-

-  /* Free the screen privates for this screen */

-  free ((pointer) pScreenPriv);

-

-  return fReturn;

-}

-

-

-/*

- * Tell mi what sort of visuals we need.

- * 

- * Generally we only need one visual, as our screen can only

- * handle one format at a time, I believe.  You may want

- * to verify that last sentence.

- */

-

-static Bool

-winInitVisualsPrimaryDD (ScreenPtr pScreen)

-{

-  winScreenPriv(pScreen);

-  winScreenInfo		*pScreenInfo = pScreenPriv->pScreenInfo;

-  DWORD			dwRedBits, dwGreenBits, dwBlueBits;

-

-  /* Count the number of ones in each color mask */

-  dwRedBits = winCountBits (pScreenPriv->dwRedMask);

-  dwGreenBits = winCountBits (pScreenPriv->dwGreenMask);

-  dwBlueBits = winCountBits (pScreenPriv->dwBlueMask);

-  

-  /* Store the maximum number of ones in a color mask as the bitsPerRGB */

-  if (dwRedBits > dwGreenBits && dwRedBits > dwBlueBits)

-    pScreenPriv->dwBitsPerRGB = dwRedBits;

-  else if (dwGreenBits > dwRedBits && dwGreenBits > dwBlueBits)

-    pScreenPriv->dwBitsPerRGB = dwGreenBits;

-  else

-    pScreenPriv->dwBitsPerRGB = dwBlueBits;

-  

-  ErrorF ("winInitVisualsPrimaryDD - Masks: %08x %08x %08x bpRGB: %d\n",

-	  (unsigned int) pScreenPriv->dwRedMask,

-	  (unsigned int) pScreenPriv->dwGreenMask,

-	  (unsigned int) pScreenPriv->dwBlueMask,

-	  (int) pScreenPriv->dwBitsPerRGB);

-

-  /* Create a single visual according to the Windows screen depth */

-  switch (pScreenInfo->dwDepth)

-    {

-    case 24:

-    case 16:

-    case 15:

-      if (!miSetVisualTypesAndMasks (pScreenInfo->dwDepth,

-				     TrueColorMask,

-				     pScreenPriv->dwBitsPerRGB,

-				     TrueColor,

-				     pScreenPriv->dwRedMask,

-				     pScreenPriv->dwGreenMask,

-				     pScreenPriv->dwBlueMask))

-	{

-	  ErrorF ("winInitVisualsPrimaryDD - " 

-		  "miSetVisualTypesAndMasks failed\n");

-	  return FALSE;

-	}

-      break;

-

-    case 8:

-#if CYGDEBUG

-      winDebug ("winInitVisuals - Calling miSetVisualTypesAndMasks\n");

-#endif /* CYGDEBUG */

-      if (!miSetVisualTypesAndMasks (pScreenInfo->dwDepth,

-				     PseudoColorMask,

-				     pScreenPriv->dwBitsPerRGB,

-				     PseudoColor,

-				     pScreenPriv->dwRedMask,

-				     pScreenPriv->dwGreenMask,

-				     pScreenPriv->dwBlueMask))

-	{

-	  ErrorF ("winInitVisualsPrimaryDD - "

-		  "miSetVisualTypesAndMasks failed\n");

-	  return FALSE;

-	}

-#if CYGDEBUG

-      winDebug ("winInitVisualsPrimaryDD - Returned from "

-	      "miSetVisualTypesAndMasks\n");

-#endif /* CYGDEBUG */

-      break;

-

-    default:

-      ErrorF ("winInitVisualsPrimaryDD - Unknown screen depth\n");

-      return FALSE;

-    }

-

-  ErrorF ("winInitVisualsPrimaryDD - Returning\n");

-

-  return TRUE;

-}

-

-

-static Bool

-winAdjustVideoModePrimaryDD (ScreenPtr pScreen)

-{

-  winScreenPriv(pScreen);

-  winScreenInfo		*pScreenInfo = pScreenPriv->pScreenInfo;

-  HDC			hdc = NULL;

-  DWORD			dwBPP;

-

-  /* We're in serious trouble if we can't get a DC */

-  hdc = GetDC (NULL);

-  if (hdc == NULL)

-    {

-      ErrorF ("winAdjustVideoModePrimaryDD - GetDC failed\n");

-      return FALSE;

-    }

-

-  /* Query GDI for current display depth */

-  dwBPP = GetDeviceCaps (hdc, BITSPIXEL);

-

-  /* DirectDraw can only change the depth in fullscreen mode */

-  if (pScreenInfo->dwBPP == WIN_DEFAULT_BPP)

-    {

-      /* No -depth parameter passed, let the user know the depth being used */

-      ErrorF ("winAdjustVideoModePrimaryDD - Using Windows display "

-	      "depth of %d bits per pixel\n", (int) dwBPP);

-

-      /* Use GDI's depth */

-      pScreenInfo->dwBPP = dwBPP;

-    }

-  else if (pScreenInfo->fFullScreen

-	   && pScreenInfo->dwBPP != dwBPP)

-    {

-      /* FullScreen, and GDI depth differs from -depth parameter */

-      ErrorF ("winAdjustVideoModePrimaryDD - FullScreen, using command "

-	      "line depth: %d\n", (int) pScreenInfo->dwBPP);

-    }

-  else if (dwBPP != pScreenInfo->dwBPP)

-    {

-      /* Windowed, and GDI depth differs from -depth parameter */

-      ErrorF ("winAdjustVideoModePrimaryDD - Windowed, command line "

-	      "depth: %d, using depth: %d\n",

-	      (int) pScreenInfo->dwBPP, (int) dwBPP);

-

-      /* We'll use GDI's depth */

-      pScreenInfo->dwBPP = dwBPP;

-    }

-  

-  /* Release our DC */

-  ReleaseDC (NULL, hdc);

-

-  return TRUE;

-}

-

-

-/*

- * We need to blit our offscreen fb to

- * the screen when we are activated, and we need to point

- * the fb code back to the primary surface memory.

- */

-

-static Bool

-winActivateAppPrimaryDD (ScreenPtr pScreen)

-{

-  winScreenPriv(pScreen);

-  winScreenInfo		*pScreenInfo = pScreenPriv->pScreenInfo;

-  RECT			rcSrc, rcClient;

-  HRESULT		ddrval = DD_OK;

-

-  /* Check for errors */

-  if (pScreenPriv == NULL

-      || pScreenPriv->pddsPrimary == NULL

-      || pScreenPriv->pddsOffscreen == NULL)

-    return FALSE;

-

-  /* Check for do-nothing */

-  if (!pScreenPriv->fActive)

-    return TRUE;

-  

-  /* We are activating */

-  ddrval = IDirectDrawSurface2_IsLost (pScreenPriv->pddsOffscreen);

-  if (ddrval == DD_OK)

-    {

-      IDirectDrawSurface2_Unlock (pScreenPriv->pddsOffscreen,

-				  NULL);

-      /*

-       * We don't check for an error from Unlock, because it

-       * doesn't matter if the Unlock failed.

-       */

-    }

-

-  /* Restore both surfaces, just cause I like it that way */

-  IDirectDrawSurface2_Restore (pScreenPriv->pddsOffscreen);

-  IDirectDrawSurface2_Restore (pScreenPriv->pddsPrimary);

-			      

-  /* Get client area in screen coords */

-  GetClientRect (pScreenPriv->hwndScreen, &rcClient);

-  MapWindowPoints (pScreenPriv->hwndScreen,

-		   HWND_DESKTOP,

-		   (LPPOINT)&rcClient, 2);

-

-  /* Setup a source rectangle */

-  rcSrc.left = 0;

-  rcSrc.top = 0;

-  rcSrc.right = pScreenInfo->dwWidth;

-  rcSrc.bottom = pScreenInfo->dwHeight;

-

-  ddrval = IDirectDrawSurface2_Blt (pScreenPriv->pddsPrimary,

-				    &rcClient,

-				    pScreenPriv->pddsOffscreen,

-				    &rcSrc,

-				    DDBLT_WAIT,

-				    NULL);

-  if (ddrval != DD_OK)

-    FatalError ("winActivateAppPrimaryDD () - Failed blitting offscreen "

-		"surface to primary surface %08x\n", (unsigned int) ddrval);

-  

-  /* Lock the primary surface */

-  ddrval = IDirectDrawSurface2_Lock (pScreenPriv->pddsPrimary,

-				     &rcClient,

-				     pScreenPriv->pddsdPrimary,

-				     DDLOCK_WAIT,

-				     NULL);

-  if (ddrval != DD_OK

-      || pScreenPriv->pddsdPrimary->lpSurface == NULL)

-    FatalError ("winActivateAppPrimaryDD () - Could not lock "

-		"primary surface\n");

-

-  /* Notify FB of the new memory pointer */

-  winUpdateFBPointer (pScreen,

-		      pScreenPriv->pddsdPrimary->lpSurface);

-

-  /*

-   * Register the Alt-Tab combo as a hotkey so we can copy

-   * the primary framebuffer before the display mode changes

-   */

-  RegisterHotKey (pScreenPriv->hwndScreen, 1, MOD_ALT, 9);

-

-  return TRUE;

-}

-

-

-/*

- * Handle the Alt+Tab hotkey.

- *

- * We need to save the primary fb to an offscreen fb when

- * we get deactivated, and point the fb code at the offscreen

- * fb for the duration of the deactivation.

- */

-

-static Bool

-winHotKeyAltTabPrimaryDD (ScreenPtr pScreen)

-{

-  winScreenPriv(pScreen);

-  winScreenInfo		*pScreenInfo = pScreenPriv->pScreenInfo;

-  RECT			rcClient, rcSrc;

-  HRESULT		ddrval = DD_OK;

-

-  ErrorF ("\nwinHotKeyAltTabPrimaryDD\n\n");

-

-  /* Alt+Tab was pressed, we will lose focus very soon */

-  pScreenPriv->fActive = FALSE;

-  

-  /* Check for error conditions */

-  if (pScreenPriv->pddsPrimary == NULL

-      || pScreenPriv->pddsOffscreen == NULL)

-    return FALSE;

-

-  /* Get client area in screen coords */

-  GetClientRect (pScreenPriv->hwndScreen, &rcClient);

-  MapWindowPoints (pScreenPriv->hwndScreen,

-		   HWND_DESKTOP,

-		   (LPPOINT)&rcClient, 2);

-

-  /* Did we loose the primary surface? */

-  ddrval = IDirectDrawSurface2_IsLost (pScreenPriv->pddsPrimary);

-  if (ddrval == DD_OK)

-    {

-      ddrval = IDirectDrawSurface2_Unlock (pScreenPriv->pddsPrimary,

-					   NULL);

-      if (FAILED (ddrval))

-	FatalError ("winHotKeyAltTabPrimaryDD - Failed unlocking primary "

-		    "surface\n");

-    }

-

-  /* Setup a source rectangle */

-  rcSrc.left = 0;

-  rcSrc.top = 0;

-  rcSrc.right = pScreenInfo->dwWidth;

-  rcSrc.bottom = pScreenInfo->dwHeight;

-

-      /* Blit the primary surface to the offscreen surface */

-  ddrval = IDirectDrawSurface2_Blt (pScreenPriv->pddsOffscreen,

-				    NULL, /* should be rcDest */

-				    pScreenPriv->pddsPrimary,

-				    NULL,

-				    DDBLT_WAIT,

-				    NULL);

-  if (ddrval == DDERR_SURFACELOST)

-    {

-      IDirectDrawSurface2_Restore (pScreenPriv->pddsOffscreen);  

-      IDirectDrawSurface2_Restore (pScreenPriv->pddsPrimary);

-		  		  

-      /* Blit the primary surface to the offscreen surface */

-      ddrval = IDirectDrawSurface2_Blt (pScreenPriv->pddsOffscreen,

-					NULL,

-					pScreenPriv->pddsPrimary,

-					NULL,

-					DDBLT_WAIT,

-					NULL);

-      if (FAILED (ddrval))

-	FatalError ("winHotKeyAltTabPrimaryDD - Failed blitting primary "

-		    "surface to offscreen surface: %08x\n",

-		    (unsigned int) ddrval);

-    }

-  else

-    {

-      FatalError ("winHotKeyAltTabPrimaryDD - Unknown error from "

-		  "Blt: %08dx\n", (unsigned int) ddrval);

-    }

-

-  /* Lock the offscreen surface */

-  ddrval = IDirectDrawSurface2_Lock (pScreenPriv->pddsOffscreen,

-				     NULL,

-				     pScreenPriv->pddsdOffscreen,

-				     DDLOCK_WAIT,

-				     NULL);

-  if (ddrval != DD_OK

-      || pScreenPriv->pddsdPrimary->lpSurface == NULL)

-    FatalError ("winHotKeyAltTabPrimaryDD - Could not lock "

-		"offscreen surface\n");

-

-  /* Notify FB of the new memory pointer */

-  winUpdateFBPointer (pScreen,

-		      pScreenPriv->pddsdOffscreen->lpSurface);

-

-  /* Unregister our hotkey */

-  UnregisterHotKey (pScreenPriv->hwndScreen, 1);

-

-  return TRUE;

-}

-

-

-/* Set engine specific functions */

-Bool

-winSetEngineFunctionsPrimaryDD (ScreenPtr pScreen)

-{

-  winScreenPriv(pScreen);

-  winScreenInfo		*pScreenInfo = pScreenPriv->pScreenInfo;

-  

-  /* Set our pointers */

-  pScreenPriv->pwinAllocateFB = winAllocateFBPrimaryDD;

-  pScreenPriv->pwinShadowUpdate

-    = (winShadowUpdateProcPtr) (void (*)(void))NoopDDA;

-  pScreenPriv->pwinCloseScreen = winCloseScreenPrimaryDD;

-  pScreenPriv->pwinInitVisuals = winInitVisualsPrimaryDD;

-  pScreenPriv->pwinAdjustVideoMode = winAdjustVideoModePrimaryDD;

-  if (pScreenInfo->fFullScreen)

-    pScreenPriv->pwinCreateBoundingWindow = winCreateBoundingWindowFullScreen;

-  else

-    pScreenPriv->pwinCreateBoundingWindow = winCreateBoundingWindowWindowed;

-  pScreenPriv->pwinFinishScreenInit = winFinishScreenInitFB;

-  pScreenPriv->pwinBltExposedRegions

-    = (winBltExposedRegionsProcPtr) (void (*)(void))NoopDDA;

-  pScreenPriv->pwinActivateApp = winActivateAppPrimaryDD;

-  pScreenPriv->pwinHotKeyAltTab = winHotKeyAltTabPrimaryDD;

-#ifdef XWIN_MULTIWINDOW

-  pScreenPriv->pwinFinishCreateWindowsWindow =

-    (winFinishCreateWindowsWindowProcPtr) (void (*)(void))NoopDDA;

-#endif

-

-  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
+ */
+
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
+#include "win.h"
+
+
+/*
+ * Local function prototypes
+ */
+
+static Bool
+winAllocateFBPrimaryDD (ScreenPtr pScreen);
+
+static Bool
+winCloseScreenPrimaryDD (int nIndex, ScreenPtr pScreen);
+
+static Bool
+winInitVisualsPrimaryDD (ScreenPtr pScreen);
+
+static Bool
+winAdjustVideoModePrimaryDD (ScreenPtr pScreen);
+
+static Bool
+winActivateAppPrimaryDD (ScreenPtr pScreen);
+
+static Bool
+winHotKeyAltTabPrimaryDD (ScreenPtr pScreen);
+
+
+/*
+ * Create a DirectDraw primary surface 
+ */
+
+static Bool
+winAllocateFBPrimaryDD (ScreenPtr pScreen)
+{
+  winScreenPriv(pScreen);
+  winScreenInfo		*pScreenInfo = pScreenPriv->pScreenInfo;  
+  HRESULT		ddrval = DD_OK;
+  DDSURFACEDESC		ddsd;
+  DDSURFACEDESC		*pddsdPrimary = NULL;
+  DDSURFACEDESC		*pddsdOffscreen = NULL;
+  RECT			rcClient;
+
+  ErrorF ("winAllocateFBPrimaryDD\n");
+
+  /* Get client area location in screen coords */
+  GetClientRect (pScreenPriv->hwndScreen, &rcClient);
+  MapWindowPoints (pScreenPriv->hwndScreen,
+		   HWND_DESKTOP,
+		   (LPPOINT)&rcClient, 2);
+
+  /* Create a DirectDraw object, store the address at lpdd */
+  ddrval = (*g_fpDirectDrawCreate) (NULL, &pScreenPriv->pdd, NULL);
+  if (ddrval != DD_OK)
+    FatalError ("winAllocateFBPrimaryDD - Could not start DirectDraw\n");
+  
+  /* Get a DirectDraw2 interface pointer */
+  ddrval = IDirectDraw_QueryInterface (pScreenPriv->pdd,
+				       &IID_IDirectDraw2,
+				       (LPVOID*) &pScreenPriv->pdd2);
+  if (FAILED (ddrval))
+    {
+      ErrorF ("winAllocateFBShadowDD - Failed DD2 query: %08x\n",
+	      (unsigned int) ddrval);
+      return FALSE;
+    }
+
+
+  ErrorF ("winAllocateFBPrimaryDD - Created and initialized DD\n");
+
+  /* Are we windowed or fullscreen? */
+  if (pScreenInfo->fFullScreen)
+    {
+      /* Full screen mode */
+      ddrval = IDirectDraw2_SetCooperativeLevel (pScreenPriv->pdd2,
+						 pScreenPriv->hwndScreen,
+						 DDSCL_FULLSCREEN
+						 | DDSCL_EXCLUSIVE);
+      if (FAILED (ddrval))
+	FatalError ("winAllocateFBPrimaryDD - Could not set "
+		    "cooperative level\n");
+
+      /* Change the video mode to the mode requested */
+      ddrval = IDirectDraw2_SetDisplayMode (pScreenPriv->pdd2,
+					    pScreenInfo->dwWidth,
+					    pScreenInfo->dwHeight,
+					    pScreenInfo->dwBPP,
+					    pScreenInfo->dwRefreshRate,
+					    0);
+       if (FAILED (ddrval))
+	FatalError ("winAllocateFBPrimaryDD - Could not set "
+		    "full screen display mode\n");
+    }
+  else
+    {
+      /* Windowed mode */
+      ddrval = IDirectDraw2_SetCooperativeLevel (pScreenPriv->pdd2,
+						 pScreenPriv->hwndScreen,
+						 DDSCL_NORMAL);
+      if (FAILED (ddrval))
+	FatalError ("winAllocateFBPrimaryDD - Could not set "
+		    "cooperative level\n");
+    }
+
+  /* Describe the primary surface */
+  ZeroMemory (&ddsd, sizeof (ddsd));
+  ddsd.dwSize = sizeof (ddsd);
+  ddsd.dwFlags = DDSD_CAPS;
+  ddsd.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE;
+  
+  /* Create the primary surface */
+  ddrval = IDirectDraw2_CreateSurface (pScreenPriv->pdd2,
+				       &ddsd,
+				       &pScreenPriv->pddsPrimary,
+				       NULL);
+  if (FAILED (ddrval))
+       FatalError ("winAllocateFBPrimaryDD - Could not create primary "
+		  "surface %08x\n", (unsigned int) ddrval);
+
+  ErrorF ("winAllocateFBPrimaryDD - Created primary\n");
+
+  /* Allocate a DD surface description for our screen privates */
+  pddsdPrimary = pScreenPriv->pddsdPrimary
+    = malloc (sizeof (DDSURFACEDESC));
+  if (pddsdPrimary == NULL)
+    FatalError ("winAllocateFBPrimaryDD - Could not allocate surface "
+		"description memory\n");
+  ZeroMemory (pddsdPrimary, sizeof (*pddsdPrimary));
+  pddsdPrimary->dwSize = sizeof (*pddsdPrimary);
+
+  /* Describe the offscreen surface to be created */
+  /*
+   * NOTE: Do not use a DDSCAPS_VIDEOMEMORY surface,
+   * as drawing, locking, and unlocking take forever
+   * with video memory surfaces.  In addition,
+   * video memory is a somewhat scarce resource,
+   * so you shouldn't be allocating video memory when
+   * you have the option of using system memory instead.
+   */
+  ZeroMemory (&ddsd, sizeof (ddsd));
+  ddsd.dwSize = sizeof (ddsd);
+  ddsd.dwFlags = DDSD_CAPS | DDSD_HEIGHT | DDSD_WIDTH;
+  ddsd.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN | DDSCAPS_SYSTEMMEMORY;
+  ddsd.dwHeight = pScreenInfo->dwHeight;
+  ddsd.dwWidth = pScreenInfo->dwWidth;
+
+  /* Create the shadow surface */
+  ddrval = IDirectDraw2_CreateSurface (pScreenPriv->pdd2,
+				       &ddsd,
+				       &pScreenPriv->pddsOffscreen,
+				       NULL);
+  if (ddrval != DD_OK)
+    FatalError ("winAllocateFBPrimaryDD - Could not create shadow "
+		"surface\n");
+  
+  ErrorF ("winAllocateFBPrimaryDD - Created offscreen\n");
+
+  /* Allocate a DD surface description for our screen privates */
+  pddsdOffscreen = pScreenPriv->pddsdOffscreen
+    = malloc (sizeof (DDSURFACEDESC));
+  if (pddsdOffscreen == NULL)
+    FatalError ("winAllocateFBPrimaryDD - Could not allocate surface "
+		"description memory\n");
+  ZeroMemory (pddsdOffscreen, sizeof (*pddsdOffscreen));
+  pddsdOffscreen->dwSize = sizeof (*pddsdOffscreen);
+
+  ErrorF ("winAllocateFBPrimaryDD - Locking primary\n");
+
+  /* Lock the primary surface */
+  ddrval = IDirectDrawSurface2_Lock (pScreenPriv->pddsPrimary,
+				    pScreenInfo->fFullScreen ? NULL:&rcClient,
+				    pddsdPrimary,
+				    DDLOCK_WAIT,
+				    NULL);
+  if (ddrval != DD_OK || pddsdPrimary->lpSurface == NULL)
+    FatalError ("winAllocateFBPrimaryDD - Could not lock "
+		"primary surface\n");
+
+  ErrorF ("winAllocateFBPrimaryDD - Locked primary\n");
+
+  /* We don't know how to deal with anything other than RGB */
+  if (!(pddsdPrimary->ddpfPixelFormat.dwFlags & DDPF_RGB))
+    FatalError ("winAllocateFBPrimaryDD - Color format other than RGB\n");
+
+  /* Grab the pitch from the surface desc */
+  pScreenInfo->dwStride = (pddsdPrimary->u1.lPitch * 8)
+    / pScreenInfo->dwBPP;
+
+  /* Save the pointer to our surface memory */
+  pScreenInfo->pfb = pddsdPrimary->lpSurface;
+  
+  /* Grab the color depth and masks from the surface description */
+  pScreenPriv->dwRedMask = pddsdPrimary->ddpfPixelFormat.u2.dwRBitMask;
+  pScreenPriv->dwGreenMask = pddsdPrimary->ddpfPixelFormat.u3.dwGBitMask;
+  pScreenPriv->dwBlueMask = pddsdPrimary->ddpfPixelFormat.u4.dwBBitMask;
+
+  ErrorF ("winAllocateFBPrimaryDD - Returning\n");
+
+  return TRUE;
+}
+
+static void
+winFreeFBPrimaryDD (ScreenPtr pScreen)
+{
+  winScreenPriv(pScreen);
+  winScreenInfo *pScreenInfo = pScreenPriv->pScreenInfo;
+
+  /* Free the offscreen surface, if there is one */
+  if (pScreenPriv->pddsOffscreen)
+    {
+      IDirectDrawSurface2_Unlock (pScreenPriv->pddsOffscreen, NULL);
+      IDirectDrawSurface2_Release (pScreenPriv->pddsOffscreen);
+      pScreenPriv->pddsOffscreen = NULL;
+    }
+
+  /* Release the primary surface, if there is one */
+  if (pScreenPriv->pddsPrimary)
+    {
+      IDirectDrawSurface2_Unlock (pScreenPriv->pddsPrimary, NULL);
+      IDirectDrawSurface2_Release (pScreenPriv->pddsPrimary);
+      pScreenPriv->pddsPrimary = NULL;
+    }
+
+  /* Free the DirectDraw object, if there is one */
+  if (pScreenPriv->pdd)
+    {
+      IDirectDraw2_RestoreDisplayMode (pScreenPriv->pdd);
+      IDirectDraw2_Release (pScreenPriv->pdd);
+      pScreenPriv->pdd = NULL;
+    }
+
+  /* Invalidate the ScreenInfo's fb pointer */
+  pScreenInfo->pfb = NULL;
+}
+
+static Bool
+winInitScreenPrimaryDD(ScreenPtr pScreen)
+{
+  return winAllocateFBPrimaryDD(pScreen);
+}
+
+/*
+ * Call the wrapped CloseScreen function.
+ * 
+ * Free our resources and private structures.
+ */
+
+static Bool
+winCloseScreenPrimaryDD (int nIndex, ScreenPtr pScreen)
+{
+  winScreenPriv(pScreen);
+  winScreenInfo		*pScreenInfo = pScreenPriv->pScreenInfo;
+  Bool			fReturn;
+  
+  ErrorF ("winCloseScreenPrimaryDD - Freeing screen resources\n");
+
+  /* Flag that the screen is closed */
+  pScreenPriv->fClosed = TRUE;
+  pScreenPriv->fActive = FALSE;
+
+  /* Call the wrapped CloseScreen procedure */
+  WIN_UNWRAP(CloseScreen);
+  fReturn = (*pScreen->CloseScreen) (nIndex, pScreen);
+
+  /* Delete the window property */
+  RemoveProp (pScreenPriv->hwndScreen, WIN_SCR_PROP);
+
+  winFreeFBPrimaryDD(pScreen);
+
+  /* Delete tray icon, if we have one */
+  if (!pScreenInfo->fNoTrayIcon)
+    winDeleteNotifyIcon (pScreenPriv);
+
+  /* Free the exit confirmation dialog box, if it exists */
+  if (g_hDlgExit != NULL)
+    {
+      DestroyWindow (g_hDlgExit);
+      g_hDlgExit = NULL;
+    }
+
+  /* Kill our window */
+  if (pScreenPriv->hwndScreen)
+    {
+      DestroyWindow (pScreenPriv->hwndScreen);
+      pScreenPriv->hwndScreen = NULL;
+    }
+
+  /* Kill our screeninfo's pointer to the screen */
+  pScreenInfo->pScreen = NULL;
+
+  /* Free the screen privates for this screen */
+  free ((pointer) pScreenPriv);
+
+  return fReturn;
+}
+
+
+/*
+ * Tell mi what sort of visuals we need.
+ * 
+ * Generally we only need one visual, as our screen can only
+ * handle one format at a time, I believe.  You may want
+ * to verify that last sentence.
+ */
+
+static Bool
+winInitVisualsPrimaryDD (ScreenPtr pScreen)
+{
+  winScreenPriv(pScreen);
+  winScreenInfo		*pScreenInfo = pScreenPriv->pScreenInfo;
+  DWORD			dwRedBits, dwGreenBits, dwBlueBits;
+
+  /* Count the number of ones in each color mask */
+  dwRedBits = winCountBits (pScreenPriv->dwRedMask);
+  dwGreenBits = winCountBits (pScreenPriv->dwGreenMask);
+  dwBlueBits = winCountBits (pScreenPriv->dwBlueMask);
+  
+  /* Store the maximum number of ones in a color mask as the bitsPerRGB */
+  if (dwRedBits > dwGreenBits && dwRedBits > dwBlueBits)
+    pScreenPriv->dwBitsPerRGB = dwRedBits;
+  else if (dwGreenBits > dwRedBits && dwGreenBits > dwBlueBits)
+    pScreenPriv->dwBitsPerRGB = dwGreenBits;
+  else
+    pScreenPriv->dwBitsPerRGB = dwBlueBits;
+  
+  ErrorF ("winInitVisualsPrimaryDD - Masks: %08x %08x %08x bpRGB: %d\n",
+	  (unsigned int) pScreenPriv->dwRedMask,
+	  (unsigned int) pScreenPriv->dwGreenMask,
+	  (unsigned int) pScreenPriv->dwBlueMask,
+	  (int) pScreenPriv->dwBitsPerRGB);
+
+  /* Create a single visual according to the Windows screen depth */
+  switch (pScreenInfo->dwDepth)
+    {
+    case 24:
+    case 16:
+    case 15:
+      if (!miSetVisualTypesAndMasks (pScreenInfo->dwDepth,
+				     TrueColorMask,
+				     pScreenPriv->dwBitsPerRGB,
+				     TrueColor,
+				     pScreenPriv->dwRedMask,
+				     pScreenPriv->dwGreenMask,
+				     pScreenPriv->dwBlueMask))
+	{
+	  ErrorF ("winInitVisualsPrimaryDD - " 
+		  "miSetVisualTypesAndMasks failed\n");
+	  return FALSE;
+	}
+      break;
+
+    case 8:
+#if CYGDEBUG
+      winDebug ("winInitVisuals - Calling miSetVisualTypesAndMasks\n");
+#endif /* CYGDEBUG */
+      if (!miSetVisualTypesAndMasks (pScreenInfo->dwDepth,
+				     PseudoColorMask,
+				     pScreenPriv->dwBitsPerRGB,
+				     PseudoColor,
+				     pScreenPriv->dwRedMask,
+				     pScreenPriv->dwGreenMask,
+				     pScreenPriv->dwBlueMask))
+	{
+	  ErrorF ("winInitVisualsPrimaryDD - "
+		  "miSetVisualTypesAndMasks failed\n");
+	  return FALSE;
+	}
+#if CYGDEBUG
+      winDebug ("winInitVisualsPrimaryDD - Returned from "
+	      "miSetVisualTypesAndMasks\n");
+#endif /* CYGDEBUG */
+      break;
+
+    default:
+      ErrorF ("winInitVisualsPrimaryDD - Unknown screen depth\n");
+      return FALSE;
+    }
+
+  ErrorF ("winInitVisualsPrimaryDD - Returning\n");
+
+  return TRUE;
+}
+
+
+static Bool
+winAdjustVideoModePrimaryDD (ScreenPtr pScreen)
+{
+  winScreenPriv(pScreen);
+  winScreenInfo		*pScreenInfo = pScreenPriv->pScreenInfo;
+  HDC			hdc = NULL;
+  DWORD			dwBPP;
+
+  /* We're in serious trouble if we can't get a DC */
+  hdc = GetDC (NULL);
+  if (hdc == NULL)
+    {
+      ErrorF ("winAdjustVideoModePrimaryDD - GetDC failed\n");
+      return FALSE;
+    }
+
+  /* Query GDI for current display depth */
+  dwBPP = GetDeviceCaps (hdc, BITSPIXEL);
+
+  /* DirectDraw can only change the depth in fullscreen mode */
+  if (!(pScreenInfo->fFullScreen &&
+        (pScreenInfo->dwBPP != WIN_DEFAULT_BPP)))
+    {
+      /* Otherwise, We'll use GDI's depth */
+      pScreenInfo->dwBPP = dwBPP;
+    }
+
+  /* Release our DC */
+  ReleaseDC (NULL, hdc);
+
+  return TRUE;
+}
+
+
+/*
+ * We need to blit our offscreen fb to
+ * the screen when we are activated, and we need to point
+ * the fb code back to the primary surface memory.
+ */
+
+static Bool
+winActivateAppPrimaryDD (ScreenPtr pScreen)
+{
+  winScreenPriv(pScreen);
+  winScreenInfo		*pScreenInfo = pScreenPriv->pScreenInfo;
+  RECT			rcSrc, rcClient;
+  HRESULT		ddrval = DD_OK;
+
+  /* Check for errors */
+  if (pScreenPriv == NULL
+      || pScreenPriv->pddsPrimary == NULL
+      || pScreenPriv->pddsOffscreen == NULL)
+    return FALSE;
+
+  /* Check for do-nothing */
+  if (!pScreenPriv->fActive)
+    return TRUE;
+  
+  /* We are activating */
+  ddrval = IDirectDrawSurface2_IsLost (pScreenPriv->pddsOffscreen);
+  if (ddrval == DD_OK)
+    {
+      IDirectDrawSurface2_Unlock (pScreenPriv->pddsOffscreen,
+				  NULL);
+      /*
+       * We don't check for an error from Unlock, because it
+       * doesn't matter if the Unlock failed.
+       */
+    }
+
+  /* Restore both surfaces, just cause I like it that way */
+  IDirectDrawSurface2_Restore (pScreenPriv->pddsOffscreen);
+  IDirectDrawSurface2_Restore (pScreenPriv->pddsPrimary);
+			      
+  /* Get client area in screen coords */
+  GetClientRect (pScreenPriv->hwndScreen, &rcClient);
+  MapWindowPoints (pScreenPriv->hwndScreen,
+		   HWND_DESKTOP,
+		   (LPPOINT)&rcClient, 2);
+
+  /* Setup a source rectangle */
+  rcSrc.left = 0;
+  rcSrc.top = 0;
+  rcSrc.right = pScreenInfo->dwWidth;
+  rcSrc.bottom = pScreenInfo->dwHeight;
+
+  ddrval = IDirectDrawSurface2_Blt (pScreenPriv->pddsPrimary,
+				    &rcClient,
+				    pScreenPriv->pddsOffscreen,
+				    &rcSrc,
+				    DDBLT_WAIT,
+				    NULL);
+  if (ddrval != DD_OK)
+    FatalError ("winActivateAppPrimaryDD () - Failed blitting offscreen "
+		"surface to primary surface %08x\n", (unsigned int) ddrval);
+  
+  /* Lock the primary surface */
+  ddrval = IDirectDrawSurface2_Lock (pScreenPriv->pddsPrimary,
+				     &rcClient,
+				     pScreenPriv->pddsdPrimary,
+				     DDLOCK_WAIT,
+				     NULL);
+  if (ddrval != DD_OK
+      || pScreenPriv->pddsdPrimary->lpSurface == NULL)
+    FatalError ("winActivateAppPrimaryDD () - Could not lock "
+		"primary surface\n");
+
+  /* Notify FB of the new memory pointer */
+  winUpdateFBPointer (pScreen,
+		      pScreenPriv->pddsdPrimary->lpSurface);
+
+  /*
+   * Register the Alt-Tab combo as a hotkey so we can copy
+   * the primary framebuffer before the display mode changes
+   */
+  RegisterHotKey (pScreenPriv->hwndScreen, 1, MOD_ALT, 9);
+
+  return TRUE;
+}
+
+
+/*
+ * Handle the Alt+Tab hotkey.
+ *
+ * We need to save the primary fb to an offscreen fb when
+ * we get deactivated, and point the fb code at the offscreen
+ * fb for the duration of the deactivation.
+ */
+
+static Bool
+winHotKeyAltTabPrimaryDD (ScreenPtr pScreen)
+{
+  winScreenPriv(pScreen);
+  winScreenInfo		*pScreenInfo = pScreenPriv->pScreenInfo;
+  RECT			rcClient, rcSrc;
+  HRESULT		ddrval = DD_OK;
+
+  ErrorF ("\nwinHotKeyAltTabPrimaryDD\n\n");
+
+  /* Alt+Tab was pressed, we will lose focus very soon */
+  pScreenPriv->fActive = FALSE;
+  
+  /* Check for error conditions */
+  if (pScreenPriv->pddsPrimary == NULL
+      || pScreenPriv->pddsOffscreen == NULL)
+    return FALSE;
+
+  /* Get client area in screen coords */
+  GetClientRect (pScreenPriv->hwndScreen, &rcClient);
+  MapWindowPoints (pScreenPriv->hwndScreen,
+		   HWND_DESKTOP,
+		   (LPPOINT)&rcClient, 2);
+
+  /* Did we loose the primary surface? */
+  ddrval = IDirectDrawSurface2_IsLost (pScreenPriv->pddsPrimary);
+  if (ddrval == DD_OK)
+    {
+      ddrval = IDirectDrawSurface2_Unlock (pScreenPriv->pddsPrimary,
+					   NULL);
+      if (FAILED (ddrval))
+	FatalError ("winHotKeyAltTabPrimaryDD - Failed unlocking primary "
+		    "surface\n");
+    }
+
+  /* Setup a source rectangle */
+  rcSrc.left = 0;
+  rcSrc.top = 0;
+  rcSrc.right = pScreenInfo->dwWidth;
+  rcSrc.bottom = pScreenInfo->dwHeight;
+
+      /* Blit the primary surface to the offscreen surface */
+  ddrval = IDirectDrawSurface2_Blt (pScreenPriv->pddsOffscreen,
+				    NULL, /* should be rcDest */
+				    pScreenPriv->pddsPrimary,
+				    NULL,
+				    DDBLT_WAIT,
+				    NULL);
+  if (ddrval == DDERR_SURFACELOST)
+    {
+      IDirectDrawSurface2_Restore (pScreenPriv->pddsOffscreen);  
+      IDirectDrawSurface2_Restore (pScreenPriv->pddsPrimary);
+		  		  
+      /* Blit the primary surface to the offscreen surface */
+      ddrval = IDirectDrawSurface2_Blt (pScreenPriv->pddsOffscreen,
+					NULL,
+					pScreenPriv->pddsPrimary,
+					NULL,
+					DDBLT_WAIT,
+					NULL);
+      if (FAILED (ddrval))
+	FatalError ("winHotKeyAltTabPrimaryDD - Failed blitting primary "
+		    "surface to offscreen surface: %08x\n",
+		    (unsigned int) ddrval);
+    }
+  else
+    {
+      FatalError ("winHotKeyAltTabPrimaryDD - Unknown error from "
+		  "Blt: %08dx\n", (unsigned int) ddrval);
+    }
+
+  /* Lock the offscreen surface */
+  ddrval = IDirectDrawSurface2_Lock (pScreenPriv->pddsOffscreen,
+				     NULL,
+				     pScreenPriv->pddsdOffscreen,
+				     DDLOCK_WAIT,
+				     NULL);
+  if (ddrval != DD_OK
+      || pScreenPriv->pddsdPrimary->lpSurface == NULL)
+    FatalError ("winHotKeyAltTabPrimaryDD - Could not lock "
+		"offscreen surface\n");
+
+  /* Notify FB of the new memory pointer */
+  winUpdateFBPointer (pScreen,
+		      pScreenPriv->pddsdOffscreen->lpSurface);
+
+  /* Unregister our hotkey */
+  UnregisterHotKey (pScreenPriv->hwndScreen, 1);
+
+  return TRUE;
+}
+
+
+/* Set engine specific functions */
+Bool
+winSetEngineFunctionsPrimaryDD (ScreenPtr pScreen)
+{
+  winScreenPriv(pScreen);
+  winScreenInfo		*pScreenInfo = pScreenPriv->pScreenInfo;
+  
+  /* Set our pointers */
+  pScreenPriv->pwinAllocateFB = winAllocateFBPrimaryDD;
+  pScreenPriv->pwinFreeFB = winFreeFBPrimaryDD;
+  pScreenPriv->pwinShadowUpdate = (winShadowUpdateProcPtr) (void (*)(void))NoopDDA;
+  pScreenPriv->pwinInitScreen = winInitScreenPrimaryDD;
+  pScreenPriv->pwinCloseScreen = winCloseScreenPrimaryDD;
+  pScreenPriv->pwinInitVisuals = winInitVisualsPrimaryDD;
+  pScreenPriv->pwinAdjustVideoMode = winAdjustVideoModePrimaryDD;
+  if (pScreenInfo->fFullScreen)
+    pScreenPriv->pwinCreateBoundingWindow = winCreateBoundingWindowFullScreen;
+  else
+    pScreenPriv->pwinCreateBoundingWindow = winCreateBoundingWindowWindowed;
+  pScreenPriv->pwinFinishScreenInit = winFinishScreenInitFB;
+  pScreenPriv->pwinBltExposedRegions = (winBltExposedRegionsProcPtr) (void (*)(void))NoopDDA;
+  pScreenPriv->pwinActivateApp = winActivateAppPrimaryDD;
+  pScreenPriv->pwinRedrawScreen = NULL;
+  pScreenPriv->pwinRealizeInstalledPalette = NULL;
+  pScreenPriv->pwinInstallColormap = NULL;
+  pScreenPriv->pwinStoreColors = NULL;
+  pScreenPriv->pwinCreateColormap = NULL;
+  pScreenPriv->pwinDestroyColormap = NULL;
+  pScreenPriv->pwinHotKeyAltTab = winHotKeyAltTabPrimaryDD;
+  pScreenPriv->pwinCreatePrimarySurface = (winCreatePrimarySurfaceProcPtr) (void (*)(void))NoopDDA;
+  pScreenPriv->pwinReleasePrimarySurface = (winReleasePrimarySurfaceProcPtr) (void (*)(void))NoopDDA;
+#ifdef XWIN_MULTIWINDOW
+  pScreenPriv->pwinFinishCreateWindowsWindow =
+    (winFinishCreateWindowsWindowProcPtr) (void (*)(void))NoopDDA;
+#endif
+
+  return TRUE;
+}
diff --git a/xorg-server/hw/xwin/winprocarg.c b/xorg-server/hw/xwin/winprocarg.c
index 39f0ee3e5..ddfe1f5b7 100644
--- a/xorg-server/hw/xwin/winprocarg.c
+++ b/xorg-server/hw/xwin/winprocarg.c
@@ -1,1256 +1,1217 @@
-/*

-

-Copyright 1993, 1998  The Open Group

-Copyright (C) Colin Harrison 2005-2008

-

-Permission to use, copy, modify, distribute, and sell this software and its

-documentation for any purpose is hereby granted without fee, provided that

-the above copyright notice appear in all copies and that both that

-copyright notice and this permission notice appear in supporting

-documentation.

-

-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 OPEN GROUP 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 Open Group 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 Open Group.

-

-*/

-

-#ifdef HAVE_XWIN_CONFIG_H

-#include <xwin-config.h>

-#endif

-

-#include <../xfree86/common/xorgVersion.h>

-#include "win.h"

-#include "winconfig.h"

-#include "winmsg.h"

-

-/*

- * References to external symbols

- */

-

-#ifdef XWIN_CLIPBOARD

-extern Bool			g_fUnicodeClipboard;

-extern Bool			g_fClipboard;

-#endif

-/* globals required by callback function for monitor information */

-struct GetMonitorInfoData {

-    int  requestedMonitor;

-    int  monitorNum;

-    Bool bUserSpecifiedMonitor;

-    Bool bMonitorSpecifiedExists;

-    int  monitorOffsetX;

-    int  monitorOffsetY;

-    int  monitorHeight;

-    int  monitorWidth;

-};

-

-typedef wBOOL (*ENUMDISPLAYMONITORSPROC)(HDC,LPCRECT,MONITORENUMPROC,LPARAM);

-ENUMDISPLAYMONITORSPROC _EnumDisplayMonitors;

-

-wBOOL CALLBACK getMonitorInfo(HMONITOR hMonitor, HDC hdc, LPRECT rect, LPARAM _data);

-

-static Bool QueryMonitor(int index, struct GetMonitorInfoData *data)

-{

-    /* Load EnumDisplayMonitors from DLL */

-    HMODULE user32;

-    FARPROC func;

-    user32 = LoadLibrary("user32.dll");

-    if (user32 == NULL)

-    {

-        winW32Error(2, "Could not open user32.dll");

-        return FALSE;

-    }

-    func = GetProcAddress(user32, "EnumDisplayMonitors");

-    if (func == NULL)

-    {

-        winW32Error(2, "Could not resolve EnumDisplayMonitors: ");

-        return FALSE;

-    }

-    _EnumDisplayMonitors = (ENUMDISPLAYMONITORSPROC)func;

-    

-    /* prepare data */

-    if (data == NULL)

-        return FALSE;

-    memset(data, 0, sizeof(*data));

-    data->requestedMonitor = index;

-

-    /* query information */

-    _EnumDisplayMonitors(NULL, NULL, getMonitorInfo, (LPARAM) data);

-

-    /* cleanup */

-    FreeLibrary(user32);

-    return TRUE;

-}

-

-/*

- * Function prototypes

- */

-

-void

-winLogCommandLine (int argc, char *argv[]);

-

-void

-winLogVersionInfo (void);

-

-#ifdef DDXOSVERRORF

-void OsVendorVErrorF (const char *pszFormat, va_list va_args);

-#endif

-

-/*

- * Process arguments on the command line

- */

-

-static int iLastScreen = -1;

-static winScreenInfo defaultScreenInfo;

-

-static void

-winInitializeScreenDefaults(void)

-{

-  DWORD dwWidth, dwHeight;

-  static Bool fInitializedScreenDefaults = FALSE;

-

-  /* Bail out early if default screen has already been initialized */

-  if (fInitializedScreenDefaults)

-    return;

-

-  /* Zero the memory used for storing the screen info */

-  memset(&defaultScreenInfo, 0, sizeof(winScreenInfo));

-

-  /* Get default width and height */

-  /*

-   * NOTE: These defaults will cause the window to cover only

-   * the primary monitor in the case that we have multiple monitors.

-   */

-  dwWidth = GetSystemMetrics (SM_CXSCREEN);

-  dwHeight = GetSystemMetrics (SM_CYSCREEN);

-

-  winErrorFVerb (2, "winInitializeScreenDefaults - w %d h %d\n",

-	  (int) dwWidth, (int) dwHeight);

-

-  /* Set a default DPI, if no parameter was passed */

-  if (monitorResolution == 0)

-    monitorResolution = WIN_DEFAULT_DPI;

-

-  defaultScreenInfo.dwWidth  = dwWidth;

-  defaultScreenInfo.dwHeight = dwHeight;

-  defaultScreenInfo.dwUserWidth  = dwWidth;

-  defaultScreenInfo.dwUserHeight = dwHeight;

-  defaultScreenInfo.fUserGaveHeightAndWidth = WIN_DEFAULT_USER_GAVE_HEIGHT_AND_WIDTH;

-  defaultScreenInfo.fUserGavePosition = FALSE;

-  defaultScreenInfo.dwBPP = WIN_DEFAULT_BPP;

-  defaultScreenInfo.dwClipUpdatesNBoxes = WIN_DEFAULT_CLIP_UPDATES_NBOXES;

-#ifdef XWIN_EMULATEPSEUDO

-  defaultScreenInfo.fEmulatePseudo = WIN_DEFAULT_EMULATE_PSEUDO;

-#endif

-  defaultScreenInfo.dwRefreshRate = WIN_DEFAULT_REFRESH;

-  defaultScreenInfo.pfb = NULL;

-  defaultScreenInfo.fFullScreen = FALSE;

-  defaultScreenInfo.fDecoration = TRUE;

-#ifdef XWIN_MULTIWINDOWEXTWM

-  defaultScreenInfo.fMWExtWM = FALSE;

-  defaultScreenInfo.fInternalWM = FALSE;

-#endif

-  defaultScreenInfo.fRootless = FALSE;

-#ifdef XWIN_MULTIWINDOW

-  defaultScreenInfo.fMultiWindow = FALSE;

-#endif

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

-  defaultScreenInfo.fMultiMonitorOverride = FALSE;

-#endif

-  defaultScreenInfo.fMultipleMonitors = FALSE;

-  defaultScreenInfo.fLessPointer = FALSE;

-  defaultScreenInfo.fScrollbars = FALSE;

-  defaultScreenInfo.fNoTrayIcon = FALSE;

-  defaultScreenInfo.iE3BTimeout = WIN_E3B_OFF;

-  defaultScreenInfo.dwWidth_mm = (dwWidth / WIN_DEFAULT_DPI) * 25.4;

-  defaultScreenInfo.dwHeight_mm = (dwHeight / WIN_DEFAULT_DPI) * 25.4;

-  defaultScreenInfo.fUseWinKillKey = WIN_DEFAULT_WIN_KILL;

-  defaultScreenInfo.fUseUnixKillKey = WIN_DEFAULT_UNIX_KILL;

-  defaultScreenInfo.fIgnoreInput = FALSE;

-  defaultScreenInfo.fExplicitScreen = FALSE;

-

-  /* Note that the default screen has been initialized */

-  fInitializedScreenDefaults = TRUE;

-}

-

-static void

-winInitializeScreen(int i)

-{

-  winErrorFVerb (2, "winInitializeScreen - %d\n",i);

-

-  /* Initialize default screen values, if needed */

-  winInitializeScreenDefaults();

-

-  /* Copy the default screen info */

-  g_ScreenInfo[i] = defaultScreenInfo;

-

-  /* Set the screen number */

-  g_ScreenInfo[i].dwScreen = i;

-}

-

-void

-winInitializeScreens(int maxscreens)

-{

-  int i;

-  winErrorFVerb (2, "winInitializeScreens - %i\n", maxscreens);

-

-  if (maxscreens > g_iNumScreens)

-    {

-      /* Reallocate the memory for DDX-specific screen info */

-      g_ScreenInfo = realloc(g_ScreenInfo, maxscreens * sizeof (winScreenInfo));

-

-      /* Set default values for any new screens */

-      for (i = g_iNumScreens; i < maxscreens ; i++)

-        winInitializeScreen(i);

-

-      /* Keep a count of the number of screens */

-      g_iNumScreens = maxscreens;

-    }

-}

-

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

-/*

- * INPUT

- * argv: pointer to an array of null-terminated strings, one for

- *   each token in the X Server command line; the first token

- *   is 'XWin.exe', or similar.

- * argc: a count of the number of tokens stored in argv.

- * i: a zero-based index into argv indicating the current token being

- *   processed.

- *

- * OUTPUT

- * return: return the number of tokens processed correctly.

- *

- * NOTE

- * When looking for n tokens, check that i + n is less than argc.  Or,

- *   you may check if i is greater than or equal to argc, in which case

- *   you should display the UseMsg () and return 0.

- */

-

-/* Check if enough arguments are given for the option */

-#define CHECK_ARGS(count) if (i + count >= argc) { UseMsg (); return 0; }

-

-/* Compare the current option with the string. */ 

-#define IS_OPTION(name) (strcmp (argv[i], name) == 0)

-

-int

-ddxProcessArgument (int argc, char *argv[], int i)

-{

-  static Bool		s_fBeenHere = FALSE;

-  winScreenInfo	*screenInfoPtr = NULL;

-

-  /* Initialize once */

-  if (!s_fBeenHere)

-    {

-#ifdef DDXOSVERRORF

-      /*

-       * This initialises our hook into VErrorF () for catching log messages

-       * that are generated before OsInit () is called.

-       */

-      OsVendorVErrorFProc = OsVendorVErrorF;

-#endif

-

-      s_fBeenHere = TRUE;

-

-      /* Initialize only if option is not -help */

-      if (!IS_OPTION("-help") && !IS_OPTION("-h") && !IS_OPTION("--help") &&

-          !IS_OPTION("-version") && !IS_OPTION("--version"))

-	{

-

-          /* Log the version information */

-          winLogVersionInfo ();

-

-          /* Log the command line */

-          winLogCommandLine (argc, argv);

-

-	  /*

-	   * Initialize default screen settings.  We have to do this before

-	   * OsVendorInit () gets called, otherwise we will overwrite

-	   * settings changed by parameters such as -fullscreen, etc.

-	   */

-	  winErrorFVerb (2, "ddxProcessArgument - Initializing default "

-			 "screens\n");

-	  winInitializeScreenDefaults();

-	}

-    }

-

-#if CYGDEBUG

-  winDebug ("ddxProcessArgument - arg: %s\n", argv[i]);

-#endif

-

-  /*

-   * Look for the '-help' and similar options

-   */ 

-  if (IS_OPTION ("-help") || IS_OPTION("-h") || IS_OPTION("--help"))

-    {

-      /* Reset logfile. We don't need that helpmessage in the logfile */  

-      g_pszLogFile = NULL;

-      g_fNoHelpMessageBox = TRUE;

-      UseMsg();

-      exit (0);

-      return 1;

-    }

-

-  if (IS_OPTION ("-version") || IS_OPTION("--version"))

-    {

-      /* Reset logfile. We don't need that versioninfo in the logfile */  

-      g_pszLogFile = NULL;

-      winLogVersionInfo ();

-      exit (0);

-      return 1;

-    }

-

-  /*

-   * Look for the '-screen scr_num [width height]' argument

-   */

-  if (IS_OPTION ("-screen"))

-    {

-      int		iArgsProcessed = 1;

-      int		nScreenNum;

-      int		iWidth, iHeight, iX, iY;

-      int		iMonitor;

-

-#if CYGDEBUG

-      winDebug ("ddxProcessArgument - screen - argc: %d i: %d\n",

-	      argc, i);

-#endif

-

-      /* Display the usage message if the argument is malformed */

-      if (i + 1 >= argc)

-	{

-	  return 0;

-	}

-      

-      /* Grab screen number */

-      nScreenNum = atoi (argv[i + 1]);

-

-      /* Validate the specified screen number */

-      if (nScreenNum < 0)

-        {

-          ErrorF ("ddxProcessArgument - screen - Invalid screen number %d\n",

-		  nScreenNum);

-          UseMsg ();

-	  return 0;

-        }

-

-      /*

-        Initialize default values for any new screens

-

-        Note that default values can't change after a -screen option is

-        seen, so it's safe to do this for each screen as it is introduced

-      */

-      winInitializeScreens(nScreenNum+1);

-

-	  /* look for @m where m is monitor number */

-	  if (i + 2 < argc

-		  && 1 == sscanf(argv[i + 2], "@%d", (int *) &iMonitor)) 

-      {

-        struct GetMonitorInfoData data;

-        if (!QueryMonitor(iMonitor, &data))

-        {

-            ErrorF ("ddxProcessArgument - screen - "

-                    "Querying monitors is not supported on NT4 and Win95\n");

-        } else if (data.bMonitorSpecifiedExists == TRUE) 

-        {

-		  winErrorFVerb(2, "ddxProcessArgument - screen - Found Valid ``@Monitor'' = %d arg\n", iMonitor);

-		  iArgsProcessed = 3;

-		  g_ScreenInfo[nScreenNum].fUserGaveHeightAndWidth = FALSE;

-		  g_ScreenInfo[nScreenNum].fUserGavePosition = TRUE;

-		  g_ScreenInfo[nScreenNum].dwWidth = data.monitorWidth;

-		  g_ScreenInfo[nScreenNum].dwHeight = data.monitorHeight;

-		  g_ScreenInfo[nScreenNum].dwUserWidth = data.monitorWidth;

-		  g_ScreenInfo[nScreenNum].dwUserHeight = data.monitorHeight;

-		  g_ScreenInfo[nScreenNum].dwInitialX = data.monitorOffsetX;

-		  g_ScreenInfo[nScreenNum].dwInitialY = data.monitorOffsetY;

-		}

-		else 

-        {

-		  /* monitor does not exist, error out */

-		  ErrorF ("ddxProcessArgument - screen - Invalid monitor number %d\n",

-				  iMonitor);

-		  UseMsg ();

-		  exit (0);

-		  return 0;

-		}

-	  }

-

-      /* Look for 'WxD' or 'W D' */

-      else if (i + 2 < argc

-	  && 2 == sscanf (argv[i + 2], "%dx%d",

-			  (int *) &iWidth,

-			  (int *) &iHeight))

-	{

-	  winErrorFVerb (2, "ddxProcessArgument - screen - Found ``WxD'' arg\n");

-	  iArgsProcessed = 3;

-	  g_ScreenInfo[nScreenNum].fUserGaveHeightAndWidth = TRUE;

-	  g_ScreenInfo[nScreenNum].dwWidth = iWidth;

-	  g_ScreenInfo[nScreenNum].dwHeight = iHeight;

-	  g_ScreenInfo[nScreenNum].dwUserWidth = iWidth;

-	  g_ScreenInfo[nScreenNum].dwUserHeight = iHeight;

-	  /* Look for WxD+X+Y */

-	  if (2 == sscanf (argv[i + 2], "%*dx%*d+%d+%d",

-			   (int *) &iX,

-			   (int *) &iY))

-	  {

-	    winErrorFVerb (2, "ddxProcessArgument - screen - Found ``X+Y'' arg\n");

-	    g_ScreenInfo[nScreenNum].fUserGavePosition = TRUE;

-	    g_ScreenInfo[nScreenNum].dwInitialX = iX;

-	    g_ScreenInfo[nScreenNum].dwInitialY = iY;

-

-		/* look for WxD+X+Y@m where m is monitor number. take X,Y to be offsets from monitor's root position */

-		if (1 == sscanf (argv[i + 2], "%*dx%*d+%*d+%*d@%d",

-						 (int *) &iMonitor)) 

-        {

-          struct GetMonitorInfoData data;

-          if (!QueryMonitor(iMonitor, &data))

-          {

-              ErrorF ("ddxProcessArgument - screen - "

-                      "Querying monitors is not supported on NT4 and Win95\n");

-          } else if (data.bMonitorSpecifiedExists == TRUE) 

-          {

-			g_ScreenInfo[nScreenNum].dwInitialX += data.monitorOffsetX;

-			g_ScreenInfo[nScreenNum].dwInitialY += data.monitorOffsetY;

-		  }

-		  else 

-          {

-			/* monitor does not exist, error out */

-			ErrorF ("ddxProcessArgument - screen - Invalid monitor number %d\n",

-					iMonitor);

-			UseMsg ();

-			exit (0);

-			return 0;

-		  }

-

-		}

-	  }

-

-	  /* look for WxD@m where m is monitor number */

-	  else if (1 == sscanf(argv[i + 2], "%*dx%*d@%d",

-						   (int *) &iMonitor)) 

-      {

-        struct GetMonitorInfoData data;

-        if (!QueryMonitor(iMonitor, &data))

-        {

-		  ErrorF ("ddxProcessArgument - screen - "

-                  "Querying monitors is not supported on NT4 and Win95\n");

-        } else if (data.bMonitorSpecifiedExists == TRUE) 

-        {

-		  winErrorFVerb (2, "ddxProcessArgument - screen - Found Valid ``@Monitor'' = %d arg\n", iMonitor);

-		  g_ScreenInfo[nScreenNum].fUserGavePosition = TRUE;

-		  g_ScreenInfo[nScreenNum].dwInitialX = data.monitorOffsetX;

-		  g_ScreenInfo[nScreenNum].dwInitialY = data.monitorOffsetY;

-		}

-		else 

-        {

-		  /* monitor does not exist, error out */

-		  ErrorF ("ddxProcessArgument - screen - Invalid monitor number %d\n",

-				  iMonitor);

-		  UseMsg ();

-		  exit (0);

-		  return 0;

-		}

-

-	  }

-	}

-      else if (i + 3 < argc

-	       && 1 == sscanf (argv[i + 2], "%d",

-			       (int *) &iWidth)

-	       && 1 == sscanf (argv[i + 3], "%d",

-			       (int *) &iHeight))

-	{

-	  winErrorFVerb (2, "ddxProcessArgument - screen - Found ``W D'' arg\n");

-	  iArgsProcessed = 4;

-	  g_ScreenInfo[nScreenNum].fUserGaveHeightAndWidth = TRUE;

-	  g_ScreenInfo[nScreenNum].dwWidth = iWidth;

-	  g_ScreenInfo[nScreenNum].dwHeight = iHeight;

-	  g_ScreenInfo[nScreenNum].dwUserWidth = iWidth;

-	  g_ScreenInfo[nScreenNum].dwUserHeight = iHeight;

-	  if (i + 5 < argc

-	      && 1 == sscanf (argv[i + 4], "%d",

-			      (int *) &iX)

-	      && 1 == sscanf (argv[i + 5], "%d",

-			      (int *) &iY))

-	  {

-	    winErrorFVerb (2, "ddxProcessArgument - screen - Found ``X Y'' arg\n");

-	    iArgsProcessed = 6;

-	    g_ScreenInfo[nScreenNum].fUserGavePosition = TRUE;

-	    g_ScreenInfo[nScreenNum].dwInitialX = iX;

-	    g_ScreenInfo[nScreenNum].dwInitialY = iY;

-	  }

-	}

-      else

-	{

-	  winErrorFVerb (2, "ddxProcessArgument - screen - Did not find size arg. "

-		  "dwWidth: %d dwHeight: %d\n",

-		  (int) g_ScreenInfo[nScreenNum].dwWidth,

-		  (int) g_ScreenInfo[nScreenNum].dwHeight);

-	  iArgsProcessed = 2;

-	  g_ScreenInfo[nScreenNum].fUserGaveHeightAndWidth = FALSE;

-	}

-

-      /* Calculate the screen width and height in millimeters */

-      if (g_ScreenInfo[nScreenNum].fUserGaveHeightAndWidth)

-	{

-	  g_ScreenInfo[nScreenNum].dwWidth_mm

-	    = (g_ScreenInfo[nScreenNum].dwWidth

-	       / monitorResolution) * 25.4;

-	  g_ScreenInfo[nScreenNum].dwHeight_mm

-	    = (g_ScreenInfo[nScreenNum].dwHeight

-	       / monitorResolution) * 25.4;

-	}

-

-      /* Flag that this screen was explicity specified by the user */

-      g_ScreenInfo[nScreenNum].fExplicitScreen = TRUE;

-

-      /*

-       * Keep track of the last screen number seen, as parameters seen

-       * before a screen number apply to all screens, whereas parameters

-       * seen after a screen number apply to that screen number only.

-       */

-      iLastScreen = nScreenNum;

-

-      return iArgsProcessed;

-    }

-

-

-  /*

-   * Is this parameter attached to a screen or global?

-   *

-   * If the parameter is for all screens (appears before

-   * any -screen option), store it in the default screen

-   * info

-   *

-   * If the parameter is for a single screen (appears

-   * after a -screen option), store it in the screen info

-   * for that screen

-   *

-   */

-  if (iLastScreen == -1)

-    {

-      screenInfoPtr = &defaultScreenInfo;

-    }

-  else

-    {

-      screenInfoPtr = &(g_ScreenInfo[iLastScreen]);

-    }

-

-  /*

-   * Look for the '-engine n' argument

-   */

-  if (IS_OPTION ("-engine"))

-    {

-      DWORD		dwEngine = 0;

-      CARD8		c8OnBits = 0;

-      

-      /* Display the usage message if the argument is malformed */

-      if (++i >= argc)

-	{

-	  UseMsg ();

-	  return 0;

-	}

-

-      /* Grab the argument */

-      dwEngine = atoi (argv[i]);

-

-      /* Count the one bits in the engine argument */

-      c8OnBits = winCountBits (dwEngine);

-

-      /* Argument should only have a single bit on */

-      if (c8OnBits != 1)

-	{

-	  UseMsg ();

-	  return 0;

-	}

-

-      screenInfoPtr->dwEnginePreferred = dwEngine;

-      

-      /* Indicate that we have processed the argument */

-      return 2;

-    }

-

-  /*

-   * Look for the '-fullscreen' argument

-   */

-  if (IS_OPTION ("-fullscreen"))

-    {

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

-          if (!screenInfoPtr->fMultiMonitorOverride)

-            screenInfoPtr->fMultipleMonitors = FALSE;

-#endif

-	  screenInfoPtr->fFullScreen = TRUE;

-

-      /* Indicate that we have processed this argument */

-      return 1;

-    }

-

-  /*

-   * Look for the '-lesspointer' argument

-   */

-  if (IS_OPTION ("-lesspointer"))

-    {

-      screenInfoPtr->fLessPointer = TRUE;

-

-      /* Indicate that we have processed this argument */

-      return 1;

-    }

-

-  /*

-   * Look for the '-nodecoration' argument

-   */

-  if (IS_OPTION ("-nodecoration"))

-    {

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

-      if (!screenInfoPtr->fMultiMonitorOverride)

-        screenInfoPtr->fMultipleMonitors = FALSE;

-#endif

-      screenInfoPtr->fDecoration = FALSE;

-

-      /* Indicate that we have processed this argument */

-      return 1;

-    }

-

-#ifdef XWIN_MULTIWINDOWEXTWM

-  /*

-   * Look for the '-mwextwm' argument

-   */

-  if (IS_OPTION ("-mwextwm"))

-    {

-      if (!screenInfoPtr->fMultiMonitorOverride)

-        screenInfoPtr->fMultipleMonitors = TRUE;

-      screenInfoPtr->fMWExtWM = TRUE;

-

-      /* Indicate that we have processed this argument */

-      return 1;

-    }

-  /*

-   * Look for the '-internalwm' argument

-   */

-  if (IS_OPTION ("-internalwm"))

-    {

-      if (!screenInfoPtr->fMultiMonitorOverride)

-        screenInfoPtr->fMultipleMonitors = TRUE;

-      screenInfoPtr->fMWExtWM = TRUE;

-      screenInfoPtr->fInternalWM = TRUE;

-

-      /* Indicate that we have processed this argument */

-      return 1;

-    }

-#endif

-

-  /*

-   * Look for the '-rootless' argument

-   */

-  if (IS_OPTION ("-rootless"))

-    {

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

-      if (!screenInfoPtr->fMultiMonitorOverride)

-        screenInfoPtr->fMultipleMonitors = FALSE;

-#endif

-      screenInfoPtr->fRootless = TRUE;

-

-      /* Indicate that we have processed this argument */

-      return 1;

-    }

-

-#ifdef XWIN_MULTIWINDOW

-  /*

-   * Look for the '-multiwindow' argument

-   */

-  if (IS_OPTION ("-multiwindow"))

-    {

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

-      if (!screenInfoPtr->fMultiMonitorOverride)

-        screenInfoPtr->fMultipleMonitors = TRUE;

-#endif

-      screenInfoPtr->fMultiWindow = TRUE;

-

-      /* Indicate that we have processed this argument */

-      return 1;

-    }

-#endif

-

-  /*

-   * Look for the '-multiplemonitors' argument

-   */

-  if (IS_OPTION ("-multiplemonitors")

-      || IS_OPTION ("-multimonitors"))

-    {

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

-      screenInfoPtr->fMultiMonitorOverride = TRUE;

-#endif

-      screenInfoPtr->fMultipleMonitors = TRUE;

-

-      /* Indicate that we have processed this argument */

-      return 1;

-    }

-

-  /*

-   * Look for the '-nomultiplemonitors' argument

-   */

-  if (IS_OPTION ("-nomultiplemonitors")

-      || IS_OPTION ("-nomultimonitors"))

-    {

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

-      screenInfoPtr->fMultiMonitorOverride = TRUE;

-#endif

-      screenInfoPtr->fMultipleMonitors = FALSE;

-

-      /* Indicate that we have processed this argument */

-      return 1;

-    }

-

-

-  /*

-   * Look for the '-scrollbars' argument

-   */

-  if (IS_OPTION ("-scrollbars"))

-    {

-      screenInfoPtr->fScrollbars = TRUE;

-

-      /* Indicate that we have processed this argument */

-      return 1;

-    }

-

-

-#ifdef XWIN_CLIPBOARD

-  /*

-   * Look for the '-clipboard' argument

-   */

-  if (IS_OPTION ("-clipboard"))

-    {

-      /* Now the default, we still accept the arg for backwards compatibility */

-      g_fClipboard = TRUE;

-

-      /* Indicate that we have processed this argument */

-      return 1;

-    }

-

-  /*

-   * Look for the '-noclipboard' argument

-   */

-  if (IS_OPTION ("-noclipboard"))

-    {

-      g_fClipboard = FALSE;

-

-      /* Indicate that we have processed this argument */

-      return 1;

-    }

-#endif

-

-

-  /*

-   * Look for the '-ignoreinput' argument

-   */

-  if (IS_OPTION ("-ignoreinput"))

-    {

-      screenInfoPtr->fIgnoreInput = TRUE;

-

-      /* Indicate that we have processed this argument */

-      return 1;

-    }

-

-  /*

-   * Look for the '-emulate3buttons' argument

-   */

-  if (IS_OPTION ("-emulate3buttons"))

-    {

-      int	iArgsProcessed = 1;

-      int	iE3BTimeout = WIN_DEFAULT_E3B_TIME;

-

-      /* Grab the optional timeout value */

-      if (i + 1 < argc

-	  && 1 == sscanf (argv[i + 1], "%d",

-			  &iE3BTimeout))

-        {

-	  /* Indicate that we have processed the next argument */

-	  iArgsProcessed++;

-        }

-      else

-	{

-	  /*

-	   * sscanf () won't modify iE3BTimeout if it doesn't find

-	   * the specified format; however, I want to be explicit

-	   * about setting the default timeout in such cases to

-	   * prevent some programs (me) from getting confused.

-	   */

-	  iE3BTimeout = WIN_DEFAULT_E3B_TIME;

-	}

-

-      screenInfoPtr->iE3BTimeout = iE3BTimeout;

-

-      /* Indicate that we have processed this argument */

-      return iArgsProcessed;

-    }

-

-  /*

-   * Look for the '-depth n' argument

-   */

-  if (IS_OPTION ("-depth"))

-    {

-      DWORD		dwBPP = 0;

-      

-      /* Display the usage message if the argument is malformed */

-      if (++i >= argc)

-	{

-	  UseMsg ();

-	  return 0;

-	}

-

-      /* Grab the argument */

-      dwBPP = atoi (argv[i]);

-

-      screenInfoPtr->dwBPP = dwBPP;

-

-      /* Indicate that we have processed the argument */

-      return 2;

-    }

-

-  /*

-   * Look for the '-refresh n' argument

-   */

-  if (IS_OPTION ("-refresh"))

-    {

-      DWORD		dwRefreshRate = 0;

-      

-      /* Display the usage message if the argument is malformed */

-      if (++i >= argc)

-	{

-	  UseMsg ();

-	  return 0;

-	}

-

-      /* Grab the argument */

-      dwRefreshRate = atoi (argv[i]);

-

-      screenInfoPtr->dwRefreshRate = dwRefreshRate;

-

-      /* Indicate that we have processed the argument */

-      return 2;

-    }

-

-  /*

-   * Look for the '-clipupdates num_boxes' argument

-   */

-  if (IS_OPTION ("-clipupdates"))

-    {

-      DWORD		dwNumBoxes = 0;

-      

-      /* Display the usage message if the argument is malformed */

-      if (++i >= argc)

-	{

-	  UseMsg ();

-	  return 0;

-	}

-

-      /* Grab the argument */

-      dwNumBoxes = atoi (argv[i]);

-

-      screenInfoPtr->dwClipUpdatesNBoxes = dwNumBoxes;

-

-      /* Indicate that we have processed the argument */

-      return 2;

-    }

-

-#ifdef XWIN_EMULATEPSEUDO

-  /*

-   * Look for the '-emulatepseudo' argument

-   */

-  if (IS_OPTION ("-emulatepseudo"))

-    {

-      screenInfoPtr->fEmulatePseudo = TRUE;

-

-      /* Indicate that we have processed this argument */

-      return 1;

-    }

-#endif

-

-  /*

-   * Look for the '-nowinkill' argument

-   */

-  if (IS_OPTION ("-nowinkill"))

-    {

-      screenInfoPtr->fUseWinKillKey = FALSE;

-

-      /* Indicate that we have processed this argument */

-      return 1;

-    }

-

-  /*

-   * Look for the '-winkill' argument

-   */

-  if (IS_OPTION ("-winkill"))

-    {

-      screenInfoPtr->fUseWinKillKey = TRUE;

-

-      /* Indicate that we have processed this argument */

-      return 1;

-    }

-

-  /*

-   * Look for the '-nounixkill' argument

-   */

-  if (IS_OPTION ("-nounixkill"))

-    {

-      screenInfoPtr->fUseUnixKillKey = FALSE;

-

-      /* Indicate that we have processed this argument */

-      return 1;

-    }

-

-  /*

-   * Look for the '-unixkill' argument

-   */

-  if (IS_OPTION ("-unixkill"))

-    {

-      screenInfoPtr->fUseUnixKillKey = TRUE;

-

-      /* Indicate that we have processed this argument */

-      return 1;

-    }

-

-  /*

-   * Look for the '-notrayicon' argument

-   */

-  if (IS_OPTION ("-notrayicon"))

-    {

-      screenInfoPtr->fNoTrayIcon = TRUE;

-

-      /* Indicate that we have processed this argument */

-      return 1;

-    }

-

-  /*

-   * Look for the '-trayicon' argument

-   */

-  if (IS_OPTION ("-trayicon"))

-    {

-      screenInfoPtr->fNoTrayIcon = FALSE;

-

-      /* Indicate that we have processed this argument */

-      return 1;

-    }

-

-  /*

-   * Look for the '-fp' argument

-   */

-  if (IS_OPTION ("-fp"))

-    {

-      CHECK_ARGS (1);

-      g_cmdline.fontPath = argv[++i];

-      return 0; /* Let DIX parse this again */

-    }

-

-  /*

-   * Look for the '-query' argument

-   */

-  if (IS_OPTION ("-query"))

-    {

-      CHECK_ARGS (1);

-      g_fXdmcpEnabled = TRUE;

-      g_pszQueryHost = argv[++i];

-      return 0; /* Let DIX parse this again */

-    }

-

-  /*

-   * Look for the '-auth' argument

-   */

-  if (IS_OPTION ("-auth"))

-    {

-      g_fAuthEnabled = TRUE;

-      return 0; /* Let DIX parse this again */

-    }

-

-  /*

-   * Look for the '-indirect' or '-broadcast' arguments

-   */

-  if (IS_OPTION ("-indirect")

-      || IS_OPTION ("-broadcast"))

-    {

-      g_fXdmcpEnabled = TRUE;

-      return 0; /* Let DIX parse this again */

-    }

-

-  /*

-   * Look for the '-config' argument

-   */

-  if (IS_OPTION ("-config")

-      || IS_OPTION ("-xf86config"))

-    {

-      CHECK_ARGS (1);

-#ifdef XWIN_XF86CONFIG

-      g_cmdline.configFile = argv[++i];

-#else

-      winMessageBoxF ("The %s option is not supported in this "

-		      "release.\n"

-		      "Ignoring this option and continuing.\n",

-		      MB_ICONINFORMATION,

-		      argv[i]);

-#endif

-      return 2;

-    }

-

-  /*

-   * Look for the '-configdir' argument

-   */

-  if (IS_OPTION ("-configdir"))

-    {

-      CHECK_ARGS (1);

-#ifdef XWIN_XF86CONFIG

-      g_cmdline.configDir = argv[++i];

-#else

-      winMessageBoxF ("The %s option is not supported in this "

-		      "release.\n"

-		      "Ignoring this option and continuing.\n",

-		      MB_ICONINFORMATION,

-		      argv[i]);

-#endif

-      return 2;

-    }

-

-  /*

-   * Look for the '-keyboard' argument

-   */

-  if (IS_OPTION ("-keyboard"))

-    {

-#ifdef XWIN_XF86CONFIG

-      CHECK_ARGS (1);

-      g_cmdline.keyboard = argv[++i];

-#else

-      winMessageBoxF ("The -keyboard option is not supported in this "

-		      "release.\n"

-		      "Ignoring this option and continuing.\n",

-		      MB_ICONINFORMATION);

-#endif

-      return 2;

-    }

-

-  /*

-   * Look for the '-logfile' argument

-   */

-  if (IS_OPTION ("-logfile"))

-    {

-      CHECK_ARGS (1);

-      g_pszLogFile = argv[++i];

-#ifdef RELOCATE_PROJECTROOT

-      g_fLogFileChanged = TRUE;

-#endif

-      return 2;

-    }

-

-  /*

-   * Look for the '-logverbose' argument

-   */

-  if (IS_OPTION ("-logverbose"))

-    {

-      CHECK_ARGS (1);

-      g_iLogVerbose = atoi(argv[++i]);

-      return 2;

-    }

-

-#ifdef XWIN_CLIPBOARD

-  /*

-   * Look for the '-nounicodeclipboard' argument

-   */

-  if (IS_OPTION ("-nounicodeclipboard"))

-    {

-      g_fUnicodeClipboard = FALSE;

-      /* Indicate that we have processed the argument */

-      return 1;

-    }

-#endif

-

-  if (IS_OPTION ("-xkbrules"))

-    {

-      CHECK_ARGS (1);

-      g_cmdline.xkbRules = argv[++i];

-      return 2;

-    }

-  if (IS_OPTION ("-xkbmodel"))

-    {

-      CHECK_ARGS (1);

-      g_cmdline.xkbModel = argv[++i];

-      return 2;

-    }

-  if (IS_OPTION ("-xkblayout"))

-    {

-      CHECK_ARGS (1);

-      g_cmdline.xkbLayout = argv[++i];

-      return 2;

-    }

-  if (IS_OPTION ("-xkbvariant"))

-    {

-      CHECK_ARGS (1);

-      g_cmdline.xkbVariant = argv[++i];

-      return 2;

-    }

-  if (IS_OPTION ("-xkboptions"))

-    {

-      CHECK_ARGS (1);

-      g_cmdline.xkbOptions = argv[++i];

-      return 2;

-    }

-

-  if (IS_OPTION ("-keyhook"))

-    {

-      g_fKeyboardHookLL = TRUE;

-      return 1;

-    }

-  

-  if (IS_OPTION ("-nokeyhook"))

-    {

-      g_fKeyboardHookLL = FALSE;

-      return 1;

-    }

-  

-  if (IS_OPTION ("-swcursor"))

-    {

-      g_fSoftwareCursor = TRUE;

-      return 1;

-    }

-  

-  if (IS_OPTION ("-silent-dup-error"))

-    {

-      g_fSilentDupError = TRUE;

-      return 1;

-    }

-

-  if (IS_OPTION("-wgl"))

-    {

-      g_fNativeGl = TRUE;

-      return 1;

-    }

-

-  if (IS_OPTION("-nowgl"))

-    {

-      g_fNativeGl = FALSE;

-      return 1;

-    }

-

-  return 0;

-}

-

-

-/*

- * winLogCommandLine - Write entire command line to the log file

- */

-

-void

-winLogCommandLine (int argc, char *argv[])

-{

-  int		i;

-  int		iSize = 0;

-  int		iCurrLen = 0;

-

-#define CHARS_PER_LINE 60

-

-  /* Bail if command line has already been logged */

-  if (g_pszCommandLine)

-    return;

-

-  /* Count how much memory is needed for concatenated command line */

-  for (i = 0, iCurrLen = 0; i < argc; ++i)

-    if (argv[i])

-      {

-	/* Adds two characters for lines that overflow */

-	if ((strlen (argv[i]) < CHARS_PER_LINE

-	    && iCurrLen + strlen (argv[i]) > CHARS_PER_LINE)

-	    || strlen (argv[i]) > CHARS_PER_LINE)

-	  {

-	    iCurrLen = 0;

-	    iSize += 2;

-	  }

-	

-	/* Add space for item and trailing space */

-	iSize += strlen (argv[i]) + 1;

-

-	/* Update current line length */

-	iCurrLen += strlen (argv[i]);

-      }

-

-  /* Allocate memory for concatenated command line */

-  g_pszCommandLine = malloc (iSize + 1);

-  if (!g_pszCommandLine)

-    FatalError ("winLogCommandLine - Could not allocate memory for "

-		"command line string.  Exiting.\n");

-  

-  /* Set first character to concatenated command line to null */

-  g_pszCommandLine[0] = '\0';

-

-  /* Loop through all args */

-  for (i = 0, iCurrLen = 0; i < argc; ++i)

-    {

-      /* Add a character for lines that overflow */

-      if ((strlen (argv[i]) < CHARS_PER_LINE

-	   && iCurrLen + strlen (argv[i]) > CHARS_PER_LINE)

-	  || strlen (argv[i]) > CHARS_PER_LINE)

-      {

-	iCurrLen = 0;

-	

-	/* Add line break if it fits */

-	strncat (g_pszCommandLine, "\n ", iSize - strlen (g_pszCommandLine));

-      }

-      

-      strncat (g_pszCommandLine, argv[i], iSize - strlen (g_pszCommandLine));

-      strncat (g_pszCommandLine, " ", iSize - strlen (g_pszCommandLine));

-

-      /* Save new line length */

-      iCurrLen += strlen (argv[i]);

-    }

-

-  ErrorF ("XWin was started with the following command line:\n\n"

-	  "%s\n\n", g_pszCommandLine);

-}

-

-

-/*

- * winLogVersionInfo - Log Cygwin/X version information

- */

-

-void

-winLogVersionInfo (void)

-{

-  static Bool		s_fBeenHere = FALSE;

-

-  if (s_fBeenHere)

-    return;

-  s_fBeenHere = TRUE;

-

-  ErrorF ("Welcome to the XWin X Server\n");

-  ErrorF ("Vendor: %s\n", XVENDORNAME);

-  ErrorF ("Release: %d.%d.%d.%d (%d)\n", XORG_VERSION_MAJOR, XORG_VERSION_MINOR, XORG_VERSION_PATCH, XORG_VERSION_SNAP, XORG_VERSION_CURRENT);

-  ErrorF ("%s\n\n", BUILDERSTRING);

-  ErrorF ("Contact: %s\n", BUILDERADDR);

-}

-

-/*

- * getMonitorInfo - callback function used to return information from the enumeration of monitors attached

- */

-

-wBOOL CALLBACK getMonitorInfo(HMONITOR hMonitor, HDC hdc, LPRECT rect, LPARAM _data) 

-{

-  struct GetMonitorInfoData* data = (struct GetMonitorInfoData*)_data;

-  // only get data for monitor number specified in <data>

-  data->monitorNum++;

-  if (data->monitorNum == data->requestedMonitor) 

-  {

-	data->bMonitorSpecifiedExists = TRUE;

-	data->monitorOffsetX = rect->left;

-	data->monitorOffsetY = rect->top;

-	data->monitorHeight  = rect->bottom - rect->top;

-	data->monitorWidth   = rect->right  - rect->left;

-    return FALSE;

-  }

-  return TRUE;

-}

+/*
+
+Copyright 1993, 1998  The Open Group
+Copyright (C) Colin Harrison 2005-2008
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.
+
+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 OPEN GROUP 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 Open Group 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 Open Group.
+
+*/
+
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
+
+#include <../xfree86/common/xorgVersion.h>
+#include "win.h"
+#include "winconfig.h"
+#include "winmsg.h"
+#include "winmonitors.h"
+
+/*
+ * References to external symbols
+ */
+
+#ifdef XWIN_CLIPBOARD
+extern Bool			g_fUnicodeClipboard;
+extern Bool			g_fClipboard;
+#endif
+
+/*
+ * Function prototypes
+ */
+
+void
+winLogCommandLine (int argc, char *argv[]);
+
+void
+winLogVersionInfo (void);
+
+#ifdef DDXOSVERRORF
+void OsVendorVErrorF (const char *pszFormat, va_list va_args);
+#endif
+
+/*
+ * Process arguments on the command line
+ */
+
+static int iLastScreen = -1;
+static winScreenInfo defaultScreenInfo;
+
+static void
+winInitializeScreenDefaults(void)
+{
+  DWORD dwWidth, dwHeight;
+  static Bool fInitializedScreenDefaults = FALSE;
+
+  /* Bail out early if default screen has already been initialized */
+  if (fInitializedScreenDefaults)
+    return;
+
+  /* Zero the memory used for storing the screen info */
+  memset(&defaultScreenInfo, 0, sizeof(winScreenInfo));
+
+  /* Get default width and height */
+  /*
+   * NOTE: These defaults will cause the window to cover only
+   * the primary monitor in the case that we have multiple monitors.
+   */
+  dwWidth = GetSystemMetrics (SM_CXSCREEN);
+  dwHeight = GetSystemMetrics (SM_CYSCREEN);
+
+  winErrorFVerb (2, "winInitializeScreenDefaults - w %d h %d\n",
+	  (int) dwWidth, (int) dwHeight);
+
+  /* Set a default DPI, if no parameter was passed */
+  if (monitorResolution == 0)
+    monitorResolution = WIN_DEFAULT_DPI;
+
+  defaultScreenInfo.iMonitor = 1;
+  defaultScreenInfo.dwWidth  = dwWidth;
+  defaultScreenInfo.dwHeight = dwHeight;
+  defaultScreenInfo.dwUserWidth  = dwWidth;
+  defaultScreenInfo.dwUserHeight = dwHeight;
+  defaultScreenInfo.fUserGaveHeightAndWidth = WIN_DEFAULT_USER_GAVE_HEIGHT_AND_WIDTH;
+  defaultScreenInfo.fUserGavePosition = FALSE;
+  defaultScreenInfo.dwBPP = WIN_DEFAULT_BPP;
+  defaultScreenInfo.dwClipUpdatesNBoxes = WIN_DEFAULT_CLIP_UPDATES_NBOXES;
+#ifdef XWIN_EMULATEPSEUDO
+  defaultScreenInfo.fEmulatePseudo = WIN_DEFAULT_EMULATE_PSEUDO;
+#endif
+  defaultScreenInfo.dwRefreshRate = WIN_DEFAULT_REFRESH;
+  defaultScreenInfo.pfb = NULL;
+  defaultScreenInfo.fFullScreen = FALSE;
+  defaultScreenInfo.fDecoration = TRUE;
+#ifdef XWIN_MULTIWINDOWEXTWM
+  defaultScreenInfo.fMWExtWM = FALSE;
+  defaultScreenInfo.fInternalWM = FALSE;
+#endif
+  defaultScreenInfo.fRootless = FALSE;
+#ifdef XWIN_MULTIWINDOW
+  defaultScreenInfo.fMultiWindow = FALSE;
+#endif
+#if defined(XWIN_MULTIWINDOW) || defined(XWIN_MULTIWINDOWEXTWM)
+  defaultScreenInfo.fMultiMonitorOverride = FALSE;
+#endif
+  defaultScreenInfo.fMultipleMonitors = FALSE;
+  defaultScreenInfo.fLessPointer = FALSE;
+  defaultScreenInfo.iResizeMode = notAllowed;
+  defaultScreenInfo.fNoTrayIcon = FALSE;
+  defaultScreenInfo.iE3BTimeout = WIN_E3B_OFF;
+  defaultScreenInfo.fUseWinKillKey = WIN_DEFAULT_WIN_KILL;
+  defaultScreenInfo.fUseUnixKillKey = WIN_DEFAULT_UNIX_KILL;
+  defaultScreenInfo.fIgnoreInput = FALSE;
+  defaultScreenInfo.fExplicitScreen = FALSE;
+
+  /* Note that the default screen has been initialized */
+  fInitializedScreenDefaults = TRUE;
+}
+
+static void
+winInitializeScreen(int i)
+{
+  winErrorFVerb (2, "winInitializeScreen - %d\n",i);
+
+  /* Initialize default screen values, if needed */
+  winInitializeScreenDefaults();
+
+  /* Copy the default screen info */
+  g_ScreenInfo[i] = defaultScreenInfo;
+
+  /* Set the screen number */
+  g_ScreenInfo[i].dwScreen = i;
+}
+
+void
+winInitializeScreens(int maxscreens)
+{
+  int i;
+  winErrorFVerb (2, "winInitializeScreens - %i\n", maxscreens);
+
+  if (maxscreens > g_iNumScreens)
+    {
+      /* Reallocate the memory for DDX-specific screen info */
+      g_ScreenInfo = realloc(g_ScreenInfo, maxscreens * sizeof (winScreenInfo));
+
+      /* Set default values for any new screens */
+      for (i = g_iNumScreens; i < maxscreens ; i++)
+        winInitializeScreen(i);
+
+      /* Keep a count of the number of screens */
+      g_iNumScreens = maxscreens;
+    }
+}
+
+/* See Porting Layer Definition - p. 57 */
+/*
+ * INPUT
+ * argv: pointer to an array of null-terminated strings, one for
+ *   each token in the X Server command line; the first token
+ *   is 'XWin.exe', or similar.
+ * argc: a count of the number of tokens stored in argv.
+ * i: a zero-based index into argv indicating the current token being
+ *   processed.
+ *
+ * OUTPUT
+ * return: return the number of tokens processed correctly.
+ *
+ * NOTE
+ * When looking for n tokens, check that i + n is less than argc.  Or,
+ *   you may check if i is greater than or equal to argc, in which case
+ *   you should display the UseMsg () and return 0.
+ */
+
+/* Check if enough arguments are given for the option */
+#define CHECK_ARGS(count) if (i + count >= argc) { UseMsg (); return 0; }
+
+/* Compare the current option with the string. */ 
+#define IS_OPTION(name) (strcmp (argv[i], name) == 0)
+
+int
+ddxProcessArgument (int argc, char *argv[], int i)
+{
+  static Bool		s_fBeenHere = FALSE;
+  winScreenInfo	*screenInfoPtr = NULL;
+
+  /* Initialize once */
+  if (!s_fBeenHere)
+    {
+#ifdef DDXOSVERRORF
+      /*
+       * This initialises our hook into VErrorF () for catching log messages
+       * that are generated before OsInit () is called.
+       */
+      OsVendorVErrorFProc = OsVendorVErrorF;
+#endif
+
+      s_fBeenHere = TRUE;
+
+      /* Initialize only if option is not -help */
+      if (!IS_OPTION("-help") && !IS_OPTION("-h") && !IS_OPTION("--help") &&
+          !IS_OPTION("-version") && !IS_OPTION("--version"))
+	{
+
+          /* Log the version information */
+          winLogVersionInfo ();
+
+          /* Log the command line */
+          winLogCommandLine (argc, argv);
+
+	  /*
+	   * Initialize default screen settings.  We have to do this before
+	   * OsVendorInit () gets called, otherwise we will overwrite
+	   * settings changed by parameters such as -fullscreen, etc.
+	   */
+	  winErrorFVerb (2, "ddxProcessArgument - Initializing default "
+			 "screens\n");
+	  winInitializeScreenDefaults();
+	}
+    }
+
+#if CYGDEBUG
+  winDebug ("ddxProcessArgument - arg: %s\n", argv[i]);
+#endif
+
+  /*
+   * Look for the '-help' and similar options
+   */ 
+  if (IS_OPTION ("-help") || IS_OPTION("-h") || IS_OPTION("--help"))
+    {
+      /* Reset logfile. We don't need that helpmessage in the logfile */  
+      g_pszLogFile = NULL;
+      g_fNoHelpMessageBox = TRUE;
+      UseMsg();
+      exit (0);
+      return 1;
+    }
+
+  if (IS_OPTION ("-version") || IS_OPTION("--version"))
+    {
+      /* Reset logfile. We don't need that versioninfo in the logfile */  
+      g_pszLogFile = NULL;
+      winLogVersionInfo ();
+      exit (0);
+      return 1;
+    }
+
+  /*
+   * Look for the '-screen scr_num [width height]' argument
+   */
+  if (IS_OPTION ("-screen"))
+    {
+      int		iArgsProcessed = 1;
+      int		nScreenNum;
+      int		iWidth, iHeight, iX, iY;
+      int		iMonitor;
+
+#if CYGDEBUG
+      winDebug ("ddxProcessArgument - screen - argc: %d i: %d\n",
+	      argc, i);
+#endif
+
+      /* Display the usage message if the argument is malformed */
+      if (i + 1 >= argc)
+	{
+	  return 0;
+	}
+      
+      /* Grab screen number */
+      nScreenNum = atoi (argv[i + 1]);
+
+      /* Validate the specified screen number */
+      if (nScreenNum < 0)
+        {
+          ErrorF ("ddxProcessArgument - screen - Invalid screen number %d\n",
+		  nScreenNum);
+          UseMsg ();
+	  return 0;
+        }
+
+      /*
+        Initialize default values for any new screens
+
+        Note that default values can't change after a -screen option is
+        seen, so it's safe to do this for each screen as it is introduced
+      */
+      winInitializeScreens(nScreenNum+1);
+
+	  /* look for @m where m is monitor number */
+	  if (i + 2 < argc
+		  && 1 == sscanf(argv[i + 2], "@%d", (int *) &iMonitor)) 
+      {
+        struct GetMonitorInfoData data;
+        if (!QueryMonitor(iMonitor, &data))
+        {
+            ErrorF ("ddxProcessArgument - screen - "
+                    "Querying monitors is not supported on NT4 and Win95\n");
+        } else if (data.bMonitorSpecifiedExists == TRUE) 
+        {
+		  winErrorFVerb(2, "ddxProcessArgument - screen - Found Valid ``@Monitor'' = %d arg\n", iMonitor);
+		  iArgsProcessed = 3;
+		  g_ScreenInfo[nScreenNum].fUserGaveHeightAndWidth = FALSE;
+		  g_ScreenInfo[nScreenNum].fUserGavePosition = TRUE;
+		  g_ScreenInfo[nScreenNum].iMonitor = iMonitor;
+		  g_ScreenInfo[nScreenNum].dwWidth = data.monitorWidth;
+		  g_ScreenInfo[nScreenNum].dwHeight = data.monitorHeight;
+		  g_ScreenInfo[nScreenNum].dwUserWidth = data.monitorWidth;
+		  g_ScreenInfo[nScreenNum].dwUserHeight = data.monitorHeight;
+		  g_ScreenInfo[nScreenNum].dwInitialX = data.monitorOffsetX;
+		  g_ScreenInfo[nScreenNum].dwInitialY = data.monitorOffsetY;
+		}
+		else 
+        {
+		  /* monitor does not exist, error out */
+		  ErrorF ("ddxProcessArgument - screen - Invalid monitor number %d\n",
+				  iMonitor);
+		  UseMsg ();
+		  exit (0);
+		  return 0;
+		}
+	  }
+
+      /* Look for 'WxD' or 'W D' */
+      else if (i + 2 < argc
+	  && 2 == sscanf (argv[i + 2], "%dx%d",
+			  (int *) &iWidth,
+			  (int *) &iHeight))
+	{
+	  winErrorFVerb (2, "ddxProcessArgument - screen - Found ``WxD'' arg\n");
+	  iArgsProcessed = 3;
+	  g_ScreenInfo[nScreenNum].fUserGaveHeightAndWidth = TRUE;
+	  g_ScreenInfo[nScreenNum].dwWidth = iWidth;
+	  g_ScreenInfo[nScreenNum].dwHeight = iHeight;
+	  g_ScreenInfo[nScreenNum].dwUserWidth = iWidth;
+	  g_ScreenInfo[nScreenNum].dwUserHeight = iHeight;
+	  /* Look for WxD+X+Y */
+	  if (2 == sscanf (argv[i + 2], "%*dx%*d+%d+%d",
+			   (int *) &iX,
+			   (int *) &iY))
+	  {
+	    winErrorFVerb (2, "ddxProcessArgument - screen - Found ``X+Y'' arg\n");
+	    g_ScreenInfo[nScreenNum].fUserGavePosition = TRUE;
+	    g_ScreenInfo[nScreenNum].dwInitialX = iX;
+	    g_ScreenInfo[nScreenNum].dwInitialY = iY;
+
+		/* look for WxD+X+Y@m where m is monitor number. take X,Y to be offsets from monitor's root position */
+		if (1 == sscanf (argv[i + 2], "%*dx%*d+%*d+%*d@%d",
+						 (int *) &iMonitor)) 
+        {
+          struct GetMonitorInfoData data;
+          if (!QueryMonitor(iMonitor, &data))
+          {
+              ErrorF ("ddxProcessArgument - screen - "
+                      "Querying monitors is not supported on NT4 and Win95\n");
+          } else if (data.bMonitorSpecifiedExists == TRUE) 
+          {
+			g_ScreenInfo[nScreenNum].iMonitor = iMonitor;
+			g_ScreenInfo[nScreenNum].dwInitialX += data.monitorOffsetX;
+			g_ScreenInfo[nScreenNum].dwInitialY += data.monitorOffsetY;
+		  }
+		  else 
+          {
+			/* monitor does not exist, error out */
+			ErrorF ("ddxProcessArgument - screen - Invalid monitor number %d\n",
+					iMonitor);
+			UseMsg ();
+			exit (0);
+			return 0;
+		  }
+
+		}
+	  }
+
+	  /* look for WxD@m where m is monitor number */
+	  else if (1 == sscanf(argv[i + 2], "%*dx%*d@%d",
+						   (int *) &iMonitor)) 
+      {
+        struct GetMonitorInfoData data;
+        if (!QueryMonitor(iMonitor, &data))
+        {
+		  ErrorF ("ddxProcessArgument - screen - "
+                  "Querying monitors is not supported on NT4 and Win95\n");
+        } else if (data.bMonitorSpecifiedExists == TRUE) 
+        {
+		  winErrorFVerb (2, "ddxProcessArgument - screen - Found Valid ``@Monitor'' = %d arg\n", iMonitor);
+		  g_ScreenInfo[nScreenNum].fUserGavePosition = TRUE;
+		  g_ScreenInfo[nScreenNum].iMonitor = iMonitor;
+		  g_ScreenInfo[nScreenNum].dwInitialX = data.monitorOffsetX;
+		  g_ScreenInfo[nScreenNum].dwInitialY = data.monitorOffsetY;
+		}
+		else 
+        {
+		  /* monitor does not exist, error out */
+		  ErrorF ("ddxProcessArgument - screen - Invalid monitor number %d\n",
+				  iMonitor);
+		  UseMsg ();
+		  exit (0);
+		  return 0;
+		}
+
+	  }
+	}
+      else if (i + 3 < argc
+	       && 1 == sscanf (argv[i + 2], "%d",
+			       (int *) &iWidth)
+	       && 1 == sscanf (argv[i + 3], "%d",
+			       (int *) &iHeight))
+	{
+	  winErrorFVerb (2, "ddxProcessArgument - screen - Found ``W D'' arg\n");
+	  iArgsProcessed = 4;
+	  g_ScreenInfo[nScreenNum].fUserGaveHeightAndWidth = TRUE;
+	  g_ScreenInfo[nScreenNum].dwWidth = iWidth;
+	  g_ScreenInfo[nScreenNum].dwHeight = iHeight;
+	  g_ScreenInfo[nScreenNum].dwUserWidth = iWidth;
+	  g_ScreenInfo[nScreenNum].dwUserHeight = iHeight;
+	  if (i + 5 < argc
+	      && 1 == sscanf (argv[i + 4], "%d",
+			      (int *) &iX)
+	      && 1 == sscanf (argv[i + 5], "%d",
+			      (int *) &iY))
+	  {
+	    winErrorFVerb (2, "ddxProcessArgument - screen - Found ``X Y'' arg\n");
+	    iArgsProcessed = 6;
+	    g_ScreenInfo[nScreenNum].fUserGavePosition = TRUE;
+	    g_ScreenInfo[nScreenNum].dwInitialX = iX;
+	    g_ScreenInfo[nScreenNum].dwInitialY = iY;
+	  }
+	}
+      else
+	{
+	  winErrorFVerb (2, "ddxProcessArgument - screen - Did not find size arg. "
+		  "dwWidth: %d dwHeight: %d\n",
+		  (int) g_ScreenInfo[nScreenNum].dwWidth,
+		  (int) g_ScreenInfo[nScreenNum].dwHeight);
+	  iArgsProcessed = 2;
+	  g_ScreenInfo[nScreenNum].fUserGaveHeightAndWidth = FALSE;
+	}
+
+      /* Flag that this screen was explicity specified by the user */
+      g_ScreenInfo[nScreenNum].fExplicitScreen = TRUE;
+
+      /*
+       * Keep track of the last screen number seen, as parameters seen
+       * before a screen number apply to all screens, whereas parameters
+       * seen after a screen number apply to that screen number only.
+       */
+      iLastScreen = nScreenNum;
+
+      return iArgsProcessed;
+    }
+
+
+  /*
+   * Is this parameter attached to a screen or global?
+   *
+   * If the parameter is for all screens (appears before
+   * any -screen option), store it in the default screen
+   * info
+   *
+   * If the parameter is for a single screen (appears
+   * after a -screen option), store it in the screen info
+   * for that screen
+   *
+   */
+  if (iLastScreen == -1)
+    {
+      screenInfoPtr = &defaultScreenInfo;
+    }
+  else
+    {
+      screenInfoPtr = &(g_ScreenInfo[iLastScreen]);
+    }
+
+  /*
+   * Look for the '-engine n' argument
+   */
+  if (IS_OPTION ("-engine"))
+    {
+      DWORD		dwEngine = 0;
+      CARD8		c8OnBits = 0;
+      
+      /* Display the usage message if the argument is malformed */
+      if (++i >= argc)
+	{
+	  UseMsg ();
+	  return 0;
+	}
+
+      /* Grab the argument */
+      dwEngine = atoi (argv[i]);
+
+      /* Count the one bits in the engine argument */
+      c8OnBits = winCountBits (dwEngine);
+
+      /* Argument should only have a single bit on */
+      if (c8OnBits != 1)
+	{
+	  UseMsg ();
+	  return 0;
+	}
+
+      screenInfoPtr->dwEnginePreferred = dwEngine;
+      
+      /* Indicate that we have processed the argument */
+      return 2;
+    }
+
+  /*
+   * Look for the '-fullscreen' argument
+   */
+  if (IS_OPTION ("-fullscreen"))
+    {
+#if defined(XWIN_MULTIWINDOW) || defined(XWIN_MULTIWINDOWEXTWM)
+          if (!screenInfoPtr->fMultiMonitorOverride)
+            screenInfoPtr->fMultipleMonitors = FALSE;
+#endif
+	  screenInfoPtr->fFullScreen = TRUE;
+
+      /* Indicate that we have processed this argument */
+      return 1;
+    }
+
+  /*
+   * Look for the '-lesspointer' argument
+   */
+  if (IS_OPTION ("-lesspointer"))
+    {
+      screenInfoPtr->fLessPointer = TRUE;
+
+      /* Indicate that we have processed this argument */
+      return 1;
+    }
+
+  /*
+   * Look for the '-nodecoration' argument
+   */
+  if (IS_OPTION ("-nodecoration"))
+    {
+#if defined(XWIN_MULTIWINDOW) || defined(XWIN_MULTIWINDOWEXTWM)
+      if (!screenInfoPtr->fMultiMonitorOverride)
+        screenInfoPtr->fMultipleMonitors = FALSE;
+#endif
+      screenInfoPtr->fDecoration = FALSE;
+
+      /* Indicate that we have processed this argument */
+      return 1;
+    }
+
+#ifdef XWIN_MULTIWINDOWEXTWM
+  /*
+   * Look for the '-mwextwm' argument
+   */
+  if (IS_OPTION ("-mwextwm"))
+    {
+      if (!screenInfoPtr->fMultiMonitorOverride)
+        screenInfoPtr->fMultipleMonitors = TRUE;
+      screenInfoPtr->fMWExtWM = TRUE;
+
+      /* Indicate that we have processed this argument */
+      return 1;
+    }
+  /*
+   * Look for the '-internalwm' argument
+   */
+  if (IS_OPTION ("-internalwm"))
+    {
+      if (!screenInfoPtr->fMultiMonitorOverride)
+        screenInfoPtr->fMultipleMonitors = TRUE;
+      screenInfoPtr->fMWExtWM = TRUE;
+      screenInfoPtr->fInternalWM = TRUE;
+
+      /* Indicate that we have processed this argument */
+      return 1;
+    }
+#endif
+
+  /*
+   * Look for the '-rootless' argument
+   */
+  if (IS_OPTION ("-rootless"))
+    {
+#if defined(XWIN_MULTIWINDOW) || defined(XWIN_MULTIWINDOWEXTWM)
+      if (!screenInfoPtr->fMultiMonitorOverride)
+        screenInfoPtr->fMultipleMonitors = FALSE;
+#endif
+      screenInfoPtr->fRootless = TRUE;
+
+      /* Indicate that we have processed this argument */
+      return 1;
+    }
+
+#ifdef XWIN_MULTIWINDOW
+  /*
+   * Look for the '-multiwindow' argument
+   */
+  if (IS_OPTION ("-multiwindow"))
+    {
+#if defined(XWIN_MULTIWINDOW) || defined(XWIN_MULTIWINDOWEXTWM)
+      if (!screenInfoPtr->fMultiMonitorOverride)
+        screenInfoPtr->fMultipleMonitors = TRUE;
+#endif
+      screenInfoPtr->fMultiWindow = TRUE;
+
+      /* Indicate that we have processed this argument */
+      return 1;
+    }
+#endif
+
+  /*
+   * Look for the '-multiplemonitors' argument
+   */
+  if (IS_OPTION ("-multiplemonitors")
+      || IS_OPTION ("-multimonitors"))
+    {
+#if defined(XWIN_MULTIWINDOW) || defined(XWIN_MULTIWINDOWEXTWM)
+      screenInfoPtr->fMultiMonitorOverride = TRUE;
+#endif
+      screenInfoPtr->fMultipleMonitors = TRUE;
+
+      /* Indicate that we have processed this argument */
+      return 1;
+    }
+
+  /*
+   * Look for the '-nomultiplemonitors' argument
+   */
+  if (IS_OPTION ("-nomultiplemonitors")
+      || IS_OPTION ("-nomultimonitors"))
+    {
+#if defined(XWIN_MULTIWINDOW) || defined(XWIN_MULTIWINDOWEXTWM)
+      screenInfoPtr->fMultiMonitorOverride = TRUE;
+#endif
+      screenInfoPtr->fMultipleMonitors = FALSE;
+
+      /* Indicate that we have processed this argument */
+      return 1;
+    }
+
+
+  /*
+   * Look for the '-scrollbars' argument
+   */
+  if (IS_OPTION ("-scrollbars"))
+    {
+
+      screenInfoPtr->iResizeMode = resizeWithScrollbars;
+
+      /* Indicate that we have processed this argument */
+      return 1;
+    }
+
+  /*
+   * Look for the '-resize' argument
+   */
+  if (IS_OPTION ("-resize") || IS_OPTION ("-noresize") ||
+      (strncmp(argv[i], "-resize=",strlen("-resize=")) == 0))
+    {
+      winResizeMode mode;
+
+      if (IS_OPTION ("-resize"))
+        mode = resizeWithRandr;
+      else if (IS_OPTION ("-noresize"))
+        mode = notAllowed;
+      else if (strncmp(argv[i], "-resize=",strlen("-resize=")) == 0)
+        {
+          char *option = argv[i] + strlen("-resize=");
+          if (strcmp(option, "randr") == 0)
+            mode = resizeWithRandr;
+          else if (strcmp(option, "scrollbars") == 0)
+            mode = resizeWithScrollbars;
+          else if (strcmp(option, "none") == 0)
+            mode = notAllowed;
+          else
+            {
+              ErrorF ("ddxProcessArgument - resize - Invalid resize mode %s\n", option);
+              return 0;
+            }
+        }
+      else
+        {
+          ErrorF ("ddxProcessArgument - resize - Invalid resize option %s\n", argv[i]);
+          return 0;
+        }
+
+      screenInfoPtr->iResizeMode = mode;
+
+      /* Indicate that we have processed this argument */
+      return 1;
+    }
+
+#ifdef XWIN_CLIPBOARD
+  /*
+   * Look for the '-clipboard' argument
+   */
+  if (IS_OPTION ("-clipboard"))
+    {
+      /* Now the default, we still accept the arg for backwards compatibility */
+      g_fClipboard = TRUE;
+
+      /* Indicate that we have processed this argument */
+      return 1;
+    }
+
+  /*
+   * Look for the '-noclipboard' argument
+   */
+  if (IS_OPTION ("-noclipboard"))
+    {
+      g_fClipboard = FALSE;
+
+      /* Indicate that we have processed this argument */
+      return 1;
+    }
+#endif
+
+
+  /*
+   * Look for the '-ignoreinput' argument
+   */
+  if (IS_OPTION ("-ignoreinput"))
+    {
+      screenInfoPtr->fIgnoreInput = TRUE;
+
+      /* Indicate that we have processed this argument */
+      return 1;
+    }
+
+  /*
+   * Look for the '-emulate3buttons' argument
+   */
+  if (IS_OPTION ("-emulate3buttons"))
+    {
+      int	iArgsProcessed = 1;
+      int	iE3BTimeout = WIN_DEFAULT_E3B_TIME;
+
+      /* Grab the optional timeout value */
+      if (i + 1 < argc
+	  && 1 == sscanf (argv[i + 1], "%d",
+			  &iE3BTimeout))
+        {
+	  /* Indicate that we have processed the next argument */
+	  iArgsProcessed++;
+        }
+      else
+	{
+	  /*
+	   * sscanf () won't modify iE3BTimeout if it doesn't find
+	   * the specified format; however, I want to be explicit
+	   * about setting the default timeout in such cases to
+	   * prevent some programs (me) from getting confused.
+	   */
+	  iE3BTimeout = WIN_DEFAULT_E3B_TIME;
+	}
+
+      screenInfoPtr->iE3BTimeout = iE3BTimeout;
+
+      /* Indicate that we have processed this argument */
+      return iArgsProcessed;
+    }
+
+  /*
+   * Look for the '-depth n' argument
+   */
+  if (IS_OPTION ("-depth"))
+    {
+      DWORD		dwBPP = 0;
+      
+      /* Display the usage message if the argument is malformed */
+      if (++i >= argc)
+	{
+	  UseMsg ();
+	  return 0;
+	}
+
+      /* Grab the argument */
+      dwBPP = atoi (argv[i]);
+
+      screenInfoPtr->dwBPP = dwBPP;
+
+      /* Indicate that we have processed the argument */
+      return 2;
+    }
+
+  /*
+   * Look for the '-refresh n' argument
+   */
+  if (IS_OPTION ("-refresh"))
+    {
+      DWORD		dwRefreshRate = 0;
+      
+      /* Display the usage message if the argument is malformed */
+      if (++i >= argc)
+	{
+	  UseMsg ();
+	  return 0;
+	}
+
+      /* Grab the argument */
+      dwRefreshRate = atoi (argv[i]);
+
+      screenInfoPtr->dwRefreshRate = dwRefreshRate;
+
+      /* Indicate that we have processed the argument */
+      return 2;
+    }
+
+  /*
+   * Look for the '-clipupdates num_boxes' argument
+   */
+  if (IS_OPTION ("-clipupdates"))
+    {
+      DWORD		dwNumBoxes = 0;
+      
+      /* Display the usage message if the argument is malformed */
+      if (++i >= argc)
+	{
+	  UseMsg ();
+	  return 0;
+	}
+
+      /* Grab the argument */
+      dwNumBoxes = atoi (argv[i]);
+
+      screenInfoPtr->dwClipUpdatesNBoxes = dwNumBoxes;
+
+      /* Indicate that we have processed the argument */
+      return 2;
+    }
+
+#ifdef XWIN_EMULATEPSEUDO
+  /*
+   * Look for the '-emulatepseudo' argument
+   */
+  if (IS_OPTION ("-emulatepseudo"))
+    {
+      screenInfoPtr->fEmulatePseudo = TRUE;
+
+      /* Indicate that we have processed this argument */
+      return 1;
+    }
+#endif
+
+  /*
+   * Look for the '-nowinkill' argument
+   */
+  if (IS_OPTION ("-nowinkill"))
+    {
+      screenInfoPtr->fUseWinKillKey = FALSE;
+
+      /* Indicate that we have processed this argument */
+      return 1;
+    }
+
+  /*
+   * Look for the '-winkill' argument
+   */
+  if (IS_OPTION ("-winkill"))
+    {
+      screenInfoPtr->fUseWinKillKey = TRUE;
+
+      /* Indicate that we have processed this argument */
+      return 1;
+    }
+
+  /*
+   * Look for the '-nounixkill' argument
+   */
+  if (IS_OPTION ("-nounixkill"))
+    {
+      screenInfoPtr->fUseUnixKillKey = FALSE;
+
+      /* Indicate that we have processed this argument */
+      return 1;
+    }
+
+  /*
+   * Look for the '-unixkill' argument
+   */
+  if (IS_OPTION ("-unixkill"))
+    {
+      screenInfoPtr->fUseUnixKillKey = TRUE;
+
+      /* Indicate that we have processed this argument */
+      return 1;
+    }
+
+  /*
+   * Look for the '-notrayicon' argument
+   */
+  if (IS_OPTION ("-notrayicon"))
+    {
+      screenInfoPtr->fNoTrayIcon = TRUE;
+
+      /* Indicate that we have processed this argument */
+      return 1;
+    }
+
+  /*
+   * Look for the '-trayicon' argument
+   */
+  if (IS_OPTION ("-trayicon"))
+    {
+      screenInfoPtr->fNoTrayIcon = FALSE;
+
+      /* Indicate that we have processed this argument */
+      return 1;
+    }
+
+  /*
+   * Look for the '-fp' argument
+   */
+  if (IS_OPTION ("-fp"))
+    {
+      CHECK_ARGS (1);
+      g_cmdline.fontPath = argv[++i];
+      return 0; /* Let DIX parse this again */
+    }
+
+  /*
+   * Look for the '-query' argument
+   */
+  if (IS_OPTION ("-query"))
+    {
+      CHECK_ARGS (1);
+      g_fXdmcpEnabled = TRUE;
+      g_pszQueryHost = argv[++i];
+      return 0; /* Let DIX parse this again */
+    }
+
+  /*
+   * Look for the '-auth' argument
+   */
+  if (IS_OPTION ("-auth"))
+    {
+      g_fAuthEnabled = TRUE;
+      return 0; /* Let DIX parse this again */
+    }
+
+  /*
+   * Look for the '-indirect' or '-broadcast' arguments
+   */
+  if (IS_OPTION ("-indirect")
+      || IS_OPTION ("-broadcast"))
+    {
+      g_fXdmcpEnabled = TRUE;
+      return 0; /* Let DIX parse this again */
+    }
+
+  /*
+   * Look for the '-config' argument
+   */
+  if (IS_OPTION ("-config")
+      || IS_OPTION ("-xf86config"))
+    {
+      CHECK_ARGS (1);
+#ifdef XWIN_XF86CONFIG
+      g_cmdline.configFile = argv[++i];
+#else
+      winMessageBoxF ("The %s option is not supported in this "
+		      "release.\n"
+		      "Ignoring this option and continuing.\n",
+		      MB_ICONINFORMATION,
+		      argv[i]);
+#endif
+      return 2;
+    }
+
+  /*
+   * Look for the '-configdir' argument
+   */
+  if (IS_OPTION ("-configdir"))
+    {
+      CHECK_ARGS (1);
+#ifdef XWIN_XF86CONFIG
+      g_cmdline.configDir = argv[++i];
+#else
+      winMessageBoxF ("The %s option is not supported in this "
+		      "release.\n"
+		      "Ignoring this option and continuing.\n",
+		      MB_ICONINFORMATION,
+		      argv[i]);
+#endif
+      return 2;
+    }
+
+  /*
+   * Look for the '-keyboard' argument
+   */
+  if (IS_OPTION ("-keyboard"))
+    {
+#ifdef XWIN_XF86CONFIG
+      CHECK_ARGS (1);
+      g_cmdline.keyboard = argv[++i];
+#else
+      winMessageBoxF ("The -keyboard option is not supported in this "
+		      "release.\n"
+		      "Ignoring this option and continuing.\n",
+		      MB_ICONINFORMATION);
+#endif
+      return 2;
+    }
+
+  /*
+   * Look for the '-logfile' argument
+   */
+  if (IS_OPTION ("-logfile"))
+    {
+      CHECK_ARGS (1);
+      g_pszLogFile = argv[++i];
+#ifdef RELOCATE_PROJECTROOT
+      g_fLogFileChanged = TRUE;
+#endif
+      return 2;
+    }
+
+  /*
+   * Look for the '-logverbose' argument
+   */
+  if (IS_OPTION ("-logverbose"))
+    {
+      CHECK_ARGS (1);
+      g_iLogVerbose = atoi(argv[++i]);
+      return 2;
+    }
+
+#ifdef XWIN_CLIPBOARD
+  /*
+   * Look for the '-nounicodeclipboard' argument
+   */
+  if (IS_OPTION ("-nounicodeclipboard"))
+    {
+      g_fUnicodeClipboard = FALSE;
+      /* Indicate that we have processed the argument */
+      return 1;
+    }
+#endif
+
+  if (IS_OPTION ("-xkbrules"))
+    {
+      CHECK_ARGS (1);
+      g_cmdline.xkbRules = argv[++i];
+      return 2;
+    }
+  if (IS_OPTION ("-xkbmodel"))
+    {
+      CHECK_ARGS (1);
+      g_cmdline.xkbModel = argv[++i];
+      return 2;
+    }
+  if (IS_OPTION ("-xkblayout"))
+    {
+      CHECK_ARGS (1);
+      g_cmdline.xkbLayout = argv[++i];
+      return 2;
+    }
+  if (IS_OPTION ("-xkbvariant"))
+    {
+      CHECK_ARGS (1);
+      g_cmdline.xkbVariant = argv[++i];
+      return 2;
+    }
+  if (IS_OPTION ("-xkboptions"))
+    {
+      CHECK_ARGS (1);
+      g_cmdline.xkbOptions = argv[++i];
+      return 2;
+    }
+
+  if (IS_OPTION ("-keyhook"))
+    {
+      g_fKeyboardHookLL = TRUE;
+      return 1;
+    }
+  
+  if (IS_OPTION ("-nokeyhook"))
+    {
+      g_fKeyboardHookLL = FALSE;
+      return 1;
+    }
+  
+  if (IS_OPTION ("-swcursor"))
+    {
+      g_fSoftwareCursor = TRUE;
+      return 1;
+    }
+  
+  if (IS_OPTION ("-silent-dup-error"))
+    {
+      g_fSilentDupError = TRUE;
+      return 1;
+    }
+
+  if (IS_OPTION("-wgl"))
+    {
+      g_fNativeGl = TRUE;
+      return 1;
+    }
+
+  if (IS_OPTION("-nowgl"))
+    {
+      g_fNativeGl = FALSE;
+      return 1;
+    }
+
+  return 0;
+}
+
+
+/*
+ * winLogCommandLine - Write entire command line to the log file
+ */
+
+void
+winLogCommandLine (int argc, char *argv[])
+{
+  int		i;
+  int		iSize = 0;
+  int		iCurrLen = 0;
+
+#define CHARS_PER_LINE 60
+
+  /* Bail if command line has already been logged */
+  if (g_pszCommandLine)
+    return;
+
+  /* Count how much memory is needed for concatenated command line */
+  for (i = 0, iCurrLen = 0; i < argc; ++i)
+    if (argv[i])
+      {
+	/* Adds two characters for lines that overflow */
+	if ((strlen (argv[i]) < CHARS_PER_LINE
+	    && iCurrLen + strlen (argv[i]) > CHARS_PER_LINE)
+	    || strlen (argv[i]) > CHARS_PER_LINE)
+	  {
+	    iCurrLen = 0;
+	    iSize += 2;
+	  }
+	
+	/* Add space for item and trailing space */
+	iSize += strlen (argv[i]) + 1;
+
+	/* Update current line length */
+	iCurrLen += strlen (argv[i]);
+      }
+
+  /* Allocate memory for concatenated command line */
+  g_pszCommandLine = malloc (iSize + 1);
+  if (!g_pszCommandLine)
+    FatalError ("winLogCommandLine - Could not allocate memory for "
+		"command line string.  Exiting.\n");
+  
+  /* Set first character to concatenated command line to null */
+  g_pszCommandLine[0] = '\0';
+
+  /* Loop through all args */
+  for (i = 0, iCurrLen = 0; i < argc; ++i)
+    {
+      /* Add a character for lines that overflow */
+      if ((strlen (argv[i]) < CHARS_PER_LINE
+	   && iCurrLen + strlen (argv[i]) > CHARS_PER_LINE)
+	  || strlen (argv[i]) > CHARS_PER_LINE)
+      {
+	iCurrLen = 0;
+	
+	/* Add line break if it fits */
+	strncat (g_pszCommandLine, "\n ", iSize - strlen (g_pszCommandLine));
+      }
+      
+      strncat (g_pszCommandLine, argv[i], iSize - strlen (g_pszCommandLine));
+      strncat (g_pszCommandLine, " ", iSize - strlen (g_pszCommandLine));
+
+      /* Save new line length */
+      iCurrLen += strlen (argv[i]);
+    }
+
+  ErrorF ("XWin was started with the following command line:\n\n"
+	  "%s\n\n", g_pszCommandLine);
+}
+
+
+/*
+ * winLogVersionInfo - Log Cygwin/X version information
+ */
+
+void
+winLogVersionInfo (void)
+{
+  static Bool		s_fBeenHere = FALSE;
+
+  if (s_fBeenHere)
+    return;
+  s_fBeenHere = TRUE;
+
+  ErrorF ("Welcome to the XWin X Server\n");
+  ErrorF ("Vendor: %s\n", XVENDORNAME);
+  ErrorF ("Release: %d.%d.%d.%d (%d)\n", XORG_VERSION_MAJOR, XORG_VERSION_MINOR, XORG_VERSION_PATCH, XORG_VERSION_SNAP, XORG_VERSION_CURRENT);
+  ErrorF ("%s\n\n", BUILDERSTRING);
+  ErrorF ("Contact: %s\n", BUILDERADDR);
+}
diff --git a/xorg-server/hw/xwin/winrandr.c b/xorg-server/hw/xwin/winrandr.c
index 7b5b1359c..248404800 100644
--- a/xorg-server/hw/xwin/winrandr.c
+++ b/xorg-server/hw/xwin/winrandr.c
@@ -1,8 +1,9 @@
 /*
  *Copyright (C) 2001-2004 Harold L Hunt II All Rights Reserved.
+ *Copyright (C) 2009-2010 Jon TURNEY
  *
  *Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
+ *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
@@ -20,101 +21,280 @@
  *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 Harold L Hunt II
+ *Except as contained in this notice, the name of the author(s)
  *shall not be used in advertising or otherwise to promote the sale, use
  *or other dealings in this Software without prior written authorization
- *from Harold L Hunt II.
+ *from the author(s)
  *
  * Authors:	Harold L Hunt II
+ *              Jon TURNEY
  */
 
 #ifdef HAVE_XWIN_CONFIG_H
 #include <xwin-config.h>
 #endif
 #include "win.h"
+#include "mivalidate.h" // for union _Validate used by windowstr.h
+
+#ifndef RANDR_12_INTERFACE
+#error X server must have RandR 1.2 interface
+#endif
 
 
 /*
- * Local prototypes
+ * Answer queries about the RandR features supported.
  */
 
 static Bool
-winRandRGetInfo (ScreenPtr pScreen, Rotation *pRotations);
+winRandRGetInfo (ScreenPtr pScreen, Rotation *pRotations)
+{
+  winDebug ("winRandRGetInfo ()\n");
 
-static Bool
-winRandRSetConfig (ScreenPtr		pScreen,
-		   Rotation		rotateKind,
-		   int			rate,
-		   RRScreenSizePtr	pSize);
+  /* Don't support rotations */
+  *pRotations = RR_Rotate_0;
 
-Bool
-winRandRInit (ScreenPtr pScreen);
+  /*
+    The screen doesn't have to be limited to the actual
+    monitor size (we can have scrollbars :-), so what is
+    the upper limit?
+  */
+  RRScreenSetSizeRange(pScreen, 0, 0, 4096, 4096);
+
+  return TRUE;
+}
 
 
 /*
- * Answer queries about the RandR features supported.
+  Copied from the xfree86 DDX
+
+  Why can't this be in DIX?
+  Does union _Validate vary depending on DDX??
  */
+static void
+xf86SetRootClip (ScreenPtr pScreen, Bool enable)
+{
+    WindowPtr	pWin = pScreen->root;
+    WindowPtr	pChild;
+    Bool	WasViewable = (Bool)(pWin->viewable);
+    Bool	anyMarked = FALSE;
+    WindowPtr   pLayerWin;
+    BoxRec	box;
 
-static Bool
-winRandRGetInfo (ScreenPtr pScreen, Rotation *pRotations)
+    if (WasViewable)
+    {
+	for (pChild = pWin->firstChild; pChild; pChild = pChild->nextSib)
+	{
+	    (void) (*pScreen->MarkOverlappedWindows)(pChild,
+						     pChild,
+						     &pLayerWin);
+	}
+	(*pScreen->MarkWindow) (pWin);
+	anyMarked = TRUE;
+	if (pWin->valdata)
+	{
+	    if (HasBorder (pWin))
+	    {
+		RegionPtr	borderVisible;
+
+		borderVisible = REGION_CREATE(pScreen, NullBox, 1);
+		REGION_SUBTRACT(pScreen, borderVisible,
+				&pWin->borderClip, &pWin->winSize);
+		pWin->valdata->before.borderVisible = borderVisible;
+	    }
+	    pWin->valdata->before.resized = TRUE;
+	}
+    }
+
+    /*
+     * Use REGION_BREAK to avoid optimizations in ValidateTree
+     * that assume the root borderClip can't change well, normally
+     * it doesn't...)
+     */
+    if (enable)
+    {
+	box.x1 = 0;
+	box.y1 = 0;
+	box.x2 = pScreen->width;
+	box.y2 = pScreen->height;
+	REGION_INIT (pScreen, &pWin->winSize, &box, 1);
+	REGION_INIT (pScreen, &pWin->borderSize, &box, 1);
+	if (WasViewable)
+	    REGION_RESET(pScreen, &pWin->borderClip, &box);
+	pWin->drawable.width = pScreen->width;
+	pWin->drawable.height = pScreen->height;
+        REGION_BREAK (pWin->drawable.pScreen, &pWin->clipList);
+    }
+    else
+    {
+	REGION_EMPTY(pScreen, &pWin->borderClip);
+	REGION_BREAK (pWin->drawable.pScreen, &pWin->clipList);
+    }
+
+    ResizeChildrenWinSize (pWin, 0, 0, 0, 0);
+
+    if (WasViewable)
+    {
+	if (pWin->firstChild)
+	{
+	    anyMarked |= (*pScreen->MarkOverlappedWindows)(pWin->firstChild,
+							   pWin->firstChild,
+							   (WindowPtr *)NULL);
+	}
+	else
+	{
+	    (*pScreen->MarkWindow) (pWin);
+	    anyMarked = TRUE;
+	}
+
+
+	if (anyMarked)
+	    (*pScreen->ValidateTree)(pWin, NullWindow, VTOther);
+    }
+
+    if (WasViewable)
+    {
+	if (anyMarked)
+	    (*pScreen->HandleExposures)(pWin);
+	if (anyMarked && pScreen->PostValidateTree)
+	    (*pScreen->PostValidateTree)(pWin, NullWindow, VTOther);
+    }
+    if (pWin->realized)
+	WindowsRestructured ();
+    FlushAllOutput ();
+}
+
+/*
+
+*/
+void
+winDoRandRScreenSetSize (ScreenPtr  pScreen,
+                         CARD16	    width,
+                         CARD16	    height,
+                         CARD32	    mmWidth,
+                         CARD32	    mmHeight)
 {
   winScreenPriv(pScreen);
-  winScreenInfo			*pScreenInfo = pScreenPriv->pScreenInfo;
-  int				n;
-  Rotation			rotateKind;
-  RRScreenSizePtr		pSize;
+  winScreenInfo *pScreenInfo = pScreenPriv->pScreenInfo;
+  WindowPtr pRoot = pScreen->root;
 
-  winDebug ("winRandRGetInfo ()\n");
+  // Prevent screen updates while we change things around
+  xf86SetRootClip(pScreen, FALSE);
 
-  /* Don't support rotations, yet */
-  *pRotations = RR_Rotate_0;
+  /* Update the screen size as requested */
+  pScreenInfo->dwWidth = width;
+  pScreenInfo->dwHeight = height;
 
-  /* Bail if no depth has a visual associated with it */
-  for (n = 0; n < pScreen->numDepths; n++)
-    if (pScreen->allowedDepths[n].numVids)
-      break;
-  if (n == pScreen->numDepths)
-    return FALSE;
+  /* Reallocate the framebuffer used by the drawing engine */
+  (*pScreenPriv->pwinFreeFB)(pScreen);
+  if (!(*pScreenPriv->pwinAllocateFB)(pScreen))
+    {
+      ErrorF ("winDoRandRScreenSetSize - Could not reallocate framebuffer\n");
+    }
 
-  /* Only one allowed rotation for now */
-  rotateKind = RR_Rotate_0;
+  pScreen->width = width;
+  pScreen->height = height;
+  pScreen->mmWidth = mmWidth;
+  pScreen->mmHeight = mmHeight;
 
-  /*
-   * Register supported sizes.  This can be called many times, but
-   * we only support one size for now.
-   */
-  pSize = RRRegisterSize (pScreen,
-			  pScreenInfo->dwWidth,
-			  pScreenInfo->dwHeight,
-			  pScreenInfo->dwWidth_mm,
-			  pScreenInfo->dwHeight_mm);
-
-  /* Tell RandR what the current config is */
-  RRSetCurrentConfig (pScreen,
-		      rotateKind,
-		      0, /* refresh rate, not needed */
-		      pSize);
-  
-  return TRUE;
-}
+  /* Update the screen pixmap to point to the new framebuffer */
+  winUpdateFBPointer(pScreen, pScreenInfo->pfb);
+
+  // pScreen->devPrivate == pScreen->GetScreenPixmap(screen) ?
+  // resize the root window
+  //pScreen->ResizeWindow(pRoot, 0, 0, width, height, NULL);
+  // does this emit a ConfigureNotify??
 
+  // Restore the ability to update screen, now with new dimensions
+  xf86SetRootClip(pScreen, TRUE);
+
+  // and arrange for it to be repainted
+  miPaintWindow(pRoot, &pRoot->borderClip,  PW_BACKGROUND);
+
+  /* Indicate that a screen size change took place */
+  RRScreenSizeNotify(pScreen);
+}
 
 /*
- * Respond to resize/rotate request from either X Server or X client app
+ * Respond to resize request
  */
-
-static Bool
-winRandRSetConfig (ScreenPtr		pScreen,
-		   Rotation		rotateKind,
-		   int			rate,
-		   RRScreenSizePtr	pSize)
+static
+Bool
+winRandRScreenSetSize (ScreenPtr  pScreen,
+		       CARD16	    width,
+		       CARD16	    height,
+		       CARD16       pixWidth,
+		       CARD16       pixHeight,
+		       CARD32	    mmWidth,
+		       CARD32	    mmHeight)
 {
-  winDebug ("winRandRSetConfig ()\n");
+  winScreenPriv(pScreen);
+  winScreenInfo *pScreenInfo = pScreenPriv->pScreenInfo;
+
+  winDebug ("winRandRScreenSetSize ()\n");
+
+  /*
+    It doesn't currently make sense to allow resize in fullscreen mode
+    (we'd actually have to list the supported resolutions)
+  */
+  if (pScreenInfo->fFullScreen)
+    {
+      ErrorF ("winRandRScreenSetSize - resize not supported in fullscreen mode\n");
+      return FALSE;
+    }
+
+  /*
+    Client resize requests aren't allowed in rootless modes, even if
+    the X screen is monitor or virtual desktop size, we'd need to
+    resize the native display size
+  */
+  if (FALSE
+#ifdef XWIN_MULTIWINDOWEXTWM
+      || pScreenInfo->fMWExtWM
+#endif
+      || pScreenInfo->fRootless
+#ifdef XWIN_MULTIWINDOW
+      || pScreenInfo->fMultiWindow
+#endif
+      )
+    {
+      ErrorF ("winRandRScreenSetSize - resize not supported in rootless modes\n");
+      return FALSE;
+    }
+
+  winDoRandRScreenSetSize(pScreen, width, height, mmWidth, mmHeight);
+
+  /* Cause the native window for the screen to resize itself */
+  {
+    DWORD dwStyle, dwExStyle;
+    RECT rcClient;
+
+    rcClient.left = 0;
+    rcClient.top = 0;
+    rcClient.right = width;
+    rcClient.bottom = height;
+
+    ErrorF ("winRandRScreenSetSize new client area w: %d h: %d\n", width, height);
+
+    /* Get the Windows window style and extended style */
+    dwExStyle = GetWindowLongPtr(pScreenPriv->hwndScreen, GWL_EXSTYLE);
+    dwStyle = GetWindowLongPtr(pScreenPriv->hwndScreen, GWL_STYLE);
+
+    /*
+     * Calculate the window size needed for the given client area
+     * adjusting for any decorations it will have
+     */
+    AdjustWindowRectEx(&rcClient, dwStyle, FALSE, dwExStyle);
+
+    ErrorF ("winRandRScreenSetSize new window area w: %ld h: %ld\n", rcClient.right-rcClient.left, rcClient.bottom-rcClient.top);
+
+    SetWindowPos(pScreenPriv->hwndScreen, NULL,
+                 0, 0, rcClient.right-rcClient.left, rcClient.bottom-rcClient.top,
+                 SWP_NOZORDER | SWP_NOMOVE);
+  }
 
   return TRUE;
 }
 
-
 /*
  * Initialize the RandR layer.
  */
@@ -122,8 +302,7 @@ winRandRSetConfig (ScreenPtr		pScreen,
 Bool
 winRandRInit (ScreenPtr pScreen)
 {
-  rrScrPrivPtr		pRRScrPriv;
-
+  rrScrPrivPtr pRRScrPriv;
   winDebug ("winRandRInit ()\n");
 
   if (!RRScreenInit (pScreen))
@@ -135,7 +314,10 @@ winRandRInit (ScreenPtr pScreen)
   /* Set some RandR function pointers */
   pRRScrPriv = rrGetScrPriv (pScreen);
   pRRScrPriv->rrGetInfo = winRandRGetInfo;
-  pRRScrPriv->rrSetConfig = winRandRSetConfig;
+  pRRScrPriv->rrSetConfig = NULL;
+  pRRScrPriv->rrScreenSetSize = winRandRScreenSetSize;
+  pRRScrPriv->rrCrtcSet = NULL;
+  pRRScrPriv->rrCrtcSetGamma = NULL;
 
   return TRUE;
 }
diff --git a/xorg-server/hw/xwin/winscrinit.c b/xorg-server/hw/xwin/winscrinit.c
index f067fde6a..691237e6f 100644
--- a/xorg-server/hw/xwin/winscrinit.c
+++ b/xorg-server/hw/xwin/winscrinit.c
@@ -1,767 +1,769 @@
-/*

- *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,

-  winMWExtWMDamageRects,

-  winMWExtWMRootlessSwitchWindow,

-  NULL,//winMWExtWMDoReorderWindow,

-  NULL,//winMWExtWMHideWindow,

-  NULL,//winMWExtWMUpdateColorMap,

-

-  NULL,//winMWExtWMCopyBytes,

-  winMWExtWMCopyWindow

-};

-#endif

-

-/*

- * 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;

-

-#if CYGDEBUG || YES

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

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

-#endif

-

-  /* 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) (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) (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

-       * winInitializeScreenDefaults() 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) (index, pScreen, argc, argv)))

-    {

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

-      return FALSE;

-    }

-

-  if (!g_fSoftwareCursor)

-    winInitCursor(pScreen);

-  else

-    winErrorFVerb(2, "winScreenInit - Using software cursor\n");  

-

-  /*

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

-     of the native virtual desktop area

-  */

-  pScreen->x = pScreenInfo->dwInitialX - GetSystemMetrics(SM_XVIRTUALSCREEN);

-  pScreen->y = pScreenInfo->dwInitialY - GetSystemMetrics(SM_YVIRTUALSCREEN);

-

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

-         index, pScreen->x, pScreen->y);

-

-#if CYGDEBUG || YES

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

-#endif

-

-  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);

-  

-  winErrorFVerb (2, "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

-

-  /* Setup the cursor routines */

-#if CYGDEBUG

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

-#endif

-  miDCInitialize (pScreen, &g_winPointerCursorFuncs);

-

-  /* KDrive does winCreateDefColormap right after miDCInitialize */

-  /* Create a default colormap */

-#if CYGDEBUG

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

-#endif

-  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

-      )

-    {

-#if CYGDEBUG

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

-#endif

-      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;

-      /* 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

-      )

-    { 

-#if CYGDEBUG || YES

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

-#endif

-

-      /* 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;

-

-#if CYGDEBUG || YES

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

-#endif

-

-  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;

-

-  ErrorF ("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;

-    }

-

-  ErrorF ("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;

-

-  ErrorF ("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,
+  winMWExtWMDamageRects,
+  winMWExtWMRootlessSwitchWindow,
+  NULL,//winMWExtWMDoReorderWindow,
+  NULL,//winMWExtWMHideWindow,
+  NULL,//winMWExtWMUpdateColorMap,
+
+  NULL,//winMWExtWMCopyBytes,
+  winMWExtWMCopyWindow
+};
+#endif
+
+/*
+ * Prototypes
+ */
+
+/*
+ * 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;
+  DWORD dwInitialBPP;
+
+#if CYGDEBUG || YES
+  winDebug ("winScreenInit - dwWidth: %ld dwHeight: %ld\n",
+	  pScreenInfo->dwWidth, pScreenInfo->dwHeight);
+#endif
+
+  /* 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;
+    }
+
+  /* Horribly misnamed function: Allow engine to adjust BPP for screen */
+  dwInitialBPP = pScreenInfo->dwBPP;
+
+  if (!(*pScreenPriv->pwinAdjustVideoMode) (pScreen))
+    {
+      ErrorF ("winScreenInit - winAdjustVideoMode () failed\n");
+      return FALSE;
+    }
+
+  if (dwInitialBPP == WIN_DEFAULT_BPP)
+    {
+      /* No -depth parameter was passed, let the user know the depth being used */
+      ErrorF ("winScreenInit - Using Windows display depth of %d bits per pixel\n", (int) pScreenInfo->dwBPP);
+    }
+  else if (dwInitialBPP != pScreenInfo->dwBPP)
+    {
+      /* Warn user if engine forced a depth different to -depth parameter */
+      ErrorF ("winScreenInit - Command line depth of %d bpp overidden by engine, using %d bpp\n", (int) dwInitialBPP, (int) pScreenInfo->dwBPP);
+    }
+  else
+    {
+      ErrorF ("winScreenInit - Using command line depth of %d bpp\n", (int) pScreenInfo->dwBPP);
+    }
+
+  /* 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");
+      if (pScreenInfo->dwEngine == WIN_SERVER_SHADOW_GDI)
+        {
+          ErrorF ("winScreenInit - Performance may suffer off primary display.\n");
+        }
+      else
+        {
+          ErrorF ("winScreenInit - Using primary display only.\n");
+          pScreenInfo->fMultipleMonitors = FALSE;
+        }
+    }
+
+  /* Create display window */
+  if (!(*pScreenPriv->pwinCreateBoundingWindow) (pScreen))
+    {
+      ErrorF ("winScreenInit - pwinCreateBoundingWindow () "
+	      "failed\n");
+      return FALSE;
+    }
+
+  /* Get a device context */
+  hdc = GetDC (pScreenPriv->hwndScreen);
+
+  /* Are we using multiple monitors? */
+  if (pScreenInfo->fMultipleMonitors)
+    {
+      /* 
+       * In this case, some of the defaults set in
+       * winInitializeScreenDefaults() are not correct ...
+       */
+      if (!pScreenInfo->fUserGaveHeightAndWidth)
+	{
+	  pScreenInfo->dwWidth = GetSystemMetrics (SM_CXVIRTUALSCREEN);
+	  pScreenInfo->dwHeight = GetSystemMetrics (SM_CYVIRTUALSCREEN);
+	}
+    }
+
+  /* Release the device context */
+  ReleaseDC (pScreenPriv->hwndScreen, hdc);
+    
+  /* Clear the visuals list */
+  miClearVisualTypes ();
+
+  /* Call the engine dependent screen initialization procedure */
+  if (!((*pScreenPriv->pwinFinishScreenInit) (index, pScreen, argc, argv)))
+    {
+      ErrorF ("winScreenInit - winFinishScreenInit () failed\n");
+      return FALSE;
+    }
+
+  if (!g_fSoftwareCursor)
+    winInitCursor(pScreen);
+  else
+    winErrorFVerb(2, "winScreenInit - Using software cursor\n");  
+
+  /*
+     Note the screen origin in a normalized coordinate space where (0,0) is at the top left
+     of the native virtual desktop area
+  */
+  pScreen->x = pScreenInfo->dwInitialX - GetSystemMetrics(SM_XVIRTUALSCREEN);
+  pScreen->y = pScreenInfo->dwInitialY - GetSystemMetrics(SM_YVIRTUALSCREEN);
+
+  ErrorF("Screen %d added at virtual desktop coordinate (%d,%d).\n",
+         index, pScreen->x, pScreen->y);
+
+#if CYGDEBUG || YES
+  winDebug ("winScreenInit - returning\n");
+#endif
+
+  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->pwinInitScreen) (pScreen))
+    {
+      ErrorF ("winFinishScreenInitFB - Could not allocate framebuffer\n");
+      return FALSE;
+    }
+
+  /*
+   * Calculate the number of bits that are used to represent color in each pixel,
+   * the color depth for the screen
+   */
+  if (pScreenInfo->dwBPP == 8)
+    pScreenInfo->dwDepth = 8;
+  else
+    pScreenInfo->dwDepth = winCountBits (pScreenPriv->dwRedMask)
+      + winCountBits (pScreenPriv->dwGreenMask)
+      + winCountBits (pScreenPriv->dwBlueMask);
+
+  winErrorFVerb (2, "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
+
+  /* Setup the cursor routines */
+#if CYGDEBUG
+  winDebug ("winFinishScreenInitFB - Calling miDCInitialize ()\n");
+#endif
+  miDCInitialize (pScreen, &g_winPointerCursorFuncs);
+
+  /* KDrive does winCreateDefColormap right after miDCInitialize */
+  /* Create a default colormap */
+#if CYGDEBUG
+  winDebug ("winFinishScreenInitFB - Calling winCreateDefColormap ()\n");
+#endif
+  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
+      )
+    {
+#if CYGDEBUG
+      winDebug ("winFinishScreenInitFB - Calling shadowSetup ()\n");
+#endif
+      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;
+      /* 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
+      )
+    { 
+#if CYGDEBUG || YES
+      winDebug ("winFinishScreenInitFB - Calling winInitWM.\n");
+#endif
+
+      /* 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;
+
+#if CYGDEBUG || YES
+  winDebug ("winFinishScreenInitFB - returning\n");
+#endif
+
+  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;
+
+  ErrorF ("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;
+    }
+
+  ErrorF ("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;
+
+  ErrorF ("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;
+}
diff --git a/xorg-server/hw/xwin/winshaddd.c b/xorg-server/hw/xwin/winshaddd.c
index ae49d5a3d..00d7a379f 100644
--- a/xorg-server/hw/xwin/winshaddd.c
+++ b/xorg-server/hw/xwin/winshaddd.c
@@ -1,1400 +1,1366 @@
-/*

- *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

- */

-

-#ifdef HAVE_XWIN_CONFIG_H

-#include <xwin-config.h>

-#endif

-#include "win.h"

-

-

-/*

- * FIXME: Headers are broken, DEFINE_GUID doesn't work correctly,

- * so we have to redefine it here.

- */

-#ifdef DEFINE_GUID

-#undef DEFINE_GUID

-#define DEFINE_GUID(n,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8) const GUID n GUID_SECT = {l,w1,w2,{b1,b2,b3,b4,b5,b6,b7,b8}}

-#endif /* DEFINE_GUID */

-

-

-/*

- * FIXME: Headers are broken, IID_IDirectDraw2 has to be defined

- * here manually.  Should be handled by ddraw.h

- */

-#ifndef IID_IDirectDraw2

-DEFINE_GUID( IID_IDirectDraw2,0xB3A6F3E0,0x2B43,0x11CF,0xA2,0xDE,0x00,0xAA,0x00,0xB9,0x33,0x56 );

-#endif /* IID_IDirectDraw2 */

-

-

-/*

- * Local prototypes

- */

-

-static Bool

-winAllocateFBShadowDD (ScreenPtr pScreen);

-

-static void

-winShadowUpdateDD (ScreenPtr pScreen, 

-		   shadowBufPtr pBuf);

-

-static Bool

-winCloseScreenShadowDD (int nIndex, ScreenPtr pScreen);

-

-static Bool

-winInitVisualsShadowDD (ScreenPtr pScreen);

-

-static Bool

-winAdjustVideoModeShadowDD (ScreenPtr pScreen);

-

-static Bool

-winBltExposedRegionsShadowDD (ScreenPtr pScreen);

-

-static Bool

-winActivateAppShadowDD (ScreenPtr pScreen);

-

-static Bool

-winRedrawScreenShadowDD (ScreenPtr pScreen);

-

-static Bool

-winRealizeInstalledPaletteShadowDD (ScreenPtr pScreen);

-

-static Bool

-winInstallColormapShadowDD (ColormapPtr pColormap);

-

-static Bool

-winStoreColorsShadowDD (ColormapPtr pmap, 

-			int ndef,

-			xColorItem *pdefs);

-

-static Bool

-winCreateColormapShadowDD (ColormapPtr pColormap);

-

-static Bool

-winDestroyColormapShadowDD (ColormapPtr pColormap);

-

-static Bool

-winCreatePrimarySurfaceShadowDD (ScreenPtr pScreen);

-

-static Bool

-winReleasePrimarySurfaceShadowDD (ScreenPtr pScreen);

-

-

-/*

- * Create the primary surface and attach the clipper.

- * Used for both the initial surface creation and during

- * WM_DISPLAYCHANGE messages.

- */

-

-static Bool

-winCreatePrimarySurfaceShadowDD (ScreenPtr pScreen)

-{

-  winScreenPriv(pScreen);

-  HRESULT		ddrval = DD_OK;

-  DDSURFACEDESC		ddsd;

-

-  /* Describe the primary surface */

-  ZeroMemory (&ddsd, sizeof (ddsd));

-  ddsd.dwSize = sizeof (ddsd);

-  ddsd.dwFlags = DDSD_CAPS;

-  ddsd.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE;

-  

-  /* Create the primary surface */

-  ddrval = IDirectDraw2_CreateSurface (pScreenPriv->pdd2,

-				       &ddsd,

-				       &pScreenPriv->pddsPrimary,

-				       NULL);

-  if (FAILED (ddrval))

-    {

-      ErrorF ("winCreatePrimarySurfaceShadowDD - Could not create primary "

-	      "surface: %08x\n", (unsigned int) ddrval);

-      return FALSE;

-    }

-  

-#if CYGDEBUG

-  winDebug ("winCreatePrimarySurfaceShadowDD - Created primary surface\n");

-#endif

-

-  /*

-   * Attach a clipper to the primary surface that will clip our blits to our

-   * display window.

-   */

-  ddrval = IDirectDrawSurface2_SetClipper (pScreenPriv->pddsPrimary,

-					   pScreenPriv->pddcPrimary);

-  if (FAILED (ddrval))

-    {

-      ErrorF ("winCreatePrimarySurfaceShadowDD - Primary attach clipper "

-	      "failed: %08x\n",

-	      (unsigned int) ddrval);

-      return FALSE;

-    }

-

-#if CYGDEBUG

-  winDebug ("winCreatePrimarySurfaceShadowDD - Attached clipper to "

-	  "primary surface\n");

-#endif

-

-  /* Everything was correct */

-  return TRUE;

-}

-

-

-/*

- * Detach the clipper and release the primary surface.

- * Called from WM_DISPLAYCHANGE.

- */

-

-static Bool

-winReleasePrimarySurfaceShadowDD (ScreenPtr pScreen)

-{

-  winScreenPriv(pScreen);

-

-  ErrorF ("winReleasePrimarySurfaceShadowDD - Hello\n");

-

-  /* Release the primary surface and clipper, if they exist */

-  if (pScreenPriv->pddsPrimary)

-    {

-      /*

-       * Detach the clipper from the primary surface.

-       * NOTE: We do this explicity for clarity.  The Clipper is not released.

-       */

-      IDirectDrawSurface2_SetClipper (pScreenPriv->pddsPrimary,

-				      NULL);

-

-      ErrorF ("winReleasePrimarySurfaceShadowDD - Detached clipper\n");

-

-      /* Release the primary surface */

-      IDirectDrawSurface2_Release (pScreenPriv->pddsPrimary);

-      pScreenPriv->pddsPrimary = NULL;

-    }

-

-  ErrorF ("winReleasePrimarySurfaceShadowDD - Released primary surface\n");

-

-  return TRUE;

-}

-

-

-/*

- * Create a DirectDraw surface for the shadow framebuffer; also create

- * a primary surface object so we can blit to the display.

- * 

- * Install a DirectDraw clipper on our primary surface object

- * that clips our blits to the unobscured client area of our display window.

- */

-

-static Bool

-winAllocateFBShadowDD (ScreenPtr pScreen)

-{

-  winScreenPriv(pScreen);

-  winScreenInfo		*pScreenInfo = pScreenPriv->pScreenInfo;  

-  HRESULT		ddrval = DD_OK;

-  DDSURFACEDESC		ddsd;

-  DDSURFACEDESC		*pddsdShadow = NULL;

-

-#if CYGDEBUG

-  winDebug ("winAllocateFBShadowDD\n");

-#endif

-

-  /* Create a clipper */

-  ddrval = (*g_fpDirectDrawCreateClipper) (0,

-					   &pScreenPriv->pddcPrimary,

-					   NULL);

-  if (FAILED (ddrval))

-    {

-      ErrorF ("winAllocateFBShadowDD - Could not create clipper: %08x\n",

-	      (unsigned int) ddrval);

-      return FALSE;

-    }

-

-#if CYGDEBUG

-  winDebug ("winAllocateFBShadowDD - Created a clipper\n");

-#endif

-

-  /* Get a device context for the screen  */

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

-

-  /* Attach the clipper to our display window */

-  ddrval = IDirectDrawClipper_SetHWnd (pScreenPriv->pddcPrimary,

-				       0,

-				       pScreenPriv->hwndScreen);

-  if (FAILED (ddrval))

-    {

-      ErrorF ("winAllocateFBShadowDD - Clipper not attached to "

-	      "window: %08x\n",

-	      (unsigned int) ddrval);

-      return FALSE;

-    }

-

-#if CYGDEBUG

-  winDebug ("winAllocateFBShadowDD - Attached clipper to window\n");

-#endif

-

-  /* Create a DirectDraw object, store the address at lpdd */

-  ddrval = (*g_fpDirectDrawCreate) (NULL, &pScreenPriv->pdd, NULL);

-  if (FAILED (ddrval))

-    {

-      ErrorF ("winAllocateFBShadowDD - Could not start DirectDraw: %08x\n",

-	      (unsigned int) ddrval);

-      return FALSE;

-    }

-

-#if CYGDEBUG

-  winDebug ("winAllocateFBShadowDD () - Created and initialized DD\n");

-#endif

-

-  /* Get a DirectDraw2 interface pointer */

-  ddrval = IDirectDraw_QueryInterface (pScreenPriv->pdd,

-				       &IID_IDirectDraw2,

-				       (LPVOID*) &pScreenPriv->pdd2);

-  if (FAILED (ddrval))

-    {

-      ErrorF ("winAllocateFBShadowDD - Failed DD2 query: %08x\n",

-	      (unsigned int) ddrval);

-      return FALSE;

-    }

-

-  /* Are we full screen? */

-  if (pScreenInfo->fFullScreen)

-    {

-      DDSURFACEDESC	ddsdCurrent;

-      DWORD		dwRefreshRateCurrent = 0;

-      HDC		hdc = NULL;

-

-      /* Set the cooperative level to full screen */

-      ddrval = IDirectDraw2_SetCooperativeLevel (pScreenPriv->pdd2,

-						 pScreenPriv->hwndScreen,

-						 DDSCL_EXCLUSIVE

-						 | DDSCL_FULLSCREEN);

-      if (FAILED (ddrval))

-	{

-	  ErrorF ("winAllocateFBShadowDD - Could not set "

-		  "cooperative level: %08x\n",

-		  (unsigned int) ddrval);

-	  return FALSE;

-	}

-

-      /*

-       * We only need to get the current refresh rate for comparison

-       * if a refresh rate has been passed on the command line.

-       */

-      if (pScreenInfo->dwRefreshRate != 0)

-	{

-	  ZeroMemory (&ddsdCurrent, sizeof (ddsdCurrent));

-	  ddsdCurrent.dwSize = sizeof (ddsdCurrent);

-	  

-	  /* Get information about current display settings */

-	  ddrval = IDirectDraw2_GetDisplayMode (pScreenPriv->pdd2,

-						&ddsdCurrent);

-	  if (FAILED (ddrval))

-	    {

-	      ErrorF ("winAllocateFBShadowDD - Could not get current "

-		      "refresh rate: %08x.  Continuing.\n",

-		      (unsigned int) ddrval);

-	      dwRefreshRateCurrent = 0;

-	    }

-	  else

-	    {

-	      /* Grab the current refresh rate */

-	      dwRefreshRateCurrent = ddsdCurrent.u2.dwRefreshRate;

-	    }

-	}

-

-      /* Clean up the refresh rate */

-      if (dwRefreshRateCurrent == pScreenInfo->dwRefreshRate)

-	{

-	  /*

-	   * Refresh rate is non-specified or equal to current.

-	   */

-	  pScreenInfo->dwRefreshRate = 0;

-	}

-

-      /* Grab a device context for the screen */

-      hdc = GetDC (NULL);

-      if (hdc == NULL)

-	{

-	  ErrorF ("winAllocateFBShadowDD - GetDC () failed\n");

-	  return FALSE;

-	}

-

-      /* Only change the video mode when different than current mode */

-      if (!pScreenInfo->fMultipleMonitors

-	  && (pScreenInfo->dwWidth != GetSystemMetrics (SM_CXSCREEN)

-	      || pScreenInfo->dwHeight != GetSystemMetrics (SM_CYSCREEN)

-	      || pScreenInfo->dwBPP != GetDeviceCaps (hdc, BITSPIXEL)

-	      || pScreenInfo->dwRefreshRate != 0))

-	{

-	  ErrorF ("winAllocateFBShadowDD - Changing video mode\n");

-

-	  /* Change the video mode to the mode requested, and use the driver default refresh rate on failure */

-	  ddrval = IDirectDraw2_SetDisplayMode (pScreenPriv->pdd2,

-						pScreenInfo->dwWidth,

-						pScreenInfo->dwHeight,

-						pScreenInfo->dwBPP,

-						pScreenInfo->dwRefreshRate,

-						0);

-	  if (FAILED (ddrval))

-	    {

-	      ErrorF ("winAllocateFBShadowDD - Could not set "\

-		      "full screen display mode: %08x\n",

-		      (unsigned int) ddrval);

-	      ErrorF ("winAllocateFBShadowDD - Using default driver refresh rate\n");

-	      ddrval = IDirectDraw2_SetDisplayMode (pScreenPriv->pdd2,

-						    pScreenInfo->dwWidth,

-						    pScreenInfo->dwHeight,

-						    pScreenInfo->dwBPP,

-						    0,

-						    0);

-	      if (FAILED(ddrval))

-		{

-			ErrorF ("winAllocateFBShadowDD - Could not set default refresh rate "

-				"full screen display mode: %08x\n",

-				(unsigned int) ddrval);

-			return FALSE;

-		}

-	    }

-	}

-      else

-	{

-	  ErrorF ("winAllocateFBShadowDD - Not changing video mode\n");

-	}

-

-      /* Release our DC */

-      ReleaseDC (NULL, hdc);

-      hdc = NULL;

-    }

-  else

-    {

-      /* Set the cooperative level for windowed mode */

-      ddrval = IDirectDraw2_SetCooperativeLevel (pScreenPriv->pdd2,

-						 pScreenPriv->hwndScreen,

-						 DDSCL_NORMAL);

-      if (FAILED (ddrval))

-	{

-	  ErrorF ("winAllocateFBShadowDD - Could not set "\

-		  "cooperative level: %08x\n",

-		  (unsigned int) ddrval);

-	  return FALSE;

-	}

-    }

-

-  /* Create the primary surface */

-  if (!winCreatePrimarySurfaceShadowDD (pScreen))

-    {

-      ErrorF ("winAllocateFBShadowDD - winCreatePrimarySurfaceShadowDD "

-	      "failed\n");

-      return FALSE;

-    }

-

-  /* Describe the shadow surface to be created */

-  /* NOTE: Do not use a DDSCAPS_VIDEOMEMORY surface,

-   * as drawing, locking, and unlocking take forever

-   * with video memory surfaces.  In addition,

-   * video memory is a somewhat scarce resource,

-   * so you shouldn't be allocating video memory when

-   * you have the option of using system memory instead.

-   */

-  ZeroMemory (&ddsd, sizeof (ddsd));

-  ddsd.dwSize = sizeof (ddsd);

-  ddsd.dwFlags = DDSD_CAPS | DDSD_HEIGHT | DDSD_WIDTH;

-  ddsd.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN | DDSCAPS_SYSTEMMEMORY;

-  ddsd.dwHeight = pScreenInfo->dwHeight;

-  ddsd.dwWidth = pScreenInfo->dwWidth;

-

-  /* Create the shadow surface */

-  ddrval = IDirectDraw2_CreateSurface (pScreenPriv->pdd2,

-				       &ddsd,

-				       &pScreenPriv->pddsShadow,

-				       NULL);

-  if (FAILED (ddrval))

-    {

-      ErrorF ("winAllocateFBShadowDD - Could not create shadow "\

-	      "surface: %08x\n", (unsigned int) ddrval);

-      return FALSE;

-    }

-  

-#if CYGDEBUG

-  winDebug ("winAllocateFBShadowDD - Created shadow\n");

-#endif

-

-  /* Allocate a DD surface description for our screen privates */

-  pddsdShadow = pScreenPriv->pddsdShadow = malloc (sizeof (DDSURFACEDESC));

-  if (pddsdShadow == NULL)

-    {

-      ErrorF ("winAllocateFBShadowDD - Could not allocate surface "\

-	      "description memory\n");

-      return FALSE;

-    }

-  ZeroMemory (pddsdShadow, sizeof (*pddsdShadow));

-  pddsdShadow->dwSize = sizeof (*pddsdShadow);

-

-#if CYGDEBUG

-  winDebug ("winAllocateFBShadowDD - Locking shadow\n");

-#endif

-

-  /* Lock the shadow surface */

-  ddrval = IDirectDrawSurface2_Lock (pScreenPriv->pddsShadow,

-				     NULL,

-				     pddsdShadow,

-				     DDLOCK_WAIT,

-				     NULL);

-  if (FAILED (ddrval) || pddsdShadow->lpSurface == NULL)

-    {

-      ErrorF ("winAllocateFBShadowDD - Could not lock shadow "\

-	      "surface: %08x\n", (unsigned int) ddrval);

-      return FALSE;

-    }

-

-#if CYGDEBUG

-  winDebug ("winAllocateFBShadowDD - Locked shadow\n");

-#endif

-

-  /* We don't know how to deal with anything other than RGB */

-  if (!(pddsdShadow->ddpfPixelFormat.dwFlags & DDPF_RGB))

-    {

-      ErrorF ("winAllocateFBShadowDD - Color format other than RGB\n");

-      return FALSE;

-    }

-

-  /* Grab the pitch from the surface desc */

-  pScreenInfo->dwStride = (pddsdShadow->u1.lPitch * 8)

-    / pScreenInfo->dwBPP;

-

-  /* Save the pointer to our surface memory */

-  pScreenInfo->pfb = pddsdShadow->lpSurface;

-  

-  /* Grab the color depth and masks from the surface description */

-  pScreenPriv->dwRedMask = pddsdShadow->ddpfPixelFormat.u2.dwRBitMask;

-  pScreenPriv->dwGreenMask = pddsdShadow->ddpfPixelFormat.u3.dwGBitMask;

-  pScreenPriv->dwBlueMask = pddsdShadow->ddpfPixelFormat.u4.dwBBitMask;

-

-#if CYGDEBUG

-  winDebug ("winAllocateFBShadowDD - Returning\n");

-#endif

-

-  return TRUE;

-}

-

-

-/*

- * Transfer the damaged regions of the shadow framebuffer to the display.

- */

-

-static void

-winShadowUpdateDD (ScreenPtr pScreen, 

-		   shadowBufPtr pBuf)

-{

-  winScreenPriv(pScreen);

-  winScreenInfo		*pScreenInfo = pScreenPriv->pScreenInfo;

-  RegionPtr		damage = shadowDamage(pBuf);

-  HRESULT		ddrval = DD_OK;

-  RECT			rcDest, rcSrc;

-  POINT			ptOrigin;

-  DWORD			dwBox = RegionNumRects (damage);

-  BoxPtr		pBox = RegionRects (damage);

-  HRGN			hrgnTemp = NULL, hrgnCombined = NULL;

-

-  /*

-   * Return immediately if the app is not active

-   * and we are fullscreen, or if we have a bad display depth

-   */

-  if ((!pScreenPriv->fActive && pScreenInfo->fFullScreen)

-      || pScreenPriv->fBadDepth) return;

-

-  /* Get the origin of the window in the screen coords */

-  ptOrigin.x = pScreenInfo->dwXOffset;

-  ptOrigin.y = pScreenInfo->dwYOffset;

-  MapWindowPoints (pScreenPriv->hwndScreen,

-		   HWND_DESKTOP,

-		   (LPPOINT)&ptOrigin, 1);

-

-  /* Unlock the shadow surface, so we can blit */

-  ddrval = IDirectDrawSurface2_Unlock (pScreenPriv->pddsShadow, NULL);

-  if (FAILED (ddrval))

-    {

-      ErrorF ("winShadowUpdateDD - Unlock failed\n");

-      return;

-    }

-

-  /*

-   * Handle small regions with multiple blits,

-   * handle large regions by creating a clipping region and 

-   * doing a single blit constrained to that clipping region.

-   */

-  if (pScreenInfo->dwClipUpdatesNBoxes == 0

-      || dwBox < pScreenInfo->dwClipUpdatesNBoxes)

-    {

-      /* Loop through all boxes in the damaged region */

-      while (dwBox--)

-	{

-	  /* Assign damage box to source rectangle */

-	  rcSrc.left = pBox->x1;

-	  rcSrc.top = pBox->y1;

-	  rcSrc.right = pBox->x2;

-	  rcSrc.bottom = pBox->y2;

-	  

-	  /* Calculate destination rectange */

-	  rcDest.left = ptOrigin.x + rcSrc.left;

-	  rcDest.top = ptOrigin.y + rcSrc.top;

-	  rcDest.right = ptOrigin.x + rcSrc.right;

-	  rcDest.bottom = ptOrigin.y + rcSrc.bottom;

-	  

-	  /* Blit the damaged areas */

-	  ddrval = IDirectDrawSurface2_Blt (pScreenPriv->pddsPrimary,

-					    &rcDest,

-					    pScreenPriv->pddsShadow,

-					    &rcSrc,

-					    DDBLT_WAIT,

-					    NULL);

-	  

-	  /* Get a pointer to the next box */

-	  ++pBox;

-	}

-    }

-  else

-    {

-      BoxPtr		pBoxExtents = RegionExtents(damage);

-

-      /* Compute a GDI region from the damaged region */

-      hrgnCombined = CreateRectRgn (pBox->x1, pBox->y1, pBox->x2, pBox->y2);

-      dwBox--;

-      pBox++;

-      while (dwBox--)

-	{

-	  hrgnTemp = CreateRectRgn (pBox->x1, pBox->y1, pBox->x2, pBox->y2);

-	  CombineRgn (hrgnCombined, hrgnCombined, hrgnTemp, RGN_OR);

-	  DeleteObject (hrgnTemp);

-	  pBox++;

-	}  

-

-      /* Install the GDI region as a clipping region */

-      SelectClipRgn (pScreenPriv->hdcScreen, hrgnCombined);

-      DeleteObject (hrgnCombined);

-      hrgnCombined = NULL;

-

-      /* Calculating a bounding box for the source is easy */

-      rcSrc.left = pBoxExtents->x1;

-      rcSrc.top = pBoxExtents->y1;

-      rcSrc.right = pBoxExtents->x2;

-      rcSrc.bottom = pBoxExtents->y2;

-

-      /* Calculating a bounding box for the destination is trickier */

-      rcDest.left = ptOrigin.x + rcSrc.left;

-      rcDest.top = ptOrigin.y + rcSrc.top;

-      rcDest.right = ptOrigin.x + rcSrc.right;

-      rcDest.bottom = ptOrigin.y + rcSrc.bottom;

-      

-      /* Our Blt should be clipped to the invalidated region */

-      ddrval = IDirectDrawSurface2_Blt (pScreenPriv->pddsPrimary,

-					&rcDest,

-					pScreenPriv->pddsShadow,

-					&rcSrc,

-					DDBLT_WAIT,

-					NULL);

-

-      /* Reset the clip region */

-      SelectClipRgn (pScreenPriv->hdcScreen, NULL);

-    }

-

-  /* Relock the shadow surface */

-  ddrval = IDirectDrawSurface2_Lock (pScreenPriv->pddsShadow,

-				     NULL,

-				     pScreenPriv->pddsdShadow,

-				     DDLOCK_WAIT,

-				     NULL);

-  if (FAILED (ddrval))

-    {

-      ErrorF ("winShadowUpdateDD - Lock failed\n");

-      return;

-    }

-

-  /* Has our memory pointer changed? */

-  if (pScreenInfo->pfb != pScreenPriv->pddsdShadow->lpSurface)

-    {

-      ErrorF ("winShadowUpdateDD - Memory location of the shadow "

-	      "surface has changed, trying to update the root window "

-	      "pixmap header to point to the new address.  If you get "

-	      "this message and "PROJECT_NAME" freezes or crashes "

-	      "after this message then send a problem report and your "

-	      "%s file to " BUILDERADDR "\n", g_pszLogFile);

-

-      /* Location of shadow framebuffer has changed */

-      pScreenInfo->pfb = pScreenPriv->pddsdShadow->lpSurface;

-      

-      /* Update the screen pixmap */

-      if (!(*pScreen->ModifyPixmapHeader)(pScreen->devPrivate,

-					  pScreen->width,

-					  pScreen->height,

-					  pScreen->rootDepth,

-					  BitsPerPixel (pScreen->rootDepth),

-					  PixmapBytePad (pScreenInfo->dwStride,

-							 pScreenInfo->dwBPP),

-					  pScreenInfo->pfb))

-	{

-	  ErrorF ("winShadowUpdateDD - Bits changed, could not "

-		  "notify fb.\n");

-	  return;

-	}

-    }

-}

-

-

-/*

- * Call the wrapped CloseScreen function.

- * 

- * Free our resources and private structures.

- */

-

-static Bool

-winCloseScreenShadowDD (int nIndex, ScreenPtr pScreen)

-{

-  winScreenPriv(pScreen);

-  winScreenInfo		*pScreenInfo = pScreenPriv->pScreenInfo;

-  Bool			fReturn;

-  

-#if CYGDEBUG

-  winDebug ("winCloseScreenShadowDD - Freeing screen resources\n");

-#endif

-

-  /* Flag that the screen is closed */

-  pScreenPriv->fClosed = TRUE;

-  pScreenPriv->fActive = FALSE;

-

-  /* Call the wrapped CloseScreen procedure */

-  WIN_UNWRAP(CloseScreen);

-  fReturn = (*pScreen->CloseScreen) (nIndex, pScreen);

-

-  /* Free the screen DC */

-  ReleaseDC (pScreenPriv->hwndScreen, pScreenPriv->hdcScreen);

-

-  /* Delete the window property */

-  RemoveProp (pScreenPriv->hwndScreen, WIN_SCR_PROP);

-

-  /* Free the shadow surface, if there is one */

-  if (pScreenPriv->pddsShadow)

-    {

-      IDirectDrawSurface2_Unlock (pScreenPriv->pddsShadow, NULL);

-      IDirectDrawSurface2_Release (pScreenPriv->pddsShadow);

-      pScreenPriv->pddsShadow = NULL;

-    }

-

-  /* Detach the clipper from the primary surface and release the clipper. */

-  if (pScreenPriv->pddcPrimary)

-    {

-      /* Detach the clipper */

-      IDirectDrawSurface2_SetClipper (pScreenPriv->pddsPrimary,

-				      NULL);

-

-      /* Release the clipper object */

-      IDirectDrawClipper_Release (pScreenPriv->pddcPrimary);

-      pScreenPriv->pddcPrimary = NULL;

-    }

-

-  /* Release the primary surface, if there is one */

-  if (pScreenPriv->pddsPrimary)

-    {

-      IDirectDrawSurface2_Release (pScreenPriv->pddsPrimary);

-      pScreenPriv->pddsPrimary = NULL;

-    }

-

-  /* Free the DirectDraw2 object, if there is one */

-  if (pScreenPriv->pdd2)

-    {

-      IDirectDraw2_RestoreDisplayMode (pScreenPriv->pdd2);

-      IDirectDraw2_Release (pScreenPriv->pdd2);

-      pScreenPriv->pdd2 = NULL;

-    }

-

-  /* Free the DirectDraw object, if there is one */

-  if (pScreenPriv->pdd)

-    {

-      IDirectDraw_Release (pScreenPriv->pdd);

-      pScreenPriv->pdd = NULL;

-    }

-

-  /* Delete tray icon, if we have one */

-  if (!pScreenInfo->fNoTrayIcon)

-    winDeleteNotifyIcon (pScreenPriv);

-  

-  /* Free the exit confirmation dialog box, if it exists */

-  if (g_hDlgExit != NULL)

-    {

-      DestroyWindow (g_hDlgExit);

-      g_hDlgExit = NULL;

-    }

-

-  /* Kill our window */

-  if (pScreenPriv->hwndScreen)

-    {

-      DestroyWindow (pScreenPriv->hwndScreen);

-      pScreenPriv->hwndScreen = NULL;

-    }

-

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

-  /* Destroy the thread startup mutex */

-  pthread_mutex_destroy (&pScreenPriv->pmServerStarted);

-#endif

-

-  /* Kill our screeninfo's pointer to the screen */

-  pScreenInfo->pScreen = NULL;

-

-  /* Invalidate the ScreenInfo's fb pointer */

-  pScreenInfo->pfb = NULL;

-

-  /* Free the screen privates for this screen */

-  free ((pointer) pScreenPriv);

-

-  return fReturn;

-}

-

-

-/*

- * Tell mi what sort of visuals we need.

- * 

- * Generally we only need one visual, as our screen can only

- * handle one format at a time, I believe.  You may want

- * to verify that last sentence.

- */

-

-static Bool

-winInitVisualsShadowDD (ScreenPtr pScreen)

-{

-  winScreenPriv(pScreen);

-  winScreenInfo		*pScreenInfo = pScreenPriv->pScreenInfo;

-  DWORD			dwRedBits, dwGreenBits, dwBlueBits;

-

-  /* Count the number of ones in each color mask */

-  dwRedBits = winCountBits (pScreenPriv->dwRedMask);

-  dwGreenBits = winCountBits (pScreenPriv->dwGreenMask);

-  dwBlueBits = winCountBits (pScreenPriv->dwBlueMask);

-  

-  /* Store the maximum number of ones in a color mask as the bitsPerRGB */

-  if (dwRedBits == 0 || dwGreenBits == 0 || dwBlueBits == 0)

-    pScreenPriv->dwBitsPerRGB = 8;

-  else if (dwRedBits > dwGreenBits && dwRedBits > dwBlueBits)

-    pScreenPriv->dwBitsPerRGB = dwRedBits;

-  else if (dwGreenBits > dwRedBits && dwGreenBits > dwBlueBits)

-    pScreenPriv->dwBitsPerRGB = dwGreenBits;

-  else

-    pScreenPriv->dwBitsPerRGB = dwBlueBits;

-  

-  ErrorF ("winInitVisualsShadowDD - Masks %08x %08x %08x BPRGB %d d %d "

-	  "bpp %d\n",

-	  (unsigned int) pScreenPriv->dwRedMask,

-	  (unsigned int) pScreenPriv->dwGreenMask,

-	  (unsigned int) pScreenPriv->dwBlueMask,

-	  (int) pScreenPriv->dwBitsPerRGB,

-	  (int) pScreenInfo->dwDepth,

-	  (int) pScreenInfo->dwBPP);

-

-  /* Create a single visual according to the Windows screen depth */

-  switch (pScreenInfo->dwDepth)

-    {

-    case 24:

-    case 16:

-    case 15:

-      /* Create the real visual */

-      if (!miSetVisualTypesAndMasks (pScreenInfo->dwDepth,

-				     TrueColorMask,

-				     pScreenPriv->dwBitsPerRGB,

-				     TrueColor,

-				     pScreenPriv->dwRedMask,

-				     pScreenPriv->dwGreenMask,

-				     pScreenPriv->dwBlueMask))

-	{

-	  ErrorF ("winInitVisualsShadowDD - miSetVisualTypesAndMasks "

-		  "failed for TrueColor\n");

-	  return FALSE;

-	}

-

-#ifdef XWIN_EMULATEPSEUDO

-      if (!pScreenInfo->fEmulatePseudo)

-	break;

-

-      /* Setup a pseudocolor visual */

-      if (!miSetVisualTypesAndMasks (8,

-				     PseudoColorMask,

-				     8,

-				     -1,

-				     0,

-				     0,

-				     0))

-	{

-	  ErrorF ("winInitVisualsShadowDD - miSetVisualTypesAndMasks "

-		  "failed for PseudoColor\n");

-	  return FALSE;

-	}

-#endif

-      break;

-

-    case 8:

-      if (!miSetVisualTypesAndMasks (pScreenInfo->dwDepth,

-				     pScreenInfo->fFullScreen 

-				     ? PseudoColorMask : StaticColorMask,

-				     pScreenPriv->dwBitsPerRGB,

-				     pScreenInfo->fFullScreen 

-				     ? PseudoColor : StaticColor,

-				     pScreenPriv->dwRedMask,

-				     pScreenPriv->dwGreenMask,

-				     pScreenPriv->dwBlueMask))

-	{

-	  ErrorF ("winInitVisualsShadowDD - miSetVisualTypesAndMasks "

-		  "failed\n");

-	  return FALSE;

-	}

-      break;

-

-    default:

-      ErrorF ("winInitVisualsShadowDD - Unknown screen depth\n");

-      return FALSE;

-    }

-

-#if CYGDEBUG

-  winDebug ("winInitVisualsShadowDD - Returning\n");

-#endif

-

-  return TRUE;

-}

-

-

-/*

- * Adjust the user proposed video mode

- */

-

-static Bool

-winAdjustVideoModeShadowDD (ScreenPtr pScreen)

-{

-  winScreenPriv(pScreen);

-  winScreenInfo		*pScreenInfo = pScreenPriv->pScreenInfo;

-  HDC			hdc = NULL;

-  DWORD			dwBPP;

-

-  /* We're in serious trouble if we can't get a DC */

-  hdc = GetDC (NULL);

-  if (hdc == NULL)

-    {

-      ErrorF ("winAdjustVideoModeShadowDD - GetDC () failed\n");

-      return FALSE;

-    }

-

-  /* Query GDI for current display depth */

-  dwBPP = GetDeviceCaps (hdc, BITSPIXEL);

-

-  /* DirectDraw can only change the depth in fullscreen mode */

-  if (pScreenInfo->dwBPP == WIN_DEFAULT_BPP)

-    {

-      /* No -depth parameter passed, let the user know the depth being used */

-      ErrorF ("winAdjustVideoModeShadowDD - Using Windows display "

-	      "depth of %d bits per pixel\n", (int) dwBPP);

-

-      /* Use GDI's depth */

-      pScreenInfo->dwBPP = dwBPP;

-    }

-  else if (pScreenInfo->fFullScreen

-	   && pScreenInfo->dwBPP != dwBPP)

-    {

-      /* FullScreen, and GDI depth differs from -depth parameter */

-      ErrorF ("winAdjustVideoModeShadowDD - FullScreen, using command line "

-	      "bpp: %d\n", (int) pScreenInfo->dwBPP);

-    }

-  else if (dwBPP != pScreenInfo->dwBPP)

-    {

-      /* Windowed, and GDI depth differs from -depth parameter */

-      ErrorF ("winAdjustVideoModeShadowDD - Windowed, command line bpp: "

-	      "%d, using bpp: %d\n", (int) pScreenInfo->dwBPP, (int) dwBPP);

-

-      /* We'll use GDI's depth */

-      pScreenInfo->dwBPP = dwBPP;

-    }

-  

-  /* See if the shadow bitmap will be larger than the DIB size limit */

-  if (pScreenInfo->dwWidth * pScreenInfo->dwHeight * pScreenInfo->dwBPP

-      >= WIN_DIB_MAXIMUM_SIZE)

-    {

-      ErrorF ("winAdjustVideoModeShadowDD - Requested DirectDraw surface "

-	      "will be larger than %d MB.  The surface may fail to be "

-	      "allocated on Windows 95, 98, or Me, due to a %d MB limit in "

-	      "DIB size.  This limit does not apply to Windows NT/2000, and "

-	      "this message may be ignored on those platforms.\n",

-	      WIN_DIB_MAXIMUM_SIZE_MB, WIN_DIB_MAXIMUM_SIZE_MB);

-    }

-

-  /* Release our DC */

-  ReleaseDC (NULL, hdc);

-  return TRUE;

-}

-

-

-/*

- * Blt exposed regions to the screen

- */

-

-static Bool

-winBltExposedRegionsShadowDD (ScreenPtr pScreen)

-{

-  winScreenPriv(pScreen);

-  winScreenInfo		*pScreenInfo = pScreenPriv->pScreenInfo;

-  RECT			rcSrc, rcDest;

-  POINT			ptOrigin;

-  HDC			hdcUpdate = NULL;

-  PAINTSTRUCT		ps;

-  HRESULT		ddrval = DD_OK;

-  Bool			fReturn = TRUE;

-  Bool			fLocked = TRUE;

-  int			i;

-

-  /* BeginPaint gives us an hdc that clips to the invalidated region */

-  hdcUpdate = BeginPaint (pScreenPriv->hwndScreen, &ps);

-  if (hdcUpdate == NULL)

-    {

-      ErrorF ("winBltExposedRegionsShadowDD - BeginPaint () returned "

-	      "a NULL device context handle.  Aborting blit attempt.\n");

-      return FALSE;

-    }

-  

-  /* Unlock the shadow surface, so we can blit */

-  ddrval = IDirectDrawSurface2_Unlock (pScreenPriv->pddsShadow, NULL);

-  if (FAILED (ddrval))

-    {

-      fReturn = FALSE;

-      goto winBltExposedRegionsShadowDD_Exit;

-    }

-  else

-    {

-      /* Flag that we have unlocked the shadow surface */

-      fLocked = FALSE;

-    }

-

-  /* Get the origin of the window in the screen coords */

-  ptOrigin.x = pScreenInfo->dwXOffset;

-  ptOrigin.y = pScreenInfo->dwYOffset;

-

-  MapWindowPoints (pScreenPriv->hwndScreen,

-		   HWND_DESKTOP,

-		   (LPPOINT)&ptOrigin, 1);

-  rcDest.left = ptOrigin.x;

-  rcDest.right = ptOrigin.x + pScreenInfo->dwWidth;

-  rcDest.top = ptOrigin.y;

-  rcDest.bottom = ptOrigin.y + pScreenInfo->dwHeight;

-

-  /* Source can be enter shadow surface, as Blt should clip */

-  rcSrc.left = 0;

-  rcSrc.top = 0;

-  rcSrc.right = pScreenInfo->dwWidth;

-  rcSrc.bottom = pScreenInfo->dwHeight;

-

-  /* Try to regain the primary surface and blit again if we've lost it */

-  for (i = 0; i <= WIN_REGAIN_SURFACE_RETRIES; ++i)

-    {

-      /* Our Blt should be clipped to the invalidated region */

-      ddrval = IDirectDrawSurface2_Blt (pScreenPriv->pddsPrimary,

-					&rcDest,

-					pScreenPriv->pddsShadow,

-					&rcSrc,

-					DDBLT_WAIT,

-					NULL);

-      if (ddrval == DDERR_SURFACELOST)

-	{

-	  /* Surface was lost */

-	  ErrorF ("winBltExposedRegionsShadowDD - IDirectDrawSurface2_Blt "

-		  "reported that the primary surface was lost, "

-		  "trying to restore, retry: %d\n", i + 1);

-

-	  /* Try to restore the surface, once */

-	  ddrval = IDirectDrawSurface2_Restore (pScreenPriv->pddsPrimary);

-	  ErrorF ("winBltExposedRegionsShadowDD - "

-		  "IDirectDrawSurface2_Restore returned: ");

-	  if (ddrval == DD_OK)

-	    ErrorF ("DD_OK\n");

-	  else if (ddrval == DDERR_WRONGMODE)

-	    ErrorF ("DDERR_WRONGMODE\n");

-	  else if (ddrval == DDERR_INCOMPATIBLEPRIMARY)

-	    ErrorF ("DDERR_INCOMPATIBLEPRIMARY\n");

-	  else if (ddrval == DDERR_UNSUPPORTED)

-	    ErrorF ("DDERR_UNSUPPORTED\n");

-	  else if (ddrval == DDERR_INVALIDPARAMS)

-	    ErrorF ("DDERR_INVALIDPARAMS\n");

-	  else if (ddrval == DDERR_INVALIDOBJECT)

-	    ErrorF ("DDERR_INVALIDOBJECT\n");

-	  else

-	    ErrorF ("unknown error: %08x\n", (unsigned int) ddrval);

-

-	  /* Loop around to try the blit one more time */

-	  continue;

-	}

-      else if (FAILED (ddrval))

-	{

-	  fReturn = FALSE;

-	  ErrorF ("winBltExposedRegionsShadowDD - IDirectDrawSurface2_Blt "

-		  "failed, but surface not lost: %08x %d\n",

-		  (unsigned int) ddrval, (int) ddrval);

-	  goto winBltExposedRegionsShadowDD_Exit;

-	}

-      else

-	{

-	  /* Success, stop looping */

-	  break;

-	}

-    }

-

-  /* Relock the shadow surface */

-  ddrval = IDirectDrawSurface2_Lock (pScreenPriv->pddsShadow,

-				     NULL,

-				     pScreenPriv->pddsdShadow,

-				     DDLOCK_WAIT,

-				     NULL);

-  if (FAILED (ddrval))

-    {

-      fReturn = FALSE;

-      ErrorF ("winBltExposedRegionsShadowDD - IDirectDrawSurface2_Lock "

-	      "failed\n");

-      goto winBltExposedRegionsShadowDD_Exit;

-    }

-  else

-    {

-      /* Indicate that we have relocked the shadow surface */

-      fLocked = TRUE;

-    }

-

-  /* Has our memory pointer changed? */

-  if (pScreenInfo->pfb != pScreenPriv->pddsdShadow->lpSurface)

-    winUpdateFBPointer (pScreen,

-			pScreenPriv->pddsdShadow->lpSurface);

-

- winBltExposedRegionsShadowDD_Exit:

-  /* EndPaint frees the DC */

-  if (hdcUpdate != NULL)

-    EndPaint (pScreenPriv->hwndScreen, &ps);

-

-  /*

-   * Relock the surface if it is not locked.  We don't care if locking fails,

-   * as it will cause the server to shutdown within a few more operations.

-   */

-  if (!fLocked)

-    {

-      IDirectDrawSurface2_Lock (pScreenPriv->pddsShadow,

-				NULL,

-				pScreenPriv->pddsdShadow,

-				DDLOCK_WAIT,

-				NULL);

-

-      /* Has our memory pointer changed? */

-      if (pScreenInfo->pfb != pScreenPriv->pddsdShadow->lpSurface)

-	winUpdateFBPointer (pScreen,

-			    pScreenPriv->pddsdShadow->lpSurface);

-      

-      fLocked = TRUE;

-    }

-  return fReturn;

-}

-

-

-/*

- * Do any engine-specific appliation-activation processing

- */

-

-static Bool

-winActivateAppShadowDD (ScreenPtr pScreen)

-{

-  winScreenPriv(pScreen);

-

-  /*

-   * Do we have a surface?

-   * Are we active?

-   * Are we fullscreen?

-   */

-  if (pScreenPriv != NULL

-      && pScreenPriv->pddsPrimary != NULL

-      && pScreenPriv->fActive)

-    {

-      /* Primary surface was lost, restore it */

-      IDirectDrawSurface2_Restore (pScreenPriv->pddsPrimary);

-    }

-

-  return TRUE;

-}

-

-

-/*

- * Reblit the shadow framebuffer to the screen.

- */

-

-static Bool

-winRedrawScreenShadowDD (ScreenPtr pScreen)

-{

-  winScreenPriv(pScreen);

-  winScreenInfo		*pScreenInfo = pScreenPriv->pScreenInfo;

-  HRESULT		ddrval = DD_OK;

-  RECT			rcSrc, rcDest;

-  POINT			ptOrigin;

-

-  /* Get the origin of the window in the screen coords */

-  ptOrigin.x = pScreenInfo->dwXOffset;

-  ptOrigin.y = pScreenInfo->dwYOffset;

-  MapWindowPoints (pScreenPriv->hwndScreen,

-		   HWND_DESKTOP,

-		   (LPPOINT)&ptOrigin, 1);

-  rcDest.left = ptOrigin.x;

-  rcDest.right = ptOrigin.x + pScreenInfo->dwWidth;

-  rcDest.top = ptOrigin.y;

-  rcDest.bottom = ptOrigin.y + pScreenInfo->dwHeight;

-

-  /* Source can be entire shadow surface, as Blt should clip for us */

-  rcSrc.left = 0;

-  rcSrc.top = 0;

-  rcSrc.right = pScreenInfo->dwWidth;

-  rcSrc.bottom = pScreenInfo->dwHeight;

-

-  /* Redraw the whole window, to take account for the new colors */

-  ddrval = IDirectDrawSurface2_Blt (pScreenPriv->pddsPrimary,

-				    &rcDest,

-				    pScreenPriv->pddsShadow,

-				    &rcSrc,

-				    DDBLT_WAIT,

-				    NULL);

-  if (FAILED (ddrval))

-    {

-      ErrorF ("winRedrawScreenShadowDD - IDirectDrawSurface_Blt () "

-	      "failed: %08x\n",

-	      (unsigned int) ddrval);

-    }

-

-  return TRUE;

-}

-

-

-/*

- * Realize the currently installed colormap

- */

-

-static Bool

-winRealizeInstalledPaletteShadowDD (ScreenPtr pScreen)

-{

-  return TRUE;

-}

-

-

-/*

- * Install the specified colormap

- */

-

-static Bool

-winInstallColormapShadowDD (ColormapPtr pColormap)

-{

-  ScreenPtr		pScreen = pColormap->pScreen;

-  winScreenPriv(pScreen);

-  winCmapPriv(pColormap);

-  HRESULT		ddrval = DD_OK;

-

-  /* Install the DirectDraw palette on the primary surface */

-  ddrval = IDirectDrawSurface2_SetPalette (pScreenPriv->pddsPrimary,

-					   pCmapPriv->lpDDPalette);

-  if (FAILED (ddrval))

-    {

-      ErrorF ("winInstallColormapShadowDD - Failed installing the "

-	      "DirectDraw palette.\n");

-      return FALSE;

-    }

-

-  /* Save a pointer to the newly installed colormap */

-  pScreenPriv->pcmapInstalled = pColormap;

-

-  return TRUE;

-}

-

-

-/*

- * Store the specified colors in the specified colormap

- */

-

-static Bool

-winStoreColorsShadowDD (ColormapPtr pColormap, 

-			int ndef,

-			xColorItem *pdefs)

-{

-  ScreenPtr		pScreen = pColormap->pScreen;

-  winScreenPriv(pScreen);

-  winCmapPriv(pColormap);

-  ColormapPtr		curpmap = pScreenPriv->pcmapInstalled;

-  HRESULT		ddrval = DD_OK;

-  

-  /* Put the X colormap entries into the Windows logical palette */

-  ddrval = IDirectDrawPalette_SetEntries (pCmapPriv->lpDDPalette,

-					  0,

-					  pdefs[0].pixel,

-					  ndef,

-					  pCmapPriv->peColors 

-					  + pdefs[0].pixel);

-  if (FAILED (ddrval))

-    {

-      ErrorF ("winStoreColorsShadowDD - SetEntries () failed\n");

-      return FALSE;

-    }

-

-  /* Don't install the DirectDraw palette if the colormap is not installed */

-  if (pColormap != curpmap)

-    {

-      return TRUE;

-    }

-

-  if (!winInstallColormapShadowDD (pColormap))

-    {

-      ErrorF ("winStoreColorsShadowDD - Failed installing colormap\n");

-      return FALSE;

-    }

-

-  return TRUE;

-}

-

-

-/*

- * Colormap initialization procedure

- */

-

-static Bool

-winCreateColormapShadowDD (ColormapPtr pColormap)

-{

-  HRESULT		ddrval = DD_OK;

-  ScreenPtr		pScreen = pColormap->pScreen;

-  winScreenPriv(pScreen);

-  winCmapPriv(pColormap);

-  

-  /* Create a DirectDraw palette */

-  ddrval = IDirectDraw2_CreatePalette (pScreenPriv->pdd,

-				       DDPCAPS_8BIT | DDPCAPS_ALLOW256,

-				       pCmapPriv->peColors,

-				       &pCmapPriv->lpDDPalette,

-				       NULL);

-  if (FAILED (ddrval))

-    {

-      ErrorF ("winCreateColormapShadowDD - CreatePalette failed\n");

-      return FALSE;

-    }

-

-  return TRUE;

-}

-

-

-/*

- * Colormap destruction procedure

- */

-

-static Bool

-winDestroyColormapShadowDD (ColormapPtr pColormap)

-{

-  winScreenPriv(pColormap->pScreen);

-  winCmapPriv(pColormap);

-  HRESULT		ddrval = DD_OK;

-

-  /*

-   * Is colormap to be destroyed the default?

-   *

-   * Non-default colormaps should have had winUninstallColormap

-   * called on them before we get here.  The default colormap

-   * will not have had winUninstallColormap called on it.  Thus,

-   * we need to handle the default colormap in a special way.

-   */

-  if (pColormap->flags & IsDefault)

-    {

-#if CYGDEBUG

-      winDebug ("winDestroyColormapShadowDD - Destroying default "

-	      "colormap\n");

-#endif

-      

-      /*

-       * FIXME: Walk the list of all screens, popping the default

-       * palette out of each screen device context.

-       */

-      

-      /* Pop the palette out of the primary surface */

-      ddrval = IDirectDrawSurface2_SetPalette (pScreenPriv->pddsPrimary,

-					       NULL);

-      if (FAILED (ddrval))

-	{

-	  ErrorF ("winDestroyColormapShadowDD - Failed freeing the "

-		  "default colormap DirectDraw palette.\n");

-	  return FALSE;

-	}

-

-      /* Clear our private installed colormap pointer */

-      pScreenPriv->pcmapInstalled = NULL;

-    }

-  

-  /* Release the palette */

-  IDirectDrawPalette_Release (pCmapPriv->lpDDPalette);

- 

-  /* Invalidate the colormap privates */

-  pCmapPriv->lpDDPalette = NULL;

-

-  return TRUE;

-}

-

-

-/*

- * Set engine specific functions

- */

-

-Bool

-winSetEngineFunctionsShadowDD (ScreenPtr pScreen)

-{

-  winScreenPriv(pScreen);

-  winScreenInfo		*pScreenInfo = pScreenPriv->pScreenInfo;

-  

-  /* Set our pointers */

-  pScreenPriv->pwinAllocateFB = winAllocateFBShadowDD;

-  pScreenPriv->pwinShadowUpdate = winShadowUpdateDD;

-  pScreenPriv->pwinCloseScreen = winCloseScreenShadowDD;

-  pScreenPriv->pwinInitVisuals = winInitVisualsShadowDD;

-  pScreenPriv->pwinAdjustVideoMode = winAdjustVideoModeShadowDD;

-  if (pScreenInfo->fFullScreen)

-    pScreenPriv->pwinCreateBoundingWindow = winCreateBoundingWindowFullScreen;

-  else

-    pScreenPriv->pwinCreateBoundingWindow = winCreateBoundingWindowWindowed;

-  pScreenPriv->pwinFinishScreenInit = winFinishScreenInitFB;

-  pScreenPriv->pwinBltExposedRegions = winBltExposedRegionsShadowDD;

-  pScreenPriv->pwinActivateApp = winActivateAppShadowDD;

-  pScreenPriv->pwinRedrawScreen = winRedrawScreenShadowDD;

-  pScreenPriv->pwinRealizeInstalledPalette

-    = winRealizeInstalledPaletteShadowDD;

-  pScreenPriv->pwinInstallColormap = winInstallColormapShadowDD;

-  pScreenPriv->pwinStoreColors = winStoreColorsShadowDD;

-  pScreenPriv->pwinCreateColormap = winCreateColormapShadowDD;

-  pScreenPriv->pwinDestroyColormap = winDestroyColormapShadowDD;

-  pScreenPriv->pwinHotKeyAltTab = (winHotKeyAltTabProcPtr) (void (*)(void))NoopDDA;

-  pScreenPriv->pwinCreatePrimarySurface = winCreatePrimarySurfaceShadowDD;

-  pScreenPriv->pwinReleasePrimarySurface = winReleasePrimarySurfaceShadowDD;

-#ifdef XWIN_MULTIWINDOW

-  pScreenPriv->pwinFinishCreateWindowsWindow =

-    (winFinishCreateWindowsWindowProcPtr) (void (*)(void))NoopDDA;

-#endif

-

-  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
+ */
+
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
+#include "win.h"
+
+
+/*
+ * FIXME: Headers are broken, DEFINE_GUID doesn't work correctly,
+ * so we have to redefine it here.
+ */
+#ifdef DEFINE_GUID
+#undef DEFINE_GUID
+#define DEFINE_GUID(n,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8) const GUID n GUID_SECT = {l,w1,w2,{b1,b2,b3,b4,b5,b6,b7,b8}}
+#endif /* DEFINE_GUID */
+
+
+/*
+ * FIXME: Headers are broken, IID_IDirectDraw2 has to be defined
+ * here manually.  Should be handled by ddraw.h
+ */
+#ifndef IID_IDirectDraw2
+DEFINE_GUID( IID_IDirectDraw2,0xB3A6F3E0,0x2B43,0x11CF,0xA2,0xDE,0x00,0xAA,0x00,0xB9,0x33,0x56 );
+#endif /* IID_IDirectDraw2 */
+
+
+/*
+ * Local prototypes
+ */
+
+static Bool
+winAllocateFBShadowDD (ScreenPtr pScreen);
+
+static void
+winShadowUpdateDD (ScreenPtr pScreen, 
+		   shadowBufPtr pBuf);
+
+static Bool
+winCloseScreenShadowDD (int nIndex, ScreenPtr pScreen);
+
+static Bool
+winInitVisualsShadowDD (ScreenPtr pScreen);
+
+static Bool
+winAdjustVideoModeShadowDD (ScreenPtr pScreen);
+
+static Bool
+winBltExposedRegionsShadowDD (ScreenPtr pScreen);
+
+static Bool
+winActivateAppShadowDD (ScreenPtr pScreen);
+
+static Bool
+winRedrawScreenShadowDD (ScreenPtr pScreen);
+
+static Bool
+winRealizeInstalledPaletteShadowDD (ScreenPtr pScreen);
+
+static Bool
+winInstallColormapShadowDD (ColormapPtr pColormap);
+
+static Bool
+winStoreColorsShadowDD (ColormapPtr pmap, 
+			int ndef,
+			xColorItem *pdefs);
+
+static Bool
+winCreateColormapShadowDD (ColormapPtr pColormap);
+
+static Bool
+winDestroyColormapShadowDD (ColormapPtr pColormap);
+
+static Bool
+winCreatePrimarySurfaceShadowDD (ScreenPtr pScreen);
+
+static Bool
+winReleasePrimarySurfaceShadowDD (ScreenPtr pScreen);
+
+
+/*
+ * Create the primary surface and attach the clipper.
+ * Used for both the initial surface creation and during
+ * WM_DISPLAYCHANGE messages.
+ */
+
+static Bool
+winCreatePrimarySurfaceShadowDD (ScreenPtr pScreen)
+{
+  winScreenPriv(pScreen);
+  HRESULT		ddrval = DD_OK;
+  DDSURFACEDESC		ddsd;
+
+  /* Describe the primary surface */
+  ZeroMemory (&ddsd, sizeof (ddsd));
+  ddsd.dwSize = sizeof (ddsd);
+  ddsd.dwFlags = DDSD_CAPS;
+  ddsd.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE;
+  
+  /* Create the primary surface */
+  ddrval = IDirectDraw2_CreateSurface (pScreenPriv->pdd2,
+				       &ddsd,
+				       &pScreenPriv->pddsPrimary,
+				       NULL);
+  if (FAILED (ddrval))
+    {
+      ErrorF ("winCreatePrimarySurfaceShadowDD - Could not create primary "
+	      "surface: %08x\n", (unsigned int) ddrval);
+      return FALSE;
+    }
+  
+#if CYGDEBUG
+  winDebug ("winCreatePrimarySurfaceShadowDD - Created primary surface\n");
+#endif
+
+  /*
+   * Attach a clipper to the primary surface that will clip our blits to our
+   * display window.
+   */
+  ddrval = IDirectDrawSurface2_SetClipper (pScreenPriv->pddsPrimary,
+					   pScreenPriv->pddcPrimary);
+  if (FAILED (ddrval))
+    {
+      ErrorF ("winCreatePrimarySurfaceShadowDD - Primary attach clipper "
+	      "failed: %08x\n",
+	      (unsigned int) ddrval);
+      return FALSE;
+    }
+
+#if CYGDEBUG
+  winDebug ("winCreatePrimarySurfaceShadowDD - Attached clipper to "
+	  "primary surface\n");
+#endif
+
+  /* Everything was correct */
+  return TRUE;
+}
+
+
+/*
+ * Detach the clipper and release the primary surface.
+ * Called from WM_DISPLAYCHANGE.
+ */
+
+static Bool
+winReleasePrimarySurfaceShadowDD (ScreenPtr pScreen)
+{
+  winScreenPriv(pScreen);
+
+  ErrorF ("winReleasePrimarySurfaceShadowDD - Hello\n");
+
+  /* Release the primary surface and clipper, if they exist */
+  if (pScreenPriv->pddsPrimary)
+    {
+      /*
+       * Detach the clipper from the primary surface.
+       * NOTE: We do this explicity for clarity.  The Clipper is not released.
+       */
+      IDirectDrawSurface2_SetClipper (pScreenPriv->pddsPrimary,
+				      NULL);
+
+      ErrorF ("winReleasePrimarySurfaceShadowDD - Detached clipper\n");
+
+      /* Release the primary surface */
+      IDirectDrawSurface2_Release (pScreenPriv->pddsPrimary);
+      pScreenPriv->pddsPrimary = NULL;
+    }
+
+  ErrorF ("winReleasePrimarySurfaceShadowDD - Released primary surface\n");
+
+  return TRUE;
+}
+
+
+/*
+ * Create a DirectDraw surface for the shadow framebuffer; also create
+ * a primary surface object so we can blit to the display.
+ * 
+ * Install a DirectDraw clipper on our primary surface object
+ * that clips our blits to the unobscured client area of our display window.
+ */
+
+static Bool
+winAllocateFBShadowDD (ScreenPtr pScreen)
+{
+  winScreenPriv(pScreen);
+  winScreenInfo		*pScreenInfo = pScreenPriv->pScreenInfo;  
+  HRESULT		ddrval = DD_OK;
+  DDSURFACEDESC		ddsd;
+  DDSURFACEDESC		*pddsdShadow = NULL;
+
+#if CYGDEBUG
+  winDebug ("winAllocateFBShadowDD\n");
+#endif
+
+  /* Create a clipper */
+  ddrval = (*g_fpDirectDrawCreateClipper) (0,
+					   &pScreenPriv->pddcPrimary,
+					   NULL);
+  if (FAILED (ddrval))
+    {
+      ErrorF ("winAllocateFBShadowDD - Could not create clipper: %08x\n",
+	      (unsigned int) ddrval);
+      return FALSE;
+    }
+
+#if CYGDEBUG
+  winDebug ("winAllocateFBShadowDD - Created a clipper\n");
+#endif
+
+  /* Attach the clipper to our display window */
+  ddrval = IDirectDrawClipper_SetHWnd (pScreenPriv->pddcPrimary,
+				       0,
+				       pScreenPriv->hwndScreen);
+  if (FAILED (ddrval))
+    {
+      ErrorF ("winAllocateFBShadowDD - Clipper not attached to "
+	      "window: %08x\n",
+	      (unsigned int) ddrval);
+      return FALSE;
+    }
+
+#if CYGDEBUG
+  winDebug ("winAllocateFBShadowDD - Attached clipper to window\n");
+#endif
+
+  /* Create a DirectDraw object, store the address at lpdd */
+  ddrval = (*g_fpDirectDrawCreate) (NULL, &pScreenPriv->pdd, NULL);
+  if (FAILED (ddrval))
+    {
+      ErrorF ("winAllocateFBShadowDD - Could not start DirectDraw: %08x\n",
+	      (unsigned int) ddrval);
+      return FALSE;
+    }
+
+#if CYGDEBUG
+  winDebug ("winAllocateFBShadowDD () - Created and initialized DD\n");
+#endif
+
+  /* Get a DirectDraw2 interface pointer */
+  ddrval = IDirectDraw_QueryInterface (pScreenPriv->pdd,
+				       &IID_IDirectDraw2,
+				       (LPVOID*) &pScreenPriv->pdd2);
+  if (FAILED (ddrval))
+    {
+      ErrorF ("winAllocateFBShadowDD - Failed DD2 query: %08x\n",
+	      (unsigned int) ddrval);
+      return FALSE;
+    }
+
+  /* Are we full screen? */
+  if (pScreenInfo->fFullScreen)
+    {
+      DDSURFACEDESC	ddsdCurrent;
+      DWORD		dwRefreshRateCurrent = 0;
+      HDC		hdc = NULL;
+
+      /* Set the cooperative level to full screen */
+      ddrval = IDirectDraw2_SetCooperativeLevel (pScreenPriv->pdd2,
+						 pScreenPriv->hwndScreen,
+						 DDSCL_EXCLUSIVE
+						 | DDSCL_FULLSCREEN);
+      if (FAILED (ddrval))
+	{
+	  ErrorF ("winAllocateFBShadowDD - Could not set "
+		  "cooperative level: %08x\n",
+		  (unsigned int) ddrval);
+	  return FALSE;
+	}
+
+      /*
+       * We only need to get the current refresh rate for comparison
+       * if a refresh rate has been passed on the command line.
+       */
+      if (pScreenInfo->dwRefreshRate != 0)
+	{
+	  ZeroMemory (&ddsdCurrent, sizeof (ddsdCurrent));
+	  ddsdCurrent.dwSize = sizeof (ddsdCurrent);
+	  
+	  /* Get information about current display settings */
+	  ddrval = IDirectDraw2_GetDisplayMode (pScreenPriv->pdd2,
+						&ddsdCurrent);
+	  if (FAILED (ddrval))
+	    {
+	      ErrorF ("winAllocateFBShadowDD - Could not get current "
+		      "refresh rate: %08x.  Continuing.\n",
+		      (unsigned int) ddrval);
+	      dwRefreshRateCurrent = 0;
+	    }
+	  else
+	    {
+	      /* Grab the current refresh rate */
+	      dwRefreshRateCurrent = ddsdCurrent.u2.dwRefreshRate;
+	    }
+	}
+
+      /* Clean up the refresh rate */
+      if (dwRefreshRateCurrent == pScreenInfo->dwRefreshRate)
+	{
+	  /*
+	   * Refresh rate is non-specified or equal to current.
+	   */
+	  pScreenInfo->dwRefreshRate = 0;
+	}
+
+      /* Grab a device context for the screen */
+      hdc = GetDC (NULL);
+      if (hdc == NULL)
+	{
+	  ErrorF ("winAllocateFBShadowDD - GetDC () failed\n");
+	  return FALSE;
+	}
+
+      /* Only change the video mode when different than current mode */
+      if (!pScreenInfo->fMultipleMonitors
+	  && (pScreenInfo->dwWidth != GetSystemMetrics (SM_CXSCREEN)
+	      || pScreenInfo->dwHeight != GetSystemMetrics (SM_CYSCREEN)
+	      || pScreenInfo->dwBPP != GetDeviceCaps (hdc, BITSPIXEL)
+	      || pScreenInfo->dwRefreshRate != 0))
+	{
+	  ErrorF ("winAllocateFBShadowDD - Changing video mode\n");
+
+	  /* Change the video mode to the mode requested, and use the driver default refresh rate on failure */
+	  ddrval = IDirectDraw2_SetDisplayMode (pScreenPriv->pdd2,
+						pScreenInfo->dwWidth,
+						pScreenInfo->dwHeight,
+						pScreenInfo->dwBPP,
+						pScreenInfo->dwRefreshRate,
+						0);
+	  if (FAILED (ddrval))
+	    {
+	      ErrorF ("winAllocateFBShadowDD - Could not set "\
+		      "full screen display mode: %08x\n",
+		      (unsigned int) ddrval);
+	      ErrorF ("winAllocateFBShadowDD - Using default driver refresh rate\n");
+	      ddrval = IDirectDraw2_SetDisplayMode (pScreenPriv->pdd2,
+						    pScreenInfo->dwWidth,
+						    pScreenInfo->dwHeight,
+						    pScreenInfo->dwBPP,
+						    0,
+						    0);
+	      if (FAILED(ddrval))
+		{
+			ErrorF ("winAllocateFBShadowDD - Could not set default refresh rate "
+				"full screen display mode: %08x\n",
+				(unsigned int) ddrval);
+			return FALSE;
+		}
+	    }
+	}
+      else
+	{
+	  ErrorF ("winAllocateFBShadowDD - Not changing video mode\n");
+	}
+
+      /* Release our DC */
+      ReleaseDC (NULL, hdc);
+      hdc = NULL;
+    }
+  else
+    {
+      /* Set the cooperative level for windowed mode */
+      ddrval = IDirectDraw2_SetCooperativeLevel (pScreenPriv->pdd2,
+						 pScreenPriv->hwndScreen,
+						 DDSCL_NORMAL);
+      if (FAILED (ddrval))
+	{
+	  ErrorF ("winAllocateFBShadowDD - Could not set "\
+		  "cooperative level: %08x\n",
+		  (unsigned int) ddrval);
+	  return FALSE;
+	}
+    }
+
+  /* Create the primary surface */
+  if (!winCreatePrimarySurfaceShadowDD (pScreen))
+    {
+      ErrorF ("winAllocateFBShadowDD - winCreatePrimarySurfaceShadowDD "
+	      "failed\n");
+      return FALSE;
+    }
+
+  /* Describe the shadow surface to be created */
+  /* NOTE: Do not use a DDSCAPS_VIDEOMEMORY surface,
+   * as drawing, locking, and unlocking take forever
+   * with video memory surfaces.  In addition,
+   * video memory is a somewhat scarce resource,
+   * so you shouldn't be allocating video memory when
+   * you have the option of using system memory instead.
+   */
+  ZeroMemory (&ddsd, sizeof (ddsd));
+  ddsd.dwSize = sizeof (ddsd);
+  ddsd.dwFlags = DDSD_CAPS | DDSD_HEIGHT | DDSD_WIDTH;
+  ddsd.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN | DDSCAPS_SYSTEMMEMORY;
+  ddsd.dwHeight = pScreenInfo->dwHeight;
+  ddsd.dwWidth = pScreenInfo->dwWidth;
+
+  /* Create the shadow surface */
+  ddrval = IDirectDraw2_CreateSurface (pScreenPriv->pdd2,
+				       &ddsd,
+				       &pScreenPriv->pddsShadow,
+				       NULL);
+  if (FAILED (ddrval))
+    {
+      ErrorF ("winAllocateFBShadowDD - Could not create shadow "\
+	      "surface: %08x\n", (unsigned int) ddrval);
+      return FALSE;
+    }
+  
+#if CYGDEBUG
+  winDebug ("winAllocateFBShadowDD - Created shadow\n");
+#endif
+
+  /* Allocate a DD surface description for our screen privates */
+  pddsdShadow = pScreenPriv->pddsdShadow = malloc (sizeof (DDSURFACEDESC));
+  if (pddsdShadow == NULL)
+    {
+      ErrorF ("winAllocateFBShadowDD - Could not allocate surface "\
+	      "description memory\n");
+      return FALSE;
+    }
+  ZeroMemory (pddsdShadow, sizeof (*pddsdShadow));
+  pddsdShadow->dwSize = sizeof (*pddsdShadow);
+
+#if CYGDEBUG
+  winDebug ("winAllocateFBShadowDD - Locking shadow\n");
+#endif
+
+  /* Lock the shadow surface */
+  ddrval = IDirectDrawSurface2_Lock (pScreenPriv->pddsShadow,
+				     NULL,
+				     pddsdShadow,
+				     DDLOCK_WAIT,
+				     NULL);
+  if (FAILED (ddrval) || pddsdShadow->lpSurface == NULL)
+    {
+      ErrorF ("winAllocateFBShadowDD - Could not lock shadow "\
+	      "surface: %08x\n", (unsigned int) ddrval);
+      return FALSE;
+    }
+
+#if CYGDEBUG
+  winDebug ("winAllocateFBShadowDD - Locked shadow\n");
+#endif
+
+  /* We don't know how to deal with anything other than RGB */
+  if (!(pddsdShadow->ddpfPixelFormat.dwFlags & DDPF_RGB))
+    {
+      ErrorF ("winAllocateFBShadowDD - Color format other than RGB\n");
+      return FALSE;
+    }
+
+  /* Grab the pitch from the surface desc */
+  pScreenInfo->dwStride = (pddsdShadow->u1.lPitch * 8)
+    / pScreenInfo->dwBPP;
+
+  /* Save the pointer to our surface memory */
+  pScreenInfo->pfb = pddsdShadow->lpSurface;
+  
+  /* Grab the color depth and masks from the surface description */
+  pScreenPriv->dwRedMask = pddsdShadow->ddpfPixelFormat.u2.dwRBitMask;
+  pScreenPriv->dwGreenMask = pddsdShadow->ddpfPixelFormat.u3.dwGBitMask;
+  pScreenPriv->dwBlueMask = pddsdShadow->ddpfPixelFormat.u4.dwBBitMask;
+
+#if CYGDEBUG
+  winDebug ("winAllocateFBShadowDD - Returning\n");
+#endif
+
+  return TRUE;
+}
+
+static void
+winFreeFBShadowDD (ScreenPtr pScreen)
+{
+  winScreenPriv(pScreen);
+  winScreenInfo *pScreenInfo = pScreenPriv->pScreenInfo;
+
+  /* Free the shadow surface, if there is one */
+  if (pScreenPriv->pddsShadow)
+    {
+      IDirectDrawSurface2_Unlock (pScreenPriv->pddsShadow, NULL);
+      IDirectDrawSurface2_Release (pScreenPriv->pddsShadow);
+      pScreenPriv->pddsShadow = NULL;
+    }
+
+  /* Detach the clipper from the primary surface and release the primary surface, if there is one */
+  winReleasePrimarySurfaceShadowDD(pScreen);
+
+  /* Release the clipper object */
+  if (pScreenPriv->pddcPrimary)
+    {
+      IDirectDrawClipper_Release (pScreenPriv->pddcPrimary);
+      pScreenPriv->pddcPrimary = NULL;
+    }
+
+  /* Free the DirectDraw2 object, if there is one */
+  if (pScreenPriv->pdd2)
+    {
+      IDirectDraw2_RestoreDisplayMode (pScreenPriv->pdd2);
+      IDirectDraw2_Release (pScreenPriv->pdd2);
+      pScreenPriv->pdd2 = NULL;
+    }
+
+  /* Free the DirectDraw object, if there is one */
+  if (pScreenPriv->pdd)
+    {
+      IDirectDraw_Release (pScreenPriv->pdd);
+      pScreenPriv->pdd = NULL;
+    }
+
+  /* Invalidate the ScreenInfo's fb pointer */
+  pScreenInfo->pfb = NULL;
+}
+
+/*
+ * Transfer the damaged regions of the shadow framebuffer to the display.
+ */
+
+static void
+winShadowUpdateDD (ScreenPtr pScreen, 
+		   shadowBufPtr pBuf)
+{
+  winScreenPriv(pScreen);
+  winScreenInfo		*pScreenInfo = pScreenPriv->pScreenInfo;
+  RegionPtr		damage = shadowDamage(pBuf);
+  HRESULT		ddrval = DD_OK;
+  RECT			rcDest, rcSrc;
+  POINT			ptOrigin;
+  DWORD			dwBox = RegionNumRects (damage);
+  BoxPtr		pBox = RegionRects (damage);
+  HRGN			hrgnTemp = NULL, hrgnCombined = NULL;
+
+  /*
+   * Return immediately if the app is not active
+   * and we are fullscreen, or if we have a bad display depth
+   */
+  if ((!pScreenPriv->fActive && pScreenInfo->fFullScreen)
+      || pScreenPriv->fBadDepth) return;
+
+  /* Return immediately if we didn't get needed surfaces */
+  if (!pScreenPriv->pddsPrimary || !pScreenPriv->pddsShadow)
+    return;
+
+  /* Get the origin of the window in the screen coords */
+  ptOrigin.x = pScreenInfo->dwXOffset;
+  ptOrigin.y = pScreenInfo->dwYOffset;
+  MapWindowPoints (pScreenPriv->hwndScreen,
+		   HWND_DESKTOP,
+		   (LPPOINT)&ptOrigin, 1);
+
+  /* Unlock the shadow surface, so we can blit */
+  ddrval = IDirectDrawSurface2_Unlock (pScreenPriv->pddsShadow, NULL);
+  if (FAILED (ddrval))
+    {
+      ErrorF ("winShadowUpdateDD - Unlock failed\n");
+      return;
+    }
+
+  /*
+   * Handle small regions with multiple blits,
+   * handle large regions by creating a clipping region and 
+   * doing a single blit constrained to that clipping region.
+   */
+  if (pScreenInfo->dwClipUpdatesNBoxes == 0
+      || dwBox < pScreenInfo->dwClipUpdatesNBoxes)
+    {
+      /* Loop through all boxes in the damaged region */
+      while (dwBox--)
+	{
+	  /* Assign damage box to source rectangle */
+	  rcSrc.left = pBox->x1;
+	  rcSrc.top = pBox->y1;
+	  rcSrc.right = pBox->x2;
+	  rcSrc.bottom = pBox->y2;
+	  
+	  /* Calculate destination rectange */
+	  rcDest.left = ptOrigin.x + rcSrc.left;
+	  rcDest.top = ptOrigin.y + rcSrc.top;
+	  rcDest.right = ptOrigin.x + rcSrc.right;
+	  rcDest.bottom = ptOrigin.y + rcSrc.bottom;
+	  
+	  /* Blit the damaged areas */
+	  ddrval = IDirectDrawSurface2_Blt (pScreenPriv->pddsPrimary,
+					    &rcDest,
+					    pScreenPriv->pddsShadow,
+					    &rcSrc,
+					    DDBLT_WAIT,
+					    NULL);
+	  
+	  /* Get a pointer to the next box */
+	  ++pBox;
+	}
+    }
+  else
+    {
+      BoxPtr		pBoxExtents = RegionExtents(damage);
+
+      /* Compute a GDI region from the damaged region */
+      hrgnCombined = CreateRectRgn (pBox->x1, pBox->y1, pBox->x2, pBox->y2);
+      dwBox--;
+      pBox++;
+      while (dwBox--)
+	{
+	  hrgnTemp = CreateRectRgn (pBox->x1, pBox->y1, pBox->x2, pBox->y2);
+	  CombineRgn (hrgnCombined, hrgnCombined, hrgnTemp, RGN_OR);
+	  DeleteObject (hrgnTemp);
+	  pBox++;
+	}  
+
+      /* Install the GDI region as a clipping region */
+      SelectClipRgn (pScreenPriv->hdcScreen, hrgnCombined);
+      DeleteObject (hrgnCombined);
+      hrgnCombined = NULL;
+
+      /* Calculating a bounding box for the source is easy */
+      rcSrc.left = pBoxExtents->x1;
+      rcSrc.top = pBoxExtents->y1;
+      rcSrc.right = pBoxExtents->x2;
+      rcSrc.bottom = pBoxExtents->y2;
+
+      /* Calculating a bounding box for the destination is trickier */
+      rcDest.left = ptOrigin.x + rcSrc.left;
+      rcDest.top = ptOrigin.y + rcSrc.top;
+      rcDest.right = ptOrigin.x + rcSrc.right;
+      rcDest.bottom = ptOrigin.y + rcSrc.bottom;
+      
+      /* Our Blt should be clipped to the invalidated region */
+      ddrval = IDirectDrawSurface2_Blt (pScreenPriv->pddsPrimary,
+					&rcDest,
+					pScreenPriv->pddsShadow,
+					&rcSrc,
+					DDBLT_WAIT,
+					NULL);
+
+      /* Reset the clip region */
+      SelectClipRgn (pScreenPriv->hdcScreen, NULL);
+    }
+
+  /* Relock the shadow surface */
+  ddrval = IDirectDrawSurface2_Lock (pScreenPriv->pddsShadow,
+				     NULL,
+				     pScreenPriv->pddsdShadow,
+				     DDLOCK_WAIT,
+				     NULL);
+  if (FAILED (ddrval))
+    {
+      ErrorF ("winShadowUpdateDD - Lock failed\n");
+      return;
+    }
+
+  /* Has our memory pointer changed? */
+  if (pScreenInfo->pfb != pScreenPriv->pddsdShadow->lpSurface)
+    {
+      ErrorF ("winShadowUpdateDD - Memory location of the shadow "
+	      "surface has changed, trying to update the root window "
+	      "pixmap header to point to the new address.  If you get "
+	      "this message and "PROJECT_NAME" freezes or crashes "
+	      "after this message then send a problem report and your "
+	      "%s file to " BUILDERADDR "\n", g_pszLogFile);
+
+      /* Location of shadow framebuffer has changed */
+      winUpdateFBPointer(pScreen, pScreenPriv->pddsdShadow->lpSurface);
+    }
+}
+
+static Bool
+winInitScreenShadowDD (ScreenPtr pScreen)
+{
+  winScreenPriv(pScreen);
+
+  /* Get a device context for the screen  */
+  pScreenPriv->hdcScreen = GetDC (pScreenPriv->hwndScreen);
+
+  return winAllocateFBShadowDD(pScreen);
+}
+
+/*
+ * Call the wrapped CloseScreen function.
+ * 
+ * Free our resources and private structures.
+ */
+
+static Bool
+winCloseScreenShadowDD (int nIndex, ScreenPtr pScreen)
+{
+  winScreenPriv(pScreen);
+  winScreenInfo		*pScreenInfo = pScreenPriv->pScreenInfo;
+  Bool			fReturn;
+  
+#if CYGDEBUG
+  winDebug ("winCloseScreenShadowDD - Freeing screen resources\n");
+#endif
+
+  /* Flag that the screen is closed */
+  pScreenPriv->fClosed = TRUE;
+  pScreenPriv->fActive = FALSE;
+
+  /* Call the wrapped CloseScreen procedure */
+  WIN_UNWRAP(CloseScreen);
+  fReturn = (*pScreen->CloseScreen) (nIndex, pScreen);
+
+  winFreeFBShadowDD(pScreen);
+
+  /* Free the screen DC */
+  ReleaseDC (pScreenPriv->hwndScreen, pScreenPriv->hdcScreen);
+
+  /* Delete the window property */
+  RemoveProp (pScreenPriv->hwndScreen, WIN_SCR_PROP);
+
+  /* Delete tray icon, if we have one */
+  if (!pScreenInfo->fNoTrayIcon)
+    winDeleteNotifyIcon (pScreenPriv);
+
+  /* Free the exit confirmation dialog box, if it exists */
+  if (g_hDlgExit != NULL)
+    {
+      DestroyWindow (g_hDlgExit);
+      g_hDlgExit = NULL;
+    }
+
+  /* Kill our window */
+  if (pScreenPriv->hwndScreen)
+    {
+      DestroyWindow (pScreenPriv->hwndScreen);
+      pScreenPriv->hwndScreen = NULL;
+    }
+
+#if defined(XWIN_CLIPBOARD) || defined(XWIN_MULTIWINDOW)
+  /* Destroy the thread startup mutex */
+  pthread_mutex_destroy (&pScreenPriv->pmServerStarted);
+#endif
+
+  /* Kill our screeninfo's pointer to the screen */
+  pScreenInfo->pScreen = NULL;
+
+  /* Free the screen privates for this screen */
+  free ((pointer) pScreenPriv);
+
+  return fReturn;
+}
+
+
+/*
+ * Tell mi what sort of visuals we need.
+ * 
+ * Generally we only need one visual, as our screen can only
+ * handle one format at a time, I believe.  You may want
+ * to verify that last sentence.
+ */
+
+static Bool
+winInitVisualsShadowDD (ScreenPtr pScreen)
+{
+  winScreenPriv(pScreen);
+  winScreenInfo		*pScreenInfo = pScreenPriv->pScreenInfo;
+  DWORD			dwRedBits, dwGreenBits, dwBlueBits;
+
+  /* Count the number of ones in each color mask */
+  dwRedBits = winCountBits (pScreenPriv->dwRedMask);
+  dwGreenBits = winCountBits (pScreenPriv->dwGreenMask);
+  dwBlueBits = winCountBits (pScreenPriv->dwBlueMask);
+  
+  /* Store the maximum number of ones in a color mask as the bitsPerRGB */
+  if (dwRedBits == 0 || dwGreenBits == 0 || dwBlueBits == 0)
+    pScreenPriv->dwBitsPerRGB = 8;
+  else if (dwRedBits > dwGreenBits && dwRedBits > dwBlueBits)
+    pScreenPriv->dwBitsPerRGB = dwRedBits;
+  else if (dwGreenBits > dwRedBits && dwGreenBits > dwBlueBits)
+    pScreenPriv->dwBitsPerRGB = dwGreenBits;
+  else
+    pScreenPriv->dwBitsPerRGB = dwBlueBits;
+  
+  ErrorF ("winInitVisualsShadowDD - Masks %08x %08x %08x BPRGB %d d %d "
+	  "bpp %d\n",
+	  (unsigned int) pScreenPriv->dwRedMask,
+	  (unsigned int) pScreenPriv->dwGreenMask,
+	  (unsigned int) pScreenPriv->dwBlueMask,
+	  (int) pScreenPriv->dwBitsPerRGB,
+	  (int) pScreenInfo->dwDepth,
+	  (int) pScreenInfo->dwBPP);
+
+  /* Create a single visual according to the Windows screen depth */
+  switch (pScreenInfo->dwDepth)
+    {
+    case 24:
+    case 16:
+    case 15:
+      /* Create the real visual */
+      if (!miSetVisualTypesAndMasks (pScreenInfo->dwDepth,
+				     TrueColorMask,
+				     pScreenPriv->dwBitsPerRGB,
+				     TrueColor,
+				     pScreenPriv->dwRedMask,
+				     pScreenPriv->dwGreenMask,
+				     pScreenPriv->dwBlueMask))
+	{
+	  ErrorF ("winInitVisualsShadowDD - miSetVisualTypesAndMasks "
+		  "failed for TrueColor\n");
+	  return FALSE;
+	}
+
+#ifdef XWIN_EMULATEPSEUDO
+      if (!pScreenInfo->fEmulatePseudo)
+	break;
+
+      /* Setup a pseudocolor visual */
+      if (!miSetVisualTypesAndMasks (8,
+				     PseudoColorMask,
+				     8,
+				     -1,
+				     0,
+				     0,
+				     0))
+	{
+	  ErrorF ("winInitVisualsShadowDD - miSetVisualTypesAndMasks "
+		  "failed for PseudoColor\n");
+	  return FALSE;
+	}
+#endif
+      break;
+
+    case 8:
+      if (!miSetVisualTypesAndMasks (pScreenInfo->dwDepth,
+				     pScreenInfo->fFullScreen 
+				     ? PseudoColorMask : StaticColorMask,
+				     pScreenPriv->dwBitsPerRGB,
+				     pScreenInfo->fFullScreen 
+				     ? PseudoColor : StaticColor,
+				     pScreenPriv->dwRedMask,
+				     pScreenPriv->dwGreenMask,
+				     pScreenPriv->dwBlueMask))
+	{
+	  ErrorF ("winInitVisualsShadowDD - miSetVisualTypesAndMasks "
+		  "failed\n");
+	  return FALSE;
+	}
+      break;
+
+    default:
+      ErrorF ("winInitVisualsShadowDD - Unknown screen depth\n");
+      return FALSE;
+    }
+
+#if CYGDEBUG
+  winDebug ("winInitVisualsShadowDD - Returning\n");
+#endif
+
+  return TRUE;
+}
+
+
+/*
+ * Adjust the user proposed video mode
+ */
+
+static Bool
+winAdjustVideoModeShadowDD (ScreenPtr pScreen)
+{
+  winScreenPriv(pScreen);
+  winScreenInfo		*pScreenInfo = pScreenPriv->pScreenInfo;
+  HDC			hdc = NULL;
+  DWORD			dwBPP;
+
+  /* We're in serious trouble if we can't get a DC */
+  hdc = GetDC (NULL);
+  if (hdc == NULL)
+    {
+      ErrorF ("winAdjustVideoModeShadowDD - GetDC () failed\n");
+      return FALSE;
+    }
+
+  /* Query GDI for current display depth */
+  dwBPP = GetDeviceCaps (hdc, BITSPIXEL);
+
+  /* DirectDraw can only change the depth in fullscreen mode */
+  if (!(pScreenInfo->fFullScreen &&
+        (pScreenInfo->dwBPP != WIN_DEFAULT_BPP)))
+    {
+      /* Otherwise, We'll use GDI's depth */
+      pScreenInfo->dwBPP = dwBPP;
+    }
+
+  /* Release our DC */
+  ReleaseDC (NULL, hdc);
+  return TRUE;
+}
+
+
+/*
+ * Blt exposed regions to the screen
+ */
+
+static Bool
+winBltExposedRegionsShadowDD (ScreenPtr pScreen)
+{
+  winScreenPriv(pScreen);
+  winScreenInfo		*pScreenInfo = pScreenPriv->pScreenInfo;
+  RECT			rcSrc, rcDest;
+  POINT			ptOrigin;
+  HDC			hdcUpdate = NULL;
+  PAINTSTRUCT		ps;
+  HRESULT		ddrval = DD_OK;
+  Bool			fReturn = TRUE;
+  Bool			fLocked = TRUE;
+  int			i;
+
+  /* BeginPaint gives us an hdc that clips to the invalidated region */
+  hdcUpdate = BeginPaint (pScreenPriv->hwndScreen, &ps);
+  if (hdcUpdate == NULL)
+    {
+      ErrorF ("winBltExposedRegionsShadowDD - BeginPaint () returned "
+	      "a NULL device context handle.  Aborting blit attempt.\n");
+      return FALSE;
+    }
+  
+  /* Unlock the shadow surface, so we can blit */
+  ddrval = IDirectDrawSurface2_Unlock (pScreenPriv->pddsShadow, NULL);
+  if (FAILED (ddrval))
+    {
+      fReturn = FALSE;
+      goto winBltExposedRegionsShadowDD_Exit;
+    }
+  else
+    {
+      /* Flag that we have unlocked the shadow surface */
+      fLocked = FALSE;
+    }
+
+  /* Get the origin of the window in the screen coords */
+  ptOrigin.x = pScreenInfo->dwXOffset;
+  ptOrigin.y = pScreenInfo->dwYOffset;
+
+  MapWindowPoints (pScreenPriv->hwndScreen,
+		   HWND_DESKTOP,
+		   (LPPOINT)&ptOrigin, 1);
+  rcDest.left = ptOrigin.x;
+  rcDest.right = ptOrigin.x + pScreenInfo->dwWidth;
+  rcDest.top = ptOrigin.y;
+  rcDest.bottom = ptOrigin.y + pScreenInfo->dwHeight;
+
+  /* Source can be enter shadow surface, as Blt should clip */
+  rcSrc.left = 0;
+  rcSrc.top = 0;
+  rcSrc.right = pScreenInfo->dwWidth;
+  rcSrc.bottom = pScreenInfo->dwHeight;
+
+  /* Try to regain the primary surface and blit again if we've lost it */
+  for (i = 0; i <= WIN_REGAIN_SURFACE_RETRIES; ++i)
+    {
+      /* Our Blt should be clipped to the invalidated region */
+      ddrval = IDirectDrawSurface2_Blt (pScreenPriv->pddsPrimary,
+					&rcDest,
+					pScreenPriv->pddsShadow,
+					&rcSrc,
+					DDBLT_WAIT,
+					NULL);
+      if (ddrval == DDERR_SURFACELOST)
+	{
+	  /* Surface was lost */
+	  ErrorF ("winBltExposedRegionsShadowDD - IDirectDrawSurface2_Blt "
+		  "reported that the primary surface was lost, "
+		  "trying to restore, retry: %d\n", i + 1);
+
+	  /* Try to restore the surface, once */
+	  ddrval = IDirectDrawSurface2_Restore (pScreenPriv->pddsPrimary);
+	  ErrorF ("winBltExposedRegionsShadowDD - "
+		  "IDirectDrawSurface2_Restore returned: ");
+	  if (ddrval == DD_OK)
+	    ErrorF ("DD_OK\n");
+	  else if (ddrval == DDERR_WRONGMODE)
+	    ErrorF ("DDERR_WRONGMODE\n");
+	  else if (ddrval == DDERR_INCOMPATIBLEPRIMARY)
+	    ErrorF ("DDERR_INCOMPATIBLEPRIMARY\n");
+	  else if (ddrval == DDERR_UNSUPPORTED)
+	    ErrorF ("DDERR_UNSUPPORTED\n");
+	  else if (ddrval == DDERR_INVALIDPARAMS)
+	    ErrorF ("DDERR_INVALIDPARAMS\n");
+	  else if (ddrval == DDERR_INVALIDOBJECT)
+	    ErrorF ("DDERR_INVALIDOBJECT\n");
+	  else
+	    ErrorF ("unknown error: %08x\n", (unsigned int) ddrval);
+
+	  /* Loop around to try the blit one more time */
+	  continue;
+	}
+      else if (FAILED (ddrval))
+	{
+	  fReturn = FALSE;
+	  ErrorF ("winBltExposedRegionsShadowDD - IDirectDrawSurface2_Blt "
+		  "failed, but surface not lost: %08x %d\n",
+		  (unsigned int) ddrval, (int) ddrval);
+	  goto winBltExposedRegionsShadowDD_Exit;
+	}
+      else
+	{
+	  /* Success, stop looping */
+	  break;
+	}
+    }
+
+  /* Relock the shadow surface */
+  ddrval = IDirectDrawSurface2_Lock (pScreenPriv->pddsShadow,
+				     NULL,
+				     pScreenPriv->pddsdShadow,
+				     DDLOCK_WAIT,
+				     NULL);
+  if (FAILED (ddrval))
+    {
+      fReturn = FALSE;
+      ErrorF ("winBltExposedRegionsShadowDD - IDirectDrawSurface2_Lock "
+	      "failed\n");
+      goto winBltExposedRegionsShadowDD_Exit;
+    }
+  else
+    {
+      /* Indicate that we have relocked the shadow surface */
+      fLocked = TRUE;
+    }
+
+  /* Has our memory pointer changed? */
+  if (pScreenInfo->pfb != pScreenPriv->pddsdShadow->lpSurface)
+    winUpdateFBPointer (pScreen,
+			pScreenPriv->pddsdShadow->lpSurface);
+
+ winBltExposedRegionsShadowDD_Exit:
+  /* EndPaint frees the DC */
+  if (hdcUpdate != NULL)
+    EndPaint (pScreenPriv->hwndScreen, &ps);
+
+  /*
+   * Relock the surface if it is not locked.  We don't care if locking fails,
+   * as it will cause the server to shutdown within a few more operations.
+   */
+  if (!fLocked)
+    {
+      IDirectDrawSurface2_Lock (pScreenPriv->pddsShadow,
+				NULL,
+				pScreenPriv->pddsdShadow,
+				DDLOCK_WAIT,
+				NULL);
+
+      /* Has our memory pointer changed? */
+      if (pScreenInfo->pfb != pScreenPriv->pddsdShadow->lpSurface)
+	winUpdateFBPointer (pScreen,
+			    pScreenPriv->pddsdShadow->lpSurface);
+      
+      fLocked = TRUE;
+    }
+  return fReturn;
+}
+
+
+/*
+ * Do any engine-specific appliation-activation processing
+ */
+
+static Bool
+winActivateAppShadowDD (ScreenPtr pScreen)
+{
+  winScreenPriv(pScreen);
+
+  /*
+   * Do we have a surface?
+   * Are we active?
+   * Are we fullscreen?
+   */
+  if (pScreenPriv != NULL
+      && pScreenPriv->pddsPrimary != NULL
+      && pScreenPriv->fActive)
+    {
+      /* Primary surface was lost, restore it */
+      IDirectDrawSurface2_Restore (pScreenPriv->pddsPrimary);
+    }
+
+  return TRUE;
+}
+
+
+/*
+ * Reblit the shadow framebuffer to the screen.
+ */
+
+static Bool
+winRedrawScreenShadowDD (ScreenPtr pScreen)
+{
+  winScreenPriv(pScreen);
+  winScreenInfo		*pScreenInfo = pScreenPriv->pScreenInfo;
+  HRESULT		ddrval = DD_OK;
+  RECT			rcSrc, rcDest;
+  POINT			ptOrigin;
+
+  /* Get the origin of the window in the screen coords */
+  ptOrigin.x = pScreenInfo->dwXOffset;
+  ptOrigin.y = pScreenInfo->dwYOffset;
+  MapWindowPoints (pScreenPriv->hwndScreen,
+		   HWND_DESKTOP,
+		   (LPPOINT)&ptOrigin, 1);
+  rcDest.left = ptOrigin.x;
+  rcDest.right = ptOrigin.x + pScreenInfo->dwWidth;
+  rcDest.top = ptOrigin.y;
+  rcDest.bottom = ptOrigin.y + pScreenInfo->dwHeight;
+
+  /* Source can be entire shadow surface, as Blt should clip for us */
+  rcSrc.left = 0;
+  rcSrc.top = 0;
+  rcSrc.right = pScreenInfo->dwWidth;
+  rcSrc.bottom = pScreenInfo->dwHeight;
+
+  /* Redraw the whole window, to take account for the new colors */
+  ddrval = IDirectDrawSurface2_Blt (pScreenPriv->pddsPrimary,
+				    &rcDest,
+				    pScreenPriv->pddsShadow,
+				    &rcSrc,
+				    DDBLT_WAIT,
+				    NULL);
+  if (FAILED (ddrval))
+    {
+      ErrorF ("winRedrawScreenShadowDD - IDirectDrawSurface_Blt () "
+	      "failed: %08x\n",
+	      (unsigned int) ddrval);
+    }
+
+  return TRUE;
+}
+
+
+/*
+ * Realize the currently installed colormap
+ */
+
+static Bool
+winRealizeInstalledPaletteShadowDD (ScreenPtr pScreen)
+{
+  return TRUE;
+}
+
+
+/*
+ * Install the specified colormap
+ */
+
+static Bool
+winInstallColormapShadowDD (ColormapPtr pColormap)
+{
+  ScreenPtr		pScreen = pColormap->pScreen;
+  winScreenPriv(pScreen);
+  winCmapPriv(pColormap);
+  HRESULT		ddrval = DD_OK;
+
+  /* Install the DirectDraw palette on the primary surface */
+  ddrval = IDirectDrawSurface2_SetPalette (pScreenPriv->pddsPrimary,
+					   pCmapPriv->lpDDPalette);
+  if (FAILED (ddrval))
+    {
+      ErrorF ("winInstallColormapShadowDD - Failed installing the "
+	      "DirectDraw palette.\n");
+      return FALSE;
+    }
+
+  /* Save a pointer to the newly installed colormap */
+  pScreenPriv->pcmapInstalled = pColormap;
+
+  return TRUE;
+}
+
+
+/*
+ * Store the specified colors in the specified colormap
+ */
+
+static Bool
+winStoreColorsShadowDD (ColormapPtr pColormap, 
+			int ndef,
+			xColorItem *pdefs)
+{
+  ScreenPtr		pScreen = pColormap->pScreen;
+  winScreenPriv(pScreen);
+  winCmapPriv(pColormap);
+  ColormapPtr		curpmap = pScreenPriv->pcmapInstalled;
+  HRESULT		ddrval = DD_OK;
+  
+  /* Put the X colormap entries into the Windows logical palette */
+  ddrval = IDirectDrawPalette_SetEntries (pCmapPriv->lpDDPalette,
+					  0,
+					  pdefs[0].pixel,
+					  ndef,
+					  pCmapPriv->peColors 
+					  + pdefs[0].pixel);
+  if (FAILED (ddrval))
+    {
+      ErrorF ("winStoreColorsShadowDD - SetEntries () failed\n");
+      return FALSE;
+    }
+
+  /* Don't install the DirectDraw palette if the colormap is not installed */
+  if (pColormap != curpmap)
+    {
+      return TRUE;
+    }
+
+  if (!winInstallColormapShadowDD (pColormap))
+    {
+      ErrorF ("winStoreColorsShadowDD - Failed installing colormap\n");
+      return FALSE;
+    }
+
+  return TRUE;
+}
+
+
+/*
+ * Colormap initialization procedure
+ */
+
+static Bool
+winCreateColormapShadowDD (ColormapPtr pColormap)
+{
+  HRESULT		ddrval = DD_OK;
+  ScreenPtr		pScreen = pColormap->pScreen;
+  winScreenPriv(pScreen);
+  winCmapPriv(pColormap);
+  
+  /* Create a DirectDraw palette */
+  ddrval = IDirectDraw2_CreatePalette (pScreenPriv->pdd,
+				       DDPCAPS_8BIT | DDPCAPS_ALLOW256,
+				       pCmapPriv->peColors,
+				       &pCmapPriv->lpDDPalette,
+				       NULL);
+  if (FAILED (ddrval))
+    {
+      ErrorF ("winCreateColormapShadowDD - CreatePalette failed\n");
+      return FALSE;
+    }
+
+  return TRUE;
+}
+
+
+/*
+ * Colormap destruction procedure
+ */
+
+static Bool
+winDestroyColormapShadowDD (ColormapPtr pColormap)
+{
+  winScreenPriv(pColormap->pScreen);
+  winCmapPriv(pColormap);
+  HRESULT		ddrval = DD_OK;
+
+  /*
+   * Is colormap to be destroyed the default?
+   *
+   * Non-default colormaps should have had winUninstallColormap
+   * called on them before we get here.  The default colormap
+   * will not have had winUninstallColormap called on it.  Thus,
+   * we need to handle the default colormap in a special way.
+   */
+  if (pColormap->flags & IsDefault)
+    {
+#if CYGDEBUG
+      winDebug ("winDestroyColormapShadowDD - Destroying default "
+	      "colormap\n");
+#endif
+      
+      /*
+       * FIXME: Walk the list of all screens, popping the default
+       * palette out of each screen device context.
+       */
+      
+      /* Pop the palette out of the primary surface */
+      ddrval = IDirectDrawSurface2_SetPalette (pScreenPriv->pddsPrimary,
+					       NULL);
+      if (FAILED (ddrval))
+	{
+	  ErrorF ("winDestroyColormapShadowDD - Failed freeing the "
+		  "default colormap DirectDraw palette.\n");
+	  return FALSE;
+	}
+
+      /* Clear our private installed colormap pointer */
+      pScreenPriv->pcmapInstalled = NULL;
+    }
+  
+  /* Release the palette */
+  IDirectDrawPalette_Release (pCmapPriv->lpDDPalette);
+ 
+  /* Invalidate the colormap privates */
+  pCmapPriv->lpDDPalette = NULL;
+
+  return TRUE;
+}
+
+
+/*
+ * Set engine specific functions
+ */
+
+Bool
+winSetEngineFunctionsShadowDD (ScreenPtr pScreen)
+{
+  winScreenPriv(pScreen);
+  winScreenInfo		*pScreenInfo = pScreenPriv->pScreenInfo;
+  
+  /* Set our pointers */
+  pScreenPriv->pwinAllocateFB = winAllocateFBShadowDD;
+  pScreenPriv->pwinFreeFB = winFreeFBShadowDD;
+  pScreenPriv->pwinShadowUpdate = winShadowUpdateDD;
+  pScreenPriv->pwinInitScreen = winInitScreenShadowDD;
+  pScreenPriv->pwinCloseScreen = winCloseScreenShadowDD;
+  pScreenPriv->pwinInitVisuals = winInitVisualsShadowDD;
+  pScreenPriv->pwinAdjustVideoMode = winAdjustVideoModeShadowDD;
+  if (pScreenInfo->fFullScreen)
+    pScreenPriv->pwinCreateBoundingWindow = winCreateBoundingWindowFullScreen;
+  else
+    pScreenPriv->pwinCreateBoundingWindow = winCreateBoundingWindowWindowed;
+  pScreenPriv->pwinFinishScreenInit = winFinishScreenInitFB;
+  pScreenPriv->pwinBltExposedRegions = winBltExposedRegionsShadowDD;
+  pScreenPriv->pwinActivateApp = winActivateAppShadowDD;
+  pScreenPriv->pwinRedrawScreen = winRedrawScreenShadowDD;
+  pScreenPriv->pwinRealizeInstalledPalette
+    = winRealizeInstalledPaletteShadowDD;
+  pScreenPriv->pwinInstallColormap = winInstallColormapShadowDD;
+  pScreenPriv->pwinStoreColors = winStoreColorsShadowDD;
+  pScreenPriv->pwinCreateColormap = winCreateColormapShadowDD;
+  pScreenPriv->pwinDestroyColormap = winDestroyColormapShadowDD;
+  pScreenPriv->pwinHotKeyAltTab = (winHotKeyAltTabProcPtr) (void (*)(void))NoopDDA;
+  pScreenPriv->pwinCreatePrimarySurface = winCreatePrimarySurfaceShadowDD;
+  pScreenPriv->pwinReleasePrimarySurface = winReleasePrimarySurfaceShadowDD;
+#ifdef XWIN_MULTIWINDOW
+  pScreenPriv->pwinFinishCreateWindowsWindow =
+    (winFinishCreateWindowsWindowProcPtr) (void (*)(void))NoopDDA;
+#endif
+
+  return TRUE;
+}
diff --git a/xorg-server/hw/xwin/winshadddnl.c b/xorg-server/hw/xwin/winshadddnl.c
index 0ce5d8d85..0a0b4ae13 100644
--- a/xorg-server/hw/xwin/winshadddnl.c
+++ b/xorg-server/hw/xwin/winshadddnl.c
@@ -1,1412 +1,1396 @@
-/*

- *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

- */

-

-#ifdef HAVE_XWIN_CONFIG_H

-#include <xwin-config.h>

-#endif

-#include "win.h"

-

-

-/*

- * FIXME: Headers are broken, DEFINE_GUID doesn't work correctly,

- * so we have to redefine it here.

- */

-#ifdef DEFINE_GUID

-#undef DEFINE_GUID

-#define DEFINE_GUID(n,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8) const GUID n GUID_SECT = {l,w1,w2,{b1,b2,b3,b4,b5,b6,b7,b8}}

-#endif /* DEFINE_GUID */

-

-/*

- * FIXME: Headers are broken, IID_IDirectDraw4 has to be defined

- * here manually.  Should be handled by ddraw.h

- */

-#ifndef IID_IDirectDraw4

-DEFINE_GUID( IID_IDirectDraw4, 0x9c59509a,0x39bd,0x11d1,0x8c,0x4a,0x00,0xc0,0x4f,0xd9,0x30,0xc5 );

-#endif /* IID_IDirectDraw4 */

-

-#define FAIL_MSG_MAX_BLT	10

-

-

-/*

- * Local prototypes

- */

-

-static Bool

-winAllocateFBShadowDDNL (ScreenPtr pScreen);

-

-static void

-winShadowUpdateDDNL (ScreenPtr pScreen, 

-		     shadowBufPtr pBuf);

-

-static Bool

-winCloseScreenShadowDDNL (int nIndex, ScreenPtr pScreen);

-

-static Bool

-winInitVisualsShadowDDNL (ScreenPtr pScreen);

-

-static Bool

-winAdjustVideoModeShadowDDNL (ScreenPtr pScreen);

-

-static Bool

-winBltExposedRegionsShadowDDNL (ScreenPtr pScreen);

-

-static Bool

-winActivateAppShadowDDNL (ScreenPtr pScreen);

-

-static Bool

-winRedrawScreenShadowDDNL (ScreenPtr pScreen);

-

-static Bool

-winRealizeInstalledPaletteShadowDDNL (ScreenPtr pScreen);

-

-static Bool

-winInstallColormapShadowDDNL (ColormapPtr pColormap);

-

-static Bool

-winStoreColorsShadowDDNL (ColormapPtr pmap, 

-			  int ndef,

-			  xColorItem *pdefs);

-

-static Bool

-winCreateColormapShadowDDNL (ColormapPtr pColormap);

-

-static Bool

-winDestroyColormapShadowDDNL (ColormapPtr pColormap);

-

-static Bool

-winCreatePrimarySurfaceShadowDDNL (ScreenPtr pScreen);

-

-static Bool

-winReleasePrimarySurfaceShadowDDNL (ScreenPtr pScreen);

-

-

-/*

- * Create the primary surface and attach the clipper.

- * Used for both the initial surface creation and during

- * WM_DISPLAYCHANGE messages.

- */

-

-static Bool

-winCreatePrimarySurfaceShadowDDNL (ScreenPtr pScreen)

-{

-  winScreenPriv(pScreen);

-  HRESULT		ddrval = DD_OK;

-  DDSURFACEDESC2	ddsd;

-

-  winDebug ("winCreatePrimarySurfaceShadowDDNL - Creating primary surface\n");

-

-  /* Describe the primary surface */

-  ZeroMemory (&ddsd, sizeof (ddsd));

-  ddsd.dwSize = sizeof (ddsd);

-  ddsd.dwFlags = DDSD_CAPS;

-  ddsd.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE;

-  

-  /* Create the primary surface */

-  ddrval = IDirectDraw4_CreateSurface (pScreenPriv->pdd4,

-				       &ddsd,

-				       &pScreenPriv->pddsPrimary4,

-				       NULL);

-  pScreenPriv->fRetryCreateSurface = FALSE;

-  if (FAILED (ddrval))

-    {

-      if (ddrval == DDERR_NOEXCLUSIVEMODE)

-        {

-          /* Recreating the surface failed. Mark screen to retry later */ 

-          pScreenPriv->fRetryCreateSurface = TRUE;

-          winDebug ("winCreatePrimarySurfaceShadowDDNL - Could not create "

-	          "primary surface: DDERR_NOEXCLUSIVEMODE\n");

-        }

-      else

-        {

-          ErrorF ("winCreatePrimarySurfaceShadowDDNL - Could not create "

-	          "primary surface: %08x\n", (unsigned int) ddrval);

-        }

-      return FALSE;

-    }

-  

-#if 1

-  winDebug ("winCreatePrimarySurfaceShadowDDNL - Created primary surface\n");

-#endif

-

-  /* Attach our clipper to our primary surface handle */

-  ddrval = IDirectDrawSurface4_SetClipper (pScreenPriv->pddsPrimary4,

-					   pScreenPriv->pddcPrimary);

-  if (FAILED (ddrval))

-    {

-      ErrorF ("winCreatePrimarySurfaceShadowDDNL - Primary attach clipper "

-	      "failed: %08x\n",

-	      (unsigned int) ddrval);

-      return FALSE;

-    }

-

-#if 1

-  winDebug ("winCreatePrimarySurfaceShadowDDNL - Attached clipper to primary "

-	  "surface\n");

-#endif

-

-  /* Everything was correct */

-  return TRUE;

-}

-

-

-/*

- * Detach the clipper and release the primary surface.

- * Called from WM_DISPLAYCHANGE.

- */

-

-static Bool

-winReleasePrimarySurfaceShadowDDNL (ScreenPtr pScreen)

-{

-  winScreenPriv(pScreen);

-

-  winDebug ("winReleasePrimarySurfaceShadowDDNL - Hello\n");

-

-  /* Release the primary surface and clipper, if they exist */

-  if (pScreenPriv->pddsPrimary4)

-    {

-      /*

-       * Detach the clipper from the primary surface.

-       * NOTE: We do this explicity for clarity.  The Clipper is not released.

-       */

-      IDirectDrawSurface4_SetClipper (pScreenPriv->pddsPrimary4,

-				      NULL);

-  

-      winDebug ("winReleasePrimarySurfaceShadowDDNL - Detached clipper\n");

-

-      /* Release the primary surface */

-      IDirectDrawSurface4_Release (pScreenPriv->pddsPrimary4);

-      pScreenPriv->pddsPrimary4 = NULL;

-    }

-

-  winDebug ("winReleasePrimarySurfaceShadowDDNL - Released primary surface\n");

-  

-  return TRUE;

-}

-

-

-/*

- * Create a DirectDraw surface for the shadow framebuffer; also create

- * a primary surface object so we can blit to the display.

- * 

- * Install a DirectDraw clipper on our primary surface object

- * that clips our blits to the unobscured client area of our display window.

- */

-

-Bool

-winAllocateFBShadowDDNL (ScreenPtr pScreen)

-{

-  winScreenPriv(pScreen);

-  winScreenInfo		*pScreenInfo = pScreenPriv->pScreenInfo;  

-  HRESULT		ddrval = DD_OK;

-  DDSURFACEDESC2	ddsdShadow;

-  char			*lpSurface = NULL;

-  DDPIXELFORMAT		ddpfPrimary;

-

-#if CYGDEBUG

-  winDebug ("winAllocateFBShadowDDNL - w %d h %d d %d\n",

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

-#endif

-

-  /* Allocate memory for our shadow surface */

-  lpSurface = malloc (pScreenInfo->dwPaddedWidth * pScreenInfo->dwHeight);

-  if (lpSurface == NULL)

-    {

-      ErrorF ("winAllocateFBShadowDDNL - Could not allocate bits\n");

-      return FALSE;

-    }

-

-  /*

-   * Initialize the framebuffer memory so we don't get a 

-   * strange display at startup

-   */

-  ZeroMemory (lpSurface, pScreenInfo->dwPaddedWidth * pScreenInfo->dwHeight);

-  

-  /* Create a clipper */

-  ddrval = (*g_fpDirectDrawCreateClipper) (0,

-					   &pScreenPriv->pddcPrimary,

-					   NULL);

-  if (FAILED (ddrval))

-    {

-      ErrorF ("winAllocateFBShadowDDNL - Could not attach clipper: %08x\n",

-	      (unsigned int) ddrval);

-      return FALSE;

-    }

-

-#if CYGDEBUG

-  winDebug ("winAllocateFBShadowDDNL - Created a clipper\n");

-#endif

-

-  /* Get a device context for the screen  */

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

-

-  /* Attach the clipper to our display window */

-  ddrval = IDirectDrawClipper_SetHWnd (pScreenPriv->pddcPrimary,

-				       0,

-				       pScreenPriv->hwndScreen);

-  if (FAILED (ddrval))

-    {

-      ErrorF ("winAllocateFBShadowDDNL - Clipper not attached "

-	      "to window: %08x\n",

-	      (unsigned int) ddrval);

-      return FALSE;

-    }

-

-#if CYGDEBUG

-  winDebug ("winAllocateFBShadowDDNL - Attached clipper to window\n");

-#endif

-

-  /* Create a DirectDraw object, store the address at lpdd */

-  ddrval = (*g_fpDirectDrawCreate) (NULL,

-				    (LPDIRECTDRAW*) &pScreenPriv->pdd,

-				    NULL);

-  if (FAILED (ddrval))

-    {

-      ErrorF ("winAllocateFBShadowDDNL - Could not start "

-	      "DirectDraw: %08x\n",

-	      (unsigned int) ddrval);

-      return FALSE;

-    }

-

-#if CYGDEBUG

-  winDebug ("winAllocateFBShadowDDNL - Created and initialized DD\n");

-#endif

-

-  /* Get a DirectDraw4 interface pointer */

-  ddrval = IDirectDraw_QueryInterface (pScreenPriv->pdd,

-				       &IID_IDirectDraw4,

-				       (LPVOID*) &pScreenPriv->pdd4);

-  if (FAILED (ddrval))

-    {

-      ErrorF ("winAllocateFBShadowDDNL - Failed DD4 query: %08x\n",

-	      (unsigned int) ddrval);

-      return FALSE;

-    }

-

-  /* Are we full screen? */

-  if (pScreenInfo->fFullScreen)

-    {

-      DDSURFACEDESC2	ddsdCurrent;

-      DWORD		dwRefreshRateCurrent = 0;

-      HDC		hdc = NULL;

-

-      /* Set the cooperative level to full screen */

-      ddrval = IDirectDraw4_SetCooperativeLevel (pScreenPriv->pdd4,

-						 pScreenPriv->hwndScreen,

-						 DDSCL_EXCLUSIVE

-						 | DDSCL_FULLSCREEN);

-      if (FAILED (ddrval))

-	{

-	  ErrorF ("winAllocateFBShadowDDNL - Could not set "

-		  "cooperative level: %08x\n",

-		  (unsigned int) ddrval);

-	  return FALSE;

-	}

-

-      /*

-       * We only need to get the current refresh rate for comparison

-       * if a refresh rate has been passed on the command line.

-       */

-      if (pScreenInfo->dwRefreshRate != 0)

-	{

-	  ZeroMemory (&ddsdCurrent, sizeof (ddsdCurrent));

-	  ddsdCurrent.dwSize = sizeof (ddsdCurrent);

-

-	  /* Get information about current display settings */

-	  ddrval = IDirectDraw4_GetDisplayMode (pScreenPriv->pdd4,

-						&ddsdCurrent);

-	  if (FAILED (ddrval))

-	    {

-	      ErrorF ("winAllocateFBShadowDDNL - Could not get current "

-		      "refresh rate: %08x.  Continuing.\n",

-		      (unsigned int) ddrval);

-	      dwRefreshRateCurrent = 0;

-	    }

-	  else

-	    {

-	      /* Grab the current refresh rate */

-	      dwRefreshRateCurrent = ddsdCurrent.u2.dwRefreshRate;

-	    }

-	}

-

-      /* Clean up the refresh rate */

-      if (dwRefreshRateCurrent == pScreenInfo->dwRefreshRate)

-	{

-	  /*

-	   * Refresh rate is non-specified or equal to current.

-	   */

-	  pScreenInfo->dwRefreshRate = 0;

-	}

-

-      /* Grab a device context for the screen */

-      hdc = GetDC (NULL);

-      if (hdc == NULL)

-	{

-	  ErrorF ("winAllocateFBShadowDDNL - GetDC () failed\n");

-	  return FALSE;

-	}

-

-      /* Only change the video mode when different than current mode */

-      if (!pScreenInfo->fMultipleMonitors

-	  && (pScreenInfo->dwWidth != GetSystemMetrics (SM_CXSCREEN)

-	      || pScreenInfo->dwHeight != GetSystemMetrics (SM_CYSCREEN)

-	      || pScreenInfo->dwBPP != GetDeviceCaps (hdc, BITSPIXEL)

-	      || pScreenInfo->dwRefreshRate != 0))

-	{

-	  winDebug ("winAllocateFBShadowDDNL - Changing video mode\n");

-

-	  /* Change the video mode to the mode requested, and use the driver default refresh rate on failure */

-	  ddrval = IDirectDraw4_SetDisplayMode (pScreenPriv->pdd4,

-						pScreenInfo->dwWidth,

-						pScreenInfo->dwHeight,

-						pScreenInfo->dwBPP,

-						pScreenInfo->dwRefreshRate,

-						0);	       

-	  if (FAILED (ddrval))

-	    {

-	      ErrorF ("winAllocateFBShadowDDNL - Could not set "

-		      "full screen display mode: %08x\n",

-		      (unsigned int) ddrval);

-	      ErrorF ("winAllocateFBShadowDDNL - Using default driver refresh rate\n");

-	      ddrval = IDirectDraw4_SetDisplayMode (pScreenPriv->pdd4,

-						    pScreenInfo->dwWidth,

-						    pScreenInfo->dwHeight,

-						    pScreenInfo->dwBPP,

-						    0,

-						    0);

-	      if (FAILED(ddrval))

-		{

-			ErrorF ("winAllocateFBShadowDDNL - Could not set default refresh rate "

-				"full screen display mode: %08x\n",

-				(unsigned int) ddrval);

-			return FALSE;

-		}

-	    }

-	}

-      else

-	{

-	  winDebug ("winAllocateFBShadowDDNL - Not changing video mode\n");

-	}

-

-      /* Release our DC */

-      ReleaseDC (NULL, hdc);

-      hdc = NULL;

-    }

-  else

-    {

-      /* Set the cooperative level for windowed mode */

-      ddrval = IDirectDraw4_SetCooperativeLevel (pScreenPriv->pdd4,

-						 pScreenPriv->hwndScreen,

-						 DDSCL_NORMAL);

-      if (FAILED (ddrval))

-	{

-	  ErrorF ("winAllocateFBShadowDDNL - Could not set "

-		  "cooperative level: %08x\n",

-		  (unsigned int) ddrval);

-	  return FALSE;

-	}

-    }

-

-  /* Create the primary surface */

-  if (!winCreatePrimarySurfaceShadowDDNL (pScreen))

-    {

-      ErrorF ("winAllocateFBShadowDDNL - winCreatePrimarySurfaceShadowDDNL "

-	      "failed\n");

-      return FALSE;

-    }

-

-  /* Get primary surface's pixel format */

-  ZeroMemory (&ddpfPrimary, sizeof (ddpfPrimary));

-  ddpfPrimary.dwSize = sizeof (ddpfPrimary);

-  ddrval = IDirectDrawSurface4_GetPixelFormat (pScreenPriv->pddsPrimary4,

-					       &ddpfPrimary);

-  if (FAILED (ddrval))

-    {

-      ErrorF ("winAllocateFBShadowDDNL - Could not get primary "

-	      "pixformat: %08x\n",

-	      (unsigned int) ddrval);

-      return FALSE;

-    }

-

-#if CYGDEBUG

-  winDebug ("winAllocateFBShadowDDNL - Primary masks: %08x %08x %08x "

-	  "dwRGBBitCount: %d\n",

-	  ddpfPrimary.u2.dwRBitMask,

-	  ddpfPrimary.u3.dwGBitMask,

-	  ddpfPrimary.u4.dwBBitMask,

-	  ddpfPrimary.u1.dwRGBBitCount);

-#endif

-

-  /* Describe the shadow surface to be created */

-  /*

-   * NOTE: Do not use a DDSCAPS_VIDEOMEMORY surface,

-   * as drawing, locking, and unlocking take forever

-   * with video memory surfaces.  In addition,

-   * video memory is a somewhat scarce resource,

-   * so you shouldn't be allocating video memory when

-   * you have the option of using system memory instead.

-   */

-  ZeroMemory (&ddsdShadow, sizeof (ddsdShadow));

-  ddsdShadow.dwSize = sizeof (ddsdShadow);

-  ddsdShadow.dwFlags = DDSD_CAPS | DDSD_HEIGHT | DDSD_WIDTH

-    | DDSD_LPSURFACE | DDSD_PITCH | DDSD_PIXELFORMAT;

-  ddsdShadow.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN | DDSCAPS_SYSTEMMEMORY;

-  ddsdShadow.dwHeight = pScreenInfo->dwHeight;

-  ddsdShadow.dwWidth = pScreenInfo->dwWidth;

-  ddsdShadow.u1.lPitch = pScreenInfo->dwPaddedWidth;

-  ddsdShadow.lpSurface = lpSurface;

-  ddsdShadow.u4.ddpfPixelFormat = ddpfPrimary;

-  

-  winDebug ("winAllocateFBShadowDDNL - lPitch: %d\n",

-	  (int) pScreenInfo->dwPaddedWidth);

-

-  /* Create the shadow surface */

-  ddrval = IDirectDraw4_CreateSurface (pScreenPriv->pdd4,

-				       &ddsdShadow,

-				       &pScreenPriv->pddsShadow4,

-				       NULL);

-  if (FAILED (ddrval))

-    {

-      ErrorF ("winAllocateFBShadowDDNL - Could not create shadow "

-	      "surface: %08x\n", (unsigned int) ddrval);

-      return FALSE;

-    }

-  

-#if CYGDEBUG || YES

-  winDebug ("winAllocateFBShadowDDNL - Created shadow pitch: %d\n",

-	  (int) ddsdShadow.u1.lPitch);

-#endif

-

-  /* Grab the pitch from the surface desc */

-  pScreenInfo->dwStride = (ddsdShadow.u1.lPitch * 8)

-    / pScreenInfo->dwBPP;

-

-#if CYGDEBUG || YES

-  winDebug ("winAllocateFBShadowDDNL - Created shadow stride: %d\n",

-	  (int) pScreenInfo->dwStride);

-#endif

-

-  /* Save the pointer to our surface memory */

-  pScreenInfo->pfb = lpSurface;

-  

-  /* Grab the masks from the surface description */

-  pScreenPriv->dwRedMask = ddsdShadow.u4.ddpfPixelFormat.u2.dwRBitMask;

-  pScreenPriv->dwGreenMask = ddsdShadow.u4.ddpfPixelFormat.u3.dwGBitMask;

-  pScreenPriv->dwBlueMask = ddsdShadow.u4.ddpfPixelFormat.u4.dwBBitMask;

-

-#if CYGDEBUG

-  winDebug ("winAllocateFBShadowDDNL - Returning\n");

-#endif

-

-  return TRUE;

-}

-

-

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

-/*

- * Create a DirectDraw surface for the new multi-window window

- */

-

-static

-Bool

-winFinishCreateWindowsWindowDDNL (WindowPtr pWin)

-{

-  winWindowPriv(pWin);

-  winPrivScreenPtr	pScreenPriv = pWinPriv->pScreenPriv;

-  HRESULT		ddrval = DD_OK;

-  DDSURFACEDESC2	ddsd;

-  int			iWidth, iHeight;

-  int			iX, iY;

-

-  winDebug ("winFinishCreateWindowsWindowDDNL!\n\n");

-

-  iX = pWin->drawable.x + GetSystemMetrics (SM_XVIRTUALSCREEN);

-  iY = pWin->drawable.y + GetSystemMetrics (SM_YVIRTUALSCREEN);

-  

-  iWidth = pWin->drawable.width;

-  iHeight = pWin->drawable.height;

-

-  /* Describe the primary surface */

-  ZeroMemory (&ddsd, sizeof (ddsd));

-  ddsd.dwSize = sizeof (ddsd);

-  ddsd.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT;

-  ddsd.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE;

-  ddsd.dwHeight = iHeight;

-  ddsd.dwWidth = iWidth;

-

-  /* Create the primary surface */

-  ddrval = IDirectDraw4_CreateSurface (pScreenPriv->pdd4,

-				       &ddsd,

-				       &pWinPriv->pddsPrimary4,

-				       NULL);

-  if (FAILED (ddrval))

-    {

-      ErrorF ("winFinishCreateWindowsWindowDDNL - Could not create primary "

-	      "surface: %08x\n",

-	      (unsigned int)ddrval);

-      return FALSE;

-    }

-  return TRUE;

-}

-#endif

-

-

-/*

- * Transfer the damaged regions of the shadow framebuffer to the display.

- */

-

-static void

-winShadowUpdateDDNL (ScreenPtr pScreen, 

-		     shadowBufPtr pBuf)

-{

-  winScreenPriv(pScreen);

-  winScreenInfo		*pScreenInfo = pScreenPriv->pScreenInfo;

-  RegionPtr		damage = shadowDamage(pBuf);

-  HRESULT		ddrval = DD_OK;

-  RECT			rcDest, rcSrc;

-  POINT			ptOrigin;

-  DWORD			dwBox = RegionNumRects (damage);

-  BoxPtr		pBox = RegionRects (damage);

-  HRGN			hrgnTemp = NULL, hrgnCombined = NULL;

-

-  /*

-   * Return immediately if the app is not active

-   * and we are fullscreen, or if we have a bad display depth

-   */

-  if ((!pScreenPriv->fActive && pScreenInfo->fFullScreen)

-      || pScreenPriv->fBadDepth) return;

-

-  /* Get the origin of the window in the screen coords */

-  ptOrigin.x = pScreenInfo->dwXOffset;

-  ptOrigin.y = pScreenInfo->dwYOffset;

-  MapWindowPoints (pScreenPriv->hwndScreen,

-		   HWND_DESKTOP,

-		   (LPPOINT)&ptOrigin, 1);

-

-  /*

-   * Handle small regions with multiple blits,

-   * handle large regions by creating a clipping region and 

-   * doing a single blit constrained to that clipping region.

-   */

-  if (pScreenInfo->dwClipUpdatesNBoxes == 0

-      || dwBox < pScreenInfo->dwClipUpdatesNBoxes)

-    {

-      /* Loop through all boxes in the damaged region */

-      while (dwBox--)

-	{

-	  /* Assign damage box to source rectangle */

-	  rcSrc.left = pBox->x1;

-	  rcSrc.top = pBox->y1;

-	  rcSrc.right = pBox->x2;

-	  rcSrc.bottom = pBox->y2;

-	  

-	  /* Calculate destination rectangle */

-	  rcDest.left = ptOrigin.x + rcSrc.left;

-	  rcDest.top = ptOrigin.y + rcSrc.top;

-	  rcDest.right = ptOrigin.x + rcSrc.right;

-	  rcDest.bottom = ptOrigin.y + rcSrc.bottom;

-	  

-	  /* Blit the damaged areas */

-	  ddrval = IDirectDrawSurface4_Blt (pScreenPriv->pddsPrimary4,

-					    &rcDest,

-					    pScreenPriv->pddsShadow4,

-					    &rcSrc,

-					    DDBLT_WAIT,

-					    NULL);

-	  if (FAILED (ddrval))

-	    {

-	      static int	s_iFailCount = 0;

-	      

-	      if (s_iFailCount < FAIL_MSG_MAX_BLT)

-		{

-		  ErrorF ("winShadowUpdateDDNL - IDirectDrawSurface4_Blt () "

-			  "failed: %08x\n",

-			  (unsigned int) ddrval);

-		  

-		  ++s_iFailCount;

-

-		  if (s_iFailCount == FAIL_MSG_MAX_BLT)

-		    {

-		      ErrorF ("winShadowUpdateDDNL - IDirectDrawSurface4_Blt "

-			      "failure message maximum (%d) reached.  No "

-			      "more failure messages will be printed.\n",

-			      FAIL_MSG_MAX_BLT);

-		    }

-		}

-	    }

-	  

-	  /* Get a pointer to the next box */

-	  ++pBox;

-	}

-    }

-  else

-    {

-      BoxPtr		pBoxExtents = RegionExtents(damage);

-

-      /* Compute a GDI region from the damaged region */

-      hrgnCombined = CreateRectRgn (pBox->x1, pBox->y1, pBox->x2, pBox->y2);

-      dwBox--;

-      pBox++;

-      while (dwBox--)

-	{

-	  hrgnTemp = CreateRectRgn (pBox->x1, pBox->y1, pBox->x2, pBox->y2);

-	  CombineRgn (hrgnCombined, hrgnCombined, hrgnTemp, RGN_OR);

-	  DeleteObject (hrgnTemp);

-	  pBox++;

-	}

-

-      /* Install the GDI region as a clipping region */

-      SelectClipRgn (pScreenPriv->hdcScreen, hrgnCombined);

-      DeleteObject (hrgnCombined);

-      hrgnCombined = NULL;

-

-#if CYGDEBUG

-      winDebug ("winShadowUpdateDDNL - be x1 %d y1 %d x2 %d y2 %d\n",

-	      pBoxExtents->x1, pBoxExtents->y1,

-	      pBoxExtents->x2, pBoxExtents->y2);

-#endif

-

-      /* Calculating a bounding box for the source is easy */

-      rcSrc.left = pBoxExtents->x1;

-      rcSrc.top = pBoxExtents->y1;

-      rcSrc.right = pBoxExtents->x2;

-      rcSrc.bottom = pBoxExtents->y2;

-

-      /* Calculating a bounding box for the destination is trickier */

-      rcDest.left = ptOrigin.x + rcSrc.left;

-      rcDest.top = ptOrigin.y + rcSrc.top;

-      rcDest.right = ptOrigin.x + rcSrc.right;

-      rcDest.bottom = ptOrigin.y + rcSrc.bottom;

-

-      /* Our Blt should be clipped to the invalidated region */

-      ddrval = IDirectDrawSurface4_Blt (pScreenPriv->pddsPrimary4,

-					&rcDest,

-					pScreenPriv->pddsShadow4,

-					&rcSrc,

-					DDBLT_WAIT,

-					NULL);

-

-      /* Reset the clip region */

-      SelectClipRgn (pScreenPriv->hdcScreen, NULL);

-    }

-}

-

-

-/*

- * Call the wrapped CloseScreen function.

- *

- * Free our resources and private structures.

- */

-

-static Bool

-winCloseScreenShadowDDNL (int nIndex, ScreenPtr pScreen)

-{

-  winScreenPriv(pScreen);

-  winScreenInfo		*pScreenInfo = pScreenPriv->pScreenInfo;

-  Bool			fReturn;

-

-#if CYGDEBUG

-  winDebug ("winCloseScreenShadowDDNL - Freeing screen resources\n");

-#endif

-

-  /* Flag that the screen is closed */

-  pScreenPriv->fClosed = TRUE;

-  pScreenPriv->fActive = FALSE;

-

-  /* Call the wrapped CloseScreen procedure */

-  WIN_UNWRAP(CloseScreen);

-  fReturn = (*pScreen->CloseScreen) (nIndex, pScreen);

-

-  /* Free the screen DC */

-  ReleaseDC (pScreenPriv->hwndScreen, pScreenPriv->hdcScreen);

-

-  /* Delete the window property */

-  RemoveProp (pScreenPriv->hwndScreen, WIN_SCR_PROP);

-

-  /* Free the shadow surface, if there is one */

-  if (pScreenPriv->pddsShadow4)

-    {

-      IDirectDrawSurface4_Release (pScreenPriv->pddsShadow4);

-      free (pScreenInfo->pfb);

-      pScreenInfo->pfb = NULL;

-      pScreenPriv->pddsShadow4 = NULL;

-    }

-

-  /* Detach the clipper from the primary surface and release the clipper. */

-  if (pScreenPriv->pddcPrimary)

-    {

-      /* Detach the clipper */

-      IDirectDrawSurface4_SetClipper (pScreenPriv->pddsPrimary4,

-				      NULL);

-

-      /* Release the clipper object */

-      IDirectDrawClipper_Release (pScreenPriv->pddcPrimary);

-      pScreenPriv->pddcPrimary = NULL;

-    }

-

-  /* Release the primary surface, if there is one */

-  if (pScreenPriv->pddsPrimary4)

-    {

-      IDirectDrawSurface4_Release (pScreenPriv->pddsPrimary4);

-      pScreenPriv->pddsPrimary4 = NULL;

-    }

-

-  /* Free the DirectDraw4 object, if there is one */

-  if (pScreenPriv->pdd4)

-    {

-      IDirectDraw4_RestoreDisplayMode (pScreenPriv->pdd4);

-      IDirectDraw4_Release (pScreenPriv->pdd4);

-      pScreenPriv->pdd4 = NULL;

-    }

-

-  /* Free the DirectDraw object, if there is one */

-  if (pScreenPriv->pdd)

-    {

-      IDirectDraw_Release (pScreenPriv->pdd);

-      pScreenPriv->pdd = NULL;

-    }

-

-  /* Delete tray icon, if we have one */

-  if (!pScreenInfo->fNoTrayIcon)

-    winDeleteNotifyIcon (pScreenPriv);

-

-  /* Free the exit confirmation dialog box, if it exists */

-  if (g_hDlgExit != NULL)

-    {

-      DestroyWindow (g_hDlgExit);

-      g_hDlgExit = NULL;

-    }

-

-  /* Kill our window */

-  if (pScreenPriv->hwndScreen)

-    {

-      DestroyWindow (pScreenPriv->hwndScreen);

-      pScreenPriv->hwndScreen = NULL;

-    }

-

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

-  /* Destroy the thread startup mutex */

-  pthread_mutex_destroy (&pScreenPriv->pmServerStarted);

-#endif

-

-  /* Kill our screeninfo's pointer to the screen */

-  pScreenInfo->pScreen = NULL;

-

-  /* Invalidate the ScreenInfo's fb pointer */

-  pScreenInfo->pfb = NULL;

-

-  /* Free the screen privates for this screen */

-  free ((pointer) pScreenPriv);

-

-  return fReturn;

-}

-

-

-/*

- * Tell mi what sort of visuals we need.

- *

- * Generally we only need one visual, as our screen can only

- * handle one format at a time, I believe.  You may want

- * to verify that last sentence.

- */

-

-static Bool

-winInitVisualsShadowDDNL (ScreenPtr pScreen)

-{

-  winScreenPriv(pScreen);

-  winScreenInfo		*pScreenInfo = pScreenPriv->pScreenInfo;

-  DWORD			dwRedBits, dwGreenBits, dwBlueBits;

-

-  /* Count the number of ones in each color mask */

-  dwRedBits = winCountBits (pScreenPriv->dwRedMask);

-  dwGreenBits = winCountBits (pScreenPriv->dwGreenMask);

-  dwBlueBits = winCountBits (pScreenPriv->dwBlueMask);

-  

-  /* Store the maximum number of ones in a color mask as the bitsPerRGB */

-  if (dwRedBits == 0 || dwGreenBits == 0 || dwBlueBits == 0)

-    pScreenPriv->dwBitsPerRGB = 8;

-  else if (dwRedBits > dwGreenBits && dwRedBits > dwBlueBits)

-    pScreenPriv->dwBitsPerRGB = dwRedBits;

-  else if (dwGreenBits > dwRedBits && dwGreenBits > dwBlueBits)

-    pScreenPriv->dwBitsPerRGB = dwGreenBits;

-  else

-    pScreenPriv->dwBitsPerRGB = dwBlueBits;

-

-  winDebug ("winInitVisualsShadowDDNL - Masks %08x %08x %08x BPRGB %d d %d "

-	  "bpp %d\n",

-	  (unsigned int) pScreenPriv->dwRedMask,

-	  (unsigned int) pScreenPriv->dwGreenMask,

-	  (unsigned int) pScreenPriv->dwBlueMask,

-	  (int) pScreenPriv->dwBitsPerRGB,

-	  (int) pScreenInfo->dwDepth,

-	  (int) pScreenInfo->dwBPP);

-

-  /* Create a single visual according to the Windows screen depth */

-  switch (pScreenInfo->dwDepth)

-    {

-    case 24:

-    case 16:

-    case 15:

-      /* Setup the real visual */

-      if (!miSetVisualTypesAndMasks (pScreenInfo->dwDepth,

-				     TrueColorMask,

-				     pScreenPriv->dwBitsPerRGB,

-				     -1,

-				     pScreenPriv->dwRedMask,

-				     pScreenPriv->dwGreenMask,

-				     pScreenPriv->dwBlueMask))

-	{

-	  ErrorF ("winInitVisualsShadowDDNL - miSetVisualTypesAndMasks "

-		  "failed for TrueColor\n");

-	  return FALSE;

-	}

-

-#ifdef XWIN_EMULATEPSEUDO

-      if (!pScreenInfo->fEmulatePseudo)

-	break;

-

-      /* Setup a pseudocolor visual */

-      if (!miSetVisualTypesAndMasks (8,

-				     PseudoColorMask,

-				     8,

-				     -1,

-				     0,

-				     0,

-				     0))

-	{

-	  ErrorF ("winInitVisualsShadowDDNL - miSetVisualTypesAndMasks "

-		  "failed for PseudoColor\n");

-	  return FALSE;

-	}

-#endif

-      break;

-

-    case 8:

-      if (!miSetVisualTypesAndMasks (pScreenInfo->dwDepth,

-				     pScreenInfo->fFullScreen 

-				     ? PseudoColorMask : StaticColorMask,

-				     pScreenPriv->dwBitsPerRGB,

-				     pScreenInfo->fFullScreen 

-				     ? PseudoColor : StaticColor,

-				     pScreenPriv->dwRedMask,

-				     pScreenPriv->dwGreenMask,

-				     pScreenPriv->dwBlueMask))

-	{

-	  ErrorF ("winInitVisualsShadowDDNL - miSetVisualTypesAndMasks "

-		  "failed\n");

-	  return FALSE;

-	}

-      break;

-

-    default:

-      ErrorF ("winInitVisualsShadowDDNL - Unknown screen depth\n");

-      return FALSE;

-    }

-

-#if CYGDEBUG

-  winDebug ("winInitVisualsShadowDDNL - Returning\n");

-#endif

-

-  return TRUE;

-}

-

-

-/*

- * Adjust the user proposed video mode

- */

-

-static Bool

-winAdjustVideoModeShadowDDNL (ScreenPtr pScreen)

-{

-  winScreenPriv(pScreen);

-  winScreenInfo		*pScreenInfo = pScreenPriv->pScreenInfo;

-  HDC			hdc = NULL;

-  DWORD			dwBPP;

-

-  /* We're in serious trouble if we can't get a DC */

-  hdc = GetDC (NULL);

-  if (hdc == NULL)

-    {

-      ErrorF ("winAdjustVideoModeShadowDDNL - GetDC () failed\n");

-      return FALSE;

-    }

-

-  /* Query GDI for current display depth */

-  dwBPP = GetDeviceCaps (hdc, BITSPIXEL);

-

-  /* DirectDraw can only change the depth in fullscreen mode */

-  if (pScreenInfo->dwBPP == WIN_DEFAULT_BPP)

-    {

-      /* No -depth parameter passed, let the user know the depth being used */

-      winErrorFVerb (2, "winAdjustVideoModeShadowDDNL - Using Windows display "

-	      "depth of %d bits per pixel\n", (int) dwBPP);

-

-      /* Use GDI's depth */

-      pScreenInfo->dwBPP = dwBPP;

-    }

-  else if (pScreenInfo->fFullScreen

-	   && pScreenInfo->dwBPP != dwBPP)

-    {

-      /* FullScreen, and GDI depth differs from -depth parameter */

-      winErrorFVerb (2, "winAdjustVideoModeShadowDDNL - FullScreen, using command "

-	      "line bpp: %d\n", (int) pScreenInfo->dwBPP);

-    }

-  else if (dwBPP != pScreenInfo->dwBPP)

-    {

-      /* Windowed, and GDI depth differs from -depth parameter */

-      winErrorFVerb (2, "winAdjustVideoModeShadowDDNL - Windowed, command line "

-	      "bpp: %d, using bpp: %d\n",

-	      (int) pScreenInfo->dwBPP, (int) dwBPP);

-

-      /* We'll use GDI's depth */

-      pScreenInfo->dwBPP = dwBPP;

-    }

-

-  /* See if the shadow bitmap will be larger than the DIB size limit */

-  if (pScreenInfo->dwWidth * pScreenInfo->dwHeight * pScreenInfo->dwBPP

-      >= WIN_DIB_MAXIMUM_SIZE)

-    {

-      winErrorFVerb (1, "winAdjustVideoModeShadowDDNL - Requested DirectDraw surface "

-	      "will be larger than %d MB.  The surface may fail to be "

-	      "allocated on Windows 95, 98, or Me, due to a %d MB limit in "

-	      "DIB size.  This limit does not apply to Windows NT/2000, and "

-	      "this message may be ignored on those platforms.\n",

-	      WIN_DIB_MAXIMUM_SIZE_MB, WIN_DIB_MAXIMUM_SIZE_MB);

-    }

-  

-  /* Release our DC */

-  ReleaseDC (NULL, hdc);

-

-  return TRUE;

-}

-

-

-/*

- * Blt exposed regions to the screen

- */

-

-static Bool

-winBltExposedRegionsShadowDDNL (ScreenPtr pScreen)

-{

-  winScreenPriv(pScreen);

-  winScreenInfo		*pScreenInfo = pScreenPriv->pScreenInfo;

-  RECT			rcSrc, rcDest;

-  POINT			ptOrigin;

-  HDC			hdcUpdate;

-  PAINTSTRUCT		ps;

-  HRESULT		ddrval = DD_OK;

-  Bool			fReturn = TRUE;

-  int			i;

-

-  /* Quite common case. The primary surface was lost (maybe because of depth

-   * change). Try to create a new primary surface. Bail out if this fails */

-  if (pScreenPriv->pddsPrimary4 == NULL && pScreenPriv->fRetryCreateSurface &&

-      !winCreatePrimarySurfaceShadowDDNL(pScreen))

-    {

-      Sleep(100);

-      return FALSE;

-    }

-  if (pScreenPriv->pddsPrimary4 == NULL)

-    return FALSE;  

-  

-  /* BeginPaint gives us an hdc that clips to the invalidated region */

-  hdcUpdate = BeginPaint (pScreenPriv->hwndScreen, &ps);

-  if (hdcUpdate == NULL)

-    {

-      fReturn = FALSE;

-      ErrorF ("winBltExposedRegionsShadowDDNL - BeginPaint () returned "

-	      "a NULL device context handle.  Aborting blit attempt.\n");

-      goto winBltExposedRegionsShadowDDNL_Exit;

-    }

-

-  /* Get the origin of the window in the screen coords */

-  ptOrigin.x = pScreenInfo->dwXOffset;

-  ptOrigin.y = pScreenInfo->dwYOffset;

-

-  MapWindowPoints (pScreenPriv->hwndScreen,

-		   HWND_DESKTOP,

-		   (LPPOINT)&ptOrigin, 1);

-  rcDest.left = ptOrigin.x;

-  rcDest.right = ptOrigin.x + pScreenInfo->dwWidth;

-  rcDest.top = ptOrigin.y;

-  rcDest.bottom = ptOrigin.y + pScreenInfo->dwHeight;

-

-  /* Source can be entire shadow surface, as Blt should clip for us */

-  rcSrc.left = 0;

-  rcSrc.top = 0;

-  rcSrc.right = pScreenInfo->dwWidth;

-  rcSrc.bottom = pScreenInfo->dwHeight;

-

-  /* Try to regain the primary surface and blit again if we've lost it */

-  for (i = 0; i <= WIN_REGAIN_SURFACE_RETRIES; ++i)

-    {

-      /* Our Blt should be clipped to the invalidated region */

-      ddrval = IDirectDrawSurface4_Blt (pScreenPriv->pddsPrimary4,

-					&rcDest,

-					pScreenPriv->pddsShadow4,

-					&rcSrc,

-					DDBLT_WAIT,

-					NULL);

-      if (ddrval == DDERR_SURFACELOST)

-	{

-	  /* Surface was lost */

-	  winErrorFVerb (1, "winBltExposedRegionsShadowDDNL - "

-          "IDirectDrawSurface4_Blt reported that the primary "

-          "surface was lost, trying to restore, retry: %d\n", i + 1);

-

-	  /* Try to restore the surface, once */

-	  

-	  ddrval = IDirectDrawSurface4_Restore (pScreenPriv->pddsPrimary4);

-	  winDebug ("winBltExposedRegionsShadowDDNL - "

-		  "IDirectDrawSurface4_Restore returned: ");

-	  if (ddrval == DD_OK)

-	    winDebug ("DD_OK\n");

-	  else if (ddrval == DDERR_WRONGMODE)

-	    winDebug ("DDERR_WRONGMODE\n");

-	  else if (ddrval == DDERR_INCOMPATIBLEPRIMARY)

-	    winDebug ("DDERR_INCOMPATIBLEPRIMARY\n");

-	  else if (ddrval == DDERR_UNSUPPORTED)

-	    winDebug ("DDERR_UNSUPPORTED\n");

-	  else if (ddrval == DDERR_INVALIDPARAMS)

-	    winDebug ("DDERR_INVALIDPARAMS\n");

-	  else if (ddrval == DDERR_INVALIDOBJECT)

-	    winDebug ("DDERR_INVALIDOBJECT\n");

-	  else

-	    winDebug ("unknown error: %08x\n", (unsigned int) ddrval);

-	  

-	  /* Loop around to try the blit one more time */

-	  continue;

-	}  

-      else if (FAILED (ddrval))

-	{

-	  fReturn = FALSE;

-	  winErrorFVerb (1, "winBltExposedRegionsShadowDDNL - "

-		  "IDirectDrawSurface4_Blt failed, but surface not "

-		  "lost: %08x %d\n",

-		  (unsigned int) ddrval, (int) ddrval);

-	  goto winBltExposedRegionsShadowDDNL_Exit;

-	}

-      else

-	{

-	  /* Success, stop looping */

-	  break;

-	}

-    }

-

- winBltExposedRegionsShadowDDNL_Exit:

-  /* EndPaint frees the DC */

-  if (hdcUpdate != NULL)

-    EndPaint (pScreenPriv->hwndScreen, &ps);

-  return fReturn;

-}

-

-

-/*

- * Do any engine-specific application-activation processing

- */

-

-static Bool

-winActivateAppShadowDDNL (ScreenPtr pScreen)

-{

-  winScreenPriv(pScreen);

-

-  /*

-   * Do we have a surface?

-   * Are we active?

-   * Are we full screen?

-   */

-  if (pScreenPriv != NULL

-      && pScreenPriv->pddsPrimary4 != NULL

-      && pScreenPriv->fActive)

-    {

-      /* Primary surface was lost, restore it */

-      IDirectDrawSurface4_Restore (pScreenPriv->pddsPrimary4);

-    }

-

-  return TRUE;

-}

-

-

-/*

- * Reblit the shadow framebuffer to the screen.

- */

-

-static Bool

-winRedrawScreenShadowDDNL (ScreenPtr pScreen)

-{

-  winScreenPriv(pScreen);

-  winScreenInfo		*pScreenInfo = pScreenPriv->pScreenInfo;

-  HRESULT		ddrval = DD_OK;

-  RECT			rcSrc, rcDest;

-  POINT			ptOrigin;

-

-  /* Get the origin of the window in the screen coords */

-  ptOrigin.x = pScreenInfo->dwXOffset;

-  ptOrigin.y = pScreenInfo->dwYOffset;

-  MapWindowPoints (pScreenPriv->hwndScreen,

-		   HWND_DESKTOP,

-		   (LPPOINT)&ptOrigin, 1);

-  rcDest.left = ptOrigin.x;

-  rcDest.right = ptOrigin.x + pScreenInfo->dwWidth;

-  rcDest.top = ptOrigin.y;

-  rcDest.bottom = ptOrigin.y + pScreenInfo->dwHeight;

-

-  /* Source can be entire shadow surface, as Blt should clip for us */

-  rcSrc.left = 0;

-  rcSrc.top = 0;

-  rcSrc.right = pScreenInfo->dwWidth;

-  rcSrc.bottom = pScreenInfo->dwHeight;

-

-  /* Redraw the whole window, to take account for the new colors */

-  ddrval = IDirectDrawSurface4_Blt (pScreenPriv->pddsPrimary4,

-				    &rcDest,

-				    pScreenPriv->pddsShadow4,

-				    &rcSrc,

-				    DDBLT_WAIT,

-				    NULL);

-  if (FAILED (ddrval))

-    {

-      ErrorF ("winRedrawScreenShadowDDNL - IDirectDrawSurface4_Blt () "

-	      "failed: %08x\n",

-	      (unsigned int) ddrval);

-    }

-

-  return TRUE;

-}

-

-

-/*

- * Realize the currently installed colormap

- */

-

-static Bool

-winRealizeInstalledPaletteShadowDDNL (ScreenPtr pScreen)

-{

-  return TRUE;

-}

-

-

-/*

- * Install the specified colormap

- */

-

-static Bool

-winInstallColormapShadowDDNL (ColormapPtr pColormap)

-{

-  ScreenPtr		pScreen = pColormap->pScreen;

-  winScreenPriv(pScreen);

-  winCmapPriv(pColormap);

-  HRESULT		ddrval = DD_OK;

-

-  /* Install the DirectDraw palette on the primary surface */

-  ddrval = IDirectDrawSurface4_SetPalette (pScreenPriv->pddsPrimary4,

-					   pCmapPriv->lpDDPalette);

-  if (FAILED (ddrval))

-    {

-      ErrorF ("winInstallColormapShadowDDNL - Failed installing the "

-	      "DirectDraw palette.\n");

-      return FALSE;

-    }

-

-  /* Save a pointer to the newly installed colormap */

-  pScreenPriv->pcmapInstalled = pColormap;

-

-  return TRUE;

-}

-

-

-/*

- * Store the specified colors in the specified colormap

- */

-

-static Bool

-winStoreColorsShadowDDNL (ColormapPtr pColormap, 

-			  int ndef,

-			  xColorItem *pdefs)

-{

-  ScreenPtr		pScreen = pColormap->pScreen;

-  winScreenPriv(pScreen);

-  winCmapPriv(pColormap);

-  ColormapPtr		curpmap = pScreenPriv->pcmapInstalled;

-  HRESULT		ddrval = DD_OK;

-  

-  /* Put the X colormap entries into the Windows logical palette */

-  ddrval = IDirectDrawPalette_SetEntries (pCmapPriv->lpDDPalette,

-					  0,

-					  pdefs[0].pixel,

-					  ndef,

-					  pCmapPriv->peColors 

-					  + pdefs[0].pixel);

-  if (FAILED (ddrval))

-    {

-      ErrorF ("winStoreColorsShadowDDNL - SetEntries () failed: %08x\n", (unsigned int) ddrval);

-      return FALSE;

-    }

-

-  /* Don't install the DirectDraw palette if the colormap is not installed */

-  if (pColormap != curpmap)

-    {

-      return TRUE;

-    }

-

-  if (!winInstallColormapShadowDDNL (pColormap))

-    {

-      ErrorF ("winStoreColorsShadowDDNL - Failed installing colormap\n");

-      return FALSE;

-    }

-

-  return TRUE;

-}

-

-

-/*

- * Colormap initialization procedure

- */

-

-static Bool

-winCreateColormapShadowDDNL (ColormapPtr pColormap)

-{

-  HRESULT		ddrval = DD_OK;

-  ScreenPtr		pScreen = pColormap->pScreen;

-  winScreenPriv(pScreen);

-  winCmapPriv(pColormap);

-  

-  /* Create a DirectDraw palette */

-  ddrval = IDirectDraw4_CreatePalette (pScreenPriv->pdd4,

-				       DDPCAPS_8BIT | DDPCAPS_ALLOW256,

-				       pCmapPriv->peColors,

-				       &pCmapPriv->lpDDPalette,

-				       NULL);

-  if (FAILED (ddrval))

-    {

-      ErrorF ("winCreateColormapShadowDDNL - CreatePalette failed\n");

-      return FALSE;

-    }

-

-  return TRUE;

-}

-

-

-/*

- * Colormap destruction procedure

- */

-

-static Bool

-winDestroyColormapShadowDDNL (ColormapPtr pColormap)

-{

-  winScreenPriv(pColormap->pScreen);

-  winCmapPriv(pColormap);

-  HRESULT		ddrval = DD_OK;

-

-  /*

-   * Is colormap to be destroyed the default?

-   *

-   * Non-default colormaps should have had winUninstallColormap

-   * called on them before we get here.  The default colormap

-   * will not have had winUninstallColormap called on it.  Thus,

-   * we need to handle the default colormap in a special way.

-   */

-  if (pColormap->flags & IsDefault)

-    {

-#if CYGDEBUG

-      winDebug ("winDestroyColormapShadowDDNL - Destroying default colormap\n");

-#endif

-      

-      /*

-       * FIXME: Walk the list of all screens, popping the default

-       * palette out of each screen device context.

-       */

-      

-      /* Pop the palette out of the primary surface */

-      ddrval = IDirectDrawSurface4_SetPalette (pScreenPriv->pddsPrimary4,

-					       NULL);

-      if (FAILED (ddrval))

-	{

-	  ErrorF ("winDestroyColormapShadowDDNL - Failed freeing the "

-		  "default colormap DirectDraw palette.\n");

-	  return FALSE;

-	}

-

-      /* Clear our private installed colormap pointer */

-      pScreenPriv->pcmapInstalled = NULL;

-    }

-  

-  /* Release the palette */

-  IDirectDrawPalette_Release (pCmapPriv->lpDDPalette);

- 

-  /* Invalidate the colormap privates */

-  pCmapPriv->lpDDPalette = NULL;

-

-  return TRUE;

-}

-

-

-/*

- * Set pointers to our engine specific functions

- */

-

-Bool

-winSetEngineFunctionsShadowDDNL (ScreenPtr pScreen)

-{

-  winScreenPriv(pScreen);

-  winScreenInfo		*pScreenInfo = pScreenPriv->pScreenInfo;

-  

-  /* Set our pointers */

-  pScreenPriv->pwinAllocateFB = winAllocateFBShadowDDNL;

-  pScreenPriv->pwinShadowUpdate = winShadowUpdateDDNL;

-  pScreenPriv->pwinCloseScreen = winCloseScreenShadowDDNL;

-  pScreenPriv->pwinInitVisuals = winInitVisualsShadowDDNL;

-  pScreenPriv->pwinAdjustVideoMode = winAdjustVideoModeShadowDDNL;

-  if (pScreenInfo->fFullScreen)

-    pScreenPriv->pwinCreateBoundingWindow = winCreateBoundingWindowFullScreen;

-  else

-    pScreenPriv->pwinCreateBoundingWindow = winCreateBoundingWindowWindowed;

-  pScreenPriv->pwinFinishScreenInit = winFinishScreenInitFB;

-  pScreenPriv->pwinBltExposedRegions = winBltExposedRegionsShadowDDNL;

-  pScreenPriv->pwinActivateApp = winActivateAppShadowDDNL;

-  pScreenPriv->pwinRedrawScreen = winRedrawScreenShadowDDNL;

-  pScreenPriv->pwinRealizeInstalledPalette

-    = winRealizeInstalledPaletteShadowDDNL;

-  pScreenPriv->pwinInstallColormap = winInstallColormapShadowDDNL;

-  pScreenPriv->pwinStoreColors = winStoreColorsShadowDDNL;

-  pScreenPriv->pwinCreateColormap = winCreateColormapShadowDDNL;

-  pScreenPriv->pwinDestroyColormap = winDestroyColormapShadowDDNL;

-  pScreenPriv->pwinHotKeyAltTab = (winHotKeyAltTabProcPtr) (void (*)(void))NoopDDA;

-  pScreenPriv->pwinCreatePrimarySurface = winCreatePrimarySurfaceShadowDDNL;

-  pScreenPriv->pwinReleasePrimarySurface = winReleasePrimarySurfaceShadowDDNL;

-#ifdef XWIN_MULTIWINDOW

-  pScreenPriv->pwinFinishCreateWindowsWindow

-    = winFinishCreateWindowsWindowDDNL;

-#endif

-

-  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
+ */
+
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
+#include "win.h"
+
+
+/*
+ * FIXME: Headers are broken, DEFINE_GUID doesn't work correctly,
+ * so we have to redefine it here.
+ */
+#ifdef DEFINE_GUID
+#undef DEFINE_GUID
+#define DEFINE_GUID(n,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8) const GUID n GUID_SECT = {l,w1,w2,{b1,b2,b3,b4,b5,b6,b7,b8}}
+#endif /* DEFINE_GUID */
+
+/*
+ * FIXME: Headers are broken, IID_IDirectDraw4 has to be defined
+ * here manually.  Should be handled by ddraw.h
+ */
+#ifndef IID_IDirectDraw4
+DEFINE_GUID( IID_IDirectDraw4, 0x9c59509a,0x39bd,0x11d1,0x8c,0x4a,0x00,0xc0,0x4f,0xd9,0x30,0xc5 );
+#endif /* IID_IDirectDraw4 */
+
+#define FAIL_MSG_MAX_BLT	10
+
+
+/*
+ * Local prototypes
+ */
+
+static Bool
+winAllocateFBShadowDDNL (ScreenPtr pScreen);
+
+static void
+winShadowUpdateDDNL (ScreenPtr pScreen, 
+		     shadowBufPtr pBuf);
+
+static Bool
+winCloseScreenShadowDDNL (int nIndex, ScreenPtr pScreen);
+
+static Bool
+winInitVisualsShadowDDNL (ScreenPtr pScreen);
+
+static Bool
+winAdjustVideoModeShadowDDNL (ScreenPtr pScreen);
+
+static Bool
+winBltExposedRegionsShadowDDNL (ScreenPtr pScreen);
+
+static Bool
+winActivateAppShadowDDNL (ScreenPtr pScreen);
+
+static Bool
+winRedrawScreenShadowDDNL (ScreenPtr pScreen);
+
+static Bool
+winRealizeInstalledPaletteShadowDDNL (ScreenPtr pScreen);
+
+static Bool
+winInstallColormapShadowDDNL (ColormapPtr pColormap);
+
+static Bool
+winStoreColorsShadowDDNL (ColormapPtr pmap, 
+			  int ndef,
+			  xColorItem *pdefs);
+
+static Bool
+winCreateColormapShadowDDNL (ColormapPtr pColormap);
+
+static Bool
+winDestroyColormapShadowDDNL (ColormapPtr pColormap);
+
+static Bool
+winCreatePrimarySurfaceShadowDDNL (ScreenPtr pScreen);
+
+static Bool
+winReleasePrimarySurfaceShadowDDNL (ScreenPtr pScreen);
+
+
+/*
+ * Create the primary surface and attach the clipper.
+ * Used for both the initial surface creation and during
+ * WM_DISPLAYCHANGE messages.
+ */
+
+static Bool
+winCreatePrimarySurfaceShadowDDNL (ScreenPtr pScreen)
+{
+  winScreenPriv(pScreen);
+  HRESULT		ddrval = DD_OK;
+  DDSURFACEDESC2	ddsd;
+
+  winDebug ("winCreatePrimarySurfaceShadowDDNL - Creating primary surface\n");
+
+  /* Describe the primary surface */
+  ZeroMemory (&ddsd, sizeof (ddsd));
+  ddsd.dwSize = sizeof (ddsd);
+  ddsd.dwFlags = DDSD_CAPS;
+  ddsd.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE;
+  
+  /* Create the primary surface */
+  ddrval = IDirectDraw4_CreateSurface (pScreenPriv->pdd4,
+				       &ddsd,
+				       &pScreenPriv->pddsPrimary4,
+				       NULL);
+  pScreenPriv->fRetryCreateSurface = FALSE;
+  if (FAILED (ddrval))
+    {
+      if (ddrval == DDERR_NOEXCLUSIVEMODE)
+        {
+          /* Recreating the surface failed. Mark screen to retry later */ 
+          pScreenPriv->fRetryCreateSurface = TRUE;
+          winDebug ("winCreatePrimarySurfaceShadowDDNL - Could not create "
+	          "primary surface: DDERR_NOEXCLUSIVEMODE\n");
+        }
+      else
+        {
+          ErrorF ("winCreatePrimarySurfaceShadowDDNL - Could not create "
+	          "primary surface: %08x\n", (unsigned int) ddrval);
+        }
+      return FALSE;
+    }
+  
+#if 1
+  winDebug ("winCreatePrimarySurfaceShadowDDNL - Created primary surface\n");
+#endif
+
+  /* Attach our clipper to our primary surface handle */
+  ddrval = IDirectDrawSurface4_SetClipper (pScreenPriv->pddsPrimary4,
+					   pScreenPriv->pddcPrimary);
+  if (FAILED (ddrval))
+    {
+      ErrorF ("winCreatePrimarySurfaceShadowDDNL - Primary attach clipper "
+	      "failed: %08x\n",
+	      (unsigned int) ddrval);
+      return FALSE;
+    }
+
+#if 1
+  winDebug ("winCreatePrimarySurfaceShadowDDNL - Attached clipper to primary "
+	  "surface\n");
+#endif
+
+  /* Everything was correct */
+  return TRUE;
+}
+
+
+/*
+ * Detach the clipper and release the primary surface.
+ * Called from WM_DISPLAYCHANGE.
+ */
+
+static Bool
+winReleasePrimarySurfaceShadowDDNL (ScreenPtr pScreen)
+{
+  winScreenPriv(pScreen);
+
+  winDebug ("winReleasePrimarySurfaceShadowDDNL - Hello\n");
+
+  /* Release the primary surface and clipper, if they exist */
+  if (pScreenPriv->pddsPrimary4)
+    {
+      /*
+       * Detach the clipper from the primary surface.
+       * NOTE: We do this explicity for clarity.  The Clipper is not released.
+       */
+      IDirectDrawSurface4_SetClipper (pScreenPriv->pddsPrimary4,
+				      NULL);
+  
+      winDebug ("winReleasePrimarySurfaceShadowDDNL - Detached clipper\n");
+
+      /* Release the primary surface */
+      IDirectDrawSurface4_Release (pScreenPriv->pddsPrimary4);
+      pScreenPriv->pddsPrimary4 = NULL;
+    }
+
+  winDebug ("winReleasePrimarySurfaceShadowDDNL - Released primary surface\n");
+  
+  return TRUE;
+}
+
+
+/*
+ * Create a DirectDraw surface for the shadow framebuffer; also create
+ * a primary surface object so we can blit to the display.
+ * 
+ * Install a DirectDraw clipper on our primary surface object
+ * that clips our blits to the unobscured client area of our display window.
+ */
+
+Bool
+winAllocateFBShadowDDNL (ScreenPtr pScreen)
+{
+  winScreenPriv(pScreen);
+  winScreenInfo		*pScreenInfo = pScreenPriv->pScreenInfo;  
+  HRESULT		ddrval = DD_OK;
+  DDSURFACEDESC2	ddsdShadow;
+  char			*lpSurface = NULL;
+  DDPIXELFORMAT		ddpfPrimary;
+
+#if CYGDEBUG
+  winDebug ("winAllocateFBShadowDDNL - w %d h %d d %d\n",
+	  pScreenInfo->dwWidth, pScreenInfo->dwHeight, pScreenInfo->dwDepth);
+#endif
+
+  /* Set the padded screen width */
+  pScreenInfo->dwPaddedWidth = PixmapBytePad (pScreenInfo->dwWidth,
+					      pScreenInfo->dwBPP);
+
+  /* Allocate memory for our shadow surface */
+  lpSurface = malloc (pScreenInfo->dwPaddedWidth * pScreenInfo->dwHeight);
+  if (lpSurface == NULL)
+    {
+      ErrorF ("winAllocateFBShadowDDNL - Could not allocate bits\n");
+      return FALSE;
+    }
+
+  /*
+   * Initialize the framebuffer memory so we don't get a 
+   * strange display at startup
+   */
+  ZeroMemory (lpSurface, pScreenInfo->dwPaddedWidth * pScreenInfo->dwHeight);
+  
+  /* Create a clipper */
+  ddrval = (*g_fpDirectDrawCreateClipper) (0,
+					   &pScreenPriv->pddcPrimary,
+					   NULL);
+  if (FAILED (ddrval))
+    {
+      ErrorF ("winAllocateFBShadowDDNL - Could not attach clipper: %08x\n",
+	      (unsigned int) ddrval);
+      return FALSE;
+    }
+
+#if CYGDEBUG
+  winDebug ("winAllocateFBShadowDDNL - Created a clipper\n");
+#endif
+
+  /* Attach the clipper to our display window */
+  ddrval = IDirectDrawClipper_SetHWnd (pScreenPriv->pddcPrimary,
+				       0,
+				       pScreenPriv->hwndScreen);
+  if (FAILED (ddrval))
+    {
+      ErrorF ("winAllocateFBShadowDDNL - Clipper not attached "
+	      "to window: %08x\n",
+	      (unsigned int) ddrval);
+      return FALSE;
+    }
+
+#if CYGDEBUG
+  winDebug ("winAllocateFBShadowDDNL - Attached clipper to window\n");
+#endif
+
+  /* Create a DirectDraw object, store the address at lpdd */
+  ddrval = (*g_fpDirectDrawCreate) (NULL,
+				    (LPDIRECTDRAW*) &pScreenPriv->pdd,
+				    NULL);
+  if (FAILED (ddrval))
+    {
+      ErrorF ("winAllocateFBShadowDDNL - Could not start "
+	      "DirectDraw: %08x\n",
+	      (unsigned int) ddrval);
+      return FALSE;
+    }
+
+#if CYGDEBUG
+  winDebug ("winAllocateFBShadowDDNL - Created and initialized DD\n");
+#endif
+
+  /* Get a DirectDraw4 interface pointer */
+  ddrval = IDirectDraw_QueryInterface (pScreenPriv->pdd,
+				       &IID_IDirectDraw4,
+				       (LPVOID*) &pScreenPriv->pdd4);
+  if (FAILED (ddrval))
+    {
+      ErrorF ("winAllocateFBShadowDDNL - Failed DD4 query: %08x\n",
+	      (unsigned int) ddrval);
+      return FALSE;
+    }
+
+  /* Are we full screen? */
+  if (pScreenInfo->fFullScreen)
+    {
+      DDSURFACEDESC2	ddsdCurrent;
+      DWORD		dwRefreshRateCurrent = 0;
+      HDC		hdc = NULL;
+
+      /* Set the cooperative level to full screen */
+      ddrval = IDirectDraw4_SetCooperativeLevel (pScreenPriv->pdd4,
+						 pScreenPriv->hwndScreen,
+						 DDSCL_EXCLUSIVE
+						 | DDSCL_FULLSCREEN);
+      if (FAILED (ddrval))
+	{
+	  ErrorF ("winAllocateFBShadowDDNL - Could not set "
+		  "cooperative level: %08x\n",
+		  (unsigned int) ddrval);
+	  return FALSE;
+	}
+
+      /*
+       * We only need to get the current refresh rate for comparison
+       * if a refresh rate has been passed on the command line.
+       */
+      if (pScreenInfo->dwRefreshRate != 0)
+	{
+	  ZeroMemory (&ddsdCurrent, sizeof (ddsdCurrent));
+	  ddsdCurrent.dwSize = sizeof (ddsdCurrent);
+
+	  /* Get information about current display settings */
+	  ddrval = IDirectDraw4_GetDisplayMode (pScreenPriv->pdd4,
+						&ddsdCurrent);
+	  if (FAILED (ddrval))
+	    {
+	      ErrorF ("winAllocateFBShadowDDNL - Could not get current "
+		      "refresh rate: %08x.  Continuing.\n",
+		      (unsigned int) ddrval);
+	      dwRefreshRateCurrent = 0;
+	    }
+	  else
+	    {
+	      /* Grab the current refresh rate */
+	      dwRefreshRateCurrent = ddsdCurrent.u2.dwRefreshRate;
+	    }
+	}
+
+      /* Clean up the refresh rate */
+      if (dwRefreshRateCurrent == pScreenInfo->dwRefreshRate)
+	{
+	  /*
+	   * Refresh rate is non-specified or equal to current.
+	   */
+	  pScreenInfo->dwRefreshRate = 0;
+	}
+
+      /* Grab a device context for the screen */
+      hdc = GetDC (NULL);
+      if (hdc == NULL)
+	{
+	  ErrorF ("winAllocateFBShadowDDNL - GetDC () failed\n");
+	  return FALSE;
+	}
+
+      /* Only change the video mode when different than current mode */
+      if (!pScreenInfo->fMultipleMonitors
+	  && (pScreenInfo->dwWidth != GetSystemMetrics (SM_CXSCREEN)
+	      || pScreenInfo->dwHeight != GetSystemMetrics (SM_CYSCREEN)
+	      || pScreenInfo->dwBPP != GetDeviceCaps (hdc, BITSPIXEL)
+	      || pScreenInfo->dwRefreshRate != 0))
+	{
+	  winDebug ("winAllocateFBShadowDDNL - Changing video mode\n");
+
+	  /* Change the video mode to the mode requested, and use the driver default refresh rate on failure */
+	  ddrval = IDirectDraw4_SetDisplayMode (pScreenPriv->pdd4,
+						pScreenInfo->dwWidth,
+						pScreenInfo->dwHeight,
+						pScreenInfo->dwBPP,
+						pScreenInfo->dwRefreshRate,
+						0);	       
+	  if (FAILED (ddrval))
+	    {
+	      ErrorF ("winAllocateFBShadowDDNL - Could not set "
+		      "full screen display mode: %08x\n",
+		      (unsigned int) ddrval);
+	      ErrorF ("winAllocateFBShadowDDNL - Using default driver refresh rate\n");
+	      ddrval = IDirectDraw4_SetDisplayMode (pScreenPriv->pdd4,
+						    pScreenInfo->dwWidth,
+						    pScreenInfo->dwHeight,
+						    pScreenInfo->dwBPP,
+						    0,
+						    0);
+	      if (FAILED(ddrval))
+		{
+			ErrorF ("winAllocateFBShadowDDNL - Could not set default refresh rate "
+				"full screen display mode: %08x\n",
+				(unsigned int) ddrval);
+			return FALSE;
+		}
+	    }
+	}
+      else
+	{
+	  winDebug ("winAllocateFBShadowDDNL - Not changing video mode\n");
+	}
+
+      /* Release our DC */
+      ReleaseDC (NULL, hdc);
+      hdc = NULL;
+    }
+  else
+    {
+      /* Set the cooperative level for windowed mode */
+      ddrval = IDirectDraw4_SetCooperativeLevel (pScreenPriv->pdd4,
+						 pScreenPriv->hwndScreen,
+						 DDSCL_NORMAL);
+      if (FAILED (ddrval))
+	{
+	  ErrorF ("winAllocateFBShadowDDNL - Could not set "
+		  "cooperative level: %08x\n",
+		  (unsigned int) ddrval);
+	  return FALSE;
+	}
+    }
+
+  /* Create the primary surface */
+  if (!winCreatePrimarySurfaceShadowDDNL (pScreen))
+    {
+      ErrorF ("winAllocateFBShadowDDNL - winCreatePrimarySurfaceShadowDDNL "
+	      "failed\n");
+      return FALSE;
+    }
+
+  /* Get primary surface's pixel format */
+  ZeroMemory (&ddpfPrimary, sizeof (ddpfPrimary));
+  ddpfPrimary.dwSize = sizeof (ddpfPrimary);
+  ddrval = IDirectDrawSurface4_GetPixelFormat (pScreenPriv->pddsPrimary4,
+					       &ddpfPrimary);
+  if (FAILED (ddrval))
+    {
+      ErrorF ("winAllocateFBShadowDDNL - Could not get primary "
+	      "pixformat: %08x\n",
+	      (unsigned int) ddrval);
+      return FALSE;
+    }
+
+#if CYGDEBUG
+  winDebug ("winAllocateFBShadowDDNL - Primary masks: %08x %08x %08x "
+	  "dwRGBBitCount: %d\n",
+	  ddpfPrimary.u2.dwRBitMask,
+	  ddpfPrimary.u3.dwGBitMask,
+	  ddpfPrimary.u4.dwBBitMask,
+	  ddpfPrimary.u1.dwRGBBitCount);
+#endif
+
+  /* Describe the shadow surface to be created */
+  /*
+   * NOTE: Do not use a DDSCAPS_VIDEOMEMORY surface,
+   * as drawing, locking, and unlocking take forever
+   * with video memory surfaces.  In addition,
+   * video memory is a somewhat scarce resource,
+   * so you shouldn't be allocating video memory when
+   * you have the option of using system memory instead.
+   */
+  ZeroMemory (&ddsdShadow, sizeof (ddsdShadow));
+  ddsdShadow.dwSize = sizeof (ddsdShadow);
+  ddsdShadow.dwFlags = DDSD_CAPS | DDSD_HEIGHT | DDSD_WIDTH
+    | DDSD_LPSURFACE | DDSD_PITCH | DDSD_PIXELFORMAT;
+  ddsdShadow.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN | DDSCAPS_SYSTEMMEMORY;
+  ddsdShadow.dwHeight = pScreenInfo->dwHeight;
+  ddsdShadow.dwWidth = pScreenInfo->dwWidth;
+  ddsdShadow.u1.lPitch = pScreenInfo->dwPaddedWidth;
+  ddsdShadow.lpSurface = lpSurface;
+  ddsdShadow.u4.ddpfPixelFormat = ddpfPrimary;
+  
+  winDebug ("winAllocateFBShadowDDNL - lPitch: %d\n",
+	  (int) pScreenInfo->dwPaddedWidth);
+
+  /* Create the shadow surface */
+  ddrval = IDirectDraw4_CreateSurface (pScreenPriv->pdd4,
+				       &ddsdShadow,
+				       &pScreenPriv->pddsShadow4,
+				       NULL);
+  if (FAILED (ddrval))
+    {
+      ErrorF ("winAllocateFBShadowDDNL - Could not create shadow "
+	      "surface: %08x\n", (unsigned int) ddrval);
+      return FALSE;
+    }
+  
+#if CYGDEBUG || YES
+  winDebug ("winAllocateFBShadowDDNL - Created shadow pitch: %d\n",
+	  (int) ddsdShadow.u1.lPitch);
+#endif
+
+  /* Grab the pitch from the surface desc */
+  pScreenInfo->dwStride = (ddsdShadow.u1.lPitch * 8)
+    / pScreenInfo->dwBPP;
+
+#if CYGDEBUG || YES
+  winDebug ("winAllocateFBShadowDDNL - Created shadow stride: %d\n",
+	  (int) pScreenInfo->dwStride);
+#endif
+
+  /* Save the pointer to our surface memory */
+  pScreenInfo->pfb = lpSurface;
+  
+  /* Grab the masks from the surface description */
+  pScreenPriv->dwRedMask = ddsdShadow.u4.ddpfPixelFormat.u2.dwRBitMask;
+  pScreenPriv->dwGreenMask = ddsdShadow.u4.ddpfPixelFormat.u3.dwGBitMask;
+  pScreenPriv->dwBlueMask = ddsdShadow.u4.ddpfPixelFormat.u4.dwBBitMask;
+
+#if CYGDEBUG
+  winDebug ("winAllocateFBShadowDDNL - Returning\n");
+#endif
+
+  return TRUE;
+}
+
+static void
+winFreeFBShadowDDNL(ScreenPtr pScreen)
+{
+  winScreenPriv(pScreen);
+  winScreenInfo *pScreenInfo = pScreenPriv->pScreenInfo;
+
+  /* Free the shadow surface, if there is one */
+  if (pScreenPriv->pddsShadow4)
+    {
+      IDirectDrawSurface4_Release (pScreenPriv->pddsShadow4);
+      free (pScreenInfo->pfb);
+      pScreenInfo->pfb = NULL;
+      pScreenPriv->pddsShadow4 = NULL;
+    }
+
+  /* Detach the clipper from the primary surface and release the primary surface, if there is one */
+  winReleasePrimarySurfaceShadowDDNL(pScreen);
+
+  /* Release the clipper object */
+  if (pScreenPriv->pddcPrimary)
+    {
+      IDirectDrawClipper_Release (pScreenPriv->pddcPrimary);
+      pScreenPriv->pddcPrimary = NULL;
+    }
+
+  /* Free the DirectDraw4 object, if there is one */
+  if (pScreenPriv->pdd4)
+    {
+      IDirectDraw4_RestoreDisplayMode (pScreenPriv->pdd4);
+      IDirectDraw4_Release (pScreenPriv->pdd4);
+      pScreenPriv->pdd4 = NULL;
+    }
+
+  /* Free the DirectDraw object, if there is one */
+  if (pScreenPriv->pdd)
+    {
+      IDirectDraw_Release (pScreenPriv->pdd);
+      pScreenPriv->pdd = NULL;
+    }
+
+  /* Invalidate the ScreenInfo's fb pointer */
+  pScreenInfo->pfb = NULL;
+}
+
+#if defined(XWIN_MULTIWINDOW) || defined(XWIN_MULTIWINDOWEXTWM)
+/*
+ * Create a DirectDraw surface for the new multi-window window
+ */
+
+static
+Bool
+winFinishCreateWindowsWindowDDNL (WindowPtr pWin)
+{
+  winWindowPriv(pWin);
+  winPrivScreenPtr	pScreenPriv = pWinPriv->pScreenPriv;
+  HRESULT		ddrval = DD_OK;
+  DDSURFACEDESC2	ddsd;
+  int			iWidth, iHeight;
+  int			iX, iY;
+
+  winDebug ("winFinishCreateWindowsWindowDDNL!\n\n");
+
+  iX = pWin->drawable.x + GetSystemMetrics (SM_XVIRTUALSCREEN);
+  iY = pWin->drawable.y + GetSystemMetrics (SM_YVIRTUALSCREEN);
+  
+  iWidth = pWin->drawable.width;
+  iHeight = pWin->drawable.height;
+
+  /* Describe the primary surface */
+  ZeroMemory (&ddsd, sizeof (ddsd));
+  ddsd.dwSize = sizeof (ddsd);
+  ddsd.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT;
+  ddsd.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE;
+  ddsd.dwHeight = iHeight;
+  ddsd.dwWidth = iWidth;
+
+  /* Create the primary surface */
+  ddrval = IDirectDraw4_CreateSurface (pScreenPriv->pdd4,
+				       &ddsd,
+				       &pWinPriv->pddsPrimary4,
+				       NULL);
+  if (FAILED (ddrval))
+    {
+      ErrorF ("winFinishCreateWindowsWindowDDNL - Could not create primary "
+	      "surface: %08x\n",
+	      (unsigned int)ddrval);
+      return FALSE;
+    }
+  return TRUE;
+}
+#endif
+
+
+/*
+ * Transfer the damaged regions of the shadow framebuffer to the display.
+ */
+
+static void
+winShadowUpdateDDNL (ScreenPtr pScreen, 
+		     shadowBufPtr pBuf)
+{
+  winScreenPriv(pScreen);
+  winScreenInfo		*pScreenInfo = pScreenPriv->pScreenInfo;
+  RegionPtr		damage = shadowDamage(pBuf);
+  HRESULT		ddrval = DD_OK;
+  RECT			rcDest, rcSrc;
+  POINT			ptOrigin;
+  DWORD			dwBox = RegionNumRects (damage);
+  BoxPtr		pBox = RegionRects (damage);
+  HRGN			hrgnTemp = NULL, hrgnCombined = NULL;
+
+  /*
+   * Return immediately if the app is not active
+   * and we are fullscreen, or if we have a bad display depth
+   */
+  if ((!pScreenPriv->fActive && pScreenInfo->fFullScreen)
+      || pScreenPriv->fBadDepth) return;
+
+  /* Return immediately if we didn't get needed surfaces */
+  if (!pScreenPriv->pddsPrimary4 || !pScreenPriv->pddsShadow4)
+    return;
+
+  /* Get the origin of the window in the screen coords */
+  ptOrigin.x = pScreenInfo->dwXOffset;
+  ptOrigin.y = pScreenInfo->dwYOffset;
+  MapWindowPoints (pScreenPriv->hwndScreen,
+		   HWND_DESKTOP,
+		   (LPPOINT)&ptOrigin, 1);
+
+  /*
+   * Handle small regions with multiple blits,
+   * handle large regions by creating a clipping region and 
+   * doing a single blit constrained to that clipping region.
+   */
+  if (pScreenInfo->dwClipUpdatesNBoxes == 0
+      || dwBox < pScreenInfo->dwClipUpdatesNBoxes)
+    {
+      /* Loop through all boxes in the damaged region */
+      while (dwBox--)
+	{
+	  /* Assign damage box to source rectangle */
+	  rcSrc.left = pBox->x1;
+	  rcSrc.top = pBox->y1;
+	  rcSrc.right = pBox->x2;
+	  rcSrc.bottom = pBox->y2;
+	  
+	  /* Calculate destination rectangle */
+	  rcDest.left = ptOrigin.x + rcSrc.left;
+	  rcDest.top = ptOrigin.y + rcSrc.top;
+	  rcDest.right = ptOrigin.x + rcSrc.right;
+	  rcDest.bottom = ptOrigin.y + rcSrc.bottom;
+	  
+	  /* Blit the damaged areas */
+	  ddrval = IDirectDrawSurface4_Blt (pScreenPriv->pddsPrimary4,
+					    &rcDest,
+					    pScreenPriv->pddsShadow4,
+					    &rcSrc,
+					    DDBLT_WAIT,
+					    NULL);
+	  if (FAILED (ddrval))
+	    {
+	      static int	s_iFailCount = 0;
+	      
+	      if (s_iFailCount < FAIL_MSG_MAX_BLT)
+		{
+		  ErrorF ("winShadowUpdateDDNL - IDirectDrawSurface4_Blt () "
+			  "failed: %08x\n",
+			  (unsigned int) ddrval);
+		  
+		  ++s_iFailCount;
+
+		  if (s_iFailCount == FAIL_MSG_MAX_BLT)
+		    {
+		      ErrorF ("winShadowUpdateDDNL - IDirectDrawSurface4_Blt "
+			      "failure message maximum (%d) reached.  No "
+			      "more failure messages will be printed.\n",
+			      FAIL_MSG_MAX_BLT);
+		    }
+		}
+	    }
+	  
+	  /* Get a pointer to the next box */
+	  ++pBox;
+	}
+    }
+  else
+    {
+      BoxPtr		pBoxExtents = RegionExtents(damage);
+
+      /* Compute a GDI region from the damaged region */
+      hrgnCombined = CreateRectRgn (pBox->x1, pBox->y1, pBox->x2, pBox->y2);
+      dwBox--;
+      pBox++;
+      while (dwBox--)
+	{
+	  hrgnTemp = CreateRectRgn (pBox->x1, pBox->y1, pBox->x2, pBox->y2);
+	  CombineRgn (hrgnCombined, hrgnCombined, hrgnTemp, RGN_OR);
+	  DeleteObject (hrgnTemp);
+	  pBox++;
+	}
+
+      /* Install the GDI region as a clipping region */
+      SelectClipRgn (pScreenPriv->hdcScreen, hrgnCombined);
+      DeleteObject (hrgnCombined);
+      hrgnCombined = NULL;
+
+#if CYGDEBUG
+      winDebug ("winShadowUpdateDDNL - be x1 %d y1 %d x2 %d y2 %d\n",
+	      pBoxExtents->x1, pBoxExtents->y1,
+	      pBoxExtents->x2, pBoxExtents->y2);
+#endif
+
+      /* Calculating a bounding box for the source is easy */
+      rcSrc.left = pBoxExtents->x1;
+      rcSrc.top = pBoxExtents->y1;
+      rcSrc.right = pBoxExtents->x2;
+      rcSrc.bottom = pBoxExtents->y2;
+
+      /* Calculating a bounding box for the destination is trickier */
+      rcDest.left = ptOrigin.x + rcSrc.left;
+      rcDest.top = ptOrigin.y + rcSrc.top;
+      rcDest.right = ptOrigin.x + rcSrc.right;
+      rcDest.bottom = ptOrigin.y + rcSrc.bottom;
+
+      /* Our Blt should be clipped to the invalidated region */
+      ddrval = IDirectDrawSurface4_Blt (pScreenPriv->pddsPrimary4,
+					&rcDest,
+					pScreenPriv->pddsShadow4,
+					&rcSrc,
+					DDBLT_WAIT,
+					NULL);
+
+      /* Reset the clip region */
+      SelectClipRgn (pScreenPriv->hdcScreen, NULL);
+    }
+}
+
+static Bool
+winInitScreenShadowDDNL(ScreenPtr pScreen)
+{
+  winScreenPriv(pScreen);
+
+  /* Get a device context for the screen  */
+  pScreenPriv->hdcScreen = GetDC (pScreenPriv->hwndScreen);
+
+  return winAllocateFBShadowDDNL(pScreen);
+}
+
+/*
+ * Call the wrapped CloseScreen function.
+ *
+ * Free our resources and private structures.
+ */
+
+static Bool
+winCloseScreenShadowDDNL (int nIndex, ScreenPtr pScreen)
+{
+  winScreenPriv(pScreen);
+  winScreenInfo		*pScreenInfo = pScreenPriv->pScreenInfo;
+  Bool			fReturn;
+
+#if CYGDEBUG
+  winDebug ("winCloseScreenShadowDDNL - Freeing screen resources\n");
+#endif
+
+  /* Flag that the screen is closed */
+  pScreenPriv->fClosed = TRUE;
+  pScreenPriv->fActive = FALSE;
+
+  /* Call the wrapped CloseScreen procedure */
+  WIN_UNWRAP(CloseScreen);
+  fReturn = (*pScreen->CloseScreen) (nIndex, pScreen);
+
+  winFreeFBShadowDDNL(pScreen);
+
+  /* Free the screen DC */
+  ReleaseDC (pScreenPriv->hwndScreen, pScreenPriv->hdcScreen);
+
+  /* Delete the window property */
+  RemoveProp (pScreenPriv->hwndScreen, WIN_SCR_PROP);
+
+  /* Delete tray icon, if we have one */
+  if (!pScreenInfo->fNoTrayIcon)
+    winDeleteNotifyIcon (pScreenPriv);
+
+  /* Free the exit confirmation dialog box, if it exists */
+  if (g_hDlgExit != NULL)
+    {
+      DestroyWindow (g_hDlgExit);
+      g_hDlgExit = NULL;
+    }
+
+  /* Kill our window */
+  if (pScreenPriv->hwndScreen)
+    {
+      DestroyWindow (pScreenPriv->hwndScreen);
+      pScreenPriv->hwndScreen = NULL;
+    }
+
+#if defined(XWIN_CLIPBOARD) || defined(XWIN_MULTIWINDOW)
+  /* Destroy the thread startup mutex */
+  pthread_mutex_destroy (&pScreenPriv->pmServerStarted);
+#endif
+
+  /* Kill our screeninfo's pointer to the screen */
+  pScreenInfo->pScreen = NULL;
+
+  /* Free the screen privates for this screen */
+  free ((pointer) pScreenPriv);
+
+  return fReturn;
+}
+
+
+/*
+ * Tell mi what sort of visuals we need.
+ *
+ * Generally we only need one visual, as our screen can only
+ * handle one format at a time, I believe.  You may want
+ * to verify that last sentence.
+ */
+
+static Bool
+winInitVisualsShadowDDNL (ScreenPtr pScreen)
+{
+  winScreenPriv(pScreen);
+  winScreenInfo		*pScreenInfo = pScreenPriv->pScreenInfo;
+  DWORD			dwRedBits, dwGreenBits, dwBlueBits;
+
+  /* Count the number of ones in each color mask */
+  dwRedBits = winCountBits (pScreenPriv->dwRedMask);
+  dwGreenBits = winCountBits (pScreenPriv->dwGreenMask);
+  dwBlueBits = winCountBits (pScreenPriv->dwBlueMask);
+  
+  /* Store the maximum number of ones in a color mask as the bitsPerRGB */
+  if (dwRedBits == 0 || dwGreenBits == 0 || dwBlueBits == 0)
+    pScreenPriv->dwBitsPerRGB = 8;
+  else if (dwRedBits > dwGreenBits && dwRedBits > dwBlueBits)
+    pScreenPriv->dwBitsPerRGB = dwRedBits;
+  else if (dwGreenBits > dwRedBits && dwGreenBits > dwBlueBits)
+    pScreenPriv->dwBitsPerRGB = dwGreenBits;
+  else
+    pScreenPriv->dwBitsPerRGB = dwBlueBits;
+
+  winDebug ("winInitVisualsShadowDDNL - Masks %08x %08x %08x BPRGB %d d %d "
+	  "bpp %d\n",
+	  (unsigned int) pScreenPriv->dwRedMask,
+	  (unsigned int) pScreenPriv->dwGreenMask,
+	  (unsigned int) pScreenPriv->dwBlueMask,
+	  (int) pScreenPriv->dwBitsPerRGB,
+	  (int) pScreenInfo->dwDepth,
+	  (int) pScreenInfo->dwBPP);
+
+  /* Create a single visual according to the Windows screen depth */
+  switch (pScreenInfo->dwDepth)
+    {
+    case 24:
+    case 16:
+    case 15:
+      /* Setup the real visual */
+      if (!miSetVisualTypesAndMasks (pScreenInfo->dwDepth,
+				     TrueColorMask,
+				     pScreenPriv->dwBitsPerRGB,
+				     -1,
+				     pScreenPriv->dwRedMask,
+				     pScreenPriv->dwGreenMask,
+				     pScreenPriv->dwBlueMask))
+	{
+	  ErrorF ("winInitVisualsShadowDDNL - miSetVisualTypesAndMasks "
+		  "failed for TrueColor\n");
+	  return FALSE;
+	}
+
+#ifdef XWIN_EMULATEPSEUDO
+      if (!pScreenInfo->fEmulatePseudo)
+	break;
+
+      /* Setup a pseudocolor visual */
+      if (!miSetVisualTypesAndMasks (8,
+				     PseudoColorMask,
+				     8,
+				     -1,
+				     0,
+				     0,
+				     0))
+	{
+	  ErrorF ("winInitVisualsShadowDDNL - miSetVisualTypesAndMasks "
+		  "failed for PseudoColor\n");
+	  return FALSE;
+	}
+#endif
+      break;
+
+    case 8:
+      if (!miSetVisualTypesAndMasks (pScreenInfo->dwDepth,
+				     pScreenInfo->fFullScreen 
+				     ? PseudoColorMask : StaticColorMask,
+				     pScreenPriv->dwBitsPerRGB,
+				     pScreenInfo->fFullScreen 
+				     ? PseudoColor : StaticColor,
+				     pScreenPriv->dwRedMask,
+				     pScreenPriv->dwGreenMask,
+				     pScreenPriv->dwBlueMask))
+	{
+	  ErrorF ("winInitVisualsShadowDDNL - miSetVisualTypesAndMasks "
+		  "failed\n");
+	  return FALSE;
+	}
+      break;
+
+    default:
+      ErrorF ("winInitVisualsShadowDDNL - Unknown screen depth\n");
+      return FALSE;
+    }
+
+#if CYGDEBUG
+  winDebug ("winInitVisualsShadowDDNL - Returning\n");
+#endif
+
+  return TRUE;
+}
+
+
+/*
+ * Adjust the user proposed video mode
+ */
+
+static Bool
+winAdjustVideoModeShadowDDNL (ScreenPtr pScreen)
+{
+  winScreenPriv(pScreen);
+  winScreenInfo		*pScreenInfo = pScreenPriv->pScreenInfo;
+  HDC			hdc = NULL;
+  DWORD			dwBPP;
+
+  /* We're in serious trouble if we can't get a DC */
+  hdc = GetDC (NULL);
+  if (hdc == NULL)
+    {
+      ErrorF ("winAdjustVideoModeShadowDDNL - GetDC () failed\n");
+      return FALSE;
+    }
+
+  /* Query GDI for current display depth */
+  dwBPP = GetDeviceCaps (hdc, BITSPIXEL);
+
+  /* DirectDraw can only change the depth in fullscreen mode */
+  if (!(pScreenInfo->fFullScreen &&
+        (pScreenInfo->dwBPP != WIN_DEFAULT_BPP)))
+    {
+      /* Otherwise, We'll use GDI's depth */
+      pScreenInfo->dwBPP = dwBPP;
+    }
+
+  /* Release our DC */
+  ReleaseDC (NULL, hdc);
+
+  return TRUE;
+}
+
+
+/*
+ * Blt exposed regions to the screen
+ */
+
+static Bool
+winBltExposedRegionsShadowDDNL (ScreenPtr pScreen)
+{
+  winScreenPriv(pScreen);
+  winScreenInfo		*pScreenInfo = pScreenPriv->pScreenInfo;
+  RECT			rcSrc, rcDest;
+  POINT			ptOrigin;
+  HDC			hdcUpdate;
+  PAINTSTRUCT		ps;
+  HRESULT		ddrval = DD_OK;
+  Bool			fReturn = TRUE;
+  int			i;
+
+  /* Quite common case. The primary surface was lost (maybe because of depth
+   * change). Try to create a new primary surface. Bail out if this fails */
+  if (pScreenPriv->pddsPrimary4 == NULL && pScreenPriv->fRetryCreateSurface &&
+      !winCreatePrimarySurfaceShadowDDNL(pScreen))
+    {
+      Sleep(100);
+      return FALSE;
+    }
+  if (pScreenPriv->pddsPrimary4 == NULL)
+    return FALSE;  
+  
+  /* BeginPaint gives us an hdc that clips to the invalidated region */
+  hdcUpdate = BeginPaint (pScreenPriv->hwndScreen, &ps);
+  if (hdcUpdate == NULL)
+    {
+      fReturn = FALSE;
+      ErrorF ("winBltExposedRegionsShadowDDNL - BeginPaint () returned "
+	      "a NULL device context handle.  Aborting blit attempt.\n");
+      goto winBltExposedRegionsShadowDDNL_Exit;
+    }
+
+  /* Get the origin of the window in the screen coords */
+  ptOrigin.x = pScreenInfo->dwXOffset;
+  ptOrigin.y = pScreenInfo->dwYOffset;
+
+  MapWindowPoints (pScreenPriv->hwndScreen,
+		   HWND_DESKTOP,
+		   (LPPOINT)&ptOrigin, 1);
+  rcDest.left = ptOrigin.x;
+  rcDest.right = ptOrigin.x + pScreenInfo->dwWidth;
+  rcDest.top = ptOrigin.y;
+  rcDest.bottom = ptOrigin.y + pScreenInfo->dwHeight;
+
+  /* Source can be entire shadow surface, as Blt should clip for us */
+  rcSrc.left = 0;
+  rcSrc.top = 0;
+  rcSrc.right = pScreenInfo->dwWidth;
+  rcSrc.bottom = pScreenInfo->dwHeight;
+
+  /* Try to regain the primary surface and blit again if we've lost it */
+  for (i = 0; i <= WIN_REGAIN_SURFACE_RETRIES; ++i)
+    {
+      /* Our Blt should be clipped to the invalidated region */
+      ddrval = IDirectDrawSurface4_Blt (pScreenPriv->pddsPrimary4,
+					&rcDest,
+					pScreenPriv->pddsShadow4,
+					&rcSrc,
+					DDBLT_WAIT,
+					NULL);
+      if (ddrval == DDERR_SURFACELOST)
+	{
+	  /* Surface was lost */
+	  winErrorFVerb (1, "winBltExposedRegionsShadowDDNL - "
+          "IDirectDrawSurface4_Blt reported that the primary "
+          "surface was lost, trying to restore, retry: %d\n", i + 1);
+
+	  /* Try to restore the surface, once */
+	  
+	  ddrval = IDirectDrawSurface4_Restore (pScreenPriv->pddsPrimary4);
+	  winDebug ("winBltExposedRegionsShadowDDNL - "
+		  "IDirectDrawSurface4_Restore returned: ");
+	  if (ddrval == DD_OK)
+	    winDebug ("DD_OK\n");
+	  else if (ddrval == DDERR_WRONGMODE)
+	    winDebug ("DDERR_WRONGMODE\n");
+	  else if (ddrval == DDERR_INCOMPATIBLEPRIMARY)
+	    winDebug ("DDERR_INCOMPATIBLEPRIMARY\n");
+	  else if (ddrval == DDERR_UNSUPPORTED)
+	    winDebug ("DDERR_UNSUPPORTED\n");
+	  else if (ddrval == DDERR_INVALIDPARAMS)
+	    winDebug ("DDERR_INVALIDPARAMS\n");
+	  else if (ddrval == DDERR_INVALIDOBJECT)
+	    winDebug ("DDERR_INVALIDOBJECT\n");
+	  else
+	    winDebug ("unknown error: %08x\n", (unsigned int) ddrval);
+	  
+	  /* Loop around to try the blit one more time */
+	  continue;
+	}  
+      else if (FAILED (ddrval))
+	{
+	  fReturn = FALSE;
+	  winErrorFVerb (1, "winBltExposedRegionsShadowDDNL - "
+		  "IDirectDrawSurface4_Blt failed, but surface not "
+		  "lost: %08x %d\n",
+		  (unsigned int) ddrval, (int) ddrval);
+	  goto winBltExposedRegionsShadowDDNL_Exit;
+	}
+      else
+	{
+	  /* Success, stop looping */
+	  break;
+	}
+    }
+
+ winBltExposedRegionsShadowDDNL_Exit:
+  /* EndPaint frees the DC */
+  if (hdcUpdate != NULL)
+    EndPaint (pScreenPriv->hwndScreen, &ps);
+  return fReturn;
+}
+
+
+/*
+ * Do any engine-specific application-activation processing
+ */
+
+static Bool
+winActivateAppShadowDDNL (ScreenPtr pScreen)
+{
+  winScreenPriv(pScreen);
+
+  /*
+   * Do we have a surface?
+   * Are we active?
+   * Are we full screen?
+   */
+  if (pScreenPriv != NULL
+      && pScreenPriv->pddsPrimary4 != NULL
+      && pScreenPriv->fActive)
+    {
+      /* Primary surface was lost, restore it */
+      IDirectDrawSurface4_Restore (pScreenPriv->pddsPrimary4);
+    }
+
+  return TRUE;
+}
+
+
+/*
+ * Reblit the shadow framebuffer to the screen.
+ */
+
+static Bool
+winRedrawScreenShadowDDNL (ScreenPtr pScreen)
+{
+  winScreenPriv(pScreen);
+  winScreenInfo		*pScreenInfo = pScreenPriv->pScreenInfo;
+  HRESULT		ddrval = DD_OK;
+  RECT			rcSrc, rcDest;
+  POINT			ptOrigin;
+
+  /* Get the origin of the window in the screen coords */
+  ptOrigin.x = pScreenInfo->dwXOffset;
+  ptOrigin.y = pScreenInfo->dwYOffset;
+  MapWindowPoints (pScreenPriv->hwndScreen,
+		   HWND_DESKTOP,
+		   (LPPOINT)&ptOrigin, 1);
+  rcDest.left = ptOrigin.x;
+  rcDest.right = ptOrigin.x + pScreenInfo->dwWidth;
+  rcDest.top = ptOrigin.y;
+  rcDest.bottom = ptOrigin.y + pScreenInfo->dwHeight;
+
+  /* Source can be entire shadow surface, as Blt should clip for us */
+  rcSrc.left = 0;
+  rcSrc.top = 0;
+  rcSrc.right = pScreenInfo->dwWidth;
+  rcSrc.bottom = pScreenInfo->dwHeight;
+
+  /* Redraw the whole window, to take account for the new colors */
+  ddrval = IDirectDrawSurface4_Blt (pScreenPriv->pddsPrimary4,
+				    &rcDest,
+				    pScreenPriv->pddsShadow4,
+				    &rcSrc,
+				    DDBLT_WAIT,
+				    NULL);
+  if (FAILED (ddrval))
+    {
+      ErrorF ("winRedrawScreenShadowDDNL - IDirectDrawSurface4_Blt () "
+	      "failed: %08x\n",
+	      (unsigned int) ddrval);
+    }
+
+  return TRUE;
+}
+
+
+/*
+ * Realize the currently installed colormap
+ */
+
+static Bool
+winRealizeInstalledPaletteShadowDDNL (ScreenPtr pScreen)
+{
+  return TRUE;
+}
+
+
+/*
+ * Install the specified colormap
+ */
+
+static Bool
+winInstallColormapShadowDDNL (ColormapPtr pColormap)
+{
+  ScreenPtr		pScreen = pColormap->pScreen;
+  winScreenPriv(pScreen);
+  winCmapPriv(pColormap);
+  HRESULT		ddrval = DD_OK;
+
+  /* Install the DirectDraw palette on the primary surface */
+  ddrval = IDirectDrawSurface4_SetPalette (pScreenPriv->pddsPrimary4,
+					   pCmapPriv->lpDDPalette);
+  if (FAILED (ddrval))
+    {
+      ErrorF ("winInstallColormapShadowDDNL - Failed installing the "
+	      "DirectDraw palette.\n");
+      return FALSE;
+    }
+
+  /* Save a pointer to the newly installed colormap */
+  pScreenPriv->pcmapInstalled = pColormap;
+
+  return TRUE;
+}
+
+
+/*
+ * Store the specified colors in the specified colormap
+ */
+
+static Bool
+winStoreColorsShadowDDNL (ColormapPtr pColormap, 
+			  int ndef,
+			  xColorItem *pdefs)
+{
+  ScreenPtr		pScreen = pColormap->pScreen;
+  winScreenPriv(pScreen);
+  winCmapPriv(pColormap);
+  ColormapPtr		curpmap = pScreenPriv->pcmapInstalled;
+  HRESULT		ddrval = DD_OK;
+  
+  /* Put the X colormap entries into the Windows logical palette */
+  ddrval = IDirectDrawPalette_SetEntries (pCmapPriv->lpDDPalette,
+					  0,
+					  pdefs[0].pixel,
+					  ndef,
+					  pCmapPriv->peColors 
+					  + pdefs[0].pixel);
+  if (FAILED (ddrval))
+    {
+      ErrorF ("winStoreColorsShadowDDNL - SetEntries () failed: %08x\n", (unsigned int) ddrval);
+      return FALSE;
+    }
+
+  /* Don't install the DirectDraw palette if the colormap is not installed */
+  if (pColormap != curpmap)
+    {
+      return TRUE;
+    }
+
+  if (!winInstallColormapShadowDDNL (pColormap))
+    {
+      ErrorF ("winStoreColorsShadowDDNL - Failed installing colormap\n");
+      return FALSE;
+    }
+
+  return TRUE;
+}
+
+
+/*
+ * Colormap initialization procedure
+ */
+
+static Bool
+winCreateColormapShadowDDNL (ColormapPtr pColormap)
+{
+  HRESULT		ddrval = DD_OK;
+  ScreenPtr		pScreen = pColormap->pScreen;
+  winScreenPriv(pScreen);
+  winCmapPriv(pColormap);
+  
+  /* Create a DirectDraw palette */
+  ddrval = IDirectDraw4_CreatePalette (pScreenPriv->pdd4,
+				       DDPCAPS_8BIT | DDPCAPS_ALLOW256,
+				       pCmapPriv->peColors,
+				       &pCmapPriv->lpDDPalette,
+				       NULL);
+  if (FAILED (ddrval))
+    {
+      ErrorF ("winCreateColormapShadowDDNL - CreatePalette failed\n");
+      return FALSE;
+    }
+
+  return TRUE;
+}
+
+
+/*
+ * Colormap destruction procedure
+ */
+
+static Bool
+winDestroyColormapShadowDDNL (ColormapPtr pColormap)
+{
+  winScreenPriv(pColormap->pScreen);
+  winCmapPriv(pColormap);
+  HRESULT		ddrval = DD_OK;
+
+  /*
+   * Is colormap to be destroyed the default?
+   *
+   * Non-default colormaps should have had winUninstallColormap
+   * called on them before we get here.  The default colormap
+   * will not have had winUninstallColormap called on it.  Thus,
+   * we need to handle the default colormap in a special way.
+   */
+  if (pColormap->flags & IsDefault)
+    {
+#if CYGDEBUG
+      winDebug ("winDestroyColormapShadowDDNL - Destroying default colormap\n");
+#endif
+      
+      /*
+       * FIXME: Walk the list of all screens, popping the default
+       * palette out of each screen device context.
+       */
+      
+      /* Pop the palette out of the primary surface */
+      ddrval = IDirectDrawSurface4_SetPalette (pScreenPriv->pddsPrimary4,
+					       NULL);
+      if (FAILED (ddrval))
+	{
+	  ErrorF ("winDestroyColormapShadowDDNL - Failed freeing the "
+		  "default colormap DirectDraw palette.\n");
+	  return FALSE;
+	}
+
+      /* Clear our private installed colormap pointer */
+      pScreenPriv->pcmapInstalled = NULL;
+    }
+  
+  /* Release the palette */
+  IDirectDrawPalette_Release (pCmapPriv->lpDDPalette);
+ 
+  /* Invalidate the colormap privates */
+  pCmapPriv->lpDDPalette = NULL;
+
+  return TRUE;
+}
+
+
+/*
+ * Set pointers to our engine specific functions
+ */
+
+Bool
+winSetEngineFunctionsShadowDDNL (ScreenPtr pScreen)
+{
+  winScreenPriv(pScreen);
+  winScreenInfo		*pScreenInfo = pScreenPriv->pScreenInfo;
+  
+  /* Set our pointers */
+  pScreenPriv->pwinAllocateFB = winAllocateFBShadowDDNL;
+  pScreenPriv->pwinFreeFB = winFreeFBShadowDDNL;
+  pScreenPriv->pwinShadowUpdate = winShadowUpdateDDNL;
+  pScreenPriv->pwinInitScreen = winInitScreenShadowDDNL;
+  pScreenPriv->pwinCloseScreen = winCloseScreenShadowDDNL;
+  pScreenPriv->pwinInitVisuals = winInitVisualsShadowDDNL;
+  pScreenPriv->pwinAdjustVideoMode = winAdjustVideoModeShadowDDNL;
+  if (pScreenInfo->fFullScreen)
+    pScreenPriv->pwinCreateBoundingWindow = winCreateBoundingWindowFullScreen;
+  else
+    pScreenPriv->pwinCreateBoundingWindow = winCreateBoundingWindowWindowed;
+  pScreenPriv->pwinFinishScreenInit = winFinishScreenInitFB;
+  pScreenPriv->pwinBltExposedRegions = winBltExposedRegionsShadowDDNL;
+  pScreenPriv->pwinActivateApp = winActivateAppShadowDDNL;
+  pScreenPriv->pwinRedrawScreen = winRedrawScreenShadowDDNL;
+  pScreenPriv->pwinRealizeInstalledPalette
+    = winRealizeInstalledPaletteShadowDDNL;
+  pScreenPriv->pwinInstallColormap = winInstallColormapShadowDDNL;
+  pScreenPriv->pwinStoreColors = winStoreColorsShadowDDNL;
+  pScreenPriv->pwinCreateColormap = winCreateColormapShadowDDNL;
+  pScreenPriv->pwinDestroyColormap = winDestroyColormapShadowDDNL;
+  pScreenPriv->pwinHotKeyAltTab = (winHotKeyAltTabProcPtr) (void (*)(void))NoopDDA;
+  pScreenPriv->pwinCreatePrimarySurface = winCreatePrimarySurfaceShadowDDNL;
+  pScreenPriv->pwinReleasePrimarySurface = winReleasePrimarySurfaceShadowDDNL;
+#ifdef XWIN_MULTIWINDOW
+  pScreenPriv->pwinFinishCreateWindowsWindow
+    = winFinishCreateWindowsWindowDDNL;
+#endif
+
+  return TRUE;
+}
diff --git a/xorg-server/hw/xwin/winshadgdi.c b/xorg-server/hw/xwin/winshadgdi.c
index 4f36547f9..499037656 100644
--- a/xorg-server/hw/xwin/winshadgdi.c
+++ b/xorg-server/hw/xwin/winshadgdi.c
@@ -1,1267 +1,1259 @@
-/*

- *Copyright (C) 2001-2004 Harold L Hunt II 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 HAROLD L HUNT II 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 Harold L Hunt II

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

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

- *from Harold L Hunt II.

- *

- * Authors:	Harold L Hunt II

- */

-

-#ifdef HAVE_XWIN_CONFIG_H

-#include <xwin-config.h>

-#endif

-#include "win.h"

-

-

-/*

- * Local function prototypes

- */

-

-#ifdef XWIN_MULTIWINDOW

-static wBOOL CALLBACK

-winRedrawAllProcShadowGDI (HWND hwnd, LPARAM lParam);

-

-static wBOOL CALLBACK

-winRedrawDamagedWindowShadowGDI (HWND hwnd, LPARAM lParam);

-#endif

-

-static Bool

-winAllocateFBShadowGDI (ScreenPtr pScreen);

-

-static void

-winShadowUpdateGDI (ScreenPtr pScreen, 

-		    shadowBufPtr pBuf);

-

-static Bool

-winCloseScreenShadowGDI (int nIndex, ScreenPtr pScreen);

-

-static Bool

-winInitVisualsShadowGDI (ScreenPtr pScreen);

-

-static Bool

-winAdjustVideoModeShadowGDI (ScreenPtr pScreen);

-

-static Bool

-winBltExposedRegionsShadowGDI (ScreenPtr pScreen);

-

-static Bool

-winActivateAppShadowGDI (ScreenPtr pScreen);

-

-static Bool

-winRedrawScreenShadowGDI (ScreenPtr pScreen);

-

-static Bool

-winRealizeInstalledPaletteShadowGDI (ScreenPtr pScreen);

-

-static Bool

-winInstallColormapShadowGDI (ColormapPtr pColormap);

-

-static Bool

-winStoreColorsShadowGDI (ColormapPtr pmap, 

-			 int ndef,

-			 xColorItem *pdefs);

-

-static Bool

-winCreateColormapShadowGDI (ColormapPtr pColormap);

-

-static Bool

-winDestroyColormapShadowGDI (ColormapPtr pColormap);

-

-

-/*

- * Internal function to get the DIB format that is compatible with the screen

- */

-

-static

-Bool

-winQueryScreenDIBFormat (ScreenPtr pScreen, BITMAPINFOHEADER *pbmih)

-{

-  winScreenPriv(pScreen);

-  HBITMAP		hbmp;

-#if CYGDEBUG

-  LPDWORD		pdw = NULL;

-#endif

-  

-  /* Create a memory bitmap compatible with the screen */

-  hbmp = CreateCompatibleBitmap (pScreenPriv->hdcScreen, 1, 1);

-  if (hbmp == NULL)

-    {

-      ErrorF ("winQueryScreenDIBFormat - CreateCompatibleBitmap failed\n");

-      return FALSE;

-    }

-  

-  /* Initialize our bitmap info header */

-  ZeroMemory (pbmih, sizeof (BITMAPINFOHEADER) + 256 * sizeof (RGBQUAD));

-  pbmih->biSize = sizeof (BITMAPINFOHEADER);

-

-  /* Get the biBitCount */

-  if (!GetDIBits (pScreenPriv->hdcScreen,

-		  hbmp,

-		  0, 1,

-		  NULL,

-		  (BITMAPINFO*) pbmih,

-		  DIB_RGB_COLORS))

-    {

-      ErrorF ("winQueryScreenDIBFormat - First call to GetDIBits failed\n");

-      DeleteObject (hbmp);

-      return FALSE;

-    }

-

-#if CYGDEBUG

-  /* Get a pointer to bitfields */

-  pdw = (DWORD*) ((CARD8*)pbmih + sizeof (BITMAPINFOHEADER));

-

-  winDebug ("winQueryScreenDIBFormat - First call masks: %08x %08x %08x\n",

-	  pdw[0], pdw[1], pdw[2]);

-#endif

-

-  /* Get optimal color table, or the optimal bitfields */

-  if (!GetDIBits (pScreenPriv->hdcScreen,

-		  hbmp,

-		  0, 1,

-		  NULL,

-		  (BITMAPINFO*)pbmih,

-		  DIB_RGB_COLORS))

-    {

-      ErrorF ("winQueryScreenDIBFormat - Second call to GetDIBits "

-	      "failed\n");

-      DeleteObject (hbmp);

-      return FALSE;

-    }

-

-  /* Free memory */

-  DeleteObject (hbmp);

-  

-  return TRUE;

-}

-

-

-/*

- * Internal function to determine the GDI bits per rgb and bit masks

- */

-

-static

-Bool

-winQueryRGBBitsAndMasks (ScreenPtr pScreen)

-{

-  winScreenPriv(pScreen);

-  BITMAPINFOHEADER	*pbmih = NULL;

-  Bool			fReturn = TRUE;

-  LPDWORD		pdw = NULL;

-  DWORD			dwRedBits, dwGreenBits, dwBlueBits;

-

-  /* Color masks for 8 bpp are standardized */

-  if (GetDeviceCaps (pScreenPriv->hdcScreen, RASTERCAPS) & RC_PALETTE)

-    {

-      /* 

-       * RGB BPP for 8 bit palletes is always 8

-       * and the color masks are always 0.

-       */

-      pScreenPriv->dwBitsPerRGB = 8;

-      pScreenPriv->dwRedMask = 0x0L;

-      pScreenPriv->dwGreenMask = 0x0L;

-      pScreenPriv->dwBlueMask = 0x0L;

-      return TRUE;

-    }

-

-  /* Color masks for 24 bpp are standardized */

-  if (GetDeviceCaps (pScreenPriv->hdcScreen, PLANES)

-      * GetDeviceCaps (pScreenPriv->hdcScreen, BITSPIXEL) == 24)

-    {

-      ErrorF ("winQueryRGBBitsAndMasks - GetDeviceCaps (BITSPIXEL) "

-	      "returned 24 for the screen.  Using default 24bpp masks.\n");

-

-      /* 8 bits per primary color */

-      pScreenPriv->dwBitsPerRGB = 8;

-

-      /* Set screen privates masks */

-      pScreenPriv->dwRedMask = WIN_24BPP_MASK_RED;

-      pScreenPriv->dwGreenMask = WIN_24BPP_MASK_GREEN;

-      pScreenPriv->dwBlueMask = WIN_24BPP_MASK_BLUE;

-      

-      return TRUE;

-    }

-

-  /* Allocate a bitmap header and color table */

-  pbmih = (BITMAPINFOHEADER*) malloc (sizeof (BITMAPINFOHEADER)

-				      + 256  * sizeof (RGBQUAD));

-  if (pbmih == NULL)

-    {

-      ErrorF ("winQueryRGBBitsAndMasks - malloc failed\n");

-      return FALSE;

-    }

-

-  /* Get screen description */

-  if (winQueryScreenDIBFormat (pScreen, pbmih))

-    {

-      /* Get a pointer to bitfields */

-      pdw = (DWORD*) ((CARD8*)pbmih + sizeof (BITMAPINFOHEADER));

-      

-#if CYGDEBUG

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

-	      pdw[0], pdw[1], pdw[2]);

-      winDebug ("%s - Bitmap: %dx%d %d bpp %d planes\n", __FUNCTION__,

-              pbmih->biWidth, pbmih->biHeight, pbmih->biBitCount, pbmih->biPlanes);

-      winDebug ("%s - Compression: %d %s\n", __FUNCTION__,

-              pbmih->biCompression,

-              (pbmih->biCompression == BI_RGB?"(BI_RGB)":

-               (pbmih->biCompression == BI_RLE8?"(BI_RLE8)":

-                (pbmih->biCompression == BI_RLE4?"(BI_RLE4)":

-                 (pbmih->biCompression == BI_BITFIELDS?"(BI_BITFIELDS)":""

-                 )))));

-#endif

-

-      /* Handle BI_RGB case, which is returned by Wine */

-      if (pbmih->biCompression == BI_RGB)

-        {

-	  dwRedBits = 5;

-	  dwGreenBits = 5;

-	  dwBlueBits = 5;

-	  

-	  pScreenPriv->dwBitsPerRGB = 5;

-	  

-	  /* Set screen privates masks */

-	  pScreenPriv->dwRedMask = 0x7c00;

-	  pScreenPriv->dwGreenMask = 0x03e0;

-	  pScreenPriv->dwBlueMask = 0x001f;

-        }

-      else 

-        {

-          /* Count the number of bits in each mask */

-          dwRedBits = winCountBits (pdw[0]);

-          dwGreenBits = winCountBits (pdw[1]);

-          dwBlueBits = winCountBits (pdw[2]);

-

-	  /* Find maximum bits per red, green, blue */

-	  if (dwRedBits > dwGreenBits && dwRedBits > dwBlueBits)

-	    pScreenPriv->dwBitsPerRGB = dwRedBits;

-	  else if (dwGreenBits > dwRedBits && dwGreenBits > dwBlueBits)

-	    pScreenPriv->dwBitsPerRGB = dwGreenBits;

-	  else

-	    pScreenPriv->dwBitsPerRGB = dwBlueBits;

-

-	  /* Set screen privates masks */

-	  pScreenPriv->dwRedMask = pdw[0];

-	  pScreenPriv->dwGreenMask = pdw[1];

-	  pScreenPriv->dwBlueMask = pdw[2];

-	}

-    }

-  else

-    {

-      ErrorF ("winQueryRGBBitsAndMasks - winQueryScreenDIBFormat failed\n");

-      free (pbmih);

-      fReturn = FALSE;

-    }

-

-  /* Free memory */

-  free (pbmih);

-

-  return fReturn;

-}

-

-

-#ifdef XWIN_MULTIWINDOW

-/*

- * Redraw all ---?

- */

-

-static wBOOL CALLBACK

-winRedrawAllProcShadowGDI (HWND hwnd, LPARAM lParam)

-{

-  if (hwnd == (HWND)lParam)

-    return TRUE;  

-  InvalidateRect (hwnd, NULL, FALSE);

-  UpdateWindow (hwnd);

-  return TRUE;

-}

-

-static wBOOL CALLBACK

-winRedrawDamagedWindowShadowGDI (HWND hwnd, LPARAM lParam)

-{

-  BoxPtr pDamage = (BoxPtr)lParam;

-  RECT rcClient, rcDamage, rcRedraw;

-  POINT topLeft, bottomRight;

-  

-  if (IsIconic (hwnd))

-    return TRUE; /* Don't care minimized windows */

-  

-  /* Convert the damaged area from Screen coords to Client coords */

-  topLeft.x = pDamage->x1; topLeft.y = pDamage->y1;

-  bottomRight.x = pDamage->x2; bottomRight.y = pDamage->y2;

-  topLeft.x += GetSystemMetrics (SM_XVIRTUALSCREEN);

-  bottomRight.x += GetSystemMetrics (SM_XVIRTUALSCREEN);

-  topLeft.y += GetSystemMetrics (SM_YVIRTUALSCREEN);

-  bottomRight.y += GetSystemMetrics (SM_YVIRTUALSCREEN);

-  ScreenToClient (hwnd, &topLeft);

-  ScreenToClient (hwnd, &bottomRight);

-  SetRect (&rcDamage, topLeft.x, topLeft.y, bottomRight.x, bottomRight.y);

-

-  GetClientRect (hwnd, &rcClient);

-

-  if (IntersectRect (&rcRedraw, &rcClient, &rcDamage))

-    {

-      InvalidateRect (hwnd, &rcRedraw, FALSE);

-      UpdateWindow (hwnd);

-    }

-  return TRUE;

-}

-#endif

-

-

-/*

- * Allocate a DIB for the shadow framebuffer GDI server

- */

-

-static Bool

-winAllocateFBShadowGDI (ScreenPtr pScreen)

-{

-  winScreenPriv(pScreen);

-  winScreenInfo		*pScreenInfo = pScreenPriv->pScreenInfo;

-  BITMAPINFOHEADER	*pbmih = NULL;

-  DIBSECTION		dibsection;

-  Bool			fReturn = TRUE;

-

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

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

-  pScreenPriv->hdcShadow = CreateCompatibleDC (pScreenPriv->hdcScreen);

-

-  /* Allocate bitmap info header */

-  pbmih = (BITMAPINFOHEADER*) malloc (sizeof (BITMAPINFOHEADER)

-				      + 256 * sizeof (RGBQUAD));

-  if (pbmih == NULL)

-    {

-      ErrorF ("winAllocateFBShadowGDI - malloc () failed\n");

-      return FALSE;

-    }

-

-  /* Query the screen format */

-  fReturn = winQueryScreenDIBFormat (pScreen, pbmih);

-

-  /* Describe shadow bitmap to be created */

-  pbmih->biWidth = pScreenInfo->dwWidth;

-  pbmih->biHeight = -pScreenInfo->dwHeight;

-  

-  ErrorF ("winAllocateFBShadowGDI - Creating DIB with width: %d height: %d "

-	  "depth: %d\n",

-	  (int) pbmih->biWidth, (int) -pbmih->biHeight, pbmih->biBitCount);

-

-  /* Create a DI shadow bitmap with a bit pointer */

-  pScreenPriv->hbmpShadow = CreateDIBSection (pScreenPriv->hdcScreen,

-					      (BITMAPINFO *) pbmih,

-					      DIB_RGB_COLORS,

-					      (VOID**) &pScreenInfo->pfb,

-					      NULL,

-					      0);

-  if (pScreenPriv->hbmpShadow == NULL || pScreenInfo->pfb == NULL)

-    {

-      winW32Error (2, "winAllocateFBShadowGDI - CreateDIBSection failed:");

-      return FALSE;

-    }

-  else

-    {

-#if CYGDEBUG

-      winDebug ("winAllocateFBShadowGDI - Shadow buffer allocated\n");

-#endif

-    }

-

-  /* Get information about the bitmap that was allocated */

-  GetObject (pScreenPriv->hbmpShadow,

-	     sizeof (dibsection),

-	     &dibsection);

-

-#if CYGDEBUG || YES

-  /* Print information about bitmap allocated */

-  winDebug ("winAllocateFBShadowGDI - Dibsection width: %d height: %d "

-	  "depth: %d size image: %d\n",

-	  (int) dibsection.dsBmih.biWidth, (int) dibsection.dsBmih.biHeight,

-	  dibsection.dsBmih.biBitCount,

-	  (int) dibsection.dsBmih.biSizeImage);

-#endif

-

-  /* Select the shadow bitmap into the shadow DC */

-  SelectObject (pScreenPriv->hdcShadow,

-		pScreenPriv->hbmpShadow);

-

-#if CYGDEBUG

-  winDebug ("winAllocateFBShadowGDI - Attempting a shadow blit\n");

-#endif

-

-  /* Do a test blit from the shadow to the screen, I think */

-  fReturn = BitBlt (pScreenPriv->hdcScreen,

-		    0, 0,

-		    pScreenInfo->dwWidth, pScreenInfo->dwHeight,

-		    pScreenPriv->hdcShadow,

-		    0, 0,

-		    SRCCOPY);

-  if (fReturn)

-    {

-#if CYGDEBUG

-      winDebug ("winAllocateFBShadowGDI - Shadow blit success\n");

-#endif

-    }

-  else

-    {

-      winW32Error (2, "winAllocateFBShadowGDI - Shadow blit failure\n");

-#if 0      

-      return FALSE;

-#else 

-      /* ago: ignore this error. The blit fails with wine, but does not 

-       * cause any problems later. */

-

-      fReturn = TRUE;

-#endif      

-    }

-

-  /* Look for height weirdness */

-  if (dibsection.dsBmih.biHeight < 0)

-    {

-      dibsection.dsBmih.biHeight = -dibsection.dsBmih.biHeight;

-    }

-

-  /* Set screeninfo stride */

-  pScreenInfo->dwStride = ((dibsection.dsBmih.biSizeImage

-			    / dibsection.dsBmih.biHeight)

-			   * 8) / pScreenInfo->dwBPP;

-

-#if CYGDEBUG || YES

-  winDebug ("winAllocateFBShadowGDI - Created shadow stride: %d\n",

-	  (int) pScreenInfo->dwStride);

-#endif

-

-  /* See if the shadow bitmap will be larger than the DIB size limit */

-  if (pScreenInfo->dwWidth * pScreenInfo->dwHeight * pScreenInfo->dwBPP

-      >= WIN_DIB_MAXIMUM_SIZE)

-    {

-      ErrorF ("winAllocateFBShadowGDI - Requested DIB (bitmap) "

-	      "will be larger than %d MB.  The surface may fail to be "

-	      "allocated on Windows 95, 98, or Me, due to a %d MB limit in "

-	      "DIB size.  This limit does not apply to Windows NT/2000, and "

-	      "this message may be ignored on those platforms.\n",

-	      WIN_DIB_MAXIMUM_SIZE_MB, WIN_DIB_MAXIMUM_SIZE_MB);

-    }

-

-  /* Determine our color masks */

-  if (!winQueryRGBBitsAndMasks (pScreen))

-    {

-      ErrorF ("winAllocateFBShadowGDI - winQueryRGBBitsAndMasks failed\n");

-      return FALSE;

-    }

-

-#ifdef XWIN_MULTIWINDOW

-  /* Redraw all windows */

-  if (pScreenInfo->fMultiWindow)

-    EnumThreadWindows (g_dwCurrentThreadID, winRedrawAllProcShadowGDI, 0);

-#endif

-

-  return fReturn;

-}

-

-

-/*

- * Blit the damaged regions of the shadow fb to the screen

- */

-

-static void

-winShadowUpdateGDI (ScreenPtr pScreen, 

-		    shadowBufPtr pBuf)

-{

-  winScreenPriv(pScreen);

-  winScreenInfo		*pScreenInfo = pScreenPriv->pScreenInfo;

-  RegionPtr		damage = shadowDamage(pBuf);

-  DWORD			dwBox = RegionNumRects (damage);

-  BoxPtr		pBox = RegionRects (damage);

-  int			x, y, w, h;

-  HRGN			hrgnTemp = NULL, hrgnCombined = NULL;

-#ifdef XWIN_UPDATESTATS

-  static DWORD		s_dwNonUnitRegions = 0;

-  static DWORD		s_dwTotalUpdates = 0;

-  static DWORD		s_dwTotalBoxes = 0;

-#endif

-  BoxPtr		pBoxExtents = RegionExtents(damage);

-

-  /*

-   * Return immediately if the app is not active

-   * and we are fullscreen, or if we have a bad display depth

-   */

-  if ((!pScreenPriv->fActive && pScreenInfo->fFullScreen)

-      || pScreenPriv->fBadDepth) return;

-

-#ifdef XWIN_UPDATESTATS

-  ++s_dwTotalUpdates;

-  s_dwTotalBoxes += dwBox;

-

-  if (dwBox != 1)

-    {

-      ++s_dwNonUnitRegions;

-      ErrorF ("winShadowUpdatGDI - dwBox: %d\n", dwBox);

-    }

-  

-  if ((s_dwTotalUpdates % 100) == 0)

-    ErrorF ("winShadowUpdateGDI - %d%% non-unity regions, avg boxes: %d "

-	    "nu: %d tu: %d\n",

-	    (s_dwNonUnitRegions * 100) / s_dwTotalUpdates,

-	    s_dwTotalBoxes / s_dwTotalUpdates,

-	    s_dwNonUnitRegions, s_dwTotalUpdates);

-#endif /* XWIN_UPDATESTATS */

-

-  /*

-   * Handle small regions with multiple blits,

-   * handle large regions by creating a clipping region and 

-   * doing a single blit constrained to that clipping region.

-   */

-  if (!pScreenInfo->fMultiWindow &&

-      (pScreenInfo->dwClipUpdatesNBoxes == 0 ||

-      dwBox < pScreenInfo->dwClipUpdatesNBoxes))

-    {

-      /* Loop through all boxes in the damaged region */

-      while (dwBox--)

-	{

-	  /*

-	   * Calculate x offset, y offset, width, and height for

-	   * current damage box

-	   */

-	  x = pBox->x1;

-	  y = pBox->y1;

-	  w = pBox->x2 - pBox->x1;

-	  h = pBox->y2 - pBox->y1;

-	  

-	  BitBlt (pScreenPriv->hdcScreen,

-		  x, y,

-		  w, h,

-		  pScreenPriv->hdcShadow,

-		  x, y,

-		  SRCCOPY);

-	  

-	  /* Get a pointer to the next box */

-	  ++pBox;

-	}

-    }

-  else if (!pScreenInfo->fMultiWindow)

-    {

-      /* Compute a GDI region from the damaged region */

-      hrgnCombined = CreateRectRgn (pBox->x1, pBox->y1, pBox->x2, pBox->y2);

-      dwBox--;

-      pBox++;

-      while (dwBox--)

-	{

-	  hrgnTemp = CreateRectRgn (pBox->x1, pBox->y1, pBox->x2, pBox->y2);

-	  CombineRgn (hrgnCombined, hrgnCombined, hrgnTemp, RGN_OR);

-	  DeleteObject (hrgnTemp);

-	  pBox++;

-	}

-      

-      /* Install the GDI region as a clipping region */

-      SelectClipRgn (pScreenPriv->hdcScreen, hrgnCombined);

-      DeleteObject (hrgnCombined);

-      hrgnCombined = NULL;

-      

-      /*

-       * Blit the shadow buffer to the screen,

-       * constrained to the clipping region.

-       */

-      BitBlt (pScreenPriv->hdcScreen,

-	      pBoxExtents->x1, pBoxExtents->y1,

-	      pBoxExtents->x2 - pBoxExtents->x1,

-	      pBoxExtents->y2 - pBoxExtents->y1,

-	      pScreenPriv->hdcShadow,

-	      pBoxExtents->x1, pBoxExtents->y1,

-	      SRCCOPY);

-

-      /* Reset the clip region */

-      SelectClipRgn (pScreenPriv->hdcScreen, NULL);

-    }

-

-#ifdef XWIN_MULTIWINDOW

-  /* Redraw all multiwindow windows */

-  if (pScreenInfo->fMultiWindow)

-    EnumThreadWindows (g_dwCurrentThreadID,

-		       winRedrawDamagedWindowShadowGDI,

-		       (LPARAM)pBoxExtents);

-#endif

-}

-

-

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

-/*

- * We wrap whatever CloseScreen procedure was specified by fb;

- * a pointer to said procedure is stored in our privates.

- */

-

-static Bool

-winCloseScreenShadowGDI (int nIndex, ScreenPtr pScreen)

-{

-  winScreenPriv(pScreen);

-  winScreenInfo		*pScreenInfo = pScreenPriv->pScreenInfo;

-  Bool			fReturn;

-

-#if CYGDEBUG

-  winDebug ("winCloseScreenShadowGDI - Freeing screen resources\n");

-#endif

-

-  /* Flag that the screen is closed */

-  pScreenPriv->fClosed = TRUE;

-  pScreenPriv->fActive = FALSE;

-

-  /* Call the wrapped CloseScreen procedure */

-  WIN_UNWRAP(CloseScreen);

-  fReturn = (*pScreen->CloseScreen) (nIndex, pScreen);

-

-  /* Delete the window property */

-  RemoveProp (pScreenPriv->hwndScreen, WIN_SCR_PROP);

-

-  /* Free the shadow DC; which allows the bitmap to be freed */

-  DeleteDC (pScreenPriv->hdcShadow);

-  

-  /* Free the shadow bitmap */

-  DeleteObject (pScreenPriv->hbmpShadow);

-

-  /* Free the screen DC */

-  ReleaseDC (pScreenPriv->hwndScreen, pScreenPriv->hdcScreen);

-

-  /* Delete tray icon, if we have one */

-  if (!pScreenInfo->fNoTrayIcon)

-    winDeleteNotifyIcon (pScreenPriv);

-

-  /* Free the exit confirmation dialog box, if it exists */

-  if (g_hDlgExit != NULL)

-    {

-      DestroyWindow (g_hDlgExit);

-      g_hDlgExit = NULL;

-    }

-

-  /* Kill our window */

-  if (pScreenPriv->hwndScreen)

-    {

-      DestroyWindow (pScreenPriv->hwndScreen);

-      pScreenPriv->hwndScreen = NULL;

-    }

-

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

-  /* Destroy the thread startup mutex */

-  pthread_mutex_destroy (&pScreenPriv->pmServerStarted);

-#endif

-

-  /* Invalidate our screeninfo's pointer to the screen */

-  pScreenInfo->pScreen = NULL;

-

-  /* Invalidate the ScreenInfo's fb pointer */

-  pScreenInfo->pfb = NULL;

-

-  /* Free the screen privates for this screen */

-  free ((pointer) pScreenPriv);

-

-  return fReturn;

-}

-

-

-/*

- * Tell mi what sort of visuals we need.

- * 

- * Generally we only need one visual, as our screen can only

- * handle one format at a time, I believe.  You may want

- * to verify that last sentence.

- */

-

-static Bool

-winInitVisualsShadowGDI (ScreenPtr pScreen)

-{

-  winScreenPriv(pScreen);

-  winScreenInfo		*pScreenInfo = pScreenPriv->pScreenInfo;

-

-  /* Display debugging information */

-  ErrorF ("winInitVisualsShadowGDI - Masks %08x %08x %08x BPRGB %d d %d "

-	  "bpp %d\n",

-	  (unsigned int) pScreenPriv->dwRedMask,

-	  (unsigned int) pScreenPriv->dwGreenMask,

-	  (unsigned int) pScreenPriv->dwBlueMask,

-	  (int) pScreenPriv->dwBitsPerRGB,

-	  (int) pScreenInfo->dwDepth,

-	  (int) pScreenInfo->dwBPP);

-

-  /* Create a single visual according to the Windows screen depth */

-  switch (pScreenInfo->dwDepth)

-    {

-    case 24:

-    case 16:

-    case 15:

-      /* Setup the real visual */

-      if (!miSetVisualTypesAndMasks (pScreenInfo->dwDepth,

-				     TrueColorMask,

-				     pScreenPriv->dwBitsPerRGB,

-				     -1,

-				     pScreenPriv->dwRedMask,

-				     pScreenPriv->dwGreenMask,

-				     pScreenPriv->dwBlueMask))

-	{

-	  ErrorF ("winInitVisualsShadowGDI - miSetVisualTypesAndMasks "

-		  "failed\n");

-	  return FALSE;

-	}

-

-#ifdef XWIN_EMULATEPSEUDO

-      if (!pScreenInfo->fEmulatePseudo)

-	break;

-

-      /* Setup a pseudocolor visual */

-      if (!miSetVisualTypesAndMasks (8,

-				     PseudoColorMask,

-				     8,

-				     -1,

-				     0,

-				     0,

-				     0))

-	{

-	  ErrorF ("winInitVisualsShadowGDI - miSetVisualTypesAndMasks "

-		  "failed for PseudoColor\n");

-	  return FALSE;

-	}

-#endif

-      break;

-

-    case 8:

-      if (!miSetVisualTypesAndMasks (pScreenInfo->dwDepth,

-				     PseudoColorMask,

-				     pScreenPriv->dwBitsPerRGB,

-				     PseudoColor,

-				     pScreenPriv->dwRedMask,

-				     pScreenPriv->dwGreenMask,

-				     pScreenPriv->dwBlueMask))

-	{

-	  ErrorF ("winInitVisualsShadowGDI - miSetVisualTypesAndMasks "

-		  "failed\n");

-	  return FALSE;

-	}

-      break;

-

-    default:

-      ErrorF ("winInitVisualsShadowGDI - Unknown screen depth\n");

-      return FALSE;

-    }

-

-#if CYGDEBUG

-  winDebug ("winInitVisualsShadowGDI - Returning\n");

-#endif

-

-  return TRUE;

-}

-

-

-/*

- * Adjust the proposed video mode

- */

-

-static Bool

-winAdjustVideoModeShadowGDI (ScreenPtr pScreen)

-{

-  winScreenPriv(pScreen);

-  winScreenInfo		*pScreenInfo = pScreenPriv->pScreenInfo;

-  HDC			hdc;

-  DWORD			dwBPP;

-  

-  hdc = GetDC (NULL);

-

-  /* We're in serious trouble if we can't get a DC */

-  if (hdc == NULL)

-    {

-      ErrorF ("winAdjustVideoModeShadowGDI - GetDC () failed\n");

-      return FALSE;

-    }

-

-  /* Query GDI for current display depth */

-  dwBPP = GetDeviceCaps (hdc, BITSPIXEL);

-

-  /* GDI cannot change the screen depth */

-  if (pScreenInfo->dwBPP == WIN_DEFAULT_BPP)

-    {

-      /* No -depth parameter passed, let the user know the depth being used */

-      ErrorF ("winAdjustVideoModeShadowGDI - Using Windows display "

-	      "depth of %d bits per pixel\n", (int) dwBPP);

-

-      /* Use GDI's depth */

-      pScreenInfo->dwBPP = dwBPP;

-    }

-  else if (dwBPP != pScreenInfo->dwBPP)

-    {

-      /* Warn user if GDI depth is different than -depth parameter */

-      ErrorF ("winAdjustVideoModeShadowGDI - Command line bpp: %d, "\

-	      "using bpp: %d\n", (int) pScreenInfo->dwBPP, (int) dwBPP);

-

-      /* We'll use GDI's depth */

-      pScreenInfo->dwBPP = dwBPP;

-    }

-  

-  /* Release our DC */

-  ReleaseDC (NULL, hdc);

-  hdc = NULL;

-

-  return TRUE;

-}

-

-

-/*

- * Blt exposed regions to the screen

- */

-

-static Bool

-winBltExposedRegionsShadowGDI (ScreenPtr pScreen)

-{

-  winScreenPriv(pScreen);

-  winScreenInfo		*pScreenInfo = pScreenPriv->pScreenInfo;

-  winPrivCmapPtr	pCmapPriv = NULL;

-  HDC			hdcUpdate;

-  PAINTSTRUCT		ps;

-

-  /* BeginPaint gives us an hdc that clips to the invalidated region */

-  hdcUpdate = BeginPaint (pScreenPriv->hwndScreen, &ps);

-

-  /* Realize the palette, if we have one */

-  if (pScreenPriv->pcmapInstalled != NULL)

-    {

-      pCmapPriv = winGetCmapPriv (pScreenPriv->pcmapInstalled);

-      

-      SelectPalette (hdcUpdate, pCmapPriv->hPalette, FALSE);

-      RealizePalette (hdcUpdate);

-    }

-

-  /* Our BitBlt will be clipped to the invalidated region */

-  BitBlt (hdcUpdate,

-	  0, 0,

-	  pScreenInfo->dwWidth, pScreenInfo->dwHeight,

-	  pScreenPriv->hdcShadow,

-	  0, 0,

-	  SRCCOPY);

-

-  /* EndPaint frees the DC */

-  EndPaint (pScreenPriv->hwndScreen, &ps);

-

-#ifdef XWIN_MULTIWINDOW

-  /* Redraw all windows */

-  if (pScreenInfo->fMultiWindow)

-    EnumThreadWindows(g_dwCurrentThreadID, winRedrawAllProcShadowGDI, 

-            (LPARAM)pScreenPriv->hwndScreen);

-#endif

-

-  return TRUE;

-}

-

-

-/*

- * Do any engine-specific appliation-activation processing

- */

-

-static Bool

-winActivateAppShadowGDI (ScreenPtr pScreen)

-{

-  winScreenPriv(pScreen);

-  winScreenInfo		*pScreenInfo = pScreenPriv->pScreenInfo;

-

-  /*

-   * 2004/04/12 - Harold - We perform the restoring or minimizing

-   * manually for ShadowGDI in fullscreen modes so that this engine

-   * will perform just like ShadowDD and ShadowDDNL in fullscreen mode;

-   * if we do not do this then our fullscreen window will appear in the

-   * z-order when it is deactivated and it can be uncovered by resizing

-   * or minimizing another window that is on top of it, which is not how

-   * the DirectDraw engines work.  Therefore we keep this code here to

-   * make sure that all engines work the same in fullscreen mode.

-   */

-

-  /*

-   * Are we active?

-   * Are we fullscreen?

-   */

-  if (pScreenPriv->fActive

-      && pScreenInfo->fFullScreen)

-    {

-      /*

-       * Activating, attempt to bring our window 

-       * to the top of the display

-       */

-      ShowWindow (pScreenPriv->hwndScreen, SW_RESTORE);

-    }

-  else if (!pScreenPriv->fActive

-	   && pScreenInfo->fFullScreen)

-    {

-      /*

-       * Deactivating, stuff our window onto the

-       * task bar.

-       */

-      ShowWindow (pScreenPriv->hwndScreen, SW_MINIMIZE);

-    }

-

-  return TRUE;

-}

-

-

-/*

- * Reblit the shadow framebuffer to the screen.

- */

-

-static Bool

-winRedrawScreenShadowGDI (ScreenPtr pScreen)

-{

-  winScreenPriv(pScreen);

-  winScreenInfo		*pScreenInfo = pScreenPriv->pScreenInfo;

-

-  /* Redraw the whole window, to take account for the new colors */

-  BitBlt (pScreenPriv->hdcScreen,

-	  0, 0,

-	  pScreenInfo->dwWidth, pScreenInfo->dwHeight,

-	  pScreenPriv->hdcShadow,

-	  0, 0,

-	  SRCCOPY);

-

-#ifdef XWIN_MULTIWINDOW

-  /* Redraw all windows */

-  if (pScreenInfo->fMultiWindow)

-    EnumThreadWindows(g_dwCurrentThreadID, winRedrawAllProcShadowGDI, 0);

-#endif

-

-  return TRUE;

-}

-

-

-

-/*

- * Realize the currently installed colormap

- */

-

-static Bool

-winRealizeInstalledPaletteShadowGDI (ScreenPtr pScreen)

-{

-  winScreenPriv(pScreen);

-  winPrivCmapPtr	pCmapPriv = NULL;

-

-#if CYGDEBUG

-  winDebug ("winRealizeInstalledPaletteShadowGDI\n");

-#endif

-

-  /* Don't do anything if there is not a colormap */

-  if (pScreenPriv->pcmapInstalled == NULL)

-    {

-#if CYGDEBUG

-      winDebug ("winRealizeInstalledPaletteShadowGDI - No colormap "

-	      "installed\n");

-#endif

-      return TRUE;

-    }

-

-  pCmapPriv = winGetCmapPriv (pScreenPriv->pcmapInstalled);

-  

-  /* Realize our palette for the screen */

-  if (RealizePalette (pScreenPriv->hdcScreen) == GDI_ERROR)

-    {

-      ErrorF ("winRealizeInstalledPaletteShadowGDI - RealizePalette () "

-	      "failed\n");

-      return FALSE;

-    }

-  

-  /* Set the DIB color table */

-  if (SetDIBColorTable (pScreenPriv->hdcShadow,

-			0,

-			WIN_NUM_PALETTE_ENTRIES,

-			pCmapPriv->rgbColors) == 0)

-    {

-      ErrorF ("winRealizeInstalledPaletteShadowGDI - SetDIBColorTable () "

-	      "failed\n");

-      return FALSE;

-    }

-  

-  return TRUE;

-}

-

-

-/*

- * Install the specified colormap

- */

-

-static Bool

-winInstallColormapShadowGDI (ColormapPtr pColormap)

-{

-  ScreenPtr		pScreen = pColormap->pScreen;

-  winScreenPriv(pScreen);

-  winScreenInfo		*pScreenInfo = pScreenPriv->pScreenInfo;

-  winCmapPriv(pColormap);

-

-  /*

-   * Tell Windows to install the new colormap

-   */

-  if (SelectPalette (pScreenPriv->hdcScreen,

-		     pCmapPriv->hPalette,

-		     FALSE) == NULL)

-    {

-      ErrorF ("winInstallColormapShadowGDI - SelectPalette () failed\n");

-      return FALSE;

-    }

-      

-  /* Realize the palette */

-  if (GDI_ERROR == RealizePalette (pScreenPriv->hdcScreen))

-    {

-      ErrorF ("winInstallColormapShadowGDI - RealizePalette () failed\n");

-      return FALSE;

-    }

-

-  /* Set the DIB color table */

-  if (SetDIBColorTable (pScreenPriv->hdcShadow,

-			0,

-			WIN_NUM_PALETTE_ENTRIES,

-			pCmapPriv->rgbColors) == 0)

-    {

-      ErrorF ("winInstallColormapShadowGDI - SetDIBColorTable () failed\n");

-      return FALSE;

-    }

-

-  /* Redraw the whole window, to take account for the new colors */

-  BitBlt (pScreenPriv->hdcScreen,

-	  0, 0,

-	  pScreenInfo->dwWidth, pScreenInfo->dwHeight,

-	  pScreenPriv->hdcShadow,

-	  0, 0,

-	  SRCCOPY);

-

-  /* Save a pointer to the newly installed colormap */

-  pScreenPriv->pcmapInstalled = pColormap;

-

-#ifdef XWIN_MULTIWINDOW

-  /* Redraw all windows */

-  if (pScreenInfo->fMultiWindow)

-    EnumThreadWindows (g_dwCurrentThreadID, winRedrawAllProcShadowGDI, 0);

-#endif

-

-  return TRUE;

-}

-

-

-/*

- * Store the specified colors in the specified colormap

- */

-

-static Bool

-winStoreColorsShadowGDI (ColormapPtr pColormap,

-			 int ndef,

-			 xColorItem *pdefs)

-{

-  ScreenPtr		pScreen = pColormap->pScreen;

-  winScreenPriv(pScreen);

-  winCmapPriv(pColormap);

-  ColormapPtr curpmap = pScreenPriv->pcmapInstalled;

-  

-  /* Put the X colormap entries into the Windows logical palette */

-  if (SetPaletteEntries (pCmapPriv->hPalette,

-			 pdefs[0].pixel,

-			 ndef,

-			 pCmapPriv->peColors + pdefs[0].pixel) == 0)

-    {

-      ErrorF ("winStoreColorsShadowGDI - SetPaletteEntries () failed\n");

-      return FALSE;

-    }

-

-  /* Don't install the Windows palette if the colormap is not installed */

-  if (pColormap != curpmap)

-    {

-      return TRUE;

-    }

-

-  /* Try to install the newly modified colormap */

-  if (!winInstallColormapShadowGDI (pColormap))

-    {

-      ErrorF ("winInstallColormapShadowGDI - winInstallColormapShadowGDI "

-	      "failed\n");

-      return FALSE;

-    }

-

-#if 0

-  /* Tell Windows that the palette has changed */

-  RealizePalette (pScreenPriv->hdcScreen);

-  

-  /* Set the DIB color table */

-  if (SetDIBColorTable (pScreenPriv->hdcShadow,

-			pdefs[0].pixel,

-			ndef,

-			pCmapPriv->rgbColors + pdefs[0].pixel) == 0)

-    {

-      ErrorF ("winInstallColormapShadowGDI - SetDIBColorTable () failed\n");

-      return FALSE;

-    }

-

-  /* Save a pointer to the newly installed colormap */

-  pScreenPriv->pcmapInstalled = pColormap;

-#endif

-

-  return TRUE;

-}

-

-

-/*

- * Colormap initialization procedure

- */

-

-static Bool

-winCreateColormapShadowGDI (ColormapPtr pColormap)

-{

-  LPLOGPALETTE		lpPaletteNew = NULL;

-  DWORD			dwEntriesMax;

-  VisualPtr		pVisual;

-  HPALETTE		hpalNew = NULL;

-  winCmapPriv(pColormap);

-

-  /* Get a pointer to the visual that the colormap belongs to */

-  pVisual = pColormap->pVisual;

-

-  /* Get the maximum number of palette entries for this visual */

-  dwEntriesMax = pVisual->ColormapEntries;

-

-  /* Allocate a Windows logical color palette with max entries */

-  lpPaletteNew = malloc (sizeof (LOGPALETTE)

-			 + (dwEntriesMax - 1) * sizeof (PALETTEENTRY));

-  if (lpPaletteNew == NULL)

-    {

-      ErrorF ("winCreateColormapShadowGDI - Couldn't allocate palette "

-	      "with %d entries\n",

-	      (int) dwEntriesMax);

-      return FALSE;

-    }

-

-  /* Zero out the colormap */

-  ZeroMemory (lpPaletteNew, sizeof (LOGPALETTE)

-	      + (dwEntriesMax - 1) * sizeof (PALETTEENTRY));

-  

-  /* Set the logical palette structure */

-  lpPaletteNew->palVersion = 0x0300;

-  lpPaletteNew->palNumEntries = dwEntriesMax;

-

-  /* Tell Windows to create the palette */

-  hpalNew = CreatePalette (lpPaletteNew);

-  if (hpalNew == NULL)

-    {

-      ErrorF ("winCreateColormapShadowGDI - CreatePalette () failed\n");

-      free (lpPaletteNew);

-      return FALSE;

-    }

-

-  /* Save the Windows logical palette handle in the X colormaps' privates */

-  pCmapPriv->hPalette = hpalNew;

-

-  /* Free the palette initialization memory */

-  free (lpPaletteNew);

-

-  return TRUE;

-}

-

-

-/*

- * Colormap destruction procedure

- */

-

-static Bool

-winDestroyColormapShadowGDI (ColormapPtr pColormap)

-{

-  winScreenPriv(pColormap->pScreen);

-  winCmapPriv(pColormap);

-

-  /*

-   * Is colormap to be destroyed the default?

-   *

-   * Non-default colormaps should have had winUninstallColormap

-   * called on them before we get here.  The default colormap

-   * will not have had winUninstallColormap called on it.  Thus,

-   * we need to handle the default colormap in a special way.

-   */

-  if (pColormap->flags & IsDefault)

-    {

-#if CYGDEBUG

-      winDebug ("winDestroyColormapShadowGDI - Destroying default "

-	      "colormap\n");

-#endif

-      

-      /*

-       * FIXME: Walk the list of all screens, popping the default

-       * palette out of each screen device context.

-       */

-      

-      /* Pop the palette out of the device context */

-      SelectPalette (pScreenPriv->hdcScreen,

-		     GetStockObject (DEFAULT_PALETTE),

-		     FALSE);

-

-      /* Clear our private installed colormap pointer */

-      pScreenPriv->pcmapInstalled = NULL;

-    }

-  

-  /* Try to delete the logical palette */

-  if (DeleteObject (pCmapPriv->hPalette) == 0)

-    {

-      ErrorF ("winDestroyColormap - DeleteObject () failed\n");

-      return FALSE;

-    }

-  

-  /* Invalidate the colormap privates */

-  pCmapPriv->hPalette = NULL;

-

-  return TRUE;

-}

-

-

-/*

- * Set engine specific funtions

- */

-

-Bool

-winSetEngineFunctionsShadowGDI (ScreenPtr pScreen)

-{

-  winScreenPriv(pScreen);

-  winScreenInfo		*pScreenInfo = pScreenPriv->pScreenInfo;

-  

-  /* Set our pointers */

-  pScreenPriv->pwinAllocateFB = winAllocateFBShadowGDI;

-  pScreenPriv->pwinShadowUpdate = winShadowUpdateGDI;

-  pScreenPriv->pwinCloseScreen = winCloseScreenShadowGDI;

-  pScreenPriv->pwinInitVisuals = winInitVisualsShadowGDI;

-  pScreenPriv->pwinAdjustVideoMode = winAdjustVideoModeShadowGDI;

-  if (pScreenInfo->fFullScreen)

-    pScreenPriv->pwinCreateBoundingWindow = winCreateBoundingWindowFullScreen;

-  else

-    pScreenPriv->pwinCreateBoundingWindow = winCreateBoundingWindowWindowed;

-  pScreenPriv->pwinFinishScreenInit = winFinishScreenInitFB;

-  pScreenPriv->pwinBltExposedRegions = winBltExposedRegionsShadowGDI;

-  pScreenPriv->pwinActivateApp = winActivateAppShadowGDI;

-  pScreenPriv->pwinRedrawScreen = winRedrawScreenShadowGDI;

-  pScreenPriv->pwinRealizeInstalledPalette = 

-    winRealizeInstalledPaletteShadowGDI;

-  pScreenPriv->pwinInstallColormap = winInstallColormapShadowGDI;

-  pScreenPriv->pwinStoreColors = winStoreColorsShadowGDI;

-  pScreenPriv->pwinCreateColormap = winCreateColormapShadowGDI;

-  pScreenPriv->pwinDestroyColormap = winDestroyColormapShadowGDI;

-  pScreenPriv->pwinHotKeyAltTab = (winHotKeyAltTabProcPtr) (void (*)(void))NoopDDA;

-  pScreenPriv->pwinCreatePrimarySurface

-    = (winCreatePrimarySurfaceProcPtr) (void (*)(void))NoopDDA;

-  pScreenPriv->pwinReleasePrimarySurface

-    = (winReleasePrimarySurfaceProcPtr) (void (*)(void))NoopDDA;

-#ifdef XWIN_MULTIWINDOW

-  pScreenPriv->pwinFinishCreateWindowsWindow =

-    (winFinishCreateWindowsWindowProcPtr) (void (*)(void))NoopDDA;

-#endif

-

-  return TRUE;

-}

+/*
+ *Copyright (C) 2001-2004 Harold L Hunt II 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 HAROLD L HUNT II 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 Harold L Hunt II
+ *shall not be used in advertising or otherwise to promote the sale, use
+ *or other dealings in this Software without prior written authorization
+ *from Harold L Hunt II.
+ *
+ * Authors:	Harold L Hunt II
+ */
+
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
+#include "win.h"
+
+
+/*
+ * Local function prototypes
+ */
+
+#ifdef XWIN_MULTIWINDOW
+static wBOOL CALLBACK
+winRedrawAllProcShadowGDI (HWND hwnd, LPARAM lParam);
+
+static wBOOL CALLBACK
+winRedrawDamagedWindowShadowGDI (HWND hwnd, LPARAM lParam);
+#endif
+
+static Bool
+winAllocateFBShadowGDI (ScreenPtr pScreen);
+
+static void
+winShadowUpdateGDI (ScreenPtr pScreen, 
+		    shadowBufPtr pBuf);
+
+static Bool
+winCloseScreenShadowGDI (int nIndex, ScreenPtr pScreen);
+
+static Bool
+winInitVisualsShadowGDI (ScreenPtr pScreen);
+
+static Bool
+winAdjustVideoModeShadowGDI (ScreenPtr pScreen);
+
+static Bool
+winBltExposedRegionsShadowGDI (ScreenPtr pScreen);
+
+static Bool
+winActivateAppShadowGDI (ScreenPtr pScreen);
+
+static Bool
+winRedrawScreenShadowGDI (ScreenPtr pScreen);
+
+static Bool
+winRealizeInstalledPaletteShadowGDI (ScreenPtr pScreen);
+
+static Bool
+winInstallColormapShadowGDI (ColormapPtr pColormap);
+
+static Bool
+winStoreColorsShadowGDI (ColormapPtr pmap, 
+			 int ndef,
+			 xColorItem *pdefs);
+
+static Bool
+winCreateColormapShadowGDI (ColormapPtr pColormap);
+
+static Bool
+winDestroyColormapShadowGDI (ColormapPtr pColormap);
+
+
+/*
+ * Internal function to get the DIB format that is compatible with the screen
+ */
+
+static
+Bool
+winQueryScreenDIBFormat (ScreenPtr pScreen, BITMAPINFOHEADER *pbmih)
+{
+  winScreenPriv(pScreen);
+  HBITMAP		hbmp;
+#if CYGDEBUG
+  LPDWORD		pdw = NULL;
+#endif
+  
+  /* Create a memory bitmap compatible with the screen */
+  hbmp = CreateCompatibleBitmap (pScreenPriv->hdcScreen, 1, 1);
+  if (hbmp == NULL)
+    {
+      ErrorF ("winQueryScreenDIBFormat - CreateCompatibleBitmap failed\n");
+      return FALSE;
+    }
+  
+  /* Initialize our bitmap info header */
+  ZeroMemory (pbmih, sizeof (BITMAPINFOHEADER) + 256 * sizeof (RGBQUAD));
+  pbmih->biSize = sizeof (BITMAPINFOHEADER);
+
+  /* Get the biBitCount */
+  if (!GetDIBits (pScreenPriv->hdcScreen,
+		  hbmp,
+		  0, 1,
+		  NULL,
+		  (BITMAPINFO*) pbmih,
+		  DIB_RGB_COLORS))
+    {
+      ErrorF ("winQueryScreenDIBFormat - First call to GetDIBits failed\n");
+      DeleteObject (hbmp);
+      return FALSE;
+    }
+
+#if CYGDEBUG
+  /* Get a pointer to bitfields */
+  pdw = (DWORD*) ((CARD8*)pbmih + sizeof (BITMAPINFOHEADER));
+
+  winDebug ("winQueryScreenDIBFormat - First call masks: %08x %08x %08x\n",
+	  pdw[0], pdw[1], pdw[2]);
+#endif
+
+  /* Get optimal color table, or the optimal bitfields */
+  if (!GetDIBits (pScreenPriv->hdcScreen,
+		  hbmp,
+		  0, 1,
+		  NULL,
+		  (BITMAPINFO*)pbmih,
+		  DIB_RGB_COLORS))
+    {
+      ErrorF ("winQueryScreenDIBFormat - Second call to GetDIBits "
+	      "failed\n");
+      DeleteObject (hbmp);
+      return FALSE;
+    }
+
+  /* Free memory */
+  DeleteObject (hbmp);
+  
+  return TRUE;
+}
+
+
+/*
+ * Internal function to determine the GDI bits per rgb and bit masks
+ */
+
+static
+Bool
+winQueryRGBBitsAndMasks (ScreenPtr pScreen)
+{
+  winScreenPriv(pScreen);
+  BITMAPINFOHEADER	*pbmih = NULL;
+  Bool			fReturn = TRUE;
+  LPDWORD		pdw = NULL;
+  DWORD			dwRedBits, dwGreenBits, dwBlueBits;
+
+  /* Color masks for 8 bpp are standardized */
+  if (GetDeviceCaps (pScreenPriv->hdcScreen, RASTERCAPS) & RC_PALETTE)
+    {
+      /* 
+       * RGB BPP for 8 bit palletes is always 8
+       * and the color masks are always 0.
+       */
+      pScreenPriv->dwBitsPerRGB = 8;
+      pScreenPriv->dwRedMask = 0x0L;
+      pScreenPriv->dwGreenMask = 0x0L;
+      pScreenPriv->dwBlueMask = 0x0L;
+      return TRUE;
+    }
+
+  /* Color masks for 24 bpp are standardized */
+  if (GetDeviceCaps (pScreenPriv->hdcScreen, PLANES)
+      * GetDeviceCaps (pScreenPriv->hdcScreen, BITSPIXEL) == 24)
+    {
+      ErrorF ("winQueryRGBBitsAndMasks - GetDeviceCaps (BITSPIXEL) "
+	      "returned 24 for the screen.  Using default 24bpp masks.\n");
+
+      /* 8 bits per primary color */
+      pScreenPriv->dwBitsPerRGB = 8;
+
+      /* Set screen privates masks */
+      pScreenPriv->dwRedMask = WIN_24BPP_MASK_RED;
+      pScreenPriv->dwGreenMask = WIN_24BPP_MASK_GREEN;
+      pScreenPriv->dwBlueMask = WIN_24BPP_MASK_BLUE;
+      
+      return TRUE;
+    }
+
+  /* Allocate a bitmap header and color table */
+  pbmih = (BITMAPINFOHEADER*) malloc (sizeof (BITMAPINFOHEADER)
+				      + 256  * sizeof (RGBQUAD));
+  if (pbmih == NULL)
+    {
+      ErrorF ("winQueryRGBBitsAndMasks - malloc failed\n");
+      return FALSE;
+    }
+
+  /* Get screen description */
+  if (winQueryScreenDIBFormat (pScreen, pbmih))
+    {
+      /* Get a pointer to bitfields */
+      pdw = (DWORD*) ((CARD8*)pbmih + sizeof (BITMAPINFOHEADER));
+      
+#if CYGDEBUG
+      winDebug ("%s - Masks: %08x %08x %08x\n", __FUNCTION__,
+	      pdw[0], pdw[1], pdw[2]);
+      winDebug ("%s - Bitmap: %dx%d %d bpp %d planes\n", __FUNCTION__,
+              pbmih->biWidth, pbmih->biHeight, pbmih->biBitCount, pbmih->biPlanes);
+      winDebug ("%s - Compression: %d %s\n", __FUNCTION__,
+              pbmih->biCompression,
+              (pbmih->biCompression == BI_RGB?"(BI_RGB)":
+               (pbmih->biCompression == BI_RLE8?"(BI_RLE8)":
+                (pbmih->biCompression == BI_RLE4?"(BI_RLE4)":
+                 (pbmih->biCompression == BI_BITFIELDS?"(BI_BITFIELDS)":""
+                 )))));
+#endif
+
+      /* Handle BI_RGB case, which is returned by Wine */
+      if (pbmih->biCompression == BI_RGB)
+        {
+	  dwRedBits = 5;
+	  dwGreenBits = 5;
+	  dwBlueBits = 5;
+	  
+	  pScreenPriv->dwBitsPerRGB = 5;
+	  
+	  /* Set screen privates masks */
+	  pScreenPriv->dwRedMask = 0x7c00;
+	  pScreenPriv->dwGreenMask = 0x03e0;
+	  pScreenPriv->dwBlueMask = 0x001f;
+        }
+      else 
+        {
+          /* Count the number of bits in each mask */
+          dwRedBits = winCountBits (pdw[0]);
+          dwGreenBits = winCountBits (pdw[1]);
+          dwBlueBits = winCountBits (pdw[2]);
+
+	  /* Find maximum bits per red, green, blue */
+	  if (dwRedBits > dwGreenBits && dwRedBits > dwBlueBits)
+	    pScreenPriv->dwBitsPerRGB = dwRedBits;
+	  else if (dwGreenBits > dwRedBits && dwGreenBits > dwBlueBits)
+	    pScreenPriv->dwBitsPerRGB = dwGreenBits;
+	  else
+	    pScreenPriv->dwBitsPerRGB = dwBlueBits;
+
+	  /* Set screen privates masks */
+	  pScreenPriv->dwRedMask = pdw[0];
+	  pScreenPriv->dwGreenMask = pdw[1];
+	  pScreenPriv->dwBlueMask = pdw[2];
+	}
+    }
+  else
+    {
+      ErrorF ("winQueryRGBBitsAndMasks - winQueryScreenDIBFormat failed\n");
+      free (pbmih);
+      fReturn = FALSE;
+    }
+
+  /* Free memory */
+  free (pbmih);
+
+  return fReturn;
+}
+
+
+#ifdef XWIN_MULTIWINDOW
+/*
+ * Redraw all ---?
+ */
+
+static wBOOL CALLBACK
+winRedrawAllProcShadowGDI (HWND hwnd, LPARAM lParam)
+{
+  if (hwnd == (HWND)lParam)
+    return TRUE;  
+  InvalidateRect (hwnd, NULL, FALSE);
+  UpdateWindow (hwnd);
+  return TRUE;
+}
+
+static wBOOL CALLBACK
+winRedrawDamagedWindowShadowGDI (HWND hwnd, LPARAM lParam)
+{
+  BoxPtr pDamage = (BoxPtr)lParam;
+  RECT rcClient, rcDamage, rcRedraw;
+  POINT topLeft, bottomRight;
+  
+  if (IsIconic (hwnd))
+    return TRUE; /* Don't care minimized windows */
+  
+  /* Convert the damaged area from Screen coords to Client coords */
+  topLeft.x = pDamage->x1; topLeft.y = pDamage->y1;
+  bottomRight.x = pDamage->x2; bottomRight.y = pDamage->y2;
+  topLeft.x += GetSystemMetrics (SM_XVIRTUALSCREEN);
+  bottomRight.x += GetSystemMetrics (SM_XVIRTUALSCREEN);
+  topLeft.y += GetSystemMetrics (SM_YVIRTUALSCREEN);
+  bottomRight.y += GetSystemMetrics (SM_YVIRTUALSCREEN);
+  ScreenToClient (hwnd, &topLeft);
+  ScreenToClient (hwnd, &bottomRight);
+  SetRect (&rcDamage, topLeft.x, topLeft.y, bottomRight.x, bottomRight.y);
+
+  GetClientRect (hwnd, &rcClient);
+
+  if (IntersectRect (&rcRedraw, &rcClient, &rcDamage))
+    {
+      InvalidateRect (hwnd, &rcRedraw, FALSE);
+      UpdateWindow (hwnd);
+    }
+  return TRUE;
+}
+#endif
+
+
+/*
+ * Allocate a DIB for the shadow framebuffer GDI server
+ */
+
+static Bool
+winAllocateFBShadowGDI (ScreenPtr pScreen)
+{
+  winScreenPriv(pScreen);
+  winScreenInfo		*pScreenInfo = pScreenPriv->pScreenInfo;
+  DIBSECTION		dibsection;
+  Bool			fReturn = TRUE;
+
+  /* Describe shadow bitmap to be created */
+  pScreenPriv->pbmih->biWidth = pScreenInfo->dwWidth;
+  pScreenPriv->pbmih->biHeight = -pScreenInfo->dwHeight;
+
+  ErrorF ("winAllocateFBShadowGDI - Creating DIB with width: %d height: %d "
+	  "depth: %d\n",
+	  (int) pScreenPriv->pbmih->biWidth, (int) -pScreenPriv->pbmih->biHeight, pScreenPriv->pbmih->biBitCount);
+
+  /* Create a DI shadow bitmap with a bit pointer */
+  pScreenPriv->hbmpShadow = CreateDIBSection (pScreenPriv->hdcScreen,
+					      (BITMAPINFO *) pScreenPriv->pbmih,
+					      DIB_RGB_COLORS,
+					      (VOID**) &pScreenInfo->pfb,
+					      NULL,
+					      0);
+  if (pScreenPriv->hbmpShadow == NULL || pScreenInfo->pfb == NULL)
+    {
+      winW32Error (2, "winAllocateFBShadowGDI - CreateDIBSection failed:");
+      return FALSE;
+    }
+  else
+    {
+#if CYGDEBUG
+      winDebug ("winAllocateFBShadowGDI - Shadow buffer allocated\n");
+#endif
+    }
+
+  /* Get information about the bitmap that was allocated */
+  GetObject (pScreenPriv->hbmpShadow,
+	     sizeof (dibsection),
+	     &dibsection);
+
+#if CYGDEBUG || YES
+  /* Print information about bitmap allocated */
+  winDebug ("winAllocateFBShadowGDI - Dibsection width: %d height: %d "
+	  "depth: %d size image: %d\n",
+	  (int) dibsection.dsBmih.biWidth, (int) dibsection.dsBmih.biHeight,
+	  dibsection.dsBmih.biBitCount,
+	  (int) dibsection.dsBmih.biSizeImage);
+#endif
+
+  /* Select the shadow bitmap into the shadow DC */
+  SelectObject (pScreenPriv->hdcShadow,
+		pScreenPriv->hbmpShadow);
+
+#if CYGDEBUG
+  winDebug ("winAllocateFBShadowGDI - Attempting a shadow blit\n");
+#endif
+
+  /* Do a test blit from the shadow to the screen, I think */
+  fReturn = BitBlt (pScreenPriv->hdcScreen,
+		    0, 0,
+		    pScreenInfo->dwWidth, pScreenInfo->dwHeight,
+		    pScreenPriv->hdcShadow,
+		    0, 0,
+		    SRCCOPY);
+  if (fReturn)
+    {
+#if CYGDEBUG
+      winDebug ("winAllocateFBShadowGDI - Shadow blit success\n");
+#endif
+    }
+  else
+    {
+      winW32Error (2, "winAllocateFBShadowGDI - Shadow blit failure\n");
+#if 0      
+      return FALSE;
+#else 
+      /* ago: ignore this error. The blit fails with wine, but does not 
+       * cause any problems later. */
+
+      fReturn = TRUE;
+#endif      
+    }
+
+  /* Look for height weirdness */
+  if (dibsection.dsBmih.biHeight < 0)
+    {
+      dibsection.dsBmih.biHeight = -dibsection.dsBmih.biHeight;
+    }
+
+  /* Set screeninfo stride */
+  pScreenInfo->dwStride = ((dibsection.dsBmih.biSizeImage
+			    / dibsection.dsBmih.biHeight)
+			   * 8) / pScreenInfo->dwBPP;
+
+#if CYGDEBUG || YES
+  winDebug ("winAllocateFBShadowGDI - Created shadow stride: %d\n",
+	  (int) pScreenInfo->dwStride);
+#endif
+
+#ifdef XWIN_MULTIWINDOW
+  /* Redraw all windows */
+  if (pScreenInfo->fMultiWindow)
+    EnumThreadWindows (g_dwCurrentThreadID, winRedrawAllProcShadowGDI, 0);
+#endif
+
+  return fReturn;
+}
+
+static void
+winFreeFBShadowGDI (ScreenPtr pScreen)
+{
+  winScreenPriv(pScreen);
+  winScreenInfo *pScreenInfo = pScreenPriv->pScreenInfo;
+
+  /* Free the shadow bitmap */
+  DeleteObject (pScreenPriv->hbmpShadow);
+
+  /* Invalidate the ScreenInfo's fb pointer */
+  pScreenInfo->pfb = NULL;
+}
+
+/*
+ * Blit the damaged regions of the shadow fb to the screen
+ */
+
+static void
+winShadowUpdateGDI (ScreenPtr pScreen, 
+		    shadowBufPtr pBuf)
+{
+  winScreenPriv(pScreen);
+  winScreenInfo		*pScreenInfo = pScreenPriv->pScreenInfo;
+  RegionPtr		damage = shadowDamage(pBuf);
+  DWORD			dwBox = RegionNumRects (damage);
+  BoxPtr		pBox = RegionRects (damage);
+  int			x, y, w, h;
+  HRGN			hrgnTemp = NULL, hrgnCombined = NULL;
+#ifdef XWIN_UPDATESTATS
+  static DWORD		s_dwNonUnitRegions = 0;
+  static DWORD		s_dwTotalUpdates = 0;
+  static DWORD		s_dwTotalBoxes = 0;
+#endif
+  BoxPtr		pBoxExtents = RegionExtents(damage);
+
+  /*
+   * Return immediately if the app is not active
+   * and we are fullscreen, or if we have a bad display depth
+   */
+  if ((!pScreenPriv->fActive && pScreenInfo->fFullScreen)
+      || pScreenPriv->fBadDepth) return;
+
+#ifdef XWIN_UPDATESTATS
+  ++s_dwTotalUpdates;
+  s_dwTotalBoxes += dwBox;
+
+  if (dwBox != 1)
+    {
+      ++s_dwNonUnitRegions;
+      ErrorF ("winShadowUpdatGDI - dwBox: %d\n", dwBox);
+    }
+  
+  if ((s_dwTotalUpdates % 100) == 0)
+    ErrorF ("winShadowUpdateGDI - %d%% non-unity regions, avg boxes: %d "
+	    "nu: %d tu: %d\n",
+	    (s_dwNonUnitRegions * 100) / s_dwTotalUpdates,
+	    s_dwTotalBoxes / s_dwTotalUpdates,
+	    s_dwNonUnitRegions, s_dwTotalUpdates);
+#endif /* XWIN_UPDATESTATS */
+
+  /*
+   * Handle small regions with multiple blits,
+   * handle large regions by creating a clipping region and 
+   * doing a single blit constrained to that clipping region.
+   */
+  if (!pScreenInfo->fMultiWindow &&
+      (pScreenInfo->dwClipUpdatesNBoxes == 0 ||
+      dwBox < pScreenInfo->dwClipUpdatesNBoxes))
+    {
+      /* Loop through all boxes in the damaged region */
+      while (dwBox--)
+	{
+	  /*
+	   * Calculate x offset, y offset, width, and height for
+	   * current damage box
+	   */
+	  x = pBox->x1;
+	  y = pBox->y1;
+	  w = pBox->x2 - pBox->x1;
+	  h = pBox->y2 - pBox->y1;
+	  
+	  BitBlt (pScreenPriv->hdcScreen,
+		  x, y,
+		  w, h,
+		  pScreenPriv->hdcShadow,
+		  x, y,
+		  SRCCOPY);
+	  
+	  /* Get a pointer to the next box */
+	  ++pBox;
+	}
+    }
+  else if (!pScreenInfo->fMultiWindow)
+    {
+      /* Compute a GDI region from the damaged region */
+      hrgnCombined = CreateRectRgn (pBox->x1, pBox->y1, pBox->x2, pBox->y2);
+      dwBox--;
+      pBox++;
+      while (dwBox--)
+	{
+	  hrgnTemp = CreateRectRgn (pBox->x1, pBox->y1, pBox->x2, pBox->y2);
+	  CombineRgn (hrgnCombined, hrgnCombined, hrgnTemp, RGN_OR);
+	  DeleteObject (hrgnTemp);
+	  pBox++;
+	}
+      
+      /* Install the GDI region as a clipping region */
+      SelectClipRgn (pScreenPriv->hdcScreen, hrgnCombined);
+      DeleteObject (hrgnCombined);
+      hrgnCombined = NULL;
+      
+      /*
+       * Blit the shadow buffer to the screen,
+       * constrained to the clipping region.
+       */
+      BitBlt (pScreenPriv->hdcScreen,
+	      pBoxExtents->x1, pBoxExtents->y1,
+	      pBoxExtents->x2 - pBoxExtents->x1,
+	      pBoxExtents->y2 - pBoxExtents->y1,
+	      pScreenPriv->hdcShadow,
+	      pBoxExtents->x1, pBoxExtents->y1,
+	      SRCCOPY);
+
+      /* Reset the clip region */
+      SelectClipRgn (pScreenPriv->hdcScreen, NULL);
+    }
+
+#ifdef XWIN_MULTIWINDOW
+  /* Redraw all multiwindow windows */
+  if (pScreenInfo->fMultiWindow)
+    EnumThreadWindows (g_dwCurrentThreadID,
+		       winRedrawDamagedWindowShadowGDI,
+		       (LPARAM)pBoxExtents);
+#endif
+}
+
+
+static Bool
+winInitScreenShadowGDI (ScreenPtr pScreen)
+{
+  winScreenPriv(pScreen);
+
+  /* Get device contexts for the screen and shadow bitmap */
+  pScreenPriv->hdcScreen = GetDC (pScreenPriv->hwndScreen);
+  pScreenPriv->hdcShadow = CreateCompatibleDC (pScreenPriv->hdcScreen);
+
+  /* Allocate bitmap info header */
+  pScreenPriv->pbmih = (BITMAPINFOHEADER*) malloc (sizeof (BITMAPINFOHEADER)
+                                                   + 256 * sizeof (RGBQUAD));
+  if (pScreenPriv->pbmih == NULL)
+    {
+      ErrorF ("winInitScreenShadowGDI - malloc () failed\n");
+      return FALSE;
+    }
+
+  /* Query the screen format */
+  if (!winQueryScreenDIBFormat (pScreen, pScreenPriv->pbmih))
+    {
+      ErrorF ("winInitScreenShadowGDI - winQueryScreenDIBFormat failed\n");
+      return FALSE;
+    }
+
+  /* Determine our color masks */
+  if (!winQueryRGBBitsAndMasks (pScreen))
+    {
+      ErrorF ("winInitScreenShadowGDI - winQueryRGBBitsAndMasks failed\n");
+      return FALSE;
+    }
+
+  return winAllocateFBShadowGDI(pScreen);
+}
+
+/* See Porting Layer Definition - p. 33 */
+/*
+ * We wrap whatever CloseScreen procedure was specified by fb;
+ * a pointer to said procedure is stored in our privates.
+ */
+
+static Bool
+winCloseScreenShadowGDI (int nIndex, ScreenPtr pScreen)
+{
+  winScreenPriv(pScreen);
+  winScreenInfo		*pScreenInfo = pScreenPriv->pScreenInfo;
+  Bool			fReturn;
+
+#if CYGDEBUG
+  winDebug ("winCloseScreenShadowGDI - Freeing screen resources\n");
+#endif
+
+  /* Flag that the screen is closed */
+  pScreenPriv->fClosed = TRUE;
+  pScreenPriv->fActive = FALSE;
+
+  /* Call the wrapped CloseScreen procedure */
+  WIN_UNWRAP(CloseScreen);
+  fReturn = (*pScreen->CloseScreen) (nIndex, pScreen);
+
+  /* Delete the window property */
+  RemoveProp (pScreenPriv->hwndScreen, WIN_SCR_PROP);
+
+  /* Free the shadow DC; which allows the bitmap to be freed */
+  DeleteDC (pScreenPriv->hdcShadow);
+
+  winFreeFBShadowGDI(pScreen);
+
+  /* Free the screen DC */
+  ReleaseDC (pScreenPriv->hwndScreen, pScreenPriv->hdcScreen);
+
+  /* Delete tray icon, if we have one */
+  if (!pScreenInfo->fNoTrayIcon)
+    winDeleteNotifyIcon (pScreenPriv);
+
+  /* Free the exit confirmation dialog box, if it exists */
+  if (g_hDlgExit != NULL)
+    {
+      DestroyWindow (g_hDlgExit);
+      g_hDlgExit = NULL;
+    }
+
+  /* Kill our window */
+  if (pScreenPriv->hwndScreen)
+    {
+      DestroyWindow (pScreenPriv->hwndScreen);
+      pScreenPriv->hwndScreen = NULL;
+    }
+
+#if defined(XWIN_CLIPBOARD) || defined(XWIN_MULTIWINDOW)
+  /* Destroy the thread startup mutex */
+  pthread_mutex_destroy (&pScreenPriv->pmServerStarted);
+#endif
+
+  /* Invalidate our screeninfo's pointer to the screen */
+  pScreenInfo->pScreen = NULL;
+
+  /* Free the screen privates for this screen */
+  free ((pointer) pScreenPriv);
+
+  return fReturn;
+}
+
+
+/*
+ * Tell mi what sort of visuals we need.
+ * 
+ * Generally we only need one visual, as our screen can only
+ * handle one format at a time, I believe.  You may want
+ * to verify that last sentence.
+ */
+
+static Bool
+winInitVisualsShadowGDI (ScreenPtr pScreen)
+{
+  winScreenPriv(pScreen);
+  winScreenInfo		*pScreenInfo = pScreenPriv->pScreenInfo;
+
+  /* Display debugging information */
+  ErrorF ("winInitVisualsShadowGDI - Masks %08x %08x %08x BPRGB %d d %d "
+	  "bpp %d\n",
+	  (unsigned int) pScreenPriv->dwRedMask,
+	  (unsigned int) pScreenPriv->dwGreenMask,
+	  (unsigned int) pScreenPriv->dwBlueMask,
+	  (int) pScreenPriv->dwBitsPerRGB,
+	  (int) pScreenInfo->dwDepth,
+	  (int) pScreenInfo->dwBPP);
+
+  /* Create a single visual according to the Windows screen depth */
+  switch (pScreenInfo->dwDepth)
+    {
+    case 24:
+    case 16:
+    case 15:
+      /* Setup the real visual */
+      if (!miSetVisualTypesAndMasks (pScreenInfo->dwDepth,
+				     TrueColorMask,
+				     pScreenPriv->dwBitsPerRGB,
+				     -1,
+				     pScreenPriv->dwRedMask,
+				     pScreenPriv->dwGreenMask,
+				     pScreenPriv->dwBlueMask))
+	{
+	  ErrorF ("winInitVisualsShadowGDI - miSetVisualTypesAndMasks "
+		  "failed\n");
+	  return FALSE;
+	}
+
+#ifdef XWIN_EMULATEPSEUDO
+      if (!pScreenInfo->fEmulatePseudo)
+	break;
+
+      /* Setup a pseudocolor visual */
+      if (!miSetVisualTypesAndMasks (8,
+				     PseudoColorMask,
+				     8,
+				     -1,
+				     0,
+				     0,
+				     0))
+	{
+	  ErrorF ("winInitVisualsShadowGDI - miSetVisualTypesAndMasks "
+		  "failed for PseudoColor\n");
+	  return FALSE;
+	}
+#endif
+      break;
+
+    case 8:
+      if (!miSetVisualTypesAndMasks (pScreenInfo->dwDepth,
+				     PseudoColorMask,
+				     pScreenPriv->dwBitsPerRGB,
+				     PseudoColor,
+				     pScreenPriv->dwRedMask,
+				     pScreenPriv->dwGreenMask,
+				     pScreenPriv->dwBlueMask))
+	{
+	  ErrorF ("winInitVisualsShadowGDI - miSetVisualTypesAndMasks "
+		  "failed\n");
+	  return FALSE;
+	}
+      break;
+
+    default:
+      ErrorF ("winInitVisualsShadowGDI - Unknown screen depth\n");
+      return FALSE;
+    }
+
+#if CYGDEBUG
+  winDebug ("winInitVisualsShadowGDI - Returning\n");
+#endif
+
+  return TRUE;
+}
+
+
+/*
+ * Adjust the proposed video mode
+ */
+
+static Bool
+winAdjustVideoModeShadowGDI (ScreenPtr pScreen)
+{
+  winScreenPriv(pScreen);
+  winScreenInfo		*pScreenInfo = pScreenPriv->pScreenInfo;
+  HDC			hdc;
+  DWORD			dwBPP;
+  
+  hdc = GetDC (NULL);
+
+  /* We're in serious trouble if we can't get a DC */
+  if (hdc == NULL)
+    {
+      ErrorF ("winAdjustVideoModeShadowGDI - GetDC () failed\n");
+      return FALSE;
+    }
+
+  /* Query GDI for current display depth */
+  dwBPP = GetDeviceCaps (hdc, BITSPIXEL);
+
+  /* GDI cannot change the screen depth, so always use GDI's depth */
+  pScreenInfo->dwBPP = dwBPP;
+
+  /* Release our DC */
+  ReleaseDC (NULL, hdc);
+  hdc = NULL;
+
+  return TRUE;
+}
+
+
+/*
+ * Blt exposed regions to the screen
+ */
+
+static Bool
+winBltExposedRegionsShadowGDI (ScreenPtr pScreen)
+{
+  winScreenPriv(pScreen);
+  winScreenInfo		*pScreenInfo = pScreenPriv->pScreenInfo;
+  winPrivCmapPtr	pCmapPriv = NULL;
+  HDC			hdcUpdate;
+  PAINTSTRUCT		ps;
+
+  /* BeginPaint gives us an hdc that clips to the invalidated region */
+  hdcUpdate = BeginPaint (pScreenPriv->hwndScreen, &ps);
+
+  /* Realize the palette, if we have one */
+  if (pScreenPriv->pcmapInstalled != NULL)
+    {
+      pCmapPriv = winGetCmapPriv (pScreenPriv->pcmapInstalled);
+      
+      SelectPalette (hdcUpdate, pCmapPriv->hPalette, FALSE);
+      RealizePalette (hdcUpdate);
+    }
+
+  /* Our BitBlt will be clipped to the invalidated region */
+  BitBlt (hdcUpdate,
+	  0, 0,
+	  pScreenInfo->dwWidth, pScreenInfo->dwHeight,
+	  pScreenPriv->hdcShadow,
+	  0, 0,
+	  SRCCOPY);
+
+  /* EndPaint frees the DC */
+  EndPaint (pScreenPriv->hwndScreen, &ps);
+
+#ifdef XWIN_MULTIWINDOW
+  /* Redraw all windows */
+  if (pScreenInfo->fMultiWindow)
+    EnumThreadWindows(g_dwCurrentThreadID, winRedrawAllProcShadowGDI, 
+            (LPARAM)pScreenPriv->hwndScreen);
+#endif
+
+  return TRUE;
+}
+
+
+/*
+ * Do any engine-specific appliation-activation processing
+ */
+
+static Bool
+winActivateAppShadowGDI (ScreenPtr pScreen)
+{
+  winScreenPriv(pScreen);
+  winScreenInfo		*pScreenInfo = pScreenPriv->pScreenInfo;
+
+  /*
+   * 2004/04/12 - Harold - We perform the restoring or minimizing
+   * manually for ShadowGDI in fullscreen modes so that this engine
+   * will perform just like ShadowDD and ShadowDDNL in fullscreen mode;
+   * if we do not do this then our fullscreen window will appear in the
+   * z-order when it is deactivated and it can be uncovered by resizing
+   * or minimizing another window that is on top of it, which is not how
+   * the DirectDraw engines work.  Therefore we keep this code here to
+   * make sure that all engines work the same in fullscreen mode.
+   */
+
+  /*
+   * Are we active?
+   * Are we fullscreen?
+   */
+  if (pScreenPriv->fActive
+      && pScreenInfo->fFullScreen)
+    {
+      /*
+       * Activating, attempt to bring our window 
+       * to the top of the display
+       */
+      ShowWindow (pScreenPriv->hwndScreen, SW_RESTORE);
+    }
+  else if (!pScreenPriv->fActive
+	   && pScreenInfo->fFullScreen)
+    {
+      /*
+       * Deactivating, stuff our window onto the
+       * task bar.
+       */
+      ShowWindow (pScreenPriv->hwndScreen, SW_MINIMIZE);
+    }
+
+  return TRUE;
+}
+
+
+/*
+ * Reblit the shadow framebuffer to the screen.
+ */
+
+static Bool
+winRedrawScreenShadowGDI (ScreenPtr pScreen)
+{
+  winScreenPriv(pScreen);
+  winScreenInfo		*pScreenInfo = pScreenPriv->pScreenInfo;
+
+  /* Redraw the whole window, to take account for the new colors */
+  BitBlt (pScreenPriv->hdcScreen,
+	  0, 0,
+	  pScreenInfo->dwWidth, pScreenInfo->dwHeight,
+	  pScreenPriv->hdcShadow,
+	  0, 0,
+	  SRCCOPY);
+
+#ifdef XWIN_MULTIWINDOW
+  /* Redraw all windows */
+  if (pScreenInfo->fMultiWindow)
+    EnumThreadWindows(g_dwCurrentThreadID, winRedrawAllProcShadowGDI, 0);
+#endif
+
+  return TRUE;
+}
+
+
+
+/*
+ * Realize the currently installed colormap
+ */
+
+static Bool
+winRealizeInstalledPaletteShadowGDI (ScreenPtr pScreen)
+{
+  winScreenPriv(pScreen);
+  winPrivCmapPtr	pCmapPriv = NULL;
+
+#if CYGDEBUG
+  winDebug ("winRealizeInstalledPaletteShadowGDI\n");
+#endif
+
+  /* Don't do anything if there is not a colormap */
+  if (pScreenPriv->pcmapInstalled == NULL)
+    {
+#if CYGDEBUG
+      winDebug ("winRealizeInstalledPaletteShadowGDI - No colormap "
+	      "installed\n");
+#endif
+      return TRUE;
+    }
+
+  pCmapPriv = winGetCmapPriv (pScreenPriv->pcmapInstalled);
+  
+  /* Realize our palette for the screen */
+  if (RealizePalette (pScreenPriv->hdcScreen) == GDI_ERROR)
+    {
+      ErrorF ("winRealizeInstalledPaletteShadowGDI - RealizePalette () "
+	      "failed\n");
+      return FALSE;
+    }
+  
+  /* Set the DIB color table */
+  if (SetDIBColorTable (pScreenPriv->hdcShadow,
+			0,
+			WIN_NUM_PALETTE_ENTRIES,
+			pCmapPriv->rgbColors) == 0)
+    {
+      ErrorF ("winRealizeInstalledPaletteShadowGDI - SetDIBColorTable () "
+	      "failed\n");
+      return FALSE;
+    }
+  
+  return TRUE;
+}
+
+
+/*
+ * Install the specified colormap
+ */
+
+static Bool
+winInstallColormapShadowGDI (ColormapPtr pColormap)
+{
+  ScreenPtr		pScreen = pColormap->pScreen;
+  winScreenPriv(pScreen);
+  winScreenInfo		*pScreenInfo = pScreenPriv->pScreenInfo;
+  winCmapPriv(pColormap);
+
+  /*
+   * Tell Windows to install the new colormap
+   */
+  if (SelectPalette (pScreenPriv->hdcScreen,
+		     pCmapPriv->hPalette,
+		     FALSE) == NULL)
+    {
+      ErrorF ("winInstallColormapShadowGDI - SelectPalette () failed\n");
+      return FALSE;
+    }
+      
+  /* Realize the palette */
+  if (GDI_ERROR == RealizePalette (pScreenPriv->hdcScreen))
+    {
+      ErrorF ("winInstallColormapShadowGDI - RealizePalette () failed\n");
+      return FALSE;
+    }
+
+  /* Set the DIB color table */
+  if (SetDIBColorTable (pScreenPriv->hdcShadow,
+			0,
+			WIN_NUM_PALETTE_ENTRIES,
+			pCmapPriv->rgbColors) == 0)
+    {
+      ErrorF ("winInstallColormapShadowGDI - SetDIBColorTable () failed\n");
+      return FALSE;
+    }
+
+  /* Redraw the whole window, to take account for the new colors */
+  BitBlt (pScreenPriv->hdcScreen,
+	  0, 0,
+	  pScreenInfo->dwWidth, pScreenInfo->dwHeight,
+	  pScreenPriv->hdcShadow,
+	  0, 0,
+	  SRCCOPY);
+
+  /* Save a pointer to the newly installed colormap */
+  pScreenPriv->pcmapInstalled = pColormap;
+
+#ifdef XWIN_MULTIWINDOW
+  /* Redraw all windows */
+  if (pScreenInfo->fMultiWindow)
+    EnumThreadWindows (g_dwCurrentThreadID, winRedrawAllProcShadowGDI, 0);
+#endif
+
+  return TRUE;
+}
+
+
+/*
+ * Store the specified colors in the specified colormap
+ */
+
+static Bool
+winStoreColorsShadowGDI (ColormapPtr pColormap,
+			 int ndef,
+			 xColorItem *pdefs)
+{
+  ScreenPtr		pScreen = pColormap->pScreen;
+  winScreenPriv(pScreen);
+  winCmapPriv(pColormap);
+  ColormapPtr curpmap = pScreenPriv->pcmapInstalled;
+  
+  /* Put the X colormap entries into the Windows logical palette */
+  if (SetPaletteEntries (pCmapPriv->hPalette,
+			 pdefs[0].pixel,
+			 ndef,
+			 pCmapPriv->peColors + pdefs[0].pixel) == 0)
+    {
+      ErrorF ("winStoreColorsShadowGDI - SetPaletteEntries () failed\n");
+      return FALSE;
+    }
+
+  /* Don't install the Windows palette if the colormap is not installed */
+  if (pColormap != curpmap)
+    {
+      return TRUE;
+    }
+
+  /* Try to install the newly modified colormap */
+  if (!winInstallColormapShadowGDI (pColormap))
+    {
+      ErrorF ("winInstallColormapShadowGDI - winInstallColormapShadowGDI "
+	      "failed\n");
+      return FALSE;
+    }
+
+#if 0
+  /* Tell Windows that the palette has changed */
+  RealizePalette (pScreenPriv->hdcScreen);
+  
+  /* Set the DIB color table */
+  if (SetDIBColorTable (pScreenPriv->hdcShadow,
+			pdefs[0].pixel,
+			ndef,
+			pCmapPriv->rgbColors + pdefs[0].pixel) == 0)
+    {
+      ErrorF ("winInstallColormapShadowGDI - SetDIBColorTable () failed\n");
+      return FALSE;
+    }
+
+  /* Save a pointer to the newly installed colormap */
+  pScreenPriv->pcmapInstalled = pColormap;
+#endif
+
+  return TRUE;
+}
+
+
+/*
+ * Colormap initialization procedure
+ */
+
+static Bool
+winCreateColormapShadowGDI (ColormapPtr pColormap)
+{
+  LPLOGPALETTE		lpPaletteNew = NULL;
+  DWORD			dwEntriesMax;
+  VisualPtr		pVisual;
+  HPALETTE		hpalNew = NULL;
+  winCmapPriv(pColormap);
+
+  /* Get a pointer to the visual that the colormap belongs to */
+  pVisual = pColormap->pVisual;
+
+  /* Get the maximum number of palette entries for this visual */
+  dwEntriesMax = pVisual->ColormapEntries;
+
+  /* Allocate a Windows logical color palette with max entries */
+  lpPaletteNew = malloc (sizeof (LOGPALETTE)
+			 + (dwEntriesMax - 1) * sizeof (PALETTEENTRY));
+  if (lpPaletteNew == NULL)
+    {
+      ErrorF ("winCreateColormapShadowGDI - Couldn't allocate palette "
+	      "with %d entries\n",
+	      (int) dwEntriesMax);
+      return FALSE;
+    }
+
+  /* Zero out the colormap */
+  ZeroMemory (lpPaletteNew, sizeof (LOGPALETTE)
+	      + (dwEntriesMax - 1) * sizeof (PALETTEENTRY));
+  
+  /* Set the logical palette structure */
+  lpPaletteNew->palVersion = 0x0300;
+  lpPaletteNew->palNumEntries = dwEntriesMax;
+
+  /* Tell Windows to create the palette */
+  hpalNew = CreatePalette (lpPaletteNew);
+  if (hpalNew == NULL)
+    {
+      ErrorF ("winCreateColormapShadowGDI - CreatePalette () failed\n");
+      free (lpPaletteNew);
+      return FALSE;
+    }
+
+  /* Save the Windows logical palette handle in the X colormaps' privates */
+  pCmapPriv->hPalette = hpalNew;
+
+  /* Free the palette initialization memory */
+  free (lpPaletteNew);
+
+  return TRUE;
+}
+
+
+/*
+ * Colormap destruction procedure
+ */
+
+static Bool
+winDestroyColormapShadowGDI (ColormapPtr pColormap)
+{
+  winScreenPriv(pColormap->pScreen);
+  winCmapPriv(pColormap);
+
+  /*
+   * Is colormap to be destroyed the default?
+   *
+   * Non-default colormaps should have had winUninstallColormap
+   * called on them before we get here.  The default colormap
+   * will not have had winUninstallColormap called on it.  Thus,
+   * we need to handle the default colormap in a special way.
+   */
+  if (pColormap->flags & IsDefault)
+    {
+#if CYGDEBUG
+      winDebug ("winDestroyColormapShadowGDI - Destroying default "
+	      "colormap\n");
+#endif
+      
+      /*
+       * FIXME: Walk the list of all screens, popping the default
+       * palette out of each screen device context.
+       */
+      
+      /* Pop the palette out of the device context */
+      SelectPalette (pScreenPriv->hdcScreen,
+		     GetStockObject (DEFAULT_PALETTE),
+		     FALSE);
+
+      /* Clear our private installed colormap pointer */
+      pScreenPriv->pcmapInstalled = NULL;
+    }
+  
+  /* Try to delete the logical palette */
+  if (DeleteObject (pCmapPriv->hPalette) == 0)
+    {
+      ErrorF ("winDestroyColormap - DeleteObject () failed\n");
+      return FALSE;
+    }
+  
+  /* Invalidate the colormap privates */
+  pCmapPriv->hPalette = NULL;
+
+  return TRUE;
+}
+
+
+/*
+ * Set engine specific funtions
+ */
+
+Bool
+winSetEngineFunctionsShadowGDI (ScreenPtr pScreen)
+{
+  winScreenPriv(pScreen);
+  winScreenInfo		*pScreenInfo = pScreenPriv->pScreenInfo;
+  
+  /* Set our pointers */
+  pScreenPriv->pwinAllocateFB = winAllocateFBShadowGDI;
+  pScreenPriv->pwinFreeFB = winFreeFBShadowGDI;
+  pScreenPriv->pwinShadowUpdate = winShadowUpdateGDI;
+  pScreenPriv->pwinInitScreen = winInitScreenShadowGDI;
+  pScreenPriv->pwinCloseScreen = winCloseScreenShadowGDI;
+  pScreenPriv->pwinInitVisuals = winInitVisualsShadowGDI;
+  pScreenPriv->pwinAdjustVideoMode = winAdjustVideoModeShadowGDI;
+  if (pScreenInfo->fFullScreen)
+    pScreenPriv->pwinCreateBoundingWindow = winCreateBoundingWindowFullScreen;
+  else
+    pScreenPriv->pwinCreateBoundingWindow = winCreateBoundingWindowWindowed;
+  pScreenPriv->pwinFinishScreenInit = winFinishScreenInitFB;
+  pScreenPriv->pwinBltExposedRegions = winBltExposedRegionsShadowGDI;
+  pScreenPriv->pwinActivateApp = winActivateAppShadowGDI;
+  pScreenPriv->pwinRedrawScreen = winRedrawScreenShadowGDI;
+  pScreenPriv->pwinRealizeInstalledPalette = 
+    winRealizeInstalledPaletteShadowGDI;
+  pScreenPriv->pwinInstallColormap = winInstallColormapShadowGDI;
+  pScreenPriv->pwinStoreColors = winStoreColorsShadowGDI;
+  pScreenPriv->pwinCreateColormap = winCreateColormapShadowGDI;
+  pScreenPriv->pwinDestroyColormap = winDestroyColormapShadowGDI;
+  pScreenPriv->pwinHotKeyAltTab = (winHotKeyAltTabProcPtr) (void (*)(void))NoopDDA;
+  pScreenPriv->pwinCreatePrimarySurface
+    = (winCreatePrimarySurfaceProcPtr) (void (*)(void))NoopDDA;
+  pScreenPriv->pwinReleasePrimarySurface
+    = (winReleasePrimarySurfaceProcPtr) (void (*)(void))NoopDDA;
+#ifdef XWIN_MULTIWINDOW
+  pScreenPriv->pwinFinishCreateWindowsWindow =
+    (winFinishCreateWindowsWindowProcPtr) (void (*)(void))NoopDDA;
+#endif
+
+  return TRUE;
+}
diff --git a/xorg-server/hw/xwin/winvalargs.c b/xorg-server/hw/xwin/winvalargs.c
index f97bce610..04db777b0 100644
--- a/xorg-server/hw/xwin/winvalargs.c
+++ b/xorg-server/hw/xwin/winvalargs.c
@@ -1,180 +1,180 @@
-/*

- *Copyright (C) 2003-2004 Harold L Hunt II 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 HAROLD L HUNT II 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 Harold L Hunt II

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

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

- *from Harold L Hunt II.

- *

- * Authors:	Harold L Hunt II

- */

-

-#ifdef HAVE_XWIN_CONFIG_H

-#include <xwin-config.h>

-#endif

-#include "win.h"

-#include "winmsg.h"

-

-

-

-

-/*

- * Verify all screens have been explicitly specified

- */

-static BOOL

-isEveryScreenExplicit(void)

-{

-  int i;

-

-  for (i = 0; i < g_iNumScreens; i++)

-    if (!g_ScreenInfo[i].fExplicitScreen)

-      return FALSE;

-

-  return TRUE;

-}

-

-/*

- * winValidateArgs - Look for invalid argument combinations

- */

-

-Bool

-winValidateArgs (void)

-{

-  int		i;

-  int		iMaxConsecutiveScreen = 0;

-  BOOL		fHasNormalScreen0 = FALSE;

-  BOOL		fImplicitScreenFound = FALSE;

-

-  /*

-   * Check for a malformed set of -screen parameters.

-   * Examples of malformed parameters:

-   *	XWin -screen 1

-   *	XWin -screen 0 -screen 2

-   *	XWin -screen 1 -screen 2

-   */

-  if (!isEveryScreenExplicit())

-    {

-      ErrorF ("winValidateArgs - Malformed set of screen parameter(s).  "

-	      "Screens must be specified consecutively starting with "

-	      "screen 0.  That is, you cannot have only a screen 1, nor "

-	      "could you have screen 0 and screen 2.  You instead must "

-	      "have screen 0, or screen 0 and screen 1, respectively.  "

-	      "You can specify as many screens as you want.\n");

-      return FALSE;

-    }

-

-  /* Loop through all screens */

-  for (i = 0; i < g_iNumScreens; ++i)

-    {

-      /*

-       * Check for any combination of

-       * -multiwindow, -mwextwm, and -rootless.

-       */

-      {

-	int		iCount = 0;

-

-	/* Count conflicting options */

-#ifdef XWIN_MULTIWINDOW

-	if (g_ScreenInfo[i].fMultiWindow)

-	  ++iCount;

-#endif

-#ifdef XWIN_MULTIWINDOWEXTWM

-	if (g_ScreenInfo[i].fMWExtWM)

-	  ++iCount;

-#endif

-	if (g_ScreenInfo[i].fRootless)

-	  ++iCount;

-

-	/* Check if the first screen is without rootless and multiwindow */ 

-	if (iCount == 0 && i == 0)

-	  fHasNormalScreen0 = TRUE;  

-

-	/* Fail if two or more conflicting options */

-	if (iCount > 1)

-	  {

-	    ErrorF ("winValidateArgs - Only one of -multiwindow, -mwextwm, "

-		    "and -rootless can be specific at a time.\n");

-	    return FALSE;

-	  }

-      }

-

-      /* Check for -multiwindow or -mwextwm and Xdmcp */

-      /* allow xdmcp if screen 0 is normal. */

-      if (g_fXdmcpEnabled && !fHasNormalScreen0

-	  && (FALSE

-#ifdef XWIN_MULTIWINDOW

-	      || g_ScreenInfo[i].fMultiWindow

-#endif

-#ifdef XWIN_MULTIWINDOWEXTWM

-	      || g_ScreenInfo[i].fMWExtWM

-#endif

-	      )

-	  )

-	{

-	  ErrorF ("winValidateArgs - Xdmcp (-query, -broadcast, or -indirect) "

-		  "is invalid with -multiwindow or -mwextwm.\n");

-	  return FALSE;

-	}

-

-      /* Check for -multiwindow, -mwextwm, or -rootless and fullscreen */

-      if (g_ScreenInfo[i].fFullScreen

-	  && (FALSE

-#ifdef XWIN_MULTIWINDOW

-	      || g_ScreenInfo[i].fMultiWindow

-#endif

-#ifdef XWIN_MULTIWINDOWEXTWM

-	      || g_ScreenInfo[i].fMWExtWM

-#endif

-	      || g_ScreenInfo[i].fRootless)

-	  )

-	{

-	  ErrorF ("winValidateArgs - -fullscreen is invalid with "

-		  "-multiwindow, -mwextwm, or -rootless.\n");

-	  return FALSE;

-	}

-      

-      /* Check for !fullscreen and any fullscreen-only parameters */

-      if (!g_ScreenInfo[i].fFullScreen

-	  && (g_ScreenInfo[i].dwRefreshRate != WIN_DEFAULT_BPP

-	      || g_ScreenInfo[i].dwBPP != WIN_DEFAULT_REFRESH))

-	{

-	  ErrorF ("winValidateArgs - -refresh and -depth are only valid "

-		  "with -fullscreen.\n");

-	  return FALSE;

-	}

-

-      /* Check for fullscreen and any non-fullscreen parameters */

-      if (g_ScreenInfo[i].fFullScreen

-	  && (g_ScreenInfo[i].fScrollbars

-	      || !g_ScreenInfo[i].fDecoration

-	      || g_ScreenInfo[i].fLessPointer))

-	{

-	  ErrorF ("winValidateArgs - -fullscreen is invalid with "

-		  "-scrollbars, -nodecoration, or -lesspointer.\n");

-	  return FALSE;

-	}

-    }

-

-  winDebug ("winValidateArgs - Returning.\n");

-

-  return TRUE;

-}

+/*
+ *Copyright (C) 2003-2004 Harold L Hunt II 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 HAROLD L HUNT II 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 Harold L Hunt II
+ *shall not be used in advertising or otherwise to promote the sale, use
+ *or other dealings in this Software without prior written authorization
+ *from Harold L Hunt II.
+ *
+ * Authors:	Harold L Hunt II
+ */
+
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
+#include "win.h"
+#include "winmsg.h"
+
+
+
+
+/*
+ * Verify all screens have been explicitly specified
+ */
+static BOOL
+isEveryScreenExplicit(void)
+{
+  int i;
+
+  for (i = 0; i < g_iNumScreens; i++)
+    if (!g_ScreenInfo[i].fExplicitScreen)
+      return FALSE;
+
+  return TRUE;
+}
+
+/*
+ * winValidateArgs - Look for invalid argument combinations
+ */
+
+Bool
+winValidateArgs (void)
+{
+  int		i;
+  int		iMaxConsecutiveScreen = 0;
+  BOOL		fHasNormalScreen0 = FALSE;
+  BOOL		fImplicitScreenFound = FALSE;
+
+  /*
+   * Check for a malformed set of -screen parameters.
+   * Examples of malformed parameters:
+   *	XWin -screen 1
+   *	XWin -screen 0 -screen 2
+   *	XWin -screen 1 -screen 2
+   */
+  if (!isEveryScreenExplicit())
+    {
+      ErrorF ("winValidateArgs - Malformed set of screen parameter(s).  "
+	      "Screens must be specified consecutively starting with "
+	      "screen 0.  That is, you cannot have only a screen 1, nor "
+	      "could you have screen 0 and screen 2.  You instead must "
+	      "have screen 0, or screen 0 and screen 1, respectively.  "
+	      "You can specify as many screens as you want.\n");
+      return FALSE;
+    }
+
+  /* Loop through all screens */
+  for (i = 0; i < g_iNumScreens; ++i)
+    {
+      /*
+       * Check for any combination of
+       * -multiwindow, -mwextwm, and -rootless.
+       */
+      {
+	int		iCount = 0;
+
+	/* Count conflicting options */
+#ifdef XWIN_MULTIWINDOW
+	if (g_ScreenInfo[i].fMultiWindow)
+	  ++iCount;
+#endif
+#ifdef XWIN_MULTIWINDOWEXTWM
+	if (g_ScreenInfo[i].fMWExtWM)
+	  ++iCount;
+#endif
+	if (g_ScreenInfo[i].fRootless)
+	  ++iCount;
+
+	/* Check if the first screen is without rootless and multiwindow */ 
+	if (iCount == 0 && i == 0)
+	  fHasNormalScreen0 = TRUE;  
+
+	/* Fail if two or more conflicting options */
+	if (iCount > 1)
+	  {
+	    ErrorF ("winValidateArgs - Only one of -multiwindow, -mwextwm, "
+		    "and -rootless can be specific at a time.\n");
+	    return FALSE;
+	  }
+      }
+
+      /* Check for -multiwindow or -mwextwm and Xdmcp */
+      /* allow xdmcp if screen 0 is normal. */
+      if (g_fXdmcpEnabled && !fHasNormalScreen0
+	  && (FALSE
+#ifdef XWIN_MULTIWINDOW
+	      || g_ScreenInfo[i].fMultiWindow
+#endif
+#ifdef XWIN_MULTIWINDOWEXTWM
+	      || g_ScreenInfo[i].fMWExtWM
+#endif
+	      )
+	  )
+	{
+	  ErrorF ("winValidateArgs - Xdmcp (-query, -broadcast, or -indirect) "
+		  "is invalid with -multiwindow or -mwextwm.\n");
+	  return FALSE;
+	}
+
+      /* Check for -multiwindow, -mwextwm, or -rootless and fullscreen */
+      if (g_ScreenInfo[i].fFullScreen
+	  && (FALSE
+#ifdef XWIN_MULTIWINDOW
+	      || g_ScreenInfo[i].fMultiWindow
+#endif
+#ifdef XWIN_MULTIWINDOWEXTWM
+	      || g_ScreenInfo[i].fMWExtWM
+#endif
+	      || g_ScreenInfo[i].fRootless)
+	  )
+	{
+	  ErrorF ("winValidateArgs - -fullscreen is invalid with "
+		  "-multiwindow, -mwextwm, or -rootless.\n");
+	  return FALSE;
+	}
+      
+      /* Check for !fullscreen and any fullscreen-only parameters */
+      if (!g_ScreenInfo[i].fFullScreen
+	  && (g_ScreenInfo[i].dwRefreshRate != WIN_DEFAULT_REFRESH
+	      || g_ScreenInfo[i].dwBPP != WIN_DEFAULT_BPP))
+	{
+	  ErrorF ("winValidateArgs - -refresh and -depth are only valid "
+		  "with -fullscreen.\n");
+	  return FALSE;
+	}
+
+      /* Check for fullscreen and any non-fullscreen parameters */
+      if (g_ScreenInfo[i].fFullScreen
+	  && ((g_ScreenInfo[i].iResizeMode != notAllowed)
+	      || !g_ScreenInfo[i].fDecoration
+	      || g_ScreenInfo[i].fLessPointer))
+	{
+	  ErrorF ("winValidateArgs - -fullscreen is invalid with "
+		  "-scrollbars, -resize, -nodecoration, or -lesspointer.\n");
+	  return FALSE;
+	}
+    }
+
+  winDebug ("winValidateArgs - Returning.\n");
+
+  return TRUE;
+}
diff --git a/xorg-server/hw/xwin/winwindow.c b/xorg-server/hw/xwin/winwindow.c
index f6371a65c..7975d71a9 100644
--- a/xorg-server/hw/xwin/winwindow.c
+++ b/xorg-server/hw/xwin/winwindow.c
@@ -1,636 +1,637 @@
-/*

- *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:	Harold L Hunt II

- *		Kensuke Matsuzaki

- */

-

-#ifdef HAVE_XWIN_CONFIG_H

-#include <xwin-config.h>

-#endif

-#include "win.h"

-

-

-/*

- * Prototypes for local functions

- */

-

-static int

-winAddRgn (WindowPtr pWindow, pointer data);

-

-static

-void

-winUpdateRgnRootless (WindowPtr pWindow);

-

-static

-void

-winReshapeRootless (WindowPtr pWin);

-

-

-#ifdef XWIN_NATIVEGDI

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

-/* See mfb/mfbwindow.c - mfbCreateWindow() */

-

-Bool

-winCreateWindowNativeGDI (WindowPtr pWin)

-{

-  ScreenPtr		pScreen = pWin->drawable.pScreen;

-  winWindowPriv(pWin);

-  winScreenPriv(pScreen);

-

-#if CYGDEBUG

-  winTrace ("winCreateWindowNativeGDI (%p)\n", pWin);

-#endif

-

-  WIN_UNWRAP(CreateWindow);

-  fResult = (*pScreen->CreateWindow) (pWin);

-  WIN_WRAP(CreateWindow, winCreateWindowNativeGDI);

-

-  return fResult;

-}

-

-

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

-/* See mfb/mfbwindow.c - mfbDestroyWindow() */

-

-Bool

-winDestroyWindowNativeGDI (WindowPtr pWin)

-{

-  Bool			fResult = TRUE;

-  ScreenPtr		pScreen = pWin->drawable.pScreen;

-  winWindowPriv(pWin);

-  winScreenPriv(pScreen);

-

-#if CYGDEBUG

-  winTrace ("winDestroyWindowNativeGDI (%p)\n", pWin);

-#endif

-

-  WIN_UNWRAP(DestroyWindow); 

-  fResult = (*pScreen->DestroyWindow)(pWin);

-  WIN_WRAP(DestroyWindow, winDestroyWindowNativeGDI);

-

-  return fResult;

-}

-

-

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

-/* See mfb/mfbwindow.c - mfbPositionWindow() */

-

-Bool

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

-{

-  Bool			fResult = TRUE;

-  ScreenPtr		pScreen = pWin->drawable.pScreen;

-  winWindowPriv(pWin);

-  winScreenPriv(pScreen);

-

-#if CYGDEBUG

-  winTrace ("winPositionWindowNativeGDI (%p)\n", pWin);

-#endif

-

-  WIN_UNWRAP(PositionWindow);

-  fResult = (*pScreen->PositionWindow)(pWin, x, y);

-  WIN_WRAP(PositionWindow, winPositionWindowNativeGDI);

-

-  return fResult;

-}

-

-

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

-/* See mfb/mfbwindow.c - mfbCopyWindow() */

-

-void 

-winCopyWindowNativeGDI (WindowPtr pWin,

-			DDXPointRec ptOldOrg,

-			RegionPtr prgnSrc)

-{

-  DDXPointPtr		pptSrc;

-  DDXPointPtr		ppt;

-  RegionPtr		prgnDst;

-  BoxPtr		pBox;

-  int			dx, dy;

-  int			i, nbox;

-  WindowPtr		pwinRoot;

-  BoxPtr		pBoxDst;

-  ScreenPtr		pScreen = pWin->drawable.pScreen;

-  winScreenPriv(pScreen);

-

-#if 0

-  ErrorF ("winCopyWindow\n");

-#endif

-

-  /* Get a pointer to the root window */

-  pwinRoot = pWin->drawable.pScreen->root;

-

-  /* Create a region for the destination */

-  prgnDst = RegionCreate(NULL, 1);

-

-  /* Calculate the shift from the source to the destination */

-  dx = ptOldOrg.x - pWin->drawable.x;

-  dy = ptOldOrg.y - pWin->drawable.y;

-

-  /* Translate the region from the destination to the source? */

-  RegionTranslate(prgnSrc, -dx, -dy);

-  RegionIntersect(prgnDst, &pWin->borderClip,

-		   prgnSrc);

-

-  /* Get a pointer to the first box in the region to be copied */

-  pBox = RegionRects(prgnDst);

-  

-  /* Get the number of boxes in the region */

-  nbox = RegionNumRects(prgnDst);

-

-  /* Allocate source points for each box */

-  if(!(pptSrc = (DDXPointPtr )malloc(nbox * sizeof(DDXPointRec))))

-    return;

-

-  /* Set an iterator pointer */

-  ppt = pptSrc;

-

-  /* Calculate the source point of each box? */

-  for (i = nbox; --i >= 0; ppt++, pBox++)

-    {

-      ppt->x = pBox->x1 + dx;

-      ppt->y = pBox->y1 + dy;

-    }

-

-  /* Setup loop pointers again */

-  pBoxDst = RegionRects(prgnDst);

-  ppt = pptSrc;

-

-#if 0

-  ErrorF ("winCopyWindow - x1\tx2\ty1\ty2\tx\ty\n");

-#endif

-

-  /* BitBlt each source to the destination point */

-  for (i = nbox; --i >= 0; pBoxDst++, ppt++)

-    {

-#if 0

-      ErrorF ("winCopyWindow - %d\t%d\t%d\t%d\t%d\t%d\n",

-	      pBoxDst->x1, pBoxDst->x2, pBoxDst->y1, pBoxDst->y2,

-	      ppt->x, ppt->y);

-#endif

-

-      BitBlt (pScreenPriv->hdcScreen,

-	      pBoxDst->x1, pBoxDst->y1,

-	      pBoxDst->x2 - pBoxDst->x1, pBoxDst->y2 - pBoxDst->y1,

-	      pScreenPriv->hdcScreen,

-	      ppt->x, ppt->y,

-	      SRCCOPY);

-    }

-

-  /* Cleanup the regions, etc. */

-  free(pptSrc);

-  RegionDestroy(prgnDst);

-}

-

-

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

-/* See mfb/mfbwindow.c - mfbChangeWindowAttributes() */

-

-Bool

-winChangeWindowAttributesNativeGDI (WindowPtr pWin, unsigned long mask)

-{

-  Bool			fResult = TRUE;

-  ScreenPtr		pScreen = pWin->drawable.pScreen;

-  winWindowPriv(pWin);

-  winScreenPriv(pScreen);

-

-#if CYGDEBUG

-  winTrace ("winChangeWindowAttributesNativeGDI (%p)\n", pWin);

-#endif

-  

-  WIN_UNWRAP(ChangeWindowAttributes); 

-  fResult = (*pScreen->ChangeWindowAttributes)(pWin, mask);

-  WIN_WRAP(ChangeWindowAttributes, winChangeWindowAttributesNativeGDI);

-  

-  /*

-   * NOTE: We do not currently need to do anything here.

-   */

-

-  return fResult;

-}

-

-

-/* See Porting Layer Definition - p. 37

- * Also referred to as UnrealizeWindow

- */

-

-Bool

-winUnmapWindowNativeGDI (WindowPtr pWin)

-{

-  Bool			fResult = TRUE;

-  ScreenPtr		pScreen = pWin->drawable.pScreen;

-  winWindowPriv(pWin);

-  winScreenPriv(pScreen);

-

-#if CYGDEBUG

-  winTrace ("winUnmapWindowNativeGDI (%p)\n", pWin);

-#endif

-

-  WIN_UNWRAP(UnrealizeWindow); 

-  fResult = (*pScreen->UnrealizeWindow)(pWin);

-  WIN_WRAP(UnrealizeWindow, winUnmapWindowNativeGDI);

-  

-  return fResult;

-}

-

-

-/* See Porting Layer Definition - p. 37

- * Also referred to as RealizeWindow

- */

-

-Bool

-winMapWindowNativeGDI (WindowPtr pWin)

-{

-  Bool			fResult = TRUE;

-  ScreenPtr		pScreen = pWin->drawable.pScreen;

-  winWindowPriv(pWin);

-  winScreenPriv(pScreen);

-

-#if CYGDEBUG

-  winTrace ("winMapWindowNativeGDI (%p)\n", pWin);

-#endif

-

-  WIN_UNWRAP(RealizeWindow); 

-  fResult = (*pScreen->RealizeWindow)(pWin);

-  WIN_WRAP(RealizeWindow, winMapWindowMultiWindow);

-  

-  return fResult;

-

-}

-#endif

-

-

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

-/* See mfb/mfbwindow.c - mfbCreateWindow() */

-

-Bool

-winCreateWindowRootless (WindowPtr pWin)

-{

-  Bool			fResult = FALSE;

-  ScreenPtr		pScreen = pWin->drawable.pScreen;

-  winWindowPriv(pWin);

-  winScreenPriv(pScreen);

-

-#if CYGDEBUG

-  winTrace ("winCreateWindowRootless (%p)\n", pWin);

-#endif

-

-  WIN_UNWRAP(CreateWindow);

-  fResult = (*pScreen->CreateWindow) (pWin);

-  WIN_WRAP(CreateWindow, winCreateWindowRootless);

-  

-  pWinPriv->hRgn = NULL;

-  

-  return fResult;

-}

-

-

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

-/* See mfb/mfbwindow.c - mfbDestroyWindow() */

-

-Bool

-winDestroyWindowRootless (WindowPtr pWin)

-{

-  Bool			fResult = FALSE;

-  ScreenPtr		pScreen = pWin->drawable.pScreen;

-  winWindowPriv(pWin);

-  winScreenPriv(pScreen);

-

-#if CYGDEBUG

-  winTrace ("winDestroyWindowRootless (%p)\n", pWin);

-#endif

-

-  WIN_UNWRAP(DestroyWindow); 

-  fResult = (*pScreen->DestroyWindow)(pWin);

-  WIN_WRAP(DestroyWindow, winDestroyWindowRootless);

-  

-  if (pWinPriv->hRgn != NULL)

-    {

-      DeleteObject(pWinPriv->hRgn);

-      pWinPriv->hRgn = NULL;

-    }

-  

-  winUpdateRgnRootless (pWin);

-  

-  return fResult;

-}

-

-

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

-/* See mfb/mfbwindow.c - mfbPositionWindow() */

-

-Bool

-winPositionWindowRootless (WindowPtr pWin, int x, int y)

-{

-  Bool			fResult = FALSE;

-  ScreenPtr		pScreen = pWin->drawable.pScreen;

-  winScreenPriv(pScreen);

-

-

-#if CYGDEBUG

-  winTrace ("winPositionWindowRootless (%p)\n", pWin);

-#endif

-

-  WIN_UNWRAP(PositionWindow);

-  fResult = (*pScreen->PositionWindow)(pWin, x, y);

-  WIN_WRAP(PositionWindow, winPositionWindowRootless);

-  

-  winUpdateRgnRootless (pWin);

-  

-  return fResult;

-}

-

-

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

-/* See mfb/mfbwindow.c - mfbChangeWindowAttributes() */

-

-Bool

-winChangeWindowAttributesRootless (WindowPtr pWin, unsigned long mask)

-{

-  Bool			fResult = FALSE;

-  ScreenPtr		pScreen = pWin->drawable.pScreen;

-  winScreenPriv(pScreen);

-

-#if CYGDEBUG

-  winTrace ("winChangeWindowAttributesRootless (%p)\n", pWin);

-#endif

-

-  WIN_UNWRAP(ChangeWindowAttributes); 

-  fResult = (*pScreen->ChangeWindowAttributes)(pWin, mask);

-  WIN_WRAP(ChangeWindowAttributes, winChangeWindowAttributesRootless);

-

-  winUpdateRgnRootless (pWin);

-  

-  return fResult;

-}

-

-

-/* See Porting Layer Definition - p. 37

- * Also referred to as UnrealizeWindow

- */

-

-Bool

-winUnmapWindowRootless (WindowPtr pWin)

-{

-  Bool			fResult = FALSE;

-  ScreenPtr		pScreen = pWin->drawable.pScreen;

-  winWindowPriv(pWin);

-  winScreenPriv(pScreen);

-

-#if CYGDEBUG

-  winTrace ("winUnmapWindowRootless (%p)\n", pWin);

-#endif

-

-  WIN_UNWRAP(UnrealizeWindow); 

-  fResult = (*pScreen->UnrealizeWindow)(pWin);

-  WIN_WRAP(UnrealizeWindow, winUnmapWindowRootless);

-  

-  if (pWinPriv->hRgn != NULL)

-    {

-      DeleteObject(pWinPriv->hRgn);

-      pWinPriv->hRgn = NULL;

-    }

-  

-  winUpdateRgnRootless (pWin);

-  

-  return fResult;

-}

-

-

-/* See Porting Layer Definition - p. 37

- * Also referred to as RealizeWindow

- */

-

-Bool

-winMapWindowRootless (WindowPtr pWin)

-{

-  Bool			fResult = FALSE;

-  ScreenPtr		pScreen = pWin->drawable.pScreen;

-  winScreenPriv(pScreen);

-

-#if CYGDEBUG

-  winTrace ("winMapWindowRootless (%p)\n", pWin);

-#endif

-

-  WIN_UNWRAP(RealizeWindow); 

-  fResult = (*pScreen->RealizeWindow)(pWin);

-  WIN_WRAP(RealizeWindow, winMapWindowRootless);

-

-  winReshapeRootless (pWin);

-  

-  winUpdateRgnRootless (pWin);

-  

-  return fResult;

-}

-

-

-void

-winSetShapeRootless (WindowPtr pWin, int kind)

-{

-  ScreenPtr		pScreen = pWin->drawable.pScreen;

-  winScreenPriv(pScreen);

-

-#if CYGDEBUG

-  winTrace ("winSetShapeRootless (%p, %i)\n", pWin, kind);

-#endif

-

-  WIN_UNWRAP(SetShape); 

-  (*pScreen->SetShape)(pWin, kind);

-  WIN_WRAP(SetShape, winSetShapeRootless);

-  

-  winReshapeRootless (pWin);

-  winUpdateRgnRootless (pWin);

-  

-  return;

-}

-

-

-/*

- * Local function for adding a region to the Windows window region

- */

-

-static

-int

-winAddRgn (WindowPtr pWin, pointer data)

-{

-  int		iX, iY, iWidth, iHeight, iBorder;

-  HRGN		hRgn = *(HRGN*)data;

-  HRGN		hRgnWin;

-  winWindowPriv(pWin);

-  

-  /* If pWin is not Root */

-  if (pWin->parent != NULL) 

-    {

-#if CYGDEBUG

-      winDebug ("winAddRgn ()\n");

-#endif

-      if (pWin->mapped)

-	{

-	  iBorder = wBorderWidth (pWin);

-	  

-	  iX = pWin->drawable.x - iBorder;

-	  iY = pWin->drawable.y - iBorder;

-	  

-	  iWidth = pWin->drawable.width + iBorder * 2;

-	  iHeight = pWin->drawable.height + iBorder * 2;

-	  

-	  hRgnWin = CreateRectRgn (0, 0, iWidth, iHeight);

-	  

-	  if (hRgnWin == NULL)

-	    {

-	      ErrorF ("winAddRgn - CreateRectRgn () failed\n");

-	      ErrorF ("  Rect %d %d %d %d\n",

-		      iX, iY, iX + iWidth, iY + iHeight);

-	    }

-	  

-	  if (pWinPriv->hRgn)

-	    {

-	      if (CombineRgn (hRgnWin, hRgnWin, pWinPriv->hRgn, RGN_AND)

-		  == ERROR)

-		{

-		  ErrorF ("winAddRgn - CombineRgn () failed\n");

-		}

-	    }

-	  

-	  OffsetRgn (hRgnWin, iX, iY);

-

-	  if (CombineRgn (hRgn, hRgn, hRgnWin, RGN_OR) == ERROR)

-	    {

-	      ErrorF ("winAddRgn - CombineRgn () failed\n");

-	    }

-	  

-	  DeleteObject (hRgnWin);

-	}

-      return WT_DONTWALKCHILDREN;

-    }

-  else

-    {

-      return WT_WALKCHILDREN;

-    }

-}

-

-

-/*

- * Local function to update the Windows window's region

- */

-

-static

-void

-winUpdateRgnRootless (WindowPtr pWin)

-{

-  HRGN		hRgn = CreateRectRgn (0, 0, 0, 0);

-  

-  if (hRgn != NULL)

-    {

-      WalkTree (pWin->drawable.pScreen, winAddRgn, &hRgn);

-      SetWindowRgn (winGetScreenPriv(pWin->drawable.pScreen)->hwndScreen,

-		    hRgn, TRUE);

-    }

-  else

-    {

-      ErrorF ("winUpdateRgnRootless - CreateRectRgn failed.\n");

-    }

-}

-

-

-static

-void

-winReshapeRootless (WindowPtr pWin)

-{

-  int		nRects;

-  RegionRec	rrNewShape;

-  BoxPtr	pShape, pRects, pEnd;

-  HRGN		hRgn, hRgnRect;

-  winWindowPriv(pWin);

-

-#if CYGDEBUG

-  winDebug ("winReshapeRootless ()\n");

-#endif

-

-  /* Bail if the window is the root window */

-  if (pWin->parent == NULL)

-    return;

-

-  /* Bail if the window is not top level */

-  if (pWin->parent->parent != NULL)

-    return;

-

-  /* Free any existing window region stored in the window privates */

-  if (pWinPriv->hRgn != NULL)

-    {

-      DeleteObject (pWinPriv->hRgn);

-      pWinPriv->hRgn = NULL;

-    }

-  

-  /* Bail if the window has no bounding region defined */

-  if (!wBoundingShape (pWin))

-    return;

-

-  RegionNull(&rrNewShape);

-  RegionCopy(&rrNewShape, wBoundingShape(pWin));

-  RegionTranslate(&rrNewShape, pWin->borderWidth,

-                   pWin->borderWidth);

-  

-  nRects = RegionNumRects(&rrNewShape);

-  pShape = RegionRects(&rrNewShape);

-  

-  if (nRects > 0)

-    {

-      /* Create initial empty Windows region */

-      hRgn = CreateRectRgn (0, 0, 0, 0);

-

-      /* Loop through all rectangles in the X region */

-      for (pRects = pShape, pEnd = pShape + nRects; pRects < pEnd; pRects++)

-        {

-	  /* Create a Windows region for the X rectangle */

-	  hRgnRect = CreateRectRgn (pRects->x1, pRects->y1,

-				    pRects->x2, pRects->y2);

-	  if (hRgnRect == NULL)

-	    {

-	      ErrorF("winReshapeRootless - CreateRectRgn() failed\n");

-	    }

-

-	  /* Merge the Windows region with the accumulated region */

-	  if (CombineRgn (hRgn, hRgn, hRgnRect, RGN_OR) == ERROR)

-	    {

-	      ErrorF("winReshapeRootless - CombineRgn() failed\n");

-	    }

-

-	  /* Delete the temporary Windows region */

-	  DeleteObject (hRgnRect);

-        }

-      

-      /* Save a handle to the composite region in the window privates */

-      pWinPriv->hRgn = hRgn;

-    }

-

-  RegionUninit(&rrNewShape);

-  

-  return;

-}

+/*
+ *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:	Harold L Hunt II
+ *		Kensuke Matsuzaki
+ */
+
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
+#include "win.h"
+
+
+/*
+ * Prototypes for local functions
+ */
+
+static int
+winAddRgn (WindowPtr pWindow, pointer data);
+
+static
+void
+winUpdateRgnRootless (WindowPtr pWindow);
+
+static
+void
+winReshapeRootless (WindowPtr pWin);
+
+
+#ifdef XWIN_NATIVEGDI
+/* See Porting Layer Definition - p. 37 */
+/* See mfb/mfbwindow.c - mfbCreateWindow() */
+
+Bool
+winCreateWindowNativeGDI (WindowPtr pWin)
+{
+  Bool			fResult = TRUE;
+  ScreenPtr		pScreen = pWin->drawable.pScreen;
+  winWindowPriv(pWin);
+  winScreenPriv(pScreen);
+
+#if CYGDEBUG
+  winTrace ("winCreateWindowNativeGDI (%p)\n", pWin);
+#endif
+
+  WIN_UNWRAP(CreateWindow);
+  fResult = (*pScreen->CreateWindow) (pWin);
+  WIN_WRAP(CreateWindow, winCreateWindowNativeGDI);
+
+  return fResult;
+}
+
+
+/* See Porting Layer Definition - p. 37 */
+/* See mfb/mfbwindow.c - mfbDestroyWindow() */
+
+Bool
+winDestroyWindowNativeGDI (WindowPtr pWin)
+{
+  Bool			fResult = TRUE;
+  ScreenPtr		pScreen = pWin->drawable.pScreen;
+  winWindowPriv(pWin);
+  winScreenPriv(pScreen);
+
+#if CYGDEBUG
+  winTrace ("winDestroyWindowNativeGDI (%p)\n", pWin);
+#endif
+
+  WIN_UNWRAP(DestroyWindow); 
+  fResult = (*pScreen->DestroyWindow)(pWin);
+  WIN_WRAP(DestroyWindow, winDestroyWindowNativeGDI);
+
+  return fResult;
+}
+
+
+/* See Porting Layer Definition - p. 37 */
+/* See mfb/mfbwindow.c - mfbPositionWindow() */
+
+Bool
+winPositionWindowNativeGDI (WindowPtr pWin, int x, int y)
+{
+  Bool			fResult = TRUE;
+  ScreenPtr		pScreen = pWin->drawable.pScreen;
+  winWindowPriv(pWin);
+  winScreenPriv(pScreen);
+
+#if CYGDEBUG
+  winTrace ("winPositionWindowNativeGDI (%p)\n", pWin);
+#endif
+
+  WIN_UNWRAP(PositionWindow);
+  fResult = (*pScreen->PositionWindow)(pWin, x, y);
+  WIN_WRAP(PositionWindow, winPositionWindowNativeGDI);
+
+  return fResult;
+}
+
+
+/* See Porting Layer Definition - p. 39 */
+/* See mfb/mfbwindow.c - mfbCopyWindow() */
+
+void 
+winCopyWindowNativeGDI (WindowPtr pWin,
+			DDXPointRec ptOldOrg,
+			RegionPtr prgnSrc)
+{
+  DDXPointPtr		pptSrc;
+  DDXPointPtr		ppt;
+  RegionPtr		prgnDst;
+  BoxPtr		pBox;
+  int			dx, dy;
+  int			i, nbox;
+  WindowPtr		pwinRoot;
+  BoxPtr		pBoxDst;
+  ScreenPtr		pScreen = pWin->drawable.pScreen;
+  winScreenPriv(pScreen);
+
+#if 0
+  ErrorF ("winCopyWindow\n");
+#endif
+
+  /* Get a pointer to the root window */
+  pwinRoot = pWin->drawable.pScreen->root;
+
+  /* Create a region for the destination */
+  prgnDst = RegionCreate(NULL, 1);
+
+  /* Calculate the shift from the source to the destination */
+  dx = ptOldOrg.x - pWin->drawable.x;
+  dy = ptOldOrg.y - pWin->drawable.y;
+
+  /* Translate the region from the destination to the source? */
+  RegionTranslate(prgnSrc, -dx, -dy);
+  RegionIntersect(prgnDst, &pWin->borderClip,
+		   prgnSrc);
+
+  /* Get a pointer to the first box in the region to be copied */
+  pBox = RegionRects(prgnDst);
+  
+  /* Get the number of boxes in the region */
+  nbox = RegionNumRects(prgnDst);
+
+  /* Allocate source points for each box */
+  if(!(pptSrc = (DDXPointPtr )malloc(nbox * sizeof(DDXPointRec))))
+    return;
+
+  /* Set an iterator pointer */
+  ppt = pptSrc;
+
+  /* Calculate the source point of each box? */
+  for (i = nbox; --i >= 0; ppt++, pBox++)
+    {
+      ppt->x = pBox->x1 + dx;
+      ppt->y = pBox->y1 + dy;
+    }
+
+  /* Setup loop pointers again */
+  pBoxDst = RegionRects(prgnDst);
+  ppt = pptSrc;
+
+#if 0
+  ErrorF ("winCopyWindow - x1\tx2\ty1\ty2\tx\ty\n");
+#endif
+
+  /* BitBlt each source to the destination point */
+  for (i = nbox; --i >= 0; pBoxDst++, ppt++)
+    {
+#if 0
+      ErrorF ("winCopyWindow - %d\t%d\t%d\t%d\t%d\t%d\n",
+	      pBoxDst->x1, pBoxDst->x2, pBoxDst->y1, pBoxDst->y2,
+	      ppt->x, ppt->y);
+#endif
+
+      BitBlt (pScreenPriv->hdcScreen,
+	      pBoxDst->x1, pBoxDst->y1,
+	      pBoxDst->x2 - pBoxDst->x1, pBoxDst->y2 - pBoxDst->y1,
+	      pScreenPriv->hdcScreen,
+	      ppt->x, ppt->y,
+	      SRCCOPY);
+    }
+
+  /* Cleanup the regions, etc. */
+  free(pptSrc);
+  RegionDestroy(prgnDst);
+}
+
+
+/* See Porting Layer Definition - p. 37 */
+/* See mfb/mfbwindow.c - mfbChangeWindowAttributes() */
+
+Bool
+winChangeWindowAttributesNativeGDI (WindowPtr pWin, unsigned long mask)
+{
+  Bool			fResult = TRUE;
+  ScreenPtr		pScreen = pWin->drawable.pScreen;
+  winWindowPriv(pWin);
+  winScreenPriv(pScreen);
+
+#if CYGDEBUG
+  winTrace ("winChangeWindowAttributesNativeGDI (%p)\n", pWin);
+#endif
+  
+  WIN_UNWRAP(ChangeWindowAttributes); 
+  fResult = (*pScreen->ChangeWindowAttributes)(pWin, mask);
+  WIN_WRAP(ChangeWindowAttributes, winChangeWindowAttributesNativeGDI);
+  
+  /*
+   * NOTE: We do not currently need to do anything here.
+   */
+
+  return fResult;
+}
+
+
+/* See Porting Layer Definition - p. 37
+ * Also referred to as UnrealizeWindow
+ */
+
+Bool
+winUnmapWindowNativeGDI (WindowPtr pWin)
+{
+  Bool			fResult = TRUE;
+  ScreenPtr		pScreen = pWin->drawable.pScreen;
+  winWindowPriv(pWin);
+  winScreenPriv(pScreen);
+
+#if CYGDEBUG
+  winTrace ("winUnmapWindowNativeGDI (%p)\n", pWin);
+#endif
+
+  WIN_UNWRAP(UnrealizeWindow); 
+  fResult = (*pScreen->UnrealizeWindow)(pWin);
+  WIN_WRAP(UnrealizeWindow, winUnmapWindowNativeGDI);
+  
+  return fResult;
+}
+
+
+/* See Porting Layer Definition - p. 37
+ * Also referred to as RealizeWindow
+ */
+
+Bool
+winMapWindowNativeGDI (WindowPtr pWin)
+{
+  Bool			fResult = TRUE;
+  ScreenPtr		pScreen = pWin->drawable.pScreen;
+  winWindowPriv(pWin);
+  winScreenPriv(pScreen);
+
+#if CYGDEBUG
+  winTrace ("winMapWindowNativeGDI (%p)\n", pWin);
+#endif
+
+  WIN_UNWRAP(RealizeWindow); 
+  fResult = (*pScreen->RealizeWindow)(pWin);
+  WIN_WRAP(RealizeWindow, winMapWindowMultiWindow);
+  
+  return fResult;
+
+}
+#endif
+
+
+/* See Porting Layer Definition - p. 37 */
+/* See mfb/mfbwindow.c - mfbCreateWindow() */
+
+Bool
+winCreateWindowRootless (WindowPtr pWin)
+{
+  Bool			fResult = FALSE;
+  ScreenPtr		pScreen = pWin->drawable.pScreen;
+  winWindowPriv(pWin);
+  winScreenPriv(pScreen);
+
+#if CYGDEBUG
+  winTrace ("winCreateWindowRootless (%p)\n", pWin);
+#endif
+
+  WIN_UNWRAP(CreateWindow);
+  fResult = (*pScreen->CreateWindow) (pWin);
+  WIN_WRAP(CreateWindow, winCreateWindowRootless);
+  
+  pWinPriv->hRgn = NULL;
+  
+  return fResult;
+}
+
+
+/* See Porting Layer Definition - p. 37 */
+/* See mfb/mfbwindow.c - mfbDestroyWindow() */
+
+Bool
+winDestroyWindowRootless (WindowPtr pWin)
+{
+  Bool			fResult = FALSE;
+  ScreenPtr		pScreen = pWin->drawable.pScreen;
+  winWindowPriv(pWin);
+  winScreenPriv(pScreen);
+
+#if CYGDEBUG
+  winTrace ("winDestroyWindowRootless (%p)\n", pWin);
+#endif
+
+  WIN_UNWRAP(DestroyWindow); 
+  fResult = (*pScreen->DestroyWindow)(pWin);
+  WIN_WRAP(DestroyWindow, winDestroyWindowRootless);
+  
+  if (pWinPriv->hRgn != NULL)
+    {
+      DeleteObject(pWinPriv->hRgn);
+      pWinPriv->hRgn = NULL;
+    }
+  
+  winUpdateRgnRootless (pWin);
+  
+  return fResult;
+}
+
+
+/* See Porting Layer Definition - p. 37 */
+/* See mfb/mfbwindow.c - mfbPositionWindow() */
+
+Bool
+winPositionWindowRootless (WindowPtr pWin, int x, int y)
+{
+  Bool			fResult = FALSE;
+  ScreenPtr		pScreen = pWin->drawable.pScreen;
+  winScreenPriv(pScreen);
+
+
+#if CYGDEBUG
+  winTrace ("winPositionWindowRootless (%p)\n", pWin);
+#endif
+
+  WIN_UNWRAP(PositionWindow);
+  fResult = (*pScreen->PositionWindow)(pWin, x, y);
+  WIN_WRAP(PositionWindow, winPositionWindowRootless);
+  
+  winUpdateRgnRootless (pWin);
+  
+  return fResult;
+}
+
+
+/* See Porting Layer Definition - p. 37 */
+/* See mfb/mfbwindow.c - mfbChangeWindowAttributes() */
+
+Bool
+winChangeWindowAttributesRootless (WindowPtr pWin, unsigned long mask)
+{
+  Bool			fResult = FALSE;
+  ScreenPtr		pScreen = pWin->drawable.pScreen;
+  winScreenPriv(pScreen);
+
+#if CYGDEBUG
+  winTrace ("winChangeWindowAttributesRootless (%p)\n", pWin);
+#endif
+
+  WIN_UNWRAP(ChangeWindowAttributes); 
+  fResult = (*pScreen->ChangeWindowAttributes)(pWin, mask);
+  WIN_WRAP(ChangeWindowAttributes, winChangeWindowAttributesRootless);
+
+  winUpdateRgnRootless (pWin);
+  
+  return fResult;
+}
+
+
+/* See Porting Layer Definition - p. 37
+ * Also referred to as UnrealizeWindow
+ */
+
+Bool
+winUnmapWindowRootless (WindowPtr pWin)
+{
+  Bool			fResult = FALSE;
+  ScreenPtr		pScreen = pWin->drawable.pScreen;
+  winWindowPriv(pWin);
+  winScreenPriv(pScreen);
+
+#if CYGDEBUG
+  winTrace ("winUnmapWindowRootless (%p)\n", pWin);
+#endif
+
+  WIN_UNWRAP(UnrealizeWindow); 
+  fResult = (*pScreen->UnrealizeWindow)(pWin);
+  WIN_WRAP(UnrealizeWindow, winUnmapWindowRootless);
+  
+  if (pWinPriv->hRgn != NULL)
+    {
+      DeleteObject(pWinPriv->hRgn);
+      pWinPriv->hRgn = NULL;
+    }
+  
+  winUpdateRgnRootless (pWin);
+  
+  return fResult;
+}
+
+
+/* See Porting Layer Definition - p. 37
+ * Also referred to as RealizeWindow
+ */
+
+Bool
+winMapWindowRootless (WindowPtr pWin)
+{
+  Bool			fResult = FALSE;
+  ScreenPtr		pScreen = pWin->drawable.pScreen;
+  winScreenPriv(pScreen);
+
+#if CYGDEBUG
+  winTrace ("winMapWindowRootless (%p)\n", pWin);
+#endif
+
+  WIN_UNWRAP(RealizeWindow); 
+  fResult = (*pScreen->RealizeWindow)(pWin);
+  WIN_WRAP(RealizeWindow, winMapWindowRootless);
+
+  winReshapeRootless (pWin);
+  
+  winUpdateRgnRootless (pWin);
+  
+  return fResult;
+}
+
+
+void
+winSetShapeRootless (WindowPtr pWin, int kind)
+{
+  ScreenPtr		pScreen = pWin->drawable.pScreen;
+  winScreenPriv(pScreen);
+
+#if CYGDEBUG
+  winTrace ("winSetShapeRootless (%p, %i)\n", pWin, kind);
+#endif
+
+  WIN_UNWRAP(SetShape); 
+  (*pScreen->SetShape)(pWin, kind);
+  WIN_WRAP(SetShape, winSetShapeRootless);
+  
+  winReshapeRootless (pWin);
+  winUpdateRgnRootless (pWin);
+  
+  return;
+}
+
+
+/*
+ * Local function for adding a region to the Windows window region
+ */
+
+static
+int
+winAddRgn (WindowPtr pWin, pointer data)
+{
+  int		iX, iY, iWidth, iHeight, iBorder;
+  HRGN		hRgn = *(HRGN*)data;
+  HRGN		hRgnWin;
+  winWindowPriv(pWin);
+  
+  /* If pWin is not Root */
+  if (pWin->parent != NULL) 
+    {
+#if CYGDEBUG
+      winDebug ("winAddRgn ()\n");
+#endif
+      if (pWin->mapped)
+	{
+	  iBorder = wBorderWidth (pWin);
+	  
+	  iX = pWin->drawable.x - iBorder;
+	  iY = pWin->drawable.y - iBorder;
+	  
+	  iWidth = pWin->drawable.width + iBorder * 2;
+	  iHeight = pWin->drawable.height + iBorder * 2;
+	  
+	  hRgnWin = CreateRectRgn (0, 0, iWidth, iHeight);
+	  
+	  if (hRgnWin == NULL)
+	    {
+	      ErrorF ("winAddRgn - CreateRectRgn () failed\n");
+	      ErrorF ("  Rect %d %d %d %d\n",
+		      iX, iY, iX + iWidth, iY + iHeight);
+	    }
+	  
+	  if (pWinPriv->hRgn)
+	    {
+	      if (CombineRgn (hRgnWin, hRgnWin, pWinPriv->hRgn, RGN_AND)
+		  == ERROR)
+		{
+		  ErrorF ("winAddRgn - CombineRgn () failed\n");
+		}
+	    }
+	  
+	  OffsetRgn (hRgnWin, iX, iY);
+
+	  if (CombineRgn (hRgn, hRgn, hRgnWin, RGN_OR) == ERROR)
+	    {
+	      ErrorF ("winAddRgn - CombineRgn () failed\n");
+	    }
+	  
+	  DeleteObject (hRgnWin);
+	}
+      return WT_DONTWALKCHILDREN;
+    }
+  else
+    {
+      return WT_WALKCHILDREN;
+    }
+}
+
+
+/*
+ * Local function to update the Windows window's region
+ */
+
+static
+void
+winUpdateRgnRootless (WindowPtr pWin)
+{
+  HRGN		hRgn = CreateRectRgn (0, 0, 0, 0);
+  
+  if (hRgn != NULL)
+    {
+      WalkTree (pWin->drawable.pScreen, winAddRgn, &hRgn);
+      SetWindowRgn (winGetScreenPriv(pWin->drawable.pScreen)->hwndScreen,
+		    hRgn, TRUE);
+    }
+  else
+    {
+      ErrorF ("winUpdateRgnRootless - CreateRectRgn failed.\n");
+    }
+}
+
+
+static
+void
+winReshapeRootless (WindowPtr pWin)
+{
+  int		nRects;
+  RegionRec	rrNewShape;
+  BoxPtr	pShape, pRects, pEnd;
+  HRGN		hRgn, hRgnRect;
+  winWindowPriv(pWin);
+
+#if CYGDEBUG
+  winDebug ("winReshapeRootless ()\n");
+#endif
+
+  /* Bail if the window is the root window */
+  if (pWin->parent == NULL)
+    return;
+
+  /* Bail if the window is not top level */
+  if (pWin->parent->parent != NULL)
+    return;
+
+  /* Free any existing window region stored in the window privates */
+  if (pWinPriv->hRgn != NULL)
+    {
+      DeleteObject (pWinPriv->hRgn);
+      pWinPriv->hRgn = NULL;
+    }
+  
+  /* Bail if the window has no bounding region defined */
+  if (!wBoundingShape (pWin))
+    return;
+
+  RegionNull(&rrNewShape);
+  RegionCopy(&rrNewShape, wBoundingShape(pWin));
+  RegionTranslate(&rrNewShape, pWin->borderWidth,
+                   pWin->borderWidth);
+  
+  nRects = RegionNumRects(&rrNewShape);
+  pShape = RegionRects(&rrNewShape);
+  
+  if (nRects > 0)
+    {
+      /* Create initial empty Windows region */
+      hRgn = CreateRectRgn (0, 0, 0, 0);
+
+      /* Loop through all rectangles in the X region */
+      for (pRects = pShape, pEnd = pShape + nRects; pRects < pEnd; pRects++)
+        {
+	  /* Create a Windows region for the X rectangle */
+	  hRgnRect = CreateRectRgn (pRects->x1, pRects->y1,
+				    pRects->x2, pRects->y2);
+	  if (hRgnRect == NULL)
+	    {
+	      ErrorF("winReshapeRootless - CreateRectRgn() failed\n");
+	    }
+
+	  /* Merge the Windows region with the accumulated region */
+	  if (CombineRgn (hRgn, hRgn, hRgnRect, RGN_OR) == ERROR)
+	    {
+	      ErrorF("winReshapeRootless - CombineRgn() failed\n");
+	    }
+
+	  /* Delete the temporary Windows region */
+	  DeleteObject (hRgnRect);
+        }
+      
+      /* Save a handle to the composite region in the window privates */
+      pWinPriv->hRgn = hRgn;
+    }
+
+  RegionUninit(&rrNewShape);
+  
+  return;
+}
diff --git a/xorg-server/hw/xwin/winwndproc.c b/xorg-server/hw/xwin/winwndproc.c
index 6d03de174..bccd6f9f2 100644
--- a/xorg-server/hw/xwin/winwndproc.c
+++ b/xorg-server/hw/xwin/winwndproc.c
@@ -1,1263 +1,1312 @@
-/*

- *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

- *		MATSUZAKI Kensuke

- */

-

-#ifdef HAVE_XWIN_CONFIG_H

-#include <xwin-config.h>

-#endif

-#include "win.h"

-#include <commctrl.h>

-#include "winprefs.h"

-#include "winconfig.h"

-#include "winmsg.h"

-#include "inputstr.h"

-

-/*

- * Global variables

- */

-

-Bool				g_fCursor = TRUE;

-Bool				g_fButton[3] = { FALSE, FALSE, FALSE };

-

-

-/*

- * Called by winWakeupHandler

- * Processes current Windows message

- */

-

-LRESULT CALLBACK

-winWindowProc (HWND hwnd, UINT message, 

-	       WPARAM wParam, LPARAM lParam)

-{

-  static winPrivScreenPtr	s_pScreenPriv = NULL;

-  static winScreenInfo		*s_pScreenInfo = NULL;

-  static ScreenPtr		s_pScreen = NULL;

-  static HWND			s_hwndLastPrivates = NULL;

-  static HINSTANCE		s_hInstance;

-  static Bool			s_fTracking = FALSE;

-  static unsigned long		s_ulServerGeneration = 0;

-  static UINT			s_uTaskbarRestart = 0;

-  int				iScanCode;

-  int				i;

-

-#if CYGDEBUG

-  winDebugWin32Message("winWindowProc", hwnd, message, wParam, lParam);

-#endif

-  

-  /* Watch for server regeneration */

-  if (g_ulServerGeneration != s_ulServerGeneration)

-    {

-      /* Store new server generation */

-      s_ulServerGeneration = g_ulServerGeneration;

-    }

-

-  /* Only retrieve new privates pointers if window handle is null or changed */

-  if ((s_pScreenPriv == NULL || hwnd != s_hwndLastPrivates)

-      && (s_pScreenPriv = GetProp (hwnd, WIN_SCR_PROP)) != NULL)

-    {

-#if CYGDEBUG

-      winDebug ("winWindowProc - Setting privates handle\n");

-#endif

-      s_pScreenInfo = s_pScreenPriv->pScreenInfo;

-      s_pScreen = s_pScreenInfo->pScreen;

-      s_hwndLastPrivates = hwnd;

-    }

-  else if (s_pScreenPriv == NULL)

-    {

-      /* For safety, handle case that should never happen */

-      s_pScreenInfo = NULL;

-      s_pScreen = NULL;

-      s_hwndLastPrivates = NULL;

-    }

-

-  /* Branch on message type */

-  switch (message)

-    {

-    case WM_TRAYICON:

-      return winHandleIconMessage (hwnd, message, wParam, lParam,

-				   s_pScreenPriv);

-

-    case WM_CREATE:

-#if CYGDEBUG

-      winDebug ("winWindowProc - WM_CREATE\n");

-#endif

-      

-      /*

-       * Add a property to our display window that references

-       * this screens' privates.

-       *

-       * This allows the window procedure to refer to the

-       * appropriate window DC and shadow DC for the window that

-       * it is processing.  We use this to repaint exposed

-       * areas of our display window.

-       */

-      s_pScreenPriv = ((LPCREATESTRUCT) lParam)->lpCreateParams;

-      s_hInstance = ((LPCREATESTRUCT) lParam)->hInstance;

-      s_pScreenInfo = s_pScreenPriv->pScreenInfo;

-      s_pScreen = s_pScreenInfo->pScreen;

-      s_hwndLastPrivates = hwnd;

-      s_uTaskbarRestart = RegisterWindowMessage(TEXT("TaskbarCreated"));

-      SetProp (hwnd, WIN_SCR_PROP, s_pScreenPriv);

-

-      /* Setup tray icon */

-      if (!s_pScreenInfo->fNoTrayIcon)

-	{

-	  /*

-	   * NOTE: The WM_CREATE message is processed before CreateWindowEx

-	   * returns, so s_pScreenPriv->hwndScreen is invalid at this point.

-	   * We go ahead and copy our hwnd parameter over top of the screen

-	   * privates hwndScreen so that we have a valid value for

-	   * that member.  Otherwise, the tray icon will disappear

-	   * the first time you move the mouse over top of it.

-	   */

-	  

-	  s_pScreenPriv->hwndScreen = hwnd;

-

-	  winInitNotifyIcon (s_pScreenPriv);

-	}

-      return 0;

-

-    case WM_DISPLAYCHANGE:

-      /* We cannot handle a display mode change during initialization */

-      if (s_pScreenInfo == NULL)

-	FatalError ("winWindowProc - WM_DISPLAYCHANGE - The display "

-		    "mode changed while we were intializing.  This is "

-		    "very bad and unexpected.  Exiting.\n");

-

-      /*

-       * We do not care about display changes with

-       * fullscreen DirectDraw engines, because those engines set

-       * their own mode when they become active.

-       */

-      if (s_pScreenInfo->fFullScreen

-	  && (s_pScreenInfo->dwEngine == WIN_SERVER_SHADOW_DD

-	      || s_pScreenInfo->dwEngine == WIN_SERVER_SHADOW_DDNL

-#ifdef XWIN_PRIMARYFB

-	      || s_pScreenInfo->dwEngine == WIN_SERVER_PRIMARY_DD

-#endif

-	      ))

-	{

-	  /* 

-	   * Store the new display dimensions and depth.

-	   * We do this here for future compatibility in case we

-	   * ever allow switching from fullscreen to windowed mode.

-	   */

-	  s_pScreenPriv->dwLastWindowsWidth = GetSystemMetrics (SM_CXSCREEN);

-	  s_pScreenPriv->dwLastWindowsHeight = GetSystemMetrics (SM_CYSCREEN);

-	  s_pScreenPriv->dwLastWindowsBitsPixel

-	    = GetDeviceCaps (s_pScreenPriv->hdcScreen, BITSPIXEL);	  

-	  break;

-	}

-      

-      ErrorF ("winWindowProc - WM_DISPLAYCHANGE - orig bpp: %d, last bpp: %d, "

-	      "new bpp: %d\n",

-	      (int) s_pScreenInfo->dwBPP,

-	      (int) s_pScreenPriv->dwLastWindowsBitsPixel,

-	      wParam);

-

-      ErrorF ("winWindowProc - WM_DISPLAYCHANGE - new width: %d "

-	      "new height: %d\n",

-	      LOWORD (lParam), HIWORD (lParam));

-

-      /*

-       * TrueColor --> TrueColor depth changes are disruptive for:

-       *	Windowed:

-       *		Shadow DirectDraw

-       *		Shadow DirectDraw Non-Locking

-       *		Primary DirectDraw

-       *

-       * TrueColor --> TrueColor depth changes are non-optimal for:

-       *	Windowed:

-       *		Shadow GDI

-       *

-       *	FullScreen:

-       *		Shadow GDI

-       *

-       * TrueColor --> PseudoColor or vice versa are disruptive for:

-       *	Windowed:

-       *		Shadow DirectDraw

-       *		Shadow DirectDraw Non-Locking

-       *		Primary DirectDraw

-       *		Shadow GDI

-       */

-

-      /*

-       * Check for a disruptive change in depth.

-       * We can only display a message for a disruptive depth change,

-       * we cannot do anything to correct the situation.

-       */

-      if ((s_pScreenInfo->dwBPP != wParam)

-	  && (s_pScreenInfo->dwEngine == WIN_SERVER_SHADOW_DD

-	      || s_pScreenInfo->dwEngine == WIN_SERVER_SHADOW_DDNL

-#ifdef XWIN_PRIMARYFB

-	      || s_pScreenInfo->dwEngine == WIN_SERVER_PRIMARY_DD

-#endif

-	      ))

-	{

-	  /* Cannot display the visual until the depth is restored */

-	  ErrorF ("winWindowProc - Disruptive change in depth\n");

-

-	  /* Display Exit dialog */

-	  winDisplayDepthChangeDialog (s_pScreenPriv);

-

-	  /* Flag that we have an invalid screen depth */

-	  s_pScreenPriv->fBadDepth = TRUE;

-

-	  /* Minimize the display window */

-	  ShowWindow (hwnd, SW_MINIMIZE);

-	}

-      else

-	{

-	  /* Flag that we have a valid screen depth */

-	  s_pScreenPriv->fBadDepth = FALSE;

-	}

-      

-      /*

-       * Check for a change in display dimensions.

-       * We can simply recreate the same-sized primary surface when

-       * the display dimensions change.

-       */

-      if (s_pScreenPriv->dwLastWindowsWidth != LOWORD (lParam)

-	  || s_pScreenPriv->dwLastWindowsHeight != HIWORD (lParam))

-	{

-	  /*

-	   * NOTE: The non-DirectDraw engines set the ReleasePrimarySurface

-	   * and CreatePrimarySurface function pointers to point

-	   * to the no operation function, NoopDDA.  This allows us

-	   * to blindly call these functions, even if they are not

-	   * relevant to the current engine (e.g., Shadow GDI).

-	   */

-

-#if CYGDEBUG

-	  winDebug ("winWindowProc - WM_DISPLAYCHANGE - Dimensions changed\n");

-#endif

-	  

-	  /* Release the old primary surface */

-	  (*s_pScreenPriv->pwinReleasePrimarySurface) (s_pScreen);

-

-#if CYGDEBUG

-	  winDebug ("winWindowProc - WM_DISPLAYCHANGE - Released "

-		  "primary surface\n");

-#endif

-

-	  /* Create the new primary surface */

-	  (*s_pScreenPriv->pwinCreatePrimarySurface) (s_pScreen);

-

-#if CYGDEBUG

-	  winDebug ("winWindowProc - WM_DISPLAYCHANGE - Recreated "

-		  "primary surface\n");

-#endif

-

-#if 0

-	  /* Multi-Window mode uses RandR for resizes */

-	  if (s_pScreenInfo->fMultiWindow)

-	    {

-	      RRSetScreenConfig ();

-	    }

-#endif

-	}

-      else

-	{

-#if CYGDEBUG

-	  winDebug ("winWindowProc - WM_DISPLAYCHANGE - Dimensions did not "

-		  "change\n");

-#endif

-	}

-

-      /* Store the new display dimensions and depth */

-      if (s_pScreenInfo->fMultipleMonitors)

-	{

-	  s_pScreenPriv->dwLastWindowsWidth

-	    = GetSystemMetrics (SM_CXVIRTUALSCREEN);

-	  s_pScreenPriv->dwLastWindowsHeight

-	    = GetSystemMetrics (SM_CYVIRTUALSCREEN);

-	}

-      else

-	{

-	  s_pScreenPriv->dwLastWindowsWidth

-	    = GetSystemMetrics (SM_CXSCREEN);

-	  s_pScreenPriv->dwLastWindowsHeight

-	    = GetSystemMetrics (SM_CYSCREEN);

-	}

-      s_pScreenPriv->dwLastWindowsBitsPixel

-	= GetDeviceCaps (s_pScreenPriv->hdcScreen, BITSPIXEL);

-      break;

-

-    case WM_SIZE:

-      {

-	SCROLLINFO		si;

-	RECT			rcWindow;

-	int			iWidth, iHeight;

-

-#if CYGDEBUG

-	winDebug ("winWindowProc - WM_SIZE\n");

-#endif

-

-	/* Break if we do not use scrollbars */

-	if (!s_pScreenInfo->fScrollbars

-	    || !s_pScreenInfo->fDecoration

-#ifdef XWIN_MULTIWINDOWEXTWM

-	    || s_pScreenInfo->fMWExtWM

-#endif

-	    || s_pScreenInfo->fRootless

-#ifdef XWIN_MULTIWINDOW

-	    || s_pScreenInfo->fMultiWindow

-#endif

-	    || s_pScreenInfo->fFullScreen)

-	  break;

-

-	/* No need to resize if we get minimized */

-	if (wParam == SIZE_MINIMIZED)

-	  return 0;

-

-	/*

-	 * Get the size of the whole window, including client area,

-	 * scrollbars, and non-client area decorations (caption, borders).

-	 * We do this because we need to check if the client area

-	 * without scrollbars is large enough to display the whole visual.

-	 * The new client area size passed by lParam already subtracts

-	 * the size of the scrollbars if they are currently displayed.

-	 * So checking is LOWORD(lParam) == visual_width and

-	 * HIWORD(lParam) == visual_height will never tell us to hide

-	 * the scrollbars because the client area would always be too small.

-	 * GetClientRect returns the same sizes given by lParam, so we

-	 * cannot use GetClientRect either.

-	 */

-	GetWindowRect (hwnd, &rcWindow);

-	iWidth = rcWindow.right - rcWindow.left;

-	iHeight = rcWindow.bottom - rcWindow.top;

-

-	ErrorF ("winWindowProc - WM_SIZE - window w: %d h: %d, "

-		"new client area w: %d h: %d\n",

-		iWidth, iHeight, LOWORD (lParam), HIWORD (lParam));

-

-	/* Subtract the frame size from the window size. */

-	iWidth -= 2 * GetSystemMetrics (SM_CXSIZEFRAME);

-	iHeight -= (2 * GetSystemMetrics (SM_CYSIZEFRAME)

-		    + GetSystemMetrics (SM_CYCAPTION));

-

-	/*

-	 * Update scrollbar page sizes.

-	 * NOTE: If page size == range, then the scrollbar is

-	 * automatically hidden.

-	 */

-

-	/* Is the naked client area large enough to show the whole visual? */

-	if (iWidth < s_pScreenInfo->dwWidth

-	    || iHeight < s_pScreenInfo->dwHeight)

-	  {

-	    /* Client area too small to display visual, use scrollbars */

-	    iWidth -= GetSystemMetrics (SM_CXVSCROLL);

-	    iHeight -= GetSystemMetrics (SM_CYHSCROLL);

-	  }

-	

-	/* Set the horizontal scrollbar page size */

-	si.cbSize = sizeof (si);

-	si.fMask = SIF_PAGE | SIF_RANGE;

-	si.nMin = 0;

-	si.nMax = s_pScreenInfo->dwWidth - 1;

-	si.nPage = iWidth;

-	SetScrollInfo (hwnd, SB_HORZ, &si, TRUE);

-	

-	/* Set the vertical scrollbar page size */

-	si.cbSize = sizeof (si);

-	si.fMask = SIF_PAGE | SIF_RANGE;

-	si.nMin = 0;

-	si.nMax = s_pScreenInfo->dwHeight - 1;

-	si.nPage = iHeight;

-	SetScrollInfo (hwnd, SB_VERT, &si, TRUE);

-

-	/*

-	 * NOTE: Scrollbars may have moved if they were at the 

-	 * far right/bottom, so we query their current position.

-	 */

-	

-	/* Get the horizontal scrollbar position and set the offset */

-	si.cbSize = sizeof (si);

-	si.fMask = SIF_POS;

-	GetScrollInfo (hwnd, SB_HORZ, &si);

-	s_pScreenInfo->dwXOffset = -si.nPos;

-	

-	/* Get the vertical scrollbar position and set the offset */

-	si.cbSize = sizeof (si);

-	si.fMask = SIF_POS;

-	GetScrollInfo (hwnd, SB_VERT, &si);

-	s_pScreenInfo->dwYOffset = -si.nPos;

-      }

-      return 0;

-

-    case WM_VSCROLL:

-      {

-	SCROLLINFO		si;

-	int			iVertPos;

-

-#if CYGDEBUG

-	winDebug ("winWindowProc - WM_VSCROLL\n");

-#endif

-      

-	/* Get vertical scroll bar info */

-	si.cbSize = sizeof (si);

-	si.fMask = SIF_ALL;

-	GetScrollInfo (hwnd, SB_VERT, &si);

-

-	/* Save the vertical position for comparison later */

-	iVertPos = si.nPos;

-

-	/*

-	 * Don't forget:

-	 * moving the scrollbar to the DOWN, scroll the content UP

-	 */

-	switch (LOWORD(wParam))

-	  {

-	  case SB_TOP:

-	    si.nPos = si.nMin;

-	    break;

-	  

-	  case SB_BOTTOM:

-	    si.nPos = si.nMax - si.nPage + 1;

-	    break;

-

-	  case SB_LINEUP:

-	    si.nPos -= 1;

-	    break;

-	  

-	  case SB_LINEDOWN:

-	    si.nPos += 1;

-	    break;

-	  

-	  case SB_PAGEUP:

-	    si.nPos -= si.nPage;

-	    break;

-	  

-	  case SB_PAGEDOWN:

-	    si.nPos += si.nPage;

-	    break;

-

-	  case SB_THUMBTRACK:

-	    si.nPos = si.nTrackPos;

-	    break;

-

-	  default:

-	    break;

-	  }

-

-	/*

-	 * We retrieve the position after setting it,

-	 * because Windows may adjust it.

-	 */

-	si.fMask = SIF_POS;

-	SetScrollInfo (hwnd, SB_VERT, &si, TRUE);

-	GetScrollInfo (hwnd, SB_VERT, &si);

-      

-	/* Scroll the window if the position has changed */

-	if (si.nPos != iVertPos)

-	  {

-	    /* Save the new offset for bit block transfers, etc. */

-	    s_pScreenInfo->dwYOffset = -si.nPos;

-

-	    /* Change displayed region in the window */

-	    ScrollWindowEx (hwnd,

-			    0,

-			    iVertPos - si.nPos,

-			    NULL,

-			    NULL,

-			    NULL,

-			    NULL,

-			    SW_INVALIDATE);

-	  

-	    /* Redraw the window contents */

-	    UpdateWindow (hwnd);

-	  }

-      }

-      return 0;

-

-    case WM_HSCROLL:

-      {

-	SCROLLINFO		si;

-	int			iHorzPos;

-

-#if CYGDEBUG

-	winDebug ("winWindowProc - WM_HSCROLL\n");

-#endif

-      

-	/* Get horizontal scroll bar info */

-	si.cbSize = sizeof (si);

-	si.fMask = SIF_ALL;

-	GetScrollInfo (hwnd, SB_HORZ, &si);

-

-	/* Save the horizontal position for comparison later */

-	iHorzPos = si.nPos;

-

-	/*

-	 * Don't forget:

-	 * moving the scrollbar to the RIGHT, scroll the content LEFT

-	 */

-	switch (LOWORD(wParam))

-	  {

-	  case SB_LEFT:

-	    si.nPos = si.nMin;

-	    break;

-	  

-	  case SB_RIGHT:

-	    si.nPos = si.nMax - si.nPage + 1;

-	    break;

-

-	  case SB_LINELEFT:

-	    si.nPos -= 1;

-	    break;

-	  

-	  case SB_LINERIGHT:

-	    si.nPos += 1;

-	    break;

-	  

-	  case SB_PAGELEFT:

-	    si.nPos -= si.nPage;

-	    break;

-	  

-	  case SB_PAGERIGHT:

-	    si.nPos += si.nPage;

-	    break;

-

-	  case SB_THUMBTRACK:

-	    si.nPos = si.nTrackPos;

-	    break;

-

-	  default:

-	    break;

-	  }

-

-	/*

-	 * We retrieve the position after setting it,

-	 * because Windows may adjust it.

-	 */

-	si.fMask = SIF_POS;

-	SetScrollInfo (hwnd, SB_HORZ, &si, TRUE);

-	GetScrollInfo (hwnd, SB_HORZ, &si);

-      

-	/* Scroll the window if the position has changed */

-	if (si.nPos != iHorzPos)

-	  {

-	    /* Save the new offset for bit block transfers, etc. */

-	    s_pScreenInfo->dwXOffset = -si.nPos;

-

-	    /* Change displayed region in the window */

-	    ScrollWindowEx (hwnd,

-			    iHorzPos - si.nPos,

-			    0,

-			    NULL,

-			    NULL,

-			    NULL,

-			    NULL,

-			    SW_INVALIDATE);

-	  

-	    /* Redraw the window contents */

-	    UpdateWindow (hwnd);

-	  }

-      }

-      return 0;

-

-    case WM_GETMINMAXINFO:

-      {

-	MINMAXINFO		*pMinMaxInfo = (MINMAXINFO *) lParam;

-	int			iCaptionHeight;

-	int			iBorderHeight, iBorderWidth;

-

-#if CYGDEBUG	

-	winDebug ("winWindowProc - WM_GETMINMAXINFO - pScreenInfo: %08x\n",

-		s_pScreenInfo);

-#endif

-

-	/* Can't do anything without screen info */

-	if (s_pScreenInfo == NULL

-	    || !s_pScreenInfo->fScrollbars

-	    || s_pScreenInfo->fFullScreen

-	    || !s_pScreenInfo->fDecoration

-#ifdef XWIN_MULTIWINDOWEXTWM

-	    || s_pScreenInfo->fMWExtWM

-#endif

-	    || s_pScreenInfo->fRootless

-#ifdef XWIN_MULTIWINDOW

-	    || s_pScreenInfo->fMultiWindow

-#endif

-	    )

-	  break;

-

-	/*

-	 * Here we can override the maximum tracking size, which

-	 * is the largest size that can be assigned to our window

-	 * via the sizing border.

-	 */

-

-	/*

-	 * FIXME: Do we only need to do this once, since our visual size

-	 * does not change?  Does Windows store this value statically

-	 * once we have set it once?

-	 */

-

-	/* Get the border and caption sizes */

-	iCaptionHeight = GetSystemMetrics (SM_CYCAPTION);

-	iBorderWidth = 2 * GetSystemMetrics (SM_CXSIZEFRAME);

-	iBorderHeight = 2 * GetSystemMetrics (SM_CYSIZEFRAME);

-	

-	/* Allow the full visual to be displayed */

-	pMinMaxInfo->ptMaxTrackSize.x

-	  = s_pScreenInfo->dwWidth + iBorderWidth;

-	pMinMaxInfo->ptMaxTrackSize.y

-	  = s_pScreenInfo->dwHeight + iBorderHeight + iCaptionHeight;

-      }

-      return 0;

-

-    case WM_ERASEBKGND:

-#if CYGDEBUG

-      winDebug ("winWindowProc - WM_ERASEBKGND\n");

-#endif

-      /*

-       * Pretend that we did erase the background but we don't care,

-       * the application uses the full window estate. This avoids some

-       * flickering when resizing.

-       */

-      return TRUE;

-

-    case WM_PAINT:

-#if CYGDEBUG

-      winDebug ("winWindowProc - WM_PAINT\n");

-#endif

-      /* Only paint if we have privates and the server is enabled */

-      if (s_pScreenPriv == NULL

-	  || !s_pScreenPriv->fEnabled

-	  || (s_pScreenInfo->fFullScreen && !s_pScreenPriv->fActive)

-	  || s_pScreenPriv->fBadDepth)

-	{

-	  /* We don't want to paint */

-	  break;

-	}

-

-      /* Break out here if we don't have a valid paint routine */

-      if (s_pScreenPriv->pwinBltExposedRegions == NULL)

-	break;

-      

-      /* Call the engine dependent repainter */

-      (*s_pScreenPriv->pwinBltExposedRegions) (s_pScreen);

-      return 0;

-

-    case WM_PALETTECHANGED:

-      {

-#if CYGDEBUG

-	winDebug ("winWindowProc - WM_PALETTECHANGED\n");

-#endif

-	/*

-	 * Don't process if we don't have privates or a colormap,

-	 * or if we have an invalid depth.

-	 */

-	if (s_pScreenPriv == NULL

-	    || s_pScreenPriv->pcmapInstalled == NULL

-	    || s_pScreenPriv->fBadDepth)

-	  break;

-

-	/* Return if we caused the palette to change */

-	if ((HWND) wParam == hwnd)

-	  {

-	    /* Redraw the screen */

-	    (*s_pScreenPriv->pwinRedrawScreen) (s_pScreen);

-	    return 0;

-	  }

-	

-	/* Reinstall the windows palette */

-	(*s_pScreenPriv->pwinRealizeInstalledPalette) (s_pScreen);

-	

-	/* Redraw the screen */

-	(*s_pScreenPriv->pwinRedrawScreen) (s_pScreen);

-	return 0;

-      }

-

-    case WM_MOUSEMOVE:

-      /* We can't do anything without privates */

-      if (s_pScreenPriv == NULL || s_pScreenInfo->fIgnoreInput)

-	break;

-

-      /* We can't do anything without g_pwinPointer */

-      if (g_pwinPointer == NULL)

-        break;

-

-      /* Has the mouse pointer crossed screens? */

-      if (s_pScreen != miPointerGetScreen(g_pwinPointer))

-	miPointerSetScreen (g_pwinPointer, s_pScreenInfo->dwScreen,

-			       GET_X_LPARAM(lParam)-s_pScreenInfo->dwXOffset,

-			       GET_Y_LPARAM(lParam)-s_pScreenInfo->dwYOffset);

-

-      /* Are we tracking yet? */

-      if (!s_fTracking)

-	{

-	  TRACKMOUSEEVENT		tme;

-	  

-	  /* Setup data structure */

-	  ZeroMemory (&tme, sizeof (tme));

-	  tme.cbSize = sizeof (tme);

-	  tme.dwFlags = TME_LEAVE;

-	  tme.hwndTrack = hwnd;

-

-	  /* Call the tracking function */

-	  if (!(*g_fpTrackMouseEvent) (&tme))

-	    ErrorF ("winWindowProc - _TrackMouseEvent failed\n");

-

-	  /* Flag that we are tracking now */

-	  s_fTracking = TRUE;

-	}

-

-      /* Hide or show the Windows mouse cursor */

-      if (g_fSoftwareCursor && g_fCursor && (s_pScreenPriv->fActive || s_pScreenInfo->fLessPointer))

-	{

-	  /* Hide Windows cursor */

-	  g_fCursor = FALSE;

-	  ShowCursor (FALSE);

-	}

-      else if (g_fSoftwareCursor && !g_fCursor && !s_pScreenPriv->fActive

-	       && !s_pScreenInfo->fLessPointer)

-	{

-	  /* Show Windows cursor */

-	  g_fCursor = TRUE;

-	  ShowCursor (TRUE);

-	}

-      

-      /* Deliver absolute cursor position to X Server */

-      winEnqueueMotion(GET_X_LPARAM(lParam)-s_pScreenInfo->dwXOffset,

-		       GET_Y_LPARAM(lParam)-s_pScreenInfo->dwYOffset);

-      return 0;

-

-    case WM_NCMOUSEMOVE:

-      /*

-       * We break instead of returning 0 since we need to call

-       * DefWindowProc to get the mouse cursor changes

-       * and min/max/close button highlighting in Windows XP.

-       * The Platform SDK says that you should return 0 if you

-       * process this message, but it fails to mention that you

-       * will give up any default functionality if you do return 0.

-       */

-      

-      /* We can't do anything without privates */

-      if (s_pScreenPriv == NULL || s_pScreenInfo->fIgnoreInput)

-	break;

-      

-      /* Non-client mouse movement, show Windows cursor */

-      if (g_fSoftwareCursor && !g_fCursor)

-	{

-	  g_fCursor = TRUE;

-	  ShowCursor (TRUE);

-	}

-      break;

-

-    case WM_MOUSELEAVE:

-      /* Mouse has left our client area */

-

-      /* Flag that we are no longer tracking */

-      s_fTracking = FALSE;

-

-      /* Show the mouse cursor, if necessary */

-      if (g_fSoftwareCursor && !g_fCursor)

-	{

-	  g_fCursor = TRUE;

-	  ShowCursor (TRUE);

-	}

-      return 0;

-

-    case WM_LBUTTONDBLCLK:

-    case WM_LBUTTONDOWN:

-      if (s_pScreenPriv == NULL || s_pScreenInfo->fIgnoreInput)

-	break;

-      if (s_pScreenInfo->fRootless

-#ifdef XWIN_MULTIWINDOWEXTWM

-	  || s_pScreenInfo->fMWExtWM

-#endif

-	  )

-	SetCapture (hwnd);

-      return winMouseButtonsHandle (s_pScreen, ButtonPress, Button1, wParam);

-      

-    case WM_LBUTTONUP:

-      if (s_pScreenPriv == NULL || s_pScreenInfo->fIgnoreInput)

-	break;

-      if (s_pScreenInfo->fRootless

-#ifdef XWIN_MULTIWINDOWEXTWM

-	  || s_pScreenInfo->fMWExtWM

-#endif

-	  )

-	ReleaseCapture ();

-      return winMouseButtonsHandle (s_pScreen, ButtonRelease, Button1, wParam);

-

-    case WM_MBUTTONDBLCLK:

-    case WM_MBUTTONDOWN:

-      if (s_pScreenPriv == NULL || s_pScreenInfo->fIgnoreInput)

-	break;

-      if (s_pScreenInfo->fRootless

-#ifdef XWIN_MULTIWINDOWEXTWM

-	  || s_pScreenInfo->fMWExtWM

-#endif

-	  )

-	SetCapture (hwnd);

-      return winMouseButtonsHandle (s_pScreen, ButtonPress, Button2, wParam);

-      

-    case WM_MBUTTONUP:

-      if (s_pScreenPriv == NULL || s_pScreenInfo->fIgnoreInput)

-	break;

-      if (s_pScreenInfo->fRootless

-#ifdef XWIN_MULTIWINDOWEXTWM

-	  || s_pScreenInfo->fMWExtWM

-#endif

-	  )

-	ReleaseCapture ();

-      return winMouseButtonsHandle (s_pScreen, ButtonRelease, Button2, wParam);

-      

-    case WM_RBUTTONDBLCLK:

-    case WM_RBUTTONDOWN:

-      if (s_pScreenPriv == NULL || s_pScreenInfo->fIgnoreInput)

-	break;

-      if (s_pScreenInfo->fRootless

-#ifdef XWIN_MULTIWINDOWEXTWM

-	  || s_pScreenInfo->fMWExtWM

-#endif

-	  )

-	SetCapture (hwnd);

-      return winMouseButtonsHandle (s_pScreen, ButtonPress, Button3, wParam);

-      

-    case WM_RBUTTONUP:

-      if (s_pScreenPriv == NULL || s_pScreenInfo->fIgnoreInput)

-	break;

-      if (s_pScreenInfo->fRootless

-#ifdef XWIN_MULTIWINDOWEXTWM

-	  || s_pScreenInfo->fMWExtWM

-#endif

-	  )

-	ReleaseCapture ();

-      return winMouseButtonsHandle (s_pScreen, ButtonRelease, Button3, wParam);

-

-    case WM_XBUTTONDBLCLK:

-    case WM_XBUTTONDOWN:

-      if (s_pScreenPriv == NULL || s_pScreenInfo->fIgnoreInput)

-	break;

-      if (s_pScreenInfo->fRootless

-#ifdef XWIN_MULTIWINDOWEXTWM

-	  || s_pScreenInfo->fMWExtWM

-#endif

-	  )

-	SetCapture (hwnd);

-      return winMouseButtonsHandle (s_pScreen, ButtonPress, HIWORD(wParam) + 5, wParam);

-    case WM_XBUTTONUP:

-      if (s_pScreenPriv == NULL || s_pScreenInfo->fIgnoreInput)

-	break;

-      if (s_pScreenInfo->fRootless

-#ifdef XWIN_MULTIWINDOWEXTWM

-	  || s_pScreenInfo->fMWExtWM

-#endif

-	  )

-	ReleaseCapture ();

-      return winMouseButtonsHandle (s_pScreen, ButtonRelease, HIWORD(wParam) + 5, wParam);

-

-    case WM_TIMER:

-      if (s_pScreenPriv == NULL || s_pScreenInfo->fIgnoreInput)

-	break;

-

-      /* Branch on the timer id */

-      switch (wParam)

-	{

-	case WIN_E3B_TIMER_ID:

-	  /* Send delayed button press */

-	  winMouseButtonsSendEvent (ButtonPress,

-				    s_pScreenPriv->iE3BCachedPress);

-

-	  /* Kill this timer */

-	  KillTimer (s_pScreenPriv->hwndScreen, WIN_E3B_TIMER_ID);

-

-	  /* Clear screen privates flags */

-	  s_pScreenPriv->iE3BCachedPress = 0;

-	  break;

-

-	case WIN_POLLING_MOUSE_TIMER_ID:

-	  {

-	    POINT		point;

-	    WPARAM		wL, wM, wR, wShift, wCtrl;

-	    LPARAM		lPos;

-	    

-	    /* Get the current position of the mouse cursor */

-	    GetCursorPos (&point);

-	    

-	    /* Map from screen (-X, -Y) to root (0, 0) */

-	    point.x -= GetSystemMetrics (SM_XVIRTUALSCREEN);

-	    point.y -= GetSystemMetrics (SM_YVIRTUALSCREEN);

-	    

-	    /* Deliver absolute cursor position to X Server */

-	    winEnqueueMotion(point.x , point.y);

-

-	    /* Check if a button was released but we didn't see it */

-	    GetCursorPos (&point);

-	    wL = (GetKeyState (VK_LBUTTON) & 0x8000)?MK_LBUTTON:0;

-	    wM = (GetKeyState (VK_MBUTTON) & 0x8000)?MK_MBUTTON:0;

-	    wR = (GetKeyState (VK_RBUTTON) & 0x8000)?MK_RBUTTON:0;

-	    wShift = (GetKeyState (VK_SHIFT) & 0x8000)?MK_SHIFT:0;

-	    wCtrl = (GetKeyState (VK_CONTROL) & 0x8000)?MK_CONTROL:0;

-	    lPos = MAKELPARAM(point.x, point.y);

-	    if (g_fButton[0] & !wL)

-	    PostMessage (hwnd, WM_LBUTTONUP, wCtrl|wM|wR|wShift, lPos);

-	    if (g_fButton[1] & !wM)

-	      PostMessage (hwnd, WM_MBUTTONUP, wCtrl|wL|wR|wShift, lPos);

-	    if (g_fButton[2] & !wR)

-	      PostMessage (hwnd, WM_RBUTTONUP, wCtrl|wL|wM|wShift, lPos);

-	  }

-	}

-      return 0;

-

-    case WM_CTLCOLORSCROLLBAR:

-      FatalError ("winWindowProc - WM_CTLCOLORSCROLLBAR - We are not "

-		  "supposed to get this message.  Exiting.\n");

-      return 0;

-

-    case WM_MOUSEWHEEL:

-      if (s_pScreenPriv == NULL || s_pScreenInfo->fIgnoreInput)

-	break;

-#if CYGDEBUG

-      winDebug ("winWindowProc - WM_MOUSEWHEEL\n");

-#endif

-      winMouseWheel (s_pScreen, GET_WHEEL_DELTA_WPARAM(wParam));

-      break;

-

-    case WM_SETFOCUS:

-      if (s_pScreenPriv == NULL || s_pScreenInfo->fIgnoreInput)

-	break;

-

-      /* Restore the state of all mode keys */

-      winRestoreModeKeyStates ();

-

-      /* Add the keyboard hook if possible */

-      if (g_fKeyboardHookLL)

-	g_fKeyboardHookLL = winInstallKeyboardHookLL ();

-      return 0;

-

-    case WM_KILLFOCUS:

-      if (s_pScreenPriv == NULL || s_pScreenInfo->fIgnoreInput)

-	break;

-

-      /* Release any pressed keys */

-      winKeybdReleaseKeys ();

-

-      /* Remove our keyboard hook if it is installed */

-      winRemoveKeyboardHookLL ();

-      return 0;

-

-    case WM_SYSKEYDOWN:

-    case WM_KEYDOWN:

-      if (s_pScreenPriv == NULL || s_pScreenInfo->fIgnoreInput)

-	break;

-

-      /*

-       * FIXME: Catching Alt-F4 like this is really terrible.  This should

-       * be generalized to handle other Windows keyboard signals.  Actually,

-       * the list keys to catch and the actions to perform when caught should

-       * be configurable; that way user's can customize the keys that they

-       * need to have passed through to their window manager or apps, or they

-       * can remap certain actions to new key codes that do not conflict

-       * with the X apps that they are using.  Yeah, that'll take awhile.

-       */

-      if ((s_pScreenInfo->fUseWinKillKey && wParam == VK_F4

-	   && (GetKeyState (VK_MENU) & 0x8000))

-	  || (s_pScreenInfo->fUseUnixKillKey && wParam == VK_BACK

-	      && (GetKeyState (VK_MENU) & 0x8000)

-	      && (GetKeyState (VK_CONTROL) & 0x8000)))

-	{

-	  /*

-	   * Better leave this message here, just in case some unsuspecting

-	   * user enters Alt + F4 and is surprised when the application

-	   * quits.

-	   */

-	  ErrorF ("winWindowProc - WM_*KEYDOWN - Closekey hit, quitting\n");

-	  

-	  /* Display Exit dialog */

-	  winDisplayExitDialog (s_pScreenPriv);

-	  return 0;

-	}

-      

-      /*

-       * Don't do anything for the Windows keys, as focus will soon

-       * be returned to Windows.  We may be able to trap the Windows keys,

-       * but we should determine if that is desirable before doing so.

-       */

-      if ((wParam == VK_LWIN || wParam == VK_RWIN) && !g_fKeyboardHookLL)

-	break;

-

-      /* 

-       * Discard presses generated from Windows auto-repeat

-       */

-      if (lParam & (1<<30))

-      {

-        switch (wParam)

-        {

-          /* ago: Pressing LControl while RControl is pressed is 

-           * Indicated as repeat. Fix this!

-           */

-          case VK_CONTROL:

-          case VK_SHIFT:

-            if (winCheckKeyPressed(wParam, lParam))

-              return 0;

-            break;

-          default:

-            return 0;

-        }

-      } 

-      

-      /* Discard fake Ctrl_L presses that precede AltGR on non-US keyboards */

-      if (winIsFakeCtrl_L (message, wParam, lParam))

-	return 0;

-      

-      /* Translate Windows key code to X scan code */

-      winTranslateKey (wParam, lParam, &iScanCode);

-

-      /* Ignore repeats for CapsLock */

-      if (wParam == VK_CAPITAL)

-	lParam = 1;

-

-      /* Send the key event(s) */

-      for (i = 0; i < LOWORD(lParam); ++i)

-	winSendKeyEvent (iScanCode, TRUE);

-      return 0;

-

-    case WM_SYSKEYUP:

-    case WM_KEYUP:

-      if (s_pScreenPriv == NULL || s_pScreenInfo->fIgnoreInput)

-	break;

-

-      /*

-       * Don't do anything for the Windows keys, as focus will soon

-       * be returned to Windows.  We may be able to trap the Windows keys,

-       * but we should determine if that is desirable before doing so.

-       */

-      if ((wParam == VK_LWIN || wParam == VK_RWIN) && !g_fKeyboardHookLL)

-	break;

-

-      /* Ignore the fake Ctrl_L that follows an AltGr release */

-      if (winIsFakeCtrl_L (message, wParam, lParam))

-	return 0;

-

-      /* Enqueue a keyup event */

-      winTranslateKey (wParam, lParam, &iScanCode);

-      winSendKeyEvent (iScanCode, FALSE);

-

-      /* Release all pressed shift keys */

-      if (wParam == VK_SHIFT) 

-        winFixShiftKeys (iScanCode);

-      return 0;

-

-    case WM_HOTKEY:

-      if (s_pScreenPriv == NULL)

-	break;

-

-      /* Call the engine-specific hot key handler */

-      (*s_pScreenPriv->pwinHotKeyAltTab) (s_pScreen);

-      return 0;

-

-    case WM_ACTIVATE:

-      if (s_pScreenPriv == NULL

-	  || s_pScreenInfo->fIgnoreInput)

-	break;

-

-      /* TODO: Override display of window when we have a bad depth */

-      if (LOWORD(wParam) != WA_INACTIVE && s_pScreenPriv->fBadDepth)

-	{

-	  ErrorF ("winWindowProc - WM_ACTIVATE - Bad depth, trying "

-		  "to override window activation\n");

-

-	  /* Minimize the window */

-	  ShowWindow (hwnd, SW_MINIMIZE);

-

-	  /* Display dialog box */

-	  if (g_hDlgDepthChange != NULL)

-	    {

-	      /* Make the existing dialog box active */

-	      SetActiveWindow (g_hDlgDepthChange);

-	    }

-	  else

-	    {

-	      /* TODO: Recreate the dialog box and bring to the top */

-	      ShowWindow (g_hDlgDepthChange, SW_SHOWDEFAULT);

-	    }

-

-	  /* Don't do any other processing of this message */

-	  return 0;

-	}

-

-#if CYGDEBUG

-      winDebug ("winWindowProc - WM_ACTIVATE\n");

-#endif

-

-      /*

-       * Focus is being changed to another window.

-       * The other window may or may not belong to

-       * our process.

-       */

-

-      /* Clear any lingering wheel delta */

-      s_pScreenPriv->iDeltaZ = 0;

-

-      /* Reshow the Windows mouse cursor if we are being deactivated */

-      if (g_fSoftwareCursor && LOWORD(wParam) == WA_INACTIVE

-	  && !g_fCursor)

-	{

-	  /* Show Windows cursor */

-	  g_fCursor = TRUE;

-	  ShowCursor (TRUE);

-	}

-      return 0;

-

-    case WM_ACTIVATEAPP:

-      if (s_pScreenPriv == NULL

-	  || s_pScreenInfo->fIgnoreInput)

-	break;

-

-#if CYGDEBUG || TRUE

-      winDebug ("winWindowProc - WM_ACTIVATEAPP\n");

-#endif

-

-      /* Activate or deactivate */

-      s_pScreenPriv->fActive = wParam;

-

-      /* Reshow the Windows mouse cursor if we are being deactivated */

-      if (g_fSoftwareCursor && !s_pScreenPriv->fActive

-	  && !g_fCursor)

-	{

-	  /* Show Windows cursor */

-	  g_fCursor = TRUE;

-	  ShowCursor (TRUE);

-	}

-

-#ifdef XWIN_CLIPBOARD

-      /* Make sure the clipboard chain is ok. */

-      winFixClipboardChain ();

-#endif

-

-      /* Call engine specific screen activation/deactivation function */

-      (*s_pScreenPriv->pwinActivateApp) (s_pScreen);

-

-#ifdef XWIN_MULTIWINDOWEXTWM

-      if (s_pScreenPriv->fActive)

-	{

-	  /* Restack all window unless using built-in wm. */

-	  if (s_pScreenInfo->fInternalWM && s_pScreenInfo->fAnotherWMRunning)

-	    winMWExtWMRestackWindows (s_pScreen);

-	}

-#endif

-

-      return 0;

-

-    case WM_COMMAND:

-      switch (LOWORD (wParam))

-	{

-	case ID_APP_EXIT:

-	  /* Display Exit dialog */

-	  winDisplayExitDialog (s_pScreenPriv);

-	  return 0;

-

-#ifdef XWIN_MULTIWINDOW

-	case ID_APP_HIDE_ROOT:

-	  if (s_pScreenPriv->fRootWindowShown)

-	    ShowWindow (s_pScreenPriv->hwndScreen, SW_HIDE);

-	  else

-	    ShowWindow (s_pScreenPriv->hwndScreen, SW_SHOW);

-	  s_pScreenPriv->fRootWindowShown = !s_pScreenPriv->fRootWindowShown;

-	  return 0;

-#endif

-

-	case ID_APP_ABOUT:

-	  /* Display the About box */

-	  winDisplayAboutDialog (s_pScreenPriv);

-	  return 0;

-

-	default:

-	  /* It's probably one of the custom menus... */

-	  if (HandleCustomWM_COMMAND (0, LOWORD (wParam)))

-	    return 0;

-	}

-      break;

-

-    case WM_ENDSESSION:

-    case WM_GIVEUP:

-      /* Tell X that we are giving up */

-#ifdef XWIN_MULTIWINDOW

-      if (s_pScreenInfo->fMultiWindow)

-	winDeinitMultiWindowWM ();

-#endif

-      GiveUp (0);

-      return 0;

-

-    case WM_CLOSE:

-      /* Display Exit dialog */

-      winDisplayExitDialog (s_pScreenPriv);

-      return 0;

-

-    case WM_SETCURSOR:

-      if (LOWORD(lParam) == HTCLIENT)

-	{

-	  if (!g_fSoftwareCursor) SetCursor (s_pScreenPriv->cursor.handle);

-	  return TRUE;

-	}

-      break;

-

-#ifdef XWIN_MULTIWINDOWEXTWM

-    case WM_MANAGE:

-      ErrorF ("winWindowProc - WM_MANAGE\n");

-      s_pScreenInfo->fAnotherWMRunning = FALSE;

-

-      if (s_pScreenInfo->fInternalWM)

-	{

-	  EnumThreadWindows (g_dwCurrentThreadID, winMWExtWMDecorateWindow, 0);

-	  //RootlessRepositionWindows (s_pScreen);

-	}

-      break;

-

-    case WM_UNMANAGE:

-      ErrorF ("winWindowProc - WM_UNMANAGE\n");

-      s_pScreenInfo->fAnotherWMRunning = TRUE;

-

-      if (s_pScreenInfo->fInternalWM)

-	{

-	  EnumThreadWindows (g_dwCurrentThreadID, winMWExtWMDecorateWindow, 0);

-	  winMWExtWMRestackWindows (s_pScreen);

-	}

-      break;

-#endif

-

-    default:

-      if(message == s_uTaskbarRestart)

-	{

-	  winInitNotifyIcon (s_pScreenPriv);

-	}

-      break;

-    }

-

-  return DefWindowProc (hwnd, message, wParam, lParam);

-}

+/*
+ *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
+ *		MATSUZAKI Kensuke
+ */
+
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
+#include "win.h"
+#include <commctrl.h>
+#include "winprefs.h"
+#include "winconfig.h"
+#include "winmsg.h"
+#include "winmonitors.h"
+#include "inputstr.h"
+
+/*
+ * Global variables
+ */
+
+Bool				g_fCursor = TRUE;
+Bool				g_fButton[3] = { FALSE, FALSE, FALSE };
+
+
+/*
+ * Called by winWakeupHandler
+ * Processes current Windows message
+ */
+
+LRESULT CALLBACK
+winWindowProc (HWND hwnd, UINT message, 
+	       WPARAM wParam, LPARAM lParam)
+{
+  static winPrivScreenPtr	s_pScreenPriv = NULL;
+  static winScreenInfo		*s_pScreenInfo = NULL;
+  static ScreenPtr		s_pScreen = NULL;
+  static HWND			s_hwndLastPrivates = NULL;
+  static HINSTANCE		s_hInstance;
+  static Bool			s_fTracking = FALSE;
+  static unsigned long		s_ulServerGeneration = 0;
+  static UINT			s_uTaskbarRestart = 0;
+  int				iScanCode;
+  int				i;
+
+#if CYGDEBUG
+  winDebugWin32Message("winWindowProc", hwnd, message, wParam, lParam);
+#endif
+  
+  /* Watch for server regeneration */
+  if (g_ulServerGeneration != s_ulServerGeneration)
+    {
+      /* Store new server generation */
+      s_ulServerGeneration = g_ulServerGeneration;
+    }
+
+  /* Only retrieve new privates pointers if window handle is null or changed */
+  if ((s_pScreenPriv == NULL || hwnd != s_hwndLastPrivates)
+      && (s_pScreenPriv = GetProp (hwnd, WIN_SCR_PROP)) != NULL)
+    {
+#if CYGDEBUG
+      winDebug ("winWindowProc - Setting privates handle\n");
+#endif
+      s_pScreenInfo = s_pScreenPriv->pScreenInfo;
+      s_pScreen = s_pScreenInfo->pScreen;
+      s_hwndLastPrivates = hwnd;
+    }
+  else if (s_pScreenPriv == NULL)
+    {
+      /* For safety, handle case that should never happen */
+      s_pScreenInfo = NULL;
+      s_pScreen = NULL;
+      s_hwndLastPrivates = NULL;
+    }
+
+  /* Branch on message type */
+  switch (message)
+    {
+    case WM_TRAYICON:
+      return winHandleIconMessage (hwnd, message, wParam, lParam,
+				   s_pScreenPriv);
+
+    case WM_CREATE:
+#if CYGDEBUG
+      winDebug ("winWindowProc - WM_CREATE\n");
+#endif
+      
+      /*
+       * Add a property to our display window that references
+       * this screens' privates.
+       *
+       * This allows the window procedure to refer to the
+       * appropriate window DC and shadow DC for the window that
+       * it is processing.  We use this to repaint exposed
+       * areas of our display window.
+       */
+      s_pScreenPriv = ((LPCREATESTRUCT) lParam)->lpCreateParams;
+      s_hInstance = ((LPCREATESTRUCT) lParam)->hInstance;
+      s_pScreenInfo = s_pScreenPriv->pScreenInfo;
+      s_pScreen = s_pScreenInfo->pScreen;
+      s_hwndLastPrivates = hwnd;
+      s_uTaskbarRestart = RegisterWindowMessage(TEXT("TaskbarCreated"));
+      SetProp (hwnd, WIN_SCR_PROP, s_pScreenPriv);
+
+      /* Setup tray icon */
+      if (!s_pScreenInfo->fNoTrayIcon)
+	{
+	  /*
+	   * NOTE: The WM_CREATE message is processed before CreateWindowEx
+	   * returns, so s_pScreenPriv->hwndScreen is invalid at this point.
+	   * We go ahead and copy our hwnd parameter over top of the screen
+	   * privates hwndScreen so that we have a valid value for
+	   * that member.  Otherwise, the tray icon will disappear
+	   * the first time you move the mouse over top of it.
+	   */
+	  
+	  s_pScreenPriv->hwndScreen = hwnd;
+
+	  winInitNotifyIcon (s_pScreenPriv);
+	}
+      return 0;
+
+    case WM_DISPLAYCHANGE:
+      /*
+        WM_DISPLAYCHANGE seems to be sent when the monitor layout or
+        any monitor's resolution or depth changes, but it's lParam and
+        wParam always indicate the resolution and bpp for the primary
+        monitor (so ignore that as we could be on any monitor...)
+       */
+
+      /* We cannot handle a display mode change during initialization */
+      if (s_pScreenInfo == NULL)
+	FatalError ("winWindowProc - WM_DISPLAYCHANGE - The display "
+		    "mode changed while we were intializing.  This is "
+		    "very bad and unexpected.  Exiting.\n");
+
+      /*
+       * We do not care about display changes with
+       * fullscreen DirectDraw engines, because those engines set
+       * their own mode when they become active.
+       */
+      if (s_pScreenInfo->fFullScreen
+	  && (s_pScreenInfo->dwEngine == WIN_SERVER_SHADOW_DD
+	      || s_pScreenInfo->dwEngine == WIN_SERVER_SHADOW_DDNL
+#ifdef XWIN_PRIMARYFB
+	      || s_pScreenInfo->dwEngine == WIN_SERVER_PRIMARY_DD
+#endif
+	      ))
+	{
+	  break;
+	}
+
+      ErrorF ("winWindowProc - WM_DISPLAYCHANGE - new width: %d "
+	      "new height: %d new bpp: %d\n",
+	      LOWORD (lParam), HIWORD (lParam), wParam);
+
+      /*
+       * Check for a disruptive change in depth.
+       * We can only display a message for a disruptive depth change,
+       * we cannot do anything to correct the situation.
+       */
+      /*
+        XXX: maybe we need to check if GetSystemMetrics(SM_SAMEDISPLAYFORMAT)
+        has changed as well...
+      */
+      if (s_pScreenInfo->dwBPP != GetDeviceCaps (s_pScreenPriv->hdcScreen, BITSPIXEL))
+        {
+          if ((s_pScreenInfo->dwEngine == WIN_SERVER_SHADOW_DD
+               || s_pScreenInfo->dwEngine == WIN_SERVER_SHADOW_DDNL
+#ifdef XWIN_PRIMARYFB
+               || s_pScreenInfo->dwEngine == WIN_SERVER_PRIMARY_DD
+#endif
+               ))
+            {
+              /* Cannot display the visual until the depth is restored */
+              ErrorF ("winWindowProc - Disruptive change in depth\n");
+
+              /* Display depth change dialog */
+              winDisplayDepthChangeDialog (s_pScreenPriv);
+
+              /* Flag that we have an invalid screen depth */
+              s_pScreenPriv->fBadDepth = TRUE;
+
+              /* Minimize the display window */
+              ShowWindow (hwnd, SW_MINIMIZE);
+            }
+          else
+            {
+              /* For GDI, performance may suffer until original depth is restored */
+              ErrorF ("winWindowProc - Performance may be non-optimal after change in depth\n");
+            }
+        }
+      else
+        {
+          /* Flag that we have a valid screen depth */
+          s_pScreenPriv->fBadDepth = FALSE;
+        }
+
+      /*
+        If we could cheaply check if this WM_DISPLAYCHANGE change
+        affects the monitor(s) which this X screen is displayed on
+        then we should do so here.  For the moment, assume it does.
+        (this is probably usually the case so that might be an
+        overoptimization)
+      */
+	{
+	  /*
+             In rootless modes which are monitor or virtual desktop size
+             use RandR to resize the X screen
+          */
+          if ((!s_pScreenInfo->fUserGaveHeightAndWidth) &&
+              (s_pScreenInfo->iResizeMode == resizeWithRandr) &&
+              (FALSE
+#ifdef XWIN_MULTIWINDOWEXTWM
+               || s_pScreenInfo->fMWExtWM
+#endif
+               || s_pScreenInfo->fRootless
+#ifdef XWIN_MULTIWINDOW
+               || s_pScreenInfo->fMultiWindow
+#endif
+               ))
+	    {
+              DWORD dwWidth, dwHeight;
+
+              if (s_pScreenInfo->fMultipleMonitors)
+                {
+                  /* resize to new virtual desktop size */
+                  dwWidth = GetSystemMetrics(SM_CXVIRTUALSCREEN);
+                  dwHeight = GetSystemMetrics(SM_CYVIRTUALSCREEN);
+                }
+              else
+                {
+                  /* resize to new size of specified monitor */
+                  struct GetMonitorInfoData data;
+                  if (QueryMonitor(s_pScreenInfo->iMonitor, &data))
+                    {
+                      if (data.bMonitorSpecifiedExists == TRUE)
+                        {
+                          dwWidth = data.monitorWidth;
+                          dwHeight = data.monitorHeight;
+                          /*
+                             XXX: monitor may have changed position,
+                             so we might need to update xinerama data
+                          */
+                        }
+                      else
+                        {
+                          ErrorF ("Monitor number %d no longer exists!\n", s_pScreenInfo->iMonitor);
+                        }
+                    }
+                }
+
+              /*
+                XXX: probably a small bug here: we don't compute the work area
+                and allow for task bar
+
+                XXX: generally, we don't allow for the task bar being moved after
+                the server is started
+               */
+
+              /* Set screen size to match new size, if it is different to current */
+              if ((s_pScreenInfo->dwWidth != dwWidth) ||
+                  (s_pScreenInfo->dwHeight != dwHeight))
+                {
+                  winDoRandRScreenSetSize(s_pScreen,
+                                          dwWidth,
+                                          dwHeight,
+                                          (dwWidth * 25.4) / monitorResolution,
+                                          (dwHeight * 25.4) / monitorResolution);
+                }
+	    }
+          else
+            {
+              /*
+               * We can simply recreate the same-sized primary surface when
+               * the display dimensions change.
+               */
+
+              /*
+               * NOTE: The non-DirectDraw engines set the ReleasePrimarySurface
+               * and CreatePrimarySurface function pointers to point
+               * to the no operation function, NoopDDA.  This allows us
+               * to blindly call these functions, even if they are not
+               * relevant to the current engine (e.g., Shadow GDI).
+               */
+
+              winDebug ("winWindowProc - WM_DISPLAYCHANGE - Releasing and recreating primary surface\n");
+
+              /* Release the old primary surface */
+              (*s_pScreenPriv->pwinReleasePrimarySurface) (s_pScreen);
+
+              /* Create the new primary surface */
+              (*s_pScreenPriv->pwinCreatePrimarySurface) (s_pScreen);
+            }
+	}
+
+      break;
+
+    case WM_SIZE:
+      {
+	SCROLLINFO		si;
+	RECT			rcWindow;
+	int			iWidth, iHeight;
+
+#if CYGDEBUG
+	winDebug ("winWindowProc - WM_SIZE\n");
+#endif
+
+	/* Break if we do not allow resizing */
+	if ((s_pScreenInfo->iResizeMode == notAllowed)
+	    || !s_pScreenInfo->fDecoration
+#ifdef XWIN_MULTIWINDOWEXTWM
+	    || s_pScreenInfo->fMWExtWM
+#endif
+	    || s_pScreenInfo->fRootless
+#ifdef XWIN_MULTIWINDOW
+	    || s_pScreenInfo->fMultiWindow
+#endif
+	    || s_pScreenInfo->fFullScreen)
+	  break;
+
+	/* No need to resize if we get minimized */
+	if (wParam == SIZE_MINIMIZED)
+	  return 0;
+
+        ErrorF ("winWindowProc - WM_SIZE - new client area w: %d h: %d\n",
+                LOWORD (lParam), HIWORD (lParam));
+
+        if (s_pScreenInfo->iResizeMode == resizeWithRandr)
+          {
+            /* Actual resizing is done on WM_EXITSIZEMOVE */
+            return 0;
+          }
+
+        /* Otherwise iResizeMode == resizeWithScrollbars */
+
+	/*
+	 * Get the size of the whole window, including client area,
+	 * scrollbars, and non-client area decorations (caption, borders).
+	 * We do this because we need to check if the client area
+	 * without scrollbars is large enough to display the whole visual.
+	 * The new client area size passed by lParam already subtracts
+	 * the size of the scrollbars if they are currently displayed.
+	 * So checking is LOWORD(lParam) == visual_width and
+	 * HIWORD(lParam) == visual_height will never tell us to hide
+	 * the scrollbars because the client area would always be too small.
+	 * GetClientRect returns the same sizes given by lParam, so we
+	 * cannot use GetClientRect either.
+	 */
+	GetWindowRect (hwnd, &rcWindow);
+	iWidth = rcWindow.right - rcWindow.left;
+	iHeight = rcWindow.bottom - rcWindow.top;
+
+	/* Subtract the frame size from the window size. */
+	iWidth -= 2 * GetSystemMetrics (SM_CXSIZEFRAME);
+	iHeight -= (2 * GetSystemMetrics (SM_CYSIZEFRAME)
+		    + GetSystemMetrics (SM_CYCAPTION));
+
+	/*
+	 * Update scrollbar page sizes.
+	 * NOTE: If page size == range, then the scrollbar is
+	 * automatically hidden.
+	 */
+
+	/* Is the naked client area large enough to show the whole visual? */
+	if (iWidth < s_pScreenInfo->dwWidth
+	    || iHeight < s_pScreenInfo->dwHeight)
+	  {
+	    /* Client area too small to display visual, use scrollbars */
+	    iWidth -= GetSystemMetrics (SM_CXVSCROLL);
+	    iHeight -= GetSystemMetrics (SM_CYHSCROLL);
+	  }
+	
+	/* Set the horizontal scrollbar page size */
+	si.cbSize = sizeof (si);
+	si.fMask = SIF_PAGE | SIF_RANGE;
+	si.nMin = 0;
+	si.nMax = s_pScreenInfo->dwWidth - 1;
+	si.nPage = iWidth;
+	SetScrollInfo (hwnd, SB_HORZ, &si, TRUE);
+	
+	/* Set the vertical scrollbar page size */
+	si.cbSize = sizeof (si);
+	si.fMask = SIF_PAGE | SIF_RANGE;
+	si.nMin = 0;
+	si.nMax = s_pScreenInfo->dwHeight - 1;
+	si.nPage = iHeight;
+	SetScrollInfo (hwnd, SB_VERT, &si, TRUE);
+
+	/*
+	 * NOTE: Scrollbars may have moved if they were at the 
+	 * far right/bottom, so we query their current position.
+	 */
+	
+	/* Get the horizontal scrollbar position and set the offset */
+	si.cbSize = sizeof (si);
+	si.fMask = SIF_POS;
+	GetScrollInfo (hwnd, SB_HORZ, &si);
+	s_pScreenInfo->dwXOffset = -si.nPos;
+	
+	/* Get the vertical scrollbar position and set the offset */
+	si.cbSize = sizeof (si);
+	si.fMask = SIF_POS;
+	GetScrollInfo (hwnd, SB_VERT, &si);
+	s_pScreenInfo->dwYOffset = -si.nPos;
+      }
+      return 0;
+
+    case WM_ENTERSIZEMOVE:
+      ErrorF("winWindowProc - WM_ENTERSIZEMOVE\n");
+      break;
+
+    case WM_EXITSIZEMOVE:
+      ErrorF("winWindowProc - WM_EXITSIZEMOVE\n");
+
+      if (s_pScreenInfo->iResizeMode == resizeWithRandr)
+        {
+          /* Set screen size to match new client area, if it is different to current */
+          RECT rcClient;
+          DWORD dwWidth, dwHeight;
+
+          GetClientRect (hwnd, &rcClient);
+          dwWidth = rcClient.right - rcClient.left;
+          dwHeight = rcClient.bottom - rcClient.top;
+
+          if ((s_pScreenInfo->dwWidth != dwWidth) ||
+              (s_pScreenInfo->dwHeight != dwHeight))
+            {
+              /* mm = dots * (25.4 mm / inch) / (dots / inch) */
+              winDoRandRScreenSetSize(s_pScreen,
+                                      dwWidth,
+                                      dwHeight,
+                                      (dwWidth * 25.4) / monitorResolution,
+                                      (dwHeight * 25.4) / monitorResolution);
+            }
+        }
+
+      break;
+
+    case WM_VSCROLL:
+      {
+	SCROLLINFO		si;
+	int			iVertPos;
+
+#if CYGDEBUG
+	winDebug ("winWindowProc - WM_VSCROLL\n");
+#endif
+      
+	/* Get vertical scroll bar info */
+	si.cbSize = sizeof (si);
+	si.fMask = SIF_ALL;
+	GetScrollInfo (hwnd, SB_VERT, &si);
+
+	/* Save the vertical position for comparison later */
+	iVertPos = si.nPos;
+
+	/*
+	 * Don't forget:
+	 * moving the scrollbar to the DOWN, scroll the content UP
+	 */
+	switch (LOWORD(wParam))
+	  {
+	  case SB_TOP:
+	    si.nPos = si.nMin;
+	    break;
+	  
+	  case SB_BOTTOM:
+	    si.nPos = si.nMax - si.nPage + 1;
+	    break;
+
+	  case SB_LINEUP:
+	    si.nPos -= 1;
+	    break;
+	  
+	  case SB_LINEDOWN:
+	    si.nPos += 1;
+	    break;
+	  
+	  case SB_PAGEUP:
+	    si.nPos -= si.nPage;
+	    break;
+	  
+	  case SB_PAGEDOWN:
+	    si.nPos += si.nPage;
+	    break;
+
+	  case SB_THUMBTRACK:
+	    si.nPos = si.nTrackPos;
+	    break;
+
+	  default:
+	    break;
+	  }
+
+	/*
+	 * We retrieve the position after setting it,
+	 * because Windows may adjust it.
+	 */
+	si.fMask = SIF_POS;
+	SetScrollInfo (hwnd, SB_VERT, &si, TRUE);
+	GetScrollInfo (hwnd, SB_VERT, &si);
+      
+	/* Scroll the window if the position has changed */
+	if (si.nPos != iVertPos)
+	  {
+	    /* Save the new offset for bit block transfers, etc. */
+	    s_pScreenInfo->dwYOffset = -si.nPos;
+
+	    /* Change displayed region in the window */
+	    ScrollWindowEx (hwnd,
+			    0,
+			    iVertPos - si.nPos,
+			    NULL,
+			    NULL,
+			    NULL,
+			    NULL,
+			    SW_INVALIDATE);
+	  
+	    /* Redraw the window contents */
+	    UpdateWindow (hwnd);
+	  }
+      }
+      return 0;
+
+    case WM_HSCROLL:
+      {
+	SCROLLINFO		si;
+	int			iHorzPos;
+
+#if CYGDEBUG
+	winDebug ("winWindowProc - WM_HSCROLL\n");
+#endif
+      
+	/* Get horizontal scroll bar info */
+	si.cbSize = sizeof (si);
+	si.fMask = SIF_ALL;
+	GetScrollInfo (hwnd, SB_HORZ, &si);
+
+	/* Save the horizontal position for comparison later */
+	iHorzPos = si.nPos;
+
+	/*
+	 * Don't forget:
+	 * moving the scrollbar to the RIGHT, scroll the content LEFT
+	 */
+	switch (LOWORD(wParam))
+	  {
+	  case SB_LEFT:
+	    si.nPos = si.nMin;
+	    break;
+	  
+	  case SB_RIGHT:
+	    si.nPos = si.nMax - si.nPage + 1;
+	    break;
+
+	  case SB_LINELEFT:
+	    si.nPos -= 1;
+	    break;
+	  
+	  case SB_LINERIGHT:
+	    si.nPos += 1;
+	    break;
+	  
+	  case SB_PAGELEFT:
+	    si.nPos -= si.nPage;
+	    break;
+	  
+	  case SB_PAGERIGHT:
+	    si.nPos += si.nPage;
+	    break;
+
+	  case SB_THUMBTRACK:
+	    si.nPos = si.nTrackPos;
+	    break;
+
+	  default:
+	    break;
+	  }
+
+	/*
+	 * We retrieve the position after setting it,
+	 * because Windows may adjust it.
+	 */
+	si.fMask = SIF_POS;
+	SetScrollInfo (hwnd, SB_HORZ, &si, TRUE);
+	GetScrollInfo (hwnd, SB_HORZ, &si);
+      
+	/* Scroll the window if the position has changed */
+	if (si.nPos != iHorzPos)
+	  {
+	    /* Save the new offset for bit block transfers, etc. */
+	    s_pScreenInfo->dwXOffset = -si.nPos;
+
+	    /* Change displayed region in the window */
+	    ScrollWindowEx (hwnd,
+			    iHorzPos - si.nPos,
+			    0,
+			    NULL,
+			    NULL,
+			    NULL,
+			    NULL,
+			    SW_INVALIDATE);
+	  
+	    /* Redraw the window contents */
+	    UpdateWindow (hwnd);
+	  }
+      }
+      return 0;
+
+    case WM_GETMINMAXINFO:
+      {
+	MINMAXINFO		*pMinMaxInfo = (MINMAXINFO *) lParam;
+	int			iCaptionHeight;
+	int			iBorderHeight, iBorderWidth;
+
+#if CYGDEBUG	
+	winDebug ("winWindowProc - WM_GETMINMAXINFO - pScreenInfo: %08x\n",
+		s_pScreenInfo);
+#endif
+
+	/* Can't do anything without screen info */
+	if (s_pScreenInfo == NULL
+	    || (s_pScreenInfo->iResizeMode != resizeWithScrollbars)
+	    || s_pScreenInfo->fFullScreen
+	    || !s_pScreenInfo->fDecoration
+#ifdef XWIN_MULTIWINDOWEXTWM
+	    || s_pScreenInfo->fMWExtWM
+#endif
+	    || s_pScreenInfo->fRootless
+#ifdef XWIN_MULTIWINDOW
+	    || s_pScreenInfo->fMultiWindow
+#endif
+	    )
+	  break;
+
+	/*
+	 * Here we can override the maximum tracking size, which
+	 * is the largest size that can be assigned to our window
+	 * via the sizing border.
+	 */
+
+	/*
+	 * FIXME: Do we only need to do this once, since our visual size
+	 * does not change?  Does Windows store this value statically
+	 * once we have set it once?
+	 */
+
+	/* Get the border and caption sizes */
+	iCaptionHeight = GetSystemMetrics (SM_CYCAPTION);
+	iBorderWidth = 2 * GetSystemMetrics (SM_CXSIZEFRAME);
+	iBorderHeight = 2 * GetSystemMetrics (SM_CYSIZEFRAME);
+	
+	/* Allow the full visual to be displayed */
+	pMinMaxInfo->ptMaxTrackSize.x
+	  = s_pScreenInfo->dwWidth + iBorderWidth;
+	pMinMaxInfo->ptMaxTrackSize.y
+	  = s_pScreenInfo->dwHeight + iBorderHeight + iCaptionHeight;
+      }
+      return 0;
+
+    case WM_ERASEBKGND:
+#if CYGDEBUG
+      winDebug ("winWindowProc - WM_ERASEBKGND\n");
+#endif
+      /*
+       * Pretend that we did erase the background but we don't care,
+       * the application uses the full window estate. This avoids some
+       * flickering when resizing.
+       */
+      return TRUE;
+
+    case WM_PAINT:
+#if CYGDEBUG
+      winDebug ("winWindowProc - WM_PAINT\n");
+#endif
+      /* Only paint if we have privates and the server is enabled */
+      if (s_pScreenPriv == NULL
+	  || !s_pScreenPriv->fEnabled
+	  || (s_pScreenInfo->fFullScreen && !s_pScreenPriv->fActive)
+	  || s_pScreenPriv->fBadDepth)
+	{
+	  /* We don't want to paint */
+	  break;
+	}
+
+      /* Break out here if we don't have a valid paint routine */
+      if (s_pScreenPriv->pwinBltExposedRegions == NULL)
+	break;
+      
+      /* Call the engine dependent repainter */
+      (*s_pScreenPriv->pwinBltExposedRegions) (s_pScreen);
+      return 0;
+
+    case WM_PALETTECHANGED:
+      {
+#if CYGDEBUG
+	winDebug ("winWindowProc - WM_PALETTECHANGED\n");
+#endif
+	/*
+	 * Don't process if we don't have privates or a colormap,
+	 * or if we have an invalid depth.
+	 */
+	if (s_pScreenPriv == NULL
+	    || s_pScreenPriv->pcmapInstalled == NULL
+	    || s_pScreenPriv->fBadDepth)
+	  break;
+
+	/* Return if we caused the palette to change */
+	if ((HWND) wParam == hwnd)
+	  {
+	    /* Redraw the screen */
+	    (*s_pScreenPriv->pwinRedrawScreen) (s_pScreen);
+	    return 0;
+	  }
+	
+	/* Reinstall the windows palette */
+	(*s_pScreenPriv->pwinRealizeInstalledPalette) (s_pScreen);
+	
+	/* Redraw the screen */
+	(*s_pScreenPriv->pwinRedrawScreen) (s_pScreen);
+	return 0;
+      }
+
+    case WM_MOUSEMOVE:
+      /* We can't do anything without privates */
+      if (s_pScreenPriv == NULL || s_pScreenInfo->fIgnoreInput)
+	break;
+
+      /* We can't do anything without g_pwinPointer */
+      if (g_pwinPointer == NULL)
+        break;
+
+      /* Has the mouse pointer crossed screens? */
+      if (s_pScreen != miPointerGetScreen(g_pwinPointer))
+	miPointerSetScreen (g_pwinPointer, s_pScreenInfo->dwScreen,
+			       GET_X_LPARAM(lParam)-s_pScreenInfo->dwXOffset,
+			       GET_Y_LPARAM(lParam)-s_pScreenInfo->dwYOffset);
+
+      /* Are we tracking yet? */
+      if (!s_fTracking)
+	{
+	  TRACKMOUSEEVENT		tme;
+	  
+	  /* Setup data structure */
+	  ZeroMemory (&tme, sizeof (tme));
+	  tme.cbSize = sizeof (tme);
+	  tme.dwFlags = TME_LEAVE;
+	  tme.hwndTrack = hwnd;
+
+	  /* Call the tracking function */
+	  if (!(*g_fpTrackMouseEvent) (&tme))
+	    ErrorF ("winWindowProc - _TrackMouseEvent failed\n");
+
+	  /* Flag that we are tracking now */
+	  s_fTracking = TRUE;
+	}
+
+      /* Hide or show the Windows mouse cursor */
+      if (g_fSoftwareCursor && g_fCursor && (s_pScreenPriv->fActive || s_pScreenInfo->fLessPointer))
+	{
+	  /* Hide Windows cursor */
+	  g_fCursor = FALSE;
+	  ShowCursor (FALSE);
+	}
+      else if (g_fSoftwareCursor && !g_fCursor && !s_pScreenPriv->fActive
+	       && !s_pScreenInfo->fLessPointer)
+	{
+	  /* Show Windows cursor */
+	  g_fCursor = TRUE;
+	  ShowCursor (TRUE);
+	}
+      
+      /* Deliver absolute cursor position to X Server */
+      winEnqueueMotion(GET_X_LPARAM(lParam)-s_pScreenInfo->dwXOffset,
+		       GET_Y_LPARAM(lParam)-s_pScreenInfo->dwYOffset);
+      return 0;
+
+    case WM_NCMOUSEMOVE:
+      /*
+       * We break instead of returning 0 since we need to call
+       * DefWindowProc to get the mouse cursor changes
+       * and min/max/close button highlighting in Windows XP.
+       * The Platform SDK says that you should return 0 if you
+       * process this message, but it fails to mention that you
+       * will give up any default functionality if you do return 0.
+       */
+      
+      /* We can't do anything without privates */
+      if (s_pScreenPriv == NULL || s_pScreenInfo->fIgnoreInput)
+	break;
+      
+      /* Non-client mouse movement, show Windows cursor */
+      if (g_fSoftwareCursor && !g_fCursor)
+	{
+	  g_fCursor = TRUE;
+	  ShowCursor (TRUE);
+	}
+      break;
+
+    case WM_MOUSELEAVE:
+      /* Mouse has left our client area */
+
+      /* Flag that we are no longer tracking */
+      s_fTracking = FALSE;
+
+      /* Show the mouse cursor, if necessary */
+      if (g_fSoftwareCursor && !g_fCursor)
+	{
+	  g_fCursor = TRUE;
+	  ShowCursor (TRUE);
+	}
+      return 0;
+
+    case WM_LBUTTONDBLCLK:
+    case WM_LBUTTONDOWN:
+      if (s_pScreenPriv == NULL || s_pScreenInfo->fIgnoreInput)
+	break;
+      if (s_pScreenInfo->fRootless
+#ifdef XWIN_MULTIWINDOWEXTWM
+	  || s_pScreenInfo->fMWExtWM
+#endif
+	  )
+	SetCapture (hwnd);
+      return winMouseButtonsHandle (s_pScreen, ButtonPress, Button1, wParam);
+      
+    case WM_LBUTTONUP:
+      if (s_pScreenPriv == NULL || s_pScreenInfo->fIgnoreInput)
+	break;
+      if (s_pScreenInfo->fRootless
+#ifdef XWIN_MULTIWINDOWEXTWM
+	  || s_pScreenInfo->fMWExtWM
+#endif
+	  )
+	ReleaseCapture ();
+      return winMouseButtonsHandle (s_pScreen, ButtonRelease, Button1, wParam);
+
+    case WM_MBUTTONDBLCLK:
+    case WM_MBUTTONDOWN:
+      if (s_pScreenPriv == NULL || s_pScreenInfo->fIgnoreInput)
+	break;
+      if (s_pScreenInfo->fRootless
+#ifdef XWIN_MULTIWINDOWEXTWM
+	  || s_pScreenInfo->fMWExtWM
+#endif
+	  )
+	SetCapture (hwnd);
+      return winMouseButtonsHandle (s_pScreen, ButtonPress, Button2, wParam);
+      
+    case WM_MBUTTONUP:
+      if (s_pScreenPriv == NULL || s_pScreenInfo->fIgnoreInput)
+	break;
+      if (s_pScreenInfo->fRootless
+#ifdef XWIN_MULTIWINDOWEXTWM
+	  || s_pScreenInfo->fMWExtWM
+#endif
+	  )
+	ReleaseCapture ();
+      return winMouseButtonsHandle (s_pScreen, ButtonRelease, Button2, wParam);
+      
+    case WM_RBUTTONDBLCLK:
+    case WM_RBUTTONDOWN:
+      if (s_pScreenPriv == NULL || s_pScreenInfo->fIgnoreInput)
+	break;
+      if (s_pScreenInfo->fRootless
+#ifdef XWIN_MULTIWINDOWEXTWM
+	  || s_pScreenInfo->fMWExtWM
+#endif
+	  )
+	SetCapture (hwnd);
+      return winMouseButtonsHandle (s_pScreen, ButtonPress, Button3, wParam);
+      
+    case WM_RBUTTONUP:
+      if (s_pScreenPriv == NULL || s_pScreenInfo->fIgnoreInput)
+	break;
+      if (s_pScreenInfo->fRootless
+#ifdef XWIN_MULTIWINDOWEXTWM
+	  || s_pScreenInfo->fMWExtWM
+#endif
+	  )
+	ReleaseCapture ();
+      return winMouseButtonsHandle (s_pScreen, ButtonRelease, Button3, wParam);
+
+    case WM_XBUTTONDBLCLK:
+    case WM_XBUTTONDOWN:
+      if (s_pScreenPriv == NULL || s_pScreenInfo->fIgnoreInput)
+	break;
+      if (s_pScreenInfo->fRootless
+#ifdef XWIN_MULTIWINDOWEXTWM
+	  || s_pScreenInfo->fMWExtWM
+#endif
+	  )
+	SetCapture (hwnd);
+      return winMouseButtonsHandle (s_pScreen, ButtonPress, HIWORD(wParam) + 5, wParam);
+    case WM_XBUTTONUP:
+      if (s_pScreenPriv == NULL || s_pScreenInfo->fIgnoreInput)
+	break;
+      if (s_pScreenInfo->fRootless
+#ifdef XWIN_MULTIWINDOWEXTWM
+	  || s_pScreenInfo->fMWExtWM
+#endif
+	  )
+	ReleaseCapture ();
+      return winMouseButtonsHandle (s_pScreen, ButtonRelease, HIWORD(wParam) + 5, wParam);
+
+    case WM_TIMER:
+      if (s_pScreenPriv == NULL || s_pScreenInfo->fIgnoreInput)
+	break;
+
+      /* Branch on the timer id */
+      switch (wParam)
+	{
+	case WIN_E3B_TIMER_ID:
+	  /* Send delayed button press */
+	  winMouseButtonsSendEvent (ButtonPress,
+				    s_pScreenPriv->iE3BCachedPress);
+
+	  /* Kill this timer */
+	  KillTimer (s_pScreenPriv->hwndScreen, WIN_E3B_TIMER_ID);
+
+	  /* Clear screen privates flags */
+	  s_pScreenPriv->iE3BCachedPress = 0;
+	  break;
+
+	case WIN_POLLING_MOUSE_TIMER_ID:
+	  {
+	    POINT		point;
+	    WPARAM		wL, wM, wR, wShift, wCtrl;
+	    LPARAM		lPos;
+	    
+	    /* Get the current position of the mouse cursor */
+	    GetCursorPos (&point);
+	    
+	    /* Map from screen (-X, -Y) to root (0, 0) */
+	    point.x -= GetSystemMetrics (SM_XVIRTUALSCREEN);
+	    point.y -= GetSystemMetrics (SM_YVIRTUALSCREEN);
+	    
+	    /* Deliver absolute cursor position to X Server */
+	    winEnqueueMotion(point.x , point.y);
+
+	    /* Check if a button was released but we didn't see it */
+	    GetCursorPos (&point);
+	    wL = (GetKeyState (VK_LBUTTON) & 0x8000)?MK_LBUTTON:0;
+	    wM = (GetKeyState (VK_MBUTTON) & 0x8000)?MK_MBUTTON:0;
+	    wR = (GetKeyState (VK_RBUTTON) & 0x8000)?MK_RBUTTON:0;
+	    wShift = (GetKeyState (VK_SHIFT) & 0x8000)?MK_SHIFT:0;
+	    wCtrl = (GetKeyState (VK_CONTROL) & 0x8000)?MK_CONTROL:0;
+	    lPos = MAKELPARAM(point.x, point.y);
+	    if (g_fButton[0] & !wL)
+	    PostMessage (hwnd, WM_LBUTTONUP, wCtrl|wM|wR|wShift, lPos);
+	    if (g_fButton[1] & !wM)
+	      PostMessage (hwnd, WM_MBUTTONUP, wCtrl|wL|wR|wShift, lPos);
+	    if (g_fButton[2] & !wR)
+	      PostMessage (hwnd, WM_RBUTTONUP, wCtrl|wL|wM|wShift, lPos);
+	  }
+	}
+      return 0;
+
+    case WM_CTLCOLORSCROLLBAR:
+      FatalError ("winWindowProc - WM_CTLCOLORSCROLLBAR - We are not "
+		  "supposed to get this message.  Exiting.\n");
+      return 0;
+
+    case WM_MOUSEWHEEL:
+      if (s_pScreenPriv == NULL || s_pScreenInfo->fIgnoreInput)
+	break;
+#if CYGDEBUG
+      winDebug ("winWindowProc - WM_MOUSEWHEEL\n");
+#endif
+      winMouseWheel (s_pScreen, GET_WHEEL_DELTA_WPARAM(wParam));
+      break;
+
+    case WM_SETFOCUS:
+      if (s_pScreenPriv == NULL || s_pScreenInfo->fIgnoreInput)
+	break;
+
+      /* Restore the state of all mode keys */
+      winRestoreModeKeyStates ();
+
+      /* Add the keyboard hook if possible */
+      if (g_fKeyboardHookLL)
+	g_fKeyboardHookLL = winInstallKeyboardHookLL ();
+      return 0;
+
+    case WM_KILLFOCUS:
+      if (s_pScreenPriv == NULL || s_pScreenInfo->fIgnoreInput)
+	break;
+
+      /* Release any pressed keys */
+      winKeybdReleaseKeys ();
+
+      /* Remove our keyboard hook if it is installed */
+      winRemoveKeyboardHookLL ();
+      return 0;
+
+    case WM_SYSKEYDOWN:
+    case WM_KEYDOWN:
+      if (s_pScreenPriv == NULL || s_pScreenInfo->fIgnoreInput)
+	break;
+
+      /*
+       * FIXME: Catching Alt-F4 like this is really terrible.  This should
+       * be generalized to handle other Windows keyboard signals.  Actually,
+       * the list keys to catch and the actions to perform when caught should
+       * be configurable; that way user's can customize the keys that they
+       * need to have passed through to their window manager or apps, or they
+       * can remap certain actions to new key codes that do not conflict
+       * with the X apps that they are using.  Yeah, that'll take awhile.
+       */
+      if ((s_pScreenInfo->fUseWinKillKey && wParam == VK_F4
+	   && (GetKeyState (VK_MENU) & 0x8000))
+	  || (s_pScreenInfo->fUseUnixKillKey && wParam == VK_BACK
+	      && (GetKeyState (VK_MENU) & 0x8000)
+	      && (GetKeyState (VK_CONTROL) & 0x8000)))
+	{
+	  /*
+	   * Better leave this message here, just in case some unsuspecting
+	   * user enters Alt + F4 and is surprised when the application
+	   * quits.
+	   */
+	  ErrorF ("winWindowProc - WM_*KEYDOWN - Closekey hit, quitting\n");
+	  
+	  /* Display Exit dialog */
+	  winDisplayExitDialog (s_pScreenPriv);
+	  return 0;
+	}
+      
+      /*
+       * Don't do anything for the Windows keys, as focus will soon
+       * be returned to Windows.  We may be able to trap the Windows keys,
+       * but we should determine if that is desirable before doing so.
+       */
+      if ((wParam == VK_LWIN || wParam == VK_RWIN) && !g_fKeyboardHookLL)
+	break;
+
+      /* 
+       * Discard presses generated from Windows auto-repeat
+       */
+      if (lParam & (1<<30))
+      {
+        switch (wParam)
+        {
+          /* ago: Pressing LControl while RControl is pressed is 
+           * Indicated as repeat. Fix this!
+           */
+          case VK_CONTROL:
+          case VK_SHIFT:
+            if (winCheckKeyPressed(wParam, lParam))
+              return 0;
+            break;
+          default:
+            return 0;
+        }
+      } 
+      
+      /* Discard fake Ctrl_L presses that precede AltGR on non-US keyboards */
+      if (winIsFakeCtrl_L (message, wParam, lParam))
+	return 0;
+      
+      /* Translate Windows key code to X scan code */
+      winTranslateKey (wParam, lParam, &iScanCode);
+
+      /* Ignore repeats for CapsLock */
+      if (wParam == VK_CAPITAL)
+	lParam = 1;
+
+      /* Send the key event(s) */
+      for (i = 0; i < LOWORD(lParam); ++i)
+	winSendKeyEvent (iScanCode, TRUE);
+      return 0;
+
+    case WM_SYSKEYUP:
+    case WM_KEYUP:
+      if (s_pScreenPriv == NULL || s_pScreenInfo->fIgnoreInput)
+	break;
+
+      /*
+       * Don't do anything for the Windows keys, as focus will soon
+       * be returned to Windows.  We may be able to trap the Windows keys,
+       * but we should determine if that is desirable before doing so.
+       */
+      if ((wParam == VK_LWIN || wParam == VK_RWIN) && !g_fKeyboardHookLL)
+	break;
+
+      /* Ignore the fake Ctrl_L that follows an AltGr release */
+      if (winIsFakeCtrl_L (message, wParam, lParam))
+	return 0;
+
+      /* Enqueue a keyup event */
+      winTranslateKey (wParam, lParam, &iScanCode);
+      winSendKeyEvent (iScanCode, FALSE);
+
+      /* Release all pressed shift keys */
+      if (wParam == VK_SHIFT) 
+        winFixShiftKeys (iScanCode);
+      return 0;
+
+    case WM_HOTKEY:
+      if (s_pScreenPriv == NULL)
+	break;
+
+      /* Call the engine-specific hot key handler */
+      (*s_pScreenPriv->pwinHotKeyAltTab) (s_pScreen);
+      return 0;
+
+    case WM_ACTIVATE:
+      if (s_pScreenPriv == NULL
+	  || s_pScreenInfo->fIgnoreInput)
+	break;
+
+      /* TODO: Override display of window when we have a bad depth */
+      if (LOWORD(wParam) != WA_INACTIVE && s_pScreenPriv->fBadDepth)
+	{
+	  ErrorF ("winWindowProc - WM_ACTIVATE - Bad depth, trying "
+		  "to override window activation\n");
+
+	  /* Minimize the window */
+	  ShowWindow (hwnd, SW_MINIMIZE);
+
+	  /* Display dialog box */
+	  if (g_hDlgDepthChange != NULL)
+	    {
+	      /* Make the existing dialog box active */
+	      SetActiveWindow (g_hDlgDepthChange);
+	    }
+	  else
+	    {
+	      /* TODO: Recreate the dialog box and bring to the top */
+	      ShowWindow (g_hDlgDepthChange, SW_SHOWDEFAULT);
+	    }
+
+	  /* Don't do any other processing of this message */
+	  return 0;
+	}
+
+#if CYGDEBUG
+      winDebug ("winWindowProc - WM_ACTIVATE\n");
+#endif
+
+      /*
+       * Focus is being changed to another window.
+       * The other window may or may not belong to
+       * our process.
+       */
+
+      /* Clear any lingering wheel delta */
+      s_pScreenPriv->iDeltaZ = 0;
+
+      /* Reshow the Windows mouse cursor if we are being deactivated */
+      if (g_fSoftwareCursor && LOWORD(wParam) == WA_INACTIVE
+	  && !g_fCursor)
+	{
+	  /* Show Windows cursor */
+	  g_fCursor = TRUE;
+	  ShowCursor (TRUE);
+	}
+      return 0;
+
+    case WM_ACTIVATEAPP:
+      if (s_pScreenPriv == NULL
+	  || s_pScreenInfo->fIgnoreInput)
+	break;
+
+#if CYGDEBUG || TRUE
+      winDebug ("winWindowProc - WM_ACTIVATEAPP\n");
+#endif
+
+      /* Activate or deactivate */
+      s_pScreenPriv->fActive = wParam;
+
+      /* Reshow the Windows mouse cursor if we are being deactivated */
+      if (g_fSoftwareCursor && !s_pScreenPriv->fActive
+	  && !g_fCursor)
+	{
+	  /* Show Windows cursor */
+	  g_fCursor = TRUE;
+	  ShowCursor (TRUE);
+	}
+
+#ifdef XWIN_CLIPBOARD
+      /* Make sure the clipboard chain is ok. */
+      winFixClipboardChain ();
+#endif
+
+      /* Call engine specific screen activation/deactivation function */
+      (*s_pScreenPriv->pwinActivateApp) (s_pScreen);
+
+#ifdef XWIN_MULTIWINDOWEXTWM
+      if (s_pScreenPriv->fActive)
+	{
+	  /* Restack all window unless using built-in wm. */
+	  if (s_pScreenInfo->fInternalWM && s_pScreenInfo->fAnotherWMRunning)
+	    winMWExtWMRestackWindows (s_pScreen);
+	}
+#endif
+
+      return 0;
+
+    case WM_COMMAND:
+      switch (LOWORD (wParam))
+	{
+	case ID_APP_EXIT:
+	  /* Display Exit dialog */
+	  winDisplayExitDialog (s_pScreenPriv);
+	  return 0;
+
+#ifdef XWIN_MULTIWINDOW
+	case ID_APP_HIDE_ROOT:
+	  if (s_pScreenPriv->fRootWindowShown)
+	    ShowWindow (s_pScreenPriv->hwndScreen, SW_HIDE);
+	  else
+	    ShowWindow (s_pScreenPriv->hwndScreen, SW_SHOW);
+	  s_pScreenPriv->fRootWindowShown = !s_pScreenPriv->fRootWindowShown;
+	  return 0;
+#endif
+
+	case ID_APP_ABOUT:
+	  /* Display the About box */
+	  winDisplayAboutDialog (s_pScreenPriv);
+	  return 0;
+
+	default:
+	  /* It's probably one of the custom menus... */
+	  if (HandleCustomWM_COMMAND (0, LOWORD (wParam)))
+	    return 0;
+	}
+      break;
+
+    case WM_ENDSESSION:
+    case WM_GIVEUP:
+      /* Tell X that we are giving up */
+#ifdef XWIN_MULTIWINDOW
+      if (s_pScreenInfo->fMultiWindow)
+	winDeinitMultiWindowWM ();
+#endif
+      GiveUp (0);
+      return 0;
+
+    case WM_CLOSE:
+      /* Display Exit dialog */
+      winDisplayExitDialog (s_pScreenPriv);
+      return 0;
+
+    case WM_SETCURSOR:
+      if (LOWORD(lParam) == HTCLIENT)
+	{
+	  if (!g_fSoftwareCursor) SetCursor (s_pScreenPriv->cursor.handle);
+	  return TRUE;
+	}
+      break;
+
+#ifdef XWIN_MULTIWINDOWEXTWM
+    case WM_MANAGE:
+      ErrorF ("winWindowProc - WM_MANAGE\n");
+      s_pScreenInfo->fAnotherWMRunning = FALSE;
+
+      if (s_pScreenInfo->fInternalWM)
+	{
+	  EnumThreadWindows (g_dwCurrentThreadID, winMWExtWMDecorateWindow, 0);
+	  //RootlessRepositionWindows (s_pScreen);
+	}
+      break;
+
+    case WM_UNMANAGE:
+      ErrorF ("winWindowProc - WM_UNMANAGE\n");
+      s_pScreenInfo->fAnotherWMRunning = TRUE;
+
+      if (s_pScreenInfo->fInternalWM)
+	{
+	  EnumThreadWindows (g_dwCurrentThreadID, winMWExtWMDecorateWindow, 0);
+	  winMWExtWMRestackWindows (s_pScreen);
+	}
+      break;
+#endif
+
+    default:
+      if(message == s_uTaskbarRestart)
+	{
+	  winInitNotifyIcon (s_pScreenPriv);
+	}
+      break;
+    }
+
+  return DefWindowProc (hwnd, message, wParam, lParam);
+}