]> Pileus Git - ~andy/gtk/blobdiff - gdk/x11/gdkpixmap-x11.c
Include "config.h" instead of <config.h> Command used: find -name
[~andy/gtk] / gdk / x11 / gdkpixmap-x11.c
index ab4cac35937fae795f0b2d27155bdc5d3f8b9a74..81d2b1da479a2ac94b8ef9da1b923712030567a9 100644 (file)
@@ -2,20 +2,29 @@
  * 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
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * 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"
+
+/*
+ * 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/. 
+ */
+
+#include "config.h"
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
 #include <X11/Xlib.h>
 
-#include "gdk.h"
-#include "gdkprivate.h"
+#include "gdkx.h"
+
+#include "gdkpixmap-x11.h"
+#include "gdkprivate-x11.h"
+#include "gdkscreen-x11.h"
+#include "gdkdisplay-x11.h"
+
+#include <gdk/gdkinternals.h>
+#include "gdkalias.h"
 
 typedef struct
 {
@@ -33,627 +49,414 @@ typedef struct
   gint transparent;
 } _GdkPixmapColor;
 
-GdkPixmap*
-gdk_pixmap_new (GdkWindow *window,
-               gint       width,
-               gint       height,
-               gint       depth)
+typedef struct
 {
-  GdkPixmap *pixmap;
-  GdkWindowPrivate *private;
-  GdkWindowPrivate *window_private;
-
-  if (!window)
-    window = (GdkWindow*) &gdk_root_parent;
-
-  if (depth == -1)
-    gdk_window_get_geometry (window, NULL, NULL, NULL, NULL, &depth);
-
-  private = g_new (GdkWindowPrivate, 1);
-  pixmap = (GdkPixmap*) private;
+  guint ncolors;
+  GdkColormap *colormap;
+  gulong pixels[1];
+} _GdkPixmapInfo;
 
-  window_private = (GdkWindowPrivate*) window;
+static void gdk_pixmap_impl_x11_get_size   (GdkDrawable        *drawable,
+                                        gint               *width,
+                                        gint               *height);
 
-  private->xdisplay = window_private->xdisplay;
-  private->window_type = GDK_WINDOW_PIXMAP;
-  private->xwindow = XCreatePixmap (private->xdisplay, window_private->xwindow,
-                                   width, height, depth);
-  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;
+static void gdk_pixmap_impl_x11_dispose    (GObject            *object);
+static void gdk_pixmap_impl_x11_finalize   (GObject            *object);
 
-  gdk_xid_table_insert (&private->xwindow, pixmap);
+G_DEFINE_TYPE (GdkPixmapImplX11, gdk_pixmap_impl_x11, GDK_TYPE_DRAWABLE_IMPL_X11)
 
-  return pixmap;
-}
-
-GdkPixmap *
-gdk_bitmap_create_from_data (GdkWindow *window,
-                            gchar     *data,
-                            gint       width,
-                            gint       height)
+GType
+_gdk_pixmap_impl_get_type (void)
 {
-  GdkPixmap *pixmap;
-  GdkWindowPrivate *private;
-  GdkWindowPrivate *window_private;
-
-  g_return_val_if_fail (data != NULL, NULL);
-
-  if (!window)
-    window = (GdkWindow*) &gdk_root_parent;
-
-  private = g_new (GdkWindowPrivate, 1);
-  pixmap = (GdkPixmap*) private;
-
-  window_private = (GdkWindowPrivate*) window;
-
-  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;
-
-  private->xwindow = XCreateBitmapFromData (private->xdisplay,
-                                           window_private->xwindow,
-                                           data, width, height);
-
-  gdk_xid_table_insert (&private->xwindow, pixmap);
-
-  return pixmap;
+  return gdk_pixmap_impl_x11_get_type ();
 }
 
-GdkPixmap*
-gdk_pixmap_create_from_data (GdkWindow *window,
-                            gchar     *data,
-                            gint       width,
-                            gint       height,
-                            gint       depth,
-                            GdkColor  *fg,
-                            GdkColor  *bg)
+static void
+gdk_pixmap_impl_x11_init (GdkPixmapImplX11 *impl)
 {
-  GdkPixmap *pixmap;
-  GdkWindowPrivate *private;
-  GdkWindowPrivate *window_private;
-
-  g_return_val_if_fail (data != NULL, NULL);
-  g_return_val_if_fail (fg != NULL, NULL);
-  g_return_val_if_fail (bg != NULL, NULL);
-
-  if (!window)
-    window = (GdkWindow*) &gdk_root_parent;
-
-  if (depth == -1)
-    gdk_window_get_geometry (window, NULL, NULL, NULL, NULL, &depth);
-
-  private = g_new (GdkWindowPrivate, 1);
-  pixmap = (GdkPixmap*) private;
-
-  window_private = (GdkWindowPrivate*) window;
-
-  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;
-
-  private->xwindow = XCreatePixmapFromBitmapData (private->xdisplay,
-                                                 window_private->xwindow,
-                                                 data, width, height,
-                                                 fg->pixel, bg->pixel, depth);
-
-  gdk_xid_table_insert (&private->xwindow, pixmap);
-
-  return pixmap;
+  impl->width = 1;
+  impl->height = 1;
 }
 
-gint
-gdk_pixmap_seek_string (FILE  *infile,
-                        const gchar *str,
-                        gint   skip_comments)
+static void
+gdk_pixmap_impl_x11_class_init (GdkPixmapImplX11Class *klass)
 {
-  char instr[1024];
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+  GdkDrawableClass *drawable_class = GDK_DRAWABLE_CLASS (klass);
+  
+  object_class->dispose  = gdk_pixmap_impl_x11_dispose;
+  object_class->finalize = gdk_pixmap_impl_x11_finalize;
 
-  while (!feof (infile))
-    {
-      fscanf (infile, "%s", instr);
-      if (skip_comments == TRUE && strcmp (instr, "/*") == 0)
-        {
-          fscanf (infile, "%s", instr);
-          while (!feof (infile) && strcmp (instr, "*/") != 0)
-            fscanf (infile, "%s", instr);
-          fscanf(infile, "%s", instr);
-        }
-      if (strcmp (instr, str)==0)
-        return TRUE;
-    }
-
-  return FALSE;
+  drawable_class->get_size = gdk_pixmap_impl_x11_get_size;
 }
 
-gint
-gdk_pixmap_seek_char (FILE  *infile,
-                      gchar  c)
+static void
+gdk_pixmap_impl_x11_dispose (GObject *object)
 {
-  gchar b, oldb;
+  GdkPixmapImplX11 *impl = GDK_PIXMAP_IMPL_X11 (object);
+  GdkPixmap *wrapper = GDK_PIXMAP (GDK_DRAWABLE_IMPL_X11 (impl)->wrapper);
+  GdkDisplay *display = GDK_PIXMAP_DISPLAY (wrapper);
 
-  while (!feof (infile))
+  if (!display->closed)
     {
-      fscanf(infile, "%c", &b);
-      if (c != b && b == '/')
-        {
-          fscanf (infile, "%c", &b);
-          if (b == '*')
-            {
-              oldb = b;
-              while (!feof (infile) && !(oldb == '*' && b == '/'))
-                {
-                  oldb = b;
-                  fscanf (infile, "%c", &b);
-                }
-              fscanf (infile, "%c", &b);
-            }
-        }
-      if (c == b)
-        return TRUE;
+      if (!impl->is_foreign)
+       XFreePixmap (GDK_DISPLAY_XDISPLAY (display), GDK_PIXMAP_XID (wrapper));
     }
 
-  return FALSE;
+  _gdk_xid_table_remove (display, GDK_PIXMAP_XID (wrapper));
+
+  G_OBJECT_CLASS (gdk_pixmap_impl_x11_parent_class)->dispose (object);
 }
 
-gint
-gdk_pixmap_read_string (FILE  *infile,
-                        gchar **buffer,
-                       int *buffer_size)
+static void
+gdk_pixmap_impl_x11_finalize (GObject *object)
 {
-  gchar c;
-  gint cnt = 0;
+  GdkPixmapImplX11 *impl = GDK_PIXMAP_IMPL_X11 (object);
+  GdkPixmap *wrapper = GDK_PIXMAP (GDK_DRAWABLE_IMPL_X11 (impl)->wrapper);
+  GdkDisplay *display = GDK_PIXMAP_DISPLAY (wrapper);
 
-  if ((*buffer) == NULL)
+  if (!display->closed)
     {
-      (*buffer_size) = 10 * sizeof (gchar);
-      (*buffer) = (gchar *) malloc (*buffer_size);
-    }
-
-  do
-    fscanf (infile, "%c", &c);
-  while (!feof (infile) && c != '"');
+      GdkDrawableImplX11 *draw_impl = GDK_DRAWABLE_IMPL_X11 (impl);
 
-  if (c != '"')
-    return FALSE;
-
-  while (!feof (infile))
-    {
-      fscanf (infile, "%c", &c);
-
-      if (cnt == (*buffer_size))
-       {
-         (*buffer_size) *= 2;
-         (*buffer) = (gchar *) realloc ((*buffer), *buffer_size);        
-       }
-
-      if (c != '"')
-        (*buffer)[cnt++] = c;
-      else
-        {
-          (*buffer)[cnt++] = 0;
-          return TRUE;
-        }
+      _gdk_x11_drawable_finish (GDK_DRAWABLE (draw_impl));
     }
 
-  return FALSE;
+  G_OBJECT_CLASS (gdk_pixmap_impl_x11_parent_class)->finalize (object);
 }
 
-gchar*
-gdk_pixmap_skip_whitespaces (gchar *buffer)
+static void
+gdk_pixmap_impl_x11_get_size   (GdkDrawable *drawable,
+                                gint        *width,
+                                gint        *height)
 {
-  gint32 index = 0;
-
-  while (buffer[index] != 0 && (buffer[index] == 0x20 || buffer[index] == 0x09))
-    index++;
-
-  return &buffer[index];
+  if (width)
+    *width = GDK_PIXMAP_IMPL_X11 (drawable)->width;
+  if (height)
+    *height = GDK_PIXMAP_IMPL_X11 (drawable)->height;
 }
 
-gchar*
-gdk_pixmap_skip_string (gchar *buffer)
-{
-  gint32 index = 0;
-
-  while (buffer[index] != 0 && buffer[index] != 0x20 && buffer[index] != 0x09)
-    index++;
-
-  return &buffer[index];
-}
-
-gchar*
-gdk_pixmap_extract_color (gchar *buffer)
+GdkPixmap*
+gdk_pixmap_new (GdkDrawable *drawable,
+               gint         width,
+               gint         height,
+               gint         depth)
 {
-  gint counter, finished = FALSE, numnames;
-  gchar *ptr = NULL, ch, temp[128];
-  gchar color[128], *retcol;
-
-  counter = 0;
-  while (ptr == NULL)
+  GdkPixmap *pixmap;
+  GdkDrawableImplX11 *draw_impl;
+  GdkPixmapImplX11 *pix_impl;
+  GdkColormap *cmap;
+  gint window_depth;
+  
+  g_return_val_if_fail (drawable == NULL || GDK_IS_DRAWABLE (drawable), NULL);
+  g_return_val_if_fail ((drawable != NULL) || (depth != -1), NULL);
+  g_return_val_if_fail ((width != 0) && (height != 0), NULL);
+  
+  if (!drawable)
     {
-      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_NOTE (MULTIHEAD, g_message ("need to specify the screen parent window "
+                                     "for gdk_pixmap_new() to be multihead safe"));
+      drawable = gdk_screen_get_root_window (gdk_screen_get_default ());
     }
 
-  if (ptr == NULL)
+  if (GDK_IS_WINDOW (drawable) && GDK_WINDOW_DESTROYED (drawable))
     return NULL;
 
-  ptr = gdk_pixmap_skip_whitespaces (ptr);
-
-  if (ptr[0] == 0)
-    return NULL;
-  else if (ptr[0] == '#')
+  window_depth = gdk_drawable_get_depth (GDK_DRAWABLE (drawable));
+  if (depth == -1)
+    depth = window_depth;
+
+  pixmap = g_object_new (gdk_pixmap_get_type (), NULL);
+  draw_impl = GDK_DRAWABLE_IMPL_X11 (GDK_PIXMAP_OBJECT (pixmap)->impl);
+  pix_impl = GDK_PIXMAP_IMPL_X11 (GDK_PIXMAP_OBJECT (pixmap)->impl);
+  draw_impl->wrapper = GDK_DRAWABLE (pixmap);
+  
+  draw_impl->screen = GDK_WINDOW_SCREEN (drawable);
+  draw_impl->xid = XCreatePixmap (GDK_PIXMAP_XDISPLAY (pixmap),
+                                  GDK_WINDOW_XID (drawable),
+                                  width, height, depth);
+  
+  pix_impl->is_foreign = FALSE;
+  pix_impl->width = width;
+  pix_impl->height = height;
+  GDK_PIXMAP_OBJECT (pixmap)->depth = depth;
+
+  if (depth == window_depth)
     {
-      retcol = g_new(gchar, strlen (ptr) + 1);
-      strcpy (retcol, ptr);
-      return retcol;
+      cmap = gdk_drawable_get_colormap (drawable);
+      if (cmap)
+        gdk_drawable_set_colormap (pixmap, cmap);
     }
+  
+  _gdk_xid_table_insert (GDK_WINDOW_DISPLAY (drawable), 
+                        &GDK_PIXMAP_XID (pixmap), pixmap);
+  return pixmap;
+}
 
-  color[0] = 0;
-  numnames = 0;
+GdkPixmap *
+gdk_bitmap_create_from_data (GdkDrawable *drawable,
+                            const gchar *data,
+                            gint         width,
+                            gint         height)
+{
+  GdkPixmap *pixmap;
+  GdkDrawableImplX11 *draw_impl;
+  GdkPixmapImplX11 *pix_impl;
+  
+  g_return_val_if_fail (data != NULL, NULL);
+  g_return_val_if_fail ((width != 0) && (height != 0), NULL);
+  g_return_val_if_fail (drawable == NULL || GDK_IS_DRAWABLE (drawable), NULL);
 
-  while (finished == FALSE)
+  if (!drawable)
     {
-      sscanf (ptr, "%s", temp);
-
-      if ((gint)ptr[0] == 0 || strcmp ("s", temp) == 0 || strcmp ("m", temp) == 0 ||
-          strcmp ("g", temp) == 0 || strcmp ("g4", temp) == 0)
-       finished = TRUE;
-      else
-        {
-          if (numnames > 0)
-            strcat (color, " ");
-          strcat (color, temp);
-          ptr = gdk_pixmap_skip_string (ptr);
-          ptr = gdk_pixmap_skip_whitespaces (ptr);
-          numnames++;
-        }
+      GDK_NOTE (MULTIHEAD, g_message ("need to specify the screen parent window "
+                                    "for gdk_bitmap_create_from_data() to be multihead safe"));
+      drawable = gdk_screen_get_root_window (gdk_screen_get_default ());
     }
+  
+  if (GDK_IS_WINDOW (drawable) && GDK_WINDOW_DESTROYED (drawable))
+    return NULL;
 
-  retcol = g_new(gchar, strlen (color) + 1);
-  strcpy (retcol, color);
-  return retcol;
-}
+  pixmap = g_object_new (gdk_pixmap_get_type (), NULL);
+  draw_impl = GDK_DRAWABLE_IMPL_X11 (GDK_PIXMAP_OBJECT (pixmap)->impl);
+  pix_impl = GDK_PIXMAP_IMPL_X11 (GDK_PIXMAP_OBJECT (pixmap)->impl);
+  draw_impl->wrapper = GDK_DRAWABLE (pixmap);
 
+  pix_impl->is_foreign = FALSE;
+  pix_impl->width = width;
+  pix_impl->height = height;
+  GDK_PIXMAP_OBJECT (pixmap)->depth = 1;
 
-GdkPixmap*
-gdk_pixmap_create_from_xpm (GdkWindow  *window,
-                           GdkBitmap **mask,
-                           GdkColor   *transparent_color,
-                           const gchar *filename)
-{
-  FILE *infile = NULL;
-  GdkPixmap *pixmap = NULL;
-  GdkImage *image = NULL;
-  GdkColormap *colormap;
-  GdkVisual *visual;
-  GdkGC *gc;
-  GdkColor tmp_color;
-  gint width, height, num_cols, cpp, cnt, n, ns, xcnt, ycnt;
-  gchar *buffer = NULL, *color_name = NULL, pixel_str[32];
-  guint buffer_size = 0;
-  _GdkPixmapColor *colors = NULL, *color = NULL;
-  gulong index;
-
-  if (!window)
-    window = (GdkWindow*) &gdk_root_parent;
-
-  infile = fopen (filename, "rb");
-  if (infile != NULL)
-    {
-      if (gdk_pixmap_seek_string (infile, "XPM", FALSE) == TRUE)
-        {
-          if (gdk_pixmap_seek_char (infile,'{') == TRUE)
-            {
-              gdk_pixmap_seek_char (infile, '"');
-              fseek (infile, -1, SEEK_CUR);
-              gdk_pixmap_read_string (infile, &buffer, &buffer_size);
-
-              sscanf (buffer,"%d %d %d %d", &width, &height, &num_cols, &cpp);
-
-              colors = g_new(_GdkPixmapColor, num_cols);
-
-              colormap = gdk_window_get_colormap (window);
-              visual = gdk_window_get_visual (window);
-
-             if (transparent_color == NULL) 
-               {
-                 gdk_color_white (colormap, &tmp_color);
-                 transparent_color = &tmp_color;
-               }
-
-              for (cnt = 0; cnt < num_cols; cnt++)
-                {
-                  gdk_pixmap_seek_char (infile, '"');
-                  fseek (infile, -1, SEEK_CUR);
-                  gdk_pixmap_read_string (infile, &buffer, &buffer_size);
-
-                  colors[cnt].color_string = g_new(gchar, cpp + 1);
-                  for (n = 0; n < cpp; n++)
-                    colors[cnt].color_string[n] = buffer[n];
-                  colors[cnt].color_string[n] = 0;
-                 colors[cnt].transparent = FALSE;
-
-                  if (color_name != NULL)
-                    g_free (color_name);
-
-                  color_name = gdk_pixmap_extract_color (&buffer[cpp]);
-
-                  if (color_name != NULL)
-                    {
-                      if (gdk_color_parse (color_name, &colors[cnt].color) == FALSE)
-                       {
-                         colors[cnt].color = *transparent_color;
-                         colors[cnt].transparent = TRUE;
-                       }
-                    }
-                  else
-                   {
-                     colors[cnt].color = *transparent_color;
-                     colors[cnt].transparent = TRUE;
-                   }
-
-                  gdk_color_alloc (colormap, &colors[cnt].color);
-                }
-
-              index = 0;
-              image = gdk_image_new (GDK_IMAGE_FASTEST, visual, width, height);
-
-             gc = NULL;
-             if (mask)
-               {
-                 *mask = gdk_pixmap_new (window, width, height, 1);
-                 gc = gdk_gc_new (*mask);
-
-                 gdk_color_black (colormap, &tmp_color);
-                 gdk_gc_set_foreground (gc, &tmp_color);
-                 gdk_draw_rectangle (*mask, gc, TRUE, 0, 0, -1, -1);
-
-                 gdk_color_white (colormap, &tmp_color);
-                 gdk_gc_set_foreground (gc, &tmp_color);
-               }
-
-              for (ycnt = 0; ycnt < height; ycnt++)
-                {
-                  gdk_pixmap_read_string (infile, &buffer, &buffer_size);
-
-                  for (n = 0, cnt = 0, xcnt = 0; n < (width * cpp); n += cpp, xcnt++)
-                    {
-                      strncpy (pixel_str, &buffer[n], cpp);
-                      pixel_str[cpp] = 0;
-                      color = NULL;
-                      ns = 0;
-
-                      while (color == NULL)
-                        {
-                          if (strcmp (pixel_str, colors[ns].color_string) == 0)
-                            color = &colors[ns];
-                          else
-                            ns++;
-                        }
-
-                      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);
-                }
-
-             if (mask)
-               gdk_gc_destroy (gc);
-
-              pixmap = gdk_pixmap_new (window, width, height, visual->depth);
-
-              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);
-            }
-        }
-
-      fclose (infile);
-      free (buffer);
-
-      if (colors != NULL)
-        {
-          for (cnt = 0; cnt < num_cols; cnt++)
-            g_free (colors[cnt].color_string);
-          g_free (colors);
-        }
-    }
+  draw_impl->screen = GDK_WINDOW_SCREEN (drawable);
+  draw_impl->xid = XCreateBitmapFromData (GDK_WINDOW_XDISPLAY (drawable),
+                                          GDK_WINDOW_XID (drawable),
+                                          (char *)data, width, height);
 
+  _gdk_xid_table_insert (GDK_WINDOW_DISPLAY (drawable), 
+                        &GDK_PIXMAP_XID (pixmap), pixmap);
   return pixmap;
 }
 
 GdkPixmap*
-gdk_pixmap_create_from_xpm_d (GdkWindow  *window,
-                             GdkBitmap **mask,
-                             GdkColor   *transparent_color,
-                             gchar     **data)
+gdk_pixmap_create_from_data (GdkDrawable    *drawable,
+                            const gchar    *data,
+                            gint            width,
+                            gint            height,
+                            gint            depth,
+                            const GdkColor *fg,
+                            const GdkColor *bg)
 {
-  GdkPixmap *pixmap = NULL;
-  GdkImage *image = NULL;
-  GdkColormap *colormap;
-  GdkVisual *visual;
-  GdkGC *gc;
-  GdkColor tmp_color;
-  gint width, height, num_cols, cpp, cnt, n, ns, xcnt, ycnt, i;
-  gchar *buffer, *color_name = NULL, pixel_str[32];
-  _GdkPixmapColor *colors = NULL, *color = NULL;
-  gulong index;
-
-  if (!window)
-    window = (GdkWindow*) &gdk_root_parent;
-
-  i = 0;
-  buffer = data[i++];
-  sscanf (buffer,"%d %d %d %d", &width, &height, &num_cols, &cpp);
-
-  colors = g_new(_GdkPixmapColor, num_cols);
-
-  colormap = gdk_window_get_colormap (window);
-  visual = gdk_window_get_visual (window);
-
-  if (transparent_color == NULL) 
-    {
-      gdk_color_white (colormap, &tmp_color);
-      transparent_color = &tmp_color;
-    }
-
-  for (cnt = 0; cnt < num_cols; cnt++)
-    {
-      buffer = data[i++];
-
-      colors[cnt].color_string = g_new(gchar, cpp + 1);
-      for (n = 0; n < cpp; n++)
-       colors[cnt].color_string[n] = buffer[n];
-      colors[cnt].color_string[n] = 0;
-      colors[cnt].transparent = FALSE;
-
-      if (color_name != NULL)
-       g_free (color_name);
-
-      color_name = gdk_pixmap_extract_color (&buffer[cpp]);
-
-      if (color_name != NULL)
-       {
-         if (gdk_color_parse (color_name, &colors[cnt].color) == FALSE)
-           {
-             colors[cnt].color = *transparent_color;
-             colors[cnt].transparent = TRUE;
-           }
-       }
-      else
-       {
-         colors[cnt].color = *transparent_color;
-         colors[cnt].transparent = TRUE;
-       }
-
-      gdk_color_alloc (colormap, &colors[cnt].color);
-    }
-
-  index = 0;
-  image = gdk_image_new (GDK_IMAGE_FASTEST, visual, width, height);
-
-  gc = NULL;
-  if (mask)
-    {
-      *mask = gdk_pixmap_new (window, width, height, 1);
-      gc = gdk_gc_new (*mask);
-
-      gdk_color_black (colormap, &tmp_color);
-      gdk_gc_set_foreground (gc, &tmp_color);
-      gdk_draw_rectangle (*mask, gc, TRUE, 0, 0, -1, -1);
+  GdkPixmap *pixmap;
+  GdkDrawableImplX11 *draw_impl;
+  GdkPixmapImplX11 *pix_impl;
 
-      gdk_color_white (colormap, &tmp_color);
-      gdk_gc_set_foreground (gc, &tmp_color);
-    }
+  g_return_val_if_fail (drawable == NULL || GDK_IS_DRAWABLE (drawable), NULL);
+  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 ((drawable != NULL) || (depth != -1), NULL);
+  g_return_val_if_fail ((width != 0) && (height != 0), NULL);
 
-  for (ycnt = 0; ycnt < height; ycnt++)
+  if (!drawable)
     {
-      buffer = data[i++];
-
-      for (n = 0, cnt = 0, xcnt = 0; n < (width * cpp); n += cpp, xcnt++)
-       {
-         strncpy (pixel_str, &buffer[n], cpp);
-         pixel_str[cpp] = 0;
-         color = NULL;
-         ns = 0;
-
-         while (color == NULL)
-           {
-             if (strcmp (pixel_str, colors[ns].color_string) == 0)
-               color = &colors[ns];
-             else
-               ns++;
-           }
-
-         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);
+      GDK_NOTE (MULTIHEAD, g_message ("need to specify the screen parent window"
+                                     "for gdk_pixmap_create_from_data() to be multihead safe"));
+      drawable = gdk_screen_get_root_window (gdk_screen_get_default ());
     }
 
-  if (mask)
-    gdk_gc_destroy (gc);
+  if (GDK_IS_WINDOW (drawable) && GDK_WINDOW_DESTROYED (drawable))
+    return NULL;
 
-  pixmap = gdk_pixmap_new (window, width, height, visual->depth);
+  if (depth == -1)
+    depth = gdk_drawable_get_visual (drawable)->depth;
+
+  pixmap = g_object_new (gdk_pixmap_get_type (), NULL);
+  draw_impl = GDK_DRAWABLE_IMPL_X11 (GDK_PIXMAP_OBJECT (pixmap)->impl);
+  pix_impl = GDK_PIXMAP_IMPL_X11 (GDK_PIXMAP_OBJECT (pixmap)->impl);
+  draw_impl->wrapper = GDK_DRAWABLE (pixmap);
+  
+  pix_impl->is_foreign = FALSE;
+  pix_impl->width = width;
+  pix_impl->height = height;
+  GDK_PIXMAP_OBJECT (pixmap)->depth = depth;
+
+  draw_impl->screen = GDK_DRAWABLE_SCREEN (drawable);
+  draw_impl->xid = XCreatePixmapFromBitmapData (GDK_WINDOW_XDISPLAY (drawable),
+                                                GDK_WINDOW_XID (drawable),
+                                                (char *)data, width, height,
+                                                fg->pixel, bg->pixel, depth);
+
+  _gdk_xid_table_insert (GDK_WINDOW_DISPLAY (drawable),
+                        &GDK_PIXMAP_XID (pixmap), pixmap);
+  return pixmap;
+}
 
-  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);
+/**
+ * gdk_pixmap_foreign_new_for_display:
+ * @display: The #GdkDisplay where @anid is located.
+ * @anid: a native pixmap handle.
+ * 
+ * Wraps a native pixmap in a #GdkPixmap.
+ * This may fail if the pixmap has been destroyed.
+ *
+ * For example in the X backend, a native pixmap handle is an Xlib
+ * <type>XID</type>.
+ *
+ * Return value: the newly-created #GdkPixmap wrapper for the 
+ *    native pixmap or %NULL if the pixmap has been destroyed.
+ *
+ * Since: 2.2
+ **/
+GdkPixmap *
+gdk_pixmap_foreign_new_for_display (GdkDisplay      *display,
+                                   GdkNativeWindow  anid)
+{
+  Pixmap xpixmap;
+  Window root_return;
+  GdkScreen *screen;
+  int x_ret, y_ret;
+  unsigned int w_ret, h_ret, bw_ret, depth_ret;
+
+  g_return_val_if_fail (GDK_IS_DISPLAY (display), NULL);
+
+  /* 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 information about the Pixmap to fill in the structure for
+     the gdk window */
+  if (!XGetGeometry (GDK_DISPLAY_XDISPLAY (display),
+                    xpixmap, &root_return,
+                    &x_ret, &y_ret, &w_ret, &h_ret, &bw_ret, &depth_ret))
+    return NULL;
+  
+  screen = _gdk_x11_display_screen_for_xrootwin (display, root_return);
+  return gdk_pixmap_foreign_new_for_screen (screen, anid, w_ret, h_ret, depth_ret);
+}
 
-  if (colors != NULL)
-    {
-      for (cnt = 0; cnt < num_cols; cnt++)
-       g_free (colors[cnt].color_string);
-      g_free (colors);
-    }
+/**
+ * gdk_pixmap_foreign_new_for_screen:
+ * @screen: a #GdkScreen
+ * @anid: a native pixmap handle
+ * @width: the width of the pixmap identified by @anid
+ * @height: the height of the pixmap identified by @anid
+ * @depth: the depth of the pixmap identified by @anid
+ *
+ * Wraps a native pixmap in a #GdkPixmap.
+ * This may fail if the pixmap has been destroyed.
+ *
+ * For example in the X backend, a native pixmap handle is an Xlib
+ * <type>XID</type>.
+ *
+ * This function is an alternative to gdk_pixmap_foreign_new_for_display()
+ * for cases where the dimensions of the pixmap are known. For the X
+ * backend, this avoids a roundtrip to the server.
+ *
+ * Return value: the newly-created #GdkPixmap wrapper for the 
+ *    native pixmap or %NULL if the pixmap has been destroyed.
+ * 
+ * Since: 2.10
+ */
+GdkPixmap *
+gdk_pixmap_foreign_new_for_screen (GdkScreen       *screen,
+                                  GdkNativeWindow  anid,
+                                  gint             width,
+                                  gint             height,
+                                  gint             depth)
+{
+  Pixmap xpixmap;
+  GdkPixmap *pixmap;
+  GdkDrawableImplX11 *draw_impl;
+  GdkPixmapImplX11 *pix_impl;
+
+  g_return_val_if_fail (GDK_IS_SCREEN (screen), NULL);
+  g_return_val_if_fail (anid != 0, NULL);
+  g_return_val_if_fail (width > 0, NULL);
+  g_return_val_if_fail (height > 0, NULL);
+  g_return_val_if_fail (depth > 0, NULL);
+
+  pixmap = g_object_new (gdk_pixmap_get_type (), NULL);
+  draw_impl = GDK_DRAWABLE_IMPL_X11 (GDK_PIXMAP_OBJECT (pixmap)->impl);
+  pix_impl = GDK_PIXMAP_IMPL_X11 (GDK_PIXMAP_OBJECT (pixmap)->impl);
+  draw_impl->wrapper = GDK_DRAWABLE (pixmap);
+
+  xpixmap = anid;
+  
+  draw_impl->screen = screen;
+  draw_impl->xid = xpixmap;
+
+  pix_impl->is_foreign = TRUE;
+  pix_impl->width = width;
+  pix_impl->height = height;
+  GDK_PIXMAP_OBJECT (pixmap)->depth = depth;
+  
+  _gdk_xid_table_insert (gdk_screen_get_display (screen), 
+                        &GDK_PIXMAP_XID (pixmap), pixmap);
 
   return pixmap;
 }
 
-void
-gdk_pixmap_destroy (GdkPixmap *pixmap)
+/**
+ * gdk_pixmap_foreign_new:
+ * @anid: a native pixmap handle.
+ * 
+ * Wraps a native window for the default display in a #GdkPixmap.
+ * This may fail if the pixmap has been destroyed.
+ *
+ * For example in the X backend, a native pixmap handle is an Xlib
+ * <type>XID</type>.
+ *
+ * Return value: the newly-created #GdkPixmap wrapper for the 
+ *    native pixmap or %NULL if the pixmap has been destroyed.
+ **/
+GdkPixmap*
+gdk_pixmap_foreign_new (GdkNativeWindow anid)
 {
-  GdkWindowPrivate *private;
+   return gdk_pixmap_foreign_new_for_display (gdk_display_get_default (), anid);
+}
 
-  g_return_if_fail (pixmap != NULL);
+/**
+ * gdk_pixmap_lookup:
+ * @anid: a native pixmap handle.
+ * 
+ * Looks up the #GdkPixmap that wraps the given native pixmap handle.
+ *
+ * For example in the X backend, a native pixmap handle is an Xlib
+ * <type>XID</type>.
+ *
+ * Return value: the #GdkWindow wrapper for the native window,
+ *    or %NULL if there is none.
+ **/
+GdkPixmap*
+gdk_pixmap_lookup (GdkNativeWindow anid)
+{
+  return (GdkPixmap*) gdk_xid_table_lookup_for_display (gdk_display_get_default (), anid);
+}
 
-  private = (GdkPixmapPrivate*) pixmap;
-  if (private->ref_count <= 0)
-    {
-      XFreePixmap (private->xdisplay, private->xwindow);
-      gdk_xid_table_remove (private->xwindow);
-      g_free (pixmap);
-    }
-  else
-    {
-      private->ref_count -= 1;
-    }
+/**
+ * gdk_pixmap_lookup_for_display:
+ * @display: the #GdkDisplay associated with @anid
+ * @anid: a native pixmap handle.
+ * 
+ * Looks up the #GdkPixmap that wraps the given native pixmap handle.
+ *
+ * For example in the X backend, a native pixmap handle is an Xlib
+ * <type>XID</type>.
+ *
+ * Return value: the #GdkPixmap wrapper for the native pixmap,
+ *    or %NULL if there is none.
+ *
+ * Since: 2.2
+ **/
+GdkPixmap*
+gdk_pixmap_lookup_for_display (GdkDisplay *display, GdkNativeWindow anid)
+{
+  g_return_val_if_fail (GDK_IS_DISPLAY (display), NULL);
+  return (GdkPixmap*) gdk_xid_table_lookup_for_display (display, anid);
 }
+
+#define __GDK_PIXMAP_X11_C__
+#include  "gdkaliasdef.c"