]> Pileus Git - ~andy/gtk/blobdiff - gtk/gtkcolorsel.c
fix bug in tooltip
[~andy/gtk] / gtk / gtkcolorsel.c
index 5f3de8476b769afa1008b24672a6402ee1c07442..a894e9fc5cf6b2ff3626b0b60ccee7933abba1f3 100644 (file)
@@ -3,34 +3,37 @@
  * 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.
  */
 
 /*
- * 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 "gdkconfig.h"
+#include <math.h>
 
 #if defined (GDK_WINDOWING_X11)
 #include "x11/gdkx.h"
 #elif defined (GDK_WINDOWING_WIN32)
 #include "win32/gdkwin32.h"
+#elif defined (GDK_WINDOWING_FB)
+#include "linux-fb/gdkfb.h"
 #endif
 
 #include "gdk/gdkkeysyms.h"
 #include "gtkentry.h"
 #include "gtkbutton.h"
 #include "gtkhseparator.h"
+#include "gtktooltips.h"
+#include "gtkinvisible.h"
+#include "gtkmenuitem.h"
+#include "gtkmain.h"
+#include "gtksettings.h"
 #include "gtkintl.h"
 
+#include <string.h>
+
+/* Number of elements in the custom palatte */
+#define GTK_CUSTOM_PALETTE_WIDTH 10
+#define GTK_CUSTOM_PALETTE_HEIGHT 2
+
 enum {
   COLOR_CHANGED,
   LAST_SIGNAL
 };
 
-
-
 enum {
   COLORSEL_RED = 0,
   COLORSEL_GREEN = 1,
@@ -78,13 +90,11 @@ typedef struct _ColorSelectionPrivate ColorSelectionPrivate;
 
 struct _ColorSelectionPrivate
 {
-  guint use_opacity : 1;
-  guint use_palette : 1;
+  guint has_opacity : 1;
+  guint has_palette : 1;
   guint changing : 1;
   guint default_set : 1;
-  
-  /* The color dropper */
-  guint moving_dropper : 1;
+  guint default_alpha_set : 1;
   
   gdouble color[COLORSEL_NUM_CHANNELS];
   gdouble old_color[COLORSEL_NUM_CHANNELS];
@@ -104,24 +114,45 @@ struct _ColorSelectionPrivate
   
   /* The Palette code */
   GtkWidget *custom_palette [GTK_CUSTOM_PALETTE_WIDTH][GTK_CUSTOM_PALETTE_HEIGHT];
-  GtkWidget *last_palette;
   
   /* The color_sample stuff */
   GtkWidget *sample_area;
   GtkWidget *old_sample;
   GtkWidget *cur_sample;
   GtkWidget *colorsel;
+
+  /* Tooltips group */
+  GtkTooltips *tooltips;
+
+  /* Window for grabbing on */
+  GtkWidget *dropper_grab_widget;
 };
 
 
 static void gtk_color_selection_init           (GtkColorSelection       *colorsel);
 static void gtk_color_selection_class_init     (GtkColorSelectionClass  *klass);
 static void gtk_color_selection_destroy                (GtkObject               *object);
+static void gtk_color_selection_finalize        (GObject                *object);
 static void update_color                       (GtkColorSelection       *colorsel);
 
+static gint     gtk_color_selection_get_palette_size    (GtkColorSelection *colorsel);
+static gboolean gtk_color_selection_get_palette_color   (GtkColorSelection *colorsel,
+                                                         gint               index,
+                                                         GdkColor          *color);
+static void     gtk_color_selection_set_palette_color   (GtkColorSelection *colorsel,
+                                                         gint               index,
+                                                         GdkColor          *color);
+static void     gtk_color_selection_unset_palette_color (GtkColorSelection *colorsel,
+                                                         gint               index);
+
 static gpointer parent_class = NULL;
 static guint color_selection_signals[LAST_SIGNAL] = { 0 };
 
+static gchar* default_colors = "black:white:gray50:red:purple:blue:light blue:green:yellow:orange:lavender:brown:goldenrod4:dodger blue:pink:light green:gray10:gray30:gray75:gray90";
+
+static GtkColorSelectionChangePaletteFunc change_palette_hook = NULL;
+
+static GdkColor current_colors[GTK_CUSTOM_PALETTE_WIDTH * GTK_CUSTOM_PALETTE_HEIGHT];
 
 /* The cursor for the dropper */
 #define DROPPER_WIDTH 17
@@ -232,7 +263,7 @@ color_sample_drag_begin (GtkWidget      *widget,
       colors[i++] = colsrc[n];
     }
   
-  if (priv->use_opacity)
+  if (priv->has_opacity)
     {
       colors[i] = colsrc[COLORSEL_OPACITY];
     }
@@ -324,7 +355,7 @@ color_sample_drag_handle (GtkWidget        *widget,
   vals[0] = colsrc[COLORSEL_RED] * 0xffff;
   vals[1] = colsrc[COLORSEL_GREEN] * 0xffff;
   vals[2] = colsrc[COLORSEL_BLUE] * 0xffff;
-  vals[3] = priv->use_opacity ? colsrc[COLORSEL_OPACITY] * 0xffff : 0xffff;
+  vals[3] = priv->has_opacity ? colsrc[COLORSEL_OPACITY] * 0xffff : 0xffff;
   
   gtk_selection_data_set (selection_data,
                          gdk_atom_intern ("application/x-color", FALSE),
@@ -378,7 +409,7 @@ color_sample_draw_sample (GtkColorSelection *colorsel, int which)
     }
 #endif
   
-  if (priv->use_opacity)
+  if (priv->has_opacity)
     {
       o = (which) ? priv->color[COLORSEL_OPACITY] : priv->old_color[COLORSEL_OPACITY];
       
@@ -395,7 +426,7 @@ color_sample_draw_sample (GtkColorSelection *colorsel, int which)
     {
       for (x = 0; x < wid; x++)
        {
-         if (priv->use_opacity)
+         if (priv->has_opacity)
            f = 3 * ((((goff + x) % 32) < 16) ^ ((y % 32) < 16));
          else
            f = 0;
@@ -494,6 +525,12 @@ color_sample_new (GtkColorSelection *colorsel)
   priv->sample_area = gtk_hbox_new (FALSE, 0);
   priv->old_sample = gtk_drawing_area_new ();
   priv->cur_sample = gtk_drawing_area_new ();
+
+  /* We need enter/leave to do tooltips */
+  gtk_widget_add_events (priv->old_sample,
+                         GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK);
+  gtk_widget_add_events (priv->cur_sample,
+                         GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK);
   
   gtk_box_pack_start (GTK_BOX (priv->sample_area), priv->old_sample,
                      TRUE, TRUE, 0);
@@ -509,6 +546,15 @@ color_sample_new (GtkColorSelection *colorsel)
   
   color_sample_setup_dnd (colorsel, priv->old_sample);
   color_sample_setup_dnd (colorsel, priv->cur_sample);
+
+  gtk_tooltips_set_tip (priv->tooltips,
+                        priv->old_sample,
+                        _("The previously-selected color, for comparison to the color you're selecting now. You can drag this color to a palette entry, or select this color as current by dragging it to the other color swatch alongside."), NULL);
+
+
+  gtk_tooltips_set_tip (priv->tooltips,
+                        priv->cur_sample,
+                        _("The color you've chosen. You can drag this color to a palette entry to save it for use in the future."), NULL);
   
   gtk_widget_show_all (priv->sample_area);
 }
@@ -519,8 +565,8 @@ color_sample_new (GtkColorSelection *colorsel)
  * The palette area code
  *
  */
-#define CUSTOM_PALETTE_ENTRY_WIDTH   16
-#define CUSTOM_PALETTE_ENTRY_HEIGHT  16
+#define CUSTOM_PALETTE_ENTRY_WIDTH   20
+#define CUSTOM_PALETTE_ENTRY_HEIGHT  20
 
 static void
 palette_get_color (GtkWidget *drawing_area, gdouble *color)
@@ -552,9 +598,6 @@ palette_paint (GtkWidget    *drawing_area,
               GdkRectangle *area,
               gpointer      data)
 {
-  GtkColorSelection *colorsel = GTK_COLOR_SELECTION (data); 
-  ColorSelectionPrivate *priv = colorsel->private_data; 
-
   if (drawing_area->window == NULL)
     return;
   
@@ -564,7 +607,7 @@ palette_paint (GtkWidget    *drawing_area,
                         area->width, 
                         area->height);
   
-  if (priv->last_palette == drawing_area)
+  if (GTK_WIDGET_HAS_FOCUS (drawing_area))
     {
       GdkGC *gc;
       gdouble color[4];
@@ -583,57 +626,6 @@ palette_paint (GtkWidget    *drawing_area,
     }
 }
 
-static void
-palette_expose (GtkWidget      *drawing_area,
-               GdkEventExpose *event,
-               gpointer        data)
-{
-  if (drawing_area->window == NULL)
-    return;
-  
-  palette_paint (drawing_area, &(event->area), data);
-}
-
-static void
-palette_press (GtkWidget      *drawing_area,
-              GdkEventButton *event,
-              gpointer        data)
-{
-  GtkColorSelection *colorsel = GTK_COLOR_SELECTION (data); 
-  ColorSelectionPrivate *priv = colorsel->private_data; 
-  if (priv->last_palette != NULL) 
-    gtk_widget_queue_clear (priv->last_palette);
-  
-  priv->last_palette = drawing_area;
-
-  if (GPOINTER_TO_INT (gtk_object_get_data (GTK_OBJECT (drawing_area), "color_set")) != 0)
-    {
-      gdouble color[4];
-      palette_get_color (drawing_area, color);
-      gtk_color_selection_set_color (GTK_COLOR_SELECTION (data), color);
-    }
-
-  gtk_widget_queue_clear (priv->last_palette);
-}
-
-static void
-palette_draw (GtkWidget    *drawing_area,
-             GdkRectangle *area,
-             gpointer      data)
-{
-  palette_paint (drawing_area, area, data);
-}
-
-static void
-palette_unset_color (GtkWidget *drawing_area)
-{
-  if (GPOINTER_TO_INT (gtk_object_get_data (GTK_OBJECT (drawing_area), "color_set")) == 0)
-    return;
-  
-  gtk_widget_reset_rc_styles (drawing_area);
-  gtk_object_set_data (GTK_OBJECT (drawing_area), "color_set", GINT_TO_POINTER (0));
-}
 
 static void
 palette_drag_begin (GtkWidget      *widget,
@@ -690,22 +682,73 @@ palette_drag_handle (GtkWidget        *widget,
                          16, (guchar *)vals, 8);
 }
 
+static void
+palette_drag_end (GtkWidget      *widget,
+                 GdkDragContext *context,
+                 gpointer        data)
+{
+  gtk_object_set_data (GTK_OBJECT (widget), "gtk-color-selection-drag-window", NULL);
+}
+
+/* Changes the model color */
+static void
+palette_change_color (GtkWidget         *drawing_area,
+                      GtkColorSelection *colorsel,
+                      gdouble           *color)
+{
+  gint x, y;
+  ColorSelectionPrivate *priv;
+  GdkColor gdk_color;
+
+  g_return_if_fail (GTK_IS_COLOR_SELECTION (colorsel));
+  g_return_if_fail (GTK_IS_DRAWING_AREA (drawing_area));
+  
+  priv = colorsel->private_data;
+  
+  gdk_color.red = color[0]*65535;
+  gdk_color.green = color[1]*65535;
+  gdk_color.blue = color[2]*65535;
+
+  x = 0;
+  while (x < GTK_CUSTOM_PALETTE_WIDTH)
+    {
+      y = 0;
+      while (y < GTK_CUSTOM_PALETTE_HEIGHT)
+        {
+          if (priv->custom_palette[x][y] == drawing_area)
+            goto out;
+          
+          ++y;
+        }
+
+      ++x;
+    }
+
+ out:
+  
+  g_assert (x < GTK_CUSTOM_PALETTE_WIDTH || y < GTK_CUSTOM_PALETTE_HEIGHT);
+
+  current_colors[y * GTK_CUSTOM_PALETTE_WIDTH + x] = gdk_color;
+
+  if (change_palette_hook)
+    (* change_palette_hook) (current_colors, GTK_CUSTOM_PALETTE_WIDTH * GTK_CUSTOM_PALETTE_HEIGHT);
+}
+
+/* Changes the view color */
 static void
 palette_set_color (GtkWidget         *drawing_area,
                   GtkColorSelection *colorsel,
                   gdouble           *color)
 {
-  GtkRcStyle *rc_style;
   gdouble *new_color = g_new (double, 4);
   gdouble *old_color;
+  GdkColor gdk_color;
   
-  rc_style = gtk_rc_style_new ();
-  rc_style->bg[GTK_STATE_NORMAL].red = color[0]*65535;
-  rc_style->bg[GTK_STATE_NORMAL].green = color[1]*65535;
-  rc_style->bg[GTK_STATE_NORMAL].blue = color[2]*65535;
-  rc_style->color_flags[GTK_STATE_NORMAL] = GTK_RC_BG;
-  gtk_rc_style_ref (rc_style);
-  gtk_widget_modify_style (drawing_area, rc_style);
+  gdk_color.red = color[0]*65535;
+  gdk_color.green = color[1]*65535;
+  gdk_color.blue = color[2]*65535;
+
+  gtk_widget_modify_bg (drawing_area, GTK_STATE_NORMAL, &gdk_color);
   
   if (GPOINTER_TO_INT (gtk_object_get_data (GTK_OBJECT (drawing_area), "color_set")) == 0)
     {
@@ -745,11 +788,132 @@ palette_set_color (GtkWidget         *drawing_area,
 }
 
 static void
-palette_drag_end (GtkWidget      *widget,
-                 GdkDragContext *context,
-                 gpointer        data)
+palette_expose (GtkWidget      *drawing_area,
+               GdkEventExpose *event,
+               gpointer        data)
 {
-  gtk_object_set_data (GTK_OBJECT (widget), "gtk-color-selection-drag-window", NULL);
+  if (drawing_area->window == NULL)
+    return;
+  
+  palette_paint (drawing_area, &(event->area), data);
+}
+
+static void
+popup_position_func (GtkMenu   *menu,
+                     gint      *x,
+                     gint      *y,
+                     gboolean  *push_in,
+                     gpointer  user_data)
+{
+  GtkWidget *widget;
+  GtkRequisition req;      
+  gint root_x, root_y;
+  
+  widget = GTK_WIDGET (user_data);
+  
+  g_return_if_fail (GTK_WIDGET_REALIZED (widget));
+
+  gdk_window_get_origin (widget->window, &root_x, &root_y);
+  
+  gtk_widget_size_request (GTK_WIDGET (menu), &req);
+
+  /* Put corner of menu centered on color cell */
+  *x = root_x + widget->allocation.width / 2;
+  *y = root_y + widget->allocation.height / 2;
+
+  /* Ensure sanity */
+  *x = CLAMP (*x, 0, MAX (0, gdk_screen_width () - req.width));
+  *y = CLAMP (*y, 0, MAX (0, gdk_screen_height () - req.height));
+}
+
+static void
+save_color_selected (GtkWidget *menuitem,
+                     gpointer   data)
+{
+  GtkColorSelection *colorsel;
+  GtkWidget *drawing_area;
+  ColorSelectionPrivate *priv;
+
+  drawing_area = GTK_WIDGET (data);
+  
+  colorsel = GTK_COLOR_SELECTION (g_object_get_data (G_OBJECT (drawing_area),
+                                                     "gtk-color-sel"));
+
+  priv = colorsel->private_data;
+  
+  palette_change_color (drawing_area, colorsel, priv->color);  
+}
+
+static void
+do_popup (GtkColorSelection *colorsel,
+          GtkWidget         *drawing_area,
+          guint32            timestamp)
+{
+  GtkWidget *menu;
+  GtkWidget *mi;
+  GtkWidget *label;
+  
+  g_object_set_data (G_OBJECT (drawing_area),
+                     "gtk-color-sel",
+                     colorsel);
+  
+  menu = gtk_menu_new ();
+
+  label = gtk_label_new_with_mnemonic (_("_Save color here"));
+  mi = gtk_menu_item_new ();
+  gtk_container_add (GTK_CONTAINER (mi), label);
+
+  gtk_signal_connect (GTK_OBJECT (mi), "activate",
+                      GTK_SIGNAL_FUNC (save_color_selected),
+                      drawing_area);
+  
+  gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi);
+
+  gtk_widget_show_all (mi);
+
+  gtk_menu_popup (GTK_MENU (menu), NULL, NULL,
+                  popup_position_func, drawing_area,
+                  3, timestamp);
+}
+
+
+static gint
+palette_press (GtkWidget      *drawing_area,
+              GdkEventButton *event,
+              gpointer        data)
+{
+  GtkColorSelection *colorsel = GTK_COLOR_SELECTION (data);
+
+  gtk_widget_grab_focus (drawing_area);
+  
+  if (event->button == 1 &&
+      event->type == GDK_BUTTON_PRESS)
+    {      
+      if (GPOINTER_TO_INT (gtk_object_get_data (GTK_OBJECT (drawing_area), "color_set")) != 0)
+        {
+          gdouble color[4];
+          palette_get_color (drawing_area, color);
+          gtk_color_selection_set_color (GTK_COLOR_SELECTION (data), color);
+        }
+    }
+  
+  if (event->button == 3 &&
+      event->type == GDK_BUTTON_PRESS)
+    {
+      do_popup (colorsel, drawing_area, event->time);
+    }
+  
+  return TRUE;
+}
+
+static void
+palette_unset_color (GtkWidget *drawing_area)
+{
+  if (GPOINTER_TO_INT (gtk_object_get_data (GTK_OBJECT (drawing_area), "color_set")) == 0)
+    return;
+  
+  gtk_widget_reset_rc_styles (drawing_area);
+  gtk_object_set_data (GTK_OBJECT (drawing_area), "color_set", GINT_TO_POINTER (0));
 }
 
 static void
@@ -781,7 +945,7 @@ palette_drop_handle (GtkWidget        *widget,
   color[1] = (gdouble)vals[1] / 0xffff;
   color[2] = (gdouble)vals[2] / 0xffff;
   color[3] = (gdouble)vals[3] / 0xffff;
-  palette_set_color (widget, GTK_COLOR_SELECTION (data), color);
+  palette_change_color (widget, GTK_COLOR_SELECTION (data), color);
   gtk_color_selection_set_color (GTK_COLOR_SELECTION (data), color);
 }
 
@@ -790,34 +954,63 @@ palette_activate (GtkWidget   *widget,
                  GdkEventKey *event,
                  gpointer     data)
 {
-  GtkColorSelection *colorsel = data;
-  ColorSelectionPrivate *priv;
-  
+  /* should have a drawing area subclass with an activate signal */
   if ((event->keyval == ' ') || (event->keyval == GDK_Return))
     {
-      priv = colorsel->private_data;
-      palette_set_color (widget, GTK_COLOR_SELECTION (data), priv->color);
+      if (GPOINTER_TO_INT (gtk_object_get_data (GTK_OBJECT (widget), "color_set")) != 0)
+        {
+          gdouble color[4];
+          palette_get_color (widget, color);
+          gtk_color_selection_set_color (GTK_COLOR_SELECTION (data), color);
+        }
+      return TRUE;
     }
   
-  return TRUE;
+  return FALSE;
 }
 
+static void
+palette_popup (GtkWidget *widget,
+               gpointer   data)
+{
+  GtkColorSelection *colorsel = GTK_COLOR_SELECTION (data);
+
+  do_popup (colorsel, widget, GDK_CURRENT_TIME);
+}
+               
+
 static GtkWidget*
 palette_new (GtkColorSelection *colorsel)
 {
   GtkWidget *retval;
+  ColorSelectionPrivate *priv;
   
   static const GtkTargetEntry targets[] = {
     { "application/x-color", 0 }
   };
+
+  priv = colorsel->private_data;
   
   retval = gtk_drawing_area_new ();
-  gtk_object_set_data (GTK_OBJECT (retval), "color_set", GINT_TO_POINTER (0)); 
-  gtk_widget_set_events (retval, GDK_BUTTON_PRESS_MASK | GDK_EXPOSURE_MASK);
+
+  GTK_WIDGET_SET_FLAGS (retval, GTK_CAN_FOCUS);
   
-  gtk_signal_connect (GTK_OBJECT (retval), "draw", palette_draw, colorsel);
-  gtk_signal_connect (GTK_OBJECT (retval), "expose_event", palette_expose, colorsel);
-  gtk_signal_connect (GTK_OBJECT (retval), "button_press_event", palette_press, colorsel);
+  gtk_object_set_data (GTK_OBJECT (retval), "color_set", GINT_TO_POINTER (0)); 
+  gtk_widget_set_events (retval, GDK_BUTTON_PRESS_MASK
+                         | GDK_BUTTON_RELEASE_MASK
+                         | GDK_EXPOSURE_MASK
+                         | GDK_ENTER_NOTIFY_MASK
+                         | GDK_LEAVE_NOTIFY_MASK);
+  
+
+  gtk_signal_connect (GTK_OBJECT (retval), "expose_event",
+                      GTK_SIGNAL_FUNC (palette_expose), colorsel);
+  gtk_signal_connect (GTK_OBJECT (retval), "button_press_event",
+                      GTK_SIGNAL_FUNC (palette_press), colorsel);
+  gtk_signal_connect (GTK_OBJECT (retval), "key_press_event",
+                      GTK_SIGNAL_FUNC (palette_activate), colorsel);
+  gtk_signal_connect (GTK_OBJECT (retval), "popup_menu",
+                      GTK_SIGNAL_FUNC (palette_popup), colorsel);
   
   gtk_drag_dest_set (retval,
                     GTK_DEST_DEFAULT_HIGHLIGHT |
@@ -826,10 +1019,15 @@ palette_new (GtkColorSelection *colorsel)
                     targets, 1,
                     GDK_ACTION_COPY);
   
-  gtk_signal_connect (GTK_OBJECT (retval), "drag_end", palette_drag_end, NULL);
-  gtk_signal_connect (GTK_OBJECT (retval), "drag_data_received", palette_drop_handle, colorsel);
-  gtk_signal_connect (GTK_OBJECT (retval), "key_press_event", GTK_SIGNAL_FUNC (palette_activate), colorsel);
-  
+  gtk_signal_connect (GTK_OBJECT (retval), "drag_end",
+                      GTK_SIGNAL_FUNC (palette_drag_end), NULL);
+  gtk_signal_connect (GTK_OBJECT (retval), "drag_data_received",
+                      GTK_SIGNAL_FUNC (palette_drop_handle), colorsel);
+
+  gtk_tooltips_set_tip (priv->tooltips,
+                        retval,
+                        _("Click this palette entry to make it the current color. To change this entry, drag a color swatch here or right-click it and select \"Save color here.\""),
+                        NULL);
   return retval;
 }
 
@@ -865,58 +1063,29 @@ initialize_cursor (void)
 }
 
 static void
-grab_color_at_mouse (GtkWidget *button,
+grab_color_at_mouse (GtkWidget *invisible,
                     gint       x_root,
                     gint       y_root,
                     gpointer   data)
 {
   GdkImage *image;
   guint32 pixel;
-  GdkVisual *visual;
   GtkColorSelection *colorsel = data;
   ColorSelectionPrivate *priv;
   GdkColormap *colormap = gdk_colormap_get_system ();
-#if defined (GDK_WINDOWING_X11)
-  XColor xcolor;
-#endif
+  GdkColor color;
   
   priv = colorsel->private_data;
   
   image = gdk_image_get (GDK_ROOT_PARENT (), x_root, y_root, 1, 1);
   pixel = gdk_image_get_pixel (image, 0, 0);
-  visual = gdk_colormap_get_visual (colormap);
-  
-  switch (visual->type) {
-  case GDK_VISUAL_DIRECT_COLOR:
-  case GDK_VISUAL_TRUE_COLOR:
-    priv->color[COLORSEL_RED] = (double)((pixel & visual->red_mask)>>visual->red_shift)/((1<<visual->red_prec) - 1);
-    priv->color[COLORSEL_GREEN] = (double)((pixel & visual->green_mask)>>visual->green_shift)/((1<<visual->green_prec) - 1);
-    priv->color[COLORSEL_BLUE] = (double)((pixel & visual->blue_mask)>>visual->blue_shift)/((1<<visual->blue_prec) - 1);
-    break;
-  case GDK_VISUAL_STATIC_GRAY:
-  case GDK_VISUAL_GRAYSCALE:
-    priv->color[COLORSEL_RED] = (double)pixel/((1<<visual->depth) - 1);
-    priv->color[COLORSEL_GREEN] = (double)pixel/((1<<visual->depth) - 1);
-    priv->color[COLORSEL_BLUE] = (double)pixel/((1<<visual->depth) - 1);
-    break;
-#if defined (GDK_WINDOWING_X11)
-  case GDK_VISUAL_STATIC_COLOR:
-    xcolor.pixel = pixel;
-    XQueryColor (GDK_DISPLAY (), GDK_COLORMAP_XCOLORMAP (colormap), &xcolor);
-    priv->color[COLORSEL_RED] = xcolor.red/65535.0;
-    priv->color[COLORSEL_GREEN] = xcolor.green/65535.0;
-    priv->color[COLORSEL_BLUE] = xcolor.blue/65535.0;
-    break;
-#endif
-  case GDK_VISUAL_PSEUDO_COLOR:
-    priv->color[COLORSEL_RED] = colormap->colors[pixel].red/(double)0xffffff;
-    priv->color[COLORSEL_GREEN] = colormap->colors[pixel].green/(double)0xffffff;
-    priv->color[COLORSEL_BLUE] = colormap->colors[pixel].blue/(double)0xffffff;
-    break;
-  default:
-    g_assert_not_reached ();
-    break;
-  }
+  gdk_image_unref (image);
+
+  gdk_colormap_query_color (colormap, pixel, &color);
+  
+  priv->color[COLORSEL_RED] = (double)color.red / 65535.0;
+  priv->color[COLORSEL_GREEN] = (double)color.green / 65535.0;
+  priv->color[COLORSEL_BLUE] = (double)color.blue / 65535.0;
   
   gtk_rgb_to_hsv (priv->color[COLORSEL_RED],
                  priv->color[COLORSEL_GREEN],
@@ -924,36 +1093,86 @@ grab_color_at_mouse (GtkWidget *button,
                  &priv->color[COLORSEL_HUE],
                  &priv->color[COLORSEL_SATURATION],
                  &priv->color[COLORSEL_VALUE]);
+
   update_color (colorsel);
 }
 
 static void
-mouse_motion (GtkWidget      *button,
+shutdown_eyedropper (GtkWidget *widget)
+{
+  GtkColorSelection *colorsel;
+  ColorSelectionPrivate *priv;
+
+  colorsel = GTK_COLOR_SELECTION (widget);
+  priv = colorsel->private_data;    
+
+  gdk_keyboard_ungrab (gtk_get_current_event_time ());
+  gdk_pointer_ungrab (gtk_get_current_event_time ());
+  gtk_grab_remove (priv->dropper_grab_widget);
+}
+
+static void
+mouse_motion (GtkWidget      *invisible,
              GdkEventMotion *event,
              gpointer        data)
 {
-  grab_color_at_mouse (button, event->x_root, event->y_root, data); 
+  grab_color_at_mouse (invisible, event->x_root, event->y_root, data); 
 }
 
-static void
-mouse_release (GtkWidget      *button,
+static gboolean
+mouse_release (GtkWidget      *invisible,
               GdkEventButton *event,
               gpointer        data)
 {
   GtkColorSelection *colorsel = data;
   ColorSelectionPrivate *priv;
-  priv = colorsel->private_data;
-  
-  gtk_signal_disconnect_by_func (GTK_OBJECT (button), mouse_motion, data);
-  gtk_signal_disconnect_by_func (GTK_OBJECT (button), mouse_release, data);
+  priv = colorsel->private_data;  
+
+  if (event->button != 1)
+    return FALSE;
+
+  grab_color_at_mouse (invisible, event->x_root, event->y_root, data);
+
+  shutdown_eyedropper (GTK_WIDGET (data));
   
-  grab_color_at_mouse (button, event->x_root, event->y_root, data);
-  gdk_pointer_ungrab (0);
+  gtk_signal_disconnect_by_func (GTK_OBJECT (invisible),
+                                 GTK_SIGNAL_FUNC (mouse_motion), data);
+  gtk_signal_disconnect_by_func (GTK_OBJECT (invisible),
+                                 GTK_SIGNAL_FUNC (mouse_release), data);
+
+  return TRUE;
 }
 
 /* Helper Functions */
-static void
-mouse_press (GtkWidget      *button,
+
+static gboolean mouse_press (GtkWidget      *invisible,
+                             GdkEventButton *event,
+                             gpointer        data);
+
+static gboolean
+key_press (GtkWidget   *invisible,
+           GdkEventKey *event,
+           gpointer     data)
+{  
+  if (event->keyval == GDK_Escape)
+    {
+      shutdown_eyedropper (data);
+
+      gtk_signal_disconnect_by_func (GTK_OBJECT (invisible),
+                                     GTK_SIGNAL_FUNC (mouse_press),
+                                     data);
+      gtk_signal_disconnect_by_func (GTK_OBJECT (invisible),
+                                     GTK_SIGNAL_FUNC (key_press),
+                                     data);
+      
+      return TRUE;
+    }
+
+  return FALSE;
+}
+
+static gboolean
+mouse_press (GtkWidget      *invisible,
             GdkEventButton *event,
             gpointer        data)
 {
@@ -961,9 +1180,25 @@ mouse_press (GtkWidget      *button,
   ColorSelectionPrivate *priv;
   priv = colorsel->private_data;
   
-  gtk_signal_connect (GTK_OBJECT (button), "motion_notify_event", mouse_motion, data);
-  gtk_signal_connect (GTK_OBJECT (button), "button_release_event", mouse_release, data);
-  gtk_signal_disconnect_by_func (GTK_OBJECT (button), mouse_press, data); 
+  if (event->type == GDK_BUTTON_PRESS &&
+      event->button == 1)
+    {
+      gtk_signal_connect (GTK_OBJECT (invisible), "motion_notify_event",
+                          GTK_SIGNAL_FUNC (mouse_motion),
+                          data);
+      gtk_signal_connect (GTK_OBJECT (invisible), "button_release_event",
+                          GTK_SIGNAL_FUNC (mouse_release),
+                          data);
+      gtk_signal_disconnect_by_func (GTK_OBJECT (invisible),
+                                     GTK_SIGNAL_FUNC (mouse_press),
+                                     data);
+      gtk_signal_disconnect_by_func (GTK_OBJECT (invisible),
+                                     GTK_SIGNAL_FUNC (key_press),
+                                     data);
+      return TRUE;
+    }
+
+  return FALSE;
 }
 
 /* when the button is clicked */
@@ -977,31 +1212,46 @@ get_screen_color (GtkWidget *button)
     {
       initialize_cursor ();
     }
-  
-  /* Why do we do this? Because the "clicked" signal will be emitted after the "button_released"
-     signal. We don't want to do this stuff again, though, or else it will get trapped here. So, 
-     priv->moving_dropper is initialized to FALSE at the initialization of the colorselector, 
-     it is initialized to true when we start waiting for the user to click the the dropper on a 
-     color, and whenver it is true when this function starts to execute, we set it to false. */
-  if (priv->moving_dropper == FALSE)
+
+  if (priv->dropper_grab_widget == NULL)
     {
-      priv->moving_dropper = TRUE;
-      gtk_signal_connect (GTK_OBJECT (button), "button_press_event", mouse_press, colorsel); 
+      priv->dropper_grab_widget = gtk_invisible_new ();
+
+      gtk_widget_add_events (priv->dropper_grab_widget,
+                             GDK_BUTTON_RELEASE_MASK | GDK_BUTTON_PRESS_MASK | GDK_POINTER_MOTION_MASK);
       
-      gdk_pointer_grab (button->window,
-                       FALSE,
-                       GDK_BUTTON_RELEASE_MASK | GDK_BUTTON_PRESS_MASK | GDK_POINTER_MOTION_MASK,
-                       NULL,
-                       picker_cursor,
-                       0);
+      gtk_widget_show (priv->dropper_grab_widget);
     }
-  else
+
+  if (gdk_keyboard_grab (priv->dropper_grab_widget->window,
+                         FALSE,
+                         gtk_get_current_event_time ()) != GDK_GRAB_SUCCESS)
+    {
+      g_warning ("Failed to grab keyboard to do eyedropper");
+      return;
+    }
+  
+  if (gdk_pointer_grab (priv->dropper_grab_widget->window,
+                        FALSE,
+                        GDK_BUTTON_RELEASE_MASK | GDK_BUTTON_PRESS_MASK | GDK_POINTER_MOTION_MASK,
+                        NULL,
+                        picker_cursor,
+                        gtk_get_current_event_time ()) != GDK_GRAB_SUCCESS)
     {
-      priv->moving_dropper = FALSE; 
+      gdk_keyboard_ungrab (GDK_CURRENT_TIME);
+      g_warning ("Failed to grab pointer to do eyedropper");
+      return;
     }
+
+  gtk_grab_add (priv->dropper_grab_widget);
+  
+  gtk_signal_connect (GTK_OBJECT (priv->dropper_grab_widget), "button_press_event",
+                      GTK_SIGNAL_FUNC (mouse_press), colorsel);
+  gtk_signal_connect (GTK_OBJECT (priv->dropper_grab_widget), "key_press_event",
+                      GTK_SIGNAL_FUNC (key_press), colorsel);
 }
 
-void
+static void
 hex_changed (GtkWidget *hex_entry,
             gpointer   data)
 {
@@ -1033,7 +1283,7 @@ hex_changed (GtkWidget *hex_entry,
   g_free (text);
 }
 
-void
+static void
 hsv_changed (GtkWidget *hsv,
             gpointer   data)
 {
@@ -1059,7 +1309,7 @@ hsv_changed (GtkWidget *hsv,
   update_color (colorsel);
 }
 
-void
+static void
 adjustment_changed (GtkAdjustment *adjustment,
                    gpointer       data)
 {
@@ -1112,7 +1362,7 @@ adjustment_changed (GtkAdjustment *adjustment,
   update_color (colorsel);
 }
 
-void 
+static void 
 opacity_entry_changed (GtkWidget *opacity_entry,
                       gpointer   data)
 {
@@ -1136,22 +1386,6 @@ opacity_entry_changed (GtkWidget *opacity_entry,
   g_free (text);
 }
 
-static void
-widget_focus_in (GtkWidget     *drawing_area,
-                GdkEventFocus *event,
-                gpointer       data)
-{
-  GtkColorSelection *colorsel = GTK_COLOR_SELECTION (data);
-  ColorSelectionPrivate *priv = colorsel->private_data;
-  
-  /* This signal is connected to by all of the widgets except the "Set Color" button
-   * This will let you add a color to the currently selected palette
-   */
-  
-  priv->last_palette = NULL;
-}
-
-
 static void
 make_label_spinbutton (GtkColorSelection *colorsel,
                       GtkWidget        **spinbutton,
@@ -1159,10 +1393,12 @@ make_label_spinbutton (GtkColorSelection *colorsel,
                       GtkWidget         *table,
                       gint               i,
                       gint               j,
-                      gint               channel_type)
+                      gint               channel_type,
+                       const gchar       *tooltip)
 {
   GtkWidget *label;
   GtkAdjustment *adjust;
+  ColorSelectionPrivate *priv = colorsel->private_data;
   
   if (channel_type == COLORSEL_HUE)
     {
@@ -1174,9 +1410,15 @@ make_label_spinbutton (GtkColorSelection *colorsel,
     }
   gtk_object_set_data (GTK_OBJECT (adjust), "COLORSEL", colorsel);
   *spinbutton = gtk_spin_button_new (adjust, 10.0, 0);
-  gtk_signal_connect (GTK_OBJECT (*spinbutton), "focus_in_event", widget_focus_in, colorsel);
-  gtk_signal_connect (GTK_OBJECT (adjust), "value_changed", adjustment_changed, GINT_TO_POINTER (channel_type));
-  label = gtk_label_new (text);
+
+  gtk_tooltips_set_tip (priv->tooltips, *spinbutton, tooltip, NULL);  
+
+  gtk_signal_connect (GTK_OBJECT (adjust), "value_changed",
+                      GTK_SIGNAL_FUNC (adjustment_changed),
+                      GINT_TO_POINTER (channel_type));
+  label = gtk_label_new_with_mnemonic (text);
+  gtk_label_set_mnemonic_widget (GTK_LABEL (label), *spinbutton);
+
   gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5);
   gtk_table_attach_defaults (GTK_TABLE (table), label, i, i+1, j, j+1);
   gtk_table_attach_defaults (GTK_TABLE (table), *spinbutton, i+1, i+2, j, j+1);
@@ -1207,12 +1449,16 @@ set_selected_palette (GtkColorSelection *colorsel, int x, int y)
 {
   ColorSelectionPrivate *priv = colorsel->private_data; 
 
-  if (priv->last_palette != NULL) 
-    gtk_widget_queue_clear (priv->last_palette);
-
-  priv->last_palette = priv->custom_palette[x][y]; 
+  gtk_widget_grab_focus (priv->custom_palette[x][y]);
+}
 
-  gtk_widget_queue_clear (priv->last_palette);
+static double
+scale_round (double val, double factor)
+{
+  val = floor (val * factor + 0.5);
+  val = MAX (val, 0);
+  val = MIN (val, factor);
+  return val;
 }
 
 static void
@@ -1232,33 +1478,33 @@ update_color (GtkColorSelection *colorsel)
                     priv->color[COLORSEL_VALUE]);
   gtk_adjustment_set_value (gtk_spin_button_get_adjustment
                            (GTK_SPIN_BUTTON (priv->hue_spinbutton)),
-                           priv->color[COLORSEL_HUE] * 360);
+                           scale_round (priv->color[COLORSEL_HUE], 360));
   gtk_adjustment_set_value (gtk_spin_button_get_adjustment
                            (GTK_SPIN_BUTTON (priv->sat_spinbutton)),
-                           priv->color[COLORSEL_SATURATION] * 255);
+                           scale_round (priv->color[COLORSEL_SATURATION], 255));
   gtk_adjustment_set_value (gtk_spin_button_get_adjustment
                            (GTK_SPIN_BUTTON (priv->val_spinbutton)),
-                           priv->color[COLORSEL_VALUE] * 255);
+                           scale_round (priv->color[COLORSEL_VALUE], 255));
   gtk_adjustment_set_value (gtk_spin_button_get_adjustment
                            (GTK_SPIN_BUTTON (priv->red_spinbutton)),
-                           priv->color[COLORSEL_RED] * 255);
+                           scale_round (priv->color[COLORSEL_RED], 255));
   gtk_adjustment_set_value (gtk_spin_button_get_adjustment
                            (GTK_SPIN_BUTTON (priv->green_spinbutton)),
-                           priv->color[COLORSEL_GREEN] * 255);
+                           scale_round (priv->color[COLORSEL_GREEN], 255));
   gtk_adjustment_set_value (gtk_spin_button_get_adjustment
                            (GTK_SPIN_BUTTON (priv->blue_spinbutton)),
-                           priv->color[COLORSEL_BLUE] * 255);
+                           scale_round (priv->color[COLORSEL_BLUE], 255));
   gtk_adjustment_set_value (gtk_range_get_adjustment
                            (GTK_RANGE (priv->opacity_slider)),
-                           priv->color[COLORSEL_OPACITY] * 255);
+                           scale_round (priv->color[COLORSEL_OPACITY], 255));
   
   g_snprintf (opacity_text, 32, "%.0f", priv->color[COLORSEL_OPACITY] * 255);
   gtk_entry_set_text (GTK_ENTRY (priv->opacity_entry), opacity_text);
   
   g_snprintf (entryval, 11, "#%2X%2X%2X",
-             (guint) (255 * priv->color[COLORSEL_RED]),
-             (guint) (255 * priv->color[COLORSEL_GREEN]),
-             (guint) (255 * priv->color[COLORSEL_BLUE]));
+             (guint) (scale_round (priv->color[COLORSEL_RED], 255)),
+             (guint) (scale_round (priv->color[COLORSEL_GREEN], 255)),
+             (guint) (scale_round (priv->color[COLORSEL_BLUE], 255)));
   
   for (ptr = entryval; *ptr; ptr++)
     if (*ptr == ' ')
@@ -1267,45 +1513,82 @@ update_color (GtkColorSelection *colorsel)
   priv->changing = FALSE;
 }
 
+
 static void
-add_button_pressed (GtkWidget         *button,
-                   GtkColorSelection *colorsel)
+fill_palette_from_string (const gchar *str)
 {
-  ColorSelectionPrivate *priv;
-  gint i, j;
+  GdkColor *colors = NULL;
+  gint n_colors = 0;
+
+  if (str == NULL)
+    return;
   
-  priv = colorsel->private_data;
+  if (!gtk_color_selection_palette_from_string (str, &colors, &n_colors))
+    return;
+
+  if (n_colors > (GTK_CUSTOM_PALETTE_WIDTH * GTK_CUSTOM_PALETTE_HEIGHT))    
+    n_colors = GTK_CUSTOM_PALETTE_WIDTH * GTK_CUSTOM_PALETTE_HEIGHT;
+
+  memcpy (current_colors, colors, sizeof (GdkColor) * n_colors);
+
+  g_free (colors);
+}
+
+static void
+palette_change_notify_class (GObject    *object,
+                             GParamSpec *pspec)
+{
+  gchar *str = NULL;
+  
+  g_object_get (object, pspec->name, &str, NULL);
+
+  fill_palette_from_string (str);
+
+  g_free (str);
+}
+
+static void
+update_palette (GtkColorSelection *colorsel)
+{
+  gint i, j;
   
-  for (j = 0; j < GTK_CUSTOM_PALETTE_HEIGHT; j++)
+  for (i = 0; i < GTK_CUSTOM_PALETTE_HEIGHT; i++)
     {
-      for (i = 0; i < GTK_CUSTOM_PALETTE_WIDTH; i++)
+      for (j = 0; j < GTK_CUSTOM_PALETTE_WIDTH; j++)
        {
-         /* Either last_palette is set and we're on it, or it's an empty palette */
-         if ((priv->last_palette && priv->last_palette == priv->custom_palette[i][j]) ||
-             ((priv->last_palette == NULL) &&
-              (GPOINTER_TO_INT (gtk_object_get_data (GTK_OBJECT (priv->custom_palette[i][j]),
-                                                     "color_set")) == 0)))
-           {
-             palette_set_color (priv->custom_palette[i][j], colorsel, priv->color);
-
-             /* forward the selection */
-             if ((i == GTK_CUSTOM_PALETTE_WIDTH - 1) && (j == GTK_CUSTOM_PALETTE_HEIGHT - 1))
-               set_selected_palette (colorsel, 0, 0);
-             else if (i == GTK_CUSTOM_PALETTE_WIDTH - 1)
-               set_selected_palette (colorsel, 0, j + 1);
-             else
-               set_selected_palette (colorsel, i + 1, j);
-
-             return;
-           }
+          gint index;
+
+          index = i * GTK_CUSTOM_PALETTE_WIDTH + j;
+          
+          gtk_color_selection_set_palette_color (colorsel,
+                                                 index,
+                                                 &current_colors[index]);
        }
     }
+}
+
+static void
+palette_change_notify_instance (GObject    *object,
+                                GParamSpec *pspec,
+                                gpointer    data)
+{
+  update_palette (GTK_COLOR_SELECTION (data));
+}
+
+static void
+default_change_palette_func (const GdkColor *colors,
+                             gint            n_colors)
+{
+  gchar *str;
+  
+  str = gtk_color_selection_palette_to_string (colors, n_colors);
 
-  /* the palette is totally full.  Add to the first one totally arbitrarily */
-  palette_set_color (priv->custom_palette[0][0], colorsel, priv->color);
+  gtk_settings_set_string_property (gtk_settings_get_global (),
+                                    "gtk-color-palette",
+                                    str,
+                                    "gtk_color_selection_palette_to_string");
 
-  /* forward the selection */
-  set_selected_palette (colorsel, 1, 0);
+  g_free (str);
 }
 
 GtkType
@@ -1337,26 +1620,43 @@ static void
 gtk_color_selection_class_init (GtkColorSelectionClass *klass)
 {
   GtkObjectClass *object_class;
+  GObjectClass *gobject_class;
   
-  object_class = (GtkObjectClass*) klass;
+  object_class = GTK_OBJECT_CLASS (klass);
+  gobject_class = G_OBJECT_CLASS (klass);
   
   parent_class = gtk_type_class (GTK_TYPE_VBOX);
   
+  object_class->destroy = gtk_color_selection_destroy;
+  gobject_class->finalize = gtk_color_selection_finalize;
+  
   color_selection_signals[COLOR_CHANGED] =
     gtk_signal_new ("color_changed",
                     GTK_RUN_FIRST,
                     GTK_CLASS_TYPE (object_class),
                     GTK_SIGNAL_OFFSET (GtkColorSelectionClass, color_changed),
-                    gtk_marshal_NONE__NONE,
+                    gtk_marshal_VOID__VOID,
                     GTK_TYPE_NONE, 0);
+
+  gtk_settings_install_property (gtk_settings_get_global (),
+                                 g_param_spec_string ("gtk-color-palette",
+                                                      _("Custom palette"),
+                                                      _("Palette to use in the color selector"),
+                                                      default_colors,
+                                                      G_PARAM_READWRITE));
   
+  fill_palette_from_string (default_colors);
+
+  change_palette_hook = default_change_palette_func;
   
-  gtk_object_class_add_signals (object_class, color_selection_signals, LAST_SIGNAL);
-  
-  object_class->destroy = gtk_color_selection_destroy;
+  g_signal_connect_data (G_OBJECT (gtk_settings_get_global ()),
+                         "notify::gtk-color-palette",
+                         G_CALLBACK (palette_change_notify_class),
+                         NULL, NULL, FALSE, FALSE);
 }
 
 /* widget functions */
+
 static void
 gtk_color_selection_init (GtkColorSelection *colorsel)
 {
@@ -1374,8 +1674,9 @@ gtk_color_selection_init (GtkColorSelection *colorsel)
   priv = colorsel->private_data = g_new0 (ColorSelectionPrivate, 1);
   priv->changing = FALSE;
   priv->default_set = FALSE;
-  priv->last_palette = NULL;
-  priv->moving_dropper = FALSE;
+  priv->default_alpha_set = FALSE;
+  
+  priv->tooltips = gtk_tooltips_new ();
   
   gtk_box_set_spacing (GTK_BOX (colorsel), 4);
   top_hbox = gtk_hbox_new (FALSE, 8);
@@ -1383,10 +1684,13 @@ gtk_color_selection_init (GtkColorSelection *colorsel)
   
   vbox = gtk_vbox_new (FALSE, 4);
   priv->triangle_colorsel = gtk_hsv_new ();
-  gtk_signal_connect (GTK_OBJECT (priv->triangle_colorsel), "changed", hsv_changed, colorsel);
+  gtk_signal_connect (GTK_OBJECT (priv->triangle_colorsel), "changed",
+                      GTK_SIGNAL_FUNC (hsv_changed), colorsel);
   gtk_hsv_set_metrics (GTK_HSV (priv->triangle_colorsel), 174, 15);
   gtk_box_pack_start (GTK_BOX (top_hbox), vbox, FALSE, FALSE, 0);
   gtk_box_pack_start (GTK_BOX (vbox), priv->triangle_colorsel, FALSE, FALSE, 0);
+  gtk_tooltips_set_tip (priv->tooltips, priv->triangle_colorsel,
+                        _("Select the color you want from the outer ring. Select the darkness or lightness of that color using the inner triangle."), NULL);
   
   hbox = gtk_hbox_new (FALSE, 4);
   gtk_box_pack_end (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
@@ -1399,14 +1703,22 @@ gtk_color_selection_init (GtkColorSelection *colorsel)
   gtk_box_pack_start (GTK_BOX (hbox), frame, TRUE, TRUE, 0);
   
   button = gtk_button_new ();
-  gtk_signal_connect (GTK_OBJECT (button), "focus_in_event", widget_focus_in, colorsel);
+
   gtk_widget_set_events (button, GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK);
   gtk_object_set_data (GTK_OBJECT (button), "COLORSEL", colorsel); 
-  gtk_signal_connect (GTK_OBJECT (button), "clicked", get_screen_color, NULL);
+  gtk_signal_connect (GTK_OBJECT (button), "clicked",
+                      GTK_SIGNAL_FUNC (get_screen_color), NULL);
   dropper_pixmap = gdk_pixmap_colormap_create_from_xpm_d (NULL, gtk_widget_get_colormap (button), &mask, NULL, picker);
   dropper_image = gtk_pixmap_new (dropper_pixmap, mask);
+  gdk_pixmap_unref (dropper_pixmap);
+  if (mask)
+    gdk_pixmap_unref (mask);
   gtk_container_add (GTK_CONTAINER (button), dropper_image);
   gtk_box_pack_end (GTK_BOX (hbox), button, FALSE, FALSE, 0);
+
+  gtk_tooltips_set_tip (priv->tooltips,
+                        button,
+                        _("Click the eyedropper, then click a color anywhere on your screen to select that color."), NULL);
   
   top_right_vbox = gtk_vbox_new (FALSE, 4);
   gtk_box_pack_start (GTK_BOX (top_hbox), top_right_vbox, FALSE, FALSE, 0);
@@ -1415,34 +1727,57 @@ gtk_color_selection_init (GtkColorSelection *colorsel)
   gtk_table_set_row_spacings (GTK_TABLE (table), 4);
   gtk_table_set_col_spacings (GTK_TABLE (table), 4);
   
-  make_label_spinbutton (colorsel, &priv->hue_spinbutton, _("Hue:"), table, 0, 0, COLORSEL_HUE);
-  make_label_spinbutton (colorsel, &priv->sat_spinbutton, _("Saturation:"), table, 0, 1, COLORSEL_SATURATION);
-  make_label_spinbutton (colorsel, &priv->val_spinbutton, _("Value:"), table, 0, 2, COLORSEL_VALUE);
-  make_label_spinbutton (colorsel, &priv->red_spinbutton, _("Red:"), table, 6, 0, COLORSEL_RED);
-  make_label_spinbutton (colorsel, &priv->green_spinbutton, _("Green:"), table, 6, 1, COLORSEL_GREEN);
-  make_label_spinbutton (colorsel, &priv->blue_spinbutton, _("Blue:"), table, 6, 2, COLORSEL_BLUE);
+  make_label_spinbutton (colorsel, &priv->hue_spinbutton, _("_Hue:"), table, 0, 0, COLORSEL_HUE,
+                         _("Position on the color wheel."));
+  make_label_spinbutton (colorsel, &priv->sat_spinbutton, _("_Saturation:"), table, 0, 1, COLORSEL_SATURATION,
+                         _("\"Deepness\" of the color."));
+  make_label_spinbutton (colorsel, &priv->val_spinbutton, _("_Value:"), table, 0, 2, COLORSEL_VALUE,
+                         _("Brightness of the color."));
+  make_label_spinbutton (colorsel, &priv->red_spinbutton, _("_Red:"), table, 6, 0, COLORSEL_RED,
+                         _("Amount of red light in the color."));
+  make_label_spinbutton (colorsel, &priv->green_spinbutton, _("_Green:"), table, 6, 1, COLORSEL_GREEN,
+                         _("Amount of green light in the color."));
+  make_label_spinbutton (colorsel, &priv->blue_spinbutton, _("_Blue:"), table, 6, 2, COLORSEL_BLUE,
+                         _("Amount of blue light in the color."));
   gtk_table_attach_defaults (GTK_TABLE (table), gtk_hseparator_new (), 0, 8, 3, 4); 
   
-  priv->opacity_label = gtk_label_new (_("Opacity:")); 
+  priv->opacity_label = gtk_label_new_with_mnemonic (_("_Opacity:")); 
   gtk_misc_set_alignment (GTK_MISC (priv->opacity_label), 1.0, 0.5); 
   gtk_table_attach_defaults (GTK_TABLE (table), priv->opacity_label, 0, 1, 4, 5); 
   adjust = GTK_ADJUSTMENT (gtk_adjustment_new (0.0, 0.0, 255.0, 1.0, 1.0, 0.0)); 
   gtk_object_set_data (GTK_OBJECT (adjust), "COLORSEL", colorsel); 
-  priv->opacity_slider = gtk_hscale_new (adjust); 
+  priv->opacity_slider = gtk_hscale_new (adjust);
+  gtk_tooltips_set_tip (priv->tooltips,
+                        priv->opacity_slider,
+                        _("Transparency of the currently-selected color."), NULL);
+  gtk_label_set_mnemonic_widget (GTK_LABEL (priv->opacity_label),
+                                 priv->opacity_slider);
   gtk_scale_set_draw_value (GTK_SCALE (priv->opacity_slider), FALSE);
-  gtk_signal_connect (GTK_OBJECT(adjust), "value_changed", adjustment_changed, GINT_TO_POINTER (COLORSEL_OPACITY));
+  gtk_signal_connect (GTK_OBJECT(adjust), "value_changed",
+                      GTK_SIGNAL_FUNC (adjustment_changed),
+                      GINT_TO_POINTER (COLORSEL_OPACITY));
   gtk_table_attach_defaults (GTK_TABLE (table), priv->opacity_slider, 1, 7, 4, 5); 
   priv->opacity_entry = gtk_entry_new (); 
   gtk_widget_set_usize (priv->opacity_entry, 40, 0); 
-  gtk_signal_connect (GTK_OBJECT (priv->opacity_entry), "focus_in_event", widget_focus_in, colorsel);
-  gtk_signal_connect (GTK_OBJECT (priv->opacity_entry), "activate", opacity_entry_changed, colorsel);
+
+  gtk_signal_connect (GTK_OBJECT (priv->opacity_entry), "activate",
+                      GTK_SIGNAL_FUNC (opacity_entry_changed), colorsel);
   gtk_table_attach_defaults (GTK_TABLE (table), priv->opacity_entry, 7, 8, 4, 5);
   
-  label = gtk_label_new (_("Hex Value:"));
+  label = gtk_label_new_with_mnemonic (_("Color _Name:"));
   gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 5, 6);
   gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5);
   priv->hex_entry = gtk_entry_new ();
-  gtk_signal_connect (GTK_OBJECT (priv->hex_entry), "activate", hex_changed, colorsel);
+
+  gtk_label_set_mnemonic_widget (GTK_LABEL (label), priv->hex_entry);
+
+  gtk_signal_connect (GTK_OBJECT (priv->hex_entry), "activate",
+                      GTK_SIGNAL_FUNC (hex_changed), colorsel);
+
+  gtk_tooltips_set_tip (priv->tooltips,
+                        priv->hex_entry,
+                        _("You can enter an HTML-style hexadecimal color value, or simply a color name such as 'orange' in this entry."), NULL);
+  
   gtk_widget_set_usize (priv->hex_entry, 75, -1);  
   gtk_table_set_col_spacing (GTK_TABLE (table), 3, 15);
   gtk_table_attach_defaults (GTK_TABLE (table), priv->hex_entry, 1, 5, 5, 6);
@@ -1459,26 +1794,41 @@ gtk_color_selection_init (GtkColorSelection *colorsel)
        }
     }
   set_selected_palette (colorsel, 0, 0);
-  priv->palette_frame = gtk_frame_new (_("Custom Palette"));
+  priv->palette_frame = gtk_frame_new (NULL);
+  label = gtk_label_new_with_mnemonic (_("_Palette"));
+  gtk_frame_set_label_widget (GTK_FRAME (priv->palette_frame), label);
+
+  gtk_label_set_mnemonic_widget (GTK_LABEL (label),
+                                 priv->custom_palette[0][0]);
+  
   gtk_box_pack_end (GTK_BOX (top_right_vbox), priv->palette_frame, FALSE, FALSE, 0);
   vbox = gtk_vbox_new (FALSE, 4);
   gtk_container_add (GTK_CONTAINER (priv->palette_frame), vbox);
   gtk_box_pack_start (GTK_BOX (vbox), table, FALSE, FALSE, 0);
-  button = gtk_button_new_with_label (_("Set Color"));
-  gtk_signal_connect (GTK_OBJECT (button), "clicked", add_button_pressed, colorsel);
-  gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
+
   gtk_container_set_border_width (GTK_CONTAINER (vbox), 4);
   
   gtk_widget_show_all (top_hbox);
+
+  /* Set default colors */
+
+  update_palette (colorsel);
+  
+  g_signal_connect_data (G_OBJECT (gtk_settings_get_global ()),
+                         "notify::gtk-color-palette",
+                         G_CALLBACK (palette_change_notify_instance),
+                         colorsel, NULL, FALSE, FALSE);
+  
+  /* hide unused stuff */
   
-  if (priv->use_opacity == FALSE)
+  if (priv->has_opacity == FALSE)
     {
       gtk_widget_hide (priv->opacity_label);
       gtk_widget_hide (priv->opacity_slider);
       gtk_widget_hide (priv->opacity_entry);
     }
   
-  if (priv->use_palette == FALSE)
+  if (priv->has_palette == FALSE)
     {
       gtk_widget_hide (priv->palette_frame);
     }
@@ -1486,6 +1836,27 @@ gtk_color_selection_init (GtkColorSelection *colorsel)
 
 static void
 gtk_color_selection_destroy (GtkObject *object)
+{
+  GtkColorSelection *cselection = GTK_COLOR_SELECTION (object);
+  ColorSelectionPrivate *priv = cselection->private_data;
+
+  if (priv->dropper_grab_widget)
+    {
+      gtk_widget_destroy (priv->dropper_grab_widget);
+      priv->dropper_grab_widget = NULL;
+    }
+
+  if (priv->tooltips)
+    {
+      gtk_object_destroy (priv->tooltips);
+      priv->tooltips = NULL;
+    }
+  
+  GTK_OBJECT_CLASS (parent_class)->destroy (object);
+}
+
+static void
+gtk_color_selection_finalize (GObject *object)
 {
   GtkColorSelection *cselection = GTK_COLOR_SELECTION (object);
   
@@ -1495,14 +1866,12 @@ gtk_color_selection_destroy (GtkObject *object)
       cselection->private_data = NULL;
     }
   
-  GTK_OBJECT_CLASS (parent_class)->destroy (object);
+  G_OBJECT_CLASS (parent_class)->finalize (object);
 }
 
 
-
 /**
  * gtk_color_selection_new:
- * @void: 
  * 
  * Creates a new GtkColorSelection.
  * 
@@ -1522,11 +1891,12 @@ gtk_color_selection_new (void)
   colorsel = gtk_type_new (GTK_TYPE_COLOR_SELECTION);
   priv = colorsel->private_data;
   gtk_color_selection_set_color (colorsel, color);
-  gtk_color_selection_set_use_opacity (colorsel, FALSE);
+  gtk_color_selection_set_has_opacity_control (colorsel, TRUE);
   
   /* We want to make sure that default_set is FALSE */
   /* This way the user can still set it */
   priv->default_set = FALSE;
+  priv->default_alpha_set = FALSE;
   
   return GTK_WIDGET (colorsel);
 }
@@ -1543,15 +1913,15 @@ gtk_color_selection_set_update_policy (GtkColorSelection *colorsel,
 }
 
 /**
- * gtk_color_selection_get_use_opacity:
+ * gtk_color_selection_get_has_opacity_control:
  * @colorsel: A GtkColorSelection.
  * 
- * Determines whether the colorsel can use opacity.
+ * Determines whether the colorsel has an opacity control.
  * 
- * Return value: TRUE if the @colorsel uses opacity.  FALSE if it does't.
+ * Return value: TRUE if the @colorsel has an opacity control.  FALSE if it does't.
  **/
 gboolean
-gtk_color_selection_get_use_opacity (GtkColorSelection *colorsel)
+gtk_color_selection_get_has_opacity_control (GtkColorSelection *colorsel)
 {
   ColorSelectionPrivate *priv;
   
@@ -1560,20 +1930,20 @@ gtk_color_selection_get_use_opacity (GtkColorSelection *colorsel)
   
   priv = colorsel->private_data;
   
-  return priv->use_opacity;
+  return priv->has_opacity;
 }
 
 /**
- * gtk_color_selection_set_use_opacity:
+ * gtk_color_selection_set_has_opacity_control:
  * @colorsel: A GtkColorSelection.
- * @use_opacity: TRUE if @colorsel can set the opacity, FALSE otherwise.
+ * @has_opacity: TRUE if @colorsel can set the opacity, FALSE otherwise.
  *
  * Sets the @colorsel to use or not use opacity.
  * 
  **/
 void
-gtk_color_selection_set_use_opacity (GtkColorSelection *colorsel,
-                                    gboolean           use_opacity)
+gtk_color_selection_set_has_opacity_control (GtkColorSelection *colorsel,
+                                            gboolean           has_opacity)
 {
   ColorSelectionPrivate *priv;
   
@@ -1581,12 +1951,12 @@ gtk_color_selection_set_use_opacity (GtkColorSelection *colorsel,
   g_return_if_fail (GTK_IS_COLOR_SELECTION (colorsel));
   
   priv = colorsel->private_data;
-  use_opacity = use_opacity != FALSE;
+  has_opacity = has_opacity != FALSE;
   
-  if (priv->use_opacity != use_opacity)
+  if (priv->has_opacity != has_opacity)
     {
-      priv->use_opacity = use_opacity;
-      if (use_opacity)
+      priv->has_opacity = has_opacity;
+      if (has_opacity)
        {
          gtk_widget_show (priv->opacity_slider);
          gtk_widget_show (priv->opacity_label);
@@ -1603,15 +1973,15 @@ gtk_color_selection_set_use_opacity (GtkColorSelection *colorsel,
 }
 
 /**
- * gtk_color_selection_get_use_palette:
+ * gtk_color_selection_get_has_palette:
  * @colorsel: A GtkColorSelection.
  * 
- * Determines whether the palette is used.
+ * Determines whether the color selector has a color palette.
  * 
- * Return value: TRUE if the palette is used.  FALSE if it isn't.
+ * Return value: TRUE if the selector has a palette.  FALSE if it hasn't.
  **/
 gboolean
-gtk_color_selection_get_use_palette (GtkColorSelection *colorsel)
+gtk_color_selection_get_has_palette (GtkColorSelection *colorsel)
 {
   ColorSelectionPrivate *priv;
   
@@ -1619,32 +1989,32 @@ gtk_color_selection_get_use_palette (GtkColorSelection *colorsel)
   
   priv = colorsel->private_data;
   
-  return priv->use_palette;
+  return priv->has_palette;
 }
 
 /**
- * gtk_color_selection_set_use_palette:
+ * gtk_color_selection_set_has_palette:
  * @colorsel: A GtkColorSelection.
- * @use_palette: TRUE if palette is to be visible, FALSE otherwise.
+ * @has_palette: TRUE if palette is to be visible, FALSE otherwise.
  *
- * Shows and hides the palette based upon the value of @use_palette.
+ * Shows and hides the palette based upon the value of @has_palette.
  * 
  **/
 void
-gtk_color_selection_set_use_palette (GtkColorSelection *colorsel,
-                                    gboolean           use_palette)
+gtk_color_selection_set_has_palette (GtkColorSelection *colorsel,
+                                    gboolean           has_palette)
 {
   ColorSelectionPrivate *priv;
   g_return_if_fail (colorsel != NULL);
   g_return_if_fail (GTK_IS_COLOR_SELECTION (colorsel));
   
   priv = colorsel->private_data;
-  use_palette = use_palette != FALSE;
+  has_palette = has_palette != FALSE;
   
-  if (priv->use_palette != use_palette)
+  if (priv->has_palette != has_palette)
     {
-      priv->use_palette = use_palette;
-      if (use_palette)
+      priv->has_palette = has_palette;
+      if (has_palette)
        gtk_widget_show (priv->palette_frame);
       else
        gtk_widget_hide (priv->palette_frame);
@@ -1652,15 +2022,87 @@ gtk_color_selection_set_use_palette (GtkColorSelection *colorsel,
 }
 
 /**
- * gtk_color_selection_set_color:
+ * gtk_color_selection_set_current_color:
  * @colorsel: A GtkColorSelection.
- * @color: A color to set the current color with.
+ * @color: A GdkColor to set the current color with.
  *
  * Sets the current color to be @color.  The first time this is called, it will
  * also set the original color to be @color too.
  * 
  **/
 void
+gtk_color_selection_set_current_color (GtkColorSelection *colorsel,
+                                      GdkColor          *color)
+{
+  ColorSelectionPrivate *priv;
+  gint i;
+  
+  g_return_if_fail (colorsel != NULL);
+  g_return_if_fail (GTK_IS_COLOR_SELECTION (colorsel));
+  
+  priv = colorsel->private_data;
+  priv->changing = TRUE;
+  priv->color[COLORSEL_RED] = color->red / 65535.0;
+  priv->color[COLORSEL_GREEN] = color->green / 65535.0;
+  priv->color[COLORSEL_BLUE] = color->blue / 65535.0;
+  gtk_rgb_to_hsv (priv->color[COLORSEL_RED],
+                 priv->color[COLORSEL_GREEN],
+                 priv->color[COLORSEL_BLUE],
+                 &priv->color[COLORSEL_HUE],
+                 &priv->color[COLORSEL_SATURATION],
+                 &priv->color[COLORSEL_VALUE]);
+  if (priv->default_set == FALSE)
+    {
+      for (i = 0; i < COLORSEL_NUM_CHANNELS; i++)
+       priv->old_color[i] = priv->color[i];
+    }
+  update_color (colorsel);
+  priv->default_set = TRUE;
+}
+
+/**
+ * gtk_color_selection_set_current_alpha:
+ * @colorsel: A GtkColorSelection.
+ * @alpha: an integer between 0 and 65535
+ *
+ * Sets the current opacity to be @alpha.  The first time this is called, it will
+ * also set the original opacity to be @alpha too.
+ * 
+ **/
+void
+gtk_color_selection_set_current_alpha (GtkColorSelection *colorsel,
+                                      guint16            alpha)
+{
+  ColorSelectionPrivate *priv;
+  gint i;
+  
+  g_return_if_fail (colorsel != NULL);
+  g_return_if_fail (GTK_IS_COLOR_SELECTION (colorsel));
+  
+  priv = colorsel->private_data;
+  priv->changing = TRUE;
+  priv->color[COLORSEL_OPACITY] = alpha / 65535.0;
+  if (priv->default_alpha_set == FALSE)
+    {
+      for (i = 0; i < COLORSEL_NUM_CHANNELS; i++)
+       priv->old_color[i] = priv->color[i];
+    }
+  update_color (colorsel);
+  priv->default_alpha_set = TRUE;
+}
+
+/**
+ * gtk_color_selection_set_color:
+ * @colorsel: A GtkColorSelection.
+ * @color: A array of doubles that specifies the color to set the current color with.
+ *
+ * Sets the current color to be @color.  The first time this is called, it will
+ * also set the original color to be @color too.
+ *
+ * This function is deprecated, use gtk_color_selection_set_current_color() instead.
+ *
+ **/
+void
 gtk_color_selection_set_color (GtkColorSelection    *colorsel,
                               gdouble              *color)
 {
@@ -1689,6 +2131,51 @@ gtk_color_selection_set_color (GtkColorSelection    *colorsel,
     }
   update_color (colorsel);
   priv->default_set = TRUE;
+  priv->default_alpha_set = TRUE;
+}
+
+/**
+ * gtk_color_selection_get_current_color:
+ * @colorsel: A GtkColorSelection.
+ * @color: A GdkColor to fill in with the current color.
+ *
+ * Sets @color to be the current color in the GtkColorSelection widget.
+ *
+ * This function is deprecated, use gtk_color_selection_get_current_color() instead.
+ **/
+void
+gtk_color_selection_get_current_color (GtkColorSelection *colorsel,
+                                      GdkColor          *color)
+{
+  ColorSelectionPrivate *priv;
+  
+  g_return_if_fail (colorsel != NULL);
+  g_return_if_fail (GTK_IS_COLOR_SELECTION (colorsel));
+  
+  priv = colorsel->private_data;
+  color->red = priv->color[COLORSEL_RED] * 65535;
+  color->green = priv->color[COLORSEL_GREEN] * 65535;
+  color->blue = priv->color[COLORSEL_BLUE] * 65535;
+}
+
+/**
+ * gtk_color_selection_get_current_alpha:
+ * @colorsel: A GtkColorSelection.
+ *
+ * Returns the current alpha value
+ *
+ * Return value: an integer between 0 and 65535
+ **/
+guint16
+gtk_color_selection_get_current_alpha (GtkColorSelection *colorsel)
+{
+  ColorSelectionPrivate *priv;
+  
+  g_return_val_if_fail (colorsel != NULL, 0);
+  g_return_val_if_fail (GTK_IS_COLOR_SELECTION (colorsel), 0);
+  
+  priv = colorsel->private_data;
+  return priv->has_opacity ? priv->color[COLORSEL_OPACITY] * 65535 : 1.0;
 }
 
 /**
@@ -1712,23 +2199,23 @@ gtk_color_selection_get_color (GtkColorSelection *colorsel,
   color[0] = priv->color[COLORSEL_RED];
   color[1] = priv->color[COLORSEL_GREEN];
   color[2] = priv->color[COLORSEL_BLUE];
-  color[3] = priv->use_opacity ? priv->color[COLORSEL_OPACITY] : 1.0;
+  color[3] = priv->has_opacity ? priv->color[COLORSEL_OPACITY] : 1.0;
 }
 
 /**
- * gtk_color_selection_get_old_color:
+ * gtk_color_selection_set_previous_color:
  * @colorsel: A GtkColorSelection.
- * @color: A color to set the original color with.
+ * @color: A color to set the previous color with.
  *
- * Sets the 'original' color to be @color.  This function should be called with
+ * Sets the 'previous' color to be @color.  This function should be called with
  * some hesitations, as it might seem confusing to have that color change.
- * Calling gtk_color_selection_set_color will also set this color the first
+ * Calling gtk_color_selection_set_current_color will also set this color the first
  * time it is called.
  * 
  **/
 void
-gtk_color_selection_set_old_color (GtkColorSelection *colorsel,
-                                  gdouble          *color)
+gtk_color_selection_set_previous_color (GtkColorSelection *colorsel,
+                                       GdkColor          *color)
 {
   ColorSelectionPrivate *priv;
   
@@ -1737,10 +2224,9 @@ gtk_color_selection_set_old_color (GtkColorSelection *colorsel,
   
   priv = colorsel->private_data;
   priv->changing = TRUE;
-  priv->old_color[COLORSEL_RED] = color[0];
-  priv->old_color[COLORSEL_GREEN] = color[1];
-  priv->old_color[COLORSEL_BLUE] = color[2];
-  priv->old_color[COLORSEL_OPACITY] = color[3];
+  priv->old_color[COLORSEL_RED] = color->red / 65535.0;
+  priv->old_color[COLORSEL_GREEN] = color->green / 65535.0;
+  priv->old_color[COLORSEL_BLUE] = color->blue / 65535.0;
   gtk_rgb_to_hsv (priv->old_color[COLORSEL_RED],
                  priv->old_color[COLORSEL_GREEN],
                  priv->old_color[COLORSEL_BLUE],
@@ -1752,16 +2238,42 @@ gtk_color_selection_set_old_color (GtkColorSelection *colorsel,
 }
 
 /**
- * gtk_color_selection_get_old_color:
+ * gtk_color_selection_set_previous_alpha:
  * @colorsel: A GtkColorSelection.
- * @color: A color to fill in with the original color value.
+ * @alpha: an integer between 0 and 65535
+ *
+ * Sets the 'previous' alpha to be @alpha.  This function should be called with
+ * some hesitations, as it might seem confusing to have that color change.
+ * 
+ **/
+void
+gtk_color_selection_set_previous_alpha (GtkColorSelection *colorsel,
+                                       guint16            alpha)
+{
+  ColorSelectionPrivate *priv;
+  
+  g_return_if_fail (colorsel != NULL);
+  g_return_if_fail (GTK_IS_COLOR_SELECTION (colorsel));
+  
+  priv = colorsel->private_data;
+  priv->changing = TRUE;
+  priv->old_color[COLORSEL_OPACITY] = alpha / 65535.0;
+  color_sample_draw_samples (colorsel);
+  priv->default_alpha_set = TRUE;
+}
+
+
+/**
+ * gtk_color_selection_get_previous_color:
+ * @colorsel: A GtkColorSelection.
+ * @color: A GdkColor to fill in with the original color value.
  *
  * Fills @color in with the original color value.
  * 
  **/
 void
-gtk_color_selection_get_old_color (GtkColorSelection *colorsel,
-                                  gdouble           *color)
+gtk_color_selection_get_previous_color (GtkColorSelection *colorsel,
+                                       GdkColor           *color)
 {
   ColorSelectionPrivate *priv;
   
@@ -1769,96 +2281,147 @@ gtk_color_selection_get_old_color (GtkColorSelection *colorsel,
   g_return_if_fail (GTK_IS_COLOR_SELECTION (colorsel));
   
   priv = colorsel->private_data;
-  color[0] = priv->old_color[COLORSEL_RED];
-  color[1] = priv->old_color[COLORSEL_GREEN];
-  color[2] = priv->old_color[COLORSEL_BLUE];
-  color[3] = priv->use_opacity ? priv->old_color[COLORSEL_OPACITY] : 1.0;
+  color->red = priv->old_color[COLORSEL_RED] * 65535;
+  color->green = priv->old_color[COLORSEL_GREEN] * 65535;
+  color->blue = priv->old_color[COLORSEL_BLUE] * 65535;
+}
+
+/**
+ * gtk_color_selection_get_previous_alpha:
+ * @colorsel: A GtkColorSelection.
+ *
+ * Returns the previous alpha value
+ *
+ * Return value: an integer between 0 and 65535
+ **/
+guint16
+gtk_color_selection_get_previous_alpha (GtkColorSelection *colorsel)
+{
+  ColorSelectionPrivate *priv;
+  
+  g_return_val_if_fail (colorsel != NULL, 0);
+  g_return_val_if_fail (GTK_IS_COLOR_SELECTION (colorsel), 0);
+  
+  priv = colorsel->private_data;
+  return priv->has_opacity ? priv->old_color[COLORSEL_OPACITY] * 65535 : 1.0;
 }
 
 /**
  * gtk_color_selection_set_palette_color:
  * @colorsel: A GtkColorSelection.
- * @x: The x coordinate of the palette.
- * @y: The y coordinate of the palette.
- * @color: A color to set the palette with.
+ * @index: The color index of the palette.
+ * @color: A GdkColor to set the palette with.
  *
- * Set the palette located at (@x, @y) to have @color set as its color.
+ * Set the palette located at at @index to have @color set as its color.
  * 
  **/
-void
+static void
 gtk_color_selection_set_palette_color (GtkColorSelection   *colorsel,
-                                      gint                 x,
-                                      gint                 y,
-                                      gdouble             *color)
+                                      gint                 index,
+                                      GdkColor            *color)
 {
   ColorSelectionPrivate *priv;
+  gint x, y;
+  gdouble col[3];
   
   g_return_if_fail (colorsel != NULL);
   g_return_if_fail (GTK_IS_COLOR_SELECTION (colorsel));
-  g_return_if_fail (x >= 0 && y >= 0 && x < GTK_CUSTOM_PALETTE_WIDTH && y < GTK_CUSTOM_PALETTE_HEIGHT);
+  g_return_if_fail (index >= 0  && index < GTK_CUSTOM_PALETTE_WIDTH*GTK_CUSTOM_PALETTE_HEIGHT);
+
+  x = index % GTK_CUSTOM_PALETTE_WIDTH;
+  y = index / GTK_CUSTOM_PALETTE_WIDTH;
   
   priv = colorsel->private_data;
-  palette_set_color (priv->custom_palette[x][y], colorsel, color);
+  col[0] = color->red / 65535.0;
+  col[1] = color->green / 65535.0;
+  col[2] = color->blue / 65535.0;
+  
+  palette_set_color (priv->custom_palette[x][y], colorsel, col);
 }
 
 /**
  * gtk_color_selection_get_palette_color:
  * @colorsel: A GtkColorSelection.
- * @x: The x coordinate of the palette.
- * @y: The y coordinate of the palette.
+ * @index: The color index of the palette.
  * @color: A color to fill in with the color value.
  * 
- * Set @color to have the color found in the palette located at (@x, @y).  If
+ * Set @color to have the color found in the palette at @index.  If
  * the palette is unset, it will leave the color unset.
  * 
- * Return value: TRUE if the palette located at (@x, @y) has a color set.  FALSE
+ * Return value: TRUE if the palette located at @index has a color set.  FALSE
  * if it doesn't.
  **/
-gboolean
+static gboolean
 gtk_color_selection_get_palette_color (GtkColorSelection   *colorsel,
-                                      gint                 x,
-                                      gint                 y,
-                                      gdouble             *color)
+                                      gint                 index,
+                                      GdkColor            *color)
 {
   ColorSelectionPrivate *priv;
+  gint x, y;
+  gdouble col[4];
   
   g_return_val_if_fail (colorsel != NULL, FALSE);
   g_return_val_if_fail (GTK_IS_COLOR_SELECTION (colorsel), FALSE);
-  g_return_val_if_fail (x >= 0 && y >= 0 && x < GTK_CUSTOM_PALETTE_WIDTH && y < GTK_CUSTOM_PALETTE_HEIGHT, FALSE);
+  g_return_val_if_fail (index >= 0  && index < GTK_CUSTOM_PALETTE_WIDTH*GTK_CUSTOM_PALETTE_HEIGHT, FALSE);
   
   priv = colorsel->private_data;
-  
+
+  x = index % GTK_CUSTOM_PALETTE_WIDTH;
+  y = index / GTK_CUSTOM_PALETTE_WIDTH;
+
   if (GPOINTER_TO_INT (gtk_object_get_data (GTK_OBJECT (priv->custom_palette[x][y]), "color_set")) == 0)
     return FALSE;
   
-  palette_get_color (priv->custom_palette[x][y], color);
+  palette_get_color (priv->custom_palette[x][y], col);
+
+  color->red = col[0] * 65535;
+  color->green = col[1] * 65535;
+  color->blue = col[2] * 65535;
+  
   return TRUE;
 }
 
 /**
  * gtk_color_selection_unset_palette_color:
  * @colorsel: A GtkColorSelection.
- * @x: The x coordinate of the palette.
- * @y: The y coordinate of the palette.
+ * @index: The color index in the palette.
  *
- * Change the palette located at (@x, @y) to have no color set.
+ * Change the palette located @index to have no color set.
  * 
  **/
-void
+static void
 gtk_color_selection_unset_palette_color (GtkColorSelection   *colorsel,
-                                        gint                 x,
-                                        gint                 y)
+                                        gint                 index)
 {
   ColorSelectionPrivate *priv;
+  gint x, y;
   
   g_return_if_fail (colorsel != NULL);
   g_return_if_fail (GTK_IS_COLOR_SELECTION (colorsel));
-  g_return_if_fail (x >= 0 && y >= 0 && x < GTK_CUSTOM_PALETTE_WIDTH && y < GTK_CUSTOM_PALETTE_HEIGHT);
+  g_return_if_fail (index >= 0  && index < GTK_CUSTOM_PALETTE_WIDTH*GTK_CUSTOM_PALETTE_HEIGHT);
+  
+  x = index % GTK_CUSTOM_PALETTE_WIDTH;
+  y = index / GTK_CUSTOM_PALETTE_WIDTH;
   
   priv = colorsel->private_data;
   palette_unset_color (priv->custom_palette[x][y]);
 }
 
+/**
+ * gtk_color_selection_get_current_alpha:
+ * @colorsel: A GtkColorSelection.
+ *
+ * Returns the maximum number of palette colors.
+ *
+ * Return value: the maximum number of palette indexes
+ **/
+static gint
+gtk_color_selection_get_palette_size (GtkColorSelection *colorsel)
+{
+  return GTK_CUSTOM_PALETTE_WIDTH * GTK_CUSTOM_PALETTE_HEIGHT;
+}
+
+
 /**
  * gtk_color_selection_is_adjusting:
  * @colorsel: A GtkColorSelection.
@@ -1880,3 +2443,163 @@ gtk_color_selection_is_adjusting (GtkColorSelection *colorsel)
   
   return (gtk_hsv_is_adjusting (GTK_HSV (priv->triangle_colorsel)));
 }
+
+
+/**
+ * gtk_color_selection_palette_from_string:
+ * @str: a string encoding a color palette
+ * @colors: return location for allocated array of GdkColor
+ * @n_colors: return location for length of array
+ * 
+ * Parses a color palette string; the string is a colon-separated
+ * list of color names readable by gdk_color_parse().
+ * 
+ * Return value: %TRUE if a palette was successfully parsed
+ **/
+gboolean
+gtk_color_selection_palette_from_string (const gchar *str,
+                                         GdkColor   **colors,
+                                         gint        *n_colors)
+{
+  GdkColor *retval;
+  gint count;
+  gchar *p;
+  gchar *start;
+  gchar *copy;
+  
+  count = 0;
+  retval = NULL;
+  copy = g_strdup (str);
+
+  start = copy;
+  p = copy;
+  while (TRUE)
+    {
+      if (*p == ':' || *p == '\0')
+        {
+          gboolean done = TRUE;
+
+          if (start == p)
+            {
+              goto failed; /* empty entry */
+            }
+              
+          if (*p)
+            {
+              *p = '\0';
+              done = FALSE;
+            }
+
+          retval = g_renew (GdkColor, retval, count + 1);
+          if (!gdk_color_parse (start, retval + count))
+            {
+              goto failed;
+            }
+
+          ++count;
+
+          if (done)
+            break;
+          else
+            start = p + 1;
+        }
+
+      ++p;
+    }
+
+  g_free (copy);
+  
+  if (colors)
+    *colors = retval;
+  else
+    g_free (retval);
+
+  if (n_colors)
+    *n_colors = count;
+
+  return TRUE;
+  
+ failed:
+  g_free (copy);
+  g_free (retval);
+
+  if (colors)
+    *colors = NULL;
+  if (n_colors)
+    *n_colors = 0;
+
+  return FALSE;
+}
+
+/**
+ * gtk_color_selection_palette_to_string:
+ * @colors: an array of colors
+ * @n_colors: length of the array
+ * 
+ * Encodes a palette as a string, useful for persistent storage.
+ * 
+ * Return value: allocated string encoding the palette
+ **/
+gchar*
+gtk_color_selection_palette_to_string (const GdkColor *colors,
+                                       gint            n_colors)
+{
+  gint i;
+  gchar **strs = NULL;
+  gchar *retval;
+  
+  if (n_colors == 0)
+    return g_strdup ("");
+
+  strs = g_new0 (gchar*, n_colors + 1);
+
+  i = 0;
+  while (i < n_colors)
+    {
+      gchar *ptr;
+      
+      strs[i] =
+        g_strdup_printf ("#%2X%2X%2X",
+                         colors[i].red / 256,
+                         colors[i].green / 256,
+                         colors[i].blue / 256);
+
+      for (ptr = strs[i]; *ptr; ptr++)
+        if (*ptr == ' ')
+          *ptr = '0';
+      
+      ++i;
+    }
+
+  retval = g_strjoinv (":", strs);
+
+  g_strfreev (strs);
+
+  return retval;
+}
+
+/**
+ * gtk_color_selection_set_change_palette_hook:
+ * @func: a function to call when the custom palette needs saving
+ * 
+ * Installs a global function to be called whenever the user tries to
+ * modify the palette in a color selection. This function should save
+ * the new palette contents, and update the GtkSettings property
+ * "gtk-color-palette" so all GtkColorSelection widgets will be modified.
+ * 
+ * Return value: the previous change palette hook (that was replaced)
+ **/
+GtkColorSelectionChangePaletteFunc
+gtk_color_selection_set_change_palette_hook (GtkColorSelectionChangePaletteFunc func)
+{
+  GtkColorSelectionChangePaletteFunc old;
+
+  old = change_palette_hook;
+
+  change_palette_hook = func;
+
+  return old;
+}
+
+
+