]> Pileus Git - ~andy/gtk/blobdiff - gdk/gdkpixmap.c
Add and use gdk_window_is_toplevel when possible
[~andy/gtk] / gdk / gdkpixmap.c
index 3467388d46998441c77b5fce19c674fa6f9a341c..919a20252fcd27ed2f18a0fdc669affab26d8449 100644 (file)
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
+ * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU Library General Public
+ * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the
  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 02111-1307, USA.
  */
-#include "config.h"
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-/* Needed for SEEK_END in SunOS */
-#include <unistd.h>
-#include <X11/Xlib.h>
 
-#include "gdk.h"
-#include "gdkprivate.h"
+/*
+ * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
+ * file for a list of people on the GTK+ Team.  See the ChangeLog
+ * files for a list of changes.  These files are distributed with
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
+ */
 
-typedef struct
+#include "config.h"
+#include "gdkpixmap.h"
+#include "gdkinternals.h"
+#include "gdkpixbuf.h"
+#include "gdkscreen.h"
+#include "gdkalias.h"
+
+static GdkGC *gdk_pixmap_create_gc      (GdkDrawable     *drawable,
+                                         GdkGCValues     *values,
+                                         GdkGCValuesMask  mask);
+static void   gdk_pixmap_draw_rectangle (GdkDrawable     *drawable,
+                                        GdkGC           *gc,
+                                        gboolean         filled,
+                                        gint             x,
+                                        gint             y,
+                                        gint             width,
+                                        gint             height);
+static void   gdk_pixmap_draw_arc       (GdkDrawable     *drawable,
+                                        GdkGC           *gc,
+                                        gboolean         filled,
+                                        gint             x,
+                                        gint             y,
+                                        gint             width,
+                                        gint             height,
+                                        gint             angle1,
+                                        gint             angle2);
+static void   gdk_pixmap_draw_polygon   (GdkDrawable     *drawable,
+                                        GdkGC           *gc,
+                                        gboolean         filled,
+                                        GdkPoint        *points,
+                                        gint             npoints);
+static void   gdk_pixmap_draw_text      (GdkDrawable     *drawable,
+                                        GdkFont         *font,
+                                        GdkGC           *gc,
+                                        gint             x,
+                                        gint             y,
+                                        const gchar     *text,
+                                        gint             text_length);
+static void   gdk_pixmap_draw_text_wc   (GdkDrawable     *drawable,
+                                        GdkFont         *font,
+                                        GdkGC           *gc,
+                                        gint             x,
+                                        gint             y,
+                                        const GdkWChar  *text,
+                                        gint             text_length);
+static void   gdk_pixmap_draw_drawable  (GdkDrawable     *drawable,
+                                        GdkGC           *gc,
+                                        GdkPixmap       *src,
+                                        gint             xsrc,
+                                        gint             ysrc,
+                                        gint             xdest,
+                                        gint             ydest,
+                                        gint             width,
+                                        gint             height,
+                                        GdkPixmap       *original_src);
+static void   gdk_pixmap_draw_points    (GdkDrawable     *drawable,
+                                        GdkGC           *gc,
+                                        GdkPoint        *points,
+                                        gint             npoints);
+static void   gdk_pixmap_draw_segments  (GdkDrawable     *drawable,
+                                        GdkGC           *gc,
+                                        GdkSegment      *segs,
+                                        gint             nsegs);
+static void   gdk_pixmap_draw_lines     (GdkDrawable     *drawable,
+                                        GdkGC           *gc,
+                                        GdkPoint        *points,
+                                        gint             npoints);
+
+static void gdk_pixmap_draw_glyphs             (GdkDrawable      *drawable,
+                                               GdkGC            *gc,
+                                               PangoFont        *font,
+                                               gint              x,
+                                               gint              y,
+                                               PangoGlyphString *glyphs);
+static void gdk_pixmap_draw_glyphs_transformed (GdkDrawable      *drawable,
+                                               GdkGC            *gc,
+                                               PangoMatrix      *matrix,
+                                               PangoFont        *font,
+                                               gint              x,
+                                               gint              y,
+                                               PangoGlyphString *glyphs);
+
+static void   gdk_pixmap_draw_image     (GdkDrawable     *drawable,
+                                         GdkGC           *gc,
+                                         GdkImage        *image,
+                                         gint             xsrc,
+                                         gint             ysrc,
+                                         gint             xdest,
+                                         gint             ydest,
+                                         gint             width,
+                                         gint             height);
+static void   gdk_pixmap_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_pixmap_draw_trapezoids (GdkDrawable     *drawable,
+                                        GdkGC           *gc,
+                                        GdkTrapezoid    *trapezoids,
+                                        gint             n_trapezoids);
+
+static void   gdk_pixmap_real_get_size  (GdkDrawable     *drawable,
+                                         gint            *width,
+                                         gint            *height);
+
+static GdkImage* gdk_pixmap_copy_to_image (GdkDrawable *drawable,
+                                          GdkImage    *image,
+                                          gint         src_x,
+                                          gint         src_y,
+                                          gint         dest_x,
+                                          gint         dest_y,
+                                          gint         width,
+                                          gint         height);
+
+static cairo_surface_t *gdk_pixmap_ref_cairo_surface (GdkDrawable *drawable);
+static cairo_surface_t *gdk_pixmap_create_cairo_surface (GdkDrawable *drawable,
+                                                        int width,
+                                                        int height);
+
+static GdkVisual*   gdk_pixmap_real_get_visual   (GdkDrawable *drawable);
+static gint         gdk_pixmap_real_get_depth    (GdkDrawable *drawable);
+static void         gdk_pixmap_real_set_colormap (GdkDrawable *drawable,
+                                                  GdkColormap *cmap);
+static GdkColormap* gdk_pixmap_real_get_colormap (GdkDrawable *drawable);
+static GdkScreen*   gdk_pixmap_real_get_screen   (GdkDrawable *drawable);
+
+static void gdk_pixmap_init       (GdkPixmapObject      *pixmap);
+static void gdk_pixmap_class_init (GdkPixmapObjectClass *klass);
+static void gdk_pixmap_finalize   (GObject              *object);
+
+static gpointer parent_class = NULL;
+
+GType
+gdk_pixmap_get_type (void)
 {
-  gchar *color_string;
-  GdkColor color;
-  gint transparent;
-} _GdkPixmapColor;
+  static GType object_type = 0;
+
+  if (!object_type)
+    object_type = g_type_register_static_simple (GDK_TYPE_DRAWABLE,
+                                                "GdkPixmap",
+                                                sizeof (GdkPixmapObjectClass),
+                                                (GClassInitFunc) gdk_pixmap_class_init,
+                                                sizeof (GdkPixmapObject),
+                                                (GInstanceInitFunc) gdk_pixmap_init,
+                                                0);
+  
+  return object_type;
+}
 
-typedef struct
+static void
+gdk_pixmap_init (GdkPixmapObject *pixmap)
 {
-  guint ncolors;
-  GdkColormap *colormap;
-  gulong pixels[1];
-} _GdkPixmapInfo;
+  /* 0-initialization is good for all other fields. */
+  pixmap->impl = g_object_new (_gdk_pixmap_impl_get_type (), NULL);
+}
 
-GdkPixmap*
-gdk_pixmap_new (GdkWindow *window,
-               gint       width,
-               gint       height,
-               gint       depth)
+static void
+gdk_pixmap_class_init (GdkPixmapObjectClass *klass)
 {
-  GdkPixmap *pixmap;
-  GdkWindowPrivate *private;
-  GdkWindowPrivate *window_private;
-
-  g_return_val_if_fail ((window != NULL) || (depth != -1), NULL);
-  g_return_val_if_fail ((width != 0) && (height != 0), NULL);
-
-  if (!window)
-    window = (GdkWindow*) &gdk_root_parent;
-
-  window_private = (GdkWindowPrivate*) window;
-  if (window_private->destroyed)
-    return NULL;
-
-  if (depth == -1)
-    depth = gdk_window_get_visual (window)->depth;
-
-  private = g_new (GdkWindowPrivate, 1);
-  pixmap = (GdkPixmap*) private;
-
-  private->xdisplay = window_private->xdisplay;
-  private->window_type = GDK_WINDOW_PIXMAP;
-  private->xwindow = XCreatePixmap (private->xdisplay, window_private->xwindow,
-                                   width, height, depth);
-  private->colormap = NULL;
-  private->parent = NULL;
-  private->x = 0;
-  private->y = 0;
-  private->width = width;
-  private->height = height;
-  private->resize_count = 0;
-  private->ref_count = 1;
-  private->destroyed = 0;
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+  GdkDrawableClass *drawable_class = GDK_DRAWABLE_CLASS (klass);
+  
+  parent_class = g_type_class_peek_parent (klass);
+
+  object_class->finalize = gdk_pixmap_finalize;
+
+  drawable_class->create_gc = gdk_pixmap_create_gc;
+  drawable_class->draw_rectangle = gdk_pixmap_draw_rectangle;
+  drawable_class->draw_arc = gdk_pixmap_draw_arc;
+  drawable_class->draw_polygon = gdk_pixmap_draw_polygon;
+  drawable_class->draw_text = gdk_pixmap_draw_text;
+  drawable_class->draw_text_wc = gdk_pixmap_draw_text_wc;
+  drawable_class->draw_drawable_with_src = gdk_pixmap_draw_drawable;
+  drawable_class->draw_points = gdk_pixmap_draw_points;
+  drawable_class->draw_segments = gdk_pixmap_draw_segments;
+  drawable_class->draw_lines = gdk_pixmap_draw_lines;
+  drawable_class->draw_glyphs = gdk_pixmap_draw_glyphs;
+  drawable_class->draw_glyphs_transformed = gdk_pixmap_draw_glyphs_transformed;
+  drawable_class->draw_image = gdk_pixmap_draw_image;
+  drawable_class->draw_pixbuf = gdk_pixmap_draw_pixbuf;
+  drawable_class->draw_trapezoids = gdk_pixmap_draw_trapezoids;
+  drawable_class->get_depth = gdk_pixmap_real_get_depth;
+  drawable_class->get_screen = gdk_pixmap_real_get_screen;
+  drawable_class->get_size = gdk_pixmap_real_get_size;
+  drawable_class->set_colormap = gdk_pixmap_real_set_colormap;
+  drawable_class->get_colormap = gdk_pixmap_real_get_colormap;
+  drawable_class->get_visual = gdk_pixmap_real_get_visual;
+  drawable_class->_copy_to_image = gdk_pixmap_copy_to_image;
+  drawable_class->ref_cairo_surface = gdk_pixmap_ref_cairo_surface;
+  drawable_class->create_cairo_surface = gdk_pixmap_create_cairo_surface;
+}
 
-  gdk_xid_table_insert (&private->xwindow, pixmap);
+static void
+gdk_pixmap_finalize (GObject *object)
+{
+  GdkPixmapObject *obj = (GdkPixmapObject *) object;
 
-  return pixmap;
+  g_object_unref (obj->impl);
+  obj->impl = NULL;
+  
+  G_OBJECT_CLASS (parent_class)->finalize (object);
 }
 
 GdkPixmap *
-gdk_bitmap_create_from_data (GdkWindow *window,
-                            gchar     *data,
-                            gint       width,
-                            gint       height)
+gdk_pixmap_new (GdkDrawable *drawable,
+                gint         width,
+                gint         height,
+                gint         depth)
 {
-  GdkPixmap *pixmap;
-  GdkWindowPrivate *private;
-  GdkWindowPrivate *window_private;
-
-  g_return_val_if_fail (data != NULL, NULL);
-  g_return_val_if_fail ((width != 0) && (height != 0), NULL);
+  GdkDrawable *source_drawable;
 
-  if (!window)
-    window = (GdkWindow*) &gdk_root_parent;
+  if (drawable)
+    source_drawable = _gdk_drawable_get_source_drawable (drawable);
+  else
+    source_drawable = NULL;
+  return _gdk_pixmap_new (source_drawable, width, height, depth);
+}
 
-  window_private = (GdkWindowPrivate*) window;
-  if (window_private->destroyed)
-    return NULL;
+GdkPixmap *
+gdk_bitmap_create_from_data (GdkDrawable *drawable,
+                             const gchar *data,
+                             gint         width,
+                             gint         height)
+{
+  GdkDrawable *source_drawable;
 
-  private = g_new (GdkWindowPrivate, 1);
-  pixmap = (GdkPixmap*) private;
+  if (drawable)
+    source_drawable = _gdk_drawable_get_source_drawable (drawable);
+  else
+    source_drawable = NULL;
+  return _gdk_bitmap_create_from_data (source_drawable, data, width, height);
+}
 
-  private->parent = NULL;
-  private->xdisplay = window_private->xdisplay;
-  private->window_type = GDK_WINDOW_PIXMAP;
-  private->x = 0;
-  private->y = 0;
-  private->width = width;
-  private->height = height;
-  private->resize_count = 0;
-  private->ref_count = 1;
-  private->destroyed = FALSE;
+GdkPixmap*
+gdk_pixmap_create_from_data (GdkDrawable    *drawable,
+                             const gchar    *data,
+                             gint            width,
+                             gint            height,
+                             gint            depth,
+                             const GdkColor *fg,
+                             const GdkColor *bg)
+{
+  GdkDrawable *source_drawable;
 
-  private->xwindow = XCreateBitmapFromData (private->xdisplay,
-                                           window_private->xwindow,
-                                           data, width, height);
+  source_drawable = _gdk_drawable_get_source_drawable (drawable);
+  return _gdk_pixmap_create_from_data (source_drawable,
+                                       data, width, height,
+                                       depth, fg,bg);
+}
 
-  gdk_xid_table_insert (&private->xwindow, pixmap);
 
-  return pixmap;
+static GdkGC *
+gdk_pixmap_create_gc (GdkDrawable     *drawable,
+                      GdkGCValues     *values,
+                      GdkGCValuesMask  mask)
+{
+  return gdk_gc_new_with_values (((GdkPixmapObject *) drawable)->impl,
+                                 values, mask);
 }
 
-GdkPixmap*
-gdk_pixmap_create_from_data (GdkWindow *window,
-                            gchar     *data,
-                            gint       width,
-                            gint       height,
-                            gint       depth,
-                            GdkColor  *fg,
-                            GdkColor  *bg)
+static void
+gdk_pixmap_draw_rectangle (GdkDrawable *drawable,
+                          GdkGC       *gc,
+                          gboolean     filled,
+                          gint         x,
+                          gint         y,
+                          gint         width,
+                          gint         height)
 {
-  GdkPixmap *pixmap;
-  GdkWindowPrivate *private;
-  GdkWindowPrivate *window_private;
+  GdkPixmapObject *private = (GdkPixmapObject *)drawable;
 
-  g_return_val_if_fail (data != NULL, NULL);
-  g_return_val_if_fail (fg != NULL, NULL);
-  g_return_val_if_fail (bg != NULL, NULL);
-  g_return_val_if_fail ((window != NULL) || (depth != -1), NULL);
-  g_return_val_if_fail ((width != 0) && (height != 0), NULL);
+  _gdk_gc_remove_drawable_clip (gc);  
+  gdk_draw_rectangle (private->impl, gc, filled,
+                      x, y, width, height);
+}
 
-  if (!window)
-    window = (GdkWindow*) &gdk_root_parent;
+static void
+gdk_pixmap_draw_arc (GdkDrawable *drawable,
+                    GdkGC       *gc,
+                    gboolean     filled,
+                    gint         x,
+                    gint         y,
+                    gint         width,
+                    gint         height,
+                    gint         angle1,
+                    gint         angle2)
+{
+  GdkPixmapObject *private = (GdkPixmapObject *)drawable;
 
-  window_private = (GdkWindowPrivate*) window;
-  if (window_private->destroyed)
-    return NULL;
+  _gdk_gc_remove_drawable_clip (gc);  
+  gdk_draw_arc (private->impl, gc, filled,
+                x, y,
+                width, height, angle1, angle2);
+}
 
-  if (depth == -1)
-    depth = gdk_window_get_visual (window)->depth;
+static void
+gdk_pixmap_draw_polygon (GdkDrawable *drawable,
+                        GdkGC       *gc,
+                        gboolean     filled,
+                        GdkPoint    *points,
+                        gint         npoints)
+{
+  GdkPixmapObject *private = (GdkPixmapObject *)drawable;
 
-  private = g_new (GdkWindowPrivate, 1);
-  pixmap = (GdkPixmap*) private;
+  _gdk_gc_remove_drawable_clip (gc);  
+  gdk_draw_polygon (private->impl, gc, filled, points, npoints);
+}
 
-  private->parent = NULL;
-  private->xdisplay = window_private->xdisplay;
-  private->window_type = GDK_WINDOW_PIXMAP;
-  private->x = 0;
-  private->y = 0;
-  private->width = width;
-  private->height = height;
-  private->resize_count = 0;
-  private->ref_count = 1;
-  private->destroyed = FALSE;
+static void
+gdk_pixmap_draw_text (GdkDrawable *drawable,
+                     GdkFont     *font,
+                     GdkGC       *gc,
+                     gint         x,
+                     gint         y,
+                     const gchar *text,
+                     gint         text_length)
+{
+  GdkPixmapObject *private = (GdkPixmapObject *)drawable;
 
-  private->xwindow = XCreatePixmapFromBitmapData (private->xdisplay,
-                                                 window_private->xwindow,
-                                                 data, width, height,
-                                                 fg->pixel, bg->pixel, depth);
+  _gdk_gc_remove_drawable_clip (gc);  
+  gdk_draw_text (private->impl, font, gc,
+                 x, y, text, text_length);
+}
 
-  gdk_xid_table_insert (&private->xwindow, pixmap);
+static void
+gdk_pixmap_draw_text_wc (GdkDrawable    *drawable,
+                        GdkFont        *font,
+                        GdkGC          *gc,
+                        gint            x,
+                        gint            y,
+                        const GdkWChar *text,
+                        gint            text_length)
+{
+  GdkPixmapObject *private = (GdkPixmapObject *)drawable;
 
-  return pixmap;
+  _gdk_gc_remove_drawable_clip (gc);  
+  gdk_draw_text_wc (private->impl, font, gc,
+                    x, y, text, text_length);
 }
 
-static gint
-gdk_pixmap_seek_string (FILE  *infile,
-                        const gchar *str,
-                        gint   skip_comments)
+static void
+gdk_pixmap_draw_drawable (GdkDrawable *drawable,
+                         GdkGC       *gc,
+                         GdkPixmap   *src,
+                         gint         xsrc,
+                         gint         ysrc,
+                         gint         xdest,
+                         gint         ydest,
+                         gint         width,
+                         gint         height,
+                         GdkPixmap   *original_src)
 {
-  char instr[1024];
+  GdkPixmapObject *private = (GdkPixmapObject *)drawable;
+
+  _gdk_gc_remove_drawable_clip (gc);
+  /* Call the method directly to avoid getting the composite drawable again */
+  GDK_DRAWABLE_GET_CLASS (private->impl)->draw_drawable_with_src (private->impl, gc,
+                                                                 src,
+                                                                 xsrc, ysrc,
+                                                                 xdest, ydest,
+                                                                 width, height,
+                                                                 original_src);
+}
 
-  while (!feof (infile))
-    {
-      fscanf (infile, "%1023s", instr);
-      if (skip_comments == TRUE && strcmp (instr, "/*") == 0)
-        {
-          fscanf (infile, "%1023s", instr);
-          while (!feof (infile) && strcmp (instr, "*/") != 0)
-            fscanf (infile, "%1023s", instr);
-          fscanf(infile, "%1023s", instr);
-        }
-      if (strcmp (instr, str)==0)
-        return TRUE;
-    }
+static void
+gdk_pixmap_draw_points (GdkDrawable *drawable,
+                       GdkGC       *gc,
+                       GdkPoint    *points,
+                       gint         npoints)
+{
+  GdkPixmapObject *private = (GdkPixmapObject *)drawable;
 
-  return FALSE;
+  _gdk_gc_remove_drawable_clip (gc);  
+  gdk_draw_points (private->impl, gc, points, npoints);
 }
 
-static gint
-gdk_pixmap_seek_char (FILE  *infile,
-                      gchar  c)
+static void
+gdk_pixmap_draw_segments (GdkDrawable *drawable,
+                         GdkGC       *gc,
+                         GdkSegment  *segs,
+                         gint         nsegs)
 {
-  gint b, oldb;
+  GdkPixmapObject *private = (GdkPixmapObject *)drawable;
 
-  while ((b = getc(infile)) != EOF)
-    {
-      if (c != b && b == '/')
-       {
-         b = getc (infile);
-         if (b == EOF)
-           return FALSE;
-         else if (b == '*')    /* we have a comment */
-           {
-             b = -1;
-             do
-               {
-                 oldb = b;
-                 b = getc (infile);
-                 if (b == EOF)
-                   return FALSE;
-               }
-             while (!(oldb == '*' && b == '/'));
-           }
-        }
-      else if (c == b)
-       return TRUE;
-    }
-  return FALSE;
+  _gdk_gc_remove_drawable_clip (gc);  
+  gdk_draw_segments (private->impl, gc, segs, nsegs);
 }
 
-static gint
-gdk_pixmap_read_string (FILE  *infile,
-                        gchar **buffer,
-                       guint *buffer_size)
+static void
+gdk_pixmap_draw_lines (GdkDrawable *drawable,
+                      GdkGC       *gc,
+                      GdkPoint    *points,
+                      gint         npoints)
 {
-  gint c;
-  guint cnt = 0, bufsiz, ret = FALSE;
-  gchar *buf;
+  GdkPixmapObject *private = (GdkPixmapObject *)drawable;
 
-  buf = *buffer;
-  bufsiz = *buffer_size;
-  if (buf == NULL)
-    {
-      bufsiz = 10 * sizeof (gchar);
-      buf = g_new(gchar, bufsiz);
-    }
+  _gdk_gc_remove_drawable_clip (gc);  
+  gdk_draw_lines (private->impl, gc, points, npoints);
+}
 
-  do
-    c = getc (infile);
-  while (c != EOF && c != '"');
+static void
+gdk_pixmap_draw_glyphs (GdkDrawable      *drawable,
+                        GdkGC            *gc,
+                        PangoFont        *font,
+                        gint              x,
+                        gint              y,
+                        PangoGlyphString *glyphs)
+{
+  GdkPixmapObject *private = (GdkPixmapObject *)drawable;
 
-  if (c != '"')
-    goto out;
+  _gdk_gc_remove_drawable_clip (gc);  
+  gdk_draw_glyphs (private->impl, gc, font, x, y, glyphs);
+}
 
-  while ((c = getc(infile)) != EOF)
-    {
-      if (cnt == bufsiz)
-       {
-         guint new_size = bufsiz * 2;
-         if (new_size > bufsiz)
-           bufsiz = new_size;
-         else
-           goto out;
-         
-         buf = (gchar *) g_realloc (buf, bufsiz);
-         buf[bufsiz-1] = '\0';
-       }
-
-      if (c != '"')
-        buf[cnt++] = c;
-      else
-        {
-          buf[cnt] = 0;
-         ret = TRUE;
-         break;
-        }
-    }
+static void
+gdk_pixmap_draw_glyphs_transformed (GdkDrawable      *drawable,
+                                   GdkGC            *gc,
+                                   PangoMatrix      *matrix,
+                                   PangoFont        *font,
+                                   gint              x,
+                                   gint              y,
+                                   PangoGlyphString *glyphs)
+{
+  GdkPixmapObject *private = (GdkPixmapObject *)drawable;
 
- out:
-  buf[bufsiz-1] = '\0';                /* ensure null termination for errors */
-  *buffer = buf;
-  *buffer_size = bufsiz;
-  return ret;
+  _gdk_gc_remove_drawable_clip (gc);  
+  gdk_draw_glyphs_transformed (private->impl, gc, matrix, font, x, y, glyphs);
 }
 
-static gchar*
-gdk_pixmap_skip_whitespaces (gchar *buffer)
+static void
+gdk_pixmap_draw_image (GdkDrawable     *drawable,
+                       GdkGC           *gc,
+                       GdkImage        *image,
+                       gint             xsrc,
+                       gint             ysrc,
+                       gint             xdest,
+                       gint             ydest,
+                       gint             width,
+                       gint             height)
 {
-  gint32 index = 0;
+  GdkPixmapObject *private = (GdkPixmapObject *)drawable;
 
-  while (buffer[index] != 0 && (buffer[index] == 0x20 || buffer[index] == 0x09))
-    index++;
-
-  return &buffer[index];
+  _gdk_gc_remove_drawable_clip (gc);  
+  gdk_draw_image (private->impl, gc, image, xsrc, ysrc, xdest, ydest,
+                  width, height);
 }
 
-static gchar*
-gdk_pixmap_skip_string (gchar *buffer)
+static void
+gdk_pixmap_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)
 {
-  gint32 index = 0;
-
-  while (buffer[index] != 0 && buffer[index] != 0x20 && buffer[index] != 0x09)
-    index++;
+  GdkPixmapObject *private = (GdkPixmapObject *)drawable;
 
-  return &buffer[index];
+  if (gc)
+    _gdk_gc_remove_drawable_clip (gc);  
+  gdk_draw_pixbuf (private->impl, gc, pixbuf,
+                  src_x, src_y, dest_x, dest_y, width, height,
+                  dither, x_dither, y_dither);
 }
 
-/* Xlib crashed ince at a color name lengths around 125 */
-#define MAX_COLOR_LEN 120
+static void
+gdk_pixmap_draw_trapezoids (GdkDrawable     *drawable,
+                           GdkGC           *gc,
+                           GdkTrapezoid    *trapezoids,
+                           gint             n_trapezoids)
+{
+  GdkPixmapObject *private = (GdkPixmapObject *)drawable;
+
+  _gdk_gc_remove_drawable_clip (gc);  
+  gdk_draw_trapezoids (private->impl, gc, trapezoids, n_trapezoids);
+}
 
-static gchar*
-gdk_pixmap_extract_color (gchar *buffer)
+static void
+gdk_pixmap_real_get_size (GdkDrawable *drawable,
+                          gint *width,
+                          gint *height)
 {
-  gint counter, numnames;
-  gchar *ptr = NULL, ch, temp[128];
-  gchar color[MAX_COLOR_LEN], *retcol;
-  gint space;
+  g_return_if_fail (GDK_IS_PIXMAP (drawable));
 
-  counter = 0;
-  while (ptr == NULL)
-    {
-      if (buffer[counter] == 'c')
-        {
-          ch = buffer[counter + 1];
-          if (ch == 0x20 || ch == 0x09)
-            ptr = &buffer[counter + 1];
-        }
-      else if (buffer[counter] == 0)
-        return NULL;
-
-      counter++;
-    }
+  gdk_drawable_get_size (GDK_DRAWABLE (((GdkPixmapObject*)drawable)->impl),
+                         width, height);
+}
 
-  ptr = gdk_pixmap_skip_whitespaces (ptr);
+static GdkVisual*
+gdk_pixmap_real_get_visual (GdkDrawable *drawable)
+{
+  GdkColormap *colormap;
 
-  if (ptr[0] == 0)
-    return NULL;
-  else if (ptr[0] == '#')
-    {
-      counter = 1;
-      while (ptr[counter] != 0 && 
-             ((ptr[counter] >= '0' && ptr[counter] <= '9') ||
-              (ptr[counter] >= 'a' && ptr[counter] <= 'f') ||
-              (ptr[counter] >= 'A' && ptr[counter] <= 'F')))
-        counter++;
-
-      retcol = g_new (gchar, counter+1);
-      strncpy (retcol, ptr, counter);
-
-      retcol[counter] = 0;
-      
-      return retcol;
-    }
+  g_return_val_if_fail (GDK_IS_PIXMAP (drawable), NULL);
 
-  color[0] = 0;
-  numnames = 0;
+  colormap = gdk_drawable_get_colormap (drawable);
+  return colormap ? gdk_colormap_get_visual (colormap) : NULL;
+}
 
-  space = MAX_COLOR_LEN - 1;
-  while (space > 0)
-    {
-      sscanf (ptr, "%127s", temp);
-
-      if (((gint)ptr[0] == 0) ||
-         (strcmp ("s", temp) == 0) || (strcmp ("m", temp) == 0) ||
-          (strcmp ("g", temp) == 0) || (strcmp ("g4", temp) == 0))
-       {
-         break;
-       }
-      else
-        {
-          if (numnames > 0)
-           {
-             space -= 1;
-             strcat (color, " ");
-           }
-         strncat (color, temp, space);
-         space -= MIN (space, strlen (temp));
-          ptr = gdk_pixmap_skip_string (ptr);
-          ptr = gdk_pixmap_skip_whitespaces (ptr);
-          numnames++;
-        }
-    }
+static gint
+gdk_pixmap_real_get_depth (GdkDrawable *drawable)
+{
+  gint depth;
+  
+  g_return_val_if_fail (GDK_IS_PIXMAP (drawable), 0);
 
-  retcol = g_strdup (color);
-  return retcol;
+  depth = GDK_PIXMAP_OBJECT (drawable)->depth;
+
+  return depth;
 }
 
+static void
+gdk_pixmap_real_set_colormap (GdkDrawable *drawable,
+                              GdkColormap *cmap)
+{
+  g_return_if_fail (GDK_IS_PIXMAP (drawable));  
+  
+  gdk_drawable_set_colormap (((GdkPixmapObject*)drawable)->impl, cmap);
+}
 
-enum buffer_op
+static GdkColormap*
+gdk_pixmap_real_get_colormap (GdkDrawable *drawable)
 {
-  op_header,
-  op_cmap,
-  op_body
-};
+  g_return_val_if_fail (GDK_IS_PIXMAP (drawable), NULL);
   
+  return gdk_drawable_get_colormap (((GdkPixmapObject*)drawable)->impl);
+}
 
-static void 
-gdk_xpm_destroy_notify (gpointer data)
+static GdkImage*
+gdk_pixmap_copy_to_image (GdkDrawable     *drawable,
+                         GdkImage        *image,
+                         gint             src_x,
+                         gint             src_y,
+                         gint             dest_x,
+                         gint             dest_y,
+                         gint             width,
+                         gint             height)
 {
-  _GdkPixmapInfo *info = (_GdkPixmapInfo *)data;
-  GdkColor color;
-  int i;
+  g_return_val_if_fail (GDK_IS_PIXMAP (drawable), NULL);
+  
+  return gdk_drawable_copy_to_image (((GdkPixmapObject*)drawable)->impl,
+                                    image,
+                                    src_x, src_y, dest_x, dest_y,
+                                    width, height);
+}
 
-  for (i=0; i<info->ncolors; i++)
-    {
-      color.pixel = info->pixels[i];
-      gdk_colormap_free_colors (info->colormap, &color, 1);
-    }
+static cairo_surface_t *
+gdk_pixmap_ref_cairo_surface (GdkDrawable *drawable)
+{
+  return _gdk_drawable_ref_cairo_surface (((GdkPixmapObject*)drawable)->impl);
+}
 
-  gdk_colormap_unref (info->colormap);
-  g_free (info);
+static cairo_surface_t *
+gdk_pixmap_create_cairo_surface (GdkDrawable *drawable,
+                                int width,
+                                int height)
+{
+  return _gdk_windowing_create_cairo_surface (GDK_PIXMAP_OBJECT(drawable)->impl,
+                                             width, height);
 }
-  
-static GdkPixmap *
-_gdk_pixmap_create_from_xpm (GdkWindow  *window,
-                            GdkColormap *colormap,
-                            GdkBitmap **mask,
-                            GdkColor   *transparent_color,
-                            gchar *   (*get_buf) (enum buffer_op op,
-                                                  gpointer       handle),
-                            gpointer    handle)
-{
-  GdkPixmap *pixmap = NULL;
-  GdkImage *image = NULL;
-  GdkVisual *visual;
-  GdkGC *gc = NULL;
-  GdkColor tmp_color;
-  gint width, height, num_cols, cpp, n, ns, cnt, xcnt, ycnt, wbytes;
-  gchar *buffer, pixel_str[32];
-  gchar *name_buf;
-  _GdkPixmapColor *color = NULL, *fallbackcolor = NULL;
-  _GdkPixmapColor *colors = NULL;
-  gulong index;
-  GHashTable *color_hash = NULL;
-  _GdkPixmapInfo *color_info = NULL;
-  
-  if ((window == NULL) && (colormap == NULL))
-    g_warning ("Creating pixmap from xpm with NULL window and colormap");
-  
-  if (window == NULL)
-    window = (GdkWindow *)&gdk_root_parent;
-  
-  if (colormap == NULL)
-    {
-      colormap = gdk_window_get_colormap (window);
-      visual = gdk_window_get_visual (window);
-    }
-  else
-    visual = ((GdkColormapPrivate *)colormap)->visual;
-  
-  buffer = (*get_buf) (op_header, handle);
-  if (buffer == NULL)
-    return NULL;
-  
-  sscanf (buffer,"%d %d %d %d", &width, &height, &num_cols, &cpp);
-  if (cpp >= 32)
-    {
-      g_warning ("Pixmap has more than 31 characters per color\n");
-      return NULL;
-    }
-  
-  color_hash = g_hash_table_new (g_str_hash, g_str_equal);
-  
-  if (transparent_color == NULL)
-    {
-      gdk_color_white (colormap, &tmp_color);
-      transparent_color = &tmp_color;
-    }
 
-  /* For pseudo-color and grayscale visuals, we have to remember
-   * the colors we allocated, so we can free them later.
-   */
-  if ((visual->type == GDK_VISUAL_PSEUDO_COLOR) ||
-      (visual->type == GDK_VISUAL_GRAYSCALE))
-    {
-      color_info = g_malloc (sizeof (_GdkPixmapInfo) + 
-                            sizeof(gulong) * (num_cols - 1));
-      color_info->ncolors = num_cols;
-      color_info->colormap = colormap;
-      gdk_colormap_ref (colormap);
-    }
 
-  name_buf = g_new (gchar, num_cols * (cpp+1));
-  colors = g_new (_GdkPixmapColor, num_cols);
 
-  for (cnt = 0; cnt < num_cols; cnt++)
-    {
-      gchar *color_name;
-      
-      buffer = (*get_buf) (op_cmap, handle);
-      if (buffer == NULL)
-       goto error;
-      
-      color = &colors[cnt];
-      color->color_string = &name_buf [cnt * (cpp + 1)];
-      strncpy (color->color_string, buffer, cpp);
-      color->color_string[cpp] = 0;
-      buffer += strlen (color->color_string);
-      color->transparent = FALSE;
-      
-      color_name = gdk_pixmap_extract_color (buffer);
-      
-      if (color_name == NULL ||
-         gdk_color_parse (color_name, &color->color) == FALSE)
-       {
-         color->color = *transparent_color;
-         color->transparent = TRUE;
-       }
-      
-      g_free (color_name);
-      
-      /* FIXME: The remaining slowness appears to happen in this
-         function. */
-      gdk_color_alloc (colormap, &color->color);
-
-      if (color_info)
-       color_info->pixels[cnt] = color->color.pixel;
-      
-      g_hash_table_insert (color_hash, color->color_string, color);
-      if (cnt == 0)
-       fallbackcolor = color;
-    }
-  
-  index = 0;
-  image = gdk_image_new (GDK_IMAGE_FASTEST, visual, width, height);
-  
-  if (mask)
-    {
-      /* The pixmap mask is just a bits pattern.
-       * Color 0 is used for background and 1 for foreground.
-       * We don't care about the colormap, we just need 0 and 1.
-       */
-      GdkColor mask_pattern;
-      
-      *mask = gdk_pixmap_new (window, width, height, 1);
-      gc = gdk_gc_new (*mask);
-      
-      mask_pattern.pixel = 0;
-      gdk_gc_set_foreground (gc, &mask_pattern);
-      gdk_draw_rectangle (*mask, gc, TRUE, 0, 0, -1, -1);
-      
-      mask_pattern.pixel = 1;
-      gdk_gc_set_foreground (gc, &mask_pattern);
-    }
-  
-  wbytes = width * cpp;
-  for (ycnt = 0; ycnt < height; ycnt++)
-    {
-      buffer = (*get_buf) (op_body, handle);
-      
-      /* FIXME: this slows things down a little - it could be
-       * integrated into the strncpy below, perhaps. OTOH, strlen
-       * is fast.
-       */
-      if ((buffer == NULL) || strlen (buffer) < wbytes)
-       continue;
-      
-      for (n = 0, cnt = 0, xcnt = 0; n < wbytes; n += cpp, xcnt++)
-       {
-         strncpy (pixel_str, &buffer[n], cpp);
-         pixel_str[cpp] = 0;
-         ns = 0;
-         
-         color = g_hash_table_lookup (color_hash, pixel_str);
-         
-         if (!color) /* screwed up XPM file */
-           color = fallbackcolor;
-         
-         gdk_image_put_pixel (image, xcnt, ycnt, color->color.pixel);
-         
-         if (mask && color->transparent)
-           {
-             if (cnt < xcnt)
-               gdk_draw_line (*mask, gc, cnt, ycnt, xcnt - 1, ycnt);
-             cnt = xcnt + 1;
-           }
-       }
-      
-      if (mask && (cnt < xcnt))
-       gdk_draw_line (*mask, gc, cnt, ycnt, xcnt - 1, ycnt);
-    }
+static GdkBitmap *
+make_solid_mask (GdkScreen *screen, gint width, gint height)
+{
+  GdkBitmap *bitmap;
+  GdkGC *gc;
+  GdkGCValues gc_values;
   
- error:
+  bitmap = gdk_pixmap_new (gdk_screen_get_root_window (screen),
+                          width, height, 1);
+
+  gc_values.foreground.pixel = 1;
+  gc = gdk_gc_new_with_values (bitmap, &gc_values, GDK_GC_FOREGROUND);
   
-  if (mask)
-    gdk_gc_destroy (gc);
+  gdk_draw_rectangle (bitmap, gc, TRUE, 0, 0, width, height);
   
-  if (image != NULL)
-    {
-      pixmap = gdk_pixmap_new (window, width, height, visual->depth);
-
-      if (color_info)
-       gdk_drawable_set_data (pixmap, "gdk-xpm", color_info, 
-                              gdk_xpm_destroy_notify);
-      
-      gc = gdk_gc_new (pixmap);
-      gdk_gc_set_foreground (gc, transparent_color);
-      gdk_draw_image (pixmap, gc, image, 0, 0, 0, 0, image->width, image->height);
-      gdk_gc_destroy (gc);
-      gdk_image_destroy (image);
-    }
-  else if (color_info)
-    gdk_xpm_destroy_notify (color_info);
+  g_object_unref (gc);
   
-  if (color_hash != NULL)
-    g_hash_table_destroy (color_hash);
-
-  if (colors != NULL)
-    g_free (colors);
-
-  if (name_buf != NULL)
-    g_free (name_buf);
-
-  return pixmap;
+  return bitmap;
 }
 
+#define PACKED_COLOR(c) ((((c)->red   & 0xff00)  << 8) |   \
+                         ((c)->green & 0xff00)        |   \
+                         ((c)->blue             >> 8))
 
-struct file_handle
-{
-  FILE *infile;
-  gchar *buffer;
-  guint buffer_size;
-};
-
-
-static gchar *
-file_buffer (enum buffer_op op, gpointer handle)
+static GdkPixmap *
+gdk_pixmap_colormap_new_from_pixbuf (GdkColormap    *colormap,
+                                    GdkBitmap     **mask,
+                                    const GdkColor *transparent_color,
+                                    GdkPixbuf      *pixbuf)
 {
-  struct file_handle *h = handle;
-
-  switch (op)
+  GdkPixmap *pixmap;
+  GdkPixbuf *render_pixbuf;
+  GdkGC *tmp_gc;
+  GdkScreen *screen = gdk_colormap_get_screen (colormap);
+  
+  pixmap = gdk_pixmap_new (gdk_screen_get_root_window (screen),
+                          gdk_pixbuf_get_width (pixbuf),
+                          gdk_pixbuf_get_height (pixbuf),
+                          gdk_colormap_get_visual (colormap)->depth);
+  gdk_drawable_set_colormap (pixmap, colormap);
+  
+  if (transparent_color)
     {
-    case op_header:
-      if (gdk_pixmap_seek_string (h->infile, "XPM", FALSE) != TRUE)
-       break;
-
-      if (gdk_pixmap_seek_char (h->infile,'{') != TRUE)
-       break;
-      /* Fall through to the next gdk_pixmap_seek_char. */
-
-    case op_cmap:
-      gdk_pixmap_seek_char (h->infile, '"');
-      fseek (h->infile, -1, SEEK_CUR);
-      /* Fall through to the gdk_pixmap_read_string. */
-
-    case op_body:
-      gdk_pixmap_read_string (h->infile, &h->buffer, &h->buffer_size);
-      return h->buffer;
+      guint32 packed_color = PACKED_COLOR (transparent_color);
+      render_pixbuf = gdk_pixbuf_composite_color_simple (pixbuf,
+                                                        gdk_pixbuf_get_width (pixbuf),
+                                                        gdk_pixbuf_get_height (pixbuf),
+                                                        GDK_INTERP_NEAREST,
+                                                        255, 16, packed_color, packed_color);
     }
-  return 0;
-}
+  else
+    render_pixbuf = pixbuf;
 
+  tmp_gc = _gdk_drawable_get_scratch_gc (pixmap, FALSE);
+  gdk_draw_pixbuf (pixmap, tmp_gc, render_pixbuf, 0, 0, 0, 0,
+                  gdk_pixbuf_get_width (render_pixbuf),
+                  gdk_pixbuf_get_height (render_pixbuf),
+                  GDK_RGB_DITHER_NORMAL, 0, 0);
 
-GdkPixmap*
-gdk_pixmap_colormap_create_from_xpm (GdkWindow   *window,
-                                    GdkColormap *colormap,
-                                    GdkBitmap  **mask,
-                                    GdkColor    *transparent_color,
-                                    const gchar *filename)
-{
-  struct file_handle h;
-  GdkPixmap *pixmap = NULL;
-
-  memset (&h, 0, sizeof (h));
-  h.infile = fopen (filename, "rb");
-  if (h.infile != NULL)
-    {
-      pixmap = _gdk_pixmap_create_from_xpm (window, colormap, mask,
-                                           transparent_color,
-                                           file_buffer, &h);
-      fclose (h.infile);
-      g_free (h.buffer);
-    }
+  if (render_pixbuf != pixbuf)
+    g_object_unref (render_pixbuf);
+
+  if (mask)
+    gdk_pixbuf_render_pixmap_and_mask_for_colormap (pixbuf, colormap, NULL, mask, 128);
+
+  if (mask && !*mask)
+    *mask = make_solid_mask (screen,
+                            gdk_pixbuf_get_width (pixbuf),
+                            gdk_pixbuf_get_height (pixbuf));
 
   return pixmap;
 }
 
 GdkPixmap*
-gdk_pixmap_create_from_xpm (GdkWindow  *window,
-                           GdkBitmap **mask,
-                           GdkColor   *transparent_color,
-                           const gchar *filename)
-{
-  return gdk_pixmap_colormap_create_from_xpm (window, NULL, mask,
-                                      transparent_color, filename);
-}
-
-
-struct mem_handle
+gdk_pixmap_colormap_create_from_xpm (GdkDrawable    *drawable,
+                                    GdkColormap    *colormap,
+                                    GdkBitmap     **mask,
+                                    const GdkColor *transparent_color,
+                                    const gchar    *filename)
 {
-  gchar **data;
-  int offset;
-};
+  GdkPixbuf *pixbuf;
+  GdkPixmap *pixmap;
 
+  g_return_val_if_fail (drawable != NULL || colormap != NULL, NULL);
+  g_return_val_if_fail (drawable == NULL || GDK_IS_DRAWABLE (drawable), NULL);
+  g_return_val_if_fail (colormap == NULL || GDK_IS_COLORMAP (colormap), NULL);
 
-static gchar *
-mem_buffer (enum buffer_op op, gpointer handle)
-{
-  struct mem_handle *h = handle;
-  switch (op)
-    {
-    case op_header:
-    case op_cmap:
-    case op_body:
-      if (h->data[h->offset])
-       return h->data[h->offset ++];
-    }
-  return 0;
-}
+  if (colormap == NULL)
+    colormap = gdk_drawable_get_colormap (drawable);
+  
+  pixbuf = gdk_pixbuf_new_from_file (filename, NULL);
+  if (!pixbuf)
+    return NULL;
 
+  pixmap = gdk_pixmap_colormap_new_from_pixbuf (colormap, mask, transparent_color, pixbuf);
 
-GdkPixmap*
-gdk_pixmap_colormap_create_from_xpm_d (GdkWindow  *window,
-                                      GdkColormap *colormap,
-                                      GdkBitmap **mask,
-                                      GdkColor   *transparent_color,
-                                      gchar     **data)
-{
-  struct mem_handle h;
-  GdkPixmap *pixmap = NULL;
-
-  memset (&h, 0, sizeof (h));
-  h.data = data;
-  pixmap = _gdk_pixmap_create_from_xpm (window, colormap, mask,
-                                       transparent_color,
-                                       mem_buffer, &h);
+  g_object_unref (pixbuf);
+  
   return pixmap;
 }
 
-
 GdkPixmap*
-gdk_pixmap_create_from_xpm_d (GdkWindow  *window,
-                             GdkBitmap **mask,
-                             GdkColor   *transparent_color,
-                             gchar     **data)
+gdk_pixmap_create_from_xpm (GdkDrawable    *drawable,
+                           GdkBitmap     **mask,
+                           const GdkColor *transparent_color,
+                           const gchar    *filename)
 {
-  return gdk_pixmap_colormap_create_from_xpm_d (window, NULL, mask,
-                                               transparent_color, data);
+  return gdk_pixmap_colormap_create_from_xpm (drawable, NULL, mask,
+                                             transparent_color, filename);
 }
 
 GdkPixmap*
-gdk_pixmap_foreign_new (guint32 anid)
+gdk_pixmap_colormap_create_from_xpm_d (GdkDrawable    *drawable,
+                                      GdkColormap    *colormap,
+                                      GdkBitmap     **mask,
+                                      const GdkColor *transparent_color,
+                                      gchar         **data)
 {
+  GdkPixbuf *pixbuf;
   GdkPixmap *pixmap;
-  GdkWindowPrivate *window_private;
-  GdkWindowPrivate *private;
-  Pixmap xpixmap;
-  Window root_return;
-  unsigned int x_ret, y_ret, w_ret, h_ret, bw_ret, depth_ret;
-
-  /* check to make sure we were passed something at
-     least a little sane */
-  g_return_val_if_fail((anid != 0), NULL);
-  
-  /* set the pixmap to the passed in value */
-  xpixmap = anid;
-  /* get the root window */
-  window_private = &gdk_root_parent;
-
-  /* get information about the Pixmap to fill in the structure for
-     the gdk window */
-  if (!XGetGeometry(window_private->xdisplay, xpixmap, &root_return,
-                   &x_ret, &y_ret, &w_ret, &h_ret, &bw_ret, &depth_ret))
-      return NULL;
-      
-  /* allocate a new gdk pixmap */
-  private = g_new(GdkWindowPrivate, 1);
-  pixmap = (GdkPixmap *)private;
-
-  private->xdisplay = window_private->xdisplay;
-  private->window_type = GDK_WINDOW_PIXMAP;
-  private->xwindow = xpixmap;
-  private->colormap = NULL;
-  private->parent = NULL;
-  private->x = 0;
-  private->y = 0;
-  private->width = w_ret;
-  private->height = h_ret;
-  private->resize_count = 0;
-  private->ref_count = 1;
-  private->destroyed = 0;
+
+  g_return_val_if_fail (drawable != NULL || colormap != NULL, NULL);
+  g_return_val_if_fail (drawable == NULL || GDK_IS_DRAWABLE (drawable), NULL);
+  g_return_val_if_fail (colormap == NULL || GDK_IS_COLORMAP (colormap), NULL);
+
+  if (colormap == NULL)
+    colormap = gdk_drawable_get_colormap (drawable);
   
-  gdk_xid_table_insert(&private->xwindow, pixmap);
+  pixbuf = gdk_pixbuf_new_from_xpm_data ((const char **)data);
+  if (!pixbuf)
+    return NULL;
 
-  return pixmap;
-}
+  pixmap = gdk_pixmap_colormap_new_from_pixbuf (colormap, mask, transparent_color, pixbuf);
 
-GdkPixmap*
-gdk_pixmap_ref (GdkPixmap *pixmap)
-{
-  GdkWindowPrivate *private = (GdkWindowPrivate *)pixmap;
-  g_return_val_if_fail (pixmap != NULL, NULL);
+  g_object_unref (pixbuf);
 
-  private->ref_count += 1;
   return pixmap;
 }
 
-void
-gdk_pixmap_unref (GdkPixmap *pixmap)
+GdkPixmap*
+gdk_pixmap_create_from_xpm_d (GdkDrawable    *drawable,
+                             GdkBitmap     **mask,
+                             const GdkColor *transparent_color,
+                             gchar         **data)
 {
-  GdkWindowPrivate *private = (GdkWindowPrivate *)pixmap;
-  g_return_if_fail(pixmap != NULL);
-
-  private->ref_count -= 1;
-  if (private->ref_count == 0)
-    {
-      XFreePixmap (private->xdisplay, private->xwindow);
-      gdk_xid_table_remove (private->xwindow);
-      g_dataset_destroy (private);
-      g_free (private);
-    }
+  return gdk_pixmap_colormap_create_from_xpm_d (drawable, NULL, mask,
+                                               transparent_color, data);
 }
 
-GdkBitmap *
-gdk_bitmap_ref (GdkBitmap *bitmap)
+static GdkScreen*
+gdk_pixmap_real_get_screen (GdkDrawable *drawable)
 {
-  return (GdkBitmap *)gdk_pixmap_ref ((GdkPixmap *)bitmap);
+    return gdk_drawable_get_screen (GDK_PIXMAP_OBJECT (drawable)->impl);
 }
 
-void
-gdk_bitmap_unref (GdkBitmap *bitmap)
-{
-  gdk_pixmap_unref ((GdkPixmap *)bitmap);
-}
+#define __GDK_PIXMAP_C__
+#include "gdkaliasdef.c"