commit ced71edbd773b0eb56dd49137fd14a7dcd5631bf
author Alexandre Julliard <julliard@winehq.org> Sat Mar 23 21:43:56 2002 +0000
committer Alexandre Julliard <julliard@winehq.org> Sat Mar 23 21:43:56 2002 +0000
tree 38177cfca210ed14b6b1e3c8178c817ffac3d620
parent 65dbf4f64721d4ed0c40845ed68a982a26e8c455

Added support for driver-specific escapes in the x11drv to retrieve
X11 information. Finished dll separation of opengl32.

graphics/x11drv/init.c

diff --git a/graphics/x11drv/init.c b/graphics/x11drv/init.c
index da0680e..dc7001f 100644
--- a/graphics/x11drv/init.c
+++ b/graphics/x11drv/init.c
@@ -29,6 +29,7 @@
 #include "wine/debug.h"
 #include "winnt.h"
 #include "x11drv.h"
+#include "x11font.h"
 #include "ddrawi.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(x11drv);
@@ -286,6 +287,8 @@
 INT X11DRV_ExtEscape( DC *dc, INT escape, INT in_count, LPCVOID in_data,
                       INT out_count, LPVOID out_data )
 {
+    X11DRV_PDEVICE *physDev = (X11DRV_PDEVICE *)dc->physDev;
+
     switch(escape)
     {
     case QUERYESCSUPPORT:
@@ -295,6 +298,8 @@
             {
             case DCICOMMAND:
                 return DD_HAL_VERSION;
+            case X11DRV_ESCAPE:
+                return TRUE;
             }
         }
         break;
@@ -307,6 +312,36 @@
             return X11DRV_DCICommand(in_count, lpCmd, out_data);
         }
         break;
+
+    case X11DRV_ESCAPE:
+        if (in_data && in_count >= sizeof(enum x11drv_escape_codes))
+        {
+            switch(*(enum x11drv_escape_codes *)in_data)
+            {
+            case X11DRV_GET_DISPLAY:
+                if (out_count >= sizeof(Display *))
+                {
+                    *(Display **)out_data = gdi_display;
+                    return TRUE;
+                }
+                break;
+            case X11DRV_GET_DRAWABLE:
+                if (out_count >= sizeof(Drawable))
+                {
+                    *(Drawable *)out_data = physDev->drawable;
+                    return TRUE;
+                }
+                break;
+            case X11DRV_GET_FONT:
+                if (out_count >= sizeof(Font))
+                {
+                    fontObject* pfo = XFONT_GetFontObject( physDev->font );
+                    *(Font *)out_data = pfo->fs->fid;
+                    return TRUE;
+                }
+            }
+        }
+        break;
     }
     return 0;
 }