From: Paul Cornett <paulcor@bullseye.com>
Date: Tue, 20 May 2008 03:27:12 +0000 (+0000)
Subject: put frame extents XGetWindowProperty code in one place
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/166b4de727d502df57d9dc8764f5047911032b59

put frame extents XGetWindowProperty code in one place

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53661 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/src/gtk/settings.cpp b/src/gtk/settings.cpp
index 1be34246f3..2cbc4b0875 100644
--- a/src/gtk/settings.cpp
+++ b/src/gtk/settings.cpp
@@ -26,9 +26,8 @@
     #undef GTK_DISABLE_DEPRECATED
 #endif
 #include <gtk/gtk.h>
-#include <gdk/gdkx.h>
 
-#include <X11/Xatom.h>
+bool wxGetFrameExtents(GdkWindow* window, int* left, int* right, int* top, int* bottom);
 
 // ----------------------------------------------------------------------------
 // wxSystemObjects
@@ -415,53 +414,6 @@ wxFont wxSystemSettingsNative::GetFont( wxSystemFont index )
     return font;
 }
 
-static bool GetFrameExtents(GdkWindow* window, int* left, int* right, int* top, int* bottom)
-{
-    bool success = false;
-    Atom property = 0;
-    if (gdk_x11_screen_supports_net_wm_hint(
-            gdk_drawable_get_screen(window),
-            gdk_atom_intern("_NET_FRAME_EXTENTS", false)))
-    {
-        success = true;
-        property = gdk_x11_get_xatom_by_name_for_display(
-            gdk_drawable_get_display(window),
-            "_NET_FRAME_EXTENTS");
-    }
-
-    if (success)
-    {
-        Atom type;
-        int format;
-        gulong nitems, bytes_after;
-        guchar* data;
-        success = XGetWindowProperty(
-            gdk_x11_drawable_get_xdisplay(window),
-            gdk_x11_drawable_get_xid(window),
-            property,
-            0, 4,
-            false,
-            XA_CARDINAL,
-            &type, &format, &nitems, &bytes_after, &data
-            ) == Success;
-        if (success)
-        {
-            success = data && nitems == 4;
-            if (success)
-            {
-                long* p = (long*)data;
-                if (left)   *left   = int(p[0]);
-                if (right)  *right  = int(p[1]);
-                if (top)    *top    = int(p[2]);
-                if (bottom) *bottom = int(p[3]);
-            }
-            if (data)
-                XFree(data);
-        }
-    }
-    return success;
-}
-
 // helper: return the GtkSettings either for the screen the current window is
 // on or for the default screen if window is NULL
 static GtkSettings *GetSettingsForWindowScreen(GdkWindow *window)
@@ -497,7 +449,7 @@ int wxSystemSettingsNative::GetMetric( wxSystemMetric index, wxWindow* win )
                     // In most cases the top extent is the titlebar, so we use the bottom extent
                     // for the heights.
                     int right, bottom;
-                    if (GetFrameExtents(window, NULL, &right, NULL, &bottom))
+                    if (wxGetFrameExtents(window, NULL, &right, NULL, &bottom))
                     {
                         switch (index)
                         {
@@ -583,7 +535,7 @@ int wxSystemSettingsNative::GetMetric( wxSystemMetric index, wxWindow* win )
             // Reconsider when we have a way to report to the user on which side it is.
             {
                 int top;
-                if (GetFrameExtents(window, NULL, NULL, &top, NULL))
+                if (wxGetFrameExtents(window, NULL, NULL, &top, NULL))
                 {
                     return top; // top frame extent
                 }
diff --git a/src/gtk/toplevel.cpp b/src/gtk/toplevel.cpp
index f54484436b..d87eec8b6a 100644
--- a/src/gtk/toplevel.cpp
+++ b/src/gtk/toplevel.cpp
@@ -375,6 +375,37 @@ gtk_frame_unmap_callback( GtkWidget * WXUNUSED(widget),
 }
 }
 
+//-----------------------------------------------------------------------------
+
+bool wxGetFrameExtents(GdkWindow* window, int* left, int* right, int* top, int* bottom)
+{
+    static GdkAtom property = gdk_atom_intern("_NET_FRAME_EXTENTS", false);
+    Atom xproperty = gdk_x11_atom_to_xatom_for_display(
+                        gdk_drawable_get_display(window), property);
+    Atom type;
+    int format;
+    gulong nitems, bytes_after;
+    guchar* data;
+    Status status = XGetWindowProperty(
+        gdk_x11_drawable_get_xdisplay(window),
+        gdk_x11_drawable_get_xid(window),
+        xproperty,
+        0, 4, false, XA_CARDINAL,
+        &type, &format, &nitems, &bytes_after, &data);
+    const bool success = status == Success && data && nitems == 4;
+    if (success)
+    {
+        long* p = (long*)data;
+        if (left)   *left   = int(p[0]);
+        if (right)  *right  = int(p[1]);
+        if (top)    *top    = int(p[2]);
+        if (bottom) *bottom = int(p[3]);
+    }
+    if (data)
+        XFree(data);
+    return success;
+}
+
 //-----------------------------------------------------------------------------
 // "property_notify_event" from m_widget
 //-----------------------------------------------------------------------------
@@ -387,27 +418,13 @@ static gboolean property_notify_event(
     static GdkAtom property = gdk_atom_intern("_NET_FRAME_EXTENTS", false);
     if (event->state == GDK_PROPERTY_NEW_VALUE && event->atom == property)
     {
-        Atom xproperty = gdk_x11_atom_to_xatom_for_display(
-                            gdk_drawable_get_display(event->window), property);
-        Atom type;
-        int format;
-        gulong nitems, bytes_after;
-        guchar* data;
-        Status status = XGetWindowProperty(
-            gdk_x11_drawable_get_xdisplay(event->window),
-            gdk_x11_drawable_get_xid(event->window),
-            xproperty,
-            0, 4, false, XA_CARDINAL,
-            &type, &format, &nitems, &bytes_after, &data);
-        if (status == Success && data && nitems == 4)
+        int left, right, top, bottom;
+        if (wxGetFrameExtents(event->window, &left, &right, &top, &bottom))
         {
-            long* p = (long*)data;
             const wxSize decorSize =
-                wxSize(int(p[0] + p[1]), int(p[2] + p[3]));
+                wxSize(left + right, top + bottom);
             win->GTKUpdateDecorSize(decorSize);
         }
-        if (data)
-            XFree(data);
     }
     return false;
 }