From b37e0373ef31475064d1b31515c4e4474ac7f532 Mon Sep 17 00:00:00 2001 From: Manish Singh Date: Thu, 20 Jan 2005 02:58:03 +0000 Subject: [PATCH] Call GDK_DISPLAY_XDISPLAY with a display, not a window. Clean up the Wed Jan 19 18:57:02 2005 Manish Singh * gdk/x11/gdkwindow-x11.c (gdk_window_get_frame_extents): Call GDK_DISPLAY_XDISPLAY with a display, not a window. Clean up the function a bit too. --- ChangeLog | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ ChangeLog.pre-2-8 | 6 ++++++ gdk/x11/gdkwindow-x11.c | 31 +++++++++++++++++-------------- 4 files changed, 35 insertions(+), 14 deletions(-) diff --git a/ChangeLog b/ChangeLog index b0eef4bb1c..9739972812 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Wed Jan 19 18:57:02 2005 Manish Singh + + * gdk/x11/gdkwindow-x11.c (gdk_window_get_frame_extents): Call + GDK_DISPLAY_XDISPLAY with a display, not a window. Clean up the + function a bit too. + Wed Jan 19 17:17:31 2005 Manish Singh * gdk/x11/gdkwindow-x11.c (gdk_window_get_frame_extents): Squash diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index b0eef4bb1c..9739972812 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +Wed Jan 19 18:57:02 2005 Manish Singh + + * gdk/x11/gdkwindow-x11.c (gdk_window_get_frame_extents): Call + GDK_DISPLAY_XDISPLAY with a display, not a window. Clean up the + function a bit too. + Wed Jan 19 17:17:31 2005 Manish Singh * gdk/x11/gdkwindow-x11.c (gdk_window_get_frame_extents): Squash diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index b0eef4bb1c..9739972812 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +Wed Jan 19 18:57:02 2005 Manish Singh + + * gdk/x11/gdkwindow-x11.c (gdk_window_get_frame_extents): Call + GDK_DISPLAY_XDISPLAY with a display, not a window. Clean up the + function a bit too. + Wed Jan 19 17:17:31 2005 Manish Singh * gdk/x11/gdkwindow-x11.c (gdk_window_get_frame_extents): Squash diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c index 040b32baaa..d9146ac9bf 100644 --- a/gdk/x11/gdkwindow-x11.c +++ b/gdk/x11/gdkwindow-x11.c @@ -3137,14 +3137,14 @@ gdk_window_get_frame_extents (GdkWindow *window, guchar *data; Window *vroots; Atom type_return; - unsigned int nchildren; - unsigned int nvroots; - unsigned long nitems_return; - unsigned long bytes_after_return; - int format_return; - int i; - unsigned int ww, wh, wb, wd; - int wx, wy; + guint nchildren; + guint nvroots; + gulong nitems_return; + gulong bytes_after_return; + gint format_return; + gint i; + guint ww, wh, wb, wd; + gint wx, wy; g_return_if_fail (GDK_IS_WINDOW (window)); g_return_if_fail (rect != NULL); @@ -3174,14 +3174,15 @@ gdk_window_get_frame_extents (GdkWindow *window, /* use NETWM_VIRTUAL_ROOTS if available */ display = gdk_drawable_get_display (window); - root = GDK_WINDOW_XID (gdk_screen_get_root_window (GDK_WINDOW_SCREEN (window))); + root = GDK_WINDOW_XROOTWIN (window); + nvroots = 0; vroots = NULL; - if (XGetWindowProperty (GDK_DISPLAY_XDISPLAY (display), - root, + + if (XGetWindowProperty (GDK_DISPLAY_XDISPLAY (display), root, gdk_x11_get_xatom_by_name_for_display (display, "_NET_VIRTUAL_ROOTS"), - 0, 0x7fffffff, False, XA_WINDOW, &type_return, + 0, G_MAXLONG, False, XA_WINDOW, &type_return, &format_return, &nitems_return, &bytes_after_return, &data) == Success) @@ -3194,10 +3195,12 @@ gdk_window_get_frame_extents (GdkWindow *window, } xparent = GDK_WINDOW_XID (window); + do { xwindow = xparent; - if (!XQueryTree (GDK_DISPLAY_XDISPLAY (window), xwindow, + + if (!XQueryTree (GDK_DISPLAY_XDISPLAY (display), xwindow, &root, &xparent, &children, &nchildren)) goto fail; @@ -3217,7 +3220,7 @@ gdk_window_get_frame_extents (GdkWindow *window, } while (xparent != root); - if (XGetGeometry (GDK_DISPLAY_XDISPLAY (window), xwindow, + if (XGetGeometry (GDK_DISPLAY_XDISPLAY (display), xwindow, &root, &wx, &wy, &ww, &wh, &wb, &wd)) { rect->x = wx;