Merge from stable.

Wed Jul  9 19:48:26 2003  Kristian Rietveld  <kris@gtk.org>

	Merge from stable.

	* gdk/gdkdisplay.c (gdk_display_get_window_at_pointer): don't
	directly return from ->window_at_pointer, but set win_x and win_y
	first if needed. (Fixes #110166, reported by Arno Charlet).

	* gdk/gdkwindow.c (gdk_window_get_composite_drawable): change
	function to accept GdkDrawables and not just GdkWindows. This was
	already done in some other functions a while back, but this patch
	got lost for some reason.

ChangeLog

@@ -1,3 +1,16 @@
+Wed Jul  9 19:48:26 2003  Kristian Rietveld  <kris@gtk.org>
+
+	Merge from stable.
+
+	* gdk/gdkdisplay.c (gdk_display_get_window_at_pointer): don't
+	directly return from ->window_at_pointer, but set win_x and win_y
+	first if needed. (Fixes #110166, reported by Arno Charlet).
+
+	* gdk/gdkwindow.c (gdk_window_get_composite_drawable): change
+	function to accept GdkDrawables and not just GdkWindows. This was
+	already done in some other functions a while back, but this patch
+	got lost for some reason.
+
 2003-07-09  Matthias Clasen  <maclas@gmx.de>
 
 	* gtk/gtkcontainer.c (gtk_container_focus_sort_tab): Consider the text direction

ChangeLog.pre-2-10

@@ -1,3 +1,16 @@
+Wed Jul  9 19:48:26 2003  Kristian Rietveld  <kris@gtk.org>
+
+	Merge from stable.
+
+	* gdk/gdkdisplay.c (gdk_display_get_window_at_pointer): don't
+	directly return from ->window_at_pointer, but set win_x and win_y
+	first if needed. (Fixes #110166, reported by Arno Charlet).
+
+	* gdk/gdkwindow.c (gdk_window_get_composite_drawable): change
+	function to accept GdkDrawables and not just GdkWindows. This was
+	already done in some other functions a while back, but this patch
+	got lost for some reason.
+
 2003-07-09  Matthias Clasen  <maclas@gmx.de>
 
 	* gtk/gtkcontainer.c (gtk_container_focus_sort_tab): Consider the text direction

ChangeLog.pre-2-4

@@ -1,3 +1,16 @@
+Wed Jul  9 19:48:26 2003  Kristian Rietveld  <kris@gtk.org>
+
+	Merge from stable.
+
+	* gdk/gdkdisplay.c (gdk_display_get_window_at_pointer): don't
+	directly return from ->window_at_pointer, but set win_x and win_y
+	first if needed. (Fixes #110166, reported by Arno Charlet).
+
+	* gdk/gdkwindow.c (gdk_window_get_composite_drawable): change
+	function to accept GdkDrawables and not just GdkWindows. This was
+	already done in some other functions a while back, but this patch
+	got lost for some reason.
+
 2003-07-09  Matthias Clasen  <maclas@gmx.de>
 
 	* gtk/gtkcontainer.c (gtk_container_focus_sort_tab): Consider the text direction

ChangeLog.pre-2-6

@@ -1,3 +1,16 @@
+Wed Jul  9 19:48:26 2003  Kristian Rietveld  <kris@gtk.org>
+
+	Merge from stable.
+
+	* gdk/gdkdisplay.c (gdk_display_get_window_at_pointer): don't
+	directly return from ->window_at_pointer, but set win_x and win_y
+	first if needed. (Fixes #110166, reported by Arno Charlet).
+
+	* gdk/gdkwindow.c (gdk_window_get_composite_drawable): change
+	function to accept GdkDrawables and not just GdkWindows. This was
+	already done in some other functions a while back, but this patch
+	got lost for some reason.
+
 2003-07-09  Matthias Clasen  <maclas@gmx.de>
 
 	* gtk/gtkcontainer.c (gtk_container_focus_sort_tab): Consider the text direction

ChangeLog.pre-2-8

@@ -1,3 +1,16 @@
+Wed Jul  9 19:48:26 2003  Kristian Rietveld  <kris@gtk.org>
+
+	Merge from stable.
+
+	* gdk/gdkdisplay.c (gdk_display_get_window_at_pointer): don't
+	directly return from ->window_at_pointer, but set win_x and win_y
+	first if needed. (Fixes #110166, reported by Arno Charlet).
+
+	* gdk/gdkwindow.c (gdk_window_get_composite_drawable): change
+	function to accept GdkDrawables and not just GdkWindows. This was
+	already done in some other functions a while back, but this patch
+	got lost for some reason.
+
 2003-07-09  Matthias Clasen  <maclas@gmx.de>
 
 	* gtk/gtkcontainer.c (gtk_container_focus_sort_tab): Consider the text direction

gdk/gdkdisplay.c

@@ -494,15 +494,18 @@ gdk_display_get_window_at_pointer (GdkDisplay *display,
 				   gint       *win_y)
 {
   gint tmp_x, tmp_y;
+  GdkWindow *window;
 
   g_return_val_if_fail (GDK_IS_DISPLAY (display), NULL);
-  
-  return display->pointer_hooks->window_at_pointer (display, &tmp_x, &tmp_y);
+
+  window = display->pointer_hooks->window_at_pointer (display, &tmp_x, &tmp_y);
 
   if (win_x)
     *win_x = tmp_x;
   if (win_y)
     *win_y = tmp_y;
+
+  return window;
 }
 
 /**

gdk/gdkwindow.c

@@ -1421,7 +1421,7 @@ gdk_window_draw_text_wc (GdkDrawable    *drawable,
 }
 
 static GdkDrawable*
-gdk_window_get_composite_drawable (GdkDrawable *window,
+gdk_window_get_composite_drawable (GdkDrawable *drawable,
                                    gint         x,
                                    gint         y,
                                    gint         width,
@@ -1429,7 +1429,7 @@ gdk_window_get_composite_drawable (GdkDrawable *window,
                                    gint        *composite_x_offset,
                                    gint        *composite_y_offset)
 {
-  GdkWindowObject *private = (GdkWindowObject *)window;
+  GdkWindowObject *private = (GdkWindowObject *)drawable;
   GdkWindowPaint *paint;
   GdkRegion *buffered_region;
   GSList *tmp_list;
@@ -1441,14 +1441,15 @@ gdk_window_get_composite_drawable (GdkDrawable *window,
   gint windowing_x_offset, windowing_y_offset;
   gint buffer_x_offset, buffer_y_offset;
 
-  if (GDK_WINDOW_DESTROYED (window) || private->paint_stack == NULL)
+  if ((GDK_IS_WINDOW (drawable) && GDK_WINDOW_DESTROYED (drawable))
+      || private->paint_stack == NULL)
     {
       /* No backing store */
-      _gdk_windowing_window_get_offsets (window,
+      _gdk_windowing_window_get_offsets (drawable,
                                          composite_x_offset,
                                          composite_y_offset);
       
-      return g_object_ref (window);
+      return g_object_ref (drawable);
     }
   
   buffered_region = NULL;
@@ -1494,20 +1495,20 @@ gdk_window_get_composite_drawable (GdkDrawable *window,
     {
       gdk_region_destroy (buffered_region);
 
-      _gdk_windowing_window_get_offsets (window,
+      _gdk_windowing_window_get_offsets (drawable,
                                          composite_x_offset,
                                          composite_y_offset);
 
-      return g_object_ref (window);
+      return g_object_ref (drawable);
     }
   
-  tmp_pixmap = gdk_pixmap_new (window,
+  tmp_pixmap = gdk_pixmap_new (drawable,
                                width, height,
                                -1);
 
   tmp_gc = gdk_gc_new (tmp_pixmap);
 
-  _gdk_windowing_window_get_offsets (window,
+  _gdk_windowing_window_get_offsets (drawable,
                                      &windowing_x_offset,
                                      &windowing_y_offset);