]> Pileus Git - ~andy/gtk/blobdiff - gdk/gdkdraw.c
gdk: Implement end_implicit_paint() with Cairo
[~andy/gtk] / gdk / gdkdraw.c
index ef42b8e5f819a291bad8af8cc610bfbbf428f769..90b44ba1767e2169f729bc729128383006977cde 100644 (file)
 #include "config.h"
 #include <math.h>
 #include <pango/pangocairo.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
 #include "gdkcairo.h"
 #include "gdkdrawable.h"
 #include "gdkinternals.h"
 #include "gdkwindow.h"
 #include "gdkscreen.h"
-#include "gdk-pixbuf-private.h"
 #include "gdkpixbuf.h"
-#include "gdkalias.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,
@@ -48,19 +43,7 @@ static GdkDrawable* gdk_drawable_real_get_composite_drawable (GdkDrawable  *draw
                                                              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 cairo_region_t *  gdk_drawable_real_get_visible_region     (GdkDrawable  *drawable);
 static void         gdk_drawable_real_draw_drawable          (GdkDrawable  *drawable,
                                                              GdkGC        *gc,
                                                              GdkDrawable  *src,
@@ -77,12 +60,10 @@ G_DEFINE_ABSTRACT_TYPE (GdkDrawable, gdk_drawable, G_TYPE_OBJECT)
 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;
   klass->draw_drawable = gdk_drawable_real_draw_drawable;
 }
 
@@ -94,56 +75,11 @@ gdk_drawable_init (GdkDrawable *drawable)
 /* Manipulation of drawables
  */
 
-/**
- * gdk_drawable_set_data:
- * @drawable: a #GdkDrawable
- * @key: name to store the data under
- * @data: arbitrary data
- * @destroy_func: function to free @data, or %NULL
- *
- * This function is equivalent to g_object_set_data(),
- * the #GObject variant should be used instead.
- * 
- **/
-void          
-gdk_drawable_set_data (GdkDrawable   *drawable,
-                      const gchar   *key,
-                      gpointer       data,
-                      GDestroyNotify destroy_func)
-{
-  g_return_if_fail (GDK_IS_DRAWABLE (drawable));
-  
-  g_object_set_qdata_full (G_OBJECT (drawable),
-                           g_quark_from_string (key),
-                           data,
-                           destroy_func);
-}
-
-/**
- * gdk_drawable_get_data:
- * @drawable: a #GdkDrawable
- * @key: name the data was stored under
- * 
- * Equivalent to g_object_get_data(); the #GObject variant should be
- * used instead.
- * 
- * Return value: the data stored at @key
- **/
-gpointer
-gdk_drawable_get_data (GdkDrawable   *drawable,
-                      const gchar   *key)
-{
-  g_return_val_if_fail (GDK_IS_DRAWABLE (drawable), NULL);
-  
-  return g_object_get_qdata (G_OBJECT (drawable),
-                             g_quark_try_string (key));
-}
-
 /**
  * gdk_drawable_get_size:
  * @drawable: a #GdkDrawable
- * @width: (out): location to store drawable's width, or %NULL
- * @height: (out): location to store drawable's height, or %NULL
+ * @width: (out) (allow-none): location to store drawable's width, or %NULL
+ * @height: (out) (allow-none): location to store drawable's height, or %NULL
  *
  * Fills *@width and *@height with the size of @drawable.
  * @width or @height can be %NULL if you only want the other one.
@@ -160,8 +96,7 @@ gdk_drawable_get_size (GdkDrawable *drawable,
 {
   g_return_if_fail (GDK_IS_DRAWABLE (drawable));
 
-  if (GDK_DRAWABLE_GET_CLASS (drawable)->get_size != NULL)
-    GDK_DRAWABLE_GET_CLASS (drawable)->get_size (drawable, width, height);  
+  GDK_DRAWABLE_GET_CLASS (drawable)->get_size (drawable, width, height);  
 }
 
 /**
@@ -276,328 +211,9 @@ gdk_drawable_get_colormap (GdkDrawable *drawable)
   return GDK_DRAWABLE_GET_CLASS (drawable)->get_colormap (drawable);
 }
 
-/**
- * gdk_drawable_ref:
- * @drawable: a #GdkDrawable
- * 
- * Deprecated equivalent of calling g_object_ref() on @drawable.
- * (Drawables were not objects in previous versions of GDK.)
- * 
- * Return value: the same @drawable passed in
- *
- * Deprecated: 2.0: Use g_object_ref() instead.
- **/
-GdkDrawable*
-gdk_drawable_ref (GdkDrawable *drawable)
-{
-  return (GdkDrawable *) g_object_ref (drawable);
-}
-
-/**
- * gdk_drawable_unref:
- * @drawable: a #GdkDrawable
- *
- * Deprecated equivalent of calling g_object_unref() on @drawable.
- * 
- * Deprecated: 2.0: Use g_object_unref() instead.
- **/
-void
-gdk_drawable_unref (GdkDrawable *drawable)
-{
-  g_return_if_fail (GDK_IS_DRAWABLE (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,
-                gint         x,
-                gint         y)
-{
-  GdkPoint point;
-
-  g_return_if_fail (GDK_IS_DRAWABLE (drawable));
-  g_return_if_fail (GDK_IS_GC (gc));
-
-  point.x = x;
-  point.y = y;
-  
-  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,
-              gint         x1,
-              gint         y1,
-              gint         x2,
-              gint         y2)
-{
-  GdkSegment segment;
-
-  g_return_if_fail (GDK_IS_DRAWABLE (drawable));
-  g_return_if_fail (GDK_IS_GC (gc));
-
-  segment.x1 = x1;
-  segment.y1 = y1;
-  segment.x2 = x2;
-  segment.y2 = y2;
-  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,
-                   gboolean     filled,
-                   gint         x,
-                   gint         y,
-                   gint         width,
-                   gint         height)
-{  
-  g_return_if_fail (GDK_IS_DRAWABLE (drawable));
-  g_return_if_fail (GDK_IS_GC (gc));
-
-  if (width < 0 || height < 0)
-    {
-      gint real_width;
-      gint real_height;
-      
-      gdk_drawable_get_size (drawable, &real_width, &real_height);
-
-      if (width < 0)
-        width = real_width;
-      if (height < 0)
-        height = real_height;
-    }
-
-  GDK_DRAWABLE_GET_CLASS (drawable)->draw_rectangle (drawable, gc, filled, x, y,
-                                                     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,
-             gboolean     filled,
-             gint         x,
-             gint         y,
-             gint         width,
-             gint         height,
-             gint         angle1,
-             gint         angle2)
-{  
-  g_return_if_fail (GDK_IS_DRAWABLE (drawable));
-  g_return_if_fail (GDK_IS_GC (gc));
-
-  if (width < 0 || height < 0)
-    {
-      gint real_width;
-      gint real_height;
-      
-      gdk_drawable_get_size (drawable, &real_width, &real_height);
-
-      if (width < 0)
-        width = real_width;
-      if (height < 0)
-        height = real_height;
-    }
-
-  GDK_DRAWABLE_GET_CLASS (drawable)->draw_arc (drawable, gc, filled,
-                                               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.
- * @n_points: the number of points.
- * 
- * Draws an outlined or filled polygon.
- **/
-void
-gdk_draw_polygon (GdkDrawable    *drawable,
-                 GdkGC          *gc,
-                 gboolean        filled,
-                 const GdkPoint *points,
-                 gint            n_points)
-{
-  g_return_if_fail (GDK_IS_DRAWABLE (drawable));
-  g_return_if_fail (GDK_IS_GC (gc));
-
-  GDK_DRAWABLE_GET_CLASS (drawable)->draw_polygon (drawable, gc, filled,
-                                                   (GdkPoint *) points,
-                                                   n_points);
-}
-
-/* gdk_draw_string
- *
- * Modified by Li-Da Lho to draw 16 bits and Multibyte strings
- *
- * 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: 2.4: Use gdk_draw_layout() instead.
- **/
-void
-gdk_draw_string (GdkDrawable *drawable,
-                GdkFont     *font,
-                GdkGC       *gc,
-                gint         x,
-                gint         y,
-                const gchar *string)
-{
-  gdk_draw_text (drawable, font, gc, x, y, string, _gdk_font_strlen (font, string));
-}
-
-/* gdk_draw_text
- *
- * Modified by Li-Da Lho to draw 16 bits and Multibyte strings
- *
- * 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: 2.4: Use gdk_draw_layout() instead.
- **/
-void
-gdk_draw_text (GdkDrawable *drawable,
-              GdkFont     *font,
-              GdkGC       *gc,
-              gint         x,
-              gint         y,
-              const gchar *text,
-              gint         text_length)
-{
-  g_return_if_fail (GDK_IS_DRAWABLE (drawable));
-  g_return_if_fail (font != NULL);
-  g_return_if_fail (GDK_IS_GC (gc));
-  g_return_if_fail (text != NULL);
-
-  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: 2.4: Use gdk_draw_layout() instead.
- **/
-void
-gdk_draw_text_wc (GdkDrawable   *drawable,
-                 GdkFont        *font,
-                 GdkGC          *gc,
-                 gint            x,
-                 gint            y,
-                 const GdkWChar *text,
-                 gint            text_length)
-{
-  g_return_if_fail (GDK_IS_DRAWABLE (drawable));
-  g_return_if_fail (font != NULL);
-  g_return_if_fail (GDK_IS_GC (gc));
-  g_return_if_fail (text != NULL);
-
-  GDK_DRAWABLE_GET_CLASS (drawable)->draw_text_wc (drawable, font, gc, x, y, text, text_length);
-}
-
 /**
  * gdk_draw_drawable:
  * @drawable: a #GdkDrawable
@@ -689,526 +305,6 @@ gdk_draw_drawable (GdkDrawable *drawable,
   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,
-               GdkImage    *image,
-               gint         xsrc,
-               gint         ysrc,
-               gint         xdest,
-               gint         ydest,
-               gint         width,
-               gint         height)
-{
-  g_return_if_fail (GDK_IS_DRAWABLE (drawable));
-  g_return_if_fail (GDK_IS_IMAGE (image));
-  g_return_if_fail (GDK_IS_GC (gc));
-
-  if (width == -1)
-    width = image->width;
-  if (height == -1)
-    height = image->height;
-
-  GDK_DRAWABLE_GET_CLASS (drawable)->draw_image (drawable, gc, image, xsrc, ysrc,
-                                                 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.
- *
- * If GDK is built with the Sun mediaLib library, the gdk_draw_pixbuf
- * function is accelerated using mediaLib, which provides hardware
- * acceleration on Intel, AMD, and Sparc chipsets.  If desired, mediaLib
- * support can be turned off by setting the GDK_DISABLE_MEDIALIB environment
- * variable.
- *
- * Since: 2.2
- **/
-void
-gdk_draw_pixbuf (GdkDrawable     *drawable,
-                 GdkGC           *gc,
-                 const 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 == 0 || height == 0)
-    return;
-
-  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,
-                                                  (GdkPixbuf *) 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.
- * @n_points: 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,
-                const GdkPoint *points,
-                gint            n_points)
-{
-  g_return_if_fail (GDK_IS_DRAWABLE (drawable));
-  g_return_if_fail ((points != NULL) && (n_points > 0));
-  g_return_if_fail (GDK_IS_GC (gc));
-  g_return_if_fail (n_points >= 0);
-
-  if (n_points == 0)
-    return;
-
-  GDK_DRAWABLE_GET_CLASS (drawable)->draw_points (drawable, gc,
-                                                  (GdkPoint *) points, n_points);
-}
-
-/**
- * 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.
- * @n_segs: 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,
-                  const GdkSegment *segs,
-                  gint              n_segs)
-{
-  g_return_if_fail (GDK_IS_DRAWABLE (drawable));
-
-  if (n_segs == 0)
-    return;
-
-  g_return_if_fail (segs != NULL);
-  g_return_if_fail (GDK_IS_GC (gc));
-  g_return_if_fail (n_segs >= 0);
-
-  GDK_DRAWABLE_GET_CLASS (drawable)->draw_segments (drawable, gc,
-                                                    (GdkSegment *) segs, n_segs);
-}
-
-/**
- * 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
- * @n_points: 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,
-               const GdkPoint *points,
-               gint            n_points)
-{
-  g_return_if_fail (GDK_IS_DRAWABLE (drawable));
-  g_return_if_fail (points != NULL);
-  g_return_if_fail (GDK_IS_GC (gc));
-  g_return_if_fail (n_points >= 0);
-
-  if (n_points == 0)
-    return;
-
-  GDK_DRAWABLE_GET_CLASS (drawable)->draw_lines (drawable, gc,
-                                                 (GdkPoint *) points, n_points);
-}
-
-static void
-real_draw_glyphs (GdkDrawable       *drawable,
-                 GdkGC             *gc,
-                 const PangoMatrix *matrix,
-                 PangoFont         *font,
-                 gdouble            x,
-                 gdouble            y,
-                 PangoGlyphString  *glyphs)
-{
-  cairo_t *cr;
-
-  cr = gdk_cairo_create (drawable);
-  _gdk_gc_update_context (gc, cr, NULL, NULL, TRUE, drawable);
-
-  if (matrix)
-    {
-      cairo_matrix_t cairo_matrix;
-
-      cairo_matrix.xx = matrix->xx;
-      cairo_matrix.yx = matrix->yx;
-      cairo_matrix.xy = matrix->xy;
-      cairo_matrix.yy = matrix->yy;
-      cairo_matrix.x0 = matrix->x0;
-      cairo_matrix.y0 = matrix->y0;
-      
-      cairo_set_matrix (cr, &cairo_matrix);
-    }
-
-  cairo_move_to (cr, x, y);
-  pango_cairo_show_glyph_string (cr, font, glyphs);
-
-  cairo_destroy (cr);
-}
-
-/**
- * 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: the glyph string to draw
- *
- * This is a low-level function; 99% of text rendering should be done
- * using gdk_draw_layout() instead.
- *
- * A glyph is a single image 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,
-                PangoFont        *font,
-                gint              x,
-                gint              y,
-                PangoGlyphString *glyphs)
-{
-  g_return_if_fail (GDK_IS_DRAWABLE (drawable));
-  g_return_if_fail (GDK_IS_GC (gc));
-  
-  real_draw_glyphs (drawable, gc, NULL, font,
-                   x, y, glyphs);
-}
-
-/**
- * gdk_draw_glyphs_transformed:
- * @drawable: a #GdkDrawable
- * @gc: a #GdkGC
- * @matrix: a #PangoMatrix, or %NULL to use an identity transformation
- * @font: the font in which to draw the string
- * @x:       the x position of the start of the string (in Pango
- *           units in user space coordinates)
- * @y:       the y position of the baseline (in Pango units
- *           in user space coordinates)
- * @glyphs:  the glyph string to draw
- * 
- * Renders a #PangoGlyphString onto a drawable, possibly
- * transforming the layed-out coordinates through a transformation
- * matrix. Note that the transformation matrix for @font is not
- * changed, so to produce correct rendering results, the @font
- * must have been loaded using a #PangoContext with an identical
- * transformation matrix to that passed in to this function.
- *
- * See also gdk_draw_glyphs(), gdk_draw_layout().
- *
- * Since: 2.6
- **/
-void
-gdk_draw_glyphs_transformed (GdkDrawable       *drawable,
-                            GdkGC             *gc,
-                            const PangoMatrix *matrix,
-                            PangoFont         *font,
-                            gint               x,
-                            gint               y,
-                            PangoGlyphString  *glyphs)
-{
-  g_return_if_fail (GDK_IS_DRAWABLE (drawable));
-  g_return_if_fail (GDK_IS_GC (gc));
-
-  real_draw_glyphs (drawable, gc, matrix, font,
-                   x / PANGO_SCALE, y / PANGO_SCALE, glyphs);
-}
-
-/**
- * gdk_draw_trapezoids:
- * @drawable: a #GdkDrawable
- * @gc: a #GdkGC
- * @trapezoids: an array of #GdkTrapezoid structures
- * @n_trapezoids: the number of trapezoids to draw
- * 
- * Draws a set of anti-aliased trapezoids. The trapezoids are
- * combined using saturation addition, then drawn over the background
- * as a set. This is low level functionality used internally to implement
- * rotated underlines and backgrouds when rendering a PangoLayout and is
- * likely not useful for applications.
- *
- * Since: 2.6
- **/
-void
-gdk_draw_trapezoids (GdkDrawable        *drawable,
-                    GdkGC              *gc,
-                    const GdkTrapezoid *trapezoids,
-                    gint                n_trapezoids)
-{
-  cairo_t *cr;
-  int i;
-
-  g_return_if_fail (GDK_IS_DRAWABLE (drawable));
-  g_return_if_fail (GDK_IS_GC (gc));
-  g_return_if_fail (n_trapezoids == 0 || trapezoids != NULL);
-
-  cr = gdk_cairo_create (drawable);
-  _gdk_gc_update_context (gc, cr, NULL, NULL, TRUE, drawable);
-  
-  for (i = 0; i < n_trapezoids; i++)
-    {
-      cairo_move_to (cr, trapezoids[i].x11, trapezoids[i].y1);
-      cairo_line_to (cr, trapezoids[i].x21, trapezoids[i].y1);
-      cairo_line_to (cr, trapezoids[i].x22, trapezoids[i].y2);
-      cairo_line_to (cr, trapezoids[i].x12, trapezoids[i].y2);
-      cairo_close_path (cr);
-    }
-
-  cairo_fill (cr);
-
-  cairo_destroy (cr);
-}
-
-/**
- * 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
- * @x: x coordinate on @drawable
- * @y: y coordinate on @drawable
- * @width: width of region to get
- * @height: height or region to get
- * 
- * A #GdkImage stores client-side image data (pixels). In contrast,
- * #GdkPixmap and #GdkWindow are server-side
- * objects. gdk_drawable_get_image() obtains the pixels from a
- * server-side drawable as a client-side #GdkImage.  The format of a
- * #GdkImage depends on the #GdkVisual of the current display, which
- * makes manipulating #GdkImage extremely difficult; therefore, in
- * most cases you should use gdk_pixbuf_get_from_drawable() instead of
- * this lower-level function. A #GdkPixbuf contains image data in a
- * canonicalized RGB format, rather than a display-dependent format.
- * Of course, there's a convenience vs. speed tradeoff here, so you'll
- * want to think about what makes sense for your application.
- *
- * @x, @y, @width, and @height define the region of @drawable to
- * obtain as an image.
- *
- * You would usually copy image data to the client side if you intend
- * to examine the values of individual pixels, for example to darken
- * an image or add a red tint. It would be prohibitively slow to
- * make a round-trip request to the windowing system for each pixel,
- * so instead you get all of them at once, modify them, then copy
- * them all back at once.
- *
- * If the X server or other windowing system backend is on the local
- * machine, this function may use shared memory to avoid copying
- * the image data.
- *
- * If the source drawable is a #GdkWindow and partially offscreen
- * or obscured, then the obscured portions of the returned image
- * will contain undefined data.
- * 
- * Return value: a #GdkImage containing the contents of @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;
-  GdkColormap *cmap;
-  
-  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);
-
-  /* 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,
-                                                               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 (composite);
-
-  cmap = gdk_drawable_get_colormap (drawable);
-  
-  if (retval && cmap)
-    gdk_image_set_colormap (retval, cmap);
-  
-  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,
@@ -1237,10 +333,10 @@ gdk_drawable_real_get_composite_drawable (GdkDrawable *drawable,
  * but no area outside of this region will be affected by drawing
  * primitives.
  * 
- * Returns: a #GdkRegion. This must be freed with gdk_region_destroy()
+ * Returns: a #cairo_region_t. This must be freed with cairo_region_destroy()
  *          when you are done.
  **/
-GdkRegion *
+cairo_region_t *
 gdk_drawable_get_clip_region (GdkDrawable *drawable)
 {
   g_return_val_if_fail (GDK_IS_DRAWABLE (drawable), NULL);
@@ -1257,10 +353,10 @@ gdk_drawable_get_clip_region (GdkDrawable *drawable)
  * obscured by other windows, but no area outside of this region
  * is visible.
  * 
- * Returns: a #GdkRegion. This must be freed with gdk_region_destroy()
+ * Returns: a #cairo_region_t. This must be freed with cairo_region_destroy()
  *          when you are done.
  **/
-GdkRegion *
+cairo_region_t *
 gdk_drawable_get_visible_region (GdkDrawable *drawable)
 {
   g_return_val_if_fail (GDK_IS_DRAWABLE (drawable), NULL);
@@ -1268,7 +364,7 @@ gdk_drawable_get_visible_region (GdkDrawable *drawable)
   return GDK_DRAWABLE_GET_CLASS (drawable)->get_visible_region (drawable);
 }
 
-static GdkRegion *
+static cairo_region_t *
 gdk_drawable_real_get_visible_region (GdkDrawable *drawable)
 {
   GdkRectangle rect;
@@ -1278,7 +374,7 @@ gdk_drawable_real_get_visible_region (GdkDrawable *drawable)
 
   gdk_drawable_get_size (drawable, &rect.width, &rect.height);
 
-  return gdk_region_rectangle (&rect);
+  return cairo_region_create_rectangle (&rect);
 }
 
 /**
@@ -1300,214 +396,6 @@ _gdk_drawable_ref_cairo_surface (GdkDrawable *drawable)
   return GDK_DRAWABLE_GET_CLASS (drawable)->ref_cairo_surface (drawable);
 }
 
-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;
-    }
-}
-
-#ifdef USE_MEDIALIB
-static void
-composite_0888_medialib (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;
-
-  mlib_image img_src, img_dst;
-
-  mlib_ImageSetStruct (&img_dst,
-                       MLIB_BYTE,
-                       4,
-                       width,
-                       height,
-                       dest_rowstride,
-                       dest_buf);
-
-  mlib_ImageSetStruct (&img_src,
-                       MLIB_BYTE,
-                       4,
-                       width,
-                       height,
-                       src_rowstride,
-                       src_buf);
-
-  if (dest_byte_order == GDK_LSB_FIRST)
-      mlib_ImageBlendRGBA2BGRA (&img_dst, &img_src);
-  else
-      mlib_ImageBlendRGBA2ARGB (&img_dst, &img_src);
-}
-#endif
-
-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;
-    }
-}
-
 /* Implementation of the old vfunc in terms of the new one
    in case someone calls it directly (which they shouldn't!) */
 static void
@@ -1533,245 +421,6 @@ gdk_drawable_real_draw_drawable (GdkDrawable  *drawable,
                                                             src);
 }
 
-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;
-  GdkDrawable  *real_drawable;
-
-  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);
-
-  /* Drawable is a wrapper here, but at this time we
-     have already retargeted the destination to any
-     impl window and set the clip, so what we really
-     want to do is draw directly on the impl, ignoring
-     client side subwindows. We also use the impl
-     in the pixmap target case to avoid resetting the
-     already set clip on the GC. */
-  if (GDK_IS_WINDOW (drawable))
-    real_drawable = GDK_WINDOW_OBJECT (drawable)->impl;
-  else
-    real_drawable = GDK_PIXMAP_OBJECT (drawable)->impl;
-
-  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)
-           {
-#ifdef USE_MEDIALIB
-             if (_gdk_use_medialib ())
-               composite_func = composite_0888_medialib;
-             else
-               composite_func = composite_0888;
-#else
-             composite_func = composite_0888;
-#endif
-           }
-       }
-
-      /* 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 (real_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 (real_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 (real_drawable, gc,
-                                   dest_x, dest_y,
-                                   width, height,
-                                   dither,
-                                   buf, pixbuf->rowstride,
-                                   x_dither, y_dither);
-    }
-
- out:
-  if (composited)
-    g_object_unref (composited);
-}
-
 /************************************************************************/
 
 /**
@@ -1907,7 +556,3 @@ _gdk_drawable_create_cairo_surface (GdkDrawable *drawable,
   return GDK_DRAWABLE_GET_CLASS (drawable)->create_cairo_surface (drawable,
                                                                  width, height);
 }
-
-
-#define __GDK_DRAW_C__
-#include "gdkaliasdef.c"