X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Fx11%2Ffg_state_x11.c;h=43c0ab5edadeb3571e2fb7d1e5c1b77091b1e21a;hb=b722c14d5e7cf18d5da885efa00051f585c3bf51;hp=cb551099230cd3f17196b5e0accb05aa169cbd80;hpb=0e653a9d94fec583f7a4172b721c1c599e06cbc8;p=freeglut

diff --git a/src/x11/fg_state_x11.c b/src/x11/fg_state_x11.c
index cb55109..43c0ab5 100644
--- a/src/x11/fg_state_x11.c
+++ b/src/x11/fg_state_x11.c
@@ -29,6 +29,8 @@
 #include "fg_internal.h"
 #ifdef EGL_VERSION_1_0
 #include "egl/fg_state_egl.h"
+#else
+#include "x11/fg_state_x11_glx.h"
 #endif
 
 int fgPlatformGlutDeviceGet ( GLenum eWhat )
@@ -82,19 +84,25 @@ int fgPlatformGlutGet ( GLenum eWhat )
      */
     case GLUT_WINDOW_X:
     case GLUT_WINDOW_Y:
-    case GLUT_WINDOW_BORDER_WIDTH:
-    case GLUT_WINDOW_HEADER_HEIGHT:
     {
         int x, y;
-        Window w;
+        Window p,w;
 
         if( fgStructure.CurrentWindow == NULL )
             return 0;
 
+        if (fgStructure.CurrentWindow->Parent)
+            /* For child window, we should return relative to upper-left
+             * of parent's client area.
+             */
+            p = fgStructure.CurrentWindow->Parent->Window.Handle;
+        else
+            p = fgDisplay.pDisplay.RootWindow;
+            
         XTranslateCoordinates(
             fgDisplay.pDisplay.Display,
             fgStructure.CurrentWindow->Window.Handle,
-            fgDisplay.pDisplay.RootWindow,
+            p,
             0, 0, &x, &y, &w);
 
         switch ( eWhat )
@@ -102,18 +110,71 @@ int fgPlatformGlutGet ( GLenum eWhat )
         case GLUT_WINDOW_X: return x;
         case GLUT_WINDOW_Y: return y;
         }
-
-        if ( w == 0 )
+    }
+    
+    case GLUT_WINDOW_BORDER_WIDTH:
+    case GLUT_WINDOW_HEADER_HEIGHT:
+    {
+        Atom actual_type, net_extents;
+        int actual_format;
+        unsigned long nitems, bytes_after;
+        unsigned char *data = NULL;
+        int result, top, left;
+        
+        if (fgStructure.CurrentWindow == NULL || fgStructure.CurrentWindow->Parent)
+            /* can't get widths/heights if no current window
+             * and child windows don't have borders */
             return 0;
-        XTranslateCoordinates(
-            fgDisplay.pDisplay.Display,
-            fgStructure.CurrentWindow->Window.Handle,
-            w, 0, 0, &x, &y, &w);
+        
+        /* try to get through _NET_FRAME_EXTENTS */
+        net_extents = XInternAtom(fgDisplay.pDisplay.Display, "_NET_FRAME_EXTENTS", False);
+        
+        result = XGetWindowProperty(
+            fgDisplay.pDisplay.Display, fgStructure.CurrentWindow->Window.Handle, net_extents,
+            0, 4, False, AnyPropertyType, 
+            &actual_type, &actual_format, 
+            &nitems, &bytes_after, &data);
+
+        if (result == Success && nitems == 4 && bytes_after == 0)
+            /* got the data we expected, here's to hoping that
+             * _NET_FRAME_EXTENTS is supported and the data
+             * contain sensible values */
+        {
+            long *extents = (long *)data;
+            left = (int) extents[0]; /* we take left as border width, consistent with old logic. bottom and right better be the same... */
+            top  = (int) extents[2];
+        }
+        else
+        {
+            /* try in the previous way as fall-back */
+            Window w;
+            int x,y;
+            
+            XTranslateCoordinates(
+                fgDisplay.pDisplay.Display,
+                fgStructure.CurrentWindow->Window.Handle,
+                fgDisplay.pDisplay.RootWindow,
+                0, 0, &x, &y, &w);
+            
+            if (w == 0)
+                /* logic below needs w */
+                return 0;
+            
+            XTranslateCoordinates(
+                fgDisplay.pDisplay.Display,
+                fgStructure.CurrentWindow->Window.Handle,
+                w, 0, 0, &x, &y, &w);  
+            
+            left = x;
+            top  = y;
+        }
+        if (result == Success)
+            XFree(data);
 
         switch ( eWhat )
         {
-        case GLUT_WINDOW_BORDER_WIDTH:  return x;
-        case GLUT_WINDOW_HEADER_HEIGHT: return y;
+        case GLUT_WINDOW_BORDER_WIDTH:  return left;
+        case GLUT_WINDOW_HEADER_HEIGHT: return top;
         }
     }
 
@@ -153,6 +214,7 @@ int fgPlatformGlutGet ( GLenum eWhat )
         else
         {
           XVisualInfo * visualInfo;
+		  int result;
 #ifdef EGL_VERSION_1_0
 	  EGLint vid = 0;
 	  XVisualInfo visualTemplate;
@@ -164,13 +226,15 @@ int fgPlatformGlutGet ( GLenum eWhat )
 	  visualTemplate.visualid = vid;
 	  visualInfo = XGetVisualInfo(fgDisplay.pDisplay.Display, VisualIDMask, &visualTemplate, &num_visuals);
 #else
+	  {
           const GLXFBConfig fbconfig =
                 fgStructure.CurrentWindow->Window.pContext.FBConfig;
 
           visualInfo =
                 glXGetVisualFromFBConfig( fgDisplay.pDisplay.Display, fbconfig );
+	  }
 #endif
-          const int result = visualInfo->visual->map_entries;
+          result = visualInfo->visual->map_entries;
 
           XFree(visualInfo);