svn merge -r588:HEAD ^/branches/released .

9 files changed, 4897 insertions, 4897 deletions

diff --git a/xorg-server/hw/xwin/glx/indirect.c b/xorg-server/hw/xwin/glx/indirect.c
index 48094a69e..08c16f85d 100644
--- a/xorg-server/hw/xwin/glx/indirect.c
+++ b/xorg-server/hw/xwin/glx/indirect.c
@@ -1,2464 +1,2464 @@
-/*
- * File: indirect.c
- * Purpose: A GLX implementation that uses Windows OpenGL library
- *
- * Authors: Alexander Gottwald
- *          Jon TURNEY
- *
- * Copyright (c) Jon TURNEY 2009
- * Copyright (c) Alexander Gottwald 2004
- *
- * Portions of this file are copied from GL/apple/indirect.c,
- * which contains the following copyright:
- *
- * Copyright (c) 2007, 2008, 2009 Apple Inc.
- * Copyright (c) 2004 Torrey T. Lyons. All Rights Reserved.
- * Copyright (c) 2002 Greg Parker. All Rights Reserved.
- *
- * Portions of this file are copied from Mesa's xf86glx.c,
- * which contains the following copyright:
- *
- * Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
- * All Rights Reserved.
- *
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE 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.
- */
-
-/*
-  TODO:
-  - hook up remaining unimplemented extensions
-  - research what guarantees glXWaitX, glXWaitGL are supposed to offer, and implement then
-    using GdiFlush and/or glFinish
-  - pbuffer clobbering: we don't get async notification, but can we arrange to emit the
-    event when we notice it's been clobbered? at the very least, check if it's been clobbered
-    before using it?
-  - are the __GLXConfig * we get handed back ones we are made (so we can extend the structure
-    with privates?) Or are they created inside the GLX core as well?
-*/
-
-/*
-  MSDN clarifications:
-
-  It says SetPixelFormat()'s PIXELFORMATDESCRIPTOR pointer argument has no effect
-  except on metafiles, this seems to mean that as it's ok to supply NULL if the DC
-  is not for a metafile
-
-  wglMakeCurrent ignores the hdc if hglrc is NULL, so wglMakeCurrent(NULL, NULL)
-  is used to make no context current
-
-*/
-
-#ifdef HAVE_XWIN_CONFIG_H
-#include <xwin-config.h>
-#endif
-
-#include "glwindows.h"
-#include <glx/glxserver.h>
-#include <glx/glxutil.h>
-#include <glx/extension_string.h>
-#include <GL/glxtokens.h>
-
-#include <winpriv.h>
-#include <wgl_ext_api.h>
-#include "win.h"
-#include <winmsg.h>
-
-extern Bool			g_fXdmcpEnabled;
-extern Bool g_fNativeGl;
-
-#define NUM_ELEMENTS(x) (sizeof(x)/ sizeof(x[1]))
-
-/* ---------------------------------------------------------------------- */
-/*
- *   structure definitions
- */
-
-typedef struct __GLXWinContext  __GLXWinContext;
-typedef struct __GLXWinDrawable __GLXWinDrawable;
-typedef struct __GLXWinScreen glxWinScreen;
-typedef struct __GLXWinConfig GLXWinConfig;
-
-struct __GLXWinContext {
-  __GLXcontext base;
-  HGLRC ctx;                         /* Windows GL Context */
-  HDC hDC;                           /* Windows device context */
-  HDC hreadDC;                     /* Windows device read context */
-  __GLXWinContext *shareContext;     /* Context with which we will share display lists and textures */
-  HWND hwnd;                         /* For detecting when HWND has changed */
-  HWND hreadwnd;
-};
-
-struct __GLXWinDrawable
-{
-  __GLXdrawable base;
-  __GLXWinContext *drawContext;
-
-  /* If this drawable is GLX_DRAWABLE_PBUFFER */
-  HPBUFFERARB hPbuffer;
-
-  /* If this drawable is GLX_DRAWABLE_PIXMAP */
-  HDC dibDC;
-  HBITMAP hDIB;
-  HBITMAP hOldDIB; /* original DIB for DC */
-  void *pOldBits; /* original pBits for this drawable's pixmap */
-};
-
-struct __GLXWinScreen
-{
-  __GLXscreen base;
-
-  /* Supported GLX extensions */
-  unsigned char glx_enable_bits[__GLX_EXT_BYTES];
-
-  Bool has_WGL_ARB_multisample;
-  Bool has_WGL_ARB_pixel_format;
-  Bool has_WGL_ARB_pbuffer;
-  Bool has_WGL_ARB_render_texture;
-
-  /* wrapped screen functions */
-  RealizeWindowProcPtr RealizeWindow;
-  UnrealizeWindowProcPtr UnrealizeWindow;
-  DestroyWindowProcPtr DestroyWindow;
-  CopyWindowProcPtr CopyWindow;
-  PositionWindowProcPtr PositionWindow;
-};
-
-struct __GLXWinConfig
-{
-  __GLXconfig base;
-  int pixelFormatIndex;
-};
-
-/* ---------------------------------------------------------------------- */
-/*
- * Various debug helpers
- */
-
-#ifdef _DEBUG
-void GLWIN_DEBUG_HWND(HWND hwnd)
-{
-  if (glxWinDebugSettings.dumpHWND)
-  {
-    char buffer[1024];
-    RECT Rect;
-    HDC hDc=GetDC(hwnd);
-
-    if (GetWindowText(hwnd, buffer, sizeof(buffer))==0) *buffer=0;
-    GetWindowRect(hwnd,&Rect);
-
-    GLWIN_DEBUG_MSG("Got HWND %p (hdc %p) for window '%s' (%d,%d,%d,%d)", hwnd, hDc, buffer, Rect.left, Rect.top, Rect.right, Rect.bottom);
-    ReleaseDC(hwnd,hDc);
-  }
-}
-
-void GLWIN_HDC_DEBUG_MSG(const char *Message, HDC hDc, HWND hwnd)
-{
-    char buffer[1024];
-    RECT Rect;
-
-    if (GetWindowText(hwnd, buffer, sizeof(buffer))==0) *buffer=0;
-    GetWindowRect(hwnd,&Rect);
-
-    GLWIN_DEBUG_MSG("Got HDC %p (hwnd %p) for window '%s' (%d,%d,%d,%d)", hDc, hwnd, buffer, Rect.left, Rect.top, Rect.right, Rect.bottom);
-
-}
-
-glxWinDebugSettingsRec glxWinDebugSettings = { 0, 0, 0, 0, 0, 0};
-
-static void glxWinInitDebugSettings(void)
-{
-    char *envptr;
-
-    envptr = getenv("GLWIN_ENABLE_DEBUG");
-    if (envptr != NULL)
-        glxWinDebugSettings.enableDebug = (atoi(envptr) == 1);
-
-    envptr = getenv("GLWIN_ENABLE_TRACE");
-    if (envptr != NULL)
-        glxWinDebugSettings.enableTrace = (atoi(envptr) == 1);
-
-    envptr = getenv("GLWIN_DUMP_PFD");
-    if (envptr != NULL)
-        glxWinDebugSettings.dumpPFD = (atoi(envptr) == 1);
-
-    envptr = getenv("GLWIN_DUMP_HWND");
-    if (envptr != NULL)
-        glxWinDebugSettings.dumpHWND = (atoi(envptr) == 1);
-
-    envptr = getenv("GLWIN_DUMP_DC");
-    if (envptr != NULL)
-        glxWinDebugSettings.dumpDC = (atoi(envptr) == 1);
-
-    envptr = getenv("GLWIN_ENABLE_GLCALL_TRACE");
-    if (envptr != NULL)
-        glxWinDebugSettings.enableGLcallTrace = (atoi(envptr) == 1);
-
-    envptr = getenv("GLWIN_ENABLE_WGLCALL_TRACE");
-    if (envptr != NULL)
-        glxWinDebugSettings.enableWGLcallTrace = (atoi(envptr) == 1);
-
-    envptr = getenv("GLWIN_DEBUG_ALL");
-    if (envptr != NULL)
-      {
-        glxWinDebugSettings.enableDebug = 1;
-        glxWinDebugSettings.enableTrace = 1;
-        glxWinDebugSettings.dumpPFD = 1;
-        glxWinDebugSettings.dumpHWND = 1;
-        glxWinDebugSettings.dumpDC = 1;
-        glxWinDebugSettings.enableGLcallTrace = 1;
-        glxWinDebugSettings.enableWGLcallTrace = 1;
-      }
-}
-#endif
-
-static
-const char *glxWinErrorMessage(void)
-{
-  static char errorbuffer[1024];
-  DWORD Error=GetLastError();
-  int offset;
-  
-  sprintf(errorbuffer, "%p ",Error);
-  offset=strlen(errorbuffer);
-
-  if (!FormatMessage(
-                     FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,
-                     NULL,
-                     Error,
-                     MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
-                     (LPTSTR) &errorbuffer[offset],
-                     sizeof(errorbuffer),
-                     NULL ))
-    {
-      snprintf(errorbuffer, sizeof(errorbuffer), "Unknown error in FormatMessage: %08x!", (unsigned)GetLastError());
-    }
-
-  if (errorbuffer[strlen(errorbuffer)-1] == '\n')
-    errorbuffer[strlen(errorbuffer)-1] = 0;
-
-  return errorbuffer;
-}
-
-static void pfdOut(const PIXELFORMATDESCRIPTOR *pfd);
-
-#ifdef _DEBUG
-
-#define DUMP_PFD_FLAG(flag) \
-    if (pfd->dwFlags & flag) { \
-        ErrorF("%s%s", pipesym, #flag); \
-        pipesym = " | "; \
-    }
-
-static void pfdOut(const PIXELFORMATDESCRIPTOR *pfd)
-{
-    const char *pipesym = ""; /* will be set after first flag dump */
-    ErrorF("PIXELFORMATDESCRIPTOR:\n");
-    ErrorF("nSize = %u\n", pfd->nSize);
-    ErrorF("nVersion = %u\n", pfd->nVersion);
-    ErrorF("dwFlags = %lu = {", pfd->dwFlags);
-        DUMP_PFD_FLAG(PFD_DOUBLEBUFFER);
-        DUMP_PFD_FLAG(PFD_STEREO);
-        DUMP_PFD_FLAG(PFD_DRAW_TO_WINDOW);
-        DUMP_PFD_FLAG(PFD_DRAW_TO_BITMAP);
-        DUMP_PFD_FLAG(PFD_SUPPORT_GDI);
-        DUMP_PFD_FLAG(PFD_SUPPORT_OPENGL);
-        DUMP_PFD_FLAG(PFD_GENERIC_FORMAT);
-        DUMP_PFD_FLAG(PFD_NEED_PALETTE);
-        DUMP_PFD_FLAG(PFD_NEED_SYSTEM_PALETTE);
-        DUMP_PFD_FLAG(PFD_SWAP_EXCHANGE);
-        DUMP_PFD_FLAG(PFD_SWAP_COPY);
-        DUMP_PFD_FLAG(PFD_SWAP_LAYER_BUFFERS);
-        DUMP_PFD_FLAG(PFD_GENERIC_ACCELERATED);
-        DUMP_PFD_FLAG(PFD_DEPTH_DONTCARE);
-        DUMP_PFD_FLAG(PFD_DOUBLEBUFFER_DONTCARE);
-        DUMP_PFD_FLAG(PFD_STEREO_DONTCARE);
-    ErrorF("}\n");
-
-    ErrorF("iPixelType = %hu = %s\n", pfd->iPixelType,
-            (pfd->iPixelType == PFD_TYPE_RGBA ? "PFD_TYPE_RGBA" : "PFD_TYPE_COLORINDEX"));
-    ErrorF("cColorBits = %hhu\n", pfd->cColorBits);
-    ErrorF("cRedBits = %hhu\n", pfd->cRedBits);
-    ErrorF("cRedShift = %hhu\n", pfd->cRedShift);
-    ErrorF("cGreenBits = %hhu\n", pfd->cGreenBits);
-    ErrorF("cGreenShift = %hhu\n", pfd->cGreenShift);
-    ErrorF("cBlueBits = %hhu\n", pfd->cBlueBits);
-    ErrorF("cBlueShift = %hhu\n", pfd->cBlueShift);
-    ErrorF("cAlphaBits = %hhu\n", pfd->cAlphaBits);
-    ErrorF("cAlphaShift = %hhu\n", pfd->cAlphaShift);
-    ErrorF("cAccumBits = %hhu\n", pfd->cAccumBits);
-    ErrorF("cAccumRedBits = %hhu\n", pfd->cAccumRedBits);
-    ErrorF("cAccumGreenBits = %hhu\n", pfd->cAccumGreenBits);
-    ErrorF("cAccumBlueBits = %hhu\n", pfd->cAccumBlueBits);
-    ErrorF("cAccumAlphaBits = %hhu\n", pfd->cAccumAlphaBits);
-    ErrorF("cDepthBits = %hhu\n", pfd->cDepthBits);
-    ErrorF("cStencilBits = %hhu\n", pfd->cStencilBits);
-    ErrorF("cAuxBuffers = %hhu\n", pfd->cAuxBuffers);
-    ErrorF("iLayerType = %hhu\n", pfd->iLayerType);
-    ErrorF("bReserved = %hhu\n", pfd->bReserved);
-    ErrorF("dwLayerMask = %lu\n", pfd->dwLayerMask);
-    ErrorF("dwVisibleMask = %lu\n", pfd->dwVisibleMask);
-    ErrorF("dwDamageMask = %lu\n", pfd->dwDamageMask);
-    ErrorF("\n");
-}
-
-static const char *
-visual_class_name(int cls)
-{
-  switch (cls) {
-  case GLX_STATIC_COLOR:
-    return "StaticColor";
-  case GLX_PSEUDO_COLOR:
-    return "PseudoColor";
-  case GLX_STATIC_GRAY:
-    return "StaticGray";
-  case GLX_GRAY_SCALE:
-    return "GrayScale";
-  case GLX_TRUE_COLOR:
-     return "TrueColor";
-  case GLX_DIRECT_COLOR:
-     return "DirectColor";
-  default:
-    return "-none-";
-  }
-}
-
-static const char *
-swap_method_name(int mthd)
-{
-  switch (mthd)
-    {
-    case GLX_SWAP_EXCHANGE_OML:
-      return "xchg";
-    case GLX_SWAP_COPY_OML:
-      return "copy";
-    case GLX_SWAP_UNDEFINED_OML:
-      return "    ";
-    default:
-      return "????";
-    }
-}
-
-static void
-fbConfigsDump(unsigned int n, __GLXconfig *c)
-{
-  ErrorF("%d fbConfigs\n", n);
-  ErrorF("pxf vis  fb                      render         Ste                     aux    accum        MS    drawable             Group/\n");
-  ErrorF("idx  ID  ID VisualType Depth Lvl RGB CI DB Swap reo  R  G  B  A   Z  S  buf AR AG AB AA  bufs num  W P Pb  Float Trans Caveat\n");
-  ErrorF("-----------------------------------------------------------------------------------------------------------------------------\n");
-
-  while (c != NULL)
-    {
-      unsigned int i = ((GLXWinConfig *)c)->pixelFormatIndex;
-
-      ErrorF("%3d  %2x  %2x "
-             "%-11s"
-             " %3d %3d   %s   %s  %s %s  %s  "
-             "%2d %2d %2d %2d  "
-             "%2d %2d  "
-             "%2d  "
-             "%2d %2d %2d %2d"
-             "   %2d   %2d"
-             "  %s %s %s "
-             "    %s   "
-             "  %s   "
-             "  %d %s"
-             "\n",
-             i, c->visualID, c->fbconfigID,
-             visual_class_name(c->visualType),
-             c->rgbBits ? c->rgbBits : c->indexBits,
-             c->level,
-	     (c->renderType & GLX_RGBA_BIT) ? "y" : ".",
-	     (c->renderType & GLX_COLOR_INDEX_BIT) ? "y" : ".",
-	     c->doubleBufferMode ? "y" : ".",
-             swap_method_name(c->swapMethod),
-	     c->stereoMode ? "y" : ".",
-             c->redBits, c->greenBits, c->blueBits, c->alphaBits,
-             c->depthBits, c->stencilBits,
-             c->numAuxBuffers,
-             c->accumRedBits, c->accumGreenBits, c->accumBlueBits, c->accumAlphaBits,
-             c->sampleBuffers, c->samples,
-             (c->drawableType & GLX_WINDOW_BIT) ? "y" : ".",
-             (c->drawableType & GLX_PIXMAP_BIT) ? "y" : ".",
-             (c->drawableType & GLX_PBUFFER_BIT) ? "y" : ".",
-             ".",
-             (c->transparentPixel != GLX_NONE_EXT) ? "y" : ".",
-             c->visualSelectGroup, (c->visualRating == GLX_SLOW_VISUAL_EXT) ? "*" : " ");
-
-      c = c->next;
-    }
-}
-#endif
-
-/* ---------------------------------------------------------------------- */
-/*
- * Forward declarations
- */
-
-static __GLXscreen *glxWinScreenProbe(ScreenPtr pScreen);
-static __GLXcontext *glxWinCreateContext(__GLXscreen *screen,
-                                        __GLXconfig *modes,
-                                        __GLXcontext *baseShareContext);
-static __GLXdrawable *glxWinCreateDrawable(ClientPtr client,
-                                          __GLXscreen *screen,
-                                          DrawablePtr pDraw,
-                                          XID drawId,
-                                          int type,
-                                          XID glxDrawId,
-                                          __GLXconfig *conf);
-
-static Bool glxWinRealizeWindow(WindowPtr pWin);
-static Bool glxWinUnrealizeWindow(WindowPtr pWin);
-static Bool glxWinDestroyWindow(WindowPtr pWin);
-static void glxWinCopyWindow(WindowPtr pWindow, DDXPointRec ptOldOrg, RegionPtr prgnSrc);
-static Bool glxWinPositionWindow(WindowPtr pWindow, int x, int y);
-
-static HDC glxWinMakeDC(__GLXWinContext *gc, __GLXWinDrawable *draw, HWND *hwnd);
-static void glxWinReleaseDC(HWND hwnd, HDC hdc, __GLXWinDrawable *draw);
-
-static void glxWinCreateConfigs(HDC dc, glxWinScreen *screen);
-static void glxWinCreateConfigsExt(HDC hdc, glxWinScreen *screen);
-static int fbConfigToPixelFormat(__GLXconfig *mode, PIXELFORMATDESCRIPTOR *pfdret, int drawableTypeOverride);
-static int fbConfigToPixelFormatIndex(HDC hdc, __GLXconfig *mode, int drawableTypeOverride, glxWinScreen *winScreen);
-
-/* ---------------------------------------------------------------------- */
-/*
- * The GLX provider
- */
-
-__GLXprovider __glXWGLProvider = {
-    glxWinScreenProbe,
-    "Win32 native WGL",
-    NULL
-};
-
-void
-glxWinPushNativeProvider(void)
-{
-  if (g_fNativeGl)
-    GlxPushProvider(&__glXWGLProvider);
-}
-
-/* ---------------------------------------------------------------------- */
-/*
- * Screen functions
- */
-
-static void
-glxWinScreenDestroy(__GLXscreen *screen)
-{
-    GLWIN_DEBUG_MSG("glxWinScreenDestroy(%p)", screen);
-    __glXScreenDestroy(screen);
-    xfree(screen);
-}
-
-static int
-glxWinScreenSwapInterval(__GLXdrawable *drawable, int interval)
-{
-  BOOL ret = wglSwapIntervalEXTWrapper(interval);
-  if (!ret)
-    {
-      ErrorF("wglSwapIntervalEXT interval %d failed:%s\n", interval, glxWinErrorMessage());
-    }
-  return ret;
-}
-
-static LRESULT CALLBACK GlxWindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
-{
-  if (uMsg== WM_NCHITTEST)
-  {
-    return HTTRANSPARENT;
-  }
-  else
-    return DefWindowProc(hwnd, uMsg, wParam, lParam);
-}
-
-/*
-  Report the extensions split and formatted to avoid overflowing a line
- */
-static void
-glxLogExtensions(const char *prefix, const char *extensions)
-{
-  int length = 0;
-  char *strl;
-  char *str = xalloc(strlen(extensions) + 1);
-
-  if (str == NULL)
-    {
-      ErrorF("glxLogExtensions: xalloc error\n");
-      return;
-    }
-
-  str[strlen(extensions)] = '\0';
-  strncpy (str, extensions, strlen(extensions));
-
-  strl = strtok(str, " ");
-  winDebug("%s%s", prefix, strl);
-  length = strlen(prefix) + strlen(strl);
-
-  while (1)
-    {
-      strl = strtok(NULL, " ");
-      if (strl == NULL) break;
-
-      if (length + strlen(strl) + 1 > 120)
-        {
-          winDebug("\n");
-          winDebug("%s",prefix);
-          length = strlen(prefix);
-        }
-      else
-        {
-          winDebug(" ");
-          length++;
-        }
-
-      winDebug("%s", strl);
-      length = length + strlen(strl);
-    }
-
-  winDebug("\n");
-
-  xfree(str);
-}
-
-/* This is called by GlxExtensionInit() asking the GLX provider if it can handle the screen... */
-static __GLXscreen *
-glxWinScreenProbe(ScreenPtr pScreen)
-{
-    glxWinScreen *screen;
-    const char *gl_extensions;
-    const char *wgl_extensions;
-    HWND hwnd;
-    HDC hdc;
-    HGLRC hglrc;
-
-    GLWIN_DEBUG_MSG("glxWinScreenProbe");
-
-#ifdef _DEBUG
-    glxWinInitDebugSettings();
-#endif
-
-    if (pScreen == NULL)
-	return NULL;
-
-    if (!winCheckScreenAiglxIsSupported(pScreen))
-      {
-        LogMessage(X_ERROR,"AIGLX: No native OpenGL in modes with a root window\n");
-        return NULL;
-      }
-
-    screen = xcalloc(1, sizeof(glxWinScreen));
-
-    if (NULL == screen)
-	return NULL;
-
-    /* Wrap RealizeWindow, UnrealizeWindow and CopyWindow on this screen */
-    screen->RealizeWindow = pScreen->RealizeWindow;
-    pScreen->RealizeWindow = glxWinRealizeWindow;
-    screen->UnrealizeWindow = pScreen->UnrealizeWindow;
-    pScreen->UnrealizeWindow = glxWinUnrealizeWindow;
-    screen->CopyWindow = pScreen->CopyWindow;
-    pScreen->CopyWindow = glxWinCopyWindow;
-    screen->PositionWindow = pScreen->PositionWindow;
-    pScreen->PositionWindow = glxWinPositionWindow;
-    screen->DestroyWindow = pScreen->DestroyWindow;
-    pScreen->DestroyWindow = glxWinDestroyWindow;
-
-    /* Dump out some useful information about the native renderer */
-
-    // create window class
-    {
-      static wATOM glTestWndClass = 0;
-      if (glTestWndClass == 0)
-        {
-          WNDCLASSEX wc;
-          glTestWndClass=1;
-          wc.cbSize = sizeof(WNDCLASSEX);
-          wc.style = CS_OWNDC ;
-          wc.lpfnWndProc = GlxWindowProc;
-          wc.cbClsExtra = 0;
-          wc.cbWndExtra = 0;
-          wc.hInstance = GetModuleHandle(NULL);
-          wc.hIcon = 0;
-          wc.hCursor = 0;
-          wc.hbrBackground = 0;
-          wc.lpszMenuName = NULL;
-          wc.lpszClassName = WIN_GL_WINDOW_CLASS;
-          wc.hIconSm = 0;
-          RegisterClassEx (&wc);
-      }
-    }
-
-    // create an invisible window for a scratch DC
-    hwnd = CreateWindowExA(0,
-                           WIN_GL_WINDOW_CLASS,
-                           "XWin GL Renderer Capabilities Test Window",
-                           0, 0, 0, 0, 0, NULL, NULL, GetModuleHandle(NULL), NULL);
-    if (hwnd == NULL)
-      LogMessage(X_ERROR,"AIGLX: Couldn't create a window for render capabilities testing\n");
-
-    hdc = GetDC(hwnd);
-
-    // we must set a pixel format before we can create a context, just use the first one...
-    SetPixelFormat(hdc, 1, NULL);
-    hglrc = wglCreateContext(hdc);
-    wglMakeCurrent(hdc, hglrc);
-
-    // initialize wgl extension proc pointers (don't call them before here...)
-    // (but we need to have a current context for them to be resolvable)
-    wglResolveExtensionProcs();
-
-    winDebug("GL_VERSION:     %s\n", glGetStringWrapperNonstatic(GL_VERSION));
-    winDebug("GL_VENDOR:      %s\n", glGetStringWrapperNonstatic(GL_VENDOR));
-    winDebug("GL_RENDERER:    %s\n", glGetStringWrapperNonstatic(GL_RENDERER));
-    gl_extensions = (const char *)glGetStringWrapperNonstatic(GL_EXTENSIONS);
-    glxLogExtensions("GL_EXTENSIONS:  ", gl_extensions);
-    wgl_extensions = wglGetExtensionsStringARBWrapper(hdc);
-    if (!wgl_extensions) wgl_extensions = "";
-    glxLogExtensions("WGL_EXTENSIONS: ", wgl_extensions);
-
-    // Can you see the problem here?  The extensions string is DC specific
-    // Different DCs for windows on a multimonitor system driven by multiple cards
-    // might have completely different capabilities.  Of course, good luck getting
-    // those screens to be accelerated in XP and earlier...
-
-    {
-      // testing facility to not use any WGL extensions
-      char *envptr = getenv("GLWIN_NO_WGL_EXTENSIONS");
-      if ((envptr != NULL) && (atoi(envptr) != 0))
-        {
-          ErrorF("GLWIN_NO_WGL_EXTENSIONS is set, ignoring WGL_EXTENSIONS\n");
-          wgl_extensions = "";
-        }
-    }
-
-    {
-      Bool glx_sgi_make_current_read = FALSE;
-
-      //
-      // Based on the WGL extensions available, enable various GLX extensions
-      // XXX: make this table-driven ?
-      //
-      memset(screen->glx_enable_bits, 0, __GLX_EXT_BYTES);
-
-      __glXEnableExtension(screen->glx_enable_bits, "GLX_EXT_visual_info");
-      __glXEnableExtension(screen->glx_enable_bits, "GLX_EXT_visual_rating");
-      __glXEnableExtension(screen->glx_enable_bits, "GLX_EXT_import_context");
-      __glXEnableExtension(screen->glx_enable_bits, "GLX_OML_swap_method");
-      __glXEnableExtension(screen->glx_enable_bits, "GLX_SGIX_fbconfig");
-
-      if (strstr(wgl_extensions, "WGL_ARB_make_current_read"))
-        {
-          __glXEnableExtension(screen->glx_enable_bits, "GLX_SGI_make_current_read");
-          LogMessage(X_INFO, "AIGLX: enabled GLX_SGI_make_current_read\n");
-          glx_sgi_make_current_read = TRUE;
-        }
-
-      if (strstr(gl_extensions, "GL_WIN_swap_hint"))
-        {
-          __glXEnableExtension(screen->glx_enable_bits, "GLX_MESA_copy_sub_buffer");
-          LogMessage(X_INFO, "AIGLX: enabled GLX_MESA_copy_sub_buffer\n");
-        }
-
-      if (strstr(wgl_extensions, "WGL_EXT_swap_control"))
-        {
-          __glXEnableExtension(screen->glx_enable_bits, "GLX_SGI_swap_control");
-          __glXEnableExtension(screen->glx_enable_bits, "GLX_MESA_swap_control");
-          LogMessage(X_INFO, "AIGLX: enabled GLX_SGI_swap_control and GLX_MESA_swap_control\n");
-        }
-
-/*       // Hmm?  screen->texOffset */
-/*       if (strstr(wgl_extensions, "WGL_ARB_render_texture")) */
-/*         { */
-/*           __glXEnableExtension(screen->glx_enable_bits, "GLX_EXT_texture_from_pixmap"); */
-/*           LogMessage(X_INFO, "AIGLX: GLX_EXT_texture_from_pixmap backed by buffer objects\n"); */
-/*           screen->has_WGL_ARB_render_texture = TRUE; */
-/*         } */
-
-      if (strstr(wgl_extensions, "WGL_ARB_pbuffer"))
-        {
-          __glXEnableExtension(screen->glx_enable_bits, "GLX_SGIX_pbuffer");
-          LogMessage(X_INFO, "AIGLX: enabled GLX_SGIX_pbuffer\n");
-          screen->has_WGL_ARB_pbuffer = TRUE;
-        }
-
-      if (strstr(wgl_extensions, "WGL_ARB_multisample"))
-        {
-          __glXEnableExtension(screen->glx_enable_bits, "GLX_ARB_multisample");
-          __glXEnableExtension(screen->glx_enable_bits, "GLX_SGIS_multisample");
-          LogMessage(X_INFO, "AIGLX: enabled GLX_ARB_multisample and GLX_SGIS_multisample\n");
-          screen->has_WGL_ARB_multisample = TRUE;
-        }
-
-      screen->base.destroy = glxWinScreenDestroy;
-      screen->base.createContext = glxWinCreateContext;
-      screen->base.createDrawable = glxWinCreateDrawable;
-      screen->base.swapInterval = glxWinScreenSwapInterval;
-      screen->base.hyperpipeFuncs = NULL;
-      screen->base.swapBarrierFuncs = NULL;
-      screen->base.pScreen = pScreen;
-
-      if (strstr(wgl_extensions, "WGL_ARB_pixel_format"))
-        {
-          glxWinCreateConfigsExt(hdc, screen);
-          screen->has_WGL_ARB_pixel_format = TRUE;
-        }
-      else
-        {
-          glxWinCreateConfigs(hdc, screen);
-          screen->has_WGL_ARB_pixel_format = FALSE;
-        }
-      // Initializes screen->base.fbconfigs and screen->base.numFBConfigs
-
-      /* These will be set by __glXScreenInit */
-      screen->base.visuals = NULL;
-      screen->base.numVisuals = 0;
-
-      __glXScreenInit(&screen->base, pScreen);
-
-#ifdef _DEBUG
-      // dump out fbConfigs now fbConfigIds and visualIDs have been assigned
-      fbConfigsDump(screen->base.numFBConfigs, screen->base.fbconfigs);
-#endif
-
-      // Override the GL extensions string set by __glXScreenInit()
-      screen->base.GLextensions = xstrdup(gl_extensions);
-
-      // Generate the GLX extensions string (overrides that set by __glXScreenInit())
-      {
-        unsigned int buffer_size = __glXGetExtensionString(screen->glx_enable_bits, NULL);
-        if (buffer_size > 0)
-          {
-            if (screen->base.GLXextensions != NULL)
-              {
-                xfree(screen->base.GLXextensions);
-              }
-
-            screen->base.GLXextensions = xnfalloc(buffer_size);
-            __glXGetExtensionString(screen->glx_enable_bits, screen->base.GLXextensions);
-          }
-      }
-
-      //
-      // Override the GLX version (__glXScreenInit() sets it to "1.2")
-      // if we have all the needed extensionsto operate as a higher version
-      //
-      // SGIX_fbconfig && SGIX_pbuffer && SGI_make_current_read -> 1.3
-      // ARB_multisample -> 1.4
-      //
-      if (screen->has_WGL_ARB_pbuffer && glx_sgi_make_current_read)
-        {
-          xfree(screen->base.GLXversion);
-
-          if (screen->has_WGL_ARB_multisample)
-            {
-              screen->base.GLXversion = xstrdup("1.4");
-              screen->base.GLXmajor = 1;
-              screen->base.GLXminor = 4;
-            }
-          else
-            {
-              screen->base.GLXversion = xstrdup("1.3");
-              screen->base.GLXmajor = 1;
-              screen->base.GLXminor = 3;
-            }
-          LogMessage(X_INFO, "AIGLX: Set GLX version to %s\n", screen->base.GLXversion);
-        }
-    }
-
-    wglMakeCurrent(NULL, NULL);
-    wglDeleteContext(hglrc);
-    ReleaseDC(hwnd, hdc);
-    DestroyWindow(hwnd);
-
-    return &screen->base;
-}
-
-/* ---------------------------------------------------------------------- */
-/*
- * Window functions
- */
-
-static Bool
-glxWinRealizeWindow(WindowPtr pWin)
-{
-    Bool result;
-    ScreenPtr pScreen = pWin->drawable.pScreen;
-    glxWinScreen *screenPriv = (glxWinScreen *) glxGetScreen(pScreen);
-    winWindowPriv(pWin);
-
-    GLWIN_DEBUG_MSG("glxWinRealizeWindow");
-
-    /* Allow the window to be created (RootlessRealizeWindow is inside our wrap) */
-    pScreen->RealizeWindow = screenPriv->RealizeWindow;
-    result = pScreen->RealizeWindow(pWin);
-    pScreen->RealizeWindow = glxWinRealizeWindow;
-    
-    // Check if ze need to move the window\n
-    if (pWinPriv->GlCtxWnd && pWinPriv->hWnd)
-    {
-       ShowWindow(pWinPriv->hWnd,SW_SHOW);
-    }
-    return result;
-}
-
-
-static void
-glxWinCopyWindow(WindowPtr pWindow, DDXPointRec ptOldOrg, RegionPtr prgnSrc)
-{
-    __GLXWinDrawable *pGlxDraw;
-    ScreenPtr pScreen = pWindow->drawable.pScreen;
-    glxWinScreen *screenPriv = (glxWinScreen *) glxGetScreen(pScreen);
-
-    GLWIN_TRACE_MSG("glxWinCopyWindow pWindow %p", pWindow);
-
-    dixLookupResourceByType((pointer) &pGlxDraw, pWindow->drawable.id, __glXDrawableRes,
-				NullClient, DixUnknownAccess);
-
-
-    /*
-       Discard any CopyWindow requests if a GL drawing context is pointing at the window
-
-       For regions which are being drawn by GL, the shadow framebuffer doesn't have the
-       correct bits, so we wish to avoid shadow framebuffer damage occuring, which will
-       cause those incorrect bits to be transferred to the display....
-    */
-    if (pGlxDraw && pGlxDraw->drawContext)
-      {
-        GLWIN_DEBUG_MSG("glxWinCopyWindow: discarding");
-        return;
-      }
-
-    GLWIN_DEBUG_MSG("glxWinCopyWindow - passing to hw layer");
-
-    pScreen->CopyWindow = screenPriv->CopyWindow;
-    pScreen->CopyWindow(pWindow, ptOldOrg, prgnSrc);
-    pScreen->CopyWindow = glxWinCopyWindow;
-
-}
-
-static Bool
-glxWinPositionWindow(WindowPtr pWin, int x, int y)
-{
-    Bool result;
-    ScreenPtr pScreen = pWin->drawable.pScreen;
-    glxWinScreen *screenPriv = (glxWinScreen *) glxGetScreen(pScreen);
-    winWindowPriv(pWin);
-
-    pScreen->PositionWindow = screenPriv->PositionWindow;
-    result = pScreen->PositionWindow(pWin, x, y);
-    pScreen->PositionWindow = glxWinPositionWindow;
-
-    if (pWinPriv->GlCtxWnd && pWinPriv->hWnd)
-    {
-       MoveWindow(pWinPriv->hWnd,
-                  pWin->drawable.x,
-                  pWin->drawable.y,
-                  pWin->drawable.width,
-                  pWin->drawable.height,
-                  FALSE);
-    }
-    return result;
-}
-
-
-static Bool
-glxWinUnrealizeWindow(WindowPtr pWin)
-{
-    Bool result;
-    ScreenPtr pScreen = pWin->drawable.pScreen;
-    glxWinScreen *screenPriv = (glxWinScreen *)glxGetScreen(pScreen);
-    winWindowPriv(pWin);
-
-    GLWIN_DEBUG_MSG("glxWinUnrealizeWindow");
-
-    pScreen->UnrealizeWindow = screenPriv->UnrealizeWindow;
-    result = pScreen->UnrealizeWindow(pWin);
-    pScreen->UnrealizeWindow = glxWinUnrealizeWindow;
-
-    if (pWinPriv->GlCtxWnd && pWinPriv->hWnd)
-      ShowWindow(pWinPriv->hWnd,SW_HIDE);
-
-    return result;
-}
-
-static Bool
-glxWinDestroyWindow(WindowPtr pWin)
-{
-    Bool result;
-    ScreenPtr pScreen = pWin->drawable.pScreen;
-    glxWinScreen *screenPriv = (glxWinScreen *)glxGetScreen(pScreen);
-    winWindowPriv(pWin);
-
-    GLWIN_DEBUG_MSG("glxWinDestroyWindow");
-
-    if (pWinPriv->GlCtxWnd && pWinPriv->hWnd)
-    {
-      __GLXWinDrawable *pGlxDraw;
-
-      dixLookupResourceByType((pointer) &pGlxDraw, pWin->drawable.id, __glXDrawableRes, NullClient, DixUnknownAccess);
-
-      if (pGlxDraw && pGlxDraw->drawContext)
-      {
-        if (pGlxDraw->drawContext->hwnd!=pWinPriv->hWnd)
-          ErrorF("Wrong assumption\n");
-        glxWinReleaseDC(pGlxDraw->drawContext->hwnd, pGlxDraw->drawContext->hDC, pGlxDraw);
-        pGlxDraw->drawContext->hDC=NULL;
-        pGlxDraw->drawContext->hwnd=NULL;
-      }
-      DestroyWindow(pWinPriv->hWnd);
-      pWinPriv->hWnd=NULL;
-      pWinPriv->GlCtxWnd=0;
-    }
-
-    pScreen->DestroyWindow = screenPriv->DestroyWindow;
-    result = pScreen->DestroyWindow(pWin);
-    pScreen->DestroyWindow = glxWinDestroyWindow;
-
-    return result;
-}
-
-/* ---------------------------------------------------------------------- */
-/*
- * Drawable functions
- */
-
-static GLboolean
-glxWinDrawableSwapBuffers(ClientPtr client, __GLXdrawable *base)
-{
-    BOOL ret;
-    __GLXWinDrawable *draw = (__GLXWinDrawable *)base;
-
-    /* Swap buffers on the last active context for drawing on the drawable */
-    if (draw->drawContext == NULL)
-      {
-        GLWIN_TRACE_MSG("glxWinSwapBuffers - no context for drawable");
-        return GL_FALSE;
-      }
-
-    GLWIN_TRACE_MSG("glxWinSwapBuffers on drawable %p, last context %p (native ctx %p)", base, draw->drawContext, draw->drawContext->ctx);
-
-    /*
-       draw->drawContext->base.drawPriv will not be set if the context is not current anymore,
-       but if it is, it should point to this drawable....
-    */
-    assert((draw->drawContext->base.drawPriv == NULL) || (draw->drawContext->base.drawPriv == base));
-
-    ret = SwapBuffers(draw->drawContext->hDC);
-
-    if (!ret)
-      {
-        ErrorF("wglSwapBuffers failed: %s\n", glxWinErrorMessage());
-        return GL_FALSE;
-      }
-
-    return GL_TRUE;
-}
-
-static void
-glxWinDrawableCopySubBuffer(__GLXdrawable *drawable,
-                            int x, int y, int w, int h)
-{
-  glAddSwapHintRectWINWrapperNonstatic(x, y, w, h);
-  glxWinDrawableSwapBuffers(NULL, drawable);
-}
-
-static void
-glxWinDrawableDestroy(__GLXdrawable *base)
-{
-  __GLXWinDrawable *glxPriv = (__GLXWinDrawable *)base;
-
-  if (glxPriv->drawContext && (__glXLastContext == &((glxPriv->drawContext)->base)))
-    {
-      // if this context is current and has unflushed commands, say we have flushed them
-      // (don't actually flush them, the window is going away anyhow, and an implict flush occurs
-      // on the next context change)
-      // (GLX core considers it an error when we try to select a new current context if the old one
-      // has unflushed commands, but the window has disappeared..)
-      __GLX_NOTE_FLUSHED_CMDS(__glXLastContext);
-      __glXLastContext = NULL;
-    }
-
-  if (glxPriv->hPbuffer)
-    if (!wglDestroyPbufferARBWrapper(glxPriv->hPbuffer))
-      {
-        ErrorF("wglDestroyPbufferARB failed: %s\n", glxWinErrorMessage());
-      }
-
-  if (glxPriv->dibDC)
-    {
-      // restore the default DIB
-      SelectObject(glxPriv->dibDC, glxPriv->hOldDIB);
-
-      if (!DeleteDC(glxPriv->dibDC))
-        {
-          ErrorF("DeleteDC failed: %s\n", glxWinErrorMessage());
-        }
-    }
-
-  if (glxPriv->hDIB)
-    {
-      if (!DeleteObject(glxPriv->hDIB))
-        {
-          ErrorF("DeleteObject failed: %s\n", glxWinErrorMessage());
-        }
-
-      ((PixmapPtr)glxPriv->base.pDraw)->devPrivate.ptr = glxPriv->pOldBits;
-    }
-
-  GLWIN_DEBUG_MSG("glxWinDestroyDrawable");
-  xfree(glxPriv);
-}
-
-static __GLXdrawable *
-glxWinCreateDrawable(ClientPtr client,
-			     __GLXscreen *screen,
-			     DrawablePtr pDraw,
-			     XID drawId,
-			     int type,
-			     XID glxDrawId,
-			     __GLXconfig *conf)
-{
-  __GLXWinDrawable *glxPriv;
-
-  glxPriv = xcalloc(1,sizeof(*glxPriv));
-
-  if (glxPriv == NULL)
-      return NULL;
-
-  if(!__glXDrawableInit(&glxPriv->base, screen, pDraw, type, glxDrawId, conf)) {
-    xfree(glxPriv);
-    return NULL;
-  }
-
-  glxPriv->base.destroy       = glxWinDrawableDestroy;
-  glxPriv->base.swapBuffers   = glxWinDrawableSwapBuffers;
-  glxPriv->base.copySubBuffer = glxWinDrawableCopySubBuffer;
-  // glxPriv->base.waitX  what are these for?
-  // glxPriv->base.waitGL
-
-  GLWIN_DEBUG_MSG("glxWinCreateDrawable %p", glxPriv);
-
-  return &glxPriv->base;
-}
-
-/* ---------------------------------------------------------------------- */
-/*
- * Texture functions
- */
-
-static
-int glxWinBindTexImage(__GLXcontext  *baseContext,
-                      int            buffer,
-                      __GLXdrawable *pixmap)
-{
-  ErrorF("glxWinBindTexImage: not implemented\n");
-  return FALSE;
-}
-
-static
-int glxWinReleaseTexImage(__GLXcontext  *baseContext,
-                         int            buffer,
-                         __GLXdrawable *pixmap)
-{
-  ErrorF(" glxWinReleaseTexImage: not implemented\n");
-  return FALSE;
-}
-
-/* ---------------------------------------------------------------------- */
-/*
- * Lazy update context implementation
- *
- * WGL contexts are created for a specific HDC, so we cannot create the WGL
- * context in glxWinCreateContext(), we must defer creation until the context
- * is actually used on a specifc drawable which is connected to a native window,
- * pbuffer or DIB
- *
- * The WGL context may be used on other, compatible HDCs, so we don't need to
- * recreate it for every new native window
- *
- * XXX: I wonder why we can't create the WGL context on the screen HDC ?
- * Basically we assume all HDCs are compatible at the moment: if they are not
- * we are in a muddle, there was some code in the old implementation to attempt
- * to transparently migrate a context to a new DC by copying state and sharing
- * lists with the old one...
- */
-
-static void
-glxWinSetPixelFormat(__GLXWinContext *gc, HDC hdc, int bppOverride, int drawableTypeOverride)
-{
-  __GLXscreen *screen = gc->base.pGlxScreen;
-  glxWinScreen *winScreen = (glxWinScreen *)screen;
-
-  __GLXconfig *config = gc->base.config;
-  GLXWinConfig *winConfig = (GLXWinConfig *)config;
-  
-  GLWIN_DEBUG_MSG("glxWinSetPixelFormat: pixelFormatIndex %d", winConfig->pixelFormatIndex);
-
-  /*
-    Normally, we can just use the the pixelFormatIndex corresponding
-    to the fbconfig which has been specified by the client
-  */
-
-  if (!((bppOverride && (bppOverride != (config->redBits + config->greenBits + config->blueBits) ))
-        || ((config->drawableType & drawableTypeOverride) == 0)))
-    {
-      if (!SetPixelFormat(hdc, winConfig->pixelFormatIndex, NULL))
-        {
-          ErrorF("SetPixelFormat error: %s\n", glxWinErrorMessage());
-          return;
-        }
-
-      return;
-    }
-
-  /*
-    However, in certain special cases this pixel format will be incompatible with the
-    use we are going to put it to, so we need to re-evaluate the pixel format to use:
-
-    1) When PFD_DRAW_TO_BITMAP is set, ChoosePixelFormat() always returns a format with
-       the cColorBits we asked for, so we need to ensure it matches the bpp of the bitmap
-
-    2) Applications may assume that visuals selected with glXChooseVisual() work with
-       pixmap drawables (there is no attribute to explicitly query for pixmap drawable
-       support as there is for glXChooseFBConfig())
-       (it's arguable this is an error in the application, but we try to make it work)
-
-       pixmap rendering is always slow for us, so we don't want to choose those visuals
-       by default, but if the actual drawable type we're trying to select the context
-       on (drawableTypeOverride) isn't supported by the selected fbConfig, reconsider
-       and see if we can find a suitable one...
-   */
-  ErrorF("glxWinSetPixelFormat: having second thoughts: cColorbits %d, bppOveride %d; config->drawableType %d, drawableTypeOverride %d\n",
-         (config->redBits + config->greenBits + config->blueBits), bppOverride, config->drawableType, drawableTypeOverride);
-
-  if (!winScreen->has_WGL_ARB_pixel_format)
-    {
-      PIXELFORMATDESCRIPTOR pfd;
-      int pixelFormat;
-      
-      /* convert fbConfig to PFD */
-      if (fbConfigToPixelFormat(gc->base.config, &pfd, drawableTypeOverride))
-        {
-          ErrorF("glxWinSetPixelFormat: fbConfigToPixelFormat failed\n");
-          return;
-        }
-
-#ifdef _DEBUG
-        if (glxWinDebugSettings.dumpPFD)
-        pfdOut(&pfd);
-#endif
-
-      if (bppOverride)
-        {
-          GLWIN_DEBUG_MSG("glxWinSetPixelFormat: Forcing bpp from %d to %d\n", pfd.cColorBits, bppOverride);
-          pfd.cColorBits = bppOverride;
-        }
-
-      pixelFormat = ChoosePixelFormat(hdc, &pfd);
-      if (pixelFormat == 0)
-        {
-          ErrorF("ChoosePixelFormat error: %s\n", glxWinErrorMessage());
-          return;
-        }
-
-      GLWIN_DEBUG_MSG("ChoosePixelFormat: chose pixelFormatIndex %d", pixelFormat);
-      ErrorF("ChoosePixelFormat: chose pixelFormatIndex %d (rather than %d as originally planned)\n", pixelFormat, winConfig->pixelFormatIndex);
-
-      if (!SetPixelFormat(hdc, pixelFormat, &pfd))
-        {
-          ErrorF("SetPixelFormat error: %s\n", glxWinErrorMessage());
-          return;
-        }
-    }
-  else
-    {
-      int pixelFormat = fbConfigToPixelFormatIndex(hdc, gc->base.config, drawableTypeOverride, winScreen);
-      if (pixelFormat == 0)
-        {
-          ErrorF("wglChoosePixelFormat error: %s\n", glxWinErrorMessage());
-          return;
-        }
-
-      GLWIN_DEBUG_MSG("wglChoosePixelFormat: chose pixelFormatIndex %d", pixelFormat);
-      ErrorF("wglChoosePixelFormat: chose pixelFormatIndex %d (rather than %d as originally planned)\n", pixelFormat, winConfig->pixelFormatIndex);
-
-      if (!SetPixelFormat(hdc, pixelFormat, NULL))
-        {
-          ErrorF("SetPixelFormat error: %s\n", glxWinErrorMessage());
-          return;
-        }
-    }
-}
-
-static HDC
-glxWinMakeDC(__GLXWinContext *gc, __GLXWinDrawable *draw, HWND *hwnd)
-{
-  HDC hdc = NULL;
-  *hwnd = NULL;
-
-  if (draw == NULL)
-    {
-      GLWIN_TRACE_MSG("No drawable for context %p (native ctx %p)", gc, gc->ctx);
-      return NULL;
-    }
-
-  switch (draw->base.type)
-  {
-    case GLX_DRAWABLE_WINDOW:
-    {
-      WindowPtr pWin;
-
-      pWin = (WindowPtr) draw->base.pDraw;
-      if (pWin == NULL)
-        {
-          GLWIN_TRACE_MSG("for drawable %p, no WindowPtr", pWin);
-          return NULL;
-        }
-
-      *hwnd = winGetWindowInfo(pWin);
-
-      if (*hwnd == NULL)
-        {
-          ErrorF("No HWND error: %s\n", glxWinErrorMessage());
-          return NULL;
-        }
-
-      hdc = GetDC(*hwnd);
-
-      if (hdc == NULL)
-        ErrorF("GetDC error: %s: hwnd %x, gc %p, gc->ctx %p ,gc->hwnd %p\n", glxWinErrorMessage(), *hwnd, gc, gc->ctx, gc->hwnd);
-
-      if (gc->hDC)
-      {
-        glxWinReleaseDC(gc->hwnd, gc->hDC, draw);
-        gc->hDC=NULL;
-      }
-#ifdef _DEBUG
-      if (glxWinDebugSettings.enableTrace)
-            GLWIN_DEBUG_HWND(*hwnd);
-
-          GLWIN_TRACE_MSG("for context %p (native ctx %p), hWnd changed from %p to %p", gc, gc->ctx, gc->hwnd, *hwnd);
-#endif
-      gc->hwnd = *hwnd;
-      
-      /* Check if we need to set the pixelformat */
-      {
-        winWindowPriv(pWin);
-        if (!pWinPriv->PixelFormatSet)
-        {
-          pWinPriv->PixelFormatSet=TRUE;
-          /* We must select a pixelformat, but SetPixelFormat can only be called once for a window... */
-          glxWinSetPixelFormat(gc, hdc, 0, GLX_WINDOW_BIT);
-        }
-      }
-    }
-    break;
-
-  case GLX_DRAWABLE_PBUFFER:
-    {
-      hdc = wglGetPbufferDCARBWrapper(draw->hPbuffer);
-
-      if (hdc == NULL)
-        ErrorF("GetDC (pbuffer) error: %s\n", glxWinErrorMessage());
-    }
-    break;
-
-  case GLX_DRAWABLE_PIXMAP:
-    {
-      hdc = draw->dibDC;
-#ifdef _DEBUG
-      if (glxWinDebugSettings.dumpDC)
-        GLWIN_DEBUG_MSG("Got PIXMAP HDC %p for window %p", hdc, *hwnd);
-#endif
-    }
-    break;
-
-  default:
-    {
-      ErrorF("glxWinMakeDC: tried to makeDC for unhandled drawable type %d\n", draw->base.type);
-    }
-  }
-
-#ifdef _DEBUG
-  if (glxWinDebugSettings.dumpDC)
-    GLWIN_HDC_DEBUG_MSG("Got HDC %p for window %p", hdc, *hwnd);
-#endif
-
-  return hdc;
-}
-
-static void
-glxWinReleaseDC(HWND hwnd, HDC hdc,__GLXWinDrawable *draw)
-{
-  switch (draw->base.type)
-  {
-    case GLX_DRAWABLE_WINDOW:
-    {
-      ReleaseDC(hwnd, hdc);
-    }
-    break;
-
-  case GLX_DRAWABLE_PBUFFER:
-    {
-      if (!wglReleasePbufferDCARBWrapper(draw->hPbuffer, hdc))
-        {
-          ErrorF("wglReleasePbufferDCARB error: %s\n", glxWinErrorMessage());
-        }
-    }
-    break;
-
-  case GLX_DRAWABLE_PIXMAP:
-    {
-      // don't release DC, the memory DC lives as long as the bitmap
-
-      // We must ensure that all GDI drawing into the bitmap has completed
-      // in case we subsequently access the bits from it
-      GdiFlush();
-    }
-    break;
-
-  default:
-    {
-      ErrorF("glxWinReleaseDC: tried to releaseDC for unhandled drawable type %d\n", draw->base.type);
-    }
-  }
-}
-
-static void
-glxWinDeferredCreateContext(__GLXWinContext *gc, __GLXWinDrawable *draw)
-{
-  HWND hwnd;
-  GLWIN_DEBUG_MSG("glxWinDeferredCreateContext: attach context %p to drawable %p", gc, draw);
-
-  switch (draw->base.type)
-  {
-    case GLX_DRAWABLE_WINDOW:
-    {
-      WindowPtr pWin = (WindowPtr) draw->base.pDraw;
-
-      if (!(gc->base.config->drawableType & GLX_WINDOW_BIT))
-        {
-          ErrorF("glxWinDeferredCreateContext: tried to attach a context whose fbConfig doesn't have drawableType GLX_WINDOW_BIT to a GLX_DRAWABLE_WINDOW drawable\n");
-        }
-
-      if (pWin == NULL)
-        {
-          GLWIN_DEBUG_MSG("Deferring until X window is created");
-          return;
-        }
-
-      GLWIN_DEBUG_MSG("glxWinDeferredCreateContext: pWin %p", pWin);
-
-      if (winGetWindowInfo(pWin) == NULL)
-        {
-          GLWIN_DEBUG_MSG("Deferring until native window is created");
-          return;
-        }
-    }
-    break;
-
-    case GLX_DRAWABLE_PBUFFER:
-    {
-      if (draw->hPbuffer == NULL)
-        {
-          __GLXscreen *screen;
-          glxWinScreen *winScreen;
-          int pixelFormat;
-          // XXX: which DC are supposed to use???
-          HDC screenDC = GetDC(NULL);
-
-          if (!(gc->base.config->drawableType & GLX_PBUFFER_BIT))
-            {
-              ErrorF("glxWinDeferredCreateContext: tried to attach a context whose fbConfig doesn't have drawableType GLX_PBUFFER_BIT to a GLX_DRAWABLE_PBUFFER drawable\n");
-            }
-
-          screen = gc->base.pGlxScreen;
-          winScreen = (glxWinScreen *)screen;
-
-          pixelFormat = fbConfigToPixelFormatIndex(screenDC, gc->base.config, GLX_DRAWABLE_PBUFFER, winScreen);
-          if (pixelFormat == 0)
-            {
-              ErrorF("wglChoosePixelFormat error: %s\n", glxWinErrorMessage());
-              return;
-            }
-
-          draw->hPbuffer = wglCreatePbufferARBWrapper(screenDC, pixelFormat, draw->base.pDraw->width, draw->base.pDraw->height, NULL);
-          ReleaseDC(NULL, screenDC);
-
-          if (draw->hPbuffer == NULL)
-            {
-              ErrorF("wglCreatePbufferARBWrapper error: %s\n", glxWinErrorMessage());
-              return;
-            }
-
-          GLWIN_DEBUG_MSG("glxWinDeferredCreateContext: pBuffer %p created for drawable %p", draw->hPbuffer, draw);
-        }
-    }
-    break;
-
-    case GLX_DRAWABLE_PIXMAP:
-    {
-      if (draw->dibDC == NULL)
-        {
-          BITMAPINFOHEADER bmpHeader;
-          void *pBits;
-
-          memset (&bmpHeader, 0, sizeof(BITMAPINFOHEADER));
-          bmpHeader.biSize = sizeof(BITMAPINFOHEADER);
-          bmpHeader.biWidth = draw->base.pDraw->width;
-          bmpHeader.biHeight = draw->base.pDraw->height;
-          bmpHeader.biPlanes = 1;
-          bmpHeader.biBitCount = draw->base.pDraw->bitsPerPixel;
-          bmpHeader.biCompression = BI_RGB;
-
-          if (!(gc->base.config->drawableType & GLX_PIXMAP_BIT))
-            {
-              ErrorF("glxWinDeferredCreateContext: tried to attach a context whose fbConfig doesn't have drawableType GLX_PIXMAP_BIT to a GLX_DRAWABLE_PIXMAP drawable\n");
-            }
-
-          draw->dibDC = CreateCompatibleDC(NULL);
-          if (draw->dibDC == NULL)
-            {
-              ErrorF("CreateCompatibleDC error: %s\n", glxWinErrorMessage());
-              return;
-            }
-
-          draw->hDIB = CreateDIBSection(draw->dibDC, (BITMAPINFO *)&bmpHeader, DIB_RGB_COLORS, &pBits, 0, 0);
-          if (draw->dibDC == NULL)
-            {
-              ErrorF("CreateDIBSection error: %s\n", glxWinErrorMessage());
-              return;
-            }
-
-          // XXX: CreateDIBSection insists on allocating the bitmap memory for us, so we're going to
-          // need some jiggery pokery to point the underlying X Drawable's bitmap at the same set of bits
-          // so that they can be read with XGetImage as well as glReadPixels, assuming the formats are
-          // even compatible ...
-          draw->pOldBits = ((PixmapPtr)draw->base.pDraw)->devPrivate.ptr;
-          ((PixmapPtr)draw->base.pDraw)->devPrivate.ptr = pBits;
-
-          // Select the DIB into the DC
-          draw->hOldDIB = SelectObject(draw->dibDC, draw->hDIB);
-          if (!draw->hOldDIB)
-            {
-              ErrorF("SelectObject error: %s\n", glxWinErrorMessage());
-            }
-
-          // Set the pixel format of the bitmap
-          glxWinSetPixelFormat(gc, draw->dibDC, draw->base.pDraw->bitsPerPixel, GLX_PIXMAP_BIT);
-
-          GLWIN_DEBUG_MSG("glxWinDeferredCreateContext: DIB bitmap %p created for drawable %p", draw->hDIB, draw);
-        }
-    }
-    break;
-
-    default:
-    {
-      ErrorF("glxWinDeferredCreateContext: tried to attach unhandled drawable type %d\n", draw->base.type);
-      return;
-    }
-  }
-
-  gc->hDC = glxWinMakeDC(gc, draw, &hwnd);
-  gc->ctx = wglCreateContext(gc->hDC);
-
-  if (gc->ctx == NULL)
-    {
-      glxWinReleaseDC(hwnd, gc->hDC, draw);
-      gc->hDC=0;
-      
-      ErrorF("wglCreateContext error: %s\n", glxWinErrorMessage());
-      return;
-    }
-
-  GLWIN_DEBUG_MSG("glxWinDeferredCreateContext: attached context %p to native context %p drawable %p", gc, gc->ctx, draw);
-
-  // if the native context was created successfully, shareLists if needed
-  if (gc->ctx && gc->shareContext)
-    {
-      GLWIN_DEBUG_MSG("glxWinCreateContextReal shareLists with context %p (native ctx %p)", gc->shareContext, gc->shareContext->ctx);
-
-      if (!wglShareLists(gc->shareContext->ctx, gc->ctx))
-        {
-          ErrorF("wglShareLists error: %s\n", glxWinErrorMessage());
-        }
-    }
-}
-
-/* ---------------------------------------------------------------------- */
-/*
- * Context functions
- */
-
-
-/* Context manipulation routines should return TRUE on success, FALSE on failure */
-static int
-glxWinContextMakeCurrent(__GLXcontext *base)
-{
-  __GLXWinContext *gc = (__GLXWinContext *)base;
-  BOOL ret;
-  __GLXWinDrawable *drawPriv;
-
-#ifdef _DEBUG
-  GLWIN_TRACE_MSG("glxWinContextMakeCurrent context %p (native ctx %p)", gc, gc->ctx);
-  glWinCallDelta();
-#endif
-
-  /* Keep a note of the last active context in the drawable */
-  drawPriv = (__GLXWinDrawable *)gc->base.drawPriv;
-  drawPriv->drawContext = gc;
-
-  if (gc->ctx == NULL)
-    {
-      glxWinDeferredCreateContext(gc, drawPriv);
-    }
-
-  if (gc->ctx == NULL)
-    {
-      ErrorF("glxWinContextMakeCurrent: Native context is NULL\n");
-      return FALSE;
-    }
-
-  if ((gc->base.readPriv != NULL) && (gc->base.readPriv != gc->base.drawPriv))
-    {
-      // XXX: should only occur with WGL_ARB_make_current_read
-      /*
-        If there is a separate read drawable, create a separate read DC, and
-        use the wglMakeContextCurrent extension to make the context current drawing
-        to one DC and reading from the other
-      */
-      gc->hreadDC = glxWinMakeDC(gc, (__GLXWinDrawable *)gc->base.readPriv, &gc->hreadwnd);
-      if (gc->hreadDC == NULL)
-        {
-          ErrorF("glxWinMakeDC failed for readDC\n");
-          return FALSE;
-        }
-
-      ret = wglMakeContextCurrentARBWrapper(gc->hDC, gc->hreadDC, gc->ctx);
-      if (!ret)
-        {
-          ErrorF("wglMakeContextCurrentARBWrapper error: %s\n", glxWinErrorMessage());
-        }
-    }
-  else
-    {
-      /* Otherwise, just use wglMakeCurrent */
-      if (!gc->hDC)
-      {
-        /* It probably has been release by loseCurrent, so create it again */
-        gc->hDC = glxWinMakeDC(gc, drawPriv, &gc->hwnd);
-      }
-      ret = wglMakeCurrent(gc->hDC, gc->ctx);
-      if (!ret)
-        {
-          DWORD ErrorCode=GetLastError();
-          ErrorF("wglMakeCurrent error: %x dc %p ctx %p\n", ErrorCode,gc->hDC,gc->ctx);
-          if (!ErrorCode)
-          {
-            ErrorF("Error code was 0, assuming no error.\n");
-            ret=TRUE;
-          }
-        }
-    }
-
-  // apparently make current could fail if the context is current in a different thread,
-  // but that shouldn't be able to happen in the current server...
-
-  return ret;
-}
-
-static int
-glxWinContextLoseCurrent(__GLXcontext *base)
-{
-  BOOL ret=TRUE;
-  __GLXWinContext *gc = (__GLXWinContext *)base;
-
-#ifdef _DEBUG
-  GLWIN_TRACE_MSG("glxWinContextLoseCurrent context %p (native ctx %p)", gc, gc->ctx);
-  glWinCallDelta();
-#endif
-
-
-  if (wglGetCurrentContext()==gc->ctx)
-  {
-    /* Only do this when we are sure we are currently the active, otherwise we are deactivating the wrong one (this is happening!!!) */
-    ret = wglMakeCurrent(NULL, NULL);
-    if (!ret)
-      ErrorF("glxWinContextLoseCurrent error: %s\n", glxWinErrorMessage());
-  }
-  else
-  {
-    return FALSE;
-  }
-
-  /* Since drawPriv is going to be set to zero in the context, we have to release the DC to */
-  if (gc->hDC && gc->base.drawPriv) glxWinReleaseDC(gc->hwnd, gc->hDC, (__GLXWinDrawable *)gc->base.drawPriv);
-  if (gc->hreadDC && gc->base.readPriv) glxWinReleaseDC(gc->hreadwnd, gc->hreadDC, (__GLXWinDrawable *)gc->base.readPriv);
-  gc->hDC=NULL;
-  gc->hreadDC=NULL;
-  
-  base->isCurrent=FALSE;  /* It looks like glx is not doing this */
-
-  return ret;
-}
-
-static int
-glxWinContextCopy(__GLXcontext *dst_base, __GLXcontext *src_base, unsigned long mask)
-{
-  __GLXWinContext *dst = (__GLXWinContext *)dst_base;
-  __GLXWinContext *src = (__GLXWinContext *)src_base;
-  BOOL ret;
-
-  GLWIN_DEBUG_MSG("glxWinContextCopy");
-
-  ret = wglCopyContext(src->ctx, dst->ctx, mask);
-  if (!ret)
-    {
-      ErrorF("wglCopyContext error: %s\n", glxWinErrorMessage());
-    }
-
-  return ret;
-}
-
-static int
-glxWinContextForceCurrent(__GLXcontext *base)
-{
-  /* wglMakeCurrent always flushes the previous context, so this is equivalent to glxWinContextMakeCurrent */
-  return glxWinContextMakeCurrent(base);
-}
-
-static void
-glxWinContextDestroy(__GLXcontext *base)
-{
-  __GLXWinContext *gc = (__GLXWinContext *)base;
-
-  if (gc != NULL)
-    {
-      GLWIN_DEBUG_MSG("GLXcontext %p destroyed (native ctx %p)", base, gc->ctx);
-
-      if (gc->ctx)
-        {
-          BOOL ret;
-          /* It's bad style to delete the context while it's still current */
-          if (wglGetCurrentContext() == gc->ctx)
-            {
-              wglMakeCurrent(NULL, NULL);
-            }
-
-          ret = wglDeleteContext(gc->ctx);
-          if (!ret)
-            ErrorF("wglDeleteContext error: %s\n", glxWinErrorMessage());
-          if (gc->base.drawPriv && gc->hDC) glxWinReleaseDC(gc->hwnd, gc->hDC, (__GLXWinDrawable *)gc->base.drawPriv);
-          if (gc->base.readPriv && gc->hreadDC) glxWinReleaseDC(gc->hreadwnd, gc->hreadDC, (__GLXWinDrawable *)gc->base.readPriv);
-          gc->hDC=NULL;
-          gc->hreadDC=NULL;
-          gc->ctx = NULL;
-        }
-
-      xfree(gc);
-    }
-}
-
-static __GLXcontext *
-glxWinCreateContext(__GLXscreen *screen,
-                   __GLXconfig *modes,
-                   __GLXcontext *baseShareContext)
-{
-    __GLXWinContext *context;
-    __GLXWinContext *shareContext = (__GLXWinContext *)baseShareContext;
-
-    static __GLXtextureFromPixmap glxWinTextureFromPixmap =
-      {
-        glxWinBindTexImage,
-        glxWinReleaseTexImage
-      };
-
-    context = (__GLXWinContext *)xcalloc(1, sizeof(__GLXWinContext));
-
-    if (!context)
-        return NULL;
-
-    memset(context, 0, sizeof *context);
-    context->base.destroy        = glxWinContextDestroy;
-    context->base.makeCurrent    = glxWinContextMakeCurrent;
-    context->base.loseCurrent    = glxWinContextLoseCurrent;
-    context->base.copy           = glxWinContextCopy;
-    context->base.forceCurrent   = glxWinContextForceCurrent;
-    context->base.textureFromPixmap = &glxWinTextureFromPixmap;
-    context->base.config = modes;
-    context->base.pGlxScreen = screen;
-
-    // actual native GL context creation is deferred until attach()
-    //context->ctx = NULL; already done with memset
-    context->shareContext = shareContext;
-
-    glWinSetupDispatchTable();
-
-    GLWIN_DEBUG_MSG("GLXcontext %p created", context);
-
-    return &(context->base);
-}
-
-/* ---------------------------------------------------------------------- */
-/*
- * Utility functions
- */
-
-static int
-fbConfigToPixelFormat(__GLXconfig *mode, PIXELFORMATDESCRIPTOR *pfdret, int drawableTypeOverride)
-{
-    PIXELFORMATDESCRIPTOR pfd = {
-      sizeof(PIXELFORMATDESCRIPTOR),   /* size of this pfd */
-      1,                     /* version number */
-      PFD_SUPPORT_OPENGL,    /* support OpenGL */
-      PFD_TYPE_RGBA,         /* RGBA type */
-      24,                    /* 24-bit color depth */
-      0, 0, 0, 0, 0, 0,      /* color bits ignored */
-      0,                     /* no alpha buffer */
-      0,                     /* shift bit ignored */
-      0,                     /* no accumulation buffer */
-      0, 0, 0, 0,            /* accum bits ignored */
-      32,                    /* 32-bit z-buffer */
-      0,                     /* no stencil buffer */
-      0,                     /* no auxiliary buffer */
-      PFD_MAIN_PLANE,        /* main layer */
-      0,                     /* reserved */
-      0, 0, 0                /* layer masks ignored */
-    };
-
-    if ((mode->drawableType | drawableTypeOverride) & GLX_WINDOW_BIT)
-      pfd.dwFlags |= PFD_DRAW_TO_WINDOW; /* support window */
-
-    if ((mode->drawableType | drawableTypeOverride) & GLX_PIXMAP_BIT)
-      pfd.dwFlags |= (PFD_DRAW_TO_BITMAP | PFD_SUPPORT_GDI); /* supports software rendering to bitmap */
-
-    if (mode->stereoMode) {
-        pfd.dwFlags |= PFD_STEREO;
-    }
-    if (mode->doubleBufferMode) {
-        pfd.dwFlags |= PFD_DOUBLEBUFFER;
-    }
-
-    pfd.iPixelType = PFD_TYPE_RGBA;
-    pfd.cColorBits = mode->redBits + mode->greenBits + mode->blueBits;
-    pfd.cRedBits = mode->redBits;
-    pfd.cRedShift = 0; /* FIXME */
-    pfd.cGreenBits = mode->greenBits;
-    pfd.cGreenShift = 0; /* FIXME  */
-    pfd.cBlueBits = mode->blueBits;
-    pfd.cBlueShift = 0; /* FIXME */
-    pfd.cAlphaBits = mode->alphaBits;
-    pfd.cAlphaShift = 0; /* FIXME */
-
-    pfd.cAccumBits = mode->accumRedBits + mode->accumGreenBits + mode->accumBlueBits + mode->accumAlphaBits;
-    pfd.cAccumRedBits = mode->accumRedBits;
-    pfd.cAccumGreenBits = mode->accumGreenBits;
-    pfd.cAccumBlueBits = mode->accumBlueBits;
-    pfd.cAccumAlphaBits = mode->accumAlphaBits;
-
-    pfd.cDepthBits = mode->depthBits;
-    pfd.cStencilBits = mode->stencilBits;
-    pfd.cAuxBuffers = mode->numAuxBuffers;
-
-    /* mode->level ? */
-    /* mode->pixmapMode ? */
-
-    *pfdret = pfd;
-
-    return 0;
-}
-
-#define SET_ATTR_VALUE(attr, value) { attribList[i++] = attr; attribList[i++] = value; assert(i < NUM_ELEMENTS(attribList)); }
-
-static int
-fbConfigToPixelFormatIndex(HDC hdc, __GLXconfig *mode, int drawableTypeOverride, glxWinScreen *winScreen)
-{
-  UINT numFormats;
-  unsigned int i = 0;
-
-  /* convert fbConfig to attr-value list  */
-  int attribList[60];
-
-  SET_ATTR_VALUE(WGL_SUPPORT_OPENGL_ARB, TRUE);
-  SET_ATTR_VALUE(WGL_PIXEL_TYPE_ARB, (mode->visualType == GLX_TRUE_COLOR) ? WGL_TYPE_RGBA_ARB : WGL_TYPE_COLORINDEX_ARB);
-  SET_ATTR_VALUE(WGL_COLOR_BITS_ARB, (mode->visualType == GLX_TRUE_COLOR) ? mode->rgbBits : mode->indexBits);
-  SET_ATTR_VALUE(WGL_RED_BITS_ARB, mode->redBits);
-  SET_ATTR_VALUE(WGL_GREEN_BITS_ARB, mode->greenBits);
-  SET_ATTR_VALUE(WGL_BLUE_BITS_ARB, mode->blueBits);
-  SET_ATTR_VALUE(WGL_ALPHA_BITS_ARB, mode->alphaBits);
-  SET_ATTR_VALUE(WGL_ACCUM_RED_BITS_ARB, mode->accumRedBits);
-  SET_ATTR_VALUE(WGL_ACCUM_GREEN_BITS_ARB, mode->accumGreenBits);
-  SET_ATTR_VALUE(WGL_ACCUM_BLUE_BITS_ARB, mode->accumBlueBits);
-  SET_ATTR_VALUE(WGL_ACCUM_ALPHA_BITS_ARB, mode->accumAlphaBits);
-  SET_ATTR_VALUE(WGL_DEPTH_BITS_ARB, mode->depthBits);
-  SET_ATTR_VALUE(WGL_STENCIL_BITS_ARB, mode->stencilBits);
-  SET_ATTR_VALUE(WGL_AUX_BUFFERS_ARB, mode->numAuxBuffers);
-
-  if (mode->doubleBufferMode)
-    SET_ATTR_VALUE(WGL_DOUBLE_BUFFER_ARB, TRUE);
-
-  if (mode->stereoMode)
-    SET_ATTR_VALUE(WGL_STEREO_ARB, TRUE);
-
-  // Some attributes are only added to the list if the value requested is not 'don't care', as exactly matching that is daft..
-  if (mode->swapMethod == GLX_SWAP_EXCHANGE_OML)
-    SET_ATTR_VALUE(WGL_SWAP_METHOD_ARB, WGL_SWAP_EXCHANGE_ARB);
-
-  if (mode->swapMethod == GLX_SWAP_COPY_OML)
-    SET_ATTR_VALUE(WGL_SWAP_COPY_ARB, TRUE);
-
-  // XXX: this should probably be the other way around, but that messes up drawableTypeOverride
-  if (mode->visualRating == GLX_SLOW_VISUAL_EXT)
-    SET_ATTR_VALUE(WGL_ACCELERATION_ARB, WGL_NO_ACCELERATION_ARB);
-
-  // must support all the drawable types the mode supports
-  if ((mode->drawableType | drawableTypeOverride) & GLX_WINDOW_BIT)
-    SET_ATTR_VALUE(WGL_DRAW_TO_WINDOW_ARB,TRUE);
-
-  // XXX: this is a horrible hacky heuristic, in fact this whole drawableTypeOverride thing is a bad idea
-  // try to avoid asking for formats which don't exist (by not asking for all when adjusting the config to include the drawableTypeOverride)
-  if (drawableTypeOverride == GLX_WINDOW_BIT)
-    {
-      if (mode->drawableType & GLX_PIXMAP_BIT)
-        SET_ATTR_VALUE(WGL_DRAW_TO_BITMAP_ARB, TRUE);
-
-      if (mode->drawableType & GLX_PBUFFER_BIT)
-        if (winScreen->has_WGL_ARB_pbuffer)
-          SET_ATTR_VALUE(WGL_DRAW_TO_PBUFFER_ARB, TRUE);
-    }
-  else
-    {
-      if (drawableTypeOverride & GLX_PIXMAP_BIT)
-        SET_ATTR_VALUE(WGL_DRAW_TO_BITMAP_ARB, TRUE);
-
-      if (drawableTypeOverride & GLX_PBUFFER_BIT)
-        if (winScreen->has_WGL_ARB_pbuffer)
-          SET_ATTR_VALUE(WGL_DRAW_TO_PBUFFER_ARB, TRUE);
-    }
-
-  SET_ATTR_VALUE(0, 0); // terminator
-
-  /* choose the first match */
-  {
-    int pixelFormatIndex;
-
-    if (!wglChoosePixelFormatARBWrapper(hdc, attribList, NULL, 1, &pixelFormatIndex, &numFormats))
-      {
-        ErrorF("wglChoosePixelFormat error: %s\n", glxWinErrorMessage());
-      }
-    else
-      {
-        if (numFormats > 0)
-          {
-            GLWIN_DEBUG_MSG("wglChoosePixelFormat: chose pixelFormatIndex %d)", pixelFormatIndex);
-            return pixelFormatIndex;
-          }
-        else
-          ErrorF("wglChoosePixelFormat couldn't decide\n");
-      }
-  }
-
-  return 0;
-}
-
-/* ---------------------------------------------------------------------- */
-
-#define BITS_AND_SHIFT_TO_MASK(bits,mask) (((1<<(bits))-1) << (mask))
-
-//
-// Create the GLXconfigs using DescribePixelFormat()
-//
-static void
-glxWinCreateConfigs(HDC hdc, glxWinScreen *screen)
-{
-  GLXWinConfig *c, *result, *prev = NULL;
-  int numConfigs = 0;
-  int i = 0;
-  int n = 0;
-  PIXELFORMATDESCRIPTOR pfd;
-
-  GLWIN_DEBUG_MSG("glxWinCreateConfigs");
-
-  screen->base.numFBConfigs = 0;
-  screen->base.fbconfigs = NULL;
-
-  // get the number of pixelformats
-  numConfigs = DescribePixelFormat(hdc, 1, sizeof(PIXELFORMATDESCRIPTOR), NULL);
-  GLWIN_DEBUG_MSG("DescribePixelFormat says %d possible pixel formats", numConfigs);
-
-  /* alloc */
-  result = xalloc(sizeof(GLXWinConfig) * numConfigs);
-
-  if (NULL == result)
-    {
-      return;
-    }
-
-  memset(result, 0, sizeof(GLXWinConfig) * numConfigs);
-  n = 0;
-
-  /* fill in configs */
-  for (i = 0;  i < numConfigs; i++)
-    {
-      int rc;
-
-      c = &(result[i]);
-      c->base.next = NULL;
-      c->pixelFormatIndex = i+1;
-
-      rc = DescribePixelFormat(hdc, i+1, sizeof(PIXELFORMATDESCRIPTOR), &pfd);
-
-      if (!rc)
-        {
-          ErrorF("DescribePixelFormat failed for index %d, error %s\n", i+1, glxWinErrorMessage());
-          break;
-        }
-
-#ifdef _DEBUG
-      if (glxWinDebugSettings.dumpPFD)
-        pfdOut(&pfd);
-#endif
-
-      if (!(pfd.dwFlags & (PFD_DRAW_TO_WINDOW | PFD_DRAW_TO_BITMAP)) || !(pfd.dwFlags & PFD_SUPPORT_OPENGL))
-        {
-          GLWIN_DEBUG_MSG("pixelFormat %d has unsuitable flags 0x%08lx, skipping", i+1, pfd.dwFlags);
-          continue;
-        }
-
-      c->base.doubleBufferMode = (pfd.dwFlags & PFD_DOUBLEBUFFER) ? GL_TRUE : GL_FALSE;
-      c->base.stereoMode = (pfd.dwFlags & PFD_STEREO) ? GL_TRUE : GL_FALSE;
-
-      c->base.redBits = pfd.cRedBits;
-      c->base.greenBits = pfd.cGreenBits;
-      c->base.blueBits = pfd.cBlueBits;
-      c->base.alphaBits = pfd.cAlphaBits;
-
-      c->base.redMask = BITS_AND_SHIFT_TO_MASK(pfd.cRedBits, pfd.cRedShift);
-      c->base.greenMask =  BITS_AND_SHIFT_TO_MASK(pfd.cGreenBits, pfd.cGreenShift);
-      c->base.blueMask = BITS_AND_SHIFT_TO_MASK(pfd.cBlueBits, pfd.cBlueShift);
-      c->base.alphaMask = BITS_AND_SHIFT_TO_MASK(pfd.cAlphaBits, pfd.cAlphaShift);
-
-      c->base.rgbBits = pfd.cColorBits;
-
-      if (pfd.iPixelType == PFD_TYPE_COLORINDEX)
-        {
-          c->base.indexBits = pfd.cColorBits;
-        }
-      else
-        {
-          c->base.indexBits = 0;
-        }
-
-      c->base.accumRedBits = pfd.cAccumRedBits;
-      c->base.accumGreenBits = pfd.cAccumGreenBits;
-      c->base.accumBlueBits = pfd.cAccumBlueBits;
-      c->base.accumAlphaBits = pfd.cAccumAlphaBits;
-      //  pfd.cAccumBits;
-
-      c->base.depthBits = pfd.cDepthBits;
-      c->base.stencilBits = pfd.cStencilBits;
-      c->base.numAuxBuffers = pfd.cAuxBuffers;
-
-      // pfd.iLayerType; // ignored
-      c->base.level = 0;
-      // pfd.dwLayerMask; // ignored
-      // pfd.dwDamageMask;  // ignored
-
-      c->base.pixmapMode = 0;
-      c->base.visualID = -1;  // will be set by __glXScreenInit()
-
-      /* EXT_visual_rating / GLX 1.2 */
-      if (pfd.dwFlags & PFD_GENERIC_FORMAT)
-        {
-          c->base.visualRating = GLX_SLOW_VISUAL_EXT;
-        }
-      else
-        {
-          // PFD_GENERIC_ACCELERATED is not considered, so this may be MCD or ICD acclerated...
-          c->base.visualRating = GLX_NONE_EXT;
-        }
-
-      /* EXT_visual_info / GLX 1.2 */
-      if (pfd.iPixelType == PFD_TYPE_COLORINDEX)
-        {
-          c->base.visualType = GLX_STATIC_COLOR;
-        }
-      else
-        {
-          c->base.visualType = GLX_TRUE_COLOR;
-        }
-
-      // pfd.dwVisibleMask; ???
-      c->base.transparentPixel = GLX_NONE;
-      c->base.transparentRed = GLX_NONE;
-      c->base.transparentGreen = GLX_NONE;
-      c->base.transparentBlue = GLX_NONE;
-      c->base.transparentAlpha = GLX_NONE;
-      c->base.transparentIndex = GLX_NONE;
-
-      /* ARB_multisample / SGIS_multisample */
-      c->base.sampleBuffers = 0;
-      c->base.samples = 0;
-
-      /* SGIX_fbconfig / GLX 1.3 */
-      c->base.drawableType = (((pfd.dwFlags & PFD_DRAW_TO_WINDOW) ? GLX_WINDOW_BIT : 0)
-                         | ((pfd.dwFlags & PFD_DRAW_TO_BITMAP) ? GLX_PIXMAP_BIT : 0));
-
-      if (pfd.iPixelType == PFD_TYPE_COLORINDEX)
-        {
-          c->base.renderType = GLX_RGBA_BIT | GLX_COLOR_INDEX_BIT;
-        }
-      else
-        {
-          c->base.renderType = GLX_RGBA_BIT;
-        }
-
-      c->base.xRenderable = GL_TRUE;
-      c->base.fbconfigID = -1; // will be set by __glXScreenInit()
-
-      /* SGIX_pbuffer / GLX 1.3 */
-      // XXX: How can we find these values out ???
-      c->base.maxPbufferWidth = -1;
-      c->base.maxPbufferHeight = -1;
-      c->base.maxPbufferPixels = -1;
-      c->base.optimalPbufferWidth = 0; // there is no optimal value
-      c->base.optimalPbufferHeight = 0;
-
-      /* SGIX_visual_select_group */
-      // arrange for visuals with the best acceleration to be preferred in selection
-      switch (pfd.dwFlags & (PFD_GENERIC_FORMAT | PFD_GENERIC_ACCELERATED))
-        {
-        case 0:
-          c->base.visualSelectGroup = 2;
-          break;
-
-        case PFD_GENERIC_ACCELERATED:
-          c->base.visualSelectGroup = 1;
-          break;
-
-        case PFD_GENERIC_FORMAT:
-          c->base.visualSelectGroup = 0;
-          break;
-
-        default:
-          ;
-          // "can't happen"
-        }
-
-      /* OML_swap_method */
-      if (pfd.dwFlags & PFD_SWAP_EXCHANGE)
-        c->base.swapMethod = GLX_SWAP_EXCHANGE_OML;
-      else if (pfd.dwFlags & PFD_SWAP_COPY)
-        c->base.swapMethod = GLX_SWAP_COPY_OML;
-      else
-        c->base.swapMethod = GLX_SWAP_UNDEFINED_OML;
-
-      /* EXT_import_context */
-      c->base.screen = screen->base.pScreen->myNum;
-
-      /* EXT_texture_from_pixmap */
-      c->base.bindToTextureRgb = -1;
-      c->base.bindToTextureRgba = -1;
-      c->base.bindToMipmapTexture = -1;
-      c->base.bindToTextureTargets = -1;
-      c->base.yInverted = -1;
-
-      n++;
-
-      // update previous config to point to this config
-      if (prev)
-        prev->base.next = &(c->base);
-
-      prev = c;
-    }
-
-  GLWIN_DEBUG_MSG("found %d pixelFormats suitable for conversion to fbConfigs", n);
-
-  screen->base.numFBConfigs = n;
-  screen->base.fbconfigs = &(result->base);
-}
-
-// helper function to access an attribute value from an attribute value array by attribute
-static
-int getAttrValue(const int attrs[], int values[], unsigned int num, int attr, int fallback)
-{
-  unsigned int i;
-  for (i = 0; i < num; i++)
-    {
-      if (attrs[i] == attr)
-        {
-          GLWIN_TRACE_MSG("getAttrValue attr 0x%x, value %d", attr, values[i]);
-          return values[i];
-        }
-    }
-
-  ErrorF("getAttrValue failed to find attr 0x%x, using default value %d\n", attr, fallback);
-  return fallback;
-}
-
-//
-// Create the GLXconfigs using wglGetPixelFormatAttribfvARB() extension
-//
-static void
-glxWinCreateConfigsExt(HDC hdc, glxWinScreen *screen)
-{
-  GLXWinConfig *c, *result, *prev = NULL;
-  int i = 0;
-  int n = 0;
-
-  const int attr = WGL_NUMBER_PIXEL_FORMATS_ARB;
-  int numConfigs;
-
-  int attrs[50];
-  unsigned int num_attrs = 0;
-
-  GLWIN_DEBUG_MSG("glxWinCreateConfigsExt");
-
-  screen->base.numFBConfigs = 0;
-  screen->base.fbconfigs = NULL;
-
-  if (!wglGetPixelFormatAttribivARBWrapper(hdc, 0, 0, 1, &attr, &numConfigs))
-    {
-      ErrorF("wglGetPixelFormatAttribivARB failed for WGL_NUMBER_PIXEL_FORMATS_ARB: %s\n", glxWinErrorMessage());
-      return;
-    }
-
-  GLWIN_DEBUG_MSG("wglGetPixelFormatAttribivARB says %d possible pixel formats", numConfigs);
-
-  /* alloc */
-  result = xalloc(sizeof(GLXWinConfig) * numConfigs);
-
-  if (NULL == result)
-    {
-      return;
-    }
-
-  memset(result, 0, sizeof(GLXWinConfig) * numConfigs);
-  n = 0;
-
-#define ADD_ATTR(a) { attrs[num_attrs++] = a; assert(num_attrs < NUM_ELEMENTS(attrs)); }
-
-  ADD_ATTR(WGL_DRAW_TO_WINDOW_ARB);
-  ADD_ATTR(WGL_DRAW_TO_BITMAP_ARB);
-  ADD_ATTR(WGL_ACCELERATION_ARB);
-  ADD_ATTR(WGL_SWAP_LAYER_BUFFERS_ARB);
-  ADD_ATTR(WGL_NUMBER_OVERLAYS_ARB);
-  ADD_ATTR(WGL_NUMBER_UNDERLAYS_ARB);
-  ADD_ATTR(WGL_TRANSPARENT_ARB);
-  ADD_ATTR(WGL_TRANSPARENT_RED_VALUE_ARB);
-  ADD_ATTR(WGL_TRANSPARENT_GREEN_VALUE_ARB);
-  ADD_ATTR(WGL_TRANSPARENT_GREEN_VALUE_ARB);
-  ADD_ATTR(WGL_TRANSPARENT_ALPHA_VALUE_ARB);
-  ADD_ATTR(WGL_SUPPORT_OPENGL_ARB);
-  ADD_ATTR(WGL_DOUBLE_BUFFER_ARB);
-  ADD_ATTR(WGL_STEREO_ARB);
-  ADD_ATTR(WGL_PIXEL_TYPE_ARB);
-  ADD_ATTR(WGL_COLOR_BITS_ARB);
-  ADD_ATTR(WGL_RED_BITS_ARB);
-  ADD_ATTR(WGL_RED_SHIFT_ARB);
-  ADD_ATTR(WGL_GREEN_BITS_ARB);
-  ADD_ATTR(WGL_GREEN_SHIFT_ARB);
-  ADD_ATTR(WGL_BLUE_BITS_ARB);
-  ADD_ATTR(WGL_BLUE_SHIFT_ARB);
-  ADD_ATTR(WGL_ALPHA_BITS_ARB);
-  ADD_ATTR(WGL_ALPHA_SHIFT_ARB);
-  ADD_ATTR(WGL_ACCUM_RED_BITS_ARB);
-  ADD_ATTR(WGL_ACCUM_GREEN_BITS_ARB);
-  ADD_ATTR(WGL_ACCUM_BLUE_BITS_ARB);
-  ADD_ATTR(WGL_ACCUM_ALPHA_BITS_ARB);
-  ADD_ATTR(WGL_DEPTH_BITS_ARB);
-  ADD_ATTR(WGL_STENCIL_BITS_ARB);
-  ADD_ATTR(WGL_AUX_BUFFERS_ARB);
-  ADD_ATTR(WGL_SWAP_METHOD_ARB);
-
-  if (screen->has_WGL_ARB_multisample)
-    {
-      // we may not query these attrs if WGL_ARB_multisample is not offered
-      ADD_ATTR(WGL_SAMPLE_BUFFERS_ARB);
-      ADD_ATTR(WGL_SAMPLES_ARB);
-    }
-
-  if (screen->has_WGL_ARB_render_texture)
-    {
-      // we may not query these attrs if WGL_ARB_render_texture is not offered
-      ADD_ATTR(WGL_BIND_TO_TEXTURE_RGB_ARB);
-      ADD_ATTR(WGL_BIND_TO_TEXTURE_RGBA_ARB);
-    }
-
-  if (screen->has_WGL_ARB_pbuffer)
-    {
-      // we may not query these attrs if WGL_ARB_pbuffer is not offered
-      ADD_ATTR(WGL_DRAW_TO_PBUFFER_ARB);
-      ADD_ATTR(WGL_MAX_PBUFFER_PIXELS_ARB);
-      ADD_ATTR(WGL_MAX_PBUFFER_WIDTH_ARB);
-      ADD_ATTR(WGL_MAX_PBUFFER_HEIGHT_ARB);
-    }
-
-  /* fill in configs */
-  for (i = 0;  i < numConfigs; i++)
-    {
-      int sizevalues=num_attrs*sizeof(int);
-      int *values=(int*)_alloca(sizevalues);
-
-      memset(values,0,sizevalues);
-
-      c = &(result[i]);
-      c->base.next = NULL;
-      c->pixelFormatIndex = i+1;
-
-      if (!wglGetPixelFormatAttribivARBWrapper(hdc, i+1, 0, num_attrs, attrs, values))
-        {
-          ErrorF("wglGetPixelFormatAttribivARB failed for index %d, error %s\n", i+1, glxWinErrorMessage());
-          break;
-        }
-
-#define ATTR_VALUE(a, d) getAttrValue(attrs, values, num_attrs, (a), (d))
-
-      if (!ATTR_VALUE(WGL_SUPPORT_OPENGL_ARB, 0))
-        {
-          GLWIN_DEBUG_MSG("pixelFormat %d isn't WGL_SUPPORT_OPENGL_ARB, skipping", i+1);
-          continue;
-        }
-
-      c->base.doubleBufferMode = ATTR_VALUE(WGL_DOUBLE_BUFFER_ARB, 0) ? GL_TRUE : GL_FALSE;
-      c->base.stereoMode = ATTR_VALUE(WGL_STEREO_ARB, 0) ? GL_TRUE : GL_FALSE;
-
-      c->base.redBits = ATTR_VALUE(WGL_RED_BITS_ARB, 0);
-      c->base.greenBits = ATTR_VALUE(WGL_GREEN_BITS_ARB, 0);
-      c->base.blueBits = ATTR_VALUE(WGL_BLUE_BITS_ARB, 0);
-      c->base.alphaBits = ATTR_VALUE(WGL_ALPHA_BITS_ARB, 0);
-
-      c->base.redMask = BITS_AND_SHIFT_TO_MASK(c->base.redBits, ATTR_VALUE(WGL_RED_SHIFT_ARB, 0));
-      c->base.greenMask = BITS_AND_SHIFT_TO_MASK(c->base.greenBits, ATTR_VALUE(WGL_GREEN_SHIFT_ARB, 0));
-      c->base.blueMask = BITS_AND_SHIFT_TO_MASK(c->base.blueBits, ATTR_VALUE(WGL_BLUE_SHIFT_ARB, 0));
-      c->base.alphaMask = BITS_AND_SHIFT_TO_MASK(c->base.alphaBits, ATTR_VALUE(WGL_ALPHA_SHIFT_ARB, 0));
-
-      switch (ATTR_VALUE(WGL_PIXEL_TYPE_ARB, 0))
-        {
-        case WGL_TYPE_COLORINDEX_ARB:
-          c->base.indexBits = ATTR_VALUE(WGL_COLOR_BITS_ARB, 0);
-          c->base.rgbBits = 0;
-          c->base.visualType = GLX_STATIC_COLOR;
-          break;
-
-        case WGL_TYPE_RGBA_FLOAT_ARB:
-          GLWIN_DEBUG_MSG("pixelFormat %d is WGL_TYPE_RGBA_FLOAT_ARB, skipping", i+1);
-          continue;
-
-        case WGL_TYPE_RGBA_UNSIGNED_FLOAT_EXT:
-          GLWIN_DEBUG_MSG("pixelFormat %d is WGL_TYPE_RGBA_UNSIGNED_FLOAT_EXT, skipping", i+1);
-          continue;
-
-        case WGL_TYPE_RGBA_ARB:
-          c->base.indexBits = 0;
-          c->base.rgbBits = ATTR_VALUE(WGL_COLOR_BITS_ARB, 0);
-          c->base.visualType = GLX_TRUE_COLOR;
-          break;
-
-        default:
-          ErrorF("wglGetPixelFormatAttribivARB returned unknown value 0x%x for WGL_PIXEL_TYPE_ARB\n", ATTR_VALUE(WGL_PIXEL_TYPE_ARB, 0));
-          continue;
-        }
-
-      c->base.accumRedBits = ATTR_VALUE(WGL_ACCUM_RED_BITS_ARB, 0);
-      c->base.accumGreenBits = ATTR_VALUE(WGL_ACCUM_GREEN_BITS_ARB, 0);
-      c->base.accumBlueBits = ATTR_VALUE(WGL_ACCUM_BLUE_BITS_ARB, 0);
-      c->base.accumAlphaBits = ATTR_VALUE(WGL_ACCUM_ALPHA_BITS_ARB, 0);
-
-      c->base.depthBits = ATTR_VALUE(WGL_DEPTH_BITS_ARB, 0);
-      c->base.stencilBits = ATTR_VALUE(WGL_STENCIL_BITS_ARB, 0);
-      c->base.numAuxBuffers = ATTR_VALUE(WGL_AUX_BUFFERS_ARB, 0);
-
-      {
-        int layers = ATTR_VALUE(WGL_NUMBER_OVERLAYS_ARB,0) + ATTR_VALUE(WGL_NUMBER_UNDERLAYS_ARB, 0);
-
-        if (layers > 0)
-          {
-            ErrorF("pixelFormat %d: has %d overlay, %d underlays which aren't currently handled", i, ATTR_VALUE(WGL_NUMBER_OVERLAYS_ARB,0), ATTR_VALUE(WGL_NUMBER_UNDERLAYS_ARB, 0));
-            // XXX: need to iterate over layers?
-          }
-      }
-      c->base.level = 0;
-
-      c->base.pixmapMode = 0; // ???
-      c->base.visualID = -1;  // will be set by __glXScreenInit()
-
-      /* EXT_visual_rating / GLX 1.2 */
-      switch (ATTR_VALUE(WGL_ACCELERATION_ARB, 0))
-        {
-        default:
-          ErrorF("wglGetPixelFormatAttribivARB returned unknown value 0x%x for WGL_ACCELERATION_ARB\n", ATTR_VALUE(WGL_ACCELERATION_ARB, 0));
-
-        case WGL_NO_ACCELERATION_ARB:
-          c->base.visualRating = GLX_SLOW_VISUAL_EXT;
-          break;
-
-        case WGL_GENERIC_ACCELERATION_ARB:
-        case WGL_FULL_ACCELERATION_ARB:
-          c->base.visualRating = GLX_NONE_EXT;
-          break;
-        }
-
-      /* EXT_visual_info / GLX 1.2 */
-      // c->base.visualType is set above
-      if (ATTR_VALUE(WGL_TRANSPARENT_ARB, 0))
-        {
-          c->base.transparentPixel = (c->base.visualType == GLX_TRUE_COLOR) ? GLX_TRANSPARENT_RGB_EXT : GLX_TRANSPARENT_INDEX_EXT;
-          c->base.transparentRed = ATTR_VALUE(WGL_TRANSPARENT_RED_VALUE_ARB, 0);
-          c->base.transparentGreen = ATTR_VALUE(WGL_TRANSPARENT_GREEN_VALUE_ARB, 0);
-          c->base.transparentBlue = ATTR_VALUE(WGL_TRANSPARENT_BLUE_VALUE_ARB, 0);
-          c->base.transparentAlpha = ATTR_VALUE(WGL_TRANSPARENT_ALPHA_VALUE_ARB, 0);
-          c->base.transparentIndex = ATTR_VALUE(WGL_TRANSPARENT_INDEX_VALUE_ARB, 0);
-        }
-      else
-        {
-          c->base.transparentPixel = GLX_NONE_EXT;
-          c->base.transparentRed = GLX_NONE;
-          c->base.transparentGreen = GLX_NONE;
-          c->base.transparentBlue = GLX_NONE;
-          c->base.transparentAlpha = GLX_NONE;
-          c->base.transparentIndex = GLX_NONE;
-        }
-
-      /* ARB_multisample / SGIS_multisample */
-      if (screen->has_WGL_ARB_multisample)
-        {
-          c->base.sampleBuffers = ATTR_VALUE(WGL_SAMPLE_BUFFERS_ARB, 0);
-          c->base.samples = ATTR_VALUE(WGL_SAMPLES_ARB, 0);
-        }
-      else
-        {
-          c->base.sampleBuffers = 0;
-          c->base.samples = 0;
-        }
-
-      /* SGIX_fbconfig / GLX 1.3 */
-      c->base.drawableType = ((ATTR_VALUE(WGL_DRAW_TO_WINDOW_ARB, 0) ? GLX_WINDOW_BIT : 0)
-                         | (ATTR_VALUE(WGL_DRAW_TO_BITMAP_ARB, 0) ? GLX_PIXMAP_BIT : 0)
-                         | (ATTR_VALUE(WGL_DRAW_TO_PBUFFER_ARB, 0) ? GLX_PBUFFER_BIT : 0));
-
-      /*
-        Assume OpenGL RGBA rendering is available on all visuals
-        (it is specified to render to red component in single-channel visuals,
-        if supported, but there doesn't seem to be any mechanism to check if it
-        is supported)
-
-        Color index rendering is only supported on single-channel visuals
-      */
-      if (c->base.visualType == GLX_STATIC_COLOR)
-        {
-          c->base.renderType = GLX_RGBA_BIT | GLX_COLOR_INDEX_BIT;
-        }
-      else
-        {
-          c->base.renderType = GLX_RGBA_BIT;
-        }
-
-      c->base.xRenderable = GL_TRUE;
-      c->base.fbconfigID = -1; // will be set by __glXScreenInit()
-
-      /* SGIX_pbuffer / GLX 1.3 */
-      if (screen->has_WGL_ARB_pbuffer)
-        {
-          c->base.maxPbufferWidth = ATTR_VALUE(WGL_MAX_PBUFFER_WIDTH_ARB, -1);
-          c->base.maxPbufferHeight = ATTR_VALUE(WGL_MAX_PBUFFER_HEIGHT_ARB, -1);
-          c->base.maxPbufferPixels =  ATTR_VALUE(WGL_MAX_PBUFFER_PIXELS_ARB, -1);
-        }
-      else
-        {
-          c->base.maxPbufferWidth = -1;
-          c->base.maxPbufferHeight = -1;
-          c->base.maxPbufferPixels =  -1;
-        }
-      c->base.optimalPbufferWidth = 0; // there is no optimal value
-      c->base.optimalPbufferHeight = 0;
-
-      /* SGIX_visual_select_group */
-      // arrange for visuals with the best acceleration to be preferred in selection
-      switch (ATTR_VALUE(WGL_ACCELERATION_ARB, 0))
-        {
-        case WGL_FULL_ACCELERATION_ARB:
-          c->base.visualSelectGroup = 2;
-          break;
-
-        case WGL_GENERIC_ACCELERATION_ARB:
-          c->base.visualSelectGroup = 1;
-          break;
-
-        default:
-        case WGL_NO_ACCELERATION_ARB:
-          c->base.visualSelectGroup = 0;
-          break;
-        }
-
-      /* OML_swap_method */
-      switch (ATTR_VALUE(WGL_SWAP_METHOD_ARB, 0))
-        {
-        case WGL_SWAP_EXCHANGE_ARB:
-          c->base.swapMethod = GLX_SWAP_EXCHANGE_OML;
-          break;
-
-        case WGL_SWAP_COPY_ARB:
-          c->base.swapMethod = GLX_SWAP_COPY_OML;
-          break;
-
-        default:
-          ErrorF("wglGetPixelFormatAttribivARB returned unknown value 0x%x for WGL_SWAP_METHOD_ARB\n", ATTR_VALUE(WGL_SWAP_METHOD_ARB, 0));
-
-        case WGL_SWAP_UNDEFINED_ARB:
-          c->base.swapMethod = GLX_SWAP_UNDEFINED_OML;
-        }
-
-      /* EXT_import_context */
-      c->base.screen = screen->base.pScreen->myNum;
-
-      /* EXT_texture_from_pixmap */
-      /*
-         Mesa's DRI configs always have bindToTextureRgb/Rgba TRUE (see driCreateConfigs(), so setting
-         bindToTextureRgb/bindToTextureRgba to FALSE means that swrast can't find any fbConfigs to use,
-         so setting these to 0, even if we know bindToTexture isn't available, isn't a good idea...
-       */
-      if (screen->has_WGL_ARB_render_texture)
-        {
-          c->base.bindToTextureRgb = ATTR_VALUE(WGL_BIND_TO_TEXTURE_RGB_ARB, -1);
-          c->base.bindToTextureRgba = ATTR_VALUE(WGL_BIND_TO_TEXTURE_RGBA_ARB, -1);
-        }
-      else
-        {
-          c->base.bindToTextureRgb = -1;
-          c->base.bindToTextureRgba = -1;
-        }
-      c->base.bindToMipmapTexture = -1;
-      c->base.bindToTextureTargets = GLX_TEXTURE_1D_BIT_EXT | GLX_TEXTURE_2D_BIT_EXT | GLX_TEXTURE_RECTANGLE_BIT_EXT;
-      c->base.yInverted = -1;
-
-      n++;
-
-      // update previous config to point to this config
-      if (prev)
-        prev->base.next = &(c->base);
-
-      prev = c;
-    }
-
-  screen->base.numFBConfigs = n;
-  screen->base.fbconfigs = &(result->base);
-}
+/*

+ * File: indirect.c

+ * Purpose: A GLX implementation that uses Windows OpenGL library

+ *

+ * Authors: Alexander Gottwald

+ *          Jon TURNEY

+ *

+ * Copyright (c) Jon TURNEY 2009

+ * Copyright (c) Alexander Gottwald 2004

+ *

+ * Portions of this file are copied from GL/apple/indirect.c,

+ * which contains the following copyright:

+ *

+ * Copyright (c) 2007, 2008, 2009 Apple Inc.

+ * Copyright (c) 2004 Torrey T. Lyons. All Rights Reserved.

+ * Copyright (c) 2002 Greg Parker. All Rights Reserved.

+ *

+ * Portions of this file are copied from Mesa's xf86glx.c,

+ * which contains the following copyright:

+ *

+ * Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.

+ * All Rights Reserved.

+ *

+ *

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

+ * copy of this software and associated documentation files (the "Software"),

+ * to deal in the Software without restriction, including without limitation

+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,

+ * and/or sell copies of the Software, and to permit persons to whom the

+ * Software is furnished to do so, subject to the following conditions:

+ *

+ * The above copyright notice and this permission notice shall be included in

+ * all copies or substantial portions of the Software.

+ *

+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL

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

+ */

+

+/*

+  TODO:

+  - hook up remaining unimplemented extensions

+  - research what guarantees glXWaitX, glXWaitGL are supposed to offer, and implement then

+    using GdiFlush and/or glFinish

+  - pbuffer clobbering: we don't get async notification, but can we arrange to emit the

+    event when we notice it's been clobbered? at the very least, check if it's been clobbered

+    before using it?

+  - are the __GLXConfig * we get handed back ones we are made (so we can extend the structure

+    with privates?) Or are they created inside the GLX core as well?

+*/

+

+/*

+  MSDN clarifications:

+

+  It says SetPixelFormat()'s PIXELFORMATDESCRIPTOR pointer argument has no effect

+  except on metafiles, this seems to mean that as it's ok to supply NULL if the DC

+  is not for a metafile

+

+  wglMakeCurrent ignores the hdc if hglrc is NULL, so wglMakeCurrent(NULL, NULL)

+  is used to make no context current

+

+*/

+

+#ifdef HAVE_XWIN_CONFIG_H

+#include <xwin-config.h>

+#endif

+

+#include "glwindows.h"

+#include <glx/glxserver.h>

+#include <glx/glxutil.h>

+#include <glx/extension_string.h>

+#include <GL/glxtokens.h>

+

+#include <winpriv.h>

+#include <wgl_ext_api.h>

+#include "win.h"

+#include <winmsg.h>

+

+extern Bool			g_fXdmcpEnabled;

+extern Bool g_fNativeGl;

+

+#define NUM_ELEMENTS(x) (sizeof(x)/ sizeof(x[1]))

+

+/* ---------------------------------------------------------------------- */

+/*

+ *   structure definitions

+ */

+

+typedef struct __GLXWinContext  __GLXWinContext;

+typedef struct __GLXWinDrawable __GLXWinDrawable;

+typedef struct __GLXWinScreen glxWinScreen;

+typedef struct __GLXWinConfig GLXWinConfig;

+

+struct __GLXWinContext {

+  __GLXcontext base;

+  HGLRC ctx;                         /* Windows GL Context */

+  HDC hDC;                           /* Windows device context */

+  HDC hreadDC;                     /* Windows device read context */

+  __GLXWinContext *shareContext;     /* Context with which we will share display lists and textures */

+  HWND hwnd;                         /* For detecting when HWND has changed */

+  HWND hreadwnd;

+};

+

+struct __GLXWinDrawable

+{

+  __GLXdrawable base;

+  __GLXWinContext *drawContext;

+

+  /* If this drawable is GLX_DRAWABLE_PBUFFER */

+  HPBUFFERARB hPbuffer;

+

+  /* If this drawable is GLX_DRAWABLE_PIXMAP */

+  HDC dibDC;

+  HBITMAP hDIB;

+  HBITMAP hOldDIB; /* original DIB for DC */

+  void *pOldBits; /* original pBits for this drawable's pixmap */

+};

+

+struct __GLXWinScreen

+{

+  __GLXscreen base;

+

+  /* Supported GLX extensions */

+  unsigned char glx_enable_bits[__GLX_EXT_BYTES];

+

+  Bool has_WGL_ARB_multisample;

+  Bool has_WGL_ARB_pixel_format;

+  Bool has_WGL_ARB_pbuffer;

+  Bool has_WGL_ARB_render_texture;

+

+  /* wrapped screen functions */

+  RealizeWindowProcPtr RealizeWindow;

+  UnrealizeWindowProcPtr UnrealizeWindow;

+  DestroyWindowProcPtr DestroyWindow;

+  CopyWindowProcPtr CopyWindow;

+  PositionWindowProcPtr PositionWindow;

+};

+

+struct __GLXWinConfig

+{

+  __GLXconfig base;

+  int pixelFormatIndex;

+};

+

+/* ---------------------------------------------------------------------- */

+/*

+ * Various debug helpers

+ */

+

+#ifdef _DEBUG

+void GLWIN_DEBUG_HWND(HWND hwnd)

+{

+  if (glxWinDebugSettings.dumpHWND)

+  {

+    char buffer[1024];

+    RECT Rect;

+    HDC hDc=GetDC(hwnd);

+

+    if (GetWindowText(hwnd, buffer, sizeof(buffer))==0) *buffer=0;

+    GetWindowRect(hwnd,&Rect);

+

+    GLWIN_DEBUG_MSG("Got HWND %p (hdc %p) for window '%s' (%d,%d,%d,%d)", hwnd, hDc, buffer, Rect.left, Rect.top, Rect.right, Rect.bottom);

+    ReleaseDC(hwnd,hDc);

+  }

+}

+

+void GLWIN_HDC_DEBUG_MSG(const char *Message, HDC hDc, HWND hwnd)

+{

+    char buffer[1024];

+    RECT Rect;

+

+    if (GetWindowText(hwnd, buffer, sizeof(buffer))==0) *buffer=0;

+    GetWindowRect(hwnd,&Rect);

+

+    GLWIN_DEBUG_MSG("Got HDC %p (hwnd %p) for window '%s' (%d,%d,%d,%d)", hDc, hwnd, buffer, Rect.left, Rect.top, Rect.right, Rect.bottom);

+

+}

+

+glxWinDebugSettingsRec glxWinDebugSettings = { 0, 0, 0, 0, 0, 0};

+

+static void glxWinInitDebugSettings(void)

+{

+    char *envptr;

+

+    envptr = getenv("GLWIN_ENABLE_DEBUG");

+    if (envptr != NULL)

+        glxWinDebugSettings.enableDebug = (atoi(envptr) == 1);

+

+    envptr = getenv("GLWIN_ENABLE_TRACE");

+    if (envptr != NULL)

+        glxWinDebugSettings.enableTrace = (atoi(envptr) == 1);

+

+    envptr = getenv("GLWIN_DUMP_PFD");

+    if (envptr != NULL)

+        glxWinDebugSettings.dumpPFD = (atoi(envptr) == 1);

+

+    envptr = getenv("GLWIN_DUMP_HWND");

+    if (envptr != NULL)

+        glxWinDebugSettings.dumpHWND = (atoi(envptr) == 1);

+

+    envptr = getenv("GLWIN_DUMP_DC");

+    if (envptr != NULL)

+        glxWinDebugSettings.dumpDC = (atoi(envptr) == 1);

+

+    envptr = getenv("GLWIN_ENABLE_GLCALL_TRACE");

+    if (envptr != NULL)

+        glxWinDebugSettings.enableGLcallTrace = (atoi(envptr) == 1);

+

+    envptr = getenv("GLWIN_ENABLE_WGLCALL_TRACE");

+    if (envptr != NULL)

+        glxWinDebugSettings.enableWGLcallTrace = (atoi(envptr) == 1);

+

+    envptr = getenv("GLWIN_DEBUG_ALL");

+    if (envptr != NULL)

+      {

+        glxWinDebugSettings.enableDebug = 1;

+        glxWinDebugSettings.enableTrace = 1;

+        glxWinDebugSettings.dumpPFD = 1;

+        glxWinDebugSettings.dumpHWND = 1;

+        glxWinDebugSettings.dumpDC = 1;

+        glxWinDebugSettings.enableGLcallTrace = 1;

+        glxWinDebugSettings.enableWGLcallTrace = 1;

+      }

+}

+#endif

+

+static

+const char *glxWinErrorMessage(void)

+{

+  static char errorbuffer[1024];

+  DWORD Error=GetLastError();

+  int offset;

+  

+  sprintf(errorbuffer, "%p ",Error);

+  offset=strlen(errorbuffer);

+

+  if (!FormatMessage(

+                     FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,

+                     NULL,

+                     Error,

+                     MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),

+                     (LPTSTR) &errorbuffer[offset],

+                     sizeof(errorbuffer),

+                     NULL ))

+    {

+      snprintf(errorbuffer, sizeof(errorbuffer), "Unknown error in FormatMessage: %08x!", (unsigned)GetLastError());

+    }

+

+  if (errorbuffer[strlen(errorbuffer)-1] == '\n')

+    errorbuffer[strlen(errorbuffer)-1] = 0;

+

+  return errorbuffer;

+}

+

+static void pfdOut(const PIXELFORMATDESCRIPTOR *pfd);

+

+#ifdef _DEBUG

+

+#define DUMP_PFD_FLAG(flag) \

+    if (pfd->dwFlags & flag) { \

+        ErrorF("%s%s", pipesym, #flag); \

+        pipesym = " | "; \

+    }

+

+static void pfdOut(const PIXELFORMATDESCRIPTOR *pfd)

+{

+    const char *pipesym = ""; /* will be set after first flag dump */

+    ErrorF("PIXELFORMATDESCRIPTOR:\n");

+    ErrorF("nSize = %u\n", pfd->nSize);

+    ErrorF("nVersion = %u\n", pfd->nVersion);

+    ErrorF("dwFlags = %lu = {", pfd->dwFlags);

+        DUMP_PFD_FLAG(PFD_DOUBLEBUFFER);

+        DUMP_PFD_FLAG(PFD_STEREO);

+        DUMP_PFD_FLAG(PFD_DRAW_TO_WINDOW);

+        DUMP_PFD_FLAG(PFD_DRAW_TO_BITMAP);

+        DUMP_PFD_FLAG(PFD_SUPPORT_GDI);

+        DUMP_PFD_FLAG(PFD_SUPPORT_OPENGL);

+        DUMP_PFD_FLAG(PFD_GENERIC_FORMAT);

+        DUMP_PFD_FLAG(PFD_NEED_PALETTE);

+        DUMP_PFD_FLAG(PFD_NEED_SYSTEM_PALETTE);

+        DUMP_PFD_FLAG(PFD_SWAP_EXCHANGE);

+        DUMP_PFD_FLAG(PFD_SWAP_COPY);

+        DUMP_PFD_FLAG(PFD_SWAP_LAYER_BUFFERS);

+        DUMP_PFD_FLAG(PFD_GENERIC_ACCELERATED);

+        DUMP_PFD_FLAG(PFD_DEPTH_DONTCARE);

+        DUMP_PFD_FLAG(PFD_DOUBLEBUFFER_DONTCARE);

+        DUMP_PFD_FLAG(PFD_STEREO_DONTCARE);

+    ErrorF("}\n");

+

+    ErrorF("iPixelType = %hu = %s\n", pfd->iPixelType,

+            (pfd->iPixelType == PFD_TYPE_RGBA ? "PFD_TYPE_RGBA" : "PFD_TYPE_COLORINDEX"));

+    ErrorF("cColorBits = %hhu\n", pfd->cColorBits);

+    ErrorF("cRedBits = %hhu\n", pfd->cRedBits);

+    ErrorF("cRedShift = %hhu\n", pfd->cRedShift);

+    ErrorF("cGreenBits = %hhu\n", pfd->cGreenBits);

+    ErrorF("cGreenShift = %hhu\n", pfd->cGreenShift);

+    ErrorF("cBlueBits = %hhu\n", pfd->cBlueBits);

+    ErrorF("cBlueShift = %hhu\n", pfd->cBlueShift);

+    ErrorF("cAlphaBits = %hhu\n", pfd->cAlphaBits);

+    ErrorF("cAlphaShift = %hhu\n", pfd->cAlphaShift);

+    ErrorF("cAccumBits = %hhu\n", pfd->cAccumBits);

+    ErrorF("cAccumRedBits = %hhu\n", pfd->cAccumRedBits);

+    ErrorF("cAccumGreenBits = %hhu\n", pfd->cAccumGreenBits);

+    ErrorF("cAccumBlueBits = %hhu\n", pfd->cAccumBlueBits);

+    ErrorF("cAccumAlphaBits = %hhu\n", pfd->cAccumAlphaBits);

+    ErrorF("cDepthBits = %hhu\n", pfd->cDepthBits);

+    ErrorF("cStencilBits = %hhu\n", pfd->cStencilBits);

+    ErrorF("cAuxBuffers = %hhu\n", pfd->cAuxBuffers);

+    ErrorF("iLayerType = %hhu\n", pfd->iLayerType);

+    ErrorF("bReserved = %hhu\n", pfd->bReserved);

+    ErrorF("dwLayerMask = %lu\n", pfd->dwLayerMask);

+    ErrorF("dwVisibleMask = %lu\n", pfd->dwVisibleMask);

+    ErrorF("dwDamageMask = %lu\n", pfd->dwDamageMask);

+    ErrorF("\n");

+}

+

+static const char *

+visual_class_name(int cls)

+{

+  switch (cls) {

+  case GLX_STATIC_COLOR:

+    return "StaticColor";

+  case GLX_PSEUDO_COLOR:

+    return "PseudoColor";

+  case GLX_STATIC_GRAY:

+    return "StaticGray";

+  case GLX_GRAY_SCALE:

+    return "GrayScale";

+  case GLX_TRUE_COLOR:

+     return "TrueColor";

+  case GLX_DIRECT_COLOR:

+     return "DirectColor";

+  default:

+    return "-none-";

+  }

+}

+

+static const char *

+swap_method_name(int mthd)

+{

+  switch (mthd)

+    {

+    case GLX_SWAP_EXCHANGE_OML:

+      return "xchg";

+    case GLX_SWAP_COPY_OML:

+      return "copy";

+    case GLX_SWAP_UNDEFINED_OML:

+      return "    ";

+    default:

+      return "????";

+    }

+}

+

+static void

+fbConfigsDump(unsigned int n, __GLXconfig *c)

+{

+  ErrorF("%d fbConfigs\n", n);

+  ErrorF("pxf vis  fb                      render         Ste                     aux    accum        MS    drawable             Group/\n");

+  ErrorF("idx  ID  ID VisualType Depth Lvl RGB CI DB Swap reo  R  G  B  A   Z  S  buf AR AG AB AA  bufs num  W P Pb  Float Trans Caveat\n");

+  ErrorF("-----------------------------------------------------------------------------------------------------------------------------\n");

+

+  while (c != NULL)

+    {

+      unsigned int i = ((GLXWinConfig *)c)->pixelFormatIndex;

+

+      ErrorF("%3d  %2x  %2x "

+             "%-11s"

+             " %3d %3d   %s   %s  %s %s  %s  "

+             "%2d %2d %2d %2d  "

+             "%2d %2d  "

+             "%2d  "

+             "%2d %2d %2d %2d"

+             "   %2d   %2d"

+             "  %s %s %s "

+             "    %s   "

+             "  %s   "

+             "  %d %s"

+             "\n",

+             i, c->visualID, c->fbconfigID,

+             visual_class_name(c->visualType),

+             c->rgbBits ? c->rgbBits : c->indexBits,

+             c->level,

+	     (c->renderType & GLX_RGBA_BIT) ? "y" : ".",

+	     (c->renderType & GLX_COLOR_INDEX_BIT) ? "y" : ".",

+	     c->doubleBufferMode ? "y" : ".",

+             swap_method_name(c->swapMethod),

+	     c->stereoMode ? "y" : ".",

+             c->redBits, c->greenBits, c->blueBits, c->alphaBits,

+             c->depthBits, c->stencilBits,

+             c->numAuxBuffers,

+             c->accumRedBits, c->accumGreenBits, c->accumBlueBits, c->accumAlphaBits,

+             c->sampleBuffers, c->samples,

+             (c->drawableType & GLX_WINDOW_BIT) ? "y" : ".",

+             (c->drawableType & GLX_PIXMAP_BIT) ? "y" : ".",

+             (c->drawableType & GLX_PBUFFER_BIT) ? "y" : ".",

+             ".",

+             (c->transparentPixel != GLX_NONE_EXT) ? "y" : ".",

+             c->visualSelectGroup, (c->visualRating == GLX_SLOW_VISUAL_EXT) ? "*" : " ");

+

+      c = c->next;

+    }

+}

+#endif

+

+/* ---------------------------------------------------------------------- */

+/*

+ * Forward declarations

+ */

+

+static __GLXscreen *glxWinScreenProbe(ScreenPtr pScreen);

+static __GLXcontext *glxWinCreateContext(__GLXscreen *screen,

+                                        __GLXconfig *modes,

+                                        __GLXcontext *baseShareContext);

+static __GLXdrawable *glxWinCreateDrawable(ClientPtr client,

+                                          __GLXscreen *screen,

+                                          DrawablePtr pDraw,

+                                          XID drawId,

+                                          int type,

+                                          XID glxDrawId,

+                                          __GLXconfig *conf);

+

+static Bool glxWinRealizeWindow(WindowPtr pWin);

+static Bool glxWinUnrealizeWindow(WindowPtr pWin);

+static Bool glxWinDestroyWindow(WindowPtr pWin);

+static void glxWinCopyWindow(WindowPtr pWindow, DDXPointRec ptOldOrg, RegionPtr prgnSrc);

+static Bool glxWinPositionWindow(WindowPtr pWindow, int x, int y);

+

+static HDC glxWinMakeDC(__GLXWinContext *gc, __GLXWinDrawable *draw, HWND *hwnd);

+static void glxWinReleaseDC(HWND hwnd, HDC hdc, __GLXWinDrawable *draw);

+

+static void glxWinCreateConfigs(HDC dc, glxWinScreen *screen);

+static void glxWinCreateConfigsExt(HDC hdc, glxWinScreen *screen);

+static int fbConfigToPixelFormat(__GLXconfig *mode, PIXELFORMATDESCRIPTOR *pfdret, int drawableTypeOverride);

+static int fbConfigToPixelFormatIndex(HDC hdc, __GLXconfig *mode, int drawableTypeOverride, glxWinScreen *winScreen);

+

+/* ---------------------------------------------------------------------- */

+/*

+ * The GLX provider

+ */

+

+__GLXprovider __glXWGLProvider = {

+    glxWinScreenProbe,

+    "Win32 native WGL",

+    NULL

+};

+

+void

+glxWinPushNativeProvider(void)

+{

+  if (g_fNativeGl)

+    GlxPushProvider(&__glXWGLProvider);

+}

+

+/* ---------------------------------------------------------------------- */

+/*

+ * Screen functions

+ */

+

+static void

+glxWinScreenDestroy(__GLXscreen *screen)

+{

+    GLWIN_DEBUG_MSG("glxWinScreenDestroy(%p)", screen);

+    __glXScreenDestroy(screen);

+    free(screen);

+}

+

+static int

+glxWinScreenSwapInterval(__GLXdrawable *drawable, int interval)

+{

+  BOOL ret = wglSwapIntervalEXTWrapper(interval);

+  if (!ret)

+    {

+      ErrorF("wglSwapIntervalEXT interval %d failed:%s\n", interval, glxWinErrorMessage());

+    }

+  return ret;

+}

+

+static LRESULT CALLBACK GlxWindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)

+{

+  if (uMsg== WM_NCHITTEST)

+  {

+    return HTTRANSPARENT;

+  }

+  else

+    return DefWindowProc(hwnd, uMsg, wParam, lParam);

+}

+

+/*

+  Report the extensions split and formatted to avoid overflowing a line

+ */

+static void

+glxLogExtensions(const char *prefix, const char *extensions)

+{

+  int length = 0;

+  char *strl;

+  char *str = malloc(strlen(extensions) + 1);

+

+  if (str == NULL)

+    {

+      ErrorF("glxLogExtensions: xalloc error\n");

+      return;

+    }

+

+  str[strlen(extensions)] = '\0';

+  strncpy (str, extensions, strlen(extensions));

+

+  strl = strtok(str, " ");

+  winDebug("%s%s", prefix, strl);

+  length = strlen(prefix) + strlen(strl);

+

+  while (1)

+    {

+      strl = strtok(NULL, " ");

+      if (strl == NULL) break;

+

+      if (length + strlen(strl) + 1 > 120)

+        {

+          winDebug("\n");

+          winDebug("%s",prefix);

+          length = strlen(prefix);

+        }

+      else

+        {

+          winDebug(" ");

+          length++;

+        }

+

+      winDebug("%s", strl);

+      length = length + strlen(strl);

+    }

+

+  winDebug("\n");

+

+  free(str);

+}

+

+/* This is called by GlxExtensionInit() asking the GLX provider if it can handle the screen... */

+static __GLXscreen *

+glxWinScreenProbe(ScreenPtr pScreen)

+{

+    glxWinScreen *screen;

+    const char *gl_extensions;

+    const char *wgl_extensions;

+    HWND hwnd;

+    HDC hdc;

+    HGLRC hglrc;

+

+    GLWIN_DEBUG_MSG("glxWinScreenProbe");

+

+#ifdef _DEBUG

+    glxWinInitDebugSettings();

+#endif

+

+    if (pScreen == NULL)

+	return NULL;

+

+    if (!winCheckScreenAiglxIsSupported(pScreen))

+      {

+        LogMessage(X_ERROR,"AIGLX: No native OpenGL in modes with a root window\n");

+        return NULL;

+      }

+

+    screen = calloc(1, sizeof(glxWinScreen));

+

+    if (NULL == screen)

+	return NULL;

+

+    /* Wrap RealizeWindow, UnrealizeWindow and CopyWindow on this screen */

+    screen->RealizeWindow = pScreen->RealizeWindow;

+    pScreen->RealizeWindow = glxWinRealizeWindow;

+    screen->UnrealizeWindow = pScreen->UnrealizeWindow;

+    pScreen->UnrealizeWindow = glxWinUnrealizeWindow;

+    screen->CopyWindow = pScreen->CopyWindow;

+    pScreen->CopyWindow = glxWinCopyWindow;

+    screen->PositionWindow = pScreen->PositionWindow;

+    pScreen->PositionWindow = glxWinPositionWindow;

+    screen->DestroyWindow = pScreen->DestroyWindow;

+    pScreen->DestroyWindow = glxWinDestroyWindow;

+

+    /* Dump out some useful information about the native renderer */

+

+    // create window class

+    {

+      static wATOM glTestWndClass = 0;

+      if (glTestWndClass == 0)

+        {

+          WNDCLASSEX wc;

+          glTestWndClass=1;

+          wc.cbSize = sizeof(WNDCLASSEX);

+          wc.style = CS_OWNDC ;

+          wc.lpfnWndProc = GlxWindowProc;

+          wc.cbClsExtra = 0;

+          wc.cbWndExtra = 0;

+          wc.hInstance = GetModuleHandle(NULL);

+          wc.hIcon = 0;

+          wc.hCursor = 0;

+          wc.hbrBackground = 0;

+          wc.lpszMenuName = NULL;

+          wc.lpszClassName = WIN_GL_WINDOW_CLASS;

+          wc.hIconSm = 0;

+          RegisterClassEx (&wc);

+      }

+    }

+

+    // create an invisible window for a scratch DC

+    hwnd = CreateWindowExA(0,

+                           WIN_GL_WINDOW_CLASS,

+                           "XWin GL Renderer Capabilities Test Window",

+                           0, 0, 0, 0, 0, NULL, NULL, GetModuleHandle(NULL), NULL);

+    if (hwnd == NULL)

+      LogMessage(X_ERROR,"AIGLX: Couldn't create a window for render capabilities testing\n");

+

+    hdc = GetDC(hwnd);

+

+    // we must set a pixel format before we can create a context, just use the first one...

+    SetPixelFormat(hdc, 1, NULL);

+    hglrc = wglCreateContext(hdc);

+    wglMakeCurrent(hdc, hglrc);

+

+    // initialize wgl extension proc pointers (don't call them before here...)

+    // (but we need to have a current context for them to be resolvable)

+    wglResolveExtensionProcs();

+

+    winDebug("GL_VERSION:     %s\n", glGetStringWrapperNonstatic(GL_VERSION));

+    winDebug("GL_VENDOR:      %s\n", glGetStringWrapperNonstatic(GL_VENDOR));

+    winDebug("GL_RENDERER:    %s\n", glGetStringWrapperNonstatic(GL_RENDERER));

+    gl_extensions = (const char *)glGetStringWrapperNonstatic(GL_EXTENSIONS);

+    glxLogExtensions("GL_EXTENSIONS:  ", gl_extensions);

+    wgl_extensions = wglGetExtensionsStringARBWrapper(hdc);

+    if (!wgl_extensions) wgl_extensions = "";

+    glxLogExtensions("WGL_EXTENSIONS: ", wgl_extensions);

+

+    // Can you see the problem here?  The extensions string is DC specific

+    // Different DCs for windows on a multimonitor system driven by multiple cards

+    // might have completely different capabilities.  Of course, good luck getting

+    // those screens to be accelerated in XP and earlier...

+

+    {

+      // testing facility to not use any WGL extensions

+      char *envptr = getenv("GLWIN_NO_WGL_EXTENSIONS");

+      if ((envptr != NULL) && (atoi(envptr) != 0))

+        {

+          ErrorF("GLWIN_NO_WGL_EXTENSIONS is set, ignoring WGL_EXTENSIONS\n");

+          wgl_extensions = "";

+        }

+    }

+

+    {

+      Bool glx_sgi_make_current_read = FALSE;

+

+      //

+      // Based on the WGL extensions available, enable various GLX extensions

+      // XXX: make this table-driven ?

+      //

+      memset(screen->glx_enable_bits, 0, __GLX_EXT_BYTES);

+

+      __glXEnableExtension(screen->glx_enable_bits, "GLX_EXT_visual_info");

+      __glXEnableExtension(screen->glx_enable_bits, "GLX_EXT_visual_rating");

+      __glXEnableExtension(screen->glx_enable_bits, "GLX_EXT_import_context");

+      __glXEnableExtension(screen->glx_enable_bits, "GLX_OML_swap_method");

+      __glXEnableExtension(screen->glx_enable_bits, "GLX_SGIX_fbconfig");

+

+      if (strstr(wgl_extensions, "WGL_ARB_make_current_read"))

+        {

+          __glXEnableExtension(screen->glx_enable_bits, "GLX_SGI_make_current_read");

+          LogMessage(X_INFO, "AIGLX: enabled GLX_SGI_make_current_read\n");

+          glx_sgi_make_current_read = TRUE;

+        }

+

+      if (strstr(gl_extensions, "GL_WIN_swap_hint"))

+        {

+          __glXEnableExtension(screen->glx_enable_bits, "GLX_MESA_copy_sub_buffer");

+          LogMessage(X_INFO, "AIGLX: enabled GLX_MESA_copy_sub_buffer\n");

+        }

+

+      if (strstr(wgl_extensions, "WGL_EXT_swap_control"))

+        {

+          __glXEnableExtension(screen->glx_enable_bits, "GLX_SGI_swap_control");

+          __glXEnableExtension(screen->glx_enable_bits, "GLX_MESA_swap_control");

+          LogMessage(X_INFO, "AIGLX: enabled GLX_SGI_swap_control and GLX_MESA_swap_control\n");

+        }

+

+/*       // Hmm?  screen->texOffset */

+/*       if (strstr(wgl_extensions, "WGL_ARB_render_texture")) */

+/*         { */

+/*           __glXEnableExtension(screen->glx_enable_bits, "GLX_EXT_texture_from_pixmap"); */

+/*           LogMessage(X_INFO, "AIGLX: GLX_EXT_texture_from_pixmap backed by buffer objects\n"); */

+/*           screen->has_WGL_ARB_render_texture = TRUE; */

+/*         } */

+

+      if (strstr(wgl_extensions, "WGL_ARB_pbuffer"))

+        {

+          __glXEnableExtension(screen->glx_enable_bits, "GLX_SGIX_pbuffer");

+          LogMessage(X_INFO, "AIGLX: enabled GLX_SGIX_pbuffer\n");

+          screen->has_WGL_ARB_pbuffer = TRUE;

+        }

+

+      if (strstr(wgl_extensions, "WGL_ARB_multisample"))

+        {

+          __glXEnableExtension(screen->glx_enable_bits, "GLX_ARB_multisample");

+          __glXEnableExtension(screen->glx_enable_bits, "GLX_SGIS_multisample");

+          LogMessage(X_INFO, "AIGLX: enabled GLX_ARB_multisample and GLX_SGIS_multisample\n");

+          screen->has_WGL_ARB_multisample = TRUE;

+        }

+

+      screen->base.destroy = glxWinScreenDestroy;

+      screen->base.createContext = glxWinCreateContext;

+      screen->base.createDrawable = glxWinCreateDrawable;

+      screen->base.swapInterval = glxWinScreenSwapInterval;

+      screen->base.hyperpipeFuncs = NULL;

+      screen->base.swapBarrierFuncs = NULL;

+      screen->base.pScreen = pScreen;

+

+      if (strstr(wgl_extensions, "WGL_ARB_pixel_format"))

+        {

+          glxWinCreateConfigsExt(hdc, screen);

+          screen->has_WGL_ARB_pixel_format = TRUE;

+        }

+      else

+        {

+          glxWinCreateConfigs(hdc, screen);

+          screen->has_WGL_ARB_pixel_format = FALSE;

+        }

+      // Initializes screen->base.fbconfigs and screen->base.numFBConfigs

+

+      /* These will be set by __glXScreenInit */

+      screen->base.visuals = NULL;

+      screen->base.numVisuals = 0;

+

+      __glXScreenInit(&screen->base, pScreen);

+

+#ifdef _DEBUG

+      // dump out fbConfigs now fbConfigIds and visualIDs have been assigned

+      fbConfigsDump(screen->base.numFBConfigs, screen->base.fbconfigs);

+#endif

+

+      // Override the GL extensions string set by __glXScreenInit()

+      screen->base.GLextensions = xstrdup(gl_extensions);

+

+      // Generate the GLX extensions string (overrides that set by __glXScreenInit())

+      {

+        unsigned int buffer_size = __glXGetExtensionString(screen->glx_enable_bits, NULL);

+        if (buffer_size > 0)

+          {

+            if (screen->base.GLXextensions != NULL)

+              {

+                free(screen->base.GLXextensions);

+              }

+

+            screen->base.GLXextensions = xnfalloc(buffer_size);

+            __glXGetExtensionString(screen->glx_enable_bits, screen->base.GLXextensions);

+          }

+      }

+

+      //

+      // Override the GLX version (__glXScreenInit() sets it to "1.2")

+      // if we have all the needed extensionsto operate as a higher version

+      //

+      // SGIX_fbconfig && SGIX_pbuffer && SGI_make_current_read -> 1.3

+      // ARB_multisample -> 1.4

+      //

+      if (screen->has_WGL_ARB_pbuffer && glx_sgi_make_current_read)

+        {

+          free(screen->base.GLXversion);

+

+          if (screen->has_WGL_ARB_multisample)

+            {

+              screen->base.GLXversion = xstrdup("1.4");

+              screen->base.GLXmajor = 1;

+              screen->base.GLXminor = 4;

+            }

+          else

+            {

+              screen->base.GLXversion = xstrdup("1.3");

+              screen->base.GLXmajor = 1;

+              screen->base.GLXminor = 3;

+            }

+          LogMessage(X_INFO, "AIGLX: Set GLX version to %s\n", screen->base.GLXversion);

+        }

+    }

+

+    wglMakeCurrent(NULL, NULL);

+    wglDeleteContext(hglrc);

+    ReleaseDC(hwnd, hdc);

+    DestroyWindow(hwnd);

+

+    return &screen->base;

+}

+

+/* ---------------------------------------------------------------------- */

+/*

+ * Window functions

+ */

+

+static Bool

+glxWinRealizeWindow(WindowPtr pWin)

+{

+    Bool result;

+    ScreenPtr pScreen = pWin->drawable.pScreen;

+    glxWinScreen *screenPriv = (glxWinScreen *) glxGetScreen(pScreen);

+    winWindowPriv(pWin);

+

+    GLWIN_DEBUG_MSG("glxWinRealizeWindow");

+

+    /* Allow the window to be created (RootlessRealizeWindow is inside our wrap) */

+    pScreen->RealizeWindow = screenPriv->RealizeWindow;

+    result = pScreen->RealizeWindow(pWin);

+    pScreen->RealizeWindow = glxWinRealizeWindow;

+    

+    // Check if ze need to move the window\n

+    if (pWinPriv->GlCtxWnd && pWinPriv->hWnd)

+    {

+       ShowWindow(pWinPriv->hWnd,SW_SHOW);

+    }

+    return result;

+}

+

+

+static void

+glxWinCopyWindow(WindowPtr pWindow, DDXPointRec ptOldOrg, RegionPtr prgnSrc)

+{

+    __GLXWinDrawable *pGlxDraw;

+    ScreenPtr pScreen = pWindow->drawable.pScreen;

+    glxWinScreen *screenPriv = (glxWinScreen *) glxGetScreen(pScreen);

+

+    GLWIN_TRACE_MSG("glxWinCopyWindow pWindow %p", pWindow);

+

+    dixLookupResourceByType((pointer) &pGlxDraw, pWindow->drawable.id, __glXDrawableRes,

+				NullClient, DixUnknownAccess);

+

+

+    /*

+       Discard any CopyWindow requests if a GL drawing context is pointing at the window

+

+       For regions which are being drawn by GL, the shadow framebuffer doesn't have the

+       correct bits, so we wish to avoid shadow framebuffer damage occuring, which will

+       cause those incorrect bits to be transferred to the display....

+    */

+    if (pGlxDraw && pGlxDraw->drawContext)

+      {

+        GLWIN_DEBUG_MSG("glxWinCopyWindow: discarding");

+        return;

+      }

+

+    GLWIN_DEBUG_MSG("glxWinCopyWindow - passing to hw layer");

+

+    pScreen->CopyWindow = screenPriv->CopyWindow;

+    pScreen->CopyWindow(pWindow, ptOldOrg, prgnSrc);

+    pScreen->CopyWindow = glxWinCopyWindow;

+

+}

+

+static Bool

+glxWinPositionWindow(WindowPtr pWin, int x, int y)

+{

+    Bool result;

+    ScreenPtr pScreen = pWin->drawable.pScreen;

+    glxWinScreen *screenPriv = (glxWinScreen *) glxGetScreen(pScreen);

+    winWindowPriv(pWin);

+

+    pScreen->PositionWindow = screenPriv->PositionWindow;

+    result = pScreen->PositionWindow(pWin, x, y);

+    pScreen->PositionWindow = glxWinPositionWindow;

+

+    if (pWinPriv->GlCtxWnd && pWinPriv->hWnd)

+    {

+       MoveWindow(pWinPriv->hWnd,

+                  pWin->drawable.x,

+                  pWin->drawable.y,

+                  pWin->drawable.width,

+                  pWin->drawable.height,

+                  FALSE);

+    }

+    return result;

+}

+

+

+static Bool

+glxWinUnrealizeWindow(WindowPtr pWin)

+{

+    Bool result;

+    ScreenPtr pScreen = pWin->drawable.pScreen;

+    glxWinScreen *screenPriv = (glxWinScreen *)glxGetScreen(pScreen);

+    winWindowPriv(pWin);

+

+    GLWIN_DEBUG_MSG("glxWinUnrealizeWindow");

+

+    pScreen->UnrealizeWindow = screenPriv->UnrealizeWindow;

+    result = pScreen->UnrealizeWindow(pWin);

+    pScreen->UnrealizeWindow = glxWinUnrealizeWindow;

+

+    if (pWinPriv->GlCtxWnd && pWinPriv->hWnd)

+      ShowWindow(pWinPriv->hWnd,SW_HIDE);

+

+    return result;

+}

+

+static Bool

+glxWinDestroyWindow(WindowPtr pWin)

+{

+    Bool result;

+    ScreenPtr pScreen = pWin->drawable.pScreen;

+    glxWinScreen *screenPriv = (glxWinScreen *)glxGetScreen(pScreen);

+    winWindowPriv(pWin);

+

+    GLWIN_DEBUG_MSG("glxWinDestroyWindow");

+

+    if (pWinPriv->GlCtxWnd && pWinPriv->hWnd)

+    {

+      __GLXWinDrawable *pGlxDraw;

+

+      dixLookupResourceByType((pointer) &pGlxDraw, pWin->drawable.id, __glXDrawableRes, NullClient, DixUnknownAccess);

+

+      if (pGlxDraw && pGlxDraw->drawContext)

+      {

+        if (pGlxDraw->drawContext->hwnd!=pWinPriv->hWnd)

+          ErrorF("Wrong assumption\n");

+        glxWinReleaseDC(pGlxDraw->drawContext->hwnd, pGlxDraw->drawContext->hDC, pGlxDraw);

+        pGlxDraw->drawContext->hDC=NULL;

+        pGlxDraw->drawContext->hwnd=NULL;

+      }

+      DestroyWindow(pWinPriv->hWnd);

+      pWinPriv->hWnd=NULL;

+      pWinPriv->GlCtxWnd=0;

+    }

+

+    pScreen->DestroyWindow = screenPriv->DestroyWindow;

+    result = pScreen->DestroyWindow(pWin);

+    pScreen->DestroyWindow = glxWinDestroyWindow;

+

+    return result;

+}

+

+/* ---------------------------------------------------------------------- */

+/*

+ * Drawable functions

+ */

+

+static GLboolean

+glxWinDrawableSwapBuffers(ClientPtr client, __GLXdrawable *base)

+{

+    BOOL ret;

+    __GLXWinDrawable *draw = (__GLXWinDrawable *)base;

+

+    /* Swap buffers on the last active context for drawing on the drawable */

+    if (draw->drawContext == NULL)

+      {

+        GLWIN_TRACE_MSG("glxWinSwapBuffers - no context for drawable");

+        return GL_FALSE;

+      }

+

+    GLWIN_TRACE_MSG("glxWinSwapBuffers on drawable %p, last context %p (native ctx %p)", base, draw->drawContext, draw->drawContext->ctx);

+

+    /*

+       draw->drawContext->base.drawPriv will not be set if the context is not current anymore,

+       but if it is, it should point to this drawable....

+    */

+    assert((draw->drawContext->base.drawPriv == NULL) || (draw->drawContext->base.drawPriv == base));

+

+    ret = SwapBuffers(draw->drawContext->hDC);

+

+    if (!ret)

+      {

+        ErrorF("wglSwapBuffers failed: %s\n", glxWinErrorMessage());

+        return GL_FALSE;

+      }

+

+    return GL_TRUE;

+}

+

+static void

+glxWinDrawableCopySubBuffer(__GLXdrawable *drawable,

+                            int x, int y, int w, int h)

+{

+  glAddSwapHintRectWINWrapperNonstatic(x, y, w, h);

+  glxWinDrawableSwapBuffers(NULL, drawable);

+}

+

+static void

+glxWinDrawableDestroy(__GLXdrawable *base)

+{

+  __GLXWinDrawable *glxPriv = (__GLXWinDrawable *)base;

+

+  if (glxPriv->drawContext && (__glXLastContext == &((glxPriv->drawContext)->base)))

+    {

+      // if this context is current and has unflushed commands, say we have flushed them

+      // (don't actually flush them, the window is going away anyhow, and an implict flush occurs

+      // on the next context change)

+      // (GLX core considers it an error when we try to select a new current context if the old one

+      // has unflushed commands, but the window has disappeared..)

+      __GLX_NOTE_FLUSHED_CMDS(__glXLastContext);

+      __glXLastContext = NULL;

+    }

+

+  if (glxPriv->hPbuffer)

+    if (!wglDestroyPbufferARBWrapper(glxPriv->hPbuffer))

+      {

+        ErrorF("wglDestroyPbufferARB failed: %s\n", glxWinErrorMessage());

+      }

+

+  if (glxPriv->dibDC)

+    {

+      // restore the default DIB

+      SelectObject(glxPriv->dibDC, glxPriv->hOldDIB);

+

+      if (!DeleteDC(glxPriv->dibDC))

+        {

+          ErrorF("DeleteDC failed: %s\n", glxWinErrorMessage());

+        }

+    }

+

+  if (glxPriv->hDIB)

+    {

+      if (!DeleteObject(glxPriv->hDIB))

+        {

+          ErrorF("DeleteObject failed: %s\n", glxWinErrorMessage());

+        }

+

+      ((PixmapPtr)glxPriv->base.pDraw)->devPrivate.ptr = glxPriv->pOldBits;

+    }

+

+  GLWIN_DEBUG_MSG("glxWinDestroyDrawable");

+  free(glxPriv);

+}

+

+static __GLXdrawable *

+glxWinCreateDrawable(ClientPtr client,

+			     __GLXscreen *screen,

+			     DrawablePtr pDraw,

+			     XID drawId,

+			     int type,

+			     XID glxDrawId,

+			     __GLXconfig *conf)

+{

+  __GLXWinDrawable *glxPriv;

+

+  glxPriv = calloc(1,sizeof(*glxPriv));

+

+  if (glxPriv == NULL)

+      return NULL;

+

+  if(!__glXDrawableInit(&glxPriv->base, screen, pDraw, type, glxDrawId, conf)) {

+    free(glxPriv);

+    return NULL;

+  }

+

+  glxPriv->base.destroy       = glxWinDrawableDestroy;

+  glxPriv->base.swapBuffers   = glxWinDrawableSwapBuffers;

+  glxPriv->base.copySubBuffer = glxWinDrawableCopySubBuffer;

+  // glxPriv->base.waitX  what are these for?

+  // glxPriv->base.waitGL

+

+  GLWIN_DEBUG_MSG("glxWinCreateDrawable %p", glxPriv);

+

+  return &glxPriv->base;

+}

+

+/* ---------------------------------------------------------------------- */

+/*

+ * Texture functions

+ */

+

+static

+int glxWinBindTexImage(__GLXcontext  *baseContext,

+                      int            buffer,

+                      __GLXdrawable *pixmap)

+{

+  ErrorF("glxWinBindTexImage: not implemented\n");

+  return FALSE;

+}

+

+static

+int glxWinReleaseTexImage(__GLXcontext  *baseContext,

+                         int            buffer,

+                         __GLXdrawable *pixmap)

+{

+  ErrorF(" glxWinReleaseTexImage: not implemented\n");

+  return FALSE;

+}

+

+/* ---------------------------------------------------------------------- */

+/*

+ * Lazy update context implementation

+ *

+ * WGL contexts are created for a specific HDC, so we cannot create the WGL

+ * context in glxWinCreateContext(), we must defer creation until the context

+ * is actually used on a specifc drawable which is connected to a native window,

+ * pbuffer or DIB

+ *

+ * The WGL context may be used on other, compatible HDCs, so we don't need to

+ * recreate it for every new native window

+ *

+ * XXX: I wonder why we can't create the WGL context on the screen HDC ?

+ * Basically we assume all HDCs are compatible at the moment: if they are not

+ * we are in a muddle, there was some code in the old implementation to attempt

+ * to transparently migrate a context to a new DC by copying state and sharing

+ * lists with the old one...

+ */

+

+static void

+glxWinSetPixelFormat(__GLXWinContext *gc, HDC hdc, int bppOverride, int drawableTypeOverride)

+{

+  __GLXscreen *screen = gc->base.pGlxScreen;

+  glxWinScreen *winScreen = (glxWinScreen *)screen;

+

+  __GLXconfig *config = gc->base.config;

+  GLXWinConfig *winConfig = (GLXWinConfig *)config;

+  

+  GLWIN_DEBUG_MSG("glxWinSetPixelFormat: pixelFormatIndex %d", winConfig->pixelFormatIndex);

+

+  /*

+    Normally, we can just use the the pixelFormatIndex corresponding

+    to the fbconfig which has been specified by the client

+  */

+

+  if (!((bppOverride && (bppOverride != (config->redBits + config->greenBits + config->blueBits) ))

+        || ((config->drawableType & drawableTypeOverride) == 0)))

+    {

+      if (!SetPixelFormat(hdc, winConfig->pixelFormatIndex, NULL))

+        {

+          ErrorF("SetPixelFormat error: %s\n", glxWinErrorMessage());

+          return;

+        }

+

+      return;

+    }

+

+  /*

+    However, in certain special cases this pixel format will be incompatible with the

+    use we are going to put it to, so we need to re-evaluate the pixel format to use:

+

+    1) When PFD_DRAW_TO_BITMAP is set, ChoosePixelFormat() always returns a format with

+       the cColorBits we asked for, so we need to ensure it matches the bpp of the bitmap

+

+    2) Applications may assume that visuals selected with glXChooseVisual() work with

+       pixmap drawables (there is no attribute to explicitly query for pixmap drawable

+       support as there is for glXChooseFBConfig())

+       (it's arguable this is an error in the application, but we try to make it work)

+

+       pixmap rendering is always slow for us, so we don't want to choose those visuals

+       by default, but if the actual drawable type we're trying to select the context

+       on (drawableTypeOverride) isn't supported by the selected fbConfig, reconsider

+       and see if we can find a suitable one...

+   */

+  ErrorF("glxWinSetPixelFormat: having second thoughts: cColorbits %d, bppOveride %d; config->drawableType %d, drawableTypeOverride %d\n",

+         (config->redBits + config->greenBits + config->blueBits), bppOverride, config->drawableType, drawableTypeOverride);

+

+  if (!winScreen->has_WGL_ARB_pixel_format)

+    {

+      PIXELFORMATDESCRIPTOR pfd;

+      int pixelFormat;

+      

+      /* convert fbConfig to PFD */

+      if (fbConfigToPixelFormat(gc->base.config, &pfd, drawableTypeOverride))

+        {

+          ErrorF("glxWinSetPixelFormat: fbConfigToPixelFormat failed\n");

+          return;

+        }

+

+#ifdef _DEBUG

+        if (glxWinDebugSettings.dumpPFD)

+        pfdOut(&pfd);

+#endif

+

+      if (bppOverride)

+        {

+          GLWIN_DEBUG_MSG("glxWinSetPixelFormat: Forcing bpp from %d to %d\n", pfd.cColorBits, bppOverride);

+          pfd.cColorBits = bppOverride;

+        }

+

+      pixelFormat = ChoosePixelFormat(hdc, &pfd);

+      if (pixelFormat == 0)

+        {

+          ErrorF("ChoosePixelFormat error: %s\n", glxWinErrorMessage());

+          return;

+        }

+

+      GLWIN_DEBUG_MSG("ChoosePixelFormat: chose pixelFormatIndex %d", pixelFormat);

+      ErrorF("ChoosePixelFormat: chose pixelFormatIndex %d (rather than %d as originally planned)\n", pixelFormat, winConfig->pixelFormatIndex);

+

+      if (!SetPixelFormat(hdc, pixelFormat, &pfd))

+        {

+          ErrorF("SetPixelFormat error: %s\n", glxWinErrorMessage());

+          return;

+        }

+    }

+  else

+    {

+      int pixelFormat = fbConfigToPixelFormatIndex(hdc, gc->base.config, drawableTypeOverride, winScreen);

+      if (pixelFormat == 0)

+        {

+          ErrorF("wglChoosePixelFormat error: %s\n", glxWinErrorMessage());

+          return;

+        }

+

+      GLWIN_DEBUG_MSG("wglChoosePixelFormat: chose pixelFormatIndex %d", pixelFormat);

+      ErrorF("wglChoosePixelFormat: chose pixelFormatIndex %d (rather than %d as originally planned)\n", pixelFormat, winConfig->pixelFormatIndex);

+

+      if (!SetPixelFormat(hdc, pixelFormat, NULL))

+        {

+          ErrorF("SetPixelFormat error: %s\n", glxWinErrorMessage());

+          return;

+        }

+    }

+}

+

+static HDC

+glxWinMakeDC(__GLXWinContext *gc, __GLXWinDrawable *draw, HWND *hwnd)

+{

+  HDC hdc = NULL;

+  *hwnd = NULL;

+

+  if (draw == NULL)

+    {

+      GLWIN_TRACE_MSG("No drawable for context %p (native ctx %p)", gc, gc->ctx);

+      return NULL;

+    }

+

+  switch (draw->base.type)

+  {

+    case GLX_DRAWABLE_WINDOW:

+    {

+      WindowPtr pWin;

+

+      pWin = (WindowPtr) draw->base.pDraw;

+      if (pWin == NULL)

+        {

+          GLWIN_TRACE_MSG("for drawable %p, no WindowPtr", pWin);

+          return NULL;

+        }

+

+      *hwnd = winGetWindowInfo(pWin);

+

+      if (*hwnd == NULL)

+        {

+          ErrorF("No HWND error: %s\n", glxWinErrorMessage());

+          return NULL;

+        }

+

+      hdc = GetDC(*hwnd);

+

+      if (hdc == NULL)

+        ErrorF("GetDC error: %s: hwnd %x, gc %p, gc->ctx %p ,gc->hwnd %p\n", glxWinErrorMessage(), *hwnd, gc, gc->ctx, gc->hwnd);

+

+      if (gc->hDC)

+      {

+        glxWinReleaseDC(gc->hwnd, gc->hDC, draw);

+        gc->hDC=NULL;

+      }

+#ifdef _DEBUG

+      if (glxWinDebugSettings.enableTrace)

+            GLWIN_DEBUG_HWND(*hwnd);

+

+          GLWIN_TRACE_MSG("for context %p (native ctx %p), hWnd changed from %p to %p", gc, gc->ctx, gc->hwnd, *hwnd);

+#endif

+      gc->hwnd = *hwnd;

+      

+      /* Check if we need to set the pixelformat */

+      {

+        winWindowPriv(pWin);

+        if (!pWinPriv->PixelFormatSet)

+        {

+          pWinPriv->PixelFormatSet=TRUE;

+          /* We must select a pixelformat, but SetPixelFormat can only be called once for a window... */

+          glxWinSetPixelFormat(gc, hdc, 0, GLX_WINDOW_BIT);

+        }

+      }

+    }

+    break;

+

+  case GLX_DRAWABLE_PBUFFER:

+    {

+      hdc = wglGetPbufferDCARBWrapper(draw->hPbuffer);

+

+      if (hdc == NULL)

+        ErrorF("GetDC (pbuffer) error: %s\n", glxWinErrorMessage());

+    }

+    break;

+

+  case GLX_DRAWABLE_PIXMAP:

+    {

+      hdc = draw->dibDC;

+#ifdef _DEBUG

+      if (glxWinDebugSettings.dumpDC)

+        GLWIN_DEBUG_MSG("Got PIXMAP HDC %p for window %p", hdc, *hwnd);

+#endif

+    }

+    break;

+

+  default:

+    {

+      ErrorF("glxWinMakeDC: tried to makeDC for unhandled drawable type %d\n", draw->base.type);

+    }

+  }

+

+#ifdef _DEBUG

+  if (glxWinDebugSettings.dumpDC)

+    GLWIN_HDC_DEBUG_MSG("Got HDC %p for window %p", hdc, *hwnd);

+#endif

+

+  return hdc;

+}

+

+static void

+glxWinReleaseDC(HWND hwnd, HDC hdc,__GLXWinDrawable *draw)

+{

+  switch (draw->base.type)

+  {

+    case GLX_DRAWABLE_WINDOW:

+    {

+      ReleaseDC(hwnd, hdc);

+    }

+    break;

+

+  case GLX_DRAWABLE_PBUFFER:

+    {

+      if (!wglReleasePbufferDCARBWrapper(draw->hPbuffer, hdc))

+        {

+          ErrorF("wglReleasePbufferDCARB error: %s\n", glxWinErrorMessage());

+        }

+    }

+    break;

+

+  case GLX_DRAWABLE_PIXMAP:

+    {

+      // don't release DC, the memory DC lives as long as the bitmap

+

+      // We must ensure that all GDI drawing into the bitmap has completed

+      // in case we subsequently access the bits from it

+      GdiFlush();

+    }

+    break;

+

+  default:

+    {

+      ErrorF("glxWinReleaseDC: tried to releaseDC for unhandled drawable type %d\n", draw->base.type);

+    }

+  }

+}

+

+static void

+glxWinDeferredCreateContext(__GLXWinContext *gc, __GLXWinDrawable *draw)

+{

+  HWND hwnd;

+  GLWIN_DEBUG_MSG("glxWinDeferredCreateContext: attach context %p to drawable %p", gc, draw);

+

+  switch (draw->base.type)

+  {

+    case GLX_DRAWABLE_WINDOW:

+    {

+      WindowPtr pWin = (WindowPtr) draw->base.pDraw;

+

+      if (!(gc->base.config->drawableType & GLX_WINDOW_BIT))

+        {

+          ErrorF("glxWinDeferredCreateContext: tried to attach a context whose fbConfig doesn't have drawableType GLX_WINDOW_BIT to a GLX_DRAWABLE_WINDOW drawable\n");

+        }

+

+      if (pWin == NULL)

+        {

+          GLWIN_DEBUG_MSG("Deferring until X window is created");

+          return;

+        }

+

+      GLWIN_DEBUG_MSG("glxWinDeferredCreateContext: pWin %p", pWin);

+

+      if (winGetWindowInfo(pWin) == NULL)

+        {

+          GLWIN_DEBUG_MSG("Deferring until native window is created");

+          return;

+        }

+    }

+    break;

+

+    case GLX_DRAWABLE_PBUFFER:

+    {

+      if (draw->hPbuffer == NULL)

+        {

+          __GLXscreen *screen;

+          glxWinScreen *winScreen;

+          int pixelFormat;

+          // XXX: which DC are supposed to use???

+          HDC screenDC = GetDC(NULL);

+

+          if (!(gc->base.config->drawableType & GLX_PBUFFER_BIT))

+            {

+              ErrorF("glxWinDeferredCreateContext: tried to attach a context whose fbConfig doesn't have drawableType GLX_PBUFFER_BIT to a GLX_DRAWABLE_PBUFFER drawable\n");

+            }

+

+          screen = gc->base.pGlxScreen;

+          winScreen = (glxWinScreen *)screen;

+

+          pixelFormat = fbConfigToPixelFormatIndex(screenDC, gc->base.config, GLX_DRAWABLE_PBUFFER, winScreen);

+          if (pixelFormat == 0)

+            {

+              ErrorF("wglChoosePixelFormat error: %s\n", glxWinErrorMessage());

+              return;

+            }

+

+          draw->hPbuffer = wglCreatePbufferARBWrapper(screenDC, pixelFormat, draw->base.pDraw->width, draw->base.pDraw->height, NULL);

+          ReleaseDC(NULL, screenDC);

+

+          if (draw->hPbuffer == NULL)

+            {

+              ErrorF("wglCreatePbufferARBWrapper error: %s\n", glxWinErrorMessage());

+              return;

+            }

+

+          GLWIN_DEBUG_MSG("glxWinDeferredCreateContext: pBuffer %p created for drawable %p", draw->hPbuffer, draw);

+        }

+    }

+    break;

+

+    case GLX_DRAWABLE_PIXMAP:

+    {

+      if (draw->dibDC == NULL)

+        {

+          BITMAPINFOHEADER bmpHeader;

+          void *pBits;

+

+          memset (&bmpHeader, 0, sizeof(BITMAPINFOHEADER));

+          bmpHeader.biSize = sizeof(BITMAPINFOHEADER);

+          bmpHeader.biWidth = draw->base.pDraw->width;

+          bmpHeader.biHeight = draw->base.pDraw->height;

+          bmpHeader.biPlanes = 1;

+          bmpHeader.biBitCount = draw->base.pDraw->bitsPerPixel;

+          bmpHeader.biCompression = BI_RGB;

+

+          if (!(gc->base.config->drawableType & GLX_PIXMAP_BIT))

+            {

+              ErrorF("glxWinDeferredCreateContext: tried to attach a context whose fbConfig doesn't have drawableType GLX_PIXMAP_BIT to a GLX_DRAWABLE_PIXMAP drawable\n");

+            }

+

+          draw->dibDC = CreateCompatibleDC(NULL);

+          if (draw->dibDC == NULL)

+            {

+              ErrorF("CreateCompatibleDC error: %s\n", glxWinErrorMessage());

+              return;

+            }

+

+          draw->hDIB = CreateDIBSection(draw->dibDC, (BITMAPINFO *)&bmpHeader, DIB_RGB_COLORS, &pBits, 0, 0);

+          if (draw->dibDC == NULL)

+            {

+              ErrorF("CreateDIBSection error: %s\n", glxWinErrorMessage());

+              return;

+            }

+

+          // XXX: CreateDIBSection insists on allocating the bitmap memory for us, so we're going to

+          // need some jiggery pokery to point the underlying X Drawable's bitmap at the same set of bits

+          // so that they can be read with XGetImage as well as glReadPixels, assuming the formats are

+          // even compatible ...

+          draw->pOldBits = ((PixmapPtr)draw->base.pDraw)->devPrivate.ptr;

+          ((PixmapPtr)draw->base.pDraw)->devPrivate.ptr = pBits;

+

+          // Select the DIB into the DC

+          draw->hOldDIB = SelectObject(draw->dibDC, draw->hDIB);

+          if (!draw->hOldDIB)

+            {

+              ErrorF("SelectObject error: %s\n", glxWinErrorMessage());

+            }

+

+          // Set the pixel format of the bitmap

+          glxWinSetPixelFormat(gc, draw->dibDC, draw->base.pDraw->bitsPerPixel, GLX_PIXMAP_BIT);

+

+          GLWIN_DEBUG_MSG("glxWinDeferredCreateContext: DIB bitmap %p created for drawable %p", draw->hDIB, draw);

+        }

+    }

+    break;

+

+    default:

+    {

+      ErrorF("glxWinDeferredCreateContext: tried to attach unhandled drawable type %d\n", draw->base.type);

+      return;

+    }

+  }

+

+  gc->hDC = glxWinMakeDC(gc, draw, &hwnd);

+  gc->ctx = wglCreateContext(gc->hDC);

+

+  if (gc->ctx == NULL)

+    {

+      glxWinReleaseDC(hwnd, gc->hDC, draw);

+      gc->hDC=0;

+      

+      ErrorF("wglCreateContext error: %s\n", glxWinErrorMessage());

+      return;

+    }

+

+  GLWIN_DEBUG_MSG("glxWinDeferredCreateContext: attached context %p to native context %p drawable %p", gc, gc->ctx, draw);

+

+  // if the native context was created successfully, shareLists if needed

+  if (gc->ctx && gc->shareContext)

+    {

+      GLWIN_DEBUG_MSG("glxWinCreateContextReal shareLists with context %p (native ctx %p)", gc->shareContext, gc->shareContext->ctx);

+

+      if (!wglShareLists(gc->shareContext->ctx, gc->ctx))

+        {

+          ErrorF("wglShareLists error: %s\n", glxWinErrorMessage());

+        }

+    }

+}

+

+/* ---------------------------------------------------------------------- */

+/*

+ * Context functions

+ */

+

+

+/* Context manipulation routines should return TRUE on success, FALSE on failure */

+static int

+glxWinContextMakeCurrent(__GLXcontext *base)

+{

+  __GLXWinContext *gc = (__GLXWinContext *)base;

+  BOOL ret;

+  __GLXWinDrawable *drawPriv;

+

+#ifdef _DEBUG

+  GLWIN_TRACE_MSG("glxWinContextMakeCurrent context %p (native ctx %p)", gc, gc->ctx);

+  glWinCallDelta();

+#endif

+

+  /* Keep a note of the last active context in the drawable */

+  drawPriv = (__GLXWinDrawable *)gc->base.drawPriv;

+  drawPriv->drawContext = gc;

+

+  if (gc->ctx == NULL)

+    {

+      glxWinDeferredCreateContext(gc, drawPriv);

+    }

+

+  if (gc->ctx == NULL)

+    {

+      ErrorF("glxWinContextMakeCurrent: Native context is NULL\n");

+      return FALSE;

+    }

+

+  if ((gc->base.readPriv != NULL) && (gc->base.readPriv != gc->base.drawPriv))

+    {

+      // XXX: should only occur with WGL_ARB_make_current_read

+      /*

+        If there is a separate read drawable, create a separate read DC, and

+        use the wglMakeContextCurrent extension to make the context current drawing

+        to one DC and reading from the other

+      */

+      gc->hreadDC = glxWinMakeDC(gc, (__GLXWinDrawable *)gc->base.readPriv, &gc->hreadwnd);

+      if (gc->hreadDC == NULL)

+        {

+          ErrorF("glxWinMakeDC failed for readDC\n");

+          return FALSE;

+        }

+

+      ret = wglMakeContextCurrentARBWrapper(gc->hDC, gc->hreadDC, gc->ctx);

+      if (!ret)

+        {

+          ErrorF("wglMakeContextCurrentARBWrapper error: %s\n", glxWinErrorMessage());

+        }

+    }

+  else

+    {

+      /* Otherwise, just use wglMakeCurrent */

+      if (!gc->hDC)

+      {

+        /* It probably has been release by loseCurrent, so create it again */

+        gc->hDC = glxWinMakeDC(gc, drawPriv, &gc->hwnd);

+      }

+      ret = wglMakeCurrent(gc->hDC, gc->ctx);

+      if (!ret)

+        {

+          DWORD ErrorCode=GetLastError();

+          ErrorF("wglMakeCurrent error: %x dc %p ctx %p\n", ErrorCode,gc->hDC,gc->ctx);

+          if (!ErrorCode)

+          {

+            ErrorF("Error code was 0, assuming no error.\n");

+            ret=TRUE;

+          }

+        }

+    }

+

+  // apparently make current could fail if the context is current in a different thread,

+  // but that shouldn't be able to happen in the current server...

+

+  return ret;

+}

+

+static int

+glxWinContextLoseCurrent(__GLXcontext *base)

+{

+  BOOL ret=TRUE;

+  __GLXWinContext *gc = (__GLXWinContext *)base;

+

+#ifdef _DEBUG

+  GLWIN_TRACE_MSG("glxWinContextLoseCurrent context %p (native ctx %p)", gc, gc->ctx);

+  glWinCallDelta();

+#endif

+

+

+  if (wglGetCurrentContext()==gc->ctx)

+  {

+    /* Only do this when we are sure we are currently the active, otherwise we are deactivating the wrong one (this is happening!!!) */

+    ret = wglMakeCurrent(NULL, NULL);

+    if (!ret)

+      ErrorF("glxWinContextLoseCurrent error: %s\n", glxWinErrorMessage());

+  }

+  else

+  {

+    return FALSE;

+  }

+

+  /* Since drawPriv is going to be set to zero in the context, we have to release the DC to */

+  if (gc->hDC && gc->base.drawPriv) glxWinReleaseDC(gc->hwnd, gc->hDC, (__GLXWinDrawable *)gc->base.drawPriv);

+  if (gc->hreadDC && gc->base.readPriv) glxWinReleaseDC(gc->hreadwnd, gc->hreadDC, (__GLXWinDrawable *)gc->base.readPriv);

+  gc->hDC=NULL;

+  gc->hreadDC=NULL;

+  

+  base->isCurrent=FALSE;  /* It looks like glx is not doing this */

+

+  return ret;

+}

+

+static int

+glxWinContextCopy(__GLXcontext *dst_base, __GLXcontext *src_base, unsigned long mask)

+{

+  __GLXWinContext *dst = (__GLXWinContext *)dst_base;

+  __GLXWinContext *src = (__GLXWinContext *)src_base;

+  BOOL ret;

+

+  GLWIN_DEBUG_MSG("glxWinContextCopy");

+

+  ret = wglCopyContext(src->ctx, dst->ctx, mask);

+  if (!ret)

+    {

+      ErrorF("wglCopyContext error: %s\n", glxWinErrorMessage());

+    }

+

+  return ret;

+}

+

+static int

+glxWinContextForceCurrent(__GLXcontext *base)

+{

+  /* wglMakeCurrent always flushes the previous context, so this is equivalent to glxWinContextMakeCurrent */

+  return glxWinContextMakeCurrent(base);

+}

+

+static void

+glxWinContextDestroy(__GLXcontext *base)

+{

+  __GLXWinContext *gc = (__GLXWinContext *)base;

+

+  if (gc != NULL)

+    {

+      GLWIN_DEBUG_MSG("GLXcontext %p destroyed (native ctx %p)", base, gc->ctx);

+

+      if (gc->ctx)

+        {

+          BOOL ret;

+          /* It's bad style to delete the context while it's still current */

+          if (wglGetCurrentContext() == gc->ctx)

+            {

+              wglMakeCurrent(NULL, NULL);

+            }

+

+          ret = wglDeleteContext(gc->ctx);

+          if (!ret)

+            ErrorF("wglDeleteContext error: %s\n", glxWinErrorMessage());

+          if (gc->base.drawPriv && gc->hDC) glxWinReleaseDC(gc->hwnd, gc->hDC, (__GLXWinDrawable *)gc->base.drawPriv);

+          if (gc->base.readPriv && gc->hreadDC) glxWinReleaseDC(gc->hreadwnd, gc->hreadDC, (__GLXWinDrawable *)gc->base.readPriv);

+          gc->hDC=NULL;

+          gc->hreadDC=NULL;

+          gc->ctx = NULL;

+        }

+

+      free(gc);

+    }

+}

+

+static __GLXcontext *

+glxWinCreateContext(__GLXscreen *screen,

+                   __GLXconfig *modes,

+                   __GLXcontext *baseShareContext)

+{

+    __GLXWinContext *context;

+    __GLXWinContext *shareContext = (__GLXWinContext *)baseShareContext;

+

+    static __GLXtextureFromPixmap glxWinTextureFromPixmap =

+      {

+        glxWinBindTexImage,

+        glxWinReleaseTexImage

+      };

+

+    context = (__GLXWinContext *)calloc(1, sizeof(__GLXWinContext));

+

+    if (!context)

+        return NULL;

+

+    memset(context, 0, sizeof *context);

+    context->base.destroy        = glxWinContextDestroy;

+    context->base.makeCurrent    = glxWinContextMakeCurrent;

+    context->base.loseCurrent    = glxWinContextLoseCurrent;

+    context->base.copy           = glxWinContextCopy;

+    context->base.forceCurrent   = glxWinContextForceCurrent;

+    context->base.textureFromPixmap = &glxWinTextureFromPixmap;

+    context->base.config = modes;

+    context->base.pGlxScreen = screen;

+

+    // actual native GL context creation is deferred until attach()

+    //context->ctx = NULL; already done with memset

+    context->shareContext = shareContext;

+

+    glWinSetupDispatchTable();

+

+    GLWIN_DEBUG_MSG("GLXcontext %p created", context);

+

+    return &(context->base);

+}

+

+/* ---------------------------------------------------------------------- */

+/*

+ * Utility functions

+ */

+

+static int

+fbConfigToPixelFormat(__GLXconfig *mode, PIXELFORMATDESCRIPTOR *pfdret, int drawableTypeOverride)

+{

+    PIXELFORMATDESCRIPTOR pfd = {

+      sizeof(PIXELFORMATDESCRIPTOR),   /* size of this pfd */

+      1,                     /* version number */

+      PFD_SUPPORT_OPENGL,    /* support OpenGL */

+      PFD_TYPE_RGBA,         /* RGBA type */

+      24,                    /* 24-bit color depth */

+      0, 0, 0, 0, 0, 0,      /* color bits ignored */

+      0,                     /* no alpha buffer */

+      0,                     /* shift bit ignored */

+      0,                     /* no accumulation buffer */

+      0, 0, 0, 0,            /* accum bits ignored */

+      32,                    /* 32-bit z-buffer */

+      0,                     /* no stencil buffer */

+      0,                     /* no auxiliary buffer */

+      PFD_MAIN_PLANE,        /* main layer */

+      0,                     /* reserved */

+      0, 0, 0                /* layer masks ignored */

+    };

+

+    if ((mode->drawableType | drawableTypeOverride) & GLX_WINDOW_BIT)

+      pfd.dwFlags |= PFD_DRAW_TO_WINDOW; /* support window */

+

+    if ((mode->drawableType | drawableTypeOverride) & GLX_PIXMAP_BIT)

+      pfd.dwFlags |= (PFD_DRAW_TO_BITMAP | PFD_SUPPORT_GDI); /* supports software rendering to bitmap */

+

+    if (mode->stereoMode) {

+        pfd.dwFlags |= PFD_STEREO;

+    }

+    if (mode->doubleBufferMode) {

+        pfd.dwFlags |= PFD_DOUBLEBUFFER;

+    }

+

+    pfd.iPixelType = PFD_TYPE_RGBA;

+    pfd.cColorBits = mode->redBits + mode->greenBits + mode->blueBits;

+    pfd.cRedBits = mode->redBits;

+    pfd.cRedShift = 0; /* FIXME */

+    pfd.cGreenBits = mode->greenBits;

+    pfd.cGreenShift = 0; /* FIXME  */

+    pfd.cBlueBits = mode->blueBits;

+    pfd.cBlueShift = 0; /* FIXME */

+    pfd.cAlphaBits = mode->alphaBits;

+    pfd.cAlphaShift = 0; /* FIXME */

+

+    pfd.cAccumBits = mode->accumRedBits + mode->accumGreenBits + mode->accumBlueBits + mode->accumAlphaBits;

+    pfd.cAccumRedBits = mode->accumRedBits;

+    pfd.cAccumGreenBits = mode->accumGreenBits;

+    pfd.cAccumBlueBits = mode->accumBlueBits;

+    pfd.cAccumAlphaBits = mode->accumAlphaBits;

+

+    pfd.cDepthBits = mode->depthBits;

+    pfd.cStencilBits = mode->stencilBits;

+    pfd.cAuxBuffers = mode->numAuxBuffers;

+

+    /* mode->level ? */

+    /* mode->pixmapMode ? */

+

+    *pfdret = pfd;

+

+    return 0;

+}

+

+#define SET_ATTR_VALUE(attr, value) { attribList[i++] = attr; attribList[i++] = value; assert(i < NUM_ELEMENTS(attribList)); }

+

+static int

+fbConfigToPixelFormatIndex(HDC hdc, __GLXconfig *mode, int drawableTypeOverride, glxWinScreen *winScreen)

+{

+  UINT numFormats;

+  unsigned int i = 0;

+

+  /* convert fbConfig to attr-value list  */

+  int attribList[60];

+

+  SET_ATTR_VALUE(WGL_SUPPORT_OPENGL_ARB, TRUE);

+  SET_ATTR_VALUE(WGL_PIXEL_TYPE_ARB, (mode->visualType == GLX_TRUE_COLOR) ? WGL_TYPE_RGBA_ARB : WGL_TYPE_COLORINDEX_ARB);

+  SET_ATTR_VALUE(WGL_COLOR_BITS_ARB, (mode->visualType == GLX_TRUE_COLOR) ? mode->rgbBits : mode->indexBits);

+  SET_ATTR_VALUE(WGL_RED_BITS_ARB, mode->redBits);

+  SET_ATTR_VALUE(WGL_GREEN_BITS_ARB, mode->greenBits);

+  SET_ATTR_VALUE(WGL_BLUE_BITS_ARB, mode->blueBits);

+  SET_ATTR_VALUE(WGL_ALPHA_BITS_ARB, mode->alphaBits);

+  SET_ATTR_VALUE(WGL_ACCUM_RED_BITS_ARB, mode->accumRedBits);

+  SET_ATTR_VALUE(WGL_ACCUM_GREEN_BITS_ARB, mode->accumGreenBits);

+  SET_ATTR_VALUE(WGL_ACCUM_BLUE_BITS_ARB, mode->accumBlueBits);

+  SET_ATTR_VALUE(WGL_ACCUM_ALPHA_BITS_ARB, mode->accumAlphaBits);

+  SET_ATTR_VALUE(WGL_DEPTH_BITS_ARB, mode->depthBits);

+  SET_ATTR_VALUE(WGL_STENCIL_BITS_ARB, mode->stencilBits);

+  SET_ATTR_VALUE(WGL_AUX_BUFFERS_ARB, mode->numAuxBuffers);

+

+  if (mode->doubleBufferMode)

+    SET_ATTR_VALUE(WGL_DOUBLE_BUFFER_ARB, TRUE);

+

+  if (mode->stereoMode)

+    SET_ATTR_VALUE(WGL_STEREO_ARB, TRUE);

+

+  // Some attributes are only added to the list if the value requested is not 'don't care', as exactly matching that is daft..

+  if (mode->swapMethod == GLX_SWAP_EXCHANGE_OML)

+    SET_ATTR_VALUE(WGL_SWAP_METHOD_ARB, WGL_SWAP_EXCHANGE_ARB);

+

+  if (mode->swapMethod == GLX_SWAP_COPY_OML)

+    SET_ATTR_VALUE(WGL_SWAP_COPY_ARB, TRUE);

+

+  // XXX: this should probably be the other way around, but that messes up drawableTypeOverride

+  if (mode->visualRating == GLX_SLOW_VISUAL_EXT)

+    SET_ATTR_VALUE(WGL_ACCELERATION_ARB, WGL_NO_ACCELERATION_ARB);

+

+  // must support all the drawable types the mode supports

+  if ((mode->drawableType | drawableTypeOverride) & GLX_WINDOW_BIT)

+    SET_ATTR_VALUE(WGL_DRAW_TO_WINDOW_ARB,TRUE);

+

+  // XXX: this is a horrible hacky heuristic, in fact this whole drawableTypeOverride thing is a bad idea

+  // try to avoid asking for formats which don't exist (by not asking for all when adjusting the config to include the drawableTypeOverride)

+  if (drawableTypeOverride == GLX_WINDOW_BIT)

+    {

+      if (mode->drawableType & GLX_PIXMAP_BIT)

+        SET_ATTR_VALUE(WGL_DRAW_TO_BITMAP_ARB, TRUE);

+

+      if (mode->drawableType & GLX_PBUFFER_BIT)

+        if (winScreen->has_WGL_ARB_pbuffer)

+          SET_ATTR_VALUE(WGL_DRAW_TO_PBUFFER_ARB, TRUE);

+    }

+  else

+    {

+      if (drawableTypeOverride & GLX_PIXMAP_BIT)

+        SET_ATTR_VALUE(WGL_DRAW_TO_BITMAP_ARB, TRUE);

+

+      if (drawableTypeOverride & GLX_PBUFFER_BIT)

+        if (winScreen->has_WGL_ARB_pbuffer)

+          SET_ATTR_VALUE(WGL_DRAW_TO_PBUFFER_ARB, TRUE);

+    }

+

+  SET_ATTR_VALUE(0, 0); // terminator

+

+  /* choose the first match */

+  {

+    int pixelFormatIndex;

+

+    if (!wglChoosePixelFormatARBWrapper(hdc, attribList, NULL, 1, &pixelFormatIndex, &numFormats))

+      {

+        ErrorF("wglChoosePixelFormat error: %s\n", glxWinErrorMessage());

+      }

+    else

+      {

+        if (numFormats > 0)

+          {

+            GLWIN_DEBUG_MSG("wglChoosePixelFormat: chose pixelFormatIndex %d)", pixelFormatIndex);

+            return pixelFormatIndex;

+          }

+        else

+          ErrorF("wglChoosePixelFormat couldn't decide\n");

+      }

+  }

+

+  return 0;

+}

+

+/* ---------------------------------------------------------------------- */

+

+#define BITS_AND_SHIFT_TO_MASK(bits,mask) (((1<<(bits))-1) << (mask))

+

+//

+// Create the GLXconfigs using DescribePixelFormat()

+//

+static void

+glxWinCreateConfigs(HDC hdc, glxWinScreen *screen)

+{

+  GLXWinConfig *c, *result, *prev = NULL;

+  int numConfigs = 0;

+  int i = 0;

+  int n = 0;

+  PIXELFORMATDESCRIPTOR pfd;

+

+  GLWIN_DEBUG_MSG("glxWinCreateConfigs");

+

+  screen->base.numFBConfigs = 0;

+  screen->base.fbconfigs = NULL;

+

+  // get the number of pixelformats

+  numConfigs = DescribePixelFormat(hdc, 1, sizeof(PIXELFORMATDESCRIPTOR), NULL);

+  GLWIN_DEBUG_MSG("DescribePixelFormat says %d possible pixel formats", numConfigs);

+

+  /* alloc */

+  result = malloc(sizeof(GLXWinConfig) * numConfigs);

+

+  if (NULL == result)

+    {

+      return;

+    }

+

+  memset(result, 0, sizeof(GLXWinConfig) * numConfigs);

+  n = 0;

+

+  /* fill in configs */

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

+    {

+      int rc;

+

+      c = &(result[i]);

+      c->base.next = NULL;

+      c->pixelFormatIndex = i+1;

+

+      rc = DescribePixelFormat(hdc, i+1, sizeof(PIXELFORMATDESCRIPTOR), &pfd);

+

+      if (!rc)

+        {

+          ErrorF("DescribePixelFormat failed for index %d, error %s\n", i+1, glxWinErrorMessage());

+          break;

+        }

+

+#ifdef _DEBUG

+      if (glxWinDebugSettings.dumpPFD)

+        pfdOut(&pfd);

+#endif

+

+      if (!(pfd.dwFlags & (PFD_DRAW_TO_WINDOW | PFD_DRAW_TO_BITMAP)) || !(pfd.dwFlags & PFD_SUPPORT_OPENGL))

+        {

+          GLWIN_DEBUG_MSG("pixelFormat %d has unsuitable flags 0x%08lx, skipping", i+1, pfd.dwFlags);

+          continue;

+        }

+

+      c->base.doubleBufferMode = (pfd.dwFlags & PFD_DOUBLEBUFFER) ? GL_TRUE : GL_FALSE;

+      c->base.stereoMode = (pfd.dwFlags & PFD_STEREO) ? GL_TRUE : GL_FALSE;

+

+      c->base.redBits = pfd.cRedBits;

+      c->base.greenBits = pfd.cGreenBits;

+      c->base.blueBits = pfd.cBlueBits;

+      c->base.alphaBits = pfd.cAlphaBits;

+

+      c->base.redMask = BITS_AND_SHIFT_TO_MASK(pfd.cRedBits, pfd.cRedShift);

+      c->base.greenMask =  BITS_AND_SHIFT_TO_MASK(pfd.cGreenBits, pfd.cGreenShift);

+      c->base.blueMask = BITS_AND_SHIFT_TO_MASK(pfd.cBlueBits, pfd.cBlueShift);

+      c->base.alphaMask = BITS_AND_SHIFT_TO_MASK(pfd.cAlphaBits, pfd.cAlphaShift);

+

+      c->base.rgbBits = pfd.cColorBits;

+

+      if (pfd.iPixelType == PFD_TYPE_COLORINDEX)

+        {

+          c->base.indexBits = pfd.cColorBits;

+        }

+      else

+        {

+          c->base.indexBits = 0;

+        }

+

+      c->base.accumRedBits = pfd.cAccumRedBits;

+      c->base.accumGreenBits = pfd.cAccumGreenBits;

+      c->base.accumBlueBits = pfd.cAccumBlueBits;

+      c->base.accumAlphaBits = pfd.cAccumAlphaBits;

+      //  pfd.cAccumBits;

+

+      c->base.depthBits = pfd.cDepthBits;

+      c->base.stencilBits = pfd.cStencilBits;

+      c->base.numAuxBuffers = pfd.cAuxBuffers;

+

+      // pfd.iLayerType; // ignored

+      c->base.level = 0;

+      // pfd.dwLayerMask; // ignored

+      // pfd.dwDamageMask;  // ignored

+

+      c->base.pixmapMode = 0;

+      c->base.visualID = -1;  // will be set by __glXScreenInit()

+

+      /* EXT_visual_rating / GLX 1.2 */

+      if (pfd.dwFlags & PFD_GENERIC_FORMAT)

+        {

+          c->base.visualRating = GLX_SLOW_VISUAL_EXT;

+        }

+      else

+        {

+          // PFD_GENERIC_ACCELERATED is not considered, so this may be MCD or ICD acclerated...

+          c->base.visualRating = GLX_NONE_EXT;

+        }

+

+      /* EXT_visual_info / GLX 1.2 */

+      if (pfd.iPixelType == PFD_TYPE_COLORINDEX)

+        {

+          c->base.visualType = GLX_STATIC_COLOR;

+        }

+      else

+        {

+          c->base.visualType = GLX_TRUE_COLOR;

+        }

+

+      // pfd.dwVisibleMask; ???

+      c->base.transparentPixel = GLX_NONE;

+      c->base.transparentRed = GLX_NONE;

+      c->base.transparentGreen = GLX_NONE;

+      c->base.transparentBlue = GLX_NONE;

+      c->base.transparentAlpha = GLX_NONE;

+      c->base.transparentIndex = GLX_NONE;

+

+      /* ARB_multisample / SGIS_multisample */

+      c->base.sampleBuffers = 0;

+      c->base.samples = 0;

+

+      /* SGIX_fbconfig / GLX 1.3 */

+      c->base.drawableType = (((pfd.dwFlags & PFD_DRAW_TO_WINDOW) ? GLX_WINDOW_BIT : 0)

+                         | ((pfd.dwFlags & PFD_DRAW_TO_BITMAP) ? GLX_PIXMAP_BIT : 0));

+

+      if (pfd.iPixelType == PFD_TYPE_COLORINDEX)

+        {

+          c->base.renderType = GLX_RGBA_BIT | GLX_COLOR_INDEX_BIT;

+        }

+      else

+        {

+          c->base.renderType = GLX_RGBA_BIT;

+        }

+

+      c->base.xRenderable = GL_TRUE;

+      c->base.fbconfigID = -1; // will be set by __glXScreenInit()

+

+      /* SGIX_pbuffer / GLX 1.3 */

+      // XXX: How can we find these values out ???

+      c->base.maxPbufferWidth = -1;

+      c->base.maxPbufferHeight = -1;

+      c->base.maxPbufferPixels = -1;

+      c->base.optimalPbufferWidth = 0; // there is no optimal value

+      c->base.optimalPbufferHeight = 0;

+

+      /* SGIX_visual_select_group */

+      // arrange for visuals with the best acceleration to be preferred in selection

+      switch (pfd.dwFlags & (PFD_GENERIC_FORMAT | PFD_GENERIC_ACCELERATED))

+        {

+        case 0:

+          c->base.visualSelectGroup = 2;

+          break;

+

+        case PFD_GENERIC_ACCELERATED:

+          c->base.visualSelectGroup = 1;

+          break;

+

+        case PFD_GENERIC_FORMAT:

+          c->base.visualSelectGroup = 0;

+          break;

+

+        default:

+          ;

+          // "can't happen"

+        }

+

+      /* OML_swap_method */

+      if (pfd.dwFlags & PFD_SWAP_EXCHANGE)

+        c->base.swapMethod = GLX_SWAP_EXCHANGE_OML;

+      else if (pfd.dwFlags & PFD_SWAP_COPY)

+        c->base.swapMethod = GLX_SWAP_COPY_OML;

+      else

+        c->base.swapMethod = GLX_SWAP_UNDEFINED_OML;

+

+      /* EXT_import_context */

+      c->base.screen = screen->base.pScreen->myNum;

+

+      /* EXT_texture_from_pixmap */

+      c->base.bindToTextureRgb = -1;

+      c->base.bindToTextureRgba = -1;

+      c->base.bindToMipmapTexture = -1;

+      c->base.bindToTextureTargets = -1;

+      c->base.yInverted = -1;

+

+      n++;

+

+      // update previous config to point to this config

+      if (prev)

+        prev->base.next = &(c->base);

+

+      prev = c;

+    }

+

+  GLWIN_DEBUG_MSG("found %d pixelFormats suitable for conversion to fbConfigs", n);

+

+  screen->base.numFBConfigs = n;

+  screen->base.fbconfigs = &(result->base);

+}

+

+// helper function to access an attribute value from an attribute value array by attribute

+static

+int getAttrValue(const int attrs[], int values[], unsigned int num, int attr, int fallback)

+{

+  unsigned int i;

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

+    {

+      if (attrs[i] == attr)

+        {

+          GLWIN_TRACE_MSG("getAttrValue attr 0x%x, value %d", attr, values[i]);

+          return values[i];

+        }

+    }

+

+  ErrorF("getAttrValue failed to find attr 0x%x, using default value %d\n", attr, fallback);

+  return fallback;

+}

+

+//

+// Create the GLXconfigs using wglGetPixelFormatAttribfvARB() extension

+//

+static void

+glxWinCreateConfigsExt(HDC hdc, glxWinScreen *screen)

+{

+  GLXWinConfig *c, *result, *prev = NULL;

+  int i = 0;

+  int n = 0;

+

+  const int attr = WGL_NUMBER_PIXEL_FORMATS_ARB;

+  int numConfigs;

+

+  int attrs[50];

+  unsigned int num_attrs = 0;

+

+  GLWIN_DEBUG_MSG("glxWinCreateConfigsExt");

+

+  screen->base.numFBConfigs = 0;

+  screen->base.fbconfigs = NULL;

+

+  if (!wglGetPixelFormatAttribivARBWrapper(hdc, 0, 0, 1, &attr, &numConfigs))

+    {

+      ErrorF("wglGetPixelFormatAttribivARB failed for WGL_NUMBER_PIXEL_FORMATS_ARB: %s\n", glxWinErrorMessage());

+      return;

+    }

+

+  GLWIN_DEBUG_MSG("wglGetPixelFormatAttribivARB says %d possible pixel formats", numConfigs);

+

+  /* alloc */

+  result = malloc(sizeof(GLXWinConfig) * numConfigs);

+

+  if (NULL == result)

+    {

+      return;

+    }

+

+  memset(result, 0, sizeof(GLXWinConfig) * numConfigs);

+  n = 0;

+

+#define ADD_ATTR(a) { attrs[num_attrs++] = a; assert(num_attrs < NUM_ELEMENTS(attrs)); }

+

+  ADD_ATTR(WGL_DRAW_TO_WINDOW_ARB);

+  ADD_ATTR(WGL_DRAW_TO_BITMAP_ARB);

+  ADD_ATTR(WGL_ACCELERATION_ARB);

+  ADD_ATTR(WGL_SWAP_LAYER_BUFFERS_ARB);

+  ADD_ATTR(WGL_NUMBER_OVERLAYS_ARB);

+  ADD_ATTR(WGL_NUMBER_UNDERLAYS_ARB);

+  ADD_ATTR(WGL_TRANSPARENT_ARB);

+  ADD_ATTR(WGL_TRANSPARENT_RED_VALUE_ARB);

+  ADD_ATTR(WGL_TRANSPARENT_GREEN_VALUE_ARB);

+  ADD_ATTR(WGL_TRANSPARENT_GREEN_VALUE_ARB);

+  ADD_ATTR(WGL_TRANSPARENT_ALPHA_VALUE_ARB);

+  ADD_ATTR(WGL_SUPPORT_OPENGL_ARB);

+  ADD_ATTR(WGL_DOUBLE_BUFFER_ARB);

+  ADD_ATTR(WGL_STEREO_ARB);

+  ADD_ATTR(WGL_PIXEL_TYPE_ARB);

+  ADD_ATTR(WGL_COLOR_BITS_ARB);

+  ADD_ATTR(WGL_RED_BITS_ARB);

+  ADD_ATTR(WGL_RED_SHIFT_ARB);

+  ADD_ATTR(WGL_GREEN_BITS_ARB);

+  ADD_ATTR(WGL_GREEN_SHIFT_ARB);

+  ADD_ATTR(WGL_BLUE_BITS_ARB);

+  ADD_ATTR(WGL_BLUE_SHIFT_ARB);

+  ADD_ATTR(WGL_ALPHA_BITS_ARB);

+  ADD_ATTR(WGL_ALPHA_SHIFT_ARB);

+  ADD_ATTR(WGL_ACCUM_RED_BITS_ARB);

+  ADD_ATTR(WGL_ACCUM_GREEN_BITS_ARB);

+  ADD_ATTR(WGL_ACCUM_BLUE_BITS_ARB);

+  ADD_ATTR(WGL_ACCUM_ALPHA_BITS_ARB);

+  ADD_ATTR(WGL_DEPTH_BITS_ARB);

+  ADD_ATTR(WGL_STENCIL_BITS_ARB);

+  ADD_ATTR(WGL_AUX_BUFFERS_ARB);

+  ADD_ATTR(WGL_SWAP_METHOD_ARB);

+

+  if (screen->has_WGL_ARB_multisample)

+    {

+      // we may not query these attrs if WGL_ARB_multisample is not offered

+      ADD_ATTR(WGL_SAMPLE_BUFFERS_ARB);

+      ADD_ATTR(WGL_SAMPLES_ARB);

+    }

+

+  if (screen->has_WGL_ARB_render_texture)

+    {

+      // we may not query these attrs if WGL_ARB_render_texture is not offered

+      ADD_ATTR(WGL_BIND_TO_TEXTURE_RGB_ARB);

+      ADD_ATTR(WGL_BIND_TO_TEXTURE_RGBA_ARB);

+    }

+

+  if (screen->has_WGL_ARB_pbuffer)

+    {

+      // we may not query these attrs if WGL_ARB_pbuffer is not offered

+      ADD_ATTR(WGL_DRAW_TO_PBUFFER_ARB);

+      ADD_ATTR(WGL_MAX_PBUFFER_PIXELS_ARB);

+      ADD_ATTR(WGL_MAX_PBUFFER_WIDTH_ARB);

+      ADD_ATTR(WGL_MAX_PBUFFER_HEIGHT_ARB);

+    }

+

+  /* fill in configs */

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

+    {

+      int sizevalues=num_attrs*sizeof(int);

+      int *values=(int*)_alloca(sizevalues);

+

+      memset(values,0,sizevalues);

+

+      c = &(result[i]);

+      c->base.next = NULL;

+      c->pixelFormatIndex = i+1;

+

+      if (!wglGetPixelFormatAttribivARBWrapper(hdc, i+1, 0, num_attrs, attrs, values))

+        {

+          ErrorF("wglGetPixelFormatAttribivARB failed for index %d, error %s\n", i+1, glxWinErrorMessage());

+          break;

+        }

+

+#define ATTR_VALUE(a, d) getAttrValue(attrs, values, num_attrs, (a), (d))

+

+      if (!ATTR_VALUE(WGL_SUPPORT_OPENGL_ARB, 0))

+        {

+          GLWIN_DEBUG_MSG("pixelFormat %d isn't WGL_SUPPORT_OPENGL_ARB, skipping", i+1);

+          continue;

+        }

+

+      c->base.doubleBufferMode = ATTR_VALUE(WGL_DOUBLE_BUFFER_ARB, 0) ? GL_TRUE : GL_FALSE;

+      c->base.stereoMode = ATTR_VALUE(WGL_STEREO_ARB, 0) ? GL_TRUE : GL_FALSE;

+

+      c->base.redBits = ATTR_VALUE(WGL_RED_BITS_ARB, 0);

+      c->base.greenBits = ATTR_VALUE(WGL_GREEN_BITS_ARB, 0);

+      c->base.blueBits = ATTR_VALUE(WGL_BLUE_BITS_ARB, 0);

+      c->base.alphaBits = ATTR_VALUE(WGL_ALPHA_BITS_ARB, 0);

+

+      c->base.redMask = BITS_AND_SHIFT_TO_MASK(c->base.redBits, ATTR_VALUE(WGL_RED_SHIFT_ARB, 0));

+      c->base.greenMask = BITS_AND_SHIFT_TO_MASK(c->base.greenBits, ATTR_VALUE(WGL_GREEN_SHIFT_ARB, 0));

+      c->base.blueMask = BITS_AND_SHIFT_TO_MASK(c->base.blueBits, ATTR_VALUE(WGL_BLUE_SHIFT_ARB, 0));

+      c->base.alphaMask = BITS_AND_SHIFT_TO_MASK(c->base.alphaBits, ATTR_VALUE(WGL_ALPHA_SHIFT_ARB, 0));

+

+      switch (ATTR_VALUE(WGL_PIXEL_TYPE_ARB, 0))

+        {

+        case WGL_TYPE_COLORINDEX_ARB:

+          c->base.indexBits = ATTR_VALUE(WGL_COLOR_BITS_ARB, 0);

+          c->base.rgbBits = 0;

+          c->base.visualType = GLX_STATIC_COLOR;

+          break;

+

+        case WGL_TYPE_RGBA_FLOAT_ARB:

+          GLWIN_DEBUG_MSG("pixelFormat %d is WGL_TYPE_RGBA_FLOAT_ARB, skipping", i+1);

+          continue;

+

+        case WGL_TYPE_RGBA_UNSIGNED_FLOAT_EXT:

+          GLWIN_DEBUG_MSG("pixelFormat %d is WGL_TYPE_RGBA_UNSIGNED_FLOAT_EXT, skipping", i+1);

+          continue;

+

+        case WGL_TYPE_RGBA_ARB:

+          c->base.indexBits = 0;

+          c->base.rgbBits = ATTR_VALUE(WGL_COLOR_BITS_ARB, 0);

+          c->base.visualType = GLX_TRUE_COLOR;

+          break;

+

+        default:

+          ErrorF("wglGetPixelFormatAttribivARB returned unknown value 0x%x for WGL_PIXEL_TYPE_ARB\n", ATTR_VALUE(WGL_PIXEL_TYPE_ARB, 0));

+          continue;

+        }

+

+      c->base.accumRedBits = ATTR_VALUE(WGL_ACCUM_RED_BITS_ARB, 0);

+      c->base.accumGreenBits = ATTR_VALUE(WGL_ACCUM_GREEN_BITS_ARB, 0);

+      c->base.accumBlueBits = ATTR_VALUE(WGL_ACCUM_BLUE_BITS_ARB, 0);

+      c->base.accumAlphaBits = ATTR_VALUE(WGL_ACCUM_ALPHA_BITS_ARB, 0);

+

+      c->base.depthBits = ATTR_VALUE(WGL_DEPTH_BITS_ARB, 0);

+      c->base.stencilBits = ATTR_VALUE(WGL_STENCIL_BITS_ARB, 0);

+      c->base.numAuxBuffers = ATTR_VALUE(WGL_AUX_BUFFERS_ARB, 0);

+

+      {

+        int layers = ATTR_VALUE(WGL_NUMBER_OVERLAYS_ARB,0) + ATTR_VALUE(WGL_NUMBER_UNDERLAYS_ARB, 0);

+

+        if (layers > 0)

+          {

+            ErrorF("pixelFormat %d: has %d overlay, %d underlays which aren't currently handled", i, ATTR_VALUE(WGL_NUMBER_OVERLAYS_ARB,0), ATTR_VALUE(WGL_NUMBER_UNDERLAYS_ARB, 0));

+            // XXX: need to iterate over layers?

+          }

+      }

+      c->base.level = 0;

+

+      c->base.pixmapMode = 0; // ???

+      c->base.visualID = -1;  // will be set by __glXScreenInit()

+

+      /* EXT_visual_rating / GLX 1.2 */

+      switch (ATTR_VALUE(WGL_ACCELERATION_ARB, 0))

+        {

+        default:

+          ErrorF("wglGetPixelFormatAttribivARB returned unknown value 0x%x for WGL_ACCELERATION_ARB\n", ATTR_VALUE(WGL_ACCELERATION_ARB, 0));

+

+        case WGL_NO_ACCELERATION_ARB:

+          c->base.visualRating = GLX_SLOW_VISUAL_EXT;

+          break;

+

+        case WGL_GENERIC_ACCELERATION_ARB:

+        case WGL_FULL_ACCELERATION_ARB:

+          c->base.visualRating = GLX_NONE_EXT;

+          break;

+        }

+

+      /* EXT_visual_info / GLX 1.2 */

+      // c->base.visualType is set above

+      if (ATTR_VALUE(WGL_TRANSPARENT_ARB, 0))

+        {

+          c->base.transparentPixel = (c->base.visualType == GLX_TRUE_COLOR) ? GLX_TRANSPARENT_RGB_EXT : GLX_TRANSPARENT_INDEX_EXT;

+          c->base.transparentRed = ATTR_VALUE(WGL_TRANSPARENT_RED_VALUE_ARB, 0);

+          c->base.transparentGreen = ATTR_VALUE(WGL_TRANSPARENT_GREEN_VALUE_ARB, 0);

+          c->base.transparentBlue = ATTR_VALUE(WGL_TRANSPARENT_BLUE_VALUE_ARB, 0);

+          c->base.transparentAlpha = ATTR_VALUE(WGL_TRANSPARENT_ALPHA_VALUE_ARB, 0);

+          c->base.transparentIndex = ATTR_VALUE(WGL_TRANSPARENT_INDEX_VALUE_ARB, 0);

+        }

+      else

+        {

+          c->base.transparentPixel = GLX_NONE_EXT;

+          c->base.transparentRed = GLX_NONE;

+          c->base.transparentGreen = GLX_NONE;

+          c->base.transparentBlue = GLX_NONE;

+          c->base.transparentAlpha = GLX_NONE;

+          c->base.transparentIndex = GLX_NONE;

+        }

+

+      /* ARB_multisample / SGIS_multisample */

+      if (screen->has_WGL_ARB_multisample)

+        {

+          c->base.sampleBuffers = ATTR_VALUE(WGL_SAMPLE_BUFFERS_ARB, 0);

+          c->base.samples = ATTR_VALUE(WGL_SAMPLES_ARB, 0);

+        }

+      else

+        {

+          c->base.sampleBuffers = 0;

+          c->base.samples = 0;

+        }

+

+      /* SGIX_fbconfig / GLX 1.3 */

+      c->base.drawableType = ((ATTR_VALUE(WGL_DRAW_TO_WINDOW_ARB, 0) ? GLX_WINDOW_BIT : 0)

+                         | (ATTR_VALUE(WGL_DRAW_TO_BITMAP_ARB, 0) ? GLX_PIXMAP_BIT : 0)

+                         | (ATTR_VALUE(WGL_DRAW_TO_PBUFFER_ARB, 0) ? GLX_PBUFFER_BIT : 0));

+

+      /*

+        Assume OpenGL RGBA rendering is available on all visuals

+        (it is specified to render to red component in single-channel visuals,

+        if supported, but there doesn't seem to be any mechanism to check if it

+        is supported)

+

+        Color index rendering is only supported on single-channel visuals

+      */

+      if (c->base.visualType == GLX_STATIC_COLOR)

+        {

+          c->base.renderType = GLX_RGBA_BIT | GLX_COLOR_INDEX_BIT;

+        }

+      else

+        {

+          c->base.renderType = GLX_RGBA_BIT;

+        }

+

+      c->base.xRenderable = GL_TRUE;

+      c->base.fbconfigID = -1; // will be set by __glXScreenInit()

+

+      /* SGIX_pbuffer / GLX 1.3 */

+      if (screen->has_WGL_ARB_pbuffer)

+        {

+          c->base.maxPbufferWidth = ATTR_VALUE(WGL_MAX_PBUFFER_WIDTH_ARB, -1);

+          c->base.maxPbufferHeight = ATTR_VALUE(WGL_MAX_PBUFFER_HEIGHT_ARB, -1);

+          c->base.maxPbufferPixels =  ATTR_VALUE(WGL_MAX_PBUFFER_PIXELS_ARB, -1);

+        }

+      else

+        {

+          c->base.maxPbufferWidth = -1;

+          c->base.maxPbufferHeight = -1;

+          c->base.maxPbufferPixels =  -1;

+        }

+      c->base.optimalPbufferWidth = 0; // there is no optimal value

+      c->base.optimalPbufferHeight = 0;

+

+      /* SGIX_visual_select_group */

+      // arrange for visuals with the best acceleration to be preferred in selection

+      switch (ATTR_VALUE(WGL_ACCELERATION_ARB, 0))

+        {

+        case WGL_FULL_ACCELERATION_ARB:

+          c->base.visualSelectGroup = 2;

+          break;

+

+        case WGL_GENERIC_ACCELERATION_ARB:

+          c->base.visualSelectGroup = 1;

+          break;

+

+        default:

+        case WGL_NO_ACCELERATION_ARB:

+          c->base.visualSelectGroup = 0;

+          break;

+        }

+

+      /* OML_swap_method */

+      switch (ATTR_VALUE(WGL_SWAP_METHOD_ARB, 0))

+        {

+        case WGL_SWAP_EXCHANGE_ARB:

+          c->base.swapMethod = GLX_SWAP_EXCHANGE_OML;

+          break;

+

+        case WGL_SWAP_COPY_ARB:

+          c->base.swapMethod = GLX_SWAP_COPY_OML;

+          break;

+

+        default:

+          ErrorF("wglGetPixelFormatAttribivARB returned unknown value 0x%x for WGL_SWAP_METHOD_ARB\n", ATTR_VALUE(WGL_SWAP_METHOD_ARB, 0));

+

+        case WGL_SWAP_UNDEFINED_ARB:

+          c->base.swapMethod = GLX_SWAP_UNDEFINED_OML;

+        }

+

+      /* EXT_import_context */

+      c->base.screen = screen->base.pScreen->myNum;

+

+      /* EXT_texture_from_pixmap */

+      /*

+         Mesa's DRI configs always have bindToTextureRgb/Rgba TRUE (see driCreateConfigs(), so setting

+         bindToTextureRgb/bindToTextureRgba to FALSE means that swrast can't find any fbConfigs to use,

+         so setting these to 0, even if we know bindToTexture isn't available, isn't a good idea...

+       */

+      if (screen->has_WGL_ARB_render_texture)

+        {

+          c->base.bindToTextureRgb = ATTR_VALUE(WGL_BIND_TO_TEXTURE_RGB_ARB, -1);

+          c->base.bindToTextureRgba = ATTR_VALUE(WGL_BIND_TO_TEXTURE_RGBA_ARB, -1);

+        }

+      else

+        {

+          c->base.bindToTextureRgb = -1;

+          c->base.bindToTextureRgba = -1;

+        }

+      c->base.bindToMipmapTexture = -1;

+      c->base.bindToTextureTargets = GLX_TEXTURE_1D_BIT_EXT | GLX_TEXTURE_2D_BIT_EXT | GLX_TEXTURE_RECTANGLE_BIT_EXT;

+      c->base.yInverted = -1;

+

+      n++;

+

+      // update previous config to point to this config

+      if (prev)

+        prev->base.next = &(c->base);

+

+      prev = c;

+    }

+

+  screen->base.numFBConfigs = n;

+  screen->base.fbconfigs = &(result->base);

+}

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

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

+ *

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

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

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

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

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

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

+ *the following conditions:

+ *

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

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

+ *

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

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

+ *MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

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

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

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

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

+ *

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

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

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

+ *from the XFree86 Project.

+ *

+ * Authors:	Dakshinamurthy Karra

+ *		Suhaib M Siddiqi

+ *		Peter Busch

+ *		Harold L Hunt II

+ *		Kensuke Matsuzaki

+ */

+

+#ifndef _WIN_H_

+#define _WIN_H_

+

+#ifndef NO

+#define NO					0

+#endif

+#ifndef YES

+#define YES					1

+#endif

+

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

+#ifndef WM_XBUTTONDOWN

+# define WM_XBUTTONDOWN 523

+#endif

+#ifndef WM_XBUTTONUP

+# define WM_XBUTTONUP 524

+#endif

+#ifndef WM_XBUTTONDBLCLK

+# define WM_XBUTTONDBLCLK 525

+#endif

+

+

+#define WIN_DEFAULT_BPP				0

+#define WIN_DEFAULT_WHITEPIXEL			255

+#define WIN_DEFAULT_BLACKPIXEL			0

+#define WIN_DEFAULT_LINEBIAS			0

+#define WIN_DEFAULT_E3B_TIME			50 /* milliseconds */

+#define WIN_DEFAULT_DPI				75

+#define WIN_DEFAULT_REFRESH			0

+#define WIN_DEFAULT_WIN_KILL			TRUE

+#define WIN_DEFAULT_UNIX_KILL			FALSE

+#define WIN_DEFAULT_CLIP_UPDATES_NBOXES		0

+#ifdef XWIN_EMULATEPSEUDO

+#define WIN_DEFAULT_EMULATE_PSEUDO		FALSE

+#endif

+#define WIN_DEFAULT_USER_GAVE_HEIGHT_AND_WIDTH	FALSE

+

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

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

+

+/*

+ * Windows only supports 256 color palettes

+ */

+#define WIN_NUM_PALETTE_ENTRIES			256

+

+/*

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

+ */

+#define WIN_REGAIN_SURFACE_RETRIES		1

+

+/*

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

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

+ */

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

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

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

+#define WIN_CHECK_DEPTH		YES

+

+/*

+ * Timer IDs for WM_TIMER

+ */

+#define WIN_E3B_TIMER_ID		1

+#define WIN_POLLING_MOUSE_TIMER_ID	2

+

+#define MOUSE_POLLING_INTERVAL		50

+

+#define WIN_E3B_OFF		-1

+#define WIN_FD_INVALID		-1

+

+#define WIN_SERVER_NONE		0x0L	/* 0 */

+#define WIN_SERVER_SHADOW_GDI	0x1L	/* 1 */

+#define WIN_SERVER_SHADOW_DD	0x2L	/* 2 */

+#define WIN_SERVER_SHADOW_DDNL	0x4L	/* 4 */

+#ifdef XWIN_PRIMARYFB

+#define WIN_SERVER_PRIMARY_DD	0x8L	/* 8 */

+#endif

+#ifdef XWIN_NATIVEGDI

+# define WIN_SERVER_NATIVE_GDI	0x10L	/* 16 */

+#endif

+

+#define AltMapIndex		Mod1MapIndex

+#define NumLockMapIndex		Mod2MapIndex

+#define AltLangMapIndex		Mod3MapIndex

+#define KanaMapIndex		Mod4MapIndex

+#define ScrollLockMapIndex	Mod5MapIndex

+

+#define WIN_MOD_LALT		0x00000001

+#define WIN_MOD_RALT		0x00000002

+#define WIN_MOD_LCONTROL	0x00000004

+#define WIN_MOD_RCONTROL	0x00000008

+

+#define WIN_24BPP_MASK_RED	0x00FF0000

+#define WIN_24BPP_MASK_GREEN	0x0000FF00

+#define WIN_24BPP_MASK_BLUE	0x000000FF

+

+#define WIN_MAX_KEYS_PER_KEY	4

+

+#include <sys/types.h>

+#include <sys/stat.h>

+#include <stdio.h>

+

+#include <errno.h>

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

+#define HANDLE void *

+#ifdef _MSC_VER

+typedef int pid_t;

+#endif

+#include <pthread.h>

+#undef HANDLE

+#endif

+

+#ifdef HAS_MMAP

+#include <sys/mman.h>

+#ifndef MAP_FILE

+#define MAP_FILE 0

+#endif /* MAP_FILE */

+#endif /* HAS_MMAP */

+

+#include <X11/X.h>

+#include <X11/Xproto.h>

+#include <X11/Xos.h>

+#include <X11/Xprotostr.h>

+#include "scrnintstr.h"

+#include "pixmapstr.h"

+#include "pixmap.h"

+#include "region.h"

+#include "gcstruct.h"

+#include "colormap.h"

+#include "colormapst.h"

+#include "miscstruct.h"

+#include "servermd.h"

+#include "windowstr.h"

+#include "mi.h"

+#include "micmap.h"

+#include "mifillarc.h"

+#include "mifpoly.h"

+#include "mibstore.h"

+#include "input.h"

+#include "mipointer.h"

+#include "X11/keysym.h"

+#include "mibstore.h"

+#include "micoord.h"

+#include "dix.h"

+#include "miline.h"

+#include "shadow.h"

+#include "fb.h"

+#include "rootless.h"

+

+#include "mipict.h"

+#include "picturestr.h"

+

+#ifdef RANDR

+#include "randrstr.h"

+#endif

+

+/*

+ * Windows headers

+ */

+#include "winms.h"

+#include "winresource.h"

+

+

+/*

+ * Define Windows constants

+ */

+

+#define WM_TRAYICON		(WM_USER + 1000)

+#define WM_INIT_SYS_MENU	(WM_USER + 1001)

+#define WM_GIVEUP		(WM_USER + 1002)

+

+

+/* Local includes */

+#include "winwindow.h"

+#include "winmsg.h"

+

+#define PROFILEPOINT(point,thresh)\

+{\

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

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

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

+}

+

+

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

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

+

+#define DEFINE_ATOM_HELPER(func,atom_name)			\

+static Atom func (void) {					\

+    static int generation;					\

+    static Atom atom;						\

+    if (generation != serverGeneration) {			\

+	generation = serverGeneration;				\

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

+    }								\

+    return atom;						\

+}

+

+/*

+ * Typedefs for engine dependent function pointers

+ */

+

+typedef Bool (*winAllocateFBProcPtr)(ScreenPtr);

+

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

+

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

+

+typedef Bool (*winInitVisualsProcPtr)(ScreenPtr);

+

+typedef Bool (*winAdjustVideoModeProcPtr)(ScreenPtr);

+

+typedef Bool (*winCreateBoundingWindowProcPtr)(ScreenPtr);

+

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

+

+typedef Bool (*winBltExposedRegionsProcPtr)(ScreenPtr);

+

+typedef Bool (*winActivateAppProcPtr)(ScreenPtr);

+

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

+

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

+

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

+

+typedef Bool (*winStoreColorsProcPtr)(ColormapPtr pmap, 

+				      int ndef, xColorItem *pdefs);

+

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

+

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

+

+typedef Bool (*winHotKeyAltTabProcPtr)(ScreenPtr);

+

+typedef Bool (*winCreatePrimarySurfaceProcPtr)(ScreenPtr);

+

+typedef Bool (*winReleasePrimarySurfaceProcPtr)(ScreenPtr);

+

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

+

+typedef Bool (*winCreateScreenResourcesProc)(ScreenPtr);

+

+/* Typedef for DIX wrapper functions */

+typedef int (*winDispatchProcPtr) (ClientPtr);

+

+

+/*

+ * GC (graphics context) privates

+ */

+

+typedef struct

+{

+  HDC			hdc;

+  HDC			hdcMem;

+} winPrivGCRec, *winPrivGCPtr;

+

+

+/*

+ * Pixmap privates

+ */

+

+typedef struct

+{

+  HDC			hdcSelected;

+  HBITMAP		hBitmap;

+  BYTE			*pbBits;

+  DWORD			dwScanlineBytes;

+  BITMAPINFOHEADER	*pbmih;

+} winPrivPixmapRec, *winPrivPixmapPtr;

+

+

+/*

+ * Colormap privates

+ */

+

+typedef struct

+{

+  HPALETTE		hPalette;

+  LPDIRECTDRAWPALETTE	lpDDPalette;

+  RGBQUAD		rgbColors[WIN_NUM_PALETTE_ENTRIES];

+  PALETTEENTRY		peColors[WIN_NUM_PALETTE_ENTRIES];

+} winPrivCmapRec, *winPrivCmapPtr;

+

+/*

+ * Windows Cursor handling.

+ */ 

+  

+typedef struct {

+  /* from GetSystemMetrics */

+  int sm_cx;

+  int sm_cy;

+

+  BOOL visible;

+  HCURSOR handle;

+  QueryBestSizeProcPtr QueryBestSize;

+  miPointerSpriteFuncPtr spriteFuncs;

+} winCursorRec;

+

+/*

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

+ * in the server startup sequence.

+ */

+

+typedef struct

+{

+  ScreenPtr		pScreen;

+  

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

+  Bool			fUserGaveHeightAndWidth;

+

+  DWORD			dwScreen;

+  DWORD			dwUserWidth;

+  DWORD			dwUserHeight;

+  DWORD			dwWidth;

+  DWORD			dwHeight;

+  DWORD			dwWidth_mm;

+  DWORD			dwHeight_mm;

+  DWORD			dwPaddedWidth;

+

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

+  Bool			fUserGavePosition;

+  DWORD                 dwInitialX;

+  DWORD                 dwInitialY;

+

+  /*

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

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

+   * a rounding up of the width.

+   */

+  DWORD			dwStride;

+

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

+  DWORD			dwXOffset;

+  DWORD			dwYOffset;

+

+  DWORD			dwBPP;

+  DWORD			dwDepth;

+  DWORD			dwRefreshRate;

+  char			*pfb;

+  DWORD			dwEngine;

+  DWORD			dwEnginePreferred;

+  DWORD			dwClipUpdatesNBoxes;

+#ifdef XWIN_EMULATEPSEUDO

+  Bool			fEmulatePseudo;

+#endif

+  Bool			fFullScreen;

+  Bool			fDecoration;

+#ifdef XWIN_MULTIWINDOWEXTWM

+  Bool			fMWExtWM;

+  Bool			fInternalWM;

+  Bool			fAnotherWMRunning;

+#endif

+  Bool			fRootless;

+#ifdef XWIN_MULTIWINDOW

+  Bool			fMultiWindow;

+#endif

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

+  Bool			fMultiMonitorOverride;

+#endif

+  Bool                  fMultipleMonitors;

+  Bool			fLessPointer;

+  Bool			fScrollbars;

+  Bool			fNoTrayIcon;

+  int			iE3BTimeout;

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

+  Bool                  fUseWinKillKey;

+  Bool                  fUseUnixKillKey;

+  Bool			fIgnoreInput;

+

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

+  Bool			fExplicitScreen;

+} winScreenInfo, *winScreenInfoPtr;

+

+

+/*

+ * Screen privates

+ */

+

+typedef struct _winPrivScreenRec

+{

+  winScreenInfoPtr	pScreenInfo;

+

+  Bool			fEnabled;

+  Bool			fClosed;

+  Bool			fActive;

+  Bool			fBadDepth;

+

+  int			iDeltaZ;

+

+  int			iConnectedClients;

+

+  CloseScreenProcPtr	CloseScreen;

+

+  DWORD			dwRedMask;

+  DWORD			dwGreenMask;

+  DWORD			dwBlueMask;

+  DWORD			dwBitsPerRGB;

+

+  DWORD			dwModeKeyStates;

+

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

+  HICON			hiconNotifyIcon;

+

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

+  DWORD			dwLastWindowsWidth;

+  DWORD			dwLastWindowsHeight;

+  DWORD			dwLastWindowsBitsPixel;

+

+  /* Palette management */

+  ColormapPtr		pcmapInstalled;

+

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

+  VisualPtr		pRootVisual;

+

+  /* 3 button emulation variables */

+  int			iE3BCachedPress;

+  Bool			fE3BFakeButton2Sent;

+

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

+  HBITMAP		hbmpShadow;

+  HDC			hdcScreen;

+  HDC			hdcShadow;

+  HWND			hwndScreen;

+  

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

+  LPDIRECTDRAW		pdd;

+  LPDIRECTDRAWSURFACE	pddsPrimary;

+  LPDIRECTDRAW2		pdd2;

+

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

+  LPDIRECTDRAWSURFACE	pddsShadow;

+  LPDDSURFACEDESC	pddsdShadow;

+

+#ifdef XWIN_PRIMARYFB

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

+  LPDIRECTDRAWSURFACE	pddsOffscreen;

+  LPDDSURFACEDESC	pddsdOffscreen;

+  LPDDSURFACEDESC	pddsdPrimary;

+#endif

+

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

+  LPDIRECTDRAW4		pdd4;

+  LPDIRECTDRAWSURFACE4	pddsShadow4;

+  LPDIRECTDRAWSURFACE4	pddsPrimary4;

+  BOOL			fRetryCreateSurface;

+

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

+  LPDIRECTDRAWCLIPPER	pddcPrimary;

+

+#ifdef XWIN_MULTIWINDOWEXTWM

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

+  RootlessFrameID	widTop;

+  Bool			fRestacking;

+#endif

+

+#ifdef XWIN_MULTIWINDOW

+  /* Privates used by multi-window */

+  pthread_t		ptWMProc;

+  pthread_t		ptXMsgProc;

+  void			*pWMInfo;

+#endif

+

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

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

+  Bool			fRootWindowShown;

+#endif

+

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

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

+  pthread_mutex_t	pmServerStarted;

+  Bool			fServerStarted;

+#endif

+  

+  /* Engine specific functions */

+  winAllocateFBProcPtr			pwinAllocateFB;

+  winShadowUpdateProcPtr		pwinShadowUpdate;

+  winCloseScreenProcPtr			pwinCloseScreen;

+  winInitVisualsProcPtr			pwinInitVisuals;

+  winAdjustVideoModeProcPtr		pwinAdjustVideoMode;

+  winCreateBoundingWindowProcPtr	pwinCreateBoundingWindow;

+  winFinishScreenInitProcPtr		pwinFinishScreenInit;

+  winBltExposedRegionsProcPtr		pwinBltExposedRegions;

+  winActivateAppProcPtr			pwinActivateApp;

+  winRedrawScreenProcPtr		pwinRedrawScreen;

+  winRealizeInstalledPaletteProcPtr	pwinRealizeInstalledPalette;

+  winInstallColormapProcPtr		pwinInstallColormap;

+  winStoreColorsProcPtr			pwinStoreColors;

+  winCreateColormapProcPtr		pwinCreateColormap;

+  winDestroyColormapProcPtr		pwinDestroyColormap;

+  winHotKeyAltTabProcPtr		pwinHotKeyAltTab;

+  winCreatePrimarySurfaceProcPtr	pwinCreatePrimarySurface;

+  winReleasePrimarySurfaceProcPtr	pwinReleasePrimarySurface;

+

+  winCreateScreenResourcesProc       pwinCreateScreenResources;

+

+#ifdef XWIN_MULTIWINDOW

+  /* Window Procedures for MultiWindow mode */

+  winFinishCreateWindowsWindowProcPtr	pwinFinishCreateWindowsWindow;

+#endif

+

+  /* Window Procedures for Rootless mode */

+  CreateWindowProcPtr			CreateWindow;

+  DestroyWindowProcPtr			DestroyWindow;

+  PositionWindowProcPtr			PositionWindow;

+  ChangeWindowAttributesProcPtr		ChangeWindowAttributes;

+  RealizeWindowProcPtr			RealizeWindow;

+  UnrealizeWindowProcPtr		UnrealizeWindow;

+  ValidateTreeProcPtr			ValidateTree;

+  PostValidateTreeProcPtr		PostValidateTree;

+  WindowExposuresProcPtr		WindowExposures;

+  CopyWindowProcPtr			CopyWindow;

+  ClearToBackgroundProcPtr		ClearToBackground;

+  ClipNotifyProcPtr			ClipNotify;

+  RestackWindowProcPtr			RestackWindow;

+  ReparentWindowProcPtr			ReparentWindow;

+  ResizeWindowProcPtr			ResizeWindow;

+  MoveWindowProcPtr			MoveWindow;

+  SetShapeProcPtr			SetShape;

+

+#ifdef XWIN_NATIVEGDI

+  RealizeFontProcPtr                    RealizeFont;

+  UnrealizeFontProcPtr                  UnrealizeFont;

+#endif

+

+  winCursorRec                          cursor;

+} winPrivScreenRec;

+

+

+#ifdef XWIN_MULTIWINDOWEXTWM

+typedef struct {

+  RootlessWindowPtr	pFrame;

+  HWND			hWnd;

+  int			dwWidthBytes;

+  BITMAPINFOHEADER	*pbmihShadow;

+  HBITMAP		hbmpShadow;

+  HDC			hdcShadow;

+  HDC			hdcScreen;

+  BOOL			fResized;

+  BOOL			fRestackingNow;

+  BOOL			fClose;

+  BOOL			fMovingOrSizing;

+  BOOL			fDestroyed;//for debug

+  char			*pfb;

+} win32RootlessWindowRec, *win32RootlessWindowPtr;

+#endif

+

+

+typedef struct {

+  pointer		value;

+  XID			id;

+} WindowIDPairRec, *WindowIDPairPtr;

+

+

+/*

+ * Extern declares for general global variables

+ */

+

+extern winScreenInfo *		g_ScreenInfo;

+extern miPointerScreenFuncRec	g_winPointerCursorFuncs;

+extern DWORD			g_dwEvents;

+#ifdef HAS_DEVWINDOWS

+extern int			g_fdMessageQueue;

+#endif

+extern DevPrivateKey		g_iScreenPrivateKey;

+extern DevPrivateKey		g_iCmapPrivateKey;

+extern DevPrivateKey		g_iGCPrivateKey;

+extern DevPrivateKey		g_iPixmapPrivateKey;

+extern DevPrivateKey		g_iWindowPrivateKey;

+extern unsigned long		g_ulServerGeneration;

+extern DWORD			g_dwEnginesSupported;

+extern HINSTANCE		g_hInstance;

+extern int                      g_copyROP[];

+extern int                      g_patternROP[];

+extern const char *		g_pszQueryHost;

+extern DeviceIntPtr             g_pwinPointer;

+extern DeviceIntPtr             g_pwinKeyboard;

+

+

+/*

+ * Extern declares for dynamically loaded libraries and function pointers

+ */

+

+extern HMODULE			g_hmodDirectDraw;

+extern FARPROC			g_fpDirectDrawCreate;

+extern FARPROC			g_fpDirectDrawCreateClipper;

+

+extern HMODULE			g_hmodCommonControls;

+extern FARPROC			g_fpTrackMouseEvent;

+

+

+/*

+ * Screen privates macros

+ */

+

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

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

+

+#define winSetScreenPriv(pScreen,v) \

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

+

+#define winScreenPriv(pScreen) \

+	winPrivScreenPtr pScreenPriv = winGetScreenPriv(pScreen)

+

+

+/*

+ * Colormap privates macros

+ */

+

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

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

+

+#define winSetCmapPriv(pCmap,v) \

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

+

+#define winCmapPriv(pCmap) \

+	winPrivCmapPtr pCmapPriv = winGetCmapPriv(pCmap)

+

+

+/*

+ * GC privates macros

+ */

+

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

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

+

+#define winSetGCPriv(pGC,v) \

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

+

+#define winGCPriv(pGC) \

+	winPrivGCPtr pGCPriv = winGetGCPriv(pGC)

+

+

+/*

+ * Pixmap privates macros

+ */

+

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

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

+

+#define winSetPixmapPriv(pPixmap,v) \

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

+

+#define winPixmapPriv(pPixmap) \

+	winPrivPixmapPtr pPixmapPriv = winGetPixmapPriv(pPixmap)

+

+

+/*

+ * Window privates macros

+ */

+

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

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

+

+#define winSetWindowPriv(pWin,v) \

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

+

+#define winWindowPriv(pWin) \

+	winPrivWinPtr pWinPriv = winGetWindowPriv(pWin)

+

+/*

+ * wrapper macros 

+ */

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

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

+    real->mem = func; \

+}

+

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

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

+}

+

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

+

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

+

+/*

+ * BEGIN DDX and DIX Function Prototypes

+ */

+

+

+/*

+ * winallpriv.c

+ */

+

+Bool

+winAllocatePrivates (ScreenPtr pScreen);

+

+Bool

+winInitCmapPrivates (ColormapPtr pCmap, int index);

+

+Bool

+winAllocateCmapPrivates (ColormapPtr pCmap);

+

+

+/*

+ * winauth.c

+ */

+

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

+Bool

+winGenerateAuthorization (void);

+void winSetAuthorization(void);

+#endif

+

+

+/*

+ * winblock.c

+ */

+

+void

+winBlockHandler (int nScreen,

+		 pointer pBlockData,

+		 pointer pTimeout,

+		 pointer pReadMask);

+

+

+#ifdef XWIN_NATIVEGDI

+/*

+ * winclip.c

+ */

+

+RegionPtr

+winPixmapToRegionNativeGDI (PixmapPtr pPix);

+#endif

+

+

+#ifdef XWIN_CLIPBOARD

+/*

+ * winclipboardinit.c

+ */

+

+Bool

+winInitClipboard (void);

+

+void

+winFixClipboardChain (void);

+#endif

+

+

+/*

+ * wincmap.c

+ */

+

+void

+winSetColormapFunctions (ScreenPtr pScreen);

+

+Bool

+winCreateDefColormap (ScreenPtr pScreen);

+

+

+/*

+ * wincreatewnd.c

+ */

+

+Bool

+winCreateBoundingWindowFullScreen (ScreenPtr pScreen);

+

+Bool

+winCreateBoundingWindowWindowed (ScreenPtr pScreen);

+

+

+/*

+ * windialogs.c

+ */

+

+int

+GetLiveClients (winPrivScreenPtr pScreenPriv);

+

+void

+winDisplayExitDialog (winPrivScreenPtr pScreenPriv);

+

+void

+winDisplayDepthChangeDialog (winPrivScreenPtr pScreenPriv);

+

+void

+winDisplayAboutDialog (winPrivScreenPtr pScreenPriv);

+

+

+/*

+ * winengine.c

+ */

+

+void

+winDetectSupportedEngines (void);

+

+Bool

+winSetEngine (ScreenPtr pScreen);

+

+Bool

+winGetDDProcAddresses (void);

+

+

+/*

+ * winerror.c

+ */

+

+#ifdef DDXOSVERRORF

+void

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

+#endif

+

+void

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

+

+

+#ifdef XWIN_NATIVEGDI

+/*

+ * winfillsp.c

+ */

+

+void

+winFillSpansNativeGDI (DrawablePtr	pDrawable,

+		       GCPtr		pGC,

+		       int		nSpans,

+		       DDXPointPtr	pPoints,

+		       int		*pWidths,

+		       int		fSorted);

+#endif

+

+

+#ifdef XWIN_NATIVEGDI

+/*

+ * winfont.c

+ */

+

+Bool

+winRealizeFontNativeGDI (ScreenPtr pScreen, FontPtr pFont);

+

+Bool

+winUnrealizeFontNativeGDI (ScreenPtr pScreen, FontPtr pFont);

+#endif

+

+

+#ifdef XWIN_NATIVEGDI

+/*

+ * wingc.c

+ */

+

+Bool

+winCreateGCNativeGDI (GCPtr pGC);

+#endif

+

+

+#ifdef XWIN_NATIVEGDI

+/*

+ * wingetsp.c

+ */

+

+void

+winGetSpansNativeGDI (DrawablePtr	pDrawable, 

+		      int		wMax, 

+		      DDXPointPtr	pPoints, 

+		      int		*pWidths, 

+		      int		nSpans, 

+		      char		*pDst);

+#endif

+

+

+/*

+ * winglobals.c

+ */

+

+void

+winInitializeGlobals (void);

+

+

+/*

+ * winkeybd.c

+ */

+

+void

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

+

+int

+winKeybdProc (DeviceIntPtr pDeviceInt, int iState);

+

+void

+winInitializeModeKeyStates (void);

+

+void

+winRestoreModeKeyStates (void);

+

+Bool

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

+

+void

+winKeybdReleaseKeys (void);

+

+void

+winSendKeyEvent (DWORD dwKey, Bool fDown);

+

+BOOL

+winCheckKeyPressed(WPARAM wParam, LPARAM lParam);

+

+void

+winFixShiftKeys (int iScanCode);

+

+/*

+ * winkeyhook.c

+ */

+

+Bool

+winInstallKeyboardHookLL (void);

+

+void

+winRemoveKeyboardHookLL (void);

+

+

+/*

+ * winmisc.c

+ */

+

+#ifdef XWIN_NATIVEGDI

+void

+winQueryBestSizeNativeGDI (int class, unsigned short *pWidth,

+			   unsigned short *pHeight, ScreenPtr pScreen);

+#endif

+

+CARD8

+winCountBits (DWORD dw);

+

+Bool

+winUpdateFBPointer (ScreenPtr pScreen, void *pbits);

+

+#ifdef XWIN_NATIVEGDI

+BOOL

+winPaintBackground (HWND hwnd, COLORREF colorref);

+#endif

+

+

+/*

+ * winmouse.c

+ */

+

+int

+winMouseProc (DeviceIntPtr pDeviceInt, int iState);

+

+int

+winMouseWheel (ScreenPtr pScreen, int iDeltaZ);

+

+void

+winMouseButtonsSendEvent (int iEventType, int iButton);

+

+int

+winMouseButtonsHandle (ScreenPtr pScreen,

+		       int iEventType, int iButton,

+		       WPARAM wParam);

+

+void

+winEnqueueMotion(int x, int y);

+

+#ifdef XWIN_NATIVEGDI

+/*

+ * winnativegdi.c

+ */

+

+HBITMAP

+winCreateDIBNativeGDI (int iWidth, int iHeight, int iDepth,

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

+

+Bool

+winSetEngineFunctionsNativeGDI (ScreenPtr pScreen);

+#endif

+

+

+#ifdef XWIN_PRIMARYFB

+/*

+ * winpfbddd.c

+ */

+

+Bool

+winSetEngineFunctionsPrimaryDD (ScreenPtr pScreen);

+#endif

+

+

+#ifdef XWIN_NATIVEGDI

+/*

+ * winpixmap.c

+ */

+

+PixmapPtr

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

+			  unsigned usage_hint);

+

+Bool

+winDestroyPixmapNativeGDI (PixmapPtr pPixmap);

+

+Bool

+winModifyPixmapHeaderNativeGDI (PixmapPtr pPixmap,

+				int iWidth, int iHeight,

+				int iDepth,

+				int iBitsPerPixel,

+				int devKind,

+				pointer pPixData);

+#endif

+

+#ifdef XWIN_NATIVEGDI

+/*

+ * winpolyline.c

+ */

+

+void

+winPolyLineNativeGDI (DrawablePtr	pDrawable,

+		      GCPtr		pGC,

+		      int		mode,

+		      int		npt,

+		      DDXPointPtr	ppt);

+#endif

+

+

+#ifdef XWIN_NATIVEGDI

+/*

+ * winpushpxl.c

+ */

+

+void

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

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

+#endif

+

+

+/*

+ * winscrinit.c

+ */

+

+Bool

+winScreenInit (int index,

+	       ScreenPtr pScreen,

+	       int argc, char **argv);

+

+Bool

+winFinishScreenInitFB (int index,

+		       ScreenPtr pScreen,

+		       int argc, char **argv);

+

+#if defined(XWIN_NATIVEGDI)

+Bool

+winFinishScreenInitNativeGDI (int index,

+			      ScreenPtr pScreen,

+			      int argc, char **argv);

+#endif

+

+

+#ifdef XWIN_NATIVEGDI

+/*

+ * winsetsp.c

+ */

+

+void

+winSetSpansNativeGDI (DrawablePtr	pDrawable,

+		      GCPtr		pGC,

+		      char		*pSrc,

+		      DDXPointPtr	pPoints,

+		      int		*pWidth,

+		      int		nSpans,

+		      int		fSorted);

+#endif

+

+

+/*

+ * winshaddd.c

+ */

+

+Bool

+winSetEngineFunctionsShadowDD (ScreenPtr pScreen);

+

+

+/*

+ * winshadddnl.c

+ */

+

+Bool

+winSetEngineFunctionsShadowDDNL (ScreenPtr pScreen);

+

+

+/*

+ * winshadgdi.c

+ */

+

+Bool

+winSetEngineFunctionsShadowGDI (ScreenPtr pScreen);

+

+

+/*

+ * winwakeup.c

+ */

+

+void

+winWakeupHandler (int nScreen,

+		  pointer pWakeupData,

+		  unsigned long ulResult,

+		  pointer pReadmask);

+

+

+/*

+ * winwindow.c

+ */

+

+#ifdef XWIN_NATIVEGDI

+Bool

+winCreateWindowNativeGDI (WindowPtr pWin);

+

+Bool

+winDestroyWindowNativeGDI (WindowPtr pWin);

+

+Bool

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

+

+void 

+winCopyWindowNativeGDI (WindowPtr pWin,

+			DDXPointRec ptOldOrg,

+			RegionPtr prgnSrc);

+

+Bool

+winChangeWindowAttributesNativeGDI (WindowPtr pWin, unsigned long mask);

+

+Bool

+winUnmapWindowNativeGDI (WindowPtr pWindow);

+

+Bool

+winMapWindowNativeGDI (WindowPtr pWindow);

+#endif

+

+Bool

+winCreateWindowRootless (WindowPtr pWindow);

+

+Bool

+winDestroyWindowRootless (WindowPtr pWindow);

+

+Bool

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

+

+Bool

+winChangeWindowAttributesRootless (WindowPtr pWindow, unsigned long mask);

+

+Bool

+winUnmapWindowRootless (WindowPtr pWindow);

+

+Bool

+winMapWindowRootless (WindowPtr pWindow);

+

+void

+winSetShapeRootless (WindowPtr pWindow);

+

+

+/*

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

+ */

+

+HICON

+winXIconToHICON (WindowPtr pWin, int iconSize);

+

+void

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

+

+#ifdef XWIN_MULTIWINDOW

+/*

+ * winmultiwindowshape.c

+ */

+

+void

+winReshapeMultiWindow (WindowPtr pWin);

+

+void

+winSetShapeMultiWindow (WindowPtr pWindow);

+

+void

+winUpdateRgnMultiWindow (WindowPtr pWindow);

+#endif

+

+

+#ifdef XWIN_MULTIWINDOW

+/*

+ * winmultiwindowwindow.c

+ */

+

+Bool

+winCreateWindowMultiWindow (WindowPtr pWindow);

+

+Bool

+winDestroyWindowMultiWindow (WindowPtr pWindow);

+

+Bool

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

+

+Bool

+winChangeWindowAttributesMultiWindow (WindowPtr pWindow, unsigned long mask);

+

+Bool

+winUnmapWindowMultiWindow (WindowPtr pWindow);

+

+Bool

+winMapWindowMultiWindow (WindowPtr pWindow);

+

+void

+winReparentWindowMultiWindow (WindowPtr pWin, WindowPtr pPriorParent);

+

+void

+winRestackWindowMultiWindow (WindowPtr pWin, WindowPtr pOldNextSib);

+

+void

+winReorderWindowsMultiWindow (void);

+

+void

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

+			    unsigned int h, WindowPtr pSib);

+void

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

+			  WindowPtr pSib, VTKind kind);

+

+void

+winCopyWindowMultiWindow (WindowPtr pWin, DDXPointRec oldpt,

+			  RegionPtr oldRegion);

+

+XID

+winGetWindowID (WindowPtr pWin);

+

+int

+winAdjustXWindow (WindowPtr pWin, HWND hwnd);

+#endif

+

+

+#ifdef XWIN_MULTIWINDOW

+/*

+ * winmultiwindowwndproc.c

+ */

+

+LRESULT CALLBACK

+winTopLevelWindowProc (HWND hwnd, UINT message, 

+		       WPARAM wParam, LPARAM lParam);

+#endif

+

+

+/*

+ * wintrayicon.c

+ */

+

+void

+winInitNotifyIcon (winPrivScreenPtr pScreenPriv, Bool Modify);

+

+void

+winDeleteNotifyIcon (winPrivScreenPtr pScreenPriv);

+

+LRESULT

+winHandleIconMessage (HWND hwnd, UINT message,

+		      WPARAM wParam, LPARAM lParam,

+		      winPrivScreenPtr pScreenPriv);

+

+

+/*

+ * winwndproc.c

+ */

+

+LRESULT CALLBACK

+winWindowProc (HWND hWnd, UINT message, 

+	       WPARAM wParam, LPARAM lParam);

+

+

+#ifdef XWIN_MULTIWINDOWEXTWM

+/*

+ * winwin32rootless.c

+ */

+

+Bool

+winMWExtWMCreateFrame (RootlessWindowPtr pFrame, ScreenPtr pScreen,

+			     int newX, int newY, RegionPtr pShape);

+

+void

+winMWExtWMDestroyFrame (RootlessFrameID wid);

+

+void

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

+

+void

+winMWExtWMResizeFrame (RootlessFrameID wid, ScreenPtr pScreen,

+			     int newX, int newY, unsigned int newW, unsigned int newH,

+			     unsigned int gravity);

+

+void

+winMWExtWMRestackFrame (RootlessFrameID wid, RootlessFrameID nextWid);

+

+void

+winMWExtWMReshapeFrame (RootlessFrameID wid, RegionPtr pShape);

+

+void

+winMWExtWMUnmapFrame (RootlessFrameID wid);

+

+void

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

+

+void

+winMWExtWMStopDrawing (RootlessFrameID wid, Bool flush);

+

+void

+winMWExtWMUpdateRegion (RootlessFrameID wid, RegionPtr pDamage);

+

+void

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

+			     int shift_x, int shift_y);

+

+void

+winMWExtWMRootlessSwitchWindow (RootlessWindowPtr pFrame, WindowPtr oldWin);

+

+void

+winMWExtWMCopyBytes (unsigned int width, unsigned int height,

+			   const void *src, unsigned int srcRowBytes,

+			   void *dst, unsigned int dstRowBytes);

+

+void

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

+			   void *dst, unsigned int dstRowBytes);

+

+int

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

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

+				 void *mask, unsigned int maskRowBytes,

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

+

+void

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

+			    int dx, int dy);

+#endif

+

+

+#ifdef XWIN_MULTIWINDOWEXTWM

+/*

+ * winwin32rootlesswindow.c

+ */

+

+void

+winMWExtWMReorderWindows (ScreenPtr pScreen);

+

+void

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

+

+void

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

+

+void

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

+

+void

+winMWExtWMUpdateIcon (Window id);

+

+void

+winMWExtWMUpdateWindowDecoration (win32RootlessWindowPtr pRLWinPriv,

+				  winScreenInfoPtr pScreenInfo);

+

+wBOOL CALLBACK

+winMWExtWMDecorateWindow (HWND hwnd, LPARAM lParam);

+

+Bool

+winIsInternalWMRunning (winScreenInfoPtr pScreenInfo);

+

+void

+winMWExtWMRestackWindows (ScreenPtr pScreen);

+#endif

+

+

+#ifdef XWIN_MULTIWINDOWEXTWM

+/*

+ * winwin32rootlesswndproc.c

+ */

+

+LRESULT CALLBACK

+winMWExtWMWindowProc (HWND hwnd, UINT message, 

+			    WPARAM wParam, LPARAM lParam);

+#endif

+

+

+/*

+ * winwindowswm.c

+ */

+

+void

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

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

+

+void

+winWindowsWMExtensionInit (void);

+

+/*

+ * wincursor.c

+ */

+

+Bool

+winInitCursor (ScreenPtr pScreen);

+

+/*

+ * winprocarg.c

+ */

+void

+winInitializeScreens(int maxscreens);

+

+/*

+ * windisplay.c

+ */

+

+void

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

+

+/*

+ * END DDX and DIX Function Prototypes

+ */

+

+#endif /* _WIN_H_ */

+

diff --git a/xorg-server/hw/xwin/winauth.c b/xorg-server/hw/xwin/winauth.c
index 581098694..10bce693b 100644
--- a/xorg-server/hw/xwin/winauth.c
+++ b/xorg-server/hw/xwin/winauth.c
@@ -163,7 +163,7 @@ winGenerateAuthorization (void)
 #ifdef XCSECURITY

   /* Allocate structure for additional auth information */

   pAuth = (SecurityAuthorizationPtr) 

-    xalloc (sizeof (SecurityAuthorizationRec));

+    malloc(sizeof (SecurityAuthorizationRec));

   if (!(pAuth))

     {

       ErrorF ("winGenerateAuthorization - Failed allocating "

@@ -199,7 +199,7 @@ winGenerateAuthorization (void)
 

  auth_bailout:

   if (fFreeAuth)

-    xfree (pAuth);

+    free(pAuth);

   

   return FALSE;

 }

diff --git a/xorg-server/hw/xwin/winconfig.c b/xorg-server/hw/xwin/winconfig.c
index c3b9dcc35..afdf6926e 100644
--- a/xorg-server/hw/xwin/winconfig.c
+++ b/xorg-server/hw/xwin/winconfig.c
@@ -390,10 +390,10 @@ winConfigKeyboard (DeviceIntPtr pDevice)
                   (1000 / g_winInfo.keyboard.rate) < 1) 

             {

               ErrorF ("\"%s\" is not a valid AutoRepeat value", s);

-              xfree(s);

+              free(s);

               return FALSE;

             }

-          xfree(s);

+          free(s);

           winDebug ("AutoRepeat: %ld %ld\n", 

                   g_winInfo.keyboard.delay, g_winInfo.keyboard.rate);

         }

diff --git a/xorg-server/hw/xwin/windialogs.c b/xorg-server/hw/xwin/windialogs.c
index adbec19cb..17d4d3226 100644
--- a/xorg-server/hw/xwin/windialogs.c
+++ b/xorg-server/hw/xwin/windialogs.c
@@ -373,7 +373,7 @@ winExitDlgProc (HWND hDialog, UINT message,
 	/* Set the number of connected clients */

 	SetWindowText (GetDlgItem (hDialog, IDC_CLIENTS_CONNECTED),

 		       pszConnectedClients);

-	xfree (pszConnectedClients);

+	free(pszConnectedClients);

       }

       return TRUE;

 

diff --git a/xorg-server/hw/xwin/winerror.c b/xorg-server/hw/xwin/winerror.c
index 7cbfd65e2..2e706009c 100644
--- a/xorg-server/hw/xwin/winerror.c
+++ b/xorg-server/hw/xwin/winerror.c
@@ -1,170 +1,170 @@
-/*
- *Copyright (C) 2001-2004 Harold L Hunt II All Rights Reserved.
- *
- *Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- *"Software"), to deal in the Software without restriction, including
- *without limitation the rights to use, copy, modify, merge, publish,
- *distribute, sublicense, and/or sell copies of the Software, and to
- *permit persons to whom the Software is furnished to do so, subject to
- *the following conditions:
- *
- *The above copyright notice and this permission notice shall be
- *included in all copies or substantial portions of the Software.
- *
- *THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *NONINFRINGEMENT. IN NO EVENT SHALL HAROLD L HUNT II BE LIABLE FOR
- *ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- *CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- *WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- *Except as contained in this notice, the name of Harold L Hunt II
- *shall not be used in advertising or otherwise to promote the sale, use
- *or other dealings in this Software without prior written authorization
- *from Harold L Hunt II.
- *
- * Authors:	Harold L Hunt II
- */
-
-#ifdef HAVE_XWIN_CONFIG_H
-#include <xwin-config.h>
-#endif
-#ifdef XVENDORNAME
-#define VENDOR_STRING XVENDORNAME
-#define VENDOR_CONTACT BUILDERADDR
-#endif
-
-#include <../xfree86/common/xorgVersion.h>
-#include "win.h"
-
-/* References to external symbols */
-extern char *		g_pszCommandLine;
-extern const char *	g_pszLogFile;
-extern Bool		g_fSilentFatalError;
-extern Bool		g_fSilentDupError;
-extern Bool		g_fLogInited;
-
-#ifdef DDXOSVERRORF
-/* Prototype */
-void
-OsVendorVErrorF (const char *pszFormat, va_list va_args);
-
-void
-OsVendorVErrorF (const char *pszFormat, va_list va_args)
-{
-#if defined(XWIN_CLIPBOARD) || defined (XWIN_MULTIWINDOW)
-  /* make sure the clipboard and multiwindow threads do not interfere the
-   * main thread */
-  static pthread_mutex_t	s_pmPrinting = PTHREAD_MUTEX_INITIALIZER;
-
-  /* Lock the printing mutex */
-  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);
-
-#if defined(XWIN_CLIPBOARD) || defined (XWIN_MULTIWINDOW)
-  /* Unlock the printing mutex */
-  pthread_mutex_unlock (&s_pmPrinting);
-#endif
-}
-#endif
-
-
-/*
- * os/util.c/FatalError () calls our vendor ErrorF, so the message
- * from a FatalError will be logged.  Thus, the message for the
- * fatal error is not passed to this function.
- *
- * Attempt to do last-ditch, safe, important cleanup here.
- */
-void
-OsVendorFatalError (void)
-{
-  /* Don't give duplicate warning if UseMsg was called */
-  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",
-		  MB_ICONERROR, (g_pszLogFile?g_pszLogFile:"the logfile"));
-}
-
-
-/*
- * winMessageBoxF - Print a formatted error message in a useful
- * message box.
- */
-
-void
-winMessageBoxF (const char *pszError, UINT uType, ...)
-{
-  char *	pszErrorF = NULL;
-  char *	pszMsgBox = NULL;
-  va_list	args;
-
-  va_start(args, uType);
-  pszErrorF = Xvprintf(pszError, args);
-  va_end(args);
-  if (!pszErrorF)
-    goto winMessageBoxF_Cleanup;
-
-#define MESSAGEBOXF \
-	"%s\n" \
-	"Vendor: %s\n" \
-	"Release: %d.%d.%d.%d (%d)\n" \
-	"Contact: %s\n" \
-	"%s\n\n" \
-	"XWin was started with the following command-line:\n\n" \
-	"%s\n"
-
-  pszMsgBox = Xprintf (MESSAGEBOXF,
-	   pszErrorF, VENDOR_STRING,
-		       XORG_VERSION_MAJOR, XORG_VERSION_MINOR, XORG_VERSION_PATCH, XORG_VERSION_SNAP, XORG_VERSION_CURRENT,
-		       VENDOR_CONTACT,
-		       BUILDERSTRING,
-	   g_pszCommandLine);
-  if (!pszMsgBox)
-    goto winMessageBoxF_Cleanup;
-
-  /* Display the message box string */
-  MessageBox (NULL,
-	      pszMsgBox,
-	      PROJECT_NAME,
-	      MB_OK | uType);
-
- winMessageBoxF_Cleanup:
-  if (pszErrorF)
-    xfree (pszErrorF);
-  if (pszMsgBox)
-    xfree (pszMsgBox);
-#undef MESSAGEBOXF
-}
+/*

+ *Copyright (C) 2001-2004 Harold L Hunt II All Rights Reserved.

+ *

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

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

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

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

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

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

+ *the following conditions:

+ *

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

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

+ *

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

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

+ *MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

+ *NONINFRINGEMENT. IN NO EVENT SHALL HAROLD L HUNT II BE LIABLE FOR

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

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

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

+ *

+ *Except as contained in this notice, the name of Harold L Hunt II

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

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

+ *from Harold L Hunt II.

+ *

+ * Authors:	Harold L Hunt II

+ */

+

+#ifdef HAVE_XWIN_CONFIG_H

+#include <xwin-config.h>

+#endif

+#ifdef XVENDORNAME

+#define VENDOR_STRING XVENDORNAME

+#define VENDOR_CONTACT BUILDERADDR

+#endif

+

+#include <../xfree86/common/xorgVersion.h>

+#include "win.h"

+

+/* References to external symbols */

+extern char *		g_pszCommandLine;

+extern const char *	g_pszLogFile;

+extern Bool		g_fSilentFatalError;

+extern Bool		g_fSilentDupError;

+extern Bool		g_fLogInited;

+

+#ifdef DDXOSVERRORF

+/* Prototype */

+void

+OsVendorVErrorF (const char *pszFormat, va_list va_args);

+

+void

+OsVendorVErrorF (const char *pszFormat, va_list va_args)

+{

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

+  /* make sure the clipboard and multiwindow threads do not interfere the

+   * main thread */

+  static pthread_mutex_t	s_pmPrinting = PTHREAD_MUTEX_INITIALIZER;

+

+  /* Lock the printing mutex */

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

+

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

+  /* Unlock the printing mutex */

+  pthread_mutex_unlock (&s_pmPrinting);

+#endif

+}

+#endif

+

+

+/*

+ * os/util.c/FatalError () calls our vendor ErrorF, so the message

+ * from a FatalError will be logged.  Thus, the message for the

+ * fatal error is not passed to this function.

+ *

+ * Attempt to do last-ditch, safe, important cleanup here.

+ */

+void

+OsVendorFatalError (void)

+{

+  /* Don't give duplicate warning if UseMsg was called */

+  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",

+		  MB_ICONERROR, (g_pszLogFile?g_pszLogFile:"the logfile"));

+}

+

+

+/*

+ * winMessageBoxF - Print a formatted error message in a useful

+ * message box.

+ */

+

+void

+winMessageBoxF (const char *pszError, UINT uType, ...)

+{

+  char *	pszErrorF = NULL;

+  char *	pszMsgBox = NULL;

+  va_list	args;

+

+  va_start(args, uType);

+  pszErrorF = Xvprintf(pszError, args);

+  va_end(args);

+  if (!pszErrorF)

+    goto winMessageBoxF_Cleanup;

+

+#define MESSAGEBOXF \

+	"%s\n" \

+	"Vendor: %s\n" \

+	"Release: %d.%d.%d.%d (%d)\n" \

+	"Contact: %s\n" \

+	"%s\n\n" \

+	"XWin was started with the following command-line:\n\n" \

+	"%s\n"

+

+  pszMsgBox = Xprintf (MESSAGEBOXF,

+	   pszErrorF, VENDOR_STRING,

+		       XORG_VERSION_MAJOR, XORG_VERSION_MINOR, XORG_VERSION_PATCH, XORG_VERSION_SNAP, XORG_VERSION_CURRENT,

+		       VENDOR_CONTACT,

+		       BUILDERSTRING,

+	   g_pszCommandLine);

+  if (!pszMsgBox)

+    goto winMessageBoxF_Cleanup;

+

+  /* Display the message box string */

+  MessageBox (NULL,

+	      pszMsgBox,

+	      PROJECT_NAME,

+	      MB_OK | uType);

+

+ winMessageBoxF_Cleanup:

+  if (pszErrorF)

+    free(pszErrorF);

+  if (pszMsgBox)

+    free(pszMsgBox);

+#undef MESSAGEBOXF

+}

diff --git a/xorg-server/hw/xwin/winvideo.c b/xorg-server/hw/xwin/winvideo.c
index 529ca76d3..42f46f405 100644
--- a/xorg-server/hw/xwin/winvideo.c
+++ b/xorg-server/hw/xwin/winvideo.c
@@ -1,210 +1,210 @@
-/*
- *Copyright (C) 2003-2004 Harold L Hunt II All Rights Reserved.
- *
- *Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- *"Software"), to deal in the Software without restriction, including
- *without limitation the rights to use, copy, modify, merge, publish,
- *distribute, sublicense, and/or sell copies of the Software, and to
- *permit persons to whom the Software is furnished to do so, subject to
- *the following conditions:
- *
- *The above copyright notice and this permission notice shall be
- *included in all copies or substantial portions of the Software.
- *
- *THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *NONINFRINGEMENT. IN NO EVENT SHALL HAROLD L HUNT II BE LIABLE FOR
- *ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- *CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- *WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- *Except as contained in this notice, the name of Harold L Hunt II
- *shall not be used in advertising or otherwise to promote the sale, use
- *or other dealings in this Software without prior written authorization
- *from Harold L Hunt II.
- *
- * Authors:	Harold L Hunt II
- */
-
-#ifdef HAVE_XWIN_CONFIG_H
-#include <xwin-config.h>
-#endif
-#include "win.h"
-#include <X11/extensions/Xv.h>
-#include <X11/extensions/Xvproto.h>
-
-void
-winInitVideo (ScreenPtr pScreen);
-
-/*
- * winInitVideo - Initialize support for the X Video (Xv) Extension.
- */
-
-void
-winInitVideo (ScreenPtr pScreen)
-{
-  winScreenPriv(pScreen);
-  winScreenInfo		*pScreenInfo = pScreenPriv->pScreenInfo; 
-
-  if (pScreenInfo->dwBPP > 8) 
-    {
-      
-    }
-  
-
-}
-
-
-
-
-
-
-
-#if 0
-#include "../xfree86/common/xf86.h"
-#include "../Xext/xvdix.h"
-#include "../xfree86/common/xf86xv.h"
-#include <X11/extensions/Xv.h>
-#endif
-
-#include "win.h"
-
-
-
-#if 0
-/* client libraries expect an encoding */
-static XF86VideoEncodingRec DummyEncoding[1] =
-{
- {
-   0,
-   "XV_IMAGE",
-   IMAGE_MAX_WIDTH, IMAGE_MAX_HEIGHT,
-   {1, 1}
- }
-};
-
-#define NUM_FORMATS 3
-
-static XF86VideoFormatRec Formats[NUM_FORMATS] = 
-{
-  {15, TrueColor}, {16, TrueColor}, {24, TrueColor}
-};
-
-#define NUM_ATTRIBUTES 3
-
-static XF86AttributeRec Attributes[NUM_ATTRIBUTES] =
-{
-   {XvSettable | XvGettable, 0, (1 << 24) - 1, "XV_COLORKEY"},
-   {XvSettable | XvGettable, -128, 127, "XV_BRIGHTNESS"},
-   {XvSettable | XvGettable, 0, 255, "XV_CONTRAST"}
-};
-
-#define NUM_IMAGES 4
-
-static XF86ImageRec Images[NUM_IMAGES] =
-{
-	XVIMAGE_YUY2,
-	XVIMAGE_YV12,
-	XVIMAGE_I420,
-	XVIMAGE_UYVY
-};
-
-
-
-/*
- * winInitVideo - Initialize support for the X Video (Xv) Extension.
- */
-
-void
-winInitVideo (ScreenPtr pScreen)
-{
-  winScreenPriv(pScreen);
-  winScreenInfo		*pScreenInfo = pScreenPriv->pScreenInfo; 
-  XF86VideoAdaptorPtr	newAdaptor = NULL;
-
-  if (pScreenInfo->dwBPP > 8) 
-    {
-      newAdaptor = I810SetupImageVideo (pScreen);
-      I810InitOffscreenImages (pScreen);
-    }
-  
-    xf86XVScreenInit (pScreen, adaptors, 1);
-}
-
-
-static XF86VideoAdaptorPtr 
-winSetupImageVideo (ScreenPtr pScreen)
-{
-    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
-#if 0
-    I810Ptr pI810 = I810PTR(pScrn);
-#endif
-    XF86VideoAdaptorPtr adapt;
-
-    if (!(adapt = xcalloc (1, sizeof(XF86VideoAdaptorRec))))
-      return NULL;
-
-    adapt->type = XvWindowMask | XvInputMask | XvImageMask;
-    adapt->flags = VIDEO_OVERLAID_IMAGES | VIDEO_CLIP_TO_VIEWPORT;
-    adapt->name = PROJECT_NAME " Video Overlay";
-    adapt->nEncodings = 1;
-    adapt->pEncodings = DummyEncoding;
-    adapt->nFormats = NUM_FORMATS;
-    adapt->pFormats = Formats;
-    adapt->nPorts = 1;
-    adapt->pPortPrivates = NULL;
-
-    adapt->pPortPrivates[0].ptr = NULL;
-    adapt->pAttributes = Attributes;
-    adapt->nImages = NUM_IMAGES;
-    adapt->nAttributes = NUM_ATTRIBUTES;
-    adapt->pImages = Images;
-    adapt->PutVideo = NULL;
-    adapt->PutStill = NULL;
-    adapt->GetVideo = NULL;
-    adapt->GetStill = NULL;
-#if 0
-    adapt->StopVideo = I810StopVideo;
-    adapt->SetPortAttribute = I810SetPortAttribute;
-    adapt->GetPortAttribute = I810GetPortAttribute;
-    adapt->QueryBestSize = I810QueryBestSize;
-    adapt->PutImage = I810PutImage;
-    adapt->QueryImageAttributes = I810QueryImageAttributes;
-#endif
-
-#if 0
-    pPriv->colorKey = pI810->colorKey & ((1 << pScrn->depth) - 1);
-#endif
-    pPriv->videoStatus = 0;
-    pPriv->brightness = 0;
-    pPriv->contrast = 64;
-    pPriv->linear = NULL;
-    pPriv->currentBuf = 0;
-
-#if 0
-    /* gotta uninit this someplace */
-    REGION_NULL(pScreen, &pPriv->clip);
-#endif
-
-#if 0
-    pI810->adaptor = adapt;
-
-    pI810->BlockHandler = pScreen->BlockHandler;
-    pScreen->BlockHandler = I810BlockHandler;
-#endif
-
-#if 0
-    xvBrightness = MAKE_ATOM("XV_BRIGHTNESS");
-    xvContrast   = MAKE_ATOM("XV_CONTRAST");
-    xvColorKey   = MAKE_ATOM("XV_COLORKEY");
-#endif
-
-#if 0
-    I810ResetVideo(pScrn);
-#endif
-
-    return adapt;
-}
-#endif
+/*

+ *Copyright (C) 2003-2004 Harold L Hunt II All Rights Reserved.

+ *

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

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

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

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

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

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

+ *the following conditions:

+ *

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

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

+ *

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

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

+ *MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

+ *NONINFRINGEMENT. IN NO EVENT SHALL HAROLD L HUNT II BE LIABLE FOR

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

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

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

+ *

+ *Except as contained in this notice, the name of Harold L Hunt II

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

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

+ *from Harold L Hunt II.

+ *

+ * Authors:	Harold L Hunt II

+ */

+

+#ifdef HAVE_XWIN_CONFIG_H

+#include <xwin-config.h>

+#endif

+#include "win.h"

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

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

+

+void

+winInitVideo (ScreenPtr pScreen);

+

+/*

+ * winInitVideo - Initialize support for the X Video (Xv) Extension.

+ */

+

+void

+winInitVideo (ScreenPtr pScreen)

+{

+  winScreenPriv(pScreen);

+  winScreenInfo		*pScreenInfo = pScreenPriv->pScreenInfo; 

+

+  if (pScreenInfo->dwBPP > 8) 

+    {

+      

+    }

+  

+

+}

+

+

+

+

+

+

+

+#if 0

+#include "../xfree86/common/xf86.h"

+#include "../Xext/xvdix.h"

+#include "../xfree86/common/xf86xv.h"

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

+#endif

+

+#include "win.h"

+

+

+

+#if 0

+/* client libraries expect an encoding */

+static XF86VideoEncodingRec DummyEncoding[1] =

+{

+ {

+   0,

+   "XV_IMAGE",

+   IMAGE_MAX_WIDTH, IMAGE_MAX_HEIGHT,

+   {1, 1}

+ }

+};

+

+#define NUM_FORMATS 3

+

+static XF86VideoFormatRec Formats[NUM_FORMATS] = 

+{

+  {15, TrueColor}, {16, TrueColor}, {24, TrueColor}

+};

+

+#define NUM_ATTRIBUTES 3

+

+static XF86AttributeRec Attributes[NUM_ATTRIBUTES] =

+{

+   {XvSettable | XvGettable, 0, (1 << 24) - 1, "XV_COLORKEY"},

+   {XvSettable | XvGettable, -128, 127, "XV_BRIGHTNESS"},

+   {XvSettable | XvGettable, 0, 255, "XV_CONTRAST"}

+};

+

+#define NUM_IMAGES 4

+

+static XF86ImageRec Images[NUM_IMAGES] =

+{

+	XVIMAGE_YUY2,

+	XVIMAGE_YV12,

+	XVIMAGE_I420,

+	XVIMAGE_UYVY

+};

+

+

+

+/*

+ * winInitVideo - Initialize support for the X Video (Xv) Extension.

+ */

+

+void

+winInitVideo (ScreenPtr pScreen)

+{

+  winScreenPriv(pScreen);

+  winScreenInfo		*pScreenInfo = pScreenPriv->pScreenInfo; 

+  XF86VideoAdaptorPtr	newAdaptor = NULL;

+

+  if (pScreenInfo->dwBPP > 8) 

+    {

+      newAdaptor = I810SetupImageVideo (pScreen);

+      I810InitOffscreenImages (pScreen);

+    }

+  

+    xf86XVScreenInit (pScreen, adaptors, 1);

+}

+

+

+static XF86VideoAdaptorPtr 

+winSetupImageVideo (ScreenPtr pScreen)

+{

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

+#if 0

+    I810Ptr pI810 = I810PTR(pScrn);

+#endif

+    XF86VideoAdaptorPtr adapt;

+

+    if (!(adapt = calloc(1, sizeof(XF86VideoAdaptorRec))))

+      return NULL;

+

+    adapt->type = XvWindowMask | XvInputMask | XvImageMask;

+    adapt->flags = VIDEO_OVERLAID_IMAGES | VIDEO_CLIP_TO_VIEWPORT;

+    adapt->name = PROJECT_NAME " Video Overlay";

+    adapt->nEncodings = 1;

+    adapt->pEncodings = DummyEncoding;

+    adapt->nFormats = NUM_FORMATS;

+    adapt->pFormats = Formats;

+    adapt->nPorts = 1;

+    adapt->pPortPrivates = NULL;

+

+    adapt->pPortPrivates[0].ptr = NULL;

+    adapt->pAttributes = Attributes;

+    adapt->nImages = NUM_IMAGES;

+    adapt->nAttributes = NUM_ATTRIBUTES;

+    adapt->pImages = Images;

+    adapt->PutVideo = NULL;

+    adapt->PutStill = NULL;

+    adapt->GetVideo = NULL;

+    adapt->GetStill = NULL;

+#if 0

+    adapt->StopVideo = I810StopVideo;

+    adapt->SetPortAttribute = I810SetPortAttribute;

+    adapt->GetPortAttribute = I810GetPortAttribute;

+    adapt->QueryBestSize = I810QueryBestSize;

+    adapt->PutImage = I810PutImage;

+    adapt->QueryImageAttributes = I810QueryImageAttributes;

+#endif

+

+#if 0

+    pPriv->colorKey = pI810->colorKey & ((1 << pScrn->depth) - 1);

+#endif

+    pPriv->videoStatus = 0;

+    pPriv->brightness = 0;

+    pPriv->contrast = 64;

+    pPriv->linear = NULL;

+    pPriv->currentBuf = 0;

+

+#if 0

+    /* gotta uninit this someplace */

+    REGION_NULL(pScreen, &pPriv->clip);

+#endif

+

+#if 0

+    pI810->adaptor = adapt;

+

+    pI810->BlockHandler = pScreen->BlockHandler;

+    pScreen->BlockHandler = I810BlockHandler;

+#endif

+

+#if 0

+    xvBrightness = MAKE_ATOM("XV_BRIGHTNESS");

+    xvContrast   = MAKE_ATOM("XV_CONTRAST");

+    xvColorKey   = MAKE_ATOM("XV_COLORKEY");

+#endif

+

+#if 0

+    I810ResetVideo(pScrn);

+#endif

+

+    return adapt;

+}

+#endif

diff --git a/xorg-server/hw/xwin/winwindow.c b/xorg-server/hw/xwin/winwindow.c
index 6f22a5a6e..8156671cd 100644
--- a/xorg-server/hw/xwin/winwindow.c
+++ b/xorg-server/hw/xwin/winwindow.c
@@ -1,593 +1,593 @@
-/*
- *Copyright (C) 1994-2000 The XFree86 Project, Inc. All Rights Reserved.
- *
- *Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- *"Software"), to deal in the Software without restriction, including
- *without limitation the rights to use, copy, modify, merge, publish,
- *distribute, sublicense, and/or sell copies of the Software, and to
- *permit persons to whom the Software is furnished to do so, subject to
- *the following conditions:
- *
- *The above copyright notice and this permission notice shall be
- *included in all copies or substantial portions of the Software.
- *
- *THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *NONINFRINGEMENT. IN NO EVENT SHALL THE XFREE86 PROJECT BE LIABLE FOR
- *ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- *CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- *WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- *Except as contained in this notice, the name of the XFree86 Project
- *shall not be used in advertising or otherwise to promote the sale, use
- *or other dealings in this Software without prior written authorization
- *from the XFree86 Project.
- *
- * Authors:	Harold L Hunt II
- *		Kensuke Matsuzaki
- */
-
-#ifdef HAVE_XWIN_CONFIG_H
-#include <xwin-config.h>
-#endif
-#include "win.h"
-
-
-/*
- * Prototypes for local functions
- */
-
-static int
-winAddRgn (WindowPtr pWindow, pointer data);
-
-static
-void
-winUpdateRgnRootless (WindowPtr pWindow);
-
-static
-void
-winReshapeRootless (WindowPtr pWin);
-
-
-#ifdef XWIN_NATIVEGDI
-/* See Porting Layer Definition - p. 37 */
-/* See mfb/mfbwindow.c - mfbCreateWindow() */
-
-Bool
-winCreateWindowNativeGDI (WindowPtr pWin)
-{
-  Bool fResult;
-  ScreenPtr		pScreen = pWin->drawable.pScreen;
-  winWindowPriv(pWin);
-  winScreenPriv(pScreen);
-
-  winDebug ("winCreateWindowNativeGDI (%p)\n", pWin);
-
-  WIN_UNWRAP(CreateWindow);
-  fResult = (*pScreen->CreateWindow) (pWin);
-  WIN_WRAP(CreateWindow, winCreateWindowNativeGDI);
-
-  return fResult;
-}
-
-
-/* See Porting Layer Definition - p. 37 */
-/* See mfb/mfbwindow.c - mfbDestroyWindow() */
-
-Bool
-winDestroyWindowNativeGDI (WindowPtr pWin)
-{
-  Bool			fResult = TRUE;
-  ScreenPtr		pScreen = pWin->drawable.pScreen;
-  winWindowPriv(pWin);
-  winScreenPriv(pScreen);
-
-  winDebug ("winDestroyWindowNativeGDI (%p)\n", pWin);
-
-  WIN_UNWRAP(DestroyWindow); 
-  fResult = (*pScreen->DestroyWindow)(pWin);
-  WIN_WRAP(DestroyWindow, winDestroyWindowNativeGDI);
-
-  return fResult;
-}
-
-
-/* See Porting Layer Definition - p. 37 */
-/* See mfb/mfbwindow.c - mfbPositionWindow() */
-
-Bool
-winPositionWindowNativeGDI (WindowPtr pWin, int x, int y)
-{
-  Bool			fResult = TRUE;
-  ScreenPtr		pScreen = pWin->drawable.pScreen;
-  winWindowPriv(pWin);
-  winScreenPriv(pScreen);
-
-  winDebug ("winPositionWindowNativeGDI (%p)\n", pWin);
-
-  WIN_UNWRAP(PositionWindow);
-  fResult = (*pScreen->PositionWindow)(pWin, x, y);
-  WIN_WRAP(PositionWindow, winPositionWindowNativeGDI);
-
-  return fResult;
-}
-
-
-/* See Porting Layer Definition - p. 39 */
-/* See mfb/mfbwindow.c - mfbCopyWindow() */
-
-void 
-winCopyWindowNativeGDI (WindowPtr pWin,
-			DDXPointRec ptOldOrg,
-			RegionPtr prgnSrc)
-{
-  DDXPointPtr		pptSrc;
-  DDXPointPtr		ppt;
-  RegionPtr		prgnDst;
-  BoxPtr		pBox;
-  int			dx, dy;
-  int			i, nbox;
-  WindowPtr		pwinRoot;
-  BoxPtr		pBoxDst;
-  ScreenPtr		pScreen = pWin->drawable.pScreen;
-  winScreenPriv(pScreen);
-
-  /* Get a pointer to the root window */
-  pwinRoot = WindowTable[pWin->drawable.pScreen->myNum];
-
-  /* Create a region for the destination */
-  prgnDst = REGION_CREATE(pWin->drawable.pScreen, NULL, 1);
-
-  /* Calculate the shift from the source to the destination */
-  dx = ptOldOrg.x - pWin->drawable.x;
-  dy = ptOldOrg.y - pWin->drawable.y;
-
-  /* Translate the region from the destination to the source? */
-  REGION_TRANSLATE(pWin->drawable.pScreen, prgnSrc, -dx, -dy);
-  REGION_INTERSECT(pWin->drawable.pScreen, prgnDst, &pWin->borderClip,
-		   prgnSrc);
-
-  /* Get a pointer to the first box in the region to be copied */
-  pBox = REGION_RECTS(prgnDst);
-  
-  /* Get the number of boxes in the region */
-  nbox = REGION_NUM_RECTS(prgnDst);
-
-  /* Allocate source points for each box */
-  if(!(pptSrc = (DDXPointPtr )xalloc(nbox * sizeof(DDXPointRec))))
-    return;
-
-  /* Set an iterator pointer */
-  ppt = pptSrc;
-
-  /* Calculate the source point of each box? */
-  for (i = nbox; --i >= 0; ppt++, pBox++)
-    {
-      ppt->x = pBox->x1 + dx;
-      ppt->y = pBox->y1 + dy;
-    }
-
-  /* Setup loop pointers again */
-  pBoxDst = REGION_RECTS(prgnDst);
-  ppt = pptSrc;
-
-  /* BitBlt each source to the destination point */
-  for (i = nbox; --i >= 0; pBoxDst++, ppt++)
-    {
-      BitBlt (pScreenPriv->hdcScreen,
-	      pBoxDst->x1, pBoxDst->y1,
-	      pBoxDst->x2 - pBoxDst->x1, pBoxDst->y2 - pBoxDst->y1,
-	      pScreenPriv->hdcScreen,
-	      ppt->x, ppt->y,
-	      SRCCOPY);
-    }
-
-  /* Cleanup the regions, etc. */
-  xfree(pptSrc);
-  REGION_DESTROY(pWin->drawable.pScreen, prgnDst);
-}
-
-
-/* See Porting Layer Definition - p. 37 */
-/* See mfb/mfbwindow.c - mfbChangeWindowAttributes() */
-
-Bool
-winChangeWindowAttributesNativeGDI (WindowPtr pWin, unsigned long mask)
-{
-  Bool			fResult = TRUE;
-  ScreenPtr		pScreen = pWin->drawable.pScreen;
-  winWindowPriv(pWin);
-  winScreenPriv(pScreen);
-
-  winDebug ("winChangeWindowAttributesNativeGDI (%p)\n", pWin);
-  
-  WIN_UNWRAP(ChangeWindowAttributes); 
-  fResult = (*pScreen->ChangeWindowAttributes)(pWin, mask);
-  WIN_WRAP(ChangeWindowAttributes, winChangeWindowAttributesNativeGDI);
-  
-  /*
-   * NOTE: We do not currently need to do anything here.
-   */
-
-  return fResult;
-}
-
-
-/* See Porting Layer Definition - p. 37
- * Also referred to as UnrealizeWindow
- */
-
-Bool
-winUnmapWindowNativeGDI (WindowPtr pWin)
-{
-  Bool			fResult = TRUE;
-  ScreenPtr		pScreen = pWin->drawable.pScreen;
-  winWindowPriv(pWin);
-  winScreenPriv(pScreen);
-
-  winDebug ("winUnmapWindowNativeGDI (%p)\n", pWin);
-
-  WIN_UNWRAP(UnrealizeWindow); 
-  fResult = (*pScreen->UnrealizeWindow)(pWin);
-  WIN_WRAP(UnrealizeWindow, winUnmapWindowNativeGDI);
-  
-  return fResult;
-}
-
-
-/* See Porting Layer Definition - p. 37
- * Also referred to as RealizeWindow
- */
-
-Bool
-winMapWindowNativeGDI (WindowPtr pWin)
-{
-  Bool			fResult = TRUE;
-  ScreenPtr		pScreen = pWin->drawable.pScreen;
-  winWindowPriv(pWin);
-  winScreenPriv(pScreen);
-
-  winDebug ("winMapWindowNativeGDI (%p)\n", pWin);
-
-  WIN_UNWRAP(RealizeWindow); 
-  fResult = (*pScreen->RealizeWindow)(pWin);
-  WIN_WRAP(RealizeWindow, winMapWindowMultiWindow);
-  
-  return fResult;
-
-}
-#endif
-
-
-/* See Porting Layer Definition - p. 37 */
-/* See mfb/mfbwindow.c - mfbCreateWindow() */
-
-Bool
-winCreateWindowRootless (WindowPtr pWin)
-{
-  Bool			fResult = FALSE;
-  ScreenPtr		pScreen = pWin->drawable.pScreen;
-  winWindowPriv(pWin);
-  winScreenPriv(pScreen);
-
-  winDebug ("winCreateWindowRootless (%p)\n", pWin);
-
-  WIN_UNWRAP(CreateWindow);
-  fResult = (*pScreen->CreateWindow) (pWin);
-  WIN_WRAP(CreateWindow, winCreateWindowRootless);
-  
-  pWinPriv->hRgn = NULL;
-  
-  return fResult;
-}
-
-
-/* See Porting Layer Definition - p. 37 */
-/* See mfb/mfbwindow.c - mfbDestroyWindow() */
-
-Bool
-winDestroyWindowRootless (WindowPtr pWin)
-{
-  Bool			fResult = FALSE;
-  ScreenPtr		pScreen = pWin->drawable.pScreen;
-  winWindowPriv(pWin);
-  winScreenPriv(pScreen);
-
-  winDebug ("winDestroyWindowRootless (%p)\n", pWin);
-
-  WIN_UNWRAP(DestroyWindow); 
-  fResult = (*pScreen->DestroyWindow)(pWin);
-  WIN_WRAP(DestroyWindow, winDestroyWindowRootless);
-  
-  if (pWinPriv->hRgn != NULL)
-    {
-      DeleteObject(pWinPriv->hRgn);
-      pWinPriv->hRgn = NULL;
-    }
-  
-  winUpdateRgnRootless (pWin);
-  
-  return fResult;
-}
-
-
-/* See Porting Layer Definition - p. 37 */
-/* See mfb/mfbwindow.c - mfbPositionWindow() */
-
-Bool
-winPositionWindowRootless (WindowPtr pWin, int x, int y)
-{
-  Bool			fResult = FALSE;
-  ScreenPtr		pScreen = pWin->drawable.pScreen;
-  winScreenPriv(pScreen);
-
-  winDebug ("winPositionWindowRootless (%p)\n", pWin);
-
-  WIN_UNWRAP(PositionWindow);
-  fResult = (*pScreen->PositionWindow)(pWin, x, y);
-  WIN_WRAP(PositionWindow, winPositionWindowRootless);
-  
-  winUpdateRgnRootless (pWin);
-  
-  return fResult;
-}
-
-
-/* See Porting Layer Definition - p. 37 */
-/* See mfb/mfbwindow.c - mfbChangeWindowAttributes() */
-
-Bool
-winChangeWindowAttributesRootless (WindowPtr pWin, unsigned long mask)
-{
-  Bool			fResult = FALSE;
-  ScreenPtr		pScreen = pWin->drawable.pScreen;
-  winScreenPriv(pScreen);
-
-  winDebug ("winChangeWindowAttributesRootless (%p)\n", pWin);
-
-  WIN_UNWRAP(ChangeWindowAttributes); 
-  fResult = (*pScreen->ChangeWindowAttributes)(pWin, mask);
-  WIN_WRAP(ChangeWindowAttributes, winChangeWindowAttributesRootless);
-
-  winUpdateRgnRootless (pWin);
-  
-  return fResult;
-}
-
-
-/* See Porting Layer Definition - p. 37
- * Also referred to as UnrealizeWindow
- */
-
-Bool
-winUnmapWindowRootless (WindowPtr pWin)
-{
-  Bool			fResult = FALSE;
-  ScreenPtr		pScreen = pWin->drawable.pScreen;
-  winWindowPriv(pWin);
-  winScreenPriv(pScreen);
-
-  winDebug ("winUnmapWindowRootless (%p)\n", pWin);
-
-  WIN_UNWRAP(UnrealizeWindow); 
-  fResult = (*pScreen->UnrealizeWindow)(pWin);
-  WIN_WRAP(UnrealizeWindow, winUnmapWindowRootless);
-  
-  if (pWinPriv->hRgn != NULL)
-    {
-      DeleteObject(pWinPriv->hRgn);
-      pWinPriv->hRgn = NULL;
-    }
-  
-  winUpdateRgnRootless (pWin);
-  
-  return fResult;
-}
-
-
-/* See Porting Layer Definition - p. 37
- * Also referred to as RealizeWindow
- */
-
-Bool
-winMapWindowRootless (WindowPtr pWin)
-{
-  Bool			fResult = FALSE;
-  ScreenPtr		pScreen = pWin->drawable.pScreen;
-  winScreenPriv(pScreen);
-
-  winDebug ("winMapWindowRootless (%p)\n", pWin);
-
-  WIN_UNWRAP(RealizeWindow); 
-  fResult = (*pScreen->RealizeWindow)(pWin);
-  WIN_WRAP(RealizeWindow, winMapWindowRootless);
-
-  winReshapeRootless (pWin);
-  
-  winUpdateRgnRootless (pWin);
-  
-  return fResult;
-}
-
-
-void
-winSetShapeRootless (WindowPtr pWin)
-{
-  ScreenPtr		pScreen = pWin->drawable.pScreen;
-  winScreenPriv(pScreen);
-
-  winDebug ("winSetShapeRootless (%p)\n", pWin);
-
-  WIN_UNWRAP(SetShape); 
-  (*pScreen->SetShape)(pWin);
-  WIN_WRAP(SetShape, winSetShapeRootless);
-  
-  winReshapeRootless (pWin);
-  winUpdateRgnRootless (pWin);
-  
-  return;
-}
-
-
-/*
- * Local function for adding a region to the Windows window region
- */
-
-static
-int
-winAddRgn (WindowPtr pWin, pointer data)
-{
-  int		iX, iY, iWidth, iHeight, iBorder;
-  HRGN		hRgn = *(HRGN*)data;
-  HRGN		hRgnWin;
-  winWindowPriv(pWin);
-  
-  /* If pWin is not Root */
-  if (pWin->parent != NULL) 
-    {
-      winDebug ("winAddRgn ()\n");
-      if (pWin->mapped)
-	{
-	  iBorder = wBorderWidth (pWin);
-	  
-	  iX = pWin->drawable.x - iBorder;
-	  iY = pWin->drawable.y - iBorder;
-	  
-	  iWidth = pWin->drawable.width + iBorder * 2;
-	  iHeight = pWin->drawable.height + iBorder * 2;
-	  
-	  hRgnWin = CreateRectRgn (0, 0, iWidth, iHeight);
-	  
-	  if (hRgnWin == NULL)
-	    {
-	      winDebug ("winAddRgn - CreateRectRgn () failed\n");
-	      winDebug ("  Rect %d %d %d %d\n",
-		      iX, iY, iX + iWidth, iY + iHeight);
-	    }
-	  
-	  if (pWinPriv->hRgn)
-	    {
-	      if (CombineRgn (hRgnWin, hRgnWin, pWinPriv->hRgn, RGN_AND)
-		  == ERROR)
-		{
-		  ErrorF ("winAddRgn - CombineRgn () failed\n");
-		}
-	    }
-	  
-	  OffsetRgn (hRgnWin, iX, iY);
-
-	  if (CombineRgn (hRgn, hRgn, hRgnWin, RGN_OR) == ERROR)
-	    {
-	      ErrorF ("winAddRgn - CombineRgn () failed\n");
-	    }
-	  
-	  DeleteObject (hRgnWin);
-	}
-      return WT_DONTWALKCHILDREN;
-    }
-  else
-    {
-      return WT_WALKCHILDREN;
-    }
-}
-
-
-/*
- * Local function to update the Windows window's region
- */
-
-static
-void
-winUpdateRgnRootless (WindowPtr pWin)
-{
-  HRGN		hRgn = CreateRectRgn (0, 0, 0, 0);
-  
-  if (hRgn != NULL)
-    {
-      WalkTree (pWin->drawable.pScreen, winAddRgn, &hRgn);
-      SetWindowRgn (winGetScreenPriv(pWin->drawable.pScreen)->hwndScreen,
-		    hRgn, TRUE);
-    }
-  else
-    {
-      ErrorF ("winUpdateRgnRootless - CreateRectRgn failed.\n");
-    }
-}
-
-
-static
-void
-winReshapeRootless (WindowPtr pWin)
-{
-  int		nRects;
-  /* ScreenPtr	pScreen = pWin->drawable.pScreen;*/
-  RegionRec	rrNewShape;
-  BoxPtr	pShape, pRects, pEnd;
-  HRGN		hRgn, hRgnRect;
-  winWindowPriv(pWin);
-
-  winDebug ("winReshapeRootless ()\n");
-
-  /* Bail if the window is the root window */
-  if (pWin->parent == NULL)
-    return;
-
-  /* Bail if the window is not top level */
-  if (pWin->parent->parent != NULL)
-    return;
-
-  /* Free any existing window region stored in the window privates */
-  if (pWinPriv->hRgn != NULL)
-    {
-      DeleteObject (pWinPriv->hRgn);
-      pWinPriv->hRgn = NULL;
-    }
-  
-  /* Bail if the window has no bounding region defined */
-  if (!wBoundingShape (pWin))
-    return;
-
-  REGION_NULL(pScreen, &rrNewShape);
-  REGION_COPY(pScreen, &rrNewShape, wBoundingShape(pWin));
-  REGION_TRANSLATE(pScreen, &rrNewShape, pWin->borderWidth,
-                   pWin->borderWidth);
-  
-  nRects = REGION_NUM_RECTS(&rrNewShape);
-  pShape = REGION_RECTS(&rrNewShape);
-  
-  if (nRects > 0)
-    {
-      /* Create initial empty Windows region */
-      hRgn = CreateRectRgn (0, 0, 0, 0);
-
-      /* Loop through all rectangles in the X region */
-      for (pRects = pShape, pEnd = pShape + nRects; pRects < pEnd; pRects++)
-        {
-	  /* Create a Windows region for the X rectangle */
-	  hRgnRect = CreateRectRgn (pRects->x1, pRects->y1,
-				    pRects->x2, pRects->y2);
-	  if (hRgnRect == NULL)
-	    {
-	      ErrorF("winReshapeRootless - CreateRectRgn() failed\n");
-	    }
-
-	  /* Merge the Windows region with the accumulated region */
-	  if (CombineRgn (hRgn, hRgn, hRgnRect, RGN_OR) == ERROR)
-	    {
-	      ErrorF("winReshapeRootless - CombineRgn() failed\n");
-	    }
-
-	  /* Delete the temporary Windows region */
-	  DeleteObject (hRgnRect);
-        }
-      
-      /* Save a handle to the composite region in the window privates */
-      pWinPriv->hRgn = hRgn;
-    }
-
-  REGION_UNINIT(pScreen, &rrNewShape);
-  
-  return;
-}
+/*

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

+ *

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

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

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

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

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

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

+ *the following conditions:

+ *

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

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

+ *

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

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

+ *MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

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

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

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

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

+ *

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

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

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

+ *from the XFree86 Project.

+ *

+ * Authors:	Harold L Hunt II

+ *		Kensuke Matsuzaki

+ */

+

+#ifdef HAVE_XWIN_CONFIG_H

+#include <xwin-config.h>

+#endif

+#include "win.h"

+

+

+/*

+ * Prototypes for local functions

+ */

+

+static int

+winAddRgn (WindowPtr pWindow, pointer data);

+

+static

+void

+winUpdateRgnRootless (WindowPtr pWindow);

+

+static

+void

+winReshapeRootless (WindowPtr pWin);

+

+

+#ifdef XWIN_NATIVEGDI

+/* See Porting Layer Definition - p. 37 */

+/* See mfb/mfbwindow.c - mfbCreateWindow() */

+

+Bool

+winCreateWindowNativeGDI (WindowPtr pWin)

+{

+  Bool fResult;

+  ScreenPtr		pScreen = pWin->drawable.pScreen;

+  winWindowPriv(pWin);

+  winScreenPriv(pScreen);

+

+  winDebug ("winCreateWindowNativeGDI (%p)\n", pWin);

+

+  WIN_UNWRAP(CreateWindow);

+  fResult = (*pScreen->CreateWindow) (pWin);

+  WIN_WRAP(CreateWindow, winCreateWindowNativeGDI);

+

+  return fResult;

+}

+

+

+/* See Porting Layer Definition - p. 37 */

+/* See mfb/mfbwindow.c - mfbDestroyWindow() */

+

+Bool

+winDestroyWindowNativeGDI (WindowPtr pWin)

+{

+  Bool			fResult = TRUE;

+  ScreenPtr		pScreen = pWin->drawable.pScreen;

+  winWindowPriv(pWin);

+  winScreenPriv(pScreen);

+

+  winDebug ("winDestroyWindowNativeGDI (%p)\n", pWin);

+

+  WIN_UNWRAP(DestroyWindow); 

+  fResult = (*pScreen->DestroyWindow)(pWin);

+  WIN_WRAP(DestroyWindow, winDestroyWindowNativeGDI);

+

+  return fResult;

+}

+

+

+/* See Porting Layer Definition - p. 37 */

+/* See mfb/mfbwindow.c - mfbPositionWindow() */

+

+Bool

+winPositionWindowNativeGDI (WindowPtr pWin, int x, int y)

+{

+  Bool			fResult = TRUE;

+  ScreenPtr		pScreen = pWin->drawable.pScreen;

+  winWindowPriv(pWin);

+  winScreenPriv(pScreen);

+

+  winDebug ("winPositionWindowNativeGDI (%p)\n", pWin);

+

+  WIN_UNWRAP(PositionWindow);

+  fResult = (*pScreen->PositionWindow)(pWin, x, y);

+  WIN_WRAP(PositionWindow, winPositionWindowNativeGDI);

+

+  return fResult;

+}

+

+

+/* See Porting Layer Definition - p. 39 */

+/* See mfb/mfbwindow.c - mfbCopyWindow() */

+

+void 

+winCopyWindowNativeGDI (WindowPtr pWin,

+			DDXPointRec ptOldOrg,

+			RegionPtr prgnSrc)

+{

+  DDXPointPtr		pptSrc;

+  DDXPointPtr		ppt;

+  RegionPtr		prgnDst;

+  BoxPtr		pBox;

+  int			dx, dy;

+  int			i, nbox;

+  WindowPtr		pwinRoot;

+  BoxPtr		pBoxDst;

+  ScreenPtr		pScreen = pWin->drawable.pScreen;

+  winScreenPriv(pScreen);

+

+  /* Get a pointer to the root window */

+  pwinRoot = WindowTable[pWin->drawable.pScreen->myNum];

+

+  /* Create a region for the destination */

+  prgnDst = REGION_CREATE(pWin->drawable.pScreen, NULL, 1);

+

+  /* Calculate the shift from the source to the destination */

+  dx = ptOldOrg.x - pWin->drawable.x;

+  dy = ptOldOrg.y - pWin->drawable.y;

+

+  /* Translate the region from the destination to the source? */

+  REGION_TRANSLATE(pWin->drawable.pScreen, prgnSrc, -dx, -dy);

+  REGION_INTERSECT(pWin->drawable.pScreen, prgnDst, &pWin->borderClip,

+		   prgnSrc);

+

+  /* Get a pointer to the first box in the region to be copied */

+  pBox = REGION_RECTS(prgnDst);

+  

+  /* Get the number of boxes in the region */

+  nbox = REGION_NUM_RECTS(prgnDst);

+

+  /* Allocate source points for each box */

+  if(!(pptSrc = (DDXPointPtr )malloc(nbox * sizeof(DDXPointRec))))

+    return;

+

+  /* Set an iterator pointer */

+  ppt = pptSrc;

+

+  /* Calculate the source point of each box? */

+  for (i = nbox; --i >= 0; ppt++, pBox++)

+    {

+      ppt->x = pBox->x1 + dx;

+      ppt->y = pBox->y1 + dy;

+    }

+

+  /* Setup loop pointers again */

+  pBoxDst = REGION_RECTS(prgnDst);

+  ppt = pptSrc;

+

+  /* BitBlt each source to the destination point */

+  for (i = nbox; --i >= 0; pBoxDst++, ppt++)

+    {

+      BitBlt (pScreenPriv->hdcScreen,

+	      pBoxDst->x1, pBoxDst->y1,

+	      pBoxDst->x2 - pBoxDst->x1, pBoxDst->y2 - pBoxDst->y1,

+	      pScreenPriv->hdcScreen,

+	      ppt->x, ppt->y,

+	      SRCCOPY);

+    }

+

+  /* Cleanup the regions, etc. */

+  free(pptSrc);

+  REGION_DESTROY(pWin->drawable.pScreen, prgnDst);

+}

+

+

+/* See Porting Layer Definition - p. 37 */

+/* See mfb/mfbwindow.c - mfbChangeWindowAttributes() */

+

+Bool

+winChangeWindowAttributesNativeGDI (WindowPtr pWin, unsigned long mask)

+{

+  Bool			fResult = TRUE;

+  ScreenPtr		pScreen = pWin->drawable.pScreen;

+  winWindowPriv(pWin);

+  winScreenPriv(pScreen);

+

+  winDebug ("winChangeWindowAttributesNativeGDI (%p)\n", pWin);

+  

+  WIN_UNWRAP(ChangeWindowAttributes); 

+  fResult = (*pScreen->ChangeWindowAttributes)(pWin, mask);

+  WIN_WRAP(ChangeWindowAttributes, winChangeWindowAttributesNativeGDI);

+  

+  /*

+   * NOTE: We do not currently need to do anything here.

+   */

+

+  return fResult;

+}

+

+

+/* See Porting Layer Definition - p. 37

+ * Also referred to as UnrealizeWindow

+ */

+

+Bool

+winUnmapWindowNativeGDI (WindowPtr pWin)

+{

+  Bool			fResult = TRUE;

+  ScreenPtr		pScreen = pWin->drawable.pScreen;

+  winWindowPriv(pWin);

+  winScreenPriv(pScreen);

+

+  winDebug ("winUnmapWindowNativeGDI (%p)\n", pWin);

+

+  WIN_UNWRAP(UnrealizeWindow); 

+  fResult = (*pScreen->UnrealizeWindow)(pWin);

+  WIN_WRAP(UnrealizeWindow, winUnmapWindowNativeGDI);

+  

+  return fResult;

+}

+

+

+/* See Porting Layer Definition - p. 37

+ * Also referred to as RealizeWindow

+ */

+

+Bool

+winMapWindowNativeGDI (WindowPtr pWin)

+{

+  Bool			fResult = TRUE;

+  ScreenPtr		pScreen = pWin->drawable.pScreen;

+  winWindowPriv(pWin);

+  winScreenPriv(pScreen);

+

+  winDebug ("winMapWindowNativeGDI (%p)\n", pWin);

+

+  WIN_UNWRAP(RealizeWindow); 

+  fResult = (*pScreen->RealizeWindow)(pWin);

+  WIN_WRAP(RealizeWindow, winMapWindowMultiWindow);

+  

+  return fResult;

+

+}

+#endif

+

+

+/* See Porting Layer Definition - p. 37 */

+/* See mfb/mfbwindow.c - mfbCreateWindow() */

+

+Bool

+winCreateWindowRootless (WindowPtr pWin)

+{

+  Bool			fResult = FALSE;

+  ScreenPtr		pScreen = pWin->drawable.pScreen;

+  winWindowPriv(pWin);

+  winScreenPriv(pScreen);

+

+  winDebug ("winCreateWindowRootless (%p)\n", pWin);

+

+  WIN_UNWRAP(CreateWindow);

+  fResult = (*pScreen->CreateWindow) (pWin);

+  WIN_WRAP(CreateWindow, winCreateWindowRootless);

+  

+  pWinPriv->hRgn = NULL;

+  

+  return fResult;

+}

+

+

+/* See Porting Layer Definition - p. 37 */

+/* See mfb/mfbwindow.c - mfbDestroyWindow() */

+

+Bool

+winDestroyWindowRootless (WindowPtr pWin)

+{

+  Bool			fResult = FALSE;

+  ScreenPtr		pScreen = pWin->drawable.pScreen;

+  winWindowPriv(pWin);

+  winScreenPriv(pScreen);

+

+  winDebug ("winDestroyWindowRootless (%p)\n", pWin);

+

+  WIN_UNWRAP(DestroyWindow); 

+  fResult = (*pScreen->DestroyWindow)(pWin);

+  WIN_WRAP(DestroyWindow, winDestroyWindowRootless);

+  

+  if (pWinPriv->hRgn != NULL)

+    {

+      DeleteObject(pWinPriv->hRgn);

+      pWinPriv->hRgn = NULL;

+    }

+  

+  winUpdateRgnRootless (pWin);

+  

+  return fResult;

+}

+

+

+/* See Porting Layer Definition - p. 37 */

+/* See mfb/mfbwindow.c - mfbPositionWindow() */

+

+Bool

+winPositionWindowRootless (WindowPtr pWin, int x, int y)

+{

+  Bool			fResult = FALSE;

+  ScreenPtr		pScreen = pWin->drawable.pScreen;

+  winScreenPriv(pScreen);

+

+  winDebug ("winPositionWindowRootless (%p)\n", pWin);

+

+  WIN_UNWRAP(PositionWindow);

+  fResult = (*pScreen->PositionWindow)(pWin, x, y);

+  WIN_WRAP(PositionWindow, winPositionWindowRootless);

+  

+  winUpdateRgnRootless (pWin);

+  

+  return fResult;

+}

+

+

+/* See Porting Layer Definition - p. 37 */

+/* See mfb/mfbwindow.c - mfbChangeWindowAttributes() */

+

+Bool

+winChangeWindowAttributesRootless (WindowPtr pWin, unsigned long mask)

+{

+  Bool			fResult = FALSE;

+  ScreenPtr		pScreen = pWin->drawable.pScreen;

+  winScreenPriv(pScreen);

+

+  winDebug ("winChangeWindowAttributesRootless (%p)\n", pWin);

+

+  WIN_UNWRAP(ChangeWindowAttributes); 

+  fResult = (*pScreen->ChangeWindowAttributes)(pWin, mask);

+  WIN_WRAP(ChangeWindowAttributes, winChangeWindowAttributesRootless);

+

+  winUpdateRgnRootless (pWin);

+  

+  return fResult;

+}

+

+

+/* See Porting Layer Definition - p. 37

+ * Also referred to as UnrealizeWindow

+ */

+

+Bool

+winUnmapWindowRootless (WindowPtr pWin)

+{

+  Bool			fResult = FALSE;

+  ScreenPtr		pScreen = pWin->drawable.pScreen;

+  winWindowPriv(pWin);

+  winScreenPriv(pScreen);

+

+  winDebug ("winUnmapWindowRootless (%p)\n", pWin);

+

+  WIN_UNWRAP(UnrealizeWindow); 

+  fResult = (*pScreen->UnrealizeWindow)(pWin);

+  WIN_WRAP(UnrealizeWindow, winUnmapWindowRootless);

+  

+  if (pWinPriv->hRgn != NULL)

+    {

+      DeleteObject(pWinPriv->hRgn);

+      pWinPriv->hRgn = NULL;

+    }

+  

+  winUpdateRgnRootless (pWin);

+  

+  return fResult;

+}

+

+

+/* See Porting Layer Definition - p. 37

+ * Also referred to as RealizeWindow

+ */

+

+Bool

+winMapWindowRootless (WindowPtr pWin)

+{

+  Bool			fResult = FALSE;

+  ScreenPtr		pScreen = pWin->drawable.pScreen;

+  winScreenPriv(pScreen);

+

+  winDebug ("winMapWindowRootless (%p)\n", pWin);

+

+  WIN_UNWRAP(RealizeWindow); 

+  fResult = (*pScreen->RealizeWindow)(pWin);

+  WIN_WRAP(RealizeWindow, winMapWindowRootless);

+

+  winReshapeRootless (pWin);

+  

+  winUpdateRgnRootless (pWin);

+  

+  return fResult;

+}

+

+

+void

+winSetShapeRootless (WindowPtr pWin)

+{

+  ScreenPtr		pScreen = pWin->drawable.pScreen;

+  winScreenPriv(pScreen);

+

+  winDebug ("winSetShapeRootless (%p)\n", pWin);

+

+  WIN_UNWRAP(SetShape); 

+  (*pScreen->SetShape)(pWin);

+  WIN_WRAP(SetShape, winSetShapeRootless);

+  

+  winReshapeRootless (pWin);

+  winUpdateRgnRootless (pWin);

+  

+  return;

+}

+

+

+/*

+ * Local function for adding a region to the Windows window region

+ */

+

+static

+int

+winAddRgn (WindowPtr pWin, pointer data)

+{

+  int		iX, iY, iWidth, iHeight, iBorder;

+  HRGN		hRgn = *(HRGN*)data;

+  HRGN		hRgnWin;

+  winWindowPriv(pWin);

+  

+  /* If pWin is not Root */

+  if (pWin->parent != NULL) 

+    {

+      winDebug ("winAddRgn ()\n");

+      if (pWin->mapped)

+	{

+	  iBorder = wBorderWidth (pWin);

+	  

+	  iX = pWin->drawable.x - iBorder;

+	  iY = pWin->drawable.y - iBorder;

+	  

+	  iWidth = pWin->drawable.width + iBorder * 2;

+	  iHeight = pWin->drawable.height + iBorder * 2;

+	  

+	  hRgnWin = CreateRectRgn (0, 0, iWidth, iHeight);

+	  

+	  if (hRgnWin == NULL)

+	    {

+	      winDebug ("winAddRgn - CreateRectRgn () failed\n");

+	      winDebug ("  Rect %d %d %d %d\n",

+		      iX, iY, iX + iWidth, iY + iHeight);

+	    }

+	  

+	  if (pWinPriv->hRgn)

+	    {

+	      if (CombineRgn (hRgnWin, hRgnWin, pWinPriv->hRgn, RGN_AND)

+		  == ERROR)

+		{

+		  ErrorF ("winAddRgn - CombineRgn () failed\n");

+		}

+	    }

+	  

+	  OffsetRgn (hRgnWin, iX, iY);

+

+	  if (CombineRgn (hRgn, hRgn, hRgnWin, RGN_OR) == ERROR)

+	    {

+	      ErrorF ("winAddRgn - CombineRgn () failed\n");

+	    }

+	  

+	  DeleteObject (hRgnWin);

+	}

+      return WT_DONTWALKCHILDREN;

+    }

+  else

+    {

+      return WT_WALKCHILDREN;

+    }

+}

+

+

+/*

+ * Local function to update the Windows window's region

+ */

+

+static

+void

+winUpdateRgnRootless (WindowPtr pWin)

+{

+  HRGN		hRgn = CreateRectRgn (0, 0, 0, 0);

+  

+  if (hRgn != NULL)

+    {

+      WalkTree (pWin->drawable.pScreen, winAddRgn, &hRgn);

+      SetWindowRgn (winGetScreenPriv(pWin->drawable.pScreen)->hwndScreen,

+		    hRgn, TRUE);

+    }

+  else

+    {

+      ErrorF ("winUpdateRgnRootless - CreateRectRgn failed.\n");

+    }

+}

+

+

+static

+void

+winReshapeRootless (WindowPtr pWin)

+{

+  int		nRects;

+  /* ScreenPtr	pScreen = pWin->drawable.pScreen;*/

+  RegionRec	rrNewShape;

+  BoxPtr	pShape, pRects, pEnd;

+  HRGN		hRgn, hRgnRect;

+  winWindowPriv(pWin);

+

+  winDebug ("winReshapeRootless ()\n");

+

+  /* Bail if the window is the root window */

+  if (pWin->parent == NULL)

+    return;

+

+  /* Bail if the window is not top level */

+  if (pWin->parent->parent != NULL)

+    return;

+

+  /* Free any existing window region stored in the window privates */

+  if (pWinPriv->hRgn != NULL)

+    {

+      DeleteObject (pWinPriv->hRgn);

+      pWinPriv->hRgn = NULL;

+    }

+  

+  /* Bail if the window has no bounding region defined */

+  if (!wBoundingShape (pWin))

+    return;

+

+  REGION_NULL(pScreen, &rrNewShape);

+  REGION_COPY(pScreen, &rrNewShape, wBoundingShape(pWin));

+  REGION_TRANSLATE(pScreen, &rrNewShape, pWin->borderWidth,

+                   pWin->borderWidth);

+  

+  nRects = REGION_NUM_RECTS(&rrNewShape);

+  pShape = REGION_RECTS(&rrNewShape);

+  

+  if (nRects > 0)

+    {

+      /* Create initial empty Windows region */

+      hRgn = CreateRectRgn (0, 0, 0, 0);

+

+      /* Loop through all rectangles in the X region */

+      for (pRects = pShape, pEnd = pShape + nRects; pRects < pEnd; pRects++)

+        {

+	  /* Create a Windows region for the X rectangle */

+	  hRgnRect = CreateRectRgn (pRects->x1, pRects->y1,

+				    pRects->x2, pRects->y2);

+	  if (hRgnRect == NULL)

+	    {

+	      ErrorF("winReshapeRootless - CreateRectRgn() failed\n");

+	    }

+

+	  /* Merge the Windows region with the accumulated region */

+	  if (CombineRgn (hRgn, hRgn, hRgnRect, RGN_OR) == ERROR)

+	    {

+	      ErrorF("winReshapeRootless - CombineRgn() failed\n");

+	    }

+

+	  /* Delete the temporary Windows region */

+	  DeleteObject (hRgnRect);

+        }

+      

+      /* Save a handle to the composite region in the window privates */

+      pWinPriv->hRgn = hRgn;

+    }

+

+  REGION_UNINIT(pScreen, &rrNewShape);

+  

+  return;

+}

diff --git a/xorg-server/hw/xwin/winwindowswm.c b/xorg-server/hw/xwin/winwindowswm.c
index d0c6de9bc..e16f6cfaf 100644
--- a/xorg-server/hw/xwin/winwindowswm.c
+++ b/xorg-server/hw/xwin/winwindowswm.c
@@ -124,7 +124,7 @@ ProcWindowsWMQueryVersion(register ClientPtr client)
       swapl(&rep.length, n);

     }

   WriteToClient(client, sizeof(xWindowsWMQueryVersionReply), (char *)&rep);

-  return (client->noClientException);

+  return Success;

 }

 

 

@@ -164,7 +164,7 @@ WMFreeClient (pointer data, XID id)
 	}

       updateEventMask (pHead);

     }

-  xfree ((pointer) pEvent);

+  free((pointer) pEvent);

   return 1;

 }

 

@@ -179,9 +179,9 @@ WMFreeEvents (pointer data, XID id)
     {

       pNext = pCur->next;

       FreeResource (pCur->clientResource, ClientType);

-      xfree ((pointer) pCur);

+      free((pointer) pCur);

     }

-  xfree ((pointer) pHead);

+  free((pointer) pHead);

   eventMask = 0;

   return 1;

 }

@@ -212,7 +212,7 @@ ProcWindowsWMSelectInput (register ClientPtr client)
 	}

       

       /* build the entry */

-      pNewEvent = (WMEventPtr) xalloc (sizeof (WMEventRec));

+      pNewEvent = (WMEventPtr) malloc(sizeof (WMEventRec));

       if (!pNewEvent)

 	return BadAlloc;

       pNewEvent->next = 0;

@@ -234,7 +234,7 @@ ProcWindowsWMSelectInput (register ClientPtr client)
        */

       if (!pHead)

 	{

-	  pHead = (WMEventPtr *) xalloc (sizeof (WMEventPtr));

+	  pHead = (WMEventPtr *) malloc(sizeof (WMEventPtr));

 	  if (!pHead ||

 	      !AddResource (eventResource, eventResourceType, (pointer)pHead))

 	    {

@@ -266,7 +266,7 @@ ProcWindowsWMSelectInput (register ClientPtr client)
 		pNewEvent->next = pEvent->next;

 	      else

 		*pHead = pEvent->next;

-	      xfree (pEvent);

+	      free(pEvent);

 	      updateEventMask (pHead);

 	    }

 	}

@@ -330,7 +330,7 @@ ProcWindowsWMDisableUpdate (register ClientPtr client)
 

   //winDisableUpdate();

 

-  return (client->noClientException);

+  return Success;

 }

 

 static int

@@ -340,7 +340,7 @@ ProcWindowsWMReenableUpdate (register ClientPtr client)
 

   //winEnableUpdate(); 

 

-  return (client->noClientException);

+  return Success;

 }

 

 

@@ -353,7 +353,7 @@ ProcWindowsWMSetFrontProcess (register ClientPtr client)
   

   //QuartzMessageMainThread(kWindowsSetFrontProcess, NULL, 0);

   

-  return (client->noClientException);

+  return Success;

 }

 

 

@@ -403,7 +403,7 @@ ProcWindowsWMFrameGetRect (register ClientPtr client)
 	  rep.x, rep.y, rep.w, rep.h);

 

   WriteToClient(client, sizeof(xWindowsWMFrameGetRectReply), (char *)&rep);

-  return (client->noClientException);

+  return Success;

 }

 

 

@@ -490,7 +490,7 @@ ProcWindowsWMFrameDraw (register ClientPtr client)
     }

   winDebug ("ProcWindowsWMFrameDraw - done\n");

 

-  return (client->noClientException);

+  return Success;

 }

 

 static int

@@ -541,7 +541,7 @@ ProcWindowsWMFrameSetTitle(
 

   winDebug ("ProcWindowsWMFrameSetTitle - done\n");

 

-  return (client->noClientException);

+  return Success;

 }