sync code with last improvements from OpenBSD

xserver/hw/xwin/glx/winpriv.c

@@ -0,0 +1,101 @@
+/*
+ * Export window information for the Windows-OpenGL GLX implementation.
+ *
+ * Authors: Alexander Gottwald
+ */
+
+#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
+#include "win.h"
+#include "winpriv.h"
+#include "winwindow.h"
+
+void
+ winCreateWindowsWindow(WindowPtr pWin);
+
+/**
+ * Return size and handles of a window.
+ * If pWin is NULL, then the information for the root window is requested.
+ */
+HWND
+winGetWindowInfo(WindowPtr pWin)
+{
+    winTrace("%s: pWin %p XID 0x%x\n", __FUNCTION__, pWin, (unsigned int)pWin->drawable.id);
+
+    /* a real window was requested */
+    if (pWin != NULL) {
+        /* Get the window and screen privates */
+        ScreenPtr pScreen = pWin->drawable.pScreen;
+        winPrivScreenPtr pWinScreen = winGetScreenPriv(pScreen);
+        winScreenInfoPtr pScreenInfo = NULL;
+        HWND hwnd = NULL;
+
+        if (pWinScreen == NULL) {
+            ErrorF("winGetWindowInfo: screen has no privates\n");
+            return NULL;
+        }
+
+        hwnd = pWinScreen->hwndScreen;
+
+        pScreenInfo = pWinScreen->pScreenInfo;
+        /* check for multiwindow mode */
+        if (pScreenInfo->fMultiWindow) {
+            winWindowPriv(pWin);
+
+            if (pWinPriv == NULL) {
+                ErrorF("winGetWindowInfo: window has no privates\n");
+                return hwnd;
+            }
+
+            if (pWinPriv->hWnd == NULL) {
+                winCreateWindowsWindow(pWin);
+                winDebug("winGetWindowInfo: forcing window to exist\n");
+            }
+
+            if (pWinPriv->hWnd != NULL) {
+                /* copy window handle */
+                hwnd = pWinPriv->hWnd;
+
+                /* mark GLX active on that hwnd */
+                pWinPriv->fWglUsed = TRUE;
+            }
+
+            return hwnd;
+        }
+    }
+    else {
+        ScreenPtr pScreen = g_ScreenInfo[0].pScreen;
+        winPrivScreenPtr pWinScreen = winGetScreenPriv(pScreen);
+
+        if (pWinScreen == NULL) {
+            ErrorF("winGetWindowInfo: screen has no privates\n");
+            return NULL;
+        }
+
+        ErrorF("winGetWindowInfo: returning root window\n");
+
+        return pWinScreen->hwndScreen;
+    }
+
+    return NULL;
+}
+
+Bool
+winCheckScreenAiglxIsSupported(ScreenPtr pScreen)
+{
+    winPrivScreenPtr pWinScreen = winGetScreenPriv(pScreen);
+    winScreenInfoPtr pScreenInfo = pWinScreen->pScreenInfo;
+
+    if (pScreenInfo->fMultiWindow)
+        return TRUE;
+
+    return FALSE;
+}
+
+void
+winSetScreenAiglxIsActive(ScreenPtr pScreen)
+{
+    winPrivScreenPtr pWinScreen = winGetScreenPriv(pScreen);
+    pWinScreen->fNativeGlActive = TRUE;
+}