]> Pileus Git - ~andy/gtk/blobdiff - gtk/gtksettings.c
Updated Bulgarian translation by Alexander Shopov <ash@contact.bg>
[~andy/gtk] / gtk / gtksettings.c
index 07f272ccc9f55fc7659f2b73fcaabf46e70a918d..ad93c671e5f707bd1f0530dfed8f6f4140a26e41 100644 (file)
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
+#include <config.h>
+
+#include <string.h>
+
+#include "gtkmodules.h"
 #include "gtksettings.h"
 #include "gtkrc.h"
 #include "gtkintl.h"
 #include "gtkwidget.h"
+#include "gtkprivate.h"
+#include "gtkalias.h"
+
+#ifdef GDK_WINDOWING_X11
+#include "x11/gdkx.h"
+#endif
+
+#define DEFAULT_TIMEOUT_INITIAL 200
+#define DEFAULT_TIMEOUT_REPEAT   20
+#define DEFAULT_TIMEOUT_EXPAND  500
 
 typedef struct _GtkSettingsValuePrivate GtkSettingsValuePrivate;
 
+typedef enum
+{
+  GTK_SETTINGS_SOURCE_DEFAULT,
+  GTK_SETTINGS_SOURCE_RC_FILE,
+  GTK_SETTINGS_SOURCE_XSETTING,
+  GTK_SETTINGS_SOURCE_APPLICATION
+} GtkSettingsSource;
+
 struct _GtkSettingsValuePrivate
 {
   GtkSettingsValue public;
-  guint from_rc : 1;
+  GtkSettingsSource source;
 };
 
 struct _GtkSettingsPropertyValue
 {
   GValue value;
-  guint from_rc : 1;
+  GtkSettingsSource source;
 };
 
 enum {
   PROP_0,
   PROP_DOUBLE_CLICK_TIME,
+  PROP_DOUBLE_CLICK_DISTANCE,
   PROP_CURSOR_BLINK,
   PROP_CURSOR_BLINK_TIME,
   PROP_SPLIT_CURSOR,
   PROP_THEME_NAME,
+  PROP_ICON_THEME_NAME,
+  PROP_FALLBACK_ICON_THEME,
   PROP_KEY_THEME_NAME,
   PROP_MENU_BAR_ACCEL,
   PROP_DND_DRAG_THRESHOLD,
   PROP_FONT_NAME,
-  PROP_ICON_SIZES
+  PROP_ICON_SIZES,
+  PROP_MODULES,
+#ifdef GDK_WINDOWING_X11
+  PROP_XFT_ANTIALIAS,
+  PROP_XFT_HINTING,
+  PROP_XFT_HINTSTYLE,
+  PROP_XFT_RGBA,
+  PROP_XFT_DPI,
+  PROP_CURSOR_THEME_NAME,
+  PROP_CURSOR_THEME_SIZE,
+#endif
+  PROP_ALTERNATIVE_BUTTON_ORDER,
+  PROP_SHOW_INPUT_METHOD_MENU,
+  PROP_SHOW_UNICODE_MENU,
+  PROP_TIMEOUT_INITIAL,
+  PROP_TIMEOUT_REPEAT,
+  PROP_TIMEOUT_EXPAND,
+  PROP_COLOR_SCHEME,
+  PROP_ENABLE_ANIMATIONS,
+  PROP_TOUCHSCREEN_MODE,
+  PROP_COLOR_HASH
 };
 
 
 /* --- prototypes --- */
-static void    gtk_settings_init                (GtkSettings           *settings);
-static void    gtk_settings_class_init          (GtkSettingsClass      *class);
 static void    gtk_settings_finalize            (GObject               *object);
 static void    gtk_settings_get_property        (GObject               *object,
                                                  guint                  property_id,
@@ -67,43 +111,32 @@ static void        gtk_settings_notify              (GObject               *object,
 static guint   settings_install_property_parser (GtkSettingsClass      *class,
                                                  GParamSpec            *pspec,
                                                  GtkRcPropertyParser    parser);
+static void    settings_update_double_click      (GtkSettings           *settings);
+static void    settings_update_modules           (GtkSettings           *settings);
+
+#ifdef GDK_WINDOWING_X11
+static void    settings_update_cursor_theme      (GtkSettings           *settings);
+static void    settings_update_resolution        (GtkSettings           *settings);
+static void    settings_update_font_options      (GtkSettings           *settings);
+#endif
+static void    settings_update_color_scheme      (GtkSettings *settings);
+
+static void    merge_color_scheme                (GtkSettings           *settings, 
+                                                 GValue                *value, 
+                                                 GtkSettingsSource      source);
+static gchar  *get_color_scheme                  (GtkSettings           *settings);
+static GHashTable *get_color_hash                (GtkSettings           *settings);
 
 
 /* --- variables --- */
-static gpointer                 parent_class = NULL;
 static GQuark           quark_property_parser = 0;
 static GSList           *object_list = NULL;
 static guint            class_n_properties = 0;
 
 
-/* --- functions --- */
-GType
-gtk_settings_get_type (void)
-{
-  static GType settings_type = 0;
-  
-  if (!settings_type)
-    {
-      static const GTypeInfo settings_info =
-      {
-       sizeof (GtkSettingsClass),
-       NULL,           /* base_init */
-       NULL,           /* base_finalize */
-       (GClassInitFunc) gtk_settings_class_init,
-       NULL,           /* class_finalize */
-       NULL,           /* class_data */
-       sizeof (GtkSettings),
-       0,              /* n_preallocs */
-       (GInstanceInitFunc) gtk_settings_init,
-      };
-      
-      settings_type = g_type_register_static (G_TYPE_OBJECT, "GtkSettings",
-                                             &settings_info, 0);
-    }
-  
-  return settings_type;
-}
+G_DEFINE_TYPE (GtkSettings, gtk_settings, G_TYPE_OBJECT)
 
+/* --- functions --- */
 static void
 gtk_settings_init (GtkSettings *settings)
 {
@@ -133,7 +166,7 @@ gtk_settings_init (GtkSettings *settings)
       g_value_init (&settings->property_values[i].value, G_PARAM_SPEC_VALUE_TYPE (pspec));
       g_param_value_set_default (pspec, &settings->property_values[i].value);
       g_object_notify (G_OBJECT (settings), pspec->name);
-      settings->property_values[i].from_rc = FALSE;
+      settings->property_values[i].source = GTK_SETTINGS_SOURCE_DEFAULT;
       i++;
     }
   g_object_thaw_notify (G_OBJECT (settings));
@@ -146,99 +179,337 @@ gtk_settings_class_init (GtkSettingsClass *class)
   GObjectClass *gobject_class = G_OBJECT_CLASS (class);
   guint result;
   
-  parent_class = g_type_class_peek_parent (class);
-
   gobject_class->finalize = gtk_settings_finalize;
   gobject_class->get_property = gtk_settings_get_property;
   gobject_class->set_property = gtk_settings_set_property;
   gobject_class->notify = gtk_settings_notify;
 
   quark_property_parser = g_quark_from_static_string ("gtk-rc-property-parser");
-
   result = settings_install_property_parser (class,
                                              g_param_spec_int ("gtk-double-click-time",
-                                                               _("Double Click Time"),
-                                                               _("Maximum time allowed between two clicks for them to be considered a double click (in milliseconds)"),
+                                                               P_("Double Click Time"),
+                                                               P_("Maximum time allowed between two clicks for them to be considered a double click (in milliseconds)"),
                                                                0, G_MAXINT, 250,
-                                                               G_PARAM_READWRITE),
+                                                               GTK_PARAM_READWRITE),
                                              NULL);
   g_assert (result == PROP_DOUBLE_CLICK_TIME);
+  result = settings_install_property_parser (class,
+                                             g_param_spec_int ("gtk-double-click-distance",
+                                                               P_("Double Click Distance"),
+                                                               P_("Maximum distance allowed between two clicks for them to be considered a double click (in pixels)"),
+                                                               0, G_MAXINT, 5,
+                                                               GTK_PARAM_READWRITE),
+                                             NULL);
+  g_assert (result == PROP_DOUBLE_CLICK_DISTANCE);
   result = settings_install_property_parser (class,
                                              g_param_spec_boolean ("gtk-cursor-blink",
-                                                                  _("Cursor Blink"),
-                                                                  _("Whether the cursor should blink"),
+                                                                  P_("Cursor Blink"),
+                                                                  P_("Whether the cursor should blink"),
                                                                   TRUE,
-                                                                  G_PARAM_READWRITE),
+                                                                  GTK_PARAM_READWRITE),
                                             NULL);
   g_assert (result == PROP_CURSOR_BLINK);
   result = settings_install_property_parser (class,
                                              g_param_spec_int ("gtk-cursor-blink-time",
-                                                               _("Cursor Blink Time"),
-                                                               _("Length of the cursor blink cycle, in milleseconds"),
+                                                               P_("Cursor Blink Time"),
+                                                               P_("Length of the cursor blink cycle, in milleseconds"),
                                                                100, G_MAXINT, 1200,
-                                                               G_PARAM_READWRITE),
+                                                               GTK_PARAM_READWRITE),
                                              NULL);
   g_assert (result == PROP_CURSOR_BLINK_TIME);
   result = settings_install_property_parser (class,
                                              g_param_spec_boolean ("gtk-split-cursor",
-                                                                  _("Split Cursor"),
-                                                                  _("Whether two cursors should be displayed for mixed left-to-right and right-to-left text"),
+                                                                  P_("Split Cursor"),
+                                                                  P_("Whether two cursors should be displayed for mixed left-to-right and right-to-left text"),
                                                                   TRUE,
-                                                                  G_PARAM_READWRITE),
+                                                                  GTK_PARAM_READWRITE),
                                              NULL);
   g_assert (result == PROP_SPLIT_CURSOR);
   result = settings_install_property_parser (class,
                                              g_param_spec_string ("gtk-theme-name",
-                                                                  _("Theme Name"),
-                                                                  _("Name of theme RC file to load"),
-                                                                 "Default",
-                                                                 G_PARAM_READWRITE),
+                                                                  P_("Theme Name"),
+                                                                  P_("Name of theme RC file to load"),
+                                                                 "Raleigh",
+                                                                 GTK_PARAM_READWRITE),
                                              NULL);
   g_assert (result == PROP_THEME_NAME);
+
+  result = settings_install_property_parser (class,
+                                             g_param_spec_string ("gtk-icon-theme-name",
+                                                                 P_("Icon Theme Name"),
+                                                                 P_("Name of icon theme to use"),
+                                                                 "hicolor",
+                                                                 GTK_PARAM_READWRITE),
+                                             NULL);
+  g_assert (result == PROP_ICON_THEME_NAME);
+
+  result = settings_install_property_parser (class,
+                                             g_param_spec_string ("gtk-fallback-icon-theme",
+                                                                 P_("Fallback Icon Theme Name"),
+                                                                 P_("Name of a icon theme to fall back to"),
+                                                                 NULL,
+                                                                 GTK_PARAM_READWRITE),
+                                             NULL);
+  g_assert (result == PROP_FALLBACK_ICON_THEME);
+  
   result = settings_install_property_parser (class,
                                              g_param_spec_string ("gtk-key-theme-name",
-                                                                 _("Key Theme Name"),
-                                                                 _("Name of key theme RC file to load"),
+                                                                 P_("Key Theme Name"),
+                                                                 P_("Name of key theme RC file to load"),
                                                                  NULL,
-                                                                 G_PARAM_READWRITE),
+                                                                 GTK_PARAM_READWRITE),
                                              NULL);
   g_assert (result == PROP_KEY_THEME_NAME);    
 
   result = settings_install_property_parser (class,
                                              g_param_spec_string ("gtk-menu-bar-accel",
-                                                                  _("Menu bar accelerator"),
-                                                                  _("Keybinding to activate the menu bar"),
+                                                                  P_("Menu bar accelerator"),
+                                                                  P_("Keybinding to activate the menu bar"),
                                                                   "F10",
-                                                                  G_PARAM_READWRITE),
+                                                                  GTK_PARAM_READWRITE),
                                              NULL);
   g_assert (result == PROP_MENU_BAR_ACCEL);
 
   result = settings_install_property_parser (class,
                                             g_param_spec_int ("gtk-dnd-drag-threshold",
-                                                              _("Drag threshold"),
-                                                              _("Number of pixels the cursor can move before dragging"),
+                                                              P_("Drag threshold"),
+                                                              P_("Number of pixels the cursor can move before dragging"),
                                                               1, G_MAXINT, 8,
-                                                               G_PARAM_READWRITE),
+                                                               GTK_PARAM_READWRITE),
                                             NULL);
   g_assert (result == PROP_DND_DRAG_THRESHOLD);
 
   result = settings_install_property_parser (class,
                                              g_param_spec_string ("gtk-font-name",
-                                                                  _("Font Name"),
-                                                                  _("Name of default font to use"),
+                                                                  P_("Font Name"),
+                                                                  P_("Name of default font to use"),
                                                                  "Sans 10",
-                                                                 G_PARAM_READWRITE),
+                                                                 GTK_PARAM_READWRITE),
                                              NULL);
   g_assert (result == PROP_FONT_NAME);
 
   result = settings_install_property_parser (class,
                                              g_param_spec_string ("gtk-icon-sizes",
-                                                                  _("Icon Sizes"),
-                                                                  _("List of icon sizes (gtk-menu=16,16;gtk-button=20,20..."),
+                                                                  P_("Icon Sizes"),
+                                                                  P_("List of icon sizes (gtk-menu=16,16:gtk-button=20,20..."),
                                                                  NULL,
-                                                                 G_PARAM_READWRITE),
+                                                                 GTK_PARAM_READWRITE),
                                              NULL);
   g_assert (result == PROP_ICON_SIZES);
+
+  result = settings_install_property_parser (class,
+                                             g_param_spec_string ("gtk-modules",
+                                                                 P_("GTK Modules"),
+                                                                 P_("List of currently active GTK modules"),
+                                                                 NULL,
+                                                                 GTK_PARAM_READWRITE),
+                                             NULL);
+  g_assert (result == PROP_MODULES);
+
+#ifdef GDK_WINDOWING_X11
+  result = settings_install_property_parser (class,
+                                            g_param_spec_int ("gtk-xft-antialias",
+                                                              P_("Xft Antialias"),
+                                                              P_("Whether to antialias Xft fonts; 0=no, 1=yes, -1=default"),
+                                                              -1, 1, -1,
+                                                              GTK_PARAM_READWRITE),
+                                            NULL);
+  g_assert (result == PROP_XFT_ANTIALIAS);
+  
+  result = settings_install_property_parser (class,
+                                            g_param_spec_int ("gtk-xft-hinting",
+                                                              P_("Xft Hinting"),
+                                                              P_("Whether to hint Xft fonts; 0=no, 1=yes, -1=default"),
+                                                              -1, 1, -1,
+                                                              GTK_PARAM_READWRITE),
+                                            NULL);
+  
+  g_assert (result == PROP_XFT_HINTING);
+  
+  result = settings_install_property_parser (class,
+                                            g_param_spec_string ("gtk-xft-hintstyle",
+                                                                 P_("Xft Hint Style"),
+                                                                 P_("What degree of hinting to use; hintnone, hintslight, hintmedium, or hintfull"),
+                                                                 NULL,
+                                                                 GTK_PARAM_READWRITE),
+                                              NULL);
+  
+  g_assert (result == PROP_XFT_HINTSTYLE);
+  
+  result = settings_install_property_parser (class,
+                                            g_param_spec_string ("gtk-xft-rgba",
+                                                                 P_("Xft RGBA"),
+                                                                 P_("Type of subpixel antialiasing; none, rgb, bgr, vrgb, vbgr"),
+                                                                 NULL,
+                                                                 GTK_PARAM_READWRITE),
+                                            NULL);
+  
+  g_assert (result == PROP_XFT_RGBA);
+  
+  result = settings_install_property_parser (class,
+                                            g_param_spec_int ("gtk-xft-dpi",
+                                                              P_("Xft DPI"),
+                                                              P_("Resolution for Xft, in 1024 * dots/inch. -1 to use default value"),
+                                                              -1, 1024*1024, -1,
+                                                              GTK_PARAM_READWRITE),
+                                            NULL);
+  
+  g_assert (result == PROP_XFT_DPI);
+
+  result = settings_install_property_parser (class,
+                                             g_param_spec_string ("gtk-cursor-theme-name",
+                                                                 P_("Cursor theme name"),
+                                                                 P_("Name of the cursor theme to use, or NULL to use the default theme"),
+                                                                 NULL,
+                                                                 GTK_PARAM_READWRITE),
+                                             NULL);
+  g_assert (result == PROP_CURSOR_THEME_NAME);
+
+  result = settings_install_property_parser (class,
+                                            g_param_spec_int ("gtk-cursor-theme-size",
+                                                              P_("Cursor theme size"),
+                                                              P_("Size to use for cursors, or 0 to use the default size"),
+                                                              0, 128, 0,
+                                                              GTK_PARAM_READWRITE),
+                                            NULL);
+  
+  g_assert (result == PROP_CURSOR_THEME_SIZE);
+
+#endif  /* GDK_WINDOWING_X11 */
+  result = settings_install_property_parser (class,
+                                             g_param_spec_boolean ("gtk-alternative-button-order",
+                                                                  P_("Alternative button order"),
+                                                                  P_("Whether buttons in dialogs should use the alternative button order"),
+                                                                  FALSE,
+                                                                  GTK_PARAM_READWRITE),
+                                             NULL);
+  g_assert (result == PROP_ALTERNATIVE_BUTTON_ORDER);
+
+  result = settings_install_property_parser (class,
+                                            g_param_spec_boolean ("gtk-show-input-method-menu",
+                                                                  P_("Show the 'Input Methods' menu"),
+                                                                  P_("Whether the context menus of entries and text views should offer to change the input method"),
+                                                                  TRUE,
+                                                                  GTK_PARAM_READWRITE),
+                                            NULL);
+  g_assert (result == PROP_SHOW_INPUT_METHOD_MENU);
+
+  result = settings_install_property_parser (class,
+                                            g_param_spec_boolean ("gtk-show-unicode-menu",
+                                                                  P_("Show the 'Insert Unicode Control Character' menu"),
+                                                                  P_("Whether the context menus of entries and text views should offer to insert control characters"),
+                                                                  TRUE,
+                                                                  GTK_PARAM_READWRITE),
+                                            NULL);
+  g_assert (result == PROP_SHOW_UNICODE_MENU);
+
+  result = settings_install_property_parser (class,
+                                            g_param_spec_int ("gtk-timeout-initial",
+                                                              P_("Start timeout"),
+                                                              P_("Starting value for timeouts, when button is pressed"),
+                                                              0, G_MAXINT, DEFAULT_TIMEOUT_INITIAL,
+                                                              GTK_PARAM_READWRITE),
+                                            NULL);
+
+  g_assert (result == PROP_TIMEOUT_INITIAL);
+
+  result = settings_install_property_parser (class,
+                                            g_param_spec_int ("gtk-timeout-repeat",
+                                                              P_("Repeat timeout"),
+                                                              P_("Repeat value for timeouts, when button is pressed"),
+                                                              0, G_MAXINT, DEFAULT_TIMEOUT_REPEAT,
+                                                              GTK_PARAM_READWRITE),
+                                            NULL);
+
+  g_assert (result == PROP_TIMEOUT_REPEAT);
+
+  result = settings_install_property_parser (class,
+                                            g_param_spec_int ("gtk-timeout-expand",
+                                                              P_("Expand timeout"),
+                                                              P_("Expand value for timeouts, when a widget is expanding a new region"),
+                                                              0, G_MAXINT, DEFAULT_TIMEOUT_EXPAND,
+                                                              GTK_PARAM_READWRITE),
+                                            NULL);
+
+  g_assert (result == PROP_TIMEOUT_EXPAND);
+
+  /**
+   * GtkSettings:gtk-color-scheme:
+   *
+   * A palette of named colors for use in themes. The format of the string is
+   * <programlisting>
+   * name1: color1
+   * name2: color2
+   * ...
+   * </programlisting>
+   * Color names must be acceptable as identifiers in the 
+   * <link linkend="gtk-Resource-Files">gtkrc</link> syntax, and
+   * color specifications must be in the format accepted by
+   * gdk_color_parse().
+   * 
+   * Note that due to the way the color tables from different sources are
+   * merged, color specifications will be converted to hexadecimal form
+   * when getting this property.
+   *
+   * Since: 2.10
+   */
+  result = settings_install_property_parser (class,
+                                            g_param_spec_string ("gtk-color-scheme",
+                                                                 P_("Color scheme"),
+                                                                 P_("A palette of named colors for use in themes"),
+                                                                 "",
+                                                                 GTK_PARAM_READWRITE),
+                                            NULL);
+
+  g_assert (result == PROP_COLOR_SCHEME);
+
+  result = settings_install_property_parser (class,
+                                             g_param_spec_boolean ("gtk-enable-animations",
+                                                                   P_("Enable Animations"),
+                                                                   P_("Whether to enable toolkit-wide animations."),
+                                                                   TRUE,
+                                                                   GTK_PARAM_READWRITE),
+                                             NULL);
+
+  g_assert (result == PROP_ENABLE_ANIMATIONS);
+
+  /**
+   * GtkSettings:gtk-touchscreen-mode:
+   *
+   * When TRUE, there are no motion notify events delivered on this screen,
+   * and widgets can't use the pointer hovering them for any essential
+   * functionality.
+   *
+   * Since: 2.10
+   */
+  result = settings_install_property_parser (class,
+                                             g_param_spec_boolean ("gtk-touchscreen-mode",
+                                                                   P_("Enable Touchscreen Mode"),
+                                                                   P_("When TRUE, there are no motion notify events delivered on this screen"),
+                                                                   FALSE,
+                                                                   GTK_PARAM_READWRITE),
+                                             NULL);
+
+  g_assert (result == PROP_TOUCHSCREEN_MODE);
+
+  /**
+   * GtkSettings:color-hash:
+   *
+   * Holds a hash table representation of the gtk-color-scheme setting,
+   * mapping color names to #GdkColor<!-- -->s. 
+   *
+   * Since: 2.10
+   */
+  g_object_class_install_property (gobject_class,
+                                  PROP_COLOR_HASH,
+                                  g_param_spec_boxed ("color-hash",
+                                                      P_("Color Hash"),
+                                                      P_("A hash table representation of the color scheme."),
+                                                      G_TYPE_HASH_TABLE,
+                                                      GTK_PARAM_READABLE));
+
+  class_n_properties++;
 }
 
 static void
@@ -249,13 +520,15 @@ gtk_settings_finalize (GObject *object)
 
   object_list = g_slist_remove (object_list, settings);
 
+  _gtk_rc_context_destroy (settings);
+
   for (i = 0; i < class_n_properties; i++)
     g_value_unset (&settings->property_values[i].value);
   g_free (settings->property_values);
-
+  
   g_datalist_clear (&settings->queued_settings);
 
-  G_OBJECT_CLASS (parent_class)->finalize (object);
+  G_OBJECT_CLASS (gtk_settings_parent_class)->finalize (object);
 }
 
 /**
@@ -265,6 +538,8 @@ gtk_settings_finalize (GObject *object)
  * Gets the #GtkSettings object for @screen, creating it if necessary.
  *
  * Return value: a #GtkSettings object.
+ *
+ * Since: 2.2
  */
 GtkSettings*
 gtk_settings_get_for_screen (GdkScreen *screen)
@@ -278,8 +553,17 @@ gtk_settings_get_for_screen (GdkScreen *screen)
     {
       settings = g_object_new (GTK_TYPE_SETTINGS, NULL);
       settings->screen = screen;
-      g_object_set_data (G_OBJECT (screen), "gtk-settings", settings); 
+      g_object_set_data_full (G_OBJECT (screen), I_("gtk-settings"), 
+                             settings, g_object_unref);
+
       gtk_rc_reparse_all_for_settings (settings, TRUE);
+      settings_update_double_click (settings);
+#ifdef GDK_WINDOWING_X11
+      settings_update_cursor_theme (settings);
+      settings_update_resolution (settings);
+      settings_update_font_options (settings);
+#endif
+      settings_update_color_scheme (settings);
     }
   
   return settings;
@@ -312,8 +596,9 @@ gtk_settings_set_property (GObject      *object,
                           GParamSpec   *pspec)
 {
   GtkSettings *settings = GTK_SETTINGS (object);
-  
+
   g_value_copy (value, &settings->property_values[property_id - 1].value);
+  settings->property_values[property_id - 1].source = GTK_SETTINGS_SOURCE_APPLICATION;
 }
 
 static void
@@ -326,6 +611,12 @@ gtk_settings_get_property (GObject     *object,
   GType value_type = G_VALUE_TYPE (value);
   GType fundamental_type = G_TYPE_FUNDAMENTAL (value_type);
 
+  if (property_id == PROP_COLOR_HASH)
+    {
+      g_value_set_boxed (value, get_color_hash (settings));
+      return;
+    }
+
   /* For enums and strings, we need to get the value as a string,
    * not as an int, since we support using names/nicks as the setting
    * value.
@@ -335,10 +626,19 @@ gtk_settings_get_property (GObject     *object,
       g_value_type_transformable (G_TYPE_STRING, G_VALUE_TYPE (value)) ||
       g_value_type_transformable (GDK_TYPE_COLOR, G_VALUE_TYPE (value)))
     {
-      if (gdk_screen_get_setting (settings->screen, pspec->name, value))
-        g_param_value_validate (pspec, value);
-      else
+      if (settings->property_values[property_id - 1].source == GTK_SETTINGS_SOURCE_APPLICATION ||
+         !gdk_screen_get_setting (settings->screen, pspec->name, value))
         g_value_copy (&settings->property_values[property_id - 1].value, value);
+      else 
+       {
+         if (pspec->param_id == PROP_COLOR_SCHEME)
+           {
+             merge_color_scheme (settings, value, GTK_SETTINGS_SOURCE_XSETTING);
+             g_value_take_string (value, get_color_scheme (settings));
+           }
+         
+         g_param_value_validate (pspec, value);
+       }
     }
   else
     {
@@ -348,7 +648,8 @@ gtk_settings_get_property (GObject     *object,
       
       g_value_init (&val, G_TYPE_STRING);
 
-      if (!gdk_screen_get_setting (settings->screen, pspec->name, &val))
+      if (settings->property_values[property_id - 1].source == GTK_SETTINGS_SOURCE_APPLICATION ||
+         !gdk_screen_get_setting (settings->screen, pspec->name, &val))
         {
           g_value_copy (&settings->property_values[property_id - 1].value, value);
         }
@@ -359,9 +660,8 @@ gtk_settings_get_property (GObject     *object,
           GtkRcPropertyParser parser = (GtkRcPropertyParser) g_param_spec_get_qdata (pspec, quark_property_parser);
           
           g_value_init (&gstring_value, G_TYPE_GSTRING);
-
-          g_value_set_boxed (&gstring_value,
-                             g_string_new (g_value_get_string (&val)));
+          g_value_take_boxed (&gstring_value,
+                              g_string_new (g_value_get_string (&val)));
 
           g_value_init (&tmp_value, G_PARAM_SPEC_VALUE_TYPE (pspec));
 
@@ -390,23 +690,43 @@ gtk_settings_notify (GObject    *object,
 {
   GtkSettings *settings = GTK_SETTINGS (object);
   guint property_id = pspec->param_id;
-  gint double_click_time;
 
   if (settings->screen == NULL) /* initialization */
     return;
 
   switch (property_id)
     {
+    case PROP_MODULES:
+      settings_update_modules (settings);
+      break;
     case PROP_DOUBLE_CLICK_TIME:
-      {
-       GdkDisplay *display;
-       
-       g_object_get (object, pspec->name, &double_click_time, NULL);
-       display = gdk_screen_get_display (settings->screen);
-       if (settings->screen == gdk_display_get_screen (display, 0))
-         gdk_display_set_double_click_time (display, double_click_time);
-       break;
-      }
+    case PROP_DOUBLE_CLICK_DISTANCE:
+      settings_update_double_click (settings);
+      break;
+    case PROP_COLOR_SCHEME:
+      settings_update_color_scheme (settings);
+      break;
+#ifdef GDK_WINDOWING_X11
+    case PROP_XFT_DPI:
+      settings_update_resolution (settings);
+      /* This is a hack because with gtk_rc_reset_styles() doesn't get
+       * widgets with gtk_widget_style_set(), and also causes more
+       * recomputation than necessary.
+       */
+      gtk_rc_reset_styles (GTK_SETTINGS (object));
+      break;
+    case PROP_XFT_ANTIALIAS:
+    case PROP_XFT_HINTING:
+    case PROP_XFT_HINTSTYLE:
+    case PROP_XFT_RGBA:
+      settings_update_font_options (settings);
+      gtk_rc_reset_styles (GTK_SETTINGS (object));
+      break;
+    case PROP_CURSOR_THEME_NAME:
+    case PROP_CURSOR_THEME_SIZE:
+      settings_update_cursor_theme (settings);
+      break;
+#endif /* GDK_WINDOWING_X11 */
     }
 }
 
@@ -432,12 +752,12 @@ _gtk_settings_parse_convert (GtkRcPropertyParser parser,
        }
       else if (G_VALUE_HOLDS_LONG (src_value))
        {
-         gstring = g_string_new ("");
+         gstring = g_string_new (NULL);
          g_string_append_printf (gstring, "%ld", g_value_get_long (src_value));
        }
       else if (G_VALUE_HOLDS_DOUBLE (src_value))
        {
-         gstring = g_string_new ("");
+         gstring = g_string_new (NULL);
          g_string_append_printf (gstring, "%f", g_value_get_double (src_value));
        }
       else if (G_VALUE_HOLDS_STRING (src_value))
@@ -489,15 +809,25 @@ apply_queued_setting (GtkSettings             *data,
   if (_gtk_settings_parse_convert (parser, &qvalue->public.value,
                                   pspec, &tmp_value))
     {
-      data->property_values[pspec->param_id - 1].from_rc = qvalue->from_rc;
-      g_object_set_property (G_OBJECT (data), pspec->name, &tmp_value);
+      if (pspec->param_id == PROP_COLOR_SCHEME) 
+       {
+         merge_color_scheme (data, &tmp_value, qvalue->source);
+         g_object_set_property (G_OBJECT (data), pspec->name, &tmp_value);
+         data->property_values[pspec->param_id - 1].source = GTK_SETTINGS_SOURCE_DEFAULT;
+       }      
+      
+      else if (data->property_values[pspec->param_id - 1].source <= qvalue->source)
+       {
+         g_object_set_property (G_OBJECT (data), pspec->name, &tmp_value);
+         data->property_values[pspec->param_id - 1].source = qvalue->source;
+       }
     }
   else
     {
       gchar *debug = g_strdup_value_contents (&qvalue->public.value);
       
       g_message ("%s: failed to retrieve property `%s' of type `%s' from rc file value \"%s\" of type `%s'",
-                qvalue->public.origin,
+                qvalue->public.origin ? qvalue->public.origin : "(for origin information, set GTK_DEBUG)",
                 pspec->name,
                 g_type_name (G_PARAM_SPEC_VALUE_TYPE (pspec)),
                 debug,
@@ -557,7 +887,7 @@ settings_install_property_parser (GtkSettingsClass   *class,
       settings->property_values[class_n_properties - 1].value.g_type = 0;
       g_value_init (&settings->property_values[class_n_properties - 1].value, G_PARAM_SPEC_VALUE_TYPE (pspec));
       g_param_value_set_default (pspec, &settings->property_values[class_n_properties - 1].value);
-      settings->property_values[class_n_properties - 1].from_rc = FALSE;
+      settings->property_values[class_n_properties - 1].source = GTK_SETTINGS_SOURCE_DEFAULT;
       g_object_notify (G_OBJECT (settings), pspec->name);
       
       qvalue = g_datalist_get_data (&settings->queued_settings, pspec->name);
@@ -627,7 +957,7 @@ static void
 gtk_settings_set_property_value_internal (GtkSettings            *settings,
                                          const gchar            *prop_name,
                                          const GtkSettingsValue *new_value,
-                                         gboolean                from_rc)
+                                         GtkSettingsSource       source)
 {
   GtkSettingsValuePrivate *qvalue;
   GParamSpec *pspec;
@@ -644,7 +974,7 @@ gtk_settings_set_property_value_internal (GtkSettings            *settings,
     }
   
   name = g_strdup (prop_name);
-  g_strcanon (name, G_CSET_A_2_Z G_CSET_a_2_z G_CSET_DIGITS "-", '-');
+  g_strcanon (name, G_CSET_DIGITS "-" G_CSET_a_2_z G_CSET_A_2_Z, '-');
   name_quark = g_quark_from_string (name);
   g_free (name);
 
@@ -662,7 +992,7 @@ gtk_settings_set_property_value_internal (GtkSettings            *settings,
   qvalue->public.origin = g_strdup (new_value->origin);
   g_value_init (&qvalue->public.value, G_VALUE_TYPE (&new_value->value));
   g_value_copy (&new_value->value, &qvalue->public.value);
-  qvalue->from_rc = from_rc;
+  qvalue->source = source;
   pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (settings), g_quark_to_string (name_quark));
   if (pspec)
     apply_queued_setting (settings, pspec, qvalue);
@@ -676,9 +1006,9 @@ gtk_settings_set_property_value (GtkSettings            *settings,
   g_return_if_fail (GTK_SETTINGS (settings));
   g_return_if_fail (prop_name != NULL);
   g_return_if_fail (new_value != NULL);
-  g_return_if_fail (new_value->origin != NULL);
 
-  gtk_settings_set_property_value_internal (settings, prop_name, new_value, FALSE);
+  gtk_settings_set_property_value_internal (settings, prop_name, new_value,
+                                           GTK_SETTINGS_SOURCE_APPLICATION);
 }
 
 void
@@ -689,9 +1019,9 @@ _gtk_settings_set_property_value_from_rc (GtkSettings            *settings,
   g_return_if_fail (GTK_SETTINGS (settings));
   g_return_if_fail (prop_name != NULL);
   g_return_if_fail (new_value != NULL);
-  g_return_if_fail (new_value->origin != NULL);
 
-  gtk_settings_set_property_value_internal (settings, prop_name, new_value, TRUE);
+  gtk_settings_set_property_value_internal (settings, prop_name, new_value,
+                                           GTK_SETTINGS_SOURCE_RC_FILE);
 }
 
 void
@@ -705,7 +1035,6 @@ gtk_settings_set_string_property (GtkSettings *settings,
   g_return_if_fail (GTK_SETTINGS (settings));
   g_return_if_fail (name != NULL);
   g_return_if_fail (v_string != NULL);
-  g_return_if_fail (origin != NULL);
 
   svalue.origin = (gchar*) origin;
   g_value_init (&svalue.value, G_TYPE_STRING);
@@ -724,7 +1053,6 @@ gtk_settings_set_long_property (GtkSettings *settings,
   
   g_return_if_fail (GTK_SETTINGS (settings));
   g_return_if_fail (name != NULL);
-  g_return_if_fail (origin != NULL);
 
   svalue.origin = (gchar*) origin;
   g_value_init (&svalue.value, G_TYPE_LONG);
@@ -743,7 +1071,6 @@ gtk_settings_set_double_property (GtkSettings *settings,
 
   g_return_if_fail (GTK_SETTINGS (settings));
   g_return_if_fail (name != NULL);
-  g_return_if_fail (origin != NULL);
 
   svalue.origin = (gchar*) origin;
   g_value_init (&svalue.value, G_TYPE_DOUBLE);
@@ -752,6 +1079,22 @@ gtk_settings_set_double_property (GtkSettings *settings,
   g_value_unset (&svalue.value);
 }
 
+/**
+ * gtk_rc_property_parse_color:
+ * @pspec: a #GParamSpec
+ * @gstring: the #GString to be parsed
+ * @property_value: a #GValue which must hold #GdkColor values.
+ * 
+ * A #GtkRcPropertyParser for use with gtk_settings_install_property_parser()
+ * or gtk_widget_class_install_style_property_parser() which parses a
+ * color given either by its name or in the form 
+ * <literal>{ red, green, blue }</literal> where %red, %green and
+ * %blue are integers between 0 and 65535 or floating-point numbers
+ * between 0 and 1.
+ * 
+ * Return value: %TRUE if @gstring could be parsed and @property_value
+ * has been set to the resulting #GdkColor.
+ **/
 gboolean
 gtk_rc_property_parse_color (const GParamSpec *pspec,
                             const GString    *gstring,
@@ -779,6 +1122,23 @@ gtk_rc_property_parse_color (const GParamSpec *pspec,
   return success;
 }
 
+/**
+ * gtk_rc_property_parse_enum:
+ * @pspec: a #GParamSpec
+ * @gstring: the #GString to be parsed
+ * @property_value: a #GValue which must hold enum values.
+ * 
+ * A #GtkRcPropertyParser for use with gtk_settings_install_property_parser()
+ * or gtk_widget_class_install_style_property_parser() which parses a single
+ * enumeration value.
+ *
+ * The enumeration value can be specified by its name, its nickname or
+ * its numeric value. For consistency with flags parsing, the value
+ * may be surrounded by parentheses.
+ * 
+ * Return value: %TRUE if @gstring could be parsed and @property_value
+ * has been set to the resulting #GEnumValue.
+ **/
 gboolean
 gtk_rc_property_parse_enum (const GParamSpec *pspec,
                            const GString    *gstring,
@@ -795,7 +1155,7 @@ gtk_rc_property_parse_enum (const GParamSpec *pspec,
   g_scanner_input_text (scanner, gstring->str, gstring->len);
 
   /* we just want to parse _one_ value, but for consistency with flags parsing
-   * we support optional paranthesis
+   * we support optional parenthesis
    */
   g_scanner_get_next_token (scanner);
   if (scanner->token == '(')
@@ -858,13 +1218,29 @@ parse_flags_value (GScanner    *scanner,
   return G_TOKEN_IDENTIFIER;
 }
 
+/**
+ * gtk_rc_property_parse_flags:
+ * @pspec: a #GParamSpec
+ * @gstring: the #GString to be parsed
+ * @property_value: a #GValue which must hold flags values.
+ * 
+ * A #GtkRcPropertyParser for use with gtk_settings_install_property_parser()
+ * or gtk_widget_class_install_style_property_parser() which parses flags. 
+ * 
+ * Flags can be specified by their name, their nickname or
+ * numerically. Multiple flags can be specified in the form 
+ * <literal>"( flag1 | flag2 | ... )"</literal>.
+ * 
+ * Return value: %TRUE if @gstring could be parsed and @property_value
+ * has been set to the resulting flags value.
+ **/
 gboolean
 gtk_rc_property_parse_flags (const GParamSpec *pspec,
                             const GString    *gstring,
                             GValue           *property_value)
 {
   GFlagsClass *class;
-  gboolean success = FALSE;
+   gboolean success = FALSE;
   GScanner *scanner;
 
   g_return_val_if_fail (G_IS_PARAM_SPEC (pspec), FALSE);
@@ -948,6 +1324,20 @@ get_braced_int (GScanner *scanner,
   return TRUE;
 }
 
+/**
+ * gtk_rc_property_parse_requisition:
+ * @pspec: a #GParamSpec
+ * @gstring: the #GString to be parsed
+ * @property_value: a #GValue which must hold boxed values.
+ * 
+ * A #GtkRcPropertyParser for use with gtk_settings_install_property_parser()
+ * or gtk_widget_class_install_style_property_parser() which parses a
+ * requisition in the form 
+ * <literal>"{ width, height }"</literal> for integers %width and %height.
+ * 
+ * Return value: %TRUE if @gstring could be parsed and @property_value
+ * has been set to the resulting #GtkRequisition.
+ **/
 gboolean
 gtk_rc_property_parse_requisition  (const GParamSpec *pspec,
                                    const GString    *gstring,
@@ -975,6 +1365,21 @@ gtk_rc_property_parse_requisition  (const GParamSpec *pspec,
   return success;
 }
 
+/**
+ * gtk_rc_property_parse_border:
+ * @pspec: a #GParamSpec
+ * @gstring: the #GString to be parsed
+ * @property_value: a #GValue which must hold boxed values.
+ * 
+ * A #GtkRcPropertyParser for use with gtk_settings_install_property_parser()
+ * or gtk_widget_class_install_style_property_parser() which parses
+ * borders in the form 
+ * <literal>"{ left, right, top, bottom }"</literal> for integers 
+ * %left, %right, %top and %bottom.
+ * 
+ * Return value: %TRUE if @gstring could be parsed and @property_value
+ * has been set to the resulting #GtkBorder.
+ **/
 gboolean
 gtk_rc_property_parse_border (const GParamSpec *pspec,
                              const GString    *gstring,
@@ -1021,7 +1426,7 @@ reset_rc_values_foreach (GQuark    key_id,
   GtkSettingsValuePrivate *qvalue = data;
   GSList **to_reset = user_data;
 
-  if (qvalue->from_rc)
+  if (qvalue->source == GTK_SETTINGS_SOURCE_RC_FILE)
     *to_reset = g_slist_prepend (*to_reset, GUINT_TO_POINTER (key_id));
 }
 
@@ -1053,7 +1458,7 @@ _gtk_settings_reset_rc_values (GtkSettings *settings)
   g_object_freeze_notify (G_OBJECT (settings));
   for (p = pspecs; *p; p++)
     {
-      if (settings->property_values[i].from_rc)
+      if (settings->property_values[i].source == GTK_SETTINGS_SOURCE_RC_FILE)
        {
          GParamSpec *pspec = *p;
 
@@ -1066,3 +1471,331 @@ _gtk_settings_reset_rc_values (GtkSettings *settings)
   g_free (pspecs);
 }
 
+static void
+settings_update_double_click (GtkSettings *settings)
+{
+  if (gdk_screen_get_number (settings->screen) == 0)
+    {
+      GdkDisplay *display = gdk_screen_get_display (settings->screen);
+      gint double_click_time;
+      gint double_click_distance;
+  
+      g_object_get (settings, 
+                   "gtk-double-click-time", &double_click_time, 
+                   "gtk-double-click-distance", &double_click_distance,
+                   NULL);
+      
+      gdk_display_set_double_click_time (display, double_click_time);
+      gdk_display_set_double_click_distance (display, double_click_distance);
+    }
+}
+
+static void
+settings_update_modules (GtkSettings *settings)
+{
+  gchar *modules;
+  
+  g_object_get (settings, 
+               "gtk-modules", &modules,
+               NULL);
+  
+  _gtk_modules_settings_changed (settings, modules);
+  
+  g_free (modules);
+}
+
+#ifdef GDK_WINDOWING_X11
+static void
+settings_update_cursor_theme (GtkSettings *settings)
+{
+  GdkDisplay *display = gdk_screen_get_display (settings->screen);
+  gchar *theme = NULL;
+  gint size = 0;
+  
+  g_object_get (settings, 
+               "gtk-cursor-theme-name", &theme,
+               "gtk-cursor-theme-size", &size,
+               NULL);
+  
+  gdk_x11_display_set_cursor_theme (display, theme, size);
+
+  g_free (theme);
+}
+
+static void
+settings_update_font_options (GtkSettings *settings)
+{
+  gint hinting;
+  gchar *hint_style_str;
+  cairo_hint_style_t hint_style = CAIRO_HINT_STYLE_DEFAULT;
+  gint antialias;
+  cairo_antialias_t antialias_mode = CAIRO_ANTIALIAS_DEFAULT;
+  gchar *rgba_str;
+  cairo_subpixel_order_t subpixel_order = CAIRO_SUBPIXEL_ORDER_DEFAULT;
+  cairo_font_options_t *options;
+  
+  g_object_get (settings,
+               "gtk-xft-antialias", &antialias,
+               "gtk-xft-hinting", &hinting,
+               "gtk-xft-hintstyle", &hint_style_str,
+               "gtk-xft-rgba", &rgba_str,
+               NULL);
+
+  options = cairo_font_options_create ();
+  
+  /* hint_metrics = FALSE should never be set for user interface code.
+   */
+  cairo_font_options_set_hint_metrics (options, CAIRO_HINT_METRICS_ON);
+
+  if (hinting >= 0 && !hinting)
+    {
+      hint_style = CAIRO_HINT_STYLE_NONE;
+    }
+  else if (hint_style_str)
+    {
+      if (strcmp (hint_style_str, "hintnone") == 0)
+       hint_style = CAIRO_HINT_STYLE_NONE;
+      else if (strcmp (hint_style_str, "hintslight") == 0)
+       hint_style = CAIRO_HINT_STYLE_SLIGHT;
+      else if (strcmp (hint_style_str, "hintmedium") == 0)
+       hint_style = CAIRO_HINT_STYLE_MEDIUM;
+      else if (strcmp (hint_style_str, "hintfull") == 0)
+       hint_style = CAIRO_HINT_STYLE_FULL;
+    }
+
+  if (hint_style_str)
+    g_free (hint_style_str);
+
+  cairo_font_options_set_hint_style (options, hint_style);
+
+  if (rgba_str)
+    {
+      if (strcmp (rgba_str, "rgb") == 0)
+       subpixel_order = CAIRO_SUBPIXEL_ORDER_RGB;
+      else if (strcmp (rgba_str, "bgr") == 0)
+       subpixel_order = CAIRO_SUBPIXEL_ORDER_BGR;
+      else if (strcmp (rgba_str, "vrgb") == 0)
+       subpixel_order = CAIRO_SUBPIXEL_ORDER_VRGB;
+      else if (strcmp (rgba_str, "vbgr") == 0)
+       subpixel_order = CAIRO_SUBPIXEL_ORDER_VBGR;
+
+      g_free (rgba_str);
+    }
+
+  cairo_font_options_set_subpixel_order (options, subpixel_order);
+  
+  if (antialias >= 0 && !antialias)
+    antialias_mode = CAIRO_ANTIALIAS_NONE;
+  else if (subpixel_order != CAIRO_SUBPIXEL_ORDER_DEFAULT)
+    antialias_mode = CAIRO_ANTIALIAS_SUBPIXEL;
+  else if (antialias >= 0)
+    antialias_mode = CAIRO_ANTIALIAS_GRAY;
+  
+  cairo_font_options_set_antialias (options, antialias_mode);
+
+  gdk_screen_set_font_options (settings->screen, options);
+  
+  cairo_font_options_destroy (options);
+}
+
+static void
+settings_update_resolution (GtkSettings *settings)
+{
+  gint dpi_int;
+  double dpi;
+  
+  g_object_get (settings,
+               "gtk-xft-dpi", &dpi_int,
+               NULL);
+
+  if (dpi_int > 0)
+    dpi = dpi_int / 1024.;
+  else
+    dpi = -1.;
+
+  gdk_screen_set_resolution (settings->screen, dpi);
+}
+#endif
+
+static void
+settings_update_color_scheme (GtkSettings *settings)
+{
+  gchar *dummy;
+
+  g_object_get (settings, "gtk-color-scheme", &dummy, NULL);
+
+  /* nothing to do here, the color hash is updated as a
+   * side effect of getting the color scheme
+   */
+
+  g_free (dummy);  
+}
+
+
+typedef struct {
+  GHashTable *color_hash;
+  gchar *tables[GTK_SETTINGS_SOURCE_APPLICATION + 1];
+} ColorSchemeData;
+
+
+static gboolean
+update_color_hash (ColorSchemeData   *data,
+                  const gchar       *str, 
+                  GtkSettingsSource  source)
+{
+  gchar *copy, *s, *p, *name;
+  GdkColor color;
+  gboolean changed = FALSE;
+
+  if (data->tables[source] == NULL && str == NULL)
+    return FALSE;
+
+  if (data->tables[source] != NULL && str != NULL &&
+      strcmp (data->tables[source], str) == 0)
+    return FALSE;
+
+  g_free (data->tables[source]);
+  data->tables[source] = g_strdup (str);
+
+  copy = g_strdup (str);
+
+  s = copy;
+  while (s && *s)
+    {
+      name = s;
+      p = strchr (s, ':');
+      if (p)
+        {
+          *p = '\0';
+          p++;
+        }
+      else
+       break;
+
+      while (*p == ' ')
+        p++;
+
+      s = p;
+      while (*s) 
+       {
+         if (*s == '\n')
+           {
+             *s = '\0';
+             s++;
+             break;
+           }
+         s++;
+       }
+
+      if (gdk_color_parse (p, &color))
+       {
+         GdkColor *old;
+
+         old = g_hash_table_lookup (data->color_hash, name);
+         if (!old || 
+             (old->pixel <= source && !gdk_color_equal (old, &color)))
+           {
+             GdkColor *new;
+             
+             new = gdk_color_copy (&color);
+             new->pixel = source;
+  
+             g_hash_table_insert (data->color_hash, g_strdup (name), new);
+             changed = TRUE;
+           }
+       }
+    }
+
+  g_free (copy);
+
+  return changed;
+}
+
+static void
+color_scheme_data_free (ColorSchemeData *data)
+{
+  gint i;
+
+  g_hash_table_unref (data->color_hash);
+
+  for (i = 0; i <= GTK_SETTINGS_SOURCE_APPLICATION; i++)
+    g_free (data->tables[i]);
+
+  g_free (data);
+}
+
+static void
+merge_color_scheme (GtkSettings       *settings, 
+                   GValue            *value, 
+                   GtkSettingsSource  source)
+{
+  ColorSchemeData *data;
+  const gchar *colors;
+
+  colors = g_value_get_string (value);
+
+  data = (ColorSchemeData *) g_object_get_data (G_OBJECT (settings),
+                                                "gtk-color-scheme");
+  if (!data)
+    {
+      data = g_new0 (ColorSchemeData, 1);
+      data->color_hash = g_hash_table_new_full (g_str_hash, g_str_equal, g_free,
+                                               (GDestroyNotify) gdk_color_free);
+      g_object_set_data_full (G_OBJECT (settings), "gtk-color-scheme",
+                             data, (GDestroyNotify) color_scheme_data_free);
+    }
+  
+  if (update_color_hash (data, colors, source))
+    g_object_notify (G_OBJECT (settings), "color-hash");
+}
+
+static GHashTable *
+get_color_hash (GtkSettings *settings)
+{
+  ColorSchemeData *data;
+
+  if (!g_object_get_data (G_OBJECT (settings), "gtk-color-scheme"))
+    settings_update_color_scheme (settings);
+  
+  data = (ColorSchemeData *)g_object_get_data (G_OBJECT (settings), 
+                                              "gtk-color-scheme");
+
+  if (!data)
+    return NULL;
+
+  return data->color_hash;
+}
+
+static void 
+append_color_scheme (gpointer key,
+                    gpointer value,
+                    gpointer data)
+{
+  gchar *name = (gchar *)key;
+  GdkColor *color = (GdkColor *)value;
+  GString *string = (GString *)data;
+
+  g_string_append_printf (string, "%s: #%04x%04x%04x\n",
+                         name, color->red, color->green, color->blue);
+}
+
+static gchar *
+get_color_scheme (GtkSettings *settings)
+{
+  ColorSchemeData *data;
+  GString *string;
+  
+  data = (ColorSchemeData *) g_object_get_data (G_OBJECT (settings),
+                                               "gtk-color-scheme");
+
+  string = g_string_new ("");
+
+  g_hash_table_foreach (data->color_hash, append_color_scheme, string);
+
+  return g_string_free (string, FALSE);
+}
+
+
+#define __GTK_SETTINGS_C__
+#include "gtkaliasdef.c"