]> Pileus Git - ~andy/gtk/blobdiff - gtk/gtkrc.c
new default color scheme based on the GNOME stock icon palette. (#80691,
[~andy/gtk] / gtk / gtkrc.c
index 09d22a49b8a2f316e5f7d26bc0f74daf3b1d6e46..82700ebf47e1ee3db5c0222509b187a6fe231a00 100644 (file)
@@ -2,23 +2,23 @@
  * 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 "config.h"
 
-#include "gdkx.h"
-
-#if GDK_WINDOWING == GDK_WINDOWING_X11
-#include <X11/Xlocale.h>       /* so we get the right setlocale */
-#else
 #include <locale.h>
-#endif
-#include <ctype.h>
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
 #define lstat stat
 #endif
 
-#ifdef NATIVE_WIN32
-#include <io.h>
-#endif
+#include <glib.h>
+#include "gdkconfig.h"
 
+#include "gtkversion.h"
 #include "gtkrc.h"
 #include "gtkbindings.h"
 #include "gtkthemes.h"
 #include "gtkintl.h"
+#include "gtkiconfactory.h"
+#include "gtkmain.h"
+#include "gtkprivate.h"
+#include "gtksettings.h"
+#include "gtkwindow.h"
+
+#ifdef G_OS_WIN32
+#include <io.h>
+#endif
 
 typedef struct _GtkRcSet    GtkRcSet;
 typedef struct _GtkRcNode   GtkRcNode;
@@ -65,72 +67,136 @@ typedef struct _GtkRcFile   GtkRcFile;
 
 struct _GtkRcSet
 {
-  GtkPatternSpec pspec;
-  GtkRcStyle   *rc_style;
+  GPatternSpec *pspec;
+  GtkRcStyle *rc_style;
+  gint priority;
 };
 
 struct _GtkRcFile
 {
+  gboolean is_string;          /* If TRUE, name is a string to parse with gtk_rc_parse_string() */
   time_t mtime;
   gchar *name;
   gchar *canonical_name;
-  gboolean reload;
+  guint reload;
+};
+
+#define GTK_RC_MAX_PIXMAP_PATHS 128
+
+struct _GtkRcContext
+{
+  GHashTable *rc_style_ht;
+  GtkSettings *settings;
+  GSList *rc_sets_widget;
+  GSList *rc_sets_widget_class;
+  GSList *rc_sets_class;
+
+  /* The files we have parsed, to reread later if necessary */
+  GSList *rc_files;
+
+  gchar *theme_name;
+  gchar *key_theme_name;
+  gchar *font_name;
+  
+  gchar *pixmap_path[GTK_RC_MAX_PIXMAP_PATHS];
+
+  gint default_priority;
+  GtkStyle *default_style;
 };
 
-static guint      gtk_rc_style_hash               (const char   *name);
-static gint       gtk_rc_style_compare            (const char   *a,
-                                                   const char   *b);
-static guint      gtk_rc_styles_hash              (const GSList *rc_styles);
-static gint       gtk_rc_styles_compare           (const GSList *a,
-                                                   const GSList *b);
-static GtkRcStyle* gtk_rc_style_find              (const char   *name);
-static GSList *    gtk_rc_styles_match             (GSList       *rc_styles,
-                                                   GSList       *sets,
-                                                   guint         path_length,
-                                                   gchar        *path,
-                                                   gchar        *path_reversed);
-static GtkStyle *  gtk_rc_style_to_style           (GtkRcStyle   *rc_style);
-static GtkStyle*   gtk_rc_style_init              (GSList       *rc_styles);
-static void        gtk_rc_parse_file               (const gchar  *filename,
-                                                   gboolean      reload);
-
-static void       gtk_rc_parse_any                (const gchar  *input_name,
-                                                   gint          input_fd,
-                                                   const gchar  *input_string);
-static guint      gtk_rc_parse_statement          (GScanner     *scanner);
-static guint      gtk_rc_parse_style              (GScanner     *scanner);
-static guint      gtk_rc_parse_base               (GScanner     *scanner,
-                                                   GtkRcStyle   *style);
-static guint      gtk_rc_parse_bg                 (GScanner     *scanner,
-                                                   GtkRcStyle   *style);
-static guint      gtk_rc_parse_fg                 (GScanner     *scanner,
-                                                   GtkRcStyle   *style);
-static guint      gtk_rc_parse_text               (GScanner     *scanner,
-                                                   GtkRcStyle   *style);
-static guint      gtk_rc_parse_bg_pixmap          (GScanner     *scanner,
-                                                   GtkRcStyle   *rc_style);
-static guint      gtk_rc_parse_font               (GScanner     *scanner,
-                                                   GtkRcStyle   *rc_style);
-static guint      gtk_rc_parse_fontset            (GScanner     *scanner,
-                                                   GtkRcStyle   *rc_style);
-static guint      gtk_rc_parse_engine             (GScanner     *scanner,
-                                                   GtkRcStyle   *rc_style);
-static guint      gtk_rc_parse_pixmap_path        (GScanner     *scanner);
-static void       gtk_rc_parse_pixmap_path_string (gchar *pix_path);
-static guint      gtk_rc_parse_module_path        (GScanner     *scanner);
-static void       gtk_rc_parse_module_path_string (gchar *mod_path);
-static guint      gtk_rc_parse_path_pattern       (GScanner     *scanner);
-static void        gtk_rc_clear_hash_node          (gpointer   key, 
-                                                   gpointer   data, 
-                                                   gpointer   user_data);
-static void        gtk_rc_clear_styles               (void);
-static void        gtk_rc_append_default_pixmap_path (void);
-static void        gtk_rc_append_default_module_path (void);
-static void        gtk_rc_append_pixmap_path         (gchar *dir);
+static GtkRcContext *gtk_rc_context_get              (GtkSettings     *settings);
+
+static guint       gtk_rc_style_hash                 (const gchar     *name);
+static gboolean    gtk_rc_style_equal                (const gchar     *a,
+                                                      const gchar     *b);
+static guint       gtk_rc_styles_hash                (const GSList    *rc_styles);
+static gboolean    gtk_rc_styles_equal               (const GSList    *a,
+                                                      const GSList    *b);
+static GtkRcStyle* gtk_rc_style_find                 (GtkRcContext    *context,
+                                                     const gchar     *name);
+static GSList *    gtk_rc_styles_match               (GSList          *rc_styles,
+                                                      GSList          *sets,
+                                                      guint            path_length,
+                                                      const gchar     *path,
+                                                      const gchar     *path_reversed);
+static GtkStyle *  gtk_rc_style_to_style             (GtkRcContext    *context,
+                                                     GtkRcStyle      *rc_style);
+static GtkStyle*   gtk_rc_init_style                 (GtkRcContext    *context,
+                                                     GSList          *rc_styles);
+static void        gtk_rc_parse_default_files        (GtkRcContext    *context);
+static void        gtk_rc_parse_named                (GtkRcContext    *context,
+                                                     const gchar     *name,
+                                                     const gchar     *type);
+static void        gtk_rc_context_parse_file         (GtkRcContext    *context,
+                                                     const gchar     *filename,
+                                                     gint             priority,
+                                                      gboolean         reload);
+static void        gtk_rc_parse_any                  (GtkRcContext    *context,
+                                                     const gchar     *input_name,
+                                                      gint             input_fd,
+                                                      const gchar     *input_string);
+static guint       gtk_rc_parse_statement            (GtkRcContext    *context,
+                                                     GScanner        *scanner);
+static guint       gtk_rc_parse_style                (GtkRcContext    *context,
+                                                     GScanner        *scanner);
+static guint       gtk_rc_parse_assignment           (GScanner        *scanner,
+                                                     GtkRcProperty   *prop);
+static guint       gtk_rc_parse_bg                   (GScanner        *scanner,
+                                                      GtkRcStyle      *style);
+static guint       gtk_rc_parse_fg                   (GScanner        *scanner,
+                                                      GtkRcStyle      *style);
+static guint       gtk_rc_parse_text                 (GScanner        *scanner,
+                                                      GtkRcStyle      *style);
+static guint       gtk_rc_parse_base                 (GScanner        *scanner,
+                                                      GtkRcStyle      *style);
+static guint       gtk_rc_parse_xthickness           (GScanner        *scanner,
+                                                      GtkRcStyle      *style);
+static guint       gtk_rc_parse_ythickness           (GScanner        *scanner,
+                                                      GtkRcStyle      *style);
+static guint       gtk_rc_parse_bg_pixmap            (GtkRcContext    *context,
+                                                     GScanner        *scanner,
+                                                      GtkRcStyle      *rc_style);
+static guint       gtk_rc_parse_font                 (GScanner        *scanner,
+                                                      GtkRcStyle      *rc_style);
+static guint       gtk_rc_parse_fontset              (GScanner        *scanner,
+                                                      GtkRcStyle      *rc_style);
+static guint       gtk_rc_parse_font_name            (GScanner        *scanner,
+                                                      GtkRcStyle      *rc_style);
+static guint       gtk_rc_parse_engine               (GtkRcContext    *context,
+                                                     GScanner        *scanner,
+                                                      GtkRcStyle     **rc_style);
+static guint       gtk_rc_parse_pixmap_path          (GtkRcContext    *context,
+                                                     GScanner        *scanner);
+static void        gtk_rc_parse_pixmap_path_string   (GtkRcContext    *context,
+                                                     GScanner        *scanner,
+                                                     const gchar     *pix_path);
+static guint       gtk_rc_parse_module_path          (GScanner        *scanner);
+static guint       gtk_rc_parse_im_module_file       (GScanner        *scanner);
+static guint       gtk_rc_parse_path_pattern         (GtkRcContext    *context,
+                                                     GScanner        *scanner);
+static guint       gtk_rc_parse_stock                (GtkRcContext    *context,
+                                                     GScanner        *scanner,
+                                                      GtkRcStyle      *rc_style,
+                                                      GtkIconFactory  *factory);
+static void        gtk_rc_clear_hash_node            (gpointer         key,
+                                                      gpointer         data,
+                                                      gpointer         user_data);
+static void        gtk_rc_clear_styles               (GtkRcContext    *context);
 static void        gtk_rc_add_initial_default_files  (void);
 
+static void        gtk_rc_style_init                 (GtkRcStyle      *style);
+static void        gtk_rc_style_class_init           (GtkRcStyleClass *klass);
+static void        gtk_rc_style_finalize             (GObject         *object);
+static void        gtk_rc_style_real_merge           (GtkRcStyle      *dest,
+                                                      GtkRcStyle      *src);
+static GtkRcStyle* gtk_rc_style_real_create_rc_style (GtkRcStyle      *rc_style);
+static GtkStyle*   gtk_rc_style_real_create_style    (GtkRcStyle      *rc_style);
+static gint       gtk_rc_properties_cmp             (gconstpointer    bsearch_node1,
+                                                     gconstpointer    bsearch_node2);
+
+static gpointer parent_class = NULL;
 
-static const GScannerConfig    gtk_rc_scanner_config =
+static const GScannerConfig gtk_rc_scanner_config =
 {
   (
    " \t\r\n"
@@ -184,10 +250,13 @@ static const struct
   { "INSENSITIVE", GTK_RC_TOKEN_INSENSITIVE },
   { "fg", GTK_RC_TOKEN_FG },
   { "bg", GTK_RC_TOKEN_BG },
-  { "base", GTK_RC_TOKEN_BASE },
   { "text", GTK_RC_TOKEN_TEXT },
+  { "base", GTK_RC_TOKEN_BASE },
+  { "xthickness", GTK_RC_TOKEN_XTHICKNESS },
+  { "ythickness", GTK_RC_TOKEN_YTHICKNESS },
   { "font", GTK_RC_TOKEN_FONT },
   { "fontset", GTK_RC_TOKEN_FONTSET },
+  { "font_name", GTK_RC_TOKEN_FONT_NAME },
   { "bg_pixmap", GTK_RC_TOKEN_BG_PIXMAP },
   { "pixmap_path", GTK_RC_TOKEN_PIXMAP_PATH },
   { "style", GTK_RC_TOKEN_STYLE },
@@ -199,179 +268,137 @@ static const struct
   { "lowest", GTK_RC_TOKEN_LOWEST },
   { "gtk", GTK_RC_TOKEN_GTK },
   { "application", GTK_RC_TOKEN_APPLICATION },
+  { "theme", GTK_RC_TOKEN_THEME },
   { "rc", GTK_RC_TOKEN_RC },
   { "highest", GTK_RC_TOKEN_HIGHEST },
   { "engine", GTK_RC_TOKEN_ENGINE },
   { "module_path", GTK_RC_TOKEN_MODULE_PATH },
+  { "stock", GTK_RC_TOKEN_STOCK },
+  { "im_module_file", GTK_RC_TOKEN_IM_MODULE_FILE },
+  { "LTR", GTK_RC_TOKEN_LTR },
+  { "RTL", GTK_RC_TOKEN_RTL }
 };
 
-static const guint n_symbols = sizeof (symbols) / sizeof (symbols[0]);
-
-static GHashTable *rc_style_ht = NULL;
 static GHashTable *realized_style_ht = NULL;
-static GSList *gtk_rc_sets_widget = NULL;
-static GSList *gtk_rc_sets_widget_class = NULL;
-static GSList *gtk_rc_sets_class = NULL;
+
+static gchar *im_module_file = NULL;
 
 #define GTK_RC_MAX_DEFAULT_FILES 128
 static gchar *gtk_rc_default_files[GTK_RC_MAX_DEFAULT_FILES];
-static gboolean gtk_rc_auto_parse = TRUE;
 
-#define GTK_RC_MAX_PIXMAP_PATHS 128
-static gchar *pixmap_path[GTK_RC_MAX_PIXMAP_PATHS];
-#define GTK_RC_MAX_MODULE_PATHS 128
-static gchar *module_path[GTK_RC_MAX_MODULE_PATHS];
+/* A stack of directories for RC files we are parsing currently.
+ * these are implicitely added to the end of PIXMAP_PATHS
+ */
+static GSList *rc_dir_stack = NULL;
 
-/* The files we have parsed, to reread later if necessary */
-GSList *rc_files = NULL;
+/* RC files and strings that are parsed for every context
+ */
+static GSList *global_rc_files = NULL;
 
-static GtkImageLoader image_loader = NULL;
+/* Keep list of all current RC contexts for convenience
+ */
+static GSList *rc_contexts;
 
 /* RC file handling */
 
-
-#ifdef NATIVE_WIN32
-
-static gchar *
-get_gtk_sysconf_directory ()
-{
-  static gchar gtk_sysconf_dir[200];
-  gchar win_dir[100];
-
-  GetWindowsDirectory (win_dir, sizeof (win_dir));
-  sprintf (gtk_sysconf_dir, "%s\\gtk", win_dir);
-  return gtk_sysconf_dir;
-}
-
 static gchar *
-get_themes_directory ()
-{
-  /* We really should fetch this from the Registry. The GIMP
-   * installation program stores the Themes installation
-   * directory in HKLM\Software\GNU\GTk+\Themes\InstallDirectory.
-   * Later.
-   */
-  static gchar themes_dir[200];
-
-  sprintf (themes_dir, "%s\\themes", get_gtk_sysconf_directory ());
-  return themes_dir;
-}
-
-#endif
-gchar *
-gtk_rc_get_theme_dir(void)
+gtk_rc_make_default_dir (const gchar *type)
 {
-  gchar *var, *path;
+  const gchar *var;
+  gchar *path;
 
-#ifndef NATIVE_WIN32
-  var = getenv("GTK_DATA_PREFIX");
+  var = g_getenv ("GTK_EXE_PREFIX");
   if (var)
-    path = g_strdup_printf("%s%s", var, "/share/themes");
+    path = g_build_filename (var, "lib", "gtk-2.0", GTK_BINARY_VERSION, type, NULL);
   else
-    path = g_strdup_printf("%s%s", GTK_DATA_PREFIX, "/share/themes");
-#else
-  path = g_strdup (get_themes_directory ());
-#endif
+    path = g_build_filename (GTK_LIBDIR, "gtk-2.0", GTK_BINARY_VERSION, type, NULL);
 
   return path;
 }
 
+/**
+ * gtk_rc_get_im_module_path:
+ * @returns: a newly-allocated string containing the path in which to 
+ *    look for IM modules.
+ *
+ * Obtains the path in which to look for IM modules. See the documentation
+ * of the <link linkend="im-module-path"><envar>GTK_PATH</envar></link>
+ * environment variable for more details about looking up modules. This
+ * function is useful solely for utilities supplied with GTK+ and should
+ * not be used by applications under normal circumstances.
+ */
 gchar *
-gtk_rc_get_module_dir(void)
+gtk_rc_get_im_module_path (void)
 {
-  gchar *var, *path;
-
-#ifndef NATIVE_WIN32
-  var = getenv("GTK_EXE_PREFIX");
-  if (var)
-    path = g_strdup_printf("%s%s", var, "/lib/gtk/themes/engines");
-  else
-    path = g_strdup_printf("%s%s", GTK_EXE_PREFIX, "/lib/gtk/themes/engines");
-#else
-  path = g_strdup_printf ("%s%s", get_themes_directory (), "\\engines");
-#endif
+  gchar **paths = _gtk_get_module_path ("immodules");
+  gchar *result = g_strjoinv (G_SEARCHPATH_SEPARATOR_S, paths);
+  g_strfreev (paths);
 
-  return path;
+  return result;
 }
 
-static void
-gtk_rc_append_default_pixmap_path(void)
+/**
+ * gtk_rc_get_im_module_file:
+ * @returns: a newly-allocated string containing the name of the file
+ * listing the IM modules available for loading
+ *
+ * Obtains the path to the IM modules file. See the documentation
+ * of the <link linkend="im-module-file"><envar>GTK_IM_MODULE_FILE</envar></link>
+ * environment variable for more details.
+ */
+gchar *
+gtk_rc_get_im_module_file (void)
 {
-  gchar *var, *path;
-  gint n;
+  gchar *result = g_strdup (g_getenv ("GTK_IM_MODULE_FILE"));
 
-#ifndef NATIVE_WIN32
-  var = getenv("GTK_DATA_PREFIX");
-  if (var)
-    path = g_strdup_printf("%s%s", var, "/share/gtk/themes");
-  else
-    path = g_strdup_printf("%s%s", GTK_DATA_PREFIX, "/share/gtk/themes");
-#else
-  path = g_strdup (get_themes_directory ());
-#endif      
-  
-  for (n = 0; pixmap_path[n]; n++) ;
-  if (n >= GTK_RC_MAX_PIXMAP_PATHS - 1)
+  if (!result)
     {
-      g_free (path);
-      return;
+      if (im_module_file)
+       result = g_strdup (im_module_file);
+      else
+       result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtk.immodules", NULL);
     }
-  pixmap_path[n++] = path;
-  pixmap_path[n] = NULL;
-}
-
-static void
-gtk_rc_append_pixmap_path(gchar *dir)
-{
-  gint n;
 
-  for (n = 0; pixmap_path[n]; n++) ;
-  if (n >= GTK_RC_MAX_MODULE_PATHS - 1)
-    return;
-  pixmap_path[n++] = g_strdup(dir);
-  pixmap_path[n] = NULL;
+  return result;
 }
 
-static void
-gtk_rc_append_default_module_path(void)
+gchar *
+gtk_rc_get_theme_dir (void)
 {
-  gchar *var, *path;
-  gint n;
+  const gchar *var;
+  gchar *path;
 
-  for (n = 0; module_path[n]; n++) ;
-  if (n >= GTK_RC_MAX_MODULE_PATHS - 1)
-    return;
-  
-#ifndef NATIVE_WIN32
-  var = getenv("GTK_EXE_PREFIX");
+  var = g_getenv ("GTK_DATA_PREFIX");
   if (var)
-    path = g_strdup_printf("%s%s", var, "/lib/gtk/themes/engines");
+    path = g_build_filename (var, "share", "themes", NULL);
   else
-    path = g_strdup_printf("%s%s", GTK_EXE_PREFIX, "/lib/gtk/themes/engines");
-#else
-  path = g_strdup_printf ("%s%s", get_themes_directory (), "\\engines");
-#endif
-  module_path[n++] = path;
+    path = g_build_filename (GTK_DATA_PREFIX, "share", "themes", NULL);
 
-  var = g_get_home_dir ();
-  if (var)
-    {
-#ifndef NATIVE_WIN32
-      path = g_strdup_printf ("%s%s", var, "/.gtk/lib/themes/engines");
-#else
-      path = g_strdup_printf ("%s%s", var, "\\_gtk\\themes\\engines");
-#endif
-      module_path[n++] = path;
-    }
-  module_path[n] = NULL;
+  return path;
+}
+
+/**
+ * gtk_rc_get_module_dir:
+ * 
+ * Returns a directory in which GTK+ looks for theme engines.
+ * For full information about the search for theme engines,
+ * see the docs for <envar>GTK_PATH</envar> in
+ * <xref linkend="gtk-running"/>.
+ * 
+ * return value: the directory. (Must be freed with g_free())
+ **/
+gchar *
+gtk_rc_get_module_dir (void)
+{
+  return gtk_rc_make_default_dir ("engines");
 }
 
 static void
 gtk_rc_add_initial_default_files (void)
 {
   static gint init = FALSE;
-  gchar *var, *str;
+  const gchar *var;
+  gchar *str;
   gchar **files;
   gint i;
 
@@ -381,7 +408,7 @@ gtk_rc_add_initial_default_files (void)
   gtk_rc_default_files[0] = NULL;
   init = TRUE;
 
-  var = g_getenv("GTK_RC_FILES");
+  var = g_getenv ("GTK2_RC_FILES");
   if (var)
     {
       files = g_strsplit (var, G_SEARCHPATH_SEPARATOR_S, 128);
@@ -395,26 +422,31 @@ gtk_rc_add_initial_default_files (void)
     }
   else
     {
-#ifndef NATIVE_WIN32
-      str = g_strdup (GTK_SYSCONFDIR G_DIR_SEPARATOR_S "gtk" G_DIR_SEPARATOR_S "gtkrc");
-#else
-      str = g_strdup_printf ("%s\\gtkrc", get_gtk_sysconf_directory ());
-#endif
+      str = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtkrc", NULL);
+
       gtk_rc_add_default_file (str);
       g_free (str);
 
       var = g_get_home_dir ();
       if (var)
        {
-         str = g_strdup_printf ("%s" G_DIR_SEPARATOR_S ".gtkrc", var);
+         str = g_build_filename (var, ".gtkrc-2.0", NULL);
          gtk_rc_add_default_file (str);
          g_free (str);
        }
     }
 }
 
+/**
+ * gtk_rc_add_default_file:
+ * @filename: the pathname to the file. If @filename is not absolute, it
+ *    is searched in the current directory.
+ * 
+ * Adds a file to the list of files to be parsed at the
+ * end of gtk_init().
+ **/
 void
-gtk_rc_add_default_file (const gchar *file)
+gtk_rc_add_default_file (const gchar *filename)
 {
   guint n;
   
@@ -424,12 +456,19 @@ gtk_rc_add_default_file (const gchar *file)
   if (n >= GTK_RC_MAX_DEFAULT_FILES - 1)
     return;
   
-  gtk_rc_default_files[n++] = g_strdup (file);
+  gtk_rc_default_files[n++] = g_strdup (filename);
   gtk_rc_default_files[n] = NULL;
 }
 
+/**
+ * gtk_rc_set_default_files:
+ * @filenames: A %NULL-terminated list of filenames.
+ * 
+ * Sets the list of files that GTK+ will read at the
+ * end of gtk_init().
+ **/
 void
-gtk_rc_set_default_files (gchar **files)
+gtk_rc_set_default_files (gchar **filenames)
 {
   gint i;
 
@@ -443,16 +482,25 @@ gtk_rc_set_default_files (gchar **files)
     }
     
   gtk_rc_default_files[0] = NULL;
-  gtk_rc_auto_parse = FALSE;
 
   i = 0;
-  while (files[i] != NULL)
+  while (filenames[i] != NULL)
     {
-      gtk_rc_add_default_file (files[i]);
+      gtk_rc_add_default_file (filenames[i]);
       i++;
     }
 }
 
+/**
+ * gtk_rc_get_default_files:
+ * 
+ * Retrieves the current list of RC files that will be parsed
+ * at the end of gtk_init().
+ * 
+ * Return value: A %NULL-terminated array of filenames. This memory
+ * is owned by GTK+ and must not be freed by the application.
+ * If you want to store this information, you should make a copy.
+ **/
 gchar **
 gtk_rc_get_default_files (void)
 {
@@ -461,112 +509,262 @@ gtk_rc_get_default_files (void)
   return gtk_rc_default_files;
 }
 
-void
-gtk_rc_init (void)
+static void
+gtk_rc_settings_changed (GtkSettings  *settings,
+                        GParamSpec   *pspec,
+                        GtkRcContext *context)
 {
-  gchar *locale_suffixes[3];
-  gint n_locale_suffixes = 0;
-  gint i, j;
-#ifdef HAVE_LC_MESSAGES
-  char *locale = setlocale (LC_MESSAGES, NULL);
-#else
-  char *locale = setlocale (LC_CTYPE, NULL);
-#endif
-  guint length;
-  char *p;
+  gchar *new_theme_name;
+  gchar *new_key_theme_name;
+
+  g_object_get (settings,
+               "gtk-theme-name", &new_theme_name,
+               "gtk-key-theme-name", &new_key_theme_name,
+               NULL);
+
+  if ((new_theme_name != context->theme_name && 
+       !(new_theme_name && context->theme_name && strcmp (new_theme_name, context->theme_name) == 0)) ||
+      (new_key_theme_name != context->key_theme_name &&
+       !(new_key_theme_name && context->key_theme_name && strcmp (new_key_theme_name, context->key_theme_name) == 0)))
+    {
+      gtk_rc_reparse_all_for_settings (settings, TRUE);
+    }
 
-  rc_style_ht = g_hash_table_new ((GHashFunc) gtk_rc_style_hash,
-                                 (GCompareFunc) gtk_rc_style_compare);
-  pixmap_path[0] = NULL;
-  module_path[0] = NULL;
-  gtk_rc_append_default_pixmap_path();
-  gtk_rc_append_default_module_path();
+  g_free (new_theme_name);
+  g_free (new_key_theme_name);
+}
 
-  gtk_rc_add_initial_default_files ();
+static void
+gtk_rc_font_name_changed (GtkSettings  *settings,
+                          GParamSpec   *pspec,
+                          GtkRcContext *context)
+{
+  _gtk_rc_context_get_default_font_name (settings);
+}
 
-  if (strcmp (locale, "C") && strcmp (locale, "POSIX"))
+static GtkRcContext *
+gtk_rc_context_get (GtkSettings *settings)
+{
+  if (!settings->rc_context)
     {
-      /* Determine locale-specific suffixes for RC files
-       */
-      p = strchr (locale, '@');
-      length = p ? (p -locale) : strlen (locale);
+      GtkRcContext *context = settings->rc_context = g_new (GtkRcContext, 1);
+
+      context->settings = settings;
+      context->rc_style_ht = NULL;
+      context->rc_sets_widget = NULL;
+      context->rc_sets_widget_class = NULL;
+      context->rc_sets_class = NULL;
+      context->rc_files = NULL;
+      context->default_style = NULL;
+
+      g_object_get (settings,
+                   "gtk-theme-name", &context->theme_name,
+                   "gtk-key-theme-name", &context->key_theme_name,
+                   "gtk-font-name", &context->font_name,
+                   NULL);
+
+      g_signal_connect (settings,
+                       "notify::gtk-theme-name",
+                       G_CALLBACK (gtk_rc_settings_changed),
+                       context);
+      g_signal_connect (settings,
+                       "notify::gtk-key-theme-name",
+                       G_CALLBACK (gtk_rc_settings_changed),
+                       context);
+      g_signal_connect (settings,
+                       "notify::gtk-font-name",
+                       G_CALLBACK (gtk_rc_font_name_changed),
+                       context);
+
       
-      p = strchr (locale, '.');
-      if (p)
+      context->pixmap_path[0] = NULL;
+
+      context->default_priority = GTK_PATH_PRIO_RC;
+
+      rc_contexts = g_slist_prepend (rc_contexts, settings->rc_context);
+    }
+
+  return settings->rc_context;
+}
+
+static void
+gtk_rc_parse_named (GtkRcContext *context,
+                   const gchar  *name,
+                   const gchar  *type)
+{
+  gchar *path = NULL;
+  const gchar *home_dir;
+  gchar *subpath;
+
+  if (type)
+    subpath = g_strconcat ("gtk-2.0-", type,
+                          G_DIR_SEPARATOR_S "gtkrc",
+                          NULL);
+  else
+    subpath = g_strdup ("gtk-2.0" G_DIR_SEPARATOR_S "gtkrc");
+  
+  /* First look in the users home directory
+   */
+  home_dir = g_get_home_dir ();
+  if (home_dir)
+    {
+      path = g_build_filename (home_dir, ".themes", name, subpath, NULL);
+      if (!g_file_test (path, G_FILE_TEST_EXISTS))
        {
-         locale_suffixes[n_locale_suffixes++] = g_strndup (locale, length);
-         length = p - locale;
+         g_free (path);
+         path = NULL;
        }
+    }
+
+  if (!path)
+    {
+      gchar *theme_dir = gtk_rc_get_theme_dir ();
+      path = g_build_filename (theme_dir, name, subpath, NULL);
+      g_free (theme_dir);
       
-      p = strchr (locale, '_');
-      if (p)
+      if (!g_file_test (path, G_FILE_TEST_EXISTS))
        {
-         locale_suffixes[n_locale_suffixes++] = g_strndup (locale, length);
-         length = p - locale;
+         g_free (path);
+         path = NULL;
        }
-
-      locale_suffixes[n_locale_suffixes++] = g_strndup (locale, length);
     }
-  
-  i = 0;
-  while (gtk_rc_default_files[i] != NULL)
+
+  if (path)
     {
-      /* Try to find a locale specific RC file corresponding to
-       * to parse before the default file.
-       */
-      for (j=n_locale_suffixes-1; j>=0; j--)
-       {
-         gchar *name = g_strconcat (gtk_rc_default_files[i],
-                                    ".",
-                                    locale_suffixes[j],
-                                    NULL);
-         gtk_rc_parse (name);
-         g_free (name);
-       }
+      gtk_rc_context_parse_file (context, path, GTK_PATH_PRIO_THEME, FALSE);
+      g_free (path);
+    }
 
-      gtk_rc_parse (gtk_rc_default_files[i]);
-      i++;
+  g_free (subpath);
+}
+
+static void
+gtk_rc_parse_default_files (GtkRcContext *context)
+{
+  gint i;
+
+  for (i = 0; gtk_rc_default_files[i] != NULL; i++)
+    gtk_rc_context_parse_file (context, gtk_rc_default_files[i], GTK_PATH_PRIO_RC, FALSE);
+}
+
+void
+_gtk_rc_init (void)
+{
+  static gboolean initialized = FALSE;
+
+  if (!initialized)
+    {
+      initialized = TRUE;
+      
+      gtk_rc_add_initial_default_files ();
     }
- }
+  
+  /* Default RC string */
+  gtk_rc_parse_string ("style \"gtk-default-tooltips-style\" {\n"
+                      "  bg[NORMAL] = \"#eee1b3\"\n"
+                      "  fg[NORMAL] = \"#000000\"\n"
+                      "}\n"
+                      "\n"
+                      "style \"gtk-default-progress-bar-style\" {\n"
+                      "  bg[PRELIGHT] = \"#4b6983\"\n"
+                      "  fg[PRELIGHT] = \"#ffffff\"\n"
+                      "  bg[NORMAL]   = \"#bab5ab\"\n"
+                      "}\n"
+                      "\n"
+                      "style \"gtk-default-menu-item-style\" {\n"
+                      "  bg[PRELIGHT] = \"#4b6983\"\n"
+                      "  fg[PRELIGHT] = \"#ffffff\"\n"
+                      "  base[PRELIGHT] = \"#4b6983\"\n"
+                      "  text[PRELIGHT] = \"#ffffff\"\n"
+                      "}\n"
+                      "\n"
+                      "class \"GtkProgressBar\" style : gtk \"gtk-default-progress-bar-style\"\n"
+                      "widget \"gtk-tooltips*\" style : gtk \"gtk-default-tooltips-style\"\n"
+                      "class \"GtkMenuItem\" style : gtk \"gtk-default-menu-item-style\"\n"
+                      "widget_class \"*.GtkMenuItem.*\" style : gtk \"gtk-default-menu-item-style\"\n"
+                      "widget_class \"*.GtkAccelMenuItem.*\" style : gtk \"gtk-default-menu-item-style\"\n"
+                      "widget_class \"*.GtkRadioMenuItem.*\" style : gtk \"gtk-default-menu-item-style\"\n"
+                      "widget_class \"*.GtkCheckMenuItem.*\" style : gtk \"gtk-default-menu-item-style\"\n"
+                      "widget_class \"*.GtkImageMenuItem.*\" style : gtk \"gtk-default-menu-item-style\"\n"
+                      "widget_class \"*.GtkSeparatorMenuItem.*\" style : gtk \"gtk-default-menu-item-style\"\n"
+      );
+}
+  
+static void
+gtk_rc_context_parse_string (GtkRcContext *context,
+                            const gchar  *rc_string)
+{
+  gtk_rc_parse_any (context, "-", -1, rc_string);
+}
 
 void
 gtk_rc_parse_string (const gchar *rc_string)
 {
+  GtkRcFile *rc_file;
+  GSList *tmp_list;
+      
   g_return_if_fail (rc_string != NULL);
 
-  gtk_rc_parse_any ("-", -1, rc_string);
+  rc_file = g_new (GtkRcFile, 1);
+  rc_file->is_string = TRUE;
+  rc_file->name = g_strdup (rc_string);
+  rc_file->canonical_name = NULL;
+  rc_file->mtime = 0;
+  rc_file->reload = TRUE;
+
+  global_rc_files = g_slist_append (global_rc_files, rc_file);
+
+  for (tmp_list = rc_contexts; tmp_list; tmp_list = tmp_list->next)
+    gtk_rc_context_parse_string (tmp_list->data, rc_string);
 }
 
-static void
-gtk_rc_parse_file (const gchar *filename, gboolean reload)
+static GtkRcFile *
+add_to_rc_file_list (GSList     **rc_file_list,
+                    const char  *filename,
+                    gboolean     reload)
 {
-  GtkRcFile *rc_file = NULL;
-  struct stat statbuf;
   GSList *tmp_list;
-
-  g_return_if_fail (filename != NULL);
-
-  tmp_list = rc_files;
+  GtkRcFile *rc_file;
+  
+  tmp_list = *rc_file_list;
   while (tmp_list)
     {
       rc_file = tmp_list->data;
       if (!strcmp (rc_file->name, filename))
-       break;
+       return rc_file;
       
       tmp_list = tmp_list->next;
     }
 
-  if (!tmp_list)
-    {
-      rc_file = g_new (GtkRcFile, 1);
-      rc_file->name = g_strdup (filename);
-      rc_file->canonical_name = NULL;
-      rc_file->mtime = 0;
-      rc_file->reload = reload;
+  rc_file = g_new (GtkRcFile, 1);
+  rc_file->is_string = FALSE;
+  rc_file->name = g_strdup (filename);
+  rc_file->canonical_name = NULL;
+  rc_file->mtime = 0;
+  rc_file->reload = reload;
+  
+  *rc_file_list = g_slist_append (*rc_file_list, rc_file);
+  
+  return rc_file;
+}
 
-      rc_files = g_slist_append (rc_files, rc_file);
-    }
+static void
+gtk_rc_context_parse_one_file (GtkRcContext *context,
+                              const gchar  *filename,
+                              gint          priority,
+                              gboolean      reload)
+{
+  GtkRcFile *rc_file;
+  struct stat statbuf;
+  gint saved_priority;
+
+  g_return_if_fail (filename != NULL);
+
+  saved_priority = context->default_priority;
+  context->default_priority = priority;
 
+  rc_file = add_to_rc_file_list (&context->rc_files, filename, reload);
+  
   if (!rc_file->canonical_name)
     {
       /* Get the absolute pathname */
@@ -575,120 +773,473 @@ gtk_rc_parse_file (const gchar *filename, gboolean reload)
        rc_file->canonical_name = rc_file->name;
       else
        {
-         GString *str;
          gchar *cwd;
 
          cwd = g_get_current_dir ();
-
-         str = g_string_new (cwd);
+         rc_file->canonical_name = g_build_filename (cwd, rc_file->name, NULL);
          g_free (cwd);
-         g_string_append_c (str, G_DIR_SEPARATOR);
-         g_string_append (str, rc_file->name);
-         
-         rc_file->canonical_name = str->str;
-         g_string_free (str, FALSE);
        }
     }
 
   if (!lstat (rc_file->canonical_name, &statbuf))
     {
       gint fd;
+      GSList *tmp_list;
 
       rc_file->mtime = statbuf.st_mtime;
 
       fd = open (rc_file->canonical_name, O_RDONLY);
       if (fd < 0)
-       return;
+       goto out;
 
-       {
-         gint i;
-         gchar *dir;
-         
-         dir = g_strdup(rc_file->canonical_name);
-         for (i = strlen(dir) - 1; (i >= 0) && (dir[i] != G_DIR_SEPARATOR); i--)
-           dir[i] = 0;
-         gtk_rc_append_pixmap_path(dir);
-         g_free(dir);
-       }
-      gtk_rc_parse_any (filename, fd, NULL);
+      /* Temporarily push directory name for this file on
+       * a stack of directory names while parsing it
+       */
+      rc_dir_stack = 
+       g_slist_prepend (rc_dir_stack,
+                        g_path_get_dirname (rc_file->canonical_name));
+      gtk_rc_parse_any (context, filename, fd, NULL);
+      tmp_list = rc_dir_stack;
+      rc_dir_stack = rc_dir_stack->next;
+      g_free (tmp_list->data);
+      g_slist_free_1 (tmp_list);
 
       close (fd);
     }
+
+ out:
+  context->default_priority = saved_priority;
 }
 
-void
-gtk_rc_parse (const gchar *filename)
+static gchar *
+strchr_len (const gchar *str, gint len, char c)
 {
-  g_return_if_fail (filename != NULL);
+  while (len--)
+    {
+      if (*str == c)
+       return (gchar *)str;
 
-  gtk_rc_parse_file (filename, TRUE);
-}
+      str++;
+    }
 
-/* Handling of RC styles */
+  return NULL;
+}
 
-GtkRcStyle *
-gtk_rc_style_new              (void)
+static void
+gtk_rc_context_parse_file (GtkRcContext *context,
+                          const gchar  *filename,
+                          gint          priority,
+                          gboolean      reload)
 {
-  GtkRcStyle *new_style;
+  gchar *locale_suffixes[2];
+  gint n_locale_suffixes = 0;
+  gchar *p;
+  const gchar *locale;
+  gint length, j;
+  gboolean found = FALSE;
+
+#ifdef G_OS_WIN32      
+  locale = g_win32_getlocale ();
+#else      
+  locale = setlocale (LC_CTYPE, NULL);
+#endif      
 
-  new_style = g_new0 (GtkRcStyle, 1);
-  new_style->ref_count = 1;
+  if (strcmp (locale, "C") && strcmp (locale, "POSIX"))
+    {
+      /* Determine locale-specific suffixes for RC files.
+       */
+      length = strlen (locale);
+      
+      p = strchr (locale, '@');
+      if (p)
+       length = p - locale;
 
-  return new_style;
+      p = strchr_len (locale, length, '.');
+      if (p)
+       length = p - locale;
+      
+      locale_suffixes[n_locale_suffixes++] = g_strndup (locale, length);
+      
+      p = strchr_len (locale, length, '_');
+      if (p)
+       {
+         length = p - locale;
+         locale_suffixes[n_locale_suffixes++] = g_strndup (locale, length);
+       }
+    }
+  
+  gtk_rc_context_parse_one_file (context, filename, priority, reload);
+  for (j = 0; j < n_locale_suffixes; j++)
+    {
+      if (!found)
+       {
+         gchar *name = g_strconcat (filename, ".", locale_suffixes[j], NULL);
+         if (g_file_test (name, G_FILE_TEST_EXISTS))
+           {
+             gtk_rc_context_parse_one_file (context, name, priority, FALSE);
+             found = TRUE;
+           }
+             
+         g_free (name);
+       }
+      
+      g_free (locale_suffixes[j]);
+    }
 }
 
-void      
-gtk_rc_style_ref (GtkRcStyle  *rc_style)
+void
+gtk_rc_parse (const gchar *filename)
 {
-  g_return_if_fail (rc_style != NULL);
+  GSList *tmp_list;
+  
+  g_return_if_fail (filename != NULL);
 
-  rc_style->ref_count++;
+  add_to_rc_file_list (&global_rc_files, filename, TRUE);
+  
+  for (tmp_list = rc_contexts; tmp_list; tmp_list = tmp_list->next)
+    gtk_rc_context_parse_file (tmp_list->data, filename, GTK_PATH_PRIO_RC, TRUE);
 }
 
-void      
-gtk_rc_style_unref (GtkRcStyle  *rc_style)
-{
-  gint i;
-
-  g_return_if_fail (rc_style != NULL);
-  g_return_if_fail (rc_style->ref_count > 0);
+/* Handling of RC styles */
 
-  rc_style->ref_count--;
+GType
+gtk_rc_style_get_type (void)
+{
+  static GType rc_style_type = 0;
 
-  if (rc_style->ref_count == 0)
+  if (!rc_style_type)
     {
-      if (rc_style->engine)
-       {
-         rc_style->engine->destroy_rc_style (rc_style);
-         gtk_theme_engine_unref (rc_style->engine);
-       }
-
-      if (rc_style->name)
-       g_free (rc_style->name);
-      if (rc_style->fontset_name)
-       g_free (rc_style->fontset_name);
-      if (rc_style->font_name)
-       g_free (rc_style->font_name);
-      
-      for (i=0 ; i<5 ; i++)
-       if (rc_style->bg_pixmap_name[i])
-         g_free (rc_style->bg_pixmap_name[i]);
+      static const GTypeInfo rc_style_info =
+      {
+        sizeof (GtkRcStyleClass),
+        (GBaseInitFunc) NULL,
+        (GBaseFinalizeFunc) NULL,
+        (GClassInitFunc) gtk_rc_style_class_init,
+        NULL,           /* class_finalize */
+        NULL,           /* class_data */
+        sizeof (GtkRcStyle),
+        0,              /* n_preallocs */
+        (GInstanceInitFunc) gtk_rc_style_init,
+      };
       
-      g_free (rc_style);
+      rc_style_type = g_type_register_static (G_TYPE_OBJECT, "GtkRcStyle",
+                                             &rc_style_info, 0);
     }
+  
+  return rc_style_type;
 }
 
 static void
-gtk_rc_clear_realized_node (gpointer key,
-                           gpointer data,
-                           gpointer user_data)
+gtk_rc_style_init (GtkRcStyle *style)
 {
-  gtk_style_unref (data);
+  guint i;
+
+  style->name = NULL;
+  style->font_desc = NULL;
+
+  for (i = 0; i < 5; i++)
+    {
+      static const GdkColor init_color = { 0, 0, 0, 0, };
+
+      style->bg_pixmap_name[i] = NULL;
+      style->color_flags[i] = 0;
+      style->fg[i] = init_color;
+      style->bg[i] = init_color;
+      style->text[i] = init_color;
+      style->base[i] = init_color;
+    }
+  style->xthickness = -1;
+  style->ythickness = -1;
+  style->rc_properties = NULL;
+
+  style->rc_style_lists = NULL;
+  style->icon_factories = NULL;
 }
 
 static void
-gtk_rc_clear_hash_node (gpointer key, 
-                       gpointer data, 
+gtk_rc_style_class_init (GtkRcStyleClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+  
+  parent_class = g_type_class_peek_parent (klass);
+
+  object_class->finalize = gtk_rc_style_finalize;
+
+  klass->parse = NULL;
+  klass->create_rc_style = gtk_rc_style_real_create_rc_style;
+  klass->merge = gtk_rc_style_real_merge;
+  klass->create_style = gtk_rc_style_real_create_style;
+}
+
+static void
+gtk_rc_style_finalize (GObject *object)
+{
+  GSList *tmp_list1, *tmp_list2;
+  GtkRcStyle *rc_style;
+  gint i;
+
+  rc_style = GTK_RC_STYLE (object);
+  
+  if (rc_style->name)
+    g_free (rc_style->name);
+  if (rc_style->font_desc)
+    pango_font_description_free (rc_style->font_desc);
+      
+  for (i = 0; i < 5; i++)
+    if (rc_style->bg_pixmap_name[i])
+      g_free (rc_style->bg_pixmap_name[i]);
+  
+  /* Now remove all references to this rc_style from
+   * realized_style_ht
+   */
+  tmp_list1 = rc_style->rc_style_lists;
+  while (tmp_list1)
+    {
+      GSList *rc_styles = tmp_list1->data;
+      GtkStyle *style = g_hash_table_lookup (realized_style_ht, rc_styles);
+      g_object_unref (style);
+
+      /* Remove the list of styles from the other rc_styles
+       * in the list
+       */
+      tmp_list2 = rc_styles;
+      while (tmp_list2)
+        {
+          GtkRcStyle *other_style = tmp_list2->data;
+
+          if (other_style != rc_style)
+            other_style->rc_style_lists = g_slist_remove_all (other_style->rc_style_lists,
+                                                             rc_styles);
+          tmp_list2 = tmp_list2->next;
+        }
+
+      /* And from the hash table itself
+       */
+      g_hash_table_remove (realized_style_ht, rc_styles);
+      g_slist_free (rc_styles);
+
+      tmp_list1 = tmp_list1->next;
+    }
+  g_slist_free (rc_style->rc_style_lists);
+
+  if (rc_style->rc_properties)
+    {
+      guint i;
+
+      for (i = 0; i < rc_style->rc_properties->len; i++)
+       {
+         GtkRcProperty *node = &g_array_index (rc_style->rc_properties, GtkRcProperty, i);
+
+         g_free (node->origin);
+         g_value_unset (&node->value);
+       }
+      g_array_free (rc_style->rc_properties, TRUE);
+      rc_style->rc_properties = NULL;
+    }
+
+  tmp_list1 = rc_style->icon_factories;
+  while (tmp_list1)
+    {
+      g_object_unref (tmp_list1->data);
+      tmp_list1 = tmp_list1->next;
+    }
+  g_slist_free (rc_style->icon_factories);
+  
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+GtkRcStyle *
+gtk_rc_style_new (void)
+{
+  GtkRcStyle *style;
+  
+  style = g_object_new (GTK_TYPE_RC_STYLE, NULL);
+  
+  return style;
+}
+
+/**
+ * gtk_rc_style_copy:
+ * @orig: the style to copy
+ * 
+ * Makes a copy of the specified #GtkRcStyle. This function
+ * will correctly copy an RC style that is a member of a class
+ * derived from #GtkRcStyle.
+ * 
+ * Return value: the resulting #GtkRcStyle
+ **/
+GtkRcStyle *
+gtk_rc_style_copy (GtkRcStyle *orig)
+{
+  GtkRcStyle *style;
+
+  g_return_val_if_fail (GTK_IS_RC_STYLE (orig), NULL);
+  
+  style = GTK_RC_STYLE_GET_CLASS (orig)->create_rc_style (orig);
+  GTK_RC_STYLE_GET_CLASS (style)->merge (style, orig);
+
+  return style;
+}
+
+void      
+gtk_rc_style_ref (GtkRcStyle *rc_style)
+{
+  g_return_if_fail (GTK_IS_RC_STYLE (rc_style));
+
+  g_object_ref (rc_style);
+}
+
+void      
+gtk_rc_style_unref (GtkRcStyle *rc_style)
+{
+  g_return_if_fail (GTK_IS_RC_STYLE (rc_style));
+
+  g_object_unref (rc_style);
+}
+
+static GtkRcStyle *
+gtk_rc_style_real_create_rc_style (GtkRcStyle *style)
+{
+  return GTK_RC_STYLE (g_object_new (G_OBJECT_TYPE (style), NULL));
+}
+
+static gint
+gtk_rc_properties_cmp (gconstpointer bsearch_node1,
+                      gconstpointer bsearch_node2)
+{
+  const GtkRcProperty *prop1 = bsearch_node1;
+  const GtkRcProperty *prop2 = bsearch_node2;
+
+  if (prop1->type_name == prop2->type_name)
+    return prop1->property_name < prop2->property_name ? -1 : prop1->property_name == prop2->property_name ? 0 : 1;
+  else
+    return prop1->type_name < prop2->type_name ? -1 : 1;
+}
+
+static void
+insert_rc_property (GtkRcStyle    *style,
+                   GtkRcProperty *property,
+                   gboolean       replace)
+{
+  guint i;
+  GtkRcProperty *new_property = NULL;
+  GtkRcProperty key = { 0, 0, NULL, { 0, }, };
+
+  key.type_name = property->type_name;
+  key.property_name = property->property_name;
+
+  if (!style->rc_properties)
+    style->rc_properties = g_array_new (FALSE, FALSE, sizeof (GtkRcProperty));
+
+  i = 0;
+  while (i < style->rc_properties->len)
+    {
+      gint cmp = gtk_rc_properties_cmp (&key, &g_array_index (style->rc_properties, GtkRcProperty, i));
+
+      if (cmp == 0)
+       {
+         if (replace)
+           {
+             new_property = &g_array_index (style->rc_properties, GtkRcProperty, i);
+             
+             g_free (new_property->origin);
+             g_value_unset (&new_property->value);
+             
+             *new_property = key;
+             break;
+           }
+         else
+           return;
+       }
+      else if (cmp < 0)
+       break;
+
+      i++;
+    }
+
+  if (!new_property)
+    {
+      g_array_insert_val (style->rc_properties, i, key);
+      new_property = &g_array_index (style->rc_properties, GtkRcProperty, i);
+    }
+
+  new_property->origin = g_strdup (property->origin);
+  g_value_init (&new_property->value, G_VALUE_TYPE (&property->value));
+  g_value_copy (&property->value, &new_property->value);
+}
+
+static void
+gtk_rc_style_real_merge (GtkRcStyle *dest,
+                        GtkRcStyle *src)
+{
+  gint i;
+  
+  for (i = 0; i < 5; i++)
+    {
+      if (!dest->bg_pixmap_name[i] && src->bg_pixmap_name[i])
+       dest->bg_pixmap_name[i] = g_strdup (src->bg_pixmap_name[i]);
+      
+      if (!(dest->color_flags[i] & GTK_RC_FG) && 
+         src->color_flags[i] & GTK_RC_FG)
+       {
+         dest->fg[i] = src->fg[i];
+         dest->color_flags[i] |= GTK_RC_FG;
+       }
+      if (!(dest->color_flags[i] & GTK_RC_BG) && 
+         src->color_flags[i] & GTK_RC_BG)
+       {
+         dest->bg[i] = src->bg[i];
+         dest->color_flags[i] |= GTK_RC_BG;
+       }
+      if (!(dest->color_flags[i] & GTK_RC_TEXT) && 
+         src->color_flags[i] & GTK_RC_TEXT)
+       {
+         dest->text[i] = src->text[i];
+         dest->color_flags[i] |= GTK_RC_TEXT;
+       }
+      if (!(dest->color_flags[i] & GTK_RC_BASE) && 
+         src->color_flags[i] & GTK_RC_BASE)
+       {
+         dest->base[i] = src->base[i];
+         dest->color_flags[i] |= GTK_RC_BASE;
+       }
+    }
+
+  if (dest->xthickness < 0 && src->xthickness >= 0)
+    dest->xthickness = src->xthickness;
+  if (dest->ythickness < 0 && src->ythickness >= 0)
+    dest->ythickness = src->ythickness;
+
+  if (src->font_desc)
+    {
+      if (!dest->font_desc)
+       dest->font_desc = pango_font_description_copy (src->font_desc);
+      else
+       pango_font_description_merge (dest->font_desc, src->font_desc, FALSE);
+    }
+
+  if (src->rc_properties)
+    {
+      guint i;
+
+      for (i = 0; i < src->rc_properties->len; i++)
+       insert_rc_property (dest,
+                           &g_array_index (src->rc_properties, GtkRcProperty, i),
+                           FALSE);
+    }
+}
+
+static GtkStyle *
+gtk_rc_style_real_create_style (GtkRcStyle *rc_style)
+{
+  return gtk_style_new ();
+}
+
+static void
+gtk_rc_clear_hash_node (gpointer key, 
+                       gpointer data, 
                        gpointer user_data)
 {
   gtk_rc_style_unref (data);
@@ -702,7 +1253,7 @@ gtk_rc_free_rc_sets (GSList *slist)
       GtkRcSet *rc_set;
 
       rc_set = slist->data;
-      gtk_pattern_spec_free_segs (&rc_set->pspec);
+      g_pattern_spec_free (rc_set->pspec);
       g_free (rc_set);
 
       slist = slist->next;
@@ -710,90 +1261,288 @@ gtk_rc_free_rc_sets (GSList *slist)
 }
 
 static void
-gtk_rc_clear_styles (void)
+gtk_rc_clear_styles (GtkRcContext *context)
 {
   /* Clear out all old rc_styles */
 
-  if (rc_style_ht)
+  if (context->rc_style_ht)
+    {
+      g_hash_table_foreach (context->rc_style_ht, gtk_rc_clear_hash_node, NULL);
+      g_hash_table_destroy (context->rc_style_ht);
+      context->rc_style_ht = NULL;
+    }
+
+  gtk_rc_free_rc_sets (context->rc_sets_widget);
+  g_slist_free (context->rc_sets_widget);
+  context->rc_sets_widget = NULL;
+
+  gtk_rc_free_rc_sets (context->rc_sets_widget_class);
+  g_slist_free (context->rc_sets_widget_class);
+  context->rc_sets_widget_class = NULL;
+
+  gtk_rc_free_rc_sets (context->rc_sets_class);
+  g_slist_free (context->rc_sets_class);
+  context->rc_sets_class = NULL;
+}
+
+/* Reset all our widgets. Also, we have to invalidate cached icons in
+ * icon sets so they get re-rendered.
+ */
+static void
+gtk_rc_reset_widgets (GtkSettings *settings)
+{
+  GList *list, *toplevels;
+
+  _gtk_icon_set_invalidate_caches ();
+  
+  toplevels = gtk_window_list_toplevels ();
+  g_list_foreach (toplevels, (GFunc)g_object_ref, NULL);
+  
+  for (list = toplevels; list; list = list->next)
+    {
+      if (gtk_widget_get_screen (list->data) == settings->screen)
+       {
+         gtk_widget_reset_rc_styles (list->data);
+         g_object_unref (list->data);
+       }
+    }
+  g_list_free (toplevels);
+}
+
+static void
+gtk_rc_clear_realized_style (gpointer key,
+                            gpointer value,
+                            gpointer data)
+{
+  GSList *rc_styles = key;
+  GSList *tmp_list = rc_styles;
+
+  while (tmp_list)
     {
-      g_hash_table_foreach (rc_style_ht, gtk_rc_clear_hash_node, NULL);
-      g_hash_table_destroy (rc_style_ht);
-      rc_style_ht = NULL;
+      GtkRcStyle *rc_style = tmp_list->data;
+      
+      rc_style->rc_style_lists = g_slist_remove_all (rc_style->rc_style_lists,
+                                                    rc_styles);
+      tmp_list = tmp_list->next;
     }
 
+  g_slist_free (rc_styles);
+}
+
+/**
+ * _gtk_rc_reset_styles:
+ * @settings: a #GtkSettings
+ * 
+ * This setting resets all of our styles; we use it when the font
+ * rendering parameters or the icon sizes have changed. It's both less
+ * and more comprehensive then we actually need:
+ *
+ * Less comprehensive: it doesn't affect widgets that have a style
+ *   set on them.
+ *
+ * More comprehensive: it resets the styles, but the styles haven't
+ *   changed. The main reason for resetting the styles is becaues
+ *   most widgets will redo all their font stuff when their style
+ *   change.
+ **/
+void
+_gtk_rc_reset_styles (GtkSettings *settings)
+{
+  GtkRcContext *context;
+  gboolean reset = FALSE;
+
+  g_return_if_fail (GTK_IS_SETTINGS (settings));
+
+  context = gtk_rc_context_get (settings);
+  
+  if (context->default_style)
+    {
+      g_object_unref (G_OBJECT (context->default_style));
+      context->default_style = NULL;
+      reset = TRUE;
+    }
+  
+  /* Clear out styles that have been looked up already
+   */
   if (realized_style_ht)
     {
-      g_hash_table_foreach (realized_style_ht, gtk_rc_clear_realized_node, NULL);
+      g_hash_table_foreach (realized_style_ht, gtk_rc_clear_realized_style, NULL);
       g_hash_table_destroy (realized_style_ht);
       realized_style_ht = NULL;
+      reset = TRUE;
     }
+  
+  if (reset)
+    gtk_rc_reset_widgets (settings);
+}
 
-  gtk_rc_free_rc_sets (gtk_rc_sets_widget);
-  g_slist_free (gtk_rc_sets_widget);
-  gtk_rc_sets_widget = NULL;
+const gchar*
+_gtk_rc_context_get_default_font_name (GtkSettings *settings)
+{
+  GtkRcContext *context;
+  gchar *new_font_name;
+  
+  g_return_val_if_fail (GTK_IS_SETTINGS (settings), NULL);
 
-  gtk_rc_free_rc_sets (gtk_rc_sets_widget_class);
-  g_slist_free (gtk_rc_sets_widget_class);
-  gtk_rc_sets_widget_class = NULL;
+  context = gtk_rc_context_get (settings);
 
-  gtk_rc_free_rc_sets (gtk_rc_sets_class);
-  g_slist_free (gtk_rc_sets_class);
-  gtk_rc_sets_class = NULL;
+  g_object_get (context->settings,
+                "gtk-font-name", &new_font_name,
+                NULL);
 
-  gtk_rc_init ();
+  if (new_font_name != context->font_name && !(new_font_name && strcmp (context->font_name, new_font_name) == 0))
+    {
+       g_free (context->font_name);
+       context->font_name = g_strdup (new_font_name);
+       _gtk_rc_reset_styles (settings);
+    }
+          
+  g_free (new_font_name);
+
+  return context->font_name;
 }
 
+/**
+ * gtk_rc_reparse_all_for_settings:
+ * @settings: a #GtkSettings
+ * @force_load: load whether or not anything changed
+ * 
+ * If the modification time on any previously read file
+ * for the given #GtkSettings has changed, discard all style information
+ * and then reread all previously read RC files.
+ * 
+ * Return value: %TRUE if the files were reread.
+ **/
 gboolean
-gtk_rc_reparse_all (void)
+gtk_rc_reparse_all_for_settings (GtkSettings *settings,
+                                gboolean     force_load)
 {
-  GSList *tmp_list;
   gboolean mtime_modified = FALSE;
   GtkRcFile *rc_file;
+  GSList *tmp_list;
+  GtkRcContext *context;
 
   struct stat statbuf;
 
-  /* Check through and see if any of the RC's have had their
-   * mtime modified. If so, reparse everything.
-   */
-  tmp_list = rc_files;
-  while (tmp_list)
+  g_return_val_if_fail (GTK_IS_SETTINGS (settings), FALSE);
+
+  context = gtk_rc_context_get (settings);
+
+  if (!force_load)
     {
-      rc_file = tmp_list->data;
-      
-      if (!lstat (rc_file->name, &statbuf) && 
-         (statbuf.st_mtime > rc_file->mtime))
+      /* Check through and see if any of the RC's have had their
+       * mtime modified. If so, reparse everything.
+       */
+      tmp_list = context->rc_files;
+      while (tmp_list)
        {
-         mtime_modified = TRUE;
-         break;
+         rc_file = tmp_list->data;
+
+         if (!rc_file->is_string)
+           {
+             if (!lstat (rc_file->name, &statbuf) && 
+                 (statbuf.st_mtime > rc_file->mtime))
+               {
+                 mtime_modified = TRUE;
+                 break;
+               }
+           }
+         
+         tmp_list = tmp_list->next;
        }
-      
-      tmp_list = tmp_list->next;
     }
-
-  if (mtime_modified)
+      
+  if (force_load || mtime_modified)
     {
-      gtk_rc_clear_styles();
+      _gtk_binding_reset_parsed ();
+      gtk_rc_clear_styles (context);
+      g_object_freeze_notify (G_OBJECT (context->settings));
 
-      tmp_list = rc_files;
+      _gtk_settings_reset_rc_values (context->settings);
+      tmp_list = context->rc_files;
       while (tmp_list)
        {
          rc_file = tmp_list->data;
-         if (rc_file->reload)
-           gtk_rc_parse_file (rc_file->name, FALSE);
-         
+
+         if (rc_file->canonical_name != rc_file->name)
+           g_free (rc_file->canonical_name);
+         g_free (rc_file->name);
+         g_free (rc_file);
+
+         tmp_list = tmp_list->next;
+       }
+
+      g_slist_free (context->rc_files);
+      context->rc_files = NULL;
+
+      gtk_rc_parse_default_files (context);
+
+      tmp_list = global_rc_files;
+      while (tmp_list)
+       {
+         rc_file = tmp_list->data;
+
+         if (rc_file->is_string)
+           gtk_rc_context_parse_string (context, rc_file->name);
+         else
+           gtk_rc_context_parse_file (context, rc_file->name, GTK_PATH_PRIO_RC, FALSE);
+
          tmp_list = tmp_list->next;
        }
+
+      g_free (context->theme_name);
+      g_free (context->key_theme_name);
+
+      g_object_get (context->settings,
+                   "gtk-theme-name", &context->theme_name,
+                   "gtk-key-theme-name", &context->key_theme_name,
+                   NULL);
+
+      if (context->theme_name && context->theme_name[0])
+       gtk_rc_parse_named (context, context->theme_name, NULL);
+      if (context->key_theme_name && context->key_theme_name[0])
+       gtk_rc_parse_named (context, context->key_theme_name, "key");
+      
+      g_object_thaw_notify (G_OBJECT (context->settings));
+
+      gtk_rc_reset_widgets (context->settings);
     }
 
-  return mtime_modified;
+  return force_load || mtime_modified;
+}
+
+/**
+ * gtk_rc_reparse_all:
+ * 
+ * If the modification time on any previously read file for the
+ * default #GtkSettings has changed, discard all style information
+ * and then reread all previously read RC files.
+ * 
+ * Return value:  %TRUE if the files were reread.
+ **/
+gboolean
+gtk_rc_reparse_all (void)
+{
+  GSList *tmp_list;
+  gboolean result = FALSE;
+
+  for (tmp_list = rc_contexts; tmp_list; tmp_list = tmp_list->next)
+    {
+      GtkRcContext *context = tmp_list->data;
+      if (gtk_rc_reparse_all_for_settings (context->settings, FALSE))
+       result = TRUE;
+    }
+
+  return result;
 }
 
 static GSList *
 gtk_rc_styles_match (GSList       *rc_styles,
                     GSList       *sets,
                     guint         path_length,
-                    gchar        *path,
-                    gchar        *path_reversed)
+                    const gchar  *path,
+                    const gchar  *path_reversed)
                     
 {
   GtkRcSet *rc_set;
@@ -803,88 +1552,260 @@ gtk_rc_styles_match (GSList       *rc_styles,
       rc_set = sets->data;
       sets = sets->next;
 
-      if (gtk_pattern_match (&rc_set->pspec, path_length, path, path_reversed))
-       rc_styles = g_slist_append (rc_styles, rc_set->rc_style);
+      if (g_pattern_match (rc_set->pspec, path_length, path, path_reversed))
+       rc_styles = g_slist_append (rc_styles, rc_set);
     }
   
   return rc_styles;
 }
 
-GtkStyle*
+static gint
+rc_set_compare (gconstpointer a, gconstpointer b)
+{
+  const GtkRcSet *set_a = a;
+  const GtkRcSet *set_b = b;
+
+  return (set_a->priority < set_b->priority) ? 1 : (set_a->priority == set_b->priority ? 0 : -1);
+}
+
+static GSList *
+sort_and_dereference_sets (GSList *styles)
+{
+  GSList *tmp_list;
+  
+  /* At this point, the list of sets is ordered by:
+   *
+   * a) 'widget' patterns are earlier than 'widget_class' patterns
+   *    which are ealier than 'class' patterns.
+   * a) For two matches for class patterns, a match to a child type
+   *    is before a match to a parent type
+   * c) a match later in the RC file (or in a later RC file) is before a
+   *    match earlier in the RC file.
+   *
+   * With a) taking precedence over b) which takes precendence over c).
+   *
+   * Now sort by priority, which has the highest precendence for sort order
+   */
+  styles = g_slist_sort (styles, rc_set_compare);
+
+  /* Make styles->data = styles->data->rc_style
+   */
+  tmp_list = styles;
+  while (tmp_list)
+    {
+      GtkRcSet *set = tmp_list->data;
+      tmp_list->data = set->rc_style;
+      tmp_list = tmp_list->next;
+    }
+
+  return styles;
+}
+
+/**
+ * gtk_rc_get_style:
+ * @widget: a #GtkWidget
+ * 
+ * Finds all matching RC styles for a given widget,
+ * composites them together, and then creates a 
+ * #GtkStyle representing the composite appearance.
+ * (GTK+ actually keeps a cache of previously 
+ * created styles, so a new style may not be
+ * created.)
+ * 
+ * Returns: the resulting style. No refcount is added
+ *   to the returned style, so if you want to save this
+ *   style around, you should add a reference yourself.
+ **/
+GtkStyle *
 gtk_rc_get_style (GtkWidget *widget)
 {
   GtkRcStyle *widget_rc_style;
   GSList *rc_styles = NULL;
+  GtkRcContext *context;
 
   static guint rc_style_key_id = 0;
 
+  g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
+
+  context = gtk_rc_context_get (gtk_widget_get_settings (widget));
+
   /* We allow the specification of a single rc style to be bound
    * tightly to a widget, for application modifications
    */
   if (!rc_style_key_id)
     rc_style_key_id = g_quark_from_static_string ("gtk-rc-style");
 
-  widget_rc_style = gtk_object_get_data_by_id (GTK_OBJECT (widget),
-                                              rc_style_key_id);
-
-  if (widget_rc_style)
-    rc_styles = g_slist_prepend (rc_styles, widget_rc_style);
-  
-  if (gtk_rc_sets_widget)
+  if (context->rc_sets_widget)
     {
       gchar *path, *path_reversed;
       guint path_length;
 
       gtk_widget_path (widget, &path_length, &path, &path_reversed);
-      rc_styles = gtk_rc_styles_match (rc_styles, gtk_rc_sets_widget, path_length, path, path_reversed);
+      rc_styles = gtk_rc_styles_match (rc_styles, context->rc_sets_widget, path_length, path, path_reversed);
       g_free (path);
       g_free (path_reversed);
-      
     }
   
-  if (gtk_rc_sets_widget_class)
+  if (context->rc_sets_widget_class)
     {
       gchar *path, *path_reversed;
       guint path_length;
 
       gtk_widget_class_path (widget, &path_length, &path, &path_reversed);
-      rc_styles = gtk_rc_styles_match (rc_styles, gtk_rc_sets_widget_class, path_length, path, path_reversed);
+      rc_styles = gtk_rc_styles_match (rc_styles, context->rc_sets_widget_class, path_length, path, path_reversed);
       g_free (path);
       g_free (path_reversed);
     }
 
-  if (gtk_rc_sets_class)
+  if (context->rc_sets_class)
+    {
+      GType type;
+
+      type = G_TYPE_FROM_INSTANCE (widget);
+      while (type)
+       {
+         const gchar *path;
+          gchar *path_reversed;
+         guint path_length;
+
+         path = g_type_name (type);
+         path_length = strlen (path);
+         path_reversed = g_strdup (path);
+         g_strreverse (path_reversed);
+         
+         rc_styles = gtk_rc_styles_match (rc_styles, context->rc_sets_class, path_length, path, path_reversed);
+         g_free (path_reversed);
+      
+         type = g_type_parent (type);
+       }
+    }
+  
+  rc_styles = sort_and_dereference_sets (rc_styles);
+  
+  widget_rc_style = g_object_get_qdata (G_OBJECT (widget), rc_style_key_id);
+
+  if (widget_rc_style)
+    rc_styles = g_slist_prepend (rc_styles, widget_rc_style);
+
+  if (rc_styles)
+    return gtk_rc_init_style (context, rc_styles);
+  else
+    {
+      if (!context->default_style)
+       {
+         context->default_style = gtk_style_new ();
+         _gtk_style_init_for_settings (context->default_style, context->settings);
+       }
+
+      return context->default_style;
+    }
+}
+
+/**
+ * gtk_rc_get_style_by_paths:
+ * @settings: a #GtkSettings object
+ * @widget_path: the widget path to use when looking up the style, or %NULL
+ *               if no matching against the widget path should be done
+ * @class_path: the class path to use when looking up the style, or %NULL
+ *               if no matching against the class path should be done.
+ * @type: a type that will be used along with parent types of this type
+ *        when matching against class styles, or #G_TYPE_NONE
+ * 
+ * Creates up a #GtkStyle from styles defined in a RC file by providing
+ * the raw components used in matching. This function may be useful
+ * when creating pseudo-widgets that should be themed like widgets but
+ * don't actually have corresponding GTK+ widgets. An example of this
+ * would be items inside a GNOME canvas widget.
+ *
+ * The action of gtk_rc_get_style() is similar to:
+ * <informalexample><programlisting>
+ *  gtk_widget_path (widget, NULL, &amp;path, NULL);
+ *  gtk_widget_class_path (widget, NULL, &amp;class_path, NULL);
+ *  gtk_rc_get_style_by_paths (gtk_widget_get_settings (widget), path, class_path,
+ *                             G_OBJECT_TYPE (widget));
+ * </programlisting></informalexample>
+ * 
+ * Return value: A style created by matching with the supplied paths,
+ *   or %NULL if nothing matching was specified and the default style should
+ *   be used. The returned value is owned by GTK+ as part of an internal cache,
+ *   so you must call g_object_ref() on the returned value if you want to
+ *   keep a reference to it.
+ **/
+GtkStyle *
+gtk_rc_get_style_by_paths (GtkSettings *settings,
+                          const char  *widget_path,
+                          const char  *class_path,
+                          GType        type)
+{
+  /* We duplicate the code from above to avoid slowing down the above
+   * by generating paths when we don't need them. I don't know if
+   * this is really worth it.
+   */
+  GSList *rc_styles = NULL;
+  GtkRcContext *context;
+
+  g_return_val_if_fail (GTK_IS_SETTINGS (settings), NULL);
+
+  context = gtk_rc_context_get (settings);
+
+  if (widget_path && context->rc_sets_widget)
+    {
+      gchar *path_reversed;
+      guint path_length;
+
+      path_length = strlen (widget_path);
+      path_reversed = g_strdup (widget_path);
+      g_strreverse (path_reversed);
+
+      rc_styles = gtk_rc_styles_match (rc_styles, context->rc_sets_widget, path_length, widget_path, path_reversed);
+      g_free (path_reversed);
+    }
+  
+  if (class_path && context->rc_sets_widget_class)
     {
-      GtkType type;
+      gchar *path_reversed;
+      guint path_length;
 
-      type = GTK_OBJECT_TYPE (widget);
+      path_length = strlen (class_path);
+      path_reversed = g_strdup (class_path);
+      g_strreverse (path_reversed);
+
+      rc_styles = gtk_rc_styles_match (rc_styles, context->rc_sets_widget_class, path_length, class_path, path_reversed);
+      g_free (path_reversed);
+    }
+
+  if (type != G_TYPE_NONE && context->rc_sets_class)
+    {
       while (type)
        {
-         gchar *path, *path_reversed;
+         const gchar *path;
+          gchar *path_reversed;
          guint path_length;
 
-         path = gtk_type_name (type);
+         path = g_type_name (type);
          path_length = strlen (path);
          path_reversed = g_strdup (path);
          g_strreverse (path_reversed);
          
-         rc_styles = gtk_rc_styles_match (rc_styles, gtk_rc_sets_class, path_length, path, path_reversed);
+         rc_styles = gtk_rc_styles_match (rc_styles, context->rc_sets_class, path_length, path, path_reversed);
          g_free (path_reversed);
       
-         type = gtk_type_parent (type);
+         type = g_type_parent (type);
        }
     }
+  rc_styles = sort_and_dereference_sets (rc_styles);
   
   if (rc_styles)
-    return gtk_rc_style_init (rc_styles);
+    return gtk_rc_init_style (context, rc_styles);
 
   return NULL;
 }
 
-static GSList*
-gtk_rc_add_rc_sets (GSList     *slist,
-                   GtkRcStyle *rc_style,
-                   const char *pattern)
+static GSList *
+gtk_rc_add_rc_sets (GSList      *slist,
+                   GtkRcStyle  *rc_style,
+                   const gchar *pattern)
 {
   GtkRcStyle *new_style;
   GtkRcSet *rc_set;
@@ -893,14 +1814,14 @@ gtk_rc_add_rc_sets (GSList     *slist,
   new_style = gtk_rc_style_new ();
   *new_style = *rc_style;
   new_style->name = g_strdup (rc_style->name);
-  new_style->font_name = g_strdup (rc_style->font_name);
-  new_style->fontset_name = g_strdup (rc_style->fontset_name);
+  if (rc_style->font_desc)
+    new_style->font_desc = pango_font_description_copy (rc_style->font_desc);
   
   for (i = 0; i < 5; i++)
     new_style->bg_pixmap_name[i] = g_strdup (rc_style->bg_pixmap_name[i]);
   
   rc_set = g_new (GtkRcSet, 1);
-  gtk_pattern_spec_init (&rc_set->pspec, pattern);
+  rc_set->pspec = g_pattern_spec_new (pattern);
   rc_set->rc_style = rc_style;
   
   return g_slist_prepend (slist, rc_set);
@@ -910,42 +1831,61 @@ void
 gtk_rc_add_widget_name_style (GtkRcStyle  *rc_style,
                              const gchar *pattern)
 {
+  GtkRcContext *context;
+  
   g_return_if_fail (rc_style != NULL);
   g_return_if_fail (pattern != NULL);
 
-  gtk_rc_sets_widget = gtk_rc_add_rc_sets (gtk_rc_sets_widget, rc_style, pattern);
+  context = gtk_rc_context_get (gtk_settings_get_default ());
+  
+  context->rc_sets_widget = gtk_rc_add_rc_sets (context->rc_sets_widget, rc_style, pattern);
 }
 
 void
 gtk_rc_add_widget_class_style (GtkRcStyle  *rc_style,
                               const gchar *pattern)
 {
+  GtkRcContext *context;
+  
   g_return_if_fail (rc_style != NULL);
   g_return_if_fail (pattern != NULL);
 
-  gtk_rc_sets_widget_class = gtk_rc_add_rc_sets (gtk_rc_sets_widget_class, rc_style, pattern);
+  context = gtk_rc_context_get (gtk_settings_get_default ());
+  
+  context->rc_sets_widget_class = gtk_rc_add_rc_sets (context->rc_sets_widget_class, rc_style, pattern);
 }
 
 void
 gtk_rc_add_class_style (GtkRcStyle  *rc_style,
                        const gchar *pattern)
 {
+  GtkRcContext *context;
+  
   g_return_if_fail (rc_style != NULL);
   g_return_if_fail (pattern != NULL);
 
-  gtk_rc_sets_class = gtk_rc_add_rc_sets (gtk_rc_sets_class, rc_style, pattern);
+  context = gtk_rc_context_get (gtk_settings_get_default ());
+  
+  context->rc_sets_class = gtk_rc_add_rc_sets (context->rc_sets_class, rc_style, pattern);
+}
+
+GScanner*
+gtk_rc_scanner_new (void)
+{
+  return g_scanner_new (&gtk_rc_scanner_config);
 }
 
 static void
-gtk_rc_parse_any (const gchar  *input_name,
+gtk_rc_parse_any (GtkRcContext *context,
+                 const gchar  *input_name,
                  gint          input_fd,
                  const gchar  *input_string)
 {
   GScanner *scanner;
   guint           i;
   gboolean done;
-  
-  scanner = g_scanner_new ((GScannerConfig *) &gtk_rc_scanner_config);
+
+  scanner = gtk_rc_scanner_new ();
   
   if (input_fd >= 0)
     {
@@ -961,10 +1901,8 @@ gtk_rc_parse_any (const gchar  *input_name,
     }
   scanner->input_name = input_name;
 
-  g_scanner_freeze_symbol_table (scanner);
-  for (i = 0; i < n_symbols; i++)
-    g_scanner_add_symbol (scanner, symbols[i].name, GINT_TO_POINTER (symbols[i].token));
-  g_scanner_thaw_symbol_table (scanner);
+  for (i = 0; i < G_N_ELEMENTS (symbols); i++)
+    g_scanner_scope_add_symbol (scanner, 0, symbols[i].name, GINT_TO_POINTER (symbols[i].token));
   
   done = FALSE;
   while (!done)
@@ -975,7 +1913,7 @@ gtk_rc_parse_any (const gchar  *input_name,
        {
          guint expected_token;
          
-         expected_token = gtk_rc_parse_statement (scanner);
+         expected_token = gtk_rc_parse_statement (context, scanner);
 
          if (expected_token != G_TOKEN_NONE)
            {
@@ -987,14 +1925,14 @@ gtk_rc_parse_any (const gchar  *input_name,
              if (scanner->scope_id == 0)
                {
                  /* if we are in scope 0, we know the symbol names
-                  * that are associated with certaintoken values.
+                  * that are associated with certain token values.
                   * so we look them up to make the error messages
                   * more readable.
                   */
                  if (expected_token > GTK_RC_TOKEN_INVALID &&
                      expected_token < GTK_RC_TOKEN_LAST)
                    {
-                     for (i = 0; i < n_symbols; i++)
+                     for (i = 0; i < G_N_ELEMENTS (symbols); i++)
                        if (symbols[i].token == expected_token)
                          msg = symbols[i].name;
                      if (msg)
@@ -1004,7 +1942,7 @@ gtk_rc_parse_any (const gchar  *input_name,
                      scanner->token < GTK_RC_TOKEN_LAST)
                    {
                      symbol_name = "???";
-                     for (i = 0; i < n_symbols; i++)
+                     for (i = 0; i < G_N_ELEMENTS (symbols); i++)
                        if (symbols[i].token == scanner->token)
                          symbol_name = symbols[i].name;
                    }
@@ -1040,9 +1978,9 @@ gtk_rc_styles_hash (const GSList *rc_styles)
   return result;
 }
 
-static gint       
-gtk_rc_styles_compare (const GSList *a,
-                      const GSList *b)
+static gboolean
+gtk_rc_styles_equal (const GSList *a,
+                    const GSList *b)
 {
   while (a && b)
     {
@@ -1056,7 +1994,7 @@ gtk_rc_styles_compare (const GSList *a,
 }
 
 static guint
-gtk_rc_style_hash (const char *name)
+gtk_rc_style_hash (const gchar *name)
 {
   guint result;
   
@@ -1067,151 +2005,122 @@ gtk_rc_style_hash (const char *name)
   return result;
 }
 
-static gint
-gtk_rc_style_compare (const char *a,
-                     const char *b)
+static gboolean
+gtk_rc_style_equal (const gchar *a,
+                   const gchar *b)
 {
   return (strcmp (a, b) == 0);
 }
 
 static GtkRcStyle*
-gtk_rc_style_find (const char *name)
+gtk_rc_style_find (GtkRcContext *context,
+                  const gchar  *name)
 {
-  GtkRcStyle *rc_style;
-  
-  rc_style = g_hash_table_lookup (rc_style_ht, (gpointer) name);
-  
-  return rc_style;
+  if (context->rc_style_ht)
+    return g_hash_table_lookup (context->rc_style_ht, (gpointer) name);
+  else
+    return NULL;
 }
 
-/* Assumes ownership of rc_style */
 static GtkStyle *
-gtk_rc_style_to_style (GtkRcStyle *rc_style)
+gtk_rc_style_to_style (GtkRcContext *context,
+                      GtkRcStyle   *rc_style)
 {
   GtkStyle *style;
-  GdkFont *old_font;
-  gint i;
 
-  style = gtk_style_new ();
+  style = GTK_RC_STYLE_GET_CLASS (rc_style)->create_style (rc_style);
+  _gtk_style_init_for_settings (style, context->settings);
 
   style->rc_style = rc_style;
-  
-  if (rc_style->fontset_name)
-    {
-      old_font = style->font;
-      style->font = gdk_fontset_load (rc_style->fontset_name);
-      if (style->font)
-       gdk_font_unref (old_font);
-      else
-       style->font = old_font;
-    }
-  else if (rc_style->font_name)
-    {
-      old_font = style->font;
-      style->font = gdk_font_load (rc_style->font_name);
-      if (style->font)
-       gdk_font_unref (old_font);
-      else
-       style->font = old_font;
-    }
-  
-  for (i = 0; i < 5; i++)
-    {
-      if (rc_style->color_flags[i] & GTK_RC_FG)
-       style->fg[i] = rc_style->fg[i];
-      if (rc_style->color_flags[i] & GTK_RC_BG)
-       style->bg[i] = rc_style->bg[i];
-      if (rc_style->color_flags[i] & GTK_RC_TEXT)
-       style->text[i] = rc_style->text[i];
-      if (rc_style->color_flags[i] & GTK_RC_BASE)
-       style->base[i] = rc_style->base[i];
-    }
 
-  if (rc_style->engine)
-    {
-      style->engine = rc_style->engine;
-      gtk_theme_engine_ref (style->engine);
-      rc_style->engine->rc_style_to_style (style, rc_style);
-    }
+  gtk_rc_style_ref (rc_style);
+  
+  GTK_STYLE_GET_CLASS (style)->init_from_rc (style, rc_style);  
 
   return style;
 }
 
 /* Reuses or frees rc_styles */
 static GtkStyle *
-gtk_rc_style_init (GSList *rc_styles)
+gtk_rc_init_style (GtkRcContext *context,
+                  GSList       *rc_styles)
 {
-  gint i;
-
   GtkStyle *style = NULL;
-  GtkRcStyle *proto_style;
+  gint i;
 
+  g_return_val_if_fail (rc_styles != NULL, NULL);
+  
   if (!realized_style_ht)
-    realized_style_ht = g_hash_table_new ((GHashFunc)gtk_rc_styles_hash,
                                         (GCompareFunc)gtk_rc_styles_compare);
+    realized_style_ht = g_hash_table_new ((GHashFunc) gtk_rc_styles_hash,
(GEqualFunc) gtk_rc_styles_equal);
 
   style = g_hash_table_lookup (realized_style_ht, rc_styles);
 
   if (!style)
     {
-      GSList *tmp_styles = rc_styles;
-      
-      proto_style = gtk_rc_style_new ();
-
+      GtkRcStyle *base_style = NULL;
+      GtkRcStyle *proto_style;
+      GtkRcStyleClass *proto_style_class;
+      GSList *tmp_styles;
+      GType rc_style_type = GTK_TYPE_RC_STYLE;
+
+      /* Find the the first style where the RC file specified engine "" {}
+       * or the first derived style and use that to create the
+       * merged style. If we only have raw GtkRcStyles, use the first
+       * style to create the merged style.
+       */
+      base_style = rc_styles->data;
+      tmp_styles = rc_styles;
       while (tmp_styles)
        {
          GtkRcStyle *rc_style = tmp_styles->data;
-
-         for (i=0; i<5; i++)
-           {
-             if (!proto_style->bg_pixmap_name[i] && rc_style->bg_pixmap_name[i])
-               proto_style->bg_pixmap_name[i] = g_strdup (rc_style->bg_pixmap_name[i]);
-
-             if (!(proto_style->color_flags[i] & GTK_RC_FG) && 
-                   rc_style->color_flags[i] & GTK_RC_FG)
-               {
-                 proto_style->fg[i] = rc_style->fg[i];
-                 proto_style->color_flags[i] |= GTK_RC_FG;
-               }
-             if (!(proto_style->color_flags[i] & GTK_RC_BG) && 
-                   rc_style->color_flags[i] & GTK_RC_BG)
-               {
-                 proto_style->bg[i] = rc_style->bg[i];
-                 proto_style->color_flags[i] |= GTK_RC_BG;
-               }
-             if (!(proto_style->color_flags[i] & GTK_RC_TEXT) && 
-                   rc_style->color_flags[i] & GTK_RC_TEXT)
-               {
-                 proto_style->text[i] = rc_style->text[i];
-                 proto_style->color_flags[i] |= GTK_RC_TEXT;
-               }
-             if (!(proto_style->color_flags[i] & GTK_RC_BASE) && 
-                   rc_style->color_flags[i] & GTK_RC_BASE)
-               {
-                 proto_style->base[i] = rc_style->base[i];
-                 proto_style->color_flags[i] |= GTK_RC_BASE;
-               }
-           }
-
-         if (!proto_style->font_name && rc_style->font_name)
-           proto_style->font_name = g_strdup (rc_style->font_name);
-         if (!proto_style->fontset_name && rc_style->fontset_name)
-           proto_style->fontset_name = g_strdup (rc_style->fontset_name);
-
-         if (!proto_style->engine && rc_style->engine)
+          
+         if (rc_style->engine_specified ||
+             G_OBJECT_TYPE (rc_style) != rc_style_type)
            {
-             proto_style->engine = rc_style->engine;
-             gtk_theme_engine_ref (proto_style->engine);
+             base_style = rc_style;
+             break;
            }
-         
-         if (proto_style->engine &&
-             (proto_style->engine == rc_style->engine))
-           proto_style->engine->merge_rc_style (proto_style, rc_style);
-
+          
+         tmp_styles = tmp_styles->next;
+       }
+      
+      proto_style_class = GTK_RC_STYLE_GET_CLASS (base_style);
+      proto_style = proto_style_class->create_rc_style (base_style);
+      
+      tmp_styles = rc_styles;
+      while (tmp_styles)
+       {
+         GtkRcStyle *rc_style = tmp_styles->data;
+          GSList *factories;
+          
+         proto_style_class->merge (proto_style, rc_style);       
+          
+         /* Point from each rc_style to the list of styles */
+         if (!g_slist_find (rc_style->rc_style_lists, rc_styles))
+           rc_style->rc_style_lists = g_slist_prepend (rc_style->rc_style_lists, rc_styles);
+
+          factories = g_slist_copy (rc_style->icon_factories);
+          if (factories)
+            {
+              GSList *iter;
+              
+              iter = factories;
+              while (iter != NULL)
+                {
+                  g_object_ref (iter->data);
+                  iter = g_slist_next (iter);
+                }
+
+              proto_style->icon_factories = g_slist_concat (proto_style->icon_factories,
+                                                            factories);
+
+            }
+          
          tmp_styles = tmp_styles->next;
        }
 
-      for (i=0; i<5; i++)
+      for (i = 0; i < 5; i++)
        if (proto_style->bg_pixmap_name[i] &&
            (strcmp (proto_style->bg_pixmap_name[i], "<none>") == 0))
          {
@@ -1219,74 +2128,373 @@ gtk_rc_style_init (GSList *rc_styles)
            proto_style->bg_pixmap_name[i] = NULL;
          }
 
-      style = gtk_rc_style_to_style (proto_style);
+      style = gtk_rc_style_to_style (context, proto_style);
+      gtk_rc_style_unref (proto_style);
 
       g_hash_table_insert (realized_style_ht, rc_styles, style);
     }
+  else
+    g_slist_free (rc_styles);
 
   return style;
 }
 
-/*********************
- * Parsing functions *
- *********************/
+/*********************
+ * Parsing functions *
+ *********************/
+
+static guint
+rc_parse_token_or_compound (GScanner  *scanner,
+                           GString   *gstring,
+                           GTokenType delimiter)
+{
+  guint token = g_scanner_get_next_token (scanner);
+
+  /* we either scan a single token (skipping comments)
+   * or a compund statement.
+   * compunds are enclosed in (), [] or {} braces, we read
+   * them in via deep recursion.
+   */
+
+  switch (token)
+    {
+      gchar *string;
+    case G_TOKEN_INT:
+      g_string_append_printf (gstring, " 0x%lx", scanner->value.v_int);
+      break;
+    case G_TOKEN_FLOAT:
+      g_string_append_printf (gstring, " %f", scanner->value.v_float);
+      break;
+    case G_TOKEN_STRING:
+      string = g_strescape (scanner->value.v_string, NULL);
+      g_string_append (gstring, " \"");
+      g_string_append (gstring, string);
+      g_string_append_c (gstring, '"');
+      g_free (string);
+      break;
+    case G_TOKEN_IDENTIFIER:
+      g_string_append_c (gstring, ' ');
+      g_string_append (gstring, scanner->value.v_identifier);
+      break;
+    case G_TOKEN_COMMENT_SINGLE:
+    case G_TOKEN_COMMENT_MULTI:
+      return rc_parse_token_or_compound (scanner, gstring, delimiter);
+    case G_TOKEN_LEFT_PAREN:
+      g_string_append_c (gstring, ' ');
+      g_string_append_c (gstring, token);
+      token = rc_parse_token_or_compound (scanner, gstring, G_TOKEN_RIGHT_PAREN);
+      if (token != G_TOKEN_NONE)
+       return token;
+      break;
+    case G_TOKEN_LEFT_CURLY:
+      g_string_append_c (gstring, ' ');
+      g_string_append_c (gstring, token);
+      token = rc_parse_token_or_compound (scanner, gstring, G_TOKEN_RIGHT_CURLY);
+      if (token != G_TOKEN_NONE)
+       return token;
+      break;
+    case G_TOKEN_LEFT_BRACE:
+      g_string_append_c (gstring, ' ');
+      g_string_append_c (gstring, token);
+      token = rc_parse_token_or_compound (scanner, gstring, G_TOKEN_RIGHT_BRACE);
+      if (token != G_TOKEN_NONE)
+       return token;
+      break;
+    default:
+      if (token >= 256 || token < 1)
+       return delimiter ? delimiter : G_TOKEN_STRING;
+      g_string_append_c (gstring, ' ');
+      g_string_append_c (gstring, token);
+      if (token == delimiter)
+       return G_TOKEN_NONE;
+      break;
+    }
+  if (!delimiter)
+    return G_TOKEN_NONE;
+  else
+    return rc_parse_token_or_compound (scanner, gstring, delimiter);
+}
+
+static guint
+gtk_rc_parse_assignment (GScanner      *scanner,
+                        GtkRcProperty *prop)
+{
+  gboolean scan_identifier = scanner->config->scan_identifier;
+  gboolean scan_symbols = scanner->config->scan_symbols;
+  gboolean identifier_2_string = scanner->config->identifier_2_string;
+  gboolean char_2_token = scanner->config->char_2_token;
+  gboolean scan_identifier_NULL = scanner->config->scan_identifier_NULL;
+  gboolean numbers_2_int = scanner->config->numbers_2_int;
+  gboolean negate = FALSE;
+  guint token;
+
+  /* check that this is an assignment */
+  if (g_scanner_get_next_token (scanner) != '=')
+    return '=';
+
+  /* adjust scanner mode */
+  scanner->config->scan_identifier = TRUE;
+  scanner->config->scan_symbols = FALSE;
+  scanner->config->identifier_2_string = FALSE;
+  scanner->config->char_2_token = TRUE;
+  scanner->config->scan_identifier_NULL = FALSE;
+  scanner->config->numbers_2_int = TRUE;
+
+  /* record location */
+  prop->origin = g_strdup_printf ("%s:%u", scanner->input_name, scanner->line);
+
+  /* parse optional sign */
+  if (g_scanner_peek_next_token (scanner) == '-')
+    {
+      g_scanner_get_next_token (scanner); /* eat sign */
+      negate = TRUE;
+    }
+
+  /* parse one of LONG, DOUBLE and STRING or, if that fails, create an unparsed compund */
+  token = g_scanner_peek_next_token (scanner);
+  switch (token)
+    {
+    case G_TOKEN_INT:
+      g_scanner_get_next_token (scanner);
+      g_value_init (&prop->value, G_TYPE_LONG);
+      g_value_set_long (&prop->value, negate ? -scanner->value.v_int : scanner->value.v_int);
+      token = G_TOKEN_NONE;
+      break;
+    case G_TOKEN_FLOAT:
+      g_scanner_get_next_token (scanner);
+      g_value_init (&prop->value, G_TYPE_DOUBLE);
+      g_value_set_double (&prop->value, negate ? -scanner->value.v_float : scanner->value.v_float);
+      token = G_TOKEN_NONE;
+      break;
+    case G_TOKEN_STRING:
+      g_scanner_get_next_token (scanner);
+      if (negate)
+       token = G_TOKEN_INT;
+      else
+       {
+         g_value_init (&prop->value, G_TYPE_STRING);
+         g_value_set_string (&prop->value, scanner->value.v_string);
+         token = G_TOKEN_NONE;
+       }
+      break;
+    case G_TOKEN_IDENTIFIER:
+    case G_TOKEN_LEFT_PAREN:
+    case G_TOKEN_LEFT_CURLY:
+    case G_TOKEN_LEFT_BRACE:
+      if (!negate)
+       {
+         GString *gstring = g_string_new ("");
+
+         token = rc_parse_token_or_compound (scanner, gstring, 0);
+         if (token == G_TOKEN_NONE)
+           {
+             g_string_append_c (gstring, ' ');
+             g_value_init (&prop->value, G_TYPE_GSTRING);
+             g_value_set_static_boxed (&prop->value, gstring);
+           }
+         else
+           g_string_free (gstring, TRUE);
+         break;
+       }
+      /* fall through */
+    default:
+      g_scanner_get_next_token (scanner);
+      token = G_TOKEN_INT;
+      break;
+    }
+
+  /* restore scanner mode */
+  scanner->config->scan_identifier = scan_identifier;
+  scanner->config->scan_symbols = scan_symbols;
+  scanner->config->identifier_2_string = identifier_2_string;
+  scanner->config->char_2_token = char_2_token;
+  scanner->config->scan_identifier_NULL = scan_identifier_NULL;
+  scanner->config->numbers_2_int = numbers_2_int;
+
+  return token;
+}
+
+static gboolean
+is_c_identifier (const gchar *string)
+{
+  const gchar *p;
+  gboolean is_varname;
+
+  is_varname = strchr (G_CSET_a_2_z G_CSET_A_2_Z "_", string[0]) != NULL;
+  for (p = string + 1; *p && is_varname; p++)
+    is_varname &= strchr (G_CSET_a_2_z G_CSET_A_2_Z G_CSET_DIGITS "_-", *p) != NULL;
+
+  return is_varname;
+}
+
+static void
+parse_include_file (GtkRcContext *context,
+                   GScanner     *scanner,
+                   const gchar  *filename)
+{
+  char *to_parse = NULL;
+  
+  if (g_path_is_absolute (filename))
+    {
+      /* For abolute paths, we call gtk_rc_context_parse_file unconditionally. We
+       * don't print an error in this case.
+       */
+      to_parse = g_strdup (filename);
+    }
+  else
+    {
+      /* if a relative path, we look relative to all the RC files in the
+       * include stack. We require the file to be found in this case
+       * so we can give meaningful error messages, and because on reparsing
+       * non-absolute paths don't make sense.
+       */
+      GSList *tmp_list = rc_dir_stack;
+      while (tmp_list)
+       {
+         gchar *tmpname = g_build_filename (tmp_list->data, filename, NULL);
+
+         if (g_file_test (tmpname, G_FILE_TEST_EXISTS))
+           {
+             to_parse = tmpname;
+             break;
+           }
+
+         g_free (tmpname);
+         
+         tmp_list = tmp_list->next;
+       }
+    }
+
+  if (to_parse)
+    {
+      gtk_rc_context_parse_file (context, to_parse, context->default_priority, FALSE);
+      g_free (to_parse);
+    }
+  else
+    {
+      g_scanner_warn (scanner, 
+                     _("Unable to find include file: \"%s\""),
+                     filename);
+    }
+
+}
 
 static guint
-gtk_rc_parse_statement (GScanner *scanner)
+gtk_rc_parse_statement (GtkRcContext *context,
+                       GScanner     *scanner)
 {
   guint token;
   
   token = g_scanner_peek_next_token (scanner);
-
   switch (token)
     {
     case GTK_RC_TOKEN_INCLUDE:
       token = g_scanner_get_next_token (scanner);
       if (token != GTK_RC_TOKEN_INCLUDE)
        return GTK_RC_TOKEN_INCLUDE;
-
       token = g_scanner_get_next_token (scanner);
       if (token != G_TOKEN_STRING)
        return G_TOKEN_STRING;
-
-      gtk_rc_parse_file (scanner->value.v_string, FALSE);
+      parse_include_file (context, scanner, scanner->value.v_string);
       return G_TOKEN_NONE;
-
+      
     case GTK_RC_TOKEN_STYLE:
-      return gtk_rc_parse_style (scanner);
-
+      return gtk_rc_parse_style (context, scanner);
+      
     case GTK_RC_TOKEN_BINDING:
       return gtk_binding_parse_binding (scanner);
-
+      
     case GTK_RC_TOKEN_PIXMAP_PATH:
-      return gtk_rc_parse_pixmap_path (scanner);
-
+      return gtk_rc_parse_pixmap_path (context, scanner);
+      
     case GTK_RC_TOKEN_WIDGET:
-      return gtk_rc_parse_path_pattern (scanner);
-
+      return gtk_rc_parse_path_pattern (context, scanner);
+      
     case GTK_RC_TOKEN_WIDGET_CLASS:
-      return gtk_rc_parse_path_pattern (scanner);
-
+      return gtk_rc_parse_path_pattern (context, scanner);
+      
     case GTK_RC_TOKEN_CLASS:
-      return gtk_rc_parse_path_pattern (scanner);
-
+      return gtk_rc_parse_path_pattern (context, scanner);
+      
     case GTK_RC_TOKEN_MODULE_PATH:
       return gtk_rc_parse_module_path (scanner);
-       
+      
+    case GTK_RC_TOKEN_IM_MODULE_FILE:
+      return gtk_rc_parse_im_module_file (scanner);
+
+    case G_TOKEN_IDENTIFIER:
+      if (is_c_identifier (scanner->next_value.v_identifier))
+       {
+         GtkRcProperty prop = { 0, 0, NULL, { 0, }, };
+         gchar *name;
+         
+         g_scanner_get_next_token (scanner); /* eat identifier */
+         name = g_strdup (scanner->value.v_identifier);
+         
+         token = gtk_rc_parse_assignment (scanner, &prop);
+         if (token == G_TOKEN_NONE)
+           {
+             GtkSettingsValue svalue;
+
+             svalue.origin = prop.origin;
+             memcpy (&svalue.value, &prop.value, sizeof (prop.value));
+             g_strcanon (name, G_CSET_A_2_Z G_CSET_a_2_z G_CSET_DIGITS "-", '-');
+             _gtk_settings_set_property_value_from_rc (context->settings,
+                                                       name,
+                                                       &svalue);
+           }
+         g_free (prop.origin);
+         if (G_VALUE_TYPE (&prop.value))
+           g_value_unset (&prop.value);
+         g_free (name);
+         
+         return token;
+       }
+      else
+       {
+         g_scanner_get_next_token (scanner);
+         return G_TOKEN_IDENTIFIER;
+       }
     default:
       g_scanner_get_next_token (scanner);
       return /* G_TOKEN_SYMBOL */ GTK_RC_TOKEN_STYLE;
     }
 }
 
+static void
+fixup_rc_set (GSList     *list,
+             GtkRcStyle *orig,
+             GtkRcStyle *new)
+{
+  while (list)
+    {
+      GtkRcSet *set = list->data;
+      if (set->rc_style == orig)
+       set->rc_style = new;
+      list = list->next;
+    }
+}
+
+static void
+fixup_rc_sets (GtkRcContext *context,
+              GtkRcStyle   *orig,
+              GtkRcStyle   *new)
+{
+  fixup_rc_set (context->rc_sets_widget, orig, new);
+  fixup_rc_set (context->rc_sets_widget_class, orig, new);
+  fixup_rc_set (context->rc_sets_class, orig, new);
+}
+
 static guint
-gtk_rc_parse_style (GScanner *scanner)
+gtk_rc_parse_style (GtkRcContext *context,
+                   GScanner     *scanner)
 {
   GtkRcStyle *rc_style;
+  GtkRcStyle *orig_style;
   GtkRcStyle *parent_style;
   guint token;
-  gint insert;
   gint i;
+  GtkIconFactory *our_factory = NULL;
   
   token = g_scanner_get_next_token (scanner);
   if (token != GTK_RC_TOKEN_STYLE)
@@ -1296,12 +2504,20 @@ gtk_rc_parse_style (GScanner *scanner)
   if (token != G_TOKEN_STRING)
     return G_TOKEN_STRING;
   
-  insert = FALSE;
-  rc_style = g_hash_table_lookup (rc_style_ht, scanner->value.v_string);
+  rc_style = gtk_rc_style_find (context, scanner->value.v_string);
+  if (rc_style)
+    orig_style = g_object_ref (rc_style);
+  else
+    orig_style = NULL;
+
+  /* If there's a list, its first member is always the factory belonging
+   * to this RcStyle
+   */
+  if (rc_style && rc_style->icon_factories)
+    our_factory = rc_style->icon_factories->data;
   
   if (!rc_style)
     {
-      insert = TRUE;
       rc_style = gtk_rc_style_new ();
       rc_style->name = g_strdup (scanner->value.v_string);
       
@@ -1310,11 +2526,8 @@ gtk_rc_parse_style (GScanner *scanner)
 
       for (i = 0; i < 5; i++)
        rc_style->color_flags[i] = 0;
-
-      rc_style->engine = NULL;
-      rc_style->engine_data = NULL;
     }
-  
+
   token = g_scanner_peek_next_token (scanner);
   if (token == G_TOKEN_EQUAL_SIGN)
     {
@@ -1323,15 +2536,15 @@ gtk_rc_parse_style (GScanner *scanner)
       token = g_scanner_get_next_token (scanner);
       if (token != G_TOKEN_STRING)
        {
-         if (insert)
-           g_free (rc_style);
-
-         return G_TOKEN_STRING;
+         token = G_TOKEN_STRING;
+         goto err;
        }
       
-      parent_style = g_hash_table_lookup (rc_style_ht, scanner->value.v_string);
+      parent_style = gtk_rc_style_find (context, scanner->value.v_string);
       if (parent_style)
        {
+          GSList *factories;
+          
          for (i = 0; i < 5; i++)
            {
              rc_style->color_flags[i] = parent_style->color_flags[i];
@@ -1340,18 +2553,25 @@ gtk_rc_parse_style (GScanner *scanner)
              rc_style->text[i] = parent_style->text[i];
              rc_style->base[i] = parent_style->base[i];
            }
+
+         rc_style->xthickness = parent_style->xthickness;
+         rc_style->ythickness = parent_style->ythickness;
          
-         if (parent_style->fontset_name)
+         if (parent_style->font_desc)
            {
-             if (rc_style->fontset_name)
-               g_free (rc_style->fontset_name);
-             rc_style->fontset_name = g_strdup (parent_style->fontset_name);
+             if (rc_style->font_desc)
+               pango_font_description_free (rc_style->font_desc);
+             rc_style->font_desc = pango_font_description_copy (parent_style->font_desc);
            }
-         else if (parent_style->font_name)
+
+         if (parent_style->rc_properties)
            {
-             if (rc_style->font_name)
-               g_free (rc_style->font_name);
-             rc_style->font_name = g_strdup (parent_style->font_name);
+             guint i;
+
+             for (i = 0; i < parent_style->rc_properties->len; i++)
+               insert_rc_property (rc_style,
+                                   &g_array_index (parent_style->rc_properties, GtkRcProperty, i),
+                                   TRUE);
            }
          
          for (i = 0; i < 5; i++)
@@ -1360,16 +2580,43 @@ gtk_rc_parse_style (GScanner *scanner)
                g_free (rc_style->bg_pixmap_name[i]);
              rc_style->bg_pixmap_name[i] = g_strdup (parent_style->bg_pixmap_name[i]);
            }
+          
+          /* Append parent's factories, adding a ref to them */
+          if (parent_style->icon_factories != NULL)
+            {
+              /* Add a factory for ourselves if we have none,
+               * in case we end up defining more stock icons.
+               * I see no real way around this; we need to maintain
+               * the invariant that the first factory in the list
+               * is always our_factory, the one belonging to us,
+               * and if we put parent factories in the list we can't
+               * do that if the style is reopened.
+               */
+              if (our_factory == NULL)
+                {
+                  our_factory = gtk_icon_factory_new ();
+                  rc_style->icon_factories = g_slist_prepend (rc_style->icon_factories,
+                                                              our_factory);
+                }
+              
+              rc_style->icon_factories = g_slist_concat (rc_style->icon_factories,
+                                                         g_slist_copy (parent_style->icon_factories));
+              
+              factories = parent_style->icon_factories;
+              while (factories != NULL)
+                {
+                  g_object_ref (factories->data);
+                  factories = factories->next;
+                }
+            }
        }
     }
   
   token = g_scanner_get_next_token (scanner);
   if (token != G_TOKEN_LEFT_CURLY)
     {
-      if (insert)
-       g_free (rc_style);
-
-      return G_TOKEN_LEFT_CURLY;
+      token = G_TOKEN_LEFT_CURLY;
+      goto err;
     }
   
   token = g_scanner_peek_next_token (scanner);
@@ -1377,9 +2624,6 @@ gtk_rc_parse_style (GScanner *scanner)
     {
       switch (token)
        {
-       case GTK_RC_TOKEN_BASE:
-         token = gtk_rc_parse_base (scanner, rc_style);
-         break;
        case GTK_RC_TOKEN_BG:
          token = gtk_rc_parse_bg (scanner, rc_style);
          break;
@@ -1389,8 +2633,17 @@ gtk_rc_parse_style (GScanner *scanner)
        case GTK_RC_TOKEN_TEXT:
          token = gtk_rc_parse_text (scanner, rc_style);
          break;
+       case GTK_RC_TOKEN_BASE:
+         token = gtk_rc_parse_base (scanner, rc_style);
+         break;
+       case GTK_RC_TOKEN_XTHICKNESS:
+         token = gtk_rc_parse_xthickness (scanner, rc_style);
+         break;
+       case GTK_RC_TOKEN_YTHICKNESS:
+         token = gtk_rc_parse_ythickness (scanner, rc_style);
+         break;
        case GTK_RC_TOKEN_BG_PIXMAP:
-         token = gtk_rc_parse_bg_pixmap (scanner, rc_style);
+         token = gtk_rc_parse_bg_pixmap (context, scanner, rc_style);
          break;
        case GTK_RC_TOKEN_FONT:
          token = gtk_rc_parse_font (scanner, rc_style);
@@ -1398,8 +2651,63 @@ gtk_rc_parse_style (GScanner *scanner)
        case GTK_RC_TOKEN_FONTSET:
          token = gtk_rc_parse_fontset (scanner, rc_style);
          break;
+       case GTK_RC_TOKEN_FONT_NAME:
+         token = gtk_rc_parse_font_name (scanner, rc_style);
+         break;
        case GTK_RC_TOKEN_ENGINE:
-         token = gtk_rc_parse_engine (scanner, rc_style);
+         token = gtk_rc_parse_engine (context, scanner, &rc_style);
+         break;
+        case GTK_RC_TOKEN_STOCK:
+          if (our_factory == NULL)
+            {
+              our_factory = gtk_icon_factory_new ();
+              rc_style->icon_factories = g_slist_prepend (rc_style->icon_factories,
+                                                          our_factory);
+            }
+          token = gtk_rc_parse_stock (context, scanner, rc_style, our_factory);
+          break;
+       case G_TOKEN_IDENTIFIER:
+         if (is_c_identifier (scanner->next_value.v_identifier) &&
+             scanner->next_value.v_identifier[0] >= 'A' &&
+             scanner->next_value.v_identifier[0] <= 'Z') /* match namespaced type names */
+           {
+             GtkRcProperty prop = { 0, 0, NULL, { 0, }, };
+             
+             g_scanner_get_next_token (scanner); /* eat type name */
+             prop.type_name = g_quark_from_string (scanner->value.v_identifier);
+             if (g_scanner_get_next_token (scanner) != ':' ||
+                 g_scanner_get_next_token (scanner) != ':')
+               {
+                 token = ':';
+                 break;
+               }
+             if (g_scanner_get_next_token (scanner) != G_TOKEN_IDENTIFIER ||
+                 !is_c_identifier (scanner->value.v_identifier))
+               {
+                 token = G_TOKEN_IDENTIFIER;
+                 break;
+               }
+
+             /* it's important that we do the same canonification as GParamSpecPool here */
+             g_strcanon (scanner->value.v_identifier, G_CSET_A_2_Z G_CSET_a_2_z G_CSET_DIGITS "-", '-');
+             prop.property_name = g_quark_from_string (scanner->value.v_identifier);
+
+             token = gtk_rc_parse_assignment (scanner, &prop);
+             if (token == G_TOKEN_NONE)
+               {
+                 g_return_val_if_fail (prop.origin != NULL && G_VALUE_TYPE (&prop.value) != 0, G_TOKEN_ERROR);
+                 insert_rc_property (rc_style, &prop, TRUE);
+               }
+             
+             g_free (prop.origin);
+             if (G_VALUE_TYPE (&prop.value))
+               g_value_unset (&prop.value);
+           }
+         else
+           {
+             g_scanner_get_next_token (scanner);
+             token = G_TOKEN_IDENTIFIER;
+           }
          break;
        default:
          g_scanner_get_next_token (scanner);
@@ -1408,69 +2716,70 @@ gtk_rc_parse_style (GScanner *scanner)
        }
 
       if (token != G_TOKEN_NONE)
-       {
-         if (insert)
-           {
-             if (rc_style->fontset_name)
-               g_free (rc_style->fontset_name);
-             if (rc_style->font_name)
-               g_free (rc_style->font_name);
-             for (i = 0; i < 5; i++)
-               if (rc_style->bg_pixmap_name[i])
-                 g_free (rc_style->bg_pixmap_name[i]);
-             g_free (rc_style);
-           }
-         return token;
-       }
+       goto err;
+
       token = g_scanner_peek_next_token (scanner);
-    }
+    } /* while (token != G_TOKEN_RIGHT_CURLY) */
   
   token = g_scanner_get_next_token (scanner);
   if (token != G_TOKEN_RIGHT_CURLY)
     {
-      if (insert)
-       {
-         if (rc_style->fontset_name)
-           g_free (rc_style->fontset_name);
-         if (rc_style->font_name)
-           g_free (rc_style->font_name);
-         
-         for (i = 0; i < 5; i++)
-           if (rc_style->bg_pixmap_name[i])
-             g_free (rc_style->bg_pixmap_name[i]);
-         
-         g_free (rc_style);
-       }
-      return G_TOKEN_RIGHT_CURLY;
+      token = G_TOKEN_RIGHT_CURLY;
+      goto err;
     }
   
-  if (insert)
-    g_hash_table_insert (rc_style_ht, rc_style->name, rc_style);
+  if (rc_style != orig_style)
+    {
+      if (!context->rc_style_ht)
+       context->rc_style_ht = g_hash_table_new ((GHashFunc) gtk_rc_style_hash,
+                                                (GEqualFunc) gtk_rc_style_equal);
+      
+      g_hash_table_replace (context->rc_style_ht, rc_style->name, rc_style);
+
+      /* If we copied the data into a new rc style, fix up references to the old rc style
+       * in bindings that we have.
+       */
+      if (orig_style)
+       fixup_rc_sets (context, orig_style, rc_style);
+    }
+
+  if (orig_style)
+    g_object_unref (orig_style);
   
   return G_TOKEN_NONE;
+
+ err:
+  if (rc_style != orig_style)
+    gtk_rc_style_unref (rc_style);
+
+  if (orig_style)
+    g_object_unref (orig_style);
+  
+  return token;
 }
 
-static guint
-gtk_rc_parse_base (GScanner   *scanner,
-                  GtkRcStyle *style)
+const GtkRcProperty*
+_gtk_rc_style_lookup_rc_property (GtkRcStyle *rc_style,
+                                 GQuark      type_name,
+                                 GQuark      property_name)
 {
-  GtkStateType state;
-  guint token;
-  
-  token = g_scanner_get_next_token (scanner);
-  if (token != GTK_RC_TOKEN_BASE)
-    return GTK_RC_TOKEN_BASE;
-  
-  token = gtk_rc_parse_state (scanner, &state);
-  if (token != G_TOKEN_NONE)
-    return token;
-  
-  token = g_scanner_get_next_token (scanner);
-  if (token != G_TOKEN_EQUAL_SIGN)
-    return G_TOKEN_EQUAL_SIGN;
+  GtkRcProperty *node = NULL;
 
-  style->color_flags[state] |= GTK_RC_BASE;
-  return gtk_rc_parse_color (scanner, &style->base[state]);
+  g_return_val_if_fail (GTK_IS_RC_STYLE (rc_style), NULL);
+
+  if (rc_style->rc_properties)
+    {
+      GtkRcProperty key;
+
+      key.type_name = type_name;
+      key.property_name = property_name;
+
+      node = bsearch (&key,
+                     rc_style->rc_properties->data, rc_style->rc_properties->len,
+                     sizeof (GtkRcProperty), gtk_rc_properties_cmp);
+    }
+
+  return node;
 }
 
 static guint
@@ -1543,8 +2852,68 @@ gtk_rc_parse_text (GScanner   *scanner,
 }
 
 static guint
-gtk_rc_parse_bg_pixmap (GScanner   *scanner,
-                       GtkRcStyle *rc_style)
+gtk_rc_parse_base (GScanner   *scanner,
+                  GtkRcStyle *style)
+{
+  GtkStateType state;
+  guint token;
+  
+  token = g_scanner_get_next_token (scanner);
+  if (token != GTK_RC_TOKEN_BASE)
+    return GTK_RC_TOKEN_BASE;
+  
+  token = gtk_rc_parse_state (scanner, &state);
+  if (token != G_TOKEN_NONE)
+    return token;
+  
+  token = g_scanner_get_next_token (scanner);
+  if (token != G_TOKEN_EQUAL_SIGN)
+    return G_TOKEN_EQUAL_SIGN;
+
+  style->color_flags[state] |= GTK_RC_BASE;
+  return gtk_rc_parse_color (scanner, &style->base[state]);
+}
+
+static guint
+gtk_rc_parse_xthickness (GScanner   *scanner,
+                        GtkRcStyle *style)
+{
+  if (g_scanner_get_next_token (scanner) != GTK_RC_TOKEN_XTHICKNESS)
+    return GTK_RC_TOKEN_XTHICKNESS;
+
+  if (g_scanner_get_next_token (scanner) != G_TOKEN_EQUAL_SIGN)
+    return G_TOKEN_EQUAL_SIGN;
+
+  if (g_scanner_get_next_token (scanner) != G_TOKEN_INT)
+    return G_TOKEN_INT;
+
+  style->xthickness = scanner->value.v_int;
+
+  return G_TOKEN_NONE;
+}
+
+static guint
+gtk_rc_parse_ythickness (GScanner   *scanner,
+                        GtkRcStyle *style)
+{
+  if (g_scanner_get_next_token (scanner) != GTK_RC_TOKEN_YTHICKNESS)
+    return GTK_RC_TOKEN_YTHICKNESS;
+
+  if (g_scanner_get_next_token (scanner) != G_TOKEN_EQUAL_SIGN)
+    return G_TOKEN_EQUAL_SIGN;
+
+  if (g_scanner_get_next_token (scanner) != G_TOKEN_INT)
+    return G_TOKEN_INT;
+
+  style->ythickness = scanner->value.v_int;
+
+  return G_TOKEN_NONE;
+}
+
+static guint
+gtk_rc_parse_bg_pixmap (GtkRcContext *context,
+                       GScanner     *scanner,
+                       GtkRcStyle   *rc_style)
 {
   GtkStateType state;
   guint token;
@@ -1570,7 +2939,8 @@ gtk_rc_parse_bg_pixmap (GScanner   *scanner,
       (strcmp (scanner->value.v_string, "<none>") == 0))
     pixmap_file = g_strdup (scanner->value.v_string);
   else
-    pixmap_file = gtk_rc_find_pixmap_in_path (scanner, scanner->value.v_string);
+    pixmap_file = gtk_rc_find_pixmap_in_path (context->settings,
+                                             scanner, scanner->value.v_string);
   
   if (pixmap_file)
     {
@@ -1582,32 +2952,71 @@ gtk_rc_parse_bg_pixmap (GScanner   *scanner,
   return G_TOKEN_NONE;
 }
 
-gchar*
-gtk_rc_find_pixmap_in_path (GScanner *scanner,
-                           const gchar *pixmap_file)
+static gchar*
+gtk_rc_check_pixmap_dir (const gchar *dir, const gchar *pixmap_file)
 {
-  gint i;
-  gint fd;
   gchar *buf;
+  gint fd;
+
+  buf = g_build_filename (dir, pixmap_file, NULL);
   
-  for (i = 0; (i < GTK_RC_MAX_PIXMAP_PATHS) && (pixmap_path[i] != NULL); i++)
+  fd = open (buf, O_RDONLY);
+  if (fd >= 0)
     {
-      buf = g_strdup_printf ("%s" G_DIR_SEPARATOR_S "%s",
-                            pixmap_path[i], pixmap_file);
-      
-      fd = open (buf, O_RDONLY);
-      if (fd >= 0)
-       {
-         close (fd);
-         return buf;
-       }
-      
-      g_free (buf);
+      close (fd);
+      return buf;
     }
+   
+  g_free (buf);
+   return NULL;
+ }
+
+/**
+ * gtk_rc_find_pixmap_in_path:
+ * @settings: a #GtkSettings
+ * @scanner: Scanner used to get line number information for the
+ *   warning message, or %NULL
+ * @pixmap_file: name of the pixmap file to locate.
+ * 
+ * Looks up a file in pixmap path for the specified #GtkSettings.
+ * If the file is not found, it outputs a warning message using
+ * g_warning() and returns %NULL.
+ *
+ * Return value: the filename. 
+ **/
+gchar*
+gtk_rc_find_pixmap_in_path (GtkSettings  *settings,
+                           GScanner     *scanner,
+                           const gchar  *pixmap_file)
+{
+  gint i;
+  gchar *filename;
+  GSList *tmp_list;
 
+  GtkRcContext *context = gtk_rc_context_get (settings);
+    
+  for (i = 0; (i < GTK_RC_MAX_PIXMAP_PATHS) && (context->pixmap_path[i] != NULL); i++)
+    {
+      filename = gtk_rc_check_pixmap_dir (context->pixmap_path[i], pixmap_file);
+      if (filename)
+       return filename;
+    }
+  tmp_list = rc_dir_stack;
+  while (tmp_list)
+    {
+      filename = gtk_rc_check_pixmap_dir (tmp_list->data, pixmap_file);
+      if (filename)
+       return filename;
+       
+      tmp_list = tmp_list->next;
+    }
+  
   if (scanner)
-    g_warning (_("Unable to locate image file in pixmap_path: \"%s\" line %d"),
-              pixmap_file, scanner->line);
+    g_scanner_warn (scanner, 
+                    _("Unable to locate image file in pixmap_path: \"%s\""),
+                    pixmap_file);
   else
     g_warning (_("Unable to locate image file in pixmap_path: \"%s\""),
               pixmap_file);
@@ -1615,29 +3024,20 @@ gtk_rc_find_pixmap_in_path (GScanner *scanner,
   return NULL;
 }
 
+/**
+ * gtk_rc_find_module_in_path:
+ * @module_file: name of a theme engine
+ * 
+ * Searches for a theme engine in the GTK+ search path. This function
+ * is not useful for applications and should not be used.
+ * 
+ * Return value: The filename, if found (must be freed with g_free()),
+ *   otherwise %NULL.
+ **/
 gchar*
 gtk_rc_find_module_in_path (const gchar *module_file)
 {
-  gint i;
-  gint fd;
-  gchar *buf;
-  
-  for (i = 0; (i < GTK_RC_MAX_MODULE_PATHS) && (module_path[i] != NULL); i++)
-    {
-      buf = g_strdup_printf ("%s" G_DIR_SEPARATOR_S "%s",
-                            module_path[i], module_file);
-      
-      fd = open (buf, O_RDONLY);
-      if (fd >= 0)
-       {
-         close (fd);
-         return buf;
-       }
-      
-      g_free (buf);
-    }
-    
-  return NULL;
+  return _gtk_find_module (module_file, "engines");
 }
 
 static guint
@@ -1657,10 +3057,8 @@ gtk_rc_parse_font (GScanner   *scanner,
   token = g_scanner_get_next_token (scanner);
   if (token != G_TOKEN_STRING)
     return G_TOKEN_STRING;
-  
-  if (rc_style->font_name)
-    g_free (rc_style->font_name);
-  rc_style->font_name = g_strdup (scanner->value.v_string);
+
+  /* Ignore, do nothing */
   
   return G_TOKEN_NONE;
 }
@@ -1682,20 +3080,50 @@ gtk_rc_parse_fontset (GScanner   *scanner,
   token = g_scanner_get_next_token (scanner);
   if (token != G_TOKEN_STRING)
     return G_TOKEN_STRING;
+
+  /* Do nothing - silently ignore */
+  
+  return G_TOKEN_NONE;
+}
+
+static guint
+gtk_rc_parse_font_name (GScanner   *scanner,
+                       GtkRcStyle *rc_style)
+{
+  guint token;
+  
+  token = g_scanner_get_next_token (scanner);
+  if (token != GTK_RC_TOKEN_FONT_NAME)
+    return GTK_RC_TOKEN_FONT;
+  
+  token = g_scanner_get_next_token (scanner);
+  if (token != G_TOKEN_EQUAL_SIGN)
+    return G_TOKEN_EQUAL_SIGN;
   
-  if (rc_style->fontset_name)
-    g_free (rc_style->fontset_name);
-  rc_style->fontset_name = g_strdup (scanner->value.v_string);
+  token = g_scanner_get_next_token (scanner);
+  if (token != G_TOKEN_STRING)
+    return G_TOKEN_STRING;
+
+  if (rc_style->font_desc)
+    pango_font_description_free (rc_style->font_desc);
+
+  rc_style->font_desc = 
+    pango_font_description_from_string (scanner->value.v_string);
   
   return G_TOKEN_NONE;
 }
 
 static guint      
-gtk_rc_parse_engine (GScanner   *scanner,
-                    GtkRcStyle  *rc_style)
+gtk_rc_parse_engine (GtkRcContext *context,
+                    GScanner     *scanner,
+                    GtkRcStyle  **rc_style)
 {
   guint token;
-
+  GtkThemeEngine *engine;
+  guint result = G_TOKEN_NONE;
+  GtkRcStyle *new_style = NULL;
+  gboolean parsed_curlies = FALSE;
+  
   token = g_scanner_get_next_token (scanner);
   if (token != GTK_RC_TOKEN_ENGINE)
     return GTK_RC_TOKEN_ENGINE;
@@ -1704,32 +3132,97 @@ gtk_rc_parse_engine (GScanner    *scanner,
   if (token != G_TOKEN_STRING)
     return G_TOKEN_STRING;
 
-  rc_style->engine = gtk_theme_engine_get (scanner->value.v_string);
+  if (!scanner->value.v_string[0])
+    {
+      /* Support engine "" {} to mean override to the default engine
+       */
+      token = g_scanner_get_next_token (scanner);
+      if (token != G_TOKEN_LEFT_CURLY)
+       return G_TOKEN_LEFT_CURLY;
+      
+      token = g_scanner_get_next_token (scanner);
+      if (token != G_TOKEN_RIGHT_CURLY)
+       return G_TOKEN_RIGHT_CURLY;
 
-  token = g_scanner_get_next_token (scanner);
-  if (token != G_TOKEN_LEFT_CURLY)
-    return G_TOKEN_LEFT_CURLY;
+      parsed_curlies = TRUE;
 
-  if (rc_style->engine)
-    return rc_style->engine->parse_rc_style (scanner, rc_style);
+      if (G_OBJECT_TYPE (*rc_style) != GTK_TYPE_RC_STYLE)
+       {
+         new_style = gtk_rc_style_new ();
+         gtk_rc_style_real_merge (new_style, *rc_style);
+         
+         if ((*rc_style)->name)
+           new_style->name = g_strdup ((*rc_style)->name);
+       }
+      else
+       (*rc_style)->engine_specified = TRUE;
+    }
   else
     {
-      /* Skip over remainder, looking for nested {}'s */
+      engine = gtk_theme_engine_get (scanner->value.v_string);
+      
+      token = g_scanner_get_next_token (scanner);
+      if (token != G_TOKEN_LEFT_CURLY)
+       return G_TOKEN_LEFT_CURLY;
+      
+      if (engine)
+       {
+         GtkRcStyleClass *new_class;
+         
+         new_style = gtk_theme_engine_create_rc_style (engine);
+         g_type_module_unuse (G_TYPE_MODULE (engine));
+         
+         new_class = GTK_RC_STYLE_GET_CLASS (new_style);
+         
+         new_class->merge (new_style, *rc_style);
+         if ((*rc_style)->name)
+           new_style->name = g_strdup ((*rc_style)->name);
+         
+         if (new_class->parse)
+           {
+             parsed_curlies = TRUE;
+             result = new_class->parse (new_style, context->settings, scanner);
+             
+             if (result != G_TOKEN_NONE)
+               {
+                 g_object_unref (new_style);
+                 new_style = NULL;
+               }
+           }
+       }
+    }
+
+  if (!parsed_curlies)
+    {
+      /* Skip over remainder, looking for nested {}'s
+       */
       guint count = 1;
       
+      result = G_TOKEN_RIGHT_CURLY;
       while ((token = g_scanner_get_next_token (scanner)) != G_TOKEN_EOF)
        {
          if (token == G_TOKEN_LEFT_CURLY)
            count++;
          else if (token == G_TOKEN_RIGHT_CURLY)
            count--;
-
+         
          if (count == 0)
-           return G_TOKEN_NONE;
+           {
+             result = G_TOKEN_NONE;
+             break;
+           }
        }
+    }
 
-      return G_TOKEN_RIGHT_CURLY;
+  if (new_style)
+    {
+      new_style->engine_specified = TRUE;
+
+      g_object_unref (*rc_style);
+      *rc_style = new_style;
     }
+
+  return result;
 }
 
 guint
@@ -1815,6 +3308,9 @@ gtk_rc_parse_priority (GScanner              *scanner,
     case GTK_RC_TOKEN_APPLICATION:
       *priority = GTK_PATH_PRIO_APPLICATION;
       break;
+    case GTK_RC_TOKEN_THEME:
+      *priority = GTK_PATH_PRIO_THEME;
+      break;
     case GTK_RC_TOKEN_RC:
       *priority = GTK_PATH_PRIO_RC;
       break;
@@ -1838,7 +3334,7 @@ gtk_rc_parse_color (GScanner *scanner,
 
   g_return_val_if_fail (scanner != NULL, G_TOKEN_ERROR);
 
-  /* we don't need to set our own scop here, because
+  /* we don't need to set our own scope here, because
    * we don't need own symbols
    */
   
@@ -1846,10 +3342,6 @@ gtk_rc_parse_color (GScanner *scanner,
   switch (token)
     {
       gint token_int;
-      gint length;
-      gint temp;
-      gchar buf[9];
-      gint i, j;
       
     case G_TOKEN_LEFT_CURLY:
       token = g_scanner_get_next_token (scanner);
@@ -1893,54 +3385,14 @@ gtk_rc_parse_color (GScanner *scanner,
       return G_TOKEN_NONE;
       
     case G_TOKEN_STRING:
-      if (scanner->value.v_string[0] != '#')
-       return G_TOKEN_STRING;
-      
-      length = strlen (scanner->value.v_string) - 1;
-      if (((length % 3) != 0) || (length > 12))
-       return G_TOKEN_STRING;
-      length /= 3;
-      
-      for (i = 0, j = 1; i < length; i++, j++)
-       buf[i] = scanner->value.v_string[j];
-      buf[i] = '\0';
-      
-      sscanf (buf, "%x", &temp);
-      color->red = temp;
-      
-      for (i = 0; i < length; i++, j++)
-       buf[i] = scanner->value.v_string[j];
-      buf[i] = '\0';
-      
-      sscanf (buf, "%x", &temp);
-      color->green = temp;
-      
-      for (i = 0; i < length; i++, j++)
-       buf[i] = scanner->value.v_string[j];
-      buf[i] = '\0';
-      
-      sscanf (buf, "%x", &temp);
-      color->blue = temp;
-      
-      if (length == 1)
-       {
-         color->red *= 4369;
-         color->green *= 4369;
-         color->blue *= 4369;
-       }
-      else if (length == 2)
-       {
-         color->red *= 257;
-         color->green *= 257;
-         color->blue *= 257;
-       }
-      else if (length == 3)
+      if (!gdk_color_parse (scanner->value.v_string, color))
        {
-         color->red *= 16;
-         color->green *= 16;
-         color->blue *= 16;
+         g_scanner_warn (scanner, "Invalid color constant '%s'",
+                         scanner->value.v_string);
+         return G_TOKEN_STRING;
        }
-      return G_TOKEN_NONE;
+      else
+       return G_TOKEN_NONE;
       
     default:
       return G_TOKEN_STRING;
@@ -1948,7 +3400,8 @@ gtk_rc_parse_color (GScanner *scanner,
 }
 
 static guint
-gtk_rc_parse_pixmap_path (GScanner *scanner)
+gtk_rc_parse_pixmap_path (GtkRcContext *context,
+                         GScanner     *scanner)
 {
   guint token;
   
@@ -1960,47 +3413,54 @@ gtk_rc_parse_pixmap_path (GScanner *scanner)
   if (token != G_TOKEN_STRING)
     return G_TOKEN_STRING;
   
-  gtk_rc_parse_pixmap_path_string (scanner->value.v_string);
+  gtk_rc_parse_pixmap_path_string (context, scanner, scanner->value.v_string);
   
   return G_TOKEN_NONE;
 }
 
 static void
-gtk_rc_parse_pixmap_path_string (gchar *pix_path)
+gtk_rc_parse_pixmap_path_string (GtkRcContext *context,
+                                GScanner     *scanner,
+                                const gchar  *pix_path)
 {
-  gchar *buf;
   gint end_offset;
   gint start_offset = 0;
   gint path_len;
   gint path_num;
   
   /* free the old one, or just add to the old one ? */
-  for (path_num=0; pixmap_path[path_num]; path_num++)
+  for (path_num = 0; context->pixmap_path[path_num]; path_num++)
     {
-      g_free (pixmap_path[path_num]);
-      pixmap_path[path_num] = NULL;
+      g_free (context->pixmap_path[path_num]);
+      context->pixmap_path[path_num] = NULL;
     }
   
   path_num = 0;
   
   path_len = strlen (pix_path);
   
-  buf = g_strdup (pix_path);
-  
   for (end_offset = 0; end_offset <= path_len; end_offset++)
     {
-      if ((buf[end_offset] == G_SEARCHPATH_SEPARATOR) ||
+      if ((pix_path[end_offset] == G_SEARCHPATH_SEPARATOR) ||
          (end_offset == path_len))
        {
-         buf[end_offset] = '\0';
-         pixmap_path[path_num] = g_strdup (buf + start_offset);
-         path_num++;
-         pixmap_path[path_num] = NULL;
+         gchar *path_element = g_strndup (pix_path + start_offset, end_offset - start_offset);
+         if (g_path_is_absolute (path_element))
+           {
+             context->pixmap_path[path_num] = path_element;
+             path_num++;
+             context->pixmap_path[path_num] = NULL;
+           }
+         else
+           {
+             g_warning (_("Pixmap path element: \"%s\" must be absolute, %s, line %d"),
+                        path_element, scanner->input_name, scanner->line);
+             g_free (path_element);
+           }
+
          start_offset = end_offset + 1;
        }
     }
-  g_free (buf);
-  gtk_rc_append_default_pixmap_path();
 }
 
 static guint
@@ -2015,58 +3475,42 @@ gtk_rc_parse_module_path (GScanner *scanner)
   token = g_scanner_get_next_token (scanner);
   if (token != G_TOKEN_STRING)
     return G_TOKEN_STRING;
-  
-  gtk_rc_parse_module_path_string (scanner->value.v_string);
-  
+
+  g_warning ("module_path directive is now ignored\n");
+
   return G_TOKEN_NONE;
 }
 
-static void
-gtk_rc_parse_module_path_string (gchar *mod_path)
+static guint
+gtk_rc_parse_im_module_file (GScanner *scanner)
 {
-  gchar *buf;
-  gint end_offset;
-  gint start_offset = 0;
-  gint path_len;
-  gint path_num;
-  
-  /* free the old one, or just add to the old one ? */
-  for (path_num=0; module_path[path_num]; path_num++)
-    {
-      g_free (module_path[path_num]);
-      module_path[path_num] = NULL;
-    }
-  
-  path_num = 0;
-  
-  path_len = strlen (mod_path);
+  guint token;
   
-  buf = g_strdup (mod_path);
+  token = g_scanner_get_next_token (scanner);
+  if (token != GTK_RC_TOKEN_IM_MODULE_FILE)
+    return GTK_RC_TOKEN_IM_MODULE_FILE;
   
-  for (end_offset = 0; end_offset <= path_len; end_offset++)
-    {
-      if ((buf[end_offset] == G_SEARCHPATH_SEPARATOR) ||
-         (end_offset == path_len))
-       {
-         buf[end_offset] = '\0';
-         module_path[path_num] = g_strdup (buf + start_offset);
-         path_num++;
-         module_path[path_num] = NULL;
-         start_offset = end_offset + 1;
-       }
-    }
-  g_free (buf);
-  gtk_rc_append_default_module_path();
+  token = g_scanner_get_next_token (scanner);
+  if (token != G_TOKEN_STRING)
+    return G_TOKEN_STRING;
+
+  if (im_module_file)
+    g_free (im_module_file);
+    
+  im_module_file = g_strdup (scanner->value.v_string);
+
+  return G_TOKEN_NONE;
 }
 
 static guint
-gtk_rc_parse_path_pattern (GScanner   *scanner)
+gtk_rc_parse_path_pattern (GtkRcContext *context,
+                          GScanner     *scanner)
 {
   guint token;
   GtkPathType path_type;
   gchar *pattern;
   gboolean is_binding;
-  GtkPathPriorityType priority = GTK_PATH_PRIO_RC;
+  GtkPathPriorityType priority = context->default_priority;
   
   token = g_scanner_get_next_token (scanner);
   switch (token)
@@ -2083,7 +3527,7 @@ gtk_rc_parse_path_pattern (GScanner   *scanner)
     default:
       return GTK_RC_TOKEN_WIDGET_CLASS;
     }
-  
+
   token = g_scanner_get_next_token (scanner);
   if (token != G_TOKEN_STRING)
     return G_TOKEN_STRING;
@@ -2094,24 +3538,23 @@ gtk_rc_parse_path_pattern (GScanner   *scanner)
   if (token == GTK_RC_TOKEN_STYLE)
     is_binding = FALSE;
   else if (token == GTK_RC_TOKEN_BINDING)
-    {
-      is_binding = TRUE;
-      if (g_scanner_peek_next_token (scanner) == ':')
-       {
-         token = gtk_rc_parse_priority (scanner, &priority);
-         if (token != G_TOKEN_NONE)
-           {
-             g_free (pattern);
-             return token;
-           }
-       }
-    }
+    is_binding = TRUE;
   else
     {
       g_free (pattern);
       return GTK_RC_TOKEN_STYLE;
     }
   
+  if (g_scanner_peek_next_token (scanner) == ':')
+    {
+      token = gtk_rc_parse_priority (scanner, &priority);
+      if (token != G_TOKEN_NONE)
+       {
+         g_free (pattern);
+         return token;
+       }
+    }
+  
   token = g_scanner_get_next_token (scanner);
   if (token != G_TOKEN_STRING)
     {
@@ -2136,7 +3579,7 @@ gtk_rc_parse_path_pattern (GScanner   *scanner)
       GtkRcStyle *rc_style;
       GtkRcSet *rc_set;
 
-      rc_style = gtk_rc_style_find (scanner->value.v_string);
+      rc_style = gtk_rc_style_find (context, scanner->value.v_string);
       
       if (!rc_style)
        {
@@ -2145,51 +3588,291 @@ gtk_rc_parse_path_pattern (GScanner   *scanner)
        }
 
       rc_set = g_new (GtkRcSet, 1);
-      gtk_pattern_spec_init (&rc_set->pspec, pattern);
+      rc_set->pspec = g_pattern_spec_new (pattern);
       rc_set->rc_style = rc_style;
+      rc_set->priority = priority;
 
       if (path_type == GTK_PATH_WIDGET)
-       gtk_rc_sets_widget = g_slist_prepend (gtk_rc_sets_widget, rc_set);
+       context->rc_sets_widget = g_slist_prepend (context->rc_sets_widget, rc_set);
       else if (path_type == GTK_PATH_WIDGET_CLASS)
-       gtk_rc_sets_widget_class = g_slist_prepend (gtk_rc_sets_widget_class, rc_set);
+       context->rc_sets_widget_class = g_slist_prepend (context->rc_sets_widget_class, rc_set);
       else
-       gtk_rc_sets_class = g_slist_prepend (gtk_rc_sets_class, rc_set);
+       context->rc_sets_class = g_slist_prepend (context->rc_sets_class, rc_set);
     }
 
   g_free (pattern);
   return G_TOKEN_NONE;
 }
 
-/*
-typedef  GdkPixmap * (*GtkImageLoader) (GdkWindow   *window,
-                                        GdkColormap *colormap,
-                                        GdkBitmap  **mask,
-                                        GdkColor    *transparent_color,
-                                        const gchar *filename);
-*/
+static guint
+gtk_rc_parse_stock_id (GScanner         *scanner,
+                       gchar    **stock_id)
+{
+  guint token;
+  
+  token = g_scanner_get_next_token (scanner);
+  if (token != G_TOKEN_LEFT_BRACE)
+    return G_TOKEN_LEFT_BRACE;
 
-void
-gtk_rc_set_image_loader(GtkImageLoader loader)
+  token = g_scanner_get_next_token (scanner);
+  
+  if (token != G_TOKEN_STRING)
+    return G_TOKEN_STRING;
+  
+  *stock_id = g_strdup (scanner->value.v_string);
+  
+  token = g_scanner_get_next_token (scanner);
+  if (token != G_TOKEN_RIGHT_BRACE)
+    {
+      g_free (*stock_id);
+      return G_TOKEN_RIGHT_BRACE;
+    }
+  
+  return G_TOKEN_NONE;
+}
+
+static guint
+gtk_rc_parse_icon_source (GtkRcContext   *context,
+                         GScanner       *scanner,
+                          GtkIconSet     *icon_set,
+                          gboolean       *icon_set_valid)
 {
-  image_loader = loader;
+  guint token;
+  GtkIconSource *source;
+  gchar *full_filename;
+  
+  token = g_scanner_get_next_token (scanner);
+  if (token != G_TOKEN_LEFT_CURLY)
+    return G_TOKEN_LEFT_CURLY;
+
+  token = g_scanner_get_next_token (scanner);
+  
+  if (token != G_TOKEN_STRING)
+    return G_TOKEN_STRING;
+
+  
+  source = gtk_icon_source_new ();
+  
+  full_filename = gtk_rc_find_pixmap_in_path (context->settings, scanner, scanner->value.v_string);
+  if (full_filename)
+    {
+      gtk_icon_source_set_filename (source, full_filename);
+      g_free (full_filename);
+    }
+
+  /* We continue parsing even if we didn't find the pixmap so that rest of the
+   * file is read, even if the syntax is bad. However we don't validate the 
+   * icon_set so the caller can choose not to install it.
+   */
+  token = g_scanner_get_next_token (scanner);
+
+  if (token == G_TOKEN_RIGHT_CURLY)
+    goto done;
+  else if (token != G_TOKEN_COMMA)
+    {
+      gtk_icon_source_free (source);
+      return G_TOKEN_COMMA;
+    }
+
+  /* Get the direction */
+  
+  token = g_scanner_get_next_token (scanner);
+
+  switch (token)
+    {
+    case GTK_RC_TOKEN_RTL:
+      gtk_icon_source_set_direction_wildcarded (source, FALSE);
+      gtk_icon_source_set_direction (source, GTK_TEXT_DIR_RTL);
+      break;
+
+    case GTK_RC_TOKEN_LTR:
+      gtk_icon_source_set_direction_wildcarded (source, FALSE);
+      gtk_icon_source_set_direction (source, GTK_TEXT_DIR_LTR);
+      break;
+      
+    case '*':
+      break;
+      
+    default:
+      gtk_icon_source_free (source);
+      return GTK_RC_TOKEN_RTL;
+      break;
+    }
+
+  token = g_scanner_get_next_token (scanner);
+
+  if (token == G_TOKEN_RIGHT_CURLY)
+    goto done;
+  else if (token != G_TOKEN_COMMA)
+    {
+      gtk_icon_source_free (source);
+      return G_TOKEN_COMMA;
+    }
+
+  /* Get the state */
+  
+  token = g_scanner_get_next_token (scanner);
+  
+  switch (token)
+    {
+    case GTK_RC_TOKEN_NORMAL:
+      gtk_icon_source_set_state_wildcarded (source, FALSE);
+      gtk_icon_source_set_state (source, GTK_STATE_NORMAL);
+      break;
+
+    case GTK_RC_TOKEN_PRELIGHT:
+      gtk_icon_source_set_state_wildcarded (source, FALSE);
+      gtk_icon_source_set_state (source, GTK_STATE_PRELIGHT);
+      break;
+      
+
+    case GTK_RC_TOKEN_INSENSITIVE:
+      gtk_icon_source_set_state_wildcarded (source, FALSE);
+      gtk_icon_source_set_state (source, GTK_STATE_INSENSITIVE);
+      break;
+
+    case GTK_RC_TOKEN_ACTIVE:
+      gtk_icon_source_set_state_wildcarded (source, FALSE);
+      gtk_icon_source_set_state (source, GTK_STATE_ACTIVE);
+      break;
+
+    case GTK_RC_TOKEN_SELECTED:
+      gtk_icon_source_set_state_wildcarded (source, FALSE);
+      gtk_icon_source_set_state (source, GTK_STATE_SELECTED);
+      break;
+
+    case '*':
+      break;
+      
+    default:
+      gtk_icon_source_free (source);
+      return GTK_RC_TOKEN_PRELIGHT;
+      break;
+    }  
+
+  token = g_scanner_get_next_token (scanner);
+
+  if (token == G_TOKEN_RIGHT_CURLY)
+    goto done;
+  else if (token != G_TOKEN_COMMA)
+    {
+      gtk_icon_source_free (source);
+      return G_TOKEN_COMMA;
+    }
+  
+  /* Get the size */
+  
+  token = g_scanner_get_next_token (scanner);
+
+  if (token != '*')
+    {
+      GtkIconSize size;
+      
+      if (token != G_TOKEN_STRING)
+        {
+          gtk_icon_source_free (source);
+          return G_TOKEN_STRING;
+        }
+
+      size = gtk_icon_size_from_name (scanner->value.v_string);
+
+      if (size != GTK_ICON_SIZE_INVALID)
+        {
+          gtk_icon_source_set_size_wildcarded (source, FALSE);
+          gtk_icon_source_set_size (source, size);
+        }
+    }
+
+  /* Check the close brace */
+  
+  token = g_scanner_get_next_token (scanner);
+  if (token != G_TOKEN_RIGHT_CURLY)
+    {
+      gtk_icon_source_free (source);
+      return G_TOKEN_RIGHT_CURLY;
+    }
+
+ done:
+  if (gtk_icon_source_get_filename (source))
+    {
+      gtk_icon_set_add_source (icon_set, source);
+      *icon_set_valid = TRUE;
+    }
+  gtk_icon_source_free (source);
+  
+  return G_TOKEN_NONE;
 }
 
-GdkPixmap *
-gtk_rc_load_image (GdkColormap *colormap,
-                  GdkColor    *transparent_color,
-                  const gchar *filename)
+static guint
+gtk_rc_parse_stock (GtkRcContext   *context,
+                   GScanner       *scanner,
+                    GtkRcStyle     *rc_style,
+                    GtkIconFactory *factory)
 {
-  if (strcmp (filename, "<parent>") == 0)
-    return (GdkPixmap*) GDK_PARENT_RELATIVE;
-  else
+  GtkIconSet *icon_set = NULL;
+  gboolean icon_set_valid = FALSE;
+  gchar *stock_id = NULL;
+  guint token;
+  
+  token = g_scanner_get_next_token (scanner);
+  if (token != GTK_RC_TOKEN_STOCK)
+    return GTK_RC_TOKEN_STOCK;
+  
+  token = gtk_rc_parse_stock_id (scanner, &stock_id);
+  if (token != G_TOKEN_NONE)
+    return token;
+  
+  token = g_scanner_get_next_token (scanner);
+  if (token != G_TOKEN_EQUAL_SIGN)
     {
-      if(image_loader)
-       return image_loader(NULL, colormap, NULL,
-                           transparent_color,
-                           filename);
-      else
-       return gdk_pixmap_colormap_create_from_xpm (NULL, colormap, NULL,
-                                                   transparent_color,
-                                                   filename);
+      g_free (stock_id);
+      return G_TOKEN_EQUAL_SIGN;
+    }
+
+  token = g_scanner_get_next_token (scanner);
+  if (token != G_TOKEN_LEFT_CURLY)
+    {
+      g_free (stock_id);
+      return G_TOKEN_LEFT_CURLY;
+    }
+
+  token = g_scanner_peek_next_token (scanner);
+  while (token != G_TOKEN_RIGHT_CURLY)
+    {
+      if (icon_set == NULL)
+        icon_set = gtk_icon_set_new ();
+      
+      token = gtk_rc_parse_icon_source (context, 
+                                        scanner, icon_set, &icon_set_valid);
+      if (token != G_TOKEN_NONE)
+        {
+          g_free (stock_id);
+          gtk_icon_set_unref (icon_set);
+          return token;
+        }
+
+      token = g_scanner_get_next_token (scanner);
+      
+      if (token != G_TOKEN_COMMA &&
+          token != G_TOKEN_RIGHT_CURLY)
+        {
+          g_free (stock_id);
+          gtk_icon_set_unref (icon_set);
+          return G_TOKEN_RIGHT_CURLY;
+        }
+    }
+
+  if (icon_set)
+    {
+      if (icon_set_valid)
+        gtk_icon_factory_add (factory,
+                              stock_id,
+                              icon_set);
+
+      gtk_icon_set_unref (icon_set);
     }
+  
+  g_free (stock_id);
+
+  return G_TOKEN_NONE;
 }