87 files changed, 9689 insertions, 12121 deletions

diff --git a/xorg-server/hw/dmx/dmxinit.c b/xorg-server/hw/dmx/dmxinit.c
index e5598e331..739c4ca7f 100644
--- a/xorg-server/hw/dmx/dmxinit.c
+++ b/xorg-server/hw/dmx/dmxinit.c
@@ -1,1035 +1,1042 @@
-/*
- * 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>
- *   David H. Dawes <dawes@xfree86.org>
- *   Rickard E. (Rik) Faith <faith@redhat.com>
- *
- */
-
-/** \file
- * Provide expected functions for initialization from the ddx layer and
- * global variables for the DMX server. */
-
-#ifdef HAVE_DMX_CONFIG_H
-#include <dmx-config.h>
-#endif
-
-#include "dmx.h"
-#include "dmxinit.h"
-#include "dmxsync.h"
-#include "dmxlog.h"
-#include "dmxinput.h"
-#include "dmxscrinit.h"
-#include "dmxcursor.h"
-#include "dmxfont.h"
-#include "config/dmxconfig.h"
-#include "dmxcb.h"
-#include "dmxprop.h"
-#include "dmxstat.h"
-#ifdef RENDER
-#include "dmxpict.h"
-#endif
-
-#include <X11/Xos.h>                /* For gettimeofday */
-#include "dixstruct.h"
-#ifdef PANORAMIX
-#include "panoramiXsrv.h"
-#endif
-
-#include <signal.h>             /* For SIGQUIT */
-
-#ifdef GLXEXT
-#include <GL/glx.h>
-#include <GL/glxint.h>
-#include "dmx_glxvisuals.h"
-#include <X11/extensions/Xext.h>
-#include <X11/extensions/extutil.h>
-
-extern void GlxSetVisualConfigs(
-    int               nconfigs,
-    __GLXvisualConfig *configs,
-    void              **configprivs
-);
-#endif /* GLXEXT */
-
-/* Global variables available to all Xserver/hw/dmx routines. */
-int             dmxNumScreens;
-DMXScreenInfo  *dmxScreens;
-
-int             dmxNumInputs;
-DMXInputInfo   *dmxInputs;
-
-int             dmxShadowFB = FALSE;
-
-XErrorEvent     dmxLastErrorEvent;
-Bool            dmxErrorOccurred = FALSE;
-
-char           *dmxFontPath = NULL;
-
-Bool            dmxOffScreenOpt = TRUE;
-
-Bool            dmxSubdividePrimitives = TRUE;
-
-Bool            dmxLazyWindowCreation = TRUE;
-
-Bool            dmxUseXKB = TRUE;
-
-int             dmxDepth = 0;
-
-#ifndef GLXEXT
-static Bool     dmxGLXProxy = FALSE;
-#else
-Bool            dmxGLXProxy = TRUE;
-
-Bool            dmxGLXSwapGroupSupport = TRUE;
-
-Bool            dmxGLXSyncSwap = FALSE;
-
-Bool            dmxGLXFinishSwap = FALSE;
-#endif
-
-Bool            dmxIgnoreBadFontPaths = FALSE;
-
-Bool            dmxAddRemoveScreens = FALSE;
-
-/* dmxErrorHandler catches errors that occur when calling one of the
- * back-end servers.  Some of this code is based on _XPrintDefaultError
- * in xc/lib/X11/XlibInt.c */
-static int dmxErrorHandler(Display *dpy, XErrorEvent *ev)
-{
-#define DMX_ERROR_BUF_SIZE 256
-                                /* RATS: these buffers are only used in
-                                 * length-limited calls. */
-    char        buf[DMX_ERROR_BUF_SIZE];
-    char        request[DMX_ERROR_BUF_SIZE];
-    _XExtension *ext = NULL;
-
-    dmxErrorOccurred  = TRUE;
-    dmxLastErrorEvent = *ev;
-
-    XGetErrorText(dpy, ev->error_code, buf, sizeof(buf));
-    dmxLog(dmxWarning, "dmxErrorHandler: %s\n", buf);
-
-                                /* Find major opcode name */
-    if (ev->request_code < 128) {
-        XmuSnprintf(request, sizeof(request), "%d", ev->request_code);
-        XGetErrorDatabaseText(dpy, "XRequest", request, "", buf, sizeof(buf));
-    } else {
-        for (ext = dpy->ext_procs;
-             ext && ext->codes.major_opcode != ev->request_code;
-             ext = ext->next);
-        if (ext) strncpy(buf, ext->name, sizeof(buf));
-        else     buf[0] = '\0';
-    }
-    dmxLog(dmxWarning, "                 Major opcode: %d (%s)\n",
-           ev->request_code, buf);
-
-                                /* Find minor opcode name */
-    if (ev->request_code >= 128 && ext) {
-        XmuSnprintf(request, sizeof(request), "%d", ev->request_code);
-        XmuSnprintf(request, sizeof(request), "%s.%d",
-                    ext->name, ev->minor_code);
-        XGetErrorDatabaseText(dpy, "XRequest", request, "", buf, sizeof(buf));
-        dmxLog(dmxWarning, "                 Minor opcode: %d (%s)\n",
-               ev->minor_code, buf);
-    }
-
-                                /* Provide value information */
-    switch (ev->error_code) {
-    case BadValue:
-        dmxLog(dmxWarning, "                 Value:        0x%x\n",
-               ev->resourceid);
-        break;
-    case BadAtom:
-        dmxLog(dmxWarning, "                 AtomID:       0x%x\n",
-               ev->resourceid);
-        break;
-    default:
-        dmxLog(dmxWarning, "                 ResourceID:   0x%x\n",
-               ev->resourceid);
-        break;
-    }
-
-                                /* Provide serial number information */
-    dmxLog(dmxWarning, "                 Failed serial number:  %d\n",
-           ev->serial);
-    dmxLog(dmxWarning, "                 Current serial number: %d\n",
-           dpy->request);
-    return 0;
-}
-
-#ifdef GLXEXT
-static int dmxNOPErrorHandler(Display *dpy, XErrorEvent *ev)
-{
-    return 0;
-}
-#endif
-
-Bool dmxOpenDisplay(DMXScreenInfo *dmxScreen)
-{
-    if (!(dmxScreen->beDisplay = XOpenDisplay(dmxScreen->name)))
-	return FALSE;
-
-    dmxPropertyDisplay(dmxScreen);
-    return TRUE;
-}
-
-void dmxSetErrorHandler(DMXScreenInfo *dmxScreen)
-{
-    XSetErrorHandler(dmxErrorHandler);
-}
-
-static void dmxPrintScreenInfo(DMXScreenInfo *dmxScreen)
-{
-    XWindowAttributes attribs;
-    int               ndepths = 0, *depths = NULL;
-    int               i;
-    Display           *dpy   = dmxScreen->beDisplay;
-    Screen            *s     = DefaultScreenOfDisplay(dpy);
-    int               scr    = DefaultScreen(dpy);
-
-    XGetWindowAttributes(dpy, DefaultRootWindow(dpy), &attribs);
-    if (!(depths = XListDepths(dpy, scr, &ndepths))) ndepths = 0;
-    
-    dmxLogOutput(dmxScreen, "Name of display: %s\n", DisplayString(dpy));
-    dmxLogOutput(dmxScreen, "Version number:  %d.%d\n",
-                 ProtocolVersion(dpy), ProtocolRevision(dpy));
-    dmxLogOutput(dmxScreen, "Vendor string:   %s\n", ServerVendor(dpy));
-    if (!strstr(ServerVendor(dpy), "XFree86")) {
-        dmxLogOutput(dmxScreen, "Vendor release:  %d\n", VendorRelease(dpy));
-    } else {
-                                /* This code based on xdpyinfo.c */
-    	int v = VendorRelease(dpy);
-        int major = -1, minor = -1, patch = -1, subpatch = -1;
-
-        if (v < 336)
-            major = v / 100, minor = (v / 10) % 10, patch = v % 10;
-        else if (v < 3900) {
-            major = v / 1000;
-            minor = (v / 100) % 10;
-            if (((v / 10) % 10) || (v % 10)) {
-                patch = (v / 10) % 10;
-                if (v % 10) subpatch = v % 10;
-            }
-        } else if (v < 40000000) {
-            major = v / 1000;
-            minor = (v / 10) % 10;
-            if (v % 10) patch = v % 10;
-	} else {
-            major = v / 10000000;
-            minor = (v / 100000) % 100;
-            patch = (v / 1000) % 100;
-            if (v % 1000) subpatch = v % 1000;
-	}
-        dmxLogOutput(dmxScreen, "Vendor release:  %d (XFree86 version: %d.%d",
-                     v, major, minor);
-        if (patch > 0)    dmxLogOutputCont(dmxScreen, ".%d", patch);
-        if (subpatch > 0) dmxLogOutputCont(dmxScreen, ".%d", subpatch);
-        dmxLogOutputCont(dmxScreen, ")\n");
-    }
-
-    
-    dmxLogOutput(dmxScreen, "Dimensions:      %dx%d pixels\n", 
-                 attribs.width, attribs.height);
-    dmxLogOutput(dmxScreen, "%d depths on screen %d: ", ndepths, scr);
-    for (i = 0; i < ndepths; i++)
-        dmxLogOutputCont(dmxScreen, "%c%d", i ? ',' : ' ', depths[i]);
-    dmxLogOutputCont(dmxScreen, "\n");
-    dmxLogOutput(dmxScreen, "Depth of root window:  %d plane%s (%d)\n",
-                 attribs.depth, attribs.depth == 1 ? "" : "s",
-                 DisplayPlanes(dpy, scr));
-    dmxLogOutput(dmxScreen, "Number of colormaps:   %d min, %d max\n",
-                 MinCmapsOfScreen(s), MaxCmapsOfScreen(s));
-    dmxLogOutput(dmxScreen, "Options: backing-store %s, save-unders %s\n",
-                 (DoesBackingStore (s) == NotUseful) ? "no" :
-                 ((DoesBackingStore (s) == Always) ? "yes" : "when mapped"),
-                 DoesSaveUnders (s) ? "yes" : "no");
-    dmxLogOutput(dmxScreen, "Window Manager running: %s\n",
-		 (dmxScreen->WMRunningOnBE) ? "yes" : "no");
-
-    if (dmxScreen->WMRunningOnBE) {
-	dmxLogOutputWarning(dmxScreen,
-			    "Window manager running "
-			    "-- colormaps not supported\n");
-    }
-    XFree(depths);
-}
-
-void dmxGetScreenAttribs(DMXScreenInfo *dmxScreen)
-{
-    XWindowAttributes attribs;
-    Display           *dpy   = dmxScreen->beDisplay;
-#ifdef GLXEXT
-    int               dummy;
-#endif
-
-    XGetWindowAttributes(dpy, DefaultRootWindow(dpy), &attribs);
-
-    dmxScreen->beWidth  = attribs.width;
-    dmxScreen->beHeight = attribs.height;
-    
-                                /* Fill in missing geometry information */
-    if (dmxScreen->scrnXSign < 0) {
-        if (dmxScreen->scrnWidth) {
-            dmxScreen->scrnX   = (attribs.width - dmxScreen->scrnWidth
-				  - dmxScreen->scrnX);
-        } else {
-            dmxScreen->scrnWidth  = attribs.width - dmxScreen->scrnX;
-            dmxScreen->scrnX   = 0;
-        }
-    }
-    if (dmxScreen->scrnYSign < 0) {
-        if (dmxScreen->scrnHeight) {
-            dmxScreen->scrnY   = (attribs.height - dmxScreen->scrnHeight
-				  - dmxScreen->scrnY);
-        } else {
-            dmxScreen->scrnHeight = attribs.height - dmxScreen->scrnY;
-            dmxScreen->scrnY   = 0;
-        }
-    }
-    if (!dmxScreen->scrnWidth)
-        dmxScreen->scrnWidth  = attribs.width  - dmxScreen->scrnX;
-    if (!dmxScreen->scrnHeight)
-        dmxScreen->scrnHeight = attribs.height - dmxScreen->scrnY;
-
-    if (!dmxScreen->rootWidth)  dmxScreen->rootWidth  = dmxScreen->scrnWidth;
-    if (!dmxScreen->rootHeight) dmxScreen->rootHeight = dmxScreen->scrnHeight;
-    if (dmxScreen->rootWidth + dmxScreen->rootX > dmxScreen->scrnWidth)
-        dmxScreen->rootWidth = dmxScreen->scrnWidth - dmxScreen->rootX;
-    if (dmxScreen->rootHeight + dmxScreen->rootY > dmxScreen->scrnHeight)
-        dmxScreen->rootHeight = dmxScreen->scrnHeight - dmxScreen->rootY;
-
-    /* FIXME: Get these from the back-end server */
-    dmxScreen->beXDPI = 75;
-    dmxScreen->beYDPI = 75;
-
-    dmxScreen->beDepth  = attribs.depth; /* FIXME: verify that this
-					  * works always.  In
-					  * particular, this will work
-					  * well for depth=16, will fail
-					  * because of colormap issues
-					  * at depth 8.  More work needs
-					  * to be done here. */
-
-    if (dmxScreen->beDepth <= 8)       dmxScreen->beBPP = 8;
-    else if (dmxScreen->beDepth <= 16) dmxScreen->beBPP = 16;
-    else                               dmxScreen->beBPP = 32;
-
-#ifdef GLXEXT
-    /* get the majorOpcode for the back-end GLX extension */
-    XQueryExtension(dpy, "GLX", &dmxScreen->glxMajorOpcode,
-		    &dummy, &dmxScreen->glxErrorBase);
-#endif
-
-    dmxPrintScreenInfo(dmxScreen);
-    dmxLogOutput(dmxScreen, "%dx%d+%d+%d on %dx%d at depth=%d, bpp=%d\n",
-                 dmxScreen->scrnWidth, dmxScreen->scrnHeight,
-                 dmxScreen->scrnX, dmxScreen->scrnY,
-                 dmxScreen->beWidth, dmxScreen->beHeight,
-                 dmxScreen->beDepth, dmxScreen->beBPP);
-    if (dmxScreen->beDepth == 8)
-        dmxLogOutputWarning(dmxScreen,
-                            "Support for depth == 8 is not complete\n");
-}
-
-Bool dmxGetVisualInfo(DMXScreenInfo *dmxScreen)
-{
-    int i;
-    XVisualInfo visinfo;
-
-    visinfo.screen = DefaultScreen(dmxScreen->beDisplay);
-    dmxScreen->beVisuals = XGetVisualInfo(dmxScreen->beDisplay,
-					  VisualScreenMask,
-					  &visinfo,
-					  &dmxScreen->beNumVisuals);
-
-    dmxScreen->beDefVisualIndex = -1;
-
-    if (defaultColorVisualClass >= 0 || dmxDepth > 0) {
-	for (i = 0; i < dmxScreen->beNumVisuals; i++)
-	    if (defaultColorVisualClass >= 0) {
-		if (dmxScreen->beVisuals[i].class == defaultColorVisualClass) {
-		    if (dmxDepth > 0) {
-			if (dmxScreen->beVisuals[i].depth == dmxDepth) {
-			    dmxScreen->beDefVisualIndex = i;
-			    break;
-			}
-		    } else {
-			dmxScreen->beDefVisualIndex = i;
-			break;
-		    }
-		}
-	    } else if (dmxScreen->beVisuals[i].depth == dmxDepth) {
-		dmxScreen->beDefVisualIndex = i;
-		break;
-	    }
-    } else {
-	visinfo.visualid =
-	    XVisualIDFromVisual(DefaultVisual(dmxScreen->beDisplay,
-					      visinfo.screen));
-
-	for (i = 0; i < dmxScreen->beNumVisuals; i++)
-	    if (visinfo.visualid == dmxScreen->beVisuals[i].visualid) {
-		dmxScreen->beDefVisualIndex = i;
-		break;
-	    }
-    }
-
-    for (i = 0; i < dmxScreen->beNumVisuals; i++)
-        dmxLogVisual(dmxScreen, &dmxScreen->beVisuals[i],
-                     (i == dmxScreen->beDefVisualIndex));
-
-    return (dmxScreen->beDefVisualIndex >= 0);
-}
-
-void dmxGetColormaps(DMXScreenInfo *dmxScreen)
-{
-    int i;
-
-    dmxScreen->beNumDefColormaps = dmxScreen->beNumVisuals;
-    dmxScreen->beDefColormaps = xalloc(dmxScreen->beNumDefColormaps *
-				       sizeof(*dmxScreen->beDefColormaps));
-
-    for (i = 0; i < dmxScreen->beNumDefColormaps; i++)
-	dmxScreen->beDefColormaps[i] =
-	    XCreateColormap(dmxScreen->beDisplay,
-			    DefaultRootWindow(dmxScreen->beDisplay),
-			    dmxScreen->beVisuals[i].visual,
-			    AllocNone);
-
-    dmxScreen->beBlackPixel = BlackPixel(dmxScreen->beDisplay,
-					 DefaultScreen(dmxScreen->beDisplay));
-    dmxScreen->beWhitePixel = WhitePixel(dmxScreen->beDisplay,
-					 DefaultScreen(dmxScreen->beDisplay));
-}
-
-void dmxGetPixmapFormats(DMXScreenInfo *dmxScreen)
-{
-    dmxScreen->beDepths =
-	XListDepths(dmxScreen->beDisplay, DefaultScreen(dmxScreen->beDisplay),
-		    &dmxScreen->beNumDepths);
-
-    dmxScreen->bePixmapFormats =
-	XListPixmapFormats(dmxScreen->beDisplay,
-			   &dmxScreen->beNumPixmapFormats);
-}
-
-static Bool dmxSetPixmapFormats(ScreenInfo *pScreenInfo,
-				DMXScreenInfo *dmxScreen)
-{
-    XPixmapFormatValues *bePixmapFormat;
-    PixmapFormatRec     *format;
-    int                  i, j;
-
-    pScreenInfo->imageByteOrder = ImageByteOrder(dmxScreen->beDisplay);
-    pScreenInfo->bitmapScanlineUnit = BitmapUnit(dmxScreen->beDisplay);
-    pScreenInfo->bitmapScanlinePad = BitmapPad(dmxScreen->beDisplay);
-    pScreenInfo->bitmapBitOrder = BitmapBitOrder(dmxScreen->beDisplay);
-
-    pScreenInfo->numPixmapFormats = 0;
-    for (i = 0; i < dmxScreen->beNumPixmapFormats; i++) {
-	bePixmapFormat = &dmxScreen->bePixmapFormats[i];
-	for (j = 0; j < dmxScreen->beNumDepths; j++)
-	    if ((bePixmapFormat->depth == 1) ||
-		(bePixmapFormat->depth == dmxScreen->beDepths[j])) {
-		format = &pScreenInfo->formats[pScreenInfo->numPixmapFormats];
-
-		format->depth        = bePixmapFormat->depth;
-		format->bitsPerPixel = bePixmapFormat->bits_per_pixel;
-		format->scanlinePad  = bePixmapFormat->scanline_pad;
-
-		pScreenInfo->numPixmapFormats++;
-		break;
-	    }
-    }
-
-    return TRUE;
-}
-
-void dmxCheckForWM(DMXScreenInfo *dmxScreen)
-{
-    Status status;
-    XWindowAttributes xwa;
-
-    status = XGetWindowAttributes(dmxScreen->beDisplay,
-				  DefaultRootWindow(dmxScreen->beDisplay),
-				  &xwa);
-    dmxScreen->WMRunningOnBE =
-	(status &&
-	 ((xwa.all_event_masks & SubstructureRedirectMask) ||
-	  (xwa.all_event_masks & SubstructureNotifyMask)));
-}
-
-/** Initialize the display and collect relevant information about the
- *  display properties */
-static void dmxDisplayInit(DMXScreenInfo *dmxScreen)
-{
-    if (!dmxOpenDisplay(dmxScreen))
-	dmxLog(dmxFatal,
-               "dmxOpenDisplay: Unable to open display %s\n",
-               dmxScreen->name);
-
-    dmxSetErrorHandler(dmxScreen);
-    dmxCheckForWM(dmxScreen);
-    dmxGetScreenAttribs(dmxScreen);
-
-    if (!dmxGetVisualInfo(dmxScreen))
-	dmxLog(dmxFatal, "dmxGetVisualInfo: No matching visuals found\n");
-
-    dmxGetColormaps(dmxScreen);
-    dmxGetPixmapFormats(dmxScreen);
-}
-
-/* If this doesn't compile, just add || defined(yoursystem) to the line
- * below.  This information is to help with bug reports and is not
- * critical. */
-#if !defined(_POSIX_SOURCE) 
-static const char *dmxExecOS(void) { return ""; }
-#else
-#include <sys/utsname.h>
-static const char *dmxExecOS(void)
-{
-    static char buffer[128];
-    static int  initialized = 0;
-    struct utsname u;
-
-    if (!initialized++) {
-        memset(buffer, 0, sizeof(buffer));
-        uname(&u);
-        XmuSnprintf(buffer, sizeof(buffer)-1, "%s %s %s",
-                    u.sysname, u.release, u.version);
-    }
-    return buffer;
-}
-#endif
-
-static const char *dmxBuildCompiler(void)
-{
-    static char buffer[128];
-    static int  initialized = 0;
-
-    if (!initialized++) {
-        memset(buffer, 0, sizeof(buffer));
-#if defined(__GNUC__) && defined(__GNUC_MINOR__) &&defined(__GNUC_PATCHLEVEL__)
-        XmuSnprintf(buffer, sizeof(buffer)-1, "gcc %d.%d.%d",
-                    __GNUC__, __GNUC_MINOR__, __GNUC_PATCHLEVEL__);
-#endif
-    }
-    return buffer;
-}
-
-static const char *dmxExecHost(void)
-{
-    static char buffer[128];
-    static int  initialized = 0;
-
-    if (!initialized++) {
-        memset(buffer, 0, sizeof(buffer));
-        XmuGetHostname(buffer, sizeof(buffer) - 1);
-    }
-    return buffer;
-}
-
-/** This routine is called in Xserver/dix/main.c from \a main(). */
-void InitOutput(ScreenInfo *pScreenInfo, int argc, char *argv[])
-{
-    int                  i;
-    static unsigned long dmxGeneration = 0;
-#ifdef GLXEXT
-    Bool                 glxSupported  = TRUE;
-#endif
-
-    if (dmxGeneration != serverGeneration) {
-	int vendrel = VENDOR_RELEASE;
-        int major, minor, year, month, day;
-        
-        dmxGeneration = serverGeneration;
-
-        major    = vendrel / 100000000;
-        vendrel -= major   * 100000000;
-        minor    = vendrel /   1000000;
-        vendrel -= minor   *   1000000;
-        year     = vendrel /     10000;
-        vendrel -= year    *     10000;
-        month    = vendrel /       100;
-        vendrel -= month   *       100;
-        day      = vendrel;
-
-                                /* Add other epoch tests here */
-        if (major > 0 && minor > 0) year += 2000;
-
-        dmxLog(dmxInfo, "Generation:         %d\n", dmxGeneration);
-        dmxLog(dmxInfo, "DMX version:        %d.%d.%02d%02d%02d (%s)\n",
-               major, minor, year, month, day, VENDOR_STRING);
-
-        SetVendorRelease(VENDOR_RELEASE);
-        SetVendorString(VENDOR_STRING);
-
-        if (dmxGeneration == 1) {
-            dmxLog(dmxInfo, "DMX Build OS:       %s (%s)\n", OSNAME, OSVENDOR);
-            dmxLog(dmxInfo, "DMX Build Compiler: %s\n", dmxBuildCompiler());
-            dmxLog(dmxInfo, "DMX Execution OS:   %s\n", dmxExecOS());
-            dmxLog(dmxInfo, "DMX Execution Host: %s\n", dmxExecHost());
-        }
-        dmxLog(dmxInfo, "MAXSCREENS:         %d\n", MAXSCREENS);
-
-        for (i = 0; i < dmxNumScreens; i++) {
-            if (dmxScreens[i].beDisplay)
-                dmxLog(dmxWarning, "Display \"%s\" still open\n",
-                       dmxScreens[i].name);
-            dmxStatFree(dmxScreens[i].stat);
-            dmxScreens[i].stat = NULL;
-        }
-        for (i = 0; i < dmxNumInputs; i++) dmxInputFree(&dmxInputs[i]);
-        if (dmxScreens) free(dmxScreens);
-        if (dmxInputs)  free(dmxInputs);
-        dmxScreens    = NULL;
-        dmxInputs     = NULL;
-        dmxNumScreens = 0;
-        dmxNumInputs  = 0;
-    }
-
-    /* Make sure that the command-line arguments are sane. */
-    if (dmxAddRemoveScreens && dmxGLXProxy) {
-	/* Currently it is not possible to support GLX and Render
-	 * extensions with dynamic screen addition/removal due to the
-	 * state that each extension keeps, which cannot be restored. */
-        dmxLog(dmxWarning,
-	       "GLX Proxy and Render extensions do not yet support dynamic\n");
-        dmxLog(dmxWarning,
-	       "screen addition and removal.  Please specify -noglxproxy\n");
-        dmxLog(dmxWarning,
-	       "and -norender on the command line or in the configuration\n");
-        dmxLog(dmxWarning,
-	       "file to disable these two extensions if you wish to use\n");
-        dmxLog(dmxWarning,
-	       "the dynamic addition and removal of screens support.\n");
-        dmxLog(dmxFatal,
-	       "Dynamic screen addition/removal error (see above).\n");
-    }
-
-    /* ddxProcessArgument has been called at this point, but any data
-     * from the configuration file has not been applied.  Do so, and be
-     * sure we have at least one back-end display. */
-    dmxConfigConfigure();
-    if (!dmxNumScreens)
-        dmxLog(dmxFatal, "InitOutput: no back-end displays found\n");
-    if (!dmxNumInputs)
-        dmxLog(dmxInfo, "InitOutput: no inputs found\n");
-    
-    /* Disable lazy window creation optimization if offscreen
-     * optimization is disabled */
-    if (!dmxOffScreenOpt && dmxLazyWindowCreation) {
-        dmxLog(dmxInfo,
-	       "InitOutput: Disabling lazy window creation optimization\n");
-        dmxLog(dmxInfo,
-	       "            since it requires the offscreen optimization\n");
-        dmxLog(dmxInfo,
-	       "            to function properly.\n");
-	dmxLazyWindowCreation = FALSE;
-    }
-
-    /* Open each display and gather information about it. */
-    for (i = 0; i < dmxNumScreens; i++)
-        dmxDisplayInit(&dmxScreens[i]);
-
-#if PANORAMIX
-    /* Register a Xinerama callback which will run from within
-     * PanoramiXCreateConnectionBlock.  We can use the callback to
-     * determine if Xinerama is loaded and to check the visuals
-     * determined by PanoramiXConsolidate. */
-    XineramaRegisterConnectionBlockCallback(dmxConnectionBlockCallback);
-#endif
-
-    /* Since we only have a single screen thus far, we only need to set
-       the pixmap formats to match that screen.  FIXME: this isn't true.*/
-    if (!dmxSetPixmapFormats(pScreenInfo, &dmxScreens[0])) return;
-
-    /* Might want to install a signal handler to allow cleaning up after
-     * unexpected signals.  The DIX/OS layer already handles SIGINT and
-     * SIGTERM, so everything is OK for expected signals. --DD
-     *
-     * SIGHUP, SIGINT, and SIGTERM are trapped in os/connection.c
-     * SIGQUIT is another common signal that is sent from the keyboard.
-     * Trap it here, to ensure that the keyboard modifier map and other
-     * state for the input devices are restored. (This makes the
-     * behavior of SIGQUIT somewhat unexpected, since it will be the
-     * same as the behavior of SIGINT.  However, leaving the modifier
-     * map of the input devices empty is even more unexpected.) --RF
-     */
-    OsSignal(SIGQUIT, GiveUp);
-
-#ifdef GLXEXT
-    /* Check if GLX extension exists on all back-end servers */
-    for (i = 0; i < dmxNumScreens; i++)
-	glxSupported &= (dmxScreens[i].glxMajorOpcode > 0);
-#endif
-
-    /* Tell dix layer about the backend displays */
-    for (i = 0; i < dmxNumScreens; i++) {
-
-#ifdef GLXEXT
-	if (glxSupported) {
-	    /*
-	     * Builds GLX configurations from the list of visuals
-	     * supported by the back-end server, and give that
-	     * configuration list to the glx layer - so that he will
-	     * build the visuals accordingly.
-	     */
-
-	    DMXScreenInfo       *dmxScreen    = &dmxScreens[i];
-	    __GLXvisualConfig   *configs      = NULL;
-	    dmxGlxVisualPrivate **configprivs = NULL;
-	    int                 nconfigs      = 0;
-	    int                 (*oldErrorHandler)(Display *, XErrorEvent *);
-	    int                 i;
-
-	    /* Catch errors if when using an older GLX w/o FBconfigs */
-	    oldErrorHandler = XSetErrorHandler(dmxNOPErrorHandler);
-
-	    /* Get FBConfigs of the back-end server */
-	    dmxScreen->fbconfigs = GetGLXFBConfigs(dmxScreen->beDisplay,
-						   dmxScreen->glxMajorOpcode,
-						   &dmxScreen->numFBConfigs);
-
-	    XSetErrorHandler(oldErrorHandler);
-
-	    dmxScreen->glxVisuals = 
-		GetGLXVisualConfigs(dmxScreen->beDisplay,
-				    DefaultScreen(dmxScreen->beDisplay),
-				    &dmxScreen->numGlxVisuals);
-
-	    if (dmxScreen->fbconfigs) {
-		configs =
-		    GetGLXVisualConfigsFromFBConfigs(dmxScreen->fbconfigs,
-						     dmxScreen->numFBConfigs,
-						     dmxScreen->beVisuals,
-						     dmxScreen->beNumVisuals,
-						     dmxScreen->glxVisuals,
-						     dmxScreen->numGlxVisuals,
-						     &nconfigs);
-	    } else {
-		configs = dmxScreen->glxVisuals;
-		nconfigs = dmxScreen->numGlxVisuals;
-	    }
-
-	    configprivs = xalloc(nconfigs * sizeof(dmxGlxVisualPrivate*));
-
-	    if (configs != NULL && configprivs != NULL) {
-
-		/* Initialize our private info for each visual
-		 * (currently only x_visual_depth and x_visual_class)
-		 */
-		for (i = 0; i < nconfigs; i++) {
-
-		    configprivs[i] = (dmxGlxVisualPrivate *)
-			xalloc(sizeof(dmxGlxVisualPrivate));
-		    configprivs[i]->x_visual_depth = 0;
-		    configprivs[i]->x_visual_class = 0;
-
-		    /* Find the visual depth */
-		    if (configs[i].vid > 0) {
-			int  j;
-			for (j = 0; j < dmxScreen->beNumVisuals; j++) {
-			    if (dmxScreen->beVisuals[j].visualid ==
-				configs[i].vid) {
-				configprivs[i]->x_visual_depth =
-				    dmxScreen->beVisuals[j].depth;
-				configprivs[i]->x_visual_class =
-				    dmxScreen->beVisuals[j].class;
-				break;
-			    }
-			}
-		    }
-		}
-
-		/* Hand out the glx configs to glx extension */
-		GlxSetVisualConfigs(nconfigs, configs, (void**)configprivs);
-
-                XFlush(dmxScreen->beDisplay);
-	    }
-	}
-#endif  /* GLXEXT */
-
-	AddScreen(dmxScreenInit, argc, argv);
-    }
-
-    /* Compute origin information. */
-    dmxInitOrigins();
-
-    /* Compute overlap information. */
-    dmxInitOverlap();
-
-    /* Make sure there is a global width/height available */
-    dmxComputeWidthHeight(DMX_NO_RECOMPUTE_BOUNDING_BOX);
-
-    /* FIXME: The following is temporarily placed here.  When the DMX
-     * extension is available, it will be move there.
-     */
-    dmxInitFonts();
-
-#ifdef RENDER
-    /* Initialize the render extension */
-    if (!noRenderExtension)
-	dmxInitRender();
-#endif
-
-    /* Initialized things that need timer hooks */
-    dmxStatInit();
-    dmxSyncInit();              /* Calls RegisterBlockAndWakeupHandlers */
-
-    dmxLog(dmxInfo, "Shadow framebuffer support %s\n",
-	   dmxShadowFB ? "enabled" : "disabled");
-}
-
-/* RATS: Assuming the fp string (which comes from the command-line argv
-         vector) is NULL-terminated, the buffer is large enough for the
-         strcpy. */ 
-static void dmxSetDefaultFontPath(char *fp)
-{
-    int fplen = strlen(fp) + 1;
-    
-    if (dmxFontPath) {
-	int len;
-
-	len = strlen(dmxFontPath);
-	dmxFontPath = xrealloc(dmxFontPath, len+fplen+1);
-	dmxFontPath[len] = ',';
-	strncpy(&dmxFontPath[len+1], fp, fplen);
-    } else {
-	dmxFontPath = xalloc(fplen);
-	strncpy(dmxFontPath, fp, fplen);
-    }
-
-    defaultFontPath = dmxFontPath;
-}
-
-/** This function is called in Xserver/os/utils.c from \a AbortServer().
- * We must ensure that backend and console state is restored in the
- * event the server shutdown wasn't clean. */
-void AbortDDX(void)
-{
-    int i;
-
-    for (i=0; i < dmxNumScreens; i++) {
-        DMXScreenInfo *dmxScreen = &dmxScreens[i];
-        
-        if (dmxScreen->beDisplay) XCloseDisplay(dmxScreen->beDisplay);
-        dmxScreen->beDisplay = NULL;
-    }
-}
-
-/** This function is called in Xserver/dix/main.c from \a main() when
- * dispatchException & DE_TERMINATE (which is the only way to exit the
- * main loop without an interruption. */
-void ddxGiveUp(void)
-{
-    AbortDDX();
-}
-
-/** This function is called in Xserver/os/osinit.c from \a OsInit(). */
-void OsVendorInit(void)
-{
-}
-
-/** This function is called in Xserver/os/utils.c from \a FatalError()
- * and \a VFatalError().  (Note that setting the function pointer \a
- * OsVendorVErrorFProc will cause \a VErrorF() (which is called by the
- * two routines mentioned here, as well as by others) to use the
- * referenced routine instead of \a vfprintf().) */
-void OsVendorFatalError(void)
-{
-}
-
-/** Process our command line arguments. */
-int ddxProcessArgument(int argc, char *argv[], int i)
-{
-    int retval = 0;
-    
-    if (!strcmp(argv[i], "-display")) {
-	if (++i < argc) dmxConfigStoreDisplay(argv[i]);
-        retval = 2;
-    } else if (!strcmp(argv[i], "-inputfrom") || !strcmp(argv[i], "-input")) {
-	if (++i < argc) dmxConfigStoreInput(argv[i]);
-        retval = 2;
-    } else if (!strcmp(argv[i], "-xinputfrom") || !strcmp(argv[i],"-xinput")) {
-        if (++i < argc) dmxConfigStoreXInput(argv[i]);
-        retval = 2;
-    } else if (!strcmp(argv[i], "-noshadowfb")) {
-        dmxLog(dmxWarning,
-               "-noshadowfb has been deprecated "
-	       "since it is now the default\n");
-	dmxShadowFB = FALSE;
-	retval = 1;
-    } else if (!strcmp(argv[i], "-nomulticursor")) {
-        dmxCursorNoMulti();
-	retval = 1;
-    } else if (!strcmp(argv[i], "-shadowfb")) {
-	dmxShadowFB = TRUE;
-	retval = 1;
-    } else if (!strcmp(argv[i], "-configfile")) {
-        if (++i < argc) dmxConfigStoreFile(argv[i]);
-        retval = 2;
-    } else if (!strcmp(argv[i], "-config")) {
-        if (++i < argc) dmxConfigStoreConfig(argv[i]);
-        retval = 2;
-    } else if (!strcmp(argv[i], "-fontpath")) {
-        if (++i < argc) dmxSetDefaultFontPath(argv[i]);
-        retval = 2;
-    } else if (!strcmp(argv[i], "-stat")) {
-        if ((i += 2) < argc) dmxStatActivate(argv[i-1], argv[i]);
-        retval = 3;
-    } else if (!strcmp(argv[i], "-syncbatch")) {
-        if (++i < argc) dmxSyncActivate(argv[i]);
-        retval = 2;
-    } else if (!strcmp(argv[i], "-nooffscreenopt")) {
-	dmxOffScreenOpt = FALSE;
-        retval = 1;
-    } else if (!strcmp(argv[i], "-nosubdivprims")) {
-	dmxSubdividePrimitives = FALSE;
-        retval = 1;
-    } else if (!strcmp(argv[i], "-nowindowopt")) {
-	dmxLazyWindowCreation = FALSE;
-        retval = 1;
-    } else if (!strcmp(argv[i], "-noxkb")) {
-	dmxUseXKB = FALSE;
-        retval = 1;
-    } else if (!strcmp(argv[i], "-depth")) {
-        if (++i < argc) dmxDepth = atoi(argv[i]);
-        retval = 2;
-    } else if (!strcmp(argv[i], "-norender")) {
-	noRenderExtension = TRUE;
-        retval = 1;
-#ifdef GLXEXT
-    } else if (!strcmp(argv[i], "-noglxproxy")) {
-	dmxGLXProxy = FALSE;
-        retval = 1;
-    } else if (!strcmp(argv[i], "-noglxswapgroup")) {
-	dmxGLXSwapGroupSupport = FALSE;
-        retval = 1;
-    } else if (!strcmp(argv[i], "-glxsyncswap")) {
-	dmxGLXSyncSwap = TRUE;
-        retval = 1;
-    } else if (!strcmp(argv[i], "-glxfinishswap")) {
-	dmxGLXFinishSwap = TRUE;
-        retval = 1;
-#endif
-    } else if (!strcmp(argv[i], "-ignorebadfontpaths")) {
-	dmxIgnoreBadFontPaths = TRUE;
-        retval = 1;
-    } else if (!strcmp(argv[i], "-addremovescreens")) {
-	dmxAddRemoveScreens = TRUE;
-        retval = 1;
-    } else if (!strcmp(argv[i], "-param")) {
-        if ((i += 2) < argc) {
-            if (!strcasecmp(argv[i-1], "xkbrules"))
-                dmxConfigSetXkbRules(argv[i]);
-            else if (!strcasecmp(argv[i-1], "xkbmodel"))
-                dmxConfigSetXkbModel(argv[i]);
-            else if (!strcasecmp(argv[i-1], "xkblayout"))
-                dmxConfigSetXkbLayout(argv[i]);
-            else if (!strcasecmp(argv[i-1], "xkbvariant"))
-                dmxConfigSetXkbVariant(argv[i]);
-            else if (!strcasecmp(argv[i-1], "xkboptions"))
-                dmxConfigSetXkbOptions(argv[i]);
-            else
-                dmxLog(dmxWarning,
-                       "-param requires: XkbRules, XkbModel, XkbLayout,"
-                       " XkbVariant, or XkbOptions\n");
-        }
-        retval = 3;
-    }
-    if (!serverGeneration) dmxConfigSetMaxScreens();
-    return retval;
-}
-
-/** Provide succinct usage information for the DMX server. */
-void ddxUseMsg(void)
-{
-    ErrorF("\n\nDevice Dependent Usage:\n");
-    ErrorF("-display string      Specify the back-end display(s)\n");
-    ErrorF("-input string        Specify input source for core device\n");
-    ErrorF("-xinput string       Specify input source for XInput device\n");
-    ErrorF("-shadowfb            Enable shadow frame buffer\n");
-    ErrorF("-configfile file     Read from a configuration file\n");
-    ErrorF("-config config       Select a specific configuration\n");
-    ErrorF("-nomulticursor       Turn of multiple cursor support\n");
-    ErrorF("-fontpath            Sets the default font path\n");
-    ErrorF("-stat inter scrns    Print out performance statistics\n");
-    ErrorF("-syncbatch inter     Set interval for XSync batching\n");
-    ErrorF("-nooffscreenopt      Disable offscreen optimization\n");
-    ErrorF("-nosubdivprims       Disable primitive subdivision\n");
-    ErrorF("                     optimization\n");
-    ErrorF("-nowindowopt         Disable lazy window creation optimization\n");
-    ErrorF("-noxkb               Disable use of the XKB extension with\n");
-    ErrorF("                     backend displays (cf. -kb).\n");
-    ErrorF("-depth               Specify the default root window depth\n");
-    ErrorF("-norender            Disable RENDER extension support\n");
-#ifdef GLXEXT
-    ErrorF("-noglxproxy          Disable GLX Proxy\n");
-    ErrorF("-noglxswapgroup      Disable swap group and swap barrier\n");
-    ErrorF("                     extensions in GLX proxy\n");
-    ErrorF("-glxsyncswap         Force XSync after swap buffers\n");
-    ErrorF("-glxfinishswap       Force glFinish after swap buffers\n");
-#endif
-    ErrorF("-ignorebadfontpaths  Ignore bad font paths during initialization\n");
-    ErrorF("-addremovescreens    Enable dynamic screen addition/removal\n");
-    ErrorF("-param ...           Specify configuration parameters (e.g.,\n");
-    ErrorF("                     XkbRules, XkbModel, XkbLayout, etc.)\n");
-    ErrorF("\n");
-    ErrorF("    If the -input string matches a -display string, then input\n"
-           "    is taken from that backend display.  (XInput cannot be taken\n"
-           "    from a backend display.)  Placing \",console\" after the\n"
-           "    display name will force a console window to be opened on\n"
-           "    that display in addition to the backend input.  This is\n"
-           "    useful if the backend window does not cover the whole\n"
-           "    physical display.\n\n");
-    
-    ErrorF("    Otherwise, if the -input or -xinput string specifies another\n"
-           "    X display, then a console window will be created on that\n"
-           "    display.  Placing \",windows\" or \",nowindows\" after the\n"
-           "    display name will control the display of window outlines in\n"
-           "    the console.\n\n");
-    
-    ErrorF("    -input or -xinput dummy specifies no input.\n");
-    ErrorF("    -input or -xinput local specifies the use of a raw keyboard,\n"
-           "    mouse, or other (extension) device:\n"
-           "        -input local,kbd,ps2 will use a ps2 mouse\n"
-           "        -input local,kbd,ms  will use a serial mouse\n"
-           "        -input local,usb-kbd,usb-mou will use USB devices \n"
-           "        -xinput local,usb-oth will use a non-mouse and\n"
-           "                non-keyboard USB device with XInput\n\n");
-    
-    ErrorF("    Special Keys:\n");
-    ErrorF("        Ctrl-Alt-g    Server grab/ungrab (console only)\n");
-    ErrorF("        Ctrl-Alt-f    Fine (1-pixel) mouse mode (console only)\n");
-    ErrorF("        Ctrl-Alt-q    Quit (core devices only)\n");
-    ErrorF("        Ctrl-Alt-F*   Switch to VC (local only)\n");
-}
+/*

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

+ *   David H. Dawes <dawes@xfree86.org>

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

+ *

+ */

+

+/** \file

+ * Provide expected functions for initialization from the ddx layer and

+ * global variables for the DMX server. */

+

+#ifdef HAVE_DMX_CONFIG_H

+#include <dmx-config.h>

+#endif

+

+#include "dmx.h"

+#include "dmxinit.h"

+#include "dmxsync.h"

+#include "dmxlog.h"

+#include "dmxinput.h"

+#include "dmxscrinit.h"

+#include "dmxcursor.h"

+#include "dmxfont.h"

+#include "config/dmxconfig.h"

+#include "dmxcb.h"

+#include "dmxprop.h"

+#include "dmxstat.h"

+#ifdef RENDER

+#include "dmxpict.h"

+#endif

+

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

+#include "dixstruct.h"

+#ifdef PANORAMIX

+#include "panoramiXsrv.h"

+#endif

+

+#include <signal.h>             /* For SIGQUIT */

+

+#ifdef GLXEXT

+#include <GL/glx.h>

+#include <GL/glxint.h>

+#include "dmx_glxvisuals.h"

+#include <X11/extensions/Xext.h>

+#include <X11/extensions/extutil.h>

+

+extern void GlxSetVisualConfigs(

+    int               nconfigs,

+    __GLXvisualConfig *configs,

+    void              **configprivs

+);

+#endif /* GLXEXT */

+

+/* Global variables available to all Xserver/hw/dmx routines. */

+int             dmxNumScreens;

+DMXScreenInfo  *dmxScreens;

+

+int             dmxNumInputs;

+DMXInputInfo   *dmxInputs;

+

+int             dmxShadowFB = FALSE;

+

+XErrorEvent     dmxLastErrorEvent;

+Bool            dmxErrorOccurred = FALSE;

+

+char           *dmxFontPath = NULL;

+

+Bool            dmxOffScreenOpt = TRUE;

+

+Bool            dmxSubdividePrimitives = TRUE;

+

+Bool            dmxLazyWindowCreation = TRUE;

+

+Bool            dmxUseXKB = TRUE;

+

+int             dmxDepth = 0;

+

+#ifndef GLXEXT

+static Bool     dmxGLXProxy = FALSE;

+#else

+Bool            dmxGLXProxy = TRUE;

+

+Bool            dmxGLXSwapGroupSupport = TRUE;

+

+Bool            dmxGLXSyncSwap = FALSE;

+

+Bool            dmxGLXFinishSwap = FALSE;

+#endif

+

+Bool            dmxIgnoreBadFontPaths = FALSE;

+

+Bool            dmxAddRemoveScreens = FALSE;

+

+/* dmxErrorHandler catches errors that occur when calling one of the

+ * back-end servers.  Some of this code is based on _XPrintDefaultError

+ * in xc/lib/X11/XlibInt.c */

+static int dmxErrorHandler(Display *dpy, XErrorEvent *ev)

+{

+#define DMX_ERROR_BUF_SIZE 256

+                                /* RATS: these buffers are only used in

+                                 * length-limited calls. */

+    char        buf[DMX_ERROR_BUF_SIZE];

+    char        request[DMX_ERROR_BUF_SIZE];

+    _XExtension *ext = NULL;

+

+    dmxErrorOccurred  = TRUE;

+    dmxLastErrorEvent = *ev;

+

+    XGetErrorText(dpy, ev->error_code, buf, sizeof(buf));

+    dmxLog(dmxWarning, "dmxErrorHandler: %s\n", buf);

+

+                                /* Find major opcode name */

+    if (ev->request_code < 128) {

+        XmuSnprintf(request, sizeof(request), "%d", ev->request_code);

+        XGetErrorDatabaseText(dpy, "XRequest", request, "", buf, sizeof(buf));

+    } else {

+        for (ext = dpy->ext_procs;

+             ext && ext->codes.major_opcode != ev->request_code;

+             ext = ext->next);

+        if (ext) strncpy(buf, ext->name, sizeof(buf));

+        else     buf[0] = '\0';

+    }

+    dmxLog(dmxWarning, "                 Major opcode: %d (%s)\n",

+           ev->request_code, buf);

+

+                                /* Find minor opcode name */

+    if (ev->request_code >= 128 && ext) {

+        XmuSnprintf(request, sizeof(request), "%d", ev->request_code);

+        XmuSnprintf(request, sizeof(request), "%s.%d",

+                    ext->name, ev->minor_code);

+        XGetErrorDatabaseText(dpy, "XRequest", request, "", buf, sizeof(buf));

+        dmxLog(dmxWarning, "                 Minor opcode: %d (%s)\n",

+               ev->minor_code, buf);

+    }

+

+                                /* Provide value information */

+    switch (ev->error_code) {

+    case BadValue:

+        dmxLog(dmxWarning, "                 Value:        0x%x\n",

+               ev->resourceid);

+        break;

+    case BadAtom:

+        dmxLog(dmxWarning, "                 AtomID:       0x%x\n",

+               ev->resourceid);

+        break;

+    default:

+        dmxLog(dmxWarning, "                 ResourceID:   0x%x\n",

+               ev->resourceid);

+        break;

+    }

+

+                                /* Provide serial number information */

+    dmxLog(dmxWarning, "                 Failed serial number:  %d\n",

+           ev->serial);

+    dmxLog(dmxWarning, "                 Current serial number: %d\n",

+           dpy->request);

+    return 0;

+}

+

+#ifdef GLXEXT

+static int dmxNOPErrorHandler(Display *dpy, XErrorEvent *ev)

+{

+    return 0;

+}

+#endif

+

+Bool dmxOpenDisplay(DMXScreenInfo *dmxScreen)

+{

+    if (!(dmxScreen->beDisplay = XOpenDisplay(dmxScreen->name)))

+	return FALSE;

+

+    dmxPropertyDisplay(dmxScreen);

+    return TRUE;

+}

+

+void dmxSetErrorHandler(DMXScreenInfo *dmxScreen)

+{

+    XSetErrorHandler(dmxErrorHandler);

+}

+

+static void dmxPrintScreenInfo(DMXScreenInfo *dmxScreen)

+{

+    XWindowAttributes attribs;

+    int               ndepths = 0, *depths = NULL;

+    int               i;

+    Display           *dpy   = dmxScreen->beDisplay;

+    Screen            *s     = DefaultScreenOfDisplay(dpy);

+    int               scr    = DefaultScreen(dpy);

+

+    XGetWindowAttributes(dpy, DefaultRootWindow(dpy), &attribs);

+    if (!(depths = XListDepths(dpy, scr, &ndepths))) ndepths = 0;

+    

+    dmxLogOutput(dmxScreen, "Name of display: %s\n", DisplayString(dpy));

+    dmxLogOutput(dmxScreen, "Version number:  %d.%d\n",

+                 ProtocolVersion(dpy), ProtocolRevision(dpy));

+    dmxLogOutput(dmxScreen, "Vendor string:   %s\n", ServerVendor(dpy));

+    if (!strstr(ServerVendor(dpy), "XFree86")) {

+        dmxLogOutput(dmxScreen, "Vendor release:  %d\n", VendorRelease(dpy));

+    } else {

+                                /* This code based on xdpyinfo.c */

+    	int v = VendorRelease(dpy);

+        int major = -1, minor = -1, patch = -1, subpatch = -1;

+

+        if (v < 336)

+            major = v / 100, minor = (v / 10) % 10, patch = v % 10;

+        else if (v < 3900) {

+            major = v / 1000;

+            minor = (v / 100) % 10;

+            if (((v / 10) % 10) || (v % 10)) {

+                patch = (v / 10) % 10;

+                if (v % 10) subpatch = v % 10;

+            }

+        } else if (v < 40000000) {

+            major = v / 1000;

+            minor = (v / 10) % 10;

+            if (v % 10) patch = v % 10;

+	} else {

+            major = v / 10000000;

+            minor = (v / 100000) % 100;

+            patch = (v / 1000) % 100;

+            if (v % 1000) subpatch = v % 1000;

+	}

+        dmxLogOutput(dmxScreen, "Vendor release:  %d (XFree86 version: %d.%d",

+                     v, major, minor);

+        if (patch > 0)    dmxLogOutputCont(dmxScreen, ".%d", patch);

+        if (subpatch > 0) dmxLogOutputCont(dmxScreen, ".%d", subpatch);

+        dmxLogOutputCont(dmxScreen, ")\n");

+    }

+

+    

+    dmxLogOutput(dmxScreen, "Dimensions:      %dx%d pixels\n", 

+                 attribs.width, attribs.height);

+    dmxLogOutput(dmxScreen, "%d depths on screen %d: ", ndepths, scr);

+    for (i = 0; i < ndepths; i++)

+        dmxLogOutputCont(dmxScreen, "%c%d", i ? ',' : ' ', depths[i]);

+    dmxLogOutputCont(dmxScreen, "\n");

+    dmxLogOutput(dmxScreen, "Depth of root window:  %d plane%s (%d)\n",

+                 attribs.depth, attribs.depth == 1 ? "" : "s",

+                 DisplayPlanes(dpy, scr));

+    dmxLogOutput(dmxScreen, "Number of colormaps:   %d min, %d max\n",

+                 MinCmapsOfScreen(s), MaxCmapsOfScreen(s));

+    dmxLogOutput(dmxScreen, "Options: backing-store %s, save-unders %s\n",

+                 (DoesBackingStore (s) == NotUseful) ? "no" :

+                 ((DoesBackingStore (s) == Always) ? "yes" : "when mapped"),

+                 DoesSaveUnders (s) ? "yes" : "no");

+    dmxLogOutput(dmxScreen, "Window Manager running: %s\n",

+		 (dmxScreen->WMRunningOnBE) ? "yes" : "no");

+

+    if (dmxScreen->WMRunningOnBE) {

+	dmxLogOutputWarning(dmxScreen,

+			    "Window manager running "

+			    "-- colormaps not supported\n");

+    }

+    XFree(depths);

+}

+

+void dmxGetScreenAttribs(DMXScreenInfo *dmxScreen)

+{

+    XWindowAttributes attribs;

+    Display           *dpy   = dmxScreen->beDisplay;

+#ifdef GLXEXT

+    int               dummy;

+#endif

+

+    XGetWindowAttributes(dpy, DefaultRootWindow(dpy), &attribs);

+

+    dmxScreen->beWidth  = attribs.width;

+    dmxScreen->beHeight = attribs.height;

+    

+                                /* Fill in missing geometry information */

+    if (dmxScreen->scrnXSign < 0) {

+        if (dmxScreen->scrnWidth) {

+            dmxScreen->scrnX   = (attribs.width - dmxScreen->scrnWidth

+				  - dmxScreen->scrnX);

+        } else {

+            dmxScreen->scrnWidth  = attribs.width - dmxScreen->scrnX;

+            dmxScreen->scrnX   = 0;

+        }

+    }

+    if (dmxScreen->scrnYSign < 0) {

+        if (dmxScreen->scrnHeight) {

+            dmxScreen->scrnY   = (attribs.height - dmxScreen->scrnHeight

+				  - dmxScreen->scrnY);

+        } else {

+            dmxScreen->scrnHeight = attribs.height - dmxScreen->scrnY;

+            dmxScreen->scrnY   = 0;

+        }

+    }

+    if (!dmxScreen->scrnWidth)

+        dmxScreen->scrnWidth  = attribs.width  - dmxScreen->scrnX;

+    if (!dmxScreen->scrnHeight)

+        dmxScreen->scrnHeight = attribs.height - dmxScreen->scrnY;

+

+    if (!dmxScreen->rootWidth)  dmxScreen->rootWidth  = dmxScreen->scrnWidth;

+    if (!dmxScreen->rootHeight) dmxScreen->rootHeight = dmxScreen->scrnHeight;

+    if (dmxScreen->rootWidth + dmxScreen->rootX > dmxScreen->scrnWidth)

+        dmxScreen->rootWidth = dmxScreen->scrnWidth - dmxScreen->rootX;

+    if (dmxScreen->rootHeight + dmxScreen->rootY > dmxScreen->scrnHeight)

+        dmxScreen->rootHeight = dmxScreen->scrnHeight - dmxScreen->rootY;

+

+    /* FIXME: Get these from the back-end server */

+    dmxScreen->beXDPI = 75;

+    dmxScreen->beYDPI = 75;

+

+    dmxScreen->beDepth  = attribs.depth; /* FIXME: verify that this

+					  * works always.  In

+					  * particular, this will work

+					  * well for depth=16, will fail

+					  * because of colormap issues

+					  * at depth 8.  More work needs

+					  * to be done here. */

+

+    if (dmxScreen->beDepth <= 8)       dmxScreen->beBPP = 8;

+    else if (dmxScreen->beDepth <= 16) dmxScreen->beBPP = 16;

+    else                               dmxScreen->beBPP = 32;

+

+#ifdef GLXEXT

+    /* get the majorOpcode for the back-end GLX extension */

+    XQueryExtension(dpy, "GLX", &dmxScreen->glxMajorOpcode,

+		    &dummy, &dmxScreen->glxErrorBase);

+#endif

+

+    dmxPrintScreenInfo(dmxScreen);

+    dmxLogOutput(dmxScreen, "%dx%d+%d+%d on %dx%d at depth=%d, bpp=%d\n",

+                 dmxScreen->scrnWidth, dmxScreen->scrnHeight,

+                 dmxScreen->scrnX, dmxScreen->scrnY,

+                 dmxScreen->beWidth, dmxScreen->beHeight,

+                 dmxScreen->beDepth, dmxScreen->beBPP);

+    if (dmxScreen->beDepth == 8)

+        dmxLogOutputWarning(dmxScreen,

+                            "Support for depth == 8 is not complete\n");

+}

+

+Bool dmxGetVisualInfo(DMXScreenInfo *dmxScreen)

+{

+    int i;

+    XVisualInfo visinfo;

+

+    visinfo.screen = DefaultScreen(dmxScreen->beDisplay);

+    dmxScreen->beVisuals = XGetVisualInfo(dmxScreen->beDisplay,

+					  VisualScreenMask,

+					  &visinfo,

+					  &dmxScreen->beNumVisuals);

+

+    dmxScreen->beDefVisualIndex = -1;

+

+    if (defaultColorVisualClass >= 0 || dmxDepth > 0) {

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

+	    if (defaultColorVisualClass >= 0) {

+		if (dmxScreen->beVisuals[i].class == defaultColorVisualClass) {

+		    if (dmxDepth > 0) {

+			if (dmxScreen->beVisuals[i].depth == dmxDepth) {

+			    dmxScreen->beDefVisualIndex = i;

+			    break;

+			}

+		    } else {

+			dmxScreen->beDefVisualIndex = i;

+			break;

+		    }

+		}

+	    } else if (dmxScreen->beVisuals[i].depth == dmxDepth) {

+		dmxScreen->beDefVisualIndex = i;

+		break;

+	    }

+    } else {

+	visinfo.visualid =

+	    XVisualIDFromVisual(DefaultVisual(dmxScreen->beDisplay,

+					      visinfo.screen));

+

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

+	    if (visinfo.visualid == dmxScreen->beVisuals[i].visualid) {

+		dmxScreen->beDefVisualIndex = i;

+		break;

+	    }

+    }

+

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

+        dmxLogVisual(dmxScreen, &dmxScreen->beVisuals[i],

+                     (i == dmxScreen->beDefVisualIndex));

+

+    return (dmxScreen->beDefVisualIndex >= 0);

+}

+

+void dmxGetColormaps(DMXScreenInfo *dmxScreen)

+{

+    int i;

+

+    dmxScreen->beNumDefColormaps = dmxScreen->beNumVisuals;

+    dmxScreen->beDefColormaps = xalloc(dmxScreen->beNumDefColormaps *

+				       sizeof(*dmxScreen->beDefColormaps));

+

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

+	dmxScreen->beDefColormaps[i] =

+	    XCreateColormap(dmxScreen->beDisplay,

+			    DefaultRootWindow(dmxScreen->beDisplay),

+			    dmxScreen->beVisuals[i].visual,

+			    AllocNone);

+

+    dmxScreen->beBlackPixel = BlackPixel(dmxScreen->beDisplay,

+					 DefaultScreen(dmxScreen->beDisplay));

+    dmxScreen->beWhitePixel = WhitePixel(dmxScreen->beDisplay,

+					 DefaultScreen(dmxScreen->beDisplay));

+}

+

+void dmxGetPixmapFormats(DMXScreenInfo *dmxScreen)

+{

+    dmxScreen->beDepths =

+	XListDepths(dmxScreen->beDisplay, DefaultScreen(dmxScreen->beDisplay),

+		    &dmxScreen->beNumDepths);

+

+    dmxScreen->bePixmapFormats =

+	XListPixmapFormats(dmxScreen->beDisplay,

+			   &dmxScreen->beNumPixmapFormats);

+}

+

+static Bool dmxSetPixmapFormats(ScreenInfo *pScreenInfo,

+				DMXScreenInfo *dmxScreen)

+{

+    XPixmapFormatValues *bePixmapFormat;

+    PixmapFormatRec     *format;

+    int                  i, j;

+

+    pScreenInfo->imageByteOrder = ImageByteOrder(dmxScreen->beDisplay);

+    pScreenInfo->bitmapScanlineUnit = BitmapUnit(dmxScreen->beDisplay);

+    pScreenInfo->bitmapScanlinePad = BitmapPad(dmxScreen->beDisplay);

+    pScreenInfo->bitmapBitOrder = BitmapBitOrder(dmxScreen->beDisplay);

+

+    pScreenInfo->numPixmapFormats = 0;

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

+	bePixmapFormat = &dmxScreen->bePixmapFormats[i];

+	for (j = 0; j < dmxScreen->beNumDepths; j++)

+	    if ((bePixmapFormat->depth == 1) ||

+		(bePixmapFormat->depth == dmxScreen->beDepths[j])) {

+		format = &pScreenInfo->formats[pScreenInfo->numPixmapFormats];

+

+		format->depth        = bePixmapFormat->depth;

+		format->bitsPerPixel = bePixmapFormat->bits_per_pixel;

+		format->scanlinePad  = bePixmapFormat->scanline_pad;

+

+		pScreenInfo->numPixmapFormats++;

+		break;

+	    }

+    }

+

+    return TRUE;

+}

+

+void dmxCheckForWM(DMXScreenInfo *dmxScreen)

+{

+    Status status;

+    XWindowAttributes xwa;

+

+    status = XGetWindowAttributes(dmxScreen->beDisplay,

+				  DefaultRootWindow(dmxScreen->beDisplay),

+				  &xwa);

+    dmxScreen->WMRunningOnBE =

+	(status &&

+	 ((xwa.all_event_masks & SubstructureRedirectMask) ||

+	  (xwa.all_event_masks & SubstructureNotifyMask)));

+}

+

+/** Initialize the display and collect relevant information about the

+ *  display properties */

+static void dmxDisplayInit(DMXScreenInfo *dmxScreen)

+{

+    if (!dmxOpenDisplay(dmxScreen))

+	dmxLog(dmxFatal,

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

+               dmxScreen->name);

+

+    dmxSetErrorHandler(dmxScreen);

+    dmxCheckForWM(dmxScreen);

+    dmxGetScreenAttribs(dmxScreen);

+

+    if (!dmxGetVisualInfo(dmxScreen))

+	dmxLog(dmxFatal, "dmxGetVisualInfo: No matching visuals found\n");

+

+    dmxGetColormaps(dmxScreen);

+    dmxGetPixmapFormats(dmxScreen);

+}

+

+/* If this doesn't compile, just add || defined(yoursystem) to the line

+ * below.  This information is to help with bug reports and is not

+ * critical. */

+#if !defined(_POSIX_SOURCE) 

+static const char *dmxExecOS(void) { return ""; }

+#else

+#include <sys/utsname.h>

+static const char *dmxExecOS(void)

+{

+    static char buffer[128];

+    static int  initialized = 0;

+    struct utsname u;

+

+    if (!initialized++) {

+        memset(buffer, 0, sizeof(buffer));

+        uname(&u);

+        XmuSnprintf(buffer, sizeof(buffer)-1, "%s %s %s",

+                    u.sysname, u.release, u.version);

+    }

+    return buffer;

+}

+#endif

+

+static const char *dmxBuildCompiler(void)

+{

+    static char buffer[128];

+    static int  initialized = 0;

+

+    if (!initialized++) {

+        memset(buffer, 0, sizeof(buffer));

+#if defined(__GNUC__) && defined(__GNUC_MINOR__) &&defined(__GNUC_PATCHLEVEL__)

+        XmuSnprintf(buffer, sizeof(buffer)-1, "gcc %d.%d.%d",

+                    __GNUC__, __GNUC_MINOR__, __GNUC_PATCHLEVEL__);

+#endif

+    }

+    return buffer;

+}

+

+static const char *dmxExecHost(void)

+{

+    static char buffer[128];

+    static int  initialized = 0;

+

+    if (!initialized++) {

+        memset(buffer, 0, sizeof(buffer));

+        XmuGetHostname(buffer, sizeof(buffer) - 1);

+    }

+    return buffer;

+}

+

+/** This routine is called in Xserver/dix/main.c from \a main(). */

+void InitOutput(ScreenInfo *pScreenInfo, int argc, char *argv[])

+{

+    int                  i;

+    static unsigned long dmxGeneration = 0;

+#ifdef GLXEXT

+    Bool                 glxSupported  = TRUE;

+#endif

+

+    if (dmxGeneration != serverGeneration) {

+	int vendrel = VENDOR_RELEASE;

+        int major, minor, year, month, day;

+        

+        dmxGeneration = serverGeneration;

+

+        major    = vendrel / 100000000;

+        vendrel -= major   * 100000000;

+        minor    = vendrel /   1000000;

+        vendrel -= minor   *   1000000;

+        year     = vendrel /     10000;

+        vendrel -= year    *     10000;

+        month    = vendrel /       100;

+        vendrel -= month   *       100;

+        day      = vendrel;

+

+                                /* Add other epoch tests here */

+        if (major > 0 && minor > 0) year += 2000;

+

+        dmxLog(dmxInfo, "Generation:         %d\n", dmxGeneration);

+        dmxLog(dmxInfo, "DMX version:        %d.%d.%02d%02d%02d (%s)\n",

+               major, minor, year, month, day, VENDOR_STRING);

+

+        SetVendorRelease(VENDOR_RELEASE);

+        SetVendorString(VENDOR_STRING);

+

+        if (dmxGeneration == 1) {

+            dmxLog(dmxInfo, "DMX Build OS:       %s (%s)\n", OSNAME, OSVENDOR);

+            dmxLog(dmxInfo, "DMX Build Compiler: %s\n", dmxBuildCompiler());

+            dmxLog(dmxInfo, "DMX Execution OS:   %s\n", dmxExecOS());

+            dmxLog(dmxInfo, "DMX Execution Host: %s\n", dmxExecHost());

+        }

+        dmxLog(dmxInfo, "MAXSCREENS:         %d\n", MAXSCREENS);

+

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

+            if (dmxScreens[i].beDisplay)

+                dmxLog(dmxWarning, "Display \"%s\" still open\n",

+                       dmxScreens[i].name);

+            dmxStatFree(dmxScreens[i].stat);

+            dmxScreens[i].stat = NULL;

+        }

+        for (i = 0; i < dmxNumInputs; i++) dmxInputFree(&dmxInputs[i]);

+        if (dmxScreens) free(dmxScreens);

+        if (dmxInputs)  free(dmxInputs);

+        dmxScreens    = NULL;

+        dmxInputs     = NULL;

+        dmxNumScreens = 0;

+        dmxNumInputs  = 0;

+    }

+

+    /* Make sure that the command-line arguments are sane. */

+    if (dmxAddRemoveScreens && dmxGLXProxy) {

+	/* Currently it is not possible to support GLX and Render

+	 * extensions with dynamic screen addition/removal due to the

+	 * state that each extension keeps, which cannot be restored. */

+        dmxLog(dmxWarning,

+	       "GLX Proxy and Render extensions do not yet support dynamic\n");

+        dmxLog(dmxWarning,

+	       "screen addition and removal.  Please specify -noglxproxy\n");

+        dmxLog(dmxWarning,

+	       "and -norender on the command line or in the configuration\n");

+        dmxLog(dmxWarning,

+	       "file to disable these two extensions if you wish to use\n");

+        dmxLog(dmxWarning,

+	       "the dynamic addition and removal of screens support.\n");

+        dmxLog(dmxFatal,

+	       "Dynamic screen addition/removal error (see above).\n");

+    }

+

+    /* ddxProcessArgument has been called at this point, but any data

+     * from the configuration file has not been applied.  Do so, and be

+     * sure we have at least one back-end display. */

+    dmxConfigConfigure();

+    if (!dmxNumScreens)

+        dmxLog(dmxFatal, "InitOutput: no back-end displays found\n");

+    if (!dmxNumInputs)

+        dmxLog(dmxInfo, "InitOutput: no inputs found\n");

+    

+    /* Disable lazy window creation optimization if offscreen

+     * optimization is disabled */

+    if (!dmxOffScreenOpt && dmxLazyWindowCreation) {

+        dmxLog(dmxInfo,

+	       "InitOutput: Disabling lazy window creation optimization\n");

+        dmxLog(dmxInfo,

+	       "            since it requires the offscreen optimization\n");

+        dmxLog(dmxInfo,

+	       "            to function properly.\n");

+	dmxLazyWindowCreation = FALSE;

+    }

+

+    /* Open each display and gather information about it. */

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

+        dmxDisplayInit(&dmxScreens[i]);

+

+#if PANORAMIX

+    /* Register a Xinerama callback which will run from within

+     * PanoramiXCreateConnectionBlock.  We can use the callback to

+     * determine if Xinerama is loaded and to check the visuals

+     * determined by PanoramiXConsolidate. */

+    XineramaRegisterConnectionBlockCallback(dmxConnectionBlockCallback);

+#endif

+

+    /* Since we only have a single screen thus far, we only need to set

+       the pixmap formats to match that screen.  FIXME: this isn't true.*/

+    if (!dmxSetPixmapFormats(pScreenInfo, &dmxScreens[0])) return;

+

+    /* Might want to install a signal handler to allow cleaning up after

+     * unexpected signals.  The DIX/OS layer already handles SIGINT and

+     * SIGTERM, so everything is OK for expected signals. --DD

+     *

+     * SIGHUP, SIGINT, and SIGTERM are trapped in os/connection.c

+     * SIGQUIT is another common signal that is sent from the keyboard.

+     * Trap it here, to ensure that the keyboard modifier map and other

+     * state for the input devices are restored. (This makes the

+     * behavior of SIGQUIT somewhat unexpected, since it will be the

+     * same as the behavior of SIGINT.  However, leaving the modifier

+     * map of the input devices empty is even more unexpected.) --RF

+     */

+    OsSignal(SIGQUIT, GiveUp);

+

+#ifdef GLXEXT

+    /* Check if GLX extension exists on all back-end servers */

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

+	glxSupported &= (dmxScreens[i].glxMajorOpcode > 0);

+#endif

+

+    /* Tell dix layer about the backend displays */

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

+

+#ifdef GLXEXT

+	if (glxSupported) {

+	    /*

+	     * Builds GLX configurations from the list of visuals

+	     * supported by the back-end server, and give that

+	     * configuration list to the glx layer - so that he will

+	     * build the visuals accordingly.

+	     */

+

+	    DMXScreenInfo       *dmxScreen    = &dmxScreens[i];

+	    __GLXvisualConfig   *configs      = NULL;

+	    dmxGlxVisualPrivate **configprivs = NULL;

+	    int                 nconfigs      = 0;

+	    int                 (*oldErrorHandler)(Display *, XErrorEvent *);

+	    int                 i;

+

+	    /* Catch errors if when using an older GLX w/o FBconfigs */

+	    oldErrorHandler = XSetErrorHandler(dmxNOPErrorHandler);

+

+	    /* Get FBConfigs of the back-end server */

+	    dmxScreen->fbconfigs = GetGLXFBConfigs(dmxScreen->beDisplay,

+						   dmxScreen->glxMajorOpcode,

+						   &dmxScreen->numFBConfigs);

+

+	    XSetErrorHandler(oldErrorHandler);

+

+	    dmxScreen->glxVisuals = 

+		GetGLXVisualConfigs(dmxScreen->beDisplay,

+				    DefaultScreen(dmxScreen->beDisplay),

+				    &dmxScreen->numGlxVisuals);

+

+	    if (dmxScreen->fbconfigs) {

+		configs =

+		    GetGLXVisualConfigsFromFBConfigs(dmxScreen->fbconfigs,

+						     dmxScreen->numFBConfigs,

+						     dmxScreen->beVisuals,

+						     dmxScreen->beNumVisuals,

+						     dmxScreen->glxVisuals,

+						     dmxScreen->numGlxVisuals,

+						     &nconfigs);

+	    } else {

+		configs = dmxScreen->glxVisuals;

+		nconfigs = dmxScreen->numGlxVisuals;

+	    }

+

+	    configprivs = xalloc(nconfigs * sizeof(dmxGlxVisualPrivate*));

+

+	    if (configs != NULL && configprivs != NULL) {

+

+		/* Initialize our private info for each visual

+		 * (currently only x_visual_depth and x_visual_class)

+		 */

+		for (i = 0; i < nconfigs; i++) {

+

+		    configprivs[i] = (dmxGlxVisualPrivate *)

+			xalloc(sizeof(dmxGlxVisualPrivate));

+		    configprivs[i]->x_visual_depth = 0;

+		    configprivs[i]->x_visual_class = 0;

+

+		    /* Find the visual depth */

+		    if (configs[i].vid > 0) {

+			int  j;

+			for (j = 0; j < dmxScreen->beNumVisuals; j++) {

+			    if (dmxScreen->beVisuals[j].visualid ==

+				configs[i].vid) {

+				configprivs[i]->x_visual_depth =

+				    dmxScreen->beVisuals[j].depth;

+				configprivs[i]->x_visual_class =

+				    dmxScreen->beVisuals[j].class;

+				break;

+			    }

+			}

+		    }

+		}

+

+		/* Hand out the glx configs to glx extension */

+		GlxSetVisualConfigs(nconfigs, configs, (void**)configprivs);

+

+                XFlush(dmxScreen->beDisplay);

+	    }

+	}

+#endif  /* GLXEXT */

+

+	AddScreen(dmxScreenInit, argc, argv);

+    }

+

+    /* Compute origin information. */

+    dmxInitOrigins();

+

+    /* Compute overlap information. */

+    dmxInitOverlap();

+

+    /* Make sure there is a global width/height available */

+    dmxComputeWidthHeight(DMX_NO_RECOMPUTE_BOUNDING_BOX);

+

+    /* FIXME: The following is temporarily placed here.  When the DMX

+     * extension is available, it will be move there.

+     */

+    dmxInitFonts();

+

+#ifdef RENDER

+    /* Initialize the render extension */

+    if (!noRenderExtension)

+	dmxInitRender();

+#endif

+

+    /* Initialized things that need timer hooks */

+    dmxStatInit();

+    dmxSyncInit();              /* Calls RegisterBlockAndWakeupHandlers */

+

+    dmxLog(dmxInfo, "Shadow framebuffer support %s\n",

+	   dmxShadowFB ? "enabled" : "disabled");

+}

+

+/* RATS: Assuming the fp string (which comes from the command-line argv

+         vector) is NULL-terminated, the buffer is large enough for the

+         strcpy. */ 

+static void dmxSetDefaultFontPath(char *fp)

+{

+    int fplen = strlen(fp) + 1;

+    

+    if (dmxFontPath) {

+	int len;

+

+	len = strlen(dmxFontPath);

+	dmxFontPath = xrealloc(dmxFontPath, len+fplen+1);

+	dmxFontPath[len] = ',';

+	strncpy(&dmxFontPath[len+1], fp, fplen);

+    } else {

+	dmxFontPath = xalloc(fplen);

+	strncpy(dmxFontPath, fp, fplen);

+    }

+

+    defaultFontPath = dmxFontPath;

+}

+

+/** This function is called in Xserver/os/utils.c from \a AbortServer().

+ * We must ensure that backend and console state is restored in the

+ * event the server shutdown wasn't clean. */

+void AbortDDX(void)

+{

+    int i;

+

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

+        DMXScreenInfo *dmxScreen = &dmxScreens[i];

+        

+        if (dmxScreen->beDisplay) XCloseDisplay(dmxScreen->beDisplay);

+        dmxScreen->beDisplay = NULL;

+    }

+}

+

+#ifdef DDXBEFORERESET

+/* This function is called in Xserver/dix/dispatch.c */

+void ddxBeforeReset(void)

+{

+}

+#endif

+

+/** This function is called in Xserver/dix/main.c from \a main() when

+ * dispatchException & DE_TERMINATE (which is the only way to exit the

+ * main loop without an interruption. */

+void ddxGiveUp(void)

+{

+    AbortDDX();

+}

+

+/** This function is called in Xserver/os/osinit.c from \a OsInit(). */

+void OsVendorInit(void)

+{

+}

+

+/** This function is called in Xserver/os/utils.c from \a FatalError()

+ * and \a VFatalError().  (Note that setting the function pointer \a

+ * OsVendorVErrorFProc will cause \a VErrorF() (which is called by the

+ * two routines mentioned here, as well as by others) to use the

+ * referenced routine instead of \a vfprintf().) */

+void OsVendorFatalError(void)

+{

+}

+

+/** Process our command line arguments. */

+int ddxProcessArgument(int argc, char *argv[], int i)

+{

+    int retval = 0;

+    

+    if (!strcmp(argv[i], "-display")) {

+	if (++i < argc) dmxConfigStoreDisplay(argv[i]);

+        retval = 2;

+    } else if (!strcmp(argv[i], "-inputfrom") || !strcmp(argv[i], "-input")) {

+	if (++i < argc) dmxConfigStoreInput(argv[i]);

+        retval = 2;

+    } else if (!strcmp(argv[i], "-xinputfrom") || !strcmp(argv[i],"-xinput")) {

+        if (++i < argc) dmxConfigStoreXInput(argv[i]);

+        retval = 2;

+    } else if (!strcmp(argv[i], "-noshadowfb")) {

+        dmxLog(dmxWarning,

+               "-noshadowfb has been deprecated "

+	       "since it is now the default\n");

+	dmxShadowFB = FALSE;

+	retval = 1;

+    } else if (!strcmp(argv[i], "-nomulticursor")) {

+        dmxCursorNoMulti();

+	retval = 1;

+    } else if (!strcmp(argv[i], "-shadowfb")) {

+	dmxShadowFB = TRUE;

+	retval = 1;

+    } else if (!strcmp(argv[i], "-configfile")) {

+        if (++i < argc) dmxConfigStoreFile(argv[i]);

+        retval = 2;

+    } else if (!strcmp(argv[i], "-config")) {

+        if (++i < argc) dmxConfigStoreConfig(argv[i]);

+        retval = 2;

+    } else if (!strcmp(argv[i], "-fontpath")) {

+        if (++i < argc) dmxSetDefaultFontPath(argv[i]);

+        retval = 2;

+    } else if (!strcmp(argv[i], "-stat")) {

+        if ((i += 2) < argc) dmxStatActivate(argv[i-1], argv[i]);

+        retval = 3;

+    } else if (!strcmp(argv[i], "-syncbatch")) {

+        if (++i < argc) dmxSyncActivate(argv[i]);

+        retval = 2;

+    } else if (!strcmp(argv[i], "-nooffscreenopt")) {

+	dmxOffScreenOpt = FALSE;

+        retval = 1;

+    } else if (!strcmp(argv[i], "-nosubdivprims")) {

+	dmxSubdividePrimitives = FALSE;

+        retval = 1;

+    } else if (!strcmp(argv[i], "-nowindowopt")) {

+	dmxLazyWindowCreation = FALSE;

+        retval = 1;

+    } else if (!strcmp(argv[i], "-noxkb")) {

+	dmxUseXKB = FALSE;

+        retval = 1;

+    } else if (!strcmp(argv[i], "-depth")) {

+        if (++i < argc) dmxDepth = atoi(argv[i]);

+        retval = 2;

+    } else if (!strcmp(argv[i], "-norender")) {

+	noRenderExtension = TRUE;

+        retval = 1;

+#ifdef GLXEXT

+    } else if (!strcmp(argv[i], "-noglxproxy")) {

+	dmxGLXProxy = FALSE;

+        retval = 1;

+    } else if (!strcmp(argv[i], "-noglxswapgroup")) {

+	dmxGLXSwapGroupSupport = FALSE;

+        retval = 1;

+    } else if (!strcmp(argv[i], "-glxsyncswap")) {

+	dmxGLXSyncSwap = TRUE;

+        retval = 1;

+    } else if (!strcmp(argv[i], "-glxfinishswap")) {

+	dmxGLXFinishSwap = TRUE;

+        retval = 1;

+#endif

+    } else if (!strcmp(argv[i], "-ignorebadfontpaths")) {

+	dmxIgnoreBadFontPaths = TRUE;

+        retval = 1;

+    } else if (!strcmp(argv[i], "-addremovescreens")) {

+	dmxAddRemoveScreens = TRUE;

+        retval = 1;

+    } else if (!strcmp(argv[i], "-param")) {

+        if ((i += 2) < argc) {

+            if (!strcasecmp(argv[i-1], "xkbrules"))

+                dmxConfigSetXkbRules(argv[i]);

+            else if (!strcasecmp(argv[i-1], "xkbmodel"))

+                dmxConfigSetXkbModel(argv[i]);

+            else if (!strcasecmp(argv[i-1], "xkblayout"))

+                dmxConfigSetXkbLayout(argv[i]);

+            else if (!strcasecmp(argv[i-1], "xkbvariant"))

+                dmxConfigSetXkbVariant(argv[i]);

+            else if (!strcasecmp(argv[i-1], "xkboptions"))

+                dmxConfigSetXkbOptions(argv[i]);

+            else

+                dmxLog(dmxWarning,

+                       "-param requires: XkbRules, XkbModel, XkbLayout,"

+                       " XkbVariant, or XkbOptions\n");

+        }

+        retval = 3;

+    }

+    if (!serverGeneration) dmxConfigSetMaxScreens();

+    return retval;

+}

+

+/** Provide succinct usage information for the DMX server. */

+void ddxUseMsg(void)

+{

+    ErrorF("\n\nDevice Dependent Usage:\n");

+    ErrorF("-display string      Specify the back-end display(s)\n");

+    ErrorF("-input string        Specify input source for core device\n");

+    ErrorF("-xinput string       Specify input source for XInput device\n");

+    ErrorF("-shadowfb            Enable shadow frame buffer\n");

+    ErrorF("-configfile file     Read from a configuration file\n");

+    ErrorF("-config config       Select a specific configuration\n");

+    ErrorF("-nomulticursor       Turn of multiple cursor support\n");

+    ErrorF("-fontpath            Sets the default font path\n");

+    ErrorF("-stat inter scrns    Print out performance statistics\n");

+    ErrorF("-syncbatch inter     Set interval for XSync batching\n");

+    ErrorF("-nooffscreenopt      Disable offscreen optimization\n");

+    ErrorF("-nosubdivprims       Disable primitive subdivision\n");

+    ErrorF("                     optimization\n");

+    ErrorF("-nowindowopt         Disable lazy window creation optimization\n");

+    ErrorF("-noxkb               Disable use of the XKB extension with\n");

+    ErrorF("                     backend displays (cf. -kb).\n");

+    ErrorF("-depth               Specify the default root window depth\n");

+    ErrorF("-norender            Disable RENDER extension support\n");

+#ifdef GLXEXT

+    ErrorF("-noglxproxy          Disable GLX Proxy\n");

+    ErrorF("-noglxswapgroup      Disable swap group and swap barrier\n");

+    ErrorF("                     extensions in GLX proxy\n");

+    ErrorF("-glxsyncswap         Force XSync after swap buffers\n");

+    ErrorF("-glxfinishswap       Force glFinish after swap buffers\n");

+#endif

+    ErrorF("-ignorebadfontpaths  Ignore bad font paths during initialization\n");

+    ErrorF("-addremovescreens    Enable dynamic screen addition/removal\n");

+    ErrorF("-param ...           Specify configuration parameters (e.g.,\n");

+    ErrorF("                     XkbRules, XkbModel, XkbLayout, etc.)\n");

+    ErrorF("\n");

+    ErrorF("    If the -input string matches a -display string, then input\n"

+           "    is taken from that backend display.  (XInput cannot be taken\n"

+           "    from a backend display.)  Placing \",console\" after the\n"

+           "    display name will force a console window to be opened on\n"

+           "    that display in addition to the backend input.  This is\n"

+           "    useful if the backend window does not cover the whole\n"

+           "    physical display.\n\n");

+    

+    ErrorF("    Otherwise, if the -input or -xinput string specifies another\n"

+           "    X display, then a console window will be created on that\n"

+           "    display.  Placing \",windows\" or \",nowindows\" after the\n"

+           "    display name will control the display of window outlines in\n"

+           "    the console.\n\n");

+    

+    ErrorF("    -input or -xinput dummy specifies no input.\n");

+    ErrorF("    -input or -xinput local specifies the use of a raw keyboard,\n"

+           "    mouse, or other (extension) device:\n"

+           "        -input local,kbd,ps2 will use a ps2 mouse\n"

+           "        -input local,kbd,ms  will use a serial mouse\n"

+           "        -input local,usb-kbd,usb-mou will use USB devices \n"

+           "        -xinput local,usb-oth will use a non-mouse and\n"

+           "                non-keyboard USB device with XInput\n\n");

+    

+    ErrorF("    Special Keys:\n");

+    ErrorF("        Ctrl-Alt-g    Server grab/ungrab (console only)\n");

+    ErrorF("        Ctrl-Alt-f    Fine (1-pixel) mouse mode (console only)\n");

+    ErrorF("        Ctrl-Alt-q    Quit (core devices only)\n");

+    ErrorF("        Ctrl-Alt-F*   Switch to VC (local only)\n");

+}

diff --git a/xorg-server/hw/kdrive/ephyr/ephyr.c b/xorg-server/hw/kdrive/ephyr/ephyr.c
index 254fcbc54..87e48afaf 100644
--- a/xorg-server/hw/kdrive/ephyr/ephyr.c
+++ b/xorg-server/hw/kdrive/ephyr/ephyr.c
@@ -1,1176 +1,1187 @@
-/*
- * Xephyr - A kdrive X server thats runs in a host X window.
- *          Authored by Matthew Allum <mallum@openedhand.com>
- * 
- * Copyright © 2004 Nokia 
- *
- * 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, and that the name of Nokia not be used in
- * advertising or publicity pertaining to distribution of the software without
- * specific, written prior permission. Nokia makes no
- * representations about the suitability of this software for any purpose.  It
- * is provided "as is" without express or implied warranty.
- *
- * NOKIA DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL NOKIA BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <kdrive-config.h>
-#endif
-#include "ephyr.h"
-
-#include "inputstr.h"
-#include "scrnintstr.h"
-#include "ephyrlog.h"
-
-#ifdef XF86DRI
-#include "ephyrdri.h"
-#include "ephyrdriext.h"
-#include "ephyrglxext.h"
-#endif /* XF86DRI */
-
-extern int KdTsPhyScreen;
-#ifdef GLXEXT
-extern Bool noGlxVisualInit;
-#endif
-
-KdKeyboardInfo *ephyrKbd;
-KdPointerInfo *ephyrMouse;
-EphyrKeySyms ephyrKeySyms;
-Bool ephyrNoDRI=FALSE ;
-Bool ephyrNoXV=FALSE ;
-
-static int mouseState = 0;
-
-typedef struct _EphyrInputPrivate {
-    Bool    enabled;
-} EphyrKbdPrivate, EphyrPointerPrivate;
-
-Bool   EphyrWantGrayScale = 0;
-
-
-Bool
-ephyrInitialize (KdCardInfo *card, EphyrPriv *priv)
-{
-  OsSignal(SIGUSR1, hostx_handle_signal);
-  
-  priv->base = 0;
-  priv->bytes_per_line = 0;
-  return TRUE;
-}
-
-Bool
-ephyrCardInit (KdCardInfo *card)
-{
-  EphyrPriv	*priv;
-  
-  priv = (EphyrPriv *) xalloc (sizeof (EphyrPriv));
-  if (!priv)
-    return FALSE;
-  
-  if (!ephyrInitialize (card, priv))
-    {
-      xfree (priv);
-      return FALSE;
-    }
-  card->driver = priv;
-  
-  return TRUE;
-}
-
-Bool
-ephyrScreenInitialize (KdScreenInfo *screen, EphyrScrPriv *scrpriv)
-{
-  int width = 640, height = 480; 
-  CARD32 redMask, greenMask, blueMask;
-  
-  if (hostx_want_screen_size(screen, &width, &height)
-      || !screen->width || !screen->height)
-    {
-      screen->width = width;
-      screen->height = height;
-    }
-
-  if (EphyrWantGrayScale)
-    screen->fb[0].depth = 8;
-
-  if (screen->fb[0].depth && screen->fb[0].depth != hostx_get_depth())
-    {
-      if (screen->fb[0].depth < hostx_get_depth()
-	  && (screen->fb[0].depth == 24 || screen->fb[0].depth == 16
-	      || screen->fb[0].depth == 8))
-	{
-	  hostx_set_server_depth(screen, screen->fb[0].depth);
-	}
-      else
-	ErrorF("\nXephyr: requested screen depth not supported, setting to match hosts.\n");
-    }
-  
-  screen->fb[0].depth = hostx_get_server_depth(screen);
-  screen->rate = 72;
-  
-  if (screen->fb[0].depth <= 8)
-    {
-      if (EphyrWantGrayScale)
-	screen->fb[0].visuals = ((1 << StaticGray) | (1 << GrayScale));
-      else
-	screen->fb[0].visuals = ((1 << StaticGray) |
-				 (1 << GrayScale) |
-				 (1 << StaticColor) |
-				 (1 << PseudoColor) |
-				 (1 << TrueColor) |
-				 (1 << DirectColor));
-      
-      screen->fb[0].redMask   = 0x00;
-      screen->fb[0].greenMask = 0x00;
-      screen->fb[0].blueMask  = 0x00;
-      screen->fb[0].depth        = 8;
-      screen->fb[0].bitsPerPixel = 8;
-    }
-  else 
-    {
-      screen->fb[0].visuals = (1 << TrueColor);
-      
-      if (screen->fb[0].depth <= 15)
-	{
-	  screen->fb[0].depth = 15;
-	  screen->fb[0].bitsPerPixel = 16;
-	}
-      else if (screen->fb[0].depth <= 16)
-	{
-	  screen->fb[0].depth = 16;
-	  screen->fb[0].bitsPerPixel = 16;
-	}
-      else if (screen->fb[0].depth <= 24)
-	{
-	  screen->fb[0].depth = 24;
-	  screen->fb[0].bitsPerPixel = 32;
-	}
-      else if (screen->fb[0].depth <= 30)
-	{
-	  screen->fb[0].depth = 30;
-	  screen->fb[0].bitsPerPixel = 32;
-	}
-      else
-	{
-	  ErrorF("\nXephyr: Unsupported screen depth %d\n",
-	         screen->fb[0].depth);
-	  return FALSE;
-	}
-
-      hostx_get_visual_masks (screen, &redMask, &greenMask, &blueMask);
-
-      screen->fb[0].redMask = (Pixel) redMask;
-      screen->fb[0].greenMask = (Pixel) greenMask;
-      screen->fb[0].blueMask = (Pixel) blueMask;
-
-    }
-  
-  scrpriv->randr = screen->randr;
-
-  return ephyrMapFramebuffer (screen);
-}
-
-Bool
-ephyrScreenInit (KdScreenInfo *screen)
-{
-  EphyrScrPriv *scrpriv;
-  
-  scrpriv = xcalloc (1, sizeof (EphyrScrPriv));
-
-  if (!scrpriv)
-    return FALSE;
-
-  screen->driver = scrpriv;
-
-  if (!ephyrScreenInitialize (screen, scrpriv))
-    {
-      screen->driver = 0;
-      xfree (scrpriv);
-      return FALSE;
-    }
-
-  return TRUE;
-}
-    
-void*
-ephyrWindowLinear (ScreenPtr	pScreen,
-		   CARD32	row,
-		   CARD32	offset,
-		   int		mode,
-		   CARD32	*size,
-		   void		*closure)
-{
-  KdScreenPriv(pScreen);
-  EphyrPriv	    *priv = pScreenPriv->card->driver;
-  
-  if (!pScreenPriv->enabled)
-    return 0;
-
-  *size = priv->bytes_per_line;
-  return priv->base + row * priv->bytes_per_line + offset;
-}
-
-Bool
-ephyrMapFramebuffer (KdScreenInfo *screen)
-{
-  EphyrScrPriv  *scrpriv = screen->driver;
-  EphyrPriv	  *priv    = screen->card->driver;
-  KdPointerMatrix m;
-  int buffer_height;
-  
-  EPHYR_LOG("screen->width: %d, screen->height: %d index=%d",
-	     screen->width, screen->height, screen->mynum);
-  
-  KdComputePointerMatrix (&m, scrpriv->randr, screen->width, screen->height);
-  KdSetPointerMatrix (&m);
-  
-  priv->bytes_per_line = ((screen->width * screen->fb[0].bitsPerPixel + 31) >> 5) << 2;
-  
-  /* point the framebuffer to the data in an XImage */
-  /* If fakexa is enabled, allocate a larger buffer so that fakexa has space to
-   * put offscreen pixmaps.
-   */
-  if (ephyrFuncs.initAccel == NULL)
-    buffer_height = screen->height;
-  else
-    buffer_height = 3 * screen->height;
-
-  priv->base = hostx_screen_init (screen, screen->width, screen->height, buffer_height);
-
-  screen->memory_base  = (CARD8 *) (priv->base);
-  screen->memory_size  = priv->bytes_per_line * buffer_height;
-  screen->off_screen_base = priv->bytes_per_line * screen->height;
-  
-  if ((scrpriv->randr & RR_Rotate_0) && !(scrpriv->randr & RR_Reflect_All))
-    {
-      scrpriv->shadow = FALSE;
-      
-      screen->fb[0].byteStride = priv->bytes_per_line;
-      screen->fb[0].pixelStride = screen->width;
-      screen->fb[0].frameBuffer = (CARD8 *) (priv->base);
-    }
-  else
-    {
-      /* Rotated/Reflected so we need to use shadow fb */
-      scrpriv->shadow = TRUE;
-      
-      EPHYR_LOG("allocing shadow");
-      
-      KdShadowFbAlloc (screen, 0, 
-		       scrpriv->randr & (RR_Rotate_90|RR_Rotate_270));
-    }
-  
-  return TRUE;
-}
-
-void
-ephyrSetScreenSizes (ScreenPtr pScreen)
-{
-  KdScreenPriv(pScreen);
-  KdScreenInfo	*screen = pScreenPriv->screen;
-  EphyrScrPriv	*scrpriv = screen->driver;
-  
-  if (scrpriv->randr & (RR_Rotate_0|RR_Rotate_180))
-    {
-      pScreen->width = screen->width;
-      pScreen->height = screen->height;
-      pScreen->mmWidth = screen->width_mm;
-      pScreen->mmHeight = screen->height_mm;
-    }
-  else 
-    {
-      pScreen->width = screen->height;
-      pScreen->height = screen->width;
-      pScreen->mmWidth = screen->height_mm;
-      pScreen->mmHeight = screen->width_mm;
-    }
-}
-
-Bool
-ephyrUnmapFramebuffer (KdScreenInfo *screen)
-{
-  EphyrScrPriv  *scrpriv = screen->driver;
-  
-  if (scrpriv->shadow)
-    KdShadowFbFree (screen, 0);
-  
-  /* Note, priv->base will get freed when XImage recreated */
-  
-  return TRUE;
-}
-
-void 
-ephyrShadowUpdate (ScreenPtr pScreen, shadowBufPtr pBuf)
-{
-  KdScreenPriv(pScreen);
-  KdScreenInfo *screen = pScreenPriv->screen;
-  
-  EPHYR_LOG("slow paint");
-  
-  /* FIXME: Slow Rotated/Reflected updates could be much
-   * much faster efficiently updating via tranforming 
-   * pBuf->pDamage  regions     
-  */
-  shadowUpdateRotatePacked(pScreen, pBuf);
-  hostx_paint_rect(screen, 0,0,0,0, screen->width, screen->height);
-}
-
-static void
-ephyrInternalDamageRedisplay (ScreenPtr pScreen)
-{
-  KdScreenPriv(pScreen);
-  KdScreenInfo	*screen = pScreenPriv->screen;
-  EphyrScrPriv	*scrpriv = screen->driver;
-  RegionPtr	 pRegion;
-
-  if (!scrpriv || !scrpriv->pDamage)
-    return;
-
-  pRegion = DamageRegion (scrpriv->pDamage);
-
-  if (REGION_NOTEMPTY (pScreen, pRegion))
-    {
-      int           nbox;
-      BoxPtr        pbox;
-
-      nbox = REGION_NUM_RECTS (pRegion);
-      pbox = REGION_RECTS (pRegion);
-
-      while (nbox--)
-        {
-          hostx_paint_rect(screen,
-                           pbox->x1, pbox->y1,
-                           pbox->x1, pbox->y1,
-                           pbox->x2 - pbox->x1,
-                           pbox->y2 - pbox->y1);
-          pbox++;
-        }
-      DamageEmpty (scrpriv->pDamage);
-    }
-}
-
-static void
-ephyrInternalDamageBlockHandler (pointer   data,
-				 OSTimePtr pTimeout,
-				 pointer   pRead)
-{
-  ScreenPtr pScreen = (ScreenPtr) data;
-  
-  ephyrInternalDamageRedisplay (pScreen);
-}
-
-static void
-ephyrInternalDamageWakeupHandler (pointer data, int i, pointer LastSelectMask)
-{
-  /* FIXME: Not needed ? */
-}
-
-Bool
-ephyrSetInternalDamage (ScreenPtr pScreen)
-{
-  KdScreenPriv(pScreen);
-  KdScreenInfo	*screen = pScreenPriv->screen;
-  EphyrScrPriv	*scrpriv = screen->driver;
-  PixmapPtr      pPixmap = NULL;
-  
-  scrpriv->pDamage = DamageCreate ((DamageReportFunc) 0,
-				   (DamageDestroyFunc) 0,
-				   DamageReportNone,
-				   TRUE,
-				   pScreen,
-				   pScreen);
-  
-  if (!RegisterBlockAndWakeupHandlers (ephyrInternalDamageBlockHandler,
-				       ephyrInternalDamageWakeupHandler,
-				       (pointer) pScreen))
-    return FALSE;
-  
-  pPixmap = (*pScreen->GetScreenPixmap) (pScreen);
-  
-  DamageRegister (&pPixmap->drawable, scrpriv->pDamage);
-      
-  return TRUE;
-}
-
-void
-ephyrUnsetInternalDamage (ScreenPtr pScreen)
-{
-  KdScreenPriv(pScreen);
-  KdScreenInfo	*screen = pScreenPriv->screen;
-  EphyrScrPriv	*scrpriv = screen->driver;
-  PixmapPtr      pPixmap = NULL;
-  
-  pPixmap = (*pScreen->GetScreenPixmap) (pScreen);
-  DamageUnregister (&pPixmap->drawable, scrpriv->pDamage);
-  DamageDestroy (scrpriv->pDamage);
-  
-  RemoveBlockAndWakeupHandlers (ephyrInternalDamageBlockHandler,
-				ephyrInternalDamageWakeupHandler,
-				(pointer) pScreen);
-}
-
-#ifdef RANDR
-Bool
-ephyrRandRGetInfo (ScreenPtr pScreen, Rotation *rotations)
-{
-  KdScreenPriv(pScreen);
-  KdScreenInfo	    *screen = pScreenPriv->screen;
-  EphyrScrPriv	    *scrpriv = screen->driver;
-  RRScreenSizePtr	    pSize;
-  Rotation		    randr;
-  int			    n = 0;
- 
-  struct { int width, height; } sizes[] = 
-    {
-      { 1600, 1200 },
-      { 1400, 1050 },
-      { 1280, 960  },
-      { 1280, 1024 },
-      { 1152, 864 },
-      { 1024, 768 },
-      { 832, 624 },
-      { 800, 600 },
-      { 720, 400 },
-      { 480, 640 },
-      { 640, 480 },
-      { 640, 400 },
-      { 320, 240 },
-      { 240, 320 },
-      { 160, 160 }, 
-      { 0, 0 }
-    };
-
-  EPHYR_LOG("mark");
-
-  *rotations = RR_Rotate_All|RR_Reflect_All;
-
-  if (!hostx_want_preexisting_window (screen)
-      && !hostx_want_fullscreen ()) /* only if no -parent switch */
-    {
-      while (sizes[n].width != 0 && sizes[n].height != 0)
-	{
-	  RRRegisterSize (pScreen,
-			  sizes[n].width,
-			  sizes[n].height, 
-			  (sizes[n].width * screen->width_mm)/screen->width,
-			  (sizes[n].height *screen->height_mm)/screen->height
-			  );
-	  n++;
-	}
-    }
-  
-  pSize = RRRegisterSize (pScreen,
-			  screen->width,
-			  screen->height, 
-			  screen->width_mm,
-			  screen->height_mm);
-    
-  randr = KdSubRotation (scrpriv->randr, screen->randr);
-  
-  RRSetCurrentConfig (pScreen, randr, 0, pSize);
-    
-  return TRUE;
-}
-
-Bool
-ephyrRandRSetConfig (ScreenPtr		pScreen,
-		     Rotation		randr,
-		     int		rate,
-		     RRScreenSizePtr	pSize)
-{
-  KdScreenPriv(pScreen);
-  KdScreenInfo	*screen    = pScreenPriv->screen;
-  EphyrScrPriv	*scrpriv   = screen->driver;
-  Bool		wasEnabled = pScreenPriv->enabled;
-  EphyrScrPriv	oldscr;
-  int		oldwidth, oldheight, oldmmwidth, oldmmheight;
-  Bool          oldshadow;
-  int		newwidth, newheight;
-  
-  if (screen->randr & (RR_Rotate_0|RR_Rotate_180))
-    {
-      newwidth = pSize->width;
-      newheight = pSize->height;
-    }
-  else
-    {
-      newwidth = pSize->height;
-      newheight = pSize->width;
-    }
-  
-  if (wasEnabled)
-    KdDisableScreen (pScreen);
-
-  oldscr = *scrpriv;
-    
-  oldwidth    = screen->width;
-  oldheight   = screen->height;
-  oldmmwidth  = pScreen->mmWidth;
-  oldmmheight = pScreen->mmHeight;
-  oldshadow   = scrpriv->shadow;
-  
-  /*
-   * Set new configuration
-   */
-  
-  scrpriv->randr = KdAddRotation (screen->randr, randr);
-  
-  ephyrUnmapFramebuffer (screen); 
-  
-  screen->width  = newwidth;
-  screen->height = newheight;
-  
-  if (!ephyrMapFramebuffer (screen))
-    goto bail4;
-  
-  /* FIXME below should go in own call */
-  
-  if (oldshadow)
-    KdShadowUnset (screen->pScreen);
-  else
-    ephyrUnsetInternalDamage(screen->pScreen);
-  
-  if (scrpriv->shadow)
-    {
-      if (!KdShadowSet (screen->pScreen, 
-			scrpriv->randr, 
-			ephyrShadowUpdate, 
-			ephyrWindowLinear))
-	goto bail4;
-    }
-  else
-    {
-      /* Without shadow fb ( non rotated ) we need 
-       * to use damage to efficiently update display
-       * via signal regions what to copy from 'fb'.
-       */
-      if (!ephyrSetInternalDamage(screen->pScreen))
-	goto bail4;
-    }
-  
-  ephyrSetScreenSizes (screen->pScreen);
-  
-  /*
-   * Set frame buffer mapping
-   */
-  (*pScreen->ModifyPixmapHeader) (fbGetScreenPixmap (pScreen),
-				  pScreen->width,
-				  pScreen->height,
-				  screen->fb[0].depth,
-				  screen->fb[0].bitsPerPixel,
-				  screen->fb[0].byteStride,
-				  screen->fb[0].frameBuffer);
-  
-  /* set the subpixel order */
-  
-  KdSetSubpixelOrder (pScreen, scrpriv->randr);
-  
-  if (wasEnabled)
-    KdEnableScreen (pScreen);
-  
-  return TRUE;
-  
- bail4:
-  EPHYR_LOG("bailed");
-  
-  ephyrUnmapFramebuffer (screen);
-  *scrpriv = oldscr;
-  (void) ephyrMapFramebuffer (screen);
-  
-  pScreen->width = oldwidth;
-  pScreen->height = oldheight;
-  pScreen->mmWidth = oldmmwidth;
-  pScreen->mmHeight = oldmmheight;
-  
-  if (wasEnabled)
-    KdEnableScreen (pScreen);
-  return FALSE;
-}
-
-Bool
-ephyrRandRInit (ScreenPtr pScreen)
-{
-  rrScrPrivPtr    pScrPriv;
-  
-  if (!RRScreenInit (pScreen))
-    return FALSE;
-  
-  pScrPriv = rrGetScrPriv(pScreen);
-  pScrPriv->rrGetInfo = ephyrRandRGetInfo;
-  pScrPriv->rrSetConfig = ephyrRandRSetConfig;
-  return TRUE;
-}
-#endif
-
-Bool
-ephyrCreateColormap (ColormapPtr pmap)
-{
-  return fbInitializeColormap (pmap);
-}
-
-Bool
-ephyrInitScreen (ScreenPtr pScreen)
-{
-  KdScreenPriv(pScreen);
-  KdScreenInfo	*screen    = pScreenPriv->screen;
-
-  EPHYR_LOG ("pScreen->myNum:%d\n", pScreen->myNum) ;
-  hostx_set_screen_number (screen, pScreen->myNum);
-  hostx_set_win_title (screen, "(ctrl+shift grabs mouse and keyboard)") ;
-  pScreen->CreateColormap = ephyrCreateColormap;
-
-#ifdef XV
-  if (!ephyrNoXV) {
-      if (!ephyrInitVideo (pScreen)) {
-          EPHYR_LOG_ERROR ("failed to initialize xvideo\n") ;
-      } else {
-          EPHYR_LOG ("initialized xvideo okay\n") ;
-      }
-  }
-#endif /*XV*/
-
-#ifdef XF86DRI
-  if (!ephyrNoDRI && !hostx_has_dri ()) {
-      EPHYR_LOG ("host x does not support DRI. Disabling DRI forwarding\n") ;
-      ephyrNoDRI = TRUE ;
-#ifdef GLXEXT
-      noGlxVisualInit = FALSE ;
-#endif
-  }
-  if (!ephyrNoDRI) {
-    ephyrDRIExtensionInit (pScreen) ;
-    ephyrHijackGLXExtension () ;
-  }
-#endif
-
-#ifdef GLXEXT
-  if (ephyrNoDRI) {
-      noGlxVisualInit = FALSE ;
-  }
-#endif
-
-  return TRUE;
-}
-
-Bool
-ephyrFinishInitScreen (ScreenPtr pScreen)
-{
-  /* FIXME: Calling this even if not using shadow.  
-   * Seems harmless enough. But may be safer elsewhere.
-   */
-  if (!shadowSetup (pScreen))
-    return FALSE;
-
-#ifdef RANDR
-  if (!ephyrRandRInit (pScreen))
-    return FALSE;
-#endif
-
-  return TRUE;
-}
-
-Bool
-ephyrCreateResources (ScreenPtr pScreen)
-{
-  KdScreenPriv(pScreen);
-  KdScreenInfo	*screen    = pScreenPriv->screen;
-  EphyrScrPriv	*scrpriv   = screen->driver;
-
-  EPHYR_LOG("mark pScreen=%p mynum=%d shadow=%d",
-            pScreen, pScreen->myNum, scrpriv->shadow);
-
-  if (scrpriv->shadow) 
-    return KdShadowSet (pScreen, 
-			scrpriv->randr, 
-			ephyrShadowUpdate, 
-			ephyrWindowLinear);
-  else
-    return ephyrSetInternalDamage(pScreen); 
-}
-
-void
-ephyrPreserve (KdCardInfo *card)
-{
-}
-
-Bool
-ephyrEnable (ScreenPtr pScreen)
-{
-  return TRUE;
-}
-
-Bool
-ephyrDPMS (ScreenPtr pScreen, int mode)
-{
-  return TRUE;
-}
-
-void
-ephyrDisable (ScreenPtr pScreen)
-{
-}
-
-void
-ephyrRestore (KdCardInfo *card)
-{
-}
-
-void
-ephyrScreenFini (KdScreenInfo *screen)
-{
-    EphyrScrPriv  *scrpriv = screen->driver;
-    if (scrpriv->shadow) {
-        KdShadowFbFree (screen, 0);
-    }
-    xfree(screen->driver);
-    screen->driver = NULL;
-}
-
-/*  
- * Port of Mark McLoughlin's Xnest fix for focus in + modifier bug.
- * See https://bugs.freedesktop.org/show_bug.cgi?id=3030
- */
-void
-ephyrUpdateModifierState(unsigned int state)
-{
-#if 0
-  DeviceIntPtr pkeydev;
-  KeyClassPtr  keyc;
-  int          i;
-  CARD8        mask;
-
-  pkeydev = inputInfo.keyboard;
-
-  if (!pkeydev)
-    return;
-  
-/* This is pretty broken.
- *
- * What should happen is that focus out should do as a VT switch does in
- * traditional servers: fake releases for all keys (and buttons too, come
- * to think of it) currently down.  Then, on focus in, get the state from
- * the host, and fake keypresses for everything currently down.
- *
- * So I'm leaving this broken for a little while.  Sorry, folks.
- *
- * -daniels
- */
-
-  keyc = pkeydev->key;
-  
-  state = state & 0xff;
-  
-  if (keyc->state == state)
-    return;
-  
-  for (i = 0, mask = 1; i < 8; i++, mask <<= 1) 
-    {
-      int key;
-      
-      /* Modifier is down, but shouldn't be   */
-      if ((keyc->state & mask) && !(state & mask)) 
-	{
-	  int count = keyc->modifierKeyCount[i];
-	  
-	  for (key = 0; key < MAP_LENGTH; key++)
-	    if (keyc->xkbInfo->desc->map->modmap[key] & mask)
-	      {
-		int bit;
-		BYTE *kptr;
-		
-		kptr = &keyc->down[key >> 3];
-		bit = 1 << (key & 7);
-		
-		if (*kptr & bit && ephyrKbd &&
-                    ((EphyrKbdPrivate *)ephyrKbd->driverPrivate)->enabled)
-		  KdEnqueueKeyboardEvent(ephyrKbd, key, TRUE); /* release */
-		
-		if (--count == 0)
-		  break;
-	      }
-	}
-       
-      /* Modifier shoud be down, but isn't   */
-      if (!(keyc->state & mask) && (state & mask))
-	for (key = 0; key < MAP_LENGTH; key++)
-	  if (keyc->xkbInfo->desc->map->modmap[key] & mask)
-	    {
-              if (keyc->xkbInfo->desc->map->modmap[key] & mask && ephyrKbd &&
-                  ((EphyrKbdPrivate *)ephyrKbd->driverPrivate)->enabled)
-	          KdEnqueueKeyboardEvent(ephyrKbd, key, FALSE); /* press */
-	      break;
-	    }
-    }
-#endif
-}
-
-static void
-ephyrBlockSigio (void)
-{
-    sigset_t set;
-
-    sigemptyset (&set);
-    sigaddset (&set, SIGIO);
-    sigprocmask (SIG_BLOCK, &set, 0);
-}
-
-static void
-ephyrUnblockSigio (void)
-{
-    sigset_t set;
-
-    sigemptyset (&set);
-    sigaddset (&set, SIGIO);
-    sigprocmask (SIG_UNBLOCK, &set, 0);
-}
-
-static Bool
-ephyrCursorOffScreen(ScreenPtr *ppScreen, int *x, int *y)
-{
-  return FALSE;
-}
-
-static void
-ephyrCrossScreen (ScreenPtr pScreen, Bool entering)
-{
-}
-
-int ephyrCurScreen; /*current event screen*/
-
-static void
-ephyrWarpCursor (DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y)
-{
-    ephyrBlockSigio ();
-    ephyrCurScreen = pScreen->myNum;
-    miPointerWarpCursor (inputInfo.pointer, pScreen, x, y);
-    ephyrUnblockSigio ();
-}
-
-miPointerScreenFuncRec ephyrPointerScreenFuncs =
-{
-  ephyrCursorOffScreen,
-  ephyrCrossScreen,
-  ephyrWarpCursor,
-  NULL,
-  NULL
-};
-
-#ifdef XF86DRI
-/**
- * find if the remote window denoted by a_remote
- * is paired with an internal Window within the Xephyr server.
- * If the remove window is paired with an internal window, send an
- * expose event to the client insterested in the internal window expose event.
- *
- * Pairing happens when a drawable inside Xephyr is associated with
- * a GL surface in a DRI environment.
- * Look at the function ProcXF86DRICreateDrawable in ephyrdriext.c to
- * know a paired window is created.
- *
- * This is useful to make GL drawables (only windows for now) handle
- * expose events and send those events to clients.
- */
-static void
-ephyrExposePairedWindow (int a_remote)
-{
-    EphyrWindowPair *pair = NULL;
-    RegionRec reg;
-    ScreenPtr screen;
-
-    if (!findWindowPairFromRemote (a_remote, &pair)) {
-	EPHYR_LOG ("did not find a pair for this window\n");
-	return;
-    }
-    screen = pair->local->drawable.pScreen;
-    REGION_NULL (screen, &reg);
-    REGION_COPY (screen, &reg, &pair->local->clipList);
-    screen->WindowExposures (pair->local, &reg, NullRegion);
-    REGION_UNINIT (screen, &reg);
-}
-#endif /* XF86DRI */
-
-void
-ephyrPoll(void)
-{
-  EphyrHostXEvent ev;
-
-  while (hostx_get_event(&ev))
-    {
-      switch (ev.type)
-        {
-        case EPHYR_EV_MOUSE_MOTION:
-          if (!ephyrMouse ||
-              !((EphyrPointerPrivate *)ephyrMouse->driverPrivate)->enabled) {
-              EPHYR_LOG ("skipping mouse motion:%d\n", ephyrCurScreen) ;
-              continue;
-          }
-          {
-            if (ev.data.mouse_motion.screen >=0
-                && (ephyrCurScreen != ev.data.mouse_motion.screen))
-              {
-                  EPHYR_LOG ("warping mouse cursor. "
-                             "cur_screen%d, motion_screen:%d\n",
-                             ephyrCurScreen, ev.data.mouse_motion.screen) ;
-                  if (ev.data.mouse_motion.screen >= 0)
-                    {
-                      ephyrWarpCursor
-                            (inputInfo.pointer, screenInfo.screens[ev.data.mouse_motion.screen],
-                             ev.data.mouse_motion.x,
-                             ev.data.mouse_motion.y );
-                    }
-              }
-            else
-              {
-                  int x=0, y=0;
-#ifdef XF86DRI
-                  EphyrWindowPair *pair = NULL;
-#endif
-                  EPHYR_LOG ("enqueuing mouse motion:%d\n", ephyrCurScreen) ;
-                  x = ev.data.mouse_motion.x;
-                  y = ev.data.mouse_motion.y;
-                  EPHYR_LOG ("initial (x,y):(%d,%d)\n", x, y) ;
-#ifdef XF86DRI
-                  EPHYR_LOG ("is this window peered by a gl drawable ?\n") ;
-                  if (findWindowPairFromRemote (ev.data.mouse_motion.window,
-                                                &pair))
-                    {
-                        EPHYR_LOG ("yes, it is peered\n") ;
-                        x += pair->local->drawable.x;
-                        y += pair->local->drawable.y;
-                    }
-                  else
-                    {
-                        EPHYR_LOG ("no, it is not peered\n") ;
-                    }
-                  EPHYR_LOG ("final (x,y):(%d,%d)\n", x, y) ;
-#endif
-                  KdEnqueuePointerEvent(ephyrMouse, mouseState, x, y, 0);
-              }
-          }
-          break;
-
-        case EPHYR_EV_MOUSE_PRESS:
-          if (!ephyrMouse ||
-              !((EphyrPointerPrivate *)ephyrMouse->driverPrivate)->enabled) {
-              EPHYR_LOG ("skipping mouse press:%d\n", ephyrCurScreen) ;
-              continue;
-          }
-          EPHYR_LOG ("enqueuing mouse press:%d\n", ephyrCurScreen) ;
-	  ephyrUpdateModifierState(ev.key_state);
-	  mouseState |= ev.data.mouse_down.button_num;
-	  KdEnqueuePointerEvent(ephyrMouse, mouseState|KD_MOUSE_DELTA, 0, 0, 0);
-	  break;
-
-	case EPHYR_EV_MOUSE_RELEASE:
-          if (!ephyrMouse ||
-              !((EphyrPointerPrivate *)ephyrMouse->driverPrivate)->enabled)
-              continue;
-	  ephyrUpdateModifierState(ev.key_state);
-	  mouseState &= ~ev.data.mouse_up.button_num;
-          EPHYR_LOG ("enqueuing mouse release:%d\n", ephyrCurScreen) ;
-	  KdEnqueuePointerEvent(ephyrMouse, mouseState|KD_MOUSE_DELTA, 0, 0, 0);
-	  break;
-
-	case EPHYR_EV_KEY_PRESS:
-          if (!ephyrKbd ||
-              !((EphyrKbdPrivate *)ephyrKbd->driverPrivate)->enabled)
-              continue;
-	  ephyrUpdateModifierState(ev.key_state);
-	  KdEnqueueKeyboardEvent (ephyrKbd, ev.data.key_down.scancode, FALSE);
-	  break;
-
-	case EPHYR_EV_KEY_RELEASE:
-          if (!ephyrKbd ||
-              !((EphyrKbdPrivate *)ephyrKbd->driverPrivate)->enabled)
-              continue;
-	  KdEnqueueKeyboardEvent (ephyrKbd, ev.data.key_up.scancode, TRUE);
-	  break;
-
-#ifdef XF86DRI
-	case EPHYR_EV_EXPOSE:
-	  /*
-	   * We only receive expose events when the expose event have
-	   * be generated for a drawable that is a host X window managed
-	   * by Xephyr. Host X windows managed by Xephyr exists for instance
-	   * when Xephyr is asked to create a GL drawable in a DRI environment.
-	   */
-	  ephyrExposePairedWindow (ev.data.expose.window);
-	  break;
-#endif /* XF86DRI */
-
-	default:
-	  break;
-	}
-    }
-}
-
-void
-ephyrCardFini (KdCardInfo *card)
-{
-  EphyrPriv	*priv = card->driver;
-  xfree (priv);
-}
-
-void
-ephyrGetColors (ScreenPtr pScreen, int fb, int n, xColorItem *pdefs)
-{
-  /* XXX Not sure if this is right */
-  
-  EPHYR_LOG("mark");
-  
-  while (n--)
-    {
-      pdefs->red = 0;
-      pdefs->green = 0;
-      pdefs->blue = 0;
-      pdefs++;
-    }
-
-}
-
-void
-ephyrPutColors (ScreenPtr pScreen, int fb, int n, xColorItem *pdefs)
-{
-  int min, max, p;
-
-  /* XXX Not sure if this is right */
-
-  min = 256;
-  max = 0;
-  
-  while (n--)
-    {
-      p = pdefs->pixel;
-      if (p < min)
-	min = p;
-      if (p > max)
-	max = p;
-
-      hostx_set_cmap_entry(p, 		
-			   pdefs->red >> 8,
-			   pdefs->green >> 8,
-			   pdefs->blue >> 8);
-      pdefs++;
-    }
-}
-
-/* Mouse calls */
-
-static Status
-MouseInit (KdPointerInfo *pi)
-{
-    pi->driverPrivate = (EphyrPointerPrivate *)
-                         xcalloc(sizeof(EphyrPointerPrivate), 1);
-    ((EphyrPointerPrivate *)pi->driverPrivate)->enabled = FALSE;
-    pi->nAxes = 3;
-    pi->nButtons = 32;
-    if (pi->name)
-        xfree(pi->name);
-    pi->name = strdup("Xephyr virtual mouse");
-    ephyrMouse = pi;
-    return Success;
-}
-
-static Status
-MouseEnable (KdPointerInfo *pi)
-{
-    ((EphyrPointerPrivate *)pi->driverPrivate)->enabled = TRUE;
-    return Success;
-}
-
-static void
-MouseDisable (KdPointerInfo *pi)
-{
-    ((EphyrPointerPrivate *)pi->driverPrivate)->enabled = FALSE;
-    return;
-}
-
-static void
-MouseFini (KdPointerInfo *pi)
-{
-    ephyrMouse = NULL; 
-    return;
-}
-
-KdPointerDriver EphyrMouseDriver = {
-    "ephyr",
-    MouseInit,
-    MouseEnable,
-    MouseDisable,
-    MouseFini,
-    NULL,
-};
-
-/* Keyboard */
-
-static Status
-EphyrKeyboardInit (KdKeyboardInfo *ki)
-{
-  ki->driverPrivate = (EphyrKbdPrivate *)
-                       xcalloc(sizeof(EphyrKbdPrivate), 1);
-  hostx_load_keymap();
-  if (!ephyrKeySyms.map) {
-      ErrorF("Couldn't load keymap from host\n");
-      return BadAlloc;
-  }
-  ki->minScanCode = ephyrKeySyms.minKeyCode;
-  ki->maxScanCode = ephyrKeySyms.maxKeyCode;
-  if (ki->name)
-      xfree(ki->name);
-  ki->name = strdup("Xephyr virtual keyboard");
-  ephyrKbd = ki;
-  return Success;
-}
-
-static Status
-EphyrKeyboardEnable (KdKeyboardInfo *ki)
-{
-    ((EphyrKbdPrivate *)ki->driverPrivate)->enabled = TRUE;
-
-    return Success;
-}
-
-static void
-EphyrKeyboardDisable (KdKeyboardInfo *ki)
-{
-    ((EphyrKbdPrivate *)ki->driverPrivate)->enabled = FALSE;
-}
-
-static void
-EphyrKeyboardFini (KdKeyboardInfo *ki)
-{
-    ephyrKbd = NULL;
-    return;
-}
-
-static void
-EphyrKeyboardLeds (KdKeyboardInfo *ki, int leds)
-{
-}
-
-static void
-EphyrKeyboardBell (KdKeyboardInfo *ki, int volume, int frequency, int duration)
-{
-}
-
-
-KdKeyboardDriver EphyrKeyboardDriver = {
-    "ephyr",
-    EphyrKeyboardInit,
-    EphyrKeyboardEnable,
-    EphyrKeyboardLeds,
-    EphyrKeyboardBell,
-    EphyrKeyboardDisable,
-    EphyrKeyboardFini,
-    NULL,
-};
+/*

+ * Xephyr - A kdrive X server thats runs in a host X window.

+ *          Authored by Matthew Allum <mallum@openedhand.com>

+ * 

+ * Copyright © 2004 Nokia 

+ *

+ * 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, and that the name of Nokia not be used in

+ * advertising or publicity pertaining to distribution of the software without

+ * specific, written prior permission. Nokia makes no

+ * representations about the suitability of this software for any purpose.  It

+ * is provided "as is" without express or implied warranty.

+ *

+ * NOKIA DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,

+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO

+ * EVENT SHALL NOKIA BE LIABLE FOR ANY SPECIAL, INDIRECT OR

+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,

+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER

+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR

+ * PERFORMANCE OF THIS SOFTWARE.

+ */

+

+#ifdef HAVE_CONFIG_H

+#include <kdrive-config.h>

+#endif

+#include "ephyr.h"

+

+#include "inputstr.h"

+#include "scrnintstr.h"

+#include "ephyrlog.h"

+

+#ifdef XF86DRI

+#include "ephyrdri.h"

+#include "ephyrdriext.h"

+#include "ephyrglxext.h"

+#endif /* XF86DRI */

+

+extern int KdTsPhyScreen;

+#ifdef GLXEXT

+extern Bool noGlxVisualInit;

+#endif

+

+KdKeyboardInfo *ephyrKbd;

+KdPointerInfo *ephyrMouse;

+EphyrKeySyms ephyrKeySyms;

+Bool ephyrNoDRI=FALSE ;

+Bool ephyrNoXV=FALSE ;

+

+static int mouseState = 0;

+

+typedef struct _EphyrInputPrivate {

+    Bool    enabled;

+} EphyrKbdPrivate, EphyrPointerPrivate;

+

+Bool   EphyrWantGrayScale = 0;

+

+

+Bool

+ephyrInitialize (KdCardInfo *card, EphyrPriv *priv)

+{

+#ifdef _MSC_VER

+  __asm int 3;

+#else

+  OsSignal(SIGUSR1, hostx_handle_signal);

+#endif  

+  priv->base = 0;

+  priv->bytes_per_line = 0;

+  return TRUE;

+}

+

+Bool

+ephyrCardInit (KdCardInfo *card)

+{

+  EphyrPriv	*priv;

+  

+  priv = (EphyrPriv *) xalloc (sizeof (EphyrPriv));

+  if (!priv)

+    return FALSE;

+  

+  if (!ephyrInitialize (card, priv))

+    {

+      xfree (priv);

+      return FALSE;

+    }

+  card->driver = priv;

+  

+  return TRUE;

+}

+

+Bool

+ephyrScreenInitialize (KdScreenInfo *screen, EphyrScrPriv *scrpriv)

+{

+  int width = 640, height = 480; 

+  CARD32 redMask, greenMask, blueMask;

+  

+  if (hostx_want_screen_size(screen, &width, &height)

+      || !screen->width || !screen->height)

+    {

+      screen->width = width;

+      screen->height = height;

+    }

+

+  if (EphyrWantGrayScale)

+    screen->fb[0].depth = 8;

+

+  if (screen->fb[0].depth && screen->fb[0].depth != hostx_get_depth())

+    {

+      if (screen->fb[0].depth < hostx_get_depth()

+	  && (screen->fb[0].depth == 24 || screen->fb[0].depth == 16

+	      || screen->fb[0].depth == 8))

+	{

+	  hostx_set_server_depth(screen, screen->fb[0].depth);

+	}

+      else

+	ErrorF("\nXephyr: requested screen depth not supported, setting to match hosts.\n");

+    }

+  

+  screen->fb[0].depth = hostx_get_server_depth(screen);

+  screen->rate = 72;

+  

+  if (screen->fb[0].depth <= 8)

+    {

+      if (EphyrWantGrayScale)

+	screen->fb[0].visuals = ((1 << StaticGray) | (1 << GrayScale));

+      else

+	screen->fb[0].visuals = ((1 << StaticGray) |

+				 (1 << GrayScale) |

+				 (1 << StaticColor) |

+				 (1 << PseudoColor) |

+				 (1 << TrueColor) |

+				 (1 << DirectColor));

+      

+      screen->fb[0].redMask   = 0x00;

+      screen->fb[0].greenMask = 0x00;

+      screen->fb[0].blueMask  = 0x00;

+      screen->fb[0].depth        = 8;

+      screen->fb[0].bitsPerPixel = 8;

+    }

+  else 

+    {

+      screen->fb[0].visuals = (1 << TrueColor);

+      

+      if (screen->fb[0].depth <= 15)

+	{

+	  screen->fb[0].depth = 15;

+	  screen->fb[0].bitsPerPixel = 16;

+	}

+      else if (screen->fb[0].depth <= 16)

+	{

+	  screen->fb[0].depth = 16;

+	  screen->fb[0].bitsPerPixel = 16;

+	}

+      else if (screen->fb[0].depth <= 24)

+	{

+	  screen->fb[0].depth = 24;

+	  screen->fb[0].bitsPerPixel = 32;

+	}

+      else if (screen->fb[0].depth <= 30)

+	{

+	  screen->fb[0].depth = 30;

+	  screen->fb[0].bitsPerPixel = 32;

+	}

+      else

+	{

+	  ErrorF("\nXephyr: Unsupported screen depth %d\n",

+	         screen->fb[0].depth);

+	  return FALSE;

+	}

+

+      hostx_get_visual_masks (screen, &redMask, &greenMask, &blueMask);

+

+      screen->fb[0].redMask = (Pixel) redMask;

+      screen->fb[0].greenMask = (Pixel) greenMask;

+      screen->fb[0].blueMask = (Pixel) blueMask;

+

+    }

+  

+  scrpriv->randr = screen->randr;

+

+  return ephyrMapFramebuffer (screen);

+}

+

+Bool

+ephyrScreenInit (KdScreenInfo *screen)

+{

+  EphyrScrPriv *scrpriv;

+  

+  scrpriv = xcalloc (1, sizeof (EphyrScrPriv));

+

+  if (!scrpriv)

+    return FALSE;

+

+  screen->driver = scrpriv;

+

+  if (!ephyrScreenInitialize (screen, scrpriv))

+    {

+      screen->driver = 0;

+      xfree (scrpriv);

+      return FALSE;

+    }

+

+  return TRUE;

+}

+    

+void*

+ephyrWindowLinear (ScreenPtr	pScreen,

+		   CARD32	row,

+		   CARD32	offset,

+		   int		mode,

+		   CARD32	*size,

+		   void		*closure)

+{

+  KdScreenPriv(pScreen);

+  EphyrPriv	    *priv = pScreenPriv->card->driver;

+  

+  if (!pScreenPriv->enabled)

+    return 0;

+

+  *size = priv->bytes_per_line;

+  return priv->base + row * priv->bytes_per_line + offset;

+}

+

+Bool

+ephyrMapFramebuffer (KdScreenInfo *screen)

+{

+  EphyrScrPriv  *scrpriv = screen->driver;

+  EphyrPriv	  *priv    = screen->card->driver;

+  KdPointerMatrix m;

+  int buffer_height;

+  

+  EPHYR_LOG("screen->width: %d, screen->height: %d index=%d",

+	     screen->width, screen->height, screen->mynum);

+  

+  KdComputePointerMatrix (&m, scrpriv->randr, screen->width, screen->height);

+  KdSetPointerMatrix (&m);

+  

+  priv->bytes_per_line = ((screen->width * screen->fb[0].bitsPerPixel + 31) >> 5) << 2;

+  

+  /* point the framebuffer to the data in an XImage */

+  /* If fakexa is enabled, allocate a larger buffer so that fakexa has space to

+   * put offscreen pixmaps.

+   */

+  if (ephyrFuncs.initAccel == NULL)

+    buffer_height = screen->height;

+  else

+    buffer_height = 3 * screen->height;

+

+  priv->base = hostx_screen_init (screen, screen->width, screen->height, buffer_height);

+

+  screen->memory_base  = (CARD8 *) (priv->base);

+  screen->memory_size  = priv->bytes_per_line * buffer_height;

+  screen->off_screen_base = priv->bytes_per_line * screen->height;

+  

+  if ((scrpriv->randr & RR_Rotate_0) && !(scrpriv->randr & RR_Reflect_All))

+    {

+      scrpriv->shadow = FALSE;

+      

+      screen->fb[0].byteStride = priv->bytes_per_line;

+      screen->fb[0].pixelStride = screen->width;

+      screen->fb[0].frameBuffer = (CARD8 *) (priv->base);

+    }

+  else

+    {

+      /* Rotated/Reflected so we need to use shadow fb */

+      scrpriv->shadow = TRUE;

+      

+      EPHYR_LOG("allocing shadow");

+      

+      KdShadowFbAlloc (screen, 0, 

+		       scrpriv->randr & (RR_Rotate_90|RR_Rotate_270));

+    }

+  

+  return TRUE;

+}

+

+void

+ephyrSetScreenSizes (ScreenPtr pScreen)

+{

+  KdScreenPriv(pScreen);

+  KdScreenInfo	*screen = pScreenPriv->screen;

+  EphyrScrPriv	*scrpriv = screen->driver;

+  

+  if (scrpriv->randr & (RR_Rotate_0|RR_Rotate_180))

+    {

+      pScreen->width = screen->width;

+      pScreen->height = screen->height;

+      pScreen->mmWidth = screen->width_mm;

+      pScreen->mmHeight = screen->height_mm;

+    }

+  else 

+    {

+      pScreen->width = screen->height;

+      pScreen->height = screen->width;

+      pScreen->mmWidth = screen->height_mm;

+      pScreen->mmHeight = screen->width_mm;

+    }

+}

+

+Bool

+ephyrUnmapFramebuffer (KdScreenInfo *screen)

+{

+  EphyrScrPriv  *scrpriv = screen->driver;

+  

+  if (scrpriv->shadow)

+    KdShadowFbFree (screen, 0);

+  

+  /* Note, priv->base will get freed when XImage recreated */

+  

+  return TRUE;

+}

+

+void 

+ephyrShadowUpdate (ScreenPtr pScreen, shadowBufPtr pBuf)

+{

+  KdScreenPriv(pScreen);

+  KdScreenInfo *screen = pScreenPriv->screen;

+  

+  EPHYR_LOG("slow paint");

+  

+  /* FIXME: Slow Rotated/Reflected updates could be much

+   * much faster efficiently updating via tranforming 

+   * pBuf->pDamage  regions     

+  */

+  shadowUpdateRotatePacked(pScreen, pBuf);

+  hostx_paint_rect(screen, 0,0,0,0, screen->width, screen->height);

+}

+

+static void

+ephyrInternalDamageRedisplay (ScreenPtr pScreen)

+{

+  KdScreenPriv(pScreen);

+  KdScreenInfo	*screen = pScreenPriv->screen;

+  EphyrScrPriv	*scrpriv = screen->driver;

+  RegionPtr	 pRegion;

+

+  if (!scrpriv || !scrpriv->pDamage)

+    return;

+

+  pRegion = DamageRegion (scrpriv->pDamage);

+

+  if (REGION_NOTEMPTY (pScreen, pRegion))

+    {

+      int           nbox;

+      BoxPtr        pbox;

+

+      nbox = REGION_NUM_RECTS (pRegion);

+      pbox = REGION_RECTS (pRegion);

+

+      while (nbox--)

+        {

+          hostx_paint_rect(screen,

+                           pbox->x1, pbox->y1,

+                           pbox->x1, pbox->y1,

+                           pbox->x2 - pbox->x1,

+                           pbox->y2 - pbox->y1);

+          pbox++;

+        }

+      DamageEmpty (scrpriv->pDamage);

+    }

+}

+

+static void

+ephyrInternalDamageBlockHandler (pointer   data,

+				 OSTimePtr pTimeout,

+				 pointer   pRead)

+{

+  ScreenPtr pScreen = (ScreenPtr) data;

+  

+  ephyrInternalDamageRedisplay (pScreen);

+}

+

+static void

+ephyrInternalDamageWakeupHandler (pointer data, int i, pointer LastSelectMask)

+{

+  /* FIXME: Not needed ? */

+}

+

+Bool

+ephyrSetInternalDamage (ScreenPtr pScreen)

+{

+  KdScreenPriv(pScreen);

+  KdScreenInfo	*screen = pScreenPriv->screen;

+  EphyrScrPriv	*scrpriv = screen->driver;

+  PixmapPtr      pPixmap = NULL;

+  

+  scrpriv->pDamage = DamageCreate ((DamageReportFunc) 0,

+				   (DamageDestroyFunc) 0,

+				   DamageReportNone,

+				   TRUE,

+				   pScreen,

+				   pScreen);

+  

+  if (!RegisterBlockAndWakeupHandlers (ephyrInternalDamageBlockHandler,

+				       ephyrInternalDamageWakeupHandler,

+				       (pointer) pScreen))

+    return FALSE;

+  

+  pPixmap = (*pScreen->GetScreenPixmap) (pScreen);

+  

+  DamageRegister (&pPixmap->drawable, scrpriv->pDamage);

+      

+  return TRUE;

+}

+

+void

+ephyrUnsetInternalDamage (ScreenPtr pScreen)

+{

+  KdScreenPriv(pScreen);

+  KdScreenInfo	*screen = pScreenPriv->screen;

+  EphyrScrPriv	*scrpriv = screen->driver;

+  PixmapPtr      pPixmap = NULL;

+  

+  pPixmap = (*pScreen->GetScreenPixmap) (pScreen);

+  DamageUnregister (&pPixmap->drawable, scrpriv->pDamage);

+  DamageDestroy (scrpriv->pDamage);

+  

+  RemoveBlockAndWakeupHandlers (ephyrInternalDamageBlockHandler,

+				ephyrInternalDamageWakeupHandler,

+				(pointer) pScreen);

+}

+

+#ifdef RANDR

+Bool

+ephyrRandRGetInfo (ScreenPtr pScreen, Rotation *rotations)

+{

+  KdScreenPriv(pScreen);

+  KdScreenInfo	    *screen = pScreenPriv->screen;

+  EphyrScrPriv	    *scrpriv = screen->driver;

+  RRScreenSizePtr	    pSize;

+  Rotation		    randr;

+  int			    n = 0;

+ 

+  struct { int width, height; } sizes[] = 

+    {

+      { 1600, 1200 },

+      { 1400, 1050 },

+      { 1280, 960  },

+      { 1280, 1024 },

+      { 1152, 864 },

+      { 1024, 768 },

+      { 832, 624 },

+      { 800, 600 },

+      { 720, 400 },

+      { 480, 640 },

+      { 640, 480 },

+      { 640, 400 },

+      { 320, 240 },

+      { 240, 320 },

+      { 160, 160 }, 

+      { 0, 0 }

+    };

+

+  EPHYR_LOG("mark");

+

+  *rotations = RR_Rotate_All|RR_Reflect_All;

+

+  if (!hostx_want_preexisting_window (screen)

+      && !hostx_want_fullscreen ()) /* only if no -parent switch */

+    {

+      while (sizes[n].width != 0 && sizes[n].height != 0)

+	{

+	  RRRegisterSize (pScreen,

+			  sizes[n].width,

+			  sizes[n].height, 

+			  (sizes[n].width * screen->width_mm)/screen->width,

+			  (sizes[n].height *screen->height_mm)/screen->height

+			  );

+	  n++;

+	}

+    }

+  

+  pSize = RRRegisterSize (pScreen,

+			  screen->width,

+			  screen->height, 

+			  screen->width_mm,

+			  screen->height_mm);

+    

+  randr = KdSubRotation (scrpriv->randr, screen->randr);

+  

+  RRSetCurrentConfig (pScreen, randr, 0, pSize);

+    

+  return TRUE;

+}

+

+Bool

+ephyrRandRSetConfig (ScreenPtr		pScreen,

+		     Rotation		randr,

+		     int		rate,

+		     RRScreenSizePtr	pSize)

+{

+  KdScreenPriv(pScreen);

+  KdScreenInfo	*screen    = pScreenPriv->screen;

+  EphyrScrPriv	*scrpriv   = screen->driver;

+  Bool		wasEnabled = pScreenPriv->enabled;

+  EphyrScrPriv	oldscr;

+  int		oldwidth, oldheight, oldmmwidth, oldmmheight;

+  Bool          oldshadow;

+  int		newwidth, newheight;

+  

+  if (screen->randr & (RR_Rotate_0|RR_Rotate_180))

+    {

+      newwidth = pSize->width;

+      newheight = pSize->height;

+    }

+  else

+    {

+      newwidth = pSize->height;

+      newheight = pSize->width;

+    }

+  

+  if (wasEnabled)

+    KdDisableScreen (pScreen);

+

+  oldscr = *scrpriv;

+    

+  oldwidth    = screen->width;

+  oldheight   = screen->height;

+  oldmmwidth  = pScreen->mmWidth;

+  oldmmheight = pScreen->mmHeight;

+  oldshadow   = scrpriv->shadow;

+  

+  /*

+   * Set new configuration

+   */

+  

+  scrpriv->randr = KdAddRotation (screen->randr, randr);

+  

+  ephyrUnmapFramebuffer (screen); 

+  

+  screen->width  = newwidth;

+  screen->height = newheight;

+  

+  if (!ephyrMapFramebuffer (screen))

+    goto bail4;

+  

+  /* FIXME below should go in own call */

+  

+  if (oldshadow)

+    KdShadowUnset (screen->pScreen);

+  else

+    ephyrUnsetInternalDamage(screen->pScreen);

+  

+  if (scrpriv->shadow)

+    {

+      if (!KdShadowSet (screen->pScreen, 

+			scrpriv->randr, 

+			ephyrShadowUpdate, 

+			ephyrWindowLinear))

+	goto bail4;

+    }

+  else

+    {

+      /* Without shadow fb ( non rotated ) we need 

+       * to use damage to efficiently update display

+       * via signal regions what to copy from 'fb'.

+       */

+      if (!ephyrSetInternalDamage(screen->pScreen))

+	goto bail4;

+    }

+  

+  ephyrSetScreenSizes (screen->pScreen);

+  

+  /*

+   * Set frame buffer mapping

+   */

+  (*pScreen->ModifyPixmapHeader) (fbGetScreenPixmap (pScreen),

+				  pScreen->width,

+				  pScreen->height,

+				  screen->fb[0].depth,

+				  screen->fb[0].bitsPerPixel,

+				  screen->fb[0].byteStride,

+				  screen->fb[0].frameBuffer);

+  

+  /* set the subpixel order */

+  

+  KdSetSubpixelOrder (pScreen, scrpriv->randr);

+  

+  if (wasEnabled)

+    KdEnableScreen (pScreen);

+  

+  return TRUE;

+  

+ bail4:

+  EPHYR_LOG("bailed");

+  

+  ephyrUnmapFramebuffer (screen);

+  *scrpriv = oldscr;

+  (void) ephyrMapFramebuffer (screen);

+  

+  pScreen->width = oldwidth;

+  pScreen->height = oldheight;

+  pScreen->mmWidth = oldmmwidth;

+  pScreen->mmHeight = oldmmheight;

+  

+  if (wasEnabled)

+    KdEnableScreen (pScreen);

+  return FALSE;

+}

+

+Bool

+ephyrRandRInit (ScreenPtr pScreen)

+{

+  rrScrPrivPtr    pScrPriv;

+  

+  if (!RRScreenInit (pScreen))

+    return FALSE;

+  

+  pScrPriv = rrGetScrPriv(pScreen);

+  pScrPriv->rrGetInfo = ephyrRandRGetInfo;

+  pScrPriv->rrSetConfig = ephyrRandRSetConfig;

+  return TRUE;

+}

+#endif

+

+Bool

+ephyrCreateColormap (ColormapPtr pmap)

+{

+  return fbInitializeColormap (pmap);

+}

+

+Bool

+ephyrInitScreen (ScreenPtr pScreen)

+{

+  KdScreenPriv(pScreen);

+  KdScreenInfo	*screen    = pScreenPriv->screen;

+

+  EPHYR_LOG ("pScreen->myNum:%d\n", pScreen->myNum) ;

+  hostx_set_screen_number (screen, pScreen->myNum);

+  hostx_set_win_title (screen, "(ctrl+shift grabs mouse and keyboard)") ;

+  pScreen->CreateColormap = ephyrCreateColormap;

+

+#ifdef XV

+  if (!ephyrNoXV) {

+      if (!ephyrInitVideo (pScreen)) {

+          EPHYR_LOG_ERROR ("failed to initialize xvideo\n") ;

+      } else {

+          EPHYR_LOG ("initialized xvideo okay\n") ;

+      }

+  }

+#endif /*XV*/

+

+#ifdef XF86DRI

+  if (!ephyrNoDRI && !hostx_has_dri ()) {

+      EPHYR_LOG ("host x does not support DRI. Disabling DRI forwarding\n") ;

+      ephyrNoDRI = TRUE ;

+#ifdef GLXEXT

+      noGlxVisualInit = FALSE ;

+#endif

+  }

+  if (!ephyrNoDRI) {

+    ephyrDRIExtensionInit (pScreen) ;

+    ephyrHijackGLXExtension () ;

+  }

+#endif

+

+#ifdef GLXEXT

+  if (ephyrNoDRI) {

+      noGlxVisualInit = FALSE ;

+  }

+#endif

+

+  return TRUE;

+}

+

+Bool

+ephyrFinishInitScreen (ScreenPtr pScreen)

+{

+  /* FIXME: Calling this even if not using shadow.  

+   * Seems harmless enough. But may be safer elsewhere.

+   */

+  if (!shadowSetup (pScreen))

+    return FALSE;

+

+#ifdef RANDR

+  if (!ephyrRandRInit (pScreen))

+    return FALSE;

+#endif

+

+  return TRUE;

+}

+

+Bool

+ephyrCreateResources (ScreenPtr pScreen)

+{

+  KdScreenPriv(pScreen);

+  KdScreenInfo	*screen    = pScreenPriv->screen;

+  EphyrScrPriv	*scrpriv   = screen->driver;

+

+  EPHYR_LOG("mark pScreen=%p mynum=%d shadow=%d",

+            pScreen, pScreen->myNum, scrpriv->shadow);

+

+  if (scrpriv->shadow) 

+    return KdShadowSet (pScreen, 

+			scrpriv->randr, 

+			ephyrShadowUpdate, 

+			ephyrWindowLinear);

+  else

+    return ephyrSetInternalDamage(pScreen); 

+}

+

+void

+ephyrPreserve (KdCardInfo *card)

+{

+}

+

+Bool

+ephyrEnable (ScreenPtr pScreen)

+{

+  return TRUE;

+}

+

+Bool

+ephyrDPMS (ScreenPtr pScreen, int mode)

+{

+  return TRUE;

+}

+

+void

+ephyrDisable (ScreenPtr pScreen)

+{

+}

+

+void

+ephyrRestore (KdCardInfo *card)

+{

+}

+

+void

+ephyrScreenFini (KdScreenInfo *screen)

+{

+    EphyrScrPriv  *scrpriv = screen->driver;

+    if (scrpriv->shadow) {

+        KdShadowFbFree (screen, 0);

+    }

+    xfree(screen->driver);

+    screen->driver = NULL;

+}

+

+/*  

+ * Port of Mark McLoughlin's Xnest fix for focus in + modifier bug.

+ * See https://bugs.freedesktop.org/show_bug.cgi?id=3030

+ */

+void

+ephyrUpdateModifierState(unsigned int state)

+{

+#if 0

+  DeviceIntPtr pkeydev;

+  KeyClassPtr  keyc;

+  int          i;

+  CARD8        mask;

+

+  pkeydev = inputInfo.keyboard;

+

+  if (!pkeydev)

+    return;

+  

+/* This is pretty broken.

+ *

+ * What should happen is that focus out should do as a VT switch does in

+ * traditional servers: fake releases for all keys (and buttons too, come

+ * to think of it) currently down.  Then, on focus in, get the state from

+ * the host, and fake keypresses for everything currently down.

+ *

+ * So I'm leaving this broken for a little while.  Sorry, folks.

+ *

+ * -daniels

+ */

+

+  keyc = pkeydev->key;

+  

+  state = state & 0xff;

+  

+  if (keyc->state == state)

+    return;

+  

+  for (i = 0, mask = 1; i < 8; i++, mask <<= 1) 

+    {

+      int key;

+      

+      /* Modifier is down, but shouldn't be   */

+      if ((keyc->state & mask) && !(state & mask)) 

+	{

+	  int count = keyc->modifierKeyCount[i];

+	  

+	  for (key = 0; key < MAP_LENGTH; key++)

+	    if (keyc->xkbInfo->desc->map->modmap[key] & mask)

+	      {

+		int bit;

+		BYTE *kptr;

+		

+		kptr = &keyc->down[key >> 3];

+		bit = 1 << (key & 7);

+		

+		if (*kptr & bit && ephyrKbd &&

+                    ((EphyrKbdPrivate *)ephyrKbd->driverPrivate)->enabled)

+		  KdEnqueueKeyboardEvent(ephyrKbd, key, TRUE); /* release */

+		

+		if (--count == 0)

+		  break;

+	      }

+	}

+       

+      /* Modifier shoud be down, but isn't   */

+      if (!(keyc->state & mask) && (state & mask))

+	for (key = 0; key < MAP_LENGTH; key++)

+	  if (keyc->xkbInfo->desc->map->modmap[key] & mask)

+	    {

+              if (keyc->xkbInfo->desc->map->modmap[key] & mask && ephyrKbd &&

+                  ((EphyrKbdPrivate *)ephyrKbd->driverPrivate)->enabled)

+	          KdEnqueueKeyboardEvent(ephyrKbd, key, FALSE); /* press */

+	      break;

+	    }

+    }

+#endif

+}

+

+static void

+ephyrBlockSigio (void)

+{

+#ifdef _MSC_VER

+    __asm int 3;

+#else

+    sigset_t set;

+

+    sigemptyset (&set);

+    sigaddset (&set, SIGIO);

+    sigprocmask (SIG_BLOCK, &set, 0);

+#endif

+}

+

+static void

+ephyrUnblockSigio (void)

+{

+#ifdef _MSC_VER

+    __asm int 3;

+#else

+    sigset_t set;

+

+    sigemptyset (&set);

+    sigaddset (&set, SIGIO);

+    sigprocmask (SIG_UNBLOCK, &set, 0);

+#endif

+}

+

+static Bool

+ephyrCursorOffScreen(ScreenPtr *ppScreen, int *x, int *y)

+{

+  return FALSE;

+}

+

+static void

+ephyrCrossScreen (ScreenPtr pScreen, Bool entering)

+{

+}

+

+int ephyrCurScreen; /*current event screen*/

+

+static void

+ephyrWarpCursor (DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y)

+{

+    ephyrBlockSigio ();

+    ephyrCurScreen = pScreen->myNum;

+    miPointerWarpCursor (inputInfo.pointer, pScreen, x, y);

+    ephyrUnblockSigio ();

+}

+

+miPointerScreenFuncRec ephyrPointerScreenFuncs =

+{

+  ephyrCursorOffScreen,

+  ephyrCrossScreen,

+  ephyrWarpCursor,

+  NULL,

+  NULL

+};

+

+#ifdef XF86DRI

+/**

+ * find if the remote window denoted by a_remote

+ * is paired with an internal Window within the Xephyr server.

+ * If the remove window is paired with an internal window, send an

+ * expose event to the client insterested in the internal window expose event.

+ *

+ * Pairing happens when a drawable inside Xephyr is associated with

+ * a GL surface in a DRI environment.

+ * Look at the function ProcXF86DRICreateDrawable in ephyrdriext.c to

+ * know a paired window is created.

+ *

+ * This is useful to make GL drawables (only windows for now) handle

+ * expose events and send those events to clients.

+ */

+static void

+ephyrExposePairedWindow (int a_remote)

+{

+    EphyrWindowPair *pair = NULL;

+    RegionRec reg;

+    ScreenPtr screen;

+

+    if (!findWindowPairFromRemote (a_remote, &pair)) {

+	EPHYR_LOG ("did not find a pair for this window\n");

+	return;

+    }

+    screen = pair->local->drawable.pScreen;

+    REGION_NULL (screen, &reg);

+    REGION_COPY (screen, &reg, &pair->local->clipList);

+    screen->WindowExposures (pair->local, &reg, NullRegion);

+    REGION_UNINIT (screen, &reg);

+}

+#endif /* XF86DRI */

+

+void

+ephyrPoll(void)

+{

+  EphyrHostXEvent ev;

+

+  while (hostx_get_event(&ev))

+    {

+      switch (ev.type)

+        {

+        case EPHYR_EV_MOUSE_MOTION:

+          if (!ephyrMouse ||

+              !((EphyrPointerPrivate *)ephyrMouse->driverPrivate)->enabled) {

+              EPHYR_LOG ("skipping mouse motion:%d\n", ephyrCurScreen) ;

+              continue;

+          }

+          {

+            if (ev.data.mouse_motion.screen >=0

+                && (ephyrCurScreen != ev.data.mouse_motion.screen))

+              {

+                  EPHYR_LOG ("warping mouse cursor. "

+                             "cur_screen%d, motion_screen:%d\n",

+                             ephyrCurScreen, ev.data.mouse_motion.screen) ;

+                  if (ev.data.mouse_motion.screen >= 0)

+                    {

+                      ephyrWarpCursor

+                            (inputInfo.pointer, screenInfo.screens[ev.data.mouse_motion.screen],

+                             ev.data.mouse_motion.x,

+                             ev.data.mouse_motion.y );

+                    }

+              }

+            else

+              {

+                  int x=0, y=0;

+#ifdef XF86DRI

+                  EphyrWindowPair *pair = NULL;

+#endif

+                  EPHYR_LOG ("enqueuing mouse motion:%d\n", ephyrCurScreen) ;

+                  x = ev.data.mouse_motion.x;

+                  y = ev.data.mouse_motion.y;

+                  EPHYR_LOG ("initial (x,y):(%d,%d)\n", x, y) ;

+#ifdef XF86DRI

+                  EPHYR_LOG ("is this window peered by a gl drawable ?\n") ;

+                  if (findWindowPairFromRemote (ev.data.mouse_motion.window,

+                                                &pair))

+                    {

+                        EPHYR_LOG ("yes, it is peered\n") ;

+                        x += pair->local->drawable.x;

+                        y += pair->local->drawable.y;

+                    }

+                  else

+                    {

+                        EPHYR_LOG ("no, it is not peered\n") ;

+                    }

+                  EPHYR_LOG ("final (x,y):(%d,%d)\n", x, y) ;

+#endif

+                  KdEnqueuePointerEvent(ephyrMouse, mouseState, x, y, 0);

+              }

+          }

+          break;

+

+        case EPHYR_EV_MOUSE_PRESS:

+          if (!ephyrMouse ||

+              !((EphyrPointerPrivate *)ephyrMouse->driverPrivate)->enabled) {

+              EPHYR_LOG ("skipping mouse press:%d\n", ephyrCurScreen) ;

+              continue;

+          }

+          EPHYR_LOG ("enqueuing mouse press:%d\n", ephyrCurScreen) ;

+	  ephyrUpdateModifierState(ev.key_state);

+	  mouseState |= ev.data.mouse_down.button_num;

+	  KdEnqueuePointerEvent(ephyrMouse, mouseState|KD_MOUSE_DELTA, 0, 0, 0);

+	  break;

+

+	case EPHYR_EV_MOUSE_RELEASE:

+          if (!ephyrMouse ||

+              !((EphyrPointerPrivate *)ephyrMouse->driverPrivate)->enabled)

+              continue;

+	  ephyrUpdateModifierState(ev.key_state);

+	  mouseState &= ~ev.data.mouse_up.button_num;

+          EPHYR_LOG ("enqueuing mouse release:%d\n", ephyrCurScreen) ;

+	  KdEnqueuePointerEvent(ephyrMouse, mouseState|KD_MOUSE_DELTA, 0, 0, 0);

+	  break;

+

+	case EPHYR_EV_KEY_PRESS:

+          if (!ephyrKbd ||

+              !((EphyrKbdPrivate *)ephyrKbd->driverPrivate)->enabled)

+              continue;

+	  ephyrUpdateModifierState(ev.key_state);

+	  KdEnqueueKeyboardEvent (ephyrKbd, ev.data.key_down.scancode, FALSE);

+	  break;

+

+	case EPHYR_EV_KEY_RELEASE:

+          if (!ephyrKbd ||

+              !((EphyrKbdPrivate *)ephyrKbd->driverPrivate)->enabled)

+              continue;

+	  KdEnqueueKeyboardEvent (ephyrKbd, ev.data.key_up.scancode, TRUE);

+	  break;

+

+#ifdef XF86DRI

+	case EPHYR_EV_EXPOSE:

+	  /*

+	   * We only receive expose events when the expose event have

+	   * be generated for a drawable that is a host X window managed

+	   * by Xephyr. Host X windows managed by Xephyr exists for instance

+	   * when Xephyr is asked to create a GL drawable in a DRI environment.

+	   */

+	  ephyrExposePairedWindow (ev.data.expose.window);

+	  break;

+#endif /* XF86DRI */

+

+	default:

+	  break;

+	}

+    }

+}

+

+void

+ephyrCardFini (KdCardInfo *card)

+{

+  EphyrPriv	*priv = card->driver;

+  xfree (priv);

+}

+

+void

+ephyrGetColors (ScreenPtr pScreen, int fb, int n, xColorItem *pdefs)

+{

+  /* XXX Not sure if this is right */

+  

+  EPHYR_LOG("mark");

+  

+  while (n--)

+    {

+      pdefs->red = 0;

+      pdefs->green = 0;

+      pdefs->blue = 0;

+      pdefs++;

+    }

+

+}

+

+void

+ephyrPutColors (ScreenPtr pScreen, int fb, int n, xColorItem *pdefs)

+{

+  int min, max, p;

+

+  /* XXX Not sure if this is right */

+

+  min = 256;

+  max = 0;

+  

+  while (n--)

+    {

+      p = pdefs->pixel;

+      if (p < min)

+	min = p;

+      if (p > max)

+	max = p;

+

+      hostx_set_cmap_entry(p, 		

+			   pdefs->red >> 8,

+			   pdefs->green >> 8,

+			   pdefs->blue >> 8);

+      pdefs++;

+    }

+}

+

+/* Mouse calls */

+

+static Status

+MouseInit (KdPointerInfo *pi)

+{

+    pi->driverPrivate = (EphyrPointerPrivate *)

+                         xcalloc(sizeof(EphyrPointerPrivate), 1);

+    ((EphyrPointerPrivate *)pi->driverPrivate)->enabled = FALSE;

+    pi->nAxes = 3;

+    pi->nButtons = 32;

+    if (pi->name)

+        xfree(pi->name);

+    pi->name = strdup("Xephyr virtual mouse");

+    ephyrMouse = pi;

+    return Success;

+}

+

+static Status

+MouseEnable (KdPointerInfo *pi)

+{

+    ((EphyrPointerPrivate *)pi->driverPrivate)->enabled = TRUE;

+    return Success;

+}

+

+static void

+MouseDisable (KdPointerInfo *pi)

+{

+    ((EphyrPointerPrivate *)pi->driverPrivate)->enabled = FALSE;

+    return;

+}

+

+static void

+MouseFini (KdPointerInfo *pi)

+{

+    ephyrMouse = NULL; 

+    return;

+}

+

+KdPointerDriver EphyrMouseDriver = {

+    "ephyr",

+    MouseInit,

+    MouseEnable,

+    MouseDisable,

+    MouseFini,

+    NULL,

+};

+

+/* Keyboard */

+

+static Status

+EphyrKeyboardInit (KdKeyboardInfo *ki)

+{

+  ki->driverPrivate = (EphyrKbdPrivate *)

+                       xcalloc(sizeof(EphyrKbdPrivate), 1);

+  hostx_load_keymap();

+  if (!ephyrKeySyms.map) {

+      ErrorF("Couldn't load keymap from host\n");

+      return BadAlloc;

+  }

+  ki->minScanCode = ephyrKeySyms.minKeyCode;

+  ki->maxScanCode = ephyrKeySyms.maxKeyCode;

+  if (ki->name)

+      xfree(ki->name);

+  ki->name = strdup("Xephyr virtual keyboard");

+  ephyrKbd = ki;

+  return Success;

+}

+

+static Status

+EphyrKeyboardEnable (KdKeyboardInfo *ki)

+{

+    ((EphyrKbdPrivate *)ki->driverPrivate)->enabled = TRUE;

+

+    return Success;

+}

+

+static void

+EphyrKeyboardDisable (KdKeyboardInfo *ki)

+{

+    ((EphyrKbdPrivate *)ki->driverPrivate)->enabled = FALSE;

+}

+

+static void

+EphyrKeyboardFini (KdKeyboardInfo *ki)

+{

+    ephyrKbd = NULL;

+    return;

+}

+

+static void

+EphyrKeyboardLeds (KdKeyboardInfo *ki, int leds)

+{

+}

+

+static void

+EphyrKeyboardBell (KdKeyboardInfo *ki, int volume, int frequency, int duration)

+{

+}

+

+

+KdKeyboardDriver EphyrKeyboardDriver = {

+    "ephyr",

+    EphyrKeyboardInit,

+    EphyrKeyboardEnable,

+    EphyrKeyboardLeds,

+    EphyrKeyboardBell,

+    EphyrKeyboardDisable,

+    EphyrKeyboardFini,

+    NULL,

+};

diff --git a/xorg-server/hw/kdrive/ephyr/ephyr.h b/xorg-server/hw/kdrive/ephyr/ephyr.h
index 5d58a216c..dd22bd150 100644
--- a/xorg-server/hw/kdrive/ephyr/ephyr.h
+++ b/xorg-server/hw/kdrive/ephyr/ephyr.h
@@ -26,9 +26,11 @@
 #ifndef _EPHYR_H_
 #define _EPHYR_H_
 #include <stdio.h>
+#ifndef _MSC_VER
 #include <unistd.h>
-#include <signal.h>
 #include <libgen.h>
+#endif
+#include <signal.h>
 
 #include "os.h"  		/* for OsSignal() */
 #include "kdrive.h"
diff --git a/xorg-server/hw/kdrive/ephyr/ephyrinit.c b/xorg-server/hw/kdrive/ephyr/ephyrinit.c
index eecad7e42..dec57b78c 100644
--- a/xorg-server/hw/kdrive/ephyr/ephyrinit.c
+++ b/xorg-server/hw/kdrive/ephyr/ephyrinit.c
@@ -1,402 +1,421 @@
-/*
- * Xephyr - A kdrive X server thats runs in a host X window.
- *          Authored by Matthew Allum <mallum@o-hand.com>
- * 
- * Copyright © 2004 Nokia 
- *
- * 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, and that the name of Nokia not be used in
- * advertising or publicity pertaining to distribution of the software without
- * specific, written prior permission. Nokia makes no
- * representations about the suitability of this software for any purpose.  It
- * is provided "as is" without express or implied warranty.
- *
- * NOKIA DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL NOKIA BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <kdrive-config.h>
-#endif
-#include "ephyr.h"
-#include "ephyrlog.h"
-
-extern Window EphyrPreExistingHostWin;
-extern Bool   EphyrWantGrayScale;
-extern Bool   kdHasPointer;
-extern Bool   kdHasKbd;
-
-#ifdef GLXEXT
-extern Bool   ephyrNoDRI;
-extern Bool noGlxVisualInit;
-#endif
-extern Bool   ephyrNoXV;
-
-void processScreenArg (char *screen_size, char *parent_id) ;
-
-void
-InitCard (char *name)
-{
-    KdCardAttr	attr;
-
-    EPHYR_DBG("mark");
-
-
-    KdCardInfoAdd (&ephyrFuncs, &attr, 0);
-}
-
-void
-InitOutput (ScreenInfo *pScreenInfo, int argc, char **argv)
-{
-  KdInitOutput (pScreenInfo, argc, argv);
-}
-
-void
-InitInput (int argc, char **argv)
-{
-  KdKeyboardInfo *ki;
-  KdPointerInfo *pi;
-
-  KdAddKeyboardDriver(&EphyrKeyboardDriver);
-#ifdef linux
-  KdAddKeyboardDriver(&LinuxEvdevKeyboardDriver);
-#endif
-  KdAddPointerDriver(&EphyrMouseDriver);
-#ifdef linux
-  KdAddPointerDriver(&LinuxEvdevMouseDriver);
-#endif
-
-  if (!kdHasKbd) {
-    ki = KdNewKeyboard();
-    if (!ki)
-      FatalError("Couldn't create Xephyr keyboard\n");
-    ki->driver = &EphyrKeyboardDriver;
-    KdAddKeyboard(ki);
-  }
-
-  if (!kdHasPointer) {
-    pi = KdNewPointer();
-    if (!pi)
-      FatalError("Couldn't create Xephyr pointer\n");
-    pi->driver = &EphyrMouseDriver;
-    KdAddPointer(pi);
-  }
-
-  KdInitInput();
-}
-
-void
-ddxUseMsg (void)
-{
-  KdUseMsg();
-
-  ErrorF("\nXephyr Option Usage:\n");
-  ErrorF("-parent <XID>        Use existing window as Xephyr root win\n");
-  ErrorF("-host-cursor         Re-use exisiting X host server cursor\n");
-  ErrorF("-fullscreen          Attempt to run Xephyr fullscreen\n");
-  ErrorF("-grayscale           Simulate 8bit grayscale\n");
-  ErrorF("-fakexa              Simulate acceleration using software rendering\n");
-  ErrorF("-verbosity <level>   Set log verbosity level\n");
-#ifdef GLXEXT
-  ErrorF("-nodri               do not use DRI\n");
-#endif
-  ErrorF("-noxv                do not use XV\n");
-  ErrorF("-name [name]         define the name in the WM_CLASS property\n");
-  ErrorF("-title [title]       set the window title in the WM_NAME property\n");
-  ErrorF("\n");
-
-  exit(1);
-}
-
-void
-processScreenArg (char *screen_size, char *parent_id)
-{
-  KdCardInfo   *card;
-
-  InitCard (0);  /*Put each screen on a separate card*/
-  card = KdCardInfoLast ();
-
-  if (card)
-    {
-      KdScreenInfo *screen;
-      unsigned long p_id = 0;
-
-      screen = KdScreenInfoAdd (card);
-      KdParseScreen (screen, screen_size);
-
-      if (parent_id)
-        {
-          p_id = strtol (parent_id, NULL, 0);
-        }
-      EPHYR_DBG ("screen number:%d\n", screen->mynum) ;
-      hostx_add_screen (screen, p_id, screen->mynum);
-    }
-  else
-    {
-      ErrorF("No matching card found!\n");
-    }
-}
-
-int
-ddxProcessArgument (int argc, char **argv, int i)
-{
-  static char* parent = NULL;
-  EPHYR_DBG("mark argv[%d]='%s'", i, argv[i] );
-
-  if (i == 1)
-    {
-      hostx_use_resname(basename(argv[0]), 0);
-    }
-
-  if (!strcmp (argv[i], "-parent"))
-    {
-      if(i+1 < argc)
-	{
-	  int j;
-	  /* If parent is specified and a screen argument follows, don't do
-           * anything, let the -screen handling init the rest */
-	  for (j = i; j < argc; j++)
-	    {
-	      if (!strcmp(argv[j], "-screen"))
-		{
-		  parent = argv[i + 1];
-		  return 2;
-		}
-	    }
-
-	  processScreenArg ("100x100", argv[i+1]);
-	  return 2;
-	}
-
-      UseMsg();
-      exit(1);
-    }
-  else if (!strcmp (argv[i], "-screen"))
-    {
-      if ((i+1) < argc)
-	{
-	  processScreenArg (argv[i+1], parent);
-	  parent = NULL;
-	  return 2;
-	}
-
-      UseMsg();
-      exit(1);
-    }
-  else if (!strcmp (argv[i], "-host-cursor"))
-    {
-      hostx_use_host_cursor();
-      return 1;
-    }
-  else if (!strcmp (argv[i], "-fullscreen"))
-    {
-      hostx_use_fullscreen();
-      return 1;
-    }
-  else if (!strcmp (argv[i], "-grayscale"))
-    {
-      EphyrWantGrayScale = 1;      
-      return 1;
-    }
-  else if (!strcmp (argv[i], "-fakexa"))
-    {
-      ephyrFuncs.initAccel = ephyrDrawInit;
-      ephyrFuncs.enableAccel = ephyrDrawEnable;
-      ephyrFuncs.disableAccel = ephyrDrawDisable;
-      ephyrFuncs.finiAccel = ephyrDrawFini;
-      return 1;
-    }
-  else if (!strcmp (argv[i], "-verbosity"))
-    {
-      if(i+1 < argc && argv[i+1][0] != '-')
-	{
-	  int verbosity=atoi (argv[i+1]) ;
-	  LogSetParameter (XLOG_VERBOSITY, verbosity) ;
-	  EPHYR_LOG ("set verbosiry to %d\n", verbosity) ;
-	  return 2 ;
-	}
-      else
-	{
-	  UseMsg() ;
-	  exit(1) ;
-	}
-    }
-#ifdef GLXEXT
-  else if (!strcmp (argv[i], "-nodri"))
-   {
-       noGlxVisualInit = FALSE ;
-       ephyrNoDRI = TRUE ;
-       EPHYR_LOG ("no direct rendering enabled\n") ;
-       return 1 ;
-   }
-#endif
-  else if (!strcmp (argv[i], "-noxv"))
-   {
-       ephyrNoXV = TRUE ;
-       EPHYR_LOG ("no XVideo enabled\n") ;
-       return 1 ;
-   }
-  else if (!strcmp (argv[i], "-name"))
-   {
-       if (i+1 < argc && argv[i+1][0] != '-')
-         {
-           hostx_use_resname(argv[i+1], 1);
-           return 2;
-         }
-       else
-         {
-           UseMsg();
-           return 0;
-         }
-   }
-  else if (!strcmp (argv[i], "-title"))
-   {
-       if (i+1 < argc && argv[i+1][0] != '-')
-         {
-           hostx_set_title(argv[i+1]);
-           return 2;
-         }
-       else
-         {
-           UseMsg();
-           return 0;
-         }
-   }
-  else if (argv[i][0] == ':')
-    {
-      hostx_set_display_name(argv[i]);
-    }
-  /* Xnest compatibility */
-  else if (!strcmp(argv[i], "-display"))
-  {
-      hostx_set_display_name(argv[i+1]);
-      return 2;
-  }
-  else if (!strcmp(argv[i], "-sync") ||
-	   !strcmp(argv[i], "-full") ||
-	   !strcmp(argv[i], "-sss") ||
-	   !strcmp(argv[i], "-install"))
-  {
-      return 1;
-  }
-  else if (!strcmp(argv[i], "-bw") ||
-	   !strcmp(argv[i], "-class") ||
-	   !strcmp(argv[i], "-geometry") ||
-	   !strcmp(argv[i], "-scrns"))
-  {
-      return 2;
-  }
-  /* end Xnest compat */
-
-  return KdProcessArgument (argc, argv, i);
-}
-
-void
-OsVendorInit (void)
-{
-  EPHYR_DBG("mark");
-
-  if (hostx_want_host_cursor())
-    {
-      ephyrFuncs.initCursor   = &ephyrCursorInit;
-      ephyrFuncs.enableCursor = &ephyrCursorEnable;
-    }
-
-  KdOsInit (&EphyrOsFuncs);
-}
-
-/* 'Fake' cursor stuff, could be improved */
-
-static Bool
-ephyrRealizeCursor(DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCursor)
-{
-  return TRUE;
-}
-
-static Bool
-ephyrUnrealizeCursor(DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCursor)
-{
-  return TRUE;
-}
-
-static void
-ephyrSetCursor(DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCursor, int x, int y)
-{
-  ;
-}
-
-static void
-ephyrMoveCursor(DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y)
-{
-  ;
-}
-
-static Bool
-ephyrDeviceCursorInitialize(DeviceIntPtr pDev, ScreenPtr pScreen)
-{
-  return TRUE;
-}
-
-miPointerSpriteFuncRec EphyrPointerSpriteFuncs = {
-	ephyrRealizeCursor,
-	ephyrUnrealizeCursor,
-	ephyrSetCursor,
-	ephyrMoveCursor,
-	ephyrDeviceCursorInitialize,
-	NULL
-};
-
-
-Bool
-ephyrCursorInit(ScreenPtr pScreen)
-{
-  miPointerInitialize(pScreen,
-		      &EphyrPointerSpriteFuncs,
-		      &ephyrPointerScreenFuncs,
-		      FALSE);
-
-  return TRUE;
-}
-
-void
-ephyrCursorEnable(ScreenPtr pScreen)
-{
-  ;
-}
-
-KdCardFuncs ephyrFuncs = {
-    ephyrCardInit,	    /* cardinit */
-    ephyrScreenInit,	    /* scrinit */
-    ephyrInitScreen,	    /* initScreen */
-    ephyrFinishInitScreen,  /* finishInitScreen */
-    ephyrCreateResources,   /* createRes */
-    ephyrPreserve,	    /* preserve */
-    ephyrEnable,	    /* enable */
-    ephyrDPMS,		    /* dpms */
-    ephyrDisable,	    /* disable */
-    ephyrRestore,	    /* restore */
-    ephyrScreenFini,	    /* scrfini */
-    ephyrCardFini,	    /* cardfini */
-
-    0,			    /* initCursor */
-    0,			    /* enableCursor */
-    0,			    /* disableCursor */
-    0,			    /* finiCursor */
-    0,			    /* recolorCursor */
-
-    0,			    /* initAccel */
-    0,			    /* enableAccel */
-    0,			    /* disableAccel */
-    0,			    /* finiAccel */
-
-    ephyrGetColors,/* getColors */
-    ephyrPutColors,	    /* putColors */
-};
+/*

+ * Xephyr - A kdrive X server thats runs in a host X window.

+ *          Authored by Matthew Allum <mallum@o-hand.com>

+ * 

+ * Copyright © 2004 Nokia 

+ *

+ * 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, and that the name of Nokia not be used in

+ * advertising or publicity pertaining to distribution of the software without

+ * specific, written prior permission. Nokia makes no

+ * representations about the suitability of this software for any purpose.  It

+ * is provided "as is" without express or implied warranty.

+ *

+ * NOKIA DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,

+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO

+ * EVENT SHALL NOKIA BE LIABLE FOR ANY SPECIAL, INDIRECT OR

+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,

+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER

+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR

+ * PERFORMANCE OF THIS SOFTWARE.

+ */

+

+#ifdef HAVE_CONFIG_H

+#include <kdrive-config.h>

+#endif

+#include "ephyr.h"

+#include "ephyrlog.h"

+

+extern Window EphyrPreExistingHostWin;

+extern Bool   EphyrWantGrayScale;

+extern Bool   kdHasPointer;

+extern Bool   kdHasKbd;

+

+#ifdef GLXEXT

+extern Bool   ephyrNoDRI;

+extern Bool noGlxVisualInit;

+#endif

+extern Bool   ephyrNoXV;

+

+void processScreenArg (char *screen_size, char *parent_id) ;

+

+void

+InitCard (char *name)

+{

+    KdCardAttr	attr;

+

+    EPHYR_DBG("mark");

+

+

+    KdCardInfoAdd (&ephyrFuncs, &attr, 0);

+}

+

+#ifndef _MSC_VER

+void

+InitOutput (ScreenInfo *pScreenInfo, int argc, char **argv)

+{

+  KdInitOutput (pScreenInfo, argc, argv);

+}

+

+void

+InitInput (int argc, char **argv)

+{

+  KdKeyboardInfo *ki;

+  KdPointerInfo *pi;

+

+  KdAddKeyboardDriver(&EphyrKeyboardDriver);

+#ifdef linux

+  KdAddKeyboardDriver(&LinuxEvdevKeyboardDriver);

+#endif

+  KdAddPointerDriver(&EphyrMouseDriver);

+#ifdef linux

+  KdAddPointerDriver(&LinuxEvdevMouseDriver);

+#endif

+

+  if (!kdHasKbd) {

+    ki = KdNewKeyboard();

+    if (!ki)

+      FatalError("Couldn't create Xephyr keyboard\n");

+    ki->driver = &EphyrKeyboardDriver;

+    KdAddKeyboard(ki);

+  }

+

+  if (!kdHasPointer) {

+    pi = KdNewPointer();

+    if (!pi)

+      FatalError("Couldn't create Xephyr pointer\n");

+    pi->driver = &EphyrMouseDriver;

+    KdAddPointer(pi);

+  }

+

+  KdInitInput();

+}

+

+void

+ddxUseMsg (void)

+{

+  KdUseMsg();

+

+  ErrorF("\nXephyr Option Usage:\n");

+  ErrorF("-parent <XID>        Use existing window as Xephyr root win\n");

+  ErrorF("-host-cursor         Re-use exisiting X host server cursor\n");

+  ErrorF("-fullscreen          Attempt to run Xephyr fullscreen\n");

+  ErrorF("-grayscale           Simulate 8bit grayscale\n");

+  ErrorF("-fakexa              Simulate acceleration using software rendering\n");

+  ErrorF("-verbosity <level>   Set log verbosity level\n");

+#ifdef GLXEXT

+  ErrorF("-nodri               do not use DRI\n");

+#endif

+  ErrorF("-noxv                do not use XV\n");

+  ErrorF("-name [name]         define the name in the WM_CLASS property\n");

+  ErrorF("-title [title]       set the window title in the WM_NAME property\n");

+  ErrorF("\n");

+

+  exit(1);

+}

+#endif

+

+void

+processScreenArg (char *screen_size, char *parent_id)

+{

+  KdCardInfo   *card;

+

+  InitCard (0);  /*Put each screen on a separate card*/

+  card = KdCardInfoLast ();

+

+  if (card)

+    {

+      KdScreenInfo *screen;

+      unsigned long p_id = 0;

+

+      screen = KdScreenInfoAdd (card);

+      KdParseScreen (screen, screen_size);

+

+      if (parent_id)

+        {

+          p_id = strtol (parent_id, NULL, 0);

+        }

+      EPHYR_DBG ("screen number:%d\n", screen->mynum) ;

+      hostx_add_screen (screen, p_id, screen->mynum);

+    }

+  else

+    {

+      ErrorF("No matching card found!\n");

+    }

+}

+

+#ifndef _MSC_VER

+int

+ddxProcessArgument (int argc, char **argv, int i)

+{

+  static char* parent = NULL;

+  EPHYR_DBG("mark argv[%d]='%s'", i, argv[i] );

+

+  if (i == 1)

+    {

+      hostx_use_resname(basename(argv[0]), 0);

+    }

+

+  if (!strcmp (argv[i], "-parent"))

+    {

+      if(i+1 < argc)

+	{

+	  int j;

+	  /* If parent is specified and a screen argument follows, don't do

+           * anything, let the -screen handling init the rest */

+	  for (j = i; j < argc; j++)

+	    {

+	      if (!strcmp(argv[j], "-screen"))

+		{

+		  parent = argv[i + 1];

+		  return 2;

+		}

+	    }

+

+	  processScreenArg ("100x100", argv[i+1]);

+	  return 2;

+	}

+

+      UseMsg();

+      exit(1);

+    }

+  else if (!strcmp (argv[i], "-screen"))

+    {

+      if ((i+1) < argc)

+	{

+	  processScreenArg (argv[i+1], parent);

+	  parent = NULL;

+	  return 2;

+	}

+

+      UseMsg();

+      exit(1);

+    }

+  else if (!strcmp (argv[i], "-host-cursor"))

+    {

+      hostx_use_host_cursor();

+      return 1;

+    }

+  else if (!strcmp (argv[i], "-fullscreen"))

+    {

+      hostx_use_fullscreen();

+      return 1;

+    }

+  else if (!strcmp (argv[i], "-grayscale"))

+    {

+      EphyrWantGrayScale = 1;      

+      return 1;

+    }

+  else if (!strcmp (argv[i], "-fakexa"))

+    {

+      ephyrFuncs.initAccel = ephyrDrawInit;

+      ephyrFuncs.enableAccel = ephyrDrawEnable;

+      ephyrFuncs.disableAccel = ephyrDrawDisable;

+      ephyrFuncs.finiAccel = ephyrDrawFini;

+      return 1;

+    }

+  else if (!strcmp (argv[i], "-verbosity"))

+    {

+      if(i+1 < argc && argv[i+1][0] != '-')

+	{

+	  int verbosity=atoi (argv[i+1]) ;

+	  LogSetParameter (XLOG_VERBOSITY, verbosity) ;

+	  EPHYR_LOG ("set verbosiry to %d\n", verbosity) ;

+	  return 2 ;

+	}

+      else

+	{

+	  UseMsg() ;

+	  exit(1) ;

+	}

+    }

+#ifdef GLXEXT

+  else if (!strcmp (argv[i], "-nodri"))

+   {

+       noGlxVisualInit = FALSE ;

+       ephyrNoDRI = TRUE ;

+       EPHYR_LOG ("no direct rendering enabled\n") ;

+       return 1 ;

+   }

+#endif

+  else if (!strcmp (argv[i], "-noxv"))

+   {

+       ephyrNoXV = TRUE ;

+       EPHYR_LOG ("no XVideo enabled\n") ;

+       return 1 ;

+   }

+  else if (!strcmp (argv[i], "-name"))

+   {

+       if (i+1 < argc && argv[i+1][0] != '-')

+         {

+           hostx_use_resname(argv[i+1], 1);

+           return 2;

+         }

+       else

+         {

+           UseMsg();

+           return 0;

+         }

+   }

+  else if (!strcmp (argv[i], "-title"))

+   {

+       if (i+1 < argc && argv[i+1][0] != '-')

+         {

+           hostx_set_title(argv[i+1]);

+           return 2;

+         }

+       else

+         {

+           UseMsg();

+           return 0;

+         }

+   }

+  else if (argv[i][0] == ':')

+    {

+      hostx_set_display_name(argv[i]);

+    }

+  /* Xnest compatibility */

+  else if (!strcmp(argv[i], "-display"))

+  {

+      hostx_set_display_name(argv[i+1]);

+      return 2;

+  }

+  else if (!strcmp(argv[i], "-sync") ||

+	   !strcmp(argv[i], "-full") ||

+	   !strcmp(argv[i], "-sss") ||

+	   !strcmp(argv[i], "-install"))

+  {

+      return 1;

+  }

+  else if (!strcmp(argv[i], "-bw") ||

+	   !strcmp(argv[i], "-class") ||

+	   !strcmp(argv[i], "-geometry") ||

+	   !strcmp(argv[i], "-scrns"))

+  {

+      return 2;

+  }

+  /* end Xnest compat */

+

+  return KdProcessArgument (argc, argv, i);

+}

+

+#ifdef DDXBEFORERESET

+void

+ddxBeforeReset (void)

+{

+}

+#endif

+

+void

+OsVendorInit (void)

+{

+  EPHYR_DBG("mark");

+

+  if (hostx_want_host_cursor())

+    {

+      ephyrFuncs.initCursor   = &ephyrCursorInit;

+      ephyrFuncs.enableCursor = &ephyrCursorEnable;

+    }

+

+  KdOsInit (&EphyrOsFuncs);

+}

+

+#ifdef DDXOSFATALERROR

+void

+OsVendorFatalError(void)

+{

+}

+#endif

+

+#endif

+

+/* 'Fake' cursor stuff, could be improved */

+

+static Bool

+ephyrRealizeCursor(DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCursor)

+{

+  return TRUE;

+}

+

+static Bool

+ephyrUnrealizeCursor(DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCursor)

+{

+  return TRUE;

+}

+

+static void

+ephyrSetCursor(DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCursor, int x, int y)

+{

+  ;

+}

+

+static void

+ephyrMoveCursor(DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y)

+{

+  ;

+}

+

+static Bool

+ephyrDeviceCursorInitialize(DeviceIntPtr pDev, ScreenPtr pScreen)

+{

+  return TRUE;

+}

+

+miPointerSpriteFuncRec EphyrPointerSpriteFuncs = {

+	ephyrRealizeCursor,

+	ephyrUnrealizeCursor,

+	ephyrSetCursor,

+	ephyrMoveCursor,

+	ephyrDeviceCursorInitialize,

+	NULL

+};

+

+

+Bool

+ephyrCursorInit(ScreenPtr pScreen)

+{

+  miPointerInitialize(pScreen,

+		      &EphyrPointerSpriteFuncs,

+		      &ephyrPointerScreenFuncs,

+		      FALSE);

+

+  return TRUE;

+}

+

+void

+ephyrCursorEnable(ScreenPtr pScreen)

+{

+  ;

+}

+

+KdCardFuncs ephyrFuncs = {

+    ephyrCardInit,	    /* cardinit */

+    ephyrScreenInit,	    /* scrinit */

+    ephyrInitScreen,	    /* initScreen */

+    ephyrFinishInitScreen,  /* finishInitScreen */

+    ephyrCreateResources,   /* createRes */

+    ephyrPreserve,	    /* preserve */

+    ephyrEnable,	    /* enable */

+    ephyrDPMS,		    /* dpms */

+    ephyrDisable,	    /* disable */

+    ephyrRestore,	    /* restore */

+    ephyrScreenFini,	    /* scrfini */

+    ephyrCardFini,	    /* cardfini */

+

+    0,			    /* initCursor */

+    0,			    /* enableCursor */

+    0,			    /* disableCursor */

+    0,			    /* finiCursor */

+    0,			    /* recolorCursor */

+

+    0,			    /* initAccel */

+    0,			    /* enableAccel */

+    0,			    /* disableAccel */

+    0,			    /* finiAccel */

+

+    ephyrGetColors,/* getColors */

+    ephyrPutColors,	    /* putColors */

+};

diff --git a/xorg-server/hw/kdrive/ephyr/ephyrlog.h b/xorg-server/hw/kdrive/ephyr/ephyrlog.h
index a07a0a097..ba52a3bce 100644
--- a/xorg-server/hw/kdrive/ephyr/ephyrlog.h
+++ b/xorg-server/hw/kdrive/ephyr/ephyrlog.h
@@ -43,14 +43,14 @@
 #ifndef EPHYR_LOG
 #define EPHYR_LOG(...) \
 LogMessageVerb(X_NOTICE, INFO_LOG_LEVEL, "in %s:%d:%s: ",\
-                      __FILE__, __LINE__, __func__) ; \
+                      __FILE__, __LINE__, __FUNCTION__) ; \
 LogMessageVerb(X_NOTICE, INFO_LOG_LEVEL, __VA_ARGS__)
 #endif /*nomadik_log*/
 
 #ifndef EPHYR_LOG_ERROR
 #define EPHYR_LOG_ERROR(...) \
 LogMessageVerb(X_NOTICE, ERROR_LOG_LEVEL, "Error:in %s:%d:%s: ",\
-                      __FILE__, __LINE__, __func__) ; \
+                      __FILE__, __LINE__, __FUNCTION__) ; \
 LogMessageVerb(X_NOTICE, ERROR_LOG_LEVEL, __VA_ARGS__)
 #endif /*EPHYR_LOG_ERROR*/
 
diff --git a/xorg-server/hw/kdrive/ephyr/hostx.c b/xorg-server/hw/kdrive/ephyr/hostx.c
index d546370ba..7a828eb31 100644
--- a/xorg-server/hw/kdrive/ephyr/hostx.c
+++ b/xorg-server/hw/kdrive/ephyr/hostx.c
@@ -47,9 +47,11 @@
 #include <string.h> 		/* for memset */
 #include <time.h>
 
+#ifndef _MSC_VER
 #include <sys/ipc.h>
 #include <sys/shm.h>
 #include <sys/time.h>
+#endif
 
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
@@ -208,7 +210,11 @@ hostx_add_screen (EphyrScreenInfo screen,
 void
 hostx_set_display_name (char *name)
 {
+#ifdef _MSC_VER
+  __asm int 3;
+#else
   HostX.server_dpy_name = strdup (name);
+#endif
 }
 
 void
@@ -475,6 +481,9 @@ hostx_init (void)
     }
   /* Try to get share memory ximages for a little bit more speed */
 
+#ifdef _MSC_VER
+  __asm int 3;
+#else
   if (!XShmQueryExtension(HostX.dpy) || getenv("XEPHYR_NO_SHM"))
     {
       fprintf(stderr, "\nXephyr unable to use SHM XImages\n");
@@ -505,6 +514,7 @@ hostx_init (void)
         shmdt(shminfo.shmaddr);
         shmctl(shminfo.shmid, IPC_RMID, 0);
 }
+#endif
 
   XFlush(HostX.dpy);
 
@@ -647,7 +657,7 @@ hostx_screen_init (EphyrScreenInfo screen,
   struct EphyrHostScreen *host_screen = host_screen_from_screen_info (screen);
   if (!host_screen)
     {
-      fprintf (stderr, "%s: Error in accessing hostx data\n", __func__ );
+      fprintf (stderr, "%s: Error in accessing hostx data\n", __FUNCTION__ );
       exit(1);
     }
 
@@ -662,10 +672,14 @@ hostx_screen_init (EphyrScreenInfo screen,
 
       if (HostX.have_shm)
 	{
+#ifdef _MSC_VER
+	  __asm int 3;
+#else
 	  XShmDetach(HostX.dpy, &host_screen->shminfo);
 	  XDestroyImage (host_screen->ximg);
 	  shmdt(host_screen->shminfo.shmaddr);
 	  shmctl(host_screen->shminfo.shmid, IPC_RMID, 0);
+#endif
 	}
       else
 	{
@@ -681,6 +695,9 @@ hostx_screen_init (EphyrScreenInfo screen,
 
   if (HostX.have_shm)
     {
+#ifdef _MSC_VER
+__asm int 3;
+#else
       host_screen->ximg = XShmCreateImage (HostX.dpy, HostX.visual, HostX.depth,
                                            ZPixmap, NULL, &host_screen->shminfo,
                                            width, buffer_height );
@@ -706,6 +723,7 @@ hostx_screen_init (EphyrScreenInfo screen,
 	  XShmAttach(HostX.dpy, &host_screen->shminfo);
 	  shm_success = True;
 	}
+#endif
     }
 
   if (!shm_success)
@@ -834,9 +852,13 @@ hostx_paint_rect (EphyrScreenInfo screen,
 
   if (HostX.have_shm)
     {
+#ifdef _MSC_VER
+      __asm int 3;
+#else
       XShmPutImage (HostX.dpy, host_screen->win,
                     HostX.gc, host_screen->ximg,
                     sx, sy, dx, dy, width, height, False);
+#endif
     }
   else
     {
@@ -852,6 +874,9 @@ hostx_paint_debug_rect (struct EphyrHostScreen *host_screen,
                         int x,     int y,
                         int width, int height)
 {
+#ifdef _MSC_VER
+  __asm int 3;
+#else
   struct timespec tspec;
 
   tspec.tv_sec  = HostX.damage_debug_msec / (1000000);
@@ -867,6 +892,7 @@ hostx_paint_debug_rect (struct EphyrHostScreen *host_screen,
 
   /* nanosleep seems to work better than usleep for me... */
   nanosleep(&tspec, NULL);
+#endif
 }
 
 void
@@ -1288,8 +1314,12 @@ hostx_set_window_bounding_rectangles (int a_window,
                    rects[i].width, rects[i].height) ;
     }
     /*this aways returns 1*/
+#ifdef _MSC_VER
+    __asm int 3;
+#else
     XShapeCombineRectangles (dpy, a_window, ShapeBounding, 0, 0,
                              rects, a_num_rects, ShapeSet, YXBanded) ;
+#endif
     is_ok = TRUE ;
 
     if (rects) {
@@ -1325,8 +1355,12 @@ hostx_set_window_clipping_rectangles (int a_window,
                    rects[i].width, rects[i].height) ;
     }
     /*this aways returns 1*/
+#ifdef _MSC_VER
+    __asm int 3;
+#else
     XShapeCombineRectangles (dpy, a_window, ShapeClip, 0, 0,
                              rects, a_num_rects, ShapeSet, YXBanded) ;
+#endif
     is_ok = TRUE ;
 
     if (rects) {
@@ -1341,12 +1375,16 @@ int
 hostx_has_xshape (void)
 {
     int event_base=0, error_base=0 ;
+#ifdef _MSC_VER
+    __asm int 3;
+#else
     Display *dpy=hostx_get_display () ;
     if (!XShapeQueryExtension (dpy,
                                &event_base,
                                &error_base)) {
         return FALSE ;
     }
+#endif
     return TRUE;
 }
 
diff --git a/xorg-server/hw/kdrive/ephyr/hostx.h b/xorg-server/hw/kdrive/ephyr/hostx.h
index e65e0c9bc..f455b3003 100644
--- a/xorg-server/hw/kdrive/ephyr/hostx.h
+++ b/xorg-server/hw/kdrive/ephyr/hostx.h
@@ -35,8 +35,12 @@
 #define EPHYR_DBG(x, a...) \
  fprintf(stderr, __FILE__ ":%d,%s() " x "\n", __LINE__, __func__, ##a)
 #else
+#ifdef _MSC_VER
+#define EPHYR_DBG()
+#else
 #define EPHYR_DBG(x, a...) do {} while (0) 
 #endif
+#endif
 
 typedef struct EphyrHostXVars  EphyrHostXVars;
 typedef struct EphyrHostXEvent EphyrHostXEvent;
diff --git a/xorg-server/hw/kdrive/ephyr/makefile b/xorg-server/hw/kdrive/ephyr/makefile
new file mode 100644
index 000000000..eba9a93e1
--- /dev/null
+++ b/xorg-server/hw/kdrive/ephyr/makefile
@@ -0,0 +1,6 @@
+LIBRARY = libxephyr
+
+CSRCS=ephyrinit.c ephyr.c hostx.c
+
+INCLUDES += ..\src ..\..\..\exa
+
diff --git a/xorg-server/hw/kdrive/src/kdrive.c b/xorg-server/hw/kdrive/src/kdrive.c
index 5cfe54ff8..f79b96f6f 100644
--- a/xorg-server/hw/kdrive/src/kdrive.c
+++ b/xorg-server/hw/kdrive/src/kdrive.c
@@ -321,6 +321,7 @@ KdProcessSwitch (void)
 	KdEnableScreens ();
 }
 
+#ifndef _MSC_VER
 void
 AbortDDX(void)
 {
@@ -343,6 +344,7 @@ ddxGiveUp (void)
 {
     AbortDDX ();
 }
+#endif
 
 Bool	kdDumbDriver;
 Bool	kdSoftCursor;
@@ -1310,11 +1312,14 @@ KdInitOutput (ScreenInfo    *pScreenInfo,
     OsRegisterSigWrapper(KdSignalWrapper);
 }
 
+#ifndef _MSC_VER
 void
 OsVendorFatalError(void)
 {
 }
+#endif
 
+#ifndef _MSC_VER
 int
 DPMSSet(ClientPtr client, int level)
 {
@@ -1326,3 +1331,4 @@ DPMSSupported (void)
 {
     return FALSE;
 }
+#endif
diff --git a/xorg-server/hw/kdrive/src/kinput.c b/xorg-server/hw/kdrive/src/kinput.c
index fb8ebd076..6f54ada1f 100644
--- a/xorg-server/hw/kdrive/src/kinput.c
+++ b/xorg-server/hw/kdrive/src/kinput.c
@@ -1,2351 +1,2376 @@
-/*
- * Copyright © 1999 Keith Packard
- * Copyright © 2006 Nokia Corporation
- *
- * 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, and that the name of the authors not be used in
- * advertising or publicity pertaining to distribution of the software without
- * specific, written prior permission.  The authors make no
- * representations about the suitability of this software for any purpose.  It
- * is provided "as is" without express or implied warranty.
- *
- * THE AUTHORS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL THE AUTHORS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <kdrive-config.h>
-#endif
-#include "kdrive.h"
-#include "inputstr.h"
-
-#define XK_PUBLISHING
-#include <X11/keysym.h>
-#if HAVE_X11_XF86KEYSYM_H
-#include <X11/XF86keysym.h>
-#endif
-#include <signal.h>
-#include <stdio.h>
-#ifdef sun
-#include <sys/file.h> /* needed for FNONBLOCK & FASYNC */
-#endif
-
-#include "xkbsrv.h"
-
-#include <X11/extensions/XI.h>
-#include <X11/extensions/XIproto.h>
-#include "XIstubs.h" /* even though we don't use stubs.  cute, no? */
-#include "exevents.h"
-#include "extinit.h"
-#include "exglobals.h"
-#include "eventstr.h"
-#include "xserver-properties.h"
-
-#define AtomFromName(x) MakeAtom(x, strlen(x), 1)
-
-struct KdConfigDevice {
-    char *line;
-    struct KdConfigDevice *next;
-};
-
-/* kdKeyboards and kdPointers hold all the real devices. */
-static KdKeyboardInfo *kdKeyboards         = NULL;
-static KdPointerInfo  *kdPointers          = NULL;
-static struct KdConfigDevice *kdConfigKeyboards   = NULL;
-static struct KdConfigDevice *kdConfigPointers    = NULL;
-
-static KdKeyboardDriver *kdKeyboardDrivers = NULL;
-static KdPointerDriver  *kdPointerDrivers  = NULL;
-
-static EventListPtr     kdEvents = NULL;
-
-static Bool		kdInputEnabled;
-static Bool		kdOffScreen;
-static unsigned long	kdOffScreenTime;
-static KdPointerMatrix	kdPointerMatrix = {
-   { { 1, 0, 0 },
-     { 0, 1, 0 } }
-};
-
-void KdResetInputMachine (void);
-    
-#define KD_MAX_INPUT_FDS    8
-
-typedef struct _kdInputFd {
-    int	        fd;
-    void        (*read) (int fd, void *closure);
-    int	        (*enable) (int fd, void *closure);
-    void        (*disable) (int fd, void *closure);
-    void        *closure;
-} KdInputFd;
-
-static KdInputFd kdInputFds[KD_MAX_INPUT_FDS];
-static int	 kdNumInputFds;
-
-extern Bool      kdRawPointerCoordinates;
-
-static void
-KdSigio (int sig)
-{
-    int	i;
-
-    for (i = 0; i < kdNumInputFds; i++)
-	(*kdInputFds[i].read) (kdInputFds[i].fd, kdInputFds[i].closure);
-}
-
-static void
-KdBlockSigio (void)
-{
-    sigset_t	set;
-    
-    sigemptyset (&set);
-    sigaddset (&set, SIGIO);
-    sigprocmask (SIG_BLOCK, &set, 0);
-}
-
-static void
-KdUnblockSigio (void)
-{
-    sigset_t	set;
-    
-    sigemptyset (&set);
-    sigaddset (&set, SIGIO);
-    sigprocmask (SIG_UNBLOCK, &set, 0);
-}
-
-#ifdef DEBUG_SIGIO
-
-void
-KdAssertSigioBlocked (char *where)
-{
-    sigset_t	set, old;
-
-    sigemptyset (&set);
-    sigprocmask (SIG_BLOCK, &set, &old);
-    if (!sigismember (&old, SIGIO)) {
-	ErrorF ("SIGIO not blocked at %s\n", where);
-        KdBacktrace(0);
-    }
-}
-
-#else
-
-#define KdAssertSigioBlocked(s)
-
-#endif
-
-static int  kdnFds;
-
-#ifdef FNONBLOCK
-#define NOBLOCK FNONBLOCK
-#else
-#define NOBLOCK FNDELAY
-#endif
-
-void
-KdResetInputMachine (void)
-{
-    KdPointerInfo *pi;
-
-    for (pi = kdPointers; pi; pi = pi->next) {
-        pi->mouseState = start;
-        pi->eventHeld = FALSE;
-    }
-}
-
-static void
-KdNonBlockFd (int fd)
-{
-    int	flags;
-    flags = fcntl (fd, F_GETFL);
-    flags |= FASYNC|NOBLOCK;
-    fcntl (fd, F_SETFL, flags);
-}
-
-static void
-KdAddFd (int fd)
-{
-    struct sigaction	act;
-    sigset_t		set;
-    
-    kdnFds++;
-    fcntl (fd, F_SETOWN, getpid());
-    KdNonBlockFd (fd);
-    AddEnabledDevice (fd);
-    memset (&act, '\0', sizeof act);
-    act.sa_handler = KdSigio;
-    sigemptyset (&act.sa_mask);
-    sigaddset (&act.sa_mask, SIGIO);
-    sigaddset (&act.sa_mask, SIGALRM);
-    sigaddset (&act.sa_mask, SIGVTALRM);
-    sigaction (SIGIO, &act, 0);
-    sigemptyset (&set);
-    sigprocmask (SIG_SETMASK, &set, 0);
-}
-
-static void
-KdRemoveFd (int fd)
-{
-    struct sigaction	act;
-    int			flags;
-    
-    kdnFds--;
-    RemoveEnabledDevice (fd);
-    flags = fcntl (fd, F_GETFL);
-    flags &= ~(FASYNC|NOBLOCK);
-    fcntl (fd, F_SETFL, flags);
-    if (kdnFds == 0)
-    {
-	memset (&act, '\0', sizeof act);
-	act.sa_handler = SIG_IGN;
-	sigemptyset (&act.sa_mask);
-	sigaction (SIGIO, &act, 0);
-    }
-}
-
-Bool
-KdRegisterFd (int fd, void (*read) (int fd, void *closure), void *closure)
-{
-    if (kdNumInputFds == KD_MAX_INPUT_FDS)
-	return FALSE;
-    kdInputFds[kdNumInputFds].fd = fd;
-    kdInputFds[kdNumInputFds].read = read;
-    kdInputFds[kdNumInputFds].enable = 0;
-    kdInputFds[kdNumInputFds].disable = 0;
-    kdInputFds[kdNumInputFds].closure = closure;
-    kdNumInputFds++;
-    if (kdInputEnabled)
-	KdAddFd (fd);
-    return TRUE;
-}
-
-void
-KdUnregisterFd (void *closure, int fd, Bool do_close)
-{
-    int	i, j;
-
-    for (i = 0; i < kdNumInputFds; i++) {
-	if (kdInputFds[i].closure == closure &&
-            (fd == -1 || kdInputFds[i].fd == fd)) {
-	    if (kdInputEnabled)
-		KdRemoveFd (kdInputFds[i].fd);
-	    if (do_close)
-		close (kdInputFds[i].fd);
-	    kdNumInputFds--;
-	    for (j = i; j < kdNumInputFds; j++)
-		kdInputFds[j] = kdInputFds[j+1];
-            break;
-	}
-    }
-}
-
-void
-KdUnregisterFds (void *closure, Bool do_close)
-{
-    KdUnregisterFd(closure, -1, do_close);
-}
-
-void
-KdDisableInput (void)
-{
-    KdKeyboardInfo *ki;
-    KdPointerInfo *pi;
-    int found = 0, i = 0;
-
-    KdBlockSigio();
-
-    for (ki = kdKeyboards; ki; ki = ki->next) {
-        if (ki->driver && ki->driver->Disable)
-            (*ki->driver->Disable) (ki);
-    }
-
-    for (pi = kdPointers; pi; pi = pi->next) {
-        if (pi->driver && pi->driver->Disable)
-            (*pi->driver->Disable) (pi);
-    }
-
-    if (kdNumInputFds) {
-        ErrorF("[KdDisableInput] Buggy drivers: still %d input fds left!",
-               kdNumInputFds);
-        i = 0;
-        while (i < kdNumInputFds) {
-            found = 0;
-            for (ki = kdKeyboards; ki; ki = ki->next) {
-                if (ki == kdInputFds[i].closure) {
-                    ErrorF("    fd %d belongs to keybd driver %s\n",
-                           kdInputFds[i].fd,
-                           ki->driver && ki->driver->name ?
-                             ki->driver->name : "(unnamed!)");
-                    found = 1;
-                    break;
-                }
-            }
-
-            if (found) {
-                i++;
-                continue;
-            }
-
-            for (pi = kdPointers; pi; pi = pi->next) {
-                if (pi == kdInputFds[i].closure) {
-                    ErrorF("    fd %d belongs to pointer driver %s\n",
-                           kdInputFds[i].fd,
-                           pi->driver && pi->driver->name ?
-                             pi->driver->name : "(unnamed!)");
-                    break;
-                }
-            }
-
-            if (found) {
-                i++;
-                continue;
-            }
-
-            ErrorF("    fd %d not claimed by any active device!\n",
-                   kdInputFds[i].fd);
-            KdUnregisterFd(kdInputFds[i].closure, kdInputFds[i].fd, TRUE);
-        }
-    }
-
-    kdInputEnabled = FALSE;
-}
-
-void
-KdEnableInput (void)
-{
-    InternalEvent ev;
-    KdKeyboardInfo *ki;
-    KdPointerInfo *pi;
-    
-    kdInputEnabled = TRUE;
-
-    for (ki = kdKeyboards; ki; ki = ki->next) {
-        if (ki->driver && ki->driver->Enable)
-            (*ki->driver->Enable) (ki);
-    }
-
-    for (pi = kdPointers; pi; pi = pi->next) {
-        if (pi->driver && pi->driver->Enable)
-            (*pi->driver->Enable) (pi);
-    }
-
-    /* reset screen saver */
-    ev.any.time = GetTimeInMillis ();
-    NoticeEventTime (&ev);
-
-    KdUnblockSigio ();
-}
-
-static KdKeyboardDriver *
-KdFindKeyboardDriver (char *name)
-{
-    KdKeyboardDriver *ret;
-
-    /* ask a stupid question ... */
-    if (!name)
-        return NULL;
-    
-    for (ret = kdKeyboardDrivers; ret; ret = ret->next) {
-        if (strcmp(ret->name, name) == 0)
-            return ret;
-    }
-
-    return NULL;
-}
-
-static KdPointerDriver *
-KdFindPointerDriver (char *name)
-{
-    KdPointerDriver *ret;
-
-    /* ask a stupid question ... */
-    if (!name)
-        return NULL;
-
-    for (ret = kdPointerDrivers; ret; ret = ret->next) {
-        if (strcmp(ret->name, name) == 0)
-            return ret;
-    }
-
-    return NULL;
-}
-
-static int
-KdPointerProc(DeviceIntPtr pDevice, int onoff)
-{
-    DevicePtr       pDev = (DevicePtr)pDevice;
-    KdPointerInfo   *pi;
-    Atom            xiclass;
-    Atom            *btn_labels;
-    Atom            *axes_labels;
-
-    if (!pDev)
-	return BadImplementation;
-
-    for (pi = kdPointers; pi; pi = pi->next) {
-        if (pi->dixdev && pi->dixdev->id == pDevice->id)
-            break;
-    }
-
-    if (!pi || !pi->dixdev || pi->dixdev->id != pDevice->id) {
-        ErrorF("[KdPointerProc] Failed to find pointer for device %d!\n",
-               pDevice->id);
-        return BadImplementation;
-    }
-
-    switch (onoff)
-    {
-    case DEVICE_INIT:
-#ifdef DEBUG
-        ErrorF("initialising pointer %s ...\n", pi->name);
-#endif
-        if (!pi->driver) {
-            if (!pi->driverPrivate) {
-                ErrorF("no driver specified for %s\n", pi->name);
-                return BadImplementation;
-            }
-
-            pi->driver = KdFindPointerDriver(pi->driverPrivate);
-            if (!pi->driver) {
-                ErrorF("Couldn't find pointer driver %s\n",
-                       pi->driverPrivate ? (char *) pi->driverPrivate :
-                       "(unnamed)");
-                return !Success;
-            }
-            xfree(pi->driverPrivate);
-            pi->driverPrivate = NULL;
-        }
-
-        if (!pi->driver->Init) {
-            ErrorF("no init function\n");
-            return BadImplementation;
-        }
-
-        if ((*pi->driver->Init) (pi) != Success) {
-            return !Success;
-        }
-
-	btn_labels = xcalloc(pi->nButtons, sizeof(Atom));
-	if (!btn_labels)
-	    return BadAlloc;
-	axes_labels = xcalloc(pi->nAxes, sizeof(Atom));
-	if (!axes_labels) {
-	    xfree(btn_labels);
-	    return BadAlloc;
-	}
-
-	switch(pi->nAxes)
-	{
-	    default:
-	    case 7:
-		btn_labels[6] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_HWHEEL_RIGHT);
-	    case 6:
-		btn_labels[5] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_HWHEEL_LEFT);
-	    case 5:
-		btn_labels[4] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_WHEEL_DOWN);
-	    case 4:
-		btn_labels[3] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_WHEEL_UP);
-	    case 3:
-		btn_labels[2] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_RIGHT);
-	    case 2:
-		btn_labels[1] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_MIDDLE);
-	    case 1:
-		btn_labels[0] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_LEFT);
-	    case 0:
-		break;
-	}
-
-	if (pi->nAxes >= 2) {
-	    axes_labels[0] = XIGetKnownProperty(AXIS_LABEL_PROP_REL_X);
-	    axes_labels[1] = XIGetKnownProperty(AXIS_LABEL_PROP_REL_Y);
-	}
-
-	InitPointerDeviceStruct(pDev, pi->map, pi->nButtons, btn_labels,
-	    (PtrCtrlProcPtr)NoopDDA,
-	    GetMotionHistorySize(), pi->nAxes, axes_labels);
-
-        xfree(btn_labels);
-        xfree(axes_labels);
-
-        if (pi->inputClass == KD_TOUCHSCREEN) {
-            InitAbsoluteClassDeviceStruct(pDevice);
-            xiclass = AtomFromName(XI_TOUCHSCREEN);
-        }
-        else {
-            xiclass = AtomFromName(XI_MOUSE);
-        }
-
-        AssignTypeAndName(pi->dixdev, xiclass,
-                          pi->name ? pi->name : "Generic KDrive Pointer");
-
-	return Success;
-	
-    case DEVICE_ON:
-        if (pDev->on == TRUE)
-            return Success;
-        
-        if (!pi->driver->Enable) {
-            ErrorF("no enable function\n");
-            return BadImplementation;
-        }
-
-        if ((*pi->driver->Enable) (pi) == Success) {
-            pDev->on = TRUE;
-            return Success;
-        }
-        else {
-            return BadImplementation;
-        }
-
-	return Success;
-
-    case DEVICE_OFF:
-        if (pDev->on == FALSE) {
-            return Success;
-        }
-
-        if (!pi->driver->Disable) {
-            return BadImplementation;
-        }
-        else {
-            (*pi->driver->Disable) (pi);
-            pDev->on = FALSE;
-            return Success;
-        }
-
-        return Success;
-
-    case DEVICE_CLOSE:
-	if (pDev->on) {
-            if (!pi->driver->Disable) {
-                return BadImplementation;
-            }
-            (*pi->driver->Disable) (pi);
-            pDev->on = FALSE;
-        }
-
-        if (!pi->driver->Fini)
-            return BadImplementation;
-
-        (*pi->driver->Fini) (pi);
-
-        KdRemovePointer(pi);
-        
-        return Success;
-    }
-
-    /* NOTREACHED */
-    return BadImplementation;
-}
-
-Bool
-LegalModifier(unsigned int key, DeviceIntPtr pDev)
-{
-    return TRUE;
-}
-
-static void
-KdBell (int volume, DeviceIntPtr pDev, pointer arg, int something)
-{
-    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);
-}
-
-void
-DDXRingBell(int volume, int pitch, int duration)
-{
-    KdKeyboardInfo *ki = NULL;
-
-    if (kdOsFuncs->Bell) {
-        (*kdOsFuncs->Bell)(volume, pitch, duration);
-    }
-    else {
-        for (ki = kdKeyboards; ki; ki = ki->next) {
-            if (ki->dixdev->coreEvents)
-                KdRingBell(ki, volume, pitch, duration);
-        }
-    }
-}
-
-void
-KdRingBell(KdKeyboardInfo *ki, int volume, int pitch, int duration)
-{
-    if (!ki || !ki->driver || !ki->driver->Bell)
-        return;
-        
-    if (kdInputEnabled)
-        (*ki->driver->Bell) (ki, volume, pitch, duration);
-}
-
-
-static void
-KdSetLeds (KdKeyboardInfo *ki, int leds)
-{
-    if (!ki || !ki->driver)
-        return;
-
-    if (kdInputEnabled) {
-        if (ki->driver->Leds)
-            (*ki->driver->Leds) (ki, leds);
-    }
-}
-
-void
-KdSetLed (KdKeyboardInfo *ki, int led, Bool on)
-{
-    if (!ki || !ki->dixdev || !ki->dixdev->kbdfeed)
-        return;
-
-    NoteLedState (ki->dixdev, led, on);
-    KdSetLeds (ki, ki->dixdev->kbdfeed->ctrl.leds);
-}
-
-void
-KdSetPointerMatrix (KdPointerMatrix *matrix)
-{
-    kdPointerMatrix = *matrix;
-}
-
-void
-KdComputePointerMatrix (KdPointerMatrix *m, Rotation randr, int width,
-                        int height)
-{
-    int		    x_dir = 1, y_dir = 1;
-    int		    i, j;
-    int		    size[2];
-
-    size[0] = width; size[1] = height;
-    if (randr & RR_Reflect_X)
-	x_dir = -1;
-    if (randr & RR_Reflect_Y)
-	y_dir = -1;
-    switch (randr & (RR_Rotate_All)) {
-    case RR_Rotate_0:
-	m->matrix[0][0] = x_dir; m->matrix[0][1] = 0;
-	m->matrix[1][0] = 0; m->matrix[1][1] = y_dir;
-	break;
-    case RR_Rotate_90:
-	m->matrix[0][0] = 0; m->matrix[0][1] = -x_dir;
-	m->matrix[1][0] = y_dir; m->matrix[1][1] = 0;
-	break;
-    case RR_Rotate_180:
-	m->matrix[0][0] = -x_dir; m->matrix[0][1] = 0;
-	m->matrix[1][0] = 0; m->matrix[1][1] = -y_dir;
-	break;
-    case RR_Rotate_270:
-	m->matrix[0][0] = 0; m->matrix[0][1] = x_dir;
-	m->matrix[1][0] = -y_dir; m->matrix[1][1] = 0;
-	break;
-    }
-    for (i = 0; i < 2; i++)
-    {
-	m->matrix[i][2] = 0;
-	for (j = 0 ; j < 2; j++)
-	    if (m->matrix[i][j] < 0)
-		m->matrix[i][2] = size[j] - 1;
-    }
-}
-
-void
-KdScreenToPointerCoords (int *x, int *y)
-{
-    int	(*m)[3] = kdPointerMatrix.matrix;
-    int div = m[0][1] * m[1][0] - m[1][1] * m[0][0];
-    int sx = *x;
-    int sy = *y;
-
-    *x = (m[0][1] * sy - m[0][1] * m[1][2] + m[1][1] * m[0][2] - m[1][1] * sx) / div;
-    *y = (m[1][0] * sx + m[0][0] * m[1][2] - m[1][0] * m[0][2] - m[0][0] * sy) / div;
-}
-
-static void
-KdKbdCtrl (DeviceIntPtr pDevice, KeybdCtrl *ctrl)
-{
-    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; 
-}
-
-extern KeybdCtrl defaultKeyboardControl;
-
-static int
-KdKeyboardProc(DeviceIntPtr pDevice, int onoff)
-{
-    Bool        ret;
-    DevicePtr   pDev = (DevicePtr)pDevice;
-    KdKeyboardInfo *ki;
-    Atom xiclass;
-    XkbRMLVOSet rmlvo;
-
-    if (!pDev)
-	return BadImplementation;
-
-    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) {
-        return BadImplementation;
-    }
-
-    switch (onoff)
-    {
-    case DEVICE_INIT:
-#ifdef DEBUG
-        ErrorF("initialising keyboard %s\n", ki->name);
-#endif
-        if (!ki->driver) {
-            if (!ki->driverPrivate) {
-                ErrorF("no driver specified!\n");
-                return BadImplementation;
-            }
-
-            ki->driver = KdFindKeyboardDriver(ki->driverPrivate);
-            if (!ki->driver) {
-                ErrorF("Couldn't find keyboard driver %s\n",
-                       ki->driverPrivate ? (char *) ki->driverPrivate :
-                       "(unnamed)");
-                return !Success;
-            }
-            xfree(ki->driverPrivate);
-            ki->driverPrivate = NULL;
-        }
-
-        if (!ki->driver->Init) {
-            ErrorF("Keyboard %s: no init function\n", ki->name);
-            return BadImplementation;
-        }
-
-        if ((*ki->driver->Init) (ki) != Success) {
-            return !Success;
-        }
-
-        memset(&rmlvo, 0, sizeof(rmlvo));
-        rmlvo.rules = ki->xkbRules;
-        rmlvo.model = ki->xkbModel;
-        rmlvo.layout = ki->xkbLayout;
-        rmlvo.variant = ki->xkbVariant;
-        rmlvo.options = ki->xkbOptions;
-        ret = InitKeyboardDeviceStruct (pDevice, &rmlvo, KdBell, KdKbdCtrl);
-	if (!ret) {
-            ErrorF("Couldn't initialise keyboard %s\n", ki->name);
-	    return BadImplementation;
-        }
-
-        xiclass = AtomFromName(XI_KEYBOARD);
-        AssignTypeAndName(pDevice, xiclass,
-                          ki->name ? ki->name : "Generic KDrive Keyboard");
-
-        KdResetInputMachine();
-
-        return Success;
-
-    case DEVICE_ON:
-        if (pDev->on == TRUE)
-            return Success;
-
-        if (!ki->driver->Enable)
-            return BadImplementation;
-
-        if ((*ki->driver->Enable) (ki) != Success) {
-            return BadMatch;
-        }
-
-        pDev->on = TRUE;
-        return Success;
-
-    case DEVICE_OFF:
-        if (pDev->on == FALSE)
-            return Success;
-
-        if (!ki->driver->Disable)
-            return BadImplementation;
-
-        (*ki->driver->Disable) (ki);
-        pDev->on = FALSE;
-
-        return Success;
-        
-        break;
-
-    case DEVICE_CLOSE:
-	if (pDev->on) {
-            if (!ki->driver->Disable)
-                return BadImplementation;
-
-            (*ki->driver->Disable) (ki);
-            pDev->on = FALSE;
-	}
-
-        if (!ki->driver->Fini)
-            return BadImplementation;
-
-        (*ki->driver->Fini) (ki);
-
-        KdRemoveKeyboard(ki);
-
-        return Success;
-    }
-
-    /* NOTREACHED */
-    return BadImplementation;
-}
-
-void
-KdAddPointerDriver (KdPointerDriver *driver)
-{
-    KdPointerDriver **prev;
-
-    if (!driver)
-        return;
-
-    for (prev = &kdPointerDrivers; *prev; prev = &(*prev)->next) {
-        if (*prev == driver)
-            return;
-    }
-    *prev = driver;
-}
-
-void
-KdRemovePointerDriver (KdPointerDriver *driver)
-{
-    KdPointerDriver *tmp;
-
-    if (!driver)
-        return;
-
-    /* FIXME remove all pointers using this driver */
-    for (tmp = kdPointerDrivers; tmp; tmp = tmp->next) {
-        if (tmp->next == driver)
-            tmp->next = driver->next;
-    }
-    if (tmp == driver)
-        tmp = NULL;
-}
-
-void
-KdAddKeyboardDriver (KdKeyboardDriver *driver)
-{
-    KdKeyboardDriver **prev;
-
-    if (!driver)
-        return;
-
-    for (prev = &kdKeyboardDrivers; *prev; prev = &(*prev)->next) {
-        if (*prev == driver)
-            return;
-    }
-    *prev = driver;
-}
-
-void
-KdRemoveKeyboardDriver (KdKeyboardDriver *driver)
-{
-    KdKeyboardDriver *tmp;
-
-    if (!driver)
-        return;
-
-    /* FIXME remove all keyboards using this driver */
-    for (tmp = kdKeyboardDrivers; tmp; tmp = tmp->next) {
-        if (tmp->next == driver)
-            tmp->next = driver->next;
-    }
-    if (tmp == driver)
-        tmp = NULL;
-}
-
-KdKeyboardInfo *
-KdNewKeyboard (void)
-{
-    KdKeyboardInfo *ki = xcalloc(sizeof(KdKeyboardInfo), 1);
-    if (!ki)
-        return NULL;
-
-    ki->minScanCode = 0;
-    ki->maxScanCode = 0;
-    ki->leds = 0;
-    ki->bellPitch = 1000;
-    ki->bellDuration = 200;
-    ki->next = NULL;
-    ki->options = NULL;
-    ki->xkbRules = strdup("base");
-    ki->xkbModel = strdup("pc105");
-    ki->xkbLayout = strdup("us");
-    ki->xkbVariant = NULL;
-    ki->xkbOptions = NULL;
-
-    return ki;
-}
-
-int
-KdAddConfigKeyboard (char *keyboard)
-{
-    struct KdConfigDevice **prev, *new;
-
-    if (!keyboard)
-        return Success;
-
-    new = (struct KdConfigDevice *) xcalloc(sizeof(struct KdConfigDevice), 1);
-    if (!new)
-        return BadAlloc;
-
-    new->line = xstrdup(keyboard);
-    new->next = NULL;
-
-    for (prev = &kdConfigKeyboards; *prev; prev = &(*prev)->next);
-    *prev = new;
-
-    return Success;
-}
-
-int
-KdAddKeyboard (KdKeyboardInfo *ki)
-{
-    KdKeyboardInfo **prev;
-
-    if (!ki)
-        return !Success;
-    
-    ki->dixdev = AddInputDevice(serverClient, KdKeyboardProc, TRUE);
-    if (!ki->dixdev) {
-        ErrorF("Couldn't register keyboard device %s\n",
-               ki->name ? ki->name : "(unnamed)");
-        return !Success;
-    }
-
-    ki->dixdev->deviceGrab.ActivateGrab = ActivateKeyboardGrab;
-    ki->dixdev->deviceGrab.DeactivateGrab = DeactivateKeyboardGrab;
-    RegisterOtherDevice(ki->dixdev);
-
-#ifdef DEBUG
-    ErrorF("added keyboard %s with dix id %d\n", ki->name, ki->dixdev->id);
-#endif
-
-    for (prev = &kdKeyboards; *prev; prev = &(*prev)->next);
-    *prev = ki;
-
-    return Success;
-}
-
-void
-KdRemoveKeyboard (KdKeyboardInfo *ki)
-{
-    KdKeyboardInfo **prev;
-
-    if (!ki)
-        return;
-
-    for (prev = &kdKeyboards; *prev; prev = &(*prev)->next) {
-        if (*prev == ki) {
-            *prev = ki->next;
-            break;
-        }
-    }
-
-    KdFreeKeyboard(ki);
-}
-
-int
-KdAddConfigPointer (char *pointer)
-{
-    struct KdConfigDevice **prev, *new;
-
-    if (!pointer)
-        return Success;
-
-    new = (struct KdConfigDevice *) xcalloc(sizeof(struct KdConfigDevice), 1);
-    if (!new)
-        return BadAlloc;
-
-    new->line = xstrdup(pointer);
-    new->next = NULL;
-
-    for (prev = &kdConfigPointers; *prev; prev = &(*prev)->next);
-    *prev = new;
-
-    return Success;
-}
-
-int
-KdAddPointer (KdPointerInfo *pi)
-{
-    KdPointerInfo **prev;
-
-    if (!pi)
-        return Success;
-
-    pi->mouseState = start;
-    pi->eventHeld = FALSE;
-
-    pi->dixdev = AddInputDevice(serverClient, KdPointerProc, TRUE);
-    if (!pi->dixdev) {
-        ErrorF("Couldn't add pointer device %s\n",
-               pi->name ? pi->name : "(unnamed)");
-        return BadDevice;
-    }
-
-    pi->dixdev->deviceGrab.ActivateGrab = ActivatePointerGrab;
-    pi->dixdev->deviceGrab.DeactivateGrab = DeactivatePointerGrab;
-    RegisterOtherDevice(pi->dixdev);
-
-    for (prev = &kdPointers; *prev; prev = &(*prev)->next);
-    *prev = pi;
-
-    return Success;
-}
-
-void
-KdRemovePointer (KdPointerInfo *pi)
-{
-    KdPointerInfo **prev;
-
-    if (!pi)
-        return;
-
-    for (prev = &kdPointers; *prev; prev = &(*prev)->next) {
-        if (*prev == pi) {
-            *prev = pi->next;
-            break;
-        }
-    }
-
-    KdFreePointer(pi);
-}
-
-/* 
- * You can call your kdriver server with something like:
- * $ ./hw/kdrive/yourserver/X :1 -mouse evdev,,device=/dev/input/event4 -keybd
- * evdev,,device=/dev/input/event1,xkbmodel=abnt2,xkblayout=br 
- */
-static Bool 
-KdGetOptions (InputOption **options, char *string)
-{
-    InputOption     *newopt = NULL, **tmpo = NULL;
-    int             tam_key = 0;
-
-    newopt = xcalloc(1, sizeof (InputOption));
-    if (!newopt)
-        return FALSE;
-
-    for (tmpo = options; *tmpo; tmpo = &(*tmpo)->next)
-        ; /* Hello, I'm here */ 
-    *tmpo = newopt;
-
-    if (strchr(string, '='))
-    {
-        tam_key = (strchr(string, '=') - string);
-        newopt->key = (char *)xalloc(tam_key);
-        strncpy(newopt->key, string, tam_key);
-        newopt->key[tam_key] = '\0';
-        newopt->value = xstrdup(strchr(string, '=') + 1);
-    }
-    else
-    {
-        newopt->key = xstrdup(string);
-        newopt->value = NULL;
-    }
-    newopt->next = NULL;
-
-    return TRUE;
-}
-
-static void
-KdParseKbdOptions (KdKeyboardInfo *ki)
-{
-    InputOption *option = NULL;
-
-    for (option = ki->options; option; option = option->next)
-    {
-        if (strcasecmp(option->key, "XkbRules") == 0)
-            ki->xkbRules = option->value;
-        else if (strcasecmp(option->key, "XkbModel") == 0)
-            ki->xkbModel = option->value;
-        else if (strcasecmp(option->key, "XkbLayout") == 0)
-            ki->xkbLayout = option->value;
-        else if (strcasecmp(option->key, "XkbVariant") == 0)
-            ki->xkbVariant = option->value;
-        else if (strcasecmp(option->key, "XkbOptions") == 0)
-            ki->xkbOptions = option->value;
-        else if (!strcasecmp (option->key, "device"))
-            ki->path = strdup(option->value);
-        else
-           ErrorF("Kbd option key (%s) of value (%s) not assigned!\n", 
-                    option->key, option->value);
-    }
-}
-
-KdKeyboardInfo *
-KdParseKeyboard (char *arg)
-{
-    char            save[1024];
-    char            delim;
-    InputOption     *options = NULL;
-    KdKeyboardInfo     *ki = NULL;
-
-    ki = KdNewKeyboard();
-    if (!ki)
-        return NULL;
-
-    ki->name = strdup("Unknown KDrive Keyboard");
-    ki->path = NULL;
-    ki->driver = NULL;
-    ki->driverPrivate = NULL;
-    ki->next = NULL;
-
-    if (!arg)
-    {
-        ErrorF("keybd: no arg\n");
-        KdFreeKeyboard (ki);
-        return NULL;
-    }
-
-    if (strlen (arg) >= sizeof (save))
-    {
-        ErrorF("keybd: arg too long\n");
-        KdFreeKeyboard (ki);
-        return NULL;
-    }
-
-    arg = KdParseFindNext (arg, ",", save, &delim);
-    if (!save[0])
-    {
-        ErrorF("keybd: failed on save[0]\n");
-        KdFreeKeyboard (ki);
-        return NULL;
-    }
-
-    if (strcmp (save, "auto") == 0)
-        ki->driverPrivate = NULL;
-    else
-        ki->driverPrivate = xstrdup(save);
-
-    if (delim != ',')
-    {
-        return ki;
-    }
-
-    arg = KdParseFindNext (arg, ",", save, &delim);
-
-    while (delim == ',')
-    {
-        arg = KdParseFindNext (arg, ",", save, &delim);
-
-	if (!KdGetOptions(&options, save)) 
-	{
-	    KdFreeKeyboard(ki);
-	    return NULL;
-        }    
-    }
-
-    if (options)
-    {
-        ki->options = options;
-        KdParseKbdOptions(ki);
-    }
-
-    return ki;
-}
-
-static void
-KdParsePointerOptions (KdPointerInfo *pi)
-{
-    InputOption *option = NULL;
-
-    for (option = pi->options; option; option = option->next)
-    {
-        if (!strcmp (option->key, "emulatemiddle"))
-            pi->emulateMiddleButton = TRUE;
-        else if (!strcmp (option->key, "noemulatemiddle"))
-            pi->emulateMiddleButton = FALSE;
-        else if (!strcmp (option->key, "transformcoord"))
-            pi->transformCoordinates = TRUE;
-        else if (!strcmp (option->key, "rawcoord"))
-            pi->transformCoordinates = FALSE;
-        else if (!strcasecmp (option->key, "device"))
-            pi->path = strdup(option->value);
-        else if (!strcasecmp (option->key, "protocol"))
-            pi->protocol = strdup(option->value);
-        else
-            ErrorF("Pointer option key (%s) of value (%s) not assigned!\n", 
-                    option->key, option->value);
-    }
-}
-
-KdPointerInfo *
-KdParsePointer (char *arg)
-{
-    char            save[1024];
-    char            delim;
-    KdPointerInfo   *pi = NULL;
-    InputOption     *options = NULL;
-    int             i = 0;
-
-    pi = KdNewPointer();
-    if (!pi)
-        return NULL;
-    pi->emulateMiddleButton = kdEmulateMiddleButton;
-    pi->transformCoordinates = !kdRawPointerCoordinates;
-    pi->protocol = NULL;
-    pi->nButtons = 5; /* XXX should not be hardcoded */
-    pi->inputClass = KD_MOUSE;
-
-    if (!arg)
-    {
-        ErrorF("mouse: no arg\n");
-        KdFreePointer (pi);
-        return NULL;
-    }
-
-    if (strlen (arg) >= sizeof (save))
-    {
-        ErrorF("mouse: arg too long\n");
-        KdFreePointer (pi);
-        return NULL;
-    }
-    arg = KdParseFindNext (arg, ",", save, &delim);
-    if (!save[0])
-    {
-        ErrorF("failed on save[0]\n");
-        KdFreePointer (pi);
-        return NULL;
-    }
-
-    if (strcmp(save, "auto") == 0)
-        pi->driverPrivate = NULL;
-    else
-        pi->driverPrivate = xstrdup(save);
-
-    if (delim != ',')
-    {
-        return pi;
-    }
-
-    arg = KdParseFindNext (arg, ",", save, &delim);
-
-    while (delim == ',')
-    {
-        arg = KdParseFindNext (arg, ",", save, &delim);
-        if (save[0] == '{')
-        {
-            char *s = save + 1;
-             i = 0;
-             while (*s && *s != '}')
-             {
-                if ('1' <= *s && *s <= '0' + pi->nButtons)
-                    pi->map[i] = *s - '0';
-                else
-                    UseMsg ();
-                s++;
-             }
-        }
-        else
-        {
-            if (!KdGetOptions(&options, save))
-            {
-                KdFreePointer(pi);
-                return NULL;
-            }
-        }
-    }
-
-    if (options)
-    {
-        pi->options = options;
-        KdParsePointerOptions(pi);
-    }
-
-    return pi;
-}
-
-
-void
-KdInitInput (void)
-{
-    KdPointerInfo *pi;
-    KdKeyboardInfo *ki;
-    struct KdConfigDevice *dev;
-
-    kdInputEnabled = TRUE;
-
-    for (dev = kdConfigPointers; dev; dev = dev->next) {
-        pi = KdParsePointer(dev->line);
-        if (!pi)
-            ErrorF("Failed to parse pointer\n");
-        if (KdAddPointer(pi) != Success)
-            ErrorF("Failed to add pointer!\n");
-    }
-    for (dev = kdConfigKeyboards; dev; dev = dev->next) {
-        ki = KdParseKeyboard(dev->line);
-        if (!ki)
-            ErrorF("Failed to parse keyboard\n");
-        if (KdAddKeyboard(ki) != Success)
-            ErrorF("Failed to add keyboard!\n");
-    }
-
-    mieqInit();
-}
-
-/*
- * Middle button emulation state machine
- *
- *  Possible transitions:
- *	Button 1 press	    v1
- *	Button 1 release    ^1
- *	Button 2 press	    v2
- *	Button 2 release    ^2
- *	Button 3 press	    v3
- *	Button 3 release    ^3
- *	Button other press  vo
- *	Button other release ^o
- *	Mouse motion	    <>
- *	Keyboard event	    k
- *	timeout		    ...
- *	outside box	    <->
- *
- *  States:
- *	start
- *	button_1_pend
- *	button_1_down
- *	button_2_down
- *	button_3_pend
- *	button_3_down
- *	synthetic_2_down_13
- *	synthetic_2_down_3
- *	synthetic_2_down_1
- *
- *  Transition diagram
- *
- *  start
- *	v1  -> (hold) (settimeout) button_1_pend
- *	^1  -> (deliver) start
- *	v2  -> (deliver) button_2_down
- *	^2  -> (deliever) start
- *	v3  -> (hold) (settimeout) button_3_pend
- *	^3  -> (deliver) start
- *	vo  -> (deliver) start
- *	^o  -> (deliver) start
- *	<>  -> (deliver) start
- *	k   -> (deliver) start
- *
- *  button_1_pend	(button 1 is down, timeout pending)
- *	^1  -> (release) (deliver) start
- *	v2  -> (release) (deliver) button_1_down
- *	^2  -> (release) (deliver) button_1_down
- *	v3  -> (cleartimeout) (generate v2) synthetic_2_down_13
- *	^3  -> (release) (deliver) button_1_down
- *	vo  -> (release) (deliver) button_1_down
- *	^o  -> (release) (deliver) button_1_down
- *	<-> -> (release) (deliver) button_1_down
- *	<>  -> (deliver) button_1_pend
- *	k   -> (release) (deliver) button_1_down
- *	... -> (release) button_1_down
- *
- *  button_1_down	(button 1 is down)
- *	^1  -> (deliver) start
- *	v2  -> (deliver) button_1_down
- *	^2  -> (deliver) button_1_down
- *	v3  -> (deliver) button_1_down
- *	^3  -> (deliver) button_1_down
- *	vo  -> (deliver) button_1_down
- *	^o  -> (deliver) button_1_down
- *	<>  -> (deliver) button_1_down
- *	k   -> (deliver) button_1_down
- *
- *  button_2_down	(button 2 is down)
- *	v1  -> (deliver) button_2_down
- *	^1  -> (deliver) button_2_down
- *	^2  -> (deliver) start
- *	v3  -> (deliver) button_2_down
- *	^3  -> (deliver) button_2_down
- *	vo  -> (deliver) button_2_down
- *	^o  -> (deliver) button_2_down
- *	<>  -> (deliver) button_2_down
- *	k   -> (deliver) button_2_down
- *
- *  button_3_pend	(button 3 is down, timeout pending)
- *	v1  -> (generate v2) synthetic_2_down
- *	^1  -> (release) (deliver) button_3_down
- *	v2  -> (release) (deliver) button_3_down
- *	^2  -> (release) (deliver) button_3_down
- *	^3  -> (release) (deliver) start
- *	vo  -> (release) (deliver) button_3_down
- *	^o  -> (release) (deliver) button_3_down
- *	<-> -> (release) (deliver) button_3_down
- *	<>  -> (deliver) button_3_pend
- *	k   -> (release) (deliver) button_3_down
- *	... -> (release) button_3_down
- *
- *  button_3_down	(button 3 is down)
- *	v1  -> (deliver) button_3_down
- *	^1  -> (deliver) button_3_down
- *	v2  -> (deliver) button_3_down
- *	^2  -> (deliver) button_3_down
- *	^3  -> (deliver) start
- *	vo  -> (deliver) button_3_down
- *	^o  -> (deliver) button_3_down
- *	<>  -> (deliver) button_3_down
- *	k   -> (deliver) button_3_down
- *
- *  synthetic_2_down_13	(button 1 and 3 are down)
- *	^1  -> (generate ^2) synthetic_2_down_3
- *	v2  -> synthetic_2_down_13
- *	^2  -> synthetic_2_down_13
- *	^3  -> (generate ^2) synthetic_2_down_1
- *	vo  -> (deliver) synthetic_2_down_13
- *	^o  -> (deliver) synthetic_2_down_13
- *	<>  -> (deliver) synthetic_2_down_13
- *	k   -> (deliver) synthetic_2_down_13
- *
- *  synthetic_2_down_3 (button 3 is down)
- *	v1  -> (deliver) synthetic_2_down_3
- *	^1  -> (deliver) synthetic_2_down_3
- *	v2  -> synthetic_2_down_3
- *	^2  -> synthetic_2_down_3
- *	^3  -> start
- *	vo  -> (deliver) synthetic_2_down_3
- *	^o  -> (deliver) synthetic_2_down_3
- *	<>  -> (deliver) synthetic_2_down_3
- *	k   -> (deliver) synthetic_2_down_3
- *
- *  synthetic_2_down_1 (button 1 is down)
- *	^1  -> start
- *	v2  -> synthetic_2_down_1
- *	^2  -> synthetic_2_down_1
- *	v3  -> (deliver) synthetic_2_down_1
- *	^3  -> (deliver) synthetic_2_down_1
- *	vo  -> (deliver) synthetic_2_down_1
- *	^o  -> (deliver) synthetic_2_down_1
- *	<>  -> (deliver) synthetic_2_down_1
- *	k   -> (deliver) synthetic_2_down_1
- */
- 
-typedef enum _inputClass {
-    down_1, up_1,
-    down_2, up_2,
-    down_3, up_3,
-    down_o, up_o,
-    motion, outside_box,
-    keyboard, timeout,
-    num_input_class
-} KdInputClass;
-
-typedef enum _inputAction {
-    noop,
-    hold,
-    setto,
-    deliver,
-    release,
-    clearto,
-    gen_down_2,
-    gen_up_2
-} KdInputAction;
-
-#define MAX_ACTIONS 2
-
-typedef struct _inputTransition {
-    KdInputAction  actions[MAX_ACTIONS];
-    KdPointerState nextState;
-} KdInputTransition;
-
-static const
-KdInputTransition  kdInputMachine[num_input_states][num_input_class] = {
-    /* start */
-    {
-	{ { hold, setto },	    button_1_pend },	/* v1 */
-	{ { deliver, noop },	    start },		/* ^1 */
-	{ { deliver, noop },	    button_2_down },	/* v2 */
-	{ { deliver, noop },	    start },		/* ^2 */
-	{ { hold, setto },	    button_3_pend },	/* v3 */
-	{ { deliver, noop },	    start },		/* ^3 */
-	{ { deliver, noop },	    start },		/* vo */
-	{ { deliver, noop },	    start },		/* ^o */
-	{ { deliver, noop },	    start },		/* <> */
-	{ { deliver, noop },	    start },		/* <-> */
-	{ { noop, noop },	    start },		/* k */
-	{ { noop, noop },	    start },		/* ... */
-    },
-    /* button_1_pend */
-    {
-	{ { noop, noop },	    button_1_pend },	/* v1 */
-	{ { release, deliver },	    start },		/* ^1 */
-	{ { release, deliver },	    button_1_down },	/* v2 */
-	{ { release, deliver },	    button_1_down },	/* ^2 */
-	{ { clearto, gen_down_2 },  synth_2_down_13 },	/* v3 */
-	{ { release, deliver },	    button_1_down },	/* ^3 */
-	{ { release, deliver },	    button_1_down },	/* vo */
-	{ { release, deliver },	    button_1_down },	/* ^o */
-	{ { deliver, noop },	    button_1_pend },	/* <> */
-	{ { release, deliver },	    button_1_down },	/* <-> */
-	{ { noop, noop },	    button_1_down },	/* k */
-	{ { release, noop },	    button_1_down },	/* ... */
-    },
-    /* button_1_down */
-    {
-	{ { noop, noop },	    button_1_down },	/* v1 */
-	{ { deliver, noop },	    start },		/* ^1 */
-	{ { deliver, noop },	    button_1_down },	/* v2 */
-	{ { deliver, noop },	    button_1_down },	/* ^2 */
-	{ { deliver, noop },	    button_1_down },	/* v3 */
-	{ { deliver, noop },	    button_1_down },	/* ^3 */
-	{ { deliver, noop },	    button_1_down },	/* vo */
-	{ { deliver, noop },	    button_1_down },	/* ^o */
-	{ { deliver, noop },	    button_1_down },	/* <> */
-	{ { deliver, noop },	    button_1_down },	/* <-> */
-	{ { noop, noop },	    button_1_down },	/* k */
-	{ { noop, noop },	    button_1_down },	/* ... */
-    },
-    /* button_2_down */
-    {
-	{ { deliver, noop },	    button_2_down },	/* v1 */
-	{ { deliver, noop },	    button_2_down },	/* ^1 */
-	{ { noop, noop },	    button_2_down },	/* v2 */
-	{ { deliver, noop },	    start },		/* ^2 */
-	{ { deliver, noop },	    button_2_down },	/* v3 */
-	{ { deliver, noop },	    button_2_down },	/* ^3 */
-	{ { deliver, noop },	    button_2_down },	/* vo */
-	{ { deliver, noop },	    button_2_down },	/* ^o */
-	{ { deliver, noop },	    button_2_down },	/* <> */
-	{ { deliver, noop },	    button_2_down },	/* <-> */
-	{ { noop, noop },	    button_2_down },	/* k */
-	{ { noop, noop },	    button_2_down },	/* ... */
-    },
-    /* button_3_pend */
-    {
-	{ { clearto, gen_down_2 },  synth_2_down_13 },	/* v1 */
-	{ { release, deliver },	    button_3_down },	/* ^1 */
-	{ { release, deliver },	    button_3_down },	/* v2 */
-	{ { release, deliver },	    button_3_down },	/* ^2 */
-	{ { release, deliver },	    button_3_down },	/* v3 */
-	{ { release, deliver },	    start },		/* ^3 */
-	{ { release, deliver },	    button_3_down },	/* vo */
-	{ { release, deliver },	    button_3_down },	/* ^o */
-	{ { deliver, noop },	    button_3_pend },	/* <> */
-	{ { release, deliver },	    button_3_down },	/* <-> */
-	{ { release, noop },	    button_3_down },	/* k */
-	{ { release, noop },	    button_3_down },	/* ... */
-    },
-    /* button_3_down */
-    {
-	{ { deliver, noop },	    button_3_down },	/* v1 */
-	{ { deliver, noop },	    button_3_down },	/* ^1 */
-	{ { deliver, noop },	    button_3_down },	/* v2 */
-	{ { deliver, noop },	    button_3_down },	/* ^2 */
-	{ { noop, noop },	    button_3_down },	/* v3 */
-	{ { deliver, noop },	    start },		/* ^3 */
-	{ { deliver, noop },	    button_3_down },	/* vo */
-	{ { deliver, noop },	    button_3_down },	/* ^o */
-	{ { deliver, noop },	    button_3_down },	/* <> */
-	{ { deliver, noop },	    button_3_down },	/* <-> */
-	{ { noop, noop },	    button_3_down },	/* k */
-	{ { noop, noop },	    button_3_down },	/* ... */
-    },
-    /* synthetic_2_down_13 */
-    {
-	{ { noop, noop },	    synth_2_down_13 },	/* v1 */
-	{ { gen_up_2, noop },	    synth_2_down_3 },	/* ^1 */
-	{ { noop, noop },	    synth_2_down_13 },	/* v2 */
-	{ { noop, noop },	    synth_2_down_13 },	/* ^2 */
-	{ { noop, noop },	    synth_2_down_13 },	/* v3 */
-	{ { gen_up_2, noop },	    synth_2_down_1 },	/* ^3 */
-	{ { deliver, noop },	    synth_2_down_13 },	/* vo */
-	{ { deliver, noop },	    synth_2_down_13 },	/* ^o */
-	{ { deliver, noop },	    synth_2_down_13 },	/* <> */
-	{ { deliver, noop },	    synth_2_down_13 },	/* <-> */
-	{ { noop, noop },	    synth_2_down_13 },	/* k */
-	{ { noop, noop },	    synth_2_down_13 },	/* ... */
-    },
-    /* synthetic_2_down_3 */
-    {
-	{ { deliver, noop },	    synth_2_down_3 },	/* v1 */
-	{ { deliver, noop },	    synth_2_down_3 },	/* ^1 */
-	{ { deliver, noop },	    synth_2_down_3 },	/* v2 */
-	{ { deliver, noop },	    synth_2_down_3 },	/* ^2 */
-	{ { noop, noop },	    synth_2_down_3 },	/* v3 */
-	{ { noop, noop },	    start },		/* ^3 */
-	{ { deliver, noop },	    synth_2_down_3 },	/* vo */
-	{ { deliver, noop },	    synth_2_down_3 },	/* ^o */
-	{ { deliver, noop },	    synth_2_down_3 },	/* <> */
-	{ { deliver, noop },	    synth_2_down_3 },	/* <-> */
-	{ { noop, noop },	    synth_2_down_3 },	/* k */
-	{ { noop, noop },	    synth_2_down_3 },	/* ... */
-    },
-    /* synthetic_2_down_1 */
-    {
-	{ { noop, noop },	    synth_2_down_1 },	/* v1 */
-	{ { noop, noop },	    start },		/* ^1 */
-	{ { deliver, noop },	    synth_2_down_1 },	/* v2 */
-	{ { deliver, noop },	    synth_2_down_1 },	/* ^2 */
-	{ { deliver, noop },	    synth_2_down_1 },	/* v3 */
-	{ { deliver, noop },	    synth_2_down_1 },	/* ^3 */
-	{ { deliver, noop },	    synth_2_down_1 },	/* vo */
-	{ { deliver, noop },	    synth_2_down_1 },	/* ^o */
-	{ { deliver, noop },	    synth_2_down_1 },	/* <> */
-	{ { deliver, noop },	    synth_2_down_1 },	/* <-> */
-	{ { noop, noop },	    synth_2_down_1 },	/* k */
-	{ { noop, noop },	    synth_2_down_1 },	/* ... */
-    },
-};
-
-#define EMULATION_WINDOW    10
-#define EMULATION_TIMEOUT   100
-
-static int
-KdInsideEmulationWindow (KdPointerInfo *pi, int x, int y, int z)
-{
-    pi->emulationDx = pi->heldEvent.x - x;
-    pi->emulationDy = pi->heldEvent.y - y;
-
-    return (abs (pi->emulationDx) < EMULATION_WINDOW &&
-	    abs (pi->emulationDy) < EMULATION_WINDOW);
-}
-				     
-static KdInputClass
-KdClassifyInput (KdPointerInfo *pi, int type, int x, int y, int z, int b)
-{
-    switch (type) {
-    case ButtonPress:
-	switch (b) {
-	case 1: return down_1;
-	case 2: return down_2;
-	case 3: return down_3;
-	default: return down_o;
-	}
-	break;
-    case ButtonRelease:
-	switch (b) {
-	case 1: return up_1;
-	case 2: return up_2;
-	case 3: return up_3;
-	default: return up_o;
-	}
-	break;
-    case MotionNotify:
-	if (pi->eventHeld && !KdInsideEmulationWindow(pi, x, y, z))
-	    return outside_box;
-	else
-	    return motion;
-    default:
-	return keyboard;
-    }
-    return keyboard;
-}
-
-#ifdef DEBUG
-char	*kdStateNames[] = {
-    "start",
-    "button_1_pend",
-    "button_1_down",
-    "button_2_down",
-    "button_3_pend",
-    "button_3_down",
-    "synth_2_down_13",
-    "synth_2_down_3",
-    "synthetic_2_down_1",
-    "num_input_states"
-};
-
-char	*kdClassNames[] = {
-    "down_1", "up_1",
-    "down_2", "up_2",
-    "down_3", "up_3",
-    "motion", "ouside_box",
-    "keyboard", "timeout",
-    "num_input_class"
-};
-
-char *kdActionNames[] = {
-    "noop",
-    "hold",
-    "setto",
-    "deliver",
-    "release",
-    "clearto",
-    "gen_down_2",
-    "gen_up_2",
-};
-#endif /* DEBUG */
-
-static void
-KdQueueEvent (DeviceIntPtr pDev, InternalEvent *ev)
-{
-    KdAssertSigioBlocked ("KdQueueEvent");
-    mieqEnqueue (pDev, ev);
-}
-
-/* We return true if we're stealing the event. */
-static Bool
-KdRunMouseMachine (KdPointerInfo *pi, KdInputClass c, int type, int x, int y,
-                   int z, int b, int absrel)
-{
-    const KdInputTransition *t;
-    int	a;
-
-    c = KdClassifyInput(pi, type, x, y, z, b);
-    t = &kdInputMachine[pi->mouseState][c];
-    for (a = 0; a < MAX_ACTIONS; a++)
-    {
-	switch (t->actions[a]) {
-	case noop:
-	    break;
-	case hold:
-	    pi->eventHeld = TRUE;
-	    pi->emulationDx = 0;
-	    pi->emulationDy = 0;
-	    pi->heldEvent.type = type;
-            pi->heldEvent.x = x;
-            pi->heldEvent.y = y;
-            pi->heldEvent.z = z;
-            pi->heldEvent.flags = b;
-            pi->heldEvent.absrel = absrel;
-            return TRUE;
-	    break;
-	case setto:
-	    pi->emulationTimeout = GetTimeInMillis () + EMULATION_TIMEOUT;
-	    pi->timeoutPending = TRUE;
-	    break;
-	case deliver:
-            _KdEnqueuePointerEvent (pi, pi->heldEvent.type, pi->heldEvent.x,
-                                    pi->heldEvent.y, pi->heldEvent.z,
-                                    pi->heldEvent.flags, pi->heldEvent.absrel,
-                                    TRUE);
-	    break;
-	case release:
-	    pi->eventHeld = FALSE;
-	    pi->timeoutPending = FALSE;
-            _KdEnqueuePointerEvent (pi, pi->heldEvent.type, pi->heldEvent.x,
-                                    pi->heldEvent.y, pi->heldEvent.z,
-                                    pi->heldEvent.flags, pi->heldEvent.absrel,
-                                    TRUE);
-            return TRUE;
-	    break;
-	case clearto:
-	    pi->timeoutPending = FALSE;
-	    break;
-	case gen_down_2:
-            _KdEnqueuePointerEvent (pi, ButtonPress, x, y, z, 2, absrel,
-                                    TRUE);
-	    pi->eventHeld = FALSE;
-            return TRUE;
-	    break;
-	case gen_up_2:
-            _KdEnqueuePointerEvent (pi, ButtonRelease, x, y, z, 2, absrel,
-                                    TRUE);
-            return TRUE;
-	    break;
-	}
-    }
-    pi->mouseState = t->nextState;
-    return FALSE;
-}
-
-static int
-KdHandlePointerEvent (KdPointerInfo *pi, int type, int x, int y, int z, int b,
-                      int absrel)
-{
-    if (pi->emulateMiddleButton)
-        return KdRunMouseMachine (pi, KdClassifyInput(pi, type, x, y, z, b),
-                                  type, x, y, z, b, absrel);
-    return FALSE;
-}
-
-static void
-KdReceiveTimeout (KdPointerInfo *pi)
-{
-    KdRunMouseMachine (pi, timeout, 0, 0, 0, 0, 0, 0);
-}
-
-/*
- * kdCheckTermination
- *
- * This function checks for the key sequence that terminates the server.  When
- * detected, it sets the dispatchException flag and returns.  The key sequence
- * is:
- *	Control-Alt
- * It's assumed that the server will be waken up by the caller when this
- * function returns.
- */
-
-extern int nClients;
-
-void
-KdReleaseAllKeys (void)
-{
-#if 0
-    int	key, nEvents, i;
-    KdKeyboardInfo *ki;
-
-    KdBlockSigio ();
-
-    for (ki = kdKeyboards; ki; ki = ki->next) {
-        for (key = ki->keySyms.minKeyCode; key < ki->keySyms.maxKeyCode;
-             key++) {
-            if (key_is_down(ki->dixdev, key, KEY_POSTED | KEY_PROCESSED)) {
-                KdHandleKeyboardEvent(ki, KeyRelease, key);
-                GetEventList(&kdEvents);
-                nEvents = GetKeyboardEvents(kdEvents, ki->dixdev, KeyRelease, key);
-                for (i = 0; i < nEvents; i++)
-                    KdQueueEvent (ki->dixdev, (kdEvents + i)->event);
-            }
-        }
-    }
-
-    KdUnblockSigio ();
-#endif
-}
-
-static void
-KdCheckLock (void)
-{
-    KeyClassPtr	    keyc = NULL;
-    Bool	    isSet = FALSE, shouldBeSet = FALSE;
-    KdKeyboardInfo     *tmp = NULL;
-
-    for (tmp = kdKeyboards; tmp; tmp = tmp->next) {
-        if (tmp->LockLed && tmp->dixdev && tmp->dixdev->key) {
-            keyc = tmp->dixdev->key;
-            isSet = (tmp->leds & (1 << (tmp->LockLed-1))) != 0;
-            /* FIXME: Just use XKB indicators! */
-            shouldBeSet = !!(XkbStateFieldFromRec(&keyc->xkbInfo->state) & LockMask);
-            if (isSet != shouldBeSet)
-                KdSetLed (tmp, tmp->LockLed, shouldBeSet);
-        }
-    }
-}
-
-void
-KdEnqueueKeyboardEvent(KdKeyboardInfo   *ki,
-                       unsigned char scan_code,
-		       unsigned char is_up)
-{
-    unsigned char key_code;
-    KeyClassPtr	keyc = NULL;
-    KeybdCtrl *ctrl = NULL;
-    int type, nEvents, i;
-
-    if (!ki || !ki->dixdev || !ki->dixdev->kbdfeed || !ki->dixdev->key)
-	return;
-
-    keyc = ki->dixdev->key;
-    ctrl = &ki->dixdev->kbdfeed->ctrl;
-
-    if (scan_code >= ki->minScanCode && scan_code <= ki->maxScanCode)
-    {
-	key_code = scan_code + KD_MIN_KEYCODE - ki->minScanCode;
-
-	/*
-	 * Set up this event -- the type may be modified below
-	 */
-	if (is_up)
-	    type = KeyRelease;
-	else
-	    type = KeyPress;
-
-        GetEventList(&kdEvents);
-
-        nEvents = GetKeyboardEvents(kdEvents, ki->dixdev, type, key_code);
-        for (i = 0; i < nEvents; i++)
-            KdQueueEvent(ki->dixdev, (InternalEvent *)((kdEvents + i)->event));
-    }
-    else {
-        ErrorF("driver %s wanted to post scancode %d outside of [%d, %d]!\n",
-               ki->name, scan_code, ki->minScanCode, ki->maxScanCode);
-    }
-}
-
-/*
- * kdEnqueuePointerEvent
- *
- * This function converts hardware mouse event information into X event
- * information.  A mouse movement event is passed off to MI to generate
- * a MotionNotify event, if appropriate.  Button events are created and
- * passed off to MI for enqueueing.
- */
-
-/* FIXME do something a little more clever to deal with multiple axes here */
-void
-KdEnqueuePointerEvent(KdPointerInfo *pi, unsigned long flags, int rx, int ry,
-                      int rz)
-{
-    CARD32        ms;
-    unsigned char buttons;
-    int           x, y, z;
-    int           (*matrix)[3] = kdPointerMatrix.matrix;
-    unsigned long button;
-    int           n;
-    int           dixflags = 0;
-
-    if (!pi)
-	return;
-    
-    ms = GetTimeInMillis();
-
-    /* we don't need to transform z, so we don't. */
-    if (flags & KD_MOUSE_DELTA) {
-	if (pi->transformCoordinates) {
-	    x = matrix[0][0] * rx + matrix[0][1] * ry;
-	    y = matrix[1][0] * rx + matrix[1][1] * ry;
-	}
-	else {
-	    x = rx;
-	    y = ry;
-	}
-    }
-    else {
-	if (pi->transformCoordinates) {
-	    x = matrix[0][0] * rx + matrix[0][1] * ry + matrix[0][2];
-	    y = matrix[1][0] * rx + matrix[1][1] * ry + matrix[1][2];
-	}
-	else {
-	    x = rx;
-	    y = ry;
-	}
-    }
-    z = rz;
-
-    if (flags & KD_MOUSE_DELTA)
-    {
-        if (x || y || z)
-        {
-            dixflags = POINTER_RELATIVE | POINTER_ACCELERATE;
-            _KdEnqueuePointerEvent(pi, MotionNotify, x, y, z, 0, dixflags, FALSE);
-        }
-    } else
-    {
-        dixflags = POINTER_ABSOLUTE;
-        if (x != pi->dixdev->last.valuators[0] ||
-            y != pi->dixdev->last.valuators[1])
-            _KdEnqueuePointerEvent(pi, MotionNotify, x, y, z, 0, dixflags, FALSE);
-    }
-
-    buttons = flags;
-
-    for (button = KD_BUTTON_1, n = 1; n <= pi->nButtons;
-         button <<= 1, n++) {
-        if (((pi->buttonState & button) ^ (buttons & button)) &&
-           !(buttons & button)) {
-            _KdEnqueuePointerEvent(pi, ButtonRelease, x, y, z, n,
-                                   dixflags, FALSE);
-	}
-    }
-    for (button = KD_BUTTON_1, n = 1; n <= pi->nButtons;
-         button <<= 1, n++) {
-	if (((pi->buttonState & button) ^ (buttons & button)) &&
-	    (buttons & button)) {
-            _KdEnqueuePointerEvent(pi, ButtonPress, x, y, z, n,
-                                   dixflags, FALSE);
-        }
-    }
-
-    pi->buttonState = buttons;
-}
-
-void
-_KdEnqueuePointerEvent (KdPointerInfo *pi, int type, int x, int y, int z,
-                        int b, int absrel, Bool force)
-{
-    int nEvents = 0, i = 0;
-    int valuators[3] = { x, y, z };
-
-    /* TRUE from KdHandlePointerEvent, means 'we swallowed the event'. */
-    if (!force && KdHandlePointerEvent(pi, type, x, y, z, b, absrel))
-        return;
-
-    GetEventList(&kdEvents);
-    nEvents = GetPointerEvents(kdEvents, pi->dixdev, type, b, absrel,
-                               0, 3, valuators);
-    for (i = 0; i < nEvents; i++)
-        KdQueueEvent(pi->dixdev, (InternalEvent *)((kdEvents + i)->event));
-}
-
-void
-KdBlockHandler (int		screen,
-		pointer		blockData,
-		pointer		timeout,
-		pointer		readmask)
-{
-    KdPointerInfo		    *pi;
-    int myTimeout=0;
-
-    for (pi = kdPointers; pi; pi = pi->next)
-    {
-	if (pi->timeoutPending)
-	{
-	    int	ms;
-    
-	    ms = pi->emulationTimeout - GetTimeInMillis ();
-	    if (ms < 1)
-		ms = 1;
-	    if(ms<myTimeout || myTimeout==0)
-		    myTimeout=ms;
-	}
-    }
-    /* if we need to poll for events, do that */
-    if(kdOsFuncs->pollEvents)
-    {
-	    (*kdOsFuncs->pollEvents)();
-	    myTimeout=20;
-    }
-    if(myTimeout>0)
-    	AdjustWaitForDelay (timeout, myTimeout);
-}
-
-void
-KdWakeupHandler (int		screen, 
-		 pointer    	data,
-		 unsigned long	lresult,
-		 pointer	readmask)
-{
-    int		result = (int) lresult;
-    fd_set	*pReadmask = (fd_set *) readmask;
-    int		i;
-    KdPointerInfo	*pi;
-    
-    if (kdInputEnabled && result > 0)
-    {
-	for (i = 0; i < kdNumInputFds; i++)
-	    if (FD_ISSET (kdInputFds[i].fd, pReadmask))
-	    {
-		KdBlockSigio ();
-		(*kdInputFds[i].read) (kdInputFds[i].fd, kdInputFds[i].closure);
-		KdUnblockSigio ();
-	    }
-    }
-    for (pi = kdPointers; pi; pi = pi->next)
-    {
-	if (pi->timeoutPending)
-	{
-	    if ((long) (GetTimeInMillis () - pi->emulationTimeout) >= 0)
-	    {
-		pi->timeoutPending = FALSE;
-		KdBlockSigio ();
-		KdReceiveTimeout (pi);
-		KdUnblockSigio ();
-	    }
-	}
-    }
-    if (kdSwitchPending)
-	KdProcessSwitch ();
-}
-
-#define KdScreenOrigin(pScreen) (&(KdGetScreenPriv(pScreen)->screen->origin))
-
-static Bool
-KdCursorOffScreen(ScreenPtr *ppScreen, int *x, int *y)
-{
-    ScreenPtr	pScreen  = *ppScreen;
-    ScreenPtr	pNewScreen;
-    int		n;
-    int		dx, dy;
-    int		best_x, best_y;
-    int		n_best_x, n_best_y;
-    CARD32	ms;
-    
-    if (kdDisableZaphod || screenInfo.numScreens <= 1)
-	return FALSE;
-
-    if (0 <= *x && *x < pScreen->width && 0 <= *y && *y < pScreen->height)
-	return FALSE;
-	
-    ms = GetTimeInMillis ();
-    if (kdOffScreen && (int) (ms - kdOffScreenTime) < 1000)
-	return FALSE;
-    kdOffScreen = TRUE;
-    kdOffScreenTime = ms;
-    n_best_x = -1;
-    best_x = 32767;
-    n_best_y = -1;
-    best_y = 32767;
-    for (n = 0; n < screenInfo.numScreens; n++)
-    {
-	pNewScreen = screenInfo.screens[n];
-	if (pNewScreen == pScreen) 
-	    continue;
-	dx = KdScreenOrigin(pNewScreen)->x - KdScreenOrigin(pScreen)->x;
-	dy = KdScreenOrigin(pNewScreen)->y - KdScreenOrigin(pScreen)->y;
-	if (*x < 0)
-	{
-	    if (dx <= 0 && -dx < best_x)
-	    {
-		best_x = -dx;
-		n_best_x = n;
-	    }
-	}
-	else if (*x >= pScreen->width)
-	{
-	    if (dx >= 0 && dx < best_x)
-	    {
-		best_x = dx;
-		n_best_x = n;
-	    }
-	}
-	if (*y < 0)
-	{
-	    if (dy <= 0 && -dy < best_y)
-	    {
-		best_y = -dy;
-		n_best_y = n;
-	    }
-	}
-	else if (*y >= pScreen->height)
-	{
-	    if (dy >= 0 && dy < best_y)
-	    {
-		best_y = dy;
-		n_best_y = n;
-	    }
-	}
-    }
-    if (best_y < best_x)
-	n_best_x = n_best_y;
-    if (n_best_x == -1)
-	return FALSE;
-    pNewScreen = screenInfo.screens[n_best_x];
-    
-    if (*x < 0)
-	*x += pNewScreen->width;
-    if (*y < 0)
-	*y += pNewScreen->height;
-    
-    if (*x >= pScreen->width)
-	*x -= pScreen->width;
-    if (*y >= pScreen->height)
-	*y -= pScreen->height;
-    
-    *ppScreen = pNewScreen;
-    return TRUE;
-}
-
-static void
-KdCrossScreen(ScreenPtr pScreen, Bool entering)
-{
-#ifndef XIPAQ
-    if (entering)
-	KdEnableScreen (pScreen);
-    else
-	KdDisableScreen (pScreen);
-#endif
-}
-
-int KdCurScreen;	/* current event screen */
-
-static void
-KdWarpCursor (DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y)
-{
-    KdBlockSigio ();
-    KdCurScreen = pScreen->myNum;
-    miPointerWarpCursor(pDev, pScreen, x, y);
-    KdUnblockSigio ();
-}
-
-miPointerScreenFuncRec kdPointerScreenFuncs = 
-{
-    KdCursorOffScreen,
-    KdCrossScreen,
-    KdWarpCursor
-};
-
-void
-ProcessInputEvents (void)
-{
-    mieqProcessInputEvents();
-    miPointerUpdateSprite(inputInfo.pointer);
-    if (kdSwitchPending)
-	KdProcessSwitch ();
-    KdCheckLock ();
-}
-
-/* FIXME use XSECURITY to work out whether the client should be allowed to
- * open and close. */
-void
-OpenInputDevice(DeviceIntPtr pDev, ClientPtr client, int *status)
-{
-    if (!pDev)
-        *status = BadDevice;
-    else
-        *status = Success;
-}
-
-void
-CloseInputDevice(DeviceIntPtr pDev, ClientPtr client)
-{
-    return;
-}
-
-/* We initialise all input devices at startup. */
-void
-AddOtherInputDevices(void)
-{
-    return;
-}
-
-/* At the moment, absolute/relative is up to the client. */
-int
-SetDeviceMode(register ClientPtr client, DeviceIntPtr pDev, int mode)
-{
-    return BadMatch;
-}
-
-int
-SetDeviceValuators(register ClientPtr client, DeviceIntPtr pDev,
-                   int *valuators, int first_valuator, int num_valuators)
-{
-    return BadMatch;
-}
-
-int
-ChangeDeviceControl(register ClientPtr client, DeviceIntPtr pDev,
-                        xDeviceCtl *control)
-{
-    switch (control->control) {
-    case DEVICE_RESOLUTION:
-        /* FIXME do something more intelligent here */
-        return BadMatch;
-
-    case DEVICE_ABS_CALIB:
-    case DEVICE_ABS_AREA:
-        return Success;
-
-    case DEVICE_CORE:
-        return BadMatch;
-    case DEVICE_ENABLE:
-        return Success;
-
-    default:
-        return BadMatch;
-    }
-
-    /* NOTREACHED */
-    return BadImplementation;
-}
-
-int
-NewInputDeviceRequest(InputOption *options, DeviceIntPtr *pdev)
-{
-    InputOption *option = NULL;
-    KdPointerInfo *pi = NULL;
-    KdKeyboardInfo *ki = NULL;
-
-    for (option = options; option; option = option->next) {
-        if (strcmp(option->key, "type") == 0) {
-            if (strcmp(option->value, "pointer") == 0) {
-                pi = KdNewPointer();
-                if (!pi)
-                    return BadAlloc;
-            }
-            else if (strcmp(option->value, "keyboard") == 0) {
-                ki = KdNewKeyboard();
-                if (!ki)
-                    return BadAlloc;
-            }
-            else {
-                ErrorF("unrecognised device type!\n");
-                return BadValue;
-            }
-        }
-#ifdef CONFIG_HAL
-        else if (strcmp(option->key, "_source") == 0 &&
-                 strcmp(option->value, "server/hal") == 0)
-        {
-            ErrorF("Ignoring device from HAL.\n");
-            return BadValue;
-        }
-#endif
-    }
-
-    if (!ki && !pi) {
-        ErrorF("unrecognised device identifier!\n");
-        return BadValue;
-    }
-
-    /* FIXME: change this code below to use KdParseKbdOptions and
-     * KdParsePointerOptions */
-    for (option = options; option; option = option->next) {
-        if (strcmp(option->key, "device") == 0) {
-            if (pi && option->value)
-                pi->path = strdup(option->value);
-            else if (ki && option->value)
-                ki->path = strdup(option->value);
-        }
-        else if (strcmp(option->key, "driver") == 0) {
-            if (pi) {
-                pi->driver = KdFindPointerDriver(option->value);
-                if (!pi->driver) {
-                    ErrorF("couldn't find driver!\n");
-                    KdFreePointer(pi);
-                    return BadValue;
-                }
-                pi->options = options;
-            }
-            else if (ki) {
-                ki->driver = KdFindKeyboardDriver(option->value);
-                if (!ki->driver) {
-                    ErrorF("couldn't find driver!\n");
-                    KdFreeKeyboard(ki);
-                    return BadValue;
-                }
-                ki->options = options;
-            }
-        }
-    }
-
-    if (pi) {
-        if (KdAddPointer(pi) != Success ||
-            ActivateDevice(pi->dixdev, TRUE) != Success ||
-            EnableDevice(pi->dixdev, TRUE) != TRUE) {
-            ErrorF("couldn't add or enable pointer\n");
-            return BadImplementation;
-        }
-    }
-    else if (ki) {
-        if (KdAddKeyboard(ki) != Success ||
-            ActivateDevice(ki->dixdev, TRUE) != Success ||
-            EnableDevice(ki->dixdev, TRUE) != TRUE) {
-            ErrorF("couldn't add or enable keyboard\n");
-            return BadImplementation;
-        }
-    }
-
-    if (pi) {
-        *pdev = pi->dixdev;
-    } else if(ki) {
-        *pdev = ki->dixdev;
-    }
-
-    return Success;
-}
-
-void
-DeleteInputDeviceRequest(DeviceIntPtr pDev)
-{
-    RemoveDevice(pDev, TRUE);
-}
+/*

+ * Copyright © 1999 Keith Packard

+ * Copyright © 2006 Nokia Corporation

+ *

+ * 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, and that the name of the authors not be used in

+ * advertising or publicity pertaining to distribution of the software without

+ * specific, written prior permission.  The authors make no

+ * representations about the suitability of this software for any purpose.  It

+ * is provided "as is" without express or implied warranty.

+ *

+ * THE AUTHORS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,

+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO

+ * EVENT SHALL THE AUTHORS BE LIABLE FOR ANY SPECIAL, INDIRECT OR

+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,

+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER

+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR

+ * PERFORMANCE OF THIS SOFTWARE.

+ */

+

+#ifdef HAVE_CONFIG_H

+#include <kdrive-config.h>

+#endif

+#include "kdrive.h"

+#include "inputstr.h"

+

+#define XK_PUBLISHING

+#include <X11/keysym.h>

+#if HAVE_X11_XF86KEYSYM_H

+#include <X11/XF86keysym.h>

+#endif

+#include <signal.h>

+#include <stdio.h>

+#ifdef sun

+#include <sys/file.h> /* needed for FNONBLOCK & FASYNC */

+#endif

+

+#include "xkbsrv.h"

+

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

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

+#include "XIstubs.h" /* even though we don't use stubs.  cute, no? */

+#include "exevents.h"

+#include "extinit.h"

+#include "exglobals.h"

+#include "eventstr.h"

+#include "xserver-properties.h"

+

+#define AtomFromName(x) MakeAtom(x, strlen(x), 1)

+

+struct KdConfigDevice {

+    char *line;

+    struct KdConfigDevice *next;

+};

+

+/* kdKeyboards and kdPointers hold all the real devices. */

+static KdKeyboardInfo *kdKeyboards         = NULL;

+static KdPointerInfo  *kdPointers          = NULL;

+static struct KdConfigDevice *kdConfigKeyboards   = NULL;

+static struct KdConfigDevice *kdConfigPointers    = NULL;

+

+static KdKeyboardDriver *kdKeyboardDrivers = NULL;

+static KdPointerDriver  *kdPointerDrivers  = NULL;

+

+static EventListPtr     kdEvents = NULL;

+

+static Bool		kdInputEnabled;

+static Bool		kdOffScreen;

+static unsigned long	kdOffScreenTime;

+static KdPointerMatrix	kdPointerMatrix = {

+   { { 1, 0, 0 },

+     { 0, 1, 0 } }

+};

+

+void KdResetInputMachine (void);

+    

+#define KD_MAX_INPUT_FDS    8

+

+typedef struct _kdInputFd {

+    int	        fd;

+    void        (*read) (int fd, void *closure);

+    int	        (*enable) (int fd, void *closure);

+    void        (*disable) (int fd, void *closure);

+    void        *closure;

+} KdInputFd;

+

+static KdInputFd kdInputFds[KD_MAX_INPUT_FDS];

+static int	 kdNumInputFds;

+

+extern Bool      kdRawPointerCoordinates;

+

+static void

+KdSigio (int sig)

+{

+    int	i;

+

+    for (i = 0; i < kdNumInputFds; i++)

+	(*kdInputFds[i].read) (kdInputFds[i].fd, kdInputFds[i].closure);

+}

+

+static void

+KdBlockSigio (void)

+{

+#ifdef _MSC_VER

+    __asm int 3;

+#else

+    sigset_t	set;

+    

+    sigemptyset (&set);

+    sigaddset (&set, SIGIO);

+    sigprocmask (SIG_BLOCK, &set, 0);

+#endif

+}

+

+static void

+KdUnblockSigio (void)

+{

+#ifdef _MSC_VER

+    __asm int 3;

+#else

+    sigset_t	set;

+    

+    sigemptyset (&set);

+    sigaddset (&set, SIGIO);

+    sigprocmask (SIG_UNBLOCK, &set, 0);

+#endif

+}

+

+#ifdef DEBUG_SIGIO

+

+void

+KdAssertSigioBlocked (char *where)

+{

+    sigset_t	set, old;

+

+    sigemptyset (&set);

+    sigprocmask (SIG_BLOCK, &set, &old);

+    if (!sigismember (&old, SIGIO)) {

+	ErrorF ("SIGIO not blocked at %s\n", where);

+        KdBacktrace(0);

+    }

+}

+

+#else

+

+#define KdAssertSigioBlocked(s)

+

+#endif

+

+static int  kdnFds;

+

+#ifdef FNONBLOCK

+#define NOBLOCK FNONBLOCK

+#else

+#define NOBLOCK FNDELAY

+#endif

+

+void

+KdResetInputMachine (void)

+{

+    KdPointerInfo *pi;

+

+    for (pi = kdPointers; pi; pi = pi->next) {

+        pi->mouseState = start;

+        pi->eventHeld = FALSE;

+    }

+}

+

+static void

+KdNonBlockFd (int fd)

+{

+#ifdef _MSC_VER

+    __asm int 3;

+#else

+    int	flags;

+    flags = fcntl (fd, F_GETFL);

+    flags |= FASYNC|NOBLOCK;

+    fcntl (fd, F_SETFL, flags);

+#endif

+}

+

+static void

+KdAddFd (int fd)

+{

+#ifdef _MSC_VER

+    __asm int 3;

+#else

+    struct sigaction	act;

+    sigset_t		set;

+    

+    kdnFds++;

+    fcntl (fd, F_SETOWN, getpid());

+    KdNonBlockFd (fd);

+    AddEnabledDevice (fd);

+    memset (&act, '\0', sizeof act);

+    act.sa_handler = KdSigio;

+    sigemptyset (&act.sa_mask);

+    sigaddset (&act.sa_mask, SIGIO);

+    sigaddset (&act.sa_mask, SIGALRM);

+    sigaddset (&act.sa_mask, SIGVTALRM);

+    sigaction (SIGIO, &act, 0);

+    sigemptyset (&set);

+    sigprocmask (SIG_SETMASK, &set, 0);

+#endif

+}

+

+static void

+KdRemoveFd (int fd)

+{

+#ifdef _MSC_VER

+    __asm int 3;

+#else

+    struct sigaction	act;

+    int			flags;

+    

+    kdnFds--;

+    RemoveEnabledDevice (fd);

+    flags = fcntl (fd, F_GETFL);

+    flags &= ~(FASYNC|NOBLOCK);

+    fcntl (fd, F_SETFL, flags);

+    if (kdnFds == 0)

+    {

+	memset (&act, '\0', sizeof act);

+	act.sa_handler = SIG_IGN;

+	sigemptyset (&act.sa_mask);

+	sigaction (SIGIO, &act, 0);

+    }

+#endif

+}

+

+Bool

+KdRegisterFd (int fd, void (*read) (int fd, void *closure), void *closure)

+{

+    if (kdNumInputFds == KD_MAX_INPUT_FDS)

+	return FALSE;

+    kdInputFds[kdNumInputFds].fd = fd;

+    kdInputFds[kdNumInputFds].read = read;

+    kdInputFds[kdNumInputFds].enable = 0;

+    kdInputFds[kdNumInputFds].disable = 0;

+    kdInputFds[kdNumInputFds].closure = closure;

+    kdNumInputFds++;

+    if (kdInputEnabled)

+	KdAddFd (fd);

+    return TRUE;

+}

+

+void

+KdUnregisterFd (void *closure, int fd, Bool do_close)

+{

+    int	i, j;

+

+    for (i = 0; i < kdNumInputFds; i++) {

+	if (kdInputFds[i].closure == closure &&

+            (fd == -1 || kdInputFds[i].fd == fd)) {

+	    if (kdInputEnabled)

+		KdRemoveFd (kdInputFds[i].fd);

+	    if (do_close)

+		close (kdInputFds[i].fd);

+	    kdNumInputFds--;

+	    for (j = i; j < kdNumInputFds; j++)

+		kdInputFds[j] = kdInputFds[j+1];

+            break;

+	}

+    }

+}

+

+void

+KdUnregisterFds (void *closure, Bool do_close)

+{

+    KdUnregisterFd(closure, -1, do_close);

+}

+

+void

+KdDisableInput (void)

+{

+    KdKeyboardInfo *ki;

+    KdPointerInfo *pi;

+    int found = 0, i = 0;

+

+    KdBlockSigio();

+

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

+        if (ki->driver && ki->driver->Disable)

+            (*ki->driver->Disable) (ki);

+    }

+

+    for (pi = kdPointers; pi; pi = pi->next) {

+        if (pi->driver && pi->driver->Disable)

+            (*pi->driver->Disable) (pi);

+    }

+

+    if (kdNumInputFds) {

+        ErrorF("[KdDisableInput] Buggy drivers: still %d input fds left!",

+               kdNumInputFds);

+        i = 0;

+        while (i < kdNumInputFds) {

+            found = 0;

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

+                if (ki == kdInputFds[i].closure) {

+                    ErrorF("    fd %d belongs to keybd driver %s\n",

+                           kdInputFds[i].fd,

+                           ki->driver && ki->driver->name ?

+                             ki->driver->name : "(unnamed!)");

+                    found = 1;

+                    break;

+                }

+            }

+

+            if (found) {

+                i++;

+                continue;

+            }

+

+            for (pi = kdPointers; pi; pi = pi->next) {

+                if (pi == kdInputFds[i].closure) {

+                    ErrorF("    fd %d belongs to pointer driver %s\n",

+                           kdInputFds[i].fd,

+                           pi->driver && pi->driver->name ?

+                             pi->driver->name : "(unnamed!)");

+                    break;

+                }

+            }

+

+            if (found) {

+                i++;

+                continue;

+            }

+

+            ErrorF("    fd %d not claimed by any active device!\n",

+                   kdInputFds[i].fd);

+            KdUnregisterFd(kdInputFds[i].closure, kdInputFds[i].fd, TRUE);

+        }

+    }

+

+    kdInputEnabled = FALSE;

+}

+

+void

+KdEnableInput (void)

+{

+    InternalEvent ev;

+    KdKeyboardInfo *ki;

+    KdPointerInfo *pi;

+    

+    kdInputEnabled = TRUE;

+

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

+        if (ki->driver && ki->driver->Enable)

+            (*ki->driver->Enable) (ki);

+    }

+

+    for (pi = kdPointers; pi; pi = pi->next) {

+        if (pi->driver && pi->driver->Enable)

+            (*pi->driver->Enable) (pi);

+    }

+

+    /* reset screen saver */

+    ev.any.time = GetTimeInMillis ();

+    NoticeEventTime (&ev);

+

+    KdUnblockSigio ();

+}

+

+static KdKeyboardDriver *

+KdFindKeyboardDriver (char *name)

+{

+    KdKeyboardDriver *ret;

+

+    /* ask a stupid question ... */

+    if (!name)

+        return NULL;

+    

+    for (ret = kdKeyboardDrivers; ret; ret = ret->next) {

+        if (strcmp(ret->name, name) == 0)

+            return ret;

+    }

+

+    return NULL;

+}

+

+static KdPointerDriver *

+KdFindPointerDriver (char *name)

+{

+    KdPointerDriver *ret;

+

+    /* ask a stupid question ... */

+    if (!name)

+        return NULL;

+

+    for (ret = kdPointerDrivers; ret; ret = ret->next) {

+        if (strcmp(ret->name, name) == 0)

+            return ret;

+    }

+

+    return NULL;

+}

+

+static int

+KdPointerProc(DeviceIntPtr pDevice, int onoff)

+{

+    DevicePtr       pDev = (DevicePtr)pDevice;

+    KdPointerInfo   *pi;

+    Atom            xiclass;

+    Atom            *btn_labels;

+    Atom            *axes_labels;

+

+    if (!pDev)

+	return BadImplementation;

+

+    for (pi = kdPointers; pi; pi = pi->next) {

+        if (pi->dixdev && pi->dixdev->id == pDevice->id)

+            break;

+    }

+

+    if (!pi || !pi->dixdev || pi->dixdev->id != pDevice->id) {

+        ErrorF("[KdPointerProc] Failed to find pointer for device %d!\n",

+               pDevice->id);

+        return BadImplementation;

+    }

+

+    switch (onoff)

+    {

+    case DEVICE_INIT:

+#ifdef DEBUG

+        ErrorF("initialising pointer %s ...\n", pi->name);

+#endif

+        if (!pi->driver) {

+            if (!pi->driverPrivate) {

+                ErrorF("no driver specified for %s\n", pi->name);

+                return BadImplementation;

+            }

+

+            pi->driver = KdFindPointerDriver(pi->driverPrivate);

+            if (!pi->driver) {

+                ErrorF("Couldn't find pointer driver %s\n",

+                       pi->driverPrivate ? (char *) pi->driverPrivate :

+                       "(unnamed)");

+                return !Success;

+            }

+            xfree(pi->driverPrivate);

+            pi->driverPrivate = NULL;

+        }

+

+        if (!pi->driver->Init) {

+            ErrorF("no init function\n");

+            return BadImplementation;

+        }

+

+        if ((*pi->driver->Init) (pi) != Success) {

+            return !Success;

+        }

+

+	btn_labels = xcalloc(pi->nButtons, sizeof(Atom));

+	if (!btn_labels)

+	    return BadAlloc;

+	axes_labels = xcalloc(pi->nAxes, sizeof(Atom));

+	if (!axes_labels) {

+	    xfree(btn_labels);

+	    return BadAlloc;

+	}

+

+	switch(pi->nAxes)

+	{

+	    default:

+	    case 7:

+		btn_labels[6] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_HWHEEL_RIGHT);

+	    case 6:

+		btn_labels[5] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_HWHEEL_LEFT);

+	    case 5:

+		btn_labels[4] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_WHEEL_DOWN);

+	    case 4:

+		btn_labels[3] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_WHEEL_UP);

+	    case 3:

+		btn_labels[2] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_RIGHT);

+	    case 2:

+		btn_labels[1] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_MIDDLE);

+	    case 1:

+		btn_labels[0] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_LEFT);

+	    case 0:

+		break;

+	}

+

+	if (pi->nAxes >= 2) {

+	    axes_labels[0] = XIGetKnownProperty(AXIS_LABEL_PROP_REL_X);

+	    axes_labels[1] = XIGetKnownProperty(AXIS_LABEL_PROP_REL_Y);

+	}

+

+	InitPointerDeviceStruct(pDev, pi->map, pi->nButtons, btn_labels,

+	    (PtrCtrlProcPtr)NoopDDA,

+	    GetMotionHistorySize(), pi->nAxes, axes_labels);

+

+        xfree(btn_labels);

+        xfree(axes_labels);

+

+        if (pi->inputClass == KD_TOUCHSCREEN) {

+            InitAbsoluteClassDeviceStruct(pDevice);

+            xiclass = AtomFromName(XI_TOUCHSCREEN);

+        }

+        else {

+            xiclass = AtomFromName(XI_MOUSE);

+        }

+

+        AssignTypeAndName(pi->dixdev, xiclass,

+                          pi->name ? pi->name : "Generic KDrive Pointer");

+

+	return Success;

+	

+    case DEVICE_ON:

+        if (pDev->on == TRUE)

+            return Success;

+        

+        if (!pi->driver->Enable) {

+            ErrorF("no enable function\n");

+            return BadImplementation;

+        }

+

+        if ((*pi->driver->Enable) (pi) == Success) {

+            pDev->on = TRUE;

+            return Success;

+        }

+        else {

+            return BadImplementation;

+        }

+

+	return Success;

+

+    case DEVICE_OFF:

+        if (pDev->on == FALSE) {

+            return Success;

+        }

+

+        if (!pi->driver->Disable) {

+            return BadImplementation;

+        }

+        else {

+            (*pi->driver->Disable) (pi);

+            pDev->on = FALSE;

+            return Success;

+        }

+

+        return Success;

+

+    case DEVICE_CLOSE:

+	if (pDev->on) {

+            if (!pi->driver->Disable) {

+                return BadImplementation;

+            }

+            (*pi->driver->Disable) (pi);

+            pDev->on = FALSE;

+        }

+

+        if (!pi->driver->Fini)

+            return BadImplementation;

+

+        (*pi->driver->Fini) (pi);

+

+        KdRemovePointer(pi);

+        

+        return Success;

+    }

+

+    /* NOTREACHED */

+    return BadImplementation;

+}

+

+#ifndef _MSC_VER

+Bool

+LegalModifier(unsigned int key, DeviceIntPtr pDev)

+{

+    return TRUE;

+}

+#endif

+

+static void

+KdBell (int volume, DeviceIntPtr pDev, pointer arg, int something)

+{

+    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);

+}

+

+#ifndef _MSC_VER

+void

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

+{

+    KdKeyboardInfo *ki = NULL;

+

+    if (kdOsFuncs->Bell) {

+        (*kdOsFuncs->Bell)(volume, pitch, duration);

+    }

+    else {

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

+            if (ki->dixdev->coreEvents)

+                KdRingBell(ki, volume, pitch, duration);

+        }

+    }

+}

+#endif

+void

+KdRingBell(KdKeyboardInfo *ki, int volume, int pitch, int duration)

+{

+    if (!ki || !ki->driver || !ki->driver->Bell)

+        return;

+        

+    if (kdInputEnabled)

+        (*ki->driver->Bell) (ki, volume, pitch, duration);

+}

+

+

+static void

+KdSetLeds (KdKeyboardInfo *ki, int leds)

+{

+    if (!ki || !ki->driver)

+        return;

+

+    if (kdInputEnabled) {

+        if (ki->driver->Leds)

+            (*ki->driver->Leds) (ki, leds);

+    }

+}

+

+void

+KdSetLed (KdKeyboardInfo *ki, int led, Bool on)

+{

+    if (!ki || !ki->dixdev || !ki->dixdev->kbdfeed)

+        return;

+

+    NoteLedState (ki->dixdev, led, on);

+    KdSetLeds (ki, ki->dixdev->kbdfeed->ctrl.leds);

+}

+

+void

+KdSetPointerMatrix (KdPointerMatrix *matrix)

+{

+    kdPointerMatrix = *matrix;

+}

+

+void

+KdComputePointerMatrix (KdPointerMatrix *m, Rotation randr, int width,

+                        int height)

+{

+    int		    x_dir = 1, y_dir = 1;

+    int		    i, j;

+    int		    size[2];

+

+    size[0] = width; size[1] = height;

+    if (randr & RR_Reflect_X)

+	x_dir = -1;

+    if (randr & RR_Reflect_Y)

+	y_dir = -1;

+    switch (randr & (RR_Rotate_All)) {

+    case RR_Rotate_0:

+	m->matrix[0][0] = x_dir; m->matrix[0][1] = 0;

+	m->matrix[1][0] = 0; m->matrix[1][1] = y_dir;

+	break;

+    case RR_Rotate_90:

+	m->matrix[0][0] = 0; m->matrix[0][1] = -x_dir;

+	m->matrix[1][0] = y_dir; m->matrix[1][1] = 0;

+	break;

+    case RR_Rotate_180:

+	m->matrix[0][0] = -x_dir; m->matrix[0][1] = 0;

+	m->matrix[1][0] = 0; m->matrix[1][1] = -y_dir;

+	break;

+    case RR_Rotate_270:

+	m->matrix[0][0] = 0; m->matrix[0][1] = x_dir;

+	m->matrix[1][0] = -y_dir; m->matrix[1][1] = 0;

+	break;

+    }

+    for (i = 0; i < 2; i++)

+    {

+	m->matrix[i][2] = 0;

+	for (j = 0 ; j < 2; j++)

+	    if (m->matrix[i][j] < 0)

+		m->matrix[i][2] = size[j] - 1;

+    }

+}

+

+void

+KdScreenToPointerCoords (int *x, int *y)

+{

+    int	(*m)[3] = kdPointerMatrix.matrix;

+    int div = m[0][1] * m[1][0] - m[1][1] * m[0][0];

+    int sx = *x;

+    int sy = *y;

+

+    *x = (m[0][1] * sy - m[0][1] * m[1][2] + m[1][1] * m[0][2] - m[1][1] * sx) / div;

+    *y = (m[1][0] * sx + m[0][0] * m[1][2] - m[1][0] * m[0][2] - m[0][0] * sy) / div;

+}

+

+static void

+KdKbdCtrl (DeviceIntPtr pDevice, KeybdCtrl *ctrl)

+{

+    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; 

+}

+

+extern KeybdCtrl defaultKeyboardControl;

+

+static int

+KdKeyboardProc(DeviceIntPtr pDevice, int onoff)

+{

+    Bool        ret;

+    DevicePtr   pDev = (DevicePtr)pDevice;

+    KdKeyboardInfo *ki;

+    Atom xiclass;

+    XkbRMLVOSet rmlvo;

+

+    if (!pDev)

+	return BadImplementation;

+

+    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) {

+        return BadImplementation;

+    }

+

+    switch (onoff)

+    {

+    case DEVICE_INIT:

+#ifdef DEBUG

+        ErrorF("initialising keyboard %s\n", ki->name);

+#endif

+        if (!ki->driver) {

+            if (!ki->driverPrivate) {

+                ErrorF("no driver specified!\n");

+                return BadImplementation;

+            }

+

+            ki->driver = KdFindKeyboardDriver(ki->driverPrivate);

+            if (!ki->driver) {

+                ErrorF("Couldn't find keyboard driver %s\n",

+                       ki->driverPrivate ? (char *) ki->driverPrivate :

+                       "(unnamed)");

+                return !Success;

+            }

+            xfree(ki->driverPrivate);

+            ki->driverPrivate = NULL;

+        }

+

+        if (!ki->driver->Init) {

+            ErrorF("Keyboard %s: no init function\n", ki->name);

+            return BadImplementation;

+        }

+

+        if ((*ki->driver->Init) (ki) != Success) {

+            return !Success;

+        }

+

+        memset(&rmlvo, 0, sizeof(rmlvo));

+        rmlvo.rules = ki->xkbRules;

+        rmlvo.model = ki->xkbModel;

+        rmlvo.layout = ki->xkbLayout;

+        rmlvo.variant = ki->xkbVariant;

+        rmlvo.options = ki->xkbOptions;

+        ret = InitKeyboardDeviceStruct (pDevice, &rmlvo, KdBell, KdKbdCtrl);

+	if (!ret) {

+            ErrorF("Couldn't initialise keyboard %s\n", ki->name);

+	    return BadImplementation;

+        }

+

+        xiclass = AtomFromName(XI_KEYBOARD);

+        AssignTypeAndName(pDevice, xiclass,

+                          ki->name ? ki->name : "Generic KDrive Keyboard");

+

+        KdResetInputMachine();

+

+        return Success;

+

+    case DEVICE_ON:

+        if (pDev->on == TRUE)

+            return Success;

+

+        if (!ki->driver->Enable)

+            return BadImplementation;

+

+        if ((*ki->driver->Enable) (ki) != Success) {

+            return BadMatch;

+        }

+

+        pDev->on = TRUE;

+        return Success;

+

+    case DEVICE_OFF:

+        if (pDev->on == FALSE)

+            return Success;

+

+        if (!ki->driver->Disable)

+            return BadImplementation;

+

+        (*ki->driver->Disable) (ki);

+        pDev->on = FALSE;

+

+        return Success;

+        

+        break;

+

+    case DEVICE_CLOSE:

+	if (pDev->on) {

+            if (!ki->driver->Disable)

+                return BadImplementation;

+

+            (*ki->driver->Disable) (ki);

+            pDev->on = FALSE;

+	}

+

+        if (!ki->driver->Fini)

+            return BadImplementation;

+

+        (*ki->driver->Fini) (ki);

+

+        KdRemoveKeyboard(ki);

+

+        return Success;

+    }

+

+    /* NOTREACHED */

+    return BadImplementation;

+}

+

+void

+KdAddPointerDriver (KdPointerDriver *driver)

+{

+    KdPointerDriver **prev;

+

+    if (!driver)

+        return;

+

+    for (prev = &kdPointerDrivers; *prev; prev = &(*prev)->next) {

+        if (*prev == driver)

+            return;

+    }

+    *prev = driver;

+}

+

+void

+KdRemovePointerDriver (KdPointerDriver *driver)

+{

+    KdPointerDriver *tmp;

+

+    if (!driver)

+        return;

+

+    /* FIXME remove all pointers using this driver */

+    for (tmp = kdPointerDrivers; tmp; tmp = tmp->next) {

+        if (tmp->next == driver)

+            tmp->next = driver->next;

+    }

+    if (tmp == driver)

+        tmp = NULL;

+}

+

+void

+KdAddKeyboardDriver (KdKeyboardDriver *driver)

+{

+    KdKeyboardDriver **prev;

+

+    if (!driver)

+        return;

+

+    for (prev = &kdKeyboardDrivers; *prev; prev = &(*prev)->next) {

+        if (*prev == driver)

+            return;

+    }

+    *prev = driver;

+}

+

+void

+KdRemoveKeyboardDriver (KdKeyboardDriver *driver)

+{

+    KdKeyboardDriver *tmp;

+

+    if (!driver)

+        return;

+

+    /* FIXME remove all keyboards using this driver */

+    for (tmp = kdKeyboardDrivers; tmp; tmp = tmp->next) {

+        if (tmp->next == driver)

+            tmp->next = driver->next;

+    }

+    if (tmp == driver)

+        tmp = NULL;

+}

+

+KdKeyboardInfo *

+KdNewKeyboard (void)

+{

+    KdKeyboardInfo *ki = xcalloc(sizeof(KdKeyboardInfo), 1);

+    if (!ki)

+        return NULL;

+

+    ki->minScanCode = 0;

+    ki->maxScanCode = 0;

+    ki->leds = 0;

+    ki->bellPitch = 1000;

+    ki->bellDuration = 200;

+    ki->next = NULL;

+    ki->options = NULL;

+    ki->xkbRules = strdup("base");

+    ki->xkbModel = strdup("pc105");

+    ki->xkbLayout = strdup("us");

+    ki->xkbVariant = NULL;

+    ki->xkbOptions = NULL;

+

+    return ki;

+}

+

+int

+KdAddConfigKeyboard (char *keyboard)

+{

+    struct KdConfigDevice **prev, *new;

+

+    if (!keyboard)

+        return Success;

+

+    new = (struct KdConfigDevice *) xcalloc(sizeof(struct KdConfigDevice), 1);

+    if (!new)

+        return BadAlloc;

+

+    new->line = xstrdup(keyboard);

+    new->next = NULL;

+

+    for (prev = &kdConfigKeyboards; *prev; prev = &(*prev)->next);

+    *prev = new;

+

+    return Success;

+}

+

+int

+KdAddKeyboard (KdKeyboardInfo *ki)

+{

+    KdKeyboardInfo **prev;

+

+    if (!ki)

+        return !Success;

+    

+    ki->dixdev = AddInputDevice(serverClient, KdKeyboardProc, TRUE);

+    if (!ki->dixdev) {

+        ErrorF("Couldn't register keyboard device %s\n",

+               ki->name ? ki->name : "(unnamed)");

+        return !Success;

+    }

+

+    ki->dixdev->deviceGrab.ActivateGrab = ActivateKeyboardGrab;

+    ki->dixdev->deviceGrab.DeactivateGrab = DeactivateKeyboardGrab;

+    RegisterOtherDevice(ki->dixdev);

+

+#ifdef DEBUG

+    ErrorF("added keyboard %s with dix id %d\n", ki->name, ki->dixdev->id);

+#endif

+

+    for (prev = &kdKeyboards; *prev; prev = &(*prev)->next);

+    *prev = ki;

+

+    return Success;

+}

+

+void

+KdRemoveKeyboard (KdKeyboardInfo *ki)

+{

+    KdKeyboardInfo **prev;

+

+    if (!ki)

+        return;

+

+    for (prev = &kdKeyboards; *prev; prev = &(*prev)->next) {

+        if (*prev == ki) {

+            *prev = ki->next;

+            break;

+        }

+    }

+

+    KdFreeKeyboard(ki);

+}

+

+int

+KdAddConfigPointer (char *pointer)

+{

+    struct KdConfigDevice **prev, *new;

+

+    if (!pointer)

+        return Success;

+

+    new = (struct KdConfigDevice *) xcalloc(sizeof(struct KdConfigDevice), 1);

+    if (!new)

+        return BadAlloc;

+

+    new->line = xstrdup(pointer);

+    new->next = NULL;

+

+    for (prev = &kdConfigPointers; *prev; prev = &(*prev)->next);

+    *prev = new;

+

+    return Success;

+}

+

+int

+KdAddPointer (KdPointerInfo *pi)

+{

+    KdPointerInfo **prev;

+

+    if (!pi)

+        return Success;

+

+    pi->mouseState = start;

+    pi->eventHeld = FALSE;

+

+    pi->dixdev = AddInputDevice(serverClient, KdPointerProc, TRUE);

+    if (!pi->dixdev) {

+        ErrorF("Couldn't add pointer device %s\n",

+               pi->name ? pi->name : "(unnamed)");

+        return BadDevice;

+    }

+

+    pi->dixdev->deviceGrab.ActivateGrab = ActivatePointerGrab;

+    pi->dixdev->deviceGrab.DeactivateGrab = DeactivatePointerGrab;

+    RegisterOtherDevice(pi->dixdev);

+

+    for (prev = &kdPointers; *prev; prev = &(*prev)->next);

+    *prev = pi;

+

+    return Success;

+}

+

+void

+KdRemovePointer (KdPointerInfo *pi)

+{

+    KdPointerInfo **prev;

+

+    if (!pi)

+        return;

+

+    for (prev = &kdPointers; *prev; prev = &(*prev)->next) {

+        if (*prev == pi) {

+            *prev = pi->next;

+            break;

+        }

+    }

+

+    KdFreePointer(pi);

+}

+

+/* 

+ * You can call your kdriver server with something like:

+ * $ ./hw/kdrive/yourserver/X :1 -mouse evdev,,device=/dev/input/event4 -keybd

+ * evdev,,device=/dev/input/event1,xkbmodel=abnt2,xkblayout=br 

+ */

+static Bool 

+KdGetOptions (InputOption **options, char *string)

+{

+    InputOption     *newopt = NULL, **tmpo = NULL;

+    int             tam_key = 0;

+

+    newopt = xcalloc(1, sizeof (InputOption));

+    if (!newopt)

+        return FALSE;

+

+    for (tmpo = options; *tmpo; tmpo = &(*tmpo)->next)

+        ; /* Hello, I'm here */ 

+    *tmpo = newopt;

+

+    if (strchr(string, '='))

+    {

+        tam_key = (strchr(string, '=') - string);

+        newopt->key = (char *)xalloc(tam_key);

+        strncpy(newopt->key, string, tam_key);

+        newopt->key[tam_key] = '\0';

+        newopt->value = xstrdup(strchr(string, '=') + 1);

+    }

+    else

+    {

+        newopt->key = xstrdup(string);

+        newopt->value = NULL;

+    }

+    newopt->next = NULL;

+

+    return TRUE;

+}

+

+static void

+KdParseKbdOptions (KdKeyboardInfo *ki)

+{

+    InputOption *option = NULL;

+

+    for (option = ki->options; option; option = option->next)

+    {

+        if (strcasecmp(option->key, "XkbRules") == 0)

+            ki->xkbRules = option->value;

+        else if (strcasecmp(option->key, "XkbModel") == 0)

+            ki->xkbModel = option->value;

+        else if (strcasecmp(option->key, "XkbLayout") == 0)

+            ki->xkbLayout = option->value;

+        else if (strcasecmp(option->key, "XkbVariant") == 0)

+            ki->xkbVariant = option->value;

+        else if (strcasecmp(option->key, "XkbOptions") == 0)

+            ki->xkbOptions = option->value;

+        else if (!strcasecmp (option->key, "device"))

+            ki->path = strdup(option->value);

+        else

+           ErrorF("Kbd option key (%s) of value (%s) not assigned!\n", 

+                    option->key, option->value);

+    }

+}

+

+KdKeyboardInfo *

+KdParseKeyboard (char *arg)

+{

+    char            save[1024];

+    char            delim;

+    InputOption     *options = NULL;

+    KdKeyboardInfo     *ki = NULL;

+

+    ki = KdNewKeyboard();

+    if (!ki)

+        return NULL;

+

+    ki->name = strdup("Unknown KDrive Keyboard");

+    ki->path = NULL;

+    ki->driver = NULL;

+    ki->driverPrivate = NULL;

+    ki->next = NULL;

+

+    if (!arg)

+    {

+        ErrorF("keybd: no arg\n");

+        KdFreeKeyboard (ki);

+        return NULL;

+    }

+

+    if (strlen (arg) >= sizeof (save))

+    {

+        ErrorF("keybd: arg too long\n");

+        KdFreeKeyboard (ki);

+        return NULL;

+    }

+

+    arg = KdParseFindNext (arg, ",", save, &delim);

+    if (!save[0])

+    {

+        ErrorF("keybd: failed on save[0]\n");

+        KdFreeKeyboard (ki);

+        return NULL;

+    }

+

+    if (strcmp (save, "auto") == 0)

+        ki->driverPrivate = NULL;

+    else

+        ki->driverPrivate = xstrdup(save);

+

+    if (delim != ',')

+    {

+        return ki;

+    }

+

+    arg = KdParseFindNext (arg, ",", save, &delim);

+

+    while (delim == ',')

+    {

+        arg = KdParseFindNext (arg, ",", save, &delim);

+

+	if (!KdGetOptions(&options, save)) 

+	{

+	    KdFreeKeyboard(ki);

+	    return NULL;

+        }    

+    }

+

+    if (options)

+    {

+        ki->options = options;

+        KdParseKbdOptions(ki);

+    }

+

+    return ki;

+}

+

+static void

+KdParsePointerOptions (KdPointerInfo *pi)

+{

+    InputOption *option = NULL;

+

+    for (option = pi->options; option; option = option->next)

+    {

+        if (!strcmp (option->key, "emulatemiddle"))

+            pi->emulateMiddleButton = TRUE;

+        else if (!strcmp (option->key, "noemulatemiddle"))

+            pi->emulateMiddleButton = FALSE;

+        else if (!strcmp (option->key, "transformcoord"))

+            pi->transformCoordinates = TRUE;

+        else if (!strcmp (option->key, "rawcoord"))

+            pi->transformCoordinates = FALSE;

+        else if (!strcasecmp (option->key, "device"))

+            pi->path = strdup(option->value);

+        else if (!strcasecmp (option->key, "protocol"))

+            pi->protocol = strdup(option->value);

+        else

+            ErrorF("Pointer option key (%s) of value (%s) not assigned!\n", 

+                    option->key, option->value);

+    }

+}

+

+KdPointerInfo *

+KdParsePointer (char *arg)

+{

+    char            save[1024];

+    char            delim;

+    KdPointerInfo   *pi = NULL;

+    InputOption     *options = NULL;

+    int             i = 0;

+

+    pi = KdNewPointer();

+    if (!pi)

+        return NULL;

+    pi->emulateMiddleButton = kdEmulateMiddleButton;

+    pi->transformCoordinates = !kdRawPointerCoordinates;

+    pi->protocol = NULL;

+    pi->nButtons = 5; /* XXX should not be hardcoded */

+    pi->inputClass = KD_MOUSE;

+

+    if (!arg)

+    {

+        ErrorF("mouse: no arg\n");

+        KdFreePointer (pi);

+        return NULL;

+    }

+

+    if (strlen (arg) >= sizeof (save))

+    {

+        ErrorF("mouse: arg too long\n");

+        KdFreePointer (pi);

+        return NULL;

+    }

+    arg = KdParseFindNext (arg, ",", save, &delim);

+    if (!save[0])

+    {

+        ErrorF("failed on save[0]\n");

+        KdFreePointer (pi);

+        return NULL;

+    }

+

+    if (strcmp(save, "auto") == 0)

+        pi->driverPrivate = NULL;

+    else

+        pi->driverPrivate = xstrdup(save);

+

+    if (delim != ',')

+    {

+        return pi;

+    }

+

+    arg = KdParseFindNext (arg, ",", save, &delim);

+

+    while (delim == ',')

+    {

+        arg = KdParseFindNext (arg, ",", save, &delim);

+        if (save[0] == '{')

+        {

+            char *s = save + 1;

+             i = 0;

+             while (*s && *s != '}')

+             {

+                if ('1' <= *s && *s <= '0' + pi->nButtons)

+                    pi->map[i] = *s - '0';

+                else

+                    UseMsg ();

+                s++;

+             }

+        }

+        else

+        {

+            if (!KdGetOptions(&options, save))

+            {

+                KdFreePointer(pi);

+                return NULL;

+            }

+        }

+    }

+

+    if (options)

+    {

+        pi->options = options;

+        KdParsePointerOptions(pi);

+    }

+

+    return pi;

+}

+

+

+void

+KdInitInput (void)

+{

+    KdPointerInfo *pi;

+    KdKeyboardInfo *ki;

+    struct KdConfigDevice *dev;

+

+    kdInputEnabled = TRUE;

+

+    for (dev = kdConfigPointers; dev; dev = dev->next) {

+        pi = KdParsePointer(dev->line);

+        if (!pi)

+            ErrorF("Failed to parse pointer\n");

+        if (KdAddPointer(pi) != Success)

+            ErrorF("Failed to add pointer!\n");

+    }

+    for (dev = kdConfigKeyboards; dev; dev = dev->next) {

+        ki = KdParseKeyboard(dev->line);

+        if (!ki)

+            ErrorF("Failed to parse keyboard\n");

+        if (KdAddKeyboard(ki) != Success)

+            ErrorF("Failed to add keyboard!\n");

+    }

+

+    mieqInit();

+}

+

+/*

+ * Middle button emulation state machine

+ *

+ *  Possible transitions:

+ *	Button 1 press	    v1

+ *	Button 1 release    ^1

+ *	Button 2 press	    v2

+ *	Button 2 release    ^2

+ *	Button 3 press	    v3

+ *	Button 3 release    ^3

+ *	Button other press  vo

+ *	Button other release ^o

+ *	Mouse motion	    <>

+ *	Keyboard event	    k

+ *	timeout		    ...

+ *	outside box	    <->

+ *

+ *  States:

+ *	start

+ *	button_1_pend

+ *	button_1_down

+ *	button_2_down

+ *	button_3_pend

+ *	button_3_down

+ *	synthetic_2_down_13

+ *	synthetic_2_down_3

+ *	synthetic_2_down_1

+ *

+ *  Transition diagram

+ *

+ *  start

+ *	v1  -> (hold) (settimeout) button_1_pend

+ *	^1  -> (deliver) start

+ *	v2  -> (deliver) button_2_down

+ *	^2  -> (deliever) start

+ *	v3  -> (hold) (settimeout) button_3_pend

+ *	^3  -> (deliver) start

+ *	vo  -> (deliver) start

+ *	^o  -> (deliver) start

+ *	<>  -> (deliver) start

+ *	k   -> (deliver) start

+ *

+ *  button_1_pend	(button 1 is down, timeout pending)

+ *	^1  -> (release) (deliver) start

+ *	v2  -> (release) (deliver) button_1_down

+ *	^2  -> (release) (deliver) button_1_down

+ *	v3  -> (cleartimeout) (generate v2) synthetic_2_down_13

+ *	^3  -> (release) (deliver) button_1_down

+ *	vo  -> (release) (deliver) button_1_down

+ *	^o  -> (release) (deliver) button_1_down

+ *	<-> -> (release) (deliver) button_1_down

+ *	<>  -> (deliver) button_1_pend

+ *	k   -> (release) (deliver) button_1_down

+ *	... -> (release) button_1_down

+ *

+ *  button_1_down	(button 1 is down)

+ *	^1  -> (deliver) start

+ *	v2  -> (deliver) button_1_down

+ *	^2  -> (deliver) button_1_down

+ *	v3  -> (deliver) button_1_down

+ *	^3  -> (deliver) button_1_down

+ *	vo  -> (deliver) button_1_down

+ *	^o  -> (deliver) button_1_down

+ *	<>  -> (deliver) button_1_down

+ *	k   -> (deliver) button_1_down

+ *

+ *  button_2_down	(button 2 is down)

+ *	v1  -> (deliver) button_2_down

+ *	^1  -> (deliver) button_2_down

+ *	^2  -> (deliver) start

+ *	v3  -> (deliver) button_2_down

+ *	^3  -> (deliver) button_2_down

+ *	vo  -> (deliver) button_2_down

+ *	^o  -> (deliver) button_2_down

+ *	<>  -> (deliver) button_2_down

+ *	k   -> (deliver) button_2_down

+ *

+ *  button_3_pend	(button 3 is down, timeout pending)

+ *	v1  -> (generate v2) synthetic_2_down

+ *	^1  -> (release) (deliver) button_3_down

+ *	v2  -> (release) (deliver) button_3_down

+ *	^2  -> (release) (deliver) button_3_down

+ *	^3  -> (release) (deliver) start

+ *	vo  -> (release) (deliver) button_3_down

+ *	^o  -> (release) (deliver) button_3_down

+ *	<-> -> (release) (deliver) button_3_down

+ *	<>  -> (deliver) button_3_pend

+ *	k   -> (release) (deliver) button_3_down

+ *	... -> (release) button_3_down

+ *

+ *  button_3_down	(button 3 is down)

+ *	v1  -> (deliver) button_3_down

+ *	^1  -> (deliver) button_3_down

+ *	v2  -> (deliver) button_3_down

+ *	^2  -> (deliver) button_3_down

+ *	^3  -> (deliver) start

+ *	vo  -> (deliver) button_3_down

+ *	^o  -> (deliver) button_3_down

+ *	<>  -> (deliver) button_3_down

+ *	k   -> (deliver) button_3_down

+ *

+ *  synthetic_2_down_13	(button 1 and 3 are down)

+ *	^1  -> (generate ^2) synthetic_2_down_3

+ *	v2  -> synthetic_2_down_13

+ *	^2  -> synthetic_2_down_13

+ *	^3  -> (generate ^2) synthetic_2_down_1

+ *	vo  -> (deliver) synthetic_2_down_13

+ *	^o  -> (deliver) synthetic_2_down_13

+ *	<>  -> (deliver) synthetic_2_down_13

+ *	k   -> (deliver) synthetic_2_down_13

+ *

+ *  synthetic_2_down_3 (button 3 is down)

+ *	v1  -> (deliver) synthetic_2_down_3

+ *	^1  -> (deliver) synthetic_2_down_3

+ *	v2  -> synthetic_2_down_3

+ *	^2  -> synthetic_2_down_3

+ *	^3  -> start

+ *	vo  -> (deliver) synthetic_2_down_3

+ *	^o  -> (deliver) synthetic_2_down_3

+ *	<>  -> (deliver) synthetic_2_down_3

+ *	k   -> (deliver) synthetic_2_down_3

+ *

+ *  synthetic_2_down_1 (button 1 is down)

+ *	^1  -> start

+ *	v2  -> synthetic_2_down_1

+ *	^2  -> synthetic_2_down_1

+ *	v3  -> (deliver) synthetic_2_down_1

+ *	^3  -> (deliver) synthetic_2_down_1

+ *	vo  -> (deliver) synthetic_2_down_1

+ *	^o  -> (deliver) synthetic_2_down_1

+ *	<>  -> (deliver) synthetic_2_down_1

+ *	k   -> (deliver) synthetic_2_down_1

+ */

+ 

+typedef enum _inputClass {

+    down_1, up_1,

+    down_2, up_2,

+    down_3, up_3,

+    down_o, up_o,

+    motion, outside_box,

+    keyboard, timeout,

+    num_input_class

+} KdInputClass;

+

+typedef enum _inputAction {

+    noop,

+    hold,

+    setto,

+    deliver,

+    release,

+    clearto,

+    gen_down_2,

+    gen_up_2

+} KdInputAction;

+

+#define MAX_ACTIONS 2

+

+typedef struct _inputTransition {

+    KdInputAction  actions[MAX_ACTIONS];

+    KdPointerState nextState;

+} KdInputTransition;

+

+static const

+KdInputTransition  kdInputMachine[num_input_states][num_input_class] = {

+    /* start */

+    {

+	{ { hold, setto },	    button_1_pend },	/* v1 */

+	{ { deliver, noop },	    start },		/* ^1 */

+	{ { deliver, noop },	    button_2_down },	/* v2 */

+	{ { deliver, noop },	    start },		/* ^2 */

+	{ { hold, setto },	    button_3_pend },	/* v3 */

+	{ { deliver, noop },	    start },		/* ^3 */

+	{ { deliver, noop },	    start },		/* vo */

+	{ { deliver, noop },	    start },		/* ^o */

+	{ { deliver, noop },	    start },		/* <> */

+	{ { deliver, noop },	    start },		/* <-> */

+	{ { noop, noop },	    start },		/* k */

+	{ { noop, noop },	    start },		/* ... */

+    },

+    /* button_1_pend */

+    {

+	{ { noop, noop },	    button_1_pend },	/* v1 */

+	{ { release, deliver },	    start },		/* ^1 */

+	{ { release, deliver },	    button_1_down },	/* v2 */

+	{ { release, deliver },	    button_1_down },	/* ^2 */

+	{ { clearto, gen_down_2 },  synth_2_down_13 },	/* v3 */

+	{ { release, deliver },	    button_1_down },	/* ^3 */

+	{ { release, deliver },	    button_1_down },	/* vo */

+	{ { release, deliver },	    button_1_down },	/* ^o */

+	{ { deliver, noop },	    button_1_pend },	/* <> */

+	{ { release, deliver },	    button_1_down },	/* <-> */

+	{ { noop, noop },	    button_1_down },	/* k */

+	{ { release, noop },	    button_1_down },	/* ... */

+    },

+    /* button_1_down */

+    {

+	{ { noop, noop },	    button_1_down },	/* v1 */

+	{ { deliver, noop },	    start },		/* ^1 */

+	{ { deliver, noop },	    button_1_down },	/* v2 */

+	{ { deliver, noop },	    button_1_down },	/* ^2 */

+	{ { deliver, noop },	    button_1_down },	/* v3 */

+	{ { deliver, noop },	    button_1_down },	/* ^3 */

+	{ { deliver, noop },	    button_1_down },	/* vo */

+	{ { deliver, noop },	    button_1_down },	/* ^o */

+	{ { deliver, noop },	    button_1_down },	/* <> */

+	{ { deliver, noop },	    button_1_down },	/* <-> */

+	{ { noop, noop },	    button_1_down },	/* k */

+	{ { noop, noop },	    button_1_down },	/* ... */

+    },

+    /* button_2_down */

+    {

+	{ { deliver, noop },	    button_2_down },	/* v1 */

+	{ { deliver, noop },	    button_2_down },	/* ^1 */

+	{ { noop, noop },	    button_2_down },	/* v2 */

+	{ { deliver, noop },	    start },		/* ^2 */

+	{ { deliver, noop },	    button_2_down },	/* v3 */

+	{ { deliver, noop },	    button_2_down },	/* ^3 */

+	{ { deliver, noop },	    button_2_down },	/* vo */

+	{ { deliver, noop },	    button_2_down },	/* ^o */

+	{ { deliver, noop },	    button_2_down },	/* <> */

+	{ { deliver, noop },	    button_2_down },	/* <-> */

+	{ { noop, noop },	    button_2_down },	/* k */

+	{ { noop, noop },	    button_2_down },	/* ... */

+    },

+    /* button_3_pend */

+    {

+	{ { clearto, gen_down_2 },  synth_2_down_13 },	/* v1 */

+	{ { release, deliver },	    button_3_down },	/* ^1 */

+	{ { release, deliver },	    button_3_down },	/* v2 */

+	{ { release, deliver },	    button_3_down },	/* ^2 */

+	{ { release, deliver },	    button_3_down },	/* v3 */

+	{ { release, deliver },	    start },		/* ^3 */

+	{ { release, deliver },	    button_3_down },	/* vo */

+	{ { release, deliver },	    button_3_down },	/* ^o */

+	{ { deliver, noop },	    button_3_pend },	/* <> */

+	{ { release, deliver },	    button_3_down },	/* <-> */

+	{ { release, noop },	    button_3_down },	/* k */

+	{ { release, noop },	    button_3_down },	/* ... */

+    },

+    /* button_3_down */

+    {

+	{ { deliver, noop },	    button_3_down },	/* v1 */

+	{ { deliver, noop },	    button_3_down },	/* ^1 */

+	{ { deliver, noop },	    button_3_down },	/* v2 */

+	{ { deliver, noop },	    button_3_down },	/* ^2 */

+	{ { noop, noop },	    button_3_down },	/* v3 */

+	{ { deliver, noop },	    start },		/* ^3 */

+	{ { deliver, noop },	    button_3_down },	/* vo */

+	{ { deliver, noop },	    button_3_down },	/* ^o */

+	{ { deliver, noop },	    button_3_down },	/* <> */

+	{ { deliver, noop },	    button_3_down },	/* <-> */

+	{ { noop, noop },	    button_3_down },	/* k */

+	{ { noop, noop },	    button_3_down },	/* ... */

+    },

+    /* synthetic_2_down_13 */

+    {

+	{ { noop, noop },	    synth_2_down_13 },	/* v1 */

+	{ { gen_up_2, noop },	    synth_2_down_3 },	/* ^1 */

+	{ { noop, noop },	    synth_2_down_13 },	/* v2 */

+	{ { noop, noop },	    synth_2_down_13 },	/* ^2 */

+	{ { noop, noop },	    synth_2_down_13 },	/* v3 */

+	{ { gen_up_2, noop },	    synth_2_down_1 },	/* ^3 */

+	{ { deliver, noop },	    synth_2_down_13 },	/* vo */

+	{ { deliver, noop },	    synth_2_down_13 },	/* ^o */

+	{ { deliver, noop },	    synth_2_down_13 },	/* <> */

+	{ { deliver, noop },	    synth_2_down_13 },	/* <-> */

+	{ { noop, noop },	    synth_2_down_13 },	/* k */

+	{ { noop, noop },	    synth_2_down_13 },	/* ... */

+    },

+    /* synthetic_2_down_3 */

+    {

+	{ { deliver, noop },	    synth_2_down_3 },	/* v1 */

+	{ { deliver, noop },	    synth_2_down_3 },	/* ^1 */

+	{ { deliver, noop },	    synth_2_down_3 },	/* v2 */

+	{ { deliver, noop },	    synth_2_down_3 },	/* ^2 */

+	{ { noop, noop },	    synth_2_down_3 },	/* v3 */

+	{ { noop, noop },	    start },		/* ^3 */

+	{ { deliver, noop },	    synth_2_down_3 },	/* vo */

+	{ { deliver, noop },	    synth_2_down_3 },	/* ^o */

+	{ { deliver, noop },	    synth_2_down_3 },	/* <> */

+	{ { deliver, noop },	    synth_2_down_3 },	/* <-> */

+	{ { noop, noop },	    synth_2_down_3 },	/* k */

+	{ { noop, noop },	    synth_2_down_3 },	/* ... */

+    },

+    /* synthetic_2_down_1 */

+    {

+	{ { noop, noop },	    synth_2_down_1 },	/* v1 */

+	{ { noop, noop },	    start },		/* ^1 */

+	{ { deliver, noop },	    synth_2_down_1 },	/* v2 */

+	{ { deliver, noop },	    synth_2_down_1 },	/* ^2 */

+	{ { deliver, noop },	    synth_2_down_1 },	/* v3 */

+	{ { deliver, noop },	    synth_2_down_1 },	/* ^3 */

+	{ { deliver, noop },	    synth_2_down_1 },	/* vo */

+	{ { deliver, noop },	    synth_2_down_1 },	/* ^o */

+	{ { deliver, noop },	    synth_2_down_1 },	/* <> */

+	{ { deliver, noop },	    synth_2_down_1 },	/* <-> */

+	{ { noop, noop },	    synth_2_down_1 },	/* k */

+	{ { noop, noop },	    synth_2_down_1 },	/* ... */

+    },

+};

+

+#define EMULATION_WINDOW    10

+#define EMULATION_TIMEOUT   100

+

+static int

+KdInsideEmulationWindow (KdPointerInfo *pi, int x, int y, int z)

+{

+    pi->emulationDx = pi->heldEvent.x - x;

+    pi->emulationDy = pi->heldEvent.y - y;

+

+    return (abs (pi->emulationDx) < EMULATION_WINDOW &&

+	    abs (pi->emulationDy) < EMULATION_WINDOW);

+}

+				     

+static KdInputClass

+KdClassifyInput (KdPointerInfo *pi, int type, int x, int y, int z, int b)

+{

+    switch (type) {

+    case ButtonPress:

+	switch (b) {

+	case 1: return down_1;

+	case 2: return down_2;

+	case 3: return down_3;

+	default: return down_o;

+	}

+	break;

+    case ButtonRelease:

+	switch (b) {

+	case 1: return up_1;

+	case 2: return up_2;

+	case 3: return up_3;

+	default: return up_o;

+	}

+	break;

+    case MotionNotify:

+	if (pi->eventHeld && !KdInsideEmulationWindow(pi, x, y, z))

+	    return outside_box;

+	else

+	    return motion;

+    default:

+	return keyboard;

+    }

+    return keyboard;

+}

+

+#ifdef DEBUG

+char	*kdStateNames[] = {

+    "start",

+    "button_1_pend",

+    "button_1_down",

+    "button_2_down",

+    "button_3_pend",

+    "button_3_down",

+    "synth_2_down_13",

+    "synth_2_down_3",

+    "synthetic_2_down_1",

+    "num_input_states"

+};

+

+char	*kdClassNames[] = {

+    "down_1", "up_1",

+    "down_2", "up_2",

+    "down_3", "up_3",

+    "motion", "ouside_box",

+    "keyboard", "timeout",

+    "num_input_class"

+};

+

+char *kdActionNames[] = {

+    "noop",

+    "hold",

+    "setto",

+    "deliver",

+    "release",

+    "clearto",

+    "gen_down_2",

+    "gen_up_2",

+};

+#endif /* DEBUG */

+

+static void

+KdQueueEvent (DeviceIntPtr pDev, InternalEvent *ev)

+{

+    KdAssertSigioBlocked ("KdQueueEvent");

+    mieqEnqueue (pDev, ev);

+}

+

+/* We return true if we're stealing the event. */

+static Bool

+KdRunMouseMachine (KdPointerInfo *pi, KdInputClass c, int type, int x, int y,

+                   int z, int b, int absrel)

+{

+    const KdInputTransition *t;

+    int	a;

+

+    c = KdClassifyInput(pi, type, x, y, z, b);

+    t = &kdInputMachine[pi->mouseState][c];

+    for (a = 0; a < MAX_ACTIONS; a++)

+    {

+	switch (t->actions[a]) {

+	case noop:

+	    break;

+	case hold:

+	    pi->eventHeld = TRUE;

+	    pi->emulationDx = 0;

+	    pi->emulationDy = 0;

+	    pi->heldEvent.type = type;

+            pi->heldEvent.x = x;

+            pi->heldEvent.y = y;

+            pi->heldEvent.z = z;

+            pi->heldEvent.flags = b;

+            pi->heldEvent.absrel = absrel;

+            return TRUE;

+	    break;

+	case setto:

+	    pi->emulationTimeout = GetTimeInMillis () + EMULATION_TIMEOUT;

+	    pi->timeoutPending = TRUE;

+	    break;

+	case deliver:

+            _KdEnqueuePointerEvent (pi, pi->heldEvent.type, pi->heldEvent.x,

+                                    pi->heldEvent.y, pi->heldEvent.z,

+                                    pi->heldEvent.flags, pi->heldEvent.absrel,

+                                    TRUE);

+	    break;

+	case release:

+	    pi->eventHeld = FALSE;

+	    pi->timeoutPending = FALSE;

+            _KdEnqueuePointerEvent (pi, pi->heldEvent.type, pi->heldEvent.x,

+                                    pi->heldEvent.y, pi->heldEvent.z,

+                                    pi->heldEvent.flags, pi->heldEvent.absrel,

+                                    TRUE);

+            return TRUE;

+	    break;

+	case clearto:

+	    pi->timeoutPending = FALSE;

+	    break;

+	case gen_down_2:

+            _KdEnqueuePointerEvent (pi, ButtonPress, x, y, z, 2, absrel,

+                                    TRUE);

+	    pi->eventHeld = FALSE;

+            return TRUE;

+	    break;

+	case gen_up_2:

+            _KdEnqueuePointerEvent (pi, ButtonRelease, x, y, z, 2, absrel,

+                                    TRUE);

+            return TRUE;

+	    break;

+	}

+    }

+    pi->mouseState = t->nextState;

+    return FALSE;

+}

+

+static int

+KdHandlePointerEvent (KdPointerInfo *pi, int type, int x, int y, int z, int b,

+                      int absrel)

+{

+    if (pi->emulateMiddleButton)

+        return KdRunMouseMachine (pi, KdClassifyInput(pi, type, x, y, z, b),

+                                  type, x, y, z, b, absrel);

+    return FALSE;

+}

+

+static void

+KdReceiveTimeout (KdPointerInfo *pi)

+{

+    KdRunMouseMachine (pi, timeout, 0, 0, 0, 0, 0, 0);

+}

+

+/*

+ * kdCheckTermination

+ *

+ * This function checks for the key sequence that terminates the server.  When

+ * detected, it sets the dispatchException flag and returns.  The key sequence

+ * is:

+ *	Control-Alt

+ * It's assumed that the server will be waken up by the caller when this

+ * function returns.

+ */

+

+extern int nClients;

+

+void

+KdReleaseAllKeys (void)

+{

+#if 0

+    int	key, nEvents, i;

+    KdKeyboardInfo *ki;

+

+    KdBlockSigio ();

+

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

+        for (key = ki->keySyms.minKeyCode; key < ki->keySyms.maxKeyCode;

+             key++) {

+            if (key_is_down(ki->dixdev, key, KEY_POSTED | KEY_PROCESSED)) {

+                KdHandleKeyboardEvent(ki, KeyRelease, key);

+                GetEventList(&kdEvents);

+                nEvents = GetKeyboardEvents(kdEvents, ki->dixdev, KeyRelease, key);

+                for (i = 0; i < nEvents; i++)

+                    KdQueueEvent (ki->dixdev, (kdEvents + i)->event);

+            }

+        }

+    }

+

+    KdUnblockSigio ();

+#endif

+}

+

+static void

+KdCheckLock (void)

+{

+    KeyClassPtr	    keyc = NULL;

+    Bool	    isSet = FALSE, shouldBeSet = FALSE;

+    KdKeyboardInfo     *tmp = NULL;

+

+    for (tmp = kdKeyboards; tmp; tmp = tmp->next) {

+        if (tmp->LockLed && tmp->dixdev && tmp->dixdev->key) {

+            keyc = tmp->dixdev->key;

+            isSet = (tmp->leds & (1 << (tmp->LockLed-1))) != 0;

+            /* FIXME: Just use XKB indicators! */

+            shouldBeSet = !!(XkbStateFieldFromRec(&keyc->xkbInfo->state) & LockMask);

+            if (isSet != shouldBeSet)

+                KdSetLed (tmp, tmp->LockLed, shouldBeSet);

+        }

+    }

+}

+

+void

+KdEnqueueKeyboardEvent(KdKeyboardInfo   *ki,

+                       unsigned char scan_code,

+		       unsigned char is_up)

+{

+    unsigned char key_code;

+    KeyClassPtr	keyc = NULL;

+    KeybdCtrl *ctrl = NULL;

+    int type, nEvents, i;

+

+    if (!ki || !ki->dixdev || !ki->dixdev->kbdfeed || !ki->dixdev->key)

+	return;

+

+    keyc = ki->dixdev->key;

+    ctrl = &ki->dixdev->kbdfeed->ctrl;

+

+    if (scan_code >= ki->minScanCode && scan_code <= ki->maxScanCode)

+    {

+	key_code = scan_code + KD_MIN_KEYCODE - ki->minScanCode;

+

+	/*

+	 * Set up this event -- the type may be modified below

+	 */

+	if (is_up)

+	    type = KeyRelease;

+	else

+	    type = KeyPress;

+

+        GetEventList(&kdEvents);

+

+        nEvents = GetKeyboardEvents(kdEvents, ki->dixdev, type, key_code);

+        for (i = 0; i < nEvents; i++)

+            KdQueueEvent(ki->dixdev, (InternalEvent *)((kdEvents + i)->event));

+    }

+    else {

+        ErrorF("driver %s wanted to post scancode %d outside of [%d, %d]!\n",

+               ki->name, scan_code, ki->minScanCode, ki->maxScanCode);

+    }

+}

+

+/*

+ * kdEnqueuePointerEvent

+ *

+ * This function converts hardware mouse event information into X event

+ * information.  A mouse movement event is passed off to MI to generate

+ * a MotionNotify event, if appropriate.  Button events are created and

+ * passed off to MI for enqueueing.

+ */

+

+/* FIXME do something a little more clever to deal with multiple axes here */

+void

+KdEnqueuePointerEvent(KdPointerInfo *pi, unsigned long flags, int rx, int ry,

+                      int rz)

+{

+    CARD32        ms;

+    unsigned char buttons;

+    int           x, y, z;

+    int           (*matrix)[3] = kdPointerMatrix.matrix;

+    unsigned long button;

+    int           n;

+    int           dixflags = 0;

+

+    if (!pi)

+	return;

+    

+    ms = GetTimeInMillis();

+

+    /* we don't need to transform z, so we don't. */

+    if (flags & KD_MOUSE_DELTA) {

+	if (pi->transformCoordinates) {

+	    x = matrix[0][0] * rx + matrix[0][1] * ry;

+	    y = matrix[1][0] * rx + matrix[1][1] * ry;

+	}

+	else {

+	    x = rx;

+	    y = ry;

+	}

+    }

+    else {

+	if (pi->transformCoordinates) {

+	    x = matrix[0][0] * rx + matrix[0][1] * ry + matrix[0][2];

+	    y = matrix[1][0] * rx + matrix[1][1] * ry + matrix[1][2];

+	}

+	else {

+	    x = rx;

+	    y = ry;

+	}

+    }

+    z = rz;

+

+    if (flags & KD_MOUSE_DELTA)

+    {

+        if (x || y || z)

+        {

+            dixflags = POINTER_RELATIVE | POINTER_ACCELERATE;

+            _KdEnqueuePointerEvent(pi, MotionNotify, x, y, z, 0, dixflags, FALSE);

+        }

+    } else

+    {

+        dixflags = POINTER_ABSOLUTE;

+        if (x != pi->dixdev->last.valuators[0] ||

+            y != pi->dixdev->last.valuators[1])

+            _KdEnqueuePointerEvent(pi, MotionNotify, x, y, z, 0, dixflags, FALSE);

+    }

+

+    buttons = flags;

+

+    for (button = KD_BUTTON_1, n = 1; n <= pi->nButtons;

+         button <<= 1, n++) {

+        if (((pi->buttonState & button) ^ (buttons & button)) &&

+           !(buttons & button)) {

+            _KdEnqueuePointerEvent(pi, ButtonRelease, x, y, z, n,

+                                   dixflags, FALSE);

+	}

+    }

+    for (button = KD_BUTTON_1, n = 1; n <= pi->nButtons;

+         button <<= 1, n++) {

+	if (((pi->buttonState & button) ^ (buttons & button)) &&

+	    (buttons & button)) {

+            _KdEnqueuePointerEvent(pi, ButtonPress, x, y, z, n,

+                                   dixflags, FALSE);

+        }

+    }

+

+    pi->buttonState = buttons;

+}

+

+void

+_KdEnqueuePointerEvent (KdPointerInfo *pi, int type, int x, int y, int z,

+                        int b, int absrel, Bool force)

+{

+    int nEvents = 0, i = 0;

+    int valuators[3] = { x, y, z };

+

+    /* TRUE from KdHandlePointerEvent, means 'we swallowed the event'. */

+    if (!force && KdHandlePointerEvent(pi, type, x, y, z, b, absrel))

+        return;

+

+    GetEventList(&kdEvents);

+    nEvents = GetPointerEvents(kdEvents, pi->dixdev, type, b, absrel,

+                               0, 3, valuators);

+    for (i = 0; i < nEvents; i++)

+        KdQueueEvent(pi->dixdev, (InternalEvent *)((kdEvents + i)->event));

+}

+

+void

+KdBlockHandler (int		screen,

+		pointer		blockData,

+		pointer		timeout,

+		pointer		readmask)

+{

+    KdPointerInfo		    *pi;

+    int myTimeout=0;

+

+    for (pi = kdPointers; pi; pi = pi->next)

+    {

+	if (pi->timeoutPending)

+	{

+	    int	ms;

+    

+	    ms = pi->emulationTimeout - GetTimeInMillis ();

+	    if (ms < 1)

+		ms = 1;

+	    if(ms<myTimeout || myTimeout==0)

+		    myTimeout=ms;

+	}

+    }

+    /* if we need to poll for events, do that */

+    if(kdOsFuncs->pollEvents)

+    {

+	    (*kdOsFuncs->pollEvents)();

+	    myTimeout=20;

+    }

+    if(myTimeout>0)

+    	AdjustWaitForDelay (timeout, myTimeout);

+}

+

+void

+KdWakeupHandler (int		screen, 

+		 pointer    	data,

+		 unsigned long	lresult,

+		 pointer	readmask)

+{

+    int		result = (int) lresult;

+    fd_set	*pReadmask = (fd_set *) readmask;

+    int		i;

+    KdPointerInfo	*pi;

+    

+    if (kdInputEnabled && result > 0)

+    {

+	for (i = 0; i < kdNumInputFds; i++)

+	    if (FD_ISSET (kdInputFds[i].fd, pReadmask))

+	    {

+		KdBlockSigio ();

+		(*kdInputFds[i].read) (kdInputFds[i].fd, kdInputFds[i].closure);

+		KdUnblockSigio ();

+	    }

+    }

+    for (pi = kdPointers; pi; pi = pi->next)

+    {

+	if (pi->timeoutPending)

+	{

+	    if ((long) (GetTimeInMillis () - pi->emulationTimeout) >= 0)

+	    {

+		pi->timeoutPending = FALSE;

+		KdBlockSigio ();

+		KdReceiveTimeout (pi);

+		KdUnblockSigio ();

+	    }

+	}

+    }

+    if (kdSwitchPending)

+	KdProcessSwitch ();

+}

+

+#define KdScreenOrigin(pScreen) (&(KdGetScreenPriv(pScreen)->screen->origin))

+

+static Bool

+KdCursorOffScreen(ScreenPtr *ppScreen, int *x, int *y)

+{

+    ScreenPtr	pScreen  = *ppScreen;

+    ScreenPtr	pNewScreen;

+    int		n;

+    int		dx, dy;

+    int		best_x, best_y;

+    int		n_best_x, n_best_y;

+    CARD32	ms;

+    

+    if (kdDisableZaphod || screenInfo.numScreens <= 1)

+	return FALSE;

+

+    if (0 <= *x && *x < pScreen->width && 0 <= *y && *y < pScreen->height)

+	return FALSE;

+	

+    ms = GetTimeInMillis ();

+    if (kdOffScreen && (int) (ms - kdOffScreenTime) < 1000)

+	return FALSE;

+    kdOffScreen = TRUE;

+    kdOffScreenTime = ms;

+    n_best_x = -1;

+    best_x = 32767;

+    n_best_y = -1;

+    best_y = 32767;

+    for (n = 0; n < screenInfo.numScreens; n++)

+    {

+	pNewScreen = screenInfo.screens[n];

+	if (pNewScreen == pScreen) 

+	    continue;

+	dx = KdScreenOrigin(pNewScreen)->x - KdScreenOrigin(pScreen)->x;

+	dy = KdScreenOrigin(pNewScreen)->y - KdScreenOrigin(pScreen)->y;

+	if (*x < 0)

+	{

+	    if (dx <= 0 && -dx < best_x)

+	    {

+		best_x = -dx;

+		n_best_x = n;

+	    }

+	}

+	else if (*x >= pScreen->width)

+	{

+	    if (dx >= 0 && dx < best_x)

+	    {

+		best_x = dx;

+		n_best_x = n;

+	    }

+	}

+	if (*y < 0)

+	{

+	    if (dy <= 0 && -dy < best_y)

+	    {

+		best_y = -dy;

+		n_best_y = n;

+	    }

+	}

+	else if (*y >= pScreen->height)

+	{

+	    if (dy >= 0 && dy < best_y)

+	    {

+		best_y = dy;

+		n_best_y = n;

+	    }

+	}

+    }

+    if (best_y < best_x)

+	n_best_x = n_best_y;

+    if (n_best_x == -1)

+	return FALSE;

+    pNewScreen = screenInfo.screens[n_best_x];

+    

+    if (*x < 0)

+	*x += pNewScreen->width;

+    if (*y < 0)

+	*y += pNewScreen->height;

+    

+    if (*x >= pScreen->width)

+	*x -= pScreen->width;

+    if (*y >= pScreen->height)

+	*y -= pScreen->height;

+    

+    *ppScreen = pNewScreen;

+    return TRUE;

+}

+

+static void

+KdCrossScreen(ScreenPtr pScreen, Bool entering)

+{

+#ifndef XIPAQ

+    if (entering)

+	KdEnableScreen (pScreen);

+    else

+	KdDisableScreen (pScreen);

+#endif

+}

+

+int KdCurScreen;	/* current event screen */

+

+static void

+KdWarpCursor (DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y)

+{

+    KdBlockSigio ();

+    KdCurScreen = pScreen->myNum;

+    miPointerWarpCursor(pDev, pScreen, x, y);

+    KdUnblockSigio ();

+}

+

+miPointerScreenFuncRec kdPointerScreenFuncs = 

+{

+    KdCursorOffScreen,

+    KdCrossScreen,

+    KdWarpCursor

+};

+

+#ifndef _MSC_VER

+void

+ProcessInputEvents (void)

+{

+    mieqProcessInputEvents();

+    miPointerUpdateSprite(inputInfo.pointer);

+    if (kdSwitchPending)

+	KdProcessSwitch ();

+    KdCheckLock ();

+}

+#endif

+

+/* FIXME use XSECURITY to work out whether the client should be allowed to

+ * open and close. */

+void

+OpenInputDevice(DeviceIntPtr pDev, ClientPtr client, int *status)

+{

+    if (!pDev)

+        *status = BadDevice;

+    else

+        *status = Success;

+}

+

+void

+CloseInputDevice(DeviceIntPtr pDev, ClientPtr client)

+{

+    return;

+}

+

+/* We initialise all input devices at startup. */

+void

+AddOtherInputDevices(void)

+{

+    return;

+}

+

+/* At the moment, absolute/relative is up to the client. */

+int

+SetDeviceMode(register ClientPtr client, DeviceIntPtr pDev, int mode)

+{

+    return BadMatch;

+}

+

+int

+SetDeviceValuators(register ClientPtr client, DeviceIntPtr pDev,

+                   int *valuators, int first_valuator, int num_valuators)

+{

+    return BadMatch;

+}

+

+int

+ChangeDeviceControl(register ClientPtr client, DeviceIntPtr pDev,

+                        xDeviceCtl *control)

+{

+    switch (control->control) {

+    case DEVICE_RESOLUTION:

+        /* FIXME do something more intelligent here */

+        return BadMatch;

+

+    case DEVICE_ABS_CALIB:

+    case DEVICE_ABS_AREA:

+        return Success;

+

+    case DEVICE_CORE:

+        return BadMatch;

+    case DEVICE_ENABLE:

+        return Success;

+

+    default:

+        return BadMatch;

+    }

+

+    /* NOTREACHED */

+    return BadImplementation;

+}

+

+int

+NewInputDeviceRequest(InputOption *options, DeviceIntPtr *pdev)

+{

+    InputOption *option = NULL;

+    KdPointerInfo *pi = NULL;

+    KdKeyboardInfo *ki = NULL;

+

+    for (option = options; option; option = option->next) {

+        if (strcmp(option->key, "type") == 0) {

+            if (strcmp(option->value, "pointer") == 0) {

+                pi = KdNewPointer();

+                if (!pi)

+                    return BadAlloc;

+            }

+            else if (strcmp(option->value, "keyboard") == 0) {

+                ki = KdNewKeyboard();

+                if (!ki)

+                    return BadAlloc;

+            }

+            else {

+                ErrorF("unrecognised device type!\n");

+                return BadValue;

+            }

+        }

+#ifdef CONFIG_HAL

+        else if (strcmp(option->key, "_source") == 0 &&

+                 strcmp(option->value, "server/hal") == 0)

+        {

+            ErrorF("Ignoring device from HAL.\n");

+            return BadValue;

+        }

+#endif

+    }

+

+    if (!ki && !pi) {

+        ErrorF("unrecognised device identifier!\n");

+        return BadValue;

+    }

+

+    /* FIXME: change this code below to use KdParseKbdOptions and

+     * KdParsePointerOptions */

+    for (option = options; option; option = option->next) {

+        if (strcmp(option->key, "device") == 0) {

+            if (pi && option->value)

+                pi->path = strdup(option->value);

+            else if (ki && option->value)

+                ki->path = strdup(option->value);

+        }

+        else if (strcmp(option->key, "driver") == 0) {

+            if (pi) {

+                pi->driver = KdFindPointerDriver(option->value);

+                if (!pi->driver) {

+                    ErrorF("couldn't find driver!\n");

+                    KdFreePointer(pi);

+                    return BadValue;

+                }

+                pi->options = options;

+            }

+            else if (ki) {

+                ki->driver = KdFindKeyboardDriver(option->value);

+                if (!ki->driver) {

+                    ErrorF("couldn't find driver!\n");

+                    KdFreeKeyboard(ki);

+                    return BadValue;

+                }

+                ki->options = options;

+            }

+        }

+    }

+

+    if (pi) {

+        if (KdAddPointer(pi) != Success ||

+            ActivateDevice(pi->dixdev, TRUE) != Success ||

+            EnableDevice(pi->dixdev, TRUE) != TRUE) {

+            ErrorF("couldn't add or enable pointer\n");

+            return BadImplementation;

+        }

+    }

+    else if (ki) {

+        if (KdAddKeyboard(ki) != Success ||

+            ActivateDevice(ki->dixdev, TRUE) != Success ||

+            EnableDevice(ki->dixdev, TRUE) != TRUE) {

+            ErrorF("couldn't add or enable keyboard\n");

+            return BadImplementation;

+        }

+    }

+

+    if (pi) {

+        *pdev = pi->dixdev;

+    } else if(ki) {

+        *pdev = ki->dixdev;

+    }

+

+    return Success;

+}

+

+void

+DeleteInputDeviceRequest(DeviceIntPtr pDev)

+{

+    RemoveDevice(pDev, TRUE);

+}

diff --git a/xorg-server/hw/kdrive/src/kmap.c b/xorg-server/hw/kdrive/src/kmap.c
index 60e8ae134..a10c9ec09 100644
--- a/xorg-server/hw/kdrive/src/kmap.c
+++ b/xorg-server/hw/kdrive/src/kmap.c
@@ -24,6 +24,7 @@
 #include "kdrive.h"
 
 #include <errno.h>
+#ifndef _MSC_VER
 #include <unistd.h>
 #include <sys/mman.h>
 #ifdef HAVE_ASM_MTRR_H
@@ -31,6 +32,9 @@
 #endif
 
 #include <sys/ioctl.h>
+#else
+#define DRAW_DEBUG(a)
+#endif
 
 void *
 KdMapDevice (CARD32 addr, CARD32 size)
@@ -39,7 +43,8 @@ KdMapDevice (CARD32 addr, CARD32 size)
     void    *a;
     void    *d;
 
-    d = VirtualAlloc (NULL, size, MEM_RESERVE, PAGE_NOACCESS);
+    d = VirtualAlloc (NULL, size, MEM_RESERVE, PAGE_READWRITE|PAGE_NOCACHE);
+/*
     if (!d)
 	return NULL;
     DRAW_DEBUG ((DEBUG_S3INIT, "Virtual address of 0x%x is 0x%x", addr, d));
@@ -53,6 +58,8 @@ KdMapDevice (CARD32 addr, CARD32 size)
 	return NULL;
     }
     DRAW_DEBUG ((DEBUG_S3INIT, "Device mapped successfully"));
+*/
+    __asm int 3; 
     return d;
 #endif
 #ifdef linux
diff --git a/xorg-server/hw/kdrive/src/makefile b/xorg-server/hw/kdrive/src/makefile
new file mode 100644
index 000000000..e3a826faa
--- /dev/null
+++ b/xorg-server/hw/kdrive/src/makefile
@@ -0,0 +1,14 @@
+LIBRARY = libkdrive
+
+CSRCS =	\
+	kcmap.c		\
+	kcurscol.c	\
+	kdrive.c	\
+	kinfo.c		\
+	kinput.c	\
+	kmap.c		\
+	kmode.c		\
+	kshadow.c
+
+
+
diff --git a/xorg-server/hw/xfree86/common/compiler.h b/xorg-server/hw/xfree86/common/compiler.h
index a450bd676..ae6a4615c 100644
--- a/xorg-server/hw/xfree86/common/compiler.h
+++ b/xorg-server/hw/xfree86/common/compiler.h
@@ -1,1361 +1,1361 @@
-/*
- * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
- *
- * 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, and that the name of Thomas Roell not be used in
- * advertising or publicity pertaining to distribution of the software without
- * specific, written prior permission.  Thomas Roell makes no representations
- * about the suitability of this software for any purpose.  It is provided
- * "as is" without express or implied warranty.
- *
- * THOMAS ROELL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL THOMAS ROELL BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- *
- */
-/*
- * Copyright (c) 1994-2003 by The XFree86 Project, Inc.
- *
- * 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 COPYRIGHT HOLDER(S) OR AUTHOR(S) 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 copyright holder(s)
- * and 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 the copyright holder(s) and author(s).
- */
-
-#ifndef _COMPILER_H
-
-# define _COMPILER_H
-
-#if defined(__SUNPRO_C)
-# define DO_PROTOTYPES
-#endif
-
-#ifndef _X_EXPORT
-# include <X11/Xfuncproto.h>
-#endif
-
-# include <pixman.h> /* for uint*_t types */
-
-/* Allow drivers to use the GCC-supported __inline__ and/or __inline. */
-# ifndef __inline__
-#  if defined(__GNUC__)
-    /* gcc has __inline__ */
-#  elif defined(__HIGHC__)
-#   define __inline__ _Inline
-#  else
-#   define __inline__ /**/
-#  endif
-# endif /* __inline__ */
-# ifndef __inline
-#  if defined(__GNUC__)
-    /* gcc has __inline */
-#  elif defined(__HIGHC__)
-#   define __inline _Inline
-#  else
-#   define __inline /**/
-#  endif
-# endif /* __inline */
-
-/* Support gcc's __FUNCTION__ for people using other compilers */
-#if !defined(__GNUC__) && !defined(__FUNCTION__)
-# define __FUNCTION__ __func__ /* C99 */
-#endif
-
-# if defined(NO_INLINE) || defined(DO_PROTOTYPES)
-
-#  if !defined(__arm__)
-#   if !defined(__sparc__) && !defined(__sparc) && !defined(__arm32__) \
-      && !(defined(__alpha__) && defined(linux)) \
-      && !(defined(__ia64__) && defined(linux)) \
-
-extern _X_EXPORT void outb(unsigned short, unsigned char);
-extern _X_EXPORT void outw(unsigned short, unsigned short);
-extern _X_EXPORT void outl(unsigned short, unsigned int);
-extern _X_EXPORT unsigned int inb(unsigned short);
-extern _X_EXPORT unsigned int inw(unsigned short);
-extern _X_EXPORT unsigned int inl(unsigned short);
-
-#   else /* __sparc__,  __arm32__, __alpha__*/
-
-extern _X_EXPORT void outb(unsigned long, unsigned char);
-extern _X_EXPORT void outw(unsigned long, unsigned short);
-extern _X_EXPORT void outl(unsigned long, unsigned int);
-extern _X_EXPORT unsigned int inb(unsigned long);
-extern _X_EXPORT unsigned int inw(unsigned long);
-extern _X_EXPORT unsigned int inl(unsigned long);
-
-#   endif /* __sparc__,  __arm32__, __alpha__ */
-#  endif /* __arm__ */
-
-#  if defined(__powerpc__) && !defined(__OpenBSD__)
-extern unsigned long ldq_u(unsigned long *);
-extern unsigned long ldl_u(unsigned int *);
-extern unsigned long ldw_u(unsigned short *);
-extern void stq_u(unsigned long, unsigned long *);
-extern void stl_u(unsigned long, unsigned int *);
-extern void stw_u(unsigned long, unsigned short *);
-extern void mem_barrier(void);
-extern void write_mem_barrier(void);
-extern void stl_brx(unsigned long, volatile unsigned char *, int);
-extern void stw_brx(unsigned short, volatile unsigned char *, int);
-extern unsigned long ldl_brx(volatile unsigned char *, int);
-extern unsigned short ldw_brx(volatile unsigned char *, int);
-#  endif /* __powerpc__ && !__OpenBSD */
-
-# endif /* NO_INLINE || DO_PROTOTYPES */
-
-# ifndef NO_INLINE
-#  ifdef __GNUC__
-#   ifdef __i386__
-
-#    ifdef __SSE__
-#     define write_mem_barrier() __asm__ __volatile__ ("sfence" : : : "memory")
-#    else
-#     define write_mem_barrier() __asm__ __volatile__ ("lock; addl $0,0(%%esp)" : : : "memory")
-#    endif
-
-#    ifdef __SSE2__
-#     define mem_barrier() __asm__ __volatile__ ("mfence" : : : "memory")
-#    else
-#     define mem_barrier() __asm__ __volatile__ ("lock; addl $0,0(%%esp)" : : : "memory")
-#    endif
-
-#   elif defined __alpha__
-
-#    define mem_barrier() __asm__ __volatile__ ("mb" : : : "memory")
-#    define write_mem_barrier() __asm__ __volatile__ ("wmb" : : : "memory")
-
-#   elif defined __amd64__
-
-#    define mem_barrier() __asm__ __volatile__ ("mfence" : : : "memory")
-#    define write_mem_barrier() __asm__ __volatile__ ("sfence" : : : "memory")
-
-#   elif defined __ia64__
-
-#    ifndef __INTEL_COMPILER
-#     define mem_barrier()        __asm__ __volatile__ ("mf" : : : "memory")
-#     define write_mem_barrier()  __asm__ __volatile__ ("mf" : : : "memory")
-#    else
-#     include "ia64intrin.h"
-#     define mem_barrier() __mf()
-#     define write_mem_barrier() __mf()
-#    endif
-
-#   elif defined __mips__
-     /* Note: sync instruction requires MIPS II instruction set */
-#    define mem_barrier()		\
-	__asm__ __volatile__(		\
-		".set   push\n\t"	\
-		".set   noreorder\n\t"	\
-		".set   mips2\n\t"	\
-		"sync\n\t"		\
-		".set   pop"		\
-		: /* no output */	\
-		: /* no input */	\
-		: "memory")
-#    define write_mem_barrier() mem_barrier()
-
-#   elif defined __powerpc__
-
-#    if defined(linux) && defined(__powerpc64__)
-#     include <linux/version.h>
-#     if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0)
-#      include <asm/memory.h>
-#     endif
-#    endif /* defined(linux) && defined(__powerpc64__) */
-
-#    ifndef eieio /* We deal with arch-specific eieio() routines above... */
-#     define eieio() __asm__ __volatile__ ("eieio" ::: "memory")
-#    endif /* eieio */
-#    define mem_barrier()	eieio()
-#    define write_mem_barrier()	eieio()
-
-#   elif defined __sparc__
-
-#    define barrier() __asm__ __volatile__ (".word 0x8143e00a" : : : "memory")
-#    define mem_barrier()         /* XXX: nop for now */
-#    define write_mem_barrier()   /* XXX: nop for now */
-#   endif
-#  endif /* __GNUC__ */
-# endif /* NO_INLINE */
-
-# ifndef mem_barrier
-#  define mem_barrier() /* NOP */
-# endif
-
-# ifndef write_mem_barrier
-#  define write_mem_barrier() /* NOP */
-# endif
-
-
-# ifndef NO_INLINE
-#  ifdef __GNUC__
-
-/* Define some packed structures to use with unaligned accesses */
-
-struct __una_u64 { uint64_t x __attribute__((packed)); };
-struct __una_u32 { uint32_t x __attribute__((packed)); };
-struct __una_u16 { uint16_t x __attribute__((packed)); };
-
-/* Elemental unaligned loads */
-
-static __inline__ uint64_t ldq_u(uint64_t *p)
-{
-	const struct __una_u64 *ptr = (const struct __una_u64 *) p;
-	return ptr->x;
-}
-
-static __inline__ uint32_t ldl_u(uint32_t *p)
-{
-	const struct __una_u32 *ptr = (const struct __una_u32 *) p;
-	return ptr->x;
-}
-
-static __inline__ uint16_t ldw_u(uint16_t *p)
-{
-	const struct __una_u16 *ptr = (const struct __una_u16 *) p;
-	return ptr->x;
-}
-
-/* Elemental unaligned stores */
-
-static __inline__ void stq_u(uint64_t val, uint64_t *p)
-{
-	struct __una_u64 *ptr = (struct __una_u64 *) p;
-	ptr->x = val;
-}
-
-static __inline__ void stl_u(uint32_t val, uint32_t *p)
-{
-	struct __una_u32 *ptr = (struct __una_u32 *) p;
-	ptr->x = val;
-}
-
-static __inline__ void stw_u(uint16_t val, uint16_t *p)
-{
-	struct __una_u16 *ptr = (struct __una_u16 *) p;
-	ptr->x = val;
-}
-#  else /* !__GNUC__ */
-
-#include <string.h> /* needed for memmove */
-
-static __inline__ uint64_t ldq_u(uint64_t *p)
-{
-	uint64_t ret;
-	memmove(&ret, p, sizeof(*p));
-	return ret;
-}
-
-static __inline__ uint32_t ldl_u(uint32_t *p)
-{
-	uint32_t ret;
-	memmove(&ret, p, sizeof(*p));
-	return ret;
-}
-
-static __inline__ uint16_t ldw_u(uint16_t *p)
-{
-	uint16_t ret;
-	memmove(&ret, p, sizeof(*p));
-	return ret;
-}
-
-static __inline__ void stq_u(uint64_t val, uint64_t *p)
-{
-	uint64_t tmp = val;
-	memmove(p, &tmp, sizeof(*p));
-}
-
-static __inline__ void stl_u(uint32_t val, uint32_t *p)
-{
-	uint32_t tmp = val;
-	memmove(p, &tmp, sizeof(*p));
-}
-
-static __inline__ void stw_u(uint16_t val, uint16_t *p)
-{
-	uint16_t tmp = val;
-	memmove(p, &tmp, sizeof(*p));
-}
-
-#  endif /* __GNUC__ */
-# endif /* NO_INLINE */
-
-# ifndef NO_INLINE
-#  ifdef __GNUC__
-#   if (defined(linux) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)) && (defined(__alpha__))
-
-#    ifdef linux
-/* for Linux on Alpha, we use the LIBC _inx/_outx routines */
-/* note that the appropriate setup via "ioperm" needs to be done */
-/*  *before* any inx/outx is done. */
-
-extern _X_EXPORT void (*_alpha_outb)(char val, unsigned long port);
-static __inline__ void
-outb(unsigned long port, unsigned char val)
-{
-    _alpha_outb(val, port);
-}
-
-extern _X_EXPORT void (*_alpha_outw)(short val, unsigned long port);
-static __inline__ void
-outw(unsigned long port, unsigned short val)
-{
-    _alpha_outw(val, port);
-}
-
-extern _X_EXPORT void (*_alpha_outl)(int val, unsigned long port);
-static __inline__ void
-outl(unsigned long port, unsigned int val)
-{
-    _alpha_outl(val, port);
-}
-
-extern _X_EXPORT unsigned int (*_alpha_inb)(unsigned long port);
-static __inline__ unsigned int
-inb(unsigned long port)
-{
-  return _alpha_inb(port);
-}
-
-extern _X_EXPORT unsigned int (*_alpha_inw)(unsigned long port);
-static __inline__ unsigned int
-inw(unsigned long port)
-{
-  return _alpha_inw(port);
-}
-
-extern _X_EXPORT unsigned int (*_alpha_inl)(unsigned long port);
-static __inline__ unsigned int
-inl(unsigned long port)
-{
-  return _alpha_inl(port);
-}
-
-#    endif /* linux */
-
-#    if (defined(__FreeBSD__) || defined(__OpenBSD__)) \
-      && !defined(DO_PROTOTYPES)
-
-/* for FreeBSD and OpenBSD on Alpha, we use the libio (resp. libalpha) */
-/*  inx/outx routines */
-/* note that the appropriate setup via "ioperm" needs to be done */
-/*  *before* any inx/outx is done. */
-
-extern _X_EXPORT void outb(unsigned int port, unsigned char val);
-extern _X_EXPORT void outw(unsigned int port, unsigned short val);
-extern _X_EXPORT void outl(unsigned int port, unsigned int val);
-extern _X_EXPORT unsigned char inb(unsigned int port);
-extern _X_EXPORT unsigned short inw(unsigned int port);
-extern _X_EXPORT unsigned int inl(unsigned int port);
-
-#    endif /* (__FreeBSD__ || __OpenBSD__ ) && !DO_PROTOTYPES */
-
-
-#if defined(__NetBSD__)
-#include <machine/pio.h>
-#endif /* __NetBSD__ */
-
-#   elif defined(linux) && defined(__ia64__) 
- 
-#    include <inttypes.h>
-
-#    include <sys/io.h>
-
-#    undef outb
-#    undef outw
-#    undef outl
-#    undef inb
-#    undef inw
-#    undef inl
-extern _X_EXPORT void outb(unsigned long port, unsigned char val);
-extern _X_EXPORT void outw(unsigned long port, unsigned short val);
-extern _X_EXPORT void outl(unsigned long port, unsigned int val);
-extern _X_EXPORT unsigned int inb(unsigned long port);
-extern _X_EXPORT unsigned int inw(unsigned long port);
-extern _X_EXPORT unsigned int inl(unsigned long port);
- 
-#   elif (defined(linux) || defined(__FreeBSD__)) && defined(__amd64__)
- 
-#    include <inttypes.h>
-
-static __inline__ void
-outb(unsigned short port, unsigned char val)
-{
-   __asm__ __volatile__("outb %0,%1" : :"a" (val), "d" (port));
-}
-
-
-static __inline__ void
-outw(unsigned short port, unsigned short val)
-{
-   __asm__ __volatile__("outw %0,%1" : :"a" (val), "d" (port));
-}
-
-static __inline__ void
-outl(unsigned short port, unsigned int val)
-{
-   __asm__ __volatile__("outl %0,%1" : :"a" (val), "d" (port));
-}
-
-static __inline__ unsigned int
-inb(unsigned short port)
-{
-   unsigned char ret;
-   __asm__ __volatile__("inb %1,%0" :
-       "=a" (ret) :
-       "d" (port));
-   return ret;
-}
-
-static __inline__ unsigned int
-inw(unsigned short port)
-{
-   unsigned short ret;
-   __asm__ __volatile__("inw %1,%0" :
-       "=a" (ret) :
-       "d" (port));
-   return ret;
-}
-
-static __inline__ unsigned int
-inl(unsigned short port)
-{
-   unsigned int ret;
-   __asm__ __volatile__("inl %1,%0" :
-       "=a" (ret) :
-       "d" (port));
-   return ret;
-}
-
-#   elif (defined(linux) || defined(sun) || defined(__OpenBSD__) || defined(__FreeBSD__)) && defined(__sparc__)
-
-#     ifndef ASI_PL
-#      define ASI_PL 0x88
-#     endif
-
-static __inline__ void
-outb(unsigned long port, unsigned char val)
-{
-	__asm__ __volatile__("stba %0, [%1] %2"
-			     : /* No outputs */
-			     : "r" (val), "r" (port), "i" (ASI_PL));
-	barrier();
-}
-
-static __inline__ void
-outw(unsigned long port, unsigned short val)
-{
-	__asm__ __volatile__("stha %0, [%1] %2"
-			     : /* No outputs */
-			     : "r" (val), "r" (port), "i" (ASI_PL));
-	barrier();
-}
-
-static __inline__ void
-outl(unsigned long port, unsigned int val)
-{
-	__asm__ __volatile__("sta %0, [%1] %2"
-			     : /* No outputs */
-			     : "r" (val), "r" (port), "i" (ASI_PL));
-	barrier();
-}
-
-static __inline__ unsigned int
-inb(unsigned long port)
-{
-	unsigned int ret;
-	__asm__ __volatile__("lduba [%1] %2, %0"
-			     : "=r" (ret)
-			     : "r" (port), "i" (ASI_PL));
-	return ret;
-}
-
-static __inline__ unsigned int
-inw(unsigned long port)
-{
-	unsigned int ret;
-	__asm__ __volatile__("lduha [%1] %2, %0"
-			     : "=r" (ret)
-			     : "r" (port), "i" (ASI_PL));
-	return ret;
-}
-
-static __inline__ unsigned int
-inl(unsigned long port)
-{
-	unsigned int ret;
-	__asm__ __volatile__("lda [%1] %2, %0"
-			     : "=r" (ret)
-			     : "r" (port), "i" (ASI_PL));
-	return ret;
-}
-
-static __inline__ unsigned char
-xf86ReadMmio8(__volatile__ void *base, const unsigned long offset)
-{
-	unsigned long addr = ((unsigned long)base) + offset;
-	unsigned char ret;
-
-	__asm__ __volatile__("lduba [%1] %2, %0"
-			     : "=r" (ret)
-			     : "r" (addr), "i" (ASI_PL));
-	return ret;
-}
-
-static __inline__ unsigned short
-xf86ReadMmio16Be(__volatile__ void *base, const unsigned long offset)
-{
-	unsigned long addr = ((unsigned long)base) + offset;
-	unsigned short ret;
-
-	__asm__ __volatile__("lduh [%1], %0"
-			     : "=r" (ret)
-			     : "r" (addr));
-	return ret;
-}
-
-static __inline__ unsigned short
-xf86ReadMmio16Le(__volatile__ void *base, const unsigned long offset)
-{
-	unsigned long addr = ((unsigned long)base) + offset;
-	unsigned short ret;
-
-	__asm__ __volatile__("lduha [%1] %2, %0"
-			     : "=r" (ret)
-			     : "r" (addr), "i" (ASI_PL));
-	return ret;
-}
-
-static __inline__ unsigned int
-xf86ReadMmio32Be(__volatile__ void *base, const unsigned long offset)
-{
-	unsigned long addr = ((unsigned long)base) + offset;
-	unsigned int ret;
-
-	__asm__ __volatile__("ld [%1], %0"
-			     : "=r" (ret)
-			     : "r" (addr));
-	return ret;
-}
-
-static __inline__ unsigned int
-xf86ReadMmio32Le(__volatile__ void *base, const unsigned long offset)
-{
-	unsigned long addr = ((unsigned long)base) + offset;
-	unsigned int ret;
-
-	__asm__ __volatile__("lda [%1] %2, %0"
-			     : "=r" (ret)
-			     : "r" (addr), "i" (ASI_PL));
-	return ret;
-}
-
-static __inline__ void
-xf86WriteMmio8(__volatile__ void *base, const unsigned long offset,
-	       const unsigned int val)
-{
-	unsigned long addr = ((unsigned long)base) + offset;
-
-	__asm__ __volatile__("stba %0, [%1] %2"
-			     : /* No outputs */
-			     : "r" (val), "r" (addr), "i" (ASI_PL));
-	barrier();
-}
-
-static __inline__ void
-xf86WriteMmio16Be(__volatile__ void *base, const unsigned long offset,
-		  const unsigned int val)
-{
-	unsigned long addr = ((unsigned long)base) + offset;
-
-	__asm__ __volatile__("sth %0, [%1]"
-			     : /* No outputs */
-			     : "r" (val), "r" (addr));
-	barrier();
-}
-
-static __inline__ void
-xf86WriteMmio16Le(__volatile__ void *base, const unsigned long offset,
-		  const unsigned int val)
-{
-	unsigned long addr = ((unsigned long)base) + offset;
-
-	__asm__ __volatile__("stha %0, [%1] %2"
-			     : /* No outputs */
-			     : "r" (val), "r" (addr), "i" (ASI_PL));
-	barrier();
-}
-
-static __inline__ void
-xf86WriteMmio32Be(__volatile__ void *base, const unsigned long offset,
-		  const unsigned int val)
-{
-	unsigned long addr = ((unsigned long)base) + offset;
-
-	__asm__ __volatile__("st %0, [%1]"
-			     : /* No outputs */
-			     : "r" (val), "r" (addr));
-	barrier();
-}
-
-static __inline__ void
-xf86WriteMmio32Le(__volatile__ void *base, const unsigned long offset,
-		  const unsigned int val)
-{
-	unsigned long addr = ((unsigned long)base) + offset;
-
-	__asm__ __volatile__("sta %0, [%1] %2"
-			     : /* No outputs */
-			     : "r" (val), "r" (addr), "i" (ASI_PL));
-	barrier();
-}
-
-static __inline__ void
-xf86WriteMmio8NB(__volatile__ void *base, const unsigned long offset,
-		 const unsigned int val)
-{
-	unsigned long addr = ((unsigned long)base) + offset;
-
-	__asm__ __volatile__("stba %0, [%1] %2"
-			     : /* No outputs */
-			     : "r" (val), "r" (addr), "i" (ASI_PL));
-}
-
-static __inline__ void
-xf86WriteMmio16BeNB(__volatile__ void *base, const unsigned long offset,
-		    const unsigned int val)
-{
-	unsigned long addr = ((unsigned long)base) + offset;
-
-	__asm__ __volatile__("sth %0, [%1]"
-			     : /* No outputs */
-			     : "r" (val), "r" (addr));
-}
-
-static __inline__ void
-xf86WriteMmio16LeNB(__volatile__ void *base, const unsigned long offset,
-		    const unsigned int val)
-{
-	unsigned long addr = ((unsigned long)base) + offset;
-
-	__asm__ __volatile__("stha %0, [%1] %2"
-			     : /* No outputs */
-			     : "r" (val), "r" (addr), "i" (ASI_PL));
-}
-
-static __inline__ void
-xf86WriteMmio32BeNB(__volatile__ void *base, const unsigned long offset,
-		    const unsigned int val)
-{
-	unsigned long addr = ((unsigned long)base) + offset;
-
-	__asm__ __volatile__("st %0, [%1]"
-			     : /* No outputs */
-			     : "r" (val), "r" (addr));
-}
-
-static __inline__ void
-xf86WriteMmio32LeNB(__volatile__ void *base, const unsigned long offset,
-		    const unsigned int val)
-{
-	unsigned long addr = ((unsigned long)base) + offset;
-
-	__asm__ __volatile__("sta %0, [%1] %2"
-			     : /* No outputs */
-			     : "r" (val), "r" (addr), "i" (ASI_PL));
-}
-
-#   elif defined(__mips__) || (defined(__arm32__) && !defined(__linux__))
-#    ifdef __arm32__
-#     define PORT_SIZE long
-#    else
-#     define PORT_SIZE short
-#    endif
-
-_X_EXPORT unsigned int IOPortBase;  /* Memory mapped I/O port area */
-
-static __inline__ void
-outb(unsigned PORT_SIZE port, unsigned char val)
-{
-	*(volatile unsigned char*)(((unsigned PORT_SIZE)(port))+IOPortBase) = val;
-}
-
-static __inline__ void
-outw(unsigned PORT_SIZE port, unsigned short val)
-{
-	*(volatile unsigned short*)(((unsigned PORT_SIZE)(port))+IOPortBase) = val;
-}
-
-static __inline__ void
-outl(unsigned PORT_SIZE port, unsigned int val)
-{
-	*(volatile unsigned int*)(((unsigned PORT_SIZE)(port))+IOPortBase) = val;
-}
-
-static __inline__ unsigned int
-inb(unsigned PORT_SIZE port)
-{
-	return *(volatile unsigned char*)(((unsigned PORT_SIZE)(port))+IOPortBase);
-}
-
-static __inline__ unsigned int
-inw(unsigned PORT_SIZE port)
-{
-	return *(volatile unsigned short*)(((unsigned PORT_SIZE)(port))+IOPortBase);
-}
-
-static __inline__ unsigned int
-inl(unsigned PORT_SIZE port)
-{
-	return *(volatile unsigned int*)(((unsigned PORT_SIZE)(port))+IOPortBase);
-}
-
-
-#    if defined(__mips__)
-#     ifdef linux	/* don't mess with other OSs */
-#       if X_BYTE_ORDER == X_BIG_ENDIAN
-static __inline__ unsigned int
-xf86ReadMmio32Be(__volatile__ void *base, const unsigned long offset)
-{
-	unsigned long addr = ((unsigned long)base) + offset;
-	unsigned int ret;
-
-	__asm__ __volatile__("lw %0, 0(%1)"
-			     : "=r" (ret)
-			     : "r" (addr));
-	return ret;
-}
-
-static __inline__ void
-xf86WriteMmio32Be(__volatile__ void *base, const unsigned long offset,
-		  const unsigned int val)
-{
-	unsigned long addr = ((unsigned long)base) + offset;
-
-	__asm__ __volatile__("sw %0, 0(%1)"
-			     : /* No outputs */
-			     : "r" (val), "r" (addr));
-}
-#      endif
-#     endif /* !linux */
-#    endif /* __mips__ */
-
-#   elif (defined(linux) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__)) && defined(__powerpc__)
-
-#    ifndef MAP_FAILED
-#     define MAP_FAILED ((void *)-1)
-#    endif
-
-extern _X_EXPORT volatile unsigned char *ioBase;
-
-static __inline__ unsigned char
-xf86ReadMmio8(__volatile__ void *base, const unsigned long offset)
-{
-        register unsigned char val;
-        __asm__ __volatile__(
-                        "lbzx %0,%1,%2\n\t"
-                        "eieio"
-                        : "=r" (val)
-                        : "b" (base), "r" (offset),
-                        "m" (*((volatile unsigned char *)base+offset)));
-        return val;
-}
-
-static __inline__ unsigned short
-xf86ReadMmio16Be(__volatile__ void *base, const unsigned long offset)
-{
-        register unsigned short val;
-        __asm__ __volatile__(
-                        "lhzx %0,%1,%2\n\t"
-                        "eieio"
-                        : "=r" (val)
-                        : "b" (base), "r" (offset),
-                        "m" (*((volatile unsigned char *)base+offset)));
-        return val;
-}
-
-static __inline__ unsigned short
-xf86ReadMmio16Le(__volatile__ void *base, const unsigned long offset)
-{
-        register unsigned short val;
-        __asm__ __volatile__(
-                        "lhbrx %0,%1,%2\n\t"
-                        "eieio"
-                        : "=r" (val)
-                        : "b" (base), "r" (offset),
-                        "m" (*((volatile unsigned char *)base+offset)));
-        return val;
-}
-
-static __inline__ unsigned int
-xf86ReadMmio32Be(__volatile__ void *base, const unsigned long offset)
-{
-        register unsigned int val;
-        __asm__ __volatile__(
-                        "lwzx %0,%1,%2\n\t"
-                        "eieio"
-                        : "=r" (val)
-                        : "b" (base), "r" (offset),
-                        "m" (*((volatile unsigned char *)base+offset)));
-        return val;
-}
-
-static __inline__ unsigned int
-xf86ReadMmio32Le(__volatile__ void *base, const unsigned long offset)
-{
-        register unsigned int val;
-        __asm__ __volatile__(
-                        "lwbrx %0,%1,%2\n\t"
-                        "eieio"
-                        : "=r" (val)
-                        : "b" (base), "r" (offset),
-                        "m" (*((volatile unsigned char *)base+offset)));
-        return val;
-}
-
-static __inline__ void
-xf86WriteMmioNB8(__volatile__ void *base, const unsigned long offset,
-		 const unsigned char val)
-{
-        __asm__ __volatile__(
-                        "stbx %1,%2,%3\n\t"
-                        : "=m" (*((volatile unsigned char *)base+offset))
-                        : "r" (val), "b" (base), "r" (offset));
-}
-
-static __inline__ void
-xf86WriteMmioNB16Le(__volatile__ void *base, const unsigned long offset,
-		    const unsigned short val)
-{
-        __asm__ __volatile__(
-                        "sthbrx %1,%2,%3\n\t"
-                        : "=m" (*((volatile unsigned char *)base+offset))
-                        : "r" (val), "b" (base), "r" (offset));
-}
-
-static __inline__ void
-xf86WriteMmioNB16Be(__volatile__ void *base, const unsigned long offset,
-		    const unsigned short val)
-{
-        __asm__ __volatile__(
-                        "sthx %1,%2,%3\n\t"
-                        : "=m" (*((volatile unsigned char *)base+offset))
-                        : "r" (val), "b" (base), "r" (offset));
-}
-
-static __inline__ void
-xf86WriteMmioNB32Le(__volatile__ void *base, const unsigned long offset,
-		    const unsigned int val)
-{
-        __asm__ __volatile__(
-                        "stwbrx %1,%2,%3\n\t"
-                        : "=m" (*((volatile unsigned char *)base+offset))
-                        : "r" (val), "b" (base), "r" (offset));
-}
-
-static __inline__ void
-xf86WriteMmioNB32Be(__volatile__ void *base, const unsigned long offset,
-		    const unsigned int val)
-{
-        __asm__ __volatile__(
-                        "stwx %1,%2,%3\n\t"
-                        : "=m" (*((volatile unsigned char *)base+offset))
-                        : "r" (val), "b" (base), "r" (offset));
-}
-
-static __inline__ void
-xf86WriteMmio8(__volatile__ void *base, const unsigned long offset,
-               const unsigned char val)
-{
-        xf86WriteMmioNB8(base, offset, val);
-        eieio();
-}
-
-static __inline__ void
-xf86WriteMmio16Le(__volatile__ void *base, const unsigned long offset,
-                  const unsigned short val)
-{
-        xf86WriteMmioNB16Le(base, offset, val);
-        eieio();
-}
-
-static __inline__ void
-xf86WriteMmio16Be(__volatile__ void *base, const unsigned long offset,
-                  const unsigned short val)
-{
-        xf86WriteMmioNB16Be(base, offset, val);
-        eieio();
-}
-
-static __inline__ void
-xf86WriteMmio32Le(__volatile__ void *base, const unsigned long offset,
-                  const unsigned int val)
-{
-        xf86WriteMmioNB32Le(base, offset, val);
-        eieio();
-}
-
-static __inline__ void
-xf86WriteMmio32Be(__volatile__ void *base, const unsigned long offset,
-                  const unsigned int val)
-{
-        xf86WriteMmioNB32Be(base, offset, val);
-        eieio();
-}
-
-
-static __inline__ void
-outb(unsigned short port, unsigned char value)
-{
-        if(ioBase == MAP_FAILED) return;
-        xf86WriteMmio8((void *)ioBase, port, value);
-}
-
-static __inline__ void
-outw(unsigned short port, unsigned short value)
-{
-        if(ioBase == MAP_FAILED) return;
-        xf86WriteMmio16Le((void *)ioBase, port, value);
-}
-
-static __inline__ void
-outl(unsigned short port, unsigned int value)
-{
-        if(ioBase == MAP_FAILED) return;
-        xf86WriteMmio32Le((void *)ioBase, port, value);
-}
-
-static __inline__ unsigned int
-inb(unsigned short port)
-{
-        if(ioBase == MAP_FAILED) return 0;
-        return xf86ReadMmio8((void *)ioBase, port);
-}
-
-static __inline__ unsigned int
-inw(unsigned short port)
-{
-        if(ioBase == MAP_FAILED) return 0;
-        return xf86ReadMmio16Le((void *)ioBase, port);
-}
-
-static __inline__ unsigned int
-inl(unsigned short port)
-{
-        if(ioBase == MAP_FAILED) return 0;
-        return xf86ReadMmio32Le((void *)ioBase, port);
-}
-
-#elif defined(__arm__) && defined(__linux__)
-
-/* for Linux on ARM, we use the LIBC inx/outx routines */
-/* note that the appropriate setup via "ioperm" needs to be done */
-/*  *before* any inx/outx is done. */
-
-#include <sys/io.h>
-
-static __inline__ void
-xf_outb(unsigned short port, unsigned char val)
-{
-    outb(val, port);
-}
-
-static __inline__ void
-xf_outw(unsigned short port, unsigned short val)
-{
-    outw(val, port);
-}
-
-static __inline__ void
-xf_outl(unsigned short port, unsigned int val)
-{
-    outl(val, port);
-}
-
-#define outb xf_outb
-#define outw xf_outw
-#define outl xf_outl
-
-#   else /* ix86 */
-
-#    if !defined(__SUNPRO_C)
-#    if !defined(FAKEIT) && !defined(__mc68000__) && !defined(__arm__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__m32r__)
-#     ifdef GCCUSESGAS
-
-/*
- * If gcc uses gas rather than the native assembler, the syntax of these
- * inlines has to be different.		DHD
- */
-
-static __inline__ void
-outb(unsigned short port, unsigned char val)
-{
-   __asm__ __volatile__("outb %0,%1" : :"a" (val), "d" (port));
-}
-
-
-static __inline__ void
-outw(unsigned short port, unsigned short val)
-{
-   __asm__ __volatile__("outw %0,%1" : :"a" (val), "d" (port));
-}
-
-static __inline__ void
-outl(unsigned short port, unsigned int val)
-{
-   __asm__ __volatile__("outl %0,%1" : :"a" (val), "d" (port));
-}
-
-static __inline__ unsigned int
-inb(unsigned short port)
-{
-   unsigned char ret;
-   __asm__ __volatile__("inb %1,%0" :
-       "=a" (ret) :
-       "d" (port));
-   return ret;
-}
-
-static __inline__ unsigned int
-inw(unsigned short port)
-{
-   unsigned short ret;
-   __asm__ __volatile__("inw %1,%0" :
-       "=a" (ret) :
-       "d" (port));
-   return ret;
-}
-
-static __inline__ unsigned int
-inl(unsigned short port)
-{
-   unsigned int ret;
-   __asm__ __volatile__("inl %1,%0" :
-       "=a" (ret) :
-       "d" (port));
-   return ret;
-}
-
-#     else	/* GCCUSESGAS */
-
-static __inline__ void
-outb(unsigned short port, unsigned char val)
-{
-  __asm__ __volatile__("out%B0 (%1)" : :"a" (val), "d" (port));
-}
-
-static __inline__ void
-outw(unsigned short port, unsigned short val)
-{
-  __asm__ __volatile__("out%W0 (%1)" : :"a" (val), "d" (port));
-}
-
-static __inline__ void
-outl(unsigned short port, unsigned int val)
-{
-  __asm__ __volatile__("out%L0 (%1)" : :"a" (val), "d" (port));
-}
-
-static __inline__ unsigned int
-inb(unsigned short port)
-{
-  unsigned char ret;
-  __asm__ __volatile__("in%B0 (%1)" :
-		   "=a" (ret) :
-		   "d" (port));
-  return ret;
-}
-
-static __inline__ unsigned int
-inw(unsigned short port)
-{
-  unsigned short ret;
-  __asm__ __volatile__("in%W0 (%1)" :
-		   "=a" (ret) :
-		   "d" (port));
-  return ret;
-}
-
-static __inline__ unsigned int
-inl(unsigned short port)
-{
-  unsigned int ret;
-  __asm__ __volatile__("in%L0 (%1)" :
-                   "=a" (ret) :
-                   "d" (port));
-  return ret;
-}
-
-#     endif /* GCCUSESGAS */
-
-#    else /* !defined(FAKEIT) && !defined(__mc68000__)  && !defined(__arm__) && !defined(__sh__) && !defined(__hppa__) && !defined(__m32r__) */
-
-static __inline__ void
-outb(unsigned short port, unsigned char val)
-{
-}
-
-static __inline__ void
-outw(unsigned short port, unsigned short val)
-{
-}
-
-static __inline__ void
-outl(unsigned short port, unsigned int val)
-{
-}
-
-static __inline__ unsigned int
-inb(unsigned short port)
-{
-  return 0;
-}
-
-static __inline__ unsigned int
-inw(unsigned short port)
-{
-  return 0;
-}
-
-static __inline__ unsigned int
-inl(unsigned short port)
-{
-  return 0;
-}
-
-#    endif /* FAKEIT */
-#    endif /* __SUNPRO_C */
-
-#   endif /* ix86 */
-
-#  else /* !GNUC */
-#    if defined(__STDC__) && (__STDC__ == 1)
-#     ifndef asm
-#      define asm __asm
-#     endif
-#    endif
-#    ifndef SCO325
-#     if defined(__UNIXWARE__)
-#     /* avoid including <sys/types.h> for <sys/inline.h> on UnixWare */
-#      define ushort unsigned short
-#      define ushort_t unsigned short
-#      define ulong unsigned long
-#      define ulong_t unsigned long
-#      define uint_t unsigned int
-#      define uchar_t unsigned char
-#     endif /* __UNIXWARE__ */
-#     if !defined(__SUNPRO_C)
-#      include <sys/inline.h>
-#     endif
-#    else
-#     include "scoasm.h"
-#    endif
-#    if !defined(__HIGHC__) && !defined(__SUNPRO_C) || \
-	defined(__USLC__)
-#     pragma asm partial_optimization outl
-#     pragma asm partial_optimization outw
-#     pragma asm partial_optimization outb
-#     pragma asm partial_optimization inl
-#     pragma asm partial_optimization inw
-#     pragma asm partial_optimization inb
-#    endif
-#  endif /* __GNUC__ */
-
-# endif /* NO_INLINE */
-
-# ifdef __alpha__
-/* entry points for Mmio memory access routines */
-extern _X_EXPORT int (*xf86ReadMmio8)(void *, unsigned long);
-extern _X_EXPORT int (*xf86ReadMmio16)(void *, unsigned long);
-#  ifndef STANDALONE_MMIO
-extern _X_EXPORT int (*xf86ReadMmio32)(void *, unsigned long);
-#  else
-/* Some DRI 3D drivers need MMIO_IN32. */
-static __inline__ int
-xf86ReadMmio32(void *Base, unsigned long Offset)
-{
-	mem_barrier();
-	return *(volatile unsigned int*)((unsigned long)Base+(Offset));
-}
-#  endif
-extern _X_EXPORT void (*xf86WriteMmio8)(int, void *, unsigned long);
-extern _X_EXPORT void (*xf86WriteMmio16)(int, void *, unsigned long);
-extern _X_EXPORT void (*xf86WriteMmio32)(int, void *, unsigned long);
-extern _X_EXPORT void (*xf86WriteMmioNB8)(int, void *, unsigned long);
-extern _X_EXPORT void (*xf86WriteMmioNB16)(int, void *, unsigned long);
-extern _X_EXPORT void (*xf86WriteMmioNB32)(int, void *, unsigned long);
-extern _X_EXPORT void xf86SlowBCopyFromBus(unsigned char *, unsigned char *, int);
-extern _X_EXPORT void xf86SlowBCopyToBus(unsigned char *, unsigned char *, int);
-
-/* Some macros to hide the system dependencies for MMIO accesses */
-/* Changed to kill noise generated by gcc's -Wcast-align */
-#  define MMIO_IN8(base, offset) (*xf86ReadMmio8)(base, offset)
-#  define MMIO_IN16(base, offset) (*xf86ReadMmio16)(base, offset)
-#  ifndef STANDALONE_MMIO
-#   define MMIO_IN32(base, offset) (*xf86ReadMmio32)(base, offset)
-#  else
-#   define MMIO_IN32(base, offset) xf86ReadMmio32(base, offset)
-#  endif
-
-#  define MMIO_OUT32(base, offset, val) \
-    do { \
-	write_mem_barrier(); \
-	*(volatile CARD32 *)(void *)(((CARD8*)(base)) + (offset)) = (val); \
-    } while (0)
-#  define MMIO_ONB32(base, offset, val) \
-	*(volatile CARD32 *)(void *)(((CARD8*)(base)) + (offset)) = (val)
-
-#  define MMIO_OUT8(base, offset, val) \
-    (*xf86WriteMmio8)((CARD8)(val), base, offset)
-#  define MMIO_OUT16(base, offset, val) \
-    (*xf86WriteMmio16)((CARD16)(val), base, offset)
-#  define MMIO_ONB8(base, offset, val) \
-    (*xf86WriteMmioNB8)((CARD8)(val), base, offset)
-#  define MMIO_ONB16(base, offset, val) \
-    (*xf86WriteMmioNB16)((CARD16)(val), base, offset)
-#  define MMIO_MOVE32(base, offset, val) \
-    MMIO_OUT32(base, offset, val)
-
-# elif defined(__powerpc__)  
- /* 
-  * we provide byteswapping and no byteswapping functions here
-  * with byteswapping as default, 
-  * drivers that don't need byteswapping should define PPC_MMIO_IS_BE 
-  */
-#  define MMIO_IN8(base, offset) xf86ReadMmio8(base, offset)
-#  define MMIO_OUT8(base, offset, val) \
-    xf86WriteMmio8(base, offset, (CARD8)(val))
-#  define MMIO_ONB8(base, offset, val) \
-    xf86WriteMmioNB8(base, offset, (CARD8)(val))
-
-#  if defined(PPC_MMIO_IS_BE) /* No byteswapping */
-#   define MMIO_IN16(base, offset) xf86ReadMmio16Be(base, offset)
-#   define MMIO_IN32(base, offset) xf86ReadMmio32Be(base, offset)
-#   define MMIO_OUT16(base, offset, val) \
-    xf86WriteMmio16Be(base, offset, (CARD16)(val))
-#   define MMIO_OUT32(base, offset, val) \
-    xf86WriteMmio32Be(base, offset, (CARD32)(val))
-#   define MMIO_ONB16(base, offset, val) \
-    xf86WriteMmioNB16Be(base, offset, (CARD16)(val))
-#   define MMIO_ONB32(base, offset, val) \
-    xf86WriteMmioNB32Be(base, offset, (CARD32)(val))
-#  else /* byteswapping is the default */
-#   define MMIO_IN16(base, offset) xf86ReadMmio16Le(base, offset)
-#   define MMIO_IN32(base, offset) xf86ReadMmio32Le(base, offset)
-#   define MMIO_OUT16(base, offset, val) \
-     xf86WriteMmio16Le(base, offset, (CARD16)(val))
-#   define MMIO_OUT32(base, offset, val) \
-     xf86WriteMmio32Le(base, offset, (CARD32)(val))
-#   define MMIO_ONB16(base, offset, val) \
-     xf86WriteMmioNB16Le(base, offset, (CARD16)(val))
-#   define MMIO_ONB32(base, offset, val) \
-     xf86WriteMmioNB32Le(base, offset, (CARD32)(val))
-#  endif
-
-#  define MMIO_MOVE32(base, offset, val) \
-       xf86WriteMmio32Be(base, offset, (CARD32)(val))
-
-# elif defined(__sparc__) || defined(sparc) || defined(__sparc)
- /*
-  * Like powerpc, we provide byteswapping and no byteswapping functions
-  * here with byteswapping as default, drivers that don't need byteswapping
-  * should define SPARC_MMIO_IS_BE (perhaps create a generic macro so that we
-  * do not need to use PPC_MMIO_IS_BE and the sparc one in all the same places
-  * of drivers?).
-  */
-#  define MMIO_IN8(base, offset) xf86ReadMmio8(base, offset)
-#  define MMIO_OUT8(base, offset, val) \
-    xf86WriteMmio8(base, offset, (CARD8)(val))
-#  define MMIO_ONB8(base, offset, val) \
-    xf86WriteMmio8NB(base, offset, (CARD8)(val))
-
-#  if defined(SPARC_MMIO_IS_BE) /* No byteswapping */
-#   define MMIO_IN16(base, offset) xf86ReadMmio16Be(base, offset)
-#   define MMIO_IN32(base, offset) xf86ReadMmio32Be(base, offset)
-#   define MMIO_OUT16(base, offset, val) \
-     xf86WriteMmio16Be(base, offset, (CARD16)(val))
-#   define MMIO_OUT32(base, offset, val) \
-     xf86WriteMmio32Be(base, offset, (CARD32)(val))
-#   define MMIO_ONB16(base, offset, val) \
-     xf86WriteMmio16BeNB(base, offset, (CARD16)(val))
-#   define MMIO_ONB32(base, offset, val) \
-     xf86WriteMmio32BeNB(base, offset, (CARD32)(val))
-#  else /* byteswapping is the default */
-#   define MMIO_IN16(base, offset) xf86ReadMmio16Le(base, offset)
-#   define MMIO_IN32(base, offset) xf86ReadMmio32Le(base, offset)
-#   define MMIO_OUT16(base, offset, val) \
-     xf86WriteMmio16Le(base, offset, (CARD16)(val))
-#   define MMIO_OUT32(base, offset, val) \
-     xf86WriteMmio32Le(base, offset, (CARD32)(val))
-#   define MMIO_ONB16(base, offset, val) \
-     xf86WriteMmio16LeNB(base, offset, (CARD16)(val))
-#   define MMIO_ONB32(base, offset, val) \
-     xf86WriteMmio32LeNB(base, offset, (CARD32)(val))
-#  endif
-
-#  define MMIO_MOVE32(base, offset, val) \
-       xf86WriteMmio32Be(base, offset, (CARD32)(val))
-
-# else /* !__alpha__ && !__powerpc__ && !__sparc__ */
-
-#  define MMIO_IN8(base, offset) \
-	*(volatile CARD8 *)(((CARD8*)(base)) + (offset))
-#  define MMIO_IN16(base, offset) \
-	*(volatile CARD16 *)(void *)(((CARD8*)(base)) + (offset))
-#  define MMIO_IN32(base, offset) \
-	*(volatile CARD32 *)(void *)(((CARD8*)(base)) + (offset))
-#  define MMIO_OUT8(base, offset, val) \
-	*(volatile CARD8 *)(((CARD8*)(base)) + (offset)) = (val)
-#  define MMIO_OUT16(base, offset, val) \
-	*(volatile CARD16 *)(void *)(((CARD8*)(base)) + (offset)) = (val)
-#  define MMIO_OUT32(base, offset, val) \
-	*(volatile CARD32 *)(void *)(((CARD8*)(base)) + (offset)) = (val)
-#  define MMIO_ONB8(base, offset, val) MMIO_OUT8(base, offset, val) 
-#  define MMIO_ONB16(base, offset, val) MMIO_OUT16(base, offset, val) 
-#  define MMIO_ONB32(base, offset, val) MMIO_OUT32(base, offset, val) 
-
-#  define MMIO_MOVE32(base, offset, val) MMIO_OUT32(base, offset, val)
-
-# endif /* __alpha__ */
-
-/*
- * With Intel, the version in os-support/misc/SlowBcopy.s is used.
- * This avoids port I/O during the copy (which causes problems with
- * some hardware).
- */
-# ifdef __alpha__
-#  define slowbcopy_tobus(src,dst,count) xf86SlowBCopyToBus(src,dst,count)
-#  define slowbcopy_frombus(src,dst,count) xf86SlowBCopyFromBus(src,dst,count)
-# else /* __alpha__ */
-#  define slowbcopy_tobus(src,dst,count) xf86SlowBcopy(src,dst,count)
-#  define slowbcopy_frombus(src,dst,count) xf86SlowBcopy(src,dst,count)
-# endif /* __alpha__ */
-
-#endif /* _COMPILER_H */
+/*

+ * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.

+ *

+ * 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, and that the name of Thomas Roell not be used in

+ * advertising or publicity pertaining to distribution of the software without

+ * specific, written prior permission.  Thomas Roell makes no representations

+ * about the suitability of this software for any purpose.  It is provided

+ * "as is" without express or implied warranty.

+ *

+ * THOMAS ROELL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,

+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO

+ * EVENT SHALL THOMAS ROELL BE LIABLE FOR ANY SPECIAL, INDIRECT OR

+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,

+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER

+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR

+ * PERFORMANCE OF THIS SOFTWARE.

+ *

+ */

+/*

+ * Copyright (c) 1994-2003 by The XFree86 Project, Inc.

+ *

+ * 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 COPYRIGHT HOLDER(S) OR AUTHOR(S) 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 copyright holder(s)

+ * and 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 the copyright holder(s) and author(s).

+ */

+

+#ifndef _COMPILER_H

+

+# define _COMPILER_H

+

+#if defined(__SUNPRO_C)

+# define DO_PROTOTYPES

+#endif

+

+#ifndef _X_EXPORT

+# include <X11/Xfuncproto.h>

+#endif

+

+# include <pixman.h> /* for uint*_t types */

+

+/* Allow drivers to use the GCC-supported __inline__ and/or __inline. */

+# ifndef __inline__

+#  if defined(__GNUC__)

+    /* gcc has __inline__ */

+#  elif defined(__HIGHC__)

+#   define __inline__ _Inline

+#  else

+#   define __inline__ /**/

+#  endif

+# endif /* __inline__ */

+# ifndef __inline

+#  if defined(__GNUC__) || defined(_MSC_VER)

+    /* gcc has __inline */

+#  elif defined(__HIGHC__)

+#   define __inline _Inline

+#  else

+#   define __inline /**/

+#  endif

+# endif /* __inline */

+

+/* Support gcc's __FUNCTION__ for people using other compilers */

+#if !defined(__GNUC__) && !defined(__FUNCTION__)

+# define __FUNCTION__ __func__ /* C99 */

+#endif

+

+# if defined(NO_INLINE) || defined(DO_PROTOTYPES)

+

+#  if !defined(__arm__)

+#   if !defined(__sparc__) && !defined(__sparc) && !defined(__arm32__) \

+      && !(defined(__alpha__) && defined(linux)) \

+      && !(defined(__ia64__) && defined(linux)) \

+

+extern _X_EXPORT void outb(unsigned short, unsigned char);

+extern _X_EXPORT void outw(unsigned short, unsigned short);

+extern _X_EXPORT void outl(unsigned short, unsigned int);

+extern _X_EXPORT unsigned int inb(unsigned short);

+extern _X_EXPORT unsigned int inw(unsigned short);

+extern _X_EXPORT unsigned int inl(unsigned short);

+

+#   else /* __sparc__,  __arm32__, __alpha__*/

+

+extern _X_EXPORT void outb(unsigned long, unsigned char);

+extern _X_EXPORT void outw(unsigned long, unsigned short);

+extern _X_EXPORT void outl(unsigned long, unsigned int);

+extern _X_EXPORT unsigned int inb(unsigned long);

+extern _X_EXPORT unsigned int inw(unsigned long);

+extern _X_EXPORT unsigned int inl(unsigned long);

+

+#   endif /* __sparc__,  __arm32__, __alpha__ */

+#  endif /* __arm__ */

+

+#  if defined(__powerpc__) && !defined(__OpenBSD__)

+extern unsigned long ldq_u(unsigned long *);

+extern unsigned long ldl_u(unsigned int *);

+extern unsigned long ldw_u(unsigned short *);

+extern void stq_u(unsigned long, unsigned long *);

+extern void stl_u(unsigned long, unsigned int *);

+extern void stw_u(unsigned long, unsigned short *);

+extern void mem_barrier(void);

+extern void write_mem_barrier(void);

+extern void stl_brx(unsigned long, volatile unsigned char *, int);

+extern void stw_brx(unsigned short, volatile unsigned char *, int);

+extern unsigned long ldl_brx(volatile unsigned char *, int);

+extern unsigned short ldw_brx(volatile unsigned char *, int);

+#  endif /* __powerpc__ && !__OpenBSD */

+

+# endif /* NO_INLINE || DO_PROTOTYPES */

+

+# ifndef NO_INLINE

+#  ifdef __GNUC__

+#   ifdef __i386__

+

+#    ifdef __SSE__

+#     define write_mem_barrier() __asm__ __volatile__ ("sfence" : : : "memory")

+#    else

+#     define write_mem_barrier() __asm__ __volatile__ ("lock; addl $0,0(%%esp)" : : : "memory")

+#    endif

+

+#    ifdef __SSE2__

+#     define mem_barrier() __asm__ __volatile__ ("mfence" : : : "memory")

+#    else

+#     define mem_barrier() __asm__ __volatile__ ("lock; addl $0,0(%%esp)" : : : "memory")

+#    endif

+

+#   elif defined __alpha__

+

+#    define mem_barrier() __asm__ __volatile__ ("mb" : : : "memory")

+#    define write_mem_barrier() __asm__ __volatile__ ("wmb" : : : "memory")

+

+#   elif defined __amd64__

+

+#    define mem_barrier() __asm__ __volatile__ ("mfence" : : : "memory")

+#    define write_mem_barrier() __asm__ __volatile__ ("sfence" : : : "memory")

+

+#   elif defined __ia64__

+

+#    ifndef __INTEL_COMPILER

+#     define mem_barrier()        __asm__ __volatile__ ("mf" : : : "memory")

+#     define write_mem_barrier()  __asm__ __volatile__ ("mf" : : : "memory")

+#    else

+#     include "ia64intrin.h"

+#     define mem_barrier() __mf()

+#     define write_mem_barrier() __mf()

+#    endif

+

+#   elif defined __mips__

+     /* Note: sync instruction requires MIPS II instruction set */

+#    define mem_barrier()		\

+	__asm__ __volatile__(		\

+		".set   push\n\t"	\

+		".set   noreorder\n\t"	\

+		".set   mips2\n\t"	\

+		"sync\n\t"		\

+		".set   pop"		\

+		: /* no output */	\

+		: /* no input */	\

+		: "memory")

+#    define write_mem_barrier() mem_barrier()

+

+#   elif defined __powerpc__

+

+#    if defined(linux) && defined(__powerpc64__)

+#     include <linux/version.h>

+#     if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0)

+#      include <asm/memory.h>

+#     endif

+#    endif /* defined(linux) && defined(__powerpc64__) */

+

+#    ifndef eieio /* We deal with arch-specific eieio() routines above... */

+#     define eieio() __asm__ __volatile__ ("eieio" ::: "memory")

+#    endif /* eieio */

+#    define mem_barrier()	eieio()

+#    define write_mem_barrier()	eieio()

+

+#   elif defined __sparc__

+

+#    define barrier() __asm__ __volatile__ (".word 0x8143e00a" : : : "memory")

+#    define mem_barrier()         /* XXX: nop for now */

+#    define write_mem_barrier()   /* XXX: nop for now */

+#   endif

+#  endif /* __GNUC__ */

+# endif /* NO_INLINE */

+

+# ifndef mem_barrier

+#  define mem_barrier() /* NOP */

+# endif

+

+# ifndef write_mem_barrier

+#  define write_mem_barrier() /* NOP */

+# endif

+

+

+# ifndef NO_INLINE

+#  ifdef __GNUC__

+

+/* Define some packed structures to use with unaligned accesses */

+

+struct __una_u64 { uint64_t x __attribute__((packed)); };

+struct __una_u32 { uint32_t x __attribute__((packed)); };

+struct __una_u16 { uint16_t x __attribute__((packed)); };

+

+/* Elemental unaligned loads */

+

+static __inline__ uint64_t ldq_u(uint64_t *p)

+{

+	const struct __una_u64 *ptr = (const struct __una_u64 *) p;

+	return ptr->x;

+}

+

+static __inline__ uint32_t ldl_u(uint32_t *p)

+{

+	const struct __una_u32 *ptr = (const struct __una_u32 *) p;

+	return ptr->x;

+}

+

+static __inline__ uint16_t ldw_u(uint16_t *p)

+{

+	const struct __una_u16 *ptr = (const struct __una_u16 *) p;

+	return ptr->x;

+}

+

+/* Elemental unaligned stores */

+

+static __inline__ void stq_u(uint64_t val, uint64_t *p)

+{

+	struct __una_u64 *ptr = (struct __una_u64 *) p;

+	ptr->x = val;

+}

+

+static __inline__ void stl_u(uint32_t val, uint32_t *p)

+{

+	struct __una_u32 *ptr = (struct __una_u32 *) p;

+	ptr->x = val;

+}

+

+static __inline__ void stw_u(uint16_t val, uint16_t *p)

+{

+	struct __una_u16 *ptr = (struct __una_u16 *) p;

+	ptr->x = val;

+}

+#  else /* !__GNUC__ */

+

+#include <string.h> /* needed for memmove */

+

+static __inline__ uint64_t ldq_u(uint64_t *p)

+{

+	uint64_t ret;

+	memmove(&ret, p, sizeof(*p));

+	return ret;

+}

+

+static __inline__ uint32_t ldl_u(uint32_t *p)

+{

+	uint32_t ret;

+	memmove(&ret, p, sizeof(*p));

+	return ret;

+}

+

+static __inline__ uint16_t ldw_u(uint16_t *p)

+{

+	uint16_t ret;

+	memmove(&ret, p, sizeof(*p));

+	return ret;

+}

+

+static __inline__ void stq_u(uint64_t val, uint64_t *p)

+{

+	uint64_t tmp = val;

+	memmove(p, &tmp, sizeof(*p));

+}

+

+static __inline__ void stl_u(uint32_t val, uint32_t *p)

+{

+	uint32_t tmp = val;

+	memmove(p, &tmp, sizeof(*p));

+}

+

+static __inline__ void stw_u(uint16_t val, uint16_t *p)

+{

+	uint16_t tmp = val;

+	memmove(p, &tmp, sizeof(*p));

+}

+

+#  endif /* __GNUC__ */

+# endif /* NO_INLINE */

+

+# ifndef NO_INLINE

+#  ifdef __GNUC__

+#   if (defined(linux) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)) && (defined(__alpha__))

+

+#    ifdef linux

+/* for Linux on Alpha, we use the LIBC _inx/_outx routines */

+/* note that the appropriate setup via "ioperm" needs to be done */

+/*  *before* any inx/outx is done. */

+

+extern _X_EXPORT void (*_alpha_outb)(char val, unsigned long port);

+static __inline__ void

+outb(unsigned long port, unsigned char val)

+{

+    _alpha_outb(val, port);

+}

+

+extern _X_EXPORT void (*_alpha_outw)(short val, unsigned long port);

+static __inline__ void

+outw(unsigned long port, unsigned short val)

+{

+    _alpha_outw(val, port);

+}

+

+extern _X_EXPORT void (*_alpha_outl)(int val, unsigned long port);

+static __inline__ void

+outl(unsigned long port, unsigned int val)

+{

+    _alpha_outl(val, port);

+}

+

+extern _X_EXPORT unsigned int (*_alpha_inb)(unsigned long port);

+static __inline__ unsigned int

+inb(unsigned long port)

+{

+  return _alpha_inb(port);

+}

+

+extern _X_EXPORT unsigned int (*_alpha_inw)(unsigned long port);

+static __inline__ unsigned int

+inw(unsigned long port)

+{

+  return _alpha_inw(port);

+}

+

+extern _X_EXPORT unsigned int (*_alpha_inl)(unsigned long port);

+static __inline__ unsigned int

+inl(unsigned long port)

+{

+  return _alpha_inl(port);

+}

+

+#    endif /* linux */

+

+#    if (defined(__FreeBSD__) || defined(__OpenBSD__)) \

+      && !defined(DO_PROTOTYPES)

+

+/* for FreeBSD and OpenBSD on Alpha, we use the libio (resp. libalpha) */

+/*  inx/outx routines */

+/* note that the appropriate setup via "ioperm" needs to be done */

+/*  *before* any inx/outx is done. */

+

+extern _X_EXPORT void outb(unsigned int port, unsigned char val);

+extern _X_EXPORT void outw(unsigned int port, unsigned short val);

+extern _X_EXPORT void outl(unsigned int port, unsigned int val);

+extern _X_EXPORT unsigned char inb(unsigned int port);

+extern _X_EXPORT unsigned short inw(unsigned int port);

+extern _X_EXPORT unsigned int inl(unsigned int port);

+

+#    endif /* (__FreeBSD__ || __OpenBSD__ ) && !DO_PROTOTYPES */

+

+

+#if defined(__NetBSD__)

+#include <machine/pio.h>

+#endif /* __NetBSD__ */

+

+#   elif defined(linux) && defined(__ia64__) 

+ 

+#    include <inttypes.h>

+

+#    include <sys/io.h>

+

+#    undef outb

+#    undef outw

+#    undef outl

+#    undef inb

+#    undef inw

+#    undef inl

+extern _X_EXPORT void outb(unsigned long port, unsigned char val);

+extern _X_EXPORT void outw(unsigned long port, unsigned short val);

+extern _X_EXPORT void outl(unsigned long port, unsigned int val);

+extern _X_EXPORT unsigned int inb(unsigned long port);

+extern _X_EXPORT unsigned int inw(unsigned long port);

+extern _X_EXPORT unsigned int inl(unsigned long port);

+ 

+#   elif (defined(linux) || defined(__FreeBSD__)) && defined(__amd64__)

+ 

+#    include <inttypes.h>

+

+static __inline__ void

+outb(unsigned short port, unsigned char val)

+{

+   __asm__ __volatile__("outb %0,%1" : :"a" (val), "d" (port));

+}

+

+

+static __inline__ void

+outw(unsigned short port, unsigned short val)

+{

+   __asm__ __volatile__("outw %0,%1" : :"a" (val), "d" (port));

+}

+

+static __inline__ void

+outl(unsigned short port, unsigned int val)

+{

+   __asm__ __volatile__("outl %0,%1" : :"a" (val), "d" (port));

+}

+

+static __inline__ unsigned int

+inb(unsigned short port)

+{

+   unsigned char ret;

+   __asm__ __volatile__("inb %1,%0" :

+       "=a" (ret) :

+       "d" (port));

+   return ret;

+}

+

+static __inline__ unsigned int

+inw(unsigned short port)

+{

+   unsigned short ret;

+   __asm__ __volatile__("inw %1,%0" :

+       "=a" (ret) :

+       "d" (port));

+   return ret;

+}

+

+static __inline__ unsigned int

+inl(unsigned short port)

+{

+   unsigned int ret;

+   __asm__ __volatile__("inl %1,%0" :

+       "=a" (ret) :

+       "d" (port));

+   return ret;

+}

+

+#   elif (defined(linux) || defined(sun) || defined(__OpenBSD__) || defined(__FreeBSD__)) && defined(__sparc__)

+

+#     ifndef ASI_PL

+#      define ASI_PL 0x88

+#     endif

+

+static __inline__ void

+outb(unsigned long port, unsigned char val)

+{

+	__asm__ __volatile__("stba %0, [%1] %2"

+			     : /* No outputs */

+			     : "r" (val), "r" (port), "i" (ASI_PL));

+	barrier();

+}

+

+static __inline__ void

+outw(unsigned long port, unsigned short val)

+{

+	__asm__ __volatile__("stha %0, [%1] %2"

+			     : /* No outputs */

+			     : "r" (val), "r" (port), "i" (ASI_PL));

+	barrier();

+}

+

+static __inline__ void

+outl(unsigned long port, unsigned int val)

+{

+	__asm__ __volatile__("sta %0, [%1] %2"

+			     : /* No outputs */

+			     : "r" (val), "r" (port), "i" (ASI_PL));

+	barrier();

+}

+

+static __inline__ unsigned int

+inb(unsigned long port)

+{

+	unsigned int ret;

+	__asm__ __volatile__("lduba [%1] %2, %0"

+			     : "=r" (ret)

+			     : "r" (port), "i" (ASI_PL));

+	return ret;

+}

+

+static __inline__ unsigned int

+inw(unsigned long port)

+{

+	unsigned int ret;

+	__asm__ __volatile__("lduha [%1] %2, %0"

+			     : "=r" (ret)

+			     : "r" (port), "i" (ASI_PL));

+	return ret;

+}

+

+static __inline__ unsigned int

+inl(unsigned long port)

+{

+	unsigned int ret;

+	__asm__ __volatile__("lda [%1] %2, %0"

+			     : "=r" (ret)

+			     : "r" (port), "i" (ASI_PL));

+	return ret;

+}

+

+static __inline__ unsigned char

+xf86ReadMmio8(__volatile__ void *base, const unsigned long offset)

+{

+	unsigned long addr = ((unsigned long)base) + offset;

+	unsigned char ret;

+

+	__asm__ __volatile__("lduba [%1] %2, %0"

+			     : "=r" (ret)

+			     : "r" (addr), "i" (ASI_PL));

+	return ret;

+}

+

+static __inline__ unsigned short

+xf86ReadMmio16Be(__volatile__ void *base, const unsigned long offset)

+{

+	unsigned long addr = ((unsigned long)base) + offset;

+	unsigned short ret;

+

+	__asm__ __volatile__("lduh [%1], %0"

+			     : "=r" (ret)

+			     : "r" (addr));

+	return ret;

+}

+

+static __inline__ unsigned short

+xf86ReadMmio16Le(__volatile__ void *base, const unsigned long offset)

+{

+	unsigned long addr = ((unsigned long)base) + offset;

+	unsigned short ret;

+

+	__asm__ __volatile__("lduha [%1] %2, %0"

+			     : "=r" (ret)

+			     : "r" (addr), "i" (ASI_PL));

+	return ret;

+}

+

+static __inline__ unsigned int

+xf86ReadMmio32Be(__volatile__ void *base, const unsigned long offset)

+{

+	unsigned long addr = ((unsigned long)base) + offset;

+	unsigned int ret;

+

+	__asm__ __volatile__("ld [%1], %0"

+			     : "=r" (ret)

+			     : "r" (addr));

+	return ret;

+}

+

+static __inline__ unsigned int

+xf86ReadMmio32Le(__volatile__ void *base, const unsigned long offset)

+{

+	unsigned long addr = ((unsigned long)base) + offset;

+	unsigned int ret;

+

+	__asm__ __volatile__("lda [%1] %2, %0"

+			     : "=r" (ret)

+			     : "r" (addr), "i" (ASI_PL));

+	return ret;

+}

+

+static __inline__ void

+xf86WriteMmio8(__volatile__ void *base, const unsigned long offset,

+	       const unsigned int val)

+{

+	unsigned long addr = ((unsigned long)base) + offset;

+

+	__asm__ __volatile__("stba %0, [%1] %2"

+			     : /* No outputs */

+			     : "r" (val), "r" (addr), "i" (ASI_PL));

+	barrier();

+}

+

+static __inline__ void

+xf86WriteMmio16Be(__volatile__ void *base, const unsigned long offset,

+		  const unsigned int val)

+{

+	unsigned long addr = ((unsigned long)base) + offset;

+

+	__asm__ __volatile__("sth %0, [%1]"

+			     : /* No outputs */

+			     : "r" (val), "r" (addr));

+	barrier();

+}

+

+static __inline__ void

+xf86WriteMmio16Le(__volatile__ void *base, const unsigned long offset,

+		  const unsigned int val)

+{

+	unsigned long addr = ((unsigned long)base) + offset;

+

+	__asm__ __volatile__("stha %0, [%1] %2"

+			     : /* No outputs */

+			     : "r" (val), "r" (addr), "i" (ASI_PL));

+	barrier();

+}

+

+static __inline__ void

+xf86WriteMmio32Be(__volatile__ void *base, const unsigned long offset,

+		  const unsigned int val)

+{

+	unsigned long addr = ((unsigned long)base) + offset;

+

+	__asm__ __volatile__("st %0, [%1]"

+			     : /* No outputs */

+			     : "r" (val), "r" (addr));

+	barrier();

+}

+

+static __inline__ void

+xf86WriteMmio32Le(__volatile__ void *base, const unsigned long offset,

+		  const unsigned int val)

+{

+	unsigned long addr = ((unsigned long)base) + offset;

+

+	__asm__ __volatile__("sta %0, [%1] %2"

+			     : /* No outputs */

+			     : "r" (val), "r" (addr), "i" (ASI_PL));

+	barrier();

+}

+

+static __inline__ void

+xf86WriteMmio8NB(__volatile__ void *base, const unsigned long offset,

+		 const unsigned int val)

+{

+	unsigned long addr = ((unsigned long)base) + offset;

+

+	__asm__ __volatile__("stba %0, [%1] %2"

+			     : /* No outputs */

+			     : "r" (val), "r" (addr), "i" (ASI_PL));

+}

+

+static __inline__ void

+xf86WriteMmio16BeNB(__volatile__ void *base, const unsigned long offset,

+		    const unsigned int val)

+{

+	unsigned long addr = ((unsigned long)base) + offset;

+

+	__asm__ __volatile__("sth %0, [%1]"

+			     : /* No outputs */

+			     : "r" (val), "r" (addr));

+}

+

+static __inline__ void

+xf86WriteMmio16LeNB(__volatile__ void *base, const unsigned long offset,

+		    const unsigned int val)

+{

+	unsigned long addr = ((unsigned long)base) + offset;

+

+	__asm__ __volatile__("stha %0, [%1] %2"

+			     : /* No outputs */

+			     : "r" (val), "r" (addr), "i" (ASI_PL));

+}

+

+static __inline__ void

+xf86WriteMmio32BeNB(__volatile__ void *base, const unsigned long offset,

+		    const unsigned int val)

+{

+	unsigned long addr = ((unsigned long)base) + offset;

+

+	__asm__ __volatile__("st %0, [%1]"

+			     : /* No outputs */

+			     : "r" (val), "r" (addr));

+}

+

+static __inline__ void

+xf86WriteMmio32LeNB(__volatile__ void *base, const unsigned long offset,

+		    const unsigned int val)

+{

+	unsigned long addr = ((unsigned long)base) + offset;

+

+	__asm__ __volatile__("sta %0, [%1] %2"

+			     : /* No outputs */

+			     : "r" (val), "r" (addr), "i" (ASI_PL));

+}

+

+#   elif defined(__mips__) || (defined(__arm32__) && !defined(__linux__))

+#    ifdef __arm32__

+#     define PORT_SIZE long

+#    else

+#     define PORT_SIZE short

+#    endif

+

+_X_EXPORT unsigned int IOPortBase;  /* Memory mapped I/O port area */

+

+static __inline__ void

+outb(unsigned PORT_SIZE port, unsigned char val)

+{

+	*(volatile unsigned char*)(((unsigned PORT_SIZE)(port))+IOPortBase) = val;

+}

+

+static __inline__ void

+outw(unsigned PORT_SIZE port, unsigned short val)

+{

+	*(volatile unsigned short*)(((unsigned PORT_SIZE)(port))+IOPortBase) = val;

+}

+

+static __inline__ void

+outl(unsigned PORT_SIZE port, unsigned int val)

+{

+	*(volatile unsigned int*)(((unsigned PORT_SIZE)(port))+IOPortBase) = val;

+}

+

+static __inline__ unsigned int

+inb(unsigned PORT_SIZE port)

+{

+	return *(volatile unsigned char*)(((unsigned PORT_SIZE)(port))+IOPortBase);

+}

+

+static __inline__ unsigned int

+inw(unsigned PORT_SIZE port)

+{

+	return *(volatile unsigned short*)(((unsigned PORT_SIZE)(port))+IOPortBase);

+}

+

+static __inline__ unsigned int

+inl(unsigned PORT_SIZE port)

+{

+	return *(volatile unsigned int*)(((unsigned PORT_SIZE)(port))+IOPortBase);

+}

+

+

+#    if defined(__mips__)

+#     ifdef linux	/* don't mess with other OSs */

+#       if X_BYTE_ORDER == X_BIG_ENDIAN

+static __inline__ unsigned int

+xf86ReadMmio32Be(__volatile__ void *base, const unsigned long offset)

+{

+	unsigned long addr = ((unsigned long)base) + offset;

+	unsigned int ret;

+

+	__asm__ __volatile__("lw %0, 0(%1)"

+			     : "=r" (ret)

+			     : "r" (addr));

+	return ret;

+}

+

+static __inline__ void

+xf86WriteMmio32Be(__volatile__ void *base, const unsigned long offset,

+		  const unsigned int val)

+{

+	unsigned long addr = ((unsigned long)base) + offset;

+

+	__asm__ __volatile__("sw %0, 0(%1)"

+			     : /* No outputs */

+			     : "r" (val), "r" (addr));

+}

+#      endif

+#     endif /* !linux */

+#    endif /* __mips__ */

+

+#   elif (defined(linux) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__)) && defined(__powerpc__)

+

+#    ifndef MAP_FAILED

+#     define MAP_FAILED ((void *)-1)

+#    endif

+

+extern _X_EXPORT volatile unsigned char *ioBase;

+

+static __inline__ unsigned char

+xf86ReadMmio8(__volatile__ void *base, const unsigned long offset)

+{

+        register unsigned char val;

+        __asm__ __volatile__(

+                        "lbzx %0,%1,%2\n\t"

+                        "eieio"

+                        : "=r" (val)

+                        : "b" (base), "r" (offset),

+                        "m" (*((volatile unsigned char *)base+offset)));

+        return val;

+}

+

+static __inline__ unsigned short

+xf86ReadMmio16Be(__volatile__ void *base, const unsigned long offset)

+{

+        register unsigned short val;

+        __asm__ __volatile__(

+                        "lhzx %0,%1,%2\n\t"

+                        "eieio"

+                        : "=r" (val)

+                        : "b" (base), "r" (offset),

+                        "m" (*((volatile unsigned char *)base+offset)));

+        return val;

+}

+

+static __inline__ unsigned short

+xf86ReadMmio16Le(__volatile__ void *base, const unsigned long offset)

+{

+        register unsigned short val;

+        __asm__ __volatile__(

+                        "lhbrx %0,%1,%2\n\t"

+                        "eieio"

+                        : "=r" (val)

+                        : "b" (base), "r" (offset),

+                        "m" (*((volatile unsigned char *)base+offset)));

+        return val;

+}

+

+static __inline__ unsigned int

+xf86ReadMmio32Be(__volatile__ void *base, const unsigned long offset)

+{

+        register unsigned int val;

+        __asm__ __volatile__(

+                        "lwzx %0,%1,%2\n\t"

+                        "eieio"

+                        : "=r" (val)

+                        : "b" (base), "r" (offset),

+                        "m" (*((volatile unsigned char *)base+offset)));

+        return val;

+}

+

+static __inline__ unsigned int

+xf86ReadMmio32Le(__volatile__ void *base, const unsigned long offset)

+{

+        register unsigned int val;

+        __asm__ __volatile__(

+                        "lwbrx %0,%1,%2\n\t"

+                        "eieio"

+                        : "=r" (val)

+                        : "b" (base), "r" (offset),

+                        "m" (*((volatile unsigned char *)base+offset)));

+        return val;

+}

+

+static __inline__ void

+xf86WriteMmioNB8(__volatile__ void *base, const unsigned long offset,

+		 const unsigned char val)

+{

+        __asm__ __volatile__(

+                        "stbx %1,%2,%3\n\t"

+                        : "=m" (*((volatile unsigned char *)base+offset))

+                        : "r" (val), "b" (base), "r" (offset));

+}

+

+static __inline__ void

+xf86WriteMmioNB16Le(__volatile__ void *base, const unsigned long offset,

+		    const unsigned short val)

+{

+        __asm__ __volatile__(

+                        "sthbrx %1,%2,%3\n\t"

+                        : "=m" (*((volatile unsigned char *)base+offset))

+                        : "r" (val), "b" (base), "r" (offset));

+}

+

+static __inline__ void

+xf86WriteMmioNB16Be(__volatile__ void *base, const unsigned long offset,

+		    const unsigned short val)

+{

+        __asm__ __volatile__(

+                        "sthx %1,%2,%3\n\t"

+                        : "=m" (*((volatile unsigned char *)base+offset))

+                        : "r" (val), "b" (base), "r" (offset));

+}

+

+static __inline__ void

+xf86WriteMmioNB32Le(__volatile__ void *base, const unsigned long offset,

+		    const unsigned int val)

+{

+        __asm__ __volatile__(

+                        "stwbrx %1,%2,%3\n\t"

+                        : "=m" (*((volatile unsigned char *)base+offset))

+                        : "r" (val), "b" (base), "r" (offset));

+}

+

+static __inline__ void

+xf86WriteMmioNB32Be(__volatile__ void *base, const unsigned long offset,

+		    const unsigned int val)

+{

+        __asm__ __volatile__(

+                        "stwx %1,%2,%3\n\t"

+                        : "=m" (*((volatile unsigned char *)base+offset))

+                        : "r" (val), "b" (base), "r" (offset));

+}

+

+static __inline__ void

+xf86WriteMmio8(__volatile__ void *base, const unsigned long offset,

+               const unsigned char val)

+{

+        xf86WriteMmioNB8(base, offset, val);

+        eieio();

+}

+

+static __inline__ void

+xf86WriteMmio16Le(__volatile__ void *base, const unsigned long offset,

+                  const unsigned short val)

+{

+        xf86WriteMmioNB16Le(base, offset, val);

+        eieio();

+}

+

+static __inline__ void

+xf86WriteMmio16Be(__volatile__ void *base, const unsigned long offset,

+                  const unsigned short val)

+{

+        xf86WriteMmioNB16Be(base, offset, val);

+        eieio();

+}

+

+static __inline__ void

+xf86WriteMmio32Le(__volatile__ void *base, const unsigned long offset,

+                  const unsigned int val)

+{

+        xf86WriteMmioNB32Le(base, offset, val);

+        eieio();

+}

+

+static __inline__ void

+xf86WriteMmio32Be(__volatile__ void *base, const unsigned long offset,

+                  const unsigned int val)

+{

+        xf86WriteMmioNB32Be(base, offset, val);

+        eieio();

+}

+

+

+static __inline__ void

+outb(unsigned short port, unsigned char value)

+{

+        if(ioBase == MAP_FAILED) return;

+        xf86WriteMmio8((void *)ioBase, port, value);

+}

+

+static __inline__ void

+outw(unsigned short port, unsigned short value)

+{

+        if(ioBase == MAP_FAILED) return;

+        xf86WriteMmio16Le((void *)ioBase, port, value);

+}

+

+static __inline__ void

+outl(unsigned short port, unsigned int value)

+{

+        if(ioBase == MAP_FAILED) return;

+        xf86WriteMmio32Le((void *)ioBase, port, value);

+}

+

+static __inline__ unsigned int

+inb(unsigned short port)

+{

+        if(ioBase == MAP_FAILED) return 0;

+        return xf86ReadMmio8((void *)ioBase, port);

+}

+

+static __inline__ unsigned int

+inw(unsigned short port)

+{

+        if(ioBase == MAP_FAILED) return 0;

+        return xf86ReadMmio16Le((void *)ioBase, port);

+}

+

+static __inline__ unsigned int

+inl(unsigned short port)

+{

+        if(ioBase == MAP_FAILED) return 0;

+        return xf86ReadMmio32Le((void *)ioBase, port);

+}

+

+#elif defined(__arm__) && defined(__linux__)

+

+/* for Linux on ARM, we use the LIBC inx/outx routines */

+/* note that the appropriate setup via "ioperm" needs to be done */

+/*  *before* any inx/outx is done. */

+

+#include <sys/io.h>

+

+static __inline__ void

+xf_outb(unsigned short port, unsigned char val)

+{

+    outb(val, port);

+}

+

+static __inline__ void

+xf_outw(unsigned short port, unsigned short val)

+{

+    outw(val, port);

+}

+

+static __inline__ void

+xf_outl(unsigned short port, unsigned int val)

+{

+    outl(val, port);

+}

+

+#define outb xf_outb

+#define outw xf_outw

+#define outl xf_outl

+

+#   else /* ix86 */

+

+#    if !defined(__SUNPRO_C)

+#    if !defined(FAKEIT) && !defined(__mc68000__) && !defined(__arm__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__m32r__)

+#     ifdef GCCUSESGAS

+

+/*

+ * If gcc uses gas rather than the native assembler, the syntax of these

+ * inlines has to be different.		DHD

+ */

+

+static __inline__ void

+outb(unsigned short port, unsigned char val)

+{

+   __asm__ __volatile__("outb %0,%1" : :"a" (val), "d" (port));

+}

+

+

+static __inline__ void

+outw(unsigned short port, unsigned short val)

+{

+   __asm__ __volatile__("outw %0,%1" : :"a" (val), "d" (port));

+}

+

+static __inline__ void

+outl(unsigned short port, unsigned int val)

+{

+   __asm__ __volatile__("outl %0,%1" : :"a" (val), "d" (port));

+}

+

+static __inline__ unsigned int

+inb(unsigned short port)

+{

+   unsigned char ret;

+   __asm__ __volatile__("inb %1,%0" :

+       "=a" (ret) :

+       "d" (port));

+   return ret;

+}

+

+static __inline__ unsigned int

+inw(unsigned short port)

+{

+   unsigned short ret;

+   __asm__ __volatile__("inw %1,%0" :

+       "=a" (ret) :

+       "d" (port));

+   return ret;

+}

+

+static __inline__ unsigned int

+inl(unsigned short port)

+{

+   unsigned int ret;

+   __asm__ __volatile__("inl %1,%0" :

+       "=a" (ret) :

+       "d" (port));

+   return ret;

+}

+

+#     else	/* GCCUSESGAS */

+

+static __inline__ void

+outb(unsigned short port, unsigned char val)

+{

+  __asm__ __volatile__("out%B0 (%1)" : :"a" (val), "d" (port));

+}

+

+static __inline__ void

+outw(unsigned short port, unsigned short val)

+{

+  __asm__ __volatile__("out%W0 (%1)" : :"a" (val), "d" (port));

+}

+

+static __inline__ void

+outl(unsigned short port, unsigned int val)

+{

+  __asm__ __volatile__("out%L0 (%1)" : :"a" (val), "d" (port));

+}

+

+static __inline__ unsigned int

+inb(unsigned short port)

+{

+  unsigned char ret;

+  __asm__ __volatile__("in%B0 (%1)" :

+		   "=a" (ret) :

+		   "d" (port));

+  return ret;

+}

+

+static __inline__ unsigned int

+inw(unsigned short port)

+{

+  unsigned short ret;

+  __asm__ __volatile__("in%W0 (%1)" :

+		   "=a" (ret) :

+		   "d" (port));

+  return ret;

+}

+

+static __inline__ unsigned int

+inl(unsigned short port)

+{

+  unsigned int ret;

+  __asm__ __volatile__("in%L0 (%1)" :

+                   "=a" (ret) :

+                   "d" (port));

+  return ret;

+}

+

+#     endif /* GCCUSESGAS */

+

+#    else /* !defined(FAKEIT) && !defined(__mc68000__)  && !defined(__arm__) && !defined(__sh__) && !defined(__hppa__) && !defined(__m32r__) */

+

+static __inline__ void

+outb(unsigned short port, unsigned char val)

+{

+}

+

+static __inline__ void

+outw(unsigned short port, unsigned short val)

+{

+}

+

+static __inline__ void

+outl(unsigned short port, unsigned int val)

+{

+}

+

+static __inline__ unsigned int

+inb(unsigned short port)

+{

+  return 0;

+}

+

+static __inline__ unsigned int

+inw(unsigned short port)

+{

+  return 0;

+}

+

+static __inline__ unsigned int

+inl(unsigned short port)

+{

+  return 0;

+}

+

+#    endif /* FAKEIT */

+#    endif /* __SUNPRO_C */

+

+#   endif /* ix86 */

+

+#  else /* !GNUC */

+#    if defined(__STDC__) && (__STDC__ == 1)

+#     ifndef asm

+#      define asm __asm

+#     endif

+#    endif

+#    ifndef SCO325

+#     if defined(__UNIXWARE__)

+#     /* avoid including <sys/types.h> for <sys/inline.h> on UnixWare */

+#      define ushort unsigned short

+#      define ushort_t unsigned short

+#      define ulong unsigned long

+#      define ulong_t unsigned long

+#      define uint_t unsigned int

+#      define uchar_t unsigned char

+#     endif /* __UNIXWARE__ */

+#     if !defined(__SUNPRO_C) && !defined(_MSC_VER)

+#      include <sys/inline.h>

+#     endif

+#    else

+#     include "scoasm.h"

+#    endif

+#    if (!defined(__HIGHC__) && !defined(__SUNPRO_C) && !defined(_MSC_VER)) || \

+	defined(__USLC__)

+#     pragma asm partial_optimization outl

+#     pragma asm partial_optimization outw

+#     pragma asm partial_optimization outb

+#     pragma asm partial_optimization inl

+#     pragma asm partial_optimization inw

+#     pragma asm partial_optimization inb

+#    endif

+#  endif /* __GNUC__ */

+

+# endif /* NO_INLINE */

+

+# ifdef __alpha__

+/* entry points for Mmio memory access routines */

+extern _X_EXPORT int (*xf86ReadMmio8)(void *, unsigned long);

+extern _X_EXPORT int (*xf86ReadMmio16)(void *, unsigned long);

+#  ifndef STANDALONE_MMIO

+extern _X_EXPORT int (*xf86ReadMmio32)(void *, unsigned long);

+#  else

+/* Some DRI 3D drivers need MMIO_IN32. */

+static __inline__ int

+xf86ReadMmio32(void *Base, unsigned long Offset)

+{

+	mem_barrier();

+	return *(volatile unsigned int*)((unsigned long)Base+(Offset));

+}

+#  endif

+extern _X_EXPORT void (*xf86WriteMmio8)(int, void *, unsigned long);

+extern _X_EXPORT void (*xf86WriteMmio16)(int, void *, unsigned long);

+extern _X_EXPORT void (*xf86WriteMmio32)(int, void *, unsigned long);

+extern _X_EXPORT void (*xf86WriteMmioNB8)(int, void *, unsigned long);

+extern _X_EXPORT void (*xf86WriteMmioNB16)(int, void *, unsigned long);

+extern _X_EXPORT void (*xf86WriteMmioNB32)(int, void *, unsigned long);

+extern _X_EXPORT void xf86SlowBCopyFromBus(unsigned char *, unsigned char *, int);

+extern _X_EXPORT void xf86SlowBCopyToBus(unsigned char *, unsigned char *, int);

+

+/* Some macros to hide the system dependencies for MMIO accesses */

+/* Changed to kill noise generated by gcc's -Wcast-align */

+#  define MMIO_IN8(base, offset) (*xf86ReadMmio8)(base, offset)

+#  define MMIO_IN16(base, offset) (*xf86ReadMmio16)(base, offset)

+#  ifndef STANDALONE_MMIO

+#   define MMIO_IN32(base, offset) (*xf86ReadMmio32)(base, offset)

+#  else

+#   define MMIO_IN32(base, offset) xf86ReadMmio32(base, offset)

+#  endif

+

+#  define MMIO_OUT32(base, offset, val) \

+    do { \

+	write_mem_barrier(); \

+	*(volatile CARD32 *)(void *)(((CARD8*)(base)) + (offset)) = (val); \

+    } while (0)

+#  define MMIO_ONB32(base, offset, val) \

+	*(volatile CARD32 *)(void *)(((CARD8*)(base)) + (offset)) = (val)

+

+#  define MMIO_OUT8(base, offset, val) \

+    (*xf86WriteMmio8)((CARD8)(val), base, offset)

+#  define MMIO_OUT16(base, offset, val) \

+    (*xf86WriteMmio16)((CARD16)(val), base, offset)

+#  define MMIO_ONB8(base, offset, val) \

+    (*xf86WriteMmioNB8)((CARD8)(val), base, offset)

+#  define MMIO_ONB16(base, offset, val) \

+    (*xf86WriteMmioNB16)((CARD16)(val), base, offset)

+#  define MMIO_MOVE32(base, offset, val) \

+    MMIO_OUT32(base, offset, val)

+

+# elif defined(__powerpc__)  

+ /* 

+  * we provide byteswapping and no byteswapping functions here

+  * with byteswapping as default, 

+  * drivers that don't need byteswapping should define PPC_MMIO_IS_BE 

+  */

+#  define MMIO_IN8(base, offset) xf86ReadMmio8(base, offset)

+#  define MMIO_OUT8(base, offset, val) \

+    xf86WriteMmio8(base, offset, (CARD8)(val))

+#  define MMIO_ONB8(base, offset, val) \

+    xf86WriteMmioNB8(base, offset, (CARD8)(val))

+

+#  if defined(PPC_MMIO_IS_BE) /* No byteswapping */

+#   define MMIO_IN16(base, offset) xf86ReadMmio16Be(base, offset)

+#   define MMIO_IN32(base, offset) xf86ReadMmio32Be(base, offset)

+#   define MMIO_OUT16(base, offset, val) \

+    xf86WriteMmio16Be(base, offset, (CARD16)(val))

+#   define MMIO_OUT32(base, offset, val) \

+    xf86WriteMmio32Be(base, offset, (CARD32)(val))

+#   define MMIO_ONB16(base, offset, val) \

+    xf86WriteMmioNB16Be(base, offset, (CARD16)(val))

+#   define MMIO_ONB32(base, offset, val) \

+    xf86WriteMmioNB32Be(base, offset, (CARD32)(val))

+#  else /* byteswapping is the default */

+#   define MMIO_IN16(base, offset) xf86ReadMmio16Le(base, offset)

+#   define MMIO_IN32(base, offset) xf86ReadMmio32Le(base, offset)

+#   define MMIO_OUT16(base, offset, val) \

+     xf86WriteMmio16Le(base, offset, (CARD16)(val))

+#   define MMIO_OUT32(base, offset, val) \

+     xf86WriteMmio32Le(base, offset, (CARD32)(val))

+#   define MMIO_ONB16(base, offset, val) \

+     xf86WriteMmioNB16Le(base, offset, (CARD16)(val))

+#   define MMIO_ONB32(base, offset, val) \

+     xf86WriteMmioNB32Le(base, offset, (CARD32)(val))

+#  endif

+

+#  define MMIO_MOVE32(base, offset, val) \

+       xf86WriteMmio32Be(base, offset, (CARD32)(val))

+

+# elif defined(__sparc__) || defined(sparc) || defined(__sparc)

+ /*

+  * Like powerpc, we provide byteswapping and no byteswapping functions

+  * here with byteswapping as default, drivers that don't need byteswapping

+  * should define SPARC_MMIO_IS_BE (perhaps create a generic macro so that we

+  * do not need to use PPC_MMIO_IS_BE and the sparc one in all the same places

+  * of drivers?).

+  */

+#  define MMIO_IN8(base, offset) xf86ReadMmio8(base, offset)

+#  define MMIO_OUT8(base, offset, val) \

+    xf86WriteMmio8(base, offset, (CARD8)(val))

+#  define MMIO_ONB8(base, offset, val) \

+    xf86WriteMmio8NB(base, offset, (CARD8)(val))

+

+#  if defined(SPARC_MMIO_IS_BE) /* No byteswapping */

+#   define MMIO_IN16(base, offset) xf86ReadMmio16Be(base, offset)

+#   define MMIO_IN32(base, offset) xf86ReadMmio32Be(base, offset)

+#   define MMIO_OUT16(base, offset, val) \

+     xf86WriteMmio16Be(base, offset, (CARD16)(val))

+#   define MMIO_OUT32(base, offset, val) \

+     xf86WriteMmio32Be(base, offset, (CARD32)(val))

+#   define MMIO_ONB16(base, offset, val) \

+     xf86WriteMmio16BeNB(base, offset, (CARD16)(val))

+#   define MMIO_ONB32(base, offset, val) \

+     xf86WriteMmio32BeNB(base, offset, (CARD32)(val))

+#  else /* byteswapping is the default */

+#   define MMIO_IN16(base, offset) xf86ReadMmio16Le(base, offset)

+#   define MMIO_IN32(base, offset) xf86ReadMmio32Le(base, offset)

+#   define MMIO_OUT16(base, offset, val) \

+     xf86WriteMmio16Le(base, offset, (CARD16)(val))

+#   define MMIO_OUT32(base, offset, val) \

+     xf86WriteMmio32Le(base, offset, (CARD32)(val))

+#   define MMIO_ONB16(base, offset, val) \

+     xf86WriteMmio16LeNB(base, offset, (CARD16)(val))

+#   define MMIO_ONB32(base, offset, val) \

+     xf86WriteMmio32LeNB(base, offset, (CARD32)(val))

+#  endif

+

+#  define MMIO_MOVE32(base, offset, val) \

+       xf86WriteMmio32Be(base, offset, (CARD32)(val))

+

+# else /* !__alpha__ && !__powerpc__ && !__sparc__ */

+

+#  define MMIO_IN8(base, offset) \

+	*(volatile CARD8 *)(((CARD8*)(base)) + (offset))

+#  define MMIO_IN16(base, offset) \

+	*(volatile CARD16 *)(void *)(((CARD8*)(base)) + (offset))

+#  define MMIO_IN32(base, offset) \

+	*(volatile CARD32 *)(void *)(((CARD8*)(base)) + (offset))

+#  define MMIO_OUT8(base, offset, val) \

+	*(volatile CARD8 *)(((CARD8*)(base)) + (offset)) = (val)

+#  define MMIO_OUT16(base, offset, val) \

+	*(volatile CARD16 *)(void *)(((CARD8*)(base)) + (offset)) = (val)

+#  define MMIO_OUT32(base, offset, val) \

+	*(volatile CARD32 *)(void *)(((CARD8*)(base)) + (offset)) = (val)

+#  define MMIO_ONB8(base, offset, val) MMIO_OUT8(base, offset, val) 

+#  define MMIO_ONB16(base, offset, val) MMIO_OUT16(base, offset, val) 

+#  define MMIO_ONB32(base, offset, val) MMIO_OUT32(base, offset, val) 

+

+#  define MMIO_MOVE32(base, offset, val) MMIO_OUT32(base, offset, val)

+

+# endif /* __alpha__ */

+

+/*

+ * With Intel, the version in os-support/misc/SlowBcopy.s is used.

+ * This avoids port I/O during the copy (which causes problems with

+ * some hardware).

+ */

+# ifdef __alpha__

+#  define slowbcopy_tobus(src,dst,count) xf86SlowBCopyToBus(src,dst,count)

+#  define slowbcopy_frombus(src,dst,count) xf86SlowBCopyFromBus(src,dst,count)

+# else /* __alpha__ */

+#  define slowbcopy_tobus(src,dst,count) xf86SlowBcopy(src,dst,count)

+#  define slowbcopy_frombus(src,dst,count) xf86SlowBcopy(src,dst,count)

+# endif /* __alpha__ */

+

+#endif /* _COMPILER_H */

diff --git a/xorg-server/hw/xwin/InitInput.c b/xorg-server/hw/xwin/InitInput.c
index 1e9bcad7a..51f7a923e 100644
--- a/xorg-server/hw/xwin/InitInput.c
+++ b/xorg-server/hw/xwin/InitInput.c
@@ -32,7 +32,7 @@
 #include "win.h"
 #include "dixstruct.h"
 #include "inputstr.h"
-
+#include <unistd.h>
 
 /*
  * Local function prototypes
@@ -67,6 +67,13 @@ extern winDispatchProcPtr	winProcQueryTreeOrig;
 #endif
 
 
+void InputDevicesClosed(void)
+{
+  g_pwinPointer=NULL;
+  g_pwinKeyboard=NULL;
+}
+
+
 /* Called from dix/devices.c */
 /*
  * All of our keys generate up and down transition notifications,
@@ -91,15 +98,7 @@ LegalModifier (unsigned int uiKey, DeviceIntPtr pDevice)
 void
 ProcessInputEvents (void)
 {
-#if 0
-  ErrorF ("ProcessInputEvents\n");
-#endif
-
   mieqProcessInputEvents ();
-
-#if 0
-  ErrorF ("ProcessInputEvents - returning\n");
-#endif
 }
 
 
@@ -114,9 +113,7 @@ void DDXRingBell(int volume, int pitch, int duration)
 void
 InitInput (int argc, char *argv[])
 {
-#if CYGDEBUG
   winDebug ("InitInput\n");
-#endif
 
 #ifdef XWIN_CLIPBOARD
   /*
@@ -167,7 +164,5 @@ InitInput (int argc, char *argv[])
     }
 #endif
 
-#if CYGDEBUG
   winDebug ("InitInput - returning\n");
-#endif
 }
diff --git a/xorg-server/hw/xwin/InitOutput.c b/xorg-server/hw/xwin/InitOutput.c
index 9aff336e1..acf8bc1ea 100644
--- a/xorg-server/hw/xwin/InitOutput.c
+++ b/xorg-server/hw/xwin/InitOutput.c
@@ -1,6 +1,7 @@
 /*
 
 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
@@ -45,14 +46,16 @@ from The Open Group.
 #if defined(WIN32)
 #include "xkbsrv.h"
 #endif
+
 #ifdef RELOCATE_PROJECTROOT
+#undef Status
 #include <shlobj.h>
-typedef HRESULT (*SHGETFOLDERPATHPROC)(
+typedef HRESULT  (__stdcall *  SHGETFOLDERPATHPROC)(
     HWND hwndOwner,
     int nFolder,
     HANDLE hToken,
     DWORD dwFlags,
-    LPTSTR pszPath
+    LPSTR pszPath
 );
 #endif
 
@@ -67,12 +70,13 @@ extern int			g_iLastScreen;
 extern char *			g_pszCommandLine;
 extern Bool			g_fSilentFatalError;
 
-extern char *			g_pszLogFile;
+extern const char *			g_pszLogFile;
 extern Bool			g_fLogFileChanged;
 extern int			g_iLogVerbose;
 Bool				g_fLogInited;
 
 extern Bool			g_fXdmcpEnabled;
+extern Bool			g_fAuthEnabled;
 #ifdef HAS_DEVWINDOWS
 extern int			g_fdMessageQueue;
 #endif
@@ -132,6 +136,9 @@ const char *
 winGetBaseDir(void);
 #endif
 
+static
+void glx_debugging(void);
+
 /*
  * 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
@@ -178,9 +185,6 @@ winClipboardShutdown (void)
       /* 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");
     }
 }
@@ -211,9 +215,7 @@ ddxGiveUp (void)
 {
   int		i;
 
-#if CYGDEBUG
   winDebug ("ddxGiveUp\n");
-#endif
 
   /* Perform per-screen deinitialization */
   for (i = 0; i < g_iNumScreens; ++i)
@@ -241,7 +243,7 @@ ddxGiveUp (void)
 #endif
 
   if (!g_fLogInited) {
-    LogInit (g_pszLogFile, NULL);
+    g_pszLogFile = LogInit (g_pszLogFile, NULL);
     g_fLogInited = TRUE;
   }  
   LogClose ();
@@ -285,9 +287,7 @@ ddxGiveUp (void)
 void
 AbortDDX (void)
 {
-#if CYGDEBUG
   winDebug ("AbortDDX\n");
-#endif
   ddxGiveUp ();
 }
 
@@ -371,8 +371,10 @@ winCheckMount(void)
     return;
   }
   
- if (!binary) 
-   winMsg(X_WARNING, "/tmp mounted int textmode\n"); 
+#ifdef WINDBG
+  if (!binary) 
+    winDebug("/tmp mounted int textmode\n"); 
+#endif
 }
 #else
 static void
@@ -424,7 +426,17 @@ winFixupPaths (void)
 #ifdef READ_FONTDIRS
     {
         /* Open fontpath configuration file */
+#if defined WIN32 && defined __MINGW32__
+        static Bool once = False;
+        char buffer[MAX_PATH];
+        snprintf(buffer, sizeof(buffer), "%s\\font-dirs", basedir);
+        buffer[sizeof(buffer)-1] = 0;
+        FILE *fontdirs = fopen(buffer, "rt");
+        if (once) fontdirs = NULL;
+        else once = True;
+#else
         FILE *fontdirs = fopen(ETCX11DIR "/font-dirs", "rt");
+#endif
         if (fontdirs != NULL)
         {
             char buffer[256];
@@ -597,7 +609,7 @@ winFixupPaths (void)
     }
 #endif /* RELOCATE_PROJECTROOT */
     if (changed_fontpath)
-        winMsg (font_from, "FontPath set to \"%s\"\n", defaultFontPath);
+        winDebug ("FontPath set to \"%s\"\n", defaultFontPath);
 
 #ifdef RELOCATE_PROJECTROOT
     if (getenv("XKEYSYMDB") == NULL)
@@ -624,6 +636,14 @@ winFixupPaths (void)
         buffer[sizeof(buffer)-1] = 0;
         putenv(buffer);
     }
+    if (getenv("XHOSTPREFIX") == NULL)
+    {
+        char buffer[MAX_PATH];
+        snprintf(buffer, sizeof(buffer), "XHOSTPREFIX=%s\\X",
+                basedir);
+        buffer[sizeof(buffer)-1] = 0;
+        putenv(buffer);
+    }
     if (getenv("HOME") == NULL)
     {
         HMODULE shfolder;
@@ -650,7 +670,7 @@ winFixupPaths (void)
             putenv(buffer);
         } else
         {
-            winMsg (X_ERROR, "Can not determine HOME directory\n");
+            ErrorF ("Can not determine HOME directory\n");
         } 
         if (shfolder != NULL)
             FreeLibrary(shfolder);
@@ -661,16 +681,17 @@ winFixupPaths (void)
         if (size && size < sizeof(buffer))
         {
             snprintf(buffer + size, sizeof(buffer) - size, 
-                    "XWin.%s.log", display); 
+                    "VCXSrv.%s.log", display); 
             buffer[sizeof(buffer)-1] = 0;
             g_pszLogFile = buffer;
-            winMsg (X_DEFAULT, "Logfile set to \"%s\"\n", g_pszLogFile);
+            GetLongPathName(buffer, buffer, MAX_PATH);
+            winDebug ("Logfile set to \"%s\"\n", g_pszLogFile);
         }
     }
     {
         static char xkbbasedir[MAX_PATH];
 
-        snprintf(xkbbasedir, sizeof(xkbbasedir), "%s\\xkb", basedir);
+        snprintf(xkbbasedir, sizeof(xkbbasedir), "%s\\xkbdata", basedir);
         if (sizeof(xkbbasedir) > 0)
             xkbbasedir[sizeof(xkbbasedir)-1] = 0;
         XkbBaseDirectory = xkbbasedir;
@@ -685,9 +706,6 @@ OsVendorInit (void)
   /* Re-initialize global variables on server reset */
   winInitializeGlobals ();
 
-  LogInit (NULL, NULL);
-  LogSetParameter (XLOG_VERBOSITY, g_iLogVerbose);
-
   winFixupPaths();
 
 #ifdef DDXOSVERRORF
@@ -702,7 +720,7 @@ OsVendorInit (void)
      * avoid the second call 
      */  
     g_fLogInited = TRUE;
-    LogInit (g_pszLogFile, NULL);
+    g_pszLogFile = LogInit (g_pszLogFile, NULL);
   } 
   LogSetParameter (XLOG_FLUSH, 1);
   LogSetParameter (XLOG_VERBOSITY, g_iLogVerbose);
@@ -873,7 +891,7 @@ winUseMsg (void)
 	  "\tEquivalent to XKBOptions in XF86Config files.\n");
 
   ErrorF ("-logfile filename\n"
-	  "\tWrite logmessages to <filename> instead of /tmp/Xwin.log.\n");
+	  "\tWrite logmessages to <filename>.\n");
 
   ErrorF ("-logverbose verbosity\n"
 	  "\tSet the verbosity of logmessages. [NOTE: Only a few messages\n"
@@ -903,7 +921,7 @@ ddxUseMsg(void)
 
   /* Log file will not be opened for UseMsg unless we open it now */
   if (!g_fLogInited) {
-    LogInit (g_pszLogFile, NULL);
+    g_pszLogFile = LogInit (g_pszLogFile, NULL);
     g_fLogInited = TRUE;
   }  
   LogClose ();
@@ -911,9 +929,9 @@ ddxUseMsg(void)
   /* Notify user where UseMsg text can be found.*/
   if (!g_fNoHelpMessageBox)
     winMessageBoxF ("The " PROJECT_NAME " help text has been printed to "
-		  "/tmp/XWin.log.\n"
-		  "Please open /tmp/XWin.log to read the help text.\n",
-		  MB_ICONINFORMATION);
+		  "%s.\n"
+		  "Please open %s to read the help text.\n",
+		  MB_ICONINFORMATION, g_pszLogFile, g_pszLogFile);
 }
 
 /* See Porting Layer Definition - p. 20 */
@@ -931,9 +949,7 @@ InitOutput (ScreenInfo *screenInfo, int argc, char *argv[])
   /* Log the command line */
   winLogCommandLine (argc, argv);
 
-#if CYGDEBUG
   winDebug ("InitOutput\n");
-#endif
 
   /* Validate command-line arguments */
   if (serverGeneration == 1 && !winValidateArgs ())
@@ -954,11 +970,8 @@ InitOutput (ScreenInfo *screenInfo, int argc, char *argv[])
 #ifdef XWIN_XF86CONFIG
   /* Try to read the xorg.conf-style configuration file */
   if (!winReadConfigfile ())
-    winErrorFVerb (1, "InitOutput - Error reading config file\n");
+    ErrorF ("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
 
@@ -992,7 +1005,7 @@ InitOutput (ScreenInfo *screenInfo, int argc, char *argv[])
 					 "_TrackMouseEvent");
   if (g_fpTrackMouseEvent == NULL)
     {
-      winErrorFVerb (1, "InitOutput - Could not get pointer to function\n"
+      ErrorF ("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");
@@ -1022,7 +1035,7 @@ InitOutput (ScreenInfo *screenInfo, int argc, char *argv[])
 
 #if defined(XCSECURITY)
   /* Generate a cookie used by internal clients for authorization */
-  if (g_fXdmcpEnabled)
+  if (g_fXdmcpEnabled || g_fAuthEnabled)
     winGenerateAuthorization ();
 #endif
 
@@ -1034,12 +1047,12 @@ InitOutput (ScreenInfo *screenInfo, int argc, char *argv[])
        * Apply locale specified in LANG environment variable.
        */
       setlocale (LC_ALL, "");
+
+      glx_debugging();
     }
 #endif
 
-#if CYGDEBUG || YES
   winDebug ("InitOutput - Returning.\n");
-#endif
 }
 
 
@@ -1062,7 +1075,7 @@ winCheckDisplayNumber (void)
 
   /* Check display range */
   nDisp = atoi (display);
-  if (nDisp < 0 || nDisp > 65535)
+  if (nDisp < 0 || nDisp > 59535)
     {
       ErrorF ("winCheckDisplayNumber - Bad display number: %d\n", nDisp);
       return FALSE;
@@ -1109,10 +1122,29 @@ winCheckDisplayNumber (void)
   if (GetLastError () == ERROR_ALREADY_EXISTS)
     {
       ErrorF ("winCheckDisplayNumber - "
-	      PROJECT_NAME " is already running on display %d\n",
+	      "VCXsrv, Xming or Cygwin/X is already running on display %d\n",
 	      nDisp);
       return FALSE;
     }
 
   return TRUE;
 }
+
+/* GLX debugging helpers */
+#include <../glx/glapi.h>
+
+static
+void warn_func(void * p1, const char *format, ...) {
+  va_list v;
+  va_start(v, format);
+  vfprintf(stderr, format, v);
+  va_end(v);
+  fprintf(stderr,"\n");
+}
+
+static
+void glx_debugging(void)
+{
+  _glapi_set_warning_func(warn_func);
+  _glapi_noop_enable_warnings(TRUE);
+}
diff --git a/xorg-server/hw/xwin/XWin.rc b/xorg-server/hw/xwin/XWin.rc
index 29c6f1ccf..8966fd122 100644
--- a/xorg-server/hw/xwin/XWin.rc
+++ b/xorg-server/hw/xwin/XWin.rc
@@ -1,109 +1,103 @@
-/*
- *Copyright (C) 2002-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
- */
-
-#include "windows.h"
-#include "winresource.h"
-
-/*
- * Dialogs
- */
-
-/* About */
-ABOUT_BOX DIALOGEX 32, 32, 240, 105
-STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE | WS_TABSTOP  | DS_CENTERMOUSE
-CAPTION "About " PROJECT_NAME
-FONT 8, "MS Sans Serif"
-BEGIN
-  CONTROL               PROJECT_NAME " Website", ID_ABOUT_WEBSITE, "Button",
-                        BS_OWNERDRAW | WS_TABSTOP, 30, 45, 75, 15
-  CONTROL               "Change Log", ID_ABOUT_CHANGELOG, "Button",
-                        BS_OWNERDRAW | WS_TABSTOP, 135, 45, 75, 15
-  CONTROL               "User's Guide", ID_ABOUT_UG, "Button",
-                        BS_OWNERDRAW | WS_TABSTOP, 30, 65, 75, 15
-  CONTROL               "FAQ", ID_ABOUT_FAQ, "Button",
-                        BS_OWNERDRAW | WS_TABSTOP, 135, 65, 75, 15
-
-  DEFPUSHBUTTON		"&OK", IDOK, 95, 85, 50, 15
-
-  CTEXT			PROJECT_NAME " X Server.  Use the links below to learn more about the " PROJECT_NAME " project.", IDC_STATIC, 5, 5, 230, 35
-END
-
-
-/* Depth change */
-
-DEPTH_CHANGE_BOX DIALOGEX 32, 32, 180, 100
-STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE | DS_CENTERMOUSE
-FONT 8, "MS Sans Serif"
-CAPTION PROJECT_NAME
-BEGIN
-  DEFPUSHBUTTON		"Dismiss", IDOK, 66, 80, 50, 14
-  CTEXT			PROJECT_NAME, IDC_STATIC, 40, 12, 100, 8
-  CTEXT			"Disruptive screen configuration change.", IDC_STATIC, 7, 40, 166, 8
-  CTEXT			"Restore previous resolution to use " PROJECT_NAME ".", IDC_STATIC, 7, 52, 166, 8
-END
-
-
-/* Exit */
-
-EXIT_DIALOG DIALOGEX 32, 32, 180, 78
-STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE | WS_TABSTOP | DS_CENTERMOUSE
-FONT 8, "MS Sans Serif"
-CAPTION "Exit " PROJECT_NAME "?"
-BEGIN
-  PUSHBUTTON "E&xit", IDOK, 55, 56, 30, 14
-  DEFPUSHBUTTON "&Cancel", IDCANCEL, 95, 56, 30, 14
-  CTEXT "E&xiting will close all screens running on this display.", IDC_STATIC, 7, 12, 166, 8
-  CTEXT "No information about connected clients available.", IDC_CLIENTS_CONNECTED, 7, 24, 166, 8
-  CTEXT "Proceed with shutdown of this display/server?", IDC_STATIC, 7, 36, 166, 8
-END
-
-
-/*
- * Menus
- */
-
-IDM_TRAYICON_MENU MENU
-BEGIN
-	POPUP "TRAYICON_MENU"
-	BEGIN
-		MENUITEM "&Hide Root Window", ID_APP_HIDE_ROOT
-		MENUITEM "&About...", ID_APP_ABOUT
-		MENUITEM SEPARATOR
-		MENUITEM "E&xit", ID_APP_EXIT
-	END
-END
-
-
-/*
- * Icons
- */
-
-IDI_XWIN		ICON	"X.ico"
-IDI_XWIN_BOXED		ICON	"X-boxed.ico"
+/*

+ *Copyright (C) 2002-2004 Harold L Hunt II All Rights Reserved.

+ *Copyright (C) 2008 Yaakov Selkowitz 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 names of the authors

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

+ *

+ * Authors:	Harold L Hunt II, Yaakov Selkowitz

+ */

+

+#include <windows.h>

+#include "winresource.h"

+#include "xwin-config.h"

+

+/*

+ * Dialogs

+ */

+

+/* About */

+ABOUT_BOX DIALOGEX 32, 32, 260, 95

+STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE | WS_TABSTOP  | DS_CENTERMOUSE

+CAPTION "About VcXsrv"

+FONT 8, "MS Shell Dlg 2"

+BEGIN

+  CONTROL				IDI_XWIN, IDC_STATIC, "Static", SS_ICON, 8, 8, 32, 32

+  LTEXT			"VcXsrv X Server ", IDC_STATIC, 36, 8, 220, 8

+  LTEXT			"Version 1.7.0.1 (12 Oct 2009)", IDC_STATIC, 36, 18, 220, 8

+  DEFPUSHBUTTON		"OK", IDOK, 105, 75, 50, 15

+END

+

+

+/* Depth change */

+

+DEPTH_CHANGE_BOX DIALOGEX	32, 32, 180, 100

+STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE | DS_CENTERMOUSE

+FONT 8, "MS Shell Dlg 2"

+CAPTION "VcXsrv"

+BEGIN

+  DEFPUSHBUTTON		"Dismiss", IDOK, 66, 80, 50, 14

+  CTEXT			"VcXsrv", IDC_STATIC, 40, 12, 100, 8

+  CTEXT			"Disruptive screen configuration change.", IDC_STATIC, 7, 40, 166, 8

+  CTEXT			"Restore previous resolution to use VcXsrv.", IDC_STATIC, 7, 52, 166, 8

+END

+

+

+/* Exit */

+

+EXIT_DIALOG DIALOGEX	32, 32, 180, 78

+STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE | WS_TABSTOP | DS_CENTERMOUSE

+FONT 8, "MS Shell Dlg 2"

+CAPTION "Exit VcXsrv?"

+BEGIN

+  PUSHBUTTON "E&xit", IDOK, 55, 56, 30, 14

+  DEFPUSHBUTTON "&Cancel", IDCANCEL, 95, 56, 30, 14

+  CTEXT "E&xiting will close all screens running on this display.", IDC_STATIC, 7, 12, 166, 8

+  CTEXT "No information about connected clients available.", IDC_CLIENTS_CONNECTED, 7, 24, 166, 8

+  CTEXT "Proceed with shutdown of this display/server?", IDC_STATIC, 7, 36, 166, 8

+END

+

+

+/*

+ * Menus

+ */

+

+IDM_TRAYICON_MENU MENU

+BEGIN

+	POPUP "TRAYICON_MENU"

+	BEGIN

+		MENUITEM "&Hide Root Window", ID_APP_HIDE_ROOT

+		MENUITEM "&About...", ID_APP_ABOUT

+		MENUITEM SEPARATOR

+		MENUITEM "E&xit...", ID_APP_EXIT

+	END

+END

+

+

+/*

+ * Icons

+ */

+

+IDI_XWIN		ICON	"X.ico"

+IDI_XWIN_BOXED		ICON	"X-boxed.ico"

diff --git a/xorg-server/hw/xwin/ddraw.h b/xorg-server/hw/xwin/ddraw.h
deleted file mode 100644
index 2eb7c2674..000000000
--- a/xorg-server/hw/xwin/ddraw.h
+++ /dev/null
@@ -1,2106 +0,0 @@
-#ifndef __XWIN_DDRAW_H
-#define __XWIN_DDRAW_H
-
-#include <winnt.h>
-#include <wingdi.h>
-#include <objbase.h>
-
-#if defined(NONAMELESSUNION) && !defined(DUMMYUNIONNAME1)
-#define DUMMYUNIONNAME1 u1
-#endif
-
-#define ICOM_CALL_( xfn, p, args) (p)->lpVtbl->xfn args
-
-# ifdef UNICODE
-#  define WINELIB_NAME_AW(func) func##W
-# else
-#  define WINELIB_NAME_AW(func) func##A
-# endif  /* UNICODE */
-#define DECL_WINELIB_TYPE_AW(type)  typedef WINELIB_NAME_AW(type) type;
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* defined(__cplusplus) */
-
-#ifndef	DIRECTDRAW_VERSION
-#define	DIRECTDRAW_VERSION	0x0700
-#endif /* DIRECTDRAW_VERSION */
-
-/*****************************************************************************
- * Predeclare the interfaces
- */
-DEFINE_GUID( CLSID_DirectDraw,		0xD7B70EE0,0x4340,0x11CF,0xB0,0x63,0x00,0x20,0xAF,0xC2,0xCD,0x35 );
-DEFINE_GUID( CLSID_DirectDraw7,         0x3C305196,0x50DB,0x11D3,0x9C,0xFE,0x00,0xC0,0x4F,0xD9,0x30,0xC5 );
-DEFINE_GUID( CLSID_DirectDrawClipper,	0x593817A0,0x7DB3,0x11CF,0xA2,0xDE,0x00,0xAA,0x00,0xb9,0x33,0x56 );
-DEFINE_GUID( IID_IDirectDraw,		0x6C14DB80,0xA733,0x11CE,0xA5,0x21,0x00,0x20,0xAF,0x0B,0xE5,0x60 );
-DEFINE_GUID( IID_IDirectDraw2,		0xB3A6F3E0,0x2B43,0x11CF,0xA2,0xDE,0x00,0xAA,0x00,0xB9,0x33,0x56 );
-DEFINE_GUID( IID_IDirectDraw4,          0x9c59509a,0x39bd,0x11d1,0x8c,0x4a,0x00,0xc0,0x4f,0xd9,0x30,0xc5 );
-DEFINE_GUID( IID_IDirectDraw7,          0x15e65ec0,0x3b9c,0x11d2,0xb9,0x2f,0x00,0x60,0x97,0x97,0xea,0x5b );
-DEFINE_GUID( IID_IDirectDrawSurface,	0x6C14DB81,0xA733,0x11CE,0xA5,0x21,0x00,0x20,0xAF,0x0B,0xE5,0x60 );
-DEFINE_GUID( IID_IDirectDrawSurface2,	0x57805885,0x6eec,0x11cf,0x94,0x41,0xa8,0x23,0x03,0xc1,0x0e,0x27 );
-DEFINE_GUID( IID_IDirectDrawSurface3,	0xDA044E00,0x69B2,0x11D0,0xA1,0xD5,0x00,0xAA,0x00,0xB8,0xDF,0xBB );
-DEFINE_GUID( IID_IDirectDrawSurface4,   0x0B2B8630,0xAD35,0x11D0,0x8E,0xA6,0x00,0x60,0x97,0x97,0xEA,0x5B );
-DEFINE_GUID( IID_IDirectDrawSurface7,   0x06675a80,0x3b9b,0x11d2,0xb9,0x2f,0x00,0x60,0x97,0x97,0xea,0x5b );
-DEFINE_GUID( IID_IDirectDrawPalette,	0x6C14DB84,0xA733,0x11CE,0xA5,0x21,0x00,0x20,0xAF,0x0B,0xE5,0x60 );
-DEFINE_GUID( IID_IDirectDrawClipper,	0x6C14DB85,0xA733,0x11CE,0xA5,0x21,0x00,0x20,0xAF,0x0B,0xE5,0x60 );
-DEFINE_GUID( IID_IDirectDrawColorControl,0x4B9F0EE0,0x0D7E,0x11D0,0x9B,0x06,0x00,0xA0,0xC9,0x03,0xA3,0xB8 );
-DEFINE_GUID( IID_IDirectDrawGammaControl,0x69C11C3E,0xB46B,0x11D1,0xAD,0x7A,0x00,0xC0,0x4F,0xC2,0x9B,0x4E );
-
-typedef struct IDirectDraw *LPDIRECTDRAW;
-typedef struct IDirectDraw2 *LPDIRECTDRAW2;
-typedef struct IDirectDraw4 *LPDIRECTDRAW4;
-typedef struct IDirectDraw7 *LPDIRECTDRAW7;
-typedef struct IDirectDrawClipper *LPDIRECTDRAWCLIPPER;
-typedef struct IDirectDrawPalette *LPDIRECTDRAWPALETTE;
-typedef struct IDirectDrawSurface *LPDIRECTDRAWSURFACE;
-typedef struct IDirectDrawSurface2 *LPDIRECTDRAWSURFACE2;
-typedef struct IDirectDrawSurface3 *LPDIRECTDRAWSURFACE3;
-typedef struct IDirectDrawSurface4 *LPDIRECTDRAWSURFACE4;
-typedef struct IDirectDrawSurface7 *LPDIRECTDRAWSURFACE7;
-typedef struct IDirectDrawColorControl *LPDIRECTDRAWCOLORCONTROL;
-typedef struct IDirectDrawGammaControl *LPDIRECTDRAWGAMMACONTROL;
-
-
-#define DDENUMRET_CANCEL	0
-#define DDENUMRET_OK		1
-
-#define DD_OK			0
-
-
-#define _FACDD		0x876
-#define MAKE_DDHRESULT( code )  MAKE_HRESULT( 1, _FACDD, code )
-
-#define DDERR_ALREADYINITIALIZED		MAKE_DDHRESULT( 5 )
-#define DDERR_CANNOTATTACHSURFACE		MAKE_DDHRESULT( 10 )
-#define DDERR_CANNOTDETACHSURFACE		MAKE_DDHRESULT( 20 )
-#define DDERR_CURRENTLYNOTAVAIL			MAKE_DDHRESULT( 40 )
-#define DDERR_EXCEPTION				MAKE_DDHRESULT( 55 )
-#define DDERR_GENERIC				E_FAIL
-#define DDERR_HEIGHTALIGN			MAKE_DDHRESULT( 90 )
-#define DDERR_INCOMPATIBLEPRIMARY		MAKE_DDHRESULT( 95 )
-#define DDERR_INVALIDCAPS			MAKE_DDHRESULT( 100 )
-#define DDERR_INVALIDCLIPLIST			MAKE_DDHRESULT( 110 )
-#define DDERR_INVALIDMODE			MAKE_DDHRESULT( 120 )
-#define DDERR_INVALIDOBJECT			MAKE_DDHRESULT( 130 )
-#define DDERR_INVALIDPARAMS			E_INVALIDARG
-#define DDERR_INVALIDPIXELFORMAT		MAKE_DDHRESULT( 145 )
-#define DDERR_INVALIDRECT			MAKE_DDHRESULT( 150 )
-#define DDERR_LOCKEDSURFACES			MAKE_DDHRESULT( 160 )
-#define DDERR_NO3D				MAKE_DDHRESULT( 170 )
-#define DDERR_NOALPHAHW				MAKE_DDHRESULT( 180 )
-#define DDERR_NOSTEREOHARDWARE          	MAKE_DDHRESULT( 181 )
-#define DDERR_NOSURFACELEFT                     MAKE_DDHRESULT( 182 )
-#define DDERR_NOCLIPLIST			MAKE_DDHRESULT( 205 )
-#define DDERR_NOCOLORCONVHW			MAKE_DDHRESULT( 210 )
-#define DDERR_NOCOOPERATIVELEVELSET		MAKE_DDHRESULT( 212 )
-#define DDERR_NOCOLORKEY			MAKE_DDHRESULT( 215 )
-#define DDERR_NOCOLORKEYHW			MAKE_DDHRESULT( 220 )
-#define DDERR_NODIRECTDRAWSUPPORT		MAKE_DDHRESULT( 222 )
-#define DDERR_NOEXCLUSIVEMODE			MAKE_DDHRESULT( 225 )
-#define DDERR_NOFLIPHW				MAKE_DDHRESULT( 230 )
-#define DDERR_NOGDI				MAKE_DDHRESULT( 240 )
-#define DDERR_NOMIRRORHW			MAKE_DDHRESULT( 250 )
-#define DDERR_NOTFOUND				MAKE_DDHRESULT( 255 )
-#define DDERR_NOOVERLAYHW			MAKE_DDHRESULT( 260 )
-#define DDERR_OVERLAPPINGRECTS                  MAKE_DDHRESULT( 270 )
-#define DDERR_NORASTEROPHW			MAKE_DDHRESULT( 280 )
-#define DDERR_NOROTATIONHW			MAKE_DDHRESULT( 290 )
-#define DDERR_NOSTRETCHHW			MAKE_DDHRESULT( 310 )
-#define DDERR_NOT4BITCOLOR			MAKE_DDHRESULT( 316 )
-#define DDERR_NOT4BITCOLORINDEX			MAKE_DDHRESULT( 317 )
-#define DDERR_NOT8BITCOLOR			MAKE_DDHRESULT( 320 )
-#define DDERR_NOTEXTUREHW			MAKE_DDHRESULT( 330 )
-#define DDERR_NOVSYNCHW				MAKE_DDHRESULT( 335 )
-#define DDERR_NOZBUFFERHW			MAKE_DDHRESULT( 340 )
-#define DDERR_NOZOVERLAYHW			MAKE_DDHRESULT( 350 )
-#define DDERR_OUTOFCAPS				MAKE_DDHRESULT( 360 )
-#define DDERR_OUTOFMEMORY			E_OUTOFMEMORY
-#define DDERR_OUTOFVIDEOMEMORY			MAKE_DDHRESULT( 380 )
-#define DDERR_OVERLAYCANTCLIP			MAKE_DDHRESULT( 382 )
-#define DDERR_OVERLAYCOLORKEYONLYONEACTIVE	MAKE_DDHRESULT( 384 )
-#define DDERR_PALETTEBUSY			MAKE_DDHRESULT( 387 )
-#define DDERR_COLORKEYNOTSET			MAKE_DDHRESULT( 400 )
-#define DDERR_SURFACEALREADYATTACHED		MAKE_DDHRESULT( 410 )
-#define DDERR_SURFACEALREADYDEPENDENT		MAKE_DDHRESULT( 420 )
-#define DDERR_SURFACEBUSY			MAKE_DDHRESULT( 430 )
-#define DDERR_CANTLOCKSURFACE			MAKE_DDHRESULT( 435 )
-#define DDERR_SURFACEISOBSCURED			MAKE_DDHRESULT( 440 )
-#define DDERR_SURFACELOST			MAKE_DDHRESULT( 450 )
-#define DDERR_SURFACENOTATTACHED		MAKE_DDHRESULT( 460 )
-#define DDERR_TOOBIGHEIGHT			MAKE_DDHRESULT( 470 )
-#define DDERR_TOOBIGSIZE			MAKE_DDHRESULT( 480 )
-#define DDERR_TOOBIGWIDTH			MAKE_DDHRESULT( 490 )
-#define DDERR_UNSUPPORTED			E_NOTIMPL
-#define DDERR_UNSUPPORTEDFORMAT			MAKE_DDHRESULT( 510 )
-#define DDERR_UNSUPPORTEDMASK			MAKE_DDHRESULT( 520 )
-#define DDERR_INVALIDSTREAM                     MAKE_DDHRESULT( 521 )
-#define DDERR_VERTICALBLANKINPROGRESS		MAKE_DDHRESULT( 537 )
-#define DDERR_WASSTILLDRAWING			MAKE_DDHRESULT( 540 )
-#define DDERR_DDSCAPSCOMPLEXREQUIRED            MAKE_DDHRESULT( 542 )
-#define DDERR_XALIGN				MAKE_DDHRESULT( 560 )
-#define DDERR_INVALIDDIRECTDRAWGUID		MAKE_DDHRESULT( 561 )
-#define DDERR_DIRECTDRAWALREADYCREATED		MAKE_DDHRESULT( 562 )
-#define DDERR_NODIRECTDRAWHW			MAKE_DDHRESULT( 563 )
-#define DDERR_PRIMARYSURFACEALREADYEXISTS	MAKE_DDHRESULT( 564 )
-#define DDERR_NOEMULATION			MAKE_DDHRESULT( 565 )
-#define DDERR_REGIONTOOSMALL			MAKE_DDHRESULT( 566 )
-#define DDERR_CLIPPERISUSINGHWND		MAKE_DDHRESULT( 567 )
-#define DDERR_NOCLIPPERATTACHED			MAKE_DDHRESULT( 568 )
-#define DDERR_NOHWND				MAKE_DDHRESULT( 569 )
-#define DDERR_HWNDSUBCLASSED			MAKE_DDHRESULT( 570 )
-#define DDERR_HWNDALREADYSET			MAKE_DDHRESULT( 571 )
-#define DDERR_NOPALETTEATTACHED			MAKE_DDHRESULT( 572 )
-#define DDERR_NOPALETTEHW			MAKE_DDHRESULT( 573 )
-#define DDERR_BLTFASTCANTCLIP			MAKE_DDHRESULT( 574 )
-#define DDERR_NOBLTHW				MAKE_DDHRESULT( 575 )
-#define DDERR_NODDROPSHW			MAKE_DDHRESULT( 576 )
-#define DDERR_OVERLAYNOTVISIBLE			MAKE_DDHRESULT( 577 )
-#define DDERR_NOOVERLAYDEST			MAKE_DDHRESULT( 578 )
-#define DDERR_INVALIDPOSITION			MAKE_DDHRESULT( 579 )
-#define DDERR_NOTAOVERLAYSURFACE		MAKE_DDHRESULT( 580 )
-#define DDERR_EXCLUSIVEMODEALREADYSET		MAKE_DDHRESULT( 581 )
-#define DDERR_NOTFLIPPABLE			MAKE_DDHRESULT( 582 )
-#define DDERR_CANTDUPLICATE			MAKE_DDHRESULT( 583 )
-#define DDERR_NOTLOCKED				MAKE_DDHRESULT( 584 )
-#define DDERR_CANTCREATEDC			MAKE_DDHRESULT( 585 )
-#define DDERR_NODC				MAKE_DDHRESULT( 586 )
-#define DDERR_WRONGMODE				MAKE_DDHRESULT( 587 )
-#define DDERR_IMPLICITLYCREATED			MAKE_DDHRESULT( 588 )
-#define DDERR_NOTPALETTIZED			MAKE_DDHRESULT( 589 )
-#define DDERR_UNSUPPORTEDMODE			MAKE_DDHRESULT( 590 )
-#define DDERR_NOMIPMAPHW			MAKE_DDHRESULT( 591 )
-#define DDERR_INVALIDSURFACETYPE		MAKE_DDHRESULT( 592 )
-#define DDERR_NOOPTIMIZEHW			MAKE_DDHRESULT( 600 )
-#define DDERR_NOTLOADED				MAKE_DDHRESULT( 601 )
-#define DDERR_NOFOCUSWINDOW			MAKE_DDHRESULT( 602 )
-#define DDERR_NOTONMIPMAPSUBLEVEL               MAKE_DDHRESULT( 603 )
-#define DDERR_DCALREADYCREATED			MAKE_DDHRESULT( 620 )
-#define DDERR_NONONLOCALVIDMEM			MAKE_DDHRESULT( 630 )
-#define DDERR_CANTPAGELOCK			MAKE_DDHRESULT( 640 )
-#define DDERR_CANTPAGEUNLOCK			MAKE_DDHRESULT( 660 )
-#define DDERR_NOTPAGELOCKED			MAKE_DDHRESULT( 680 )
-#define DDERR_MOREDATA				MAKE_DDHRESULT( 690 )
-#define DDERR_EXPIRED                           MAKE_DDHRESULT( 691 )
-#define DDERR_TESTFINISHED                      MAKE_DDHRESULT( 692 )
-#define DDERR_NEWMODE                           MAKE_DDHRESULT( 693 )
-#define DDERR_D3DNOTINITIALIZED                 MAKE_DDHRESULT( 694 )
-#define DDERR_VIDEONOTACTIVE			MAKE_DDHRESULT( 695 )
-#define DDERR_NOMONITORINFORMATION              MAKE_DDHRESULT( 696 )
-#define DDERR_NODRIVERSUPPORT                   MAKE_DDHRESULT( 697 )
-#define DDERR_DEVICEDOESNTOWNSURFACE		MAKE_DDHRESULT( 699 )
-#define DDERR_NOTINITIALIZED			CO_E_NOTINITIALIZED
-
-/* dwFlags for Blt* */
-#define DDBLT_ALPHADEST				0x00000001
-#define DDBLT_ALPHADESTCONSTOVERRIDE		0x00000002
-#define DDBLT_ALPHADESTNEG			0x00000004
-#define DDBLT_ALPHADESTSURFACEOVERRIDE		0x00000008
-#define DDBLT_ALPHAEDGEBLEND			0x00000010
-#define DDBLT_ALPHASRC				0x00000020
-#define DDBLT_ALPHASRCCONSTOVERRIDE		0x00000040
-#define DDBLT_ALPHASRCNEG			0x00000080
-#define DDBLT_ALPHASRCSURFACEOVERRIDE		0x00000100
-#define DDBLT_ASYNC				0x00000200
-#define DDBLT_COLORFILL				0x00000400
-#define DDBLT_DDFX				0x00000800
-#define DDBLT_DDROPS				0x00001000
-#define DDBLT_KEYDEST				0x00002000
-#define DDBLT_KEYDESTOVERRIDE			0x00004000
-#define DDBLT_KEYSRC				0x00008000
-#define DDBLT_KEYSRCOVERRIDE			0x00010000
-#define DDBLT_ROP				0x00020000
-#define DDBLT_ROTATIONANGLE			0x00040000
-#define DDBLT_ZBUFFER				0x00080000
-#define DDBLT_ZBUFFERDESTCONSTOVERRIDE		0x00100000
-#define DDBLT_ZBUFFERDESTOVERRIDE		0x00200000
-#define DDBLT_ZBUFFERSRCCONSTOVERRIDE		0x00400000
-#define DDBLT_ZBUFFERSRCOVERRIDE		0x00800000
-#define DDBLT_WAIT				0x01000000
-#define DDBLT_DEPTHFILL				0x02000000
-#define DDBLT_DONOTWAIT                         0x08000000
-
-/* dwTrans for BltFast */
-#define DDBLTFAST_NOCOLORKEY			0x00000000
-#define DDBLTFAST_SRCCOLORKEY			0x00000001
-#define DDBLTFAST_DESTCOLORKEY			0x00000002
-#define DDBLTFAST_WAIT				0x00000010
-#define DDBLTFAST_DONOTWAIT                     0x00000020
-
-/* dwFlags for Flip */
-#define DDFLIP_WAIT		0x00000001
-#define DDFLIP_EVEN		0x00000002 /* only valid for overlay */
-#define DDFLIP_ODD		0x00000004 /* only valid for overlay */
-#define DDFLIP_NOVSYNC		0x00000008
-#define DDFLIP_STEREO		0x00000010
-#define DDFLIP_DONOTWAIT	0x00000020
-
-/* dwFlags for GetBltStatus */
-#define DDGBS_CANBLT				0x00000001
-#define DDGBS_ISBLTDONE				0x00000002
-
-/* dwFlags for IDirectDrawSurface7::GetFlipStatus */
-#define DDGFS_CANFLIP		1L
-#define DDGFS_ISFLIPDONE	2L
-
-/* dwFlags for IDirectDrawSurface7::SetPrivateData */
-#define DDSPD_IUNKNOWNPTR	1L
-#define DDSPD_VOLATILE		2L
-
-/* DDSCAPS.dwCaps */
-/* reserved1, was 3d capable */
-#define DDSCAPS_RESERVED1		0x00000001
-/* surface contains alpha information */
-#define DDSCAPS_ALPHA			0x00000002
-/* this surface is a backbuffer */
-#define DDSCAPS_BACKBUFFER		0x00000004
-/* complex surface structure */
-#define DDSCAPS_COMPLEX			0x00000008
-/* part of surface flipping structure */
-#define DDSCAPS_FLIP			0x00000010
-/* this surface is the frontbuffer surface */
-#define DDSCAPS_FRONTBUFFER		0x00000020
-/* this is a plain offscreen surface */
-#define DDSCAPS_OFFSCREENPLAIN		0x00000040
-/* overlay */
-#define DDSCAPS_OVERLAY			0x00000080
-/* palette objects can be created and attached to us */
-#define DDSCAPS_PALETTE			0x00000100
-/* primary surface (the one the user looks at currently)(right eye)*/
-#define DDSCAPS_PRIMARYSURFACE		0x00000200
-/* primary surface for left eye */
-#define DDSCAPS_PRIMARYSURFACELEFT	0x00000400
-/* surface exists in systemmemory */
-#define DDSCAPS_SYSTEMMEMORY		0x00000800
-/* surface can be used as a texture */
-#define DDSCAPS_TEXTURE		        0x00001000
-/* surface may be destination for 3d rendering */
-#define DDSCAPS_3DDEVICE		0x00002000
-/* surface exists in videomemory */
-#define DDSCAPS_VIDEOMEMORY		0x00004000
-/* surface changes immediately visible */
-#define DDSCAPS_VISIBLE			0x00008000
-/* write only surface */
-#define DDSCAPS_WRITEONLY		0x00010000
-/* zbuffer surface */
-#define DDSCAPS_ZBUFFER			0x00020000
-/* has its own DC */
-#define DDSCAPS_OWNDC			0x00040000
-/* surface should be able to receive live video */
-#define DDSCAPS_LIVEVIDEO		0x00080000
-/* should be able to have a hw codec decompress stuff into it */
-#define DDSCAPS_HWCODEC			0x00100000
-/* mode X (320x200 or 320x240) surface */
-#define DDSCAPS_MODEX			0x00200000
-/* one mipmap surface (1 level) */
-#define DDSCAPS_MIPMAP			0x00400000
-#define DDSCAPS_RESERVED2		0x00800000
-/* memory allocation delayed until Load() */
-#define DDSCAPS_ALLOCONLOAD		0x04000000
-/* Indicates that the surface will receive data from a video port */
-#define DDSCAPS_VIDEOPORT		0x08000000
-/* surface is in local videomemory */
-#define DDSCAPS_LOCALVIDMEM		0x10000000
-/* surface is in nonlocal videomemory */
-#define DDSCAPS_NONLOCALVIDMEM		0x20000000
-/* surface is a standard VGA mode surface (NOT ModeX) */
-#define DDSCAPS_STANDARDVGAMODE		0x40000000
-/* optimized? surface */
-#define DDSCAPS_OPTIMIZED		0x80000000
-
-typedef struct _DDSCAPS {
-	DWORD	dwCaps;	/* capabilities of surface wanted */
-} DDSCAPS,*LPDDSCAPS;
-
-/* DDSCAPS2.dwCaps2 */
-/* indicates the surface will receive data from a video port using
-   deinterlacing hardware. */
-#define DDSCAPS2_HARDWAREDEINTERLACE	0x00000002
-/* indicates the surface will be locked very frequently. */
-#define DDSCAPS2_HINTDYNAMIC		0x00000004
-/* indicates surface can be re-ordered or retiled on load() */
-#define DDSCAPS2_HINTSTATIC             0x00000008
-/* indicates surface to be managed by directdraw/direct3D */
-#define DDSCAPS2_TEXTUREMANAGE          0x00000010
-/* reserved bits */
-#define DDSCAPS2_RESERVED1              0x00000020
-#define DDSCAPS2_RESERVED2              0x00000040
-/* indicates surface will never be locked again */
-#define DDSCAPS2_OPAQUE                 0x00000080
-/* set at CreateSurface() time to indicate antialising will be used */
-#define DDSCAPS2_HINTANTIALIASING       0x00000100
-/* set at CreateSurface() time to indicate cubic environment map */
-#define DDSCAPS2_CUBEMAP                0x00000200
-/* face flags for cube maps */
-#define DDSCAPS2_CUBEMAP_POSITIVEX      0x00000400
-#define DDSCAPS2_CUBEMAP_NEGATIVEX      0x00000800
-#define DDSCAPS2_CUBEMAP_POSITIVEY      0x00001000
-#define DDSCAPS2_CUBEMAP_NEGATIVEY      0x00002000
-#define DDSCAPS2_CUBEMAP_POSITIVEZ      0x00004000
-#define DDSCAPS2_CUBEMAP_NEGATIVEZ      0x00008000
-/* specifies all faces of a cube for CreateSurface() */
-#define DDSCAPS2_CUBEMAP_ALLFACES ( DDSCAPS2_CUBEMAP_POSITIVEX |\
-                                    DDSCAPS2_CUBEMAP_NEGATIVEX |\
-                                    DDSCAPS2_CUBEMAP_POSITIVEY |\
-                                    DDSCAPS2_CUBEMAP_NEGATIVEY |\
-                                    DDSCAPS2_CUBEMAP_POSITIVEZ |\
-                                    DDSCAPS2_CUBEMAP_NEGATIVEZ )
-/* set for mipmap sublevels on DirectX7 and later.  ignored by CreateSurface() */
-#define DDSCAPS2_MIPMAPSUBLEVEL         0x00010000
-/* indicates texture surface to be managed by Direct3D *only* */
-#define DDSCAPS2_D3DTEXTUREMANAGE       0x00020000
-/* indicates managed surface that can safely be lost */
-#define DDSCAPS2_DONOTPERSIST           0x00040000
-/* indicates surface is part of a stereo flipping chain */
-#define DDSCAPS2_STEREOSURFACELEFT      0x00080000
-
-typedef struct _DDSCAPS2 {
-	DWORD	dwCaps;	/* capabilities of surface wanted */
-	DWORD   dwCaps2; /* additional capabilities */
-	DWORD   dwCaps3; /* reserved capabilities */
-	DWORD   dwCaps4; /* more reserved capabilities */
-} DDSCAPS2,*LPDDSCAPS2;
-
-#define	DD_ROP_SPACE	(256/32)	/* space required to store ROP array */
-
-typedef struct _DDCAPS_DX7		/* DirectX 7 version of caps struct */
-{
-    DWORD	dwSize;                 /* size of the DDDRIVERCAPS structure */
-    DWORD	dwCaps;                 /* driver specific capabilities */
-    DWORD	dwCaps2;                /* more driver specific capabilites */
-    DWORD	dwCKeyCaps;             /* color key capabilities of the surface */
-    DWORD	dwFXCaps;               /* driver specific stretching and effects capabilites */
-    DWORD	dwFXAlphaCaps;          /* alpha driver specific capabilities */
-    DWORD	dwPalCaps;              /* palette capabilities */
-    DWORD	dwSVCaps;               /* stereo vision capabilities */
-    DWORD	dwAlphaBltConstBitDepths;       /* DDBD_2,4,8 */
-    DWORD	dwAlphaBltPixelBitDepths;       /* DDBD_1,2,4,8 */
-    DWORD	dwAlphaBltSurfaceBitDepths;     /* DDBD_1,2,4,8 */
-    DWORD	dwAlphaOverlayConstBitDepths;   /* DDBD_2,4,8 */
-    DWORD	dwAlphaOverlayPixelBitDepths;   /* DDBD_1,2,4,8 */
-    DWORD	dwAlphaOverlaySurfaceBitDepths; /* DDBD_1,2,4,8 */
-    DWORD	dwZBufferBitDepths;             /* DDBD_8,16,24,32 */
-    DWORD	dwVidMemTotal;          /* total amount of video memory */
-    DWORD	dwVidMemFree;           /* amount of free video memory */
-    DWORD	dwMaxVisibleOverlays;   /* maximum number of visible overlays */
-    DWORD	dwCurrVisibleOverlays;  /* current number of visible overlays */
-    DWORD	dwNumFourCCCodes;       /* number of four cc codes */
-    DWORD	dwAlignBoundarySrc;     /* source rectangle alignment */
-    DWORD	dwAlignSizeSrc;         /* source rectangle byte size */
-    DWORD	dwAlignBoundaryDest;    /* dest rectangle alignment */
-    DWORD	dwAlignSizeDest;        /* dest rectangle byte size */
-    DWORD	dwAlignStrideAlign;     /* stride alignment */
-    DWORD	dwRops[DD_ROP_SPACE];   /* ROPS supported */
-    DDSCAPS	ddsOldCaps;             /* old DDSCAPS - superceded for DirectX6+ */
-    DWORD	dwMinOverlayStretch;    /* minimum overlay stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */
-    DWORD	dwMaxOverlayStretch;    /* maximum overlay stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */
-    DWORD	dwMinLiveVideoStretch;  /* minimum live video stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */
-    DWORD	dwMaxLiveVideoStretch;  /* maximum live video stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */
-    DWORD	dwMinHwCodecStretch;    /* minimum hardware codec stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */
-    DWORD	dwMaxHwCodecStretch;    /* maximum hardware codec stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */
-    DWORD	dwReserved1;
-    DWORD	dwReserved2;
-    DWORD	dwReserved3;
-    DWORD	dwSVBCaps;              /* driver specific capabilities for System->Vmem blts */
-    DWORD	dwSVBCKeyCaps;          /* driver color key capabilities for System->Vmem blts */
-    DWORD	dwSVBFXCaps;            /* driver FX capabilities for System->Vmem blts */
-    DWORD	dwSVBRops[DD_ROP_SPACE];/* ROPS supported for System->Vmem blts */
-    DWORD	dwVSBCaps;              /* driver specific capabilities for Vmem->System blts */
-    DWORD	dwVSBCKeyCaps;          /* driver color key capabilities for Vmem->System blts */
-    DWORD	dwVSBFXCaps;            /* driver FX capabilities for Vmem->System blts */
-    DWORD	dwVSBRops[DD_ROP_SPACE];/* ROPS supported for Vmem->System blts */
-    DWORD	dwSSBCaps;              /* driver specific capabilities for System->System blts */
-    DWORD	dwSSBCKeyCaps;          /* driver color key capabilities for System->System blts */
-    DWORD	dwSSBFXCaps;            /* driver FX capabilities for System->System blts */
-    DWORD	dwSSBRops[DD_ROP_SPACE];/* ROPS supported for System->System blts */
-    DWORD       dwMaxVideoPorts;        /* maximum number of usable video ports */
-    DWORD   	dwCurrVideoPorts;       /* current number of video ports used */
-    DWORD   	dwSVBCaps2;             /* more driver specific capabilities for System->Vmem blts */
-    DWORD   	dwNLVBCaps;             /* driver specific capabilities for non-local->local vidmem blts */
-    DWORD   	dwNLVBCaps2;            /* more driver specific capabilities non-local->local vidmem blts */
-    DWORD   	dwNLVBCKeyCaps;         /* driver color key capabilities for non-local->local vidmem blts */
-    DWORD   	dwNLVBFXCaps;           /* driver FX capabilities for non-local->local blts */
-    DWORD   	dwNLVBRops[DD_ROP_SPACE]; /* ROPS supported for non-local->local blts */
-    DDSCAPS2    ddsCaps;		/* surface capabilities */
-} DDCAPS_DX7,*LPDDCAPS_DX7;
-
-typedef struct _DDCAPS_DX6		/* DirectX 6 version of caps struct */
-{
-    DWORD	dwSize;                 /* size of the DDDRIVERCAPS structure */
-    DWORD	dwCaps;                 /* driver specific capabilities */
-    DWORD	dwCaps2;                /* more driver specific capabilites */
-    DWORD	dwCKeyCaps;             /* color key capabilities of the surface */
-    DWORD	dwFXCaps;               /* driver specific stretching and effects capabilites */
-    DWORD	dwFXAlphaCaps;          /* alpha driver specific capabilities */
-    DWORD	dwPalCaps;              /* palette capabilities */
-    DWORD	dwSVCaps;               /* stereo vision capabilities */
-    DWORD	dwAlphaBltConstBitDepths;       /* DDBD_2,4,8 */
-    DWORD	dwAlphaBltPixelBitDepths;       /* DDBD_1,2,4,8 */
-    DWORD	dwAlphaBltSurfaceBitDepths;     /* DDBD_1,2,4,8 */
-    DWORD	dwAlphaOverlayConstBitDepths;   /* DDBD_2,4,8 */
-    DWORD	dwAlphaOverlayPixelBitDepths;   /* DDBD_1,2,4,8 */
-    DWORD	dwAlphaOverlaySurfaceBitDepths; /* DDBD_1,2,4,8 */
-    DWORD	dwZBufferBitDepths;             /* DDBD_8,16,24,32 */
-    DWORD	dwVidMemTotal;          /* total amount of video memory */
-    DWORD	dwVidMemFree;           /* amount of free video memory */
-    DWORD	dwMaxVisibleOverlays;   /* maximum number of visible overlays */
-    DWORD	dwCurrVisibleOverlays;  /* current number of visible overlays */
-    DWORD	dwNumFourCCCodes;       /* number of four cc codes */
-    DWORD	dwAlignBoundarySrc;     /* source rectangle alignment */
-    DWORD	dwAlignSizeSrc;         /* source rectangle byte size */
-    DWORD	dwAlignBoundaryDest;    /* dest rectangle alignment */
-    DWORD	dwAlignSizeDest;        /* dest rectangle byte size */
-    DWORD	dwAlignStrideAlign;     /* stride alignment */
-    DWORD	dwRops[DD_ROP_SPACE];   /* ROPS supported */
-    DDSCAPS	ddsOldCaps;             /* old DDSCAPS - superceded for DirectX6+ */
-    DWORD	dwMinOverlayStretch;    /* minimum overlay stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */
-    DWORD	dwMaxOverlayStretch;    /* maximum overlay stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */
-    DWORD	dwMinLiveVideoStretch;  /* minimum live video stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */
-    DWORD	dwMaxLiveVideoStretch;  /* maximum live video stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */
-    DWORD	dwMinHwCodecStretch;    /* minimum hardware codec stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */
-    DWORD	dwMaxHwCodecStretch;    /* maximum hardware codec stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */
-    DWORD	dwReserved1;
-    DWORD	dwReserved2;
-    DWORD	dwReserved3;
-    DWORD	dwSVBCaps;              /* driver specific capabilities for System->Vmem blts */
-    DWORD	dwSVBCKeyCaps;          /* driver color key capabilities for System->Vmem blts */
-    DWORD	dwSVBFXCaps;            /* driver FX capabilities for System->Vmem blts */
-    DWORD	dwSVBRops[DD_ROP_SPACE];/* ROPS supported for System->Vmem blts */
-    DWORD	dwVSBCaps;              /* driver specific capabilities for Vmem->System blts */
-    DWORD	dwVSBCKeyCaps;          /* driver color key capabilities for Vmem->System blts */
-    DWORD	dwVSBFXCaps;            /* driver FX capabilities for Vmem->System blts */
-    DWORD	dwVSBRops[DD_ROP_SPACE];/* ROPS supported for Vmem->System blts */
-    DWORD	dwSSBCaps;              /* driver specific capabilities for System->System blts */
-    DWORD	dwSSBCKeyCaps;          /* driver color key capabilities for System->System blts */
-    DWORD	dwSSBFXCaps;            /* driver FX capabilities for System->System blts */
-    DWORD	dwSSBRops[DD_ROP_SPACE];/* ROPS supported for System->System blts */
-    DWORD       dwMaxVideoPorts;        /* maximum number of usable video ports */
-    DWORD   	dwCurrVideoPorts;       /* current number of video ports used */
-    DWORD   	dwSVBCaps2;             /* more driver specific capabilities for System->Vmem blts */
-    DWORD   	dwNLVBCaps;             /* driver specific capabilities for non-local->local vidmem blts */
-    DWORD   	dwNLVBCaps2;            /* more driver specific capabilities non-local->local vidmem blts */
-    DWORD   	dwNLVBCKeyCaps;         /* driver color key capabilities for non-local->local vidmem blts */
-    DWORD   	dwNLVBFXCaps;           /* driver FX capabilities for non-local->local blts */
-    DWORD   	dwNLVBRops[DD_ROP_SPACE]; /* ROPS supported for non-local->local blts */
-    /* and one new member for DirectX 6 */
-    DDSCAPS2    ddsCaps;		/* surface capabilities */
-} DDCAPS_DX6,*LPDDCAPS_DX6;
-
-typedef struct _DDCAPS_DX5		/* DirectX5 version of caps struct */
-{
-    DWORD	dwSize;                 /* size of the DDDRIVERCAPS structure */
-    DWORD	dwCaps;                 /* driver specific capabilities */
-    DWORD	dwCaps2;                /* more driver specific capabilites */
-    DWORD	dwCKeyCaps;             /* color key capabilities of the surface */
-    DWORD	dwFXCaps;               /* driver specific stretching and effects capabilites */
-    DWORD	dwFXAlphaCaps;          /* alpha driver specific capabilities */
-    DWORD	dwPalCaps;              /* palette capabilities */
-    DWORD	dwSVCaps;               /* stereo vision capabilities */
-    DWORD	dwAlphaBltConstBitDepths;       /* DDBD_2,4,8 */
-    DWORD	dwAlphaBltPixelBitDepths;       /* DDBD_1,2,4,8 */
-    DWORD	dwAlphaBltSurfaceBitDepths;     /* DDBD_1,2,4,8 */
-    DWORD	dwAlphaOverlayConstBitDepths;   /* DDBD_2,4,8 */
-    DWORD	dwAlphaOverlayPixelBitDepths;   /* DDBD_1,2,4,8 */
-    DWORD	dwAlphaOverlaySurfaceBitDepths; /* DDBD_1,2,4,8 */
-    DWORD	dwZBufferBitDepths;             /* DDBD_8,16,24,32 */
-    DWORD	dwVidMemTotal;          /* total amount of video memory */
-    DWORD	dwVidMemFree;           /* amount of free video memory */
-    DWORD	dwMaxVisibleOverlays;   /* maximum number of visible overlays */
-    DWORD	dwCurrVisibleOverlays;  /* current number of visible overlays */
-    DWORD	dwNumFourCCCodes;       /* number of four cc codes */
-    DWORD	dwAlignBoundarySrc;     /* source rectangle alignment */
-    DWORD	dwAlignSizeSrc;         /* source rectangle byte size */
-    DWORD	dwAlignBoundaryDest;    /* dest rectangle alignment */
-    DWORD	dwAlignSizeDest;        /* dest rectangle byte size */
-    DWORD	dwAlignStrideAlign;     /* stride alignment */
-    DWORD	dwRops[DD_ROP_SPACE];   /* ROPS supported */
-    DDSCAPS	ddsCaps;                /* DDSCAPS structure has all the general capabilities */
-    DWORD	dwMinOverlayStretch;    /* minimum overlay stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */
-    DWORD	dwMaxOverlayStretch;    /* maximum overlay stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */
-    DWORD	dwMinLiveVideoStretch;  /* minimum live video stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */
-    DWORD	dwMaxLiveVideoStretch;  /* maximum live video stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */
-    DWORD	dwMinHwCodecStretch;    /* minimum hardware codec stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */
-    DWORD	dwMaxHwCodecStretch;    /* maximum hardware codec stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */
-    DWORD	dwReserved1;
-    DWORD	dwReserved2;
-    DWORD	dwReserved3;
-    DWORD	dwSVBCaps;              /* driver specific capabilities for System->Vmem blts */
-    DWORD	dwSVBCKeyCaps;          /* driver color key capabilities for System->Vmem blts */
-    DWORD	dwSVBFXCaps;            /* driver FX capabilities for System->Vmem blts */
-    DWORD	dwSVBRops[DD_ROP_SPACE];/* ROPS supported for System->Vmem blts */
-    DWORD	dwVSBCaps;              /* driver specific capabilities for Vmem->System blts */
-    DWORD	dwVSBCKeyCaps;          /* driver color key capabilities for Vmem->System blts */
-    DWORD	dwVSBFXCaps;            /* driver FX capabilities for Vmem->System blts */
-    DWORD	dwVSBRops[DD_ROP_SPACE];/* ROPS supported for Vmem->System blts */
-    DWORD	dwSSBCaps;              /* driver specific capabilities for System->System blts */
-    DWORD	dwSSBCKeyCaps;          /* driver color key capabilities for System->System blts */
-    DWORD	dwSSBFXCaps;            /* driver FX capabilities for System->System blts */
-    DWORD	dwSSBRops[DD_ROP_SPACE];/* ROPS supported for System->System blts */
-    /* the following are the new DirectX 5 members */
-    DWORD       dwMaxVideoPorts;        /* maximum number of usable video ports */
-    DWORD   	dwCurrVideoPorts;       /* current number of video ports used */
-    DWORD   	dwSVBCaps2;             /* more driver specific capabilities for System->Vmem blts */
-    DWORD   	dwNLVBCaps;             /* driver specific capabilities for non-local->local vidmem blts */
-    DWORD   	dwNLVBCaps2;            /* more driver specific capabilities non-local->local vidmem blts */
-    DWORD   	dwNLVBCKeyCaps;         /* driver color key capabilities for non-local->local vidmem blts */
-    DWORD   	dwNLVBFXCaps;           /* driver FX capabilities for non-local->local blts */
-    DWORD   	dwNLVBRops[DD_ROP_SPACE]; /* ROPS supported for non-local->local blts */
-} DDCAPS_DX5,*LPDDCAPS_DX5;
-
-typedef struct _DDCAPS_DX3		/* DirectX3 version of caps struct */
-{
-    DWORD	dwSize;                 /* size of the DDDRIVERCAPS structure */
-    DWORD	dwCaps;                 /* driver specific capabilities */
-    DWORD	dwCaps2;                /* more driver specific capabilites */
-    DWORD	dwCKeyCaps;             /* color key capabilities of the surface */
-    DWORD	dwFXCaps;               /* driver specific stretching and effects capabilites */
-    DWORD	dwFXAlphaCaps;          /* alpha driver specific capabilities */
-    DWORD	dwPalCaps;              /* palette capabilities */
-    DWORD	dwSVCaps;               /* stereo vision capabilities */
-    DWORD	dwAlphaBltConstBitDepths;       /* DDBD_2,4,8 */
-    DWORD	dwAlphaBltPixelBitDepths;       /* DDBD_1,2,4,8 */
-    DWORD	dwAlphaBltSurfaceBitDepths;     /* DDBD_1,2,4,8 */
-    DWORD	dwAlphaOverlayConstBitDepths;   /* DDBD_2,4,8 */
-    DWORD	dwAlphaOverlayPixelBitDepths;   /* DDBD_1,2,4,8 */
-    DWORD	dwAlphaOverlaySurfaceBitDepths; /* DDBD_1,2,4,8 */
-    DWORD	dwZBufferBitDepths;             /* DDBD_8,16,24,32 */
-    DWORD	dwVidMemTotal;          /* total amount of video memory */
-    DWORD	dwVidMemFree;           /* amount of free video memory */
-    DWORD	dwMaxVisibleOverlays;   /* maximum number of visible overlays */
-    DWORD	dwCurrVisibleOverlays;  /* current number of visible overlays */
-    DWORD	dwNumFourCCCodes;       /* number of four cc codes */
-    DWORD	dwAlignBoundarySrc;     /* source rectangle alignment */
-    DWORD	dwAlignSizeSrc;         /* source rectangle byte size */
-    DWORD	dwAlignBoundaryDest;    /* dest rectangle alignment */
-    DWORD	dwAlignSizeDest;        /* dest rectangle byte size */
-    DWORD	dwAlignStrideAlign;     /* stride alignment */
-    DWORD	dwRops[DD_ROP_SPACE];   /* ROPS supported */
-    DDSCAPS	ddsCaps;                /* DDSCAPS structure has all the general capabilities */
-    DWORD	dwMinOverlayStretch;    /* minimum overlay stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */
-    DWORD	dwMaxOverlayStretch;    /* maximum overlay stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */
-    DWORD	dwMinLiveVideoStretch;  /* minimum live video stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */
-    DWORD	dwMaxLiveVideoStretch;  /* maximum live video stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */
-    DWORD	dwMinHwCodecStretch;    /* minimum hardware codec stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */
-    DWORD	dwMaxHwCodecStretch;    /* maximum hardware codec stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */
-    DWORD	dwReserved1;
-    DWORD	dwReserved2;
-    DWORD	dwReserved3;
-    DWORD	dwSVBCaps;              /* driver specific capabilities for System->Vmem blts */
-    DWORD	dwSVBCKeyCaps;          /* driver color key capabilities for System->Vmem blts */
-    DWORD	dwSVBFXCaps;            /* driver FX capabilities for System->Vmem blts */
-    DWORD	dwSVBRops[DD_ROP_SPACE];/* ROPS supported for System->Vmem blts */
-    DWORD	dwVSBCaps;              /* driver specific capabilities for Vmem->System blts */
-    DWORD	dwVSBCKeyCaps;          /* driver color key capabilities for Vmem->System blts */
-    DWORD	dwVSBFXCaps;            /* driver FX capabilities for Vmem->System blts */
-    DWORD	dwVSBRops[DD_ROP_SPACE];/* ROPS supported for Vmem->System blts */
-    DWORD	dwSSBCaps;              /* driver specific capabilities for System->System blts */
-    DWORD	dwSSBCKeyCaps;          /* driver color key capabilities for System->System blts */
-    DWORD	dwSSBFXCaps;            /* driver FX capabilities for System->System blts */
-    DWORD	dwSSBRops[DD_ROP_SPACE];/* ROPS supported for System->System blts */
-    DWORD	dwReserved4;
-    DWORD	dwReserved5;
-    DWORD	dwReserved6;
-} DDCAPS_DX3,*LPDDCAPS_DX3;
-
-/* set caps struct according to DIRECTDRAW_VERSION */
-
-#if DIRECTDRAW_VERSION <= 0x300
-typedef DDCAPS_DX3 DDCAPS;
-#elif DIRECTDRAW_VERSION <= 0x500
-typedef DDCAPS_DX5 DDCAPS;
-#elif DIRECTDRAW_VERSION <= 0x600
-typedef DDCAPS_DX6 DDCAPS;
-#else
-typedef DDCAPS_DX7 DDCAPS;
-#endif
-
-typedef DDCAPS *LPDDCAPS;
-
-/* DDCAPS.dwCaps */
-#define DDCAPS_3D			0x00000001
-#define DDCAPS_ALIGNBOUNDARYDEST	0x00000002
-#define DDCAPS_ALIGNSIZEDEST		0x00000004
-#define DDCAPS_ALIGNBOUNDARYSRC		0x00000008
-#define DDCAPS_ALIGNSIZESRC		0x00000010
-#define DDCAPS_ALIGNSTRIDE		0x00000020
-#define DDCAPS_BLT			0x00000040
-#define DDCAPS_BLTQUEUE			0x00000080
-#define DDCAPS_BLTFOURCC		0x00000100
-#define DDCAPS_BLTSTRETCH		0x00000200
-#define DDCAPS_GDI			0x00000400
-#define DDCAPS_OVERLAY			0x00000800
-#define DDCAPS_OVERLAYCANTCLIP		0x00001000
-#define DDCAPS_OVERLAYFOURCC		0x00002000
-#define DDCAPS_OVERLAYSTRETCH		0x00004000
-#define DDCAPS_PALETTE			0x00008000
-#define DDCAPS_PALETTEVSYNC		0x00010000
-#define DDCAPS_READSCANLINE		0x00020000
-#define DDCAPS_STEREOVIEW		0x00040000
-#define DDCAPS_VBI			0x00080000
-#define DDCAPS_ZBLTS			0x00100000
-#define DDCAPS_ZOVERLAYS		0x00200000
-#define DDCAPS_COLORKEY			0x00400000
-#define DDCAPS_ALPHA			0x00800000
-#define DDCAPS_COLORKEYHWASSIST		0x01000000
-#define DDCAPS_NOHARDWARE		0x02000000
-#define DDCAPS_BLTCOLORFILL		0x04000000
-#define DDCAPS_BANKSWITCHED		0x08000000
-#define DDCAPS_BLTDEPTHFILL		0x10000000
-#define DDCAPS_CANCLIP			0x20000000
-#define DDCAPS_CANCLIPSTRETCHED		0x40000000
-#define DDCAPS_CANBLTSYSMEM		0x80000000
-
-/* DDCAPS.dwCaps2 */
-#define DDCAPS2_CERTIFIED		0x00000001
-#define DDCAPS2_NO2DDURING3DSCENE       0x00000002
-#define DDCAPS2_VIDEOPORT		0x00000004
-#define DDCAPS2_AUTOFLIPOVERLAY		0x00000008
-#define DDCAPS2_CANBOBINTERLEAVED	0x00000010
-#define DDCAPS2_CANBOBNONINTERLEAVED	0x00000020
-#define DDCAPS2_COLORCONTROLOVERLAY	0x00000040
-#define DDCAPS2_COLORCONTROLPRIMARY	0x00000080
-#define DDCAPS2_CANDROPZ16BIT		0x00000100
-#define DDCAPS2_NONLOCALVIDMEM		0x00000200
-#define DDCAPS2_NONLOCALVIDMEMCAPS	0x00000400
-#define DDCAPS2_NOPAGELOCKREQUIRED	0x00000800
-#define DDCAPS2_WIDESURFACES		0x00001000
-#define DDCAPS2_CANFLIPODDEVEN		0x00002000
-#define DDCAPS2_CANBOBHARDWARE		0x00004000
-#define DDCAPS2_COPYFOURCC              0x00008000
-#define DDCAPS2_PRIMARYGAMMA            0x00020000
-#define DDCAPS2_CANRENDERWINDOWED       0x00080000
-#define DDCAPS2_CANCALIBRATEGAMMA       0x00100000
-#define DDCAPS2_FLIPINTERVAL            0x00200000
-#define DDCAPS2_FLIPNOVSYNC             0x00400000
-#define DDCAPS2_CANMANAGETEXTURE        0x00800000
-#define DDCAPS2_TEXMANINNONLOCALVIDMEM  0x01000000
-#define DDCAPS2_STEREO                  0x02000000
-#define DDCAPS2_SYSTONONLOCAL_AS_SYSTOLOCAL   0x04000000
-
-
-/* Set/Get Colour Key Flags */
-#define DDCKEY_COLORSPACE  0x00000001  /* Struct is single colour space */
-#define DDCKEY_DESTBLT     0x00000002  /* To be used as dest for blt */
-#define DDCKEY_DESTOVERLAY 0x00000004  /* To be used as dest for CK overlays */
-#define DDCKEY_SRCBLT      0x00000008  /* To be used as src for blt */
-#define DDCKEY_SRCOVERLAY  0x00000010  /* To be used as src for CK overlays */
-
-typedef struct _DDCOLORKEY
-{
-	DWORD	dwColorSpaceLowValue;/* low boundary of color space that is to
-                                      * be treated as Color Key, inclusive
-				      */
-	DWORD	dwColorSpaceHighValue;/* high boundary of color space that is
-                                       * to be treated as Color Key, inclusive
-				       */
-} DDCOLORKEY,*LPDDCOLORKEY;
-
-/* ddCKEYCAPS bits */
-#define DDCKEYCAPS_DESTBLT			0x00000001
-#define DDCKEYCAPS_DESTBLTCLRSPACE		0x00000002
-#define DDCKEYCAPS_DESTBLTCLRSPACEYUV		0x00000004
-#define DDCKEYCAPS_DESTBLTYUV			0x00000008
-#define DDCKEYCAPS_DESTOVERLAY			0x00000010
-#define DDCKEYCAPS_DESTOVERLAYCLRSPACE		0x00000020
-#define DDCKEYCAPS_DESTOVERLAYCLRSPACEYUV	0x00000040
-#define DDCKEYCAPS_DESTOVERLAYONEACTIVE		0x00000080
-#define DDCKEYCAPS_DESTOVERLAYYUV		0x00000100
-#define DDCKEYCAPS_SRCBLT			0x00000200
-#define DDCKEYCAPS_SRCBLTCLRSPACE		0x00000400
-#define DDCKEYCAPS_SRCBLTCLRSPACEYUV		0x00000800
-#define DDCKEYCAPS_SRCBLTYUV			0x00001000
-#define DDCKEYCAPS_SRCOVERLAY			0x00002000
-#define DDCKEYCAPS_SRCOVERLAYCLRSPACE		0x00004000
-#define DDCKEYCAPS_SRCOVERLAYCLRSPACEYUV	0x00008000
-#define DDCKEYCAPS_SRCOVERLAYONEACTIVE		0x00010000
-#define DDCKEYCAPS_SRCOVERLAYYUV		0x00020000
-#define DDCKEYCAPS_NOCOSTOVERLAY		0x00040000
-
-typedef struct _DDPIXELFORMAT {
-    DWORD	dwSize;                 /* 0: size of structure */
-    DWORD	dwFlags;                /* 4: pixel format flags */
-    DWORD	dwFourCC;               /* 8: (FOURCC code) */
-    union {
-	DWORD	dwRGBBitCount;          /* C: how many bits per pixel */
-	DWORD	dwYUVBitCount;          /* C: how many bits per pixel */
-	DWORD	dwZBufferBitDepth;      /* C: how many bits for z buffers */
-	DWORD	dwAlphaBitDepth;        /* C: how many bits for alpha channels*/
-	DWORD	dwLuminanceBitCount;
-	DWORD	dwBumpBitCount;
-    } DUMMYUNIONNAME1;
-    union {
-	DWORD	dwRBitMask;             /* 10: mask for red bit*/
-	DWORD	dwYBitMask;             /* 10: mask for Y bits*/
-	DWORD	dwStencilBitDepth;
-	DWORD	dwLuminanceBitMask;
-	DWORD	dwBumpDuBitMask;
-    } DUMMYUNIONNAME2;
-    union {
-	DWORD	dwGBitMask;             /* 14: mask for green bits*/
-	DWORD	dwUBitMask;             /* 14: mask for U bits*/
-	DWORD	dwZBitMask;
-	DWORD	dwBumpDvBitMask;
-    } DUMMYUNIONNAME3;
-    union {
-	DWORD   dwBBitMask;             /* 18: mask for blue bits*/
-	DWORD   dwVBitMask;             /* 18: mask for V bits*/
-	DWORD	dwStencilBitMask;
-	DWORD	dwBumpLuminanceBitMask;
-    } DUMMYUNIONNAME4;
-    union {
-    	DWORD	dwRGBAlphaBitMask;	/* 1C: mask for alpha channel */
-    	DWORD	dwYUVAlphaBitMask;	/* 1C: mask for alpha channel */
-	DWORD	dwLuminanceAlphaBitMask;
-	DWORD	dwRGBZBitMask;		/* 1C: mask for Z channel */
-	DWORD	dwYUVZBitMask;		/* 1C: mask for Z channel */
-    } DUMMYUNIONNAME5;
-    					/* 20: next structure */
-} DDPIXELFORMAT,*LPDDPIXELFORMAT;
-
-/* DDCAPS.dwFXCaps */
-#define DDFXCAPS_BLTALPHA               0x00000001
-#define DDFXCAPS_OVERLAYALPHA           0x00000004
-#define DDFXCAPS_BLTARITHSTRETCHYN	0x00000010
-#define DDFXCAPS_BLTARITHSTRETCHY	0x00000020
-#define DDFXCAPS_BLTMIRRORLEFTRIGHT	0x00000040
-#define DDFXCAPS_BLTMIRRORUPDOWN	0x00000080
-#define DDFXCAPS_BLTROTATION		0x00000100
-#define DDFXCAPS_BLTROTATION90		0x00000200
-#define DDFXCAPS_BLTSHRINKX		0x00000400
-#define DDFXCAPS_BLTSHRINKXN		0x00000800
-#define DDFXCAPS_BLTSHRINKY		0x00001000
-#define DDFXCAPS_BLTSHRINKYN		0x00002000
-#define DDFXCAPS_BLTSTRETCHX		0x00004000
-#define DDFXCAPS_BLTSTRETCHXN		0x00008000
-#define DDFXCAPS_BLTSTRETCHY		0x00010000
-#define DDFXCAPS_BLTSTRETCHYN		0x00020000
-#define DDFXCAPS_OVERLAYARITHSTRETCHY	0x00040000
-#define DDFXCAPS_OVERLAYARITHSTRETCHYN	0x00000008
-#define DDFXCAPS_OVERLAYSHRINKX		0x00080000
-#define DDFXCAPS_OVERLAYSHRINKXN	0x00100000
-#define DDFXCAPS_OVERLAYSHRINKY		0x00200000
-#define DDFXCAPS_OVERLAYSHRINKYN	0x00400000
-#define DDFXCAPS_OVERLAYSTRETCHX	0x00800000
-#define DDFXCAPS_OVERLAYSTRETCHXN	0x01000000
-#define DDFXCAPS_OVERLAYSTRETCHY	0x02000000
-#define DDFXCAPS_OVERLAYSTRETCHYN	0x04000000
-#define DDFXCAPS_OVERLAYMIRRORLEFTRIGHT	0x08000000
-#define DDFXCAPS_OVERLAYMIRRORUPDOWN	0x10000000
-
-#define DDFXCAPS_OVERLAYFILTER          DDFXCAPS_OVERLAYARITHSTRETCHY
-
-/* DDCAPS.dwFXAlphaCaps */
-#define DDFXALPHACAPS_BLTALPHAEDGEBLEND		0x00000001
-#define DDFXALPHACAPS_BLTALPHAPIXELS		0x00000002
-#define DDFXALPHACAPS_BLTALPHAPIXELSNEG		0x00000004
-#define DDFXALPHACAPS_BLTALPHASURFACES		0x00000008
-#define DDFXALPHACAPS_BLTALPHASURFACESNEG	0x00000010
-#define DDFXALPHACAPS_OVERLAYALPHAEDGEBLEND	0x00000020
-#define DDFXALPHACAPS_OVERLAYALPHAPIXELS	0x00000040
-#define DDFXALPHACAPS_OVERLAYALPHAPIXELSNEG	0x00000080
-#define DDFXALPHACAPS_OVERLAYALPHASURFACES	0x00000100
-#define DDFXALPHACAPS_OVERLAYALPHASURFACESNEG	0x00000200
-
-/* DDCAPS.dwPalCaps */
-#define DDPCAPS_4BIT			0x00000001
-#define DDPCAPS_8BITENTRIES		0x00000002
-#define DDPCAPS_8BIT			0x00000004
-#define DDPCAPS_INITIALIZE		0x00000008
-#define DDPCAPS_PRIMARYSURFACE		0x00000010
-#define DDPCAPS_PRIMARYSURFACELEFT	0x00000020
-#define DDPCAPS_ALLOW256		0x00000040
-#define DDPCAPS_VSYNC			0x00000080
-#define DDPCAPS_1BIT			0x00000100
-#define DDPCAPS_2BIT			0x00000200
-#define DDPCAPS_ALPHA                   0x00000400
-
-/* DDCAPS.dwSVCaps */
-/* the first 4 of these are now obsolete */
-#if DIRECTDRAW_VERSION >= 0x700	/* FIXME: I'm not sure when this switch occured */
-#define DDSVCAPS_RESERVED1		0x00000001
-#define DDSVCAPS_RESERVED2		0x00000002
-#define DDSVCAPS_RESERVED3		0x00000004
-#define DDSVCAPS_RESERVED4		0x00000008
-#else
-#define DDSVCAPS_ENIGMA			0x00000001
-#define DDSVCAPS_FLICKER		0x00000002
-#define DDSVCAPS_REDBLUE		0x00000004
-#define DDSVCAPS_SPLIT			0x00000008
-#endif
-#define DDSVCAPS_STEREOSEQUENTIAL       0x00000010
-
-/* BitDepths */
-#define DDBD_1				0x00004000
-#define DDBD_2				0x00002000
-#define DDBD_4				0x00001000
-#define DDBD_8				0x00000800
-#define DDBD_16				0x00000400
-#define DDBD_24				0x00000200
-#define DDBD_32				0x00000100
-
-/* DDOVERLAYFX.dwDDFX */
-#define DDOVERFX_ARITHSTRETCHY		0x00000001
-#define DDOVERFX_MIRRORLEFTRIGHT	0x00000002
-#define DDOVERFX_MIRRORUPDOWN		0x00000004
-
-/* UpdateOverlay flags */
-#define DDOVER_ALPHADEST                        0x00000001
-#define DDOVER_ALPHADESTCONSTOVERRIDE           0x00000002
-#define DDOVER_ALPHADESTNEG                     0x00000004
-#define DDOVER_ALPHADESTSURFACEOVERRIDE         0x00000008
-#define DDOVER_ALPHAEDGEBLEND                   0x00000010
-#define DDOVER_ALPHASRC                         0x00000020
-#define DDOVER_ALPHASRCCONSTOVERRIDE            0x00000040
-#define DDOVER_ALPHASRCNEG                      0x00000080
-#define DDOVER_ALPHASRCSURFACEOVERRIDE          0x00000100
-#define DDOVER_HIDE                             0x00000200
-#define DDOVER_KEYDEST                          0x00000400
-#define DDOVER_KEYDESTOVERRIDE                  0x00000800
-#define DDOVER_KEYSRC                           0x00001000
-#define DDOVER_KEYSRCOVERRIDE                   0x00002000
-#define DDOVER_SHOW                             0x00004000
-#define DDOVER_ADDDIRTYRECT                     0x00008000
-#define DDOVER_REFRESHDIRTYRECTS                0x00010000
-#define DDOVER_REFRESHALL                       0x00020000
-#define DDOVER_DDFX                             0x00080000
-#define DDOVER_AUTOFLIP                         0x00100000
-#define DDOVER_BOB                              0x00200000
-#define DDOVER_OVERRIDEBOBWEAVE                 0x00400000
-#define DDOVER_INTERLEAVED                      0x00800000
-
-/* DDCOLORKEY.dwFlags */
-#define DDPF_ALPHAPIXELS		0x00000001
-#define DDPF_ALPHA			0x00000002
-#define DDPF_FOURCC			0x00000004
-#define DDPF_PALETTEINDEXED4		0x00000008
-#define DDPF_PALETTEINDEXEDTO8		0x00000010
-#define DDPF_PALETTEINDEXED8		0x00000020
-#define DDPF_RGB			0x00000040
-#define DDPF_COMPRESSED			0x00000080
-#define DDPF_RGBTOYUV			0x00000100
-#define DDPF_YUV			0x00000200
-#define DDPF_ZBUFFER			0x00000400
-#define DDPF_PALETTEINDEXED1		0x00000800
-#define DDPF_PALETTEINDEXED2		0x00001000
-#define DDPF_ZPIXELS			0x00002000
-#define DDPF_STENCILBUFFER              0x00004000
-#define DDPF_ALPHAPREMULT               0x00008000
-#define DDPF_LUMINANCE                  0x00020000
-#define DDPF_BUMPLUMINANCE              0x00040000
-#define DDPF_BUMPDUDV                   0x00080000
-
-/* SetCooperativeLevel dwFlags */
-#define DDSCL_FULLSCREEN		0x00000001
-#define DDSCL_ALLOWREBOOT		0x00000002
-#define DDSCL_NOWINDOWCHANGES		0x00000004
-#define DDSCL_NORMAL			0x00000008
-#define DDSCL_EXCLUSIVE			0x00000010
-#define DDSCL_ALLOWMODEX		0x00000040
-#define DDSCL_SETFOCUSWINDOW		0x00000080
-#define DDSCL_SETDEVICEWINDOW		0x00000100
-#define DDSCL_CREATEDEVICEWINDOW	0x00000200
-#define DDSCL_MULTITHREADED             0x00000400
-#define DDSCL_FPUSETUP                  0x00000800
-#define DDSCL_FPUPRESERVE               0x00001000
-
-
-/* DDSURFACEDESC.dwFlags */
-#define	DDSD_CAPS		0x00000001
-#define	DDSD_HEIGHT		0x00000002
-#define	DDSD_WIDTH		0x00000004
-#define	DDSD_PITCH		0x00000008
-#define	DDSD_BACKBUFFERCOUNT	0x00000020
-#define	DDSD_ZBUFFERBITDEPTH	0x00000040
-#define	DDSD_ALPHABITDEPTH	0x00000080
-#define	DDSD_LPSURFACE		0x00000800
-#define	DDSD_PIXELFORMAT	0x00001000
-#define	DDSD_CKDESTOVERLAY	0x00002000
-#define	DDSD_CKDESTBLT		0x00004000
-#define	DDSD_CKSRCOVERLAY	0x00008000
-#define	DDSD_CKSRCBLT		0x00010000
-#define	DDSD_MIPMAPCOUNT	0x00020000
-#define	DDSD_REFRESHRATE	0x00040000
-#define	DDSD_LINEARSIZE		0x00080000
-#define DDSD_TEXTURESTAGE       0x00100000
-#define DDSD_FVF                0x00200000
-#define DDSD_SRCVBHANDLE        0x00400000
-#define	DDSD_ALL		0x007ff9ee
-
-/* EnumSurfaces flags */
-#define DDENUMSURFACES_ALL          0x00000001
-#define DDENUMSURFACES_MATCH        0x00000002
-#define DDENUMSURFACES_NOMATCH      0x00000004
-#define DDENUMSURFACES_CANBECREATED 0x00000008
-#define DDENUMSURFACES_DOESEXIST    0x00000010
-
-/* SetDisplayMode flags */
-#define DDSDM_STANDARDVGAMODE	0x00000001
-
-/* EnumDisplayModes flags */
-#define DDEDM_REFRESHRATES	0x00000001
-#define DDEDM_STANDARDVGAMODES	0x00000002
-
-/* WaitForVerticalDisplay flags */
-
-#define DDWAITVB_BLOCKBEGIN		0x00000001
-#define DDWAITVB_BLOCKBEGINEVENT	0x00000002
-#define DDWAITVB_BLOCKEND		0x00000004
-
-typedef struct _DDSURFACEDESC
-{
-	DWORD	dwSize;		/* 0: size of the DDSURFACEDESC structure*/
-	DWORD	dwFlags;	/* 4: determines what fields are valid*/
-	DWORD	dwHeight;	/* 8: height of surface to be created*/
-	DWORD	dwWidth;	/* C: width of input surface*/
-	union {
-		LONG	lPitch;	/* 10: distance to start of next line (return value only)*/
-		DWORD	dwLinearSize;
-	} DUMMYUNIONNAME1;
-	DWORD	dwBackBufferCount;/* 14: number of back buffers requested*/
-	union {
-		DWORD	dwMipMapCount;/* 18:number of mip-map levels requested*/
-		DWORD	dwZBufferBitDepth;/*18: depth of Z buffer requested*/
-		DWORD	dwRefreshRate;/* 18:refresh rate (used when display mode is described)*/
-	} DUMMYUNIONNAME2;		
-	DWORD	dwAlphaBitDepth;/* 1C:depth of alpha buffer requested*/
-	DWORD	dwReserved;	/* 20:reserved*/
-	LPVOID	lpSurface;	/* 24:pointer to the associated surface memory*/
-	DDCOLORKEY	ddckCKDestOverlay;/* 28: CK for dest overlay use*/
-	DDCOLORKEY	ddckCKDestBlt;	/* 30: CK for destination blt use*/
-	DDCOLORKEY	ddckCKSrcOverlay;/* 38: CK for source overlay use*/
-	DDCOLORKEY	ddckCKSrcBlt;	/* 40: CK for source blt use*/
-	DDPIXELFORMAT	ddpfPixelFormat;/* 48: pixel format description of the surface*/
-	DDSCAPS		ddsCaps;	/* 68: direct draw surface caps */
-} DDSURFACEDESC,*LPDDSURFACEDESC;
-
-typedef struct _DDSURFACEDESC2
-{
-	DWORD	dwSize;		/* 0: size of the DDSURFACEDESC structure*/
-	DWORD	dwFlags;	/* 4: determines what fields are valid*/
-	DWORD	dwHeight;	/* 8: height of surface to be created*/
-	DWORD	dwWidth;	/* C: width of input surface*/
-	union {
-		LONG	lPitch;	      /*10: distance to start of next line (return value only)*/
-		DWORD   dwLinearSize; /*10: formless late-allocated optimized surface size */
-	} DUMMYUNIONNAME1;
-	DWORD	dwBackBufferCount;/* 14: number of back buffers requested*/
-	union {
-		DWORD	dwMipMapCount;/* 18:number of mip-map levels requested*/
-		DWORD	dwRefreshRate;/* 18:refresh rate (used when display mode is described)*/
-		DWORD   dwSrcVBHandle;/* 18:source used in VB::Optimize */
-	} DUMMYUNIONNAME2;
-	DWORD	dwAlphaBitDepth;/* 1C:depth of alpha buffer requested*/
-	DWORD	dwReserved;	/* 20:reserved*/
-	LPVOID	lpSurface;	/* 24:pointer to the associated surface memory*/
-	union {
-		DDCOLORKEY	ddckCKDestOverlay; /* 28: CK for dest overlay use*/
-		DWORD 		dwEmptyFaceColor;  /* 28: color for empty cubemap faces */
-	} DUMMYUNIONNAME3;
-	DDCOLORKEY	ddckCKDestBlt;	/* 30: CK for destination blt use*/
-	DDCOLORKEY	ddckCKSrcOverlay;/* 38: CK for source overlay use*/
-	DDCOLORKEY	ddckCKSrcBlt;	/* 40: CK for source blt use*/
-
-	union {
-		DDPIXELFORMAT	ddpfPixelFormat;/* 48: pixel format description of the surface*/
-		DWORD 		dwFVF;	/* 48: vertex format description of vertex buffers */	
-	} DUMMYUNIONNAME4;
-	DDSCAPS2	ddsCaps;  /* 68: DDraw surface caps */
-	DWORD		dwTextureStage; /* 78: stage in multitexture cascade */
-} DDSURFACEDESC2,*LPDDSURFACEDESC2;
-
-/* DDCOLORCONTROL.dwFlags */
-#define DDCOLOR_BRIGHTNESS	0x00000001
-#define DDCOLOR_CONTRAST	0x00000002
-#define DDCOLOR_HUE		0x00000004
-#define DDCOLOR_SATURATION	0x00000008
-#define DDCOLOR_SHARPNESS	0x00000010
-#define DDCOLOR_GAMMA		0x00000020
-#define DDCOLOR_COLORENABLE	0x00000040
-
-typedef struct {
-	DWORD	dwSize;
-	DWORD	dwFlags;
-	LONG	lBrightness;
-	LONG	lContrast;
-	LONG	lHue;
-	LONG	lSaturation;
-	LONG	lSharpness;
-	LONG	lGamma;
-	LONG	lColorEnable;
-	DWORD	dwReserved1;
-} DDCOLORCONTROL,*LPDDCOLORCONTROL;
-
-typedef struct {
-	WORD	red[256];
-	WORD	green[256];
-	WORD	blue[256];
-} DDGAMMARAMP,*LPDDGAMMARAMP;
-
-typedef BOOL CALLBACK (*LPDDENUMCALLBACKA)(GUID *, LPSTR, LPSTR, LPVOID);
-typedef BOOL CALLBACK (*LPDDENUMCALLBACKW)(GUID *, LPWSTR, LPWSTR, LPVOID);
-DECL_WINELIB_TYPE_AW(LPDDENUMCALLBACK)
-
-typedef HRESULT CALLBACK (*LPDDENUMMODESCALLBACK)(LPDDSURFACEDESC, LPVOID);
-typedef HRESULT CALLBACK (*LPDDENUMMODESCALLBACK2)(LPDDSURFACEDESC2, LPVOID);
-typedef HRESULT CALLBACK (*LPDDENUMSURFACESCALLBACK)(LPDIRECTDRAWSURFACE, LPDDSURFACEDESC, LPVOID);
-typedef HRESULT CALLBACK (*LPDDENUMSURFACESCALLBACK2)(LPDIRECTDRAWSURFACE4, LPDDSURFACEDESC2, LPVOID);
-typedef HRESULT CALLBACK (*LPDDENUMSURFACESCALLBACK7)(LPDIRECTDRAWSURFACE7, LPDDSURFACEDESC2, LPVOID);
-
-typedef BOOL CALLBACK (*LPDDENUMCALLBACKEXA)(GUID *, LPSTR, LPSTR, LPVOID, HMONITOR);
-typedef BOOL CALLBACK (*LPDDENUMCALLBACKEXW)(GUID *, LPWSTR, LPWSTR, LPVOID, HMONITOR);
-DECL_WINELIB_TYPE_AW(LPDDENUMCALLBACKEX)
-
-HRESULT WINAPI DirectDrawEnumerateExA( LPDDENUMCALLBACKEXA lpCallback, LPVOID lpContext, DWORD dwFlags);
-HRESULT WINAPI DirectDrawEnumerateExW( LPDDENUMCALLBACKEXW lpCallback, LPVOID lpContext, DWORD dwFlags);
-#define DirectDrawEnumerateEx WINELIB_NAME_AW(DirectDrawEnumerateEx)
-
-/* flags for DirectDrawEnumerateEx */
-#define DDENUM_ATTACHEDSECONDARYDEVICES	0x00000001
-#define DDENUM_DETACHEDSECONDARYDEVICES	0x00000002
-#define DDENUM_NONDISPLAYDEVICES	0x00000004
-
-/* flags for DirectDrawCreate or IDirectDraw::Initialize */
-#define DDCREATE_HARDWAREONLY	1L
-#define DDCREATE_EMULATIONONLY	2L
-
-typedef struct _DDBLTFX
-{
-    DWORD       dwSize;                         /* size of structure */
-    DWORD       dwDDFX;                         /* FX operations */
-    DWORD       dwROP;                          /* Win32 raster operations */
-    DWORD       dwDDROP;                        /* Raster operations new for DirectDraw */
-    DWORD       dwRotationAngle;                /* Rotation angle for blt */
-    DWORD       dwZBufferOpCode;                /* ZBuffer compares */
-    DWORD       dwZBufferLow;                   /* Low limit of Z buffer */
-    DWORD       dwZBufferHigh;                  /* High limit of Z buffer */
-    DWORD       dwZBufferBaseDest;              /* Destination base value */
-    DWORD       dwZDestConstBitDepth;           /* Bit depth used to specify Z constant for destination */
-    union
-    {
-        DWORD   dwZDestConst;                   /* Constant to use as Z buffer for dest */
-        LPDIRECTDRAWSURFACE lpDDSZBufferDest;   /* Surface to use as Z buffer for dest */
-    } DUMMYUNIONNAME1;
-    DWORD       dwZSrcConstBitDepth;            /* Bit depth used to specify Z constant for source */
-    union
-    {
-        DWORD   dwZSrcConst;                    /* Constant to use as Z buffer for src */
-        LPDIRECTDRAWSURFACE lpDDSZBufferSrc;    /* Surface to use as Z buffer for src */
-    } DUMMYUNIONNAME2;
-    DWORD       dwAlphaEdgeBlendBitDepth;       /* Bit depth used to specify constant for alpha edge blend */
-    DWORD       dwAlphaEdgeBlend;               /* Alpha for edge blending */
-    DWORD       dwReserved;
-    DWORD       dwAlphaDestConstBitDepth;       /* Bit depth used to specify alpha constant for destination */
-    union
-    {
-        DWORD   dwAlphaDestConst;               /* Constant to use as Alpha Channel */
-        LPDIRECTDRAWSURFACE lpDDSAlphaDest;     /* Surface to use as Alpha Channel */
-    } DUMMYUNIONNAME3;
-    DWORD       dwAlphaSrcConstBitDepth;        /* Bit depth used to specify alpha constant for source */
-    union
-    {
-        DWORD   dwAlphaSrcConst;                /* Constant to use as Alpha Channel */
-        LPDIRECTDRAWSURFACE lpDDSAlphaSrc;      /* Surface to use as Alpha Channel */
-    } DUMMYUNIONNAME4;
-    union
-    {
-        DWORD   dwFillColor;                    /* color in RGB or Palettized */
-        DWORD   dwFillDepth;                    /* depth value for z-buffer */
-	DWORD   dwFillPixel;			/* pixel val for RGBA or RGBZ */
-        LPDIRECTDRAWSURFACE lpDDSPattern;       /* Surface to use as pattern */
-    } DUMMYUNIONNAME5;
-    DDCOLORKEY  ddckDestColorkey;               /* DestColorkey override */
-    DDCOLORKEY  ddckSrcColorkey;                /* SrcColorkey override */
-} DDBLTFX,*LPDDBLTFX;
-
-/* dwDDFX */
-/* arithmetic stretching along y axis */
-#define DDBLTFX_ARITHSTRETCHY			0x00000001
-/* mirror on y axis */
-#define DDBLTFX_MIRRORLEFTRIGHT			0x00000002
-/* mirror on x axis */
-#define DDBLTFX_MIRRORUPDOWN			0x00000004
-/* do not tear */
-#define DDBLTFX_NOTEARING			0x00000008
-/* 180 degrees clockwise rotation */
-#define DDBLTFX_ROTATE180			0x00000010
-/* 270 degrees clockwise rotation */
-#define DDBLTFX_ROTATE270			0x00000020
-/* 90 degrees clockwise rotation */
-#define DDBLTFX_ROTATE90			0x00000040
-/* dwZBufferLow and dwZBufferHigh specify limits to the copied Z values */
-#define DDBLTFX_ZBUFFERRANGE			0x00000080
-/* add dwZBufferBaseDest to every source z value before compare */
-#define DDBLTFX_ZBUFFERBASEDEST			0x00000100
-
-typedef struct _DDOVERLAYFX
-{
-    DWORD       dwSize;                         /* size of structure */
-    DWORD       dwAlphaEdgeBlendBitDepth;       /* Bit depth used to specify constant for alpha edge blend */
-    DWORD       dwAlphaEdgeBlend;               /* Constant to use as alpha for edge blend */
-    DWORD       dwReserved;
-    DWORD       dwAlphaDestConstBitDepth;       /* Bit depth used to specify alpha constant for destination */
-    union
-    {
-        DWORD   dwAlphaDestConst;               /* Constant to use as alpha channel for dest */
-        LPDIRECTDRAWSURFACE lpDDSAlphaDest;     /* Surface to use as alpha channel for dest */
-    } DUMMYUNIONNAME1;
-    DWORD       dwAlphaSrcConstBitDepth;        /* Bit depth used to specify alpha constant for source */
-    union
-    {
-        DWORD   dwAlphaSrcConst;                /* Constant to use as alpha channel for src */
-        LPDIRECTDRAWSURFACE lpDDSAlphaSrc;      /* Surface to use as alpha channel for src */
-    } DUMMYUNIONNAME2;
-    DDCOLORKEY  dckDestColorkey;                /* DestColorkey override */
-    DDCOLORKEY  dckSrcColorkey;                 /* DestColorkey override */
-    DWORD       dwDDFX;                         /* Overlay FX */
-    DWORD       dwFlags;                        /* flags */
-} DDOVERLAYFX,*LPDDOVERLAYFX;
-
-typedef struct _DDBLTBATCH
-{
-    LPRECT		lprDest;
-    LPDIRECTDRAWSURFACE	lpDDSSrc;
-    LPRECT		lprSrc;
-    DWORD		dwFlags;
-    LPDDBLTFX		lpDDBltFx;
-} DDBLTBATCH,*LPDDBLTBATCH;
-
-#define MAX_DDDEVICEID_STRING          512
-
-typedef struct tagDDDEVICEIDENTIFIER {
-  char    szDriver[MAX_DDDEVICEID_STRING];
-  char    szDescription[MAX_DDDEVICEID_STRING];
-  LARGE_INTEGER  liDriverVersion;
-  DWORD   dwVendorId;
-  DWORD   dwDeviceId;
-  DWORD   dwSubSysId;
-  DWORD   dwRevision;
-  GUID    guidDeviceIdentifier;
-} DDDEVICEIDENTIFIER, * LPDDDEVICEIDENTIFIER;
-
-typedef struct tagDDDEVICEIDENTIFIER2 {
-  char    szDriver[MAX_DDDEVICEID_STRING];	/* user readable driver name */
-  char    szDescription[MAX_DDDEVICEID_STRING]; /* user readable description */
-  LARGE_INTEGER  liDriverVersion;		/* driver version */
-  DWORD   dwVendorId;				/* vendor ID, zero if unknown */
-  DWORD   dwDeviceId;				/* chipset ID, zero if unknown */
-  DWORD   dwSubSysId;				/* board ID, zero if unknown */
-  DWORD   dwRevision;				/* chipset version, zero if unknown */
-  GUID    guidDeviceIdentifier;			/* unique ID for this driver/chipset combination */
-  DWORD   dwWHQLLevel;				/* Windows Hardware Quality Lab certification level */
-} DDDEVICEIDENTIFIER2, * LPDDDEVICEIDENTIFIER2;
-
-/*****************************************************************************
- * IDirectDrawPalette interface
- */
-#undef INTERFACE
-#define INTERFACE IDirectDrawPalette
-DECLARE_INTERFACE_(IDirectDrawPalette,IUnknown)
-{
-    STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
-    STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-    STDMETHOD_(ULONG,Release)(THIS) PURE;
-    STDMETHOD(GetCaps)(THIS_ LPDWORD lpdwCaps) PURE;
-    STDMETHOD(GetEntries)(THIS_ DWORD dwFlags, DWORD dwBase, DWORD dwNumEntries, LPPALETTEENTRY lpEntries) PURE;
-    STDMETHOD(Initialize)(THIS_ LPDIRECTDRAW lpDD, DWORD dwFlags, LPPALETTEENTRY lpDDColorTable) PURE;
-    STDMETHOD(SetEntries)(THIS_ DWORD dwFlags, DWORD dwStartingEntry, DWORD dwCount, LPPALETTEENTRY lpEntries) PURE;
-};
-
-    /*** IUnknown methods ***/
-#define IDirectDrawPalette_QueryInterface(p,a,b) ICOM_CALL_(QueryInterface,p,(p,a,b))
-#define IDirectDrawPalette_AddRef(p)             ICOM_CALL_(AddRef,p,(p))
-#define IDirectDrawPalette_Release(p)            ICOM_CALL_(Release,p,(p))
-    /*** IDirectDrawPalette methods ***/
-#define IDirectDrawPalette_GetCaps(p,a)          ICOM_CALL_(GetCaps,p,(p,a))
-#define IDirectDrawPalette_GetEntries(p,a,b,c,d) ICOM_CALL_(GetEntries,p,(p,a,b,c,d))
-#define IDirectDrawPalette_Initialize(p,a,b,c)   ICOM_CALL_(Initialize,p,(p,a,b,c))
-#define IDirectDrawPalette_SetEntries(p,a,b,c,d) ICOM_CALL_(SetEntries,p,(p,a,b,c,d))
-
-
-/*****************************************************************************
- * IDirectDrawClipper interface
- */
-#undef INTERFACE
-#define INTERFACE IDirectDrawClipper
-DECLARE_INTERFACE_(IDirectDrawClipper,IUnknown)
-{
-    STDMETHOD(QueryInterface)(THIS_ REFIID,LPVOID*) PURE;
-    STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-    STDMETHOD_(ULONG,Release)(THIS) PURE;
-    STDMETHOD(GetClipList)(THIS_ LPRECT lpRect, LPRGNDATA lpClipList, LPDWORD lpdwSize) PURE;
-    STDMETHOD(GetHWnd)(THIS_ HWND* lphWnd) PURE;
-    STDMETHOD(Initialize)(THIS_ LPDIRECTDRAW lpDD, DWORD dwFlags) PURE;
-    STDMETHOD(IsClipListChanged)(THIS_ BOOL* lpbChanged) PURE;
-    STDMETHOD(SetClipList)(THIS_ LPRGNDATA lpClipList, DWORD dwFlags) PURE;
-    STDMETHOD(SetHWnd)(THIS_ DWORD dwFlags, HWND hWnd) PURE;
-};
-
-    /*** IUnknown methods ***/
-#define IDirectDrawClipper_QueryInterface(p,a,b) ICOM_CALL_(QueryInterface,p,(p,a,b))
-#define IDirectDrawClipper_AddRef(p)             ICOM_CALL_(AddRef,p,(p))
-#define IDirectDrawClipper_Release(p)            ICOM_CALL_(Release,p,(p))
-    /*** IDirectDrawClipper methods ***/
-#define IDirectDrawClipper_GetClipList(p,a,b,c)   ICOM_CALL_(GetClipList,p,(p,a,b,c))
-#define IDirectDrawClipper_GetHWnd(p,a)           ICOM_CALL_(GetHWnd,p,(p,a))
-#define IDirectDrawClipper_Initialize(p,a,b)      ICOM_CALL_(Initialize,p,(p,a,b))
-#define IDirectDrawClipper_IsClipListChanged(p,a) ICOM_CALL_(IsClipListChanged,p,(p,a))
-#define IDirectDrawClipper_SetClipList(p,a,b)     ICOM_CALL_(SetClipList,p,(p,a,b))
-#define IDirectDrawClipper_SetHWnd(p,a,b)         ICOM_CALL_(SetHWnd,p,(p,a,b))
-
-
-/*****************************************************************************
- * IDirectDraw interface
- */
-#undef INTERFACE
-#define INTERFACE IDirectDraw
-DECLARE_INTERFACE_(IDirectDraw,IUnknown)
-{
-    STDMETHOD(QueryInterface)(THIS_ REFIID,LPVOID*) PURE;
-    STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-    STDMETHOD_(ULONG,Release)(THIS) PURE;
-    STDMETHOD(Compact)(THIS) PURE;
-    STDMETHOD(CreateClipper)(THIS_ DWORD dwFlags, LPDIRECTDRAWCLIPPER* lplpDDClipper, IUnknown* pUnkOuter) PURE;
-    STDMETHOD(CreatePalette)(THIS_ DWORD dwFlags, LPPALETTEENTRY lpColorTable, LPDIRECTDRAWPALETTE* lplpDDPalette, IUnknown* pUnkOuter) PURE;
-    STDMETHOD(CreateSurface)(THIS_ LPDDSURFACEDESC lpDDSurfaceDesc, LPDIRECTDRAWSURFACE* lplpDDSurface, IUnknown* pUnkOuter) PURE;
-    STDMETHOD(DuplicateSurface)(THIS_ LPDIRECTDRAWSURFACE lpDDSurface, LPDIRECTDRAWSURFACE* lplpDupDDSurface) PURE;
-    STDMETHOD(EnumDisplayModes)(THIS_ DWORD dwFlags, LPDDSURFACEDESC lpDDSurfaceDesc, LPVOID lpContext, LPDDENUMMODESCALLBACK lpEnumModesCallback) PURE;
-    STDMETHOD(EnumSurfaces)(THIS_ DWORD dwFlags, LPDDSURFACEDESC lpDDSD, LPVOID lpContext, LPDDENUMSURFACESCALLBACK lpEnumSurfacesCallback) PURE;
-    STDMETHOD(FlipToGDISurface)(THIS) PURE;
-    STDMETHOD(GetCaps)(THIS_ LPDDCAPS lpDDDriverCaps, LPDDCAPS lpDDHELCaps) PURE;
-    STDMETHOD(GetDisplayMode)(THIS_ LPDDSURFACEDESC lpDDSurfaceDesc) PURE;
-    STDMETHOD(GetFourCCCodes)(THIS_ LPDWORD lpNumCodes, LPDWORD lpCodes) PURE;
-    STDMETHOD(GetGDISurface)(THIS_ LPDIRECTDRAWSURFACE* lplpGDIDDSurface) PURE;
-    STDMETHOD(GetMonitorFrequency)(THIS_ LPDWORD lpdwFrequency) PURE;
-    STDMETHOD(GetScanLine)(THIS_ LPDWORD lpdwScanLine) PURE;
-    STDMETHOD(GetVerticalBlankStatus)(THIS_ BOOL* lpbIsInVB) PURE;
-    STDMETHOD(Initialize)(THIS_ GUID* lpGUID) PURE;
-    STDMETHOD(RestoreDisplayMode)(THIS) PURE;
-    STDMETHOD(SetCooperativeLevel)(THIS_ HWND hWnd, DWORD dwFlags) PURE;
-    STDMETHOD(SetDisplayMode)(THIS_ DWORD, DWORD, DWORD) PURE;
-    STDMETHOD(WaitForVerticalBlank)(THIS_ DWORD dwFlags, HANDLE hEvent) PURE;
-};
-
-    /*** IUnknown methods ***/
-#define IDirectDraw_QueryInterface(p,a,b) ICOM_CALL_(QueryInterface,p,(p,a,b))
-#define IDirectDraw_AddRef(p)             ICOM_CALL_(AddRef,p,(p))
-#define IDirectDraw_Release(p)            ICOM_CALL_(Release,p,(p))
-    /*** IDirectDraw methods ***/
-#define IDirectDraw_Compact(p)                  ICOM_CALL_(Compact,p,(p))
-#define IDirectDraw_CreateClipper(p,a,b,c)      ICOM_CALL_(CreateClipper,p,(p,a,b,c))
-#define IDirectDraw_CreatePalette(p,a,b,c,d)    ICOM_CALL_(CreatePalette,p,(p,a,b,c,d))
-#define IDirectDraw_CreateSurface(p,a,b,c)      ICOM_CALL_(CreateSurface,p,(p,a,b,c))
-#define IDirectDraw_DuplicateSurface(p,a,b)     ICOM_CALL_(DuplicateSurface,p,(p,a,b))
-#define IDirectDraw_EnumDisplayModes(p,a,b,c,d) ICOM_CALL_(EnumDisplayModes,p,(p,a,b,c,d))
-#define IDirectDraw_EnumSurfaces(p,a,b,c,d)     ICOM_CALL_(EnumSurfaces,p,(p,a,b,c,d))
-#define IDirectDraw_FlipToGDISurface(p)         ICOM_CALL_(FlipToGDISurface,p,(p))
-#define IDirectDraw_GetCaps(p,a,b)              ICOM_CALL_(GetCaps,p,(p,a,b))
-#define IDirectDraw_GetDisplayMode(p,a)         ICOM_CALL_(GetDisplayMode,p,(p,a))
-#define IDirectDraw_GetFourCCCodes(p,a,b)       ICOM_CALL_(GetFourCCCodes,p,(p,a,b))
-#define IDirectDraw_GetGDISurface(p,a)          ICOM_CALL_(GetGDISurface,p,(p,a))
-#define IDirectDraw_GetMonitorFrequency(p,a)    ICOM_CALL_(GetMonitorFrequency,p,(p,a))
-#define IDirectDraw_GetScanLine(p,a)            ICOM_CALL_(GetScanLine,p,(p,a))
-#define IDirectDraw_GetVerticalBlankStatus(p,a) ICOM_CALL_(GetVerticalBlankStatus,p,(p,a))
-#define IDirectDraw_Initialize(p,a)             ICOM_CALL_(Initialize,p,(p,a))
-#define IDirectDraw_RestoreDisplayMode(p)       ICOM_CALL_(RestoreDisplayMode,p,(p))
-#define IDirectDraw_SetCooperativeLevel(p,a,b)  ICOM_CALL_(SetCooperativeLevel,p,(p,a,b))
-#define IDirectDraw_SetDisplayMode(p,a,b,c)     ICOM_CALL_(SetDisplayMode,p,(p,a,b,c))
-#define IDirectDraw_WaitForVerticalBlank(p,a,b) ICOM_CALL_(WaitForVerticalBlank,p,(p,a,b))
-
-
-/* flags for Lock() */
-#define DDLOCK_SURFACEMEMORYPTR	0x00000000
-#define DDLOCK_WAIT		0x00000001
-#define DDLOCK_EVENT		0x00000002
-#define DDLOCK_READONLY		0x00000010
-#define DDLOCK_WRITEONLY	0x00000020
-#define DDLOCK_NOSYSLOCK	0x00000800
-
-
-/*****************************************************************************
- * IDirectDraw2 interface
- */
-/* Note: IDirectDraw2 cannot derive from IDirectDraw because the number of 
- * arguments of SetDisplayMode has changed !
- */
-#undef INTERFACE
-#define INTERFACE IDirectDraw2
-DECLARE_INTERFACE_(IDirectDraw2,IUnknown)
-{
-    STDMETHOD(QueryInterface)(THIS_ REFIID,LPVOID*) PURE;
-    STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-    STDMETHOD_(ULONG,Release)(THIS) PURE;
-    STDMETHOD(Compact)(THIS) PURE; 
-    STDMETHOD(CreateClipper)(THIS_ DWORD dwFlags, LPDIRECTDRAWCLIPPER* lplpDDClipper, IUnknown* pUnkOuter) PURE; 
-    STDMETHOD(CreatePalette)(THIS_ DWORD dwFlags, LPPALETTEENTRY lpColorTable, LPDIRECTDRAWPALETTE* lplpDDPalette, IUnknown* pUnkOuter) PURE; 
-    STDMETHOD(CreateSurface)(THIS_ LPDDSURFACEDESC lpDDSurfaceDesc, LPDIRECTDRAWSURFACE2* lplpDDSurface, IUnknown* pUnkOuter) PURE; 
-    STDMETHOD(DuplicateSurface)(THIS_ LPDIRECTDRAWSURFACE2 lpDDSurface, LPDIRECTDRAWSURFACE2* lplpDupDDSurface) PURE; 
-    STDMETHOD(EnumDisplayModes)(THIS_ DWORD dwFlags, LPDDSURFACEDESC lpDDSurfaceDesc, LPVOID lpContext, LPDDENUMMODESCALLBACK lpEnumModesCallback) PURE; 
-    STDMETHOD(EnumSurfaces)(THIS_ DWORD dwFlags, LPDDSURFACEDESC lpDDSD, LPVOID lpContext, LPDDENUMSURFACESCALLBACK lpEnumSurfacesCallback) PURE; 
-    STDMETHOD(FlipToGDISurface)(THIS) PURE; 
-    STDMETHOD(GetCaps)(THIS_ LPDDCAPS lpDDDriverCaps, LPDDCAPS lpDDHELCaps) PURE; 
-    STDMETHOD(GetDisplayMode)(THIS_ LPDDSURFACEDESC lpDDSurfaceDesc) PURE; 
-    STDMETHOD(GetFourCCCodes)(THIS_ LPDWORD lpNumCodes, LPDWORD lpCodes) PURE; 
-    STDMETHOD(GetGDISurface)(THIS_ LPDIRECTDRAWSURFACE2* lplpGDIDDSurface) PURE; 
-    STDMETHOD(GetMonitorFrequency)(THIS_ LPDWORD lpdwFrequency) PURE; 
-    STDMETHOD(GetScanLine)(THIS_ LPDWORD lpdwScanLine) PURE; 
-    STDMETHOD(GetVerticalBlankStatus)(THIS_ BOOL* lpbIsInVB) PURE; 
-    STDMETHOD(Initialize)(THIS_ GUID* lpGUID) PURE; 
-    STDMETHOD(RestoreDisplayMode)(THIS) PURE; 
-    STDMETHOD(SetCooperativeLevel)(THIS_ HWND hWnd, DWORD dwFlags) PURE; 
-    STDMETHOD(SetDisplayMode)(THIS_ DWORD dwWidth, DWORD dwHeight, DWORD dwBPP, DWORD dwRefreshRate, DWORD dwFlags) PURE; 
-    STDMETHOD(WaitForVerticalBlank)(THIS_ DWORD dwFlags, HANDLE hEvent) PURE; 
-           
-    STDMETHOD(GetAvailableVidMem)(THIS_ LPDDSCAPS lpDDCaps, LPDWORD lpdwTotal, LPDWORD lpdwFree) PURE;
-};
-
-    /*** IUnknown methods ***/
-#define IDirectDraw2_QueryInterface(p,a,b) ICOM_CALL_(QueryInterface,p,(p,a,b))
-#define IDirectDraw2_AddRef(p)             ICOM_CALL_(AddRef,p,(p))
-#define IDirectDraw2_Release(p)            ICOM_CALL_(Release,p,(p))
-    /*** IDirectDraw methods ***/
-#define IDirectDraw2_Compact(p)                  ICOM_CALL_(Compact,p,(p))
-#define IDirectDraw2_CreateClipper(p,a,b,c)      ICOM_CALL_(CreateClipper,p,(p,a,b,c))
-#define IDirectDraw2_CreatePalette(p,a,b,c,d)    ICOM_CALL_(CreatePalette,p,(p,a,b,c,d))
-#define IDirectDraw2_CreateSurface(p,a,b,c)      ICOM_CALL_(CreateSurface,p,(p,a,b,c))
-#define IDirectDraw2_DuplicateSurface(p,a,b)     ICOM_CALL_(DuplicateSurface,p,(p,a,b))
-#define IDirectDraw2_EnumDisplayModes(p,a,b,c,d) ICOM_CALL_(EnumDisplayModes,p,(p,a,b,c,d))
-#define IDirectDraw2_EnumSurfaces(p,a,b,c,d)     ICOM_CALL_(EnumSurfaces,p,(p,a,b,c,d))
-#define IDirectDraw2_FlipToGDISurface(p)         ICOM_CALL_(FlipToGDISurface,p,(p))
-#define IDirectDraw2_GetCaps(p,a,b)              ICOM_CALL_(GetCaps,p,(p,a,b))
-#define IDirectDraw2_GetDisplayMode(p,a)         ICOM_CALL_(GetDisplayMode,p,(p,a))
-#define IDirectDraw2_GetFourCCCodes(p,a,b)       ICOM_CALL_(GetFourCCCodes,p,(p,a,b))
-#define IDirectDraw2_GetGDISurface(p,a)          ICOM_CALL_(GetGDISurface,p,(p,a))
-#define IDirectDraw2_GetMonitorFrequency(p,a)    ICOM_CALL_(GetMonitorFrequency,p,(p,a))
-#define IDirectDraw2_GetScanLine(p,a)            ICOM_CALL_(GetScanLine,p,(p,a))
-#define IDirectDraw2_GetVerticalBlankStatus(p,a) ICOM_CALL_(GetVerticalBlankStatus,p,(p,a))
-#define IDirectDraw2_Initialize(p,a)             ICOM_CALL_(Initialize,p,(p,a))
-#define IDirectDraw2_RestoreDisplayMode(p)       ICOM_CALL_(RestoreDisplayMode,p,(p))
-#define IDirectDraw2_SetCooperativeLevel(p,a,b)  ICOM_CALL_(SetCooperativeLevel,p,(p,a,b))
-#define IDirectDraw2_SetDisplayMode(p,a,b,c,d,e) ICOM_CALL_(SetDisplayMode,p,(p,a,b,c,d,e))
-#define IDirectDraw2_WaitForVerticalBlank(p,a,b) ICOM_CALL_(WaitForVerticalBlank,p,(p,a,b))
-/*** IDirectDraw2 methods ***/
-#define IDirectDraw2_GetAvailableVidMem(p,a,b,c) ICOM_CALL_(GetAvailableVidMem,p,(p,a,b,c))
-
-
-/*****************************************************************************
- * IDirectDraw4 interface
- */
-#undef INTERFACE
-#define INTERFACE IDirectDraw4
-DECLARE_INTERFACE_(IDirectDraw4,IUnknown)
-{
-    STDMETHOD(QueryInterface)(THIS_ REFIID,LPVOID*) PURE;
-    STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-    STDMETHOD_(ULONG,Release)(THIS) PURE;
-    STDMETHOD(Compact)(THIS) PURE; 
-    STDMETHOD(CreateClipper)(THIS_ DWORD dwFlags, LPDIRECTDRAWCLIPPER* lplpDDClipper, IUnknown* pUnkOuter) PURE; 
-    STDMETHOD(CreatePalette)(THIS_ DWORD dwFlags, LPPALETTEENTRY lpColorTable, LPDIRECTDRAWPALETTE* lplpDDPalette, IUnknown* pUnkOuter) PURE; 
-    STDMETHOD(CreateSurface)(THIS_ LPDDSURFACEDESC2 lpDDSurfaceDesc, LPDIRECTDRAWSURFACE4* lplpDDSurface, IUnknown* pUnkOuter) PURE; 
-    STDMETHOD(DuplicateSurface)(THIS_ LPDIRECTDRAWSURFACE4 lpDDSurface, LPDIRECTDRAWSURFACE4* lplpDupDDSurface) PURE; 
-    STDMETHOD(EnumDisplayModes)(THIS_ DWORD dwFlags, LPDDSURFACEDESC2 lpDDSurfaceDesc, LPVOID lpContext, LPDDENUMMODESCALLBACK2 lpEnumModesCallback) PURE; 
-    STDMETHOD(EnumSurfaces)(THIS_ DWORD dwFlags, LPDDSURFACEDESC2 lpDDSD, LPVOID lpContext, LPDDENUMSURFACESCALLBACK2 lpEnumSurfacesCallback) PURE; 
-    STDMETHOD(FlipToGDISurface)(THIS) PURE; 
-    STDMETHOD(GetCaps)(THIS_ LPDDCAPS lpDDDriverCaps, LPDDCAPS lpDDHELCaps) PURE; 
-    STDMETHOD(GetDisplayMode)(THIS_ LPDDSURFACEDESC2 lpDDSurfaceDesc) PURE; 
-    STDMETHOD(GetFourCCCodes)(THIS_ LPDWORD lpNumCodes, LPDWORD lpCodes) PURE; 
-    STDMETHOD(GetGDISurface)(THIS_ LPDIRECTDRAWSURFACE4* lplpGDIDDSurface) PURE; 
-    STDMETHOD(GetMonitorFrequency)(THIS_ LPDWORD lpdwFrequency) PURE; 
-    STDMETHOD(GetScanLine)(THIS_ LPDWORD lpdwScanLine) PURE; 
-    STDMETHOD(GetVerticalBlankStatus)(THIS_ BOOL* lpbIsInVB) PURE; 
-    STDMETHOD(Initialize)(THIS_ GUID* lpGUID) PURE; 
-    STDMETHOD(RestoreDisplayMode)(THIS) PURE; 
-    STDMETHOD(SetCooperativeLevel)(THIS_ HWND hWnd, DWORD dwFlags) PURE; 
-    STDMETHOD(SetDisplayMode)(THIS_ DWORD dwWidth, DWORD dwHeight, DWORD dwBPP, DWORD dwRefreshRate, DWORD dwFlags) PURE; 
-    STDMETHOD(WaitForVerticalBlank)(THIS_ DWORD dwFlags, HANDLE hEvent) PURE; 
-           
-    STDMETHOD(GetAvailableVidMem)(THIS_ LPDDSCAPS2 lpDDCaps, LPDWORD lpdwTotal, LPDWORD lpdwFree) PURE; 
-     
-    STDMETHOD(GetSurfaceFromDC)(THIS_ HDC , LPDIRECTDRAWSURFACE4* ) PURE; 
-    STDMETHOD(RestoreAllSurfaces)(THIS) PURE; 
-    STDMETHOD(TestCooperativeLevel)(THIS) PURE; 
-    STDMETHOD(GetDeviceIdentifier)(THIS_ LPDDDEVICEIDENTIFIER , DWORD ) PURE;
-};
-
-    /*** IUnknown methods ***/
-#define IDirectDraw4_QueryInterface(p,a,b) ICOM_CALL_(QueryInterface,p,(p,a,b))
-#define IDirectDraw4_AddRef(p)             ICOM_CALL_(AddRef,p,(p))
-#define IDirectDraw4_Release(p)            ICOM_CALL_(Release,p,(p))
-    /*** IDirectDraw methods ***/
-#define IDirectDraw4_Compact(p)                  ICOM_CALL_(Compact,p,(p))
-#define IDirectDraw4_CreateClipper(p,a,b,c)      ICOM_CALL_(CreateClipper,p,(p,a,b,c))
-#define IDirectDraw4_CreatePalette(p,a,b,c,d)    ICOM_CALL_(CreatePalette,p,(p,a,b,c,d))
-#define IDirectDraw4_CreateSurface(p,a,b,c)      ICOM_CALL_(CreateSurface,p,(p,a,b,c))
-#define IDirectDraw4_DuplicateSurface(p,a,b)     ICOM_CALL_(DuplicateSurface,p,(p,a,b))
-#define IDirectDraw4_EnumDisplayModes(p,a,b,c,d) ICOM_CALL_(EnumDisplayModes,p,(p,a,b,c,d))
-#define IDirectDraw4_EnumSurfaces(p,a,b,c,d)     ICOM_CALL_(EnumSurfaces,p,(p,a,b,c,d))
-#define IDirectDraw4_FlipToGDISurface(p)         ICOM_CALL_(FlipToGDISurface,p,(p))
-#define IDirectDraw4_GetCaps(p,a,b)              ICOM_CALL_(GetCaps,p,(p,a,b))
-#define IDirectDraw4_GetDisplayMode(p,a)         ICOM_CALL_(GetDisplayMode,p,(p,a))
-#define IDirectDraw4_GetFourCCCodes(p,a,b)       ICOM_CALL_(GetFourCCCodes,p,(p,a,b))
-#define IDirectDraw4_GetGDISurface(p,a)          ICOM_CALL_(GetGDISurface,p,(p,a))
-#define IDirectDraw4_GetMonitorFrequency(p,a)    ICOM_CALL_(GetMonitorFrequency,p,(p,a))
-#define IDirectDraw4_GetScanLine(p,a)            ICOM_CALL_(GetScanLine,p,(p,a))
-#define IDirectDraw4_GetVerticalBlankStatus(p,a) ICOM_CALL_(GetVerticalBlankStatus,p,(p,a))
-#define IDirectDraw4_Initialize(p,a)             ICOM_CALL_(Initialize,p,(p,a))
-#define IDirectDraw4_RestoreDisplayMode(p)       ICOM_CALL_(RestoreDisplayMode,p,(p))
-#define IDirectDraw4_SetCooperativeLevel(p,a,b)  ICOM_CALL_(SetCooperativeLevel,p,(p,a,b))
-#define IDirectDraw4_SetDisplayMode(p,a,b,c,d,e) ICOM_CALL_(SetDisplayMode,p,(p,a,b,c,d,e))
-#define IDirectDraw4_WaitForVerticalBlank(p,a,b) ICOM_CALL_(WaitForVerticalBlank,p,(p,a,b))
-/*** IDirectDraw2 methods ***/
-#define IDirectDraw4_GetAvailableVidMem(p,a,b,c) ICOM_CALL_(GetAvailableVidMem,p,(p,a,b,c))
-/*** IDirectDraw4 methods ***/
-#define IDirectDraw4_GetSurfaceFromDC(p,a,b)    ICOM_CALL_(GetSurfaceFromDC,p,(p,a,b))
-#define IDirectDraw4_RestoreAllSurfaces(pc)     ICOM_CALL_(RestoreAllSurfaces,p,(p))
-#define IDirectDraw4_TestCooperativeLevel(p)    ICOM_CALL_(TestCooperativeLevel,p,(p))
-#define IDirectDraw4_GetDeviceIdentifier(p,a,b) ICOM_CALL_(GetDeviceIdentifier,p,(p,a,b))
-
-
-/*****************************************************************************
- * IDirectDraw7 interface
- */
-/* Note: IDirectDraw7 cannot derive from IDirectDraw4; it is even documented
- * as not interchangeable with earlier DirectDraw interfaces.
- */
-#undef INTERFACE
-#define INTERFACE IDirectDraw7
-DECLARE_INTERFACE_(IDirectDraw7,IUnknown)
-{
-    STDMETHOD(QueryInterface)(THIS_ REFIID,LPVOID*) PURE;
-    STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-    STDMETHOD_(ULONG,Release)(THIS) PURE;
-    STDMETHOD(Compact)(THIS) PURE; 
-    STDMETHOD(CreateClipper)(THIS_ DWORD dwFlags, LPDIRECTDRAWCLIPPER* lplpDDClipper, IUnknown* pUnkOuter) PURE; 
-    STDMETHOD(CreatePalette)(THIS_ DWORD dwFlags, LPPALETTEENTRY lpColorTable, LPDIRECTDRAWPALETTE* lplpDDPalette, IUnknown* pUnkOuter) PURE; 
-    STDMETHOD(CreateSurface)(THIS_ LPDDSURFACEDESC2 lpDDSurfaceDesc, LPDIRECTDRAWSURFACE7* lplpDDSurface, IUnknown* pUnkOuter) PURE; 
-    STDMETHOD(DuplicateSurface)(THIS_ LPDIRECTDRAWSURFACE7 lpDDSurface, LPDIRECTDRAWSURFACE7* lplpDupDDSurface) PURE; 
-    STDMETHOD(EnumDisplayModes)(THIS_ DWORD dwFlags, LPDDSURFACEDESC2 lpDDSurfaceDesc, LPVOID lpContext, LPDDENUMMODESCALLBACK2 lpEnumModesCallback) PURE; 
-    STDMETHOD(EnumSurfaces)(THIS_ DWORD dwFlags, LPDDSURFACEDESC2 lpDDSD, LPVOID lpContext, LPDDENUMSURFACESCALLBACK7 lpEnumSurfacesCallback) PURE; 
-    STDMETHOD(FlipToGDISurface)(THIS) PURE; 
-    STDMETHOD(GetCaps)(THIS_ LPDDCAPS lpDDDriverCaps, LPDDCAPS lpDDHELCaps) PURE; 
-    STDMETHOD(GetDisplayMode)(THIS_ LPDDSURFACEDESC2 lpDDSurfaceDesc) PURE; 
-    STDMETHOD(GetFourCCCodes)(THIS_ LPDWORD lpNumCodes, LPDWORD lpCodes) PURE; 
-    STDMETHOD(GetGDISurface)(THIS_ LPDIRECTDRAWSURFACE7* lplpGDIDDSurface) PURE; 
-    STDMETHOD(GetMonitorFrequency)(THIS_ LPDWORD lpdwFrequency) PURE; 
-    STDMETHOD(GetScanLine)(THIS_ LPDWORD lpdwScanLine) PURE; 
-    STDMETHOD(GetVerticalBlankStatus)(THIS_ BOOL* lpbIsInVB) PURE; 
-    STDMETHOD(Initialize)(THIS_ GUID* lpGUID) PURE; 
-    STDMETHOD(RestoreDisplayMode)(THIS) PURE; 
-    STDMETHOD(SetCooperativeLevel)(THIS_ HWND hWnd, DWORD dwFlags) PURE; 
-    STDMETHOD(SetDisplayMode)(THIS_ DWORD dwWidth, DWORD dwHeight, DWORD dwBPP, DWORD dwRefreshRate, DWORD dwFlags) PURE; 
-    STDMETHOD(WaitForVerticalBlank)(THIS_ DWORD dwFlags, HANDLE hEvent) PURE; 
-           
-    STDMETHOD(GetAvailableVidMem)(THIS_ LPDDSCAPS2 lpDDCaps, LPDWORD lpdwTotal, LPDWORD lpdwFree) PURE; 
-           
-    STDMETHOD(GetSurfaceFromDC)(THIS_ HDC , LPDIRECTDRAWSURFACE7* ) PURE; 
-    STDMETHOD(RestoreAllSurfaces)(THIS) PURE; 
-    STDMETHOD(TestCooperativeLevel)(THIS) PURE; 
-    STDMETHOD(GetDeviceIdentifier)(THIS_ LPDDDEVICEIDENTIFIER2 , DWORD ) PURE; 
-           
-    STDMETHOD(StartModeTest)(THIS_ LPSIZE , DWORD , DWORD ) PURE; 
-    STDMETHOD(EvaluateMode)(THIS_ DWORD , DWORD * ) PURE;
-};
-
-    /*** IUnknown methods ***/
-#define IDirectDraw7_QueryInterface(p,a,b) ICOM_CALL_(QueryInterface,p,(p,a,b))
-#define IDirectDraw7_AddRef(p)             ICOM_CALL_(AddRef,p,(p))
-#define IDirectDraw7_Release(p)            ICOM_CALL_(Release,p,(p))
-    /*** IDirectDraw methods ***/
-#define IDirectDraw7_Compact(p)                  ICOM_CALL_(Compact,p,(p))
-#define IDirectDraw7_CreateClipper(p,a,b,c)      ICOM_CALL_(CreateClipper,p,(p,a,b,c))
-#define IDirectDraw7_CreatePalette(p,a,b,c,d)    ICOM_CALL_(CreatePalette,p,(p,a,b,c,d))
-#define IDirectDraw7_CreateSurface(p,a,b,c)      ICOM_CALL_(CreateSurface,p,(p,a,b,c))
-#define IDirectDraw7_DuplicateSurface(p,a,b)     ICOM_CALL_(DuplicateSurface,p,(p,a,b))
-#define IDirectDraw7_EnumDisplayModes(p,a,b,c,d) ICOM_CALL_(EnumDisplayModes,p,(p,a,b,c,d))
-#define IDirectDraw7_EnumSurfaces(p,a,b,c,d)     ICOM_CALL_(EnumSurfaces,p,(p,a,b,c,d))
-#define IDirectDraw7_FlipToGDISurface(p)         ICOM_CALL_(FlipToGDISurface,p,(p))
-#define IDirectDraw7_GetCaps(p,a,b)              ICOM_CALL_(GetCaps,p,(p,a,b))
-#define IDirectDraw7_GetDisplayMode(p,a)         ICOM_CALL_(GetDisplayMode,p,(p,a))
-#define IDirectDraw7_GetFourCCCodes(p,a,b)       ICOM_CALL_(GetFourCCCodes,p,(p,a,b))
-#define IDirectDraw7_GetGDISurface(p,a)          ICOM_CALL_(GetGDISurface,p,(p,a))
-#define IDirectDraw7_GetMonitorFrequency(p,a)    ICOM_CALL_(GetMonitorFrequency,p,(p,a))
-#define IDirectDraw7_GetScanLine(p,a)            ICOM_CALL_(GetScanLine,p,(p,a))
-#define IDirectDraw7_GetVerticalBlankStatus(p,a) ICOM_CALL_(GetVerticalBlankStatus,p,(p,a))
-#define IDirectDraw7_Initialize(p,a)             ICOM_CALL_(Initialize,p,(p,a))
-#define IDirectDraw7_RestoreDisplayMode(p)       ICOM_CALL_(RestoreDisplayMode,p,(p))
-#define IDirectDraw7_SetCooperativeLevel(p,a,b)  ICOM_CALL_(SetCooperativeLevel,p,(p,a,b))
-#define IDirectDraw7_SetDisplayMode(p,a,b,c,d,e) ICOM_CALL_(SetDisplayMode,p,(p,a,b,c,d,e))
-#define IDirectDraw7_WaitForVerticalBlank(p,a,b) ICOM_CALL_(WaitForVerticalBlank,p,(p,a,b))
-/*** added in IDirectDraw2 ***/
-#define IDirectDraw7_GetAvailableVidMem(p,a,b,c) ICOM_CALL_(GetAvailableVidMem,p,(p,a,b,c))
-/*** added in IDirectDraw4 ***/
-#define IDirectDraw7_GetSurfaceFromDC(p,a,b)    ICOM_CALL_(GetSurfaceFromDC,p,(p,a,b))
-#define IDirectDraw7_RestoreAllSurfaces(p)     ICOM_CALL_(RestoreAllSurfaces,p,(p))
-#define IDirectDraw7_TestCooperativeLevel(p)    ICOM_CALL_(TestCooperativeLevel,p,(p))
-#define IDirectDraw7_GetDeviceIdentifier(p,a,b) ICOM_CALL_(GetDeviceIdentifier,p,(p,a,b))
-/*** added in IDirectDraw 7 ***/
-#define IDirectDraw7_StartModeTest(p,a,b,c)     ICOM_CALL_(StartModeTest,p,(p,a,b,c))
-#define IDirectDraw7_EvaluateMode(p,a,b)        ICOM_CALL_(EvaluateMode,p,(p,a,b))
-
-
-/*****************************************************************************
- * IDirectDrawSurface interface
- */
-#undef INTERFACE
-#define INTERFACE IDirectDrawSurface
-DECLARE_INTERFACE_(IDirectDrawSurface,IUnknown)
-{
-    STDMETHOD(QueryInterface)(THIS_ REFIID,LPVOID*) PURE;
-    STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-    STDMETHOD_(ULONG,Release)(THIS) PURE; 
-    STDMETHOD(AddAttachedSurface)(THIS_ LPDIRECTDRAWSURFACE lpDDSAttachedSurface) PURE; 
-    STDMETHOD(AddOverlayDirtyRect)(THIS_ LPRECT lpRect) PURE; 
-    STDMETHOD(Blt)(THIS_ LPRECT lpDestRect, LPDIRECTDRAWSURFACE lpDDSrcSurface, LPRECT lpSrcRect, DWORD dwFlags, LPDDBLTFX lpDDBltFx) PURE; 
-    STDMETHOD(BltBatch)(THIS_ LPDDBLTBATCH lpDDBltBatch, DWORD dwCount, DWORD dwFlags) PURE; 
-    STDMETHOD(BltFast)(THIS_ DWORD dwX, DWORD dwY, LPDIRECTDRAWSURFACE lpDDSrcSurface, LPRECT lpSrcRect, DWORD dwTrans) PURE; 
-    STDMETHOD(DeleteAttachedSurface)(THIS_ DWORD dwFlags, LPDIRECTDRAWSURFACE lpDDSAttachedSurface) PURE; 
-    STDMETHOD(EnumAttachedSurfaces)(THIS_ LPVOID lpContext, LPDDENUMSURFACESCALLBACK lpEnumSurfacesCallback) PURE; 
-    STDMETHOD(EnumOverlayZOrders)(THIS_ DWORD dwFlags, LPVOID lpContext, LPDDENUMSURFACESCALLBACK lpfnCallback) PURE; 
-    STDMETHOD(Flip)(THIS_ LPDIRECTDRAWSURFACE lpDDSurfaceTargetOverride, DWORD dwFlags) PURE; 
-    STDMETHOD(GetAttachedSurface)(THIS_ LPDDSCAPS lpDDSCaps, LPDIRECTDRAWSURFACE* lplpDDAttachedSurface) PURE; 
-    STDMETHOD(GetBltStatus)(THIS_ DWORD dwFlags) PURE; 
-    STDMETHOD(GetCaps)(THIS_ LPDDSCAPS lpDDSCaps) PURE; 
-    STDMETHOD(GetClipper)(THIS_ LPDIRECTDRAWCLIPPER* lplpDDClipper) PURE; 
-    STDMETHOD(GetColorKey)(THIS_ DWORD dwFlags, LPDDCOLORKEY lpDDColorKey) PURE; 
-    STDMETHOD(GetDC)(THIS_ HDC* lphDC) PURE; 
-    STDMETHOD(GetFlipStatus)(THIS_ DWORD dwFlags) PURE; 
-    STDMETHOD(GetOverlayPosition)(THIS_ LPLONG lplX, LPLONG lplY) PURE; 
-    STDMETHOD(GetPalette)(THIS_ LPDIRECTDRAWPALETTE* lplpDDPalette) PURE; 
-    STDMETHOD(GetPixelFormat)(THIS_ LPDDPIXELFORMAT lpDDPixelFormat) PURE; 
-    STDMETHOD(GetSurfaceDesc)(THIS_ LPDDSURFACEDESC lpDDSurfaceDesc) PURE; 
-    STDMETHOD(Initialize)(THIS_ LPDIRECTDRAW lpDD, LPDDSURFACEDESC lpDDSurfaceDesc) PURE; 
-    STDMETHOD(IsLost)(THIS) PURE; 
-    STDMETHOD(Lock)(THIS_ LPRECT lpDestRect, LPDDSURFACEDESC lpDDSurfaceDesc, DWORD dwFlags, HANDLE hEvent) PURE; 
-    STDMETHOD(ReleaseDC)(THIS_ HDC hDC) PURE; 
-    STDMETHOD(Restore)(THIS) PURE; 
-    STDMETHOD(SetClipper)(THIS_ LPDIRECTDRAWCLIPPER lpDDClipper) PURE; 
-    STDMETHOD(SetColorKey)(THIS_ DWORD dwFlags, LPDDCOLORKEY lpDDColorKey) PURE; 
-    STDMETHOD(SetOverlayPosition)(THIS_ LONG lX, LONG lY) PURE; 
-    STDMETHOD(SetPalette)(THIS_ LPDIRECTDRAWPALETTE lpDDPalette) PURE; 
-    STDMETHOD(Unlock)(THIS_ LPVOID lpSurfaceData) PURE; 
-    STDMETHOD(UpdateOverlay)(THIS_ LPRECT lpSrcRect, LPDIRECTDRAWSURFACE lpDDDestSurface, LPRECT lpDestRect, DWORD dwFlags, LPDDOVERLAYFX lpDDOverlayFx) PURE; 
-    STDMETHOD(UpdateOverlayDisplay)(THIS_ DWORD dwFlags) PURE; 
-    STDMETHOD(UpdateOverlayZOrder)(THIS_ DWORD dwFlags, LPDIRECTDRAWSURFACE lpDDSReference) PURE;
-};
-
-    /*** IUnknown methods ***/
-#define IDirectDrawSurface_QueryInterface(p,a,b) ICOM_CALL_(QueryInterface,p,(p,a,b))
-#define IDirectDrawSurface_AddRef(p)             ICOM_CALL_(AddRef,p,(p))
-#define IDirectDrawSurface_Release(p)            ICOM_CALL_(Release,p,(p))
-    /*** IDirectDrawSurface methods ***/
-#define IDirectDrawSurface_AddAttachedSurface(p,a)      ICOM_CALL_(AddAttachedSurface,p,(p,a))
-#define IDirectDrawSurface_AddOverlayDirtyRect(p,a)     ICOM_CALL_(AddOverlayDirtyRect,p,(p,a))
-#define IDirectDrawSurface_Blt(p,a,b,c,d,e)             ICOM_CALL_(Blt,p,(p,a,b,c,d,e))
-#define IDirectDrawSurface_BltBatch(p,a,b,c)            ICOM_CALL_(BltBatch,p,(p,a,b,c))
-#define IDirectDrawSurface_BltFast(p,a,b,c,d,e)         ICOM_CALL_(BltFast,p,(p,a,b,c,d,e))
-#define IDirectDrawSurface_DeleteAttachedSurface(p,a,b) ICOM_CALL_(DeleteAttachedSurface,p,(p,a,b))
-#define IDirectDrawSurface_EnumAttachedSurfaces(p,a,b)  ICOM_CALL_(EnumAttachedSurfaces,p,(p,a,b))
-#define IDirectDrawSurface_EnumOverlayZOrders(p,a,b,c)  ICOM_CALL_(EnumOverlayZOrders,p,(p,a,b,c))
-#define IDirectDrawSurface_Flip(p,a,b)                  ICOM_CALL_(Flip,p,(p,a,b))
-#define IDirectDrawSurface_GetAttachedSurface(p,a,b)    ICOM_CALL_(GetAttachedSurface,p,(p,a,b))
-#define IDirectDrawSurface_GetBltStatus(p,a)            ICOM_CALL_(GetBltStatus,p,(p,a))
-#define IDirectDrawSurface_GetCaps(p,a)                 ICOM_CALL_(GetCaps,p,(p,a))
-#define IDirectDrawSurface_GetClipper(p,a)              ICOM_CALL_(GetClipper,p,(p,a))
-#define IDirectDrawSurface_GetColorKey(p,a,b)           ICOM_CALL_(GetColorKey,p,(p,a,b))
-#define IDirectDrawSurface_GetDC(p,a)                   ICOM_CALL_(GetDC,p,(p,a))
-#define IDirectDrawSurface_GetFlipStatus(p,a)           ICOM_CALL_(GetFlipStatus,p,(p,a))
-#define IDirectDrawSurface_GetOverlayPosition(p,a,b)    ICOM_CALL_(GetOverlayPosition,p,(p,a,b))
-#define IDirectDrawSurface_GetPalette(p,a)              ICOM_CALL_(GetPalette,p,(p,a))
-#define IDirectDrawSurface_GetPixelFormat(p,a)          ICOM_CALL_(GetPixelFormat,p,(p,a))
-#define IDirectDrawSurface_GetSurfaceDesc(p,a)          ICOM_CALL_(GetSurfaceDesc,p,(p,a))
-#define IDirectDrawSurface_Initialize(p,a,b)            ICOM_CALL_(Initialize,p,(p,a,b))
-#define IDirectDrawSurface_IsLost(p)                    ICOM_CALL_(IsLost,p,(p))
-#define IDirectDrawSurface_Lock(p,a,b,c,d)              ICOM_CALL_(Lock,p,(p,a,b,c,d))
-#define IDirectDrawSurface_ReleaseDC(p,a)               ICOM_CALL_(ReleaseDC,p,(p,a))
-#define IDirectDrawSurface_Restore(p)                   ICOM_CALL_(Restore,p,(p))
-#define IDirectDrawSurface_SetClipper(p,a)              ICOM_CALL_(SetClipper,p,(p,a))
-#define IDirectDrawSurface_SetColorKey(p,a,b)           ICOM_CALL_(SetColorKey,p,(p,a,b))
-#define IDirectDrawSurface_SetOverlayPosition(p,a,b)    ICOM_CALL_(SetOverlayPosition,p,(p,a,b))
-#define IDirectDrawSurface_SetPalette(p,a)              ICOM_CALL_(SetPalette,p,(p,a))
-#define IDirectDrawSurface_Unlock(p,a)                  ICOM_CALL_(Unlock,p,(p,a))
-#define IDirectDrawSurface_UpdateOverlay(p,a,b,c,d,e)   ICOM_CALL_(UpdateOverlay,p,(p,a,b,c,d,e))
-#define IDirectDrawSurface_UpdateOverlayDisplay(p,a)    ICOM_CALL_(UpdateOverlayDisplay,p,(p,a))
-#define IDirectDrawSurface_UpdateOverlayZOrder(p,a,b)   ICOM_CALL_(UpdateOverlayZOrder,p,(p,a,b))
-
-
-/*****************************************************************************
- * IDirectDrawSurface2 interface
- */
-/* Cannot inherit from IDirectDrawSurface because the LPDIRECTDRAWSURFACE parameters 
- * have been converted to LPDIRECTDRAWSURFACE2.
- */
-#undef INTERFACE
-#define INTERFACE IDirectDrawSurface2
-DECLARE_INTERFACE_(IDirectDrawSurface2,IUnknown)
-{
-    STDMETHOD(QueryInterface)(THIS_ REFIID,LPVOID*) PURE;
-    STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-    STDMETHOD_(ULONG,Release)(THIS) PURE; 
-    STDMETHOD(AddAttachedSurface)(THIS_ LPDIRECTDRAWSURFACE2 lpDDSAttachedSurface) PURE; 
-    STDMETHOD(AddOverlayDirtyRect)(THIS_ LPRECT lpRect) PURE; 
-    STDMETHOD(Blt)(THIS_ LPRECT lpDestRect, LPDIRECTDRAWSURFACE2 lpDDSrcSurface, LPRECT lpSrcRect, DWORD dwFlags, LPDDBLTFX lpDDBltFx) PURE; 
-    STDMETHOD(BltBatch)(THIS_ LPDDBLTBATCH lpDDBltBatch, DWORD dwCount, DWORD dwFlags) PURE; 
-    STDMETHOD(BltFast)(THIS_ DWORD dwX, DWORD dwY, LPDIRECTDRAWSURFACE2 lpDDSrcSurface, LPRECT lpSrcRect, DWORD dwTrans) PURE; 
-    STDMETHOD(DeleteAttachedSurface)(THIS_ DWORD dwFlags, LPDIRECTDRAWSURFACE2 lpDDSAttachedSurface) PURE; 
-    STDMETHOD(EnumAttachedSurfaces)(THIS_ LPVOID lpContext, LPDDENUMSURFACESCALLBACK lpEnumSurfacesCallback) PURE; 
-    STDMETHOD(EnumOverlayZOrders)(THIS_ DWORD dwFlags, LPVOID lpContext, LPDDENUMSURFACESCALLBACK lpfnCallback) PURE; 
-    STDMETHOD(Flip)(THIS_ LPDIRECTDRAWSURFACE2 lpDDSurfaceTargetOverride, DWORD dwFlags) PURE; 
-    STDMETHOD(GetAttachedSurface)(THIS_ LPDDSCAPS lpDDSCaps, LPDIRECTDRAWSURFACE2* lplpDDAttachedSurface) PURE; 
-    STDMETHOD(GetBltStatus)(THIS_ DWORD dwFlags) PURE; 
-    STDMETHOD(GetCaps)(THIS_ LPDDSCAPS lpDDSCaps) PURE; 
-    STDMETHOD(GetClipper)(THIS_ LPDIRECTDRAWCLIPPER* lplpDDClipper) PURE; 
-    STDMETHOD(GetColorKey)(THIS_ DWORD dwFlags, LPDDCOLORKEY lpDDColorKey) PURE; 
-    STDMETHOD(GetDC)(THIS_ HDC* lphDC) PURE; 
-    STDMETHOD(GetFlipStatus)(THIS_ DWORD dwFlags) PURE; 
-    STDMETHOD(GetOverlayPosition)(THIS_ LPLONG lplX, LPLONG lplY) PURE; 
-    STDMETHOD(GetPalette)(THIS_ LPDIRECTDRAWPALETTE* lplpDDPalette) PURE; 
-    STDMETHOD(GetPixelFormat)(THIS_ LPDDPIXELFORMAT lpDDPixelFormat) PURE; 
-    STDMETHOD(GetSurfaceDesc)(THIS_ LPDDSURFACEDESC lpDDSurfaceDesc) PURE; 
-    STDMETHOD(Initialize)(THIS_ LPDIRECTDRAW lpDD, LPDDSURFACEDESC lpDDSurfaceDesc) PURE; 
-    STDMETHOD(IsLost)(THIS) PURE; 
-    STDMETHOD(Lock)(THIS_ LPRECT lpDestRect, LPDDSURFACEDESC lpDDSurfaceDesc, DWORD dwFlags, HANDLE hEvent) PURE; 
-    STDMETHOD(ReleaseDC)(THIS_ HDC hDC) PURE; 
-    STDMETHOD(Restore)(THIS) PURE; 
-    STDMETHOD(SetClipper)(THIS_ LPDIRECTDRAWCLIPPER lpDDClipper) PURE; 
-    STDMETHOD(SetColorKey)(THIS_ DWORD dwFlags, LPDDCOLORKEY lpDDColorKey) PURE; 
-    STDMETHOD(SetOverlayPosition)(THIS_ LONG lX, LONG lY) PURE; 
-    STDMETHOD(SetPalette)(THIS_ LPDIRECTDRAWPALETTE lpDDPalette) PURE; 
-    STDMETHOD(Unlock)(THIS_ LPVOID lpSurfaceData) PURE; 
-    STDMETHOD(UpdateOverlay)(THIS_ LPRECT lpSrcRect, LPDIRECTDRAWSURFACE2 lpDDDestSurface, LPRECT lpDestRect, DWORD dwFlags, LPDDOVERLAYFX lpDDOverlayFx) PURE; 
-    STDMETHOD(UpdateOverlayDisplay)(THIS_ DWORD dwFlags) PURE; 
-    STDMETHOD(UpdateOverlayZOrder)(THIS_ DWORD dwFlags, LPDIRECTDRAWSURFACE2 lpDDSReference) PURE; 
-    /* added in v2 */ 
-    STDMETHOD(GetDDInterface)(THIS_ LPVOID* lplpDD) PURE; 
-    STDMETHOD(PageLock)(THIS_ DWORD dwFlags) PURE; 
-    STDMETHOD(PageUnlock)(THIS_ DWORD dwFlags) PURE;
-};
-
-    /*** IUnknown methods ***/
-#define IDirectDrawSurface2_QueryInterface(p,a,b) ICOM_CALL_(QueryInterface,p,(p,a,b))
-#define IDirectDrawSurface2_AddRef(p)             ICOM_CALL_(AddRef,p,(p))
-#define IDirectDrawSurface2_Release(p)            ICOM_CALL_(Release,p,(p))
-/*** IDirectDrawSurface methods (almost) ***/
-#define IDirectDrawSurface2_AddAttachedSurface(p,a)      ICOM_CALL_(AddAttachedSurface,p,(p,a))
-#define IDirectDrawSurface2_AddOverlayDirtyRect(p,a)     ICOM_CALL_(AddOverlayDirtyRect,p,(p,a))
-#define IDirectDrawSurface2_Blt(p,a,b,c,d,e)             ICOM_CALL_(Blt,p,(p,a,b,c,d,e))
-#define IDirectDrawSurface2_BltBatch(p,a,b,c)            ICOM_CALL_(BltBatch,p,(p,a,b,c))
-#define IDirectDrawSurface2_BltFast(p,a,b,c,d,e)         ICOM_CALL_(BltFast,p,(p,a,b,c,d,e))
-#define IDirectDrawSurface2_DeleteAttachedSurface(p,a,b) ICOM_CALL_(DeleteAttachedSurface,p,(p,a,b))
-#define IDirectDrawSurface2_EnumAttachedSurfaces(p,a,b)  ICOM_CALL_(EnumAttachedSurfaces,p,(p,a,b))
-#define IDirectDrawSurface2_EnumOverlayZOrders(p,a,b,c)  ICOM_CALL_(EnumOverlayZOrders,p,(p,a,b,c))
-#define IDirectDrawSurface2_Flip(p,a,b)                  ICOM_CALL_(Flip,p,(p,a,b))
-#define IDirectDrawSurface2_GetAttachedSurface(p,a,b)    ICOM_CALL_(GetAttachedSurface,p,(p,a,b))
-#define IDirectDrawSurface2_GetBltStatus(p,a)            ICOM_CALL_(GetBltStatus,p,(p,a))
-#define IDirectDrawSurface2_GetCaps(p,a)                 ICOM_CALL_(GetCaps,p,(p,a))
-#define IDirectDrawSurface2_GetClipper(p,a)              ICOM_CALL_(GetClipper,p,(p,a))
-#define IDirectDrawSurface2_GetColorKey(p,a,b)           ICOM_CALL_(GetColorKey,p,(p,a,b))
-#define IDirectDrawSurface2_GetDC(p,a)                   ICOM_CALL_(GetDC,p,(p,a))
-#define IDirectDrawSurface2_GetFlipStatus(p,a)           ICOM_CALL_(GetFlipStatus,p,(p,a))
-#define IDirectDrawSurface2_GetOverlayPosition(p,a,b)    ICOM_CALL_(GetOverlayPosition,p,(p,a,b))
-#define IDirectDrawSurface2_GetPalette(p,a)              ICOM_CALL_(GetPalette,p,(p,a))
-#define IDirectDrawSurface2_GetPixelFormat(p,a)          ICOM_CALL_(GetPixelFormat,p,(p,a))
-#define IDirectDrawSurface2_GetSurfaceDesc(p,a)          ICOM_CALL_(GetSurfaceDesc,p,(p,a))
-#define IDirectDrawSurface2_Initialize(p,a,b)            ICOM_CALL_(Initialize,p,(p,a,b))
-#define IDirectDrawSurface2_IsLost(p)                    ICOM_CALL_(IsLost,p,(p))
-#define IDirectDrawSurface2_Lock(p,a,b,c,d)              ICOM_CALL_(Lock,p,(p,a,b,c,d))
-#define IDirectDrawSurface2_ReleaseDC(p,a)               ICOM_CALL_(ReleaseDC,p,(p,a))
-#define IDirectDrawSurface2_Restore(p)                   ICOM_CALL_(Restore,p,(p))
-#define IDirectDrawSurface2_SetClipper(p,a)              ICOM_CALL_(SetClipper,p,(p,a))
-#define IDirectDrawSurface2_SetColorKey(p,a,b)           ICOM_CALL_(SetColorKey,p,(p,a,b))
-#define IDirectDrawSurface2_SetOverlayPosition(p,a,b)    ICOM_CALL_(SetOverlayPosition,p,(p,a,b))
-#define IDirectDrawSurface2_SetPalette(p,a)              ICOM_CALL_(SetPalette,p,(p,a))
-#define IDirectDrawSurface2_Unlock(p,a)                  ICOM_CALL_(Unlock,p,(p,a))
-#define IDirectDrawSurface2_UpdateOverlay(p,a,b,c,d,e)   ICOM_CALL_(UpdateOverlay,p,(p,a,b,c,d,e))
-#define IDirectDrawSurface2_UpdateOverlayDisplay(p,a)    ICOM_CALL_(UpdateOverlayDisplay,p,(p,a))
-#define IDirectDrawSurface2_UpdateOverlayZOrder(p,a,b)   ICOM_CALL_(UpdateOverlayZOrder,p,(p,a,b))
-/*** IDirectDrawSurface2 methods ***/
-#define IDirectDrawSurface2_GetDDInterface(p,a) ICOM_CALL_(GetDDInterface,p,(p,a))
-#define IDirectDrawSurface2_PageLock(p,a)       ICOM_CALL_(PageLock,p,(p,a))
-#define IDirectDrawSurface2_PageUnlock(p,a)     ICOM_CALL_(PageUnlock,p,(p,a))
-
-
-/*****************************************************************************
- * IDirectDrawSurface3 interface
- */
-/* Cannot inherit from IDirectDrawSurface2 because the LPDIRECTDRAWSURFACE2 parameters 
- * have been converted to LPDIRECTDRAWSURFACE3.
- */
-#undef INTERFACE
-#define INTERFACE IDirectDrawSurface3
-DECLARE_INTERFACE_(IDirectDrawSurface3,IUnknown)
-{
-    STDMETHOD(QueryInterface)(THIS_ REFIID,LPVOID*) PURE;
-    STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-    STDMETHOD_(ULONG,Release)(THIS) PURE; 
-    STDMETHOD(AddAttachedSurface)(THIS_ LPDIRECTDRAWSURFACE3 lpDDSAttachedSurface) PURE; 
-    STDMETHOD(AddOverlayDirtyRect)(THIS_ LPRECT lpRect) PURE; 
-    STDMETHOD(Blt)(THIS_ LPRECT lpDestRect, LPDIRECTDRAWSURFACE3 lpDDSrcSurface, LPRECT lpSrcRect, DWORD dwFlags, LPDDBLTFX lpDDBltFx) PURE; 
-    STDMETHOD(BltBatch)(THIS_ LPDDBLTBATCH lpDDBltBatch, DWORD dwCount, DWORD dwFlags) PURE; 
-    STDMETHOD(BltFast)(THIS_ DWORD dwX, DWORD dwY, LPDIRECTDRAWSURFACE3 lpDDSrcSurface, LPRECT lpSrcRect, DWORD dwTrans) PURE; 
-    STDMETHOD(DeleteAttachedSurface)(THIS_ DWORD dwFlags, LPDIRECTDRAWSURFACE3 lpDDSAttachedSurface) PURE; 
-    STDMETHOD(EnumAttachedSurfaces)(THIS_ LPVOID lpContext, LPDDENUMSURFACESCALLBACK lpEnumSurfacesCallback) PURE; 
-    STDMETHOD(EnumOverlayZOrders)(THIS_ DWORD dwFlags, LPVOID lpContext, LPDDENUMSURFACESCALLBACK lpfnCallback) PURE; 
-    STDMETHOD(Flip)(THIS_ LPDIRECTDRAWSURFACE3 lpDDSurfaceTargetOverride, DWORD dwFlags) PURE; 
-    STDMETHOD(GetAttachedSurface)(THIS_ LPDDSCAPS lpDDSCaps, LPDIRECTDRAWSURFACE3* lplpDDAttachedSurface) PURE; 
-    STDMETHOD(GetBltStatus)(THIS_ DWORD dwFlags) PURE; 
-    STDMETHOD(GetCaps)(THIS_ LPDDSCAPS lpDDSCaps) PURE; 
-    STDMETHOD(GetClipper)(THIS_ LPDIRECTDRAWCLIPPER* lplpDDClipper) PURE; 
-    STDMETHOD(GetColorKey)(THIS_ DWORD dwFlags, LPDDCOLORKEY lpDDColorKey) PURE; 
-    STDMETHOD(GetDC)(THIS_ HDC* lphDC) PURE; 
-    STDMETHOD(GetFlipStatus)(THIS_ DWORD dwFlags) PURE; 
-    STDMETHOD(GetOverlayPosition)(THIS_ LPLONG lplX, LPLONG lplY) PURE; 
-    STDMETHOD(GetPalette)(THIS_ LPDIRECTDRAWPALETTE* lplpDDPalette) PURE; 
-    STDMETHOD(GetPixelFormat)(THIS_ LPDDPIXELFORMAT lpDDPixelFormat) PURE; 
-    STDMETHOD(GetSurfaceDesc)(THIS_ LPDDSURFACEDESC lpDDSurfaceDesc) PURE; 
-    STDMETHOD(Initialize)(THIS_ LPDIRECTDRAW lpDD, LPDDSURFACEDESC lpDDSurfaceDesc) PURE; 
-    STDMETHOD(IsLost)(THIS) PURE; 
-    STDMETHOD(Lock)(THIS_ LPRECT lpDestRect, LPDDSURFACEDESC lpDDSurfaceDesc, DWORD dwFlags, HANDLE hEvent) PURE; 
-    STDMETHOD(ReleaseDC)(THIS_ HDC hDC) PURE; 
-    STDMETHOD(Restore)(THIS) PURE; 
-    STDMETHOD(SetClipper)(THIS_ LPDIRECTDRAWCLIPPER lpDDClipper) PURE; 
-    STDMETHOD(SetColorKey)(THIS_ DWORD dwFlags, LPDDCOLORKEY lpDDColorKey) PURE; 
-    STDMETHOD(SetOverlayPosition)(THIS_ LONG lX, LONG lY) PURE; 
-    STDMETHOD(SetPalette)(THIS_ LPDIRECTDRAWPALETTE lpDDPalette) PURE; 
-    STDMETHOD(Unlock)(THIS_ LPVOID lpSurfaceData) PURE; 
-    STDMETHOD(UpdateOverlay)(THIS_ LPRECT lpSrcRect, LPDIRECTDRAWSURFACE3 lpDDDestSurface, LPRECT lpDestRect, DWORD dwFlags, LPDDOVERLAYFX lpDDOverlayFx) PURE; 
-    STDMETHOD(UpdateOverlayDisplay)(THIS_ DWORD dwFlags) PURE; 
-    STDMETHOD(UpdateOverlayZOrder)(THIS_ DWORD dwFlags, LPDIRECTDRAWSURFACE3 lpDDSReference) PURE; 
-    /* added in v2 */ 
-    STDMETHOD(GetDDInterface)(THIS_ LPVOID* lplpDD) PURE; 
-    STDMETHOD(PageLock)(THIS_ DWORD dwFlags) PURE; 
-    STDMETHOD(PageUnlock)(THIS_ DWORD dwFlags) PURE; 
-    /* added in v3 */ 
-    STDMETHOD(SetSurfaceDesc)(THIS_ LPDDSURFACEDESC lpDDSD, DWORD dwFlags) PURE;
-};
-
-    /*** IUnknown methods ***/
-#define IDirectDrawSurface3_QueryInterface(p,a,b) ICOM_CALL_(QueryInterface,p,(p,a,b))
-#define IDirectDrawSurface3_AddRef(p)             ICOM_CALL_(AddRef,p,(p))
-#define IDirectDrawSurface3_Release(p)            ICOM_CALL_(Release,p,(p))
-/*** IDirectDrawSurface methods (almost) ***/
-#define IDirectDrawSurface3_AddAttachedSurface(p,a)      ICOM_CALL_(AddAttachedSurface,p,(p,a))
-#define IDirectDrawSurface3_AddOverlayDirtyRect(p,a)     ICOM_CALL_(AddOverlayDirtyRect,p,(p,a))
-#define IDirectDrawSurface3_Blt(p,a,b,c,d,e)             ICOM_CALL_(Blt,p,(p,a,b,c,d,e))
-#define IDirectDrawSurface3_BltBatch(p,a,b,c)            ICOM_CALL_(BltBatch,p,(p,a,b,c))
-#define IDirectDrawSurface3_BltFast(p,a,b,c,d,e)         ICOM_CALL_(BltFast,p,(p,a,b,c,d,e))
-#define IDirectDrawSurface3_DeleteAttachedSurface(p,a,b) ICOM_CALL_(DeleteAttachedSurface,p,(p,a,b))
-#define IDirectDrawSurface3_EnumAttachedSurfaces(p,a,b)  ICOM_CALL_(EnumAttachedSurfaces,p,(p,a,b))
-#define IDirectDrawSurface3_EnumOverlayZOrders(p,a,b,c)  ICOM_CALL_(EnumOverlayZOrders,p,(p,a,b,c))
-#define IDirectDrawSurface3_Flip(p,a,b)                  ICOM_CALL_(Flip,p,(p,a,b))
-#define IDirectDrawSurface3_GetAttachedSurface(p,a,b)    ICOM_CALL_(GetAttachedSurface,p,(p,a,b))
-#define IDirectDrawSurface3_GetBltStatus(p,a)            ICOM_CALL_(GetBltStatus,p,(p,a))
-#define IDirectDrawSurface3_GetCaps(p,a)                 ICOM_CALL_(GetCaps,p,(p,a))
-#define IDirectDrawSurface3_GetClipper(p,a)              ICOM_CALL_(GetClipper,p,(p,a))
-#define IDirectDrawSurface3_GetColorKey(p,a,b)           ICOM_CALL_(GetColorKey,p,(p,a,b))
-#define IDirectDrawSurface3_GetDC(p,a)                   ICOM_CALL_(GetDC,p,(p,a))
-#define IDirectDrawSurface3_GetFlipStatus(p,a)           ICOM_CALL_(GetFlipStatus,p,(p,a))
-#define IDirectDrawSurface3_GetOverlayPosition(p,a,b)    ICOM_CALL_(GetOverlayPosition,p,(p,a,b))
-#define IDirectDrawSurface3_GetPalette(p,a)              ICOM_CALL_(GetPalette,p,(p,a))
-#define IDirectDrawSurface3_GetPixelFormat(p,a)          ICOM_CALL_(GetPixelFormat,p,(p,a))
-#define IDirectDrawSurface3_GetSurfaceDesc(p,a)          ICOM_CALL_(GetSurfaceDesc,p,(p,a))
-#define IDirectDrawSurface3_Initialize(p,a,b)            ICOM_CALL_(Initialize,p,(p,a,b))
-#define IDirectDrawSurface3_IsLost(p)                    ICOM_CALL_(IsLost,p,(p))
-#define IDirectDrawSurface3_Lock(p,a,b,c,d)              ICOM_CALL_(Lock,p,(p,a,b,c,d))
-#define IDirectDrawSurface3_ReleaseDC(p,a)               ICOM_CALL_(ReleaseDC,p,(p,a))
-#define IDirectDrawSurface3_Restore(p)                   ICOM_CALL_(Restore,p,(p))
-#define IDirectDrawSurface3_SetClipper(p,a)              ICOM_CALL_(SetClipper,p,(p,a))
-#define IDirectDrawSurface3_SetColorKey(p,a,b)           ICOM_CALL_(SetColorKey,p,(p,a,b))
-#define IDirectDrawSurface3_SetOverlayPosition(p,a,b)    ICOM_CALL_(SetOverlayPosition,p,(p,a,b))
-#define IDirectDrawSurface3_SetPalette(p,a)              ICOM_CALL_(SetPalette,p,(p,a))
-#define IDirectDrawSurface3_Unlock(p,a)                  ICOM_CALL_(Unlock,p,(p,a))
-#define IDirectDrawSurface3_UpdateOverlay(p,a,b,c,d,e)   ICOM_CALL_(UpdateOverlay,p,(p,a,b,c,d,e))
-#define IDirectDrawSurface3_UpdateOverlayDisplay(p,a)    ICOM_CALL_(UpdateOverlayDisplay,p,(p,a))
-#define IDirectDrawSurface3_UpdateOverlayZOrder(p,a,b)   ICOM_CALL_(UpdateOverlayZOrder,p,(p,a,b))
-/*** IDirectDrawSurface2 methods ***/
-#define IDirectDrawSurface3_GetDDInterface(p,a) ICOM_CALL_(GetDDInterface,p,(p,a))
-#define IDirectDrawSurface3_PageLock(p,a)       ICOM_CALL_(PageLock,p,(p,a))
-#define IDirectDrawSurface3_PageUnlock(p,a)     ICOM_CALL_(PageUnlock,p,(p,a))
-/*** IDirectDrawSurface3 methods ***/
-#define IDirectDrawSurface3_SetSurfaceDesc(p,a,b) ICOM_CALL_(SetSurfaceDesc,p,(p,a,b))
-
-
-/*****************************************************************************
- * IDirectDrawSurface4 interface
- */
-/* Cannot inherit from IDirectDrawSurface2 because DDSCAPS changed to DDSCAPS2.
- */
-#undef INTERFACE
-#define INTERFACE IDirectDrawSurface4
-DECLARE_INTERFACE_(IDirectDrawSurface4,IUnknown)
-{
-    STDMETHOD(QueryInterface)(THIS_ REFIID,LPVOID*) PURE;
-    STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-    STDMETHOD_(ULONG,Release)(THIS) PURE; 
-    STDMETHOD(AddAttachedSurface)(THIS_ LPDIRECTDRAWSURFACE4 lpDDSAttachedSurface) PURE; 
-    STDMETHOD(AddOverlayDirtyRect)(THIS_ LPRECT lpRect) PURE; 
-    STDMETHOD(Blt)(THIS_ LPRECT lpDestRect, LPDIRECTDRAWSURFACE4 lpDDSrcSurface, LPRECT lpSrcRect, DWORD dwFlags, LPDDBLTFX lpDDBltFx) PURE; 
-    STDMETHOD(BltBatch)(THIS_ LPDDBLTBATCH lpDDBltBatch, DWORD dwCount, DWORD dwFlags) PURE; 
-    STDMETHOD(BltFast)(THIS_ DWORD dwX, DWORD dwY, LPDIRECTDRAWSURFACE4 lpDDSrcSurface, LPRECT lpSrcRect, DWORD dwTrans) PURE; 
-    STDMETHOD(DeleteAttachedSurface)(THIS_ DWORD dwFlags, LPDIRECTDRAWSURFACE4 lpDDSAttachedSurface) PURE; 
-    STDMETHOD(EnumAttachedSurfaces)(THIS_ LPVOID lpContext, LPDDENUMSURFACESCALLBACK lpEnumSurfacesCallback) PURE; 
-    STDMETHOD(EnumOverlayZOrders)(THIS_ DWORD dwFlags, LPVOID lpContext, LPDDENUMSURFACESCALLBACK lpfnCallback) PURE; 
-    STDMETHOD(Flip)(THIS_ LPDIRECTDRAWSURFACE4 lpDDSurfaceTargetOverride, DWORD dwFlags) PURE; 
-    STDMETHOD(GetAttachedSurface)(THIS_ LPDDSCAPS2 lpDDSCaps, LPDIRECTDRAWSURFACE4* lplpDDAttachedSurface) PURE; 
-    STDMETHOD(GetBltStatus)(THIS_ DWORD dwFlags) PURE; 
-    STDMETHOD(GetCaps)(THIS_ LPDDSCAPS2 lpDDSCaps) PURE; 
-    STDMETHOD(GetClipper)(THIS_ LPDIRECTDRAWCLIPPER* lplpDDClipper) PURE; 
-    STDMETHOD(GetColorKey)(THIS_ DWORD dwFlags, LPDDCOLORKEY lpDDColorKey) PURE; 
-    STDMETHOD(GetDC)(THIS_ HDC* lphDC) PURE; 
-    STDMETHOD(GetFlipStatus)(THIS_ DWORD dwFlags) PURE; 
-    STDMETHOD(GetOverlayPosition)(THIS_ LPLONG lplX, LPLONG lplY) PURE; 
-    STDMETHOD(GetPalette)(THIS_ LPDIRECTDRAWPALETTE* lplpDDPalette) PURE; 
-    STDMETHOD(GetPixelFormat)(THIS_ LPDDPIXELFORMAT lpDDPixelFormat) PURE; 
-    STDMETHOD(GetSurfaceDesc)(THIS_ LPDDSURFACEDESC lpDDSurfaceDesc) PURE; 
-    STDMETHOD(Initialize)(THIS_ LPDIRECTDRAW lpDD, LPDDSURFACEDESC lpDDSurfaceDesc) PURE; 
-    STDMETHOD(IsLost)(THIS) PURE; 
-    STDMETHOD(Lock)(THIS_ LPRECT lpDestRect, LPDDSURFACEDESC lpDDSurfaceDesc, DWORD dwFlags, HANDLE hEvent) PURE; 
-    STDMETHOD(ReleaseDC)(THIS_ HDC hDC) PURE; 
-    STDMETHOD(Restore)(THIS) PURE; 
-    STDMETHOD(SetClipper)(THIS_ LPDIRECTDRAWCLIPPER lpDDClipper) PURE; 
-    STDMETHOD(SetColorKey)(THIS_ DWORD dwFlags, LPDDCOLORKEY lpDDColorKey) PURE; 
-    STDMETHOD(SetOverlayPosition)(THIS_ LONG lX, LONG lY) PURE; 
-    STDMETHOD(SetPalette)(THIS_ LPDIRECTDRAWPALETTE lpDDPalette) PURE; 
-    STDMETHOD(Unlock)(THIS_ LPRECT lpSurfaceData) PURE; 
-    STDMETHOD(UpdateOverlay)(THIS_ LPRECT lpSrcRect, LPDIRECTDRAWSURFACE4 lpDDDestSurface, LPRECT lpDestRect, DWORD dwFlags, LPDDOVERLAYFX lpDDOverlayFx) PURE; 
-    STDMETHOD(UpdateOverlayDisplay)(THIS_ DWORD dwFlags) PURE; 
-    STDMETHOD(UpdateOverlayZOrder)(THIS_ DWORD dwFlags, LPDIRECTDRAWSURFACE4 lpDDSReference) PURE; 
-    /* added in v2 */ 
-    STDMETHOD(GetDDInterface)(THIS_ LPVOID* lplpDD) PURE; 
-    STDMETHOD(PageLock)(THIS_ DWORD dwFlags) PURE; 
-    STDMETHOD(PageUnlock)(THIS_ DWORD dwFlags) PURE; 
-    /* added in v3 */ 
-    STDMETHOD(SetSurfaceDesc)(THIS_ LPDDSURFACEDESC lpDDSD, DWORD dwFlags) PURE; 
-    /* added in v4 */ 
-    STDMETHOD(SetPrivateData)(THIS_ REFGUID , LPVOID , DWORD , DWORD ) PURE; 
-    STDMETHOD(GetPrivateData)(THIS_ REFGUID , LPVOID , LPDWORD ) PURE; 
-    STDMETHOD(FreePrivateData)(THIS_ REFGUID ) PURE; 
-    STDMETHOD(GetUniquenessValue)(THIS_ LPDWORD ) PURE; 
-    STDMETHOD(ChangeUniquenessValue)(THIS) PURE;
-};
-
-    /*** IUnknown methods ***/
-#define IDirectDrawSurface4_QueryInterface(p,a,b) ICOM_CALL_(QueryInterface,p,(p,a,b))
-#define IDirectDrawSurface4_AddRef(p)             ICOM_CALL_(AddRef,p,(p))
-#define IDirectDrawSurface4_Release(p)            ICOM_CALL_(Release,p,(p))
-/*** IDirectDrawSurface (almost) methods ***/
-#define IDirectDrawSurface4_AddAttachedSurface(p,a)      ICOM_CALL_(AddAttachedSurface,p,(p,a))
-#define IDirectDrawSurface4_AddOverlayDirtyRect(p,a)     ICOM_CALL_(AddOverlayDirtyRect,p,(p,a))
-#define IDirectDrawSurface4_Blt(p,a,b,c,d,e)             ICOM_CALL_(Blt,p,(p,a,b,c,d,e))
-#define IDirectDrawSurface4_BltBatch(p,a,b,c)            ICOM_CALL_(BltBatch,p,(p,a,b,c))
-#define IDirectDrawSurface4_BltFast(p,a,b,c,d,e)         ICOM_CALL_(BltFast,p,(p,a,b,c,d,e))
-#define IDirectDrawSurface4_DeleteAttachedSurface(p,a,b) ICOM_CALL_(DeleteAttachedSurface,p,(p,a,b))
-#define IDirectDrawSurface4_EnumAttachedSurfaces(p,a,b)  ICOM_CALL_(EnumAttachedSurfaces,p,(p,a,b))
-#define IDirectDrawSurface4_EnumOverlayZOrders(p,a,b,c)  ICOM_CALL_(EnumOverlayZOrders,p,(p,a,b,c))
-#define IDirectDrawSurface4_Flip(p,a,b)                  ICOM_CALL_(Flip,p,(p,a,b))
-#define IDirectDrawSurface4_GetAttachedSurface(p,a,b)    ICOM_CALL_(GetAttachedSurface,p,(p,a,b))
-#define IDirectDrawSurface4_GetBltStatus(p,a)            ICOM_CALL_(GetBltStatus,p,(p,a))
-#define IDirectDrawSurface4_GetCaps(p,a)                 ICOM_CALL_(GetCaps,p,(p,a))
-#define IDirectDrawSurface4_GetClipper(p,a)              ICOM_CALL_(GetClipper,p,(p,a))
-#define IDirectDrawSurface4_GetColorKey(p,a,b)           ICOM_CALL_(GetColorKey,p,(p,a,b))
-#define IDirectDrawSurface4_GetDC(p,a)                   ICOM_CALL_(GetDC,p,(p,a))
-#define IDirectDrawSurface4_GetFlipStatus(p,a)           ICOM_CALL_(GetFlipStatus,p,(p,a))
-#define IDirectDrawSurface4_GetOverlayPosition(p,a,b)    ICOM_CALL_(GetOverlayPosition,p,(p,a,b))
-#define IDirectDrawSurface4_GetPalette(p,a)              ICOM_CALL_(GetPalette,p,(p,a))
-#define IDirectDrawSurface4_GetPixelFormat(p,a)          ICOM_CALL_(GetPixelFormat,p,(p,a))
-#define IDirectDrawSurface4_GetSurfaceDesc(p,a)          ICOM_CALL_(GetSurfaceDesc,p,(p,a))
-#define IDirectDrawSurface4_Initialize(p,a,b)            ICOM_CALL_(Initialize,p,(p,a,b))
-#define IDirectDrawSurface4_IsLost(p)                    ICOM_CALL_(IsLost,p,(p))
-#define IDirectDrawSurface4_Lock(p,a,b,c,d)              ICOM_CALL_(Lock,p,(p,a,b,c,d))
-#define IDirectDrawSurface4_ReleaseDC(p,a)               ICOM_CALL_(ReleaseDC,p,(p,a))
-#define IDirectDrawSurface4_Restore(p)                   ICOM_CALL_(Restore,p,(p))
-#define IDirectDrawSurface4_SetClipper(p,a)              ICOM_CALL_(SetClipper,p,(p,a))
-#define IDirectDrawSurface4_SetColorKey(p,a,b)           ICOM_CALL_(SetColorKey,p,(p,a,b))
-#define IDirectDrawSurface4_SetOverlayPosition(p,a,b)    ICOM_CALL_(SetOverlayPosition,p,(p,a,b))
-#define IDirectDrawSurface4_SetPalette(p,a)              ICOM_CALL_(SetPalette,p,(p,a))
-#define IDirectDrawSurface4_Unlock(p,a)                  ICOM_CALL_(Unlock,p,(p,a))
-#define IDirectDrawSurface4_UpdateOverlay(p,a,b,c,d,e)   ICOM_CALL_(UpdateOverlay,p,(p,a,b,c,d,e))
-#define IDirectDrawSurface4_UpdateOverlayDisplay(p,a)    ICOM_CALL_(UpdateOverlayDisplay,p,(p,a))
-#define IDirectDrawSurface4_UpdateOverlayZOrder(p,a,b)   ICOM_CALL_(UpdateOverlayZOrder,p,(p,a,b))
-/*** IDirectDrawSurface2 methods ***/
-#define IDirectDrawSurface4_GetDDInterface(p,a) ICOM_CALL_(GetDDInterface,p,(p,a))
-#define IDirectDrawSurface4_PageLock(p,a)       ICOM_CALL_(PageLock,p,(p,a))
-#define IDirectDrawSurface4_PageUnlock(p,a)     ICOM_CALL_(PageUnlock,p,(p,a))
-/*** IDirectDrawSurface3 methods ***/
-#define IDirectDrawSurface4_SetSurfaceDesc(p,a,b) ICOM_CALL_(SetSurfaceDesc,p,(p,a,b))
-/*** IDirectDrawSurface4 methods ***/
-#define IDirectDrawSurface4_SetPrivateData(p,a,b,c,d) ICOM_CALL_(SetPrivateData,p,(p,a,b,c,d))
-#define IDirectDrawSurface4_GetPrivateData(p,a,b,c)   ICOM_CALL_(GetPrivateData,p,(p,a,b,c))
-#define IDirectDrawSurface4_FreePrivateData(p,a)      ICOM_CALL_(FreePrivateData,p,(p,a))
-#define IDirectDrawSurface4_GetUniquenessValue(p,a)   ICOM_CALL_(GetUniquenessValue,p,(p,a))
-#define IDirectDrawSurface4_ChangeUniquenessValue(p)  ICOM_CALL_(ChangeUniquenessValue,p,(p))
-
-
-/*****************************************************************************
- * IDirectDrawSurface7 interface
- */
-#undef INTERFACE
-#define INTERFACE IDirectDrawSurface7
-DECLARE_INTERFACE_(IDirectDrawSurface7,IUnknown)
-{
-    STDMETHOD(QueryInterface)(THIS_ REFIID,LPVOID*) PURE;
-    STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-    STDMETHOD_(ULONG,Release)(THIS) PURE; 
-    STDMETHOD(AddAttachedSurface)(THIS_ LPDIRECTDRAWSURFACE7 lpDDSAttachedSurface) PURE; 
-    STDMETHOD(AddOverlayDirtyRect)(THIS_ LPRECT lpRect) PURE; 
-    STDMETHOD(Blt)(THIS_ LPRECT lpDestRect, LPDIRECTDRAWSURFACE7 lpDDSrcSurface, LPRECT lpSrcRect, DWORD dwFlags, LPDDBLTFX lpDDBltFx) PURE; 
-    STDMETHOD(BltBatch)(THIS_ LPDDBLTBATCH lpDDBltBatch, DWORD dwCount, DWORD dwFlags) PURE; 
-    STDMETHOD(BltFast)(THIS_ DWORD dwX, DWORD dwY, LPDIRECTDRAWSURFACE7 lpDDSrcSurface, LPRECT lpSrcRect, DWORD dwTrans) PURE; 
-    STDMETHOD(DeleteAttachedSurface)(THIS_ DWORD dwFlags, LPDIRECTDRAWSURFACE7 lpDDSAttachedSurface) PURE; 
-    STDMETHOD(EnumAttachedSurfaces)(THIS_ LPVOID lpContext, LPDDENUMSURFACESCALLBACK7 lpEnumSurfacesCallback) PURE; 
-    STDMETHOD(EnumOverlayZOrders)(THIS_ DWORD dwFlags, LPVOID lpContext, LPDDENUMSURFACESCALLBACK7 lpfnCallback) PURE; 
-    STDMETHOD(Flip)(THIS_ LPDIRECTDRAWSURFACE7 lpDDSurfaceTargetOverride, DWORD dwFlags) PURE; 
-    STDMETHOD(GetAttachedSurface)(THIS_ LPDDSCAPS2 lpDDSCaps, LPDIRECTDRAWSURFACE7* lplpDDAttachedSurface) PURE; 
-    STDMETHOD(GetBltStatus)(THIS_ DWORD dwFlags) PURE; 
-    STDMETHOD(GetCaps)(THIS_ LPDDSCAPS2 lpDDSCaps) PURE; 
-    STDMETHOD(GetClipper)(THIS_ LPDIRECTDRAWCLIPPER* lplpDDClipper) PURE; 
-    STDMETHOD(GetColorKey)(THIS_ DWORD dwFlags, LPDDCOLORKEY lpDDColorKey) PURE; 
-    STDMETHOD(GetDC)(THIS_ HDC* lphDC) PURE; 
-    STDMETHOD(GetFlipStatus)(THIS_ DWORD dwFlags) PURE; 
-    STDMETHOD(GetOverlayPosition)(THIS_ LPLONG lplX, LPLONG lplY) PURE; 
-    STDMETHOD(GetPalette)(THIS_ LPDIRECTDRAWPALETTE* lplpDDPalette) PURE; 
-    STDMETHOD(GetPixelFormat)(THIS_ LPDDPIXELFORMAT lpDDPixelFormat) PURE; 
-    STDMETHOD(GetSurfaceDesc)(THIS_ LPDDSURFACEDESC2 lpDDSurfaceDesc) PURE; 
-    STDMETHOD(Initialize)(THIS_ LPDIRECTDRAW lpDD, LPDDSURFACEDESC2 lpDDSurfaceDesc) PURE; 
-    STDMETHOD(IsLost)(THIS) PURE; 
-    STDMETHOD(Lock)(THIS_ LPRECT lpDestRect, LPDDSURFACEDESC2 lpDDSurfaceDesc, DWORD dwFlags, HANDLE hEvent) PURE; 
-    STDMETHOD(ReleaseDC)(THIS_ HDC hDC) PURE; 
-    STDMETHOD(Restore)(THIS) PURE; 
-    STDMETHOD(SetClipper)(THIS_ LPDIRECTDRAWCLIPPER lpDDClipper) PURE; 
-    STDMETHOD(SetColorKey)(THIS_ DWORD dwFlags, LPDDCOLORKEY lpDDColorKey) PURE; 
-    STDMETHOD(SetOverlayPosition)(THIS_ LONG lX, LONG lY) PURE; 
-    STDMETHOD(SetPalette)(THIS_ LPDIRECTDRAWPALETTE lpDDPalette) PURE; 
-    STDMETHOD(Unlock)(THIS_ LPRECT lpSurfaceData) PURE; 
-    STDMETHOD(UpdateOverlay)(THIS_ LPRECT lpSrcRect, LPDIRECTDRAWSURFACE7 lpDDDestSurface, LPRECT lpDestRect, DWORD dwFlags, LPDDOVERLAYFX lpDDOverlayFx) PURE; 
-    STDMETHOD(UpdateOverlayDisplay)(THIS_ DWORD dwFlags) PURE; 
-    STDMETHOD(UpdateOverlayZOrder)(THIS_ DWORD dwFlags, LPDIRECTDRAWSURFACE7 lpDDSReference) PURE; 
-    /* added in v2 */ 
-    STDMETHOD(GetDDInterface)(THIS_ LPVOID* lplpDD) PURE; 
-    STDMETHOD(PageLock)(THIS_ DWORD dwFlags) PURE; 
-    STDMETHOD(PageUnlock)(THIS_ DWORD dwFlags) PURE; 
-    /* added in v3 */ 
-    STDMETHOD(SetSurfaceDesc)(THIS_ LPDDSURFACEDESC2 lpDDSD, DWORD dwFlags) PURE; 
-    /* added in v4 */ 
-    STDMETHOD(SetPrivateData)(THIS_ REFGUID , LPVOID , DWORD , DWORD ) PURE; 
-    STDMETHOD(GetPrivateData)(THIS_ REFGUID , LPVOID , LPDWORD ) PURE; 
-    STDMETHOD(FreePrivateData)(THIS_ REFGUID ) PURE; 
-    STDMETHOD(GetUniquenessValue)(THIS_ LPDWORD ) PURE; 
-    STDMETHOD(ChangeUniquenessValue)(THIS) PURE; 
-    /* added in v7 */ 
-    STDMETHOD(SetPriority)(THIS_ DWORD prio) PURE; 
-    STDMETHOD(GetPriority)(THIS_ LPDWORD prio) PURE; 
-    STDMETHOD(SetLOD)(THIS_ DWORD lod) PURE; 
-    STDMETHOD(GetLOD)(THIS_ LPDWORD lod) PURE;
-};
-
-    /*** IUnknown methods ***/
-#define IDirectDrawSurface7_QueryInterface(p,a,b) ICOM_CALL_(QueryInterface,p,(p,a,b))
-#define IDirectDrawSurface7_AddRef(p)             ICOM_CALL_(AddRef,p,(p))
-#define IDirectDrawSurface7_Release(p)            ICOM_CALL_(Release,p,(p))
-/*** IDirectDrawSurface (almost) methods ***/
-#define IDirectDrawSurface7_AddAttachedSurface(p,a)      ICOM_CALL_(AddAttachedSurface,p,(p,a))
-#define IDirectDrawSurface7_AddOverlayDirtyRect(p,a)     ICOM_CALL_(AddOverlayDirtyRect,p,(p,a))
-#define IDirectDrawSurface7_Blt(p,a,b,c,d,e)             ICOM_CALL_(Blt,p,(p,a,b,c,d,e))
-#define IDirectDrawSurface7_BltBatch(p,a,b,c)            ICOM_CALL_(BltBatch,p,(p,a,b,c))
-#define IDirectDrawSurface7_BltFast(p,a,b,c,d,e)         ICOM_CALL_(BltFast,p,(p,a,b,c,d,e))
-#define IDirectDrawSurface7_DeleteAttachedSurface(p,a,b) ICOM_CALL_(DeleteAttachedSurface,p,(p,a,b))
-#define IDirectDrawSurface7_EnumAttachedSurfaces(p,a,b)  ICOM_CALL_(EnumAttachedSurfaces,p,(p,a,b))
-#define IDirectDrawSurface7_EnumOverlayZOrders(p,a,b,c)  ICOM_CALL_(EnumOverlayZOrders,p,(p,a,b,c))
-#define IDirectDrawSurface7_Flip(p,a,b)                  ICOM_CALL_(Flip,p,(p,a,b))
-#define IDirectDrawSurface7_GetAttachedSurface(p,a,b)    ICOM_CALL_(GetAttachedSurface,p,(p,a,b))
-#define IDirectDrawSurface7_GetBltStatus(p,a)            ICOM_CALL_(GetBltStatus,p,(p,a))
-#define IDirectDrawSurface7_GetCaps(p,a)                 ICOM_CALL_(GetCaps,p,(p,a))
-#define IDirectDrawSurface7_GetClipper(p,a)              ICOM_CALL_(GetClipper,p,(p,a))
-#define IDirectDrawSurface7_GetColorKey(p,a,b)           ICOM_CALL_(GetColorKey,p,(p,a,b))
-#define IDirectDrawSurface7_GetDC(p,a)                   ICOM_CALL_(GetDC,p,(p,a))
-#define IDirectDrawSurface7_GetFlipStatus(p,a)           ICOM_CALL_(GetFlipStatus,p,(p,a))
-#define IDirectDrawSurface7_GetOverlayPosition(p,a,b)    ICOM_CALL_(GetOverlayPosition,p,(p,a,b))
-#define IDirectDrawSurface7_GetPalette(p,a)              ICOM_CALL_(GetPalette,p,(p,a))
-#define IDirectDrawSurface7_GetPixelFormat(p,a)          ICOM_CALL_(GetPixelFormat,p,(p,a))
-#define IDirectDrawSurface7_GetSurfaceDesc(p,a)          ICOM_CALL_(GetSurfaceDesc,p,(p,a))
-#define IDirectDrawSurface7_Initialize(p,a,b)            ICOM_CALL_(Initialize,p,(p,a,b))
-#define IDirectDrawSurface7_IsLost(p)                    ICOM_CALL_(IsLost,p,(p))
-#define IDirectDrawSurface7_Lock(p,a,b,c,d)              ICOM_CALL_(Lock,p,(p,a,b,c,d))
-#define IDirectDrawSurface7_ReleaseDC(p,a)               ICOM_CALL_(ReleaseDC,p,(p,a))
-#define IDirectDrawSurface7_Restore(p)                   ICOM_CALL_(Restore,p,(p))
-#define IDirectDrawSurface7_SetClipper(p,a)              ICOM_CALL_(SetClipper,p,(p,a))
-#define IDirectDrawSurface7_SetColorKey(p,a,b)           ICOM_CALL_(SetColorKey,p,(p,a,b))
-#define IDirectDrawSurface7_SetOverlayPosition(p,a,b)    ICOM_CALL_(SetOverlayPosition,p,(p,a,b))
-#define IDirectDrawSurface7_SetPalette(p,a)              ICOM_CALL_(SetPalette,p,(p,a))
-#define IDirectDrawSurface7_Unlock(p,a)                  ICOM_CALL_(Unlock,p,(p,a))
-#define IDirectDrawSurface7_UpdateOverlay(p,a,b,c,d,e)   ICOM_CALL_(UpdateOverlay,p,(p,a,b,c,d,e))
-#define IDirectDrawSurface7_UpdateOverlayDisplay(p,a)    ICOM_CALL_(UpdateOverlayDisplay,p,(p,a))
-#define IDirectDrawSurface7_UpdateOverlayZOrder(p,a,b)   ICOM_CALL_(UpdateOverlayZOrder,p,(p,a,b))
-/*** IDirectDrawSurface2 methods ***/
-#define IDirectDrawSurface7_GetDDInterface(p,a) ICOM_CALL_(GetDDInterface,p,(p,a))
-#define IDirectDrawSurface7_PageLock(p,a)       ICOM_CALL_(PageLock,p,(p,a))
-#define IDirectDrawSurface7_PageUnlock(p,a)     ICOM_CALL_(PageUnlock,p,(p,a))
-/*** IDirectDrawSurface3 methods ***/
-#define IDirectDrawSurface7_SetSurfaceDesc(p,a,b) ICOM_CALL_(SetSurfaceDesc,p,(p,a,b))
-/*** IDirectDrawSurface4 methods ***/
-#define IDirectDrawSurface7_SetPrivateData(p,a,b,c,d) ICOM_CALL_(SetPrivateData,p,(p,a,b,c,d))
-#define IDirectDrawSurface7_GetPrivateData(p,a,b,c)   ICOM_CALL_(GetPrivateData,p,(p,a,b,c))
-#define IDirectDrawSurface7_FreePrivateData(p,a)      ICOM_CALL_(FreePrivateData,p,(p,a))
-#define IDirectDrawSurface7_GetUniquenessValue(p,a)   ICOM_CALL_(GetUniquenessValue,p,(p,a))
-#define IDirectDrawSurface7_ChangeUniquenessValue(p)  ICOM_CALL_(ChangeUniquenessValue,p,(p))
-/*** IDirectDrawSurface7 methods ***/
-#define IDirectDrawSurface7_SetPriority(p,a)          ICOM_CALL_(SetPriority,p,(p,a))
-#define IDirectDrawSurface7_GetPriority(p,a)          ICOM_CALL_(GetPriority,p,(p,a))
-#define IDirectDrawSurface7_SetLOD(p,a)               ICOM_CALL_(SetLOD,p,(p,a))
-#define IDirectDrawSurface7_GetLOD(p,a)               ICOM_CALL_(GetLOD,p,(p,a))
-
-/*****************************************************************************
- * IDirectDrawColorControl interface
- */
-#undef INTERFACE
-#define INTERFACE IDirectDrawColorControl
-DECLARE_INTERFACE_(IDirectDrawColorControl,IUnknown)
-{
-    STDMETHOD(QueryInterface)(THIS_ REFIID,LPVOID*) PURE;
-    STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-    STDMETHOD_(ULONG,Release)(THIS) PURE; 
-    STDMETHOD(GetColorControls)(THIS_ LPDDCOLORCONTROL lpColorControl) PURE; 
-    STDMETHOD(SetColorControls)(THIS_ LPDDCOLORCONTROL lpColorControl) PURE;
-};
-
-	/*** IUnknown methods ***/
-#define IDirectDrawColorControl_QueryInterface(p,a,b) ICOM_CALL_(QueryInterface,p,(p,a,b))
-#define IDirectDrawColorControl_AddRef(p)             ICOM_CALL_(AddRef,p,(p))
-#define IDirectDrawColorControl_Release(p)            ICOM_CALL_(Release,p,(p))
-	/*** IDirectDrawColorControl methods ***/
-#define IDirectDrawColorControl_GetColorControls(p,a) ICOM_CALL_(GetColorControls,p,(p,a))
-#define IDirectDrawColorControl_SetColorControls(p,a) ICOM_CALL_(SetColorControls,p,(p,a))
-
-/*****************************************************************************
- * IDirectDrawGammaControl interface
- */
-#undef INTERFACE
-#define INTERFACE IDirectDrawGammaControl
-DECLARE_INTERFACE_(IDirectDrawGammaControl,IUnknown)
-{
-    STDMETHOD(QueryInterface)(THIS_ REFIID,LPVOID*) PURE;
-    STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-    STDMETHOD_(ULONG,Release)(THIS) PURE; 
-    STDMETHOD(GetGammaRamp)(THIS_ DWORD dwFlags, LPDDGAMMARAMP lpGammaRamp) PURE; 
-    STDMETHOD(SetGammaRamp)(THIS_ DWORD dwFlags, LPDDGAMMARAMP lpGammaRamp) PURE;
-};
-
-	/*** IUnknown methods ***/
-#define IDirectDrawGammaControl_QueryInterface(p,a,b) ICOM_CALL_(QueryInterface,p,(p,a,b))
-#define IDirectDrawGammaControl_AddRef(p)             ICOM_CALL_(AddRef,p,(p))
-#define IDirectDrawGammaControl_Release(p)            ICOM_CALL_(Release,p,(p))
-	/*** IDirectDrawGammaControl methods ***/
-#define IDirectDrawGammaControl_GetGammaRamp(p,a,b)   ICOM_CALL_(GetGammaRamp,p,(p,a,b))
-#define IDirectDrawGammaControl_SetGammaRamp(p,a,b)   ICOM_CALL_(SetGammaRamp,p,(p,a,b))
-
-
-HRESULT WINAPI DirectDrawCreate(LPGUID,LPDIRECTDRAW*,LPUNKNOWN);
-HRESULT WINAPI DirectDrawCreateEx(LPGUID,LPVOID*,REFIID,LPUNKNOWN);
-HRESULT WINAPI DirectDrawEnumerateA(LPDDENUMCALLBACKA,LPVOID);
-HRESULT WINAPI DirectDrawEnumerateW(LPDDENUMCALLBACKW,LPVOID);
-#define DirectDrawEnumerate WINELIB_NAME_AW(DirectDrawEnumerate)
-HRESULT WINAPI DirectDrawCreateClipper(DWORD,LPDIRECTDRAWCLIPPER*,LPUNKNOWN);
-
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif /* defined(__cplusplus) */
-
-#endif /* __XWIN_DDRAW_H */
diff --git a/xorg-server/hw/xwin/makefile b/xorg-server/hw/xwin/makefile
new file mode 100644
index 000000000..2c82d9499
--- /dev/null
+++ b/xorg-server/hw/xwin/makefile
@@ -0,0 +1,107 @@
+LIBRARY = libXWin
+
+SRCS_CLIPBOARD = \
+	winclipboardinit.c \
+	winclipboardtextconv.c \
+	winclipboardthread.c \
+	winclipboardunicode.c \
+	winclipboardwndproc.c \
+	winclipboardwrappers.c \
+	winclipboardxevents.c
+
+DEFINES += XWIN_CLIPBOARD
+
+SRCS_MULTIWINDOW = \
+	winmultiwindowshape.c \
+	winmultiwindowwindow.c \
+	winmultiwindowwm.c \
+	winmultiwindowwndproc.c
+
+DEFINES += XWIN_MULTIWINDOW
+
+#SRCS_MULTIWINDOWEXTWM = \
+#	winwin32rootless.c \
+#	winwin32rootlesswindow.c \
+#	winwin32rootlesswndproc.c \
+#	winwindowswm.c
+#DEFINES += XWIN_MULTIWINDOWEXTWM
+
+SRCS_NATIVEGDI = \
+	winclip.c \
+	winfillsp.c \
+	winfont.c \
+	wingc.c \
+	wingetsp.c \
+	winnativegdi.c \
+	winpixmap.c \
+	winpolyline.c \
+	winrop.c \
+	winsetsp.c
+DEFINES +=  XWIN_NATIVEGDI
+
+
+SRCS_RANDR = \
+	winrandr.c
+DEFINES += XWIN_RANDR RELOCATE_PROJECTROOT
+
+CSRCS = InitInput.c \
+	InitOutput.c \
+	winallpriv.c \
+	winauth.c \
+	winblock.c \
+	wincmap.c \
+	winconfig.c \
+	wincreatewnd.c \
+	wincursor.c \
+	windialogs.c \
+	winengine.c \
+	winerror.c \
+	winglobals.c \
+	winkeybd.c \
+	winkeyhook.c \
+	winmisc.c \
+	winmouse.c \
+	winmsg.c \
+	winmultiwindowclass.c \
+	winmultiwindowicons.c \
+	winprefs.c \
+	winprocarg.c \
+	winregistry.c \
+	winscrinit.c \
+	winshaddd.c \
+	winshadddnl.c \
+	winshadgdi.c \
+	wintrayicon.c \
+	winvalargs.c \
+	winwakeup.c \
+	winwindow.c \
+	winprefslex.c \
+	winprefsyacc.c \
+	winwndproc.c \
+	$(SRCS_RANDR) \
+	$(SRCS_CLIPBOARD) \
+	$(SRCS_MULTIWINDOW) \
+	$(SRCS_MULTIWINDOWEXTWM) \
+	$(SRCS_NATIVEGDI)
+
+
+DEFINES += YY_NO_UNISTD_H
+
+#	XWin.rc \
+#	$(top_srcdir)/Xext/dpmsstubs.c \
+#	$(top_srcdir)/Xi/stubs.c \
+#	$(top_srcdir)/mi/miinitext.c \
+#	$(top_srcdir)/fb/fbcmap_mi.c \
+#	$(SRCS_PRIMARYFB) \
+#	$(SRCS_XV)
+
+INCLUDES += ..\..\miext\rootless
+
+#.rc.o:
+
+#	$(WINDRES) --use-temp-file -i $< --input-format=rc -o $@ -O coff -I $(top_builddir)/include -DPROJECT_NAME=\"$(VENDOR_NAME_SHORT)\" -DPROJECT_VERSION=\"$(PACKAGE_VERSION)\" -DBUILD_DATE=\"$(BUILD_DATE)\"
+
+DEFINES += HAVE_XWIN_CONFIG_H BUILD_DATE=0-0-0000 PTW32_STATIC_LIB
+
+#CSRCS=winkeybd.c
+
diff --git a/xorg-server/hw/xwin/win.h b/xorg-server/hw/xwin/win.h
index 9009df29b..8470cef6b 100644
--- a/xorg-server/hw/xwin/win.h
+++ b/xorg-server/hw/xwin/win.h
@@ -42,11 +42,6 @@
 #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
@@ -142,6 +137,9 @@
 #include <errno.h>
 #if defined(XWIN_MULTIWINDOWEXTWM) || defined(XWIN_CLIPBOARD) || defined(XWIN_MULTIWINDOW)
 #define HANDLE void *
+#ifdef _MSC_VER
+typedef int pid_t;
+#endif
 #include <pthread.h>
 #undef HANDLE
 #endif
@@ -212,43 +210,6 @@
 #include "winwindow.h"
 #include "winmsg.h"
 
-
-/*
- * Debugging macros
- */
-
-#if CYGDEBUG
-#define DEBUG_MSG(str,...) \
-if (fDebugProcMsg) \
-{ \
-  char *pszTemp; \
-  int iLength; \
-  pszTemp = Xprintf (str, ##__VA_ARGS__); \
-  MessageBox (NULL, pszTemp, szFunctionName, MB_OK); \
-  xfree (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;\
@@ -591,6 +552,11 @@ typedef struct _winPrivScreenRec
   MoveWindowProcPtr			MoveWindow;
   SetShapeProcPtr			SetShape;
 
+#ifdef XWIN_NATIVEGDI
+  RealizeFontProcPtr                    RealizeFont;
+  UnrealizeFontProcPtr                  UnrealizeFont;
+#endif
+
   winCursorRec                          cursor;
 } winPrivScreenRec;
 
@@ -833,6 +799,9 @@ winCreateBoundingWindowWindowed (ScreenPtr pScreen);
  * windialogs.c
  */
 
+int
+GetLiveClients (winPrivScreenPtr pScreenPriv);
+
 void
 winDisplayExitDialog (winPrivScreenPtr pScreenPriv);
 
@@ -1303,7 +1272,7 @@ winTopLevelWindowProc (HWND hwnd, UINT message,
  */
 
 void
-winInitNotifyIcon (winPrivScreenPtr pScreenPriv);
+winInitNotifyIcon (winPrivScreenPtr pScreenPriv, Bool Modify);
 
 void
 winDeleteNotifyIcon (winPrivScreenPtr pScreenPriv);
diff --git a/xorg-server/hw/xwin/winallpriv.c b/xorg-server/hw/xwin/winallpriv.c
index 21ccd9b3b..3413ece53 100644
--- a/xorg-server/hw/xwin/winallpriv.c
+++ b/xorg-server/hw/xwin/winallpriv.c
@@ -48,11 +48,9 @@ winAllocatePrivates (ScreenPtr pScreen)
 {
   winPrivScreenPtr	pScreenPriv;
 
-#if CYGDEBUG
   winDebug ("winAllocateScreenPrivates - g_ulServerGeneration: %d "
 	  "serverGeneration: %d\n",
 	  g_ulServerGeneration, serverGeneration);
-#endif
 
   /* We need a new slot for our privates if the screen gen has changed */
   if (g_ulServerGeneration != serverGeneration)
@@ -111,9 +109,7 @@ winAllocatePrivates (ScreenPtr pScreen)
 Bool
 winInitCmapPrivates (ColormapPtr pcmap, int index)
 {
-#if CYGDEBUG
   winDebug ("winInitCmapPrivates\n");
-#endif
   
   /*
    * I see no way that this function can do anything useful
@@ -139,9 +135,7 @@ winAllocateCmapPrivates (ColormapPtr pCmap)
   winPrivCmapPtr		pCmapPriv;
   static unsigned long		s_ulPrivateGeneration = 0;
 
-#if CYGDEBUG
   winDebug ("winAllocateCmapPrivates\n");
-#endif
 
   /* Get a new privates index when the server generation changes */
   if (s_ulPrivateGeneration != serverGeneration)
@@ -164,9 +158,7 @@ winAllocateCmapPrivates (ColormapPtr pCmap)
   /* Save the cmap private pointer */
   winSetCmapPriv (pCmap, pCmapPriv);
 
-#if CYGDEBUG
   winDebug ("winAllocateCmapPrivates - Returning\n");
-#endif
 
   return TRUE;
 }
diff --git a/xorg-server/hw/xwin/winauth.c b/xorg-server/hw/xwin/winauth.c
index b57a35abf..97b3a85fe 100644
--- a/xorg-server/hw/xwin/winauth.c
+++ b/xorg-server/hw/xwin/winauth.c
@@ -78,10 +78,10 @@ winGenerateAuthorization ()
       ErrorF ("winGenerateAuthorization - GenerateAuthorization failed\n");
       goto auth_bailout;
     }
-#if 0
+#ifdef WINDBG
   else
     {
-      ErrorF ("winGenerateAuthorization - GenerateAuthorization success!\n"
+      winDebug ("winGenerateAuthorization - GenerateAuthorization success!\n"
 	      "AuthDataLen: %d AuthData: %s\n",
 	      g_uiAuthDataLen, g_pAuthData);
     }
diff --git a/xorg-server/hw/xwin/winclip.c b/xorg-server/hw/xwin/winclip.c
index aab7d632d..cbbf08c59 100644
--- a/xorg-server/hw/xwin/winclip.c
+++ b/xorg-server/hw/xwin/winclip.c
@@ -37,6 +37,6 @@
 RegionPtr
 winPixmapToRegionNativeGDI (PixmapPtr pPix)
 {
-  ErrorF ("winPixmapToRegion()\n");
+  winDebug ("winPixmapToRegion()\n");
   return NULL;
 }
diff --git a/xorg-server/hw/xwin/winclipboard.h b/xorg-server/hw/xwin/winclipboard.h
index 089c2913b..9bf7c9c0e 100644
--- a/xorg-server/hw/xwin/winclipboard.h
+++ b/xorg-server/hw/xwin/winclipboard.h
@@ -34,7 +34,9 @@
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
+#ifndef _MSC_VER
 #include <unistd.h>
+#endif
 #ifdef __CYGWIN__
 #include <sys/select.h>
 #else
@@ -43,6 +45,9 @@
 #endif
 #include <fcntl.h>
 #include <setjmp.h>
+#ifdef _MSC_VER
+typedef int pid_t;
+#endif
 #include <pthread.h>
 
 /* X headers */
@@ -74,15 +79,13 @@
 
 #define WM_WM_REINIT                           (WM_USER + 1)
 
+#include "winmsg.h"
+
 /*
  * References to external symbols
  */
 
 extern char *display;
-extern void ErrorF (const char* /*f*/, ...);
-extern void winDebug (const char *format, ...);
-extern void winErrorFVerb (int verb, const char *format, ...);
-
 
 /*
  * winclipboardinit.c
@@ -145,5 +148,6 @@ int
 winClipboardFlushXEvents (HWND hwnd,
 			  int iWindow,
 			  Display *pDisplay,
-			  Bool fUnicodeSupport);
+			  Bool fUnicodeSupport,
+			  Bool ClipboardOpened);
 #endif
diff --git a/xorg-server/hw/xwin/winclipboardinit.c b/xorg-server/hw/xwin/winclipboardinit.c
index bec63ac8e..d451314fb 100644
--- a/xorg-server/hw/xwin/winclipboardinit.c
+++ b/xorg-server/hw/xwin/winclipboardinit.c
@@ -61,7 +61,7 @@ extern HWND			g_hwndClipboard;
 Bool
 winInitClipboard (void)
 {
-  ErrorF ("winInitClipboard ()\n");
+  winDebug ("winInitClipboard ()\n");
 
   /* Wrap some internal server functions */
   if (ProcVector[X_SetSelectionOwner] != winProcSetSelectionOwner)
diff --git a/xorg-server/hw/xwin/winclipboardtextconv.c b/xorg-server/hw/xwin/winclipboardtextconv.c
index fd2e696c3..16637a592 100644
--- a/xorg-server/hw/xwin/winclipboardtextconv.c
+++ b/xorg-server/hw/xwin/winclipboardtextconv.c
@@ -84,8 +84,8 @@ winClipboardUNIXtoDOS (unsigned char **ppszData, int iLength)
   unsigned char		*pszEnd = pszSrc + iLength;
   unsigned char		*pszDest = NULL, *pszDestBegin = NULL;
 
-#if 0
-  ErrorF ("UNIXtoDOS () - Original data:\n%s\n", *ppszData);
+#ifdef WINDBG
+  winDebug ("UNIXtoDOS () - Original data:\n%s\n", *ppszData);
 #endif
 
   /* Count \n characters without leading \r */
@@ -153,7 +153,7 @@ winClipboardUNIXtoDOS (unsigned char **ppszData, int iLength)
   free (*ppszData);
   *ppszData = pszDestBegin;
 
-#if 0
-  ErrorF ("UNIXtoDOS () - Final string:\n%s\n", pszDestBegin);
+#ifdef WINDBG
+  winDebug ("UNIXtoDOS () - Final string:\n%s\n", pszDestBegin);
 #endif
 }
diff --git a/xorg-server/hw/xwin/winclipboardthread.c b/xorg-server/hw/xwin/winclipboardthread.c
index 8eb825fa8..fcae5f851 100644
--- a/xorg-server/hw/xwin/winclipboardthread.c
+++ b/xorg-server/hw/xwin/winclipboardthread.c
@@ -1,480 +1,519 @@
-/*
- *Copyright (C) 2003-2004 Harold L Hunt II All Rights Reserved.
- *Copyright (C) Colin Harrison 2005-2008
- *
- *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 the copyright holder(s)
- *and 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 the copyright holder(s) and author(s).
- *
- * Authors:	Harold L Hunt II
- *              Colin Harrison
- */
-
-#ifdef HAVE_XWIN_CONFIG_H
-#include <xwin-config.h>
-#endif
-#include <sys/types.h>
-#include "winclipboard.h"
-#ifdef __CYGWIN__
-#include <errno.h>
-#endif
-#include "X11/Xauth.h"
-#include "misc.h"
-
-
-/*
- * Constants
- */
-
-#define AUTH_NAME	"MIT-MAGIC-COOKIE-1"
-
-
-/*
- * References to external symbols
- */
-
-extern Bool		g_fUnicodeClipboard;
-extern unsigned long	serverGeneration;
-#if defined(XCSECURITY)
-extern unsigned int	g_uiAuthDataLen;
-extern char		*g_pAuthData;
-#endif
-extern Bool		g_fClipboardStarted;
-extern HWND		g_hwndClipboard;
-extern void		*g_pClipboardDisplay;
-extern Window		g_iClipboardWindow;
-
-
-/*
- * Global variables
- */
-
-static jmp_buf			g_jmpEntry;
-Bool				g_fUnicodeSupport = FALSE;
-Bool				g_fUseUnicode = FALSE;
-
-
-/*
- * Local function prototypes
- */
-
-static int
-winClipboardErrorHandler (Display *pDisplay, XErrorEvent *pErr);
-
-static int
-winClipboardIOErrorHandler (Display *pDisplay);
-
-
-/*
- * Main thread function
- */
-
-void *
-winClipboardProc (void *pvNotUsed)
-{
-  Atom			atomClipboard, atomClipboardManager;
-  int			iReturn;
-  HWND			hwnd = NULL;
-  int			iConnectionNumber = 0;
-#ifdef HAS_DEVWINDOWS
-  int			fdMessageQueue = 0;
-#else
-  struct timeval        tvTimeout;
-#endif
-  fd_set		fdsRead;
-  int			iMaxDescriptor;
-  Display		*pDisplay = NULL;
-  Window		iWindow = None;
-  int			iRetries;
-  Bool			fUseUnicode;
-  char			szDisplay[512];
-  int			iSelectError;
-
-  ErrorF ("winClipboardProc - Hello\n");
-
-  /* Do we have Unicode support? */
-  g_fUnicodeSupport = winClipboardDetectUnicodeSupport ();
-
-  /* Do we use Unicode clipboard? */
-  fUseUnicode = g_fUnicodeClipboard && g_fUnicodeSupport;
-
-  /* Save the Unicode support flag in a global */
-  g_fUseUnicode = fUseUnicode;
-
-  /* Allow multiple threads to access Xlib */
-  if (XInitThreads () == 0)
-    {
-      ErrorF ("winClipboardProc - XInitThreads failed.\n");
-      pthread_exit (NULL);
-    }
-
-  /* See if X supports the current locale */
-  if (XSupportsLocale () == False)
-    {
-      ErrorF ("winClipboardProc - Locale not supported by X.  Exiting.\n");
-      pthread_exit (NULL);
-    }
-
-  /* Set jump point for Error exits */
-  iReturn = setjmp (g_jmpEntry);
-  
-  /* Check if we should continue operations */
-  if (iReturn != WIN_JMP_ERROR_IO
-      && iReturn != WIN_JMP_OKAY)
-    {
-      /* setjmp returned an unknown value, exit */
-      ErrorF ("winClipboardProc - setjmp returned: %d exiting\n",
-	      iReturn);
-      pthread_exit (NULL);
-    }
-  else if (iReturn == WIN_JMP_ERROR_IO)
-    {
-      /* TODO: Cleanup the Win32 window and free any allocated memory */
-      ErrorF ("winClipboardProc - setjmp returned for IO Error Handler.\n");
-      pthread_exit (NULL);
-    }
-
-#if defined(XCSECURITY)
-  /* Use our generated cookie for authentication */
-  XSetAuthorization (AUTH_NAME,
-		     strlen (AUTH_NAME),
-		     g_pAuthData,
-		     g_uiAuthDataLen);
-#endif
-
-  /* Set error handler */
-  XSetErrorHandler (winClipboardErrorHandler);
-  XSetIOErrorHandler (winClipboardIOErrorHandler);
-
-  /* Initialize retry count */
-  iRetries = 0;
-
-  /* Setup the display connection string x */
-  /*
-   * NOTE: Always connect to screen 0 since we require that screen
-   * numbers start at 0 and increase without gaps.  We only need
-   * to connect to one screen on the display to get events
-   * for all screens on the display.  That is why there is only
-   * one clipboard client thread.
-   */
-  snprintf (szDisplay,
-	    512,
-	    "127.0.0.1:%s.0",
-	    display);
-
-  /* Print the display connection string */
-  ErrorF ("winClipboardProc - DISPLAY=%s\n", szDisplay);
-
-  /* Open the X display */
-  do
-    {
-      pDisplay = XOpenDisplay (szDisplay);
-      if (pDisplay == NULL)
-	{
-	  ErrorF ("winClipboardProc - Could not open display, "
-		  "try: %d, sleeping: %d\n",
-		  iRetries + 1, WIN_CONNECT_DELAY);
-	  ++iRetries;
-	  sleep (WIN_CONNECT_DELAY);
-	  continue;
-	}
-      else
-	break;
-    }
-  while (pDisplay == NULL && iRetries < WIN_CONNECT_RETRIES);
-
-  /* Make sure that the display opened */
-  if (pDisplay == NULL)
-    {
-      ErrorF ("winClipboardProc - Failed opening the display, giving up\n");
-      pthread_exit (NULL);
-    }
-
-  /* Save the display in the screen privates */
-  g_pClipboardDisplay = pDisplay;
-
-  ErrorF ("winClipboardProc - XOpenDisplay () returned and "
-	  "successfully opened the display.\n");
-
-  /* Get our connection number */
-  iConnectionNumber = ConnectionNumber (pDisplay);
-
-#ifdef HAS_DEVWINDOWS
-  /* Open a file descriptor for the windows message queue */
-  fdMessageQueue = open (WIN_MSG_QUEUE_FNAME, O_RDONLY);
-  if (fdMessageQueue == -1)
-    {
-      ErrorF ("winClipboardProc - Failed opening %s\n", WIN_MSG_QUEUE_FNAME);
-      pthread_exit (NULL);
-    }
-
-  /* Find max of our file descriptors */
-  iMaxDescriptor = max (fdMessageQueue, iConnectionNumber) + 1;
-#else
-  iMaxDescriptor = iConnectionNumber + 1;
-#endif
-
-  /* Create atoms */
-  atomClipboard = XInternAtom (pDisplay, "CLIPBOARD", False);
-  atomClipboardManager = XInternAtom (pDisplay, "CLIPBOARD_MANAGER", False);
-
-  /* Create a messaging window */
-  iWindow = XCreateSimpleWindow (pDisplay,
-				 DefaultRootWindow (pDisplay),
-				 1, 1,
-				 500, 500,
-				 0,
-				 BlackPixel (pDisplay, 0),
-				 BlackPixel (pDisplay, 0));
-  if (iWindow == 0)
-    {
-      ErrorF ("winClipboardProc - Could not create an X window.\n");
-      pthread_exit (NULL);
-    }
-
-  /* Select event types to watch */
-  if (XSelectInput (pDisplay,
-		    iWindow,
-		    PropertyChangeMask) == BadWindow)
-    ErrorF ("winClipboardProc - XSelectInput generated BadWindow "
-	    "on messaging window\n");
-
-  /* Save the window in the screen privates */
-  g_iClipboardWindow = iWindow;
-
-  /* Create Windows messaging window */
-  hwnd = winClipboardCreateMessagingWindow ();
-  
-  /* Save copy of HWND in screen privates */
-  g_hwndClipboard = hwnd;
-
-  /* Assert ownership of selections if Win32 clipboard is owned */
-  if (NULL != GetClipboardOwner ())
-    {
-      /* PRIMARY */
-      iReturn = XSetSelectionOwner (pDisplay, XA_PRIMARY,
-				    iWindow, CurrentTime);
-      if (iReturn == BadAtom || iReturn == BadWindow ||
-	  XGetSelectionOwner (pDisplay, XA_PRIMARY) != iWindow)
-	{
-	  ErrorF ("winClipboardProc - Could not set PRIMARY owner\n");
-	  pthread_exit (NULL);
-	}
-
-      /* CLIPBOARD */
-      iReturn = XSetSelectionOwner (pDisplay, atomClipboard,
-				    iWindow, CurrentTime);
-      if (iReturn == BadAtom || iReturn == BadWindow ||
-	  XGetSelectionOwner (pDisplay, atomClipboard) != iWindow)
-	{
-	  ErrorF ("winClipboardProc - Could not set CLIPBOARD owner\n");
-	  pthread_exit (NULL);
-	}
-    }
-
-  /* Pre-flush X events */
-  /* 
-   * NOTE: Apparently you'll freeze if you don't do this,
-   *	   because there may be events in local data structures
-   *	   already.
-   */
-  winClipboardFlushXEvents (hwnd,
-			    iWindow,
-			    pDisplay,
-			    fUseUnicode);
-
-  /* Pre-flush Windows messages */
-  if (!winClipboardFlushWindowsMessageQueue (hwnd))
-    return 0;
-
-  /* Signal that the clipboard client has started */
-  g_fClipboardStarted = TRUE;
-
-  /* Loop for X events */
-  while (1)
-    {
-      /* Setup the file descriptor set */
-      /*
-       * NOTE: You have to do this before every call to select
-       *       because select modifies the mask to indicate
-       *       which descriptors are ready.
-       */
-      FD_ZERO (&fdsRead);
-      FD_SET (iConnectionNumber, &fdsRead);
-#ifdef HAS_DEVWINDOWS
-      FD_SET (fdMessageQueue, &fdsRead);
-#else
-      tvTimeout.tv_sec = 0;
-      tvTimeout.tv_usec = 100;
-#endif
-
-      /* Wait for a Windows event or an X event */
-      iReturn = select (iMaxDescriptor,	/* Highest fds number */
-			&fdsRead,	/* Read mask */
-			NULL,		/* No write mask */
-			NULL,		/* No exception mask */
-#ifdef HAS_DEVWINDOWS
-			NULL		/* No timeout */
-#else
-			&tvTimeout      /* Set timeout */
-#endif
-          );
-
-#ifndef HAS_WINSOCK
-      iSelectError = errno;
-#else
-      iSelectError = WSAGetLastError();
-#endif
-
-      if (iReturn < 0)
-	{
-#ifndef HAS_WINSOCK
-          if (iSelectError == EINTR)
-#else
-          if (iSelectError == WSAEINTR)
-#endif
-            continue;
-          
-	  ErrorF ("winClipboardProc - Call to select () failed: %d.  "
-		  "Bailing.\n", iReturn);
-	  break;
-	}
-
-      /* Branch on which descriptor became active */
-      if (FD_ISSET (iConnectionNumber, &fdsRead))
-	{
-	  /* Process X events */
-	  /* Exit when we see that server is shutting down */
-	  iReturn = winClipboardFlushXEvents (hwnd,
-					      iWindow,
-					      pDisplay,
-					      fUseUnicode);
-	  if (WIN_XEVENTS_SHUTDOWN == iReturn)
-	    {
-	      ErrorF ("winClipboardProc - winClipboardFlushXEvents "
-		      "trapped shutdown event, exiting main loop.\n");
-	      break;
-	    }
-	}
-
-#ifdef HAS_DEVWINDOWS
-      /* Check for Windows event ready */
-      if (FD_ISSET (fdMessageQueue, &fdsRead))
-#else
-      if (1)
-#endif
-	{
-	  /* Process Windows messages */
-	  if (!winClipboardFlushWindowsMessageQueue (hwnd))
-	    {
-	      ErrorF ("winClipboardProc - "
-		      "winClipboardFlushWindowsMessageQueue trapped "
-		      "WM_QUIT message, exiting main loop.\n");
-	      break;
-	    }
-	}
-    }
-
-  /* Close our X window */
-  if (pDisplay && iWindow)
-    {
-      iReturn = XDestroyWindow (pDisplay, iWindow);
-      if (iReturn == BadWindow)
-	ErrorF ("winClipboardProc - XDestroyWindow returned BadWindow.\n");
-      else
-	ErrorF ("winClipboardProc - XDestroyWindow succeeded.\n");
-    }
-
-
-#ifdef HAS_DEVWINDOWS
-  /* Close our Win32 message handle */
-  if (fdMessageQueue)
-    close (fdMessageQueue);
-#endif
-
-#if 0
-  /*
-   * FIXME: XCloseDisplay hangs if we call it, as of 2004/03/26.  The
-   * XSync and XSelectInput calls did not help.
-   */
-
-  /* Discard any remaining events */
-  XSync (pDisplay, TRUE);
-
-  /* Select event types to watch */
-  XSelectInput (pDisplay,
-		DefaultRootWindow (pDisplay),
-		None);
-
-  /* Close our X display */
-  if (pDisplay)
-    {
-      XCloseDisplay (pDisplay);
-    }
-#endif
-
-  g_iClipboardWindow = None;
-  g_pClipboardDisplay = NULL;
-  g_hwndClipboard = NULL;
-
-  return NULL;
-}
-
-
-/*
- * winClipboardErrorHandler - Our application specific error handler
- */
-
-static int
-winClipboardErrorHandler (Display *pDisplay, XErrorEvent *pErr)
-{
-  char pszErrorMsg[100];
-  
-  XGetErrorText (pDisplay,
-		 pErr->error_code,
-		 pszErrorMsg,
-		 sizeof (pszErrorMsg));
-  ErrorF ("winClipboardErrorHandler - ERROR: \n\t%s\n"
-	  "\tSerial: %d, Request Code: %d, Minor Code: %d\n",
-	  pszErrorMsg,
-	  pErr->serial,
-	  pErr->request_code,
-	  pErr->minor_code);
-  return 0;
-}
-
-
-/*
- * winClipboardIOErrorHandler - Our application specific IO error handler
- */
-
-static int
-winClipboardIOErrorHandler (Display *pDisplay)
-{
-  ErrorF ("\nwinClipboardIOErrorHandler!\n\n");
-
-  /* Restart at the main entry point */
-  longjmp (g_jmpEntry, WIN_JMP_ERROR_IO);
-  
-  return 0;
-}
+/*

+ *Copyright (C) 2003-2004 Harold L Hunt II All Rights Reserved.

+ *Copyright (C) Colin Harrison 2005-2008

+ *

+ *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 the copyright holder(s)

+ *and 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 the copyright holder(s) and author(s).

+ *

+ * Authors:	Harold L Hunt II

+ *              Colin Harrison

+ */

+

+#ifdef HAVE_XWIN_CONFIG_H

+#include <xwin-config.h>

+#endif

+#include <sys/types.h>

+#include "winclipboard.h"

+#ifdef __CYGWIN__

+#include <errno.h>

+#endif

+#include "X11/Xauth.h"

+#include "misc.h"

+#include "winmsg.h"

+

+#ifdef _MSC_VER

+#define snprintf _snprintf

+#endif

+

+/*

+ * Constants

+ */

+

+#define AUTH_NAME	"MIT-MAGIC-COOKIE-1"

+

+

+/*

+ * References to external symbols

+ */

+

+extern Bool		g_fUnicodeClipboard;

+extern unsigned long	serverGeneration;

+#if defined(XCSECURITY)

+extern unsigned int	g_uiAuthDataLen;

+extern char		*g_pAuthData;

+#endif

+extern Bool		g_fClipboardLaunched;

+extern Bool		g_fClipboardStarted;

+extern HWND		g_hwndClipboard;

+extern void		*g_pClipboardDisplay;

+extern Window		g_iClipboardWindow;

+

+

+/*

+ * Global variables

+ */

+

+static jmp_buf			g_jmpEntry;

+Bool				g_fUnicodeSupport = FALSE;

+Bool				g_fUseUnicode = FALSE;

+

+

+/*

+ * Local function prototypes

+ */

+

+static int

+winClipboardErrorHandler (Display *pDisplay, XErrorEvent *pErr);

+

+static int

+winClipboardIOErrorHandler (Display *pDisplay);

+

+

+/*

+ * Main thread function

+ */

+

+void *

+winClipboardProc (void *pvNotUsed)

+{

+  Atom			atomClipboard, atomClipboardManager;

+  int			iReturn;

+  HWND			hwnd = NULL;

+  int			iConnectionNumber = 0;

+#ifdef HAS_DEVWINDOWS

+  int			fdMessageQueue = 0;

+#else

+  struct timeval        tvTimeout;

+#endif

+  fd_set		fdsRead;

+  int			iMaxDescriptor;

+  Display		*pDisplay = NULL;

+  Window		iWindow = None;

+  int			iRetries;

+  Bool			fUseUnicode;

+  char			szDisplay[512];

+  int			iSelectError;

+

+  winDebug ("winClipboardProc - Hello\n");

+

+  /* Do we have Unicode support? */

+  g_fUnicodeSupport = winClipboardDetectUnicodeSupport ();

+

+  /* Do we use Unicode clipboard? */

+  fUseUnicode = g_fUnicodeClipboard && g_fUnicodeSupport;

+

+  /* Save the Unicode support flag in a global */

+  g_fUseUnicode = fUseUnicode;

+

+  /* See if X supports the current locale */

+  if (XSupportsLocale () == False)

+    {

+      ErrorF ("winClipboardProc - Locale not supported by X.  Exiting.\n");

+      goto thread_errorexit;

+    }

+

+  /* Create Windows messaging window */

+  hwnd = winClipboardCreateMessagingWindow ();

+  

+  /* Save copy of HWND in screen privates */

+  g_hwndClipboard = hwnd;

+

+  /* Set jump point for Error exits */

+  iReturn = setjmp (g_jmpEntry);

+  

+  /* Check if we should continue operations */

+  if (iReturn != WIN_JMP_ERROR_IO

+      && iReturn != WIN_JMP_OKAY)

+    {

+      /* setjmp returned an unknown value, exit */

+      ErrorF ("winClipboardProc - setjmp returned: %d exiting\n",

+	      iReturn);

+      goto thread_errorexit;

+    }

+  else if (iReturn == WIN_JMP_ERROR_IO)

+    {

+      /* TODO: Cleanup the Win32 window and free any allocated memory */

+      ErrorF ("winClipboardProc - setjmp returned for IO Error Handler.\n");

+      //goto thread_errorexit;

+    }

+

+#if defined(XCSECURITY)

+  /* Use our generated cookie for authentication */

+  XSetAuthorization (AUTH_NAME,

+		     strlen (AUTH_NAME),

+		     g_pAuthData,

+		     g_uiAuthDataLen);

+#endif

+

+  /* Set error handler */

+  XSetErrorHandler (winClipboardErrorHandler);

+  XSetIOErrorHandler (winClipboardIOErrorHandler);

+

+  /* Initialize retry count */

+  iRetries = 0;

+

+  /* Setup the display connection string x */

+  /*

+   * NOTE: Always connect to screen 0 since we require that screen

+   * numbers start at 0 and increase without gaps.  We only need

+   * to connect to one screen on the display to get events

+   * for all screens on the display.  That is why there is only

+   * one clipboard client thread.

+   */

+  snprintf (szDisplay,

+	    512,

+	    "127.0.0.1:%s.0",

+	    display);

+

+  /* Print the display connection string */

+  winDebug ("winClipboardProc - DISPLAY=%s\n", szDisplay);

+

+  /* Open the X display */

+  do

+    {

+      pDisplay = XOpenDisplay (szDisplay);

+      if (pDisplay == NULL)

+	{

+	  ErrorF ("winClipboardProc - Could not open display, "

+		  "try: %d, sleeping: %d\n",

+		  iRetries + 1, WIN_CONNECT_DELAY);

+	  ++iRetries;

+	  sleep (WIN_CONNECT_DELAY);

+	  continue;

+	}

+      else

+	break;

+    }

+  while (pDisplay == NULL && iRetries < WIN_CONNECT_RETRIES);

+

+  /* Make sure that the display opened */

+  if (pDisplay == NULL)

+    {

+      ErrorF ("winClipboardProc - Failed opening the display, giving up\n");

+      goto thread_errorexit;

+    }

+

+  /* Save the display in the screen privates */

+  g_pClipboardDisplay = pDisplay;

+

+  winDebug ("winClipboardProc - XOpenDisplay () returned and "

+	  "successfully opened the display.\n");

+

+  /* Get our connection number */

+  iConnectionNumber = ConnectionNumber (pDisplay);

+

+  winDebug("Clipboard is using socket %d\n",iConnectionNumber);

+

+#ifdef HAS_DEVWINDOWS

+  /* Open a file descriptor for the windows message queue */

+  fdMessageQueue = open (WIN_MSG_QUEUE_FNAME, _O_RDONLY);

+  if (fdMessageQueue == -1)

+    {

+      ErrorF ("winClipboardProc - Failed opening %s\n", WIN_MSG_QUEUE_FNAME);

+      goto thread_errorexit;

+    }

+

+  /* Find max of our file descriptors */

+  iMaxDescriptor = max (fdMessageQueue, iConnectionNumber) + 1;

+#else

+  iMaxDescriptor = iConnectionNumber + 1;

+#endif

+

+  /* Create atoms */

+  atomClipboard = XInternAtom (pDisplay, "CLIPBOARD", False);

+  atomClipboardManager = XInternAtom (pDisplay, "CLIPBOARD_MANAGER", False);

+  XInternAtom (pDisplay, WIN_LOCAL_PROPERTY, False);

+  XInternAtom (pDisplay, "UTF8_STRING", False);

+  XInternAtom (pDisplay, "COMPOUND_TEXT", False);

+  XInternAtom (pDisplay, "TARGETS", False);

+

+  /* Create a messaging window */

+  iWindow = XCreateSimpleWindow (pDisplay,

+				 DefaultRootWindow (pDisplay),

+				 1, 1,

+				 500, 500,

+				 0,

+				 BlackPixel (pDisplay, 0),

+				 BlackPixel (pDisplay, 0));

+  if (iWindow == 0)

+    {

+      ErrorF ("winClipboardProc - Could not create an X window.\n");

+      goto thread_errorexit;

+    }

+

+  /* Select event types to watch */

+  if (XSelectInput (pDisplay,

+		    iWindow,

+		    PropertyChangeMask) == BadWindow)

+    ErrorF ("winClipboardProc - XSelectInput generated BadWindow "

+	    "on messaging window\n");

+

+  /* Save the window in the screen privates */

+  g_iClipboardWindow = iWindow;

+

+  /* Assert ownership of selections if Win32 clipboard is owned */

+  if (NULL != GetClipboardOwner ())

+    {

+      /* PRIMARY */

+      winDebug("winClipboardProc - asserted ownership.\n");

+      iReturn = XSetSelectionOwner (pDisplay, XA_PRIMARY,

+				    iWindow, CurrentTime);

+      if (iReturn == BadAtom || iReturn == BadWindow /*||

+	  XGetSelectionOwner (pDisplay, XA_PRIMARY) != iWindow*/)

+	{

+	  ErrorF ("winClipboardProc - Could not set PRIMARY owner\n");

+          goto thread_errorexit;

+	}

+

+      /* CLIPBOARD */

+      iReturn = XSetSelectionOwner (pDisplay, atomClipboard,

+				    iWindow, CurrentTime);

+      if (iReturn == BadAtom || iReturn == BadWindow /*||

+	  XGetSelectionOwner (pDisplay, atomClipboard) != iWindow*/)

+	{

+	  ErrorF ("winClipboardProc - Could not set CLIPBOARD owner\n");

+          goto thread_errorexit;

+	}

+    }

+  /* Pre-flush X events */

+  /* 

+   * NOTE: Apparently you'll freeze if you don't do this,

+   *	   because there may be events in local data structures

+   *	   already.

+   */

+  /*winClipboardFlushXEvents (hwnd,

+			    iWindow,

+			    pDisplay,

+			    fUseUnicode);

+    */

+  /* Pre-flush Windows messages */

+  winDebug ("Start flushing \n");

+  if (!winClipboardFlushWindowsMessageQueue (hwnd))

+  {

+    ErrorF ("winClipboardFlushWindowsMessageQueue - returned 0\n");

+    goto thread_errorexit;

+  }

+

+  winDebug ("winClipboardProc - Started\n");

+  /* Signal that the clipboard client has started */

+  g_fClipboardStarted = TRUE;

+

+  /* Loop for X events */

+  while (1)

+    {

+      /* Setup the file descriptor set */

+      /*

+       * NOTE: You have to do this before every call to select

+       *       because select modifies the mask to indicate

+       *       which descriptors are ready.

+       */

+      FD_ZERO (&fdsRead);

+      FD_SET (iConnectionNumber, &fdsRead);

+#ifdef HAS_DEVWINDOWS

+      FD_SET (fdMessageQueue, &fdsRead);

+#else

+      tvTimeout.tv_sec = 0;

+      tvTimeout.tv_usec = 100;

+#endif

+

+      /* Wait for a Windows event or an X event */

+      iReturn = select (iMaxDescriptor,	/* Highest fds number */

+			&fdsRead,	/* Read mask */

+			NULL,		/* No write mask */

+			NULL,		/* No exception mask */

+#ifdef HAS_DEVWINDOWS

+			NULL		/* No timeout */

+#else

+			&tvTimeout      /* Set timeout */

+#endif

+          );

+

+#ifndef HAS_WINSOCK

+      iSelectError = errno;

+#else

+      iSelectError = WSAGetLastError();

+#endif

+

+      if (iReturn < 0)

+	{

+#ifndef HAS_WINSOCK

+          if (iSelectError == EINTR)

+#else

+          if (iSelectError == WSAEINTR)

+#endif

+            continue;

+          

+	  ErrorF ("winClipboardProc - Call to select () failed: %d.  "

+		  "Bailing.\n", iReturn);

+	  break;

+	}

+

+      /* Branch on which descriptor became active */

+//      if (FD_ISSET (iConnectionNumber, &fdsRead))

+//	{ Also do it when no read since winClipboardFlushXEvents

+//    is sending the output.

+	  /* Process X events */

+	  /* Exit when we see that server is shutting down */

+	  iReturn = winClipboardFlushXEvents (hwnd,

+					      iWindow,

+					      pDisplay,

+					      fUseUnicode,

+					      FALSE

+					      );

+	  if (WIN_XEVENTS_SHUTDOWN == iReturn)

+	    {

+	      ErrorF ("winClipboardProc - winClipboardFlushXEvents "

+		      "trapped shutdown event, exiting main loop.\n");

+	      break;

+	    }

+//	}

+

+#ifdef HAS_DEVWINDOWS

+      /* Check for Windows event ready */

+      if (FD_ISSET (fdMessageQueue, &fdsRead))

+#else

+      if (1)

+#endif

+	{

+	  /* Process Windows messages */

+	  if (!winClipboardFlushWindowsMessageQueue (hwnd))

+	    {

+	      ErrorF ("winClipboardProc - "

+		      "winClipboardFlushWindowsMessageQueue trapped "

+		      "WM_QUIT message, exiting main loop.\n");

+	      break;

+	    }

+	}

+    }

+

+  /* Close our X window */

+  if (pDisplay && iWindow)

+    {

+      iReturn = XDestroyWindow (pDisplay, iWindow);

+      if (iReturn == BadWindow)

+	ErrorF ("winClipboardProc - XDestroyWindow returned BadWindow.\n");

+#ifdef WINDBG

+      else

+	winDebug ("winClipboardProc - XDestroyWindow succeeded.\n");

+#endif

+    }

+

+

+#ifdef HAS_DEVWINDOWS

+  /* Close our Win32 message handle */

+  if (fdMessageQueue)

+    close (fdMessageQueue);

+#endif

+

+#if 0

+  /*

+   * FIXME: XCloseDisplay hangs if we call it, as of 2004/03/26.  The

+   * XSync and XSelectInput calls did not help.

+   */

+

+  /* Discard any remaining events */

+  XSync (pDisplay, TRUE);

+

+  /* Select event types to watch */

+  XSelectInput (pDisplay,

+		DefaultRootWindow (pDisplay),

+		None);

+

+  /* Close our X display */

+  if (pDisplay)

+    {

+      XCloseDisplay (pDisplay);

+    }

+#endif

+

+  g_iClipboardWindow = None;

+  g_pClipboardDisplay = NULL;

+  g_fClipboardLaunched = FALSE;

+  g_fClipboardStarted = FALSE;

+

+  return NULL;

+thread_errorexit:

+  if (g_pClipboardDisplay && g_iClipboardWindow)

+  {

+    iReturn = XDestroyWindow (g_pClipboardDisplay, g_iClipboardWindow);

+    if (iReturn == BadWindow)

+	    ErrorF ("winClipboardProc - XDestroyWindow returned BadWindow.\n");

+#ifdef WINDBG

+    else

+	    winDebug ("winClipboardProc - XDestroyWindow succeeded.\n");

+#endif

+  }

+  g_iClipboardWindow = None;

+  g_pClipboardDisplay = NULL;

+  g_fClipboardLaunched = FALSE;

+  g_fClipboardStarted = FALSE;

+  //pthread_exit (NULL);

+  winDebug ("Clipboard thread died.\n");

+  return NULL;

+}

+

+

+/*

+ * winClipboardErrorHandler - Our application specific error handler

+ */

+

+static int

+winClipboardErrorHandler (Display *pDisplay, XErrorEvent *pErr)

+{

+  char pszErrorMsg[100];

+  

+  XGetErrorText (pDisplay,

+		 pErr->error_code,

+		 pszErrorMsg,

+		 sizeof (pszErrorMsg));

+  ErrorF ("winClipboardErrorHandler - ERROR: \n\t%s\n"

+          "  errorCode %d\n"

+          "  serial %d\n"

+          "  resourceID 0x%x\n"

+          "  majorCode %d\n"

+          "  minorCode %d\n"

+          , pszErrorMsg

+          , pErr->error_code

+          , pErr->serial

+          , pErr->resourceid

+          , pErr->request_code

+          , pErr->minor_code);

+  return 0;

+}

+

+

+/*

+ * winClipboardIOErrorHandler - Our application specific IO error handler

+ */

+

+static int

+winClipboardIOErrorHandler (Display *pDisplay)

+{

+  ErrorF ("\nwinClipboardIOErrorHandler!\n\n");

+

+  /* Restart at the main entry point */

+  longjmp (g_jmpEntry, WIN_JMP_ERROR_IO);

+  

+  return 0;

+}

diff --git a/xorg-server/hw/xwin/winclipboardunicode.c b/xorg-server/hw/xwin/winclipboardunicode.c
index ba86915a4..947475509 100644
--- a/xorg-server/hw/xwin/winclipboardunicode.c
+++ b/xorg-server/hw/xwin/winclipboardunicode.c
@@ -43,25 +43,43 @@ Bool
 winClipboardDetectUnicodeSupport (void)
 {
   Bool			fReturn = FALSE;
-  OSVERSIONINFO		osvi = {0};
+  OSVERSIONINFOEX	osvi = {0};
   
   /* Get operating system version information */
   osvi.dwOSVersionInfoSize = sizeof (osvi);
-  GetVersionEx (&osvi);
+  GetVersionEx ((LPOSVERSIONINFO)&osvi);
 
   /* Branch on platform ID */
   switch (osvi.dwPlatformId)
     {
     case VER_PLATFORM_WIN32_NT:
-      /* Unicode supported on NT only */
-      ErrorF ("DetectUnicodeSupport - Windows NT/2000/XP\n");
-      fReturn = TRUE;
+      if (osvi.dwMajorVersion >= 6)
+      {
+	if (osvi.wProductType == VER_NT_WORKSTATION)
+	   winDebug ("OS: Windows Vista\n");
+	else
+	   winDebug ("OS: Windows Server 2008\n");
+	fReturn = TRUE;
+      }
+      else if (osvi.dwMajorVersion == 5)
+      {
+	if (osvi.dwMinorVersion == 2)
+	{
+	  winDebug ("OS: Windows 2003\n");
+	  fReturn = TRUE;
+	}
+	else if (osvi.dwMinorVersion == 1)
+	{
+	  winDebug ("OS: Windows XP\n");
+	  fReturn = TRUE;
+	}
+	else if (osvi.dwMinorVersion == 0) winDebug ("OS: Windows 2000\n");
+      }
+      else if (osvi.dwMajorVersion <= 4) winDebug ("OS: Windows NT\n");
       break;
 
     case VER_PLATFORM_WIN32_WINDOWS:
-      /* Unicode is not supported on non-NT */
-      ErrorF ("DetectUnicodeSupport - Windows 95/98/Me\n");
-      fReturn = FALSE;
+      winDebug ("OS: Windows 95/98/Me\n");
       break;
     }
 
diff --git a/xorg-server/hw/xwin/winclipboardwndproc.c b/xorg-server/hw/xwin/winclipboardwndproc.c
index 292ca872b..2898b423d 100644
--- a/xorg-server/hw/xwin/winclipboardwndproc.c
+++ b/xorg-server/hw/xwin/winclipboardwndproc.c
@@ -1,627 +1,548 @@
-/*
- *Copyright (C) 2003-2004 Harold L Hunt II All Rights Reserved.
- *Copyright (C) Colin Harrison 2005-2008
- *
- *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 the copyright holder(s)
- *and 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 the copyright holder(s) and author(s).
- *
- * Authors:	Harold L Hunt II
- *              Colin Harrison
- */
-
-#ifdef HAVE_XWIN_CONFIG_H
-#include <xwin-config.h>
-#endif
-#include <sys/types.h>
-#include <sys/time.h>
-#include "winclipboard.h"
-#include "misc.h"
-
-/*
- * Constants
- */
-
-#define WIN_CLIPBOARD_PROP	"cyg_clipboard_prop"
-#define WIN_POLL_TIMEOUT	1
-
-
-/*
- * References to external symbols
- */
-
-extern Bool		g_fUseUnicode;
-extern Bool		g_fUnicodeSupport;
-extern void		*g_pClipboardDisplay;
-extern Window		g_iClipboardWindow;
-extern Atom		g_atomLastOwnedSelection;
-
-/* BPS - g_hwndClipboard needed for X app->Windows paste fix */
-extern HWND		g_hwndClipboard;
-
-/* 
- * Local function prototypes
- */
-
-static int
-winProcessXEventsTimeout (HWND hwnd, int iWindow, Display *pDisplay,
-			  Bool fUseUnicode, int iTimeoutSec);
-
-
-/*
- * Process X events up to specified timeout
- */
-
-static int
-winProcessXEventsTimeout (HWND hwnd, int iWindow, Display *pDisplay,
-			  Bool fUseUnicode, int iTimeoutSec)
-{
-  int			iConnNumber;
-  struct timeval	tv;
-  int			iReturn;
-  DWORD			dwStopTime = (GetTickCount () / 1000) + iTimeoutSec;
-
-  /* We need to ensure that all pending events are processed */
-  XSync (pDisplay, FALSE);
-
-  /* Get our connection number */
-  iConnNumber = ConnectionNumber (pDisplay);
-
-  /* Loop for X events */
-  while (1)
-    {
-      fd_set		fdsRead;
-
-      /* Setup the file descriptor set */
-      FD_ZERO (&fdsRead);
-      FD_SET (iConnNumber, &fdsRead);
-
-      /* Adjust timeout */
-      tv.tv_sec = dwStopTime - (GetTickCount () / 1000);
-      tv.tv_usec = 0;
-
-      /* Break out if no time left */
-      if (tv.tv_sec < 0)
-	return WIN_XEVENTS_SUCCESS;
-
-      /* Wait for a Windows event or an X event */
-      iReturn = select (iConnNumber + 1,/* Highest fds number */
-			&fdsRead,	/* Read mask */
-			NULL,		/* No write mask */
-			NULL,		/* No exception mask */
-			&tv);		/* No timeout */
-      if (iReturn <= 0)
-	{
-	  ErrorF ("winProcessXEventsTimeout - Call to select () failed: %d.  "
-		  "Bailing.\n", iReturn);
-	  break;
-	}
-
-      /* Branch on which descriptor became active */
-      if (FD_ISSET (iConnNumber, &fdsRead))
-	{
-	  /* Process X events */
-	  /* Exit when we see that server is shutting down */
-	  iReturn = winClipboardFlushXEvents (hwnd,
-					      iWindow,
-					      pDisplay,
-					      fUseUnicode);
-	  if (WIN_XEVENTS_NOTIFY == iReturn
-	      || WIN_XEVENTS_CONVERT == iReturn)
-	    {
-	      /* Bail out if convert or notify processed */
-	      return iReturn;
-	    }
-	}
-    }
-
-  return WIN_XEVENTS_SUCCESS;
-}
-
-
-/*
- * Process a given Windows message
- */
-
-/* BPS - Define our own message, which we'll post to ourselves to facilitate
- * resetting the delayed rendering mechanism after each paste from X app to
- * Windows app. TODO - Perhaps move to win.h with the other WM_USER messages.
- */
-#define WM_USER_PASTE_COMPLETE		(WM_USER + 1003)
-
-LRESULT CALLBACK
-winClipboardWindowProc (HWND hwnd, UINT message, 
-			WPARAM wParam, LPARAM lParam)
-{
-  static HWND		s_hwndNextViewer;
-  static Bool		s_fCBCInitialized;
-
-  /* Branch on message type */
-  switch (message)
-    {
-    case WM_DESTROY:
-      {
-	winDebug ("winClipboardWindowProc - WM_DESTROY\n");
-
-	/* Remove ourselves from the clipboard chain */
-	ChangeClipboardChain (hwnd, s_hwndNextViewer);
-	
-	s_hwndNextViewer = NULL;
-
-	PostQuitMessage (0);
-      }
-      return 0;
-
-
-    case WM_CREATE:
-      {
-	HWND first, next;
-	DWORD error_code = 0;
-	winDebug ("winClipboardWindowProc - WM_CREATE\n");
-	
-	first = GetClipboardViewer();			/* Get handle to first viewer in chain. */
-	if (first == hwnd) return 0;			/* Make sure it's not us! */
-	/* Add ourselves to the clipboard viewer chain */
-	next = SetClipboardViewer (hwnd);
-	error_code = GetLastError();
-	if (SUCCEEDED(error_code) && (next == first))	/* SetClipboardViewer must have succeeded, and the handle */
-		s_hwndNextViewer = next;		/* it returned must have been the first window in the chain */
-	else
-		s_fCBCInitialized = FALSE;
-      }
-      return 0;
-
-
-    case WM_CHANGECBCHAIN:
-      {
-	winDebug ("winClipboardWindowProc - WM_CHANGECBCHAIN: wParam(%x) "
-		  "lParam(%x) s_hwndNextViewer(%x)\n", 
-		  wParam, lParam, s_hwndNextViewer);
-
-	if ((HWND) wParam == s_hwndNextViewer)
-	  {
-	    s_hwndNextViewer = (HWND) lParam;
-	    if (s_hwndNextViewer == hwnd)
-	      {
-		s_hwndNextViewer = NULL;
-		winErrorFVerb (1, "winClipboardWindowProc - WM_CHANGECBCHAIN: "
-			       "attempted to set next window to ourselves.");
-	      }
-	  }
-	else if (s_hwndNextViewer)
-	  SendMessage (s_hwndNextViewer, message,
-		       wParam, lParam);
-
-      }
-      winDebug ("winClipboardWindowProc - WM_CHANGECBCHAIN: Exit\n");
-      return 0;
-
-    case WM_WM_REINIT:
-      {
-        /* Ensure that we're in the clipboard chain.  Some apps,
-         * WinXP's remote desktop for one, don't play nice with the
-         * chain.  This message is called whenever we receive a
-         * WM_ACTIVATEAPP message to ensure that we continue to
-         * receive clipboard messages.
-	 *
-	 * It might be possible to detect if we're still in the chain
-	 * by calling SendMessage (GetClipboardViewer(),
-	 * WM_DRAWCLIPBOARD, 0, 0); and then seeing if we get the
-	 * WM_DRAWCLIPBOARD message.  That, however, might be more
-	 * expensive than just putting ourselves back into the chain.
-	 */
-
-	HWND first, next;
-	DWORD error_code = 0;
-	winDebug ("winClipboardWindowProc - WM_WM_REINIT: Enter\n");
-
-	first = GetClipboardViewer();			/* Get handle to first viewer in chain. */
-	if (first == hwnd) return 0;			/* Make sure it's not us! */
-	winDebug ("  WM_WM_REINIT: Replacing us(%x) with %x at head "
-		  "of chain\n", hwnd, s_hwndNextViewer);
-	s_fCBCInitialized = FALSE;
-	ChangeClipboardChain (hwnd, s_hwndNextViewer);
-	s_hwndNextViewer = NULL;
-	s_fCBCInitialized = FALSE;
-	winDebug ("  WM_WM_REINIT: Putting us back at head of chain.\n");
-	first = GetClipboardViewer();			/* Get handle to first viewer in chain. */
-	if (first == hwnd) return 0;			/* Make sure it's not us! */
-	next = SetClipboardViewer (hwnd);
-	error_code = GetLastError();
-	if (SUCCEEDED(error_code) && (next == first))	/* SetClipboardViewer must have succeeded, and the handle */
-		s_hwndNextViewer = next;		/* it returned must have been the first window in the chain */
-	else
-		s_fCBCInitialized = FALSE;
-      }
-      winDebug ("winClipboardWindowProc - WM_WM_REINIT: Exit\n");
-      return 0;
-
-
-    case WM_DRAWCLIPBOARD:
-      {
-	static Atom atomClipboard;
-	static int generation;
-	static Bool s_fProcessingDrawClipboard = FALSE;
-	Display	*pDisplay = g_pClipboardDisplay;
-	Window	iWindow = g_iClipboardWindow;
-	int	iReturn;
-
-	winDebug ("winClipboardWindowProc - WM_DRAWCLIPBOARD: Enter\n");
-
-	if (generation != serverGeneration)
-          {
-            generation = serverGeneration;
-            atomClipboard = XInternAtom (pDisplay, "CLIPBOARD", False);
-          }
-
-	/*
-	 * We've occasionally seen a loop in the clipboard chain.
-	 * Try and fix it on the first hint of recursion.
-	 */
-	if (! s_fProcessingDrawClipboard) 
-	  {
-	    s_fProcessingDrawClipboard = TRUE;
-	  }
-	else
-	  {
-	    /* Attempt to break the nesting by getting out of the chain, twice?, and then fix and bail */
-	    s_fCBCInitialized = FALSE;
-	    ChangeClipboardChain (hwnd, s_hwndNextViewer);
-	    winFixClipboardChain();
-	    winErrorFVerb (1, "winClipboardWindowProc - WM_DRAWCLIPBOARD - "
-			   "Nested calls detected.  Re-initing.\n");
-	    winDebug ("winClipboardWindowProc - WM_DRAWCLIPBOARD: Exit\n");
-	    s_fProcessingDrawClipboard = FALSE;
-	    return 0;
-	  }
-
-	/* Bail on first message */
-	if (!s_fCBCInitialized)
-	  {
-	    s_fCBCInitialized = TRUE;
-	    s_fProcessingDrawClipboard = FALSE;
-	    winDebug ("winClipboardWindowProc - WM_DRAWCLIPBOARD: Exit\n");
-	    return 0;
-	  }
-
-	/*
-	 * NOTE: We cannot bail out when NULL == GetClipboardOwner ()
-	 * because some applications deal with the clipboard in a manner
-	 * that causes the clipboard owner to be NULL when they are in
-	 * fact taking ownership.  One example of this is the Win32
-	 * native compile of emacs.
-	 */
-	
-	/* Bail when we still own the clipboard */
-	if (hwnd == GetClipboardOwner ())
-	  {
-
-	    winDebug ("winClipboardWindowProc - WM_DRAWCLIPBOARD - "
-		    "We own the clipboard, returning.\n");
-	    winDebug ("winClipboardWindowProc - WM_DRAWCLIPBOARD: Exit\n");
-	    s_fProcessingDrawClipboard = FALSE;
-	    if (s_hwndNextViewer)
-		SendMessage (s_hwndNextViewer, message, wParam, lParam);
-	    return 0;
-	  }
-
-	/*
-	 * Do not take ownership of the X11 selections when something
-	 * other than CF_TEXT or CF_UNICODETEXT has been copied
-	 * into the Win32 clipboard.
-	 */
-	if (!IsClipboardFormatAvailable (CF_TEXT)
-	    && !IsClipboardFormatAvailable (CF_UNICODETEXT))
-	  {
-
-	    winDebug ("winClipboardWindowProc - WM_DRAWCLIPBOARD - "
-		    "Clipboard does not contain CF_TEXT nor "
-		    "CF_UNICODETEXT.\n");
-
-	    /*
-	     * We need to make sure that the X Server has processed
-	     * previous XSetSelectionOwner messages.
-	     */
-	    XSync (pDisplay, FALSE);
-	    
-	    /* Release PRIMARY selection if owned */
-	    iReturn = XGetSelectionOwner (pDisplay, XA_PRIMARY);
-	    if (iReturn == g_iClipboardWindow)
-	      {
-		winDebug ("winClipboardWindowProc - WM_DRAWCLIPBOARD - "
-			"PRIMARY selection is owned by us.\n");
-		XSetSelectionOwner (pDisplay,
-				    XA_PRIMARY,
-				    None,
-				    CurrentTime);
-	      }
-	    else if (BadWindow == iReturn || BadAtom == iReturn)
-	      winErrorFVerb (1, "winClipboardWindowProc - WM_DRAWCLIPBOARD - "
-		      "XGetSelection failed for PRIMARY: %d\n", iReturn);
-
-	    /* Release CLIPBOARD selection if owned */
-	    iReturn = XGetSelectionOwner (pDisplay,
-					  atomClipboard);
-	    if (iReturn == g_iClipboardWindow)
-	      {
-		winDebug ("winClipboardWindowProc - WM_DRAWCLIPBOARD - "
-			"CLIPBOARD selection is owned by us.\n");
-		XSetSelectionOwner (pDisplay,
-				    atomClipboard,
-				    None,
-				    CurrentTime);
-	      }
-	    else if (BadWindow == iReturn || BadAtom == iReturn)
-	      winErrorFVerb (1, "winClipboardWindowProc - WM_DRAWCLIPBOARD - "
-		      "XGetSelection failed for CLIPBOARD: %d\n", iReturn);
-
-	    winDebug ("winClipboardWindowProc - WM_DRAWCLIPBOARD: Exit\n");
-	    s_fProcessingDrawClipboard = FALSE;
-	    if (s_hwndNextViewer)
-		SendMessage (s_hwndNextViewer, message, wParam, lParam);
-	    return 0;
-	  }
-
-	/* Reassert ownership of PRIMARY */	  
-	iReturn = XSetSelectionOwner (pDisplay,
-				      XA_PRIMARY,
-				      iWindow,
-				      CurrentTime);
-	if (iReturn == BadAtom || iReturn == BadWindow ||
-	    XGetSelectionOwner (pDisplay, XA_PRIMARY) != iWindow)
-	  {
-	    winErrorFVerb (1, "winClipboardWindowProc - WM_DRAWCLIPBOARD - "
-		    "Could not reassert ownership of PRIMARY\n");
-	  }
-	else
-	  {
-	    winDebug ("winClipboardWindowProc - WM_DRAWCLIPBOARD - "
-		    "Reasserted ownership of PRIMARY\n");
-	  }
-	
-	/* Reassert ownership of the CLIPBOARD */	  
-	iReturn = XSetSelectionOwner (pDisplay,
-				      atomClipboard,
-				      iWindow,
-				      CurrentTime);
-
-	if (iReturn == BadAtom || iReturn == BadWindow ||
-	    XGetSelectionOwner (pDisplay, atomClipboard) != iWindow)
-	  {
-	    winErrorFVerb (1, "winClipboardWindowProc - WM_DRAWCLIPBOARD - "
-		    "Could not reassert ownership of CLIPBOARD\n");
-	  }
-	else
-	  {
-	    winDebug ("winClipboardWindowProc - WM_DRAWCLIPBOARD - "
-		    "Reasserted ownership of CLIPBOARD\n");
-	  }
-	
-	/* Flush the pending SetSelectionOwner event now */
-	XFlush (pDisplay);
-
-	s_fProcessingDrawClipboard = FALSE;
-      }
-      winDebug ("winClipboardWindowProc - WM_DRAWCLIPBOARD: Exit\n");
-      /* Pass the message on the next window in the clipboard viewer chain */
-      if (s_hwndNextViewer)
-	SendMessage (s_hwndNextViewer, message, wParam, lParam);
-      return 0;
-
-
-    case WM_DESTROYCLIPBOARD:
-      /*
-       * NOTE: Intentionally do nothing.
-       * Changes in the Win32 clipboard are handled by WM_DRAWCLIPBOARD
-       * above.  We only process this message to conform to the specs
-       * for delayed clipboard rendering in Win32.  You might think
-       * that we need to release ownership of the X11 selections, but
-       * we do not, because a WM_DRAWCLIPBOARD message will closely
-       * follow this message and reassert ownership of the X11
-       * selections, handling the issue for us.
-       */
-      return 0;
-
-
-    case WM_RENDERFORMAT:
-    case WM_RENDERALLFORMATS:
-      {
-	int	iReturn;
-	Display *pDisplay = g_pClipboardDisplay;
-	Window	iWindow = g_iClipboardWindow;
-	Bool	fConvertToUnicode;
-
-	winDebug ("winClipboardWindowProc - WM_RENDER*FORMAT - Hello.\n");
-
-	/* Flag whether to convert to Unicode or not */
-	if (message == WM_RENDERALLFORMATS)
-	  fConvertToUnicode = FALSE;
-	else
-	  fConvertToUnicode = g_fUnicodeSupport && (CF_UNICODETEXT == wParam);
-
-	/* Request the selection contents */
-	iReturn = XConvertSelection (pDisplay,
-				     g_atomLastOwnedSelection,
-				     XInternAtom (pDisplay,
-						  "COMPOUND_TEXT", False),
-				     XInternAtom (pDisplay,
-						  "CYGX_CUT_BUFFER", False),
-				     iWindow,
-				     CurrentTime);
-	if (iReturn == BadAtom || iReturn == BadWindow)
-	  {
-	    winErrorFVerb (1, "winClipboardWindowProc - WM_RENDER*FORMAT - "
-		    "XConvertSelection () failed\n");
-	    break;
-	  }
-
-	/* Special handling for WM_RENDERALLFORMATS */
-	if (message == WM_RENDERALLFORMATS)
-	  {
-	    /* We must open and empty the clipboard */
-
-	    /* Close clipboard if we have it open already */
-	    if (GetOpenClipboardWindow () == hwnd)
-	      {
-		CloseClipboard ();
-	      }	    
-
-	    if (!OpenClipboard (hwnd))
-	      {
-		winErrorFVerb (1, "winClipboardWindowProc - WM_RENDER*FORMATS - "
-			"OpenClipboard () failed: %08x\n",
-			GetLastError ());
-		break;
-	      }
-	    
-	    if (!EmptyClipboard ())
-	      {
-		winErrorFVerb (1, "winClipboardWindowProc - WM_RENDER*FORMATS - "
-			"EmptyClipboard () failed: %08x\n",
-		      GetLastError ());
-		break;
-	      }
-	  }
-
-	/* Process the SelectionNotify event */
-	iReturn = winProcessXEventsTimeout (hwnd,
-					    iWindow,
-					    pDisplay,
-					    fConvertToUnicode,
-					    WIN_POLL_TIMEOUT);
-	if (WIN_XEVENTS_CONVERT == iReturn)
-	  {
-	    /*
-	     * The selection was offered for conversion first, so we have
-	     * to process a second SelectionNotify event to get the actual
-	     * data in the selection.
-	     */
-	    iReturn = winProcessXEventsTimeout (hwnd,
-						iWindow,
-						pDisplay,
-						fConvertToUnicode,
-						WIN_POLL_TIMEOUT);
-	  }
-	
-	/*
-	 * The last of the up-to two calls to winProcessXEventsTimeout
-	 * from above had better have seen a notify event, or else we
-	 * are dealing with a buggy or old X11 app.  In these cases we
-	 * have to paste some fake data to the Win32 clipboard to
-	 * satisfy the requirement that we write something to it.
-	 */
-	if (WIN_XEVENTS_NOTIFY != iReturn)
-	  {
-	    /* Paste no data, to satisfy required call to SetClipboardData */
-	    if (g_fUnicodeSupport)
-	      SetClipboardData (CF_UNICODETEXT, NULL);
-	    SetClipboardData (CF_TEXT, NULL);
-	  }
-
-	/* BPS - Post ourselves a user message whose handler will reset the
-	 * delayed rendering mechanism after the paste is complete. This is
-	 * necessary because calling SetClipboardData() with a NULL argument
-	 * here will cause the data we just put on the clipboard to be lost!
-	 */
-	PostMessage(g_hwndClipboard, WM_USER_PASTE_COMPLETE, 0, 0);
-
-	/* Special handling for WM_RENDERALLFORMATS */
-	if (message == WM_RENDERALLFORMATS)
-	  {
-	    /* We must close the clipboard */
-	    
-	    if (!CloseClipboard ())
-	      {
-	      winErrorFVerb (1, "winClipboardWindowProc - WM_RENDERALLFORMATS - "
-		      "CloseClipboard () failed: %08x\n",
-		      GetLastError ());
-	      break;
-	      }
-	  }
-
-	winDebug ("winClipboardWindowProc - WM_RENDER*FORMAT - Returning.\n");
-	return 0;
-      }
-    /* BPS - This WM_USER message is posted by us. It gives us the opportunity
-     * to reset the delayed rendering mechanism after each and every paste
-     * from an X app to a Windows app. Without such a mechanism, subsequent
-     * changes of selection in the X app owning the selection are not
-     * reflected in pastes into Windows apps, since Windows won't send us the
-     * WM_RENDERFORMAT message unless someone has set changed data (or NULL)
-     * on the clipboard. */
-    case WM_USER_PASTE_COMPLETE:
-      {
-	if (hwnd != GetClipboardOwner ())
-	  /* In case we've lost the selection since posting the message */
-	  return 0;
-	winDebug ("winClipboardWindowProc - WM_USER_PASTE_COMPLETE\n");
-
-	/* Set up for another delayed rendering callback */
-	OpenClipboard (g_hwndClipboard);
-
-	/* Take ownership of the Windows clipboard */
-	EmptyClipboard ();
-
-	/* Advertise Unicode if we support it */
-	if (g_fUnicodeSupport)
-	  SetClipboardData (CF_UNICODETEXT, NULL);
-
-	/* Always advertise regular text */
-	SetClipboardData (CF_TEXT, NULL);
-
-	/* Release the clipboard */
-	CloseClipboard ();
-      }
-      return 0;
-    }
-
-  /* Let Windows perform default processing for unhandled messages */
-  return DefWindowProc (hwnd, message, wParam, lParam);
-}
-
-
-/*
- * Process any pending Windows messages
- */
-
-BOOL
-winClipboardFlushWindowsMessageQueue (HWND hwnd)
-{
-  MSG			msg;
-
-  /* Flush the messaging window queue */
-  /* NOTE: Do not pass the hwnd of our messaging window to PeekMessage,
-   * as this will filter out many non-window-specific messages that
-   * are sent to our thread, such as WM_QUIT.
-   */
-  while (PeekMessage (&msg, NULL, 0, 0, PM_REMOVE))
-    {
-      /* Dispatch the message if not WM_QUIT */
-      if (msg.message == WM_QUIT)
-	return FALSE;
-      else
-	DispatchMessage (&msg);
-    }
-  
-  return TRUE;
-}
+/*

+ *Copyright (C) 2003-2004 Harold L Hunt II All Rights Reserved.

+ *Copyright (C) Colin Harrison 2005-2008

+ *

+ *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 the copyright holder(s)

+ *and 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 the copyright holder(s) and author(s).

+ *

+ * Authors:	Harold L Hunt II

+ *              Colin Harrison

+ */

+

+#ifdef HAVE_XWIN_CONFIG_H

+#include <xwin-config.h>

+#endif

+#include <sys/types.h>

+#include <sys/time.h>

+#include "winclipboard.h"

+#include "misc.h"

+#include "winmsg.h"

+

+/*

+ * Constants

+ */

+

+#define WIN_CLIPBOARD_PROP	"cyg_clipboard_prop"

+#define WIN_POLL_TIMEOUT	1

+

+/*

+ * References to external symbols

+ */

+

+extern Bool		g_fUseUnicode;

+extern Bool		g_fUnicodeSupport;

+extern void		*g_pClipboardDisplay;

+extern Window		g_iClipboardWindow;

+extern Atom		g_atomLastOwnedSelection;

+extern Bool		g_fClipboardStarted;

+/* BPS - g_hwndClipboard needed for X app->Windows paste fix */

+extern HWND		g_hwndClipboard;

+

+/* 

+ * Local function prototypes

+ */

+

+static int

+winProcessXEventsTimeout (HWND hwnd, int iWindow, Display *pDisplay,

+			  Bool fUseUnicode, int iTimeoutSec);

+

+

+/*

+ * Process X events up to specified timeout

+ */

+

+static int

+winProcessXEventsTimeout (HWND hwnd, int iWindow, Display *pDisplay,

+			  Bool fUseUnicode, int iTimeoutSec)

+{

+  int			iConnNumber;

+  struct timeval	tv;

+  int			iReturn;

+  DWORD			dwStopTime = (GetTickCount () / 1000) + iTimeoutSec;

+

+  /* Make sure the output messages are sent before waiting on a response. */

+  iReturn = winClipboardFlushXEvents (hwnd,

+				      iWindow,

+				      pDisplay,

+				      fUseUnicode,

+				      TRUE);

+  if (WIN_XEVENTS_NOTIFY == iReturn || WIN_XEVENTS_CONVERT == iReturn)

+    {

+      /* Bail out if convert or notify processed */

+      return iReturn;

+    }

+

+  /* Get our connection number */

+  iConnNumber = ConnectionNumber (pDisplay);

+

+  /* Loop for X events */

+  while (1)

+    {

+      fd_set		fdsRead;

+

+      /* Setup the file descriptor set */

+      FD_ZERO (&fdsRead);

+      FD_SET (iConnNumber, &fdsRead);

+

+      /* Adjust timeout */

+      tv.tv_sec = dwStopTime - (GetTickCount () / 1000);

+      tv.tv_usec = 0;

+

+      /* Break out if no time left */

+      if (tv.tv_sec < 0)

+	return WIN_XEVENTS_SUCCESS;

+

+      /* Wait for a Windows event or an X event */

+      iReturn = select (iConnNumber + 1,/* Highest fds number */

+			&fdsRead,	/* Read mask */

+			NULL,		/* No write mask */

+			NULL,		/* No exception mask */

+			&tv);		/* No timeout */

+      if (iReturn <= 0)

+	{

+	  ErrorF ("winProcessXEventsTimeout - Call to select () failed: %d (%x).  "

+		  "Bailing.\n", iReturn, WSAGetLastError());

+	  break;

+	}

+

+      /* Branch on which descriptor became active */

+      if (FD_ISSET (iConnNumber, &fdsRead))

+	{

+	  /* Process X events */

+	  /* Exit when we see that server is shutting down */

+	  iReturn = winClipboardFlushXEvents (hwnd,

+					      iWindow,

+					      pDisplay,

+					      fUseUnicode,

+					      TRUE);

+	  if (WIN_XEVENTS_NOTIFY == iReturn

+	      || WIN_XEVENTS_CONVERT == iReturn)

+	    {

+	      /* Bail out if convert or notify processed */

+	      return iReturn;

+	    }

+	}

+    }

+

+  return WIN_XEVENTS_SUCCESS;

+}

+

+/*

+ * Process a given Windows message

+ */

+

+LRESULT CALLBACK

+winClipboardWindowProc (HWND hwnd, UINT message, 

+			WPARAM wParam, LPARAM lParam)

+{

+  static HWND		s_hwndNextViewer;

+

+  /* Branch on message type */

+  switch (message)

+    {

+    case WM_DESTROY:

+      {

+	winDebug ("winClipboardWindowProc - WM_DESTROY\n");

+

+	/* Remove ourselves from the clipboard chain */

+	ChangeClipboardChain (hwnd, s_hwndNextViewer);

+	

+	s_hwndNextViewer = NULL;

+	g_hwndClipboard = NULL;

+	PostQuitMessage (0);

+      }

+      return 0;

+

+

+    case WM_CREATE:

+      {

+	HWND first, next;

+	DWORD error_code = 0;

+	winDebug ("winClipboardWindowProc - WM_CREATE\n");

+	

+	/* Add ourselves to the clipboard viewer chain */

+	s_hwndNextViewer = SetClipboardViewer (hwnd);

+      }

+      return 0;

+

+

+    case WM_CHANGECBCHAIN:

+      {

+	winDebug ("winClipboardWindowProc - WM_CHANGECBCHAIN: wParam(%x) "

+		  "lParam(%x) s_hwndNextViewer(%x)\n", 

+		  wParam, lParam, s_hwndNextViewer);

+

+	if ((HWND) wParam == s_hwndNextViewer)

+	  {

+	    s_hwndNextViewer = (HWND) lParam;

+	  }

+	else if (s_hwndNextViewer)

+	  SendMessage (s_hwndNextViewer, message,

+		       wParam, lParam);

+

+      }

+      winDebug ("winClipboardWindowProc - WM_CHANGECBCHAIN: Exit\n");

+      return 0;

+

+    case WM_WM_REINIT:

+      {

+        /* Ensure that we're in the clipboard chain.  Some apps,

+         * WinXP's remote desktop for one, don't play nice with the

+         * chain.  This message is called whenever we receive a

+         * WM_ACTIVATEAPP message to ensure that we continue to

+         * receive clipboard messages.

+	 *

+	 * It might be possible to detect if we're still in the chain

+	 * by calling SendMessage (GetClipboardViewer(),

+	 * WM_DRAWCLIPBOARD, 0, 0); and then seeing if we get the

+	 * WM_DRAWCLIPBOARD message.  That, however, might be more

+	 * expensive than just putting ourselves back into the chain.

+	 */

+

+	HWND first, next;

+	DWORD error_code = 0;

+        if (!g_hwndClipboard)

+          return 0;

+	winDebug ("winClipboardWindowProc - WM_WM_REINIT: Enter\n");

+

+	first = GetClipboardViewer();			/* Get handle to first viewer in chain. */

+	if (first != hwnd)

+        { 

+          winDebug ("  WM_WM_REINIT: Replacing us(%x) with %x at head "

+		    "of chain\n", hwnd, s_hwndNextViewer);

+	  ChangeClipboardChain (hwnd, s_hwndNextViewer);

+	  winDebug ("  WM_WM_REINIT: Putting us back at head of chain.\n");

+	  s_hwndNextViewer = SetClipboardViewer (hwnd);

+        }

+        winDebug ("winClipboardWindowProc - WM_WM_REINIT: Exit\n");

+      }

+      return 0;

+

+

+    case WM_DRAWCLIPBOARD:

+      {

+	static Atom atomClipboard;

+	static int generation;

+	static Bool s_fProcessingDrawClipboard = FALSE;

+	Display	*pDisplay = g_pClipboardDisplay;

+	Window	iWindow = g_iClipboardWindow;

+	int	iReturn;

+

+	winDebug ("winClipboardWindowProc - WM_DRAWCLIPBOARD 0x%x 0x%x 0x%x: Enter\n",hwnd,wParam,lParam);

+

+	if (!g_fClipboardStarted)

+	{

+	  winDebug ("winClipboardWindowProc - WM_DRAWCLIPBOARD: Exit with no processing\n");

+	  if (s_hwndNextViewer)

+	    SendMessage (s_hwndNextViewer, message, wParam, lParam);

+	  return 0;

+    }

+

+	if (generation != serverGeneration)

+          {

+            generation = serverGeneration;

+            atomClipboard = XInternAtom (pDisplay, "CLIPBOARD", False);

+          }

+

+	/*

+	 * We've occasionally seen a loop in the clipboard chain.

+	 * Try and fix it on the first hint of recursion.

+	 */

+	if (! s_fProcessingDrawClipboard) 

+	  {

+	    s_fProcessingDrawClipboard = TRUE;

+	  }

+	else

+	  {

+	    /* Attempt to break the nesting by getting out of the chain, twice?, and then fix and bail */

+	    ChangeClipboardChain (hwnd, s_hwndNextViewer);

+	    winFixClipboardChain();

+	    ErrorF ("winClipboardWindowProc - WM_DRAWCLIPBOARD - "

+			   "Nested calls detected.  Re-initing.\n");

+	    winDebug ("winClipboardWindowProc - WM_DRAWCLIPBOARD: Exit\n");

+	    s_fProcessingDrawClipboard = FALSE;

+	    return 0;

+	  }

+

+	/*

+	 * Do not take ownership of the X11 selections when something

+	 * other than CF_TEXT or CF_UNICODETEXT has been copied

+	 * into the Win32 clipboard.

+	 */

+	if (!IsClipboardFormatAvailable (CF_TEXT)

+	    && !IsClipboardFormatAvailable (CF_UNICODETEXT))

+	  {

+

+	    winDebug ("winClipboardWindowProc - WM_DRAWCLIPBOARD - "

+		    "Clipboard does not contain CF_TEXT nor "

+		    "CF_UNICODETEXT.\n");

+

+	    /*

+	     * We need to make sure that the X Server has processed

+	     * previous XSetSelectionOwner messages.

+	     */

+	    XSync (pDisplay, FALSE);

+	    

+	    /* Release PRIMARY selection if owned */

+	    iReturn = XGetSelectionOwner (pDisplay, XA_PRIMARY);

+	    if (iReturn == g_iClipboardWindow)

+	      {

+		winDebug ("winClipboardWindowProc - WM_DRAWCLIPBOARD - "

+			"PRIMARY selection is owned by us.\n");

+		XSetSelectionOwner (pDisplay,

+				    XA_PRIMARY,

+				    None,

+				    CurrentTime);

+	      }

+	    else if (BadWindow == iReturn || BadAtom == iReturn)

+	      ErrorF ("winClipboardWindowProc - WM_DRAWCLIPBOARD - "

+		      "XGetSelection failed for PRIMARY: %d\n", iReturn);

+

+	    /* Release CLIPBOARD selection if owned */

+	    iReturn = XGetSelectionOwner (pDisplay,

+					  atomClipboard);

+	    if (iReturn == g_iClipboardWindow)

+	      {

+		winDebug ("winClipboardWindowProc - WM_DRAWCLIPBOARD - "

+			"CLIPBOARD selection is owned by us.\n");

+		XSetSelectionOwner (pDisplay,

+				    atomClipboard,

+				    None,

+				    CurrentTime);

+	      }

+	    else if (BadWindow == iReturn || BadAtom == iReturn)

+	      ErrorF ("winClipboardWindowProc - WM_DRAWCLIPBOARD - "

+		      "XGetSelection failed for CLIPBOARD: %d\n", iReturn);

+

+	    winDebug ("winClipboardWindowProc - WM_DRAWCLIPBOARD: Exit\n");

+	    s_fProcessingDrawClipboard = FALSE;

+	    if (s_hwndNextViewer)

+		SendMessage (s_hwndNextViewer, message, wParam, lParam);

+	    return 0;

+	  }

+	  /* Only reassert ownership when we did not change the clipboard ourselves */

+	if (hwnd!=(HWND)wParam)

+	{

+	  /* Reassert ownership of PRIMARY */	  

+	  iReturn = XSetSelectionOwner (pDisplay,

+				        XA_PRIMARY,

+				        iWindow,

+				        CurrentTime);

+	  if (iReturn == BadAtom || iReturn == BadWindow ||

+	      XGetSelectionOwner (pDisplay, XA_PRIMARY) != iWindow)

+	    {

+	      ErrorF ("winClipboardWindowProc - WM_DRAWCLIPBOARD - "

+		      "Could not reassert ownership of PRIMARY\n");

+	    }

+	  else

+	    {

+	      winDebug ("winClipboardWindowProc - WM_DRAWCLIPBOARD - "

+		      "Reasserted ownership of PRIMARY\n");

+	    }

+	

+	  /* Reassert ownership of the CLIPBOARD */	  

+	  iReturn = XSetSelectionOwner (pDisplay,

+				        atomClipboard,

+				        iWindow,

+				        CurrentTime);

+

+	  if (iReturn == BadAtom || iReturn == BadWindow ||

+	      XGetSelectionOwner (pDisplay, atomClipboard) != iWindow)

+	    {

+	      ErrorF ("winClipboardWindowProc - WM_DRAWCLIPBOARD - "

+		      "Could not reassert ownership of CLIPBOARD\n");

+	    }

+	  else

+	    {

+	      winDebug ("winClipboardWindowProc - WM_DRAWCLIPBOARD - "

+		      "Reasserted ownership of CLIPBOARD\n");

+	    }

+	

+	  /* Flush the pending SetSelectionOwner event now */

+	  XFlush (pDisplay);

+	  }

+        

+      s_fProcessingDrawClipboard = FALSE;

+      winDebug ("winClipboardWindowProc - WM_DRAWCLIPBOARD: Exit\n");

+      /* Pass the message on the next window in the clipboard viewer chain */

+      if (s_hwndNextViewer)

+	SendMessage (s_hwndNextViewer, message, wParam, lParam);

+      return 0;

+

+      }

+

+    case WM_DESTROYCLIPBOARD:

+      /*

+       * NOTE: Intentionally do nothing.

+       * Changes in the Win32 clipboard are handled by WM_DRAWCLIPBOARD

+       * above.  We only process this message to conform to the specs

+       * for delayed clipboard rendering in Win32.  You might think

+       * that we need to release ownership of the X11 selections, but

+       * we do not, because a WM_DRAWCLIPBOARD message will closely

+       * follow this message and reassert ownership of the X11

+       * selections, handling the issue for us.

+       */

+      return 0;

+

+

+    case WM_RENDERFORMAT:

+    case WM_RENDERALLFORMATS:

+      {

+	int	iReturn;

+	Display *pDisplay = g_pClipboardDisplay;

+	Window	iWindow = g_iClipboardWindow;

+	Bool	fConvertToUnicode;

+

+	winDebug ("winClipboardWindowProc - WM_RENDER*FORMAT - Hello.\n");

+

+	/* Flag whether to convert to Unicode or not */

+	if (message == WM_RENDERALLFORMATS)

+	  fConvertToUnicode = FALSE;

+	else

+	  fConvertToUnicode = g_fUnicodeSupport && (CF_UNICODETEXT == wParam);

+

+	/* Request the selection contents */

+	iReturn = XConvertSelection (pDisplay,

+				     g_atomLastOwnedSelection,

+				     XInternAtom (pDisplay,

+						  "COMPOUND_TEXT", False),

+				     XInternAtom (pDisplay,

+						  WIN_LOCAL_PROPERTY, False),

+				     iWindow,

+				     CurrentTime);

+	if (iReturn == BadAtom || iReturn == BadWindow)

+	  {

+	    ErrorF ("winClipboardWindowProc - WM_RENDER*FORMAT - "

+		    "XConvertSelection () failed\n");

+	    break;

+	  }

+

+	/* Special handling for WM_RENDERALLFORMATS */

+	if (message == WM_RENDERALLFORMATS)

+	  {

+	    /* We must open and empty the clipboard */

+	    if (!OpenClipboard (hwnd))

+	      {

+		ErrorF ("winClipboardWindowProc - WM_RENDER*FORMATS - "

+			"OpenClipboard () failed: %08x\n",

+			GetLastError ());

+		break;

+	      }

+	    

+	    if (!EmptyClipboard ())

+	      {

+		ErrorF ("winClipboardWindowProc - WM_RENDER*FORMATS - "

+			"EmptyClipboard () failed: %08x\n",

+		      GetLastError ());

+		CloseClipboard ();

+		break;

+	      }

+	  }

+

+	/* Process the SelectionNotify event */

+	iReturn = winProcessXEventsTimeout (hwnd,

+					    iWindow,

+					    pDisplay,

+					    fConvertToUnicode,

+					    WIN_POLL_TIMEOUT);

+	if (WIN_XEVENTS_CONVERT == iReturn)

+	  {

+	    /*

+	     * The selection was offered for conversion first, so we have

+	     * to process a second SelectionNotify event to get the actual

+	     * data in the selection.

+	     */

+	    winDebug("winClipboardWindowProc - Previous winProcessXEventsTimeout returned WIN_XEVENTS_CONVERT, calling it again\n");

+	    iReturn = winProcessXEventsTimeout (hwnd,

+						iWindow,

+						pDisplay,

+						fConvertToUnicode,

+						WIN_POLL_TIMEOUT);

+	  }

+	

+	/*

+	 * The last of the up-to two calls to winProcessXEventsTimeout

+	 * from above had better have seen a notify event, or else we

+	 * are dealing with a buggy or old X11 app.  In these cases we

+	 * have to paste some fake data to the Win32 clipboard to

+	 * satisfy the requirement that we write something to it.

+	 */

+	if (WIN_XEVENTS_NOTIFY != iReturn)

+	  {

+	    ErrorF("winClipboardWindowProc - winProcessXEventsTimeout should have returned WIN_XEVENTS_NOTIFY was %d\n",iReturn);

+	    /* Paste no data, to satisfy required call to SetClipboardData */

+	    if (g_fUnicodeSupport)

+	      SetClipboardData (CF_UNICODETEXT, NULL);

+	    SetClipboardData (CF_TEXT, NULL);

+	  }

+

+	/* Special handling for WM_RENDERALLFORMATS */

+	if (message == WM_RENDERALLFORMATS)

+	  {

+	    /* We must close the clipboard */

+	    

+	    if (!CloseClipboard ())

+	      {

+	      ErrorF ("winClipboardWindowProc - WM_RENDERALLFORMATS - "

+		      "CloseClipboard () failed: %08x\n",

+		      GetLastError ());

+	      break;

+	      }

+	  }

+

+	winDebug ("winClipboardWindowProc - WM_RENDER*FORMAT - Returning.\n");

+	return 0;

+      }

+    }

+

+  /* Let Windows perform default processing for unhandled messages */

+  return DefWindowProc (hwnd, message, wParam, lParam);

+}

+

+

+/*

+ * Process any pending Windows messages

+ */

+

+BOOL

+winClipboardFlushWindowsMessageQueue (HWND hwnd)

+{

+  MSG			msg;

+

+  /* Flush the messaging window queue */

+  /* NOTE: Do not pass the hwnd of our messaging window to PeekMessage,

+   * as this will filter out many non-window-specific messages that

+   * are sent to our thread, such as WM_QUIT.

+   */

+  while (PeekMessage (&msg, NULL, 0, 0, PM_REMOVE))

+    {

+      /* Dispatch the message if not WM_QUIT */

+      if (msg.message == WM_QUIT)

+	return FALSE;

+      else

+	DispatchMessage (&msg);

+    }

+  

+  return TRUE;

+}

diff --git a/xorg-server/hw/xwin/winclipboardwrappers.c b/xorg-server/hw/xwin/winclipboardwrappers.c
index c68d78aa3..a096a2a51 100644
--- a/xorg-server/hw/xwin/winclipboardwrappers.c
+++ b/xorg-server/hw/xwin/winclipboardwrappers.c
@@ -88,7 +88,7 @@ winProcQueryTree (ClientPtr client)
 {
   int			iReturn;
 
-  ErrorF ("winProcQueryTree - Hello\n");
+  winDebug ("winProcQueryTree - Hello\n");
 
   /*
    * This procedure is only used for initialization.
@@ -116,7 +116,7 @@ winProcQueryTree (ClientPtr client)
   /* Do nothing if clipboard is not enabled */
   if (!g_fClipboard)
     {
-      ErrorF ("winProcQueryTree - Clipboard is not enabled, "
+      winDebug ("winProcQueryTree - Clipboard is not enabled, "
 	      "returning.\n");
       return iReturn;
     }
@@ -124,7 +124,7 @@ winProcQueryTree (ClientPtr client)
   /* If the clipboard client has already been started, abort */
   if (g_fClipboardLaunched)
     {
-      ErrorF ("winProcQueryTree - Clipboard client already "
+      winDebug ("winProcQueryTree - Clipboard client already "
 	      "launched, returning.\n");
       return iReturn;
     }
@@ -166,7 +166,7 @@ winProcQueryTree (ClientPtr client)
 	  return iReturn;
 	}
       
-      ErrorF ("winProcQueryTree - winInitClipboard returned.\n");
+      winDebug ("winProcQueryTree - winInitClipboard returned.\n");
     }
   
   /* Flag that clipboard client has been launched */
@@ -189,12 +189,14 @@ winProcEstablishConnection (ClientPtr client)
   static int		s_iCallCount = 0;
   static unsigned long	s_ulServerGeneration = 0;
 
-  if (s_iCallCount == 0 || s_iCallCount == CLIP_NUM_CALLS) ErrorF ("winProcEstablishConnection - Hello\n");
+  #ifdef WINDBG
+  if (s_iCallCount == 0 || s_iCallCount == CLIP_NUM_CALLS) winDebug ("winProcEstablishConnection - Hello\n");
+  #endif
 
   /* Do nothing if clipboard is not enabled */
   if (!g_fClipboard)
     {
-      ErrorF ("winProcEstablishConnection - Clipboard is not enabled, "
+      winDebug ("winProcEstablishConnection - Clipboard is not enabled, "
 	      "returning.\n");
       
       /* Unwrap the original function, call it, and return */
@@ -222,10 +224,12 @@ winProcEstablishConnection (ClientPtr client)
       && !g_fClipboardLaunched
       && s_iCallCount < CLIP_NUM_CALLS)
     {
-      if (s_iCallCount == 1) ErrorF ("winProcEstablishConnection - Xdmcp, waiting to "
+      #ifdef WINDBG
+      if (s_iCallCount == 1) winDebug ("winProcEstablishConnection - Xdmcp, waiting to "
 	      "start clipboard client until %dth call", CLIP_NUM_CALLS);
-      if (s_iCallCount == CLIP_NUM_CALLS - 1) ErrorF (".\n");
-      else ErrorF (".");
+      if (s_iCallCount == CLIP_NUM_CALLS - 1) winDebug (".\n");
+      else winDebug (".");
+      #endif
       return (*winProcEstablishConnectionOrig) (client);
     }
 
@@ -256,7 +260,7 @@ winProcEstablishConnection (ClientPtr client)
   /* If the clipboard client has already been started, abort */
   if (g_fClipboardLaunched)
     {
-      ErrorF ("winProcEstablishConnection - Clipboard client already "
+      winDebug ("winProcEstablishConnection - Clipboard client already "
 	      "launched, returning.\n");
       return iReturn;
     }
@@ -296,7 +300,7 @@ winProcEstablishConnection (ClientPtr client)
 	  return iReturn;
 	}
       
-      ErrorF ("winProcEstablishConnection - winInitClipboard returned.\n");
+      winDebug ("winProcEstablishConnection - winInitClipboard returned.\n");
     }
   
   /* Flag that clipboard client has been launched */
@@ -310,30 +314,26 @@ winProcEstablishConnection (ClientPtr client)
  * Wrapper for internal SetSelectionOwner function.
  * Grabs ownership of Windows clipboard when X11 clipboard owner changes.
  */
-
 int
 winProcSetSelectionOwner (ClientPtr client)
 {
   int			i;
   DrawablePtr		pDrawable;
   WindowPtr		pWindow = None;
-  Bool			fOwnedToNotOwned = FALSE;
   static Window		s_iOwners[CLIP_NUM_SELECTIONS] = {None};
   static unsigned long	s_ulServerGeneration = 0;
   REQUEST(xSetSelectionOwnerReq);
   
   REQUEST_SIZE_MATCH(xSetSelectionOwnerReq);
 
-#if 0
-  ErrorF ("winProcSetSelectionOwner - Hello.\n");
-#endif
+  winDebug ("winProcSetSelectionOwner - Hello.\n");
 
   /* Watch for server reset */
   if (s_ulServerGeneration != serverGeneration)
     {
       /* Save new generation number */
       s_ulServerGeneration = serverGeneration;
-
+                  
       /* Initialize static variables */
       for (i = 0; i < CLIP_NUM_SELECTIONS; ++i)
 	s_iOwners[i] = None;
@@ -342,9 +342,9 @@ winProcSetSelectionOwner (ClientPtr client)
   /* Abort if clipboard not completely initialized yet */
   if (!g_fClipboardStarted)
     {
-      /* ErrorF ("winProcSetSelectionOwner - Clipboard not yet started, "
-	      "aborting.\n"); */
-      goto winProcSetSelectionOwner_Done;
+        winDebug ("winProcSetSelectionOwner - Clipboard not yet started, "
+	        "aborting.\n");
+        goto winProcSetSelectionOwner_Done;
     }
   
   /* Grab window if we have one */
@@ -367,12 +367,8 @@ winProcSetSelectionOwner (ClientPtr client)
       if (None == stuff->window
 	  && None != s_iOwners[CLIP_OWN_PRIMARY])
 	{
-	  fOwnedToNotOwned = TRUE;
-
-#if 0
-	  ErrorF ("winProcSetSelectionOwner - PRIMARY - Going from "
+	  winDebug ("winProcSetSelectionOwner - PRIMARY - Going from "
 		  "owned to not owned.\n");
-#endif
 
 	  /* Adjust last owned selection */
 	  if (None != s_iOwners[CLIP_OWN_CLIPBOARD])
@@ -384,10 +380,8 @@ winProcSetSelectionOwner (ClientPtr client)
       /* Save new selection owner or None */
       s_iOwners[CLIP_OWN_PRIMARY] = stuff->window;
 
-#if 0
-      ErrorF ("winProcSetSelectionOwner - PRIMARY - Now owned by: %d\n",
-	      stuff->window);
-#endif
+      winDebug ("winProcSetSelectionOwner - PRIMARY - Now owned by: 0x%x (clipboard is 0x%x)\n",
+	      stuff->window,g_iClipboardWindow);
     }
   else if (MakeAtom ("CLIPBOARD", 9, TRUE) == stuff->selection)
     {
@@ -395,12 +389,8 @@ winProcSetSelectionOwner (ClientPtr client)
       if (None == stuff->window
 	  && None != s_iOwners[CLIP_OWN_CLIPBOARD])
 	{
-	  fOwnedToNotOwned = TRUE;
-	  
-#if 0
-	  ErrorF ("winProcSetSelectionOwner - CLIPBOARD - Going from "
+	  winDebug ("winProcSetSelectionOwner - CLIPBOARD - Going from "
 		  "owned to not owned.\n");
-#endif
 
 	  /* Adjust last owned selection */
 	  if (None != s_iOwners[CLIP_OWN_PRIMARY])
@@ -412,10 +402,8 @@ winProcSetSelectionOwner (ClientPtr client)
       /* Save new selection owner or None */
       s_iOwners[CLIP_OWN_CLIPBOARD] = stuff->window;
 
-#if 0
-      ErrorF ("winProcSetSelectionOwner - CLIPBOARD - Now owned by: %d\n",
-	      stuff->window);
-#endif
+      winDebug ("winProcSetSelectionOwner - CLIPBOARD - Now owned by: 0x%x, clipboard is 0x%x\n",
+	      stuff->window,g_iClipboardWindow);
     }
   else
     goto winProcSetSelectionOwner_Done;
@@ -430,48 +418,17 @@ winProcSetSelectionOwner (ClientPtr client)
   if (g_iClipboardWindow == s_iOwners[CLIP_OWN_CLIPBOARD])
     s_iOwners[CLIP_OWN_CLIPBOARD] = None;
 
-  /*
-   * Handle case when selection is being disowned,
-   * WM_DRAWCLIPBOARD did not do the disowning,
-   * both monitored selections are no longer owned,
-   * an owned to not owned transition was detected,
-   * and we currently own the Win32 clipboard.
-   */
-  if (stuff->window == None
-      && s_iOwners[CLIP_OWN_PRIMARY] == None
-      && s_iOwners[CLIP_OWN_CLIPBOARD] == None
-      && fOwnedToNotOwned
-      && g_hwndClipboard != NULL
-      && g_hwndClipboard == GetClipboardOwner ())
-    {
-#if 0
-      ErrorF ("winProcSetSelectionOwner - We currently own the "
-	      "clipboard and neither the PRIMARY nor the CLIPBOARD "
-	      "selections are owned, releasing ownership of Win32 "
-	      "clipboard.\n");
-#endif
-      
-      /* Release ownership of the Windows clipboard */
-      OpenClipboard (NULL);
-      EmptyClipboard ();
-      CloseClipboard ();
-
-      goto winProcSetSelectionOwner_Done;
-    }
-
   /* Abort if no window at this point */
   if (None == stuff->window)
     {
-#if 0
-      ErrorF ("winProcSetSelectionOwner - No window, returning.\n");
-#endif
+      winDebug ("winProcSetSelectionOwner - No window, returning.\n");
       goto winProcSetSelectionOwner_Done;
     }
 
   /* Abort if invalid selection */
   if (!ValidAtom (stuff->selection))
     {
-      ErrorF ("winProcSetSelectionOwner - Found BadAtom, aborting.\n");
+      winDebug ("winProcSetSelectionOwner - Found BadAtom, aborting.\n");
       goto winProcSetSelectionOwner_Done;
     }
 
@@ -481,32 +438,24 @@ winProcSetSelectionOwner (ClientPtr client)
   /* Abort if clipboard manager is owning the selection */
   if (pDrawable->id == g_iClipboardWindow)
     {
-#if 0
-      ErrorF ("winProcSetSelectionOwner - We changed ownership, "
+      winDebug ("winProcSetSelectionOwner - We changed ownership, "
 	      "aborting.\n");
-#endif
       goto winProcSetSelectionOwner_Done;
     }
 
   /* Abort if root window is taking ownership */
   if (pDrawable->id == 0)
     {
-      ErrorF ("winProcSetSelectionOwner - Root window taking ownership, "
+      winDebug ("winProcSetSelectionOwner - Root window taking ownership, "
 	      "aborting\n");
       goto winProcSetSelectionOwner_Done;
     }
 
-  /* Close clipboard if we have it open already */
-  if (GetOpenClipboardWindow () == g_hwndClipboard)
-    {
-      CloseClipboard ();
-    }
-
   /* Access the Windows clipboard */
   if (!OpenClipboard (g_hwndClipboard))
     {
-      ErrorF ("winProcSetSelectionOwner - OpenClipboard () failed: %08x\n",
-	      (int) GetLastError ());
+      ErrorF ("winProcSetSelectionOwner - OpenClipboard () failed: %08x, hwnd: %08x\n",
+	      (int) GetLastError (),g_hwndClipboard);
       goto winProcSetSelectionOwner_Done;
     }
 
@@ -515,9 +464,12 @@ winProcSetSelectionOwner (ClientPtr client)
     {
       ErrorF ("winProcSetSelectionOwner - EmptyClipboard () failed: %08x\n",
 	      (int) GetLastError ());
+      CloseClipboard ();
       goto winProcSetSelectionOwner_Done;
     }
 
+  winDebug("winProcSetSelectionOwner - SetClipboardData NULL\n");
+
   /* Advertise Unicode if we support it */
   if (g_fUnicodeSupport)
     SetClipboardData (CF_UNICODETEXT, NULL);
@@ -537,6 +489,6 @@ winProcSetSelectionOwner (ClientPtr client)
       goto winProcSetSelectionOwner_Done;
     }
 
- winProcSetSelectionOwner_Done:
+winProcSetSelectionOwner_Done:
   return (*winProcSetSelectionOwnerOrig) (client);
 }
diff --git a/xorg-server/hw/xwin/winclipboardxevents.c b/xorg-server/hw/xwin/winclipboardxevents.c
index ec40814db..09aec03fc 100644
--- a/xorg-server/hw/xwin/winclipboardxevents.c
+++ b/xorg-server/hw/xwin/winclipboardxevents.c
@@ -1,825 +1,851 @@
-/*
- *Copyright (C) 2003-2004 Harold L Hunt II All Rights Reserved.
- *Copyright (C) Colin Harrison 2005-2008
- *
- *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 the copyright holder(s)
- *and 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 the copyright holder(s) and author(s).
- *
- * Authors:	Harold L Hunt II
- *              Colin Harrison
- */
-
-#ifdef HAVE_XWIN_CONFIG_H
-#include <xwin-config.h>
-#endif
-#include "winclipboard.h"
-#include "misc.h"
-
-
-/*
- * References to external symbols
- */
-
-extern Bool		g_fUnicodeSupport;
-
-
-/*
- * Process any pending X events
- */
-
-int
-winClipboardFlushXEvents (HWND hwnd,
-			  int iWindow,
-			  Display *pDisplay,
-			  Bool fUseUnicode)
-{
-  static Atom atomLocalProperty;
-  static Atom atomCompoundText;
-  static Atom atomUTF8String;
-  static Atom atomTargets;
-  static int generation;
-
-  if (generation != serverGeneration)
-    {
-      generation = serverGeneration;
-      atomLocalProperty = XInternAtom (pDisplay, WIN_LOCAL_PROPERTY, False);
-      atomUTF8String = XInternAtom (pDisplay, "UTF8_STRING", False);
-      atomCompoundText = XInternAtom (pDisplay, "COMPOUND_TEXT", False);
-      atomTargets = XInternAtom (pDisplay, "TARGETS", False);
-    }
-
-  /* Process all pending events */
-  while (XPending (pDisplay))
-    {
-      XTextProperty		xtpText = {0};
-      XEvent			event;
-      XSelectionEvent		eventSelection;
-      unsigned long		ulReturnBytesLeft;
-      unsigned char		*pszReturnData = NULL;
-      char			*pszGlobalData = NULL;
-      int			iReturn;
-      HGLOBAL			hGlobal = NULL;
-      XICCEncodingStyle		xiccesStyle;
-      int			iConvertDataLen = 0;
-      char			*pszConvertData = NULL;
-      char			*pszTextList[2] = {NULL};
-      int			iCount;
-      char			**ppszTextList = NULL;
-      wchar_t			*pwszUnicodeStr = NULL;
-      int			iUnicodeLen = 0;
-      int			iReturnDataLen = 0;
-      int			i;
-      Bool			fAbort = FALSE;
-      Bool			fCloseClipboard = FALSE;
-      Bool			fSetClipboardData = TRUE;
-
-      /* Get the next event - will not block because one is ready */
-      XNextEvent (pDisplay, &event);
-
-      /* Branch on the event type */
-      switch (event.type)
-	{
-	  /*
-	   * SelectionRequest
-	   */
-
-	case SelectionRequest:
-#if 0
-	  {
-	    char			*pszAtomName = NULL;
-	    
-	    ErrorF ("SelectionRequest - target %d\n",
-		    event.xselectionrequest.target);
-	    
-	    pszAtomName = XGetAtomName (pDisplay,
-					event.xselectionrequest.target);
-	    ErrorF ("SelectionRequest - Target atom name %s\n", pszAtomName);
-	    XFree (pszAtomName);
-	    pszAtomName = NULL;
-	  }
-#endif
-
-	  /* Abort if invalid target type */
-	  if (event.xselectionrequest.target != XA_STRING
-	      && event.xselectionrequest.target != atomUTF8String
-	      && event.xselectionrequest.target != atomCompoundText
-	      && event.xselectionrequest.target != atomTargets)
-	    {
-	      /* Abort */
-	      fAbort = TRUE;
-	      goto winClipboardFlushXEvents_SelectionRequest_Done;
-	    }
-
-	  /* Handle targets type of request */
-	  if (event.xselectionrequest.target == atomTargets)
-	    {
-	      Atom atomTargetArr[] = {atomTargets,
-				      atomCompoundText,
-				      atomUTF8String,
-				      XA_STRING};
-
-	      /* Try to change the property */
-	      iReturn = XChangeProperty (pDisplay,
-					 event.xselectionrequest.requestor,
-					 event.xselectionrequest.property,
-					 XA_ATOM,
-					 32,
-					 PropModeReplace,
-					 (unsigned char *) atomTargetArr,
-					 (sizeof (atomTargetArr)
-					  / sizeof (atomTargetArr[0])));
-	      if (iReturn == BadAlloc
-		  || iReturn == BadAtom
-		  || iReturn == BadMatch
-		  || iReturn == BadValue
-		  || iReturn == BadWindow)
-		{
-		  ErrorF ("winClipboardFlushXEvents - SelectionRequest - "
-			  "XChangeProperty failed: %d\n",
-			  iReturn);
-		}
-
-	      /* Setup selection notify xevent */
-	      eventSelection.type	= SelectionNotify;
-	      eventSelection.send_event	= True;
-	      eventSelection.display	= pDisplay;
-	      eventSelection.requestor	= event.xselectionrequest.requestor;
-	      eventSelection.selection	= event.xselectionrequest.selection;
-	      eventSelection.target	= event.xselectionrequest.target;
-	      eventSelection.property	= event.xselectionrequest.property;
-	      eventSelection.time	= event.xselectionrequest.time;
-
-	      /*
-	       * Notify the requesting window that
-	       * the operation has completed
-	       */
-	      iReturn = XSendEvent (pDisplay,
-				    eventSelection.requestor,
-				    False,
-				    0L,
-				    (XEvent *) &eventSelection);
-	      if (iReturn == BadValue || iReturn == BadWindow)
-		{
-		  ErrorF ("winClipboardFlushXEvents - SelectionRequest - "
-			  "XSendEvent () failed\n");
-		}
-	      break;
-	    }
-
-	  /* Check that clipboard format is available */
-	  if (fUseUnicode
-	      && !IsClipboardFormatAvailable (CF_UNICODETEXT))
-	    {
-	      static int count; /* Hack to stop acroread spamming the log */
-	      static HWND lasthwnd; /* I've not seen any other client get here repeatedly? */
-	      if (hwnd != lasthwnd) count = 0;
-	      count++;
-	      if (count < 6) ErrorF ("winClipboardFlushXEvents - CF_UNICODETEXT is not "
-		      "available from Win32 clipboard.  Aborting %d.\n", count);
-	      lasthwnd = hwnd;
-
-	      /* Abort */
-	      fAbort = TRUE;
-	      goto winClipboardFlushXEvents_SelectionRequest_Done;
-	    }
-	  else if (!fUseUnicode
-		   && !IsClipboardFormatAvailable (CF_TEXT))
-	    {
-	      ErrorF ("winClipboardFlushXEvents - CF_TEXT is not "
-		      "available from Win32 clipboard.  Aborting.\n");
-
-	      /* Abort */
-	      fAbort = TRUE;
-	      goto winClipboardFlushXEvents_SelectionRequest_Done;
-	    }
-
-	  /* Close clipboard if we have it open already */
-	  if (GetOpenClipboardWindow () == hwnd)
-	    {
-	      CloseClipboard ();
-	    }
-
-	  /* Access the clipboard */
-	  if (!OpenClipboard (hwnd))
-	    {
-	      ErrorF ("winClipboardFlushXEvents - SelectionRequest - "
-		      "OpenClipboard () failed: %08x\n",
-		      GetLastError ());
-
-	      /* Abort */
-	      fAbort = TRUE;
-	      goto winClipboardFlushXEvents_SelectionRequest_Done;
-	    }
-	  
-	  /* Indicate that clipboard was opened */
-	  fCloseClipboard = TRUE;
-
-	  /* Setup the string style */
-	  if (event.xselectionrequest.target == XA_STRING)
-	    xiccesStyle = XStringStyle;
-#ifdef X_HAVE_UTF8_STRING
-	  else if (event.xselectionrequest.target == atomUTF8String)
-	    xiccesStyle = XUTF8StringStyle;
-#endif
-	  else if (event.xselectionrequest.target == atomCompoundText)
-	    xiccesStyle = XCompoundTextStyle;
-	  else
-	    xiccesStyle = XStringStyle;
-
-	  /*
-	   * FIXME: Can't pass CF_UNICODETEXT on Windows 95/98/Me
-	   */
-	  
-	  /* Get a pointer to the clipboard text, in desired format */
-	  if (fUseUnicode)
-	    {
-	      /* Retrieve clipboard data */
-	      hGlobal = GetClipboardData (CF_UNICODETEXT);
-	    }
-	  else
-	    {
-	      /* Retrieve clipboard data */
-	      hGlobal = GetClipboardData (CF_TEXT);
-	    }
-	  if (!hGlobal)
-	    {
-	      ErrorF ("winClipboardFlushXEvents - SelectionRequest - "
-		      "GetClipboardData () failed: %08x\n",
-		      GetLastError ());
-
-	      /* Abort */
-	      fAbort = TRUE;
-	      goto winClipboardFlushXEvents_SelectionRequest_Done;
-	    }
-	  pszGlobalData = (char *) GlobalLock (hGlobal);
-
-	  /* Convert the Unicode string to UTF8 (MBCS) */
-	  if (fUseUnicode)
-	    {
-	      iConvertDataLen = WideCharToMultiByte (CP_UTF8,
-						     0,
-						     (LPCWSTR)pszGlobalData,
-						     -1,
-						     NULL,
-						     0,
-						     NULL,
-						     NULL);
-	      /* NOTE: iConvertDataLen includes space for null terminator */
-	      pszConvertData = (char *) malloc (iConvertDataLen);
-	      WideCharToMultiByte (CP_UTF8,
-				   0,
-				   (LPCWSTR)pszGlobalData,
-				   -1,
-				   pszConvertData,
-				   iConvertDataLen,
-				   NULL,
-				   NULL);
-	    }
-	  else
-	    {
-	      pszConvertData = strdup (pszGlobalData);
-	      iConvertDataLen = strlen (pszConvertData) + 1;
-	    }
-
-	  /* Convert DOS string to UNIX string */
-	  winClipboardDOStoUNIX (pszConvertData, strlen (pszConvertData));
-
-	  /* Setup our text list */
-	  pszTextList[0] = pszConvertData;
-	  pszTextList[1] = NULL;
-
-	  /* Initialize the text property */
-	  xtpText.value = NULL;
-	  xtpText.nitems = 0;
-
-	  /* Create the text property from the text list */
-	  if (fUseUnicode)
-	    {
-#ifdef X_HAVE_UTF8_STRING
-	      iReturn = Xutf8TextListToTextProperty (pDisplay,
-						     pszTextList,
-						     1,
-						     xiccesStyle,
-						     &xtpText);
-#endif
-	    }
-	  else
-	    {
-	      iReturn = XmbTextListToTextProperty (pDisplay,
-						   pszTextList,
-						   1,
-						   xiccesStyle,
-						   &xtpText);
-	    }
-	  if (iReturn == XNoMemory || iReturn == XLocaleNotSupported)
-	    {
-	      ErrorF ("winClipboardFlushXEvents - SelectionRequest - "
-		      "X*TextListToTextProperty failed: %d\n",
-		      iReturn);
-
-	      /* Abort */
-	      fAbort = TRUE;
-	      goto winClipboardFlushXEvents_SelectionRequest_Done;
-	    }
-	  
-	  /* Free the converted string */
-	  free (pszConvertData);
-	  pszConvertData = NULL;
-
-	  /* Copy the clipboard text to the requesting window */
-	  iReturn = XChangeProperty (pDisplay,
-				     event.xselectionrequest.requestor,
-				     event.xselectionrequest.property,
-				     event.xselectionrequest.target,
-				     8,
-				     PropModeReplace,
-				     xtpText.value,
-				     xtpText.nitems);
-	  if (iReturn == BadAlloc || iReturn == BadAtom
-	      || iReturn == BadMatch || iReturn == BadValue
-	      || iReturn == BadWindow)
-	    {
-	      ErrorF ("winClipboardFlushXEvents - SelectionRequest - "
-		      "XChangeProperty failed: %d\n",
-		      iReturn);
-
-	      /* Abort */
-	      fAbort = TRUE;
-	      goto winClipboardFlushXEvents_SelectionRequest_Done;
-	    }
-
-	  /* Release the clipboard data */
-	  GlobalUnlock (hGlobal);
-	  pszGlobalData = NULL;
-	  fCloseClipboard = FALSE;
-	  CloseClipboard ();
-
-	  /* Clean up */
-	  XFree (xtpText.value);
-	  xtpText.value = NULL;
-	  xtpText.nitems = 0;
-
-	  /* Setup selection notify event */
-	  eventSelection.type = SelectionNotify;
-	  eventSelection.send_event = True;
-	  eventSelection.display = pDisplay;
-	  eventSelection.requestor = event.xselectionrequest.requestor;
-	  eventSelection.selection = event.xselectionrequest.selection;
-	  eventSelection.target = event.xselectionrequest.target;
-	  eventSelection.property = event.xselectionrequest.property;
-	  eventSelection.time = event.xselectionrequest.time;
-
-	  /* Notify the requesting window that the operation has completed */
-	  iReturn = XSendEvent (pDisplay,
-				eventSelection.requestor,
-				False,
-				0L,
-				(XEvent *) &eventSelection);
-	  if (iReturn == BadValue || iReturn == BadWindow)
-	    {
-	      ErrorF ("winClipboardFlushXEvents - SelectionRequest - "
-		      "XSendEvent () failed\n");
-
-	      /* Abort */
-	      fAbort = TRUE;
-	      goto winClipboardFlushXEvents_SelectionRequest_Done;
-	    }
-
-	winClipboardFlushXEvents_SelectionRequest_Done:
-	  /* Free allocated resources */
-	  if (xtpText.value)
-	  {
-	    XFree (xtpText.value);
-	    xtpText.value = NULL;
-	    xtpText.nitems = 0;
-	  }
-	  if (pszConvertData)
-	    free (pszConvertData);
-	  if (hGlobal && pszGlobalData)
-	    GlobalUnlock (hGlobal);
-	  
-	  /*
-	   * Send a SelectionNotify event to the requesting
-	   * client when we abort.
-	   */
-	  if (fAbort)
-	    {
-	      /* Setup selection notify event */
-	      eventSelection.type = SelectionNotify;
-	      eventSelection.send_event = True;
-	      eventSelection.display = pDisplay;
-	      eventSelection.requestor = event.xselectionrequest.requestor;
-	      eventSelection.selection = event.xselectionrequest.selection;
-	      eventSelection.target = event.xselectionrequest.target;
-	      eventSelection.property = None;
-	      eventSelection.time = event.xselectionrequest.time;
-
-	      /* Notify the requesting window that the operation is complete */
-	      iReturn = XSendEvent (pDisplay,
-				    eventSelection.requestor,
-				    False,
-				    0L,
-				    (XEvent *) &eventSelection);
-	      if (iReturn == BadValue || iReturn == BadWindow)
-		{
-		  /*
-		   * Should not be a problem if XSendEvent fails because
-		   * the client may simply have exited.
-		   */
-		  ErrorF ("winClipboardFlushXEvents - SelectionRequest - "
-			  "XSendEvent () failed for abort event.\n");
-		}
-	    }
-
-	  /* Close clipboard if it was opened */
-	  if (fCloseClipboard)
-	  {
-	    fCloseClipboard = FALSE;
-	    CloseClipboard ();
-	  }
-	  break;
-
-
-	  /*
-	   * SelectionNotify
-	   */ 
-
-	case SelectionNotify:
-#if 0
-	  ErrorF ("winClipboardFlushXEvents - SelectionNotify\n");
-	  {
-	    char		*pszAtomName;
-	    
-	    pszAtomName = XGetAtomName (pDisplay,
-					event.xselection.selection);
-
-	    ErrorF ("winClipboardFlushXEvents - SelectionNotify - ATOM: %s\n",
-		    pszAtomName);
-	    
-	    XFree (pszAtomName);
-	  }
-#endif
-
-
-	  /*
-	   * Request conversion of UTF8 and CompoundText targets.
-	   */
-	  if (event.xselection.property == None)
-	    {
-	      if (event.xselection.target == XA_STRING)
-		{
-#if 0
-		  ErrorF ("winClipboardFlushXEvents - SelectionNotify - "
-			  "XA_STRING\n");
-#endif
-		  return WIN_XEVENTS_CONVERT;
-		}
-	      else if (event.xselection.target == atomUTF8String)
-		{
-#if 0
-		  ErrorF ("winClipboardFlushXEvents - SelectionNotify - "
-			  "Requesting conversion of UTF8 target.\n");
-#endif
-		  iReturn = XConvertSelection (pDisplay,
-					       event.xselection.selection,
-					       XA_STRING,
-					       atomLocalProperty,
-					       iWindow,
-					       CurrentTime);
-		  if (iReturn != Success)
-		    {
-		      ErrorF ("winClipboardFlushXEvents - SelectionNotify - "
-			      "XConvertSelection () failed for UTF8String, "
-			      "aborting: %d\n",
-			      iReturn);
-		      break;
-		    }
-
-		  /* Process the ConvertSelection event */
-		  XFlush (pDisplay);
-		  return WIN_XEVENTS_CONVERT;
-		}
-#ifdef X_HAVE_UTF8_STRING
-	      else if (event.xselection.target == atomCompoundText)
-		{
-#if 0
-		  ErrorF ("winClipboardFlushXEvents - SelectionNotify - "
-			  "Requesting conversion of CompoundText target.\n");
-#endif
-		  iReturn = XConvertSelection (pDisplay,
-					       event.xselection.selection,
-					       atomUTF8String,
-					       atomLocalProperty,
-					       iWindow,
-					       CurrentTime);
-		  if (iReturn != Success)
-		    {
-		      ErrorF ("winClipboardFlushXEvents - SelectionNotify - "
-			      "XConvertSelection () failed for CompoundText, "
-			      "aborting: %d\n",
-			      iReturn);
-		      break;
-		    }
-
-		  /* Process the ConvertSelection event */
-		  XFlush (pDisplay);
-		  return WIN_XEVENTS_CONVERT;
-		}
-#endif
-	      else
-		{
-		  ErrorF ("winClipboardFlushXEvents - SelectionNotify - "
-			  "Unknown format.  Cannot request conversion, "
-			  "aborting.\n");
-		  break;
-		}
-	    }
-
-	  /* Retrieve the size of the stored data */
-	  iReturn = XGetWindowProperty (pDisplay,
-					iWindow,
-					atomLocalProperty,
-					0,
-					0, /* Don't get data, just size */
-					False,
-					AnyPropertyType,
-					&xtpText.encoding,
-					&xtpText.format,
-					&xtpText.nitems,
-					&ulReturnBytesLeft,
-					&xtpText.value);
-	  if (iReturn != Success)
-	    {
-	      ErrorF ("winClipboardFlushXEvents - SelectionNotify - "
-		      "XGetWindowProperty () failed, aborting: %d\n",
-		      iReturn);
-	      break;
-	    }
-
-#if 0
-	  ErrorF ("SelectionNotify - returned data %d left %d\n",
-		  xtpText.nitems, ulReturnBytesLeft);
-#endif
-
-	  /* Request the selection data */
-	  iReturn = XGetWindowProperty (pDisplay,
-					iWindow,
-					atomLocalProperty,
-					0,
-					ulReturnBytesLeft,
-					False,
-					AnyPropertyType,
-					&xtpText.encoding,
-					&xtpText.format,
-					&xtpText.nitems,
-					&ulReturnBytesLeft,
-					&xtpText.value);
-	  if (iReturn != Success)
-	    {
-	      ErrorF ("winClipboardFlushXEvents - SelectionNotify - "
-		      "XGetWindowProperty () failed, aborting: %d\n",
-		      iReturn);
-	      break;
-	    }
-
-#if 0
-	    {
-	      char		*pszAtomName = NULL;
-
-	      ErrorF ("SelectionNotify - returned data %d left %d\n",
-		      xtpText.nitems, ulReturnBytesLeft);
-	      
-	      pszAtomName = XGetAtomName(pDisplay, xtpText.encoding);
-	      ErrorF ("Notify atom name %s\n", pszAtomName);
-	      XFree (pszAtomName);
-	      pszAtomName = NULL;
-	    }
-#endif
-
-	  if (fUseUnicode)
-	    {
-#ifdef X_HAVE_UTF8_STRING
-	      /* Convert the text property to a text list */
-	      iReturn = Xutf8TextPropertyToTextList (pDisplay,
-						     &xtpText,
-						     &ppszTextList,
-						     &iCount);
-#endif
-	    }
-	  else
-	    {
-	      iReturn = XmbTextPropertyToTextList (pDisplay,
-						   &xtpText,
-						   &ppszTextList,
-						   &iCount);
-	    }
-	  if (iReturn == Success || iReturn > 0)
-	    {
-	      /* Conversion succeeded or some unconvertible characters */
-	      if (ppszTextList != NULL)
-		{
-		  iReturnDataLen = 0;
-		  for (i = 0; i < iCount; i++)
-		    {
-		      iReturnDataLen += strlen(ppszTextList[i]);
-		    }
-		  pszReturnData = malloc (iReturnDataLen + 1);
-		  pszReturnData[0] = '\0';
-		  for (i = 0; i < iCount; i++)
-		    {
-		      strcat (pszReturnData, ppszTextList[i]);
-		    }
-		}
-	      else
-		{
-		  ErrorF ("winClipboardFlushXEvents - SelectionNotify - "
-			  "X*TextPropertyToTextList list_return is NULL.\n");
-		  pszReturnData = malloc (1);
-		  pszReturnData[0] = '\0';
-		}
-	    }
-	  else
-	    {
-	      ErrorF ("winClipboardFlushXEvents - SelectionNotify - "
-		      "X*TextPropertyToTextList returned: ");
-	      switch (iReturn)
-		{
-		case XNoMemory:
-		  ErrorF ("XNoMemory\n");
-		  break;
-		case XConverterNotFound:
-		  ErrorF ("XConverterNotFound\n");
-		  break;
-		default:
-		  ErrorF ("%d", iReturn);
-		  break;
-		}
-	      pszReturnData = malloc (1);
-	      pszReturnData[0] = '\0';
-	    }
-
-	  /* Free the data returned from XGetWindowProperty */
-	  if (ppszTextList)
-	    XFreeStringList (ppszTextList);
-	  ppszTextList = NULL;
-	  XFree (xtpText.value);
-	  xtpText.value = NULL;
-	  xtpText.nitems = 0;
-
-	  /* Convert the X clipboard string to DOS format */
-	  winClipboardUNIXtoDOS (&pszReturnData, strlen (pszReturnData));
-
-	  if (fUseUnicode)
-	    {
-	      /* Find out how much space needed to convert MBCS to Unicode */
-	      iUnicodeLen = MultiByteToWideChar (CP_UTF8,
-						 0,
-						 pszReturnData,
-						 -1,
-						 NULL,
-						 0);
-
-	      /* Allocate memory for the Unicode string */
-	      pwszUnicodeStr
-		= (wchar_t*) malloc (sizeof (wchar_t) * (iUnicodeLen + 1));
-	      if (!pwszUnicodeStr)
-		{
-		  ErrorF ("winClipboardFlushXEvents - SelectionNotify "
-			  "malloc failed for pwszUnicodeStr, aborting.\n");
-
-		  /* Abort */
-		  fAbort = TRUE;
-		  goto winClipboardFlushXEvents_SelectionNotify_Done;
-		}
-
-	      /* Do the actual conversion */
-	      MultiByteToWideChar (CP_UTF8,
-				   0,
-				   pszReturnData,
-				   -1,
-				   pwszUnicodeStr,
-				   iUnicodeLen);
-	      
-	      /* Allocate global memory for the X clipboard data */
-	      hGlobal = GlobalAlloc (GMEM_MOVEABLE,
-				     sizeof (wchar_t) * (iUnicodeLen + 1));
-	    }
-	  else
-	    {
-	      pszConvertData = strdup (pszReturnData);
-	      iConvertDataLen = strlen (pszConvertData) + 1;
-
-	      /* Allocate global memory for the X clipboard data */
-	      hGlobal = GlobalAlloc (GMEM_MOVEABLE, iConvertDataLen);
-	    }
-
-	  free (pszReturnData);
-
-	  /* Check that global memory was allocated */
-	  if (!hGlobal)
-	    {
-	      ErrorF ("winClipboardFlushXEvents - SelectionNotify "
-		      "GlobalAlloc failed, aborting: %ld\n",
-		      GetLastError ());
-
-	      /* Abort */
-	      fAbort = TRUE;
-	      goto winClipboardFlushXEvents_SelectionNotify_Done;
-	    }
-
-	  /* Obtain a pointer to the global memory */
-	  pszGlobalData = GlobalLock (hGlobal);
-	  if (pszGlobalData == NULL)
-	    {
-	      ErrorF ("winClipboardFlushXEvents - Could not lock global "
-		      "memory for clipboard transfer\n");
-
-	      /* Abort */
-	      fAbort = TRUE;
-	      goto winClipboardFlushXEvents_SelectionNotify_Done;
-	    }
-
-	  /* Copy the returned string into the global memory */
-	  if (fUseUnicode)
-	    {
-	      memcpy (pszGlobalData,
-		      pwszUnicodeStr,
-		      sizeof (wchar_t) * (iUnicodeLen + 1));
-	      free (pwszUnicodeStr);
-	      pwszUnicodeStr = NULL;
-	    }
-	  else
-	    {
-	      strcpy (pszGlobalData, pszConvertData);
-	      free (pszConvertData);
-	      pszConvertData = NULL;
-	    }
-
-	  /* Release the pointer to the global memory */
-	  GlobalUnlock (hGlobal);
-	  pszGlobalData = NULL;
-
-	  /* Push the selection data to the Windows clipboard */
-	  if (fUseUnicode)
-	    SetClipboardData (CF_UNICODETEXT, hGlobal);
-	  else
-	    SetClipboardData (CF_TEXT, hGlobal);
-
-	  /* Flag that SetClipboardData has been called */
-	  fSetClipboardData = FALSE;
-
-	  /*
-	   * NOTE: Do not try to free pszGlobalData, it is owned by
-	   * Windows after the call to SetClipboardData ().
-	   */
-
-	winClipboardFlushXEvents_SelectionNotify_Done:
-	  /* Free allocated resources */
-	  if (ppszTextList)
-	    XFreeStringList (ppszTextList);
-	  if (xtpText.value)
-	  {
-	    XFree (xtpText.value);
-	    xtpText.value = NULL;
-	    xtpText.nitems = 0;
-	  }
-	  if (pszConvertData)
-	    free (pszConvertData);
-	  if (pwszUnicodeStr)
-	    free (pwszUnicodeStr);
-	  if (hGlobal && pszGlobalData)
-	    GlobalUnlock (hGlobal);
-	  if (fSetClipboardData && g_fUnicodeSupport)
-	    SetClipboardData (CF_UNICODETEXT, NULL);
-	  if (fSetClipboardData)
-	    SetClipboardData (CF_TEXT, NULL);
-	  return WIN_XEVENTS_NOTIFY;
-
-	default:
-	  break;
-	}
-    }
-
-  return WIN_XEVENTS_SUCCESS;
-}
+/*

+ *Copyright (C) 2003-2004 Harold L Hunt II All Rights Reserved.

+ *Copyright (C) Colin Harrison 2005-2008

+ *

+ *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 the copyright holder(s)

+ *and 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 the copyright holder(s) and author(s).

+ *

+ * Authors:	Harold L Hunt II

+ *              Colin Harrison

+ */

+

+#ifdef HAVE_XWIN_CONFIG_H

+#include <xwin-config.h>

+#endif

+#include "winclipboard.h"

+#include "misc.h"

+#include "winmsg.h"

+#include <unistd.h>

+

+/*

+ * References to external symbols

+ */

+

+extern Bool		g_fUnicodeSupport;

+

+

+/*

+ * Process any pending X events

+ */

+

+int

+winClipboardFlushXEvents (HWND hwnd,

+			  int iWindow,

+			  Display *pDisplay,

+			  Bool fUseUnicode,

+			  Bool ClipboardOpened)

+{

+  static Atom atomLocalProperty;

+  static Atom atomCompoundText;

+  static Atom atomUTF8String;

+  static Atom atomTargets;

+  static int generation;

+

+  if (generation != serverGeneration)

+    {

+      generation = serverGeneration;

+      atomLocalProperty = XInternAtom (pDisplay, WIN_LOCAL_PROPERTY, False);

+      atomUTF8String = XInternAtom (pDisplay, "UTF8_STRING", False);

+      atomCompoundText = XInternAtom (pDisplay, "COMPOUND_TEXT", False);

+      atomTargets = XInternAtom (pDisplay, "TARGETS", False);

+    }

+

+  /* Process all pending events */

+  while (XPending (pDisplay))

+    {

+      XTextProperty		xtpText = {0};

+      XEvent			event;

+      XSelectionEvent		eventSelection;

+      unsigned long		ulReturnBytesLeft;

+      unsigned char		*pszReturnData = NULL;

+      char			*pszGlobalData = NULL;

+      int			iReturn;

+      HGLOBAL			hGlobal = NULL;

+      XICCEncodingStyle		xiccesStyle;

+      int			iConvertDataLen = 0;

+      char			*pszConvertData = NULL;

+      char			*pszTextList[2] = {NULL};

+      int			iCount;

+      char			**ppszTextList = NULL;

+      wchar_t			*pwszUnicodeStr = NULL;

+      int			iUnicodeLen = 0;

+      int			iReturnDataLen = 0;

+      int			i;

+      Bool			fAbort = FALSE;

+      Bool			fCloseClipboard = FALSE;

+      Bool			fSetClipboardData = TRUE;

+

+      /* Get the next event - will not block because one is ready */

+      XNextEvent (pDisplay, &event);

+

+      winDebug ("Received event type %d\n",event.type);

+

+      /* Branch on the event type */

+      switch (event.type)

+	{

+	  /*

+	   * SelectionRequest

+	   */

+

+	case SelectionRequest:

+#ifdef _DEBUG

+	  {

+	    char			*pszAtomName = NULL;

+	    

+	    winDebug ("SelectionRequest - target %d\n",

+		    event.xselectionrequest.target);

+	    

+	    pszAtomName = XGetAtomName (pDisplay,

+					event.xselectionrequest.target);

+	    winDebug ("SelectionRequest - Target atom name %s\n", pszAtomName);

+	    XFree (pszAtomName);

+	    pszAtomName = NULL;

+	    winDebug ("SelectionRequest - owner %d\n", event.xselectionrequest.owner);

+	    winDebug ("SelectionRequest - requestor %d\n", event.xselectionrequest.requestor);

+	  }

+#endif

+

+	  /* Abort if invalid target type */

+	  if (event.xselectionrequest.target != XA_STRING

+	      && event.xselectionrequest.target != atomUTF8String

+	      && event.xselectionrequest.target != atomCompoundText

+	      && event.xselectionrequest.target != atomTargets)

+	    {

+	      /* Abort */

+	      fAbort = TRUE;

+	      goto winClipboardFlushXEvents_SelectionRequest_Done;

+	    }

+

+	  /* Handle targets type of request */

+	  if (event.xselectionrequest.target == atomTargets)

+	    {

+	      Atom atomTargetArr[] = {atomTargets,

+				      atomCompoundText,

+				      atomUTF8String,

+				      XA_STRING};

+

+	      /* Try to change the property */

+	      iReturn = XChangeProperty (pDisplay,

+					 event.xselectionrequest.requestor,

+					 event.xselectionrequest.property,

+					 XA_ATOM,

+					 32,

+					 PropModeReplace,

+					 (unsigned char *) atomTargetArr,

+					 (sizeof (atomTargetArr)

+					  / sizeof (atomTargetArr[0])));

+	      if (iReturn == BadAlloc

+		  || iReturn == BadAtom

+		  || iReturn == BadMatch

+		  || iReturn == BadValue

+		  || iReturn == BadWindow)

+		{

+		  ErrorF ("winClipboardFlushXEvents - SelectionRequest - "

+			  "XChangeProperty failed: %d\n",

+			  iReturn);

+		}

+

+	      /* Setup selection notify xevent */

+	      eventSelection.type	= SelectionNotify;

+	      eventSelection.send_event	= True;

+	      eventSelection.display	= pDisplay;

+	      eventSelection.requestor	= event.xselectionrequest.requestor;

+	      eventSelection.selection	= event.xselectionrequest.selection;

+	      eventSelection.target	= event.xselectionrequest.target;

+	      eventSelection.property	= event.xselectionrequest.property;

+	      eventSelection.time	= event.xselectionrequest.time;

+

+	      /*

+	       * Notify the requesting window that

+	       * the operation has completed

+	       */

+	      iReturn = XSendEvent (pDisplay,

+				    eventSelection.requestor,

+				    False,

+				    0L,

+				    (XEvent *) &eventSelection);

+	      if (iReturn == BadValue || iReturn == BadWindow)

+		{

+		  ErrorF ("winClipboardFlushXEvents - SelectionRequest - "

+			  "XSendEvent () failed\n");

+		}

+	      break;

+	    }

+

+	  /* Check that clipboard format is available */

+	  if (fUseUnicode

+	      && !IsClipboardFormatAvailable (CF_UNICODETEXT))

+	    {

+	      static int count; /* Hack to stop acroread spamming the log */

+	      static HWND lasthwnd; /* I've not seen any other client get here repeatedly? */

+	      if (hwnd != lasthwnd) count = 0;

+	      count++;

+	      if (count < 6) ErrorF ("winClipboardFlushXEvents - CF_UNICODETEXT is not "

+		      "available from Win32 clipboard.  Aborting %d.\n", count);

+	      lasthwnd = hwnd;

+

+	      /* Abort */

+	      fAbort = TRUE;

+	      goto winClipboardFlushXEvents_SelectionRequest_Done;

+	    }

+	  else if (!fUseUnicode

+		   && !IsClipboardFormatAvailable (CF_TEXT))

+	    {

+	      ErrorF ("winClipboardFlushXEvents - CF_TEXT is not "

+		      "available from Win32 clipboard.  Aborting.\n");

+

+	      /* Abort */

+	      fAbort = TRUE;

+	      goto winClipboardFlushXEvents_SelectionRequest_Done;

+	    }

+

+	  /* Access the clipboard */

+	  if (!ClipboardOpened)

+	  {

+	    if (!OpenClipboard (hwnd))

+	      {

+	        ErrorF ("winClipboardFlushXEvents - SelectionRequest - "

+		        "OpenClipboard () failed: %08x\n",

+		        GetLastError ());

+

+	        /* Abort */

+	        fAbort = TRUE;

+	         goto winClipboardFlushXEvents_SelectionRequest_Done;

+	      }

+	  

+	    /* Indicate that clipboard was opened */

+	    fCloseClipboard = TRUE;

+	  }

+	  /* Setup the string style */

+	  if (event.xselectionrequest.target == XA_STRING)

+	    xiccesStyle = XStringStyle;

+#ifdef X_HAVE_UTF8_STRING

+	  else if (event.xselectionrequest.target == atomUTF8String)

+	    xiccesStyle = XUTF8StringStyle;

+#endif

+	  else if (event.xselectionrequest.target == atomCompoundText)

+	    xiccesStyle = XCompoundTextStyle;

+	  else

+	    xiccesStyle = XStringStyle;

+

+	  /*

+	   * FIXME: Can't pass CF_UNICODETEXT on Windows 95/98/Me

+	   */

+	  

+	  /* Get a pointer to the clipboard text, in desired format */

+	  if (fUseUnicode)

+	    {

+	      /* Retrieve clipboard data */

+	      hGlobal = GetClipboardData (CF_UNICODETEXT);

+	    }

+	  else

+	    {

+	      /* Retrieve clipboard data */

+	      hGlobal = GetClipboardData (CF_TEXT);

+	    }

+	  if (!hGlobal)

+	    {

+	      if (GetLastError()==ERROR_CLIPBOARD_NOT_OPEN && ClipboardOpened)

+	        {

+		ErrorF("We should not have received a SelectionRequest????\n"

+                        "The owner is the clipboard, but in reality it was"

+                        "an X window\n");

+                /* Set the owner to None */

+		XSetSelectionOwner (pDisplay, XA_PRIMARY, None, CurrentTime);

+		XSetSelectionOwner (pDisplay, XInternAtom (pDisplay, "CLIPBOARD", False), None, CurrentTime);

+	        }

+	        ErrorF ("winClipboardFlushXEvents - SelectionRequest - "

+		      "GetClipboardData () failed: %08x\n",

+		      GetLastError ());

+

+	      /* Abort */

+	      fAbort = TRUE;

+	      goto winClipboardFlushXEvents_SelectionRequest_Done;

+	    }

+	  pszGlobalData = (char *) GlobalLock (hGlobal);

+

+	  /* Convert the Unicode string to UTF8 (MBCS) */

+	  if (fUseUnicode)

+	    {

+	      iConvertDataLen = WideCharToMultiByte (CP_UTF8,

+						     0,

+						     (LPCWSTR)pszGlobalData,

+						     -1,

+						     NULL,

+						     0,

+						     NULL,

+						     NULL);

+	      /* NOTE: iConvertDataLen includes space for null terminator */

+	      pszConvertData = (char *) malloc (iConvertDataLen);

+	      WideCharToMultiByte (CP_UTF8,

+				   0,

+				   (LPCWSTR)pszGlobalData,

+				   -1,

+				   pszConvertData,

+				   iConvertDataLen,

+				   NULL,

+				   NULL);

+	    }

+	  else

+	    {

+	      pszConvertData = strdup (pszGlobalData);

+	      iConvertDataLen = strlen (pszConvertData) + 1;

+	    }

+

+	  /* Convert DOS string to UNIX string */

+	  winClipboardDOStoUNIX (pszConvertData, strlen (pszConvertData));

+

+	  /* Setup our text list */

+	  pszTextList[0] = pszConvertData;

+	  pszTextList[1] = NULL;

+

+	  /* Initialize the text property */

+	  xtpText.value = NULL;

+	  xtpText.nitems = 0;

+

+	  /* Create the text property from the text list */

+	  if (fUseUnicode)

+	    {

+#ifdef X_HAVE_UTF8_STRING

+	      iReturn = Xutf8TextListToTextProperty (pDisplay,

+						     pszTextList,

+						     1,

+						     xiccesStyle,

+						     &xtpText);

+#endif

+	    }

+	  else

+	    {

+	      iReturn = XmbTextListToTextProperty (pDisplay,

+						   pszTextList,

+						   1,

+						   xiccesStyle,

+						   &xtpText);

+	    }

+	  if (iReturn == XNoMemory || iReturn == XLocaleNotSupported)

+	    {

+	      ErrorF ("winClipboardFlushXEvents - SelectionRequest - "

+		      "X*TextListToTextProperty failed: %d\n",

+		      iReturn);

+

+	      /* Abort */

+	      fAbort = TRUE;

+	      goto winClipboardFlushXEvents_SelectionRequest_Done;

+	    }

+	  

+	  /* Free the converted string */

+	  free (pszConvertData);

+	  pszConvertData = NULL;

+

+	  /* Copy the clipboard text to the requesting window */

+	  iReturn = XChangeProperty (pDisplay,

+				     event.xselectionrequest.requestor,

+				     event.xselectionrequest.property,

+				     event.xselectionrequest.target,

+				     8,

+				     PropModeReplace,

+				     xtpText.value,

+				     xtpText.nitems);

+	  if (iReturn == BadAlloc || iReturn == BadAtom

+	      || iReturn == BadMatch || iReturn == BadValue

+	      || iReturn == BadWindow)

+	    {

+	      ErrorF ("winClipboardFlushXEvents - SelectionRequest - "

+		      "XChangeProperty failed: %d\n",

+		      iReturn);

+

+	      /* Abort */

+	      fAbort = TRUE;

+	      goto winClipboardFlushXEvents_SelectionRequest_Done;

+	    }

+

+	  /* Release the clipboard data */

+	  GlobalUnlock (hGlobal);

+	  pszGlobalData = NULL;

+	  if (fCloseClipboard)

+	  {

+	    fCloseClipboard = FALSE;

+	    CloseClipboard ();

+	  }

+	  /* Clean up */

+	  XFree (xtpText.value);

+	  xtpText.value = NULL;

+	  xtpText.nitems = 0;

+

+	  /* Setup selection notify event */

+	  eventSelection.type = SelectionNotify;

+	  eventSelection.send_event = True;

+	  eventSelection.display = pDisplay;

+	  eventSelection.requestor = event.xselectionrequest.requestor;

+	  eventSelection.selection = event.xselectionrequest.selection;

+	  eventSelection.target = event.xselectionrequest.target;

+	  eventSelection.property = event.xselectionrequest.property;

+	  eventSelection.time = event.xselectionrequest.time;

+

+	  /* Notify the requesting window that the operation has completed */

+	  iReturn = XSendEvent (pDisplay,

+				eventSelection.requestor,

+				False,

+				0L,

+				(XEvent *) &eventSelection);

+	  if (iReturn == BadValue || iReturn == BadWindow)

+	    {

+	      ErrorF ("winClipboardFlushXEvents - SelectionRequest - "

+		      "XSendEvent () failed\n");

+

+	      /* Abort */

+	      fAbort = TRUE;

+	      goto winClipboardFlushXEvents_SelectionRequest_Done;

+	    }

+

+	winClipboardFlushXEvents_SelectionRequest_Done:

+	  /* Free allocated resources */

+	  if (xtpText.value)

+	  {

+	    XFree (xtpText.value);

+	    xtpText.value = NULL;

+	    xtpText.nitems = 0;

+	  }

+	  if (pszConvertData)

+	    free (pszConvertData);

+	  if (hGlobal && pszGlobalData)

+	    GlobalUnlock (hGlobal);

+	  

+	  /*

+	   * Send a SelectionNotify event to the requesting

+	   * client when we abort.

+	   */

+	  if (fAbort)

+	    {

+	      /* Setup selection notify event */

+	      eventSelection.type = SelectionNotify;

+	      eventSelection.send_event = True;

+	      eventSelection.display = pDisplay;

+	      eventSelection.requestor = event.xselectionrequest.requestor;

+	      eventSelection.selection = event.xselectionrequest.selection;

+	      eventSelection.target = event.xselectionrequest.target;

+	      eventSelection.property = None;

+	      eventSelection.time = event.xselectionrequest.time;

+

+	      /* Notify the requesting window that the operation is complete */

+	      iReturn = XSendEvent (pDisplay,

+				    eventSelection.requestor,

+				    False,

+				    0L,

+				    (XEvent *) &eventSelection);

+	      if (iReturn == BadValue || iReturn == BadWindow)

+		{

+		  /*

+		   * Should not be a problem if XSendEvent fails because

+		   * the client may simply have exited.

+		   */

+		  ErrorF ("winClipboardFlushXEvents - SelectionRequest - "

+			  "XSendEvent () failed for abort event.\n");

+		}

+	    }

+

+	  /* Close clipboard if it was opened */

+	  if (fCloseClipboard)

+	  {

+	    fCloseClipboard = FALSE;

+	    CloseClipboard ();

+	  }

+	  break;

+

+

+	  /*

+	   * SelectionClear

+	   */ 

+	case SelectionClear:

+#ifdef _DEBUG

+	  winDebug ("winClipboardFlushXEvents - SelectionClear\n");

+	  {

+	    char		*pszAtomName;

+	    

+	    pszAtomName = XGetAtomName (pDisplay,

+					event.xselection.selection);

+

+	    winDebug ("SelectionClear - ATOM: %s\n",

+		    pszAtomName);

+	    winDebug ("SelectionClear - owner %d\n", event.xselectionrequest.owner);

+	    

+	    XFree (pszAtomName);

+	  }

+#endif

+	break;

+

+	  /*

+	   * SelectionNotify

+	   */ 

+	case SelectionNotify:

+#ifdef _DEBUG

+	  winDebug ("winClipboardFlushXEvents - SelectionNotify\n");

+	  {

+	    char		*pszAtomName;

+	    

+	    pszAtomName = XGetAtomName (pDisplay,

+					event.xselection.selection);

+

+	    winDebug ("SelectionNotify - ATOM: %s\n",

+		    pszAtomName);

+	    winDebug ("SelectionNotify - requestor %d\n", event.xselectionrequest.requestor);

+	    

+	    XFree (pszAtomName);

+	  }

+#endif

+

+

+	  /*

+	   * Request conversion of UTF8 and CompoundText targets.

+	   */

+	  if (event.xselection.property == None)

+	    {

+	      if (event.xselection.target == XA_STRING)

+		{

+		  winDebug ("winClipboardFlushXEvents - SelectionNotify - "

+			  "XA_STRING\n");

+		  return WIN_XEVENTS_CONVERT;

+		}

+	      else if (event.xselection.target == atomUTF8String)

+		{

+		  winDebug ("winClipboardFlushXEvents - SelectionNotify - "

+			  "Requesting conversion of UTF8 target.\n");

+		  iReturn = XConvertSelection (pDisplay,

+					       event.xselection.selection,

+					       XA_STRING,

+					       atomLocalProperty,

+					       iWindow,

+					       CurrentTime);

+		  if (iReturn != Success)

+		    {

+		      ErrorF ("winClipboardFlushXEvents - SelectionNotify - "

+			      "XConvertSelection () failed for UTF8String, "

+			      "aborting: %d\n",

+			      iReturn);

+		      break;

+		    }

+

+		  /* Process the ConvertSelection event */

+		  XFlush (pDisplay);

+		  return WIN_XEVENTS_CONVERT;

+		}

+#ifdef X_HAVE_UTF8_STRING

+	      else if (event.xselection.target == atomCompoundText)

+		{

+		  winDebug ("winClipboardFlushXEvents - SelectionNotify - "

+			  "Requesting conversion of CompoundText target.\n");

+		  iReturn = XConvertSelection (pDisplay,

+					       event.xselection.selection,

+					       atomUTF8String,

+					       atomLocalProperty,

+					       iWindow,

+					       CurrentTime);

+		  if (iReturn != Success)

+		    {

+		      ErrorF ("winClipboardFlushXEvents - SelectionNotify - "

+			      "XConvertSelection () failed for CompoundText, "

+			      "aborting: %d\n",

+			      iReturn);

+		      break;

+		    }

+

+		  /* Process the ConvertSelection event */

+		  XFlush (pDisplay);

+		  return WIN_XEVENTS_CONVERT;

+		}

+#endif

+	      else

+		{

+		  ErrorF ("winClipboardFlushXEvents - SelectionNotify - "

+			  "Unknown format.  Cannot request conversion, "

+			  "aborting.\n");

+		  break;

+		}

+	    }

+

+	  /* Retrieve the size of the stored data */

+	  iReturn = XGetWindowProperty (pDisplay,

+					iWindow,

+					atomLocalProperty,

+					0,

+					0, /* Don't get data, just size */

+					False,

+					AnyPropertyType,

+					&xtpText.encoding,

+					&xtpText.format,

+					&xtpText.nitems,

+					&ulReturnBytesLeft,

+					&xtpText.value);

+	  if (iReturn != Success)

+	    {

+	      ErrorF ("winClipboardFlushXEvents - SelectionNotify - "

+		      "XGetWindowProperty () failed, aborting: %d\n",

+		      iReturn);

+	      break;

+	    }

+

+	  winDebug ("SelectionNotify - returned data %d left %d\n",

+		  xtpText.nitems, ulReturnBytesLeft);

+

+	  /* Request the selection data */

+	  iReturn = XGetWindowProperty (pDisplay,

+					iWindow,

+					atomLocalProperty,

+					0,

+					ulReturnBytesLeft,

+					False,

+					AnyPropertyType,

+					&xtpText.encoding,

+					&xtpText.format,

+					&xtpText.nitems,

+					&ulReturnBytesLeft,

+					&xtpText.value);

+	  if (iReturn != Success)

+	    {

+	      ErrorF ("winClipboardFlushXEvents - SelectionNotify - "

+		      "XGetWindowProperty () failed, aborting: %d\n",

+		      iReturn);

+	      break;

+	    }

+

+#ifdef WINDBG

+	    {

+	      char		*pszAtomName = NULL;

+

+	      winDebug ("SelectionNotify - returned data %d left %d\n",

+		      xtpText.nitems, ulReturnBytesLeft);

+	      

+	      pszAtomName = XGetAtomName(pDisplay, xtpText.encoding);

+	      winDebug ("Notify atom name %s\n", pszAtomName);

+	      XFree (pszAtomName);

+	      pszAtomName = NULL;

+	    }

+#endif

+

+	  if (fUseUnicode)

+	    {

+#ifdef X_HAVE_UTF8_STRING

+	      /* Convert the text property to a text list */

+	      iReturn = Xutf8TextPropertyToTextList (pDisplay,

+						     &xtpText,

+						     &ppszTextList,

+						     &iCount);

+#endif

+	    }

+	  else

+	    {

+	      iReturn = XmbTextPropertyToTextList (pDisplay,

+						   &xtpText,

+						   &ppszTextList,

+						   &iCount);

+	    }

+	  if (iReturn == Success || iReturn > 0)

+	    {

+	      /* Conversion succeeded or some unconvertible characters */

+	      if (ppszTextList != NULL)

+		{

+		  iReturnDataLen = 0;

+		  for (i = 0; i < iCount; i++)

+		    {

+		      iReturnDataLen += strlen(ppszTextList[i]);

+		    }

+		  pszReturnData = (char *) malloc (iReturnDataLen + 1);

+		  pszReturnData[0] = '\0';

+		  for (i = 0; i < iCount; i++)

+		    {

+		      strcat (pszReturnData, ppszTextList[i]);

+		    }

+		}

+	      else

+		{

+		  ErrorF ("winClipboardFlushXEvents - SelectionNotify - "

+			  "X*TextPropertyToTextList list_return is NULL.\n");

+		  pszReturnData = (char *) malloc (1);

+		  pszReturnData[0] = '\0';

+		}

+	    }

+	  else

+	    {

+	      ErrorF ("winClipboardFlushXEvents - SelectionNotify - "

+		      "X*TextPropertyToTextList returned: ");

+	      switch (iReturn)

+		{

+		case XNoMemory:

+		  ErrorF ("XNoMemory\n");

+		  break;

+		case XConverterNotFound:

+		  ErrorF ("XConverterNotFound\n");

+		  break;

+		default:

+		  ErrorF ("%d", iReturn);

+		  break;

+		}

+	      pszReturnData = (char *) malloc (1);

+	      pszReturnData[0] = '\0';

+	    }

+

+	  /* Free the data returned from XGetWindowProperty */

+	  if (ppszTextList)

+	    XFreeStringList (ppszTextList);

+	  ppszTextList = NULL;

+	  XFree (xtpText.value);

+	  xtpText.value = NULL;

+	  xtpText.nitems = 0;

+

+	  /* Convert the X clipboard string to DOS format */

+	  winClipboardUNIXtoDOS ((unsigned char **)&pszReturnData, strlen (pszReturnData));

+

+	  if (fUseUnicode)

+	    {

+	      /* Find out how much space needed to convert MBCS to Unicode */

+	      iUnicodeLen = MultiByteToWideChar (CP_UTF8,

+						 0,

+						 pszReturnData,

+						 -1,

+						 NULL,

+						 0);

+

+	      /* Allocate memory for the Unicode string */

+	      pwszUnicodeStr

+		= (wchar_t*) malloc (sizeof (wchar_t) * (iUnicodeLen + 1));

+	      if (!pwszUnicodeStr)

+		{

+		  ErrorF ("winClipboardFlushXEvents - SelectionNotify "

+			  "malloc failed for pwszUnicodeStr, aborting.\n");

+

+		  /* Abort */

+		  fAbort = TRUE;

+		  goto winClipboardFlushXEvents_SelectionNotify_Done;

+		}

+

+	      /* Do the actual conversion */

+	      MultiByteToWideChar (CP_UTF8,

+				   0,

+				   pszReturnData,

+				   -1,

+				   pwszUnicodeStr,

+				   iUnicodeLen);

+	      

+	      /* Allocate global memory for the X clipboard data */

+	      hGlobal = GlobalAlloc (GMEM_MOVEABLE,

+				     sizeof (wchar_t) * (iUnicodeLen + 1));

+	    }

+	  else

+	    {

+	      pszConvertData = strdup (pszReturnData);

+	      iConvertDataLen = strlen (pszConvertData) + 1;

+

+	      /* Allocate global memory for the X clipboard data */

+	      hGlobal = GlobalAlloc (GMEM_MOVEABLE, iConvertDataLen);

+	    }

+

+	  free (pszReturnData);

+

+	  /* Check that global memory was allocated */

+	  if (!hGlobal)

+	    {

+	      ErrorF ("winClipboardFlushXEvents - SelectionNotify "

+		      "GlobalAlloc failed, aborting: %ld\n",

+		      GetLastError ());

+

+	      /* Abort */

+	      fAbort = TRUE;

+	      goto winClipboardFlushXEvents_SelectionNotify_Done;

+	    }

+

+	  /* Obtain a pointer to the global memory */

+	  pszGlobalData = GlobalLock (hGlobal);

+	  if (pszGlobalData == NULL)

+	    {

+	      ErrorF ("winClipboardFlushXEvents - Could not lock global "

+		      "memory for clipboard transfer\n");

+

+	      /* Abort */

+	      fAbort = TRUE;

+	      goto winClipboardFlushXEvents_SelectionNotify_Done;

+	    }

+

+	  /* Copy the returned string into the global memory */

+	  if (fUseUnicode)

+	    {

+	      memcpy (pszGlobalData,

+		      pwszUnicodeStr,

+		      sizeof (wchar_t) * (iUnicodeLen + 1));

+	      free (pwszUnicodeStr);

+	      pwszUnicodeStr = NULL;

+	    }

+	  else

+	    {

+	      strcpy (pszGlobalData, pszConvertData);

+	      free (pszConvertData);

+	      pszConvertData = NULL;

+	    }

+

+	  /* Release the pointer to the global memory */

+	  GlobalUnlock (hGlobal);

+	  pszGlobalData = NULL;

+

+	  /* Push the selection data to the Windows clipboard */

+	  if (fUseUnicode)

+	    SetClipboardData (CF_UNICODETEXT, hGlobal);

+	  else

+	    SetClipboardData (CF_TEXT, hGlobal);

+

+	  /* Flag that SetClipboardData has been called */

+	  fSetClipboardData = FALSE;

+

+	  /*

+	   * NOTE: Do not try to free pszGlobalData, it is owned by

+	   * Windows after the call to SetClipboardData ().

+	   */

+

+	winClipboardFlushXEvents_SelectionNotify_Done:

+	  /* Free allocated resources */

+	  if (ppszTextList)

+	    XFreeStringList (ppszTextList);

+	  if (xtpText.value)

+	  {

+	    XFree (xtpText.value);

+	    xtpText.value = NULL;

+	    xtpText.nitems = 0;

+	  }

+	  if (pszConvertData)

+	    free (pszConvertData);

+	  if (pwszUnicodeStr)

+	    free (pwszUnicodeStr);

+	  if (hGlobal && pszGlobalData)

+	    GlobalUnlock (hGlobal);

+	  if (fSetClipboardData && g_fUnicodeSupport)

+	    SetClipboardData (CF_UNICODETEXT, NULL);

+	  if (fSetClipboardData)

+	    SetClipboardData (CF_TEXT, NULL);

+	  return WIN_XEVENTS_NOTIFY;

+

+	default:

+	  break;

+	}

+    }

+

+  return WIN_XEVENTS_SUCCESS;

+}

diff --git a/xorg-server/hw/xwin/wincmap.c b/xorg-server/hw/xwin/wincmap.c
index 7ebe00244..c077f2235 100644
--- a/xorg-server/hw/xwin/wincmap.c
+++ b/xorg-server/hw/xwin/wincmap.c
@@ -119,17 +119,13 @@ winInstallColormap (ColormapPtr pColormap)
   winScreenPriv(pScreen);
   ColormapPtr		oldpmap = pScreenPriv->pcmapInstalled;
 
-#if CYGDEBUG
   winDebug ("winInstallColormap\n");
-#endif
  
   /* Did the colormap actually change? */
   if (pColormap != oldpmap)
     {
-#if CYGDEBUG
       winDebug ("winInstallColormap - Colormap has changed, attempt "
 	      "to install.\n");
-#endif
       
       /* Was there a previous colormap? */
       if (oldpmap != (ColormapPtr) None)
@@ -145,7 +141,7 @@ winInstallColormap (ColormapPtr pColormap)
       /* Call the engine specific colormap install procedure */
       if (!((*pScreenPriv->pwinInstallColormap) (pColormap)))
 	{
-	  winErrorFVerb (2, "winInstallColormap - Screen specific colormap install "
+	  ErrorF ("winInstallColormap - Screen specific colormap install "
 		  "procedure failed.  Continuing, but colors may be "
 		  "messed up from now on.\n");
 	}
@@ -163,9 +159,7 @@ winUninstallColormap (ColormapPtr pmap)
   winScreenPriv(pmap->pScreen);
   ColormapPtr curpmap = pScreenPriv->pcmapInstalled;
 
-#if CYGDEBUG
   winDebug ("winUninstallColormap\n");
-#endif
 
   /* Is the colormap currently installed? */
   if (pmap != curpmap)
@@ -204,7 +198,7 @@ winStoreColors (ColormapPtr pmap,
   int			i;
   unsigned short	nRed, nGreen, nBlue;
 
-#if CYGDEBUG
+#ifdef WINDBG
   if (ndef != 1)
     winDebug ("winStoreColors - ndef: %d\n",
 	    ndef);
@@ -228,16 +222,14 @@ winStoreColors (ColormapPtr pmap,
       pCmapPriv->rgbColors[pdefs[0].pixel + i].rgbGreen = nGreen;
       pCmapPriv->rgbColors[pdefs[0].pixel + i].rgbBlue = nBlue;
 
-#if CYGDEBUG
       winDebug ("winStoreColors - nRed %d nGreen %d nBlue %d\n",
 	      nRed, nGreen, nBlue);
-#endif
     }
 
   /* Call the engine specific store colors procedure */
   if (!((pScreenPriv->pwinStoreColors) (pmap, ndef, pdefs)))
     {
-      winErrorFVerb (2, "winStoreColors - Engine cpecific color storage procedure "
+      ErrorF ("winStoreColors - Engine cpecific color storage procedure "
 	      "failed.  Continuing, but colors may be messed up from now "
 	      "on.\n");
     }
@@ -251,9 +243,7 @@ winResolveColor (unsigned short *pred,
 		 unsigned short *pblue,
 		 VisualPtr	pVisual)
 {
-#if CYGDEBUG
   winDebug ("winResolveColor ()\n");
-#endif
 
   miResolveColor (pred, pgreen, pblue, pVisual);
 }
@@ -267,9 +257,7 @@ winCreateColormap (ColormapPtr pmap)
   ScreenPtr		pScreen = pmap->pScreen;
   winScreenPriv(pScreen);
 
-#if CYGDEBUG
   winDebug ("winCreateColormap\n");
-#endif
 
   /* Allocate colormap privates */
   if (!winAllocateCmapPrivates (pmap))
@@ -319,7 +307,7 @@ winDestroyColormap (ColormapPtr pColormap)
   /* Call the engine specific colormap destruction procedure */
   if (!((*pScreenPriv->pwinDestroyColormap) (pColormap)))
     {
-      winErrorFVerb (2, "winDestroyColormap - Engine specific colormap destruction "
+      ErrorF ("winDestroyColormap - Engine specific colormap destruction "
 	      "procedure failed.  Continuing, but it is possible that memory "
 	      "was leaked, or that colors will be messed up from now on.\n");
     }
@@ -328,9 +316,7 @@ winDestroyColormap (ColormapPtr pColormap)
   free (pCmapPriv);
   winSetCmapPriv (pColormap, NULL);
 
-#if CYGDEBUG
   winDebug ("winDestroyColormap - Returning\n");
-#endif
 }
 
 
@@ -359,10 +345,8 @@ winGetPaletteDIB (ScreenPtr pScreen, ColormapPtr pcmap)
       return FALSE;
     }
 
-#if CYGDEBUG
   winDebug ("winGetPaletteDIB - Retrieved %d colors from DIB\n",
 	  uiColorsRetrieved);
-#endif
 
   /* Set the DIB color table to the default screen palette */
   if (SetDIBColorTable (pScreenPriv->hdcShadow,
@@ -384,11 +368,9 @@ winGetPaletteDIB (ScreenPtr pScreen, ColormapPtr pcmap)
       nGreen = rgbColors[i].rgbGreen << 8;
       nBlue = rgbColors[i].rgbBlue << 8;
 
-#if CYGDEBUG
       winDebug ("winGetPaletteDIB - Allocating a color: %d; "
 	      "%d %d %d\n",
 	      pixel, nRed, nGreen, nBlue);
-#endif
 
       /* Allocate a entry in the X colormap */
       if (AllocColor (pcmap,
@@ -460,10 +442,8 @@ winGetPaletteDD (ScreenPtr pScreen, ColormapPtr pcmap)
       return FALSE;
     }
 
-#if CYGDEBUG
   winDebug ("winGetPaletteDD - uiSystemPaletteEntries %d\n",
 	  uiSystemPaletteEntries);
-#endif
   
   /* Allocate palette entries structure */
   ppeColors = malloc (uiSystemPaletteEntries * sizeof (PALETTEENTRY));
@@ -486,11 +466,9 @@ winGetPaletteDD (ScreenPtr pScreen, ColormapPtr pcmap)
       nRed = ppeColors[i].peRed << 8;
       nGreen = ppeColors[i].peGreen << 8;
       nBlue = ppeColors[i].peBlue << 8;
-#if CYGDEBUG
       winDebug ("winGetPaletteDD - Allocating a color: %d; "
 	      "%d %d %d\n",
 	      pixel, nRed, nGreen, nBlue);
-#endif
       if (AllocColor (pcmap,
 		      &nRed,
 		      &nGreen,
@@ -548,9 +526,7 @@ winCreateDefColormap (ScreenPtr pScreen)
   ColormapPtr		pcmap = NULL;
   Pixel			wp, bp;
 
-#if CYGDEBUG
   winDebug ("winCreateDefColormap\n");
-#endif
 
   /* Use standard fb colormaps for non palettized color modes */
   if (pScreenInfo->dwBPP > 8)
@@ -570,10 +546,8 @@ winCreateDefColormap (ScreenPtr pScreen)
    * to be changed by clients.
    */
 
-#if CYGDEBUG
   winDebug ("winCreateDefColormap - defColormap: %d\n",
 	  pScreen->defColormap);
-#endif
 
   /* Allocate an X colormap, owned by client 0 */
   if (CreateColormap (pScreen->defColormap, 
@@ -592,9 +566,7 @@ winCreateDefColormap (ScreenPtr pScreen)
       return FALSE;
     }
 
-#if CYGDEBUG
   winDebug ("winCreateDefColormap - Created a colormap\n");
-#endif
 
   /* Branch on the visual class */
   if (!(pVisual->class & DynamicClass))
@@ -639,36 +611,12 @@ winCreateDefColormap (ScreenPtr pScreen)
       pScreen->whitePixel = wp;
       pScreen->blackPixel = bp;
 
-#if 0
-      /* Have to reserve first 10 and last ten pixels in DirectDraw windowed */
-      if (pScreenInfo->dwEngine != WIN_SERVER_SHADOW_GDI)
-	{
-	  int		k;
-	  Pixel		p;
-
-	  for (k = 1; k < 10; ++k)
-	    {
-	      p = k;
-	      if (AllocColor (pcmap, &ones, &ones, &ones, &p, 0) != Success)
-		FatalError ("Foo!\n");
-	    }
-	  
-	  for (k = 245; k < 255; ++k)
-	    {
-	      p = k;
-	      if (AllocColor (pcmap, &zero, &zero, &zero, &p, 0) != Success)
-		FatalError ("Baz!\n");
-	    }
-	}
-#endif
     }
 
   /* Install the created colormap */
   (*pScreen->InstallColormap)(pcmap);
 
-#if CYGDEBUG
   winDebug ("winCreateDefColormap - Returning\n");
-#endif
 
   return TRUE;
 }
diff --git a/xorg-server/hw/xwin/winconfig.c b/xorg-server/hw/xwin/winconfig.c
index 3e1908c90..0350e968b 100644
--- a/xorg-server/hw/xwin/winconfig.c
+++ b/xorg-server/hw/xwin/winconfig.c
@@ -129,11 +129,11 @@ winReadConfigfile ()
 
   if (filename)
     {
-      winMsg (from, "Using config file: \"%s\"\n", filename);
+      winDebug ("Using config file: \"%s\"\n", filename);
     }
   else
     {
-      winMsg (X_ERROR, "Unable to locate/open config file");
+      ErrorF ("Unable to locate/open config file");
       if (xf86ConfigFile)
 	ErrorF (": \"%s\"", xf86ConfigFile);
       ErrorF ("\n");
@@ -141,7 +141,7 @@ winReadConfigfile ()
     }
   if ((g_xf86configptr = xf86readConfigFile ()) == NULL)
     {
-      winMsg (X_ERROR, "Problem parsing the config file\n");
+      ErrorF ("Problem parsing the config file\n");
       return FALSE;
     }
   xf86closeConfigFile ();
@@ -154,13 +154,12 @@ winReadConfigfile ()
     {
       if (g_cmdline.screenname == NULL)
 	{
-	  winMsg (X_WARNING,
-		  "No Layout section. Using the first Screen section.\n");
+	  winDebug ("No Layout section. Using the first Screen section.\n");
 	}
       if (!configImpliedLayout (&g_winConfigLayout,
 				g_xf86configptr->conf_screen_lst))
 	{
-	  winMsg (X_ERROR, "Unable to determine the screen layout\n");
+	  ErrorF ("Unable to determine the screen layout\n");
 	  return FALSE;
 	}
     }
@@ -180,7 +179,7 @@ winReadConfigfile ()
 			     g_xf86configptr->conf_layout_lst,
 			     dfltlayout))
 	    {
-	      winMsg (X_ERROR, "Unable to determine the screen layout\n");
+	      ErrorF ("Unable to determine the screen layout\n");
 	      return FALSE;
 	    }
 	}
@@ -190,7 +189,7 @@ winReadConfigfile ()
 			     g_xf86configptr->conf_layout_lst,
 			     NULL))
 	    {
-	      winMsg (X_ERROR, "Unable to determine the screen layout\n");
+	      ErrorF ("Unable to determine the screen layout\n");
 	      return FALSE;
 	    }
 	}
@@ -241,7 +240,7 @@ winConfigKeyboard (DeviceIntPtr pDevice)
             case 3:  g_winInfo.keyboard.delay = 1000; break;
           }
         g_winInfo.keyboard.rate = (kbd_speed>0)?kbd_speed:1;
-        winMsgVerb(X_PROBED, 1, "Setting autorepeat to delay=%d, rate=%d\n",
+        winDebug("Setting autorepeat to delay=%d, rate=%d\n",
                 g_winInfo.keyboard.delay, g_winInfo.keyboard.rate);
       }
   }
@@ -267,12 +266,12 @@ winConfigKeyboard (DeviceIntPtr pDevice)
 	       such as the lack of WM_KEYUP for Caps Lock key.
 	       Loading US layout fixes this problem. */
 	    if (LoadKeyboardLayout("00000409", KLF_ACTIVATE) != NULL)
-	      winMsg (X_INFO, "Loading US keyboard layout.\n");
+	      winDebug("Loading US keyboard layout.\n");
 	    else
-	      winMsg (X_ERROR, "LoadKeyboardLaout failed.\n");
+	      ErrorF ("LoadKeyboardLaout failed.\n");
 	  }
     }
-    winMsg (X_PROBED, "winConfigKeyboard - Layout: \"%s\" (%08x) \n", 
+    winDebug ("winConfigKeyboard - Layout: \"%s\" (%08x) \n", 
             layoutName, layoutNum);
 
     for (pLayout = winKBLayouts; pLayout->winlayout != -1; pLayout++)
@@ -283,9 +282,8 @@ winConfigKeyboard (DeviceIntPtr pDevice)
 	  continue;
 	
         bfound = TRUE;
-	winMsg (X_PROBED,
-		"Using preset keyboard for \"%s\" (%x), type \"%d\"\n",
-		pLayout->layoutname, pLayout->winlayout, keyboardType);
+	winDebug ("Using preset keyboard for \"%s\" (%x), type \"%d\"\n",
+		  pLayout->layoutname, pLayout->winlayout, keyboardType);
 	
 	g_winInfo.xkb.model = pLayout->xkbmodel;
 	g_winInfo.xkb.layout = pLayout->xkblayout;
@@ -310,8 +308,7 @@ winConfigKeyboard (DeviceIntPtr pDevice)
         if (!RegOpenKey(HKEY_LOCAL_MACHINE, regpath, &regkey) &&
           !RegQueryValueEx(regkey, "Layout Text", 0, NULL, lname, &namesize))
           {
-	    winMsg (X_ERROR,
-		"Keyboardlayout \"%s\" (%s) is unknown\n", lname, layoutName);
+	    ErrorF ("Keyboardlayout \"%s\" (%s) is unknown\n", lname, layoutName);
           }
 
 	/* Close registry key */
@@ -351,7 +348,7 @@ winConfigKeyboard (DeviceIntPtr pDevice)
     {
 
       if (kbd->inp_identifier)
-	winMsg (kbdfrom, "Using keyboard \"%s\" as primary keyboard\n",
+	winDebug ("Using keyboard \"%s\" as primary keyboard\n",
 		kbd->inp_identifier);
 
       if ((s = winSetStrOption(kbd->inp_option_lst, "AutoRepeat", NULL)))
@@ -362,12 +359,12 @@ winConfigKeyboard (DeviceIntPtr pDevice)
                   (g_winInfo.keyboard.rate == 0) || 
                   (1000 / g_winInfo.keyboard.rate) < 1) 
             {
-              winErrorFVerb (2, "\"%s\" is not a valid AutoRepeat value", s);
+              ErrorF ("\"%s\" is not a valid AutoRepeat value", s);
               xfree(s);
               return FALSE;
             }
           xfree(s);
-          winMsg (X_CONFIG, "AutoRepeat: %ld %ld\n", 
+          winDebug ("AutoRepeat: %ld %ld\n", 
                   g_winInfo.keyboard.delay, g_winInfo.keyboard.rate);
         }
 #endif
@@ -388,7 +385,7 @@ winConfigKeyboard (DeviceIntPtr pDevice)
         if (s)
           {
             g_winInfo.xkb.rules = NULL_IF_EMPTY (s);
-            winMsg (from, "XKB: rules: \"%s\"\n", s);
+            winDebug ("XKB: rules: \"%s\"\n", s);
 	  }
           
         s = NULL;
@@ -407,7 +404,7 @@ winConfigKeyboard (DeviceIntPtr pDevice)
         if (s)
 	  {
 	    g_winInfo.xkb.model = NULL_IF_EMPTY (s);
-	    winMsg (from, "XKB: model: \"%s\"\n", s);
+	    winDebug ("XKB: model: \"%s\"\n", s);
 	  }
 
         s = NULL;
@@ -426,7 +423,7 @@ winConfigKeyboard (DeviceIntPtr pDevice)
         if (s)
           {
 	    g_winInfo.xkb.layout = NULL_IF_EMPTY (s);
-	    winMsg (from, "XKB: layout: \"%s\"\n", s);
+	    winDebug ("XKB: layout: \"%s\"\n", s);
 	  }
 
         s = NULL;
@@ -445,7 +442,7 @@ winConfigKeyboard (DeviceIntPtr pDevice)
 	if (s)
 	  {
 	    g_winInfo.xkb.variant = NULL_IF_EMPTY (s);
-	    winMsg (from, "XKB: variant: \"%s\"\n", s);
+	    winDebug ("XKB: variant: \"%s\"\n", s);
 	  }
 
         s = NULL;
@@ -464,7 +461,7 @@ winConfigKeyboard (DeviceIntPtr pDevice)
         if (s)
 	  {
 	    g_winInfo.xkb.options = NULL_IF_EMPTY (s);
-	    winMsg (from, "XKB: options: \"%s\"\n", s);
+	    winDebug ("XKB: options: \"%s\"\n", s);
 	  }
 
 #ifdef XWIN_XF86CONFIG
@@ -506,7 +503,7 @@ winConfigMouse (DeviceIntPtr pDevice)
   if (mouse != NULL)
     {
       if (mouse->inp_identifier)
-	winMsg (mousefrom, "Using pointer \"%s\" as primary pointer\n",
+	winDebug ("Using pointer \"%s\" as primary pointer\n",
 		mouse->inp_identifier);
 
       g_winInfo.pointer.emulate3Buttons =
@@ -521,8 +518,8 @@ winConfigMouse (DeviceIntPtr pDevice)
     }
   else
     {
-      winMsg (X_ERROR, "No primary pointer configured\n");
-      winMsg (X_DEFAULT, "Using compiletime defaults for pointer\n");
+      winDebug ("No primary pointer configured\n");
+      winDebug ("Using compiletime defaults for pointer\n");
     }
 
   return TRUE;
@@ -555,7 +552,7 @@ winConfigFiles ()
       from = X_CONFIG;
       defaultFontPath = xstrdup (filesptr->file_fontpath);
     }
-  winMsg (from, "FontPath set to \"%s\"\n", defaultFontPath);
+  winDebug ("FontPath set to \"%s\"\n", defaultFontPath);
 
   return TRUE;
 }
@@ -567,7 +564,7 @@ winConfigFiles (void)
   if (g_cmdline.fontPath)
     {
       defaultFontPath = g_cmdline.fontPath;
-      winMsg (X_CMDLINE, "FontPath set to \"%s\"\n", defaultFontPath);
+      winDebug("FontPath set to \"%s\"\n", defaultFontPath);
     }
 
   return TRUE;
@@ -747,8 +744,7 @@ ParseOptionValue (int scrnIndex, pointer options, OptionInfoPtr p)
 	case OPTV_INTEGER:
 	  if (*s == '\0')
 	    {
-	      winDrvMsg (scrnIndex, X_WARNING,
-			 "Option \"%s\" requires an integer value\n",
+	      winDebug ( "Option \"%s\" requires an integer value\n",
 			 p->name);
 	      p->found = FALSE;
 	    }
@@ -761,8 +757,7 @@ ParseOptionValue (int scrnIndex, pointer options, OptionInfoPtr p)
 		}
 	      else
 		{
-		  winDrvMsg (scrnIndex, X_WARNING,
-			     "Option \"%s\" requires an integer value\n",
+		  winDebug ( "Option \"%s\" requires an integer value\n",
 			     p->name);
 		  p->found = FALSE;
 		}
@@ -771,8 +766,7 @@ ParseOptionValue (int scrnIndex, pointer options, OptionInfoPtr p)
 	case OPTV_STRING:
 	  if (*s == '\0')
 	    {
-	      winDrvMsg (scrnIndex, X_WARNING,
-			 "Option \"%s\" requires an string value\n", p->name);
+	      winDebug ( "Option \"%s\" requires an string value\n", p->name);
 	      p->found = FALSE;
 	    }
 	  else
@@ -788,8 +782,7 @@ ParseOptionValue (int scrnIndex, pointer options, OptionInfoPtr p)
 	case OPTV_REAL:
 	  if (*s == '\0')
 	    {
-	      winDrvMsg (scrnIndex, X_WARNING,
-			 "Option \"%s\" requires a floating point value\n",
+	      winDebug ( "Option \"%s\" requires a floating point value\n",
 			 p->name);
 	      p->found = FALSE;
 	    }
@@ -802,8 +795,7 @@ ParseOptionValue (int scrnIndex, pointer options, OptionInfoPtr p)
 		}
 	      else
 		{
-		  winDrvMsg (scrnIndex, X_WARNING,
-			     "Option \"%s\" requires a floating point value\n",
+		  winDebug ( "Option \"%s\" requires a floating point value\n",
 			     p->name);
 		  p->found = FALSE;
 		}
@@ -816,16 +808,14 @@ ParseOptionValue (int scrnIndex, pointer options, OptionInfoPtr p)
 	    }
 	  else
 	    {
-	      winDrvMsg (scrnIndex, X_WARNING,
-			 "Option \"%s\" requires a boolean value\n", p->name);
+	      winDebug ( "Option \"%s\" requires a boolean value\n", p->name);
 	      p->found = FALSE;
 	    }
 	  break;
 	case OPTV_FREQ:
 	  if (*s == '\0')
 	    {
-	      winDrvMsg (scrnIndex, X_WARNING,
-			 "Option \"%s\" requires a frequency value\n",
+	      winDebug ( "Option \"%s\" requires a frequency value\n",
 			 p->name);
 	      p->found = FALSE;
 	    }
@@ -847,8 +837,7 @@ ParseOptionValue (int scrnIndex, pointer options, OptionInfoPtr p)
 		    units = 1000000;
 		  else
 		    {
-		      winDrvMsg (scrnIndex, X_WARNING,
-				 "Option \"%s\" requires a frequency value\n",
+		      winDebug ( "Option \"%s\" requires a frequency value\n",
 				 p->name);
 		      p->found = FALSE;
 		    }
@@ -857,8 +846,7 @@ ParseOptionValue (int scrnIndex, pointer options, OptionInfoPtr p)
 		}
 	      else
 		{
-		  winDrvMsg (scrnIndex, X_WARNING,
-			     "Option \"%s\" requires a frequency value\n",
+		  winDebug ( "Option \"%s\" requires a frequency value\n",
 			     p->name);
 		  p->found = FALSE;
 		}
@@ -876,12 +864,12 @@ ParseOptionValue (int scrnIndex, pointer options, OptionInfoPtr p)
 	}
       if (p->found)
 	{
-	  winDrvMsgVerb (scrnIndex, X_CONFIG, 2, "Option \"%s\"", p->name);
+	  winDebug ("Option \"%s\"", p->name);
 	  if (!(p->type == OPTV_BOOLEAN && *s == 0))
 	    {
-	      winErrorFVerb (2, " \"%s\"", s);
+	      winDebug (" \"%s\"", s);
 	    }
-	  winErrorFVerb (2, "\n");
+	  winDebug ("\n");
 	}
     }
   else if (p->type == OPTV_BOOLEAN)
@@ -922,8 +910,7 @@ ParseOptionValue (int scrnIndex, pointer options, OptionInfoPtr p)
 	    }
 	  else
 	    {
-	      winDrvMsg (scrnIndex, X_WARNING,
-			 "Option \"%s\" requires a boolean value\n", newn);
+	      winDebug ( "Option \"%s\" requires a boolean value\n", newn);
 	      p->found = FALSE;
 	    }
 	}
@@ -933,12 +920,12 @@ ParseOptionValue (int scrnIndex, pointer options, OptionInfoPtr p)
 	}
       if (p->found)
 	{
-	  winDrvMsgVerb (scrnIndex, X_CONFIG, 2, "Option \"%s\"", newn);
+	  winDebug ("Option \"%s\"", newn);
 	  if (*s != 0)
 	    {
-	      winErrorFVerb (2, " \"%s\"", s);
+	      winDebug (" \"%s\"", s);
 	    }
-	  winErrorFVerb (2, "\n");
+	  winDebug ("\n");
 	}
       free (n);
     }
diff --git a/xorg-server/hw/xwin/wincreatewnd.c b/xorg-server/hw/xwin/wincreatewnd.c
index 0c342e1ae..b684922aa 100644
--- a/xorg-server/hw/xwin/wincreatewnd.c
+++ b/xorg-server/hw/xwin/wincreatewnd.c
@@ -66,9 +66,7 @@ winCreateBoundingWindowFullScreen (ScreenPtr pScreen)
   WNDCLASSEX		wc;
   char			szTitle[256];
 
-#if CYGDEBUG
   winDebug ("winCreateBoundingWindowFullScreen\n");
-#endif
 
   /* Setup our window class */
   wc.cbSize=sizeof(WNDCLASSEX);
@@ -95,13 +93,17 @@ winCreateBoundingWindowFullScreen (ScreenPtr pScreen)
 	    g_pszQueryHost,
 	    display,
 	    (int) pScreenInfo->dwScreen);
-  else    
+  else
+  {
+    char HostName[256];
+    gethostname(HostName,256);
     snprintf (szTitle,
 	    sizeof (szTitle),
 	    WINDOW_TITLE,
+	    HostName,
 	    display, 
 	    (int) pScreenInfo->dwScreen);
-
+  }
   /* Create the window */
   *phwnd = CreateWindowExA (0,			/* Extended styles */
 			    WINDOW_CLASS,	/* Class name */
@@ -237,10 +239,8 @@ winCreateBoundingWindowWindowed (ScreenPtr pScreen)
   if (pScreenInfo->fUserGaveHeightAndWidth)
     {
       /* User gave a desired height and width, try to accomodate */
-#if CYGDEBUG
       winDebug ("winCreateBoundingWindowWindowed - User gave height "
 	      "and width\n");
-#endif
       
       /* Adjust the window width and height for borders and title bar */
       if (pScreenInfo->fDecoration
@@ -253,16 +253,12 @@ winCreateBoundingWindowWindowed (ScreenPtr pScreen)
 #endif
 	  )
 	{
-#if CYGDEBUG
 	  winDebug ("winCreateBoundingWindowWindowed - Window has decoration\n");
-#endif
 	  /* Are we using scrollbars? */
 	  if (pScreenInfo->fScrollbars)
 	    {
-#if CYGDEBUG
 	      winDebug ("winCreateBoundingWindowWindowed - Window has "
 		      "scrollbars\n");
-#endif
 
 	      iWidth += 2 * GetSystemMetrics (SM_CXSIZEFRAME);
 	      iHeight += 2 * GetSystemMetrics (SM_CYSIZEFRAME) 
@@ -270,10 +266,8 @@ winCreateBoundingWindowWindowed (ScreenPtr pScreen)
 	    }
 	  else
 	    {
-#if CYGDEBUG
 	      winDebug ("winCreateBoundingWindowWindowed - Window does not have "
 		      "scrollbars\n");
-#endif
 
 	      iWidth += 2 * GetSystemMetrics (SM_CXFIXEDFRAME);
 	      iHeight += 2 * GetSystemMetrics (SM_CYFIXEDFRAME) 
@@ -284,10 +278,8 @@ winCreateBoundingWindowWindowed (ScreenPtr pScreen)
   else
     {
       /* By default, we are creating a window that is as large as possible */
-#if CYGDEBUG
       winDebug ("winCreateBoundingWindowWindowed - User did not give "
 	      "height and width\n");
-#endif
       /* Defaults are wrong if we have multiple monitors */
       if (pScreenInfo->fMultipleMonitors)
 	{
@@ -329,11 +321,9 @@ winCreateBoundingWindowWindowed (ScreenPtr pScreen)
       if (iHeight >= (rcWorkArea.bottom - rcWorkArea.top))
         iHeight = rcWorkArea.bottom - rcWorkArea.top;
   
-#if CYGDEBUG
       winDebug ("winCreateBoundingWindowWindowed - Adjusted width: %d "\
 	      "height: %d\n",
     	  iWidth, iHeight);
-#endif
     }
 
   /* Set display and screen-specific tooltip text */
@@ -344,12 +334,17 @@ winCreateBoundingWindowWindowed (ScreenPtr pScreen)
 	    g_pszQueryHost,
 	    display,
 	    (int) pScreenInfo->dwScreen);
-  else    
+  else
+  {
+    char HostName[256];
+    gethostname(HostName,256);
     snprintf (szTitle,
 	    sizeof (szTitle),
 	    WINDOW_TITLE,
+	    HostName,
 	    display, 
 	    (int) pScreenInfo->dwScreen);
+  }
 
   /* Create the window */
   *phwnd = CreateWindowExA (0,			/* Extended styles */
@@ -370,9 +365,7 @@ winCreateBoundingWindowWindowed (ScreenPtr pScreen)
       return FALSE;
     }
 
-#if CYGDEBUG
   winDebug ("winCreateBoundingWindowWindowed - CreateWindowEx () returned\n");
-#endif
 
   if (fForceShowWindow)
   {
diff --git a/xorg-server/hw/xwin/wincursor.c b/xorg-server/hw/xwin/wincursor.c
index ce98162ef..32ee560df 100644
--- a/xorg-server/hw/xwin/wincursor.c
+++ b/xorg-server/hw/xwin/wincursor.c
@@ -45,10 +45,9 @@ extern Bool	g_fSoftwareCursor;
 
 #define BRIGHTNESS(x) (x##Red * 0.299 + x##Green * 0.587 + x##Blue * 0.114)
 
-#if 0
-# define WIN_DEBUG_MSG winDebug
-#else
-# define WIN_DEBUG_MSG(...)
+#ifdef _MSC_VER
+#define min(a,b) (((a) < (b)) ? (a) : (b))
+#define max(a,b) (((a) > (b)) ? (a) : (b))
 #endif
 
 /*
@@ -87,7 +86,7 @@ winPointerWarpCursor (DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y)
       /* Don't ignore subsequent warps */
       s_fInitialWarp = FALSE;
 
-      winErrorFVerb (2, "winPointerWarpCursor - Discarding first warp: %d %d\n",
+      winDebug ("winPointerWarpCursor - Discarding first warp: %d %d\n",
 	      x, y);
       
       return;
@@ -172,7 +171,7 @@ winLoadCursor (ScreenPtr pScreen, CursorPtr pCursor, int screen)
   BITMAPINFO *pbmi;
   unsigned long *lpBits;
 
-  WIN_DEBUG_MSG("winLoadCursor: Win32: %dx%d X11: %dx%d hotspot: %d,%d\n", 
+  winDebug("winLoadCursor: Win32: %dx%d X11: %dx%d hotspot: %d,%d\n", 
           pScreenPriv->cursor.sm_cx, pScreenPriv->cursor.sm_cy,
           pCursor->bits->width, pCursor->bits->height,
           pCursor->bits->xhot, pCursor->bits->yhot
@@ -188,7 +187,7 @@ winLoadCursor (ScreenPtr pScreen, CursorPtr pCursor, int screen)
   if (pScreenPriv->cursor.sm_cx < pCursor->bits->width || 
       pScreenPriv->cursor.sm_cy < pCursor->bits->height)
     {
-      winErrorFVerb (2, "winLoadCursor - Windows requires %dx%d cursor\n"
+      ErrorF ("winLoadCursor - Windows requires %dx%d cursor\n"
 	      "\tbut X requires %dx%d\n",
 	      pScreenPriv->cursor.sm_cx, pScreenPriv->cursor.sm_cy,
 	      pCursor->bits->width, pCursor->bits->height);
@@ -251,7 +250,7 @@ winLoadCursor (ScreenPtr pScreen, CursorPtr pCursor, int screen)
   /* We have a truecolor alpha-blended cursor and can use it! */
   if (pCursor->bits->argb) 
     {
-      WIN_DEBUG_MSG("winLoadCursor: Trying truecolor alphablended cursor\n"); 
+      winDebug("winLoadCursor: Trying truecolor alphablended cursor\n"); 
       memset (&bi, 0, sizeof (BITMAPV4HEADER));
       bi.bV4Size = sizeof(BITMAPV4HEADER);
       bi.bV4Width = pScreenPriv->cursor.sm_cx;
@@ -282,7 +281,7 @@ winLoadCursor (ScreenPtr pScreen, CursorPtr pCursor, int screen)
   if (!lpBits)
     {
       /* Bicolor, use a palettized DIB */
-      WIN_DEBUG_MSG("winLoadCursor: Trying two color cursor\n"); 
+      winDebug("winLoadCursor: Trying two color cursor\n"); 
       pbmi = (BITMAPINFO*)&bi;
       memset (pbmi, 0, sizeof (BITMAPINFOHEADER));
       pbmi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER);
@@ -346,7 +345,7 @@ winLoadCursor (ScreenPtr pScreen, CursorPtr pCursor, int screen)
   /* If one of the previous two methods gave us the bitmap we need, make a cursor */
   if (lpBits)
     {
-      WIN_DEBUG_MSG("winLoadCursor: Creating bitmap cursor: hotspot %d,%d\n",
+      winDebug("winLoadCursor: Creating bitmap cursor: hotspot %d,%d\n",
               pCursor->bits->xhot, pCursor->bits->yhot);
 
       hAnd = NULL;
@@ -374,14 +373,14 @@ winLoadCursor (ScreenPtr pScreen, CursorPtr pCursor, int screen)
 	  hCursor = (HCURSOR) CreateIconIndirect( &ii );
 
 	  if (hCursor == NULL)
-	    winW32Error(2, "winLoadCursor - CreateIconIndirect failed:");
+	    winW32Error("winLoadCursor - CreateIconIndirect failed:");
 	  else 
 	    {
 	      if (GetIconInfo(hCursor, &ii))
 		{
 		  if (ii.fIcon)
 		    {
-		      WIN_DEBUG_MSG("winLoadCursor: CreateIconIndirect returned  no cursor. Trying again.\n");
+		      winDebug("winLoadCursor: CreateIconIndirect returned  no cursor. Trying again.\n");
 		      
 		      DestroyCursor(hCursor);
 		      
@@ -391,7 +390,7 @@ winLoadCursor (ScreenPtr pScreen, CursorPtr pCursor, int screen)
 		      hCursor = (HCURSOR) CreateIconIndirect( &ii );
 		      
 		      if (hCursor == NULL)
-			winW32Error(2, "winLoadCursor - CreateIconIndirect failed:");
+			winW32Error("winLoadCursor - CreateIconIndirect failed:");
 		    }
 		  /* GetIconInfo creates new bitmaps. Destroy them again */
 		  if (ii.hbmMask)
@@ -417,7 +416,7 @@ winLoadCursor (ScreenPtr pScreen, CursorPtr pCursor, int screen)
 			      pScreenPriv->cursor.sm_cx, pScreenPriv->cursor.sm_cy,
 			      pAnd, pXor);
       if (hCursor == NULL)
-	winW32Error(2, "winLoadCursor - CreateCursor failed:");
+	winW32Error("winLoadCursor - CreateCursor failed:");
     }
   free (pAnd);
   free (pXor);
@@ -472,7 +471,7 @@ winSetCursor (DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCursor, int x, in
   RECT  rcClient;
   BOOL  bInhibit;
   winScreenPriv(pScreen);
-  WIN_DEBUG_MSG("winSetCursor: cursor=%p\n", pCursor); 
+  winDebug("winSetCursor: cursor=%p\n", pCursor); 
   
   /* Inhibit changing the cursor if the mouse is not in a client area */
   bInhibit = FALSE;
@@ -523,7 +522,7 @@ winSetCursor (DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCursor, int x, in
 	}
       pScreenPriv->cursor.handle =
 	winLoadCursor (pScreen, pCursor, pScreen->myNum);
-      WIN_DEBUG_MSG("winSetCursor: handle=%p\n", pScreenPriv->cursor.handle); 
+      winDebug("winSetCursor: handle=%p\n", pScreenPriv->cursor.handle); 
 
       if (!bInhibit)
 	SetCursor (pScreenPriv->cursor.handle);
@@ -558,7 +557,7 @@ static void
 winDeviceCursorCleanup(DeviceIntPtr pDev, ScreenPtr pScr)
 {
   winScreenPriv(pScr);
-  return pScreenPriv->cursor.spriteFuncs->DeviceCursorCleanup(pDev, pScr);
+  pScreenPriv->cursor.spriteFuncs->DeviceCursorCleanup(pDev, pScr);
 }
 
 static miPointerSpriteFuncRec winSpriteFuncsRec = {
@@ -617,9 +616,11 @@ winInitCursor (ScreenPtr pScreen)
   pPointPriv = (miPointerScreenPtr)
       dixLookupPrivate(&pScreen->devPrivates, miPointerScreenKey);
   
+  if (pPointPriv)
+  {
   pScreenPriv->cursor.spriteFuncs = pPointPriv->spriteFuncs;
   pPointPriv->spriteFuncs = &winSpriteFuncsRec;
-
+  }
   pScreenPriv->cursor.handle = NULL;
   pScreenPriv->cursor.visible = FALSE;
   
diff --git a/xorg-server/hw/xwin/windialogs.c b/xorg-server/hw/xwin/windialogs.c
index 31a3766a6..13b34353c 100644
--- a/xorg-server/hw/xwin/windialogs.c
+++ b/xorg-server/hw/xwin/windialogs.c
@@ -116,8 +116,8 @@ winDrawURLWindow (LPARAM lParam)
     crText = RGB(0,0,128+64);
   SetTextColor (draw->hDC, crText);
   
-  /* Create underlined font 14 high, standard dialog font */
-  font = CreateFont (-14, 0, 0, 0, FW_NORMAL, FALSE, TRUE, FALSE,
+  /* 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)
     {
@@ -214,8 +214,8 @@ winInitDialog (HWND hwndDlg)
    */
   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);
+    SetWindowPos (hwndDlg, HWND_TOP, 0,0,0,0,
+		  SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER | SWP_FRAMECHANGED);
   } else {
     GetWindowRect (hwndDesk, &rcDesk);
     GetWindowRect (hwndDlg, &rcDlg);
@@ -254,12 +254,8 @@ winInitDialog (HWND hwndDlg)
 }
 
 
-/*
- * Display the Exit dialog box
- */
-
-void
-winDisplayExitDialog (winPrivScreenPtr pScreenPriv)
+int
+GetLiveClients (winPrivScreenPtr pScreenPriv)
 {
   int i;
   int liveClients = 0;
@@ -280,7 +276,21 @@ winDisplayExitDialog (winPrivScreenPtr pScreenPriv)
 
   /* A user reported that this sometimes drops below zero. just eye-candy. */ 
   if (liveClients < 0)
-    liveClients = 0;      
+    liveClients = 0;
+
+  pScreenPriv->iConnectedClients = liveClients;
+
+  return liveClients;
+}
+
+/*
+ * Display the Exit dialog box
+ */
+
+void
+winDisplayExitDialog (winPrivScreenPtr pScreenPriv)
+{
+  int liveClients = GetLiveClients(pScreenPriv);
 
   /* Don't show the exit confirmation dialog if SilentExit is enabled */
   if (pref.fSilentExit && liveClients <= 0)
@@ -294,8 +304,6 @@ winDisplayExitDialog (winPrivScreenPtr pScreenPriv)
       return;
     }
 
-  pScreenPriv->iConnectedClients = liveClients;
-  
   /* Check if dialog already exists */
   if (g_hDlgExit != NULL)
     {
@@ -323,7 +331,7 @@ winDisplayExitDialog (winPrivScreenPtr pScreenPriv)
   
   /* Set focus to the Cancel button */
   PostMessage (g_hDlgExit, WM_NEXTDLGCTL,
-	       GetDlgItem (g_hDlgExit, IDCANCEL), TRUE);
+	       (WPARAM)GetDlgItem (g_hDlgExit, IDCANCEL), TRUE);
 }
 
 #define CONNECTED_CLIENTS_FORMAT	"There are currently %d clients connected."
@@ -444,9 +452,9 @@ winDisplayDepthChangeDialog (winPrivScreenPtr pScreenPriv)
   /* Show the dialog box */
   ShowWindow (g_hDlgDepthChange, SW_SHOW);
   
-  ErrorF ("winDisplayDepthChangeDialog - DialogBox returned: %d\n",
+  winDebug ("winDisplayDepthChangeDialog - DialogBox returned: %d\n",
 	  (int) g_hDlgDepthChange);
-  ErrorF ("winDisplayDepthChangeDialog - GetLastError: %d\n",
+  winDebug ("winDisplayDepthChangeDialog - GetLastError: %d\n",
 	  (int) GetLastError ());
 	      
   /* Minimize the display window */
@@ -467,53 +475,43 @@ winChangeDepthDlgProc (HWND hwndDialog, UINT message,
   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");
+	  winDebug ("winChangeDelthDlgProc - wParam == s_pScreenInfo->dwBPP\n");
 
 	  /* Depth has been restored, dismiss dialog */
 	  DestroyWindow (g_hDlgDepthChange);
@@ -541,7 +539,7 @@ winChangeDepthDlgProc (HWND hwndDialog, UINT message,
       break;
 
     case WM_CLOSE:
-      ErrorF ("winChangeDepthDlgProc - WM_CLOSE\n");
+      winDebug ("winChangeDepthDlgProc - WM_CLOSE\n");
 
       DestroyWindow (g_hDlgAbout);
       g_hDlgAbout = NULL;
@@ -591,7 +589,7 @@ winDisplayAboutDialog (winPrivScreenPtr pScreenPriv)
   
   /* Set focus to the OK button */
   PostMessage (g_hDlgAbout, WM_NEXTDLGCTL,
-	       GetDlgItem (g_hDlgAbout, IDOK), TRUE);
+	       (WPARAM)GetDlgItem (g_hDlgAbout, IDOK), TRUE);
 }
 
 
@@ -607,17 +605,13 @@ winAboutDlgProc (HWND hwndDialog, UINT message,
   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;
@@ -654,7 +648,7 @@ winAboutDlgProc (HWND hwndDialog, UINT message,
 	{
 	case IDOK:
 	case IDCANCEL:
-	  ErrorF ("winAboutDlgProc - WM_COMMAND - IDOK or IDCANCEL\n");
+	  winDebug ("winAboutDlgProc - WM_COMMAND - IDOK or IDCANCEL\n");
 
 	  DestroyWindow (g_hDlgAbout);
 	  g_hDlgAbout = NULL;
@@ -672,7 +666,7 @@ winAboutDlgProc (HWND hwndDialog, UINT message,
 
 	case ID_ABOUT_CHANGELOG:
 	  {
-	    HINSTANCE iReturn;
+	    int iReturn;
 #ifdef __CYGWIN__
 	    const char *	pszCygPath = "/usr/X11R6/share/doc/"
 	      "xorg-x11-xwin/changelog.html";
@@ -685,7 +679,7 @@ winAboutDlgProc (HWND hwndDialog, UINT message,
 		    "devel/server/changelog.html";
 #endif
 	    
-	    iReturn = ShellExecute (NULL,
+	    iReturn = (int)ShellExecute (NULL,
                                     "open",
                                     pszWinPath,
                                     NULL,
@@ -702,10 +696,10 @@ winAboutDlgProc (HWND hwndDialog, UINT message,
 
 	case ID_ABOUT_WEBSITE:
 	  {
-	    const char *	pszPath = "http://x.cygwin.com/";
+	    const char *	pszPath = __VENDORDWEBSUPPORT__;
 	    int			iReturn;
 	    
-	    iReturn = ShellExecute (NULL,
+	    iReturn = (int)ShellExecute (NULL,
                                     "open",
                                     pszPath,
                                     NULL,
@@ -725,7 +719,7 @@ winAboutDlgProc (HWND hwndDialog, UINT message,
 	    const char *	pszPath = "http://x.cygwin.com/docs/ug/";
 	    int			iReturn;
 	    
-	    iReturn = ShellExecute (NULL,
+	    iReturn = (int)ShellExecute (NULL,
                                     "open",
                                     pszPath,
                                     NULL,
@@ -745,7 +739,7 @@ winAboutDlgProc (HWND hwndDialog, UINT message,
 	    const char *	pszPath = "http://x.cygwin.com/docs/faq/";
 	    int			iReturn;
 	    
-	    iReturn = ShellExecute (NULL,
+	    iReturn = (int)ShellExecute (NULL,
                                     "open",
                                     pszPath,
                                     NULL,
diff --git a/xorg-server/hw/xwin/winengine.c b/xorg-server/hw/xwin/winengine.c
index fb9aed8a0..fadd11b39 100644
--- a/xorg-server/hw/xwin/winengine.c
+++ b/xorg-server/hw/xwin/winengine.c
@@ -69,12 +69,12 @@ winDetectSupportedEngines (void)
     {
     case VER_PLATFORM_WIN32_NT:
       /* Engine 4 is supported on NT only */
-      winErrorFVerb (2, "winDetectSupportedEngines - Windows NT/2000/XP\n");
+      winDebug ("winDetectSupportedEngines - Windows NT/2000/XP\n");
       break;
 
     case VER_PLATFORM_WIN32_WINDOWS:
       /* Engine 4 is supported on NT only */
-      winErrorFVerb (2, "winDetectSupportedEngines - Windows 95/98/Me\n");
+      winDebug ("winDetectSupportedEngines - Windows 95/98/Me\n");
       break;
     }
 
@@ -100,13 +100,13 @@ winDetectSupportedEngines (void)
       if (FAILED (ddrval))
 	{
 	  /* No DirectDraw support */
-	  winErrorFVerb (2, "winDetectSupportedEngines - DirectDraw not installed\n");
+	  winDebug ("winDetectSupportedEngines - DirectDraw not installed\n");
 	  return;
 	}
       else
 	{
 	  /* We have DirectDraw */
-	  winErrorFVerb (2, "winDetectSupportedEngines - DirectDraw installed\n");
+	  winDebug ("winDetectSupportedEngines - DirectDraw installed\n");
 	  g_dwEnginesSupported |= WIN_SERVER_SHADOW_DD;
 
 #ifdef XWIN_PRIMARYFB
@@ -114,7 +114,7 @@ winDetectSupportedEngines (void)
 	  if (osvi.dwPlatformId == VER_PLATFORM_WIN32_NT)
 	    {
 	      g_dwEnginesSupported |= WIN_SERVER_PRIMARY_DD;
-	      winErrorFVerb (2, "winDetectSupportedEngines - Allowing PrimaryDD\n");
+	      winDebug ("winDetectSupportedEngines - Allowing PrimaryDD\n");
 	    }
 #endif
 	}
@@ -126,7 +126,7 @@ winDetectSupportedEngines (void)
       if (SUCCEEDED (ddrval))
 	{
 	  /* We have DirectDraw4 */
-	  winErrorFVerb (2, "winDetectSupportedEngines - DirectDraw4 installed\n");
+	  winDebug ("winDetectSupportedEngines - DirectDraw4 installed\n");
 	  g_dwEnginesSupported |= WIN_SERVER_SHADOW_DDNL;
 	}
 
@@ -137,7 +137,7 @@ winDetectSupportedEngines (void)
 	IDirectDraw_Release (lpdd);
     }
 
-  winErrorFVerb (2, "winDetectSupportedEngines - Returning, supported engines %08x\n",
+  winDebug ("winDetectSupportedEngines - Returning, supported engines %08x\n",
 	  (unsigned int) g_dwEnginesSupported);
 }
 
@@ -178,7 +178,7 @@ winSetEngine (ScreenPtr pScreen)
   /* ShadowGDI is the only engine that supports windowed PseudoColor */
   if (dwBPP == 8 && !pScreenInfo->fFullScreen)
     {
-      winErrorFVerb (2, "winSetEngine - Windowed && PseudoColor => ShadowGDI\n");
+      winDebug ("winSetEngine - Windowed && PseudoColor => ShadowGDI\n");
       pScreenInfo->dwEngine = WIN_SERVER_SHADOW_GDI;
 
       /* Set engine function pointers */
@@ -200,7 +200,7 @@ winSetEngine (ScreenPtr pScreen)
 #endif
       )
     {
-      winErrorFVerb (2, "winSetEngine - Multi Window or Rootless => ShadowGDI\n");
+      winDebug ("winSetEngine - Multi Window or Rootless => ShadowGDI\n");
       pScreenInfo->dwEngine = WIN_SERVER_SHADOW_GDI;
 
       /* Set engine function pointers */
@@ -211,7 +211,7 @@ winSetEngine (ScreenPtr pScreen)
   /* If the user's choice is supported, we'll use that */
   if (g_dwEnginesSupported & pScreenInfo->dwEnginePreferred)
     {
-      winErrorFVerb (2, "winSetEngine - Using user's preference: %d\n",
+      winDebug ("winSetEngine - Using user's preference: %d\n",
 	      (int) pScreenInfo->dwEnginePreferred);
       pScreenInfo->dwEngine = pScreenInfo->dwEnginePreferred;
 
@@ -246,7 +246,7 @@ winSetEngine (ScreenPtr pScreen)
   /* ShadowDDNL has good performance, so why not */
   if (g_dwEnginesSupported & WIN_SERVER_SHADOW_DDNL)
     {
-      winErrorFVerb (2, "winSetEngine - Using Shadow DirectDraw NonLocking\n");
+      winDebug ("winSetEngine - Using Shadow DirectDraw NonLocking\n");
       pScreenInfo->dwEngine = WIN_SERVER_SHADOW_DDNL;
 
       /* Set engine function pointers */
@@ -257,7 +257,7 @@ winSetEngine (ScreenPtr pScreen)
   /* ShadowDD is next in line */
   if (g_dwEnginesSupported & WIN_SERVER_SHADOW_DD)
     {
-      winErrorFVerb (2, "winSetEngine - Using Shadow DirectDraw\n");
+      winDebug ("winSetEngine - Using Shadow DirectDraw\n");
       pScreenInfo->dwEngine = WIN_SERVER_SHADOW_DD;
 
       /* Set engine function pointers */
@@ -268,7 +268,7 @@ winSetEngine (ScreenPtr pScreen)
   /* ShadowGDI is next in line */
   if (g_dwEnginesSupported & WIN_SERVER_SHADOW_GDI)
     {
-      winErrorFVerb (2, "winSetEngine - Using Shadow GDI DIB\n");
+      winDebug ("winSetEngine - Using Shadow GDI DIB\n");
       pScreenInfo->dwEngine = WIN_SERVER_SHADOW_GDI;
 
       /* Set engine function pointers */
diff --git a/xorg-server/hw/xwin/winerror.c b/xorg-server/hw/xwin/winerror.c
index 72ee2cfb7..78ac15117 100644
--- a/xorg-server/hw/xwin/winerror.c
+++ b/xorg-server/hw/xwin/winerror.c
@@ -43,7 +43,8 @@
 extern char *		g_pszCommandLine;
 extern char *		g_pszLogFile;
 extern Bool		g_fSilentFatalError;
-
+extern Bool		g_fSilentDupError;
+extern Bool		g_fLogInited;
 
 #ifdef DDXOSVERRORF
 /* Prototype */
@@ -62,6 +63,24 @@ OsVendorVErrorF (const char *pszFormat, va_list va_args)
   pthread_mutex_lock (&s_pmPrinting);
 #endif
 
+  /*
+     If we want to silence it,
+     detect if we are going to abort due to duplication error
+  */
+  if (g_fSilentDupError)
+    {
+      if ((strcmp(pszFormat,
+		  "InitOutput - Duplicate invocation on display "
+		  "number: %s.  Exiting.\n") == 0)
+	  || (strcmp(pszFormat,
+		     "Server is already active for display %s\n%s %s\n%s\n") == 0)
+	  || (strcmp(pszFormat,
+		     "MakeAllCOTSServerListeners: server already running\n") == 0))
+	{
+	  g_fSilentFatalError = TRUE;
+	}
+    }
+
   /* Print the error message to a log file, could be stderr */
   LogVWrite (0, pszFormat, va_args);
 
@@ -87,6 +106,12 @@ OsVendorFatalError (void)
   if (g_fSilentFatalError)
     return;
 
+  if (!g_fLogInited) {
+    g_fLogInited = TRUE;
+    g_pszLogFile = LogInit (g_pszLogFile, NULL);
+  }
+  LogClose ();
+
   winMessageBoxF (
           "A fatal error has occurred and " PROJECT_NAME " will now exit.\n" \
 		  "Please open %s for more information.\n",
diff --git a/xorg-server/hw/xwin/winfont.c b/xorg-server/hw/xwin/winfont.c
index af3e90da5..5a3011c0a 100644
--- a/xorg-server/hw/xwin/winfont.c
+++ b/xorg-server/hw/xwin/winfont.c
@@ -42,9 +42,7 @@ winRealizeFontNativeGDI (ScreenPtr pScreen, FontPtr pFont)
   BOOL			fResult = TRUE;
   winScreenPriv(pScreen);
   
-#if CYGDEBUG
-  winTrace ("winRealizeFont (%p, %p)\n", pScreen, pFont);
-#endif
+  winDebug ("winRealizeFont (%p, %p)\n", pScreen, pFont);
 
   WIN_UNWRAP(RealizeFont);
   if (pScreen->RealizeFont)
@@ -62,9 +60,7 @@ winUnrealizeFontNativeGDI (ScreenPtr pScreen, FontPtr pFont)
   BOOL			fResult = TRUE;
   winScreenPriv(pScreen);
   
-#if CYGDEBUG
-  winTrace ("winUnrealizeFont (%p, %p)\n", pScreen, pFont);
-#endif
+  winDebug ("winUnrealizeFont (%p, %p)\n", pScreen, pFont);
 
   WIN_UNWRAP(UnrealizeFont);
   if (pScreen->UnrealizeFont)
@@ -72,9 +68,5 @@ winUnrealizeFontNativeGDI (ScreenPtr pScreen, FontPtr pFont)
   WIN_WRAP(UnrealizeFont, winUnrealizeFontNativeGDI);
   
   return fResult;
-#if CYGDEBUG
-  winDebug ("winUnrealizeFont()\n");
-#endif
-  return TRUE;
 }
 #endif
diff --git a/xorg-server/hw/xwin/wingc.c b/xorg-server/hw/xwin/wingc.c
index 1f3775263..61ba78a54 100644
--- a/xorg-server/hw/xwin/wingc.c
+++ b/xorg-server/hw/xwin/wingc.c
@@ -41,47 +41,14 @@ winPushPixels (GCPtr pGC, PixmapPtr pBitMap, DrawablePtr pDrawable, int dx, int
  * Local prototypes
  */
 
-#if 0
-static void
-winChangeGCNativeGDI (GCPtr pGC, unsigned long ulChanges);
-#endif
-
 static void
 winValidateGCNativeGDI (GCPtr pGC,
 			unsigned long changes,
 			DrawablePtr pDrawable);
 
-#if 0
-static void
-winCopyGCNativeGDI (GCPtr pGCsrc, unsigned long ulMask, GCPtr pGCdst);
-#endif
-
 static void
 winDestroyGCNativeGDI (GCPtr pGC);
 
-#if 0
-static void
-winChangeClipNativeGDI (GCPtr pGC, int nType, pointer pValue, int nRects);
-
-static void
-winDestroyClipNativeGDI (GCPtr pGC);
-
-static void
-winCopyClipNativeGDI (GCPtr pGCdst, GCPtr pGCsrc);
-#endif
-
-#if 0
-/* GC Handling Routines */
-const GCFuncs winGCFuncs = {
-  winValidateGCNativeGDI,
-  winChangeGCNativeGDI,
-  winCopyGCNativeGDI,
-  winDestroyGCNativeGDI,
-  winChangeClipNativeGDI,
-  winDestroyClipNativeGDI,
-  winCopyClipNativeGDI,
-};
-#else
 const GCFuncs winGCFuncs = {
   winValidateGCNativeGDI,
   miChangeGC,
@@ -91,7 +58,6 @@ const GCFuncs winGCFuncs = {
   miDestroyClip,
   miCopyClip,
 };
-#endif
 
 /* Drawing Primitives */
 const GCOps winGCOps = {
@@ -112,13 +78,8 @@ const GCOps winGCOps = {
   miPolyText16,
   miImageText8,
   miImageText16,
-#if 0
-  winImageGlyphBltNativeGDI,
-  winPolyGlyphBltNativeGDI,
-#else
   miImageGlyphBlt,
   miPolyGlyphBlt,
-#endif
   miPushPixels,
 };
 
@@ -132,10 +93,8 @@ winCreateGCNativeGDI (GCPtr pGC)
   winPrivGCPtr		pGCPriv = NULL;
   winPrivScreenPtr	pScreenPriv = NULL;
 
-#if 0
-  ErrorF ("winCreateGCNativeGDI - depth: %d\n",
+  winDebug ("winCreateGCNativeGDI - depth: %d\n",
 	  pGC->depth);
-#endif
 
   pGC->clientClip = NULL;
   pGC->clientClipType = CT_NONE;
@@ -166,19 +125,6 @@ winCreateGCNativeGDI (GCPtr pGC)
   return TRUE;
 }
 
-
-#if 0
-/* See Porting Layer Definition - p. 45 */
-static void
-winChangeGCNativeGDI (GCPtr pGC, unsigned long ulChanges)
-{
-#if 0
-  ErrorF ("winChangeGCNativeGDI () - Doing nothing\n");
-#endif
-}
-#endif
-
-
 static void
 winValidateGCNativeGDI (GCPtr pGC,
 			unsigned long ulChanges,
@@ -192,16 +138,6 @@ winValidateGCNativeGDI (GCPtr pGC,
 }
 
 
-#if 0
-/* See Porting Layer Definition - p. 46 */
-static void
-winCopyGCNativeGDI (GCPtr pGCsrc, unsigned long ulMask, GCPtr pGCdst)
-{
-
-}
-#endif
-
-
 /* See Porting Layer Definition - p. 46 */
 static void
 winDestroyGCNativeGDI (GCPtr pGC)
@@ -229,28 +165,3 @@ winDestroyGCNativeGDI (GCPtr pGC)
   /* Invalidate the GC privates pointer */
   winSetGCPriv (pGC, NULL);
 }
-
-#if 0
-/* See Porting Layer Definition - p. 46 */
-static void
-winChangeClipNativeGDI (GCPtr pGC, int nType, pointer pValue, int nRects)
-{
-
-}
-
-
-/* See Porting Layer Definition - p. 47 */
-static void
-winDestroyClipNativeGDI (GCPtr pGC)
-{
-
-}
-
-
-/* See Porting Layer Definition - p. 47 */
-static void
-winCopyClipNativeGDI (GCPtr pGCdst, GCPtr pGCsrc)
-{
-
-}
-#endif
diff --git a/xorg-server/hw/xwin/wingetsp.c b/xorg-server/hw/xwin/wingetsp.c
index 03f7f1012..e9c23881f 100644
--- a/xorg-server/hw/xwin/wingetsp.c
+++ b/xorg-server/hw/xwin/wingetsp.c
@@ -59,10 +59,8 @@ winGetSpansNativeGDI (DrawablePtr	pDrawable,
   switch (pDrawable->type)
     {
     case DRAWABLE_PIXMAP:
-#if 0
-      ErrorF ("winGetSpans - DRAWABLE_PIXMAP %08x\n",
+      winDebug ("winGetSpans - DRAWABLE_PIXMAP %08x\n",
 	      pDrawable);
-#endif
 
       pPixmap = (PixmapPtr) pDrawable;
       pPixmapPriv = winGetPixmapPriv (pPixmap);
@@ -107,12 +105,6 @@ winGetSpansNativeGDI (DrawablePtr	pDrawable,
       	  SelectObject (hdcMem, hbmpOrig);
 	  DeleteObject (hbmpWindow);
 
-#if 0
-	  ErrorF ("(%dx%dx%d) (%d,%d) w: %d\n",
-		  pDrawable->width, pDrawable->height, pDrawable->depth,
-		  pPoint->x, pPoint->y, *piWidth);
-#endif
-
 	  /* Calculate offset of next bit destination */
 	  pDst += PixmapBytePad (*piWidth, pDrawable->depth);
 	}
@@ -126,9 +118,6 @@ winGetSpansNativeGDI (DrawablePtr	pDrawable,
       break;
 
     case DRAWABLE_WINDOW:
-#if 0
-      ErrorF ("winGetSpans - DRAWABLE_WINDOW\n");
-#endif
 
       /* Open a memory HDC */
       hdcMem = CreateCompatibleDC (NULL);
@@ -163,12 +152,6 @@ winGetSpansNativeGDI (DrawablePtr	pDrawable,
 
 	  DeleteObject (hbmpWindow);
 
-#if 0
-	  ErrorF ("(%dx%dx%d) (%d,%d) w: %d\n",
-		  pDrawable->width, pDrawable->height, pDrawable->depth,
-		  pPoint->x, pPoint->y, *piWidth);
-#endif
-
 	  /* Calculate offset of next bit destination */
 	  pDst += PixmapBytePad (*piWidth, pDrawable->depth);
 	}
diff --git a/xorg-server/hw/xwin/winglobals.c b/xorg-server/hw/xwin/winglobals.c
index 3eb6091e6..280761e72 100644
--- a/xorg-server/hw/xwin/winglobals.c
+++ b/xorg-server/hw/xwin/winglobals.c
@@ -1,5 +1,6 @@
 /*
  *Copyright (C) 2003-2004 Harold L Hunt II All Rights Reserved.
+ *Copyright (C) Colin Harrison 2005-2008
  *
  *Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the
@@ -26,6 +27,7 @@
  *from Harold L Hunt II.
  *
  * Authors:	Harold L Hunt II
+ *              Colin Harrison
  */
 
 #ifdef HAVE_XWIN_CONFIG_H
@@ -63,10 +65,11 @@ HWND		g_hDlgExit = NULL;
 HWND		g_hDlgAbout = NULL;
 const char *	g_pszQueryHost = NULL;
 Bool		g_fXdmcpEnabled = FALSE;
+Bool           g_fAuthEnabled = FALSE;
 HICON		g_hIconX = NULL;
 HICON		g_hSmallIconX = NULL;
 #ifndef RELOCATE_PROJECTROOT
-char *		g_pszLogFile = "/tmp/XWin.log";
+char *		g_pszLogFile = DEFAULT_LOGDIR "/XWin.%s.log";
 #else
 char *		g_pszLogFile = "XWin.log";
 Bool		g_fLogFileChanged = FALSE;
diff --git a/xorg-server/hw/xwin/winkeybd.c b/xorg-server/hw/xwin/winkeybd.c
index 611ea5d55..aa5b9a53a 100644
--- a/xorg-server/hw/xwin/winkeybd.c
+++ b/xorg-server/hw/xwin/winkeybd.c
@@ -75,6 +75,20 @@ winTranslateKey (WPARAM wParam, LPARAM lParam, int *piScanCode)
   int		iKeyFixupEx = g_iKeyMap[wParam * WIN_KEYMAP_COLS + 2];
   int		iParamScanCode = LOBYTE (HIWORD (lParam));
 
+/* WM_ key messages faked by Vista speech recognition (WSR) don't have a
+ * scan code.
+ *
+ * Vocola 3 (Rick Mohr's supplement to WSR) uses
+ * System.Windows.Forms.SendKeys.SendWait(), which appears always to give a
+ * scan code of 1
+ */
+  if (iParamScanCode <= 1)
+    {
+      iParamScanCode = MapVirtualKeyEx(wParam,
+				       /*MAPVK_VK_TO_VSC*/0,
+				       GetKeyboardLayout(0));
+    }
+
   /* Branch on special extended, special non-extended, or normal key */
   if ((HIWORD (lParam) & KF_EXTENDED) && iKeyFixupEx)
     *piScanCode = iKeyFixupEx;
@@ -223,13 +237,13 @@ winKeybdProc (DeviceIntPtr pDeviceInt, int iState)
       /* FIXME: Maybe we should use winGetKbdLeds () here? */
       defaultKeyboardControl.leds = g_winInfo.keyboard.leds;
 
-      winErrorFVerb(2, "Rules = \"%s\" Model = \"%s\" Layout = \"%s\""
-                    " Variant = \"%s\" Options = \"%s\"\n",
-                    g_winInfo.xkb.rules ? g_winInfo.xkb.rules : "none",
-                    g_winInfo.xkb.model ? g_winInfo.xkb.model : "none",
-                    g_winInfo.xkb.layout ? g_winInfo.xkb.layout : "none",
-                    g_winInfo.xkb.variant ? g_winInfo.xkb.variant : "none",
-                    g_winInfo.xkb.options ? g_winInfo.xkb.options : "none");
+      winDebug("Rules = \"%s\" Model = \"%s\" Layout = \"%s\""
+               " Variant = \"%s\" Options = \"%s\"\n",
+               g_winInfo.xkb.rules ? g_winInfo.xkb.rules : "none",
+               g_winInfo.xkb.model ? g_winInfo.xkb.model : "none",
+               g_winInfo.xkb.layout ? g_winInfo.xkb.layout : "none",
+               g_winInfo.xkb.variant ? g_winInfo.xkb.variant : "none",
+               g_winInfo.xkb.options ? g_winInfo.xkb.options : "none");
 
       InitKeyboardDeviceStruct (pDeviceInt,
                                 &g_winInfo.xkb,
@@ -245,9 +259,10 @@ winKeybdProc (DeviceIntPtr pDeviceInt, int iState)
         }
       else
         {
-          winErrorFVerb (1, "winKeybdProc - Error initializing keyboard AutoRepeat\n");
+          winDebug ("winKeybdProc - Error initializing keyboard AutoRepeat\n");
         }
 
+	  XkbSetExtension(pDeviceInt, ProcessKeyboardEvent);
       break;
       
     case DEVICE_ON: 
@@ -547,12 +562,10 @@ winSendKeyEvent (DWORD dwKey, Bool fDown)
   nevents = GetKeyboardEvents(events, g_pwinKeyboard, fDown ? KeyPress : KeyRelease, dwKey + MIN_KEYCODE);
 
   for (i = 0; i < nevents; i++)
-    mieqEnqueue(g_pwinKeyboard, events[i].event);
+    mieqEnqueue(g_pwinKeyboard, (InternalEvent*)(events + i)->event);
 
-#if CYGDEBUG
-  ErrorF("winSendKeyEvent: dwKey: %d, fDown: %d, nEvents %d\n",
+  winDebug("winSendKeyEvent: dwKey: %d, fDown: %d, nEvents %d\n",
           dwKey, fDown, nevents);
-#endif
 }
 
 BOOL winCheckKeyPressed(WPARAM wParam, LPARAM lParam)
diff --git a/xorg-server/hw/xwin/winkeybd.h b/xorg-server/hw/xwin/winkeybd.h
index 09eed1491..d5b115736 100644
--- a/xorg-server/hw/xwin/winkeybd.h
+++ b/xorg-server/hw/xwin/winkeybd.h
@@ -45,6 +45,11 @@
 
 #define		WIN_KEYMAP_COLS		3
 
+/* ASCII column, rows 33 through 40 are for Speech Recognition with
+ * num-lock asserted.
+ * Rows 160 through 165 correspond to software-generated codes, which
+ * may not be associated with the appropriate scan code/extended bit
+ */
 const int
 g_iKeyMap [] = {
   /* count	Windows VK,	ASCII,		ASCII when extended VK */
@@ -81,14 +86,14 @@ g_iKeyMap [] = {
   /* 30 */	0,		0,		0,
   /* 31 */	0,		0,		0,
   /* 32 */	0,		0,		0,
-  /* 33 */	VK_PRIOR,	0,		KEY_PgUp,
-  /* 34 */	VK_NEXT,	0,		KEY_PgDown,
-  /* 35 */	VK_END,		0,		KEY_End,
-  /* 36 */	VK_HOME,	0,		KEY_Home,
-  /* 37 */	VK_LEFT,	0,		KEY_Left,
-  /* 38 */	VK_UP,		0,		KEY_Up,
-  /* 39 */	VK_RIGHT,	0,		KEY_Right,
-  /* 40 */	VK_DOWN,	0,		KEY_Down,
+  /* 33 */	VK_PRIOR,	KEY_PgUp,	KEY_PgUp,
+  /* 34 */	VK_NEXT,	KEY_PgDown,	KEY_PgDown,
+  /* 35 */	VK_END,		KEY_End,	KEY_End,
+  /* 36 */	VK_HOME,	KEY_Home,	KEY_Home,
+  /* 37 */	VK_LEFT,	KEY_Left,	KEY_Left,
+  /* 38 */	VK_UP,		KEY_Up,	 	KEY_Up,
+  /* 39 */	VK_RIGHT,	KEY_Right,	KEY_Right,
+  /* 40 */	VK_DOWN,	KEY_Down,	KEY_Down,
   /* 41 */	0,		0,		0,
   /* 42 */	0,		0,		0,
   /* 43 */	0,		0,		0,
@@ -208,12 +213,12 @@ g_iKeyMap [] = {
   /* 157 */	0,		0,		0,
   /* 158 */	0,		0,		0,
   /* 159 */	0,		0,		0,
-  /* 160 */	0,		0,		0,
-  /* 161 */	0,		0,		0,
-  /* 162 */	0,		0,		0,
-  /* 163 */	0,		0,		0,
-  /* 164 */	0,		0,		0,
-  /* 165 */	0,		0,		0,
+  /* 160 */	VK_LSHIFT,	KEY_ShiftL,	KEY_ShiftL,
+  /* 161 */	VK_RSHIFT,	KEY_ShiftR,	KEY_ShiftR,
+  /* 162 */	VK_LCONTROL,	KEY_LCtrl,	KEY_LCtrl,
+  /* 163 */	VK_RCONTROL,	KEY_RCtrl,	KEY_RCtrl,
+  /* 164 */	VK_LMENU,	KEY_Alt,	KEY_Alt,
+  /* 165 */	VK_RMENU,	KEY_AltLang,	KEY_AltLang,
   /* 166 */	0,		0,		0,
   /* 167 */	0,		0,		0,
   /* 168 */	0,		0,		0,
diff --git a/xorg-server/hw/xwin/winkeyhook.c b/xorg-server/hw/xwin/winkeyhook.c
index 2d6ed18b7..82e30df88 100644
--- a/xorg-server/hw/xwin/winkeyhook.c
+++ b/xorg-server/hw/xwin/winkeyhook.c
@@ -94,9 +94,6 @@ winKeyboardMessageHookLL (int iCode, WPARAM wParam, LPARAM lParam)
   /* Pass keystrokes on to our main message loop */
   if (iCode == HC_ACTION)
     {
-#if 0
-      ErrorF ("vkCode: %08x\tscanCode: %08x\n", p->vkCode, p->scanCode);
-#endif
 
       switch (wParam)
 	{
diff --git a/xorg-server/hw/xwin/winlayouts.h b/xorg-server/hw/xwin/winlayouts.h
index d1d21a12d..193cc1a41 100644
--- a/xorg-server/hw/xwin/winlayouts.h
+++ b/xorg-server/hw/xwin/winlayouts.h
@@ -61,6 +61,7 @@ WinKBLayoutRec winKBLayouts[] =
     {  0x40b, -1, "pc105", "fi",      NULL, NULL, "Finnish"},
     {  0x40c, -1, "pc105", "fr",      NULL, NULL, "French (Standard)"},
     {  0x80c, -1, "pc105", "be",      NULL, NULL, "French (Belgian)"},
+    {0x1080c, -1, "pc105", "be",      NULL, NULL, "Belgian (Comma)"},
     {  0xc0c, -1, "pc105", "ca",      "fr", NULL, "French (Canada)"},
     { 0x100c, -1, "pc105", "ch",      "fr", NULL, "French (Switzerland)"},
     {  0x40d, -1, "pc105", "il",      NULL, NULL, "Hebrew"},
@@ -163,6 +164,7 @@ Support ID       XKB        Language
                             Finnish (with Sami)
    X    0x040c  fr          French (Standard)
    X    0x080c  be          French (Belgian)
+   X   0x1080c  be          Belgian (Comma)
    .    0x0c0c              French (Canadian)
                             French (Canadian, Legacy)
                             Canadian (Multilingual)
diff --git a/xorg-server/hw/xwin/winmisc.c b/xorg-server/hw/xwin/winmisc.c
index 8e6698118..a5a2d3d1c 100644
--- a/xorg-server/hw/xwin/winmisc.c
+++ b/xorg-server/hw/xwin/winmisc.c
@@ -44,7 +44,7 @@ void
 winQueryBestSizeNativeGDI (int class, unsigned short *pWidth,
 			   unsigned short *pHeight, ScreenPtr pScreen)
 {
-  ErrorF ("winQueryBestSizeNativeGDI\n");
+  winDebug ("winQueryBestSizeNativeGDI\n");
 }
 #endif
 
diff --git a/xorg-server/hw/xwin/winmouse.c b/xorg-server/hw/xwin/winmouse.c
index b537d3213..51ca3c5c6 100644
--- a/xorg-server/hw/xwin/winmouse.c
+++ b/xorg-server/hw/xwin/winmouse.c
@@ -36,14 +36,19 @@
 #endif
 #include "win.h"
 
-#if defined(XFree86Server)
+#ifdef XKB
+#ifndef XKB_IN_SERVER
+#define XKB_IN_SERVER
+#endif
+#include <xkbsrv.h>
+#endif
+
 #include "inputstr.h"
 #include "exevents.h" /* for button/axes labels */
 #include "xserver-properties.h"
 
 /* Peek the internal button mapping */
 static CARD8 const *g_winMouseButtonMap = NULL;
-#endif
 
 
 /*
@@ -90,7 +95,7 @@ winMouseProc (DeviceIntPtr pDeviceInt, int iState)
        */
       if (lngMouseButtons < 3)
         lngMouseButtons = 3;
-      winMsg(X_PROBED, "%d mouse buttons found\n", lngMouseButtons);
+      winDebug("%d mouse buttons found\n", lngMouseButtons);
 
       /* allocate memory: 
        * number of buttons + 2x mouse wheel event + 1 extra (offset for map) 
@@ -123,9 +128,7 @@ winMouseProc (DeviceIntPtr pDeviceInt, int iState)
       free(map);
       free(btn_labels);
 
-#if defined(XFree86Server)
       g_winMouseButtonMap = pDeviceInt->button->map;
-#endif
       break;
 
     case DEVICE_ON:
@@ -133,9 +136,7 @@ winMouseProc (DeviceIntPtr pDeviceInt, int iState)
       break;
 
     case DEVICE_CLOSE:
-#if defined(XFree86Server)
       g_winMouseButtonMap = NULL;
-#endif
     case DEVICE_OFF:
       pDevice->on = FALSE;
       break;
@@ -241,22 +242,18 @@ winMouseButtonsSendEvent (int iEventType, int iButton)
   EventListPtr events;
   int i, nevents;
 
-#if defined(XFree86Server)
   if (g_winMouseButtonMap)
     iButton = g_winMouseButtonMap[iButton];
-#endif
 
   GetEventList(&events);
   nevents = GetPointerEvents(events, g_pwinPointer, iEventType, iButton,
 			     POINTER_RELATIVE, 0, 0, NULL);
 
   for (i = 0; i < nevents; i++)
-    mieqEnqueue(g_pwinPointer, events[i].event);
+    mieqEnqueue(g_pwinPointer, (InternalEvent*)(events + i)->event);
 
-#if CYGDEBUG
-  ErrorF("winMouseButtonsSendEvent: iEventType: %d, iButton: %d, nEvents %d\n",
+  winDebug("winMouseButtonsSendEvent: iEventType: %d, iButton: %d, nEvents %d\n",
           iEventType, iButton, nevents);
-#endif
 }
 
 
@@ -371,12 +368,12 @@ winMouseButtonsHandle (ScreenPtr pScreen,
  */
 void winEnqueueMotion(int x, int y)
 {
-  miPointerSetPosition(g_pwinPointer, &x, &y);
-
   int i, nevents;
   int valuators[2];
 
   EventListPtr events;
+
+  miPointerSetPosition(g_pwinPointer, &x, &y);
   GetEventList(&events);
 
   valuators[0] = x;
@@ -385,5 +382,5 @@ void winEnqueueMotion(int x, int y)
 			     POINTER_ABSOLUTE, 0, 2, valuators);
 
   for (i = 0; i < nevents; i++)
-    mieqEnqueue(g_pwinPointer, events[i].event);
+    mieqEnqueue(g_pwinPointer, (InternalEvent*)(events + i)->event);
 }
diff --git a/xorg-server/hw/xwin/winmsg.c b/xorg-server/hw/xwin/winmsg.c
index d0464f71b..a77fde299 100644
--- a/xorg-server/hw/xwin/winmsg.c
+++ b/xorg-server/hw/xwin/winmsg.c
@@ -33,71 +33,12 @@
 #endif
 #include "win.h"
 #include "winmsg.h"
-#if CYGDEBUG
+#ifdef WINDBG
 #include "winmessages.h"
 #endif
 #include <stdarg.h>
 
-void winVMsg (int, MessageType, int verb, const char *, va_list);
-
-void
-winVMsg (int scrnIndex, MessageType type, int verb, const char *format,
-	 va_list ap)
-{
-  LogVMessageVerb(type, verb, format, ap);
-}
-
-
-void
-winDrvMsg (int scrnIndex, MessageType type, const char *format, ...)
-{
-  va_list ap;
-  va_start (ap, format);
-  LogVMessageVerb(type, 0, format, ap);
-  va_end (ap);
-}
-
-
-void
-winMsg (MessageType type, const char *format, ...)
-{
-  va_list ap;
-  va_start (ap, format);
-  LogVMessageVerb(type, 1, format, ap);
-  va_end (ap);
-}
-
-
-void
-winDrvMsgVerb (int scrnIndex, MessageType type, int verb, const char *format,
-	       ...)
-{
-  va_list ap;
-  va_start (ap, format);
-  LogVMessageVerb(type, verb, format, ap);
-  va_end (ap);
-}
-
-
-void
-winMsgVerb (MessageType type, int verb, const char *format, ...)
-{
-  va_list ap;
-  va_start (ap, format);
-  LogVMessageVerb(type, verb, format, ap);
-  va_end (ap);
-}
-
-
-void
-winErrorFVerb (int verb, const char *format, ...)
-{
-  va_list ap;
-  va_start (ap, format);
-  LogVMessageVerb(X_NONE, verb, format, ap);
-  va_end (ap);
-}
-
+#ifdef WINDBG
 void
 winDebug (const char *format, ...)
 {
@@ -106,24 +47,16 @@ winDebug (const char *format, ...)
   LogVMessageVerb(X_NONE, 3, format, ap);
   va_end (ap);
 }
+#endif
 
 void
-winTrace (const char *format, ...)
-{
-  va_list ap;
-  va_start (ap, format);
-  LogVMessageVerb(X_NONE, 10, format, ap);
-  va_end (ap);
-}
-
-void
-winW32Error(int verb, const char *msg)
+winW32Error(const char *msg)
 {
-    winW32ErrorEx(verb, msg, GetLastError());
+    winW32ErrorEx(msg, GetLastError());
 }
 
 void
-winW32ErrorEx(int verb, const char *msg, DWORD errorcode)
+winW32ErrorEx(const char *msg, DWORD errorcode)
 {
     LPVOID buffer;
     if (!FormatMessage( 
@@ -137,16 +70,17 @@ winW32ErrorEx(int verb, const char *msg, DWORD errorcode)
                 0,
                 NULL ))
     {
-        winErrorFVerb(verb, "Unknown error in FormatMessage!\n"); 
+        ErrorF(msg); 
+        ErrorF("Unknown error in FormatMessage!\n"); 
     }
     else
     {
-        winErrorFVerb(verb, "%s %s", msg, (char *)buffer); 
+        ErrorF("%s %s", msg, (char *)buffer); 
         LocalFree(buffer);
     }
 }
 
-#if CYGDEBUG
+#ifdef WINDBG
 void winDebugWin32Message(const char* function, HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
 {
   static int force = 0;
@@ -172,8 +106,4 @@ void winDebugWin32Message(const char* function, HWND hwnd, UINT message, WPARAM
       }
     }
 }
-#else
-void winDebugWin32Message(const char* function, HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
-{
-}
 #endif
diff --git a/xorg-server/hw/xwin/winmsg.h b/xorg-server/hw/xwin/winmsg.h
index 611dd6962..ecee86994 100644
--- a/xorg-server/hw/xwin/winmsg.h
+++ b/xorg-server/hw/xwin/winmsg.h
@@ -33,18 +33,19 @@
 /*
  * Function prototypes
  */
+ 
+#include "os.h"
 
-void winDrvMsgVerb (int scrnIndex,
-		    MessageType type, int verb, const char *format, ...);
-void winDrvMsg (int scrnIndex, MessageType type, const char *format, ...);
-void winMsgVerb (MessageType type, int verb, const char *format, ...);
-void winMsg (MessageType type, const char *format, ...);
+#if !defined(_MSC_VER) || defined(_DEBUG)
+#define WINDBG
 void winDebug (const char *format, ...);
-void winTrace (const char *format, ...);
-
-void winErrorFVerb (int verb, const char *format, ...);
-void winW32Error(int verb, const char *message);
-void winW32ErrorEx(int verb, const char *message, DWORD errorcode);
 void winDebugWin32Message(const char* function, HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam);
+#else
+#define winDebug(...)
+#define winDebugWin32Message(...)
+#endif
+
+void winW32Error(const char *message);
+void winW32ErrorEx(const char *message, DWORD errorcode);
 
 #endif
diff --git a/xorg-server/hw/xwin/winmultiwindowicons.c b/xorg-server/hw/xwin/winmultiwindowicons.c
index e16b2a3c8..d8df57a26 100644
--- a/xorg-server/hw/xwin/winmultiwindowicons.c
+++ b/xorg-server/hw/xwin/winmultiwindowicons.c
@@ -371,7 +371,7 @@ NetWMToWinIcon(int bpp, uint32_t *icon)
       hasIconAlphaChannel = VerifyVersionInfo(&osvi, VER_MAJORVERSION | VER_MINORVERSION, dwlConditionMask);
       versionChecked = TRUE;
 
-      ErrorF("OS has icon alpha channel support: %s\n", hasIconAlphaChannel ? "yes" : "no");
+      winDebug("OS has icon alpha channel support: %s\n", hasIconAlphaChannel ? "yes" : "no");
     }
 
   if (hasIconAlphaChannel && (bpp==32))
@@ -544,6 +544,7 @@ winUpdateIcon (Window id)
 
   pWin = (WindowPtr) LookupIDByType (id, RT_WINDOW);
   if (!pWin) return;
+  {
   winWindowPriv(pWin);
   if (pWinPriv->hWnd) {
     hIcon = winOverrideIcon ((unsigned long)pWin);
@@ -569,7 +570,7 @@ winUpdateIcon (Window id)
     hIconOld = (HICON) SendMessage (pWinPriv->hWnd,
                     WM_SETICON, ICON_SMALL, (LPARAM) hIconSmall);
     winDestroyIcon(hIconOld);
-
+  }
   }
 }
 
diff --git a/xorg-server/hw/xwin/winmultiwindowshape.c b/xorg-server/hw/xwin/winmultiwindowshape.c
index 44007027a..168a50b47 100644
--- a/xorg-server/hw/xwin/winmultiwindowshape.c
+++ b/xorg-server/hw/xwin/winmultiwindowshape.c
@@ -46,9 +46,7 @@ winSetShapeMultiWindow (WindowPtr pWin)
   ScreenPtr		pScreen = pWin->drawable.pScreen;
   winScreenPriv(pScreen);
 
-#if CYGMULTIWINDOW_DEBUG
-  ErrorF ("winSetShapeMultiWindow - pWin: %08x\n", pWin);
-#endif
+  winDebug ("winSetShapeMultiWindow - pWin: %08x\n", pWin);
   
   WIN_UNWRAP(SetShape); 
   (*pScreen->SetShape)(pWin);
@@ -71,6 +69,9 @@ winUpdateRgnMultiWindow (WindowPtr pWin)
 {
   SetWindowRgn (winGetWindowPriv(pWin)->hWnd,
 		winGetWindowPriv(pWin)->hRgn, TRUE);
+
+  /* The system now owns the region specified by the region handle and delete it when it is no longer needed. */
+  winGetWindowPriv(pWin)->hRgn = NULL;
 }
 
 
@@ -87,9 +88,7 @@ winReshapeMultiWindow (WindowPtr pWin)
   HRGN		hRgn, hRgnRect;
   winWindowPriv(pWin);
 
-#if CYGDEBUG
   winDebug ("winReshape ()\n");
-#endif
   
   /* Bail if the window is the root window */
   if (pWin->parent == NULL)
@@ -206,3 +205,14 @@ winReshapeMultiWindow (WindowPtr pWin)
   
   return;
 }
+
+void
+winShapeRgnUpdateMultiwindow(HWND hwnd)
+{
+  WindowPtr pWin = GetProp (hwnd, WIN_WINDOW_PROP);
+  if (pWin)
+    {
+      winReshapeMultiWindow(pWin);
+      winUpdateRgnMultiWindow(pWin);
+    }
+}
diff --git a/xorg-server/hw/xwin/winmultiwindowwindow.c b/xorg-server/hw/xwin/winmultiwindowwindow.c
index e2b5ed291..38f39bd7d 100644
--- a/xorg-server/hw/xwin/winmultiwindowwindow.c
+++ b/xorg-server/hw/xwin/winmultiwindowwindow.c
@@ -99,7 +99,7 @@ void winInitMultiWindowClass(void)
     wcx.hIconSm = g_hSmallIconX;
 
 #if CYGMULTIWINDOW_DEBUG
-    ErrorF ("winCreateWindowsWindow - Creating class: %s\n", WINDOW_CLASS_X);
+    winDebug ("winCreateWindowsWindow - Creating class: %s\n", WINDOW_CLASS_X);
 #endif
 
     atomXWinClass = RegisterClassEx (&wcx);
@@ -119,7 +119,7 @@ winCreateWindowMultiWindow (WindowPtr pWin)
   winScreenPriv(pScreen);
 
 #if CYGMULTIWINDOW_DEBUG
-  winTrace ("winCreateWindowMultiWindow - pWin: %p\n", pWin);
+  winDebug ("winCreateWindowMultiWindow - pWin: %p\n", pWin);
 #endif
   
   WIN_UNWRAP(CreateWindow);
@@ -149,7 +149,7 @@ winDestroyWindowMultiWindow (WindowPtr pWin)
   winScreenPriv(pScreen);
 
 #if CYGMULTIWINDOW_DEBUG
-  ErrorF ("winDestroyWindowMultiWindow - pWin: %p\n", pWin);
+  winDebug ("winDestroyWindowMultiWindow - pWin: %p\n", pWin);
 #endif
   
   WIN_UNWRAP(DestroyWindow); 
@@ -186,32 +186,26 @@ winPositionWindowMultiWindow (WindowPtr pWin, int x, int y)
   HWND hWnd = pWinPriv->hWnd;
   RECT rcNew;
   RECT rcOld;
-#if CYGMULTIWINDOW_DEBUG
+#ifdef WINDBG
   RECT rcClient;
   RECT *lpRc;
 #endif
   DWORD dwExStyle;
   DWORD dwStyle;
 
-#if CYGMULTIWINDOW_DEBUG
-  winTrace ("winPositionWindowMultiWindow - pWin: %p\n", pWin);
-#endif
+  winDebug ("winPositionWindowMultiWindow - pWin: %p\n", pWin);
   
   WIN_UNWRAP(PositionWindow);
   fResult = (*pScreen->PositionWindow)(pWin, x, y);
   WIN_WRAP(PositionWindow, winPositionWindowMultiWindow);
   
-#if CYGWINDOWING_DEBUG
-  ErrorF ("winPositionWindowMultiWindow: (x, y) = (%d, %d)\n",
+  winDebug ("winPositionWindowMultiWindow: (x, y) = (%d, %d)\n",
 	  x, y);
-#endif
 
   /* Bail out if the Windows window handle is bad */
   if (!hWnd)
     {
-#if CYGWINDOWING_DEBUG
-      ErrorF ("\timmediately return since hWnd is NULL\n");
-#endif
+      winDebug ("\timmediately return since hWnd is NULL\n");
       return fResult;
     }
 
@@ -232,7 +226,7 @@ winPositionWindowMultiWindow (WindowPtr pWin, int x, int y)
 
 #if CYGMULTIWINDOW_DEBUG
   lpRc = &rcNew;
-  ErrorF ("winPositionWindowMultiWindow - (%d ms)drawable (%d, %d)-(%d, %d)\n",
+  winDebug ("winPositionWindowMultiWindow - (%d ms)drawable (%d, %d)-(%d, %d)\n",
 	  GetTickCount (), lpRc->left, lpRc->top, lpRc->right, lpRc->bottom);
 #endif
 
@@ -250,30 +244,26 @@ winPositionWindowMultiWindow (WindowPtr pWin, int x, int y)
   GetClientRect (hWnd, &rcClient);
 
   lpRc = &rcNew;
-  ErrorF ("winPositionWindowMultiWindow - (%d ms)rcNew (%d, %d)-(%d, %d)\n",
+  winDebug ("winPositionWindowMultiWindow - (%d ms)rcNew (%d, %d)-(%d, %d)\n",
 	  GetTickCount (), lpRc->left, lpRc->top, lpRc->right, lpRc->bottom);
       
   lpRc = &rcOld;
-  ErrorF ("winPositionWindowMultiWindow - (%d ms)rcOld (%d, %d)-(%d, %d)\n",
+  winDebug ("winPositionWindowMultiWindow - (%d ms)rcOld (%d, %d)-(%d, %d)\n",
 	  GetTickCount (), lpRc->left, lpRc->top, lpRc->right, lpRc->bottom);
       
   lpRc = &rcClient;
-  ErrorF ("(%d ms)rcClient (%d, %d)-(%d, %d)\n",
+  winDebug ("(%d ms)rcClient (%d, %d)-(%d, %d)\n",
 	  GetTickCount (), lpRc->left, lpRc->top, lpRc->right, lpRc->bottom);
 #endif
 
   /* Check if the old rectangle and new rectangle are the same */
   if (!EqualRect (&rcNew, &rcOld))
     {
-#if CYGMULTIWINDOW_DEBUG
-      ErrorF ("winPositionWindowMultiWindow - Need to move\n");
-#endif
-
-#if CYGWINDOWING_DEBUG
-      ErrorF ("\tMoveWindow to (%ld, %ld) - %ldx%ld\n", rcNew.left, rcNew.top,
+      winDebug ("winPositionWindowMultiWindow - Need to move\n");
+      winDebug ("\tMoveWindow to (%ld, %ld) - %ldx%ld\n", rcNew.left, rcNew.top,
 	      rcNew.right - rcNew.left, rcNew.bottom - rcNew.top);
-#endif
-      /* Change the position and dimensions of the Windows window */
+
+        /* Change the position and dimensions of the Windows window */
       MoveWindow (hWnd,
 		  rcNew.left, rcNew.top,
 		  rcNew.right - rcNew.left, rcNew.bottom - rcNew.top,
@@ -281,9 +271,7 @@ winPositionWindowMultiWindow (WindowPtr pWin, int x, int y)
     }
   else
     {
-#if CYGMULTIWINDOW_DEBUG
-      ErrorF ("winPositionWindowMultiWindow - Not need to move\n");
-#endif
+      winDebug ("winPositionWindowMultiWindow - Not need to move\n");
     }
 
   return fResult;
@@ -301,9 +289,7 @@ winChangeWindowAttributesMultiWindow (WindowPtr pWin, unsigned long mask)
   ScreenPtr		pScreen = pWin->drawable.pScreen;
   winScreenPriv(pScreen);
 
-#if CYGMULTIWINDOW_DEBUG
-  ErrorF ("winChangeWindowAttributesMultiWindow - pWin: %08x\n", pWin);
-#endif
+  winDebug ("winChangeWindowAttributesMultiWindow - pWin: %08x\n", pWin);
   
   WIN_UNWRAP(ChangeWindowAttributes); 
   fResult = (*pScreen->ChangeWindowAttributes)(pWin, mask);
@@ -331,7 +317,7 @@ winUnmapWindowMultiWindow (WindowPtr pWin)
   winScreenPriv(pScreen);
 
 #if CYGMULTIWINDOW_DEBUG
-  ErrorF ("winUnmapWindowMultiWindow - pWin: %08x\n", pWin);
+  winDebug ("winUnmapWindowMultiWindow - pWin: %08x\n", pWin);
 #endif
   
   WIN_UNWRAP(UnrealizeWindow); 
@@ -362,7 +348,7 @@ winMapWindowMultiWindow (WindowPtr pWin)
   winScreenPriv(pScreen);
 
 #if CYGMULTIWINDOW_DEBUG
-  ErrorF ("winMapWindowMultiWindow - pWin: %08x\n", pWin);
+  winDebug ("winMapWindowMultiWindow - pWin: %08x\n", pWin);
 #endif
   
   WIN_UNWRAP(RealizeWindow); 
@@ -394,7 +380,7 @@ winReparentWindowMultiWindow (WindowPtr pWin, WindowPtr pPriorParent)
   winScreenPriv(pScreen);
 
 #if CYGMULTIWINDOW_DEBUG
-  ErrorF ("winReparentMultiWindow - pWin: %08x\n", pWin);
+  winDebug ("winReparentMultiWindow - pWin: %08x\n", pWin);
 #endif
 
   WIN_UNWRAP(ReparentWindow);
@@ -414,85 +400,22 @@ winReparentWindowMultiWindow (WindowPtr pWin, WindowPtr pPriorParent)
 void
 winRestackWindowMultiWindow (WindowPtr pWin, WindowPtr pOldNextSib)
 {
-#if 0
-  WindowPtr		pPrevWin;
-  UINT			uFlags;
-  HWND			hInsertAfter;
-  HWND                  hWnd = NULL;
-#endif
   ScreenPtr		pScreen = pWin->drawable.pScreen;
   winScreenPriv(pScreen);
 
-#if CYGMULTIWINDOW_DEBUG || CYGWINDOWING_DEBUG
-  winTrace ("winRestackMultiWindow - %08x\n", pWin);
-#endif
+  winDebug ("winRestackMultiWindow - %08x\n", pWin);
   
    WIN_UNWRAP(RestackWindow);
    if (pScreen->RestackWindow) 
      (*pScreen->RestackWindow)(pWin, pOldNextSib);
    WIN_WRAP(RestackWindow, winRestackWindowMultiWindow);
   
-#if 1
   /*
    * Calling winReorderWindowsMultiWindow here means our window manager
    * (i.e. Windows Explorer) has initiative to determine Z order.
    */
   if (pWin->nextSib != pOldNextSib)
     winReorderWindowsMultiWindow ();
-#else
-  /* Bail out if no window privates or window handle is invalid */
-  if (!pWinPriv || !pWinPriv->hWnd)
-    return;
-
-  /* Get a pointer to our previous sibling window */
-  pPrevWin = pWin->prevSib;
-
-  /*
-   * Look for a sibling window with
-   * valid privates and window handle
-   */
-  while (pPrevWin
-	 && !winGetWindowPriv(pPrevWin)
-	 && !winGetWindowPriv(pPrevWin)->hWnd)
-    pPrevWin = pPrevWin->prevSib;
-      
-  /* Check if we found a valid sibling */
-  if (pPrevWin)
-    {
-      /* Valid sibling - get handle to insert window after */
-      hInsertAfter = winGetWindowPriv(pPrevWin)->hWnd;
-      uFlags = SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOSIZE;
-  
-      hWnd = GetNextWindow (pWinPriv->hWnd, GW_HWNDPREV);
-
-      do
-	{
-	  if (GetProp (hWnd, WIN_WINDOW_PROP))
-	    {
-	      if (hWnd == winGetWindowPriv(pPrevWin)->hWnd)
-		{
-		  uFlags |= SWP_NOZORDER;
-		}
-	      break;
-	    }
-	  hWnd = GetNextWindow (hWnd, GW_HWNDPREV);
-	}
-      while (hWnd);
-    }
-  else
-    {
-      /* No valid sibling - make this window the top window */
-      hInsertAfter = HWND_TOP;
-      uFlags = SWP_NOMOVE | SWP_NOSIZE;
-    }
-      
-  /* Perform the restacking operation in Windows */
-  SetWindowPos (pWinPriv->hWnd,
-		hInsertAfter,
-		0, 0,
-		0, 0,
-		uFlags);
-#endif
 }
 
 
@@ -517,9 +440,7 @@ winCreateWindowsWindow (WindowPtr pWin)
 
   winInitMultiWindowClass();
 
-#if CYGMULTIWINDOW_DEBUG
-  ErrorF ("winCreateWindowsWindow - pWin: %08x\n", pWin);
-#endif
+  winDebug ("winCreateWindowsWindow - pWin: %08x\n", pWin);
 
   iX = pWin->drawable.x + GetSystemMetrics (SM_XVIRTUALSCREEN);
   iY = pWin->drawable.y + GetSystemMetrics (SM_YVIRTUALSCREEN);
@@ -607,7 +528,7 @@ winDestroyWindowsWindow (WindowPtr pWin)
   BOOL			oldstate = winInDestroyWindowsWindow;
   
 #if CYGMULTIWINDOW_DEBUG
-  ErrorF ("winDestroyWindowsWindow\n");
+  winDebug ("winDestroyWindowsWindow\n");
 #endif
 
   /* Bail out if the Windows window handle is invalid */
@@ -635,7 +556,7 @@ winDestroyWindowsWindow (WindowPtr pWin)
   winInDestroyWindowsWindow = oldstate;
 
 #if CYGMULTIWINDOW_DEBUG
-  ErrorF ("-winDestroyWindowsWindow\n");
+  winDebug ("-winDestroyWindowsWindow\n");
 #endif
 }
 
@@ -652,7 +573,7 @@ winUpdateWindowsWindow (WindowPtr pWin)
   HWND			hWnd = pWinPriv->hWnd;
 
 #if CYGMULTIWINDOW_DEBUG
-  ErrorF ("winUpdateWindowsWindow\n");
+  winDebug ("winUpdateWindowsWindow\n");
 #endif
 
   /* Check if the Windows window's parents have been destroyed */
@@ -681,7 +602,7 @@ winUpdateWindowsWindow (WindowPtr pWin)
     }
 
 #if CYGMULTIWINDOW_DEBUG
-  ErrorF ("-winUpdateWindowsWindow\n");
+  winDebug ("-winUpdateWindowsWindow\n");
 #endif
 }
 
@@ -700,7 +621,7 @@ winGetWindowID (WindowPtr pWin)
   FindClientResourcesByType (c, RT_WINDOW, winFindWindow, &wi);
 
 #if CYGMULTIWINDOW_DEBUG
-  ErrorF ("winGetWindowID - Window ID: %d\n", wi.id);
+  winDebug ("winGetWindowID - Window ID: %d\n", wi.id);
 #endif
 
   return wi.id;
@@ -738,17 +659,13 @@ winReorderWindowsMultiWindow (void)
   DWORD dwCurrentProcessID = GetCurrentProcessId ();
   DWORD dwWindowProcessID = 0;
 
-#if CYGMULTIWINDOW_DEBUG || CYGWINDOWING_DEBUG
-  winTrace ("winReorderWindowsMultiWindow\n");
-#endif
+  winDebug ("winReorderWindowsMultiWindow\n");
 
   if (fRestacking)
     {
       /* It is a recusive call so immediately exit */
-#if CYGWINDOWING_DEBUG
-      ErrorF ("winReorderWindowsMultiWindow - "
+      winDebug ("winReorderWindowsMultiWindow - "
 	      "exit because fRestacking == TRUE\n");
-#endif
       return;
     }
   fRestacking = TRUE;
@@ -806,9 +723,7 @@ winMinimizeWindow (Window id)
   winPrivScreenPtr pScreenPriv = NULL;
   winScreenInfo *pScreenInfo = NULL;
 
-#if CYGWINDOWING_DEBUG
-  ErrorF ("winMinimizeWindow\n");
-#endif
+  winDebug ("winMinimizeWindow\n");
 
   pWin = (WindowPtr) LookupIDByType (id, RT_WINDOW);
   if (!pWin) 
@@ -850,9 +765,8 @@ winCopyWindowMultiWindow (WindowPtr pWin, DDXPointRec oldpt,
   ScreenPtr		pScreen = pWin->drawable.pScreen;
   winScreenPriv(pScreen);
 
-#if CYGWINDOWING_DEBUG
-  ErrorF ("CopyWindowMultiWindow\n");
-#endif
+  winDebug ("CopyWindowMultiWindow\n");
+
   WIN_UNWRAP(CopyWindow); 
   (*pScreen->CopyWindow)(pWin, oldpt, oldRegion);
   WIN_WRAP(CopyWindow, winCopyWindowMultiWindow);
@@ -869,9 +783,7 @@ winMoveWindowMultiWindow (WindowPtr pWin, int x, int y,
   ScreenPtr		pScreen = pWin->drawable.pScreen;
   winScreenPriv(pScreen);
 
-#if CYGWINDOWING_DEBUG
-  ErrorF ("MoveWindowMultiWindow to (%d, %d)\n", x, y);
-#endif
+  winDebug ("MoveWindowMultiWindow to (%d, %d)\n", x, y);
 
   WIN_UNWRAP(MoveWindow); 
   (*pScreen->MoveWindow)(pWin, x, y, pSib, kind);
@@ -889,9 +801,8 @@ winResizeWindowMultiWindow (WindowPtr pWin, int x, int y, unsigned int w,
   ScreenPtr		pScreen = pWin->drawable.pScreen;
   winScreenPriv(pScreen);
 
-#if CYGWINDOWING_DEBUG
-  ErrorF ("ResizeWindowMultiWindow to (%d, %d) - %dx%d\n", x, y, w, h);
-#endif
+  winDebug ("ResizeWindowMultiWindow to (%d, %d) - %dx%d\n", x, y, w, h);
+
   WIN_UNWRAP(ResizeWindow); 
   (*pScreen->ResizeWindow)(pWin, x, y, w, h, pSib);
   WIN_WRAP(ResizeWindow, winResizeWindowMultiWindow);
@@ -921,15 +832,11 @@ winAdjustXWindow (WindowPtr pWin, HWND hwnd)
 #define WIDTH(rc) (rc.right - rc.left)
 #define HEIGHT(rc) (rc.bottom - rc.top)
   
-#if CYGWINDOWING_DEBUG
-  ErrorF ("winAdjustXWindow\n");
-#endif
+  winDebug ("winAdjustXWindow\n");
 
   if (IsIconic (hwnd))
     {
-#if CYGWINDOWING_DEBUG
-      ErrorF ("\timmediately return because the window is iconized\n");
-#endif
+      winDebug ("\timmediately return because the window is iconized\n");
       /*
        * If the Windows window is minimized, its WindowRect has
        * meaningless values so we don't adjust X window to it.
@@ -945,34 +852,26 @@ winAdjustXWindow (WindowPtr pWin, HWND hwnd)
   x = pDraw->x + GetSystemMetrics (SM_XVIRTUALSCREEN);
   y = pDraw->y + GetSystemMetrics (SM_YVIRTUALSCREEN);
   SetRect (&rcDraw, x, y, x + pDraw->width, y + pDraw->height);
-#ifdef CYGMULTIWINDOW_DEBUG
           winDebug("\tDrawable extend {%d, %d, %d, %d}, {%d, %d}\n", 
               rcDraw.left, rcDraw.top, rcDraw.right, rcDraw.bottom,
               rcDraw.right - rcDraw.left, rcDraw.bottom - rcDraw.top);
-#endif
   dwExStyle = GetWindowLongPtr (hwnd, GWL_EXSTYLE);
   dwStyle = GetWindowLongPtr (hwnd, GWL_STYLE);
-#ifdef CYGMULTIWINDOW_DEBUG
           winDebug("\tWindowStyle: %08x %08x\n", dwStyle, dwExStyle);
-#endif
   AdjustWindowRectEx (&rcDraw, dwStyle, FALSE, dwExStyle);
 
   /* The source of adjust */
   GetWindowRect (hwnd, &rcWin);
-#ifdef CYGMULTIWINDOW_DEBUG
           winDebug("\tWindow extend {%d, %d, %d, %d}, {%d, %d}\n", 
               rcWin.left, rcWin.top, rcWin.right, rcWin.bottom,
               rcWin.right - rcWin.left, rcWin.bottom - rcWin.top);
           winDebug("\tDraw extend {%d, %d, %d, %d}, {%d, %d}\n", 
               rcDraw.left, rcDraw.top, rcDraw.right, rcDraw.bottom,
               rcDraw.right - rcDraw.left, rcDraw.bottom - rcDraw.top);
-#endif
 
   if (EqualRect (&rcDraw, &rcWin)) {
     /* Bail if no adjust is needed */
-#if CYGWINDOWING_DEBUG
-    ErrorF ("\treturn because already adjusted\n");
-#endif
+    winDebug ("\treturn because already adjusted\n");
     return 0;
   }
   
@@ -992,10 +891,8 @@ winAdjustXWindow (WindowPtr pWin, HWND hwnd)
   vlist[1] = pDraw->y + dY - wBorderWidth(pWin);
   vlist[2] = pDraw->width + dW;
   vlist[3] = pDraw->height + dH;
-#if CYGWINDOWING_DEBUG
-  ErrorF ("\tConfigureWindow to (%ld, %ld) - %ldx%ld\n", vlist[0], vlist[1],
+  winDebug ("\tConfigureWindow to (%ld, %ld) - %ldx%ld\n", vlist[0], vlist[1],
 	  vlist[2], vlist[3]);
-#endif
   return ConfigureWindow (pWin, CWX | CWY | CWWidth | CWHeight,
 			  vlist, wClient(pWin));
   
diff --git a/xorg-server/hw/xwin/winmultiwindowwm.c b/xorg-server/hw/xwin/winmultiwindowwm.c
index 18d9aedc2..5e4e98b69 100644
--- a/xorg-server/hw/xwin/winmultiwindowwm.c
+++ b/xorg-server/hw/xwin/winmultiwindowwm.c
@@ -36,13 +36,18 @@
 #endif
 #include <stdio.h>
 #include <stdlib.h>
+#ifndef _MSC_VER
 #include <unistd.h>
+#endif
 #ifdef __CYGWIN__
 #include <sys/select.h>
 #endif
 #include <fcntl.h>
 #include <setjmp.h>
 #define HANDLE void *
+#ifdef _MSC_VER
+typedef int pid_t;
+#endif
 #include <pthread.h>
 #undef HANDLE
 #include <X11/X.h>
@@ -61,6 +66,7 @@
 #include "winprefs.h"
 #include "window.h"
 #include "pixmapstr.h"
+#include "winmsg.h"
 #include "windowstr.h"
 
 #ifdef XWIN_MULTIWINDOWEXTWM
@@ -75,10 +81,6 @@ extern void winDebug(const char *format, ...);
 extern void winReshapeMultiWindow(WindowPtr pWin);
 extern void winUpdateRgnMultiWindow(WindowPtr pWin);
 
-#ifndef CYGDEBUG
-#define CYGDEBUG NO
-#endif
-
 /*
  * Constant defines
  */
@@ -90,6 +92,7 @@ extern void winUpdateRgnMultiWindow(WindowPtr pWin);
 #endif
 #define WIN_JMP_OKAY		0
 #define WIN_JMP_ERROR_IO	2
+#define AUTH_NAME		"MIT-MAGIC-COOKIE-1"
 
 
 /*
@@ -139,6 +142,10 @@ typedef struct _XMsgProcArgRec {
 
 extern char *display;
 extern void ErrorF (const char* /*f*/, ...);
+#if defined(XCSECURITY)
+extern unsigned int	g_uiAuthDataLen;
+extern char		*g_pAuthData;
+#endif
 
 
 /*
@@ -155,7 +162,7 @@ static Bool
 InitQueue (WMMsgQueuePtr pQueue);
 
 static void
-GetWindowName (Display * pDpy, Window iWin, char **ppName);
+GetWindowName (Display * pDpy, Window iWin, wchar_t **ppName);
 
 static int
 SendXMessage (Display *pDisplay, Window iWin, Atom atmType, long nData);
@@ -187,11 +194,6 @@ winRedirectErrorHandler (Display *pDisplay, XErrorEvent *pErr);
 static void
 winInitMultiWindowWM (WMInfoPtr pWMInfo, WMProcArgPtr pProcArg);
 
-#if 0
-static void
-PreserveWin32Stack(WMInfoPtr pWMInfo, Window iWindow, UINT direction);
-#endif
-
 static Bool
 CheckAnotherWindowManager (Display *pDisplay, DWORD dwScreen);
 
@@ -235,46 +237,6 @@ PushMessage (WMMsgQueuePtr pQueue, WMMsgNodePtr pNode)
       pQueue->pHead = pNode;
     }
 
-
-#if 0
-  switch (pNode->msg.msg)
-    {
-    case WM_WM_MOVE:
-      ErrorF ("\tWM_WM_MOVE\n");
-      break;
-    case WM_WM_SIZE:
-      ErrorF ("\tWM_WM_SIZE\n");
-      break;
-    case WM_WM_RAISE:
-      ErrorF ("\tWM_WM_RAISE\n");
-      break;
-    case WM_WM_LOWER:
-      ErrorF ("\tWM_WM_LOWER\n");
-      break;
-    case WM_WM_MAP:
-      ErrorF ("\tWM_WM_MAP\n");
-      break;
-    case WM_WM_MAP2:
-      ErrorF ("\tWM_WM_MAP2\n");
-      break;
-    case WM_WM_MAP3:
-      ErrorF ("\tWM_WM_MAP3\n");
-      break;
-    case WM_WM_UNMAP:
-      ErrorF ("\tWM_WM_UNMAP\n");
-      break;
-    case WM_WM_KILL:
-      ErrorF ("\tWM_WM_KILL\n");
-      break;
-    case WM_WM_ACTIVATE:
-      ErrorF ("\tWM_WM_ACTIVATE\n");
-      break;
-    default:
-      ErrorF ("\tUnknown Message.\n");
-      break;
-    }
-#endif
-
   /* Increase the count of elements in the queue by one */
   ++(pQueue->nQueueSize);
 
@@ -286,7 +248,7 @@ PushMessage (WMMsgQueuePtr pQueue, WMMsgNodePtr pNode)
 }
 
 
-#if CYGMULTIWINDOW_DEBUG
+#ifdef WINDBG
 /*
  * QueueSize - Return the size of the queue
  */
@@ -338,9 +300,7 @@ PopMessage (WMMsgQueuePtr pQueue, WMInfoPtr pWMInfo)
   /* Drop the number of elements in the queue by one */
   --(pQueue->nQueueSize);
 
-#if CYGMULTIWINDOW_DEBUG
-  ErrorF ("Queue Size %d %d\n", pQueue->nQueueSize, QueueSize(pQueue));
-#endif
+  winDebug ("Queue Size %d %d\n", pQueue->nQueueSize, QueueSize(pQueue));
   
   /* Release the queue mutex */
   pthread_mutex_unlock (&pQueue->pmMutex);
@@ -392,22 +352,20 @@ InitQueue (WMMsgQueuePtr pQueue)
   /* There are no elements initially */
   pQueue->nQueueSize = 0;
 
-#if CYGMULTIWINDOW_DEBUG
-  ErrorF ("InitQueue - Queue Size %d %d\n", pQueue->nQueueSize,
+  winDebug ("InitQueue - Queue Size %d %d\n", pQueue->nQueueSize,
 	  QueueSize(pQueue));
-#endif
 
-  ErrorF ("InitQueue - Calling pthread_mutex_init\n");
+  winDebug ("InitQueue - Calling pthread_mutex_init\n");
 
   /* Create synchronization objects */
   pthread_mutex_init (&pQueue->pmMutex, NULL);
 
-  ErrorF ("InitQueue - pthread_mutex_init returned\n");
-  ErrorF ("InitQueue - Calling pthread_cond_init\n");
+  winDebug ("InitQueue - pthread_mutex_init returned\n");
+  winDebug ("InitQueue - Calling pthread_cond_init\n");
 
   pthread_cond_init (&pQueue->pcNotEmpty, NULL);
 
-  ErrorF ("InitQueue - pthread_cond_init returned\n");
+  winDebug ("InitQueue - pthread_cond_init returned\n");
 
   return TRUE;
 }
@@ -418,15 +376,15 @@ InitQueue (WMMsgQueuePtr pQueue)
  */
 
 static void
-GetWindowName (Display *pDisplay, Window iWin, char **ppName)
+GetWindowName (Display *pDisplay, Window iWin, wchar_t **ppName)
 {
   int			nResult, nNum;
   char			**ppList;
+  char			*pszReturnData;
+  int			iLen, i;
   XTextProperty		xtpName;
   
-#if CYGMULTIWINDOW_DEBUG
-  ErrorF ("GetWindowName\n");
-#endif
+  winDebug ("GetWindowName\n");
 
   /* Intialize ppName to NULL */
   *ppName = NULL;
@@ -435,47 +393,31 @@ GetWindowName (Display *pDisplay, Window iWin, char **ppName)
   nResult = XGetWMName (pDisplay, iWin, &xtpName);
   if (!nResult || !xtpName.value || !xtpName.nitems)
     {
-#if CYGMULTIWINDOW_DEBUG
       ErrorF ("GetWindowName - XGetWMName failed.  No name.\n");
-#endif
       return;
     }
-  
-  /* */
-  if (xtpName.encoding == XA_STRING)
-    {
-      /* */
-      if (xtpName.value)
-	{
-	  int size = xtpName.nitems * (xtpName.format >> 3);
-	  *ppName = malloc(size + 1);
-	  strncpy(*ppName, xtpName.value, size);
-	  (*ppName)[size] = 0;
-	  XFree (xtpName.value);
-	}
-
-#if CYGMULTIWINDOW_DEBUG
-      ErrorF ("GetWindowName - XA_STRING %s\n", *ppName);
-#endif
-    }
-  else
-    {
-      if (XmbTextPropertyToTextList (pDisplay, &xtpName, &ppList, &nNum) >= Success && nNum > 0 && *ppList)
-	{
-	  *ppName = strdup (*ppList);
-	  XFreeStringList (ppList);
-	}
-      XFree (xtpName.value);
-
-#if CYGMULTIWINDOW_DEBUG
-      ErrorF ("GetWindowName - %s %s\n",
-	      XGetAtomName (pDisplay, xtpName.encoding), *ppName);
-#endif
-    }
 
-#if CYGMULTIWINDOW_DEBUG
-  ErrorF ("GetWindowName - Returning\n");
-#endif
+   if (Xutf8TextPropertyToTextList (pDisplay, &xtpName, &ppList, &nNum) >= Success && nNum > 0 && *ppList)
+   {
+ 	iLen = 0;
+ 	for (i = 0; i < nNum; i++) iLen += strlen(ppList[i]);
+ 	pszReturnData = (char *) malloc (iLen + 1);
+ 	pszReturnData[0] = '\0';
+ 	for (i = 0; i < nNum; i++) strcat (pszReturnData, ppList[i]);
+   }
+   else
+   {
+ 	pszReturnData = (char *) malloc (1);
+ 	pszReturnData[0] = '\0';
+   }
+   iLen = MultiByteToWideChar (CP_UTF8, 0, pszReturnData, -1, NULL, 0);
+   *ppName = (wchar_t*)malloc(sizeof(wchar_t)*(iLen + 1));
+   MultiByteToWideChar (CP_UTF8, 0, pszReturnData, -1, *ppName, iLen);
+   XFree (xtpName.value);
+   if (ppList) XFreeStringList (ppList);
+   free (pszReturnData);
+
+  winDebug ("GetWindowName - Returning\n");
 }
 
 
@@ -508,7 +450,7 @@ SendXMessage (Display *pDisplay, Window iWin, Atom atmType, long nData)
 static void
 UpdateName (WMInfoPtr pWMInfo, Window iWindow)
 {
-  char			*pszName;
+  wchar_t		*pszName;
   Atom			atmType;
   int			fmtRet;
   unsigned long		items, remain;
@@ -552,7 +494,7 @@ UpdateName (WMInfoPtr pWMInfo, Window iWindow)
 			    &attr);
       if (!attr.override_redirect)
 	{
-	  SetWindowText (hWnd, pszName);
+	  SetWindowTextW (hWnd, pszName);
 	  winUpdateIcon (iWindow);
 	}
 
@@ -642,9 +584,7 @@ winMultiWindowWMProc (void *pArg)
   /* Initialize the Window Manager */
   winInitMultiWindowWM (pWMInfo, pProcArg);
   
-#if CYGMULTIWINDOW_DEBUG
-  ErrorF ("winMultiWindowWMProc ()\n");
-#endif
+  winDebug ("winMultiWindowWMProc ()\n");
 
   /* Loop until we explicity break out */
   for (;;)
@@ -667,48 +607,27 @@ winMultiWindowWMProc (void *pArg)
 	  pthread_exit (NULL);
 	}
 
-#if CYGMULTIWINDOW_DEBUG
-      ErrorF ("winMultiWindowWMProc - %d ms MSG: %d ID: %d\n",
+      winDebug ("winMultiWindowWMProc - %d ms MSG: %d ID: %d\n",
 	      GetTickCount (), (int)pNode->msg.msg, (int)pNode->msg.dwID);
-#endif
 
       /* Branch on the message type */
       switch (pNode->msg.msg)
 	{
-#if 0
-	case WM_WM_MOVE:
-	  ErrorF ("\tWM_WM_MOVE\n");
-	  break;
-
-	case WM_WM_SIZE:
-	  ErrorF ("\tWM_WM_SIZE\n");
-	  break;
-#endif
-
 	case WM_WM_RAISE:
-#if CYGMULTIWINDOW_DEBUG
-	  ErrorF ("\tWM_WM_RAISE\n");
-#endif
+	  winDebug ("\tWM_WM_RAISE\n");
 	  /* Raise the window */
 	  XRaiseWindow (pWMInfo->pDisplay, pNode->msg.iWindow);
-#if 0
-	  PreserveWin32Stack (pWMInfo, pNode->msg.iWindow, GW_HWNDPREV);
-#endif
 	  break;
 
 	case WM_WM_LOWER:
-#if CYGMULTIWINDOW_DEBUG
-	  ErrorF ("\tWM_WM_LOWER\n");
-#endif
+	  winDebug ("\tWM_WM_LOWER\n");
 
 	  /* Lower the window */
 	  XLowerWindow (pWMInfo->pDisplay, pNode->msg.iWindow);
 	  break;
 
 	case WM_WM_MAP:
-#if CYGMULTIWINDOW_DEBUG
-	  ErrorF ("\tWM_WM_MAP\n");
-#endif
+	  winDebug ("\tWM_WM_MAP\n");
 	  /* Put a note as to the HWND associated with this Window */
 	  XChangeProperty (pWMInfo->pDisplay,
 			   pNode->msg.iWindow,
@@ -720,12 +639,16 @@ winMultiWindowWMProc (void *pArg)
 			   1);
 	  UpdateName (pWMInfo, pNode->msg.iWindow);
 	  winUpdateIcon (pNode->msg.iWindow);
+	  {
+	    HWND zstyle = HWND_NOTOPMOST;
+	    winApplyHints (pWMInfo->pDisplay, pNode->msg.iWindow, pNode->msg.hwndWindow, &zstyle);
+	    winUpdateWindowPosition (pNode->msg.hwndWindow, TRUE, &zstyle);
+	  }
 	  break;
 
 	case WM_WM_MAP2:
-#if CYGMULTIWINDOW_DEBUG
-	  ErrorF ("\tWM_WM_MAP2\n");
-#endif
+	  winDebug ("\tWM_WM_MAP2\n");
+
 	  XChangeProperty (pWMInfo->pDisplay,
 			   pNode->msg.iWindow,
 			   pWMInfo->atmPrivMap,
@@ -737,9 +660,8 @@ winMultiWindowWMProc (void *pArg)
 	  break;
 
 	case WM_WM_MAP3:
-#if CYGMULTIWINDOW_DEBUG
-	  ErrorF ("\tWM_WM_MAP3\n");
-#endif
+	  winDebug ("\tWM_WM_MAP3\n");
+
 	  /* Put a note as to the HWND associated with this Window */
 	  XChangeProperty (pWMInfo->pDisplay,
 			   pNode->msg.iWindow,
@@ -759,18 +681,14 @@ winMultiWindowWMProc (void *pArg)
 	  break;
 
 	case WM_WM_UNMAP:
-#if CYGMULTIWINDOW_DEBUG
-	  ErrorF ("\tWM_WM_UNMAP\n");
-#endif
+	  winDebug ("\tWM_WM_UNMAP\n");
 	  
 	  /* Unmap the window */
 	  XUnmapWindow (pWMInfo->pDisplay, pNode->msg.iWindow);
 	  break;
 
 	case WM_WM_KILL:
-#if CYGMULTIWINDOW_DEBUG
-	  ErrorF ("\tWM_WM_KILL\n");
-#endif
+	  winDebug ("\tWM_WM_KILL\n");
 	  {
 	    int				i, n, found = 0;
 	    Atom			*protocols;
@@ -801,9 +719,7 @@ winMultiWindowWMProc (void *pArg)
 	  break;
 
 	case WM_WM_ACTIVATE:
-#if CYGMULTIWINDOW_DEBUG
-	  ErrorF ("\tWM_WM_ACTIVATE\n");
-#endif
+	  winDebug ("\tWM_WM_ACTIVATE\n");
 	  
 	  /* Set the input focus */
 	  XSetInputFocus (pWMInfo->pDisplay,
@@ -847,9 +763,7 @@ winMultiWindowWMProc (void *pArg)
   /* Free the passed-in argument */
   free (pProcArg);
   
-#if CYGMULTIWINDOW_DEBUG
-  ErrorF("-winMultiWindowWMProc ()\n");
-#endif
+  winDebug("-winMultiWindowWMProc ()\n");
   return NULL;
 }
 
@@ -872,7 +786,7 @@ winMultiWindowXMsgProc (void *pArg)
   int			iReturn;
   XIconSize		*xis;
 
-  ErrorF ("winMultiWindowXMsgProc - Hello\n");
+  winDebug ("winMultiWindowXMsgProc - Hello\n");
 
   /* Check that argument pointer is not invalid */
   if (pProcArg == NULL)
@@ -881,7 +795,7 @@ winMultiWindowXMsgProc (void *pArg)
       pthread_exit (NULL);
     }
 
-  ErrorF ("winMultiWindowXMsgProc - Calling pthread_mutex_lock ()\n");
+  winDebug ("winMultiWindowXMsgProc - Calling pthread_mutex_lock ()\n");
 
   /* Grab the server started mutex - pause until we get it */
   iReturn = pthread_mutex_lock (pProcArg->ppmServerStarted);
@@ -893,14 +807,7 @@ winMultiWindowXMsgProc (void *pArg)
       pthread_exit (NULL);
     }
 
-  ErrorF ("winMultiWindowXMsgProc - pthread_mutex_lock () returned.\n");
-
-  /* Allow multiple threads to access Xlib */
-  if (XInitThreads () == 0)
-    {
-      ErrorF ("winMultiWindowXMsgProc - XInitThreads () failed.  Exiting.\n");
-      pthread_exit (NULL);
-    }
+  winDebug ("winMultiWindowXMsgProc - pthread_mutex_lock () returned.\n");
 
   /* See if X supports the current locale */
   if (XSupportsLocale () == False)
@@ -913,7 +820,7 @@ winMultiWindowXMsgProc (void *pArg)
   /* Release the server started mutex */
   pthread_mutex_unlock (pProcArg->ppmServerStarted);
 
-  ErrorF ("winMultiWindowXMsgProc - pthread_mutex_unlock () returned.\n");
+  winDebug ("winMultiWindowXMsgProc - pthread_mutex_unlock () returned.\n");
 
   /* Set jump point for IO Error exits */
   iReturn = setjmp (g_jmpXMsgProcEntry);
@@ -942,7 +849,7 @@ winMultiWindowXMsgProc (void *pArg)
 	    512, "127.0.0.1:%s.%d", display, (int)pProcArg->dwScreen);
 
   /* Print the display connection string */
-  ErrorF ("winMultiWindowXMsgProc - DISPLAY=%s\n", pszDisplay);
+  winDebug ("winMultiWindowXMsgProc - DISPLAY=%s\n", pszDisplay);
   
   /* Initialize retry count */
   iRetries = 0;
@@ -954,7 +861,7 @@ winMultiWindowXMsgProc (void *pArg)
       pProcArg->pDisplay = XOpenDisplay (pszDisplay);
       if (pProcArg->pDisplay == NULL)
 	{
-	  ErrorF ("winMultiWindowXMsgProc - Could not open display, try: %d, "
+	  winDebug ("winMultiWindowXMsgProc - Could not open display, try: %d, "
 		  "sleeping: %d\n\f",
 		  iRetries + 1, WIN_CONNECT_DELAY);
 	  ++iRetries;
@@ -974,7 +881,7 @@ winMultiWindowXMsgProc (void *pArg)
       pthread_exit (NULL);
     }
 
-  ErrorF ("winMultiWindowXMsgProc - XOpenDisplay () returned and "
+  winDebug ("winMultiWindowXMsgProc - XOpenDisplay () returned and "
 	  "successfully opened the display.\n");
 
   /* Check if another window manager is already running */
@@ -1054,7 +961,7 @@ winMultiWindowXMsgProc (void *pArg)
       XNextEvent (pProcArg->pDisplay, &event);
 
       /* Branch on event type */
-      if (event.type == CreateNotify)
+      if (event.type == MapNotify /* CreateNotify */)
 	{
 	  XWindowAttributes	attr;
 
@@ -1067,7 +974,7 @@ winMultiWindowXMsgProc (void *pArg)
 				event.xcreatewindow.window,
 				&attr);
 
-	  if (!attr.override_redirect)
+	  if (!attr.override_redirect && attr.class != InputOnly)
 	    XSetWindowBorderWidth(pProcArg->pDisplay,
 				  event.xcreatewindow.window,
 				  0);
@@ -1098,7 +1005,7 @@ winMultiWindowXMsgProc (void *pArg)
 	       && event.xclient.message_type == atmWmChange
 	       && event.xclient.data.l[0] == IconicState)
 	{
-	  ErrorF ("winMultiWindowXMsgProc - WM_CHANGE_STATE - IconicState\n");
+	  winDebug ("winMultiWindowXMsgProc - WM_CHANGE_STATE - IconicState\n");
 
 	  memset (&msg, 0, sizeof (msg));
 
@@ -1182,9 +1089,7 @@ winInitWM (void **ppWMInfo,
       return FALSE;
     }
 
-#if CYGDEBUG || YES
   winDebug ("winInitWM - Returning.\n");
-#endif
 
   return TRUE;
 }
@@ -1201,7 +1106,7 @@ winInitMultiWindowWM (WMInfoPtr pWMInfo, WMProcArgPtr pProcArg)
   char			pszDisplay[512];
   int			iReturn;
 
-  ErrorF ("winInitMultiWindowWM - Hello\n");
+  winDebug ("winInitMultiWindowWM - Hello\n");
 
   /* Check that argument pointer is not invalid */
   if (pProcArg == NULL)
@@ -1210,7 +1115,7 @@ winInitMultiWindowWM (WMInfoPtr pWMInfo, WMProcArgPtr pProcArg)
       pthread_exit (NULL);
     }
 
-  ErrorF ("winInitMultiWindowWM - Calling pthread_mutex_lock ()\n");
+  winDebug ("winInitMultiWindowWM - Calling pthread_mutex_lock ()\n");
 
   /* Grab our garbage mutex to satisfy pthread_cond_wait */
   iReturn = pthread_mutex_lock (pProcArg->ppmServerStarted);
@@ -1222,14 +1127,7 @@ winInitMultiWindowWM (WMInfoPtr pWMInfo, WMProcArgPtr pProcArg)
       pthread_exit (NULL);
     }
 
-  ErrorF ("winInitMultiWindowWM - pthread_mutex_lock () returned.\n");
-
-  /* Allow multiple threads to access Xlib */
-  if (XInitThreads () == 0)
-    {
-      ErrorF ("winInitMultiWindowWM - XInitThreads () failed.  Exiting.\n");
-      pthread_exit (NULL);
-    }
+  winDebug ("winInitMultiWindowWM - pthread_mutex_lock () returned.\n");
 
   /* See if X supports the current locale */
   if (XSupportsLocale () == False)
@@ -1241,7 +1139,7 @@ winInitMultiWindowWM (WMInfoPtr pWMInfo, WMProcArgPtr pProcArg)
   /* Release the server started mutex */
   pthread_mutex_unlock (pProcArg->ppmServerStarted);
 
-  ErrorF ("winInitMultiWindowWM - pthread_mutex_unlock () returned.\n");
+  winDebug ("winInitMultiWindowWM - pthread_mutex_unlock () returned.\n");
 
   /* Set jump point for IO Error exits */
   iReturn = setjmp (g_jmpWMEntry);
@@ -1273,7 +1171,15 @@ winInitMultiWindowWM (WMInfoPtr pWMInfo, WMProcArgPtr pProcArg)
 	    (int) pProcArg->dwScreen);
 
   /* Print the display connection string */
-  ErrorF ("winInitMultiWindowWM - DISPLAY=%s\n", pszDisplay);
+  winDebug ("winInitMultiWindowWM - DISPLAY=%s\n", pszDisplay);
+
+#if defined(XCSECURITY)
+  /* Use our generated cookie for authentication */
+  XSetAuthorization (AUTH_NAME,
+		     strlen (AUTH_NAME),
+		     g_pAuthData,
+		     g_uiAuthDataLen);
+#endif
   
   /* Open the X display */
   do
@@ -1302,7 +1208,7 @@ winInitMultiWindowWM (WMInfoPtr pWMInfo, WMProcArgPtr pProcArg)
       pthread_exit (NULL);
     }
 
-  ErrorF ("winInitMultiWindowWM - XOpenDisplay () returned and "
+  winDebug ("winInitMultiWindowWM - XOpenDisplay () returned and "
 	  "successfully opened the display.\n");
   
 
@@ -1339,9 +1245,7 @@ winSendMessageToWM (void *pWMInfo, winWMMessagePtr pMsg)
 {
   WMMsgNodePtr pNode;
   
-#if CYGMULTIWINDOW_DEBUG
-  ErrorF ("winSendMessageToWM ()\n");
-#endif
+  winDebug ("winSendMessageToWM ()\n");
   
   pNode = (WMMsgNodePtr)malloc(sizeof(WMMsgNodeRec));
   if (pNode != NULL)
@@ -1373,7 +1277,18 @@ winMultiWindowWMErrorHandler (Display *pDisplay, XErrorEvent *pErr)
 		 pErr->error_code,
 		 pszErrorMsg,
 		 sizeof (pszErrorMsg));
-  ErrorF ("winMultiWindowWMErrorHandler - ERROR: %s\n", pszErrorMsg);
+  ErrorF ("winMultiWindowWMErrorHandler - ERROR: %s\n"
+          "  errorCode %d\n"
+          "  serial %d\n"
+          "  resourceID 0x%x\n"
+          "  majorCode %d\n"
+          "  minorCode %d\n"
+          , pszErrorMsg
+          , pErr->error_code
+          , pErr->serial
+          , pErr->resourceid
+          , pErr->request_code
+          , pErr->minor_code);
 
   return 0;
 }
@@ -1411,9 +1326,18 @@ winMultiWindowXMsgProcErrorHandler (Display *pDisplay, XErrorEvent *pErr)
 		 pErr->error_code,
 		 pszErrorMsg,
 		 sizeof (pszErrorMsg));
-#if CYGMULTIWINDOW_DEBUG
-  ErrorF ("winMultiWindowXMsgProcErrorHandler - ERROR: %s\n", pszErrorMsg);
-#endif
+  ErrorF ("winMultiWindowXMsgProcErrorHandler - ERROR: %s\n"
+          "  errorCode %d\n"
+          "  serial %d\n"
+          "  resourceID 0x%x\n"
+          "  majorCode %d\n"
+          "  minorCode %d\n"
+          , pszErrorMsg
+          , pErr->error_code
+          , pErr->serial
+          , pErr->resourceid
+          , pErr->request_code
+          , pErr->minor_code);
   
   return 0;
 }
@@ -1484,7 +1408,7 @@ CheckAnotherWindowManager (Display *pDisplay, DWORD dwScreen)
 void
 winDeinitMultiWindowWM (void)
 {
-  ErrorF ("winDeinitMultiWindowWM - Noting shutdown in progress\n");
+  winDebug ("winDeinitMultiWindowWM - Noting shutdown in progress\n");
   g_shutdown = TRUE;
 }
 
@@ -1508,6 +1432,7 @@ winApplyHints (Display *pDisplay, Window iWindow, HWND hWnd, HWND *zstyle)
   int			format;
   unsigned long		hint = 0, maxmin = 0, style, nitems = 0 , left = 0;
   WindowPtr		pWin = GetProp (hWnd, WIN_WINDOW_PROP);
+  MwmHints *mwm_hint = NULL;
 
   if (!hWnd) return;
   if (!IsWindow (hWnd)) return;
@@ -1539,7 +1464,6 @@ winApplyHints (Display *pDisplay, Window iWindow, HWND hWnd, HWND *zstyle)
   }
 
   nitems = left = 0;
-  MwmHints *mwm_hint = NULL;
   if (XGetWindowProperty(pDisplay, iWindow, motif_wm_hints, 0L,
 			 PropMwmHintsElements, False, motif_wm_hints, &type, &format,
 			 &nitems, &left, (unsigned char **)&mwm_hint) == Success)
@@ -1626,12 +1550,6 @@ winUpdateWindowPosition (HWND hWnd, Bool reshape, HWND *zstyle)
   /* Setup a rectangle with the X window position and size */
   SetRect (&rcNew, iX, iY, iX + iWidth, iY + iHeight);
 
-#if 0
-  ErrorF ("winUpdateWindowPosition - (%d, %d)-(%d, %d)\n",
-	  rcNew.left, rcNew.top,
-	  rcNew.right, rcNew.bottom);
-#endif
-
   AdjustWindowRectEx (&rcNew, GetWindowLongPtr (hWnd, GWL_STYLE), FALSE, WS_EX_APPWINDOW);
 
   /* Don't allow window decoration to disappear off to top-left as a result of this adjustment */
@@ -1649,12 +1567,6 @@ winUpdateWindowPosition (HWND hWnd, Bool reshape, HWND *zstyle)
       rcNew.bottom += iDy;
     }
 
-#if 0
-  ErrorF ("winUpdateWindowPosition - (%d, %d)-(%d, %d)\n",
-	  rcNew.left, rcNew.top,
-	  rcNew.right, rcNew.bottom);
-#endif
-
   /* Position the Windows window */
   SetWindowPos (hWnd, *zstyle, rcNew.left, rcNew.top,
 	rcNew.right - rcNew.left, rcNew.bottom - rcNew.top,
diff --git a/xorg-server/hw/xwin/winmultiwindowwndproc.c b/xorg-server/hw/xwin/winmultiwindowwndproc.c
index 543a1652f..3a08f70f1 100644
--- a/xorg-server/hw/xwin/winmultiwindowwndproc.c
+++ b/xorg-server/hw/xwin/winmultiwindowwndproc.c
@@ -42,6 +42,13 @@
 #include "winmsg.h"
 #include "inputstr.h"
 
+#ifdef XKB
+#ifndef XKB_IN_SERVER
+#define XKB_IN_SERVER
+#endif
+#include <xkbsrv.h>
+#endif
+
 /*
  * External global variables
  */
@@ -282,11 +289,11 @@ static void winRaiseWindow(WindowPtr pWin)
   if (!winInDestroyWindowsWindow && !winInRaiseWindow)
   {
     BOOL oldstate = winInRaiseWindow;
+    XID vlist[1] = { 0 };
     winInRaiseWindow = TRUE;
     /* Call configure window directly to make sure it gets processed 
      * in time
      */
-    XID vlist[1] = { 0 };
     ConfigureWindow(pWin, CWStackMode, vlist, serverClient); 
     winInRaiseWindow = oldstate;
   }
@@ -331,9 +338,7 @@ winTopLevelWindowProc (HWND hwnd, UINT message,
   Bool			needRestack = FALSE;
   LRESULT		ret;
 
-#if CYGDEBUG
   winDebugWin32Message("winTopLevelWindowProc", hwnd, message, wParam, lParam);
-#endif
   
   /* Check if the Windows window property for our X window pointer is valid */
   if ((pWin = GetProp (hwnd, WIN_WINDOW_PROP)) != NULL)
@@ -366,38 +371,15 @@ winTopLevelWindowProc (HWND hwnd, UINT message,
 
       fWMMsgInitialized = TRUE;
 
-#if 0
-      /*
-       * Print some debugging information
-       */
-
-      ErrorF ("hWnd %08X\n", hwnd);
-      ErrorF ("pWin %08X\n", pWin);
-      ErrorF ("pDraw %08X\n", pDraw);
-      ErrorF ("\ttype %08X\n", pWin->drawable.type);
-      ErrorF ("\tclass %08X\n", pWin->drawable.class);
-      ErrorF ("\tdepth %08X\n", pWin->drawable.depth);
-      ErrorF ("\tbitsPerPixel %08X\n", pWin->drawable.bitsPerPixel);
-      ErrorF ("\tid %08X\n", pWin->drawable.id);
-      ErrorF ("\tx %08X\n", pWin->drawable.x);
-      ErrorF ("\ty %08X\n", pWin->drawable.y);
-      ErrorF ("\twidth %08X\n", pWin->drawable.width);
-      ErrorF ("\thenght %08X\n", pWin->drawable.height);
-      ErrorF ("\tpScreen %08X\n", pWin->drawable.pScreen);
-      ErrorF ("\tserialNumber %08X\n", pWin->drawable.serialNumber);
-      ErrorF ("g_iWindowPrivateKey %p\n", g_iWindowPrivateKey);
-      ErrorF ("pWinPriv %08X\n", pWinPriv);
-      ErrorF ("s_pScreenPriv %08X\n", s_pScreenPriv);
-      ErrorF ("s_pScreenInfo %08X\n", s_pScreenInfo);
-      ErrorF ("hwndScreen %08X\n", hwndScreen);
-#endif
     }
 
   /* Branch on message type */
   switch (message)
     {
     case WM_CREATE:
-
+{
+      RECT rWindow;
+      HRGN hRgnWindow;
       /* */
       SetProp (hwnd,
 	       WIN_WINDOW_PROP,
@@ -416,15 +398,13 @@ winTopLevelWindowProc (HWND hwnd, UINT message,
       winReorderWindowsMultiWindow ();
 
       /* Fix a 'round title bar corner background should be transparent not black' problem when first painted */
-      RECT rWindow;
-      HRGN hRgnWindow;
       GetWindowRect(hwnd, &rWindow);
       hRgnWindow = CreateRectRgnIndirect(&rWindow);
       SetWindowRgn (hwnd, hRgnWindow, TRUE);
       DeleteObject(hRgnWindow);
 
-      SetWindowLongPtr(hwnd, GWLP_USERDATA, (LONG_PTR)XMING_SIGNATURE);
-
+      SetWindowLongPtr(hwnd, GWLP_USERDATA, (LONG_PTR)VCXSRV_SIGNATURE);
+}
       return 0;
 
     case WM_INIT_SYS_MENU:
@@ -739,7 +719,7 @@ winTopLevelWindowProc (HWND hwnd, UINT message,
       if (wParam == VK_F4 && (GetKeyState (VK_MENU) & 0x8000))
 	  break;
 
-#if CYGWINDOWING_DEBUG
+#ifdef WINDBG
       if (wParam == VK_ESCAPE)
 	{
 	  /* Place for debug: put any tests and dumps here */
@@ -750,27 +730,27 @@ winTopLevelWindowProc (HWND hwnd, UINT message,
 	  windPlace.length = sizeof (WINDOWPLACEMENT);
 	  GetWindowPlacement (hwnd, &windPlace);
 	  pRect = &windPlace.rcNormalPosition;
-	  ErrorF ("\nCYGWINDOWING Dump:\n"
+	  winDebug ("\nCYGWINDOWING Dump:\n"
 		  "\tdrawable: (%hd, %hd) - %hdx%hd\n", pDraw->x,
 		  pDraw->y, pDraw->width, pDraw->height);
-	  ErrorF ("\twindPlace: (%ld, %ld) - %ldx%ld\n", pRect->left,
+	  winDebug ("\twindPlace: (%ld, %ld) - %ldx%ld\n", pRect->left,
 		  pRect->top, pRect->right - pRect->left,
 		  pRect->bottom - pRect->top);
 	  if (GetClientRect (hwnd, &rc))
 	    {
 	      pRect = &rc;
-	      ErrorF ("\tClientRect: (%ld, %ld) - %ldx%ld\n", pRect->left,
+	      winDebug ("\tClientRect: (%ld, %ld) - %ldx%ld\n", pRect->left,
 		      pRect->top, pRect->right - pRect->left,
 		      pRect->bottom - pRect->top);
 	    }
 	  if (GetWindowRect (hwnd, &rc))
 	    {
 	      pRect = &rc;
-	      ErrorF ("\tWindowRect: (%ld, %ld) - %ldx%ld\n", pRect->left,
+	      winDebug ("\tWindowRect: (%ld, %ld) - %ldx%ld\n", pRect->left,
 		      pRect->top, pRect->right - pRect->left,
 		      pRect->bottom - pRect->top);
 	    }
-	  ErrorF ("\n");
+	  winDebug ("\n");
 	}
 #endif
       
@@ -845,7 +825,7 @@ winTopLevelWindowProc (HWND hwnd, UINT message,
       /* Branch on if the window was killed in X already */
       if (pWinPriv && !pWinPriv->fXKilled)
 	{
-	  ErrorF ("winTopLevelWindowProc - WM_DESTROY - WM_WM_KILL\n");
+	  winDebug ("winTopLevelWindowProc - WM_DESTROY - WM_WM_KILL\n");
 	  
 	  /* Tell our Window Manager thread to kill the window */
 	  wmMsg.msg = WM_WM_KILL;
@@ -897,13 +877,11 @@ winTopLevelWindowProc (HWND hwnd, UINT message,
 	}
       else /* It is an overridden window so make it top of Z stack */
 	{
-#if CYGWINDOWING_DEBUG
-	  ErrorF ("overridden window is shown\n");
-#endif
 	  HWND forHwnd = GetForegroundWindow();
+	  winDebug ("overridden window is shown\n");
 	  if (forHwnd != NULL)
 	  {
-	    if (GetWindowLongPtr(forHwnd, GWLP_USERDATA) & (LONG_PTR)XMING_SIGNATURE)
+	    if (GetWindowLongPtr(forHwnd, GWLP_USERDATA) & (LONG_PTR)VCXSRV_SIGNATURE)
 	    {
 	      if (GetWindowLongPtr(forHwnd, GWL_EXSTYLE) & WS_EX_TOPMOST)
 		SetWindowPos (hwnd, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE);
@@ -989,7 +967,7 @@ winTopLevelWindowProc (HWND hwnd, UINT message,
 
     case WM_SIZE:
       /* see dix/window.c */
-#if CYGWINDOWING_DEBUG
+#ifdef WINDBG
       {
 	char buf[64];
 	switch (wParam)
@@ -1006,24 +984,34 @@ winTopLevelWindowProc (HWND hwnd, UINT message,
 	  default:
 	    strcpy(buf, "UNKNOWN_FLAG");
 	  }
-	ErrorF ("winTopLevelWindowProc - WM_SIZE to %dx%d (%s) - %d ms\n",
+	winDebug ("winTopLevelWindowProc - WM_SIZE to %dx%d (%s) - %d ms\n",
 		(int)LOWORD(lParam), (int)HIWORD(lParam), buf,
 		(int)(GetTickCount ()));
       }
 #endif
       /* Adjust the X Window to the moved Windows window */
       winAdjustXWindow (pWin, hwnd);
+      if (wParam == SIZE_MINIMIZED) winReorderWindowsMultiWindow();
       return 0; /* end of WM_SIZE handler */
 
+    case WM_STYLECHANGED:
+      /* when the style changes, adjust the window size so the client area remains the same */
+      {
+	LONG x,y;
+	DrawablePtr pDraw = &pWin->drawable;
+	x =  pDraw->x - wBorderWidth(pWin);
+	y = pDraw->y - wBorderWidth(pWin);
+	winPositionWindowMultiWindow(pWin, x, y);
+      }
+      return 0;
+
     case WM_MOUSEACTIVATE:
 
       /* Check if this window needs to be made active when clicked */
       if (!GetProp (pWinPriv->hWnd, WIN_NEEDMANAGE_PROP))
 	{
-#if CYGMULTIWINDOW_DEBUG
-	  ErrorF ("winTopLevelWindowProc - WM_MOUSEACTIVATE - "
+	  winDebug ("winTopLevelWindowProc - WM_MOUSEACTIVATE - "
 		  "MA_NOACTIVATE\n");
-#endif
 
 	  /* */
 	  return MA_NOACTIVATE;
diff --git a/xorg-server/hw/xwin/winnativegdi.c b/xorg-server/hw/xwin/winnativegdi.c
index 48a467a2c..f7e13a712 100644
--- a/xorg-server/hw/xwin/winnativegdi.c
+++ b/xorg-server/hw/xwin/winnativegdi.c
@@ -111,7 +111,7 @@ winCloseScreenNativeGDI (int nIndex, ScreenPtr pScreen)
   winScreenPriv(pScreen);
   winScreenInfo		*pScreenInfo = pScreenPriv->pScreenInfo;
 
-  ErrorF ("winCloseScreenNativeGDI - Freeing screen resources\n");
+  winDebug ("winCloseScreenNativeGDI - Freeing screen resources\n");
 
   /* Flag that the screen is closed */
   pScreenPriv->fClosed = TRUE;
@@ -125,7 +125,7 @@ winCloseScreenNativeGDI (int nIndex, ScreenPtr pScreen)
   /* Delete the window property */
   RemoveProp (pScreenPriv->hwndScreen, WIN_SCR_PROP);
   
-  ErrorF ("winCloseScreenNativeGDI - Destroying window\n");
+  winDebug ("winCloseScreenNativeGDI - Destroying window\n");
   
   /* Delete tray icon, if we have one */
   if (!pScreenInfo->fNoTrayIcon)
@@ -151,7 +151,7 @@ winCloseScreenNativeGDI (int nIndex, ScreenPtr pScreen)
   /* Free the screen privates for this screen */
   free (pScreenPriv);
 
-  ErrorF ("winCloseScreenNativeGDI - Returning\n");
+  winDebug ("winCloseScreenNativeGDI - Returning\n");
 
   return TRUE;
 }
@@ -210,7 +210,7 @@ winInitVisualsNativeGDI (ScreenPtr pScreen)
     }
 
   /* Tell the user how many bits per RGB we are using */
-  ErrorF ("winInitVisualsNativeGDI - Using dwBitsPerRGB: %d\n",
+  winDebug ("winInitVisualsNativeGDI - Using dwBitsPerRGB: %d\n",
 	  (int) pScreenPriv->dwBitsPerRGB);
 
   /* Create a single visual according to the Windows screen depth */
@@ -233,7 +233,7 @@ winInitVisualsNativeGDI (ScreenPtr pScreen)
       break;
 
     case 8:
-      ErrorF ("winInitVisuals - Calling miSetVisualTypesAndMasks\n");
+      winDebug ("winInitVisuals - Calling miSetVisualTypesAndMasks\n");
       if (!miSetVisualTypesAndMasks (pScreenInfo->dwDepth,
 				     StaticColorMask,
 				     pScreenPriv->dwBitsPerRGB,
@@ -252,9 +252,7 @@ winInitVisualsNativeGDI (ScreenPtr pScreen)
       return FALSE;
     }
 
-#if 1
-  ErrorF ("winInitVisualsNativeGDI - Returning\n");
-#endif
+  winDebug ("winInitVisualsNativeGDI - Returning\n");
 
   return TRUE;
 }
@@ -300,7 +298,7 @@ winAdjustVideoModeNativeGDI (ScreenPtr pScreen)
   if (pScreenInfo->dwBPP == WIN_DEFAULT_BPP)
     {
       /* No -depth parameter passed, let the user know the depth being used */
-      ErrorF ("winAdjustVideoModeNativeGDI - Using Windows display "
+      winDebug ("winAdjustVideoModeNativeGDI - Using Windows display "
 	      "depth of %d bits per pixel, %d depth\n",
 	      (int) dwBPP, (int) pScreenInfo->dwDepth);
 
@@ -310,7 +308,7 @@ winAdjustVideoModeNativeGDI (ScreenPtr pScreen)
   else if (dwBPP != pScreenInfo->dwBPP)
     {
       /* Warn user if GDI depth is different than -depth parameter */
-      ErrorF ("winAdjustVideoModeNativeGDI - Command line bpp: %d, "\
+      winDebug ("winAdjustVideoModeNativeGDI - Command line bpp: %d, "\
 	      "using bpp: %d\n",
 	      (int) pScreenInfo->dwBPP, (int) dwBPP);
 
diff --git a/xorg-server/hw/xwin/winpfbdd.c b/xorg-server/hw/xwin/winpfbdd.c
index 13fc1058d..6c0c2bffd 100644
--- a/xorg-server/hw/xwin/winpfbdd.c
+++ b/xorg-server/hw/xwin/winpfbdd.c
@@ -83,7 +83,7 @@ winAllocateFBPrimaryDD (ScreenPtr pScreen)
   DDSURFACEDESC		*pddsdOffscreen = NULL;
   RECT			rcClient;
 
-  ErrorF ("winAllocateFBPrimaryDD\n");
+  winDebug ("winAllocateFBPrimaryDD\n");
 
   /* Get client area location in screen coords */
   GetClientRect (pScreenPriv->hwndScreen, &rcClient);
@@ -108,7 +108,7 @@ winAllocateFBPrimaryDD (ScreenPtr pScreen)
     }
 
 
-  ErrorF ("winAllocateFBPrimaryDD - Created and initialized DD\n");
+  winDebug ("winAllocateFBPrimaryDD - Created and initialized DD\n");
 
   /* Are we windowed or fullscreen? */
   if (pScreenInfo->fFullScreen)
@@ -159,7 +159,7 @@ winAllocateFBPrimaryDD (ScreenPtr pScreen)
        FatalError ("winAllocateFBPrimaryDD - Could not create primary "
 		  "surface %08x\n", (unsigned int) ddrval);
 
-  ErrorF ("winAllocateFBPrimaryDD - Created primary\n");
+  winDebug ("winAllocateFBPrimaryDD - Created primary\n");
 
   /* Allocate a DD surface description for our screen privates */
   pddsdPrimary = pScreenPriv->pddsdPrimary
@@ -195,7 +195,7 @@ winAllocateFBPrimaryDD (ScreenPtr pScreen)
     FatalError ("winAllocateFBPrimaryDD - Could not create shadow "
 		"surface\n");
   
-  ErrorF ("winAllocateFBPrimaryDD - Created offscreen\n");
+  winDebug ("winAllocateFBPrimaryDD - Created offscreen\n");
 
   /* Allocate a DD surface description for our screen privates */
   pddsdOffscreen = pScreenPriv->pddsdOffscreen
@@ -206,7 +206,7 @@ winAllocateFBPrimaryDD (ScreenPtr pScreen)
   ZeroMemory (pddsdOffscreen, sizeof (*pddsdOffscreen));
   pddsdOffscreen->dwSize = sizeof (*pddsdOffscreen);
 
-  ErrorF ("winAllocateFBPrimaryDD - Locking primary\n");
+  winDebug ("winAllocateFBPrimaryDD - Locking primary\n");
 
   /* Lock the primary surface */
   ddrval = IDirectDrawSurface2_Lock (pScreenPriv->pddsPrimary,
@@ -218,7 +218,7 @@ winAllocateFBPrimaryDD (ScreenPtr pScreen)
     FatalError ("winAllocateFBPrimaryDD - Could not lock "
 		"primary surface\n");
 
-  ErrorF ("winAllocateFBPrimaryDD - Locked primary\n");
+  winDebug ("winAllocateFBPrimaryDD - Locked primary\n");
 
   /* We don't know how to deal with anything other than RGB */
   if (!(pddsdPrimary->ddpfPixelFormat.dwFlags & DDPF_RGB))
@@ -236,7 +236,7 @@ winAllocateFBPrimaryDD (ScreenPtr pScreen)
   pScreenPriv->dwGreenMask = pddsdPrimary->ddpfPixelFormat.u3.dwGBitMask;
   pScreenPriv->dwBlueMask = pddsdPrimary->ddpfPixelFormat.u4.dwBBitMask;
 
-  ErrorF ("winAllocateFBPrimaryDD - Returning\n");
+  winDebug ("winAllocateFBPrimaryDD - Returning\n");
 
   return TRUE;
 }
@@ -255,7 +255,7 @@ winCloseScreenPrimaryDD (int nIndex, ScreenPtr pScreen)
   winScreenInfo		*pScreenInfo = pScreenPriv->pScreenInfo;
   Bool			fReturn;
   
-  ErrorF ("winCloseScreenPrimaryDD - Freeing screen resources\n");
+  winDebug ("winCloseScreenPrimaryDD - Freeing screen resources\n");
 
   /* Flag that the screen is closed */
   pScreenPriv->fClosed = TRUE;
@@ -351,7 +351,7 @@ winInitVisualsPrimaryDD (ScreenPtr pScreen)
   else
     pScreenPriv->dwBitsPerRGB = dwBlueBits;
   
-  ErrorF ("winInitVisualsPrimaryDD - Masks: %08x %08x %08x bpRGB: %d\n",
+  winDebug ("winInitVisualsPrimaryDD - Masks: %08x %08x %08x bpRGB: %d\n",
 	  (unsigned int) pScreenPriv->dwRedMask,
 	  (unsigned int) pScreenPriv->dwGreenMask,
 	  (unsigned int) pScreenPriv->dwBlueMask,
@@ -378,9 +378,7 @@ winInitVisualsPrimaryDD (ScreenPtr pScreen)
       break;
 
     case 8:
-#if CYGDEBUG
       winDebug ("winInitVisuals - Calling miSetVisualTypesAndMasks\n");
-#endif /* CYGDEBUG */
       if (!miSetVisualTypesAndMasks (pScreenInfo->dwDepth,
 				     PseudoColorMask,
 				     pScreenPriv->dwBitsPerRGB,
@@ -393,10 +391,8 @@ winInitVisualsPrimaryDD (ScreenPtr pScreen)
 		  "miSetVisualTypesAndMasks failed\n");
 	  return FALSE;
 	}
-#if CYGDEBUG
       winDebug ("winInitVisualsPrimaryDD - Returned from "
 	      "miSetVisualTypesAndMasks\n");
-#endif /* CYGDEBUG */
       break;
 
     default:
@@ -404,7 +400,7 @@ winInitVisualsPrimaryDD (ScreenPtr pScreen)
       return FALSE;
     }
 
-  ErrorF ("winInitVisualsPrimaryDD - Returning\n");
+  winDebug ("winInitVisualsPrimaryDD - Returning\n");
 
   return TRUE;
 }
@@ -433,7 +429,7 @@ winAdjustVideoModePrimaryDD (ScreenPtr pScreen)
   if (pScreenInfo->dwBPP == WIN_DEFAULT_BPP)
     {
       /* No -depth parameter passed, let the user know the depth being used */
-      ErrorF ("winAdjustVideoModePrimaryDD - Using Windows display "
+      winDebug ("winAdjustVideoModePrimaryDD - Using Windows display "
 	      "depth of %d bits per pixel\n", (int) dwBPP);
 
       /* Use GDI's depth */
@@ -443,13 +439,13 @@ winAdjustVideoModePrimaryDD (ScreenPtr pScreen)
 	   && pScreenInfo->dwBPP != dwBPP)
     {
       /* FullScreen, and GDI depth differs from -depth parameter */
-      ErrorF ("winAdjustVideoModePrimaryDD - FullScreen, using command "
+      winDebug ("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 "
+      winDebug ("winAdjustVideoModePrimaryDD - Windowed, command line "
 	      "depth: %d, using depth: %d\n",
 	      (int) pScreenInfo->dwBPP, (int) dwBPP);
 
@@ -567,7 +563,7 @@ winHotKeyAltTabPrimaryDD (ScreenPtr pScreen)
   RECT			rcClient, rcSrc;
   HRESULT		ddrval = DD_OK;
 
-  ErrorF ("\nwinHotKeyAltTabPrimaryDD\n\n");
+  winDebug ("\nwinHotKeyAltTabPrimaryDD\n\n");
 
   /* Alt+Tab was pressed, we will lose focus very soon */
   pScreenPriv->fActive = FALSE;
diff --git a/xorg-server/hw/xwin/winpixmap.c b/xorg-server/hw/xwin/winpixmap.c
index 050c71a7f..e5b36a000 100644
--- a/xorg-server/hw/xwin/winpixmap.c
+++ b/xorg-server/hw/xwin/winpixmap.c
@@ -70,11 +70,9 @@ winCreatePixmapNativeGDI (ScreenPtr pScreen,
       return NullPixmap;
     }
 
-#if CYGDEBUG
   winDebug ("winCreatePixmap () - w %d h %d d %d uh %d bw %d\n",
 	  iWidth, iHeight, iDepth, usage_hint,
 	  PixmapBytePad (iWidth, iDepth));
-#endif
 
   /* Setup pixmap values */
   pPixmap->drawable.type = DRAWABLE_PIXMAP;
@@ -114,11 +112,9 @@ winCreatePixmapNativeGDI (ScreenPtr pScreen,
 						&pPixmapPriv->pbBits,
 						(BITMAPINFO **) &pPixmapPriv->pbmih);
 
-#if CYGDEBUG
   winDebug ("winCreatePixmap () - Created a pixmap %08x, %dx%dx%d, for " \
 	  "screen: %08x\n",
 	  pPixmapPriv->hBitmap, iWidth, iHeight, iDepth, pScreen);
-#endif
 
   return pPixmap;
 }
@@ -135,9 +131,7 @@ winDestroyPixmapNativeGDI (PixmapPtr pPixmap)
 {
   winPrivPixmapPtr		pPixmapPriv = NULL;
   
-#if CYGDEBUG
   winDebug ("winDestroyPixmapNativeGDI ()\n");
-#endif
 
   /* Bail early if there is not a pixmap to destroy */
   if (pPixmap == NULL)
@@ -149,10 +143,8 @@ winDestroyPixmapNativeGDI (PixmapPtr pPixmap)
   /* Get a handle to the pixmap privates */
   pPixmapPriv = winGetPixmapPriv (pPixmap);
 
-#if CYGDEBUG
   winDebug ("winDestroyPixmapNativeGDI - pPixmapPriv->hBitmap: %08x\n",
 	  pPixmapPriv->hBitmap);
-#endif
 
   /* Decrement reference count, return if nonzero */
   --pPixmap->refcnt;
@@ -193,43 +185,3 @@ winModifyPixmapHeaderNativeGDI (PixmapPtr pPixmap,
   return TRUE;
 }
 
-
-#if 0
-/* 
- * Not used yet.
- * See cfb/cfbpixmap.c
- */
-
-static void
-winXRotatePixmapNativeGDI (PixmapPtr pPix, int rw)
-{
-  ErrorF ("winXRotatePixmap()\n");
-  /* fill in this function, look at CFB */
-}
-
-
-/*
- * Not used yet.
- * See cfb/cfbpixmap.c
- */
-static void
-winYRotatePixmapNativeGDI (PixmapPtr pPix, int rh)
-{
-  ErrorF ("winYRotatePixmap()\n");
-  /* fill in this function, look at CFB */
-}
-
-
-/* 
- * Not used yet.
- * See cfb/cfbpixmap.c
- */
-
-static void
-winCopyRotatePixmapNativeGDI (PixmapPtr psrcPix, PixmapPtr *ppdstPix,
-			      int xrot, int yrot)
-{
-  ErrorF ("winCopyRotatePixmap()\n");
-  /* fill in this function, look at CFB */
-}
-#endif
diff --git a/xorg-server/hw/xwin/winpolyline.c b/xorg-server/hw/xwin/winpolyline.c
index db9dd345b..bf98d73ec 100644
--- a/xorg-server/hw/xwin/winpolyline.c
+++ b/xorg-server/hw/xwin/winpolyline.c
@@ -45,7 +45,7 @@ winPolyLineNativeGDI (DrawablePtr	pDrawable,
     {
     case LineSolid:
       if (pGC->lineWidth == 0)
-	return miZeroLine (pDrawable, pGC, mode, npt, ppt);
+	miZeroLine (pDrawable, pGC, mode, npt, ppt);
       else
 	miWideLine (pDrawable, pGC, mode, npt, ppt);
       break;
diff --git a/xorg-server/hw/xwin/winprefs.c b/xorg-server/hw/xwin/winprefs.c
index d5bceb928..1d94ec206 100644
--- a/xorg-server/hw/xwin/winprefs.c
+++ b/xorg-server/hw/xwin/winprefs.c
@@ -723,7 +723,7 @@ winIconIsOverride(unsigned hiconIn)
 
 
 /*
- * Try and open ~/.XWinrc and /usr/X11R6/lib/X11/system.XWinrc
+ * Try and open ~/.XWinrc and system.XWinrc
  * Load it into prefs structure for use by other functions
  */
 void
@@ -753,7 +753,9 @@ LoadPreferences (void)
       
       prefFile = fopen (fname, "r");
       if (prefFile)
-	ErrorF ("winPrefsLoadPreferences: %s\n", fname);
+      {
+	winDebug ("winPrefsLoadPreferences: %s\n", fname);
+      }
     }
 
   /* No home file found, check system default */
@@ -763,12 +765,14 @@ LoadPreferences (void)
 #ifdef RELOCATE_PROJECTROOT
       snprintf(buffer, sizeof(buffer), "%s\\system.XWinrc", winGetBaseDir());
 #else
-      strncpy(buffer, PROJECTROOT"/lib/X11/system.XWinrc", sizeof(buffer));
+      strncpy(buffer, SYSCONFDIR"/X11/system.XWinrc", sizeof(buffer));
 #endif
       buffer[sizeof(buffer)-1] = 0;
       prefFile = fopen (buffer, "r");
       if (prefFile)
-	ErrorF ("winPrefsLoadPreferences: %s\n", buffer);
+      {
+	winDebug ("winPrefsLoadPreferences: %s\n", buffer);
+      }
     }
 
   /* If we could open it, then read the settings and close it */
diff --git a/xorg-server/hw/xwin/winprefs.h b/xorg-server/hw/xwin/winprefs.h
index 6d641da6a..abfc7434e 100644
--- a/xorg-server/hw/xwin/winprefs.h
+++ b/xorg-server/hw/xwin/winprefs.h
@@ -178,6 +178,9 @@ winOverrideIcon (unsigned long longpWin);
 unsigned long
 winOverrideStyle (unsigned long longpWin);
 
+unsigned long
+winOverrideStyle (unsigned long longpWin);
+
 HICON
 winTaskbarIcon(void);
 
diff --git a/xorg-server/hw/xwin/winprefsyacc.c b/xorg-server/hw/xwin/winprefsyacc.c
index 1255887c3..a8dee20dc 100644
--- a/xorg-server/hw/xwin/winprefsyacc.c
+++ b/xorg-server/hw/xwin/winprefsyacc.c
@@ -59,6 +59,9 @@
 
 /* Pull parsers.  */
 #define YYPULL 1
+#ifdef DEBUG
+#undef DEBUG
+#endif
 
 /* Using locations.  */
 #define YYLSP_NEEDED 0
@@ -110,6 +113,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include "winprefs.h"
+#include "winmsg.h"
 
 /* The following give better error messages in bison at the cost of a few KB */
 #define YYERROR_VERBOSE 1
@@ -414,15 +418,15 @@ YYID (yyi)
 #  endif
 #  ifndef YYMALLOC
 #   define YYMALLOC malloc
-#   if ! defined malloc && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
+#   if ! defined malloc  && !defined _MSC_VER && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus)
 void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */
 #   endif
 #  endif
 #  ifndef YYFREE
 #   define YYFREE free
-#   if ! defined free && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
+#   if ! defined free && !defined _MSC_VER && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus)
 void free (void *); /* INFRINGES ON USER NAME SPACE */
 #   endif
 #  endif
@@ -1818,7 +1822,7 @@ yyreduce:
 
 /* Line 1455 of yacc.c  */
 #line 218 "winprefsyacc.y"
-    { ErrorF("LoadPreferences: %s\n", (yyvsp[(2) - (3)].sVal)); free((yyvsp[(2) - (3)].sVal)); }
+    { winDebug("LoadPreferences: %s\n", (yyvsp[(2) - (3)].sVal)); free((yyvsp[(2) - (3)].sVal)); }
     break;
 
 
@@ -2144,7 +2148,7 @@ static void
 OpenIcons (void)
 {
   if (pref.icon != NULL) {
-    ErrorF("LoadPreferences: Redefining icon mappings\n");
+    winDebug("LoadPreferences: Redefining icon mappings\n");
     free(pref.icon);
     pref.icon = NULL;
   }
@@ -2180,7 +2184,7 @@ static void
 OpenStyles (void)
 {
   if (pref.style != NULL) {
-    ErrorF("LoadPreferences: Redefining window style\n");
+    winDebug("LoadPreferences: Redefining window style\n");
     free(pref.style);
     pref.style = NULL;
   }
@@ -2213,7 +2217,7 @@ static void
 OpenSysMenu (void)
 {
   if (pref.sysMenu != NULL) {
-    ErrorF("LoadPreferences: Redefining system menu\n");
+    winDebug("LoadPreferences: Redefining system menu\n");
     free(pref.sysMenu);
     pref.sysMenu = NULL;
   }
diff --git a/xorg-server/hw/xwin/winprefsyacc.h b/xorg-server/hw/xwin/winprefsyacc.h
index a9e5d0c2b..920e96475 100644
--- a/xorg-server/hw/xwin/winprefsyacc.h
+++ b/xorg-server/hw/xwin/winprefsyacc.h
@@ -35,6 +35,10 @@
 
 /* Tokens.  */
 #ifndef YYTOKENTYPE
+#ifdef DEBUG
+#undef DEBUG
+#endif
+
 # define YYTOKENTYPE
    /* Put the tokens into the symbol table, so that GDB and other debuggers
       know about them.  */
diff --git a/xorg-server/hw/xwin/winpriv.c b/xorg-server/hw/xwin/winpriv.c
index 29221cf2b..9dbeade89 100644
--- a/xorg-server/hw/xwin/winpriv.c
+++ b/xorg-server/hw/xwin/winpriv.c
@@ -126,7 +126,7 @@ extern void winGetWindowInfo(WindowPtr pWin, winWindowInfoPtr pWinInfo)
             return;
         }
 
-        ErrorF("winGetWindowInfo: returning root window\n");
+        winDebug("winGetWindowInfo: returning root window\n");
 
         pWinInfo->hwnd = pWinScreen->hwndScreen;
     }
diff --git a/xorg-server/hw/xwin/winprocarg.c b/xorg-server/hw/xwin/winprocarg.c
index f20598db9..995ed031e 100644
--- a/xorg-server/hw/xwin/winprocarg.c
+++ b/xorg-server/hw/xwin/winprocarg.c
@@ -1,6 +1,7 @@
 /*
 
 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
@@ -38,7 +39,8 @@ from The Open Group.
 #include "winconfig.h"
 #include "winprefs.h"
 #include "winmsg.h"
-
+#define COMPILE_MULTIMON_STUBS
+#include <multimon.h>
 /*
  * References to external symbols
  */
@@ -57,6 +59,7 @@ extern char *			g_pszLogFile;
 extern Bool			g_fLogFileChanged;
 #endif
 extern Bool			g_fXdmcpEnabled;
+extern Bool			g_fAuthEnabled;
 extern char *			g_pszCommandLine;
 extern Bool			g_fKeyboardHookLL;
 extern Bool			g_fNoHelpMessageBox;                     
@@ -75,30 +78,10 @@ struct GetMonitorInfoData {
     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;
@@ -106,10 +89,8 @@ static Bool QueryMonitor(int index, struct GetMonitorInfoData *data)
     data->requestedMonitor = index;
 
     /* query information */
-    _EnumDisplayMonitors(NULL, NULL, getMonitorInfo, (LPARAM) data);
+    xEnumDisplayMonitors(NULL, NULL, getMonitorInfo, (LPARAM) data);
 
-    /* cleanup */
-    FreeLibrary(user32);
     return TRUE;
 }
 
@@ -155,7 +136,7 @@ winInitializeDefaultScreens (void)
   dwWidth = GetSystemMetrics (SM_CXSCREEN);
   dwHeight = GetSystemMetrics (SM_CYSCREEN);
 
-  winErrorFVerb (2, "winInitializeDefaultScreens - w %d h %d\n",
+  winDebug ("winInitializeDefaultScreens - w %d h %d\n",
 	  (int) dwWidth, (int) dwHeight);
 
   /* Set a default DPI, if no parameter was passed */
@@ -210,7 +191,7 @@ winInitializeDefaultScreens (void)
   /* Signal that the default screens have been initialized */
   g_fInitializedDefaultScreens = TRUE;
 
-  winErrorFVerb (2, "winInitializeDefaultScreens - Returning\n");
+  winDebug ("winInitializeDefaultScreens - Returning\n");
 }
 
 /* See Porting Layer Definition - p. 57 */
@@ -272,15 +253,13 @@ ddxProcessArgument (int argc, char *argv[], int i)
 	   * OsVendorInit () gets called, otherwise we will overwrite
 	   * settings changed by parameters such as -fullscreen, etc.
 	   */
-	  winErrorFVerb (2, "ddxProcessArgument - Initializing default "
+	  winDebug ("ddxProcessArgument - Initializing default "
 			 "screens\n");
 	  winInitializeDefaultScreens ();
 	}
     }
 
-#if CYGDEBUG
   winDebug ("ddxProcessArgument - arg: %s\n", argv[i]);
-#endif
 
   /*
    * Look for the '-help' and similar options
@@ -314,10 +293,8 @@ ddxProcessArgument (int argc, char *argv[], int i)
       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)
@@ -348,7 +325,7 @@ ddxProcessArgument (int argc, char *argv[], int i)
                     "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);
+		  winDebug("ddxProcessArgument - screen - Found Valid ``@Monitor'' = %d arg\n", iMonitor);
 		  iArgsProcessed = 3;
 		  g_ScreenInfo[nScreenNum].fUserGaveHeightAndWidth = FALSE;
 		  g_ScreenInfo[nScreenNum].fUserGavePosition = TRUE;
@@ -376,7 +353,7 @@ ddxProcessArgument (int argc, char *argv[], int i)
 			  (int *) &iWidth,
 			  (int *) &iHeight))
 	{
-	  winErrorFVerb (2, "ddxProcessArgument - screen - Found ``WxD'' arg\n");
+	  winDebug ("ddxProcessArgument - screen - Found ``WxD'' arg\n");
 	  iArgsProcessed = 3;
 	  g_ScreenInfo[nScreenNum].fUserGaveHeightAndWidth = TRUE;
 	  g_ScreenInfo[nScreenNum].dwWidth = iWidth;
@@ -388,7 +365,7 @@ ddxProcessArgument (int argc, char *argv[], int i)
 			   (int *) &iX,
 			   (int *) &iY))
 	  {
-	    winErrorFVerb (2, "ddxProcessArgument - screen - Found ``X+Y'' arg\n");
+	    winDebug("ddxProcessArgument - screen - Found ``X+Y'' arg\n");
 	    g_ScreenInfo[nScreenNum].fUserGavePosition = TRUE;
 	    g_ScreenInfo[nScreenNum].dwInitialX = iX;
 	    g_ScreenInfo[nScreenNum].dwInitialY = iY;
@@ -431,7 +408,7 @@ ddxProcessArgument (int argc, char *argv[], int i)
                   "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);
+		  winDebug ("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;
@@ -454,7 +431,7 @@ ddxProcessArgument (int argc, char *argv[], int i)
 	       && 1 == sscanf (argv[i + 3], "%d",
 			       (int *) &iHeight))
 	{
-	  winErrorFVerb (2, "ddxProcessArgument - screen - Found ``W D'' arg\n");
+	  winDebug ("ddxProcessArgument - screen - Found ``W D'' arg\n");
 	  iArgsProcessed = 4;
 	  g_ScreenInfo[nScreenNum].fUserGaveHeightAndWidth = TRUE;
 	  g_ScreenInfo[nScreenNum].dwWidth = iWidth;
@@ -467,7 +444,7 @@ ddxProcessArgument (int argc, char *argv[], int i)
 	      && 1 == sscanf (argv[i + 5], "%d",
 			      (int *) &iY))
 	  {
-	    winErrorFVerb (2, "ddxProcessArgument - screen - Found ``X Y'' arg\n");
+	    winDebug ("ddxProcessArgument - screen - Found ``X Y'' arg\n");
 	    iArgsProcessed = 6;
 	    g_ScreenInfo[nScreenNum].fUserGavePosition = TRUE;
 	    g_ScreenInfo[nScreenNum].dwInitialX = iX;
@@ -476,7 +453,7 @@ ddxProcessArgument (int argc, char *argv[], int i)
 	}
       else
 	{
-	  winErrorFVerb (2, "ddxProcessArgument - screen - Did not find size arg. "
+	  ErrorF ("ddxProcessArgument - screen - Did not find size arg. "
 		  "dwWidth: %d dwHeight: %d\n",
 		  (int) g_ScreenInfo[nScreenNum].dwWidth,
 		  (int) g_ScreenInfo[nScreenNum].dwHeight);
@@ -1289,6 +1266,29 @@ ddxProcessArgument (int argc, char *argv[], int i)
     }
 
   /*
+   * Look for the '-auth' argument
+   */
+  if (IS_OPTION ("-auth"))
+    {
+#ifdef  __MINGW32__
+      HANDLE hFile;
+      char * pszFile;
+      CHECK_ARGS (1);
+      pszFile = argv[++i];
+      hFile = CreateFile(pszFile,GENERIC_READ,FILE_SHARE_READ,NULL,OPEN_EXISTING,FILE_ATTRIBUTE_NORMAL,NULL);
+      if (hFile == INVALID_HANDLE_VALUE)
+	winMessageBoxF ("This authorization file for the -auth option could not be opened...\n"
+			"\"%s\"\n"
+			"You should use an \"Xauthority\" file in your HOME directory.\n"
+			"\nIgnoring and continuing.\n",
+			MB_ICONINFORMATION,
+			pszFile);
+#endif
+      g_fAuthEnabled = TRUE;
+      return 0; /* Let DIX parse this again */
+    }
+
+  /*
    * Look for the '-indirect' or '-broadcast' arguments
    */
   if (IS_OPTION ("-indirect")
@@ -1494,7 +1494,7 @@ winLogCommandLine (int argc, char *argv[])
       iCurrLen += strlen (argv[i]);
     }
 
-  ErrorF ("XWin was started with the following command line:\n\n"
+  winDebug ("XWin was started with the following command line:\n\n"
 	  "%s\n\n", g_pszCommandLine);
 }
 
@@ -1506,18 +1506,19 @@ winLogCommandLine (int argc, char *argv[])
 void
 winLogVersionInfo (void)
 {
+#ifdef WINDBG
   static Bool		s_fBeenHere = FALSE;
 
   if (s_fBeenHere)
     return;
   s_fBeenHere = TRUE;
 
-  ErrorF ("Welcome to the XWin X Server\n");
-  ErrorF ("Vendor: %s\n", VENDOR_STRING);
-  ErrorF ("Release: %d.%d.%d.%d (%d)\n\n", XORG_VERSION_MAJOR, XORG_VERSION_MINOR, XORG_VERSION_PATCH, XORG_VERSION_SNAP, XORG_VERSION_CURRENT);
-  ErrorF ("Contact: %s\n\n", VENDOR_CONTACT);
+  winDebug ("Welcome to the VcXsrv X Server\n");
+  winDebug ("Vendor: %s\n", VENDOR_STRING);
+  winDebug ("Release: %d.%d.%d.%d (%d)\n\n", XORG_VERSION_MAJOR, XORG_VERSION_MINOR, XORG_VERSION_PATCH, XORG_VERSION_SNAP, XORG_VERSION_CURRENT);
+  winDebug ("Contact: %s\n\n", VENDOR_CONTACT);
+#endif
 }
-
 /*
  * getMonitorInfo - callback function used to return information from the enumeration of monitors attached
  */
diff --git a/xorg-server/hw/xwin/winregistry.c b/xorg-server/hw/xwin/winregistry.c
index 3571b14d7..898ed978b 100644
--- a/xorg-server/hw/xwin/winregistry.c
+++ b/xorg-server/hw/xwin/winregistry.c
@@ -55,11 +55,11 @@ winGetRegistryDWORD (HKEY hkey, char *pszRegistryKey)
 
   if (dwDisposition == REG_CREATED_NEW_KEY)
     {
-      ErrorF ("winGetRegistryDWORD - Created new key: %s\n", pszRegistryKey);
+      winDebug ("winGetRegistryDWORD - Created new key: %s\n", pszRegistryKey);
     }
   else if (dwDisposition == REG_OPENED_EXISTING_KEY)
     {
-      ErrorF ("winGetRegistryDWORD - Opened existing key: %s\n",
+      winDebug ("winGetRegistryDWORD - Opened existing key: %s\n",
 	      pszRegistryKey);
     }
 
diff --git a/xorg-server/hw/xwin/winscrinit.c b/xorg-server/hw/xwin/winscrinit.c
index 99d5a464e..b97b6a0de 100644
--- a/xorg-server/hw/xwin/winscrinit.c
+++ b/xorg-server/hw/xwin/winscrinit.c
@@ -108,10 +108,8 @@ winScreenInit (int 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))
@@ -143,7 +141,7 @@ winScreenInit (int index,
     }
 
   /* Adjust the video mode for our engine type */
-  if (!(*pScreenPriv->pwinAdjustVideoMode) (pScreen))
+  if (pScreenPriv->pwinAdjustVideoMode && !(*pScreenPriv->pwinAdjustVideoMode) (pScreen))
     {
       ErrorF ("winScreenInit - winAdjustVideoMode () failed\n");
       return FALSE;
@@ -177,7 +175,7 @@ winScreenInit (int index,
     }
 
   /* Create display window */
-  if (!(*pScreenPriv->pwinCreateBoundingWindow) (pScreen))
+  if (pScreenPriv->pwinCreateBoundingWindow && !(*pScreenPriv->pwinCreateBoundingWindow) (pScreen))
     {
       ErrorF ("winScreenInit - pwinCreateBoundingWindow () "
 	      "failed\n");
@@ -228,7 +226,7 @@ winScreenInit (int index,
 					      pScreenInfo->dwBPP);
 
   /* Call the engine dependent screen initialization procedure */
-  if (!((*pScreenPriv->pwinFinishScreenInit) (index, pScreen, argc, argv)))
+  if (pScreenPriv->pwinFinishScreenInit && !((*pScreenPriv->pwinFinishScreenInit) (index, pScreen, argc, argv)))
     {
       ErrorF ("winScreenInit - winFinishScreenInit () failed\n");
       return FALSE;
@@ -236,12 +234,12 @@ winScreenInit (int index,
 
   if (!g_fSoftwareCursor)
     winInitCursor(pScreen);
+#ifdef WINDBG
   else
-    winErrorFVerb(2, "winScreenInit - Using software cursor\n");  
+    winDebug("winScreenInit - Using software cursor\n");  
+#endif
 
-#if CYGDEBUG || YES
   winDebug ("winScreenInit - returning\n");
-#endif
 
   return TRUE;
 }
@@ -297,7 +295,7 @@ winFinishScreenInitFB (int index,
       + winCountBits (pScreenPriv->dwGreenMask)
       + winCountBits (pScreenPriv->dwBlueMask);
   
-  winErrorFVerb (2, "winFinishScreenInitFB - Masks: %08x %08x %08x\n",
+  winDebug ("winFinishScreenInitFB - Masks: %08x %08x %08x\n",
 	  (unsigned int) pScreenPriv->dwRedMask,
 	  (unsigned int) pScreenPriv->dwGreenMask,
 	  (unsigned int) pScreenPriv->dwBlueMask);
@@ -406,16 +404,12 @@ winFinishScreenInitFB (int index,
 
   /* KDrive does miDCInitialize right after miInitializeBackingStore */
   /* 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");
@@ -431,9 +425,7 @@ winFinishScreenInitFB (int index,
 #endif
       )
     {
-#if CYGDEBUG
       winDebug ("winFinishScreenInitFB - Calling shadowSetup ()\n");
-#endif
       if (!shadowSetup(pScreen))
 	{
 	  ErrorF ("winFinishScreenInitFB - shadowSetup () failed\n");
@@ -588,9 +580,7 @@ winFinishScreenInitFB (int index,
 #endif
       )
     { 
-#if CYGDEBUG || YES
       winDebug ("winFinishScreenInitFB - Calling winInitWM.\n");
-#endif
 
       /* Initialize multi window mode */
       if (!winInitWM (&pScreenPriv->pWMInfo,
@@ -616,9 +606,7 @@ winFinishScreenInitFB (int index,
   /* Tell the server that we have a valid depth */
   pScreenPriv->fBadDepth = FALSE;
 
-#if CYGDEBUG || YES
   winDebug ("winFinishScreenInitFB - returning\n");
-#endif
 
   return TRUE;
 }
@@ -734,7 +722,7 @@ winFinishScreenInitNativeGDI (int index,
   /* Bitmap */
   pScreen->BitmapToRegion = winPixmapToRegionNativeGDI;
 
-  ErrorF ("winFinishScreenInitNativeGDI - calling miDCInitialize\n");
+  winDebug ("winFinishScreenInitNativeGDI - calling miDCInitialize\n");
 
   /* Set the default white and black pixel positions */
   pScreen->whitePixel = pScreen->blackPixel = (Pixel) 0;
@@ -754,7 +742,7 @@ winFinishScreenInitNativeGDI (int index,
 	return FALSE;
     }
 
-  ErrorF ("winFinishScreenInitNativeGDI - miCreateDefColormap () "
+  winDebug ("winFinishScreenInitNativeGDI - miCreateDefColormap () "
 	  "returned\n");
   
   /* mi doesn't use a CloseScreen procedure, so no need to wrap */
@@ -763,7 +751,7 @@ winFinishScreenInitNativeGDI (int index,
   /* Tell the server that we are enabled */
   pScreenPriv->fEnabled = TRUE;
 
-  ErrorF ("winFinishScreenInitNativeGDI - Successful addition of "
+  winDebug ("winFinishScreenInitNativeGDI - Successful addition of "
 	  "screen %08x\n",
 	  (unsigned int) pScreen);
 
diff --git a/xorg-server/hw/xwin/winshaddd.c b/xorg-server/hw/xwin/winshaddd.c
index 833444177..e1501c6c2 100644
--- a/xorg-server/hw/xwin/winshaddd.c
+++ b/xorg-server/hw/xwin/winshaddd.c
@@ -48,10 +48,12 @@ extern char *g_pszLogFile;
  * FIXME: Headers are broken, DEFINE_GUID doesn't work correctly,
  * so we have to redefine it here.
  */
+#ifndef _MSC_VER
 #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 */
+#endif
 
 
 /*
@@ -147,9 +149,7 @@ winCreatePrimarySurfaceShadowDD (ScreenPtr pScreen)
       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
@@ -165,10 +165,8 @@ winCreatePrimarySurfaceShadowDD (ScreenPtr pScreen)
       return FALSE;
     }
 
-#if CYGDEBUG
   winDebug ("winCreatePrimarySurfaceShadowDD - Attached clipper to "
 	  "primary surface\n");
-#endif
 
   /* Everything was correct */
   return TRUE;
@@ -185,7 +183,7 @@ winReleasePrimarySurfaceShadowDD (ScreenPtr pScreen)
 {
   winScreenPriv(pScreen);
 
-  ErrorF ("winReleasePrimarySurfaceShadowDD - Hello\n");
+  winDebug ("winReleasePrimarySurfaceShadowDD - Hello\n");
 
   /* Release the primary surface and clipper, if they exist */
   if (pScreenPriv->pddsPrimary)
@@ -197,14 +195,14 @@ winReleasePrimarySurfaceShadowDD (ScreenPtr pScreen)
       IDirectDrawSurface2_SetClipper (pScreenPriv->pddsPrimary,
 				      NULL);
 
-      ErrorF ("winReleasePrimarySurfaceShadowDD - Detached clipper\n");
+      winDebug ("winReleasePrimarySurfaceShadowDD - Detached clipper\n");
 
       /* Release the primary surface */
       IDirectDrawSurface2_Release (pScreenPriv->pddsPrimary);
       pScreenPriv->pddsPrimary = NULL;
     }
 
-  ErrorF ("winReleasePrimarySurfaceShadowDD - Released primary surface\n");
+  winDebug ("winReleasePrimarySurfaceShadowDD - Released primary surface\n");
 
   return TRUE;
 }
@@ -227,9 +225,7 @@ winAllocateFBShadowDD (ScreenPtr pScreen)
   DDSURFACEDESC		ddsd;
   DDSURFACEDESC		*pddsdShadow = NULL;
 
-#if CYGDEBUG
   winDebug ("winAllocateFBShadowDD\n");
-#endif
 
   /* Create a clipper */
   ddrval = (*g_fpDirectDrawCreateClipper) (0,
@@ -242,9 +238,7 @@ winAllocateFBShadowDD (ScreenPtr pScreen)
       return FALSE;
     }
 
-#if CYGDEBUG
   winDebug ("winAllocateFBShadowDD - Created a clipper\n");
-#endif
 
   /* Get a device context for the screen  */
   pScreenPriv->hdcScreen = GetDC (pScreenPriv->hwndScreen);
@@ -261,9 +255,7 @@ winAllocateFBShadowDD (ScreenPtr pScreen)
       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);
@@ -274,9 +266,7 @@ winAllocateFBShadowDD (ScreenPtr pScreen)
       return FALSE;
     }
 
-#if CYGDEBUG
   winDebug ("winAllocateFBShadowDD () - Created and initialized DD\n");
-#endif
 
   /* Get a DirectDraw2 interface pointer */
   ddrval = IDirectDraw_QueryInterface (pScreenPriv->pdd,
@@ -359,7 +349,7 @@ winAllocateFBShadowDD (ScreenPtr pScreen)
 	      || pScreenInfo->dwBPP != GetDeviceCaps (hdc, BITSPIXEL)
 	      || pScreenInfo->dwRefreshRate != 0))
 	{
-	  ErrorF ("winAllocateFBShadowDD - Changing video mode\n");
+	  winDebug ("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,
@@ -391,7 +381,7 @@ winAllocateFBShadowDD (ScreenPtr pScreen)
 	}
       else
 	{
-	  ErrorF ("winAllocateFBShadowDD - Not changing video mode\n");
+	  winDebug ("winAllocateFBShadowDD - Not changing video mode\n");
 	}
 
       /* Release our DC */
@@ -448,9 +438,7 @@ winAllocateFBShadowDD (ScreenPtr pScreen)
       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));
@@ -463,9 +451,7 @@ winAllocateFBShadowDD (ScreenPtr pScreen)
   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,
@@ -480,9 +466,7 @@ winAllocateFBShadowDD (ScreenPtr pScreen)
       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))
@@ -503,9 +487,7 @@ winAllocateFBShadowDD (ScreenPtr pScreen)
   pScreenPriv->dwGreenMask = pddsdShadow->ddpfPixelFormat.u3.dwGBitMask;
   pScreenPriv->dwBlueMask = pddsdShadow->ddpfPixelFormat.u4.dwBBitMask;
 
-#if CYGDEBUG
   winDebug ("winAllocateFBShadowDD - Returning\n");
-#endif
 
   return TRUE;
 }
@@ -646,6 +628,7 @@ winShadowUpdateDD (ScreenPtr pScreen,
   /* Has our memory pointer changed? */
   if (pScreenInfo->pfb != pScreenPriv->pddsdShadow->lpSurface)
     {
+      extern char *g_pszLogFile;
       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 "
@@ -687,9 +670,7 @@ winCloseScreenShadowDD (int nIndex, ScreenPtr 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;
@@ -813,7 +794,7 @@ winInitVisualsShadowDD (ScreenPtr pScreen)
   else
     pScreenPriv->dwBitsPerRGB = dwBlueBits;
   
-  ErrorF ("winInitVisualsShadowDD - Masks %08x %08x %08x BPRGB %d d %d "
+  winDebug ("winInitVisualsShadowDD - Masks %08x %08x %08x BPRGB %d d %d "
 	  "bpp %d\n",
 	  (unsigned int) pScreenPriv->dwRedMask,
 	  (unsigned int) pScreenPriv->dwGreenMask,
@@ -932,9 +913,7 @@ winInitVisualsShadowDD (ScreenPtr pScreen)
       return FALSE;
     }
 
-#if CYGDEBUG
   winDebug ("winInitVisualsShadowDD - Returning\n");
-#endif
 
   return TRUE;
 }
@@ -967,7 +946,7 @@ winAdjustVideoModeShadowDD (ScreenPtr pScreen)
   if (pScreenInfo->dwBPP == WIN_DEFAULT_BPP)
     {
       /* No -depth parameter passed, let the user know the depth being used */
-      ErrorF ("winAdjustVideoModeShadowDD - Using Windows display "
+      winDebug ("winAdjustVideoModeShadowDD - Using Windows display "
 	      "depth of %d bits per pixel\n", (int) dwBPP);
 
       /* Use GDI's depth */
@@ -977,13 +956,13 @@ winAdjustVideoModeShadowDD (ScreenPtr pScreen)
 	   && pScreenInfo->dwBPP != dwBPP)
     {
       /* FullScreen, and GDI depth differs from -depth parameter */
-      ErrorF ("winAdjustVideoModeShadowDD - FullScreen, using command line "
+      winDebug ("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: "
+      winDebug ("winAdjustVideoModeShadowDD - Windowed, command line bpp: "
 	      "%d, using bpp: %d\n", (int) pScreenInfo->dwBPP, (int) dwBPP);
 
       /* We'll use GDI's depth */
@@ -1379,10 +1358,8 @@ winDestroyColormapShadowDD (ColormapPtr pColormap)
    */
   if (pColormap->flags & IsDefault)
     {
-#if CYGDEBUG
       winDebug ("winDestroyColormapShadowDD - Destroying default "
 	      "colormap\n");
-#endif
       
       /*
        * FIXME: Walk the list of all screens, popping the default
diff --git a/xorg-server/hw/xwin/winshadddnl.c b/xorg-server/hw/xwin/winshadddnl.c
index ef5c21469..b8d6222ac 100644
--- a/xorg-server/hw/xwin/winshadddnl.c
+++ b/xorg-server/hw/xwin/winshadddnl.c
@@ -48,10 +48,12 @@ extern HWND			g_hDlgExit;
  * FIXME: Headers are broken, DEFINE_GUID doesn't work correctly,
  * so we have to redefine it here.
  */
+#ifndef _MSC_VER
 #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 */
+#endif
 
 /*
  * FIXME: Headers are broken, IID_IDirectDraw4 has to be defined
@@ -161,9 +163,7 @@ winCreatePrimarySurfaceShadowDDNL (ScreenPtr pScreen)
       return FALSE;
     }
   
-#if 1
   winDebug ("winCreatePrimarySurfaceShadowDDNL - Created primary surface\n");
-#endif
 
   /* Attach our clipper to our primary surface handle */
   ddrval = IDirectDrawSurface4_SetClipper (pScreenPriv->pddsPrimary4,
@@ -176,10 +176,8 @@ winCreatePrimarySurfaceShadowDDNL (ScreenPtr pScreen)
       return FALSE;
     }
 
-#if 1
   winDebug ("winCreatePrimarySurfaceShadowDDNL - Attached clipper to primary "
 	  "surface\n");
-#endif
 
   /* Everything was correct */
   return TRUE;
@@ -239,10 +237,8 @@ winAllocateFBShadowDDNL (ScreenPtr pScreen)
   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);
@@ -269,9 +265,7 @@ winAllocateFBShadowDDNL (ScreenPtr pScreen)
       return FALSE;
     }
 
-#if CYGDEBUG
   winDebug ("winAllocateFBShadowDDNL - Created a clipper\n");
-#endif
 
   /* Get a device context for the screen  */
   pScreenPriv->hdcScreen = GetDC (pScreenPriv->hwndScreen);
@@ -288,9 +282,7 @@ winAllocateFBShadowDDNL (ScreenPtr pScreen)
       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,
@@ -304,9 +296,7 @@ winAllocateFBShadowDDNL (ScreenPtr pScreen)
       return FALSE;
     }
 
-#if CYGDEBUG
   winDebug ("winAllocateFBShadowDDNL - Created and initialized DD\n");
-#endif
 
   /* Get a DirectDraw4 interface pointer */
   ddrval = IDirectDraw_QueryInterface (pScreenPriv->pdd,
@@ -464,14 +454,12 @@ winAllocateFBShadowDDNL (ScreenPtr pScreen)
       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 */
   /*
@@ -508,19 +496,15 @@ winAllocateFBShadowDDNL (ScreenPtr pScreen)
       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;
@@ -530,9 +514,7 @@ winAllocateFBShadowDDNL (ScreenPtr pScreen)
   pScreenPriv->dwGreenMask = ddsdShadow.u4.ddpfPixelFormat.u3.dwGBitMask;
   pScreenPriv->dwBlueMask = ddsdShadow.u4.ddpfPixelFormat.u4.dwBBitMask;
 
-#if CYGDEBUG
   winDebug ("winAllocateFBShadowDDNL - Returning\n");
-#endif
 
   return TRUE;
 }
@@ -696,11 +678,9 @@ winShadowUpdateDDNL (ScreenPtr pScreen,
       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;
@@ -741,9 +721,7 @@ winCloseScreenShadowDDNL (int nIndex, ScreenPtr 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;
@@ -987,9 +965,7 @@ winInitVisualsShadowDDNL (ScreenPtr pScreen)
       return FALSE;
     }
 
-#if CYGDEBUG
   winDebug ("winInitVisualsShadowDDNL - Returning\n");
-#endif
 
   return TRUE;
 }
@@ -1022,7 +998,7 @@ winAdjustVideoModeShadowDDNL (ScreenPtr pScreen)
   if (pScreenInfo->dwBPP == WIN_DEFAULT_BPP)
     {
       /* No -depth parameter passed, let the user know the depth being used */
-      winErrorFVerb (2, "winAdjustVideoModeShadowDDNL - Using Windows display "
+      winDebug ("winAdjustVideoModeShadowDDNL - Using Windows display "
 	      "depth of %d bits per pixel\n", (int) dwBPP);
 
       /* Use GDI's depth */
@@ -1032,13 +1008,13 @@ winAdjustVideoModeShadowDDNL (ScreenPtr pScreen)
 	   && pScreenInfo->dwBPP != dwBPP)
     {
       /* FullScreen, and GDI depth differs from -depth parameter */
-      winErrorFVerb (2, "winAdjustVideoModeShadowDDNL - FullScreen, using command "
+      winDebug ("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 "
+      winDebug ("winAdjustVideoModeShadowDDNL - Windowed, command line "
 	      "bpp: %d, using bpp: %d\n",
 	      (int) pScreenInfo->dwBPP, (int) dwBPP);
 
@@ -1050,7 +1026,7 @@ winAdjustVideoModeShadowDDNL (ScreenPtr pScreen)
   if (pScreenInfo->dwWidth * pScreenInfo->dwHeight * pScreenInfo->dwBPP
       >= WIN_DIB_MAXIMUM_SIZE)
     {
-      winErrorFVerb (1, "winAdjustVideoModeShadowDDNL - Requested DirectDraw surface "
+      ErrorF ("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 "
@@ -1134,7 +1110,7 @@ winBltExposedRegionsShadowDDNL (ScreenPtr pScreen)
       if (ddrval == DDERR_SURFACELOST)
 	{
 	  /* Surface was lost */
-	  winErrorFVerb (1, "winBltExposedRegionsShadowDDNL - "
+	  ErrorF ("winBltExposedRegionsShadowDDNL - "
           "IDirectDrawSurface4_Blt reported that the primary "
           "surface was lost, trying to restore, retry: %d\n", i + 1);
 
@@ -1164,7 +1140,7 @@ winBltExposedRegionsShadowDDNL (ScreenPtr pScreen)
       else if (FAILED (ddrval))
 	{
 	  fReturn = FALSE;
-	  winErrorFVerb (1, "winBltExposedRegionsShadowDDNL - "
+	  ErrorF ("winBltExposedRegionsShadowDDNL - "
 		  "IDirectDrawSurface4_Blt failed, but surface not "
 		  "lost: %08x %d\n",
 		  (unsigned int) ddrval, (int) ddrval);
@@ -1392,9 +1368,7 @@ winDestroyColormapShadowDDNL (ColormapPtr pColormap)
    */
   if (pColormap->flags & IsDefault)
     {
-#if CYGDEBUG
       winDebug ("winDestroyColormapShadowDDNL - Destroying default colormap\n");
-#endif
       
       /*
        * FIXME: Walk the list of all screens, popping the default
diff --git a/xorg-server/hw/xwin/winshadgdi.c b/xorg-server/hw/xwin/winshadgdi.c
index d38e4f76b..fbc15abb3 100644
--- a/xorg-server/hw/xwin/winshadgdi.c
+++ b/xorg-server/hw/xwin/winshadgdi.c
@@ -109,7 +109,7 @@ winQueryScreenDIBFormat (ScreenPtr pScreen, BITMAPINFOHEADER *pbmih)
 {
   winScreenPriv(pScreen);
   HBITMAP		hbmp;
-#if CYGDEBUG
+#ifdef WINDBG
   LPDWORD		pdw = NULL;
 #endif
   
@@ -138,7 +138,7 @@ winQueryScreenDIBFormat (ScreenPtr pScreen, BITMAPINFOHEADER *pbmih)
       return FALSE;
     }
 
-#if CYGDEBUG
+#ifdef WINDBG
   /* Get a pointer to bitfields */
   pdw = (DWORD*) ((CARD8*)pbmih + sizeof (BITMAPINFOHEADER));
 
@@ -199,7 +199,7 @@ winQueryRGBBitsAndMasks (ScreenPtr pScreen)
   if (GetDeviceCaps (pScreenPriv->hdcScreen, PLANES)
       * GetDeviceCaps (pScreenPriv->hdcScreen, BITSPIXEL) == 24)
     {
-      ErrorF ("winQueryRGBBitsAndMasks - GetDeviceCaps (BITSPIXEL) "
+      winDebug ("winQueryRGBBitsAndMasks - GetDeviceCaps (BITSPIXEL) "
 	      "returned 24 for the screen.  Using default 24bpp masks.\n");
 
       /* 8 bits per primary color */
@@ -228,7 +228,7 @@ winQueryRGBBitsAndMasks (ScreenPtr pScreen)
       /* Get a pointer to bitfields */
       pdw = (DWORD*) ((CARD8*)pbmih + sizeof (BITMAPINFOHEADER));
       
-#if CYGDEBUG
+#ifdef WINDBG
       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__,
@@ -372,7 +372,7 @@ winAllocateFBShadowGDI (ScreenPtr pScreen)
   pbmih->biWidth = pScreenInfo->dwWidth;
   pbmih->biHeight = -pScreenInfo->dwHeight;
   
-  ErrorF ("winAllocateFBShadowGDI - Creating DIB with width: %d height: %d "
+  winDebug ("winAllocateFBShadowGDI - Creating DIB with width: %d height: %d "
 	  "depth: %d\n",
 	  (int) pbmih->biWidth, (int) -pbmih->biHeight, pbmih->biBitCount);
 
@@ -385,14 +385,12 @@ winAllocateFBShadowGDI (ScreenPtr pScreen)
 					      0);
   if (pScreenPriv->hbmpShadow == NULL || pScreenInfo->pfb == NULL)
     {
-      winW32Error (2, "winAllocateFBShadowGDI - CreateDIBSection failed:");
+      winW32Error ("winAllocateFBShadowGDI - CreateDIBSection failed:");
       return FALSE;
     }
   else
     {
-#if CYGDEBUG
       winDebug ("winAllocateFBShadowGDI - Shadow buffer allocated\n");
-#endif
     }
 
   /* Get information about the bitmap that was allocated */
@@ -400,22 +398,18 @@ winAllocateFBShadowGDI (ScreenPtr pScreen)
 	     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,
@@ -426,21 +420,15 @@ winAllocateFBShadowGDI (ScreenPtr pScreen)
 		    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 
+      winW32Error ("winAllocateFBShadowGDI - Shadow blit failure\n");
       /* ago: ignore this error. The blit fails with wine, but does not 
        * cause any problems later. */
 
       fReturn = TRUE;
-#endif      
     }
 
   /* Look for height weirdness */
@@ -454,10 +442,8 @@ winAllocateFBShadowGDI (ScreenPtr pScreen)
 			    / 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
@@ -524,15 +510,17 @@ winShadowUpdateGDI (ScreenPtr pScreen,
   if (dwBox != 1)
     {
       ++s_dwNonUnitRegions;
-      ErrorF ("winShadowUpdatGDI - dwBox: %d\n", dwBox);
+      winDebug ("winShadowUpdatGDI - dwBox: %d\n", dwBox);
     }
   
   if ((s_dwTotalUpdates % 100) == 0)
-    ErrorF ("winShadowUpdateGDI - %d%% non-unity regions, avg boxes: %d "
+  {
+    winDebug ("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 */
 
   /*
@@ -625,9 +613,7 @@ winCloseScreenShadowGDI (int nIndex, ScreenPtr 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;
@@ -700,7 +686,7 @@ winInitVisualsShadowGDI (ScreenPtr pScreen)
   winScreenInfo		*pScreenInfo = pScreenPriv->pScreenInfo;
 
   /* Display debugging information */
-  ErrorF ("winInitVisualsShadowGDI - Masks %08x %08x %08x BPRGB %d d %d "
+  winDebug ("winInitVisualsShadowGDI - Masks %08x %08x %08x BPRGB %d d %d "
 	  "bpp %d\n",
 	  (unsigned int) pScreenPriv->dwRedMask,
 	  (unsigned int) pScreenPriv->dwGreenMask,
@@ -816,9 +802,7 @@ winInitVisualsShadowGDI (ScreenPtr pScreen)
       return FALSE;
     }
 
-#if CYGDEBUG
   winDebug ("winInitVisualsShadowGDI - Returning\n");
-#endif
 
   return TRUE;
 }
@@ -852,7 +836,7 @@ winAdjustVideoModeShadowGDI (ScreenPtr pScreen)
   if (pScreenInfo->dwBPP == WIN_DEFAULT_BPP)
     {
       /* No -depth parameter passed, let the user know the depth being used */
-      ErrorF ("winAdjustVideoModeShadowGDI - Using Windows display "
+      winDebug ("winAdjustVideoModeShadowGDI - Using Windows display "
 	      "depth of %d bits per pixel\n", (int) dwBPP);
 
       /* Use GDI's depth */
@@ -861,7 +845,7 @@ winAdjustVideoModeShadowGDI (ScreenPtr pScreen)
   else if (dwBPP != pScreenInfo->dwBPP)
     {
       /* Warn user if GDI depth is different than -depth parameter */
-      ErrorF ("winAdjustVideoModeShadowGDI - Command line bpp: %d, "\
+      winDebug ("winAdjustVideoModeShadowGDI - Command line bpp: %d, "\
 	      "using bpp: %d\n", (int) pScreenInfo->dwBPP, (int) dwBPP);
 
       /* We'll use GDI's depth */
@@ -1010,17 +994,13 @@ 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;
     }
 
@@ -1247,10 +1227,8 @@ winDestroyColormapShadowGDI (ColormapPtr pColormap)
    */
   if (pColormap->flags & IsDefault)
     {
-#if CYGDEBUG
       winDebug ("winDestroyColormapShadowGDI - Destroying default "
 	      "colormap\n");
-#endif
       
       /*
        * FIXME: Walk the list of all screens, popping the default
diff --git a/xorg-server/hw/xwin/wintrayicon.c b/xorg-server/hw/xwin/wintrayicon.c
index 895b47caf..7750932b4 100644
--- a/xorg-server/hw/xwin/wintrayicon.c
+++ b/xorg-server/hw/xwin/wintrayicon.c
@@ -36,35 +36,43 @@
 #include <shellapi.h>
 #include "winprefs.h"
 
+static NOTIFYICONDATA nid;
 /*
  * Initialize the tray icon
  */
 
 void
-winInitNotifyIcon (winPrivScreenPtr pScreenPriv)
+winInitNotifyIcon (winPrivScreenPtr pScreenPriv, Bool Modify)
 {
   winScreenInfo		*pScreenInfo = pScreenPriv->pScreenInfo;
-  NOTIFYICONDATA	nid = {0};
+  char HostName[256];
   
-  nid.cbSize = sizeof (NOTIFYICONDATA);
-  nid.hWnd = pScreenPriv->hwndScreen;
-  nid.uID = pScreenInfo->dwScreen;
-  nid.uFlags = NIF_ICON | NIF_MESSAGE | NIF_TIP;
-  nid.uCallbackMessage = WM_TRAYICON;
-  nid.hIcon = winTaskbarIcon ();
+  if (!Modify)
+  {
+    nid.cbSize = sizeof (NOTIFYICONDATA);
+    nid.hWnd = pScreenPriv->hwndScreen;
+    nid.uID = pScreenInfo->dwScreen;
+    nid.uFlags = NIF_ICON | NIF_MESSAGE | NIF_TIP;
+    nid.uCallbackMessage = WM_TRAYICON;
+    nid.hIcon = winTaskbarIcon ();
+
+    /* Save handle to the icon so it can be freed later */
+    pScreenPriv->hiconNotifyIcon = nid.hIcon;
+  }
 
-  /* Save handle to the icon so it can be freed later */
-  pScreenPriv->hiconNotifyIcon = nid.hIcon;
+  gethostname(HostName,256);
 
   /* Set display and screen-specific tooltip text */
   snprintf (nid.szTip,
 	    sizeof (nid.szTip),
-	    PROJECT_NAME " Server:%s.%d",
+	    PROJECT_NAME " Server - %s:%s.%d - %d clients",
+	    HostName,
 	    display, 
-	    (int) pScreenInfo->dwScreen);
+	    (int) pScreenInfo->dwScreen,
+            pScreenPriv->iConnectedClients);
 
   /* Add the tray icon */
-  if (!Shell_NotifyIcon (NIM_ADD, &nid))
+  if (!Shell_NotifyIcon ((Modify) ? NIM_MODIFY : NIM_ADD, &nid))
     ErrorF ("winInitNotifyIcon - Shell_NotifyIcon Failed\n");
 }
 
@@ -79,10 +87,6 @@ winDeleteNotifyIcon (winPrivScreenPtr pScreenPriv)
   winScreenInfo		*pScreenInfo = pScreenPriv->pScreenInfo;
   NOTIFYICONDATA	nid = {0};
   
-#if 0
-  ErrorF ("winDeleteNotifyIcon\n");
-#endif
-
   nid.cbSize = sizeof (NOTIFYICONDATA);
   nid.hWnd = pScreenPriv->hwndScreen;
   nid.uID = pScreenInfo->dwScreen;
@@ -119,6 +123,17 @@ winHandleIconMessage (HWND hwnd, UINT message,
 
   switch (lParam)
     {
+    case WM_MOUSEMOVE:
+    {
+      static int PrevNrClients;
+      int NrClients=GetLiveClients(pScreenPriv);
+      if (NrClients!=PrevNrClients)
+      {
+        PrevNrClients=NrClients;
+        winInitNotifyIcon (pScreenPriv, TRUE);
+      }
+    }
+    break;
     case WM_LBUTTONUP:
       /* Restack and bring all windows to top */
       SetForegroundWindow (hwnd);
diff --git a/xorg-server/hw/xwin/winvalargs.c b/xorg-server/hw/xwin/winvalargs.c
index 038e097a5..1c9b17fde 100644
--- a/xorg-server/hw/xwin/winvalargs.c
+++ b/xorg-server/hw/xwin/winvalargs.c
@@ -75,7 +75,7 @@ winValidateArgs (void)
       if (g_ScreenInfo[i].fExplicitScreen)
 	iMaxConsecutiveScreen = i + 1;
     }
-  winErrorFVerb (2, "winValidateArgs - g_iNumScreens: %d "
+  winDebug ("winValidateArgs - g_iNumScreens: %d "
 		 "iMaxConsecutiveScreen: %d\n",
 		 g_iNumScreens, iMaxConsecutiveScreen);
   if (g_iNumScreens < iMaxConsecutiveScreen)
diff --git a/xorg-server/hw/xwin/winwin32rootless.c b/xorg-server/hw/xwin/winwin32rootless.c
index c225a4495..f76363e43 100644
--- a/xorg-server/hw/xwin/winwin32rootless.c
+++ b/xorg-server/hw/xwin/winwin32rootless.c
@@ -323,9 +323,7 @@ winMWExtWMCreateFrame (RootlessWindowPtr pFrame, ScreenPtr pScreen,
       fResult = FALSE;
     }
 
-#if CYGMULTIWINDOW_DEBUG
   winDebug ("winMWExtWMCreateFrame - ShowWindow\n");
-#endif
 
   //ShowWindow (pRLWinPriv->hWnd, SW_SHOWNOACTIVATE);
   g_fNoConfigureWindow = FALSE;
@@ -799,9 +797,7 @@ winMWExtWMStartDrawing (RootlessFrameID wid, char **pixelData, int *bytesPerRow)
 			    SRCCOPY);
 	  if (fReturn)
 	    {
-#if CYGMULTIWINDOW_DEBUG
 	      winDebug ("winMWExtWMStartDrawing - Shadow blit success\n");
-#endif
 	    }
 	  else
 	    {
@@ -822,10 +818,8 @@ winMWExtWMStartDrawing (RootlessFrameID wid, char **pixelData, int *bytesPerRow)
 	  
 	  pRLWinPriv->dwWidthBytes = dibsection.dsBm.bmWidthBytes;
 	  
-#if CYGMULTIWINDOW_DEBUG
 	  winDebug ("winMWExtWMStartDrawing - bytesPerRow: %d\n",
 		    (unsigned int)dibsection.dsBm.bmWidthBytes);
-#endif
 	  
 	  /* Free the old shadow bitmap */
 	  DeleteObject (pRLWinPriv->hdcShadow);
@@ -835,22 +829,18 @@ winMWExtWMStartDrawing (RootlessFrameID wid, char **pixelData, int *bytesPerRow)
 	  pRLWinPriv->hbmpShadow = hbmpNew;
 	  
 	  pRLWinPriv->fResized = FALSE;
-#if CYGMULTIWINDOW_DEBUG && FALSE
 	  winDebug ("winMWExtWMStartDrawing - 0x%08x %d\n",
 		(unsigned int)pRLWinPriv->pfb, 
 		(unsigned int)dibsection.dsBm.bmWidthBytes);
-#endif
 	}
     }
   else
     {
       ErrorF ("winMWExtWMStartDrawing - Already window was destroyed \n"); 
     }
-#if CYGMULTIWINDOW_DEBUG
   winDebug ("winMWExtWMStartDrawing - done (0x%08x) 0x%08x %d\n",
 	    (int) pRLWinPriv,
 	    (unsigned int)pRLWinPriv->pfb, (unsigned int)pRLWinPriv->dwWidthBytes);
-#endif
   *pixelData = pRLWinPriv->pfb;
   *bytesPerRow = pRLWinPriv->dwWidthBytes;
 }
@@ -858,77 +848,12 @@ winMWExtWMStartDrawing (RootlessFrameID wid, char **pixelData, int *bytesPerRow)
 void
 winMWExtWMStopDrawing (RootlessFrameID wid, Bool fFlush)
 {
-#if 0
-  win32RootlessWindowPtr pRLWinPriv = (win32RootlessWindowPtr) wid;
-  BLENDFUNCTION bfBlend;
-  SIZE szWin;
-  POINT ptSrc;
-#if CYGMULTIWINDOW_DEBUG || TRUE
-  winDebug ("winMWExtWMStopDrawing (%08x)\n", pRLWinPriv);
-#endif
-  szWin.cx = pRLWinPriv->dwWidth;
-  szWin.cy = pRLWinPriv->dwHeight;
-  ptSrc.x = 0;
-  ptSrc.y = 0;
-  bfBlend.BlendOp = AC_SRC_OVER;
-  bfBlend.BlendFlags = 0;
-  bfBlend.SourceConstantAlpha = 255;
-  bfBlend.AlphaFormat = AC_SRC_ALPHA;
-
-  if (!UpdateLayeredWindow (pRLWinPriv->hWnd,
-			    NULL, NULL, &szWin,
-			    pRLWinPriv->hdcShadow, &ptSrc,
-			    0, &bfBlend, ULW_ALPHA))
-    {
-      ErrorF ("winMWExtWMStopDrawing - UpdateLayeredWindow failed\n");
-    }
-#endif
 }
 
 void
 winMWExtWMUpdateRegion (RootlessFrameID wid, RegionPtr pDamage)
 {
   win32RootlessWindowPtr pRLWinPriv = (win32RootlessWindowPtr) wid;
-#if 0
-  BLENDFUNCTION bfBlend;
-  SIZE szWin;
-  POINT ptSrc;
-#endif
-#if CYGMULTIWINDOW_DEBUG && 0
-  winDebug ("winMWExtWMUpdateRegion (%08x)\n", pRLWinPriv);
-#endif
-#if 0
-  szWin.cx = pRLWinPriv->dwWidth;
-  szWin.cy = pRLWinPriv->dwHeight;
-  ptSrc.x = 0;
-  ptSrc.y = 0;
-  bfBlend.BlendOp = AC_SRC_OVER;
-  bfBlend.BlendFlags = 0;
-  bfBlend.SourceConstantAlpha = 255;
-  bfBlend.AlphaFormat = AC_SRC_ALPHA;
-
-  if (!UpdateLayeredWindow (pRLWinPriv->hWnd,
-			    NULL, NULL, &szWin,
-			    pRLWinPriv->hdcShadow, &ptSrc,
-			    0, &bfBlend, ULW_ALPHA))
-    {
-      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 ("winMWExtWMUpdateRegion - UpdateLayeredWindow failed: %s\n",
-	      (LPSTR)lpMsgBuf);
-      LocalFree (lpMsgBuf);
-    }
-#endif
   if (!g_fNoConfigureWindow) UpdateWindow (pRLWinPriv->hWnd);
 }
 
@@ -938,10 +863,8 @@ winMWExtWMDamageRects (RootlessFrameID wid, int nCount, const BoxRec *pRects,
 {
   win32RootlessWindowPtr pRLWinPriv = (win32RootlessWindowPtr) wid;
   const BoxRec *pEnd;
-#if CYGMULTIWINDOW_DEBUG && 0
   winDebug ("winMWExtWMDamageRects (%08x, %d, %08x, %d, %d)\n",
 	    pRLWinPriv, nCount, pRects, shift_x, shift_y);
-#endif
 
   for (pEnd = pRects + nCount; pRects < pEnd; pRects++) {
         RECT rcDmg;
@@ -958,10 +881,8 @@ void
 winMWExtWMRootlessSwitchWindow (RootlessWindowPtr pFrame, WindowPtr oldWin)
 {
   win32RootlessWindowPtr pRLWinPriv = (win32RootlessWindowPtr) pFrame->wid;
-#if CYGMULTIWINDOW_DEBUG
   winDebug ("winMWExtWMRootlessSwitchWindow (%08x) %08x\n",
 	    (int) pRLWinPriv, (int) pRLWinPriv->hWnd);
-#endif
   pRLWinPriv->pFrame = pFrame;
   pRLWinPriv->fResized = TRUE;
 
@@ -974,26 +895,6 @@ winMWExtWMRootlessSwitchWindow (RootlessWindowPtr pFrame, WindowPtr oldWin)
 
   DeleteProperty (serverClient, oldWin, AtmWindowsWmNativeHwnd ());
   winMWExtWMSetNativeProperty (pFrame);
-#if CYGMULTIWINDOW_DEBUG
-#if 0
- {
-   WindowPtr		pWin2 = NULL;
-   win32RootlessWindowPtr pRLWinPriv2 = NULL;
-
-   /* Check if the Windows window property for our X window pointer is valid */
-   if ((pWin2 = (WindowPtr)GetProp (pRLWinPriv->hWnd, WIN_WINDOW_PROP)) != NULL)
-     {
-       pRLWinPriv2 = (win32RootlessWindowPtr) RootlessFrameForWindow (pWin2, FALSE);
-     }
-   winDebug ("winMWExtWMSwitchFrame2 (%08x) %08x\n",
-	   pRLWinPriv2, pRLWinPriv2->hWnd);
-   if (pRLWinPriv != pRLWinPriv2 || pRLWinPriv->hWnd != pRLWinPriv2->hWnd)
-     {
-       winDebug ("Error param missmatch\n");
-     }
- }
-#endif
-#endif
 }
 
 void
@@ -1001,18 +902,14 @@ winMWExtWMCopyBytes (unsigned int width, unsigned int height,
 			   const void *src, unsigned int srcRowBytes,
 			   void *dst, unsigned int dstRowBytes)
 {
-#if CYGMULTIWINDOW_DEBUG
   winDebug ("winMWExtWMCopyBytes - Not implemented\n");
-#endif
 }
 
 void
 winMWExtWMFillBytes (unsigned int width, unsigned int height, unsigned int value,
 			   void *dst, unsigned int dstRowBytes)
 {
-#if CYGMULTIWINDOW_DEBUG
   winDebug ("winMWExtWMFillBytes - Not implemented\n");
-#endif
 }
 
 int
@@ -1021,9 +918,7 @@ winMWExtWMCompositePixels (unsigned int width, unsigned int height, unsigned int
 				 void *mask, unsigned int maskRowBytes,
 				 void *dst[2], unsigned int dstRowBytes[2])
 {
-#if CYGMULTIWINDOW_DEBUG
   winDebug ("winMWExtWMCompositePixels - Not implemented\n");
-#endif
   return 0;
 }
 
@@ -1035,21 +930,17 @@ winMWExtWMCopyWindow (RootlessFrameID wid, int nDstRects, const BoxRec *pDstRect
   win32RootlessWindowPtr pRLWinPriv = (win32RootlessWindowPtr) wid;
   const BoxRec *pEnd;
   RECT rcDmg;
-#if CYGMULTIWINDOW_DEBUG
   winDebug ("winMWExtWMCopyWindow (%08x, %d, %08x, %d, %d)\n",
 	  (int) pRLWinPriv, nDstRects, (int) pDstRects, nDx, nDy);
-#endif
 
   for (pEnd = pDstRects + nDstRects; pDstRects < pEnd; pDstRects++)
     {
-#if CYGMULTIWINDOW_DEBUG
       winDebug ("BitBlt (%d, %d, %d, %d) (%d, %d)\n",
 	      pDstRects->x1, pDstRects->y1,
 	      pDstRects->x2 - pDstRects->x1,
 	      pDstRects->y2 - pDstRects->y1,
 	      pDstRects->x1 + nDx,
 	      pDstRects->y1 + nDy);
-#endif
 
       if (!BitBlt (pRLWinPriv->hdcShadow,
 		   pDstRects->x1, pDstRects->y1,
@@ -1069,9 +960,7 @@ winMWExtWMCopyWindow (RootlessFrameID wid, int nDstRects, const BoxRec *pDstRect
       
       InvalidateRect (pRLWinPriv->hWnd, &rcDmg, FALSE);
     }
-#if CYGMULTIWINDOW_DEBUG
   winDebug ("winMWExtWMCopyWindow - done\n");
-#endif
 }
 
 
diff --git a/xorg-server/hw/xwin/winwin32rootlesswndproc.c b/xorg-server/hw/xwin/winwin32rootlesswndproc.c
index 4d7afee42..71979456d 100644
--- a/xorg-server/hw/xwin/winwin32rootlesswndproc.c
+++ b/xorg-server/hw/xwin/winwin32rootlesswndproc.c
@@ -441,7 +441,6 @@ winMWExtWMWindowProc (HWND hwnd, UINT message,
       wmMsg.iHeight	= pRLWinPriv->pFrame->height;
 
       fWMMsgInitialized = TRUE;
-#if CYGDEBUG
       winDebugWin32Message("winMWExtWMWindowProc", hwnd, message, wParam, lParam);
 
       winDebug ("\thWnd %08X\n", hwnd);
@@ -450,7 +449,6 @@ winMWExtWMWindowProc (HWND hwnd, UINT message,
       winDebug ("\thwndScreen %08X\n", hwndScreen);
       winDebug ("winMWExtWMWindowProc (%08x) %08x %08x %08x\n",
 	      pRLWinPriv, message, wParam, lParam);
-#endif
     }
   /* Branch on message type */
   switch (message)
@@ -784,9 +782,7 @@ winMWExtWMWindowProc (HWND hwnd, UINT message,
       return 0;
 
     case WM_ERASEBKGND:
-#if CYGDEBUG
       winDebug ("winMWExtWMWindowProc - WM_ERASEBKGND\n");
-#endif
       /*
        * Pretend that we did erase the background but we don't care,
        * since we repaint the entire region anyhow
@@ -1324,11 +1320,11 @@ winMWExtWMWindowProc (HWND hwnd, UINT message,
       break;
 
     case WM_MANAGE:
-      ErrorF ("winMWExtWMWindowProc - WM_MANAGE\n");
+      winDebug ("winMWExtWMWindowProc - WM_MANAGE\n");
       break;
 
     case WM_UNMANAGE:
-      ErrorF ("winMWExtWMWindowProc - WM_UNMANAGE\n");
+      winDebug ("winMWExtWMWindowProc - WM_UNMANAGE\n");
       break;
 
     default:
diff --git a/xorg-server/hw/xwin/winwindow.c b/xorg-server/hw/xwin/winwindow.c
index 0e75a2c6a..6f22a5a6e 100644
--- a/xorg-server/hw/xwin/winwindow.c
+++ b/xorg-server/hw/xwin/winwindow.c
@@ -58,13 +58,12 @@ winReshapeRootless (WindowPtr pWin);
 Bool
 winCreateWindowNativeGDI (WindowPtr pWin)
 {
+  Bool fResult;
   ScreenPtr		pScreen = pWin->drawable.pScreen;
   winWindowPriv(pWin);
   winScreenPriv(pScreen);
 
-#if CYGDEBUG
-  winTrace ("winCreateWindowNativeGDI (%p)\n", pWin);
-#endif
+  winDebug ("winCreateWindowNativeGDI (%p)\n", pWin);
 
   WIN_UNWRAP(CreateWindow);
   fResult = (*pScreen->CreateWindow) (pWin);
@@ -85,9 +84,7 @@ winDestroyWindowNativeGDI (WindowPtr pWin)
   winWindowPriv(pWin);
   winScreenPriv(pScreen);
 
-#if CYGDEBUG
-  winTrace ("winDestroyWindowNativeGDI (%p)\n", pWin);
-#endif
+  winDebug ("winDestroyWindowNativeGDI (%p)\n", pWin);
 
   WIN_UNWRAP(DestroyWindow); 
   fResult = (*pScreen->DestroyWindow)(pWin);
@@ -108,9 +105,7 @@ winPositionWindowNativeGDI (WindowPtr pWin, int x, int y)
   winWindowPriv(pWin);
   winScreenPriv(pScreen);
 
-#if CYGDEBUG
-  winTrace ("winPositionWindowNativeGDI (%p)\n", pWin);
-#endif
+  winDebug ("winPositionWindowNativeGDI (%p)\n", pWin);
 
   WIN_UNWRAP(PositionWindow);
   fResult = (*pScreen->PositionWindow)(pWin, x, y);
@@ -139,10 +134,6 @@ winCopyWindowNativeGDI (WindowPtr pWin,
   ScreenPtr		pScreen = pWin->drawable.pScreen;
   winScreenPriv(pScreen);
 
-#if 0
-  ErrorF ("winCopyWindow\n");
-#endif
-
   /* Get a pointer to the root window */
   pwinRoot = WindowTable[pWin->drawable.pScreen->myNum];
 
@@ -182,19 +173,9 @@ winCopyWindowNativeGDI (WindowPtr pWin,
   pBoxDst = REGION_RECTS(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,
@@ -220,9 +201,7 @@ winChangeWindowAttributesNativeGDI (WindowPtr pWin, unsigned long mask)
   winWindowPriv(pWin);
   winScreenPriv(pScreen);
 
-#if CYGDEBUG
-  winTrace ("winChangeWindowAttributesNativeGDI (%p)\n", pWin);
-#endif
+  winDebug ("winChangeWindowAttributesNativeGDI (%p)\n", pWin);
   
   WIN_UNWRAP(ChangeWindowAttributes); 
   fResult = (*pScreen->ChangeWindowAttributes)(pWin, mask);
@@ -248,9 +227,7 @@ winUnmapWindowNativeGDI (WindowPtr pWin)
   winWindowPriv(pWin);
   winScreenPriv(pScreen);
 
-#if CYGDEBUG
-  winTrace ("winUnmapWindowNativeGDI (%p)\n", pWin);
-#endif
+  winDebug ("winUnmapWindowNativeGDI (%p)\n", pWin);
 
   WIN_UNWRAP(UnrealizeWindow); 
   fResult = (*pScreen->UnrealizeWindow)(pWin);
@@ -272,9 +249,7 @@ winMapWindowNativeGDI (WindowPtr pWin)
   winWindowPriv(pWin);
   winScreenPriv(pScreen);
 
-#if CYGDEBUG
-  winTrace ("winMapWindowNativeGDI (%p)\n", pWin);
-#endif
+  winDebug ("winMapWindowNativeGDI (%p)\n", pWin);
 
   WIN_UNWRAP(RealizeWindow); 
   fResult = (*pScreen->RealizeWindow)(pWin);
@@ -297,9 +272,7 @@ winCreateWindowRootless (WindowPtr pWin)
   winWindowPriv(pWin);
   winScreenPriv(pScreen);
 
-#if CYGDEBUG
-  winTrace ("winCreateWindowRootless (%p)\n", pWin);
-#endif
+  winDebug ("winCreateWindowRootless (%p)\n", pWin);
 
   WIN_UNWRAP(CreateWindow);
   fResult = (*pScreen->CreateWindow) (pWin);
@@ -322,9 +295,7 @@ winDestroyWindowRootless (WindowPtr pWin)
   winWindowPriv(pWin);
   winScreenPriv(pScreen);
 
-#if CYGDEBUG
-  winTrace ("winDestroyWindowRootless (%p)\n", pWin);
-#endif
+  winDebug ("winDestroyWindowRootless (%p)\n", pWin);
 
   WIN_UNWRAP(DestroyWindow); 
   fResult = (*pScreen->DestroyWindow)(pWin);
@@ -352,10 +323,7 @@ winPositionWindowRootless (WindowPtr pWin, int x, int y)
   ScreenPtr		pScreen = pWin->drawable.pScreen;
   winScreenPriv(pScreen);
 
-
-#if CYGDEBUG
-  winTrace ("winPositionWindowRootless (%p)\n", pWin);
-#endif
+  winDebug ("winPositionWindowRootless (%p)\n", pWin);
 
   WIN_UNWRAP(PositionWindow);
   fResult = (*pScreen->PositionWindow)(pWin, x, y);
@@ -377,9 +345,7 @@ winChangeWindowAttributesRootless (WindowPtr pWin, unsigned long mask)
   ScreenPtr		pScreen = pWin->drawable.pScreen;
   winScreenPriv(pScreen);
 
-#if CYGDEBUG
-  winTrace ("winChangeWindowAttributesRootless (%p)\n", pWin);
-#endif
+  winDebug ("winChangeWindowAttributesRootless (%p)\n", pWin);
 
   WIN_UNWRAP(ChangeWindowAttributes); 
   fResult = (*pScreen->ChangeWindowAttributes)(pWin, mask);
@@ -403,9 +369,7 @@ winUnmapWindowRootless (WindowPtr pWin)
   winWindowPriv(pWin);
   winScreenPriv(pScreen);
 
-#if CYGDEBUG
-  winTrace ("winUnmapWindowRootless (%p)\n", pWin);
-#endif
+  winDebug ("winUnmapWindowRootless (%p)\n", pWin);
 
   WIN_UNWRAP(UnrealizeWindow); 
   fResult = (*pScreen->UnrealizeWindow)(pWin);
@@ -434,9 +398,7 @@ winMapWindowRootless (WindowPtr pWin)
   ScreenPtr		pScreen = pWin->drawable.pScreen;
   winScreenPriv(pScreen);
 
-#if CYGDEBUG
-  winTrace ("winMapWindowRootless (%p)\n", pWin);
-#endif
+  winDebug ("winMapWindowRootless (%p)\n", pWin);
 
   WIN_UNWRAP(RealizeWindow); 
   fResult = (*pScreen->RealizeWindow)(pWin);
@@ -456,9 +418,7 @@ winSetShapeRootless (WindowPtr pWin)
   ScreenPtr		pScreen = pWin->drawable.pScreen;
   winScreenPriv(pScreen);
 
-#if CYGDEBUG
-  winTrace ("winSetShapeRootless (%p)\n", pWin);
-#endif
+  winDebug ("winSetShapeRootless (%p)\n", pWin);
 
   WIN_UNWRAP(SetShape); 
   (*pScreen->SetShape)(pWin);
@@ -487,9 +447,7 @@ winAddRgn (WindowPtr pWin, pointer data)
   /* If pWin is not Root */
   if (pWin->parent != NULL) 
     {
-#if CYGDEBUG
       winDebug ("winAddRgn ()\n");
-#endif
       if (pWin->mapped)
 	{
 	  iBorder = wBorderWidth (pWin);
@@ -504,8 +462,8 @@ winAddRgn (WindowPtr pWin, pointer data)
 	  
 	  if (hRgnWin == NULL)
 	    {
-	      ErrorF ("winAddRgn - CreateRectRgn () failed\n");
-	      ErrorF ("  Rect %d %d %d %d\n",
+	      winDebug ("winAddRgn - CreateRectRgn () failed\n");
+	      winDebug ("  Rect %d %d %d %d\n",
 		      iX, iY, iX + iWidth, iY + iHeight);
 	    }
 	  
@@ -570,9 +528,7 @@ winReshapeRootless (WindowPtr pWin)
   HRGN		hRgn, hRgnRect;
   winWindowPriv(pWin);
 
-#if CYGDEBUG
   winDebug ("winReshapeRootless ()\n");
-#endif
 
   /* Bail if the window is the root window */
   if (pWin->parent == NULL)
diff --git a/xorg-server/hw/xwin/winwindow.h b/xorg-server/hw/xwin/winwindow.h
index 86c094334..3bd619ad3 100644
--- a/xorg-server/hw/xwin/winwindow.h
+++ b/xorg-server/hw/xwin/winwindow.h
@@ -41,28 +41,22 @@
 
 /* Constant strings */
 #ifndef PROJECT_NAME
-#  define PROJECT_NAME		"Cygwin/X"
+#  define PROJECT_NAME		"VcXsrv"
 #endif
-#define WINDOW_CLASS		"cygwin/x"
-#define WINDOW_TITLE		PROJECT_NAME ":%s.%d"
-#define WINDOW_TITLE_XDMCP	"%s:%s.%d"
-#define WIN_SCR_PROP		"cyg_screen_prop rl"
-#define WINDOW_CLASS_X		"cygwin/x X rl"
+#define WINDOW_CLASS		"VcXsrv/x"
+#define WINDOW_TITLE		PROJECT_NAME " Server - %s:%s.%d"
+#define WINDOW_TITLE_XDMCP	PROJECT_NAME " Server - %s:%s.%d"
+#define WIN_SCR_PROP		"vcxsrv_screen_prop rl"
+#define WINDOW_CLASS_X		"vcxsrv/x X rl"
 #define WINDOW_TITLE_X		PROJECT_NAME " X"
-#define WIN_WINDOW_PROP		"cyg_window_prop_rl"
+#define WIN_WINDOW_PROP		"vcxsrv_window_prop_rl"
 #ifdef HAS_DEVWINDOWS
 # define WIN_MSG_QUEUE_FNAME	"/dev/windows"
 #endif
-#define WIN_WID_PROP		"cyg_wid_prop_rl"
-#define WIN_NEEDMANAGE_PROP	"cyg_override_redirect_prop_rl"
-#ifndef CYGMULTIWINDOW_DEBUG
-#define CYGMULTIWINDOW_DEBUG    NO
-#endif
-#ifndef CYGWINDOWING_DEBUG
-#define CYGWINDOWING_DEBUG	NO
-#endif
+#define WIN_WID_PROP		"vcxsrv_wid_prop_rl"
+#define WIN_NEEDMANAGE_PROP	"vcxsrv_override_redirect_prop_rl"
 
-#define XMING_SIGNATURE		0x12345678L
+#define VCXSRV_SIGNATURE		0xdeaddeadL
 
 typedef struct _winPrivScreenRec *winPrivScreenPtr;
 
diff --git a/xorg-server/hw/xwin/winwindowswm.c b/xorg-server/hw/xwin/winwindowswm.c
index 5b164ea96..73776ba5f 100644
--- a/xorg-server/hw/xwin/winwindowswm.c
+++ b/xorg-server/hw/xwin/winwindowswm.c
@@ -290,27 +290,22 @@ winWindowsWMSendEvent (int type, unsigned int mask, int which, int arg,
   WMEventPtr		*pHead, pEvent;
   ClientPtr		client;
   xWindowsWMNotifyEvent se;
-#if CYGMULTIWINDOW_DEBUG
-  ErrorF ("winWindowsWMSendEvent %d %d %d %d,  %d %d - %d %d\n",
+  winDebug ("winWindowsWMSendEvent %d %d %d %d,  %d %d - %d %d\n",
 	  type, mask, which, arg, x, y, w, h);
-#endif
   pHead = (WMEventPtr *) LookupIDByType(eventResource, eventResourceType);
   if (!pHead)
     return;
   for (pEvent = *pHead; pEvent; pEvent = pEvent->next)
     {
       client = pEvent->client;
-#if CYGMULTIWINDOW_DEBUG
-      ErrorF ("winWindowsWMSendEvent - x%08x\n", (int) client);
-#endif
+      winDebug ("winWindowsWMSendEvent - x%08x\n", (int) client);
       if ((pEvent->mask & mask) == 0
 	  || client == serverClient || client->clientGone)
 	{
 	  continue;
 	}
-#if CYGMULTIWINDOW_DEBUG 
-      ErrorF ("winWindowsWMSendEvent - send\n");
-#endif
+      winDebug ("winWindowsWMSendEvent - send\n");
+
       se.type = type + WMEventBase;
       se.kind = which;
       se.window = window;
@@ -379,10 +374,8 @@ ProcWindowsWMFrameGetRect (register ClientPtr client)
   RECT rcNew;
   REQUEST(xWindowsWMFrameGetRectReq);
 
-#if CYGMULTIWINDOW_DEBUG
-  ErrorF ("ProcWindowsWMFrameGetRect %d %d\n",
+  winDebug ("ProcWindowsWMFrameGetRect %d %d\n",
 	  (sizeof(xWindowsWMFrameGetRectReq) >> 2), (int) client->req_len);
-#endif
   
   REQUEST_SIZE_MATCH(xWindowsWMFrameGetRectReq);
   rep.type = X_Reply;
@@ -401,10 +394,8 @@ ProcWindowsWMFrameGetRect (register ClientPtr client)
   SetRect (&rcNew, stuff->ix, stuff->iy,
 	   stuff->ix + stuff->iw, stuff->iy + stuff->ih);
     
-#if CYGMULTIWINDOW_DEBUG
-  ErrorF ("ProcWindowsWMFrameGetRect - %d %d %d %d\n",
+  winDebug ("ProcWindowsWMFrameGetRect - %d %d %d %d\n",
 	  stuff->ix, stuff->iy, stuff->ix + stuff->iw, stuff->iy + stuff->ih);
-#endif
 
   /*
    * Calculate the required size of the Windows window rectangle,
@@ -415,10 +406,8 @@ ProcWindowsWMFrameGetRect (register ClientPtr client)
   rep.y = rcNew.top;
   rep.w = rcNew.right - rcNew.left;
   rep.h = rcNew.bottom - rcNew.top;
-#if CYGMULTIWINDOW_DEBUG
-  ErrorF ("ProcWindowsWMFrameGetRect - %d %d %d %d\n",
+  winDebug ("ProcWindowsWMFrameGetRect - %d %d %d %d\n",
 	  rep.x, rep.y, rep.w, rep.h);
-#endif
 
   WriteToClient(client, sizeof(xWindowsWMFrameGetRectReply), (char *)&rep);
   return (client->noClientException);
@@ -438,26 +427,22 @@ ProcWindowsWMFrameDraw (register ClientPtr client)
 
   REQUEST_SIZE_MATCH (xWindowsWMFrameDrawReq);
 
-#if CYGMULTIWINDOW_DEBUG
-  ErrorF ("ProcWindowsWMFrameDraw\n");
-#endif
+  winDebug ("ProcWindowsWMFrameDraw\n");
+
   rc = dixLookupWindow(&pWin, stuff->window, client, DixReadAccess);
   if (rc != Success)
       return rc;
-#if CYGMULTIWINDOW_DEBUG
-  ErrorF ("ProcWindowsWMFrameDraw - Window found\n");
-#endif
+
+  winDebug ("ProcWindowsWMFrameDraw - Window found\n");
 
   pRLWinPriv = (win32RootlessWindowPtr) RootlessFrameForWindow (pWin, TRUE);
   if (pRLWinPriv == 0) return BadWindow;
 
-#if CYGMULTIWINDOW_DEBUG
-  ErrorF ("ProcWindowsWMFrameDraw - HWND 0x%08x 0x%08x 0x%08x\n",
+  winDebug ("ProcWindowsWMFrameDraw - HWND 0x%08x 0x%08x 0x%08x\n",
 	  (int) pRLWinPriv->hWnd, (int) stuff->frame_style,
 	  (int) stuff->frame_style_ex);
-  ErrorF ("ProcWindowsWMFrameDraw - %d %d %d %d\n",
+  winDebug ("ProcWindowsWMFrameDraw - %d %d %d %d\n",
 	  stuff->ix, stuff->iy, stuff->iw, stuff->ih);
-#endif
 
   /* Store the origin, height, and width in a rectangle structure */
   SetRect (&rcNew, stuff->ix, stuff->iy,
@@ -510,9 +495,7 @@ ProcWindowsWMFrameDraw (register ClientPtr client)
       winMWExtWMReshapeFrame (pRLWinPriv, &newShape);
       REGION_UNINIT(pScreen, &newShape);
     }
-#if CYGMULTIWINDOW_DEBUG
-  ErrorF ("ProcWindowsWMFrameDraw - done\n");
-#endif
+  winDebug ("ProcWindowsWMFrameDraw - done\n");
 
   return (client->noClientException);
 }
@@ -529,18 +512,14 @@ ProcWindowsWMFrameSetTitle(
   win32RootlessWindowPtr pRLWinPriv;
   int rc;
 
-#if CYGMULTIWINDOW_DEBUG
-  ErrorF ("ProcWindowsWMFrameSetTitle\n");
-#endif
+  winDebug ("ProcWindowsWMFrameSetTitle\n");
 
   REQUEST_AT_LEAST_SIZE(xWindowsWMFrameSetTitleReq);
 
   rc = dixLookupWindow(&pWin, stuff->window, client, DixReadAccess);
   if (rc != Success)
       return rc;
-#if CYGMULTIWINDOW_DEBUG
-  ErrorF ("ProcWindowsWMFrameSetTitle - Window found\n");
-#endif
+  winDebug ("ProcWindowsWMFrameSetTitle - Window found\n");
 
   title_length = stuff->title_length;
   title_max = (stuff->length << 2) - sizeof(xWindowsWMFrameSetTitleReq);
@@ -548,9 +527,7 @@ ProcWindowsWMFrameSetTitle(
   if (title_max < title_length)
     return BadValue;
 
-#if CYGMULTIWINDOW_DEBUG
-  ErrorF ("ProcWindowsWMFrameSetTitle - length is valid\n");
-#endif
+  winDebug ("ProcWindowsWMFrameSetTitle - length is valid\n");
 
   title_bytes = malloc (title_length+1);
   strncpy (title_bytes, (unsigned char *) &stuff[1], title_length);
@@ -569,9 +546,7 @@ ProcWindowsWMFrameSetTitle(
 
   free (title_bytes);
 
-#if CYGMULTIWINDOW_DEBUG
-  ErrorF ("ProcWindowsWMFrameSetTitle - done\n");
-#endif
+  winDebug ("ProcWindowsWMFrameSetTitle - done\n");
 
   return (client->noClientException);
 }
diff --git a/xorg-server/hw/xwin/winwndproc.c b/xorg-server/hw/xwin/winwndproc.c
index d72a5f135..8dcabe827 100644
--- a/xorg-server/hw/xwin/winwndproc.c
+++ b/xorg-server/hw/xwin/winwndproc.c
@@ -42,6 +42,10 @@
 #include "winmsg.h"
 #include "inputstr.h"
 
+#ifndef XKB_IN_SERVER
+#define XKB_IN_SERVER
+#endif
+#include <xkbsrv.h>
 /*
  * Global variables
  */
@@ -82,9 +86,7 @@ winWindowProc (HWND hwnd, UINT message,
   int				iScanCode;
   int				i;
 
-#if CYGDEBUG
   winDebugWin32Message("winWindowProc", hwnd, message, wParam, lParam);
-#endif
   
   /* Watch for server regeneration */
   if (g_ulServerGeneration != s_ulServerGeneration)
@@ -97,9 +99,7 @@ winWindowProc (HWND hwnd, UINT message,
   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;
@@ -120,9 +120,7 @@ winWindowProc (HWND hwnd, UINT message,
 				   s_pScreenPriv);
 
     case WM_CREATE:
-#if CYGDEBUG
       winDebug ("winWindowProc - WM_CREATE\n");
-#endif
       
       /*
        * Add a property to our display window that references
@@ -155,7 +153,7 @@ winWindowProc (HWND hwnd, UINT message,
 	  
 	  s_pScreenPriv->hwndScreen = hwnd;
 
-	  winInitNotifyIcon (s_pScreenPriv);
+	  winInitNotifyIcon (s_pScreenPriv,FALSE);
 	}
       return 0;
 
@@ -191,13 +189,13 @@ winWindowProc (HWND hwnd, UINT message,
 	  break;
 	}
       
-      ErrorF ("winWindowProc - WM_DISPLAYCHANGE - orig bpp: %d, last bpp: %d, "
+      winDebug ("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 "
+      winDebug ("winWindowProc - WM_DISPLAYCHANGE - new width: %d "
 	      "new height: %d\n",
 	      LOWORD (lParam), HIWORD (lParam));
 
@@ -237,7 +235,7 @@ winWindowProc (HWND hwnd, UINT message,
 	      ))
 	{
 	  /* Cannot display the visual until the depth is restored */
-	  ErrorF ("winWindowProc - Disruptive change in depth\n");
+	  winDebug ("winWindowProc - Disruptive change in depth\n");
 
 	  /* Display Exit dialog */
 	  winDisplayDepthChangeDialog (s_pScreenPriv);
@@ -270,25 +268,19 @@ winWindowProc (HWND hwnd, UINT message,
 	   * 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 */
@@ -300,10 +292,8 @@ winWindowProc (HWND hwnd, UINT message,
 	}
       else
 	{
-#if CYGDEBUG
 	  winDebug ("winWindowProc - WM_DISPLAYCHANGE - Dimensions did not "
 		  "change\n");
-#endif
 	}
 
       /* Store the new display dimensions and depth */
@@ -331,9 +321,7 @@ winWindowProc (HWND hwnd, UINT message,
 	RECT			rcWindow;
 	int			iWidth, iHeight;
 
-#if CYGDEBUG
 	winDebug ("winWindowProc - WM_SIZE\n");
-#endif
 
 	/* Break if we do not use scrollbars */
 	if (!s_pScreenInfo->fScrollbars
@@ -369,7 +357,7 @@ winWindowProc (HWND hwnd, UINT message,
 	iWidth = rcWindow.right - rcWindow.left;
 	iHeight = rcWindow.bottom - rcWindow.top;
 
-	ErrorF ("winWindowProc - WM_SIZE - window w: %d h: %d, "
+	winDebug ("winWindowProc - WM_SIZE - window w: %d h: %d, "
 		"new client area w: %d h: %d\n",
 		iWidth, iHeight, LOWORD (lParam), HIWORD (lParam));
 
@@ -433,9 +421,7 @@ winWindowProc (HWND hwnd, UINT message,
 	SCROLLINFO		si;
 	int			iVertPos;
 
-#if CYGDEBUG
 	winDebug ("winWindowProc - WM_VSCROLL\n");
-#endif
       
 	/* Get vertical scroll bar info */
 	si.cbSize = sizeof (si);
@@ -518,9 +504,7 @@ winWindowProc (HWND hwnd, UINT message,
 	SCROLLINFO		si;
 	int			iHorzPos;
 
-#if CYGDEBUG
 	winDebug ("winWindowProc - WM_HSCROLL\n");
-#endif
       
 	/* Get horizontal scroll bar info */
 	si.cbSize = sizeof (si);
@@ -604,10 +588,8 @@ winWindowProc (HWND hwnd, UINT message,
 	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
@@ -650,9 +632,7 @@ winWindowProc (HWND hwnd, UINT message,
       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
@@ -661,9 +641,7 @@ winWindowProc (HWND hwnd, UINT message,
       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
@@ -684,9 +662,7 @@ winWindowProc (HWND hwnd, UINT message,
 
     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.
@@ -718,7 +694,7 @@ winWindowProc (HWND hwnd, UINT message,
 	break;
 
       /* Has the mouse pointer crossed screens? */
-      if (s_pScreen != miPointerGetScreen(g_pwinPointer))
+      if (g_pwinPointer && 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);
@@ -950,9 +926,7 @@ winWindowProc (HWND hwnd, UINT message,
     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;
 
@@ -1010,7 +984,7 @@ winWindowProc (HWND hwnd, UINT message,
 	   * user enters Alt + F4 and is surprised when the application
 	   * quits.
 	   */
-	  ErrorF ("winWindowProc - WM_*KEYDOWN - Closekey hit, quitting\n");
+	  winDebug ("winWindowProc - WM_*KEYDOWN - Closekey hit, quitting\n");
 	  
 	  /* Display Exit dialog */
 	  winDisplayExitDialog (s_pScreenPriv);
@@ -1103,7 +1077,7 @@ winWindowProc (HWND hwnd, UINT message,
       /* 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 "
+	  winDebug ("winWindowProc - WM_ACTIVATE - Bad depth, trying "
 		  "to override window activation\n");
 
 	  /* Minimize the window */
@@ -1125,9 +1099,7 @@ winWindowProc (HWND hwnd, UINT message,
 	  return 0;
 	}
 
-#if CYGDEBUG
       winDebug ("winWindowProc - WM_ACTIVATE\n");
-#endif
 
       /*
        * Focus is being changed to another window.
@@ -1153,9 +1125,7 @@ winWindowProc (HWND hwnd, UINT message,
 	  || s_pScreenInfo->fIgnoreInput)
 	break;
 
-#if CYGDEBUG || TRUE
       winDebug ("winWindowProc - WM_ACTIVATEAPP\n");
-#endif
 
       /* Activate or deactivate */
       s_pScreenPriv->fActive = wParam;
@@ -1243,7 +1213,7 @@ winWindowProc (HWND hwnd, UINT message,
 
 #ifdef XWIN_MULTIWINDOWEXTWM
     case WM_MANAGE:
-      ErrorF ("winWindowProc - WM_MANAGE\n");
+      winDebug ("winWindowProc - WM_MANAGE\n");
       s_pScreenInfo->fAnotherWMRunning = FALSE;
 
       if (s_pScreenInfo->fInternalWM)
@@ -1254,7 +1224,7 @@ winWindowProc (HWND hwnd, UINT message,
       break;
 
     case WM_UNMANAGE:
-      ErrorF ("winWindowProc - WM_UNMANAGE\n");
+      winDebug ("winWindowProc - WM_UNMANAGE\n");
       s_pScreenInfo->fAnotherWMRunning = TRUE;
 
       if (s_pScreenInfo->fInternalWM)
@@ -1268,7 +1238,7 @@ winWindowProc (HWND hwnd, UINT message,
     default:
       if(message == s_uTaskbarRestart)
 	{
-	  winInitNotifyIcon (s_pScreenPriv);
+	  winInitNotifyIcon (s_pScreenPriv,FALSE);
 	}
       break;
     }
diff --git a/xorg-server/hw/xwin/xlaunch/config.h b/xorg-server/hw/xwin/xlaunch/config.h
new file mode 100644
index 000000000..e2774e894
--- /dev/null
+++ b/xorg-server/hw/xwin/xlaunch/config.h
@@ -0,0 +1,76 @@
+/*
+ * Copyright (c) 2005 Alexander Gottwald
+ *
+ * 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 ABOVE LISTED COPYRIGHT HOLDER(S) 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(s) of the above copyright
+ * holders shall not be used in advertising or otherwise to promote the sale,
+ * use or other dealings in this Software without prior written authorization.
+ *
+ * Authors:	Alexander Gottwald, Colin Harrison
+ */
+#ifndef __CONFIG_H__
+#define __CONFIG_H__
+#define UNICODE
+#define _UNICODE
+
+#define PROG_NUMBER 10
+#define HOST_NUMBER 10
+#define MAX_MESSAGE 256
+#define MAX_CAPTION 128
+
+#include <windows.h>
+#include <string>
+#include <vector>
+struct CConfig
+{
+    enum {MultiWindow, Fullscreen, Windowed, Nodecoration} window;
+    enum {NoClient, StartProgram, XDMCP} client;
+    enum {NoXClient, Local, PuTTY, OpenSSH} clientstart;
+    std::string display;
+    std::string protocol_path;
+    std::string program;
+    std::vector<std::string> progs;
+    bool compress;
+    bool local;
+    std::string protocol;
+    std::string host;
+    std::string user;
+    std::string password;
+    bool password_save;
+    bool password_start;
+    bool broadcast;
+    bool indirect;
+    std::string xdmcp_host;
+    std::vector<std::string> xhosts;
+    bool clipboard;
+    bool no_access_control;
+    std::string font_server;
+    std::string extra_params;
+    std::string extra_ssh;
+    CConfig() : window(MultiWindow), client(NoClient), clientstart(NoXClient), display(""), 
+                protocol_path(""), program("xeyes"), progs(PROG_NUMBER), compress(false), host(""), user(""),
+                password(""), password_save(false), password_start(false), broadcast(false),
+                indirect(false), xdmcp_host(""), xhosts(HOST_NUMBER), clipboard(true), no_access_control(false),
+                font_server(), extra_params(), extra_ssh() {};
+    void Load(const char * filename);
+    void Save(const char * filename);
+};
+
+#endif
diff --git a/xorg-server/hw/xwin/xlaunch/main.cc b/xorg-server/hw/xwin/xlaunch/main.cc
index 2247d3aaf..b3b1001ff 100644
--- a/xorg-server/hw/xwin/xlaunch/main.cc
+++ b/xorg-server/hw/xwin/xlaunch/main.cc
@@ -23,6 +23,10 @@
  * holders shall not be used in advertising or otherwise to promote the sale,
  * use or other dealings in this Software without prior written authorization.
  */
+
+#define printf _not_used_   /* Make sure that we do not use the standard printf definition because
+                               we are going to reimplement it in this file */
+
 #include "window/util.h"
 #include "window/wizard.h"
 #include "resources/resources.h"
@@ -34,6 +38,68 @@
 
 #include <X11/Xlib.h>
 
+#ifdef _MSC_VER
+#define snprintf _snprintf
+#endif
+#include <fcntl.h>
+#include <io.h>
+#undef printf
+
+#if defined(_MSC_VER) && defined(_DLL)
+#define _CRTEXP __declspec(dllexport)
+#else
+#define _CRTEXP
+#endif
+
+_Check_return_opt_ _CRTEXP int __cdecl printf(_In_z_ _Printf_format_string_ const char * pFmt, ...)
+{
+  static int ConsoleCreated=0;
+  va_list arglist;
+  if (!ConsoleCreated)
+  {
+    int hConHandle;
+    long lStdHandle;
+    CONSOLE_SCREEN_BUFFER_INFO coninfo;
+
+    FILE *fp;
+    const unsigned int MAX_CONSOLE_LINES = 500;
+    ConsoleCreated=1;
+    if (!AttachConsole(ATTACH_PARENT_PROCESS))
+      AllocConsole();
+
+      // set the screen buffer to be big enough to let us scroll text
+    GetConsoleScreenBufferInfo(GetStdHandle(STD_OUTPUT_HANDLE),	&coninfo);
+    coninfo.dwSize.Y = MAX_CONSOLE_LINES;
+    SetConsoleScreenBufferSize(GetStdHandle(STD_OUTPUT_HANDLE),	coninfo.dwSize);
+
+    // redirect unbuffered STDOUT to the console
+    lStdHandle = (long)GetStdHandle(STD_OUTPUT_HANDLE);
+    hConHandle = _open_osfhandle(lStdHandle, _O_TEXT);
+    fp = _fdopen( hConHandle, "w" );
+    *stdout = *fp;
+    setvbuf( stdout, NULL, _IONBF, 0 );
+
+    // redirect unbuffered STDIN to the console
+    lStdHandle = (long)GetStdHandle(STD_INPUT_HANDLE);
+    hConHandle = _open_osfhandle(lStdHandle, _O_TEXT);
+    fp = _fdopen( hConHandle, "r" );
+    *stdin = *fp;
+    setvbuf( stdin, NULL, _IONBF, 0 );
+
+    // redirect unbuffered STDERR to the console
+    lStdHandle = (long)GetStdHandle(STD_ERROR_HANDLE);
+    hConHandle = _open_osfhandle(lStdHandle, _O_TEXT);
+    fp = _fdopen( hConHandle, "w" );
+    *stderr = *fp;
+    setvbuf( stderr, NULL, _IONBF, 0 );
+
+  }
+
+  va_start(arglist, pFmt );
+  return vfprintf(stderr, pFmt, arglist);
+}
+
+
 /// @brief Send WM_ENDSESSION to all program windows.
 /// This will shutdown the started xserver
 BOOL CALLBACK KillWindowsProc(HWND hwnd, LPARAM lParam)
@@ -108,7 +174,10 @@ class CMyWizard : public CWizard
                     }
                     // Check for valid input
                     if (config.display.empty())
+                    {
+                        MessageBox(hwndDlg,"Please fill in a display number.","Error",MB_OK);
 			SetWindowLong(hwndDlg, DWL_MSGRESULT, -1);
+                    }
                     else
                         SetWindowLong(hwndDlg, DWL_MSGRESULT, IDD_CLIENTS);
 		    return TRUE;
@@ -489,7 +558,7 @@ class CMyWizard : public CWizard
             return NULL;
         }
                
-        /// @brief Do the actual start of Xming and clients
+        /// @brief Do the actual start of VCXsrv and clients
 	void StartUp()
 	{
 	    std::string buffer;
@@ -500,12 +569,12 @@ class CMyWizard : public CWizard
 	    std::string display = "localhost" + display_id + ":0";
 
 #ifdef _DEBUG
-            // Debug only: Switch to Xming installation directory
-	    SetCurrentDirectory("C:\\Programme\\Xming");
+            // Debug only: Switch to VCXsrv installation directory
+	    SetCurrentDirectory("C:\\Programme\\vcxsrv");
 #endif	    
 
-            // Build Xming commandline
-	    buffer = "Xming " + display_id + " ";
+            // Build Xsrv commandline
+	    buffer = "vcxsrv " + display_id + " ";
 	    switch (config.window)
 	    {
 		case CConfig::MultiWindow:
@@ -577,7 +646,7 @@ class CMyWizard : public CWizard
 	    sic.cb = sizeof(sic);
 	    ZeroMemory( &pic, sizeof(pic) );
 
-	    // Start Xming process. 
+	    // Start VCXsrv process. 
 #ifdef _DEBUG
 	    printf("%s\n", buffer.c_str());
 #endif
@@ -627,7 +696,7 @@ class CMyWizard : public CWizard
 #ifdef _DEBUG
 	    printf("killing process!\n");
 #endif
-            // Check if Xming is still running
+            // Check if Xsrv is still running
 	    DWORD exitcode;
 	    GetExitCodeProcess(pi.hProcess, &exitcode);
 	    unsigned counter = 0;
@@ -636,7 +705,7 @@ class CMyWizard : public CWizard
 		if (++counter > 10)
 		    TerminateProcess(pi.hProcess, (DWORD)-1);
 		else
-		    // Shutdown Xming (the soft way!)
+		    // Shutdown Xsrv (the soft way!)
 		    EnumThreadWindows(pi.dwThreadId, KillWindowsProc, 0);
 		Sleep(500);
 		GetExitCodeProcess(pi.hProcess, &exitcode);
@@ -695,6 +764,42 @@ int main(int argc, char **argv)
     }
 }
 
-
+int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow)
+{
+  int argc=1;
+  #define MAXNRARGS 20
+  char *argv[MAXNRARGS]={"plink"};
+  char *pTmp=lpCmdLine;
+  while (*pTmp && argc<MAXNRARGS-1)
+  {
+    char *pEnd;
+    if (*pTmp=='"')
+    {
+      pEnd=strchr(pTmp+1,'"');
+    }
+    else if (*pTmp!=' ')
+    {
+      pEnd=strchr(pTmp,' ');
+    }
+    else
+    {
+      pTmp++;
+      continue;
+    }
+    if (pEnd)
+    {
+      *pEnd=0;
+      argv[argc++]=pTmp;
+      pTmp=pEnd+1;
+    }
+    else
+    {
+      argv[argc++]=pTmp;
+      break;
+    }
+  }
+  
+  return main(argc,argv);
+}
 
 
diff --git a/xorg-server/hw/xwin/xlaunch/makefile b/xorg-server/hw/xwin/xlaunch/makefile
new file mode 100644
index 000000000..63b37dd1b
--- /dev/null
+++ b/xorg-server/hw/xwin/xlaunch/makefile
@@ -0,0 +1,32 @@
+INCLUDELIBFILES = window\$(OBJDIR)\window.lib \

+                  $(MHMAKECONF)\libx11\src\$(OBJDIR)\libx11.lib \

+                  $(MHMAKECONF)\libxcb\src\$(OBJDIR)\libxcb.lib \

+                  $(MHMAKECONF)\libxau\$(OBJDIR)\libxau.lib \

+                  $(MHMAKECONF)\libx11\src\xlibi18n\$(OBJDIR)\libi18n.lib \

+                  $(MHMAKECONF)\libx11\modules\lc\xlocale\$(OBJDIR)\libxlocale.lib \

+                  $(MHMAKECONF)\libx11\modules\lc\utf8\$(OBJDIR)\libxlcUTF8Load.lib \

+                  $(MHMAKECONF)\libx11\modules\lc\gen\$(OBJDIR)\liblcGenConvLoad.lib \

+                  $(MHMAKECONF)\libx11\modules\lc\def\$(OBJDIR)\libxlcDef.lib \

+                  $(MHMAKECONF)\libx11\src\xkb\$(OBJDIR)\libxkb.lib \

+                  $(MHMAKECONF)\libx11\modules\im\ximcp\$(OBJDIR)\libximcp.lib \

+                  $(MHMAKECONF)\libx11\modules\om\generic\$(OBJDIR)\libxomGeneric.lib

+

+CSRCS=config.cc main.cc

+

+WINAPP = xlaunch

+

+RESOURCES = resources.rc

+

+$(OBJDIR)\%.res : resources\%.rc

+	$(RC) $(RCFLAGS) $(RCDEFINES:%=-d "%") $(RCINCLUDES:%=-i %) -Fo$(relpath $@) $<

+

+LIBDIRS=$(dir $(INCLUDELIBFILES))

+

+load_makefile $(LIBDIRS:%$(OBJDIR)\=%makefile MAKESERVER=$(MAKESERVER) DEBUG=$(DEBUG);)

+

+ifeq ($(DEBUG),1)

+LINKLIBS += $(MHMAKECONF)\pthreads\pthreadVC2d.lib

+else

+LINKLIBS += $(MHMAKECONF)\pthreads\pthreadVC2.lib

+endif

+

diff --git a/xorg-server/hw/xwin/xlaunch/resources/resources.h b/xorg-server/hw/xwin/xlaunch/resources/resources.h
index 470005192..15e733844 100644
--- a/xorg-server/hw/xwin/xlaunch/resources/resources.h
+++ b/xorg-server/hw/xwin/xlaunch/resources/resources.h
@@ -35,6 +35,8 @@
 #define IDD_FONTPATH            106

 #define IDD_CLIPBOARD           107

 

+#define IDI_XLAUNCH             108

+

 #define IDS_DISPLAY_TITLE       300

 #define IDS_DISPLAY_SUBTITLE    301

 #define IDS_CLIENTS_TITLE       302

diff --git a/xorg-server/hw/xwin/xlaunch/resources/resources.rc b/xorg-server/hw/xwin/xlaunch/resources/resources.rc
index 07fd52f32..e3df4610a 100644
--- a/xorg-server/hw/xwin/xlaunch/resources/resources.rc
+++ b/xorg-server/hw/xwin/xlaunch/resources/resources.rc
@@ -28,3 +28,5 @@
 #include "resources.h"
 #include "images.rc"
 #include "dialog.rc"
+
+IDI_XLAUNCH		ICON	"..\\..\\X.ico"
diff --git a/xorg-server/hw/xwin/xlaunch/resources/strings.rc b/xorg-server/hw/xwin/xlaunch/resources/strings.rc
index 5a9cd281b..94db96659 100644
--- a/xorg-server/hw/xwin/xlaunch/resources/strings.rc
+++ b/xorg-server/hw/xwin/xlaunch/resources/strings.rc
@@ -60,15 +60,15 @@
 #define STR_CAPTION_CLIPBOARD       "Clipboard settings"
 #define STR_CLIPBOARD               "Clipboard"
 #define STR_CLIPBOARD_DESC          "Start the integrated clipboard manager"
-#define STR_EXTRA_PARAMS_DESC       "Additional parameters for Xming"
+#define STR_EXTRA_PARAMS_DESC       "Additional parameters for VcXsrv"
 
 #define STR_CAPTION_FINISH          "Finish configuration"
-#define STR_FINISH_DESC	            "Configuration is complete. Clish Finish to start Xming."
+#define STR_FINISH_DESC	            "Configuration is complete. Clish Finish to start VcXsrv."
 #define STR_FINISH_SAVE_DESC        "You may also save the configuration for later use."
 #define STR_FINISH_SAVE	            "Save configuration"
 
 #define STR_DISPLAY_TITLE           "Select display settings"
-#define STR_DISPLAY_SUBTITLE        "Choose how Xming display programs"
+#define STR_DISPLAY_SUBTITLE        "Choose how VcXsrv display programs"
 #define STR_CLIENTS_TITLE           "Select how to start clients"
 #define STR_CLIENTS_SUBTITLE        ""
 #define STR_PROGRAM_TITLE           "Specify the program to start"
diff --git a/xorg-server/hw/xwin/xlaunch/window/makefile b/xorg-server/hw/xwin/xlaunch/window/makefile
new file mode 100644
index 000000000..18a33e728
--- /dev/null
+++ b/xorg-server/hw/xwin/xlaunch/window/makefile
@@ -0,0 +1,4 @@
+CSRCS=dialog.cc util.cc window.cc wizard.cc

+

+LIBRARY = window

+

diff --git a/xorg-server/hw/xwin/xlaunch/window/util.cc b/xorg-server/hw/xwin/xlaunch/window/util.cc
index fb7e87297..6f768348e 100644
--- a/xorg-server/hw/xwin/xlaunch/window/util.cc
+++ b/xorg-server/hw/xwin/xlaunch/window/util.cc
@@ -25,6 +25,8 @@
  */
 #include "util.h"
 
+const char * MessageDebug::notify_names[NOTIFY_NAMES_LEN];
+
 std::string win32_error::message(DWORD errorcode)
 {
     LPVOID lpMsgBuf;
diff --git a/xorg-server/hw/xwin/xlaunch/window/util.h b/xorg-server/hw/xwin/xlaunch/window/util.h
index cd21da657..a1196b115 100644
--- a/xorg-server/hw/xwin/xlaunch/window/util.h
+++ b/xorg-server/hw/xwin/xlaunch/window/util.h
@@ -28,7 +28,7 @@
 
 #include <windows.h>
 #include <stdexcept>
-
+#include <string>  
 
 class win32_error : public std::runtime_error
 {
@@ -39,7 +39,7 @@ class win32_error : public std::runtime_error
 };
 
 #define MESSAGE_NAMES_LEN 1024
-#define NOTIFY_NAMES_LEN 0
+#define NOTIFY_NAMES_LEN 1
 class MessageDebug
 {
     protected:
diff --git a/xorg-server/hw/xwin/xlaunch/window/wizard.h b/xorg-server/hw/xwin/xlaunch/window/wizard.h
index a2361c51c..c576cc093 100644
--- a/xorg-server/hw/xwin/xlaunch/window/wizard.h
+++ b/xorg-server/hw/xwin/xlaunch/window/wizard.h
@@ -29,7 +29,6 @@
 #include "dialog.h"

 #include <vector>

 

-#define _WIN32_IE 0x0500

 #include <prsht.h>

 

 class CWizard : public CBaseDialog