]> Pileus Git - ~andy/gtk/blobdiff - gdk/gdkdraw.c
Use depth - 1 to index the cached gcs, not depth. (#139494)
[~andy/gtk] / gdk / gdkdraw.c
index b4de48a2f56f293a9a7190c6558a9bdbb80d2b41..7d77eaed01c6daacea0d466701fa2a52cdd9e4f6 100644 (file)
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
  */
 
+#include <config.h>
 #include "gdkdrawable.h"
 #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 GdkRegion *  gdk_drawable_real_get_visible_region     (GdkDrawable *drawable);
+#include "gdkscreen.h"
+#include "gdk-pixbuf-private.h"
+#include "gdkpixbuf.h"
+
+static GdkImage*    gdk_drawable_real_get_image (GdkDrawable     *drawable,
+                                                gint             x,
+                                                gint             y,
+                                                gint             width,
+                                                gint             height);
+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 GdkRegion *  gdk_drawable_real_get_visible_region     (GdkDrawable  *drawable);
+static void         gdk_drawable_real_draw_pixbuf            (GdkDrawable  *drawable,
+                                                             GdkGC        *gc,
+                                                             GdkPixbuf    *pixbuf,
+                                                             gint          src_x,
+                                                             gint          src_y,
+                                                             gint          dest_x,
+                                                             gint          dest_y,
+                                                             gint          width,
+                                                             gint          height,
+                                                             GdkRgbDither  dither,
+                                                             gint          x_dither,
+                                                             gint          y_dither);
 
 static void gdk_drawable_class_init (GdkDrawableClass *klass);
 
@@ -61,7 +82,8 @@ gdk_drawable_get_type (void)
       
       object_type = g_type_register_static (G_TYPE_OBJECT,
                                             "GdkDrawable",
-                                            &object_info, 0);
+                                            &object_info, 
+                                           G_TYPE_FLAG_ABSTRACT);
     }  
 
   return object_type;
@@ -70,10 +92,12 @@ gdk_drawable_get_type (void)
 static void
 gdk_drawable_class_init (GdkDrawableClass *klass)
 {
+  klass->get_image = gdk_drawable_real_get_image;
   klass->get_composite_drawable = gdk_drawable_real_get_composite_drawable;
   /* Default implementation for clip and visible region is the same */
   klass->get_clip_region = gdk_drawable_real_get_visible_region;
   klass->get_visible_region = gdk_drawable_real_get_visible_region;
+  klass->draw_pixbuf = gdk_drawable_real_draw_pixbuf;
 }
 
 /* Manipulation of drawables
@@ -133,6 +157,10 @@ gdk_drawable_get_data (GdkDrawable   *drawable,
  * Fills *@width and *@height with the size of @drawable.
  * @width or @height can be %NULL if you only want the other one.
  * 
+ * On the X11 platform, if @drawable is a #GdkWindow, the returned
+ * size is the size reported in the most-recently-processed configure
+ * event, rather than the current size on the X server.
+ * 
  **/
 void
 gdk_drawable_get_size (GdkDrawable *drawable,
@@ -177,7 +205,42 @@ gdk_drawable_get_depth (GdkDrawable *drawable)
 
   return GDK_DRAWABLE_GET_CLASS (drawable)->get_depth (drawable);
 }
+/**
+ * gdk_drawable_get_screen:
+ * @drawable: a #GdkDrawable
+ * 
+ * Gets the #GdkScreen associated with a #GdkDrawable.
+ * 
+ * Return value: the #GdkScreen associated with @drawable
+ *
+ * Since: 2.2
+ **/
+GdkScreen*
+gdk_drawable_get_screen(GdkDrawable *drawable)
+{
+  g_return_val_if_fail (GDK_IS_DRAWABLE (drawable), NULL);
+
+  return GDK_DRAWABLE_GET_CLASS (drawable)->get_screen (drawable);
+}
 
+/**
+ * gdk_drawable_get_display:
+ * @drawable: a #GdkDrawable
+ * 
+ * Gets the #GdkDisplay associated with a #GdkDrawable.
+ * 
+ * Return value: the #GdkDisplay associated with @drawable
+ *
+ * Since: 2.2
+ **/
+GdkDisplay*
+gdk_drawable_get_display (GdkDrawable *drawable)
+{
+  g_return_val_if_fail (GDK_IS_DRAWABLE (drawable), NULL);
+  
+  return gdk_screen_get_display (gdk_drawable_get_screen (drawable));
+}
+       
 /**
  * gdk_drawable_set_colormap:
  * @drawable: a #GdkDrawable
@@ -233,7 +296,7 @@ gdk_drawable_get_colormap (GdkDrawable *drawable)
 GdkDrawable*
 gdk_drawable_ref (GdkDrawable *drawable)
 {
-  return (GdkDrawable *) g_object_ref (G_OBJECT (drawable));
+  return (GdkDrawable *) g_object_ref (drawable);
 }
 
 /**
@@ -248,11 +311,22 @@ gdk_drawable_unref (GdkDrawable *drawable)
 {
   g_return_if_fail (GDK_IS_DRAWABLE (drawable));
 
-  g_object_unref (G_OBJECT (drawable));
+  g_object_unref (drawable);
 }
 
 /* Drawing
  */
+
+/**
+ * gdk_draw_point:
+ * @drawable: a #GdkDrawable (a #GdkWindow or a #GdkPixmap).
+ * @gc: a #GdkGC.
+ * @x: the x coordinate of the point.
+ * @y: the y coordinate of the point.
+ * 
+ * Draws a point, using the foreground color and other attributes of 
+ * the #GdkGC.
+ **/
 void
 gdk_draw_point (GdkDrawable *drawable,
                 GdkGC       *gc,
@@ -270,6 +344,18 @@ gdk_draw_point (GdkDrawable *drawable,
   GDK_DRAWABLE_GET_CLASS (drawable)->draw_points (drawable, gc, &point, 1);
 }
 
+/**
+ * gdk_draw_line:
+ * @drawable: a #GdkDrawable (a #GdkWindow or a #GdkPixmap). 
+ * @gc: a #GdkGC.
+ * @x1_: the x coordinate of the start point.
+ * @y1_: the y coordinate of the start point.
+ * @x2_: the x coordinate of the end point.
+ * @y2_: the y coordinate of the end point.
+ * 
+ * Draws a line, using the foreground color and other attributes of 
+ * the #GdkGC.
+ **/
 void
 gdk_draw_line (GdkDrawable *drawable,
               GdkGC       *gc,
@@ -292,10 +378,31 @@ gdk_draw_line (GdkDrawable *drawable,
   GDK_DRAWABLE_GET_CLASS (drawable)->draw_segments (drawable, gc, &segment, 1);
 }
 
+/**
+ * gdk_draw_rectangle:
+ * @drawable: a #GdkDrawable (a #GdkWindow or a #GdkPixmap).
+ * @gc: a #GdkGC.
+ * @filled: %TRUE if the rectangle should be filled.
+ * @x: the x coordinate of the left edge of the rectangle.
+ * @y: the y coordinate of the top edge of the rectangle.
+ * @width: the width of the rectangle.
+ * @height: the height of the rectangle.
+ * 
+ * Draws a rectangular outline or filled rectangle, using the foreground color
+ * and other attributes of the #GdkGC.
+ *
+ * A rectangle drawn filled is 1 pixel smaller in both dimensions than a 
+ * rectangle outlined. Calling 
+ * <literal>gdk_draw_rectangle (window, gc, TRUE, 0, 0, 20, 20)</literal> 
+ * results in a filled rectangle 20 pixels wide and 20 pixels high. Calling
+ * <literal>gdk_draw_rectangle (window, gc, FALSE, 0, 0, 20, 20)</literal> 
+ * results in an outlined rectangle with corners at (0, 0), (0, 20), (20, 20),
+ * and (20, 0), which makes it 21 pixels wide and 21 pixels high.
+ **/
 void
 gdk_draw_rectangle (GdkDrawable *drawable,
                    GdkGC       *gc,
-                   gint         filled,
+                   gboolean     filled,
                    gint         x,
                    gint         y,
                    gint         width,
@@ -321,10 +428,28 @@ gdk_draw_rectangle (GdkDrawable *drawable,
                                                      width, height);
 }
 
+/**
+ * gdk_draw_arc:
+ * @drawable: a #GdkDrawable (a #GdkWindow or a #GdkPixmap).
+ * @gc: a #GdkGC.
+ * @filled: %TRUE if the arc should be filled, producing a 'pie slice'.
+ * @x: the x coordinate of the left edge of the bounding rectangle.
+ * @y: the y coordinate of the top edge of the bounding rectangle.
+ * @width: the width of the bounding rectangle.
+ * @height: the height of the bounding rectangle.
+ * @angle1: the start angle of the arc, relative to the 3 o'clock position,
+ *     counter-clockwise, in 1/64ths of a degree.
+ * @angle2: the end angle of the arc, relative to @angle1, in 1/64ths 
+ *     of a degree.
+ * 
+ * Draws an arc or a filled 'pie slice'. The arc is defined by the bounding
+ * rectangle of the entire ellipse, and the start and end angles of the part 
+ * of the ellipse to be drawn.
+ **/
 void
 gdk_draw_arc (GdkDrawable *drawable,
              GdkGC       *gc,
-             gint         filled,
+             gboolean     filled,
              gint         x,
              gint         y,
              gint         width,
@@ -352,10 +477,23 @@ gdk_draw_arc (GdkDrawable *drawable,
                                                x, y, width, height, angle1, angle2);
 }
 
+/**
+ * gdk_draw_polygon:
+ * @drawable: a #GdkDrawable (a #GdkWindow or a #GdkPixmap).
+ * @gc: a #GdkGC.
+ * @filled: %TRUE if the polygon should be filled. The polygon is closed
+ *     automatically, connecting the last point to the first point if 
+ *     necessary.
+ * @points: an array of #GdkPoint structures specifying the points making 
+ *     up the polygon.
+ * @npoints: the number of points.
+ * 
+ * Draws an outlined or filled polygon.
+ **/
 void
 gdk_draw_polygon (GdkDrawable *drawable,
                  GdkGC       *gc,
-                 gint         filled,
+                 gboolean     filled,
                  GdkPoint    *points,
                  gint         npoints)
 {
@@ -372,6 +510,19 @@ gdk_draw_polygon (GdkDrawable *drawable,
  *
  * Interface changed: add "GdkFont *font" to specify font or fontset explicitely
  */
+/**
+ * gdk_draw_string:
+ * @drawable: a #GdkDrawable (a #GdkWindow or a #GdkPixmap).
+ * @font: a #GdkFont.
+ * @gc: a #GdkGC.
+ * @x: the x coordinate of the left edge of the text.
+ * @y: the y coordinate of the baseline of the text.
+ * @string:  the string of characters to draw.
+ * 
+ * Draws a string of characters in the given font or fontset.
+ * 
+ * Deprecated: Use gdk_draw_layout() instead.
+ **/
 void
 gdk_draw_string (GdkDrawable *drawable,
                 GdkFont     *font,
@@ -389,6 +540,20 @@ gdk_draw_string (GdkDrawable *drawable,
  *
  * Interface changed: add "GdkFont *font" to specify font or fontset explicitely
  */
+/**
+ * gdk_draw_text:
+ * @drawable: a #GdkDrawable (a #GdkWindow or a #GdkPixmap).
+ * @font: a #GdkFont.
+ * @gc: a #GdkGC.
+ * @x: the x coordinate of the left edge of the text.
+ * @y: the y coordinate of the baseline of the text.
+ * @text:  the characters to draw.
+ * @text_length: the number of characters of @text to draw.
+ * 
+ * Draws a number of characters in the given font or fontset.
+ *
+ * Deprecated: Use gdk_draw_layout() instead.
+ **/
 void
 gdk_draw_text (GdkDrawable *drawable,
               GdkFont     *font,
@@ -406,6 +571,22 @@ gdk_draw_text (GdkDrawable *drawable,
   GDK_DRAWABLE_GET_CLASS (drawable)->draw_text (drawable, font, gc, x, y, text, text_length);
 }
 
+/**
+ * gdk_draw_text_wc:
+ * @drawable: a #GdkDrawable (a #GdkWindow or a #GdkPixmap).
+ * @font: a #GdkFont.
+ * @gc: a #GdkGC.
+ * @x: the x coordinate of the left edge of the text.
+ * @y: the y coordinate of the baseline of the text.
+ * @text: the wide characters to draw.
+ * @text_length: the number of characters to draw.
+ * 
+ * Draws a number of wide characters using the given font of fontset.
+ * If the font is a 1-byte font, the string is converted into 1-byte 
+ * characters (discarding the high bytes) before output.
+ * 
+ * Deprecated: Use gdk_draw_layout() instead.
+ **/
 void
 gdk_draw_text_wc (GdkDrawable   *drawable,
                  GdkFont        *font,
@@ -423,6 +604,34 @@ gdk_draw_text_wc (GdkDrawable       *drawable,
   GDK_DRAWABLE_GET_CLASS (drawable)->draw_text_wc (drawable, font, gc, x, y, text, text_length);
 }
 
+/**
+ * gdk_draw_drawable:
+ * @drawable: a #GdkDrawable
+ * @gc: a #GdkGC sharing the drawable's visual and colormap
+ * @src: the source #GdkDrawable, which may be the same as @drawable
+ * @xsrc: X position in @src of rectangle to draw
+ * @ysrc: Y position in @src of rectangle to draw
+ * @xdest: X position in @drawable where the rectangle should be drawn
+ * @ydest: Y position in @drawable where the rectangle should be drawn
+ * @width: width of rectangle to draw, or -1 for entire @src width
+ * @height: height of rectangle to draw, or -1 for entire @src height
+ *
+ * Copies the @width x @height region of @src at coordinates (@xsrc,
+ * @ysrc) to coordinates (@xdest, @ydest) in @drawable.
+ * @width and/or @height may be given as -1, in which case the entire
+ * @src drawable will be copied.
+ *
+ * Most fields in @gc are not used for this operation, but notably the
+ * clip mask or clip region will be honored.
+ *
+ * The source and destination drawables must have the same visual and
+ * colormap, or errors will result. (On X11, failure to match
+ * visual/colormap results in a BadMatch error from the X server.)
+ * A common cause of this problem is an attempt to draw a bitmap to
+ * a color drawable. The way to draw a bitmap is to set the
+ * bitmap as a clip mask on your #GdkGC, then use gdk_draw_rectangle()
+ * to draw a rectangle clipped to the bitmap.
+ **/
 void
 gdk_draw_drawable (GdkDrawable *drawable,
                   GdkGC       *gc,
@@ -470,9 +679,26 @@ gdk_draw_drawable (GdkDrawable *drawable,
                                                     xdest, ydest,
                                                     width, height);
   
-  g_object_unref (G_OBJECT (composite));
+  g_object_unref (composite);
 }
 
+/**
+ * gdk_draw_image:
+ * @drawable: a #GdkDrawable (a #GdkWindow or a #GdkPixmap).
+ * @gc: a #GdkGC.
+ * @image: the #GdkImage to draw.
+ * @xsrc: the left edge of the source rectangle within @image.
+ * @ysrc: the top of the source rectangle within @image.
+ * @xdest: the x coordinate of the destination within @drawable.
+ * @ydest: the y coordinate of the destination within @drawable.
+ * @width: the width of the area to be copied, or -1 to make the area 
+ *     extend to the right edge of @image.
+ * @height: the height of the area to be copied, or -1 to make the area 
+ *     extend to the bottom edge of @image.
+ * 
+ * Draws a #GdkImage onto a drawable.
+ * The depth of the #GdkImage must match the depth of the #GdkDrawable.
+ **/
 void
 gdk_draw_image (GdkDrawable *drawable,
                GdkGC       *gc,
@@ -497,6 +723,73 @@ gdk_draw_image (GdkDrawable *drawable,
                                                  xdest, ydest, width, height);
 }
 
+/**
+ * gdk_draw_pixbuf:
+ * @drawable: Destination drawable.
+ * @gc: a #GdkGC, used for clipping, or %NULL
+ * @pixbuf: a #GdkPixbuf
+ * @src_x: Source X coordinate within pixbuf.
+ * @src_y: Source Y coordinates within pixbuf.
+ * @dest_x: Destination X coordinate within drawable.
+ * @dest_y: Destination Y coordinate within drawable.
+ * @width: Width of region to render, in pixels, or -1 to use pixbuf width.
+ * @height: Height of region to render, in pixels, or -1 to use pixbuf height.
+ * @dither: Dithering mode for #GdkRGB.
+ * @x_dither: X offset for dither.
+ * @y_dither: Y offset for dither.
+ * 
+ * Renders a rectangular portion of a pixbuf to a drawable.  The destination
+ * drawable must have a colormap. All windows have a colormap, however, pixmaps
+ * only have colormap by default if they were created with a non-%NULL window 
+ * argument. Otherwise a colormap must be set on them with 
+ * gdk_drawable_set_colormap().
+ *
+ * On older X servers, rendering pixbufs with an alpha channel involves round 
+ * trips to the X server, and may be somewhat slow.
+ *
+ * The clip mask of @gc is ignored, but clip rectangles and clip regions work
+ * fine.
+ * 
+ * Since: 2.2
+ **/
+void
+gdk_draw_pixbuf (GdkDrawable     *drawable,
+                 GdkGC           *gc,
+                 GdkPixbuf       *pixbuf,
+                 gint             src_x,
+                 gint             src_y,
+                 gint             dest_x,
+                 gint             dest_y,
+                 gint             width,
+                 gint             height,
+                 GdkRgbDither     dither,
+                 gint             x_dither,
+                 gint             y_dither)
+{
+  g_return_if_fail (GDK_IS_DRAWABLE (drawable));
+  g_return_if_fail (gc == NULL || GDK_IS_GC (gc));
+  g_return_if_fail (GDK_IS_PIXBUF (pixbuf));
+
+  if (width == -1)
+    width = gdk_pixbuf_get_width (pixbuf);
+  if (height == -1)
+    height = gdk_pixbuf_get_height (pixbuf);
+
+  GDK_DRAWABLE_GET_CLASS (drawable)->draw_pixbuf (drawable, gc, pixbuf,
+                                                 src_x, src_y, dest_x, dest_y, width, height,
+                                                 dither, x_dither, y_dither);
+}
+
+/**
+ * gdk_draw_points:
+ * @drawable: a #GdkDrawable (a #GdkWindow or a #GdkPixmap).
+ * @gc: a #GdkGC.
+ * @points: an array of #GdkPoint structures.
+ * @npoints: the number of points to be drawn.
+ * 
+ * Draws a number of points, using the foreground color and other 
+ * attributes of the #GdkGC.
+ **/
 void
 gdk_draw_points (GdkDrawable *drawable,
                 GdkGC       *gc,
@@ -514,6 +807,17 @@ gdk_draw_points (GdkDrawable *drawable,
   GDK_DRAWABLE_GET_CLASS (drawable)->draw_points (drawable, gc, points, npoints);
 }
 
+/**
+ * gdk_draw_segments:
+ * @drawable: a #GdkDrawable (a #GdkWindow or a #GdkPixmap).
+ * @gc: a #GdkGC.
+ * @segs: an array of #GdkSegment structures specifying the start and 
+ *   end points of the lines to be drawn.
+ * @nsegs: the number of line segments to draw, i.e. the size of the 
+ *   @segs array.
+ * 
+ * Draws a number of unconnected lines.
+ **/
 void
 gdk_draw_segments (GdkDrawable *drawable,
                   GdkGC       *gc,
@@ -532,13 +836,24 @@ gdk_draw_segments (GdkDrawable *drawable,
   GDK_DRAWABLE_GET_CLASS (drawable)->draw_segments (drawable, gc, segs, nsegs);
 }
 
+/**
+ * gdk_draw_lines:
+ * @drawable: a #GdkDrawable (a #GdkWindow or a #GdkPixmap).
+ * @gc: a #GdkGC.
+ * @points: an array of #GdkPoint structures specifying the endpoints of the
+ * @npoints: the size of the @points array.
+ * 
+ * Draws a series of lines connecting the given points.
+ * The way in which joins between lines are draw is determined by the
+ * #GdkCapStyle value in the #GdkGC. This can be set with
+ * gdk_gc_set_line_attributes().
+ **/
 void
 gdk_draw_lines (GdkDrawable *drawable,
                GdkGC       *gc,
                GdkPoint    *points,
                gint         npoints)
 {
-
   g_return_if_fail (GDK_IS_DRAWABLE (drawable));
   g_return_if_fail (points != NULL);
   g_return_if_fail (GDK_IS_GC (gc));
@@ -550,6 +865,25 @@ gdk_draw_lines (GdkDrawable *drawable,
   GDK_DRAWABLE_GET_CLASS (drawable)->draw_lines (drawable, gc, points, npoints);
 }
 
+/**
+ * gdk_draw_glyphs:
+ * @drawable: a #GdkDrawable
+ * @gc: a #GdkGC
+ * @font: font to be used
+ * @x: X coordinate of baseline origin
+ * @y: Y coordinate of baseline origin
+ * @glyphs: glyphs to render
+ *
+ * This is a low-level function; 99% of text rendering should be done
+ * using gdk_draw_layout() instead.
+ *
+ * A glyph is a character in a font. This function draws a sequence of
+ * glyphs.  To obtain a sequence of glyphs you have to understand a
+ * lot about internationalized text handling, which you don't want to
+ * understand; thus, use gdk_draw_layout() instead of this function,
+ * gdk_draw_layout() handles the details.
+ * 
+ **/
 void
 gdk_draw_glyphs (GdkDrawable      *drawable,
                 GdkGC            *gc,
@@ -566,6 +900,82 @@ gdk_draw_glyphs (GdkDrawable      *drawable,
 }
 
 
+/**
+ * gdk_drawable_copy_to_image:
+ * @drawable: a #GdkDrawable
+ * @image: a #GdkDrawable, or %NULL if a new @image should be created.
+ * @src_x: x coordinate on @drawable
+ * @src_y: y coordinate on @drawable
+ * @dest_x: x coordinate within @image. Must be 0 if @image is %NULL
+ * @dest_y: y coordinate within @image. Must be 0 if @image is %NULL
+ * @width: width of region to get
+ * @height: height or region to get
+ *
+ * Copies a portion of @drawable into the client side image structure
+ * @image. If @image is %NULL, creates a new image of size @width x @height
+ * and copies into that. See gdk_drawable_get_image() for further details.
+ * 
+ * Return value: @image, or a new a #GdkImage containing the contents
+ *               of @drawable
+ * 
+ * Since: 2.4
+ **/
+GdkImage*
+gdk_drawable_copy_to_image (GdkDrawable *drawable,
+                           GdkImage    *image,
+                           gint         src_x,
+                           gint         src_y,
+                           gint         dest_x,
+                           gint         dest_y,
+                           gint         width,
+                           gint         height)
+{
+  GdkDrawable *composite;
+  gint composite_x_offset = 0;
+  gint composite_y_offset = 0;
+  GdkImage *retval;
+  GdkColormap *cmap;
+  
+  g_return_val_if_fail (GDK_IS_DRAWABLE (drawable), NULL);
+  g_return_val_if_fail (src_x >= 0, NULL);
+  g_return_val_if_fail (src_y >= 0, NULL);
+
+  /* FIXME? Note race condition since we get the size then
+   * get the image, and the size may have changed.
+   */
+  
+  if (width < 0 || height < 0)
+    gdk_drawable_get_size (drawable,
+                           width < 0 ? &width : NULL,
+                           height < 0 ? &height : NULL);
+  
+  composite =
+    GDK_DRAWABLE_GET_CLASS (drawable)->get_composite_drawable (drawable,
+                                                               src_x, src_y,
+                                                               width, height,
+                                                               &composite_x_offset,
+                                                               &composite_y_offset); 
+  
+  retval = GDK_DRAWABLE_GET_CLASS (composite)->_copy_to_image (composite,
+                                                              image,
+                                                              src_x - composite_x_offset,
+                                                              src_y - composite_y_offset,
+                                                              dest_x, dest_y,
+                                                              width, height);
+
+  g_object_unref (composite);
+
+  if (!image && retval)
+    {
+      cmap = gdk_drawable_get_colormap (drawable);
+      
+      if (cmap)
+       gdk_image_set_colormap (retval, cmap);
+    }
+  
+  return retval;
+}
+
 /**
  * gdk_drawable_get_image:
  * @drawable: a #GdkDrawable
@@ -644,7 +1054,7 @@ gdk_drawable_get_image (GdkDrawable *drawable,
                                                           y - composite_y_offset,
                                                           width, height);
 
-  g_object_unref (G_OBJECT (composite));
+  g_object_unref (composite);
 
   cmap = gdk_drawable_get_colormap (drawable);
   
@@ -654,6 +1064,16 @@ gdk_drawable_get_image (GdkDrawable *drawable,
   return retval;
 }
 
+static GdkImage*
+gdk_drawable_real_get_image (GdkDrawable     *drawable,
+                            gint             x,
+                            gint             y,
+                            gint             width,
+                            gint             height)
+{
+  return gdk_drawable_copy_to_image (drawable, NULL, x, y, 0, 0, width, height);
+}
+
 static GdkDrawable*
 gdk_drawable_real_get_composite_drawable (GdkDrawable *drawable,
                                           gint         x,
@@ -668,7 +1088,7 @@ gdk_drawable_real_get_composite_drawable (GdkDrawable *drawable,
   *composite_x_offset = 0;
   *composite_y_offset = 0;
   
-  return GDK_DRAWABLE (g_object_ref (G_OBJECT (drawable)));
+  return g_object_ref (drawable);
 }
 
 /**
@@ -725,3 +1145,449 @@ gdk_drawable_real_get_visible_region (GdkDrawable *drawable)
 
   return gdk_region_rectangle (&rect);
 }
+
+static void
+composite (guchar *src_buf,
+          gint    src_rowstride,
+          guchar *dest_buf,
+          gint    dest_rowstride,
+          gint    width,
+          gint    height)
+{
+  guchar *src = src_buf;
+  guchar *dest = dest_buf;
+
+  while (height--)
+    {
+      gint twidth = width;
+      guchar *p = src;
+      guchar *q = dest;
+
+      while (twidth--)
+       {
+         guchar a = p[3];
+         guint t;
+
+         t = a * p[0] + (255 - a) * q[0] + 0x80;
+         q[0] = (t + (t >> 8)) >> 8;
+         t = a * p[1] + (255 - a) * q[1] + 0x80;
+         q[1] = (t + (t >> 8)) >> 8;
+         t = a * p[2] + (255 - a) * q[2] + 0x80;
+         q[2] = (t + (t >> 8)) >> 8;
+
+         p += 4;
+         q += 3;
+       }
+      
+      src += src_rowstride;
+      dest += dest_rowstride;
+    }
+}
+
+static void
+composite_0888 (guchar      *src_buf,
+               gint         src_rowstride,
+               guchar      *dest_buf,
+               gint         dest_rowstride,
+               GdkByteOrder dest_byte_order,
+               gint         width,
+               gint         height)
+{
+  guchar *src = src_buf;
+  guchar *dest = dest_buf;
+
+  while (height--)
+    {
+      gint twidth = width;
+      guchar *p = src;
+      guchar *q = dest;
+
+      if (dest_byte_order == GDK_LSB_FIRST)
+       {
+         while (twidth--)
+           {
+             guint t;
+             
+             t = p[3] * p[2] + (255 - p[3]) * q[0] + 0x80;
+             q[0] = (t + (t >> 8)) >> 8;
+             t = p[3] * p[1] + (255 - p[3]) * q[1] + 0x80;
+             q[1] = (t + (t >> 8)) >> 8;
+             t = p[3] * p[0] + (255 - p[3]) * q[2] + 0x80;
+             q[2] = (t + (t >> 8)) >> 8;
+             p += 4;
+             q += 4;
+           }
+       }
+      else
+       {
+         while (twidth--)
+           {
+             guint t;
+             
+             t = p[3] * p[0] + (255 - p[3]) * q[1] + 0x80;
+             q[1] = (t + (t >> 8)) >> 8;
+             t = p[3] * p[1] + (255 - p[3]) * q[2] + 0x80;
+             q[2] = (t + (t >> 8)) >> 8;
+             t = p[3] * p[2] + (255 - p[3]) * q[3] + 0x80;
+             q[3] = (t + (t >> 8)) >> 8;
+             p += 4;
+             q += 4;
+           }
+       }
+      
+      src += src_rowstride;
+      dest += dest_rowstride;
+    }
+}
+
+static void
+composite_565 (guchar      *src_buf,
+              gint         src_rowstride,
+              guchar      *dest_buf,
+              gint         dest_rowstride,
+              GdkByteOrder dest_byte_order,
+              gint         width,
+              gint         height)
+{
+  guchar *src = src_buf;
+  guchar *dest = dest_buf;
+
+  while (height--)
+    {
+      gint twidth = width;
+      guchar *p = src;
+      gushort *q = (gushort *)dest;
+
+      while (twidth--)
+       {
+         guchar a = p[3];
+         guint tr, tg, tb;
+         guint tr1, tg1, tb1;
+         guint tmp = *q;
+
+#if 1
+         /* This is fast, and corresponds to what composite() above does
+          * if we converted to 8-bit first.
+          */
+         tr = (tmp & 0xf800);
+         tr1 = a * p[0] + (255 - a) * ((tr >> 8) + (tr >> 13)) + 0x80;
+         tg = (tmp & 0x07e0);
+         tg1 = a * p[1] + (255 - a) * ((tg >> 3) + (tg >> 9)) + 0x80;
+         tb = (tmp & 0x001f);
+         tb1 = a * p[2] + (255 - a) * ((tb << 3) + (tb >> 2)) + 0x80;
+
+         *q = (((tr1 + (tr1 >> 8)) & 0xf800) |
+               (((tg1 + (tg1 >> 8)) & 0xfc00) >> 5)  |
+               ((tb1 + (tb1 >> 8)) >> 11));
+#else
+         /* This version correspond to the result we get with XRENDER -
+          * a bit of precision is lost since we convert to 8 bit after premultiplying
+          * instead of at the end
+          */
+         guint tr2, tg2, tb2;
+         guint tr3, tg3, tb3;
+         
+         tr = (tmp & 0xf800);
+         tr1 = (255 - a) * ((tr >> 8) + (tr >> 13)) + 0x80;
+         tr2 = a * p[0] + 0x80;
+         tr3 = ((tr1 + (tr1 >> 8)) >> 8) + ((tr2 + (tr2 >> 8)) >> 8);
+
+         tg = (tmp & 0x07e0);
+         tg1 = (255 - a) * ((tg >> 3) + (tg >> 9)) + 0x80;
+         tg2 = a * p[0] + 0x80;
+         tg3 = ((tg1 + (tg1 >> 8)) >> 8) + ((tg2 + (tg2 >> 8)) >> 8);
+
+         tb = (tmp & 0x001f);
+         tb1 = (255 - a) * ((tb << 3) + (tb >> 2)) + 0x80;
+         tb2 = a * p[0] + 0x80;
+         tb3 = ((tb1 + (tb1 >> 8)) >> 8) + ((tb2 + (tb2 >> 8)) >> 8);
+
+         *q = (((tr3 & 0xf8) << 8) |
+               ((tg3 & 0xfc) << 3) |
+               ((tb3 >> 3)));
+#endif
+         
+         p += 4;
+         q++;
+       }
+      
+      src += src_rowstride;
+      dest += dest_rowstride;
+    }
+}
+
+static void
+gdk_drawable_real_draw_pixbuf (GdkDrawable  *drawable,
+                              GdkGC        *gc,
+                              GdkPixbuf    *pixbuf,
+                              gint          src_x,
+                              gint          src_y,
+                              gint          dest_x,
+                              gint          dest_y,
+                              gint          width,
+                              gint          height,
+                              GdkRgbDither  dither,
+                              gint          x_dither,
+                              gint          y_dither)
+{
+  GdkPixbuf *composited = NULL;
+  gint dwidth, dheight;
+  GdkRegion *clip;
+  GdkRegion *drect;
+  GdkRectangle tmp_rect;
+                                      
+  g_return_if_fail (GDK_IS_PIXBUF (pixbuf));
+  g_return_if_fail (pixbuf->colorspace == GDK_COLORSPACE_RGB);
+  g_return_if_fail (pixbuf->n_channels == 3 || pixbuf->n_channels == 4);
+  g_return_if_fail (pixbuf->bits_per_sample == 8);
+
+  g_return_if_fail (drawable != NULL);
+
+  if (width == -1) 
+    width = pixbuf->width;
+  if (height == -1)
+    height = pixbuf->height;
+
+  g_return_if_fail (width >= 0 && height >= 0);
+  g_return_if_fail (src_x >= 0 && src_x + width <= pixbuf->width);
+  g_return_if_fail (src_y >= 0 && src_y + height <= pixbuf->height);
+
+  /* Clip to the drawable; this is required for get_from_drawable() so
+   * can't be done implicitly
+   */
+  
+  if (dest_x < 0)
+    {
+      src_x -= dest_x;
+      width += dest_x;
+      dest_x = 0;
+    }
+
+  if (dest_y < 0)
+    {
+      src_y -= dest_y;
+      height += dest_y;
+      dest_y = 0;
+    }
+
+  gdk_drawable_get_size (drawable, &dwidth, &dheight);
+
+  if ((dest_x + width) > dwidth)
+    width = dwidth - dest_x;
+
+  if ((dest_y + height) > dheight)
+    height = dheight - dest_y;
+
+  if (width <= 0 || height <= 0)
+    return;
+
+  /* Clip to the clip region; this avoids getting more
+   * image data from the server than we need to.
+   */
+  
+  tmp_rect.x = dest_x;
+  tmp_rect.y = dest_y;
+  tmp_rect.width = width;
+  tmp_rect.height = height;
+
+  drect = gdk_region_rectangle (&tmp_rect);
+  clip = gdk_drawable_get_clip_region (drawable);
+
+  gdk_region_intersect (drect, clip);
+
+  gdk_region_get_clipbox (drect, &tmp_rect);
+  
+  gdk_region_destroy (drect);
+  gdk_region_destroy (clip);
+
+  if (tmp_rect.width == 0 ||
+      tmp_rect.height == 0)
+    return;
+  
+  /* Actually draw */
+  if (!gc)
+    gc = _gdk_drawable_get_scratch_gc (drawable, FALSE);
+  
+  if (pixbuf->has_alpha)
+    {
+      GdkVisual *visual = gdk_drawable_get_visual (drawable);
+      void (*composite_func) (guchar       *src_buf,
+                             gint          src_rowstride,
+                             guchar       *dest_buf,
+                             gint          dest_rowstride,
+                             GdkByteOrder  dest_byte_order,
+                             gint          width,
+                             gint          height) = NULL;
+
+      /* First we see if we have a visual-specific composition function that can composite
+       * the pixbuf data directly onto the image
+       */
+      if (visual)
+       {
+         gint bits_per_pixel = _gdk_windowing_get_bits_for_depth (gdk_drawable_get_display (drawable),
+                                                                  visual->depth);
+         
+         if (visual->byte_order == (G_BYTE_ORDER == G_BIG_ENDIAN ? GDK_MSB_FIRST : GDK_LSB_FIRST) &&
+             visual->depth == 16 &&
+             visual->red_mask   == 0xf800 &&
+             visual->green_mask == 0x07e0 &&
+             visual->blue_mask  == 0x001f)
+           composite_func = composite_565;
+         else if (visual->depth == 24 && bits_per_pixel == 32 &&
+                  visual->red_mask   == 0xff0000 &&
+                  visual->green_mask == 0x00ff00 &&
+                  visual->blue_mask  == 0x0000ff)
+           composite_func = composite_0888;
+       }
+
+      /* We can't use our composite func if we are required to dither
+       */
+      if (composite_func && !(dither == GDK_RGB_DITHER_MAX && visual->depth != 24))
+       {
+         gint x0, y0;
+         for (y0 = 0; y0 < height; y0 += GDK_SCRATCH_IMAGE_HEIGHT)
+           {
+             gint height1 = MIN (height - y0, GDK_SCRATCH_IMAGE_HEIGHT);
+             for (x0 = 0; x0 < width; x0 += GDK_SCRATCH_IMAGE_WIDTH)
+               {
+                 gint xs0, ys0;
+                 
+                 gint width1 = MIN (width - x0, GDK_SCRATCH_IMAGE_WIDTH);
+                 
+                 GdkImage *image = _gdk_image_get_scratch (gdk_drawable_get_screen (drawable),
+                                                           width1, height1,
+                                                           gdk_drawable_get_depth (drawable), &xs0, &ys0);
+                 
+                 gdk_drawable_copy_to_image (drawable, image,
+                                             dest_x + x0, dest_y + y0,
+                                             xs0, ys0,
+                                             width1, height1);
+                 (*composite_func) (pixbuf->pixels + (src_y + y0) * pixbuf->rowstride + (src_x + x0) * 4,
+                                    pixbuf->rowstride,
+                                    (guchar*)image->mem + ys0 * image->bpl + xs0 * image->bpp,
+                                    image->bpl,
+                                    visual->byte_order,
+                                    width1, height1);
+                 gdk_draw_image (drawable, gc, image,
+                                 xs0, ys0,
+                                 dest_x + x0, dest_y + y0,
+                                 width1, height1);
+               }
+           }
+         
+         goto out;
+       }
+      else
+       {
+         /* No special composition func, convert dest to 24 bit RGB data, composite against
+          * that, and convert back.
+          */
+         composited = gdk_pixbuf_get_from_drawable (NULL,
+                                                    drawable,
+                                                    NULL,
+                                                    dest_x, dest_y,
+                                                    0, 0,
+                                                    width, height);
+         
+         if (composited)
+           composite (pixbuf->pixels + src_y * pixbuf->rowstride + src_x * 4,
+                      pixbuf->rowstride,
+                      composited->pixels,
+                      composited->rowstride,
+                      width, height);
+       }
+    }
+
+  if (composited)
+    {
+      src_x = 0;
+      src_y = 0;
+      pixbuf = composited;
+    }
+  
+  if (pixbuf->n_channels == 4)
+    {
+      guchar *buf = pixbuf->pixels + src_y * pixbuf->rowstride + src_x * 4;
+
+      gdk_draw_rgb_32_image_dithalign (drawable, gc,
+                                      dest_x, dest_y,
+                                      width, height,
+                                      dither,
+                                      buf, pixbuf->rowstride,
+                                      x_dither, y_dither);
+    }
+  else                         /* n_channels == 3 */
+    {
+      guchar *buf = pixbuf->pixels + src_y * pixbuf->rowstride + src_x * 3;
+
+      gdk_draw_rgb_image_dithalign (drawable, gc,
+                                   dest_x, dest_y,
+                                   width, height,
+                                   dither,
+                                   buf, pixbuf->rowstride,
+                                   x_dither, y_dither);
+    }
+
+ out:
+  if (composited)
+    g_object_unref (composited);
+}
+
+/**
+ * _gdk_drawable_get_scratch_gc:
+ * @drawable: A #GdkDrawable
+ * @graphics_exposures: Whether the returned #GdkGC should generate graphics exposures 
+ * 
+ * Returns a #GdkGC suitable for drawing on @drawable. The #GdkGC has
+ * the standard values for @drawable, except for the graphics_exposures
+ * field which is determined by the @graphics_exposures parameter.
+ *
+ * The foreground color of the returned #GdkGC is undefined. The #GdkGC
+ * must not be altered in any way, except to change its foreground color.
+ * 
+ * Return value: A #GdkGC suitable for drawing on @drawable
+ * 
+ * Since: 2.4
+ **/
+GdkGC *
+_gdk_drawable_get_scratch_gc (GdkDrawable *drawable,
+                             gboolean     graphics_exposures)
+{
+  GdkScreen *screen;
+  gint depth;
+
+  g_return_val_if_fail (GDK_IS_DRAWABLE (drawable), NULL);
+
+  screen = gdk_drawable_get_screen (drawable);
+
+  g_return_val_if_fail (!screen->closed, NULL);
+
+  depth = gdk_drawable_get_depth (drawable) - 1;
+
+  if (graphics_exposures)
+    {
+      if (!screen->exposure_gcs[depth])
+       {
+         GdkGCValues values;
+         GdkGCValuesMask mask;
+
+         values.graphics_exposures = TRUE;
+         mask = GDK_GC_EXPOSURES;  
+
+         screen->exposure_gcs[depth] =
+           gdk_gc_new_with_values (drawable, &values, mask);
+       }
+
+      return screen->exposure_gcs[depth];
+    }
+  else
+    {
+      if (!screen->normal_gcs[depth])
+       {
+         screen->normal_gcs[depth] =
+           gdk_gc_new (drawable);
+       }
+
+      return screen->normal_gcs[depth];
+    }
+}