Re-enable the "find" dialog

2000-10-23  Havoc Pennington  <hp@redhat.com>

        * gtk/testtext.c: Re-enable the "find" dialog

	* gtk/testgtk.c: Add test for gdk_drawable_get_image

	* gdk/gdkwindow.c (gdk_window_begin_paint_region): Fix bug where
	the arguments to gdk_draw_drawable were in the wrong order
	(gdk_window_paint_init_bg): This function was ignoring the
	init_region, instead of clipping to it, so the entire backing
	pixmap was cleared on every begin_paint()
	(gdk_window_begin_paint_region): Hmm, the same list-walking bug
	was in here again, the loop kept using the same GtkWindowPaint
	over and over.
	(gdk_window_begin_paint_region): Fix a bug where we had two
	x_offset instead of x_offset and y_offset

	* gdk/gdkdraw.c (gdk_drawable_get_image): get composite drawable
	before we get the image.
	(gdk_draw_drawable): get the composite before we draw the drawable.
	(gdk_drawable_real_get_composite_drawable): default
	get_composite_drawable implementation that returns the drawable
	itself

	* gdk/gdkdrawable.h (struct _GdkDrawableClass ): Add
	get_composite_drawable virtual function

	* gdk/gdkwindow.c (gdk_window_begin_paint_region): Fix a cheesy
	list-walking bug

	* gdk/x11/gdkdrawable-x11.c (gdk_x11_draw_drawable): Add a hack to
	make this work if the source drawable is a GdkDrawableImplX11
	instead of a public drawable type. This is really broken; the
	problem is that GdkDrawable needs a virtual method get_xid(), but
	of course that doesn't work in practice. Enter RTTI.

	Also, improve mismatched depth message.

	* gdk/gdkpixmap.c (gdk_pixmap_get_image): Implement get_image for
	GdkPixmap

	* gdk/x11/gdkdrawable-x11.c (gdk_drawable_impl_x11_class_init):
	install _gdk_x11_get_image as our implementation of get_image

	* gdk/x11/gdkimage-x11.c (gdk_image_get): Rename to
	_gdk_x11_get_image and export for use in gdkdrawable-x11.c

	* gdk/gdkimage.c (gdk_image_get): Make this just a wrapper around
	gdk_drawable_get_image

	* gdk/gdkdraw.c (gdk_drawable_get_image): call virtual get_image

	* gdk/gdkdrawable.h (struct _GdkDrawableClass ): Virtualize
	get_image

	* gtk/gtktreestore.c (gtk_tree_store_get_node): remove weird
	trailing semicolon after for loop

1 files changed, 87 insertions, 4 deletions

diff --git a/gdk/gdkdraw.c b/gdk/gdkdraw.c
index 79592c944..d2c7e4016 100644
--- a/gdk/gdkdraw.c
+++ b/gdk/gdkdraw.c
@@ -28,6 +28,16 @@
 #include "gdkinternals.h"
 #include "gdkwindow.h"
 
+static GdkDrawable* gdk_drawable_real_get_composite_drawable (GdkDrawable *drawable,
+                                                              gint         x,
+                                                              gint         y,
+                                                              gint         width,
+                                                              gint         height,
+                                                              gint        *composite_x_offset,
+                                                              gint        *composite_y_offset);
+
+static void gdk_drawable_class_init (GdkDrawableClass *klass);
+
 GType
 gdk_drawable_get_type (void)
 {
@@ -40,7 +50,7 @@ gdk_drawable_get_type (void)
         sizeof (GdkDrawableClass),
         (GBaseInitFunc) NULL,
         (GBaseFinalizeFunc) NULL,
-        (GClassInitFunc) NULL,
+        (GClassInitFunc) gdk_drawable_class_init,
         NULL,           /* class_finalize */
         NULL,           /* class_data */
         sizeof (GdkDrawable),
@@ -56,6 +66,12 @@ gdk_drawable_get_type (void)
   return object_type;
 }
 
+static void
+gdk_drawable_class_init (GdkDrawableClass *klass)
+{
+  klass->get_composite_drawable = gdk_drawable_real_get_composite_drawable;
+}
+
 /* Manipulation of drawables
  */
 
@@ -323,6 +339,10 @@ gdk_draw_drawable (GdkDrawable *drawable,
 		   gint         width,
 		   gint         height)
 {
+  GdkDrawable *composite;
+  gint composite_x_offset = 0;
+  gint composite_y_offset = 0;
+
   g_return_if_fail (GDK_IS_DRAWABLE (drawable));
   g_return_if_fail (src != NULL);
   g_return_if_fail (GDK_IS_GC (gc));
@@ -340,9 +360,22 @@ gdk_draw_drawable (GdkDrawable *drawable,
         height = real_height;
     }
 
-  GDK_DRAWABLE_GET_CLASS (drawable)->draw_drawable (drawable, gc, src,
-                                                    xsrc, ysrc, xdest, ydest,
+
+  composite =
+    GDK_DRAWABLE_GET_CLASS (src)->get_composite_drawable (src,
+                                                          xsrc, ysrc,
+                                                          width, height,
+                                                          &composite_x_offset,
+                                                          &composite_y_offset);
+
+  
+  GDK_DRAWABLE_GET_CLASS (drawable)->draw_drawable (drawable, gc, composite,
+                                                    xsrc - composite_x_offset,
+                                                    ysrc - composite_y_offset,
+                                                    xdest, ydest,
                                                     width, height);
+  
+  g_object_unref (G_OBJECT (composite));
 }
 
 void
@@ -430,7 +463,6 @@ gdk_draw_glyphs (GdkDrawable      *drawable,
 		 gint              y,
 		 PangoGlyphString *glyphs)
 {
-
   g_return_if_fail (GDK_IS_DRAWABLE (drawable));
   g_return_if_fail (GDK_IS_GC (gc));
 
@@ -439,3 +471,54 @@ gdk_draw_glyphs (GdkDrawable      *drawable,
 }
 
 
+GdkImage*
+gdk_drawable_get_image (GdkDrawable *drawable,
+                        gint         x,
+                        gint         y,
+                        gint         width,
+                        gint         height)
+{
+  GdkDrawable *composite;
+  gint composite_x_offset = 0;
+  gint composite_y_offset = 0;
+  GdkImage *retval;
+  
+  g_return_val_if_fail (GDK_IS_DRAWABLE (drawable), NULL);
+  g_return_val_if_fail (x >= 0, NULL);
+  g_return_val_if_fail (y >= 0, NULL);
+  g_return_val_if_fail (width >= 0, NULL);
+  g_return_val_if_fail (height >= 0, NULL);
+
+  composite =
+    GDK_DRAWABLE_GET_CLASS (drawable)->get_composite_drawable (drawable,
+                                                               x, y,
+                                                               width, height,
+                                                               &composite_x_offset,
+                                                               &composite_y_offset); 
+  
+  retval = GDK_DRAWABLE_GET_CLASS (composite)->get_image (composite,
+                                                          x - composite_x_offset,
+                                                          y - composite_y_offset,
+                                                          width, height);
+
+  g_object_unref (G_OBJECT (composite));
+
+  return retval;
+}
+
+static GdkDrawable*
+gdk_drawable_real_get_composite_drawable (GdkDrawable *drawable,
+                                          gint         x,
+                                          gint         y,
+                                          gint         width,
+                                          gint         height,
+                                          gint        *composite_x_offset,
+                                          gint        *composite_y_offset)
+{
+  g_return_val_if_fail (GDK_IS_DRAWABLE (drawable), NULL);
+
+  *composite_x_offset = 0;
+  *composite_y_offset = 0;
+  
+  return GDK_DRAWABLE (g_object_ref (G_OBJECT (drawable)));
+}