X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gdk%2Fgdkcolor.c;h=53765f601019c87c72dd119264b03759e6dd5b71;hb=HEAD;hp=dd9f2b27b228482baf25692873e5d544c494af66;hpb=0b4d29fd6e88bdbf70ee30e2743f4ecf9032e250;p=~andy%2Fgtk

diff --git a/gdk/gdkcolor.c b/gdk/gdkcolor.c
index dd9f2b27b..53765f601 100644
--- a/gdk/gdkcolor.c
+++ b/gdk/gdkcolor.c
@@ -2,1279 +2,190 @@
  * 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., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
- * Modified by the GTK+ Team and others 1997-1999.  See the AUTHORS
+ * 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 <time.h>
-#include <X11/Xlib.h>
-#include "gdk.h"
-#include "gdkprivate.h"
-#include "gdkx.h"
-
-
-static gint  gdk_colormap_match_color (GdkColormap *cmap,
-				       GdkColor    *color,
-				       const gchar *available);
-static void  gdk_colormap_add         (GdkColormap *cmap);
-static void  gdk_colormap_remove      (GdkColormap *cmap);
-static guint gdk_colormap_hash        (Colormap    *cmap);
-static gint  gdk_colormap_cmp         (Colormap    *a,
-				       Colormap    *b);
-static void gdk_colormap_real_destroy (GdkColormap *colormap);
-
-static GHashTable *colormap_hash = NULL;
-
-
-GdkColormap*
-gdk_colormap_new (GdkVisual *visual,
-		  gint       private_cmap)
-{
-  GdkColormap *colormap;
-  GdkColormapPrivate *private;
-  Visual *xvisual;
-  int size;
-  int i;
-
-  g_return_val_if_fail (visual != NULL, NULL);
-
-  private = g_new (GdkColormapPrivate, 1);
-  colormap = (GdkColormap*) private;
-
-  private->xdisplay = gdk_display;
-  private->visual = visual;
-  private->ref_count = 1;
-
-  private->hash = NULL;
-  private->last_sync_time = 0;
-  private->info = NULL;
-  
-  xvisual = ((GdkVisualPrivate*) visual)->xvisual;
-
-  colormap->size = visual->colormap_size;
-  colormap->colors = g_new (GdkColor, colormap->size);
-
-  switch (visual->type)
-    {
-    case GDK_VISUAL_GRAYSCALE:
-    case GDK_VISUAL_PSEUDO_COLOR:
-      private->info = g_new0 (GdkColorInfo, colormap->size);
-      colormap->colors = g_new (GdkColor, colormap->size);
-      
-      private->hash = g_hash_table_new ((GHashFunc) gdk_color_hash,
-					(GCompareFunc) gdk_color_equal);
-      
-      private->private_val = private_cmap;
-      private->xcolormap = XCreateColormap (private->xdisplay, gdk_root_window,
-					    xvisual, (private_cmap) ? (AllocAll) : (AllocNone));
-
-      if (private_cmap)
-	{
-	  XColor *default_colors;
-
-	  default_colors = g_new (XColor, colormap->size);
-
-	  for (i = 0; i < colormap->size; i++)
-	    default_colors[i].pixel = i;
-
-	  XQueryColors (private->xdisplay,
-			DefaultColormap (private->xdisplay, gdk_screen),
-			default_colors, colormap->size);
-
-	  for (i = 0; i < colormap->size; i++)
-	    {
-	      colormap->colors[i].pixel = default_colors[i].pixel;
-	      colormap->colors[i].red = default_colors[i].red;
-	      colormap->colors[i].green = default_colors[i].green;
-	      colormap->colors[i].blue = default_colors[i].blue;
-	    }
-
-	  gdk_colormap_change (colormap, colormap->size);
-	  
-	  g_free (default_colors);
-	}
-      break;
-
-    case GDK_VISUAL_DIRECT_COLOR:
-      private->private_val = TRUE;
-      private->xcolormap = XCreateColormap (private->xdisplay, gdk_root_window,
-					    xvisual, AllocAll);
-
-      size = 1 << visual->red_prec;
-      for (i = 0; i < size; i++)
-	colormap->colors[i].red = i * 65535 / (size - 1);
-
-      size = 1 << visual->green_prec;
-      for (i = 0; i < size; i++)
-	colormap->colors[i].green = i * 65535 / (size - 1);
-
-      size = 1 << visual->blue_prec;
-      for (i = 0; i < size; i++)
-	colormap->colors[i].blue = i * 65535 / (size - 1);
-
-      gdk_colormap_change (colormap, colormap->size);
-      break;
-
-    case GDK_VISUAL_STATIC_GRAY:
-    case GDK_VISUAL_STATIC_COLOR:
-    case GDK_VISUAL_TRUE_COLOR:
-      private->private_val = FALSE;
-      private->xcolormap = XCreateColormap (private->xdisplay, gdk_root_window,
-					    xvisual, AllocNone);
-      break;
-    }
-
-  gdk_colormap_add (colormap);
-
-  return colormap;
-}
-
-static void
-gdk_colormap_real_destroy (GdkColormap *colormap)
-{
-  GdkColormapPrivate *private = (GdkColormapPrivate*) colormap;
-
-  g_return_if_fail (colormap != NULL);
-  g_return_if_fail (private->ref_count == 0);
-
-  gdk_colormap_remove (colormap);
-  XFreeColormap (private->xdisplay, private->xcolormap);
-
-  if (private->hash)
-    g_hash_table_destroy (private->hash);
-  
-  g_free (private->info);
-  g_free (colormap->colors);
-  g_free (colormap);
-}
-
-GdkColormap*
-gdk_colormap_ref (GdkColormap *cmap)
-{
-  GdkColormapPrivate *private = (GdkColormapPrivate *)cmap;
-
-  g_return_val_if_fail (cmap != NULL, NULL);
-
-  private->ref_count += 1;
-  return cmap;
-}
-
-void
-gdk_colormap_unref (GdkColormap *cmap)
-{
-  GdkColormapPrivate *private = (GdkColormapPrivate *)cmap;
-
-  g_return_if_fail (cmap != NULL);
-  g_return_if_fail (private->ref_count > 0);
-
-  private->ref_count -= 1;
-  if (private->ref_count == 0)
-    gdk_colormap_real_destroy (cmap);
-}
-
-GdkVisual *
-gdk_colormap_get_visual (GdkColormap *colormap)
-{
-  GdkColormapPrivate *private;
-
-  g_return_val_if_fail (colormap != NULL, NULL);
-  
-  private = (GdkColormapPrivate *)colormap;
-
-  return private->visual;
-}
-     
-#define MIN_SYNC_TIME 2
-
-void
-gdk_colormap_sync (GdkColormap *colormap,
-		   gboolean     force)
-{
-  time_t current_time;
-  GdkColormapPrivate *private = (GdkColormapPrivate *)colormap;
-  XColor *xpalette;
-  gint nlookup;
-  gint i;
-  
-  g_return_if_fail (colormap != NULL);
-
-  current_time = time (NULL);
-  if (!force && ((current_time - private->last_sync_time) < MIN_SYNC_TIME))
-    return;
-
-  private->last_sync_time = current_time;
-
-  nlookup = 0;
-  xpalette = g_new (XColor, colormap->size);
-  
-  for (i = 0; i < colormap->size; i++)
-    {
-      if (private->info[i].ref_count == 0)
-	{
-	  xpalette[nlookup].pixel = i;
-	  xpalette[nlookup].red = 0;
-	  xpalette[nlookup].green = 0;
-	  xpalette[nlookup].blue = 0;
-	  nlookup++;
-	}
-    }
-  
-  XQueryColors (gdk_display, private->xcolormap, xpalette, nlookup);
-  
-  for (i = 0; i < nlookup; i++)
-    {
-      gulong pixel = xpalette[i].pixel;
-      colormap->colors[pixel].pixel = pixel;
-      colormap->colors[pixel].red = xpalette[i].red;
-      colormap->colors[pixel].green = xpalette[i].green;
-      colormap->colors[pixel].blue = xpalette[i].blue;
-    }
-  
-  g_free (xpalette);
-}
-		   
-
-GdkColormap*
-gdk_colormap_get_system (void)
-{
-  static GdkColormap *colormap = NULL;
-  GdkColormapPrivate *private;
-
-  if (!colormap)
-    {
-      private = g_new (GdkColormapPrivate, 1);
-      colormap = (GdkColormap*) private;
-
-      private->xdisplay = gdk_display;
-      private->xcolormap = DefaultColormap (gdk_display, gdk_screen);
-      private->visual = gdk_visual_get_system ();
-      private->private_val = FALSE;
-      private->ref_count = 1;
-
-      private->hash = NULL;
-      private->last_sync_time = 0;
-      private->info = NULL;
-
-      colormap->colors = NULL;
-      colormap->size = private->visual->colormap_size;
-
-      if ((private->visual->type == GDK_VISUAL_GRAYSCALE) ||
-	  (private->visual->type == GDK_VISUAL_PSEUDO_COLOR))
-	{
-	  private->info = g_new0 (GdkColorInfo, colormap->size);
-	  colormap->colors = g_new (GdkColor, colormap->size);
-	  
-	  private->hash = g_hash_table_new ((GHashFunc) gdk_color_hash,
-					    (GCompareFunc) gdk_color_equal);
-
-	  gdk_colormap_sync (colormap, TRUE);
-	}
-
-      gdk_colormap_add (colormap);
-    }
-
-  return colormap;
-}
-
-gint
-gdk_colormap_get_system_size (void)
-{
-  return DisplayCells (gdk_display, gdk_screen);
-}
-
-void
-gdk_colormap_change (GdkColormap *colormap,
-		     gint         ncolors)
-{
-  GdkColormapPrivate *private;
-  GdkVisual *visual;
-  XColor *palette;
-  gint shift;
-  int max_colors;
-  int size;
-  int i;
-
-  g_return_if_fail (colormap != NULL);
-
-  palette = g_new (XColor, ncolors);
-
-  private = (GdkColormapPrivate*) colormap;
-  switch (private->visual->type)
-    {
-    case GDK_VISUAL_GRAYSCALE:
-    case GDK_VISUAL_PSEUDO_COLOR:
-      for (i = 0; i < ncolors; i++)
-	{
-	  palette[i].pixel = colormap->colors[i].pixel;
-	  palette[i].red = colormap->colors[i].red;
-	  palette[i].green = colormap->colors[i].green;
-	  palette[i].blue = colormap->colors[i].blue;
-	  palette[i].flags = DoRed | DoGreen | DoBlue;
-	}
-
-      XStoreColors (private->xdisplay, private->xcolormap, palette, ncolors);
-      break;
-
-    case GDK_VISUAL_DIRECT_COLOR:
-      visual = private->visual;
+#include "config.h"
 
-      shift = visual->red_shift;
-      max_colors = 1 << visual->red_prec;
-      size = (ncolors < max_colors) ? (ncolors) : (max_colors);
+#include "gdkcolor.h"
 
-      for (i = 0; i < size; i++)
-	{
-	  palette[i].pixel = i << shift;
-	  palette[i].red = colormap->colors[i].red;
-	  palette[i].flags = DoRed;
-	}
+#include "gdkscreen.h"
+#include "gdkinternals.h"
 
-      XStoreColors (private->xdisplay, private->xcolormap, palette, size);
-
-      shift = visual->green_shift;
-      max_colors = 1 << visual->green_prec;
-      size = (ncolors < max_colors) ? (ncolors) : (max_colors);
-
-      for (i = 0; i < size; i++)
-	{
-	  palette[i].pixel = i << shift;
-	  palette[i].green = colormap->colors[i].green;
-	  palette[i].flags = DoGreen;
-	}
-
-      XStoreColors (private->xdisplay, private->xcolormap, palette, size);
-
-      shift = visual->blue_shift;
-      max_colors = 1 << visual->blue_prec;
-      size = (ncolors < max_colors) ? (ncolors) : (max_colors);
-
-      for (i = 0; i < size; i++)
-	{
-	  palette[i].pixel = i << shift;
-	  palette[i].blue = colormap->colors[i].blue;
-	  palette[i].flags = DoBlue;
-	}
-
-      XStoreColors (private->xdisplay, private->xcolormap, palette, size);
-      break;
-
-    default:
-      break;
-    }
-
-  g_free (palette);
-}
-
-void
-gdk_colors_store (GdkColormap   *colormap,
-		  GdkColor      *colors,
-		  gint           ncolors)
-{
-  gint i;
-
-  for (i = 0; i < ncolors; i++)
-    {
-      colormap->colors[i].pixel = colors[i].pixel;
-      colormap->colors[i].red = colors[i].red;
-      colormap->colors[i].green = colors[i].green;
-      colormap->colors[i].blue = colors[i].blue;
-    }
-
-  gdk_colormap_change (colormap, ncolors);
-}
-
-gboolean
-gdk_colors_alloc (GdkColormap   *colormap,
-		  gint           contiguous,
-		  gulong        *planes,
-		  gint           nplanes,
-		  gulong        *pixels,
-		  gint           npixels)
-{
-  GdkColormapPrivate *private;
-  gint return_val;
-  gint i;
-
-  g_return_val_if_fail (colormap != NULL, 0);
-
-  private = (GdkColormapPrivate*) colormap;
-
-  return_val = XAllocColorCells (private->xdisplay, private->xcolormap,
-				 contiguous, planes, nplanes, pixels, npixels);
-
-  if (return_val)
-    {
-      for (i=0; i<npixels; i++)
-	{
-	  private->info[pixels[i]].ref_count++;
-	  private->info[pixels[i]].flags |= GDK_COLOR_WRITEABLE;
-	}
-    }
-
-  return return_val;
-}
+#include <time.h>
 
-/* This is almost identical to gdk_colormap_free_colors.
- * Keep them in sync!
+/**
+ * SECTION:colors
+ * @Short_description: Manipulation of colors
+ * @Title: Colors
+ *
+ * A #GdkColor represents a color.
+ *
+ * When working with cairo, it is often more convenient
+ * to use a #GdkRGBA instead.
  */
-void
-gdk_colors_free (GdkColormap *colormap,
-		 gulong      *in_pixels,
-		 gint         in_npixels,
-		 gulong       planes)
-{
-  GdkColormapPrivate *private;
-  gulong *pixels;
-  gint npixels = 0;
-  gint i;
-
-  g_return_if_fail (colormap != NULL);
-  g_return_if_fail (in_pixels != NULL);
-
-  private = (GdkColormapPrivate*) colormap;
 
-  if ((private->visual->type != GDK_VISUAL_PSEUDO_COLOR) &&
-      (private->visual->type != GDK_VISUAL_GRAYSCALE))
-    return;
-  
-  pixels = g_new (gulong, in_npixels);
 
-  for (i=0; i<in_npixels; i++)
-    {
-      gulong pixel = in_pixels[i];
-      
-      if (private->info[pixel].ref_count)
-	{
-	  private->info[pixel].ref_count--;
-
-	  if (private->info[pixel].ref_count == 0)
-	    {
-	      pixels[npixels++] = pixel;
-	      if (!(private->info[pixel].flags & GDK_COLOR_WRITEABLE))
-		g_hash_table_remove (private->hash, &colormap->colors[in_pixels[i]]);
-	      private->info[pixel].flags = 0;
-	    }
-	}
-    }
-
-  if (npixels)
-    XFreeColors (private->xdisplay, private->xcolormap,
-		 pixels, npixels, planes);
-  g_free (pixels);
-}
-
-/*
- *--------------------------------------------------------------
- * gdk_color_copy
- *
- *   Copy a color structure into new storage.
+/**
+ * gdk_color_copy:
+ * @color: a #GdkColor
  *
- * Arguments:
- *   "color" is the color struct to copy.
+ * Makes a copy of a color structure.
  *
- * Results:
- *   A new color structure.  Free it with gdk_color_free.
+ * The result must be freed using gdk_color_free().
  *
- *--------------------------------------------------------------
+ * Return value: a copy of @color
  */
-
-static GMemChunk *color_chunk;
-
 GdkColor*
-gdk_color_copy (GdkColor *color)
+gdk_color_copy (const GdkColor *color)
 {
   GdkColor *new_color;
-  
-  g_return_val_if_fail (color != NULL, NULL);
 
-  if (color_chunk == NULL)
-    color_chunk = g_mem_chunk_new ("colors",
-				   sizeof (GdkColor),
-				   4096,
-				   G_ALLOC_AND_FREE);
+  g_return_val_if_fail (color != NULL, NULL);
 
-  new_color = g_chunk_new (GdkColor, color_chunk);
+  new_color = g_slice_new (GdkColor);
   *new_color = *color;
   return new_color;
 }
 
-/*
- *--------------------------------------------------------------
- * gdk_color_free
- *
- *   Free a color structure obtained from gdk_color_copy.  Do not use
- *   with other color structures.
+/**
+ * gdk_color_free:
+ * @color: a #GdkColor
  *
- * Arguments:
- *   "color" is the color struct to free.
- *
- *-------------------------------------------------------------- */
-
+ * Frees a color structure created with gdk_color_copy().
+ */
 void
 gdk_color_free (GdkColor *color)
 {
-  g_assert (color_chunk != NULL);
   g_return_if_fail (color != NULL);
 
-  g_mem_chunk_free (color_chunk, color);
-}
-
-gint
-gdk_color_white (GdkColormap *colormap,
-		 GdkColor    *color)
-{
-  gint return_val;
-
-  g_return_val_if_fail (colormap != NULL, FALSE);
-
-  if (color)
-    {
-      color->pixel = WhitePixel (gdk_display, gdk_screen);
-      color->red = 65535;
-      color->green = 65535;
-      color->blue = 65535;
-
-      return_val = gdk_color_alloc (colormap, color);
-    }
-  else
-    return_val = FALSE;
-
-  return return_val;
+  g_slice_free (GdkColor, color);
 }
 
-gint
-gdk_color_black (GdkColormap *colormap,
-		 GdkColor    *color)
-{
-  gint return_val;
-
-  g_return_val_if_fail (colormap != NULL, FALSE);
-
-  if (color)
-    {
-      color->pixel = BlackPixel (gdk_display, gdk_screen);
-      color->red = 0;
-      color->green = 0;
-      color->blue = 0;
-
-      return_val = gdk_color_alloc (colormap, color);
-    }
-  else
-    return_val = FALSE;
-
-  return return_val;
-}
-
-gboolean
-gdk_color_parse (const gchar *spec,
-		 GdkColor *color)
-{
-  Colormap xcolormap;
-  XColor xcolor;
-  gboolean return_val;
-
-  g_return_val_if_fail (spec != NULL, FALSE);
-  g_return_val_if_fail (color != NULL, FALSE);
-
-  xcolormap = DefaultColormap (gdk_display, gdk_screen);
-
-  if (XParseColor (gdk_display, xcolormap, spec, &xcolor))
-    {
-      return_val = TRUE;
-      color->red = xcolor.red;
-      color->green = xcolor.green;
-      color->blue = xcolor.blue;
-    }
-  else
-    return_val = FALSE;
-
-  return return_val;
-}
-
-/********************
- * Color allocation *
- ********************/
-
-/* Try to allocate a single color using XAllocColor. If it succeeds,
- * cache the result in our colormap, and store in ret.
+/**
+ * gdk_color_hash:
+ * @color: a #GdkColor
+ *
+ * A hash function suitable for using for a hash
+ * table that stores #GdkColors.
+ *
+ * Return value: The hash function applied to @color
  */
-static gboolean 
-gdk_colormap_alloc1 (GdkColormap *colormap,
-		     GdkColor    *color,
-		     GdkColor    *ret)
-{
-  GdkColormapPrivate *private;
-  XColor xcolor;
-
-  private = (GdkColormapPrivate*) colormap;
-
-  xcolor.red = color->red;
-  xcolor.green = color->green;
-  xcolor.blue = color->blue;
-  xcolor.pixel = color->pixel;
-  xcolor.flags = DoRed | DoGreen | DoBlue;
-
-  if (XAllocColor (private->xdisplay, private->xcolormap, &xcolor))
-    {
-      ret->pixel = xcolor.pixel;
-      ret->red = xcolor.red;
-      ret->green = xcolor.green;
-      ret->blue = xcolor.blue;
-      
-      if (ret->pixel < colormap->size)
-	{
-	  if (private->info[ret->pixel].ref_count) /* got a duplicate */
-	    {
-	      XFreeColors (private->xdisplay, private->xcolormap,
-			   &ret->pixel, 1, 0);
-	    }
-	  else
-	    {
-	      colormap->colors[ret->pixel] = *color;
-	      private->info[ret->pixel].ref_count = 1;
-
-	      g_hash_table_insert (private->hash,
-				   &colormap->colors[ret->pixel],
-				   &colormap->colors[ret->pixel]);
-	    }
-	}
-      return TRUE;
-    }
-  else
-    {
-      return FALSE;
-    }
-}
-
-static gint
-gdk_colormap_alloc_colors_writeable (GdkColormap *colormap,
-				     GdkColor    *colors,
-				     gint         ncolors,
-				     gboolean     writeable,
-				     gboolean     best_match,
-				     gboolean    *success)
-{
-  GdkColormapPrivate *private;
-  gulong *pixels;
-  Status status;
-  gint i, index;
-
-  private = (GdkColormapPrivate*) colormap;
-
-  if (private->private_val)
-    {
-      index = 0;
-      for (i=0; i<ncolors; i++)
-	{
-	  while ((index < colormap->size) && (private->info[index].ref_count != 0))
-	    index++;
-	  
-	  if (index < colormap->size)
-	    {
-	      colors[i].pixel = index;
-	      success[i] = TRUE;
-	      private->info[index].ref_count++;
-	      private->info[i].flags |= GDK_COLOR_WRITEABLE;
-	    }
-	  else
-	    break;
-	}
-      return i;
-    }
-  else
-    {
-      pixels = g_new (gulong, ncolors);
-      /* Allocation of a writeable color cells */
-      
-      status =  XAllocColorCells (private->xdisplay, private->xcolormap,
-				  FALSE, NULL, 0, pixels, ncolors);
-      if (status)
-	{
-	  for (i=0; i<ncolors; i++)
-	    {
-	      colors[i].pixel = pixels[i];
-	      private->info[pixels[i]].ref_count++;
-	      private->info[pixels[i]].flags |= GDK_COLOR_WRITEABLE;
-	    }
-	}
-      
-      g_free (pixels);
-
-      return status ? ncolors : 0; 
-    }
-}
-
-static gint
-gdk_colormap_alloc_colors_private (GdkColormap *colormap,
-				   GdkColor    *colors,
-				   gint         ncolors,
-				   gboolean     writeable,
-				   gboolean     best_match,
-				   gboolean    *success)
-{
-  GdkColormapPrivate *private;
-  gint i, index;
-  XColor *store = g_new (XColor, ncolors);
-  gint nstore = 0;
-  gint nremaining = 0;
-  
-  private = (GdkColormapPrivate*) colormap;
-  index = -1;
-
-  /* First, store the colors we have room for */
-
-  index = 0;
-  for (i=0; i<ncolors; i++)
-    {
-      if (!success[i])
-	{
-	  while ((index < colormap->size) && (private->info[index].ref_count != 0))
-	    index++;
-
-	  if (index < colormap->size)
-	    {
-	      store[nstore].red = colors[i].red;
-	      store[nstore].blue = colors[i].blue;
-	      store[nstore].green = colors[i].green;
-	      store[nstore].pixel = index;
-	      nstore++;
-
-	      success[i] = TRUE;
-
-	      colors[i].pixel = index;
-	      private->info[index].ref_count++;
-	    }
-	  else
-	    nremaining++;
-	}
-    }
-  
-  XStoreColors (private->xdisplay, private->xcolormap, store, nstore);
-  g_free (store);
-
-  if (nremaining > 0 && best_match)
-    {
-      /* Get best matches for remaining colors */
-
-      gchar *available = g_new (gchar, colormap->size);
-      for (i = 0; i < colormap->size; i++)
-	available[i] = TRUE;
-
-      for (i=0; i<ncolors; i++)
-	{
-	  if (!success[i])
-	    {
-	      index = gdk_colormap_match_color (colormap, 
-						&colors[i], 
-						available);
-	      if (index != -1)
-		{
-		  colors[i] = colormap->colors[index];
-		  private->info[index].ref_count++;
-
-		  success[i] = TRUE;
-		  nremaining--;
-		}
-	    }
-	}
-      g_free (available);
-    }
-
-  return (ncolors - nremaining);
-}
-
-static gint
-gdk_colormap_alloc_colors_shared (GdkColormap *colormap,
-				  GdkColor    *colors,
-				  gint         ncolors,
-				  gboolean     writeable,
-				  gboolean     best_match,
-				  gboolean    *success)
-{
-  GdkColormapPrivate *private;
-  gint i, index;
-  gint nremaining = 0;
-  gint nfailed = 0;
-
-  private = (GdkColormapPrivate*) colormap;
-  index = -1;
-
-  for (i=0; i<ncolors; i++)
-    {
-      if (!success[i])
-	{
-	  if (gdk_colormap_alloc1 (colormap, &colors[i], &colors[i]))
-	    success[i] = TRUE;
-	  else
-	    nremaining++;
-	}
-    }
-
-
-  if (nremaining > 0 && best_match)
-    {
-      gchar *available = g_new (gchar, colormap->size);
-      for (i = 0; i < colormap->size; i++)
-	available[i] = ((private->info[i].ref_count == 0) ||
-			!(private->info[i].flags && GDK_COLOR_WRITEABLE));
-      gdk_colormap_sync (colormap, FALSE);
-      
-      while (nremaining > 0)
-	{
-	  for (i=0; i<ncolors; i++)
-	    {
-	      if (!success[i])
-		{
-		  index = gdk_colormap_match_color (colormap, &colors[i], available);
-		  if (index != -1)
-		    {
-		      if (private->info[index].ref_count)
-			{
-			  private->info[index].ref_count++;
-			  colors[i] = colormap->colors[index];
-			  success[i] = TRUE;
-			  nremaining--;
-			}
-		      else
-			{
-			  if (gdk_colormap_alloc1 (colormap, 
-						   &colormap->colors[index],
-						   &colors[i]))
-			    {
-			      success[i] = TRUE;
-			      nremaining--;
-			      break;
-			    }
-			  else
-			    {
-			      available[index] = FALSE;
-			    }
-			}
-		    }
-		  else
-		    {
-		      nfailed++;
-		      nremaining--;
-		      success[i] = 2; /* flag as permanent failure */
-		    }
-		}
-	    }
-	}
-      g_free (available);
-    }
-
-  /* Change back the values we flagged as permanent failures */
-  if (nfailed > 0)
-    {
-      for (i=0; i<ncolors; i++)
-	if (success[i] == 2)
-	  success[i] = FALSE;
-      nremaining = nfailed;
-    }
-  
-  return (ncolors - nremaining);
-}
-
-static gint
-gdk_colormap_alloc_colors_pseudocolor (GdkColormap *colormap,
-				       GdkColor    *colors,
-				       gint         ncolors,
-				       gboolean     writeable,
-				       gboolean     best_match,
-				       gboolean    *success)
-{
-  GdkColormapPrivate *private;
-  GdkColor *lookup_color;
-  gint i;
-  gint nremaining = 0;
-
-  private = (GdkColormapPrivate*) colormap;
-
-  /* Check for an exact match among previously allocated colors */
-
-  for (i=0; i<ncolors; i++)
-    {
-      if (!success[i])
-	{
-	  lookup_color = g_hash_table_lookup (private->hash, &colors[i]);
-	  if (lookup_color)
-	    {
-	      private->info[lookup_color->pixel].ref_count++;
-	      colors[i].pixel = lookup_color->pixel;
-	      success[i] = TRUE;
-	    }
-	  else
-	    nremaining++;
-	}
-    }
-
-  /* If that failed, we try to allocate a new color, or approxmiate
-   * with what we can get if best_match is TRUE.
-   */
-  if (nremaining > 0)
-    {
-      if (private->private_val)
-	return gdk_colormap_alloc_colors_private (colormap, colors, ncolors, writeable, best_match, success);
-      else
-	return gdk_colormap_alloc_colors_shared (colormap, colors, ncolors, writeable, best_match, success);
-    }
-  else
-    return 0;
-}
-
-gint
-gdk_colormap_alloc_colors (GdkColormap *colormap,
-			   GdkColor    *colors,
-			   gint         ncolors,
-			   gboolean     writeable,
-			   gboolean     best_match,
-			   gboolean    *success)
-{
-  GdkColormapPrivate *private;
-  GdkVisual *visual;
-  gint i;
-  gint nremaining = 0;
-  XColor xcolor;
-
-  g_return_val_if_fail (colormap != NULL, FALSE);
-  g_return_val_if_fail (colors != NULL, FALSE);
-
-  private = (GdkColormapPrivate*) colormap;
-
-  for (i=0; i<ncolors; i++)
-    {
-      success[i] = FALSE;
-    }
-
-  switch (private->visual->type)
-    {
-    case GDK_VISUAL_PSEUDO_COLOR:
-    case GDK_VISUAL_GRAYSCALE:
-      if (writeable)
-	return gdk_colormap_alloc_colors_writeable (colormap, colors, ncolors,
-						    writeable, best_match, success);
-      else
-	return gdk_colormap_alloc_colors_pseudocolor (colormap, colors, ncolors,
-						    writeable, best_match, success);
-      break;
-
-    case GDK_VISUAL_DIRECT_COLOR:
-    case GDK_VISUAL_TRUE_COLOR:
-      visual = private->visual;
-
-      for (i=0; i<ncolors; i++)
-	{
-	  colors[i].pixel = (((colors[i].red >> (16 - visual->red_prec)) << visual->red_shift) +
-			     ((colors[i].green >> (16 - visual->green_prec)) << visual->green_shift) +
-			     ((colors[i].blue >> (16 - visual->blue_prec)) << visual->blue_shift));
-	  success[i] = TRUE;
-	}
-      break;
-
-    case GDK_VISUAL_STATIC_GRAY:
-    case GDK_VISUAL_STATIC_COLOR:
-      for (i=0; i<ncolors; i++)
-	{
-	  xcolor.red = colors[i].red;
-	  xcolor.green = colors[i].green;
-	  xcolor.blue = colors[i].blue;
-	  xcolor.pixel = colors[i].pixel;
-	  xcolor.flags = DoRed | DoGreen | DoBlue;
-
-	  if (XAllocColor (private->xdisplay, private->xcolormap, &xcolor))
-	    {
-	      colors[i].pixel = xcolor.pixel;
-	      success[i] = TRUE;
-	    }
-	  else
-	    nremaining++;
-	}
-      break;
-    }
-  return nremaining;
-}
-
-gboolean
-gdk_colormap_alloc_color (GdkColormap *colormap,
-			  GdkColor    *color,
-			  gboolean     writeable,
-			  gboolean     best_match)
+guint
+gdk_color_hash (const GdkColor *color)
 {
-  gboolean success;
-
-  gdk_colormap_alloc_colors (colormap, color, 1, writeable, best_match,
-			     &success);
-
-  return success;
+  return ((color->red) +
+          (color->green << 11) +
+          (color->blue << 22) +
+          (color->blue >> 6));
 }
 
-/* This is almost identical to gdk_colors_free.
- * Keep them in sync!
+/**
+ * gdk_color_equal:
+ * @colora: a #GdkColor
+ * @colorb: another #GdkColor
+ *
+ * Compares two colors.
+ *
+ * Return value: %TRUE if the two colors compare equal
  */
-void
-gdk_colormap_free_colors (GdkColormap *colormap,
-			  GdkColor    *colors,
-			  gint         ncolors)
-{
-  GdkColormapPrivate *private;
-  gulong *pixels;
-  gint npixels = 0;
-  gint i;
-
-  g_return_if_fail (colormap != NULL);
-  g_return_if_fail (colors != NULL);
-
-  private = (GdkColormapPrivate*) colormap;
-
-  if ((private->visual->type != GDK_VISUAL_PSEUDO_COLOR) &&
-      (private->visual->type != GDK_VISUAL_GRAYSCALE))
-    return;
-
-  pixels = g_new (gulong, ncolors);
-
-  for (i=0; i<ncolors; i++)
-    {
-      gulong pixel = colors[i].pixel;
-      
-      if (private->info[pixel].ref_count)
-	{
-	  private->info[pixel].ref_count--;
-
-	  if (private->info[pixel].ref_count == 0)
-	    {
-	      pixels[npixels++] = pixel;
-	      if (!(private->info[pixel].flags & GDK_COLOR_WRITEABLE))
-		g_hash_table_remove (private->hash, &colors[i]);
-	      private->info[pixel].flags = 0;
-	    }
-	}
-    }
-
-  if (npixels)
-    XFreeColors (private->xdisplay, private->xcolormap,
-		 pixels, npixels, 0);
-
-  g_free (pixels);
-}
-
 gboolean
-gdk_color_alloc (GdkColormap *colormap,
-		 GdkColor    *color)
-{
-  gboolean success;
-
-  gdk_colormap_alloc_colors (colormap, color, 1, FALSE, TRUE, &success);
-
-  return success;
-}
-
-gboolean
-gdk_color_change (GdkColormap *colormap,
-		  GdkColor    *color)
-{
-  GdkColormapPrivate *private;
-  XColor xcolor;
-
-  g_return_val_if_fail (colormap != NULL, FALSE);
-  g_return_val_if_fail (color != NULL, FALSE);
-
-  xcolor.pixel = color->pixel;
-  xcolor.red = color->red;
-  xcolor.green = color->green;
-  xcolor.blue = color->blue;
-  xcolor.flags = DoRed | DoGreen | DoBlue;
-
-  private = (GdkColormapPrivate*) colormap;
-  XStoreColor (private->xdisplay, private->xcolormap, &xcolor);
-
-  return TRUE;
-}
-
-guint
-gdk_color_hash (const GdkColor *colora)
-{
-  return ((colora->red) +
-	  (colora->green << 11) +
-	  (colora->blue << 22) +
-	  (colora->blue >> 6));
-}
-
-gint
 gdk_color_equal (const GdkColor *colora,
-		 const GdkColor *colorb)
+                 const GdkColor *colorb)
 {
   g_return_val_if_fail (colora != NULL, FALSE);
   g_return_val_if_fail (colorb != NULL, FALSE);
 
   return ((colora->red == colorb->red) &&
-	  (colora->green == colorb->green) &&
-	  (colora->blue == colorb->blue));
+          (colora->green == colorb->green) &&
+          (colora->blue == colorb->blue));
 }
 
-/* XXX: Do not use this function until it is fixed. An X Colormap
- *      is useless unless we also have the visual.
- */
-GdkColormap*
-gdkx_colormap_get (Colormap xcolormap)
-{
-  GdkColormap *colormap;
-  GdkColormapPrivate *private;
-
-  colormap = gdk_colormap_lookup (xcolormap);
-  if (colormap)
-    return colormap;
-
-  if (xcolormap == DefaultColormap (gdk_display, gdk_screen))
-    return gdk_colormap_get_system ();
-
-  private = g_new (GdkColormapPrivate, 1);
-  colormap = (GdkColormap*) private;
-
-  private->xdisplay = gdk_display;
-  private->xcolormap = xcolormap;
-  private->visual = NULL;
-  private->private_val = TRUE;
-
-  /* To do the following safely, we would have to have some way of finding
-   * out what the size or visual of the given colormap is. It seems
-   * X doesn't allow this
-   */
+G_DEFINE_BOXED_TYPE (GdkColor, gdk_color,
+                     gdk_color_copy,
+                     gdk_color_free)
 
-#if 0
-  for (i = 0; i < 256; i++)
-    {
-      xpalette[i].pixel = i;
-      xpalette[i].red = 0;
-      xpalette[i].green = 0;
-      xpalette[i].blue = 0;
-    }
-
-  XQueryColors (gdk_display, private->xcolormap, xpalette, 256);
-
-  for (i = 0; i < 256; i++)
-    {
-      colormap->colors[i].pixel = xpalette[i].pixel;
-      colormap->colors[i].red = xpalette[i].red;
-      colormap->colors[i].green = xpalette[i].green;
-      colormap->colors[i].blue = xpalette[i].blue;
-    }
-#endif
-
-  colormap->colors = NULL;
-  colormap->size = 0;
-
-  gdk_colormap_add (colormap);
-
-  return colormap;
-}
-
-
-static gint
-gdk_colormap_match_color (GdkColormap *cmap,
-			  GdkColor    *color,
-			  const gchar *available)
+/**
+ * gdk_color_parse:
+ * @spec: the string specifying the color
+ * @color: (out): the #GdkColor to fill in
+ *
+ * Parses a textual specification of a color and fill in the
+ * <structfield>red</structfield>, <structfield>green</structfield>,
+ * and <structfield>blue</structfield> fields of a #GdkColor
+ * structure.
+ *
+ * The string can either one of a large set of standard names
+ * (taken from the X11 <filename>rgb.txt</filename> file), or
+ * it can be a hex value in the form '&num;rgb' '&num;rrggbb'
+ * '&num;rrrgggbbb' or '&num;rrrrggggbbbb' where 'r', 'g' and
+ * 'b' are hex digits of the red, green, and blue components
+ * of the color, respectively. (White in the four forms is
+ * '&num;fff', '&num;ffffff', '&num;fffffffff' and
+ * '&num;ffffffffffff').
+ *
+ * Return value: %TRUE if the parsing succeeded
+ */
+gboolean
+gdk_color_parse (const gchar *spec,
+                 GdkColor    *color)
 {
-  GdkColor *colors;
-  guint sum, max;
-  gint rdiff, gdiff, bdiff;
-  gint i, index;
-
-  g_return_val_if_fail (cmap != NULL, 0);
-  g_return_val_if_fail (color != NULL, 0);
+  PangoColor pango_color;
 
-  colors = cmap->colors;
-  max = 3 * (65536);
-  index = -1;
-
-  for (i = 0; i < cmap->size; i++)
+  if (pango_color_parse (&pango_color, spec))
     {
-      if ((!available) || (available && available[i]))
-	{
-	  rdiff = (color->red - colors[i].red);
-	  gdiff = (color->green - colors[i].green);
-	  bdiff = (color->blue - colors[i].blue);
-
-	  sum = ABS (rdiff) + ABS (gdiff) + ABS (bdiff);
+      color->red = pango_color.red;
+      color->green = pango_color.green;
+      color->blue = pango_color.blue;
 
-	  if (sum < max)
-	    {
-	      index = i;
-	      max = sum;
-	    }
-	}
+      return TRUE;
     }
-
-  return index;
-}
-
-
-GdkColormap*
-gdk_colormap_lookup (Colormap xcolormap)
-{
-  GdkColormap *cmap;
-
-  if (!colormap_hash)
-    return NULL;
-
-  cmap = g_hash_table_lookup (colormap_hash, &xcolormap);
-  return cmap;
-}
-
-static void
-gdk_colormap_add (GdkColormap *cmap)
-{
-  GdkColormapPrivate *private;
-
-  if (!colormap_hash)
-    colormap_hash = g_hash_table_new ((GHashFunc) gdk_colormap_hash,
-				      (GCompareFunc) gdk_colormap_cmp);
-
-  private = (GdkColormapPrivate*) cmap;
-
-  g_hash_table_insert (colormap_hash, &private->xcolormap, cmap);
+  else
+    return FALSE;
 }
 
-static void
-gdk_colormap_remove (GdkColormap *cmap)
+/**
+ * gdk_color_to_string:
+ * @color: a #GdkColor
+ *
+ * Returns a textual specification of @color in the hexadecimal form
+ * <literal>&num;rrrrggggbbbb</literal>, where <literal>r</literal>,
+ * <literal>g</literal> and <literal>b</literal> are hex digits
+ * representing the red, green and blue components respectively.
+ *
+ * The returned string can be parsed by gdk_color_parse().
+ *
+ * Return value: a newly-allocated text string
+ *
+ * Since: 2.12
+ */
+gchar *
+gdk_color_to_string (const GdkColor *color)
 {
-  GdkColormapPrivate *private;
-
-  if (!colormap_hash)
-    colormap_hash = g_hash_table_new ((GHashFunc) gdk_colormap_hash,
-				      (GCompareFunc) gdk_colormap_cmp);
-
-  private = (GdkColormapPrivate*) cmap;
+  PangoColor pango_color;
 
-  g_hash_table_remove (colormap_hash, &private->xcolormap);
-}
+  g_return_val_if_fail (color != NULL, NULL);
 
-static guint
-gdk_colormap_hash (Colormap *cmap)
-{
-  return *cmap;
-}
+  pango_color.red = color->red;
+  pango_color.green = color->green;
+  pango_color.blue = color->blue;
 
-static gint
-gdk_colormap_cmp (Colormap *a,
-		  Colormap *b)
-{
-  return (*a == *b);
+  return pango_color_to_string (&pango_color);
 }