]> Pileus Git - ~andy/gtk/blobdiff - gtk/gtkrc.c
Support added for building using a GNU toolchain on Win32,
[~andy/gtk] / gtk / gtkrc.c
index 7fc8ca826313a998e75ec5518ac5987bf91fca63..09d22a49b8a2f316e5f7d26bc0f74daf3b1d6e46 100644 (file)
  * 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
+ * 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
 #include <sys/stat.h>
+#ifdef HAVE_SYS_PARAM_H
 #include <sys/param.h>
+#endif
 #include <fcntl.h>
 #include <string.h>
 #include <stdio.h>
+#include <stdlib.h>
+
+#ifndef HAVE_LSTAT
+#define lstat stat
+#endif
+
+#ifdef NATIVE_WIN32
+#include <io.h>
+#endif
+
 #include "gtkrc.h"
 #include "gtkbindings.h"
+#include "gtkthemes.h"
+#include "gtkintl.h"
 
-
-typedef struct _GtkRcStyle  GtkRcStyle;
 typedef struct _GtkRcSet    GtkRcSet;
 typedef struct _GtkRcNode   GtkRcNode;
 typedef struct _GtkRcFile   GtkRcFile;
 
-struct _GtkRcNode
-{
-  GdkColormap *cmap;
-  GtkStyle *style;
-};
-
-struct _GtkRcStyle
-{
-  char *name;
-  char *font_name;
-  char *fontset_name;
-  char *bg_pixmap_name[5];
-  GtkStyle *proto_style;
-  GList *styles;
-};
-
 struct _GtkRcSet
 {
   GtkPatternSpec pspec;
@@ -65,13 +80,17 @@ struct _GtkRcFile
 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 GtkRcStyle* gtk_rc_styles_match            (GSList       *sets,
-                                                   guint         path_length,
-                                                   gchar        *path,
-                                                   gchar        *path_reversed);
-static GtkStyle*   gtk_rc_style_init              (GtkRcStyle   *rc_style,
-                                                   GdkColormap  *cmap);
+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);
 
@@ -81,39 +100,40 @@ static void           gtk_rc_parse_any                (const gchar  *input_name,
 static guint      gtk_rc_parse_statement          (GScanner     *scanner);
 static guint      gtk_rc_parse_style              (GScanner     *scanner);
 static guint      gtk_rc_parse_base               (GScanner     *scanner,
-                                                   GtkStyle     *style);
+                                                   GtkRcStyle   *style);
 static guint      gtk_rc_parse_bg                 (GScanner     *scanner,
-                                                   GtkStyle     *style);
+                                                   GtkRcStyle   *style);
 static guint      gtk_rc_parse_fg                 (GScanner     *scanner,
-                                                   GtkStyle     *style);
+                                                   GtkRcStyle   *style);
 static guint      gtk_rc_parse_text               (GScanner     *scanner,
-                                                   GtkStyle     *style);
+                                                   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_state              (GScanner     *scanner,
-                                                   GtkStateType *state);
-static guint      gtk_rc_parse_color              (GScanner     *scanner,
-                                                   GdkColor     *color);
+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 char*      gtk_rc_find_pixmap_in_path      (GScanner     *scanner,
-                                                   gchar *pixmap_file);
+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_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 void        gtk_rc_add_initial_default_files  (void);
 
 
-static GScannerConfig  gtk_rc_scanner_config =
+static const GScannerConfig    gtk_rc_scanner_config =
 {
   (
-   " \t\n"
+   " \t\r\n"
    )                   /* cset_skip_characters */,
   (
    G_CSET_a_2_z
@@ -122,10 +142,8 @@ static     GScannerConfig  gtk_rc_scanner_config =
    )                   /* cset_identifier_first */,
   (
    G_CSET_a_2_z
-   "_0123456789"
+   "_-0123456789"
    G_CSET_A_2_Z
-   G_CSET_LATINS
-   G_CSET_LATINC
    )                   /* cset_identifier_nth */,
   ( "#\n" )            /* cpair_comment_single */,
   
@@ -147,81 +165,369 @@ static   GScannerConfig  gtk_rc_scanner_config =
   TRUE                 /* scan_string_dq */,
   TRUE                 /* numbers_2_int */,
   FALSE                        /* int_2_float */,
-  TRUE                 /* identifier_2_string */,
+  FALSE                        /* identifier_2_string */,
   TRUE                 /* char_2_token */,
   TRUE                 /* symbol_2_token */,
+  FALSE                        /* scope_0_fallback */,
 };
 
-enum {
-  TOKEN_INVALID = G_TOKEN_LAST,
-  TOKEN_INCLUDE,
-  TOKEN_NORMAL,
-  TOKEN_ACTIVE,
-  TOKEN_PRELIGHT,
-  TOKEN_SELECTED,
-  TOKEN_INSENSITIVE,
-  TOKEN_FG,
-  TOKEN_BG,
-  TOKEN_BASE,
-  TOKEN_TEXT,
-  TOKEN_FONT,
-  TOKEN_FONTSET,
-  TOKEN_BG_PIXMAP,
-  TOKEN_PIXMAP_PATH,
-  TOKEN_STYLE,
-  TOKEN_BINDING,
-  TOKEN_WIDGET,
-  TOKEN_WIDGET_CLASS,
-  TOKEN_CLASS,
-  TOKEN_LAST
-};
-
-static struct
+static const struct
 {
   gchar *name;
   guint token;
 } symbols[] = {
-  { "include", TOKEN_INCLUDE },
-  { "NORMAL", TOKEN_NORMAL },
-  { "ACTIVE", TOKEN_ACTIVE },
-  { "PRELIGHT", TOKEN_PRELIGHT },
-  { "SELECTED", TOKEN_SELECTED },
-  { "INSENSITIVE", TOKEN_INSENSITIVE },
-  { "fg", TOKEN_FG },
-  { "bg", TOKEN_BG },
-  { "base", TOKEN_BASE },
-  { "text", TOKEN_TEXT },
-  { "font", TOKEN_FONT },
-  { "fontset", TOKEN_FONTSET },
-  { "bg_pixmap", TOKEN_BG_PIXMAP },
-  { "pixmap_path", TOKEN_PIXMAP_PATH },
-  { "style", TOKEN_STYLE },
-  { "binding", TOKEN_BINDING },
-  { "widget", TOKEN_WIDGET },
-  { "widget_class", TOKEN_WIDGET_CLASS },
-  { "class", TOKEN_CLASS },
+  { "include", GTK_RC_TOKEN_INCLUDE },
+  { "NORMAL", GTK_RC_TOKEN_NORMAL },
+  { "ACTIVE", GTK_RC_TOKEN_ACTIVE },
+  { "PRELIGHT", GTK_RC_TOKEN_PRELIGHT },
+  { "SELECTED", GTK_RC_TOKEN_SELECTED },
+  { "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 },
+  { "font", GTK_RC_TOKEN_FONT },
+  { "fontset", GTK_RC_TOKEN_FONTSET },
+  { "bg_pixmap", GTK_RC_TOKEN_BG_PIXMAP },
+  { "pixmap_path", GTK_RC_TOKEN_PIXMAP_PATH },
+  { "style", GTK_RC_TOKEN_STYLE },
+  { "binding", GTK_RC_TOKEN_BINDING },
+  { "bind", GTK_RC_TOKEN_BIND },
+  { "widget", GTK_RC_TOKEN_WIDGET },
+  { "widget_class", GTK_RC_TOKEN_WIDGET_CLASS },
+  { "class", GTK_RC_TOKEN_CLASS },
+  { "lowest", GTK_RC_TOKEN_LOWEST },
+  { "gtk", GTK_RC_TOKEN_GTK },
+  { "application", GTK_RC_TOKEN_APPLICATION },
+  { "rc", GTK_RC_TOKEN_RC },
+  { "highest", GTK_RC_TOKEN_HIGHEST },
+  { "engine", GTK_RC_TOKEN_ENGINE },
+  { "module_path", GTK_RC_TOKEN_MODULE_PATH },
 };
-static guint nsymbols = sizeof (symbols) / sizeof (symbols[0]);
+
+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;
 
+#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];
 
 /* The files we have parsed, to reread later if necessary */
 GSList *rc_files = NULL;
 
 static GtkImageLoader image_loader = NULL;
 
+/* 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)
+{
+  gchar *var, *path;
+
+#ifndef NATIVE_WIN32
+  var = getenv("GTK_DATA_PREFIX");
+  if (var)
+    path = g_strdup_printf("%s%s", var, "/share/themes");
+  else
+    path = g_strdup_printf("%s%s", GTK_DATA_PREFIX, "/share/themes");
+#else
+  path = g_strdup (get_themes_directory ());
+#endif
+
+  return path;
+}
+
+gchar *
+gtk_rc_get_module_dir(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
+
+  return path;
+}
+
+static void
+gtk_rc_append_default_pixmap_path(void)
+{
+  gchar *var, *path;
+  gint n;
+
+#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)
+    {
+      g_free (path);
+      return;
+    }
+  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;
+}
+
+static void
+gtk_rc_append_default_module_path(void)
+{
+  gchar *var, *path;
+  gint n;
+
+  for (n = 0; module_path[n]; n++) ;
+  if (n >= GTK_RC_MAX_MODULE_PATHS - 1)
+    return;
+  
+#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
+  module_path[n++] = path;
+
+  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;
+}
+
+static void
+gtk_rc_add_initial_default_files (void)
+{
+  static gint init = FALSE;
+  gchar *var, *str;
+  gchar **files;
+  gint i;
+
+  if (init)
+    return;
+  
+  gtk_rc_default_files[0] = NULL;
+  init = TRUE;
+
+  var = g_getenv("GTK_RC_FILES");
+  if (var)
+    {
+      files = g_strsplit (var, G_SEARCHPATH_SEPARATOR_S, 128);
+      i=0;
+      while (files[i])
+       {
+         gtk_rc_add_default_file (files[i]);
+         i++;
+       }
+      g_strfreev (files);
+    }
+  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
+      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);
+         gtk_rc_add_default_file (str);
+         g_free (str);
+       }
+    }
+}
+
+void
+gtk_rc_add_default_file (const gchar *file)
+{
+  guint n;
+  
+  gtk_rc_add_initial_default_files ();
+
+  for (n = 0; gtk_rc_default_files[n]; n++) ;
+  if (n >= GTK_RC_MAX_DEFAULT_FILES - 1)
+    return;
+  
+  gtk_rc_default_files[n++] = g_strdup (file);
+  gtk_rc_default_files[n] = NULL;
+}
+
+void
+gtk_rc_set_default_files (gchar **files)
+{
+  gint i;
+
+  gtk_rc_add_initial_default_files ();
+
+  i = 0;
+  while (gtk_rc_default_files[i])
+    {
+      g_free (gtk_rc_default_files[i]);
+      i++;
+    }
+    
+  gtk_rc_default_files[0] = NULL;
+  gtk_rc_auto_parse = FALSE;
+
+  i = 0;
+  while (files[i] != NULL)
+    {
+      gtk_rc_add_default_file (files[i]);
+      i++;
+    }
+}
+
+gchar **
+gtk_rc_get_default_files (void)
+{
+  gtk_rc_add_initial_default_files ();
+
+  return gtk_rc_default_files;
+}
+
 void
 gtk_rc_init (void)
 {
+  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;
+
   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();
+
+  gtk_rc_add_initial_default_files ();
+
+  if (strcmp (locale, "C") && strcmp (locale, "POSIX"))
+    {
+      /* Determine locale-specific suffixes for RC files
+       */
+      p = strchr (locale, '@');
+      length = p ? (p -locale) : strlen (locale);
+      
+      p = strchr (locale, '.');
+      if (p)
+       {
+         locale_suffixes[n_locale_suffixes++] = g_strndup (locale, length);
+         length = p - locale;
+       }
+      
+      p = strchr (locale, '_');
+      if (p)
+       {
+         locale_suffixes[n_locale_suffixes++] = g_strndup (locale, length);
+         length = p - locale;
+       }
+
+      locale_suffixes[n_locale_suffixes++] = g_strndup (locale, length);
+    }
+  
+  i = 0;
+  while (gtk_rc_default_files[i] != NULL)
+    {
+      /* 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_parse (gtk_rc_default_files[i]);
+      i++;
+    }
+ }
 
 void
 gtk_rc_parse_string (const gchar *rc_string)
@@ -265,22 +571,18 @@ gtk_rc_parse_file (const gchar *filename, gboolean reload)
     {
       /* Get the absolute pathname */
 
-      if (rc_file->name[0] == '/')
+      if (g_path_is_absolute (rc_file->name))
        rc_file->canonical_name = rc_file->name;
       else
        {
          GString *str;
-         gchar buffer[MAXPATHLEN];
-         
-#if defined(sun) && !defined(__SVR4)
-         if(!getwd(buffer))
-#else
-         if(!getcwd(buffer, MAXPATHLEN))
-#endif    
-             return;
+         gchar *cwd;
+
+         cwd = g_get_current_dir ();
 
-         str = g_string_new (buffer);
-         g_string_append_c (str, '/');
+         str = g_string_new (cwd);
+         g_free (cwd);
+         g_string_append_c (str, G_DIR_SEPARATOR);
          g_string_append (str, rc_file->name);
          
          rc_file->canonical_name = str->str;
@@ -298,6 +600,16 @@ gtk_rc_parse_file (const gchar *filename, gboolean reload)
       if (fd < 0)
        return;
 
+       {
+         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);
 
       close (fd);
@@ -312,37 +624,74 @@ gtk_rc_parse (const gchar *filename)
   gtk_rc_parse_file (filename, TRUE);
 }
 
-static void
-gtk_rc_clear_hash_node (gpointer key, 
-                       gpointer data, 
-                       gpointer user_data)
+/* Handling of RC styles */
+
+GtkRcStyle *
+gtk_rc_style_new              (void)
 {
-  int i;
-  GtkRcStyle *rc_style = data;
-  GList *tmp_list;
+  GtkRcStyle *new_style;
 
-  g_free (rc_style->name);
-  g_free (rc_style->font_name);
-  g_free (rc_style->fontset_name);
+  new_style = g_new0 (GtkRcStyle, 1);
+  new_style->ref_count = 1;
 
-  for (i=0 ; i<5 ; i++)
-    g_free (rc_style->bg_pixmap_name[i]);
+  return new_style;
+}
 
-  gtk_style_unref (rc_style->proto_style);
+void      
+gtk_rc_style_ref (GtkRcStyle  *rc_style)
+{
+  g_return_if_fail (rc_style != NULL);
 
-  tmp_list = rc_style->styles;
-  while (tmp_list)
-    {
-      GtkRcNode *node = tmp_list->data;
+  rc_style->ref_count++;
+}
 
-      gdk_colormap_unref (node->cmap);
-      gtk_style_unref (node->style);
+void      
+gtk_rc_style_unref (GtkRcStyle  *rc_style)
+{
+  gint i;
 
-      g_free (node);
-      tmp_list = tmp_list->next;
+  g_return_if_fail (rc_style != NULL);
+  g_return_if_fail (rc_style->ref_count > 0);
+
+  rc_style->ref_count--;
+
+  if (rc_style->ref_count == 0)
+    {
+      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]);
+      
+      g_free (rc_style);
     }
+}
 
-  g_free (rc_style);
+static void
+gtk_rc_clear_realized_node (gpointer key,
+                           gpointer data,
+                           gpointer user_data)
+{
+  gtk_style_unref (data);
+}
+
+static void
+gtk_rc_clear_hash_node (gpointer key, 
+                       gpointer data, 
+                       gpointer user_data)
+{
+  gtk_rc_style_unref (data);
 }
 
 static void
@@ -365,9 +714,19 @@ gtk_rc_clear_styles (void)
 {
   /* Clear out all old rc_styles */
 
-  g_hash_table_foreach (rc_style_ht, gtk_rc_clear_hash_node, NULL);
-  g_hash_table_destroy (rc_style_ht);
-  rc_style_ht = NULL;
+  if (rc_style_ht)
+    {
+      g_hash_table_foreach (rc_style_ht, gtk_rc_clear_hash_node, NULL);
+      g_hash_table_destroy (rc_style_ht);
+      rc_style_ht = NULL;
+    }
+
+  if (realized_style_ht)
+    {
+      g_hash_table_foreach (realized_style_ht, gtk_rc_clear_realized_node, NULL);
+      g_hash_table_destroy (realized_style_ht);
+      realized_style_ht = NULL;
+    }
 
   gtk_rc_free_rc_sets (gtk_rc_sets_widget);
   g_slist_free (gtk_rc_sets_widget);
@@ -429,11 +788,13 @@ gtk_rc_reparse_all (void)
   return mtime_modified;
 }
 
-static GtkRcStyle*
-gtk_rc_styles_match (GSList      *sets,
+static GSList *
+gtk_rc_styles_match (GSList       *rc_styles,
+                    GSList       *sets,
                     guint         path_length,
                     gchar        *path,
                     gchar        *path_reversed)
+                    
 {
   GtkRcSet *rc_set;
 
@@ -443,16 +804,31 @@ gtk_rc_styles_match (GSList         *sets,
       sets = sets->next;
 
       if (gtk_pattern_match (&rc_set->pspec, path_length, path, path_reversed))
-       return rc_set->rc_style;
+       rc_styles = g_slist_append (rc_styles, rc_set->rc_style);
     }
   
-  return NULL;
+  return rc_styles;
 }
 
 GtkStyle*
 gtk_rc_get_style (GtkWidget *widget)
 {
-  GtkRcStyle *rc_style;
+  GtkRcStyle *widget_rc_style;
+  GSList *rc_styles = NULL;
+
+  static guint rc_style_key_id = 0;
+
+  /* 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)
     {
@@ -460,12 +836,10 @@ gtk_rc_get_style (GtkWidget *widget)
       guint path_length;
 
       gtk_widget_path (widget, &path_length, &path, &path_reversed);
-      rc_style = gtk_rc_styles_match (gtk_rc_sets_widget, path_length, path, path_reversed);
+      rc_styles = gtk_rc_styles_match (rc_styles, gtk_rc_sets_widget, path_length, path, path_reversed);
       g_free (path);
       g_free (path_reversed);
       
-      if (rc_style)
-       return gtk_rc_style_init (rc_style, gtk_widget_get_colormap (widget));
     }
   
   if (gtk_rc_sets_widget_class)
@@ -474,12 +848,9 @@ gtk_rc_get_style (GtkWidget *widget)
       guint path_length;
 
       gtk_widget_class_path (widget, &path_length, &path, &path_reversed);
-      rc_style = gtk_rc_styles_match (gtk_rc_sets_widget_class, path_length, path, path_reversed);
+      rc_styles = gtk_rc_styles_match (rc_styles, gtk_rc_sets_widget_class, path_length, path, path_reversed);
       g_free (path);
       g_free (path_reversed);
-      
-      if (rc_style)
-       return gtk_rc_style_init (rc_style, gtk_widget_get_colormap (widget));
     }
 
   if (gtk_rc_sets_class)
@@ -497,40 +868,37 @@ gtk_rc_get_style (GtkWidget *widget)
          path_reversed = g_strdup (path);
          g_strreverse (path_reversed);
          
-         rc_style = gtk_rc_styles_match (gtk_rc_sets_class, path_length, path, path_reversed);
+         rc_styles = gtk_rc_styles_match (rc_styles, gtk_rc_sets_class, path_length, path, path_reversed);
          g_free (path_reversed);
       
-         if (rc_style)
-           return gtk_rc_style_init (rc_style, gtk_widget_get_colormap (widget));
-
          type = gtk_type_parent (type);
        }
     }
   
+  if (rc_styles)
+    return gtk_rc_style_init (rc_styles);
+
   return NULL;
 }
 
 static GSList*
 gtk_rc_add_rc_sets (GSList     *slist,
-                   GtkStyle   *style,
+                   GtkRcStyle *rc_style,
                    const char *pattern)
 {
-  GtkRcStyle *rc_style;
+  GtkRcStyle *new_style;
   GtkRcSet *rc_set;
   guint i;
   
-  gtk_style_ref (style);
-  
-  rc_style = g_new (GtkRcStyle, 1);
-  rc_style->name = NULL;
-  rc_style->font_name = NULL;
-  rc_style->fontset_name = NULL;
+  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);
   
   for (i = 0; i < 5; i++)
-    rc_style->bg_pixmap_name[i] = NULL;
+    new_style->bg_pixmap_name[i] = g_strdup (rc_style->bg_pixmap_name[i]);
   
-  rc_style->styles = g_list_append (NULL, style);
-
   rc_set = g_new (GtkRcSet, 1);
   gtk_pattern_spec_init (&rc_set->pspec, pattern);
   rc_set->rc_style = rc_style;
@@ -539,33 +907,33 @@ gtk_rc_add_rc_sets (GSList     *slist,
 }
 
 void
-gtk_rc_add_widget_name_style (GtkStyle           *style,
+gtk_rc_add_widget_name_style (GtkRcStyle  *rc_style,
                              const gchar *pattern)
 {
-  g_return_if_fail (style != NULL);
+  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, style, pattern);
+  gtk_rc_sets_widget = gtk_rc_add_rc_sets (gtk_rc_sets_widget, rc_style, pattern);
 }
 
 void
-gtk_rc_add_widget_class_style (GtkStyle    *style,
+gtk_rc_add_widget_class_style (GtkRcStyle  *rc_style,
                               const gchar *pattern)
 {
-  g_return_if_fail (style != NULL);
+  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, style, pattern);
+  gtk_rc_sets_widget_class = gtk_rc_add_rc_sets (gtk_rc_sets_widget_class, rc_style, pattern);
 }
 
 void
-gtk_rc_add_class_style (GtkStyle    *style,
+gtk_rc_add_class_style (GtkRcStyle  *rc_style,
                        const gchar *pattern)
 {
-  g_return_if_fail (style != NULL);
+  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, style, pattern);
+  gtk_rc_sets_class = gtk_rc_add_rc_sets (gtk_rc_sets_class, rc_style, pattern);
 }
 
 static void
@@ -577,7 +945,7 @@ gtk_rc_parse_any (const gchar  *input_name,
   guint           i;
   gboolean done;
   
-  scanner = g_scanner_new (&gtk_rc_scanner_config);
+  scanner = g_scanner_new ((GScannerConfig *) &gtk_rc_scanner_config);
   
   if (input_fd >= 0)
     {
@@ -592,9 +960,9 @@ gtk_rc_parse_any (const gchar  *input_name,
       g_scanner_input_text (scanner, input_string, strlen (input_string));
     }
   scanner->input_name = input_name;
-  
+
   g_scanner_freeze_symbol_table (scanner);
-  for (i = 0; i < nsymbols; i++)
+  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);
   
@@ -615,25 +983,32 @@ gtk_rc_parse_any (const gchar  *input_name,
              gchar *msg;
              
              msg = NULL;
-             if (expected_token > TOKEN_INVALID &&
-                 expected_token < TOKEN_LAST)
-               {
-                 for (i = 0; i < nsymbols; i++)
-                   if (symbols[i].token == expected_token)
-                     msg = symbols[i].name;
-                 if (msg)
-                   msg = g_strconcat ("e.g. `", msg, "'", NULL);
-               }
-             if (scanner->token > TOKEN_INVALID &&
-                 scanner->token < TOKEN_LAST)
+             symbol_name = NULL;
+             if (scanner->scope_id == 0)
                {
-                 symbol_name = "???";
-                 for (i = 0; i < nsymbols; i++)
-                   if (symbols[i].token == scanner->token)
-                     symbol_name = symbols[i].name;
+                 /* if we are in scope 0, we know the symbol names
+                  * that are associated with certaintoken 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++)
+                       if (symbols[i].token == expected_token)
+                         msg = symbols[i].name;
+                     if (msg)
+                       msg = g_strconcat ("e.g. `", msg, "'", NULL);
+                   }
+                 if (scanner->token > GTK_RC_TOKEN_INVALID &&
+                     scanner->token < GTK_RC_TOKEN_LAST)
+                   {
+                     symbol_name = "???";
+                     for (i = 0; i < n_symbols; i++)
+                       if (symbols[i].token == scanner->token)
+                         symbol_name = symbols[i].name;
+                   }
                }
-             else
-               symbol_name = NULL;
              g_scanner_unexp_token (scanner,
                                     expected_token,
                                     NULL,
@@ -650,6 +1025,36 @@ gtk_rc_parse_any (const gchar  *input_name,
   g_scanner_destroy (scanner);
 }
 
+static guint      
+gtk_rc_styles_hash (const GSList *rc_styles)
+{
+  guint result;
+  
+  result = 0;
+  while (rc_styles)
+    {
+      result += (result << 9) + GPOINTER_TO_UINT (rc_styles->data);
+      rc_styles = rc_styles->next;
+    }
+  
+  return result;
+}
+
+static gint       
+gtk_rc_styles_compare (const GSList *a,
+                      const GSList *b)
+{
+  while (a && b)
+    {
+      if (a->data != b->data)
+       return FALSE;
+      a = a->next;
+      b = b->next;
+    }
+  
+  return (a == b);
+}
+
 static guint
 gtk_rc_style_hash (const char *name)
 {
@@ -679,94 +1084,153 @@ gtk_rc_style_find (const char *name)
   return rc_style;
 }
 
+/* Assumes ownership of rc_style */
 static GtkStyle *
-gtk_rc_style_init (GtkRcStyle *rc_style, GdkColormap *cmap)
+gtk_rc_style_to_style (GtkRcStyle *rc_style)
 {
+  GtkStyle *style;
   GdkFont *old_font;
-  gboolean match_cmap = FALSE;
   gint i;
 
-  GList *tmp_list;
-  GtkStyle *style = NULL;
-  GtkRcNode *node;
+  style = gtk_style_new ();
 
-  tmp_list = rc_style->styles;
+  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];
+    }
 
-  for (i=0; i<5; i++)
-    if (rc_style->bg_pixmap_name[i])
-      match_cmap = TRUE;
-      
-  while (tmp_list)
+  if (rc_style->engine)
     {
-      node = (GtkRcNode *)tmp_list->data;
+      style->engine = rc_style->engine;
+      gtk_theme_engine_ref (style->engine);
+      rc_style->engine->rc_style_to_style (style, rc_style);
+    }
 
-      if (!match_cmap || (node->cmap == cmap))
-       {
-         style = node->style;
-         break;
-       }
+  return style;
+}
+
+/* Reuses or frees rc_styles */
+static GtkStyle *
+gtk_rc_style_init (GSList *rc_styles)
+{
+  gint i;
+
+  GtkStyle *style = NULL;
+  GtkRcStyle *proto_style;
+
+  if (!realized_style_ht)
+    realized_style_ht = g_hash_table_new ((GHashFunc)gtk_rc_styles_hash,
+                                          (GCompareFunc)gtk_rc_styles_compare);
+
+  style = g_hash_table_lookup (realized_style_ht, rc_styles);
 
-      tmp_list = tmp_list->next;
-    }
-  
   if (!style)
     {
-      node = g_new (GtkRcNode, 1);
-      style = gtk_style_copy (rc_style->proto_style);
-
-     /* FIXME, this leaks colormaps, but if we don't do this, then we'll
-       * be screwed, because we identify colormaps by address equality
-       */
-      gdk_colormap_ref (cmap);
-      node->style = style;
-      node->cmap = cmap;
+      GSList *tmp_styles = rc_styles;
       
-      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)
+      proto_style = gtk_rc_style_new ();
+
+      while (tmp_styles)
        {
-         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;
+         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)
+           {
+             proto_style->engine = rc_style->engine;
+             gtk_theme_engine_ref (proto_style->engine);
+           }
+         
+         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;
        }
-      
-      for (i = 0; i < 5; i++)
-       if (rc_style->bg_pixmap_name[i])
+
+      for (i=0; i<5; i++)
+       if (proto_style->bg_pixmap_name[i] &&
+           (strcmp (proto_style->bg_pixmap_name[i], "<none>") == 0))
          {
-           if (strcmp (rc_style->bg_pixmap_name[i], "<parent>") == 0)
-             style->bg_pixmap[i] = (GdkPixmap*) GDK_PARENT_RELATIVE;
-           else
-             {
-               if(image_loader)
-                 style->bg_pixmap[i] = image_loader(NULL, cmap, NULL,
-                                                    &style->bg[i],
-                                                    rc_style->bg_pixmap_name[i]);
-               else
-                 style->bg_pixmap[i] = 
-                   gdk_pixmap_colormap_create_from_xpm (NULL, cmap,
-                                                        NULL,
-                                                        &style->bg[i],
-                                                        rc_style->bg_pixmap_name[i]);
-             }
+           g_free (proto_style->bg_pixmap_name[i]);
+           proto_style->bg_pixmap_name[i] = NULL;
          }
 
-      rc_style->styles = g_list_append (rc_style->styles, node);
+      style = gtk_rc_style_to_style (proto_style);
+
+      g_hash_table_insert (realized_style_ht, rc_styles, style);
     }
 
   return style;
 }
 
+/*********************
+ * Parsing functions *
+ *********************/
+
 static guint
 gtk_rc_parse_statement (GScanner *scanner)
 {
@@ -776,10 +1240,10 @@ gtk_rc_parse_statement (GScanner *scanner)
 
   switch (token)
     {
-    case TOKEN_INCLUDE:
+    case GTK_RC_TOKEN_INCLUDE:
       token = g_scanner_get_next_token (scanner);
-      if (token != TOKEN_INCLUDE)
-       return TOKEN_INCLUDE;
+      if (token != GTK_RC_TOKEN_INCLUDE)
+       return GTK_RC_TOKEN_INCLUDE;
 
       token = g_scanner_get_next_token (scanner);
       if (token != G_TOKEN_STRING)
@@ -788,24 +1252,30 @@ gtk_rc_parse_statement (GScanner *scanner)
       gtk_rc_parse_file (scanner->value.v_string, FALSE);
       return G_TOKEN_NONE;
 
-    case TOKEN_STYLE:
+    case GTK_RC_TOKEN_STYLE:
       return gtk_rc_parse_style (scanner);
 
-    case TOKEN_PIXMAP_PATH:
+    case GTK_RC_TOKEN_BINDING:
+      return gtk_binding_parse_binding (scanner);
+
+    case GTK_RC_TOKEN_PIXMAP_PATH:
       return gtk_rc_parse_pixmap_path (scanner);
 
-    case TOKEN_WIDGET:
+    case GTK_RC_TOKEN_WIDGET:
       return gtk_rc_parse_path_pattern (scanner);
 
-    case TOKEN_WIDGET_CLASS:
+    case GTK_RC_TOKEN_WIDGET_CLASS:
       return gtk_rc_parse_path_pattern (scanner);
 
-    case TOKEN_CLASS:
+    case GTK_RC_TOKEN_CLASS:
       return gtk_rc_parse_path_pattern (scanner);
 
+    case GTK_RC_TOKEN_MODULE_PATH:
+      return gtk_rc_parse_module_path (scanner);
+       
     default:
       g_scanner_get_next_token (scanner);
-      return /* G_TOKEN_SYMBOL */ TOKEN_STYLE;
+      return /* G_TOKEN_SYMBOL */ GTK_RC_TOKEN_STYLE;
     }
 }
 
@@ -819,8 +1289,8 @@ gtk_rc_parse_style (GScanner *scanner)
   gint i;
   
   token = g_scanner_get_next_token (scanner);
-  if (token != TOKEN_STYLE)
-    return TOKEN_STYLE;
+  if (token != GTK_RC_TOKEN_STYLE)
+    return GTK_RC_TOKEN_STYLE;
   
   token = g_scanner_get_next_token (scanner);
   if (token != G_TOKEN_STRING)
@@ -832,16 +1302,17 @@ gtk_rc_parse_style (GScanner *scanner)
   if (!rc_style)
     {
       insert = TRUE;
-      rc_style = g_new (GtkRcStyle, 1);
+      rc_style = gtk_rc_style_new ();
       rc_style->name = g_strdup (scanner->value.v_string);
-      rc_style->font_name = NULL;
-      rc_style->fontset_name = NULL;
       
       for (i = 0; i < 5; i++)
        rc_style->bg_pixmap_name[i] = NULL;
 
-      rc_style->proto_style = gtk_style_new();
-      rc_style->styles = NULL;
+      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);
@@ -853,10 +1324,8 @@ gtk_rc_parse_style (GScanner *scanner)
       if (token != G_TOKEN_STRING)
        {
          if (insert)
-           {
-             gtk_style_unref (rc_style->proto_style);
-             g_free (rc_style);
-           }
+           g_free (rc_style);
+
          return G_TOKEN_STRING;
        }
       
@@ -865,26 +1334,23 @@ gtk_rc_parse_style (GScanner *scanner)
        {
          for (i = 0; i < 5; i++)
            {
-             rc_style->proto_style->fg[i] = parent_style->proto_style->fg[i];
-             rc_style->proto_style->bg[i] = parent_style->proto_style->bg[i];
-             rc_style->proto_style->light[i] = parent_style->proto_style->light[i];
-             rc_style->proto_style->dark[i] = parent_style->proto_style->dark[i];
-             rc_style->proto_style->mid[i] = parent_style->proto_style->mid[i];
-             rc_style->proto_style->text[i] = parent_style->proto_style->text[i];
-             rc_style->proto_style->base[i] = parent_style->proto_style->base[i];
+             rc_style->color_flags[i] = parent_style->color_flags[i];
+             rc_style->fg[i] = parent_style->fg[i];
+             rc_style->bg[i] = parent_style->bg[i];
+             rc_style->text[i] = parent_style->text[i];
+             rc_style->base[i] = parent_style->base[i];
            }
          
-         rc_style->proto_style->black = parent_style->proto_style->black;
-         rc_style->proto_style->white = parent_style->proto_style->white;
-         
-         if (rc_style->fontset_name)
+         if (parent_style->fontset_name)
            {
-             g_free (rc_style->fontset_name);
+             if (rc_style->fontset_name)
+               g_free (rc_style->fontset_name);
              rc_style->fontset_name = g_strdup (parent_style->fontset_name);
            }
-         else if (rc_style->font_name)
+         else if (parent_style->font_name)
            {
-             g_free (rc_style->font_name);
+             if (rc_style->font_name)
+               g_free (rc_style->font_name);
              rc_style->font_name = g_strdup (parent_style->font_name);
            }
          
@@ -901,10 +1367,8 @@ gtk_rc_parse_style (GScanner *scanner)
   if (token != G_TOKEN_LEFT_CURLY)
     {
       if (insert)
-       {
-         gtk_style_unref (rc_style->proto_style);
-         g_free (rc_style);
-       }
+       g_free (rc_style);
+
       return G_TOKEN_LEFT_CURLY;
     }
   
@@ -913,27 +1377,30 @@ gtk_rc_parse_style (GScanner *scanner)
     {
       switch (token)
        {
-       case TOKEN_BASE:
-         token = gtk_rc_parse_base (scanner, rc_style->proto_style);
+       case GTK_RC_TOKEN_BASE:
+         token = gtk_rc_parse_base (scanner, rc_style);
          break;
-       case TOKEN_BG:
-         token = gtk_rc_parse_bg (scanner, rc_style->proto_style);
+       case GTK_RC_TOKEN_BG:
+         token = gtk_rc_parse_bg (scanner, rc_style);
          break;
-       case TOKEN_FG:
-         token = gtk_rc_parse_fg (scanner, rc_style->proto_style);
+       case GTK_RC_TOKEN_FG:
+         token = gtk_rc_parse_fg (scanner, rc_style);
          break;
-       case TOKEN_TEXT:
-         token = gtk_rc_parse_text (scanner, rc_style->proto_style);
+       case GTK_RC_TOKEN_TEXT:
+         token = gtk_rc_parse_text (scanner, rc_style);
          break;
-       case TOKEN_BG_PIXMAP:
+       case GTK_RC_TOKEN_BG_PIXMAP:
          token = gtk_rc_parse_bg_pixmap (scanner, rc_style);
          break;
-       case TOKEN_FONT:
+       case GTK_RC_TOKEN_FONT:
          token = gtk_rc_parse_font (scanner, rc_style);
          break;
-       case TOKEN_FONTSET:
+       case GTK_RC_TOKEN_FONTSET:
          token = gtk_rc_parse_fontset (scanner, rc_style);
          break;
+       case GTK_RC_TOKEN_ENGINE:
+         token = gtk_rc_parse_engine (scanner, rc_style);
+         break;
        default:
          g_scanner_get_next_token (scanner);
          token = G_TOKEN_RIGHT_CURLY;
@@ -951,7 +1418,6 @@ gtk_rc_parse_style (GScanner *scanner)
              for (i = 0; i < 5; i++)
                if (rc_style->bg_pixmap_name[i])
                  g_free (rc_style->bg_pixmap_name[i]);
-             gtk_style_unref (rc_style->proto_style);
              g_free (rc_style);
            }
          return token;
@@ -973,7 +1439,6 @@ gtk_rc_parse_style (GScanner *scanner)
            if (rc_style->bg_pixmap_name[i])
              g_free (rc_style->bg_pixmap_name[i]);
          
-         gtk_style_unref (rc_style->proto_style);
          g_free (rc_style);
        }
       return G_TOKEN_RIGHT_CURLY;
@@ -986,15 +1451,15 @@ gtk_rc_parse_style (GScanner *scanner)
 }
 
 static guint
-gtk_rc_parse_base (GScanner *scanner,
-                  GtkStyle *style)
+gtk_rc_parse_base (GScanner   *scanner,
+                  GtkRcStyle *style)
 {
   GtkStateType state;
   guint token;
   
   token = g_scanner_get_next_token (scanner);
-  if (token != TOKEN_BASE)
-    return TOKEN_BASE;
+  if (token != GTK_RC_TOKEN_BASE)
+    return GTK_RC_TOKEN_BASE;
   
   token = gtk_rc_parse_state (scanner, &state);
   if (token != G_TOKEN_NONE)
@@ -1003,20 +1468,21 @@ gtk_rc_parse_base (GScanner *scanner,
   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_bg (GScanner *scanner,
-                GtkStyle *style)
+gtk_rc_parse_bg (GScanner   *scanner,
+                GtkRcStyle *style)
 {
   GtkStateType state;
   guint token;
   
   token = g_scanner_get_next_token (scanner);
-  if (token != TOKEN_BG)
-    return TOKEN_BG;
+  if (token != GTK_RC_TOKEN_BG)
+    return GTK_RC_TOKEN_BG;
   
   token = gtk_rc_parse_state (scanner, &state);
   if (token != G_TOKEN_NONE)
@@ -1025,20 +1491,21 @@ gtk_rc_parse_bg (GScanner *scanner,
   token = g_scanner_get_next_token (scanner);
   if (token != G_TOKEN_EQUAL_SIGN)
     return G_TOKEN_EQUAL_SIGN;
-  
+
+  style->color_flags[state] |= GTK_RC_BG;
   return gtk_rc_parse_color (scanner, &style->bg[state]);
 }
 
 static guint
-gtk_rc_parse_fg (GScanner *scanner,
-                GtkStyle *style)
+gtk_rc_parse_fg (GScanner   *scanner,
+                GtkRcStyle *style)
 {
   GtkStateType state;
   guint token;
   
   token = g_scanner_get_next_token (scanner);
-  if (token != TOKEN_FG)
-    return TOKEN_FG;
+  if (token != GTK_RC_TOKEN_FG)
+    return GTK_RC_TOKEN_FG;
   
   token = gtk_rc_parse_state (scanner, &state);
   if (token != G_TOKEN_NONE)
@@ -1048,19 +1515,20 @@ gtk_rc_parse_fg (GScanner *scanner,
   if (token != G_TOKEN_EQUAL_SIGN)
     return G_TOKEN_EQUAL_SIGN;
   
+  style->color_flags[state] |= GTK_RC_FG;
   return gtk_rc_parse_color (scanner, &style->fg[state]);
 }
 
 static guint
-gtk_rc_parse_text (GScanner *scanner,
-                  GtkStyle *style)
+gtk_rc_parse_text (GScanner   *scanner,
+                  GtkRcStyle *style)
 {
   GtkStateType state;
   guint token;
   
   token = g_scanner_get_next_token (scanner);
-  if (token != TOKEN_TEXT)
-    return TOKEN_TEXT;
+  if (token != GTK_RC_TOKEN_TEXT)
+    return GTK_RC_TOKEN_TEXT;
   
   token = gtk_rc_parse_state (scanner, &state);
   if (token != G_TOKEN_NONE)
@@ -1070,6 +1538,7 @@ gtk_rc_parse_text (GScanner *scanner,
   if (token != G_TOKEN_EQUAL_SIGN)
     return G_TOKEN_EQUAL_SIGN;
   
+  style->color_flags[state] |= GTK_RC_TEXT;
   return gtk_rc_parse_color (scanner, &style->text[state]);
 }
 
@@ -1082,8 +1551,8 @@ gtk_rc_parse_bg_pixmap (GScanner   *scanner,
   gchar *pixmap_file;
   
   token = g_scanner_get_next_token (scanner);
-  if (token != TOKEN_BG_PIXMAP)
-    return TOKEN_BG_PIXMAP;
+  if (token != GTK_RC_TOKEN_BG_PIXMAP)
+    return GTK_RC_TOKEN_BG_PIXMAP;
   
   token = gtk_rc_parse_state (scanner, &state);
   if (token != G_TOKEN_NONE)
@@ -1097,10 +1566,11 @@ gtk_rc_parse_bg_pixmap (GScanner   *scanner,
   if (token != G_TOKEN_STRING)
     return G_TOKEN_STRING;
   
-  if (strcmp (scanner->value.v_string, "<parent>"))
-    pixmap_file = gtk_rc_find_pixmap_in_path (scanner, scanner->value.v_string);
-  else
+  if ((strcmp (scanner->value.v_string, "<parent>") == 0) ||
+      (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);
   
   if (pixmap_file)
     {
@@ -1112,9 +1582,9 @@ gtk_rc_parse_bg_pixmap (GScanner   *scanner,
   return G_TOKEN_NONE;
 }
 
-static gchar*
+gchar*
 gtk_rc_find_pixmap_in_path (GScanner *scanner,
-                           gchar    *pixmap_file)
+                           const gchar *pixmap_file)
 {
   gint i;
   gint fd;
@@ -1122,8 +1592,8 @@ gtk_rc_find_pixmap_in_path (GScanner *scanner,
   
   for (i = 0; (i < GTK_RC_MAX_PIXMAP_PATHS) && (pixmap_path[i] != NULL); i++)
     {
-      buf = g_malloc (strlen (pixmap_path[i]) + strlen (pixmap_file) + 2);
-      sprintf (buf, "%s%c%s", pixmap_path[i], '/', pixmap_file);
+      buf = g_strdup_printf ("%s" G_DIR_SEPARATOR_S "%s",
+                            pixmap_path[i], pixmap_file);
       
       fd = open (buf, O_RDONLY);
       if (fd >= 0)
@@ -1134,10 +1604,39 @@ gtk_rc_find_pixmap_in_path (GScanner *scanner,
       
       g_free (buf);
     }
+
+  if (scanner)
+    g_warning (_("Unable to locate image file in pixmap_path: \"%s\" line %d"),
+              pixmap_file, scanner->line);
+  else
+    g_warning (_("Unable to locate image file in pixmap_path: \"%s\""),
+              pixmap_file);
+    
+  return NULL;
+}
+
+gchar*
+gtk_rc_find_module_in_path (const gchar *module_file)
+{
+  gint i;
+  gint fd;
+  gchar *buf;
   
-  g_warning ("Unable to locate image file in pixmap_path: \"%s\" line %d",
-            pixmap_file, scanner->line);
-  
+  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;
 }
 
@@ -1148,8 +1647,8 @@ gtk_rc_parse_font (GScanner   *scanner,
   guint token;
   
   token = g_scanner_get_next_token (scanner);
-  if (token != TOKEN_FONT)
-    return TOKEN_FONT;
+  if (token != GTK_RC_TOKEN_FONT)
+    return GTK_RC_TOKEN_FONT;
   
   token = g_scanner_get_next_token (scanner);
   if (token != G_TOKEN_EQUAL_SIGN)
@@ -1173,8 +1672,8 @@ gtk_rc_parse_fontset (GScanner     *scanner,
   guint token;
   
   token = g_scanner_get_next_token (scanner);
-  if (token != TOKEN_FONTSET)
-    return TOKEN_FONTSET;
+  if (token != GTK_RC_TOKEN_FONTSET)
+    return GTK_RC_TOKEN_FONTSET;
   
   token = g_scanner_get_next_token (scanner);
   if (token != G_TOKEN_EQUAL_SIGN)
@@ -1191,11 +1690,63 @@ gtk_rc_parse_fontset (GScanner   *scanner,
   return G_TOKEN_NONE;
 }
 
-static guint
+static guint      
+gtk_rc_parse_engine (GScanner   *scanner,
+                    GtkRcStyle  *rc_style)
+{
+  guint token;
+
+  token = g_scanner_get_next_token (scanner);
+  if (token != GTK_RC_TOKEN_ENGINE)
+    return GTK_RC_TOKEN_ENGINE;
+
+  token = g_scanner_get_next_token (scanner);
+  if (token != G_TOKEN_STRING)
+    return G_TOKEN_STRING;
+
+  rc_style->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 (rc_style->engine)
+    return rc_style->engine->parse_rc_style (scanner, rc_style);
+  else
+    {
+      /* Skip over remainder, looking for nested {}'s */
+      guint count = 1;
+      
+      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;
+       }
+
+      return G_TOKEN_RIGHT_CURLY;
+    }
+}
+
+guint
 gtk_rc_parse_state (GScanner    *scanner,
                    GtkStateType *state)
 {
+  guint old_scope;
   guint token;
+
+  g_return_val_if_fail (scanner != NULL, G_TOKEN_ERROR);
+  g_return_val_if_fail (state != NULL, G_TOKEN_ERROR);
+  
+  /* we don't know where we got called from, so we reset the scope here.
+   * if we bail out due to errors, we *don't* reset the scope, so the
+   * error messaging code can make sense of our tokens.
+   */
+  old_scope = g_scanner_set_scope (scanner, 0);
   
   token = g_scanner_get_next_token (scanner);
   if (token != G_TOKEN_LEFT_BRACE)
@@ -1204,37 +1755,92 @@ gtk_rc_parse_state (GScanner     *scanner,
   token = g_scanner_get_next_token (scanner);
   switch (token)
     {
-    case TOKEN_ACTIVE:
+    case GTK_RC_TOKEN_ACTIVE:
       *state = GTK_STATE_ACTIVE;
       break;
-    case TOKEN_INSENSITIVE:
+    case GTK_RC_TOKEN_INSENSITIVE:
       *state = GTK_STATE_INSENSITIVE;
       break;
-    case TOKEN_NORMAL:
+    case GTK_RC_TOKEN_NORMAL:
       *state = GTK_STATE_NORMAL;
       break;
-    case TOKEN_PRELIGHT:
+    case GTK_RC_TOKEN_PRELIGHT:
       *state = GTK_STATE_PRELIGHT;
       break;
-    case TOKEN_SELECTED:
+    case GTK_RC_TOKEN_SELECTED:
       *state = GTK_STATE_SELECTED;
       break;
     default:
-      return /* G_TOKEN_SYMBOL */ TOKEN_NORMAL;
+      return /* G_TOKEN_SYMBOL */ GTK_RC_TOKEN_NORMAL;
     }
   
   token = g_scanner_get_next_token (scanner);
   if (token != G_TOKEN_RIGHT_BRACE)
     return G_TOKEN_RIGHT_BRACE;
   
+  g_scanner_set_scope (scanner, old_scope);
+
   return G_TOKEN_NONE;
 }
 
-static guint
+guint
+gtk_rc_parse_priority (GScanner                   *scanner,
+                      GtkPathPriorityType *priority)
+{
+  guint old_scope;
+  guint token;
+
+  g_return_val_if_fail (scanner != NULL, G_TOKEN_ERROR);
+  g_return_val_if_fail (priority != NULL, G_TOKEN_ERROR);
+
+  /* we don't know where we got called from, so we reset the scope here.
+   * if we bail out due to errors, we *don't* reset the scope, so the
+   * error messaging code can make sense of our tokens.
+   */
+  old_scope = g_scanner_set_scope (scanner, 0);
+  
+  token = g_scanner_get_next_token (scanner);
+  if (token != ':')
+    return ':';
+  
+  token = g_scanner_get_next_token (scanner);
+  switch (token)
+    {
+    case GTK_RC_TOKEN_LOWEST:
+      *priority = GTK_PATH_PRIO_LOWEST;
+      break;
+    case GTK_RC_TOKEN_GTK:
+      *priority = GTK_PATH_PRIO_GTK;
+      break;
+    case GTK_RC_TOKEN_APPLICATION:
+      *priority = GTK_PATH_PRIO_APPLICATION;
+      break;
+    case GTK_RC_TOKEN_RC:
+      *priority = GTK_PATH_PRIO_RC;
+      break;
+    case GTK_RC_TOKEN_HIGHEST:
+      *priority = GTK_PATH_PRIO_HIGHEST;
+      break;
+    default:
+      return /* G_TOKEN_SYMBOL */ GTK_RC_TOKEN_APPLICATION;
+    }
+  
+  g_scanner_set_scope (scanner, old_scope);
+
+  return G_TOKEN_NONE;
+}
+
+guint
 gtk_rc_parse_color (GScanner *scanner,
                    GdkColor *color)
 {
   guint token;
+
+  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 own symbols
+   */
   
   token = g_scanner_get_next_token (scanner);
   switch (token)
@@ -1347,8 +1953,8 @@ gtk_rc_parse_pixmap_path (GScanner *scanner)
   guint token;
   
   token = g_scanner_get_next_token (scanner);
-  if (token != TOKEN_PIXMAP_PATH)
-    return TOKEN_PIXMAP_PATH;
+  if (token != GTK_RC_TOKEN_PIXMAP_PATH)
+    return GTK_RC_TOKEN_PIXMAP_PATH;
   
   token = g_scanner_get_next_token (scanner);
   if (token != G_TOKEN_STRING)
@@ -1383,7 +1989,7 @@ gtk_rc_parse_pixmap_path_string (gchar *pix_path)
   
   for (end_offset = 0; end_offset <= path_len; end_offset++)
     {
-      if ((buf[end_offset] == ':') ||
+      if ((buf[end_offset] == G_SEARCHPATH_SEPARATOR) ||
          (end_offset == path_len))
        {
          buf[end_offset] = '\0';
@@ -1394,6 +2000,63 @@ gtk_rc_parse_pixmap_path_string (gchar *pix_path)
        }
     }
   g_free (buf);
+  gtk_rc_append_default_pixmap_path();
+}
+
+static guint
+gtk_rc_parse_module_path (GScanner *scanner)
+{
+  guint token;
+  
+  token = g_scanner_get_next_token (scanner);
+  if (token != GTK_RC_TOKEN_MODULE_PATH)
+    return GTK_RC_TOKEN_MODULE_PATH;
+  
+  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);
+  
+  return G_TOKEN_NONE;
+}
+
+static void
+gtk_rc_parse_module_path_string (gchar *mod_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; 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);
+  
+  buf = g_strdup (mod_path);
+  
+  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();
 }
 
 static guint
@@ -1403,21 +2066,22 @@ gtk_rc_parse_path_pattern (GScanner   *scanner)
   GtkPathType path_type;
   gchar *pattern;
   gboolean is_binding;
+  GtkPathPriorityType priority = GTK_PATH_PRIO_RC;
   
   token = g_scanner_get_next_token (scanner);
   switch (token)
     {
-    case TOKEN_WIDGET:
+    case GTK_RC_TOKEN_WIDGET:
       path_type = GTK_PATH_WIDGET;
       break;
-    case TOKEN_WIDGET_CLASS:
+    case GTK_RC_TOKEN_WIDGET_CLASS:
       path_type = GTK_PATH_WIDGET_CLASS;
       break;
-    case TOKEN_CLASS:
+    case GTK_RC_TOKEN_CLASS:
       path_type = GTK_PATH_CLASS;
       break;
     default:
-      return TOKEN_WIDGET_CLASS;
+      return GTK_RC_TOKEN_WIDGET_CLASS;
     }
   
   token = g_scanner_get_next_token (scanner);
@@ -1427,14 +2091,25 @@ gtk_rc_parse_path_pattern (GScanner   *scanner)
   pattern = g_strdup (scanner->value.v_string);
 
   token = g_scanner_get_next_token (scanner);
-  if (token == TOKEN_STYLE)
+  if (token == GTK_RC_TOKEN_STYLE)
     is_binding = FALSE;
-  else if (token == TOKEN_BINDING)
-    is_binding = TRUE;
+  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;
+           }
+       }
+    }
   else
     {
       g_free (pattern);
-      return TOKEN_STYLE;
+      return GTK_RC_TOKEN_STYLE;
     }
   
   token = g_scanner_get_next_token (scanner);
@@ -1454,7 +2129,7 @@ gtk_rc_parse_path_pattern (GScanner   *scanner)
          g_free (pattern);
          return G_TOKEN_STRING;
        }
-      gtk_binding_set_add_path (binding, path_type, pattern, GTK_PATH_PRIO_RC);
+      gtk_binding_set_add_path (binding, path_type, pattern, priority);
     }
   else
     {
@@ -1496,6 +2171,25 @@ typedef  GdkPixmap * (*GtkImageLoader) (GdkWindow   *window,
 void
 gtk_rc_set_image_loader(GtkImageLoader loader)
 {
-       image_loader = loader;
+  image_loader = loader;
 }
 
+GdkPixmap *
+gtk_rc_load_image (GdkColormap *colormap,
+                  GdkColor    *transparent_color,
+                  const gchar *filename)
+{
+  if (strcmp (filename, "<parent>") == 0)
+    return (GdkPixmap*) GDK_PARENT_RELATIVE;
+  else
+    {
+      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);
+    }
+}