X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkrc.c;h=82700ebf47e1ee3db5c0222509b187a6fe231a00;hb=439d61b96fab7635c5487c7eb5bc89fe90bf78bd;hp=65c5bc3c30ae7e699d672c521929a65180f6d68c;hpb=98e453dc0457c00220a82468c1a140bb68bb455d;p=~andy%2Fgtk diff --git a/gtk/gtkrc.c b/gtk/gtkrc.c index 65c5bc3c3..82700ebf4 100644 --- a/gtk/gtkrc.c +++ b/gtk/gtkrc.c @@ -26,12 +26,7 @@ #include "config.h" -#ifdef GDK_WINDOWING_X11 -#include /* so we get the right setlocale */ -#else #include -#endif -#include #ifdef HAVE_UNISTD_H #include #endif @@ -51,14 +46,18 @@ #include #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 /* For GetWindowsDirectory */ #include #endif @@ -68,39 +67,80 @@ 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 gboolean gtk_rc_style_equal (const char *a, - const char *b); +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, +static gboolean gtk_rc_styles_equal (const GSList *a, const GSList *b); -static GtkRcStyle* gtk_rc_style_find (const char *name); +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, - gchar *path, - gchar *path_reversed); -static GtkStyle * gtk_rc_style_to_style (GtkRcStyle *rc_style); -static GtkStyle* gtk_rc_init_style (GSList *rc_styles); -static void gtk_rc_parse_file (const gchar *filename, + 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 (const gchar *input_name, +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 (GScanner *scanner); -static guint gtk_rc_parse_style (GScanner *scanner); +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, @@ -113,7 +153,8 @@ 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 (GScanner *scanner, +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); @@ -121,36 +162,41 @@ 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 (GScanner *scanner, +static guint gtk_rc_parse_engine (GtkRcContext *context, + 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_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 void gtk_rc_parse_module_path_string (gchar *mod_path); -static guint gtk_rc_parse_im_module_path (GScanner *scanner); static guint gtk_rc_parse_im_module_file (GScanner *scanner); -static guint gtk_rc_parse_path_pattern (GScanner *scanner); -static guint gtk_rc_parse_stock (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 (void); -static void gtk_rc_append_default_module_path (void); +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_clone (GtkRcStyle *rc_style); -static GtkStyle * gtk_rc_style_real_create_style (GtkRcStyle *rc_style); +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" @@ -222,129 +268,84 @@ 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_path", GTK_RC_TOKEN_IM_MODULE_PATH }, { "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 *realized_style_ht = NULL; -static gchar *im_module_path = NULL; static gchar *im_module_file = NULL; -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]; /* A stack of directories for RC files we are parsing currently. * these are implicitely added to the end of PIXMAP_PATHS */ -GSList *rc_dir_stack = NULL; +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 G_OS_WIN32 - -gchar * -gtk_win32_get_installation_directory (void) -{ - static gboolean been_here = FALSE; - static gchar gtk_installation_dir[200]; - gchar win_dir[100]; - HKEY reg_key = NULL; - DWORD type; - DWORD nbytes = sizeof (gtk_installation_dir); - - if (been_here) - return gtk_installation_dir; - - been_here = TRUE; - - if (RegOpenKeyEx (HKEY_LOCAL_MACHINE, "Software\\GNU\\GTk+", 0, - KEY_QUERY_VALUE, ®_key) != ERROR_SUCCESS - || RegQueryValueEx (reg_key, "InstallationDirectory", 0, - &type, gtk_installation_dir, &nbytes) != ERROR_SUCCESS - || type != REG_SZ) - { - /* Uh oh. Use the old hard-coded %WinDir%\GTk+ value */ - GetWindowsDirectory (win_dir, sizeof (win_dir)); - sprintf (gtk_installation_dir, "%s\\gtk+", win_dir); - } - - if (reg_key != NULL) - RegCloseKey (reg_key); - - return gtk_installation_dir; -} - -static gchar * -get_themes_directory (void) -{ - static gchar themes_dir[200]; - - sprintf (themes_dir, "%s\\themes", gtk_win32_get_installation_directory ()); - return themes_dir; -} - -#endif - static gchar * gtk_rc_make_default_dir (const gchar *type) { - gchar *var, *path; + const gchar *var; + gchar *path; -#ifndef G_OS_WIN32 - var = getenv("GTK_EXE_PREFIX"); + var = g_getenv ("GTK_EXE_PREFIX"); if (var) - path = g_strdup_printf("%s%s%s", var, "/lib/gtk-2.0/" GTK_VERSION "/", type); + path = g_build_filename (var, "lib", "gtk-2.0", GTK_BINARY_VERSION, type, NULL); else - path = g_strdup_printf("%s%s%s", GTK_EXE_PREFIX, "/lib/gtk-2.0/" GTK_VERSION "/", type); -#else - path = g_strdup_printf ("%s\\%s", get_themes_directory (), type); -#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 GTK_PATH + * 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_im_module_path (void) { - gchar *result = g_getenv ("GTK_IM_MODULE_PATH"); - - if (!result) - { - if (im_module_path) - result = im_module_path; - else - return gtk_rc_make_default_dir ("immodules"); - } + gchar **paths = _gtk_get_module_path ("immodules"); + gchar *result = g_strjoinv (G_SEARCHPATH_SEPARATOR_S, paths); + g_strfreev (paths); - return g_strdup (result); + return result; } +/** + * 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 GTK_IM_MODULE_FILE + * environment variable for more details. + */ gchar * gtk_rc_get_im_module_file (void) { @@ -355,87 +356,49 @@ gtk_rc_get_im_module_file (void) if (im_module_file) result = g_strdup (im_module_file); else -#ifndef G_OS_WIN32 - result = g_strdup (GTK_SYSCONFDIR G_DIR_SEPARATOR_S "gtk-2.0" G_DIR_SEPARATOR_S "gtk.immodules"); -#else - result = g_strdup_printf ("%s\\gtk.immodules", gtk_win32_get_installation_directory ()); -#endif + result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtk.immodules", NULL); } return result; } gchar * -gtk_rc_get_theme_dir(void) +gtk_rc_get_theme_dir (void) { - gchar *var, *path; + const gchar *var; + gchar *path; -#ifndef G_OS_WIN32 - var = getenv("GTK_DATA_PREFIX"); + var = g_getenv ("GTK_DATA_PREFIX"); if (var) - path = g_strdup_printf("%s%s", var, "/share/themes"); + path = g_build_filename (var, "share", "themes", 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_DATA_PREFIX, "share", "themes", 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 GTK_PATH in + * . + * + * return value: the directory. (Must be freed with g_free()) + **/ gchar * -gtk_rc_get_module_dir(void) +gtk_rc_get_module_dir (void) { return gtk_rc_make_default_dir ("engines"); } -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 G_OS_WIN32 - var = getenv("GTK_EXE_PREFIX"); - if (var) - path = g_strdup_printf("%s%s", var, "/lib/gtk-2.0/" GTK_VERSION "/engines"); - else - path = g_strdup_printf("%s%s", GTK_EXE_PREFIX, "/lib/gtk-2.0/" GTK_VERSION "/engines"); -#else - path = g_strdup_printf ("%s%s", get_themes_directory (), "\\engines"); -#endif - module_path[n++] = path; - - var = g_get_home_dir (); - if (var) - { - gchar *sep; - /* Don't duplicate the directory separator, causes trouble at - * least on Windows. - */ - if (var[strlen (var) -1] != G_DIR_SEPARATOR) - sep = G_DIR_SEPARATOR_S; - else - sep = ""; - /* This produces something like ~/.gtk-2.0/2.0/engines */ - path = g_strdup_printf ("%s%s%s", var, sep, - ".gtk-2.0" G_DIR_SEPARATOR_S - GTK_VERSION G_DIR_SEPARATOR_S - "engines"); - module_path[n++] = path; - } - module_path[n] = NULL; -} - 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; @@ -445,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); @@ -459,11 +422,7 @@ gtk_rc_add_initial_default_files (void) } else { -#ifndef G_OS_WIN32 - str = g_strdup (GTK_SYSCONFDIR G_DIR_SEPARATOR_S "gtk-2.0" G_DIR_SEPARATOR_S "gtkrc"); -#else - str = g_strdup_printf ("%s\\gtkrc", gtk_win32_get_installation_directory ()); -#endif + str = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtkrc", NULL); gtk_rc_add_default_file (str); g_free (str); @@ -471,20 +430,23 @@ gtk_rc_add_initial_default_files (void) var = g_get_home_dir (); if (var) { - gchar *sep; - if (var[strlen (var) -1] != G_DIR_SEPARATOR) - sep = G_DIR_SEPARATOR_S; - else - sep = ""; - str = g_strdup_printf ("%s%s.gtkrc-2.0", var, sep); + 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; @@ -494,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; @@ -513,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) { @@ -531,186 +509,262 @@ gtk_rc_get_default_files (void) return gtk_rc_default_files; } - /* The following routine is based on _nl_normalize_codeset from - * the GNU C library. Contributed by - * - * Contributed by Ulrich Drepper , 1995. - * Copyright (C) 1995, 1996, 1997, 1998, 1999 Free Software Foundation, Inc. - * - * Normalize codeset name. There is no standard for the codeset - * names. Normalization allows the user to use any of the common - * names. - */ - static char * - _gtk_normalize_codeset (const char *codeset, int name_len) - { - int len = 0; - int only_digit = 1; - char *retval; - char *wp; - int cnt; - - for (cnt = 0; cnt < name_len; ++cnt) - if (isalnum (codeset[cnt])) - { - ++len; - - if (isalpha (codeset[cnt])) - only_digit = 0; - } - - retval = g_malloc ((only_digit ? 3 : 0) + len + 1); - - if (only_digit) - { - strcpy (retval, "iso"); - wp = retval + 3; - } - else - wp = retval; - - for (cnt = 0; cnt < name_len; ++cnt) - if (isalpha (codeset[cnt])) - *wp++ = isupper(codeset[cnt]) ? tolower (codeset[cnt]) : codeset[cnt]; - else if (isdigit (codeset[cnt])) - *wp++ = codeset[cnt]; - - *wp = '\0'; - - return retval; - } - -void -gtk_rc_init (void) +static void +gtk_rc_settings_changed (GtkSettings *settings, + GParamSpec *pspec, + GtkRcContext *context) { - static gchar *locale_suffixes[3]; - static gint n_locale_suffixes = 0; + gchar *new_theme_name; + gchar *new_key_theme_name; - gint i, j; + g_object_get (settings, + "gtk-theme-name", &new_theme_name, + "gtk-key-theme-name", &new_key_theme_name, + NULL); - static gboolean initted = FALSE; - - if (!initted) + 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))) { - gint length; - gchar *locale; - gchar *p; + gtk_rc_reparse_all_for_settings (settings, TRUE); + } -#ifdef G_OS_WIN32 - locale = g_win32_getlocale (); -#else - locale = setlocale (LC_CTYPE, NULL); -#endif - - initted = TRUE; + g_free (new_theme_name); + g_free (new_key_theme_name); +} + +static void +gtk_rc_font_name_changed (GtkSettings *settings, + GParamSpec *pspec, + GtkRcContext *context) +{ + _gtk_rc_context_get_default_font_name (settings); +} + +static GtkRcContext * +gtk_rc_context_get (GtkSettings *settings) +{ + if (!settings->rc_context) + { + 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); - pixmap_path[0] = NULL; - module_path[0] = NULL; - gtk_rc_append_default_module_path(); - gtk_rc_add_initial_default_files (); + context->pixmap_path[0] = NULL; - if (strcmp (locale, "C") && strcmp (locale, "POSIX")) - { - /* Determine locale-specific suffixes for RC files - * - * We normalize the charset into a standard form, - * which has all '-' and '_' characters removed, - * and is lowercase. - */ - gchar *normalized_locale; - - p = strchr (locale, '@'); - length = p ? (p -locale) : strlen (locale); - - p = strchr (locale, '.'); - if (p) - { - gchar *tmp1 = g_strndup (locale, p - locale + 1); - gchar *tmp2 = _gtk_normalize_codeset (p + 1, length - (p - locale + 1)); - - normalized_locale = g_strconcat (tmp1, tmp2, NULL); - g_free (tmp1); - g_free (tmp2); - - locale_suffixes[n_locale_suffixes++] = g_strdup (normalized_locale); - length = p - locale; - } - else - normalized_locale = g_strndup (locale, length); - - p = strchr (normalized_locale, '_'); - if (p) - { - locale_suffixes[n_locale_suffixes++] = g_strndup (normalized_locale, length); - length = p - normalized_locale; - } - - locale_suffixes[n_locale_suffixes++] = g_strndup (normalized_locale, length); + context->default_priority = GTK_PATH_PRIO_RC; - g_free (normalized_locale); - } + 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"); - i = 0; - while (gtk_rc_default_files[i] != NULL) + /* First look in the users home directory + */ + home_dir = g_get_home_dir (); + if (home_dir) { - /* 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--) + path = g_build_filename (home_dir, ".themes", name, subpath, NULL); + if (!g_file_test (path, G_FILE_TEST_EXISTS)) { - gchar *name = g_strconcat (gtk_rc_default_files[i], - ".", - locale_suffixes[j], - NULL); - gtk_rc_parse (name); - g_free (name); + 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); + + if (!g_file_test (path, G_FILE_TEST_EXISTS)) + { + g_free (path); + path = NULL; } + } - gtk_rc_parse (gtk_rc_default_files[i]); - i++; + if (path) + { + gtk_rc_context_parse_file (context, path, GTK_PATH_PRIO_THEME, FALSE); + g_free (path); } + + g_free (subpath); } -void -gtk_rc_parse_string (const gchar *rc_string) +static void +gtk_rc_parse_default_files (GtkRcContext *context) { - g_return_if_fail (rc_string != NULL); + gint i; - gtk_rc_parse_any ("-", -1, rc_string); + 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_parse_file (const gchar *filename, gboolean reload) +gtk_rc_context_parse_string (GtkRcContext *context, + const gchar *rc_string) { - GtkRcFile *rc_file = NULL; - struct stat statbuf; + 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); - g_return_if_fail (filename != NULL); + 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); - tmp_list = rc_files; + for (tmp_list = rc_contexts; tmp_list; tmp_list = tmp_list->next) + gtk_rc_context_parse_string (tmp_list->data, rc_string); +} + +static GtkRcFile * +add_to_rc_file_list (GSList **rc_file_list, + const char *filename, + gboolean reload) +{ + GSList *tmp_list; + 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 */ @@ -719,18 +773,11 @@ 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); } } @@ -743,7 +790,7 @@ gtk_rc_parse_file (const gchar *filename, gboolean reload) fd = open (rc_file->canonical_name, O_RDONLY); if (fd < 0) - return; + goto out; /* Temporarily push directory name for this file on * a stack of directory names while parsing it @@ -751,7 +798,7 @@ gtk_rc_parse_file (const gchar *filename, gboolean reload) rc_dir_stack = g_slist_prepend (rc_dir_stack, g_path_get_dirname (rc_file->canonical_name)); - gtk_rc_parse_any (filename, fd, NULL); + gtk_rc_parse_any (context, filename, fd, NULL); tmp_list = rc_dir_stack; rc_dir_stack = rc_dir_stack->next; @@ -761,14 +808,98 @@ gtk_rc_parse_file (const gchar *filename, gboolean reload) close (fd); } + + out: + context->default_priority = saved_priority; +} + +static gchar * +strchr_len (const gchar *str, gint len, char c) +{ + while (len--) + { + if (*str == c) + return (gchar *)str; + + str++; + } + + return NULL; +} + +static void +gtk_rc_context_parse_file (GtkRcContext *context, + const gchar *filename, + gint priority, + gboolean reload) +{ + 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 + + 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; + + 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_parse (const gchar *filename) { + GSList *tmp_list; + g_return_if_fail (filename != NULL); - gtk_rc_parse_file (filename, TRUE); + 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); } /* Handling of RC styles */ @@ -776,11 +907,11 @@ gtk_rc_parse (const gchar *filename) GType gtk_rc_style_get_type (void) { - static GType object_type = 0; + static GType rc_style_type = 0; - if (!object_type) + if (!rc_style_type) { - static const GTypeInfo object_info = + static const GTypeInfo rc_style_info = { sizeof (GtkRcStyleClass), (GBaseInitFunc) NULL, @@ -793,12 +924,11 @@ gtk_rc_style_get_type (void) (GInstanceInitFunc) gtk_rc_style_init, }; - object_type = g_type_register_static (G_TYPE_OBJECT, - "GtkRcStyle", - &object_info, 0); + rc_style_type = g_type_register_static (G_TYPE_OBJECT, "GtkRcStyle", + &rc_style_info, 0); } - return object_type; + return rc_style_type; } static void @@ -807,6 +937,8 @@ gtk_rc_style_init (GtkRcStyle *style) guint i; style->name = NULL; + style->font_desc = NULL; + for (i = 0; i < 5; i++) { static const GdkColor init_color = { 0, 0, 0, 0, }; @@ -820,7 +952,10 @@ gtk_rc_style_init (GtkRcStyle *style) } style->xthickness = -1; style->ythickness = -1; + style->rc_properties = NULL; + style->rc_style_lists = NULL; + style->icon_factories = NULL; } static void @@ -833,55 +968,17 @@ gtk_rc_style_class_init (GtkRcStyleClass *klass) object_class->finalize = gtk_rc_style_finalize; klass->parse = NULL; - klass->clone = gtk_rc_style_real_clone; + 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; } -/* Like g_slist_remove, but remove all copies of data */ -static GSList* -gtk_rc_slist_remove_all (GSList *list, - gpointer data) -{ - GSList *tmp; - GSList *prev; - - prev = NULL; - tmp = list; - - while (tmp) - { - if (tmp->data == data) - { - if (list == tmp) - list = list->next; - - if (prev) - prev->next = tmp->next; - - g_slist_free_1 (tmp); - - if (prev) - tmp = prev->next; - else - tmp = list; - } - else - { - prev = tmp; - tmp = tmp->next; - } - } - - return list; -} - static void gtk_rc_style_finalize (GObject *object) { - gint i; GSList *tmp_list1, *tmp_list2; GtkRcStyle *rc_style; + gint i; rc_style = GTK_RC_STYLE (object); @@ -890,7 +987,7 @@ gtk_rc_style_finalize (GObject *object) if (rc_style->font_desc) pango_font_description_free (rc_style->font_desc); - for (i=0 ; i < 5 ; i++) + for (i = 0; i < 5; i++) if (rc_style->bg_pixmap_name[i]) g_free (rc_style->bg_pixmap_name[i]); @@ -902,7 +999,7 @@ gtk_rc_style_finalize (GObject *object) { GSList *rc_styles = tmp_list1->data; GtkStyle *style = g_hash_table_lookup (realized_style_ht, rc_styles); - gtk_style_unref (style); + g_object_unref (style); /* Remove the list of styles from the other rc_styles * in the list @@ -913,9 +1010,8 @@ gtk_rc_style_finalize (GObject *object) GtkRcStyle *other_style = tmp_list2->data; if (other_style != rc_style) - other_style->rc_style_lists = - gtk_rc_slist_remove_all (other_style->rc_style_lists, rc_styles); - + other_style->rc_style_lists = g_slist_remove_all (other_style->rc_style_lists, + rc_styles); tmp_list2 = tmp_list2->next; } @@ -926,18 +1022,30 @@ gtk_rc_style_finalize (GObject *object) tmp_list1 = tmp_list1->next; } - g_slist_free (rc_style->rc_style_lists); - tmp_list1 = rc_style->icon_factories; - while (tmp_list1) + if (rc_style->rc_properties) { - g_object_unref (G_OBJECT (tmp_list1->data)); + guint i; - tmp_list1 = tmp_list1->next; + 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; } - g_slist_free (rc_style->icon_factories); + 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); } @@ -956,8 +1064,8 @@ gtk_rc_style_new (void) * gtk_rc_style_copy: * @orig: the style to copy * - * Make a copy of the specified #GtkRcStyle. This function - * will correctly copy an rc style that is a member of a class + * 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 @@ -969,34 +1077,99 @@ gtk_rc_style_copy (GtkRcStyle *orig) g_return_val_if_fail (GTK_IS_RC_STYLE (orig), NULL); - style = GTK_RC_STYLE_GET_CLASS (orig)->clone (orig); + 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) +gtk_rc_style_ref (GtkRcStyle *rc_style) { g_return_if_fail (GTK_IS_RC_STYLE (rc_style)); - g_object_ref (G_OBJECT (rc_style)); + g_object_ref (rc_style); } void -gtk_rc_style_unref (GtkRcStyle *rc_style) +gtk_rc_style_unref (GtkRcStyle *rc_style) { g_return_if_fail (GTK_IS_RC_STYLE (rc_style)); - g_object_unref (G_OBJECT (rc_style)); + g_object_unref (rc_style); } static GtkRcStyle * -gtk_rc_style_real_clone (GtkRcStyle *style) +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) @@ -1039,8 +1212,23 @@ gtk_rc_style_real_merge (GtkRcStyle *dest, if (dest->ythickness < 0 && src->ythickness >= 0) dest->ythickness = src->ythickness; - if (!dest->font_desc && src->font_desc) - dest->font_desc = pango_font_description_copy (src->font_desc); + 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 * @@ -1065,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; @@ -1073,81 +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; } - gtk_rc_free_rc_sets (gtk_rc_sets_widget); - g_slist_free (gtk_rc_sets_widget); - gtk_rc_sets_widget = NULL; + 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; - gtk_rc_free_rc_sets (gtk_rc_sets_widget_class); - g_slist_free (gtk_rc_sets_widget_class); - gtk_rc_sets_widget_class = NULL; + g_return_if_fail (GTK_IS_SETTINGS (settings)); - gtk_rc_free_rc_sets (gtk_rc_sets_class); - g_slist_free (gtk_rc_sets_class); - gtk_rc_sets_class = NULL; + 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_style, NULL); + g_hash_table_destroy (realized_style_ht); + realized_style_ht = NULL; + reset = TRUE; + } + + if (reset) + gtk_rc_reset_widgets (settings); } +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); + + context = gtk_rc_context_get (settings); + + g_object_get (context->settings, + "gtk-font-name", &new_font_name, + NULL); + + 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 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 mtime_modified; + 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; @@ -1157,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: + * + * gtk_widget_path (widget, NULL, &path, NULL); + * gtk_widget_class_path (widget, NULL, &class_path, NULL); + * gtk_rc_get_style_by_paths (gtk_widget_get_settings (widget), path, class_path, + * G_OBJECT_TYPE (widget)); + * + * + * 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; + + 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); + } - type = GTK_OBJECT_TYPE (widget); + 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_init_style (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; @@ -1254,7 +1821,7 @@ gtk_rc_add_rc_sets (GSList *slist, 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); @@ -1264,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 (>k_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 *) >k_rc_scanner_config); + + scanner = gtk_rc_scanner_new (); if (input_fd >= 0) { @@ -1315,8 +1901,8 @@ gtk_rc_parse_any (const gchar *input_name, } scanner->input_name = input_name; - for (i = 0; i < n_symbols; i++) - g_scanner_add_symbol (scanner, symbols[i].name, GINT_TO_POINTER (symbols[i].token)); + 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) @@ -1327,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) { @@ -1339,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) @@ -1356,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; } @@ -1408,7 +1994,7 @@ gtk_rc_styles_equal (const GSList *a, } static guint -gtk_rc_style_hash (const char *name) +gtk_rc_style_hash (const gchar *name) { guint result; @@ -1420,27 +2006,30 @@ gtk_rc_style_hash (const char *name) } static gboolean -gtk_rc_style_equal (const char *a, - const char *b) +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) { - if (rc_style_ht) - return g_hash_table_lookup (rc_style_ht, (gpointer) name); + if (context->rc_style_ht) + return g_hash_table_lookup (context->rc_style_ht, (gpointer) name); else return NULL; } static GtkStyle * -gtk_rc_style_to_style (GtkRcStyle *rc_style) +gtk_rc_style_to_style (GtkRcContext *context, + GtkRcStyle *rc_style) { GtkStyle *style; 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; @@ -1453,7 +2042,8 @@ gtk_rc_style_to_style (GtkRcStyle *rc_style) /* Reuses or frees rc_styles */ static GtkStyle * -gtk_rc_init_style (GSList *rc_styles) +gtk_rc_init_style (GtkRcContext *context, + GSList *rc_styles) { GtkStyle *style = NULL; gint i; @@ -1462,7 +2052,7 @@ gtk_rc_init_style (GSList *rc_styles) if (!realized_style_ht) realized_style_ht = g_hash_table_new ((GHashFunc) gtk_rc_styles_hash, - (GEqualFunc) gtk_rc_styles_equal); + (GEqualFunc) gtk_rc_styles_equal); style = g_hash_table_lookup (realized_style_ht, rc_styles); @@ -1474,9 +2064,10 @@ gtk_rc_init_style (GSList *rc_styles) GSList *tmp_styles; GType rc_style_type = GTK_TYPE_RC_STYLE; - /* Find the first derived style in the list, and use that to - * create the merged style. If we only have raw GtkRcStyles, use - * the first style to create the merged 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; @@ -1484,7 +2075,8 @@ gtk_rc_init_style (GSList *rc_styles) { GtkRcStyle *rc_style = tmp_styles->data; - if (G_OBJECT_TYPE (rc_style) != rc_style_type) + if (rc_style->engine_specified || + G_OBJECT_TYPE (rc_style) != rc_style_type) { base_style = rc_style; break; @@ -1494,7 +2086,7 @@ gtk_rc_init_style (GSList *rc_styles) } proto_style_class = GTK_RC_STYLE_GET_CLASS (base_style); - proto_style = proto_style_class->clone (base_style); + proto_style = proto_style_class->create_rc_style (base_style); tmp_styles = rc_styles; while (tmp_styles) @@ -1516,7 +2108,7 @@ gtk_rc_init_style (GSList *rc_styles) iter = factories; while (iter != NULL) { - g_object_ref (G_OBJECT (iter->data)); + g_object_ref (iter->data); iter = g_slist_next (iter); } @@ -1536,7 +2128,7 @@ gtk_rc_init_style (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); @@ -1552,66 +2144,355 @@ gtk_rc_init_style (GSList *rc_styles) *********************/ static guint -gtk_rc_parse_statement (GScanner *scanner) +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 (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_PATH: - return gtk_rc_parse_im_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; @@ -1623,8 +2504,11 @@ gtk_rc_parse_style (GScanner *scanner) if (token != G_TOKEN_STRING) return G_TOKEN_STRING; - insert = FALSE; - rc_style = gtk_rc_style_find (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 @@ -1634,7 +2518,6 @@ gtk_rc_parse_style (GScanner *scanner) if (!rc_style) { - insert = TRUE; rc_style = gtk_rc_style_new (); rc_style->name = g_strdup (scanner->value.v_string); @@ -1653,13 +2536,11 @@ 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 = gtk_rc_style_find (scanner->value.v_string); + parent_style = gtk_rc_style_find (context, scanner->value.v_string); if (parent_style) { GSList *factories; @@ -1682,6 +2563,16 @@ gtk_rc_parse_style (GScanner *scanner) pango_font_description_free (rc_style->font_desc); rc_style->font_desc = pango_font_description_copy (parent_style->font_desc); } + + if (parent_style->rc_properties) + { + 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++) { @@ -1714,7 +2605,7 @@ gtk_rc_parse_style (GScanner *scanner) factories = parent_style->icon_factories; while (factories != NULL) { - g_object_ref (G_OBJECT (factories->data)); + g_object_ref (factories->data); factories = factories->next; } } @@ -1724,10 +2615,8 @@ gtk_rc_parse_style (GScanner *scanner) 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); @@ -1754,7 +2643,7 @@ gtk_rc_parse_style (GScanner *scanner) 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); @@ -1766,7 +2655,7 @@ gtk_rc_parse_style (GScanner *scanner) 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) @@ -1775,8 +2664,51 @@ gtk_rc_parse_style (GScanner *scanner) rc_style->icon_factories = g_slist_prepend (rc_style->icon_factories, our_factory); } - token = gtk_rc_parse_stock (scanner, rc_style, 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); token = G_TOKEN_RIGHT_CURLY; @@ -1784,49 +2716,70 @@ gtk_rc_parse_style (GScanner *scanner) } if (token != G_TOKEN_NONE) - { - if (insert) - { - 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]); - 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->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]); - - g_free (rc_style); - } - return G_TOKEN_RIGHT_CURLY; + token = G_TOKEN_RIGHT_CURLY; + goto err; } - if (insert) + if (rc_style != orig_style) { - if (!rc_style_ht) - rc_style_ht = g_hash_table_new ((GHashFunc) gtk_rc_style_hash, - (GEqualFunc) gtk_rc_style_equal); + 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_insert (rc_style_ht, rc_style->name, rc_style); + 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; +} + +const GtkRcProperty* +_gtk_rc_style_lookup_rc_property (GtkRcStyle *rc_style, + GQuark type_name, + GQuark property_name) +{ + GtkRcProperty *node = NULL; + + 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 @@ -1958,8 +2911,9 @@ gtk_rc_parse_ythickness (GScanner *scanner, } static guint -gtk_rc_parse_bg_pixmap (GScanner *scanner, - GtkRcStyle *rc_style) +gtk_rc_parse_bg_pixmap (GtkRcContext *context, + GScanner *scanner, + GtkRcStyle *rc_style) { GtkStateType state; guint token; @@ -1985,7 +2939,8 @@ gtk_rc_parse_bg_pixmap (GScanner *scanner, (strcmp (scanner->value.v_string, "") == 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) { @@ -2003,7 +2958,7 @@ gtk_rc_check_pixmap_dir (const gchar *dir, const gchar *pixmap_file) gchar *buf; gint fd; - buf = g_strdup_printf ("%s" G_DIR_SEPARATOR_S "%s", dir, pixmap_file); + buf = g_build_filename (dir, pixmap_file, NULL); fd = open (buf, O_RDONLY); if (fd >= 0) @@ -2016,18 +2971,34 @@ gtk_rc_check_pixmap_dir (const gchar *dir, const gchar *pixmap_file) 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 (GScanner *scanner, - const gchar *pixmap_file) +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) && (pixmap_path[i] != NULL); i++) + for (i = 0; (i < GTK_RC_MAX_PIXMAP_PATHS) && (context->pixmap_path[i] != NULL); i++) { - filename = gtk_rc_check_pixmap_dir (pixmap_path[i], pixmap_file); + filename = gtk_rc_check_pixmap_dir (context->pixmap_path[i], pixmap_file); if (filename) return filename; } @@ -2043,8 +3014,9 @@ gtk_rc_find_pixmap_in_path (GScanner *scanner, } 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); @@ -2052,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 @@ -2141,14 +3104,19 @@ gtk_rc_parse_font_name (GScanner *scanner, if (token != G_TOKEN_STRING) return G_TOKEN_STRING; - rc_style->font_desc = pango_font_description_from_string (scanner->value.v_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; @@ -2164,34 +3132,62 @@ gtk_rc_parse_engine (GScanner *scanner, if (token != G_TOKEN_STRING) return G_TOKEN_STRING; - 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) + if (!scanner->value.v_string[0]) { - GtkRcStyleClass *new_class; + /* 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; - new_style = gtk_theme_engine_create_rc_style (engine); - g_type_module_unuse (G_TYPE_MODULE (engine)); + token = g_scanner_get_next_token (scanner); + if (token != G_TOKEN_RIGHT_CURLY) + return G_TOKEN_RIGHT_CURLY; - new_class = GTK_RC_STYLE_GET_CLASS (new_style); + parsed_curlies = TRUE; - new_class->merge (new_style, *rc_style); - if ((*rc_style)->name) - new_style->name = g_strdup ((*rc_style)->name); + 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 + { + 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 (new_class->parse) + if (engine) { - parsed_curlies = TRUE; - result = new_class->parse (new_style, scanner); - - if (result != G_TOKEN_NONE) + 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) { - g_object_unref (G_OBJECT (new_style)); - new_style = NULL; + 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; + } } } } @@ -2220,7 +3216,9 @@ gtk_rc_parse_engine (GScanner *scanner, if (new_style) { - g_object_unref (G_OBJECT (*rc_style)); + new_style->engine_specified = TRUE; + + g_object_unref (*rc_style); *rc_style = new_style; } @@ -2310,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; @@ -2333,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 */ @@ -2341,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); @@ -2388,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; @@ -2443,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; @@ -2455,46 +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); } static guint @@ -2506,32 +3472,11 @@ gtk_rc_parse_module_path (GScanner *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 guint -gtk_rc_parse_im_module_path (GScanner *scanner) -{ - guint token; - - token = g_scanner_get_next_token (scanner); - if (token != GTK_RC_TOKEN_IM_MODULE_FILE) - return GTK_RC_TOKEN_IM_MODULE_FILE; - token = g_scanner_get_next_token (scanner); if (token != G_TOKEN_STRING) return G_TOKEN_STRING; - if (im_module_path) - g_free (im_module_path); - - im_module_path = g_strdup (scanner->value.v_string); + g_warning ("module_path directive is now ignored\n"); return G_TOKEN_NONE; } @@ -2557,52 +3502,15 @@ gtk_rc_parse_im_module_file (GScanner *scanner) 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 -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) @@ -2619,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; @@ -2630,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) { @@ -2672,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) { @@ -2681,15 +3588,16 @@ 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); @@ -2723,21 +3631,15 @@ gtk_rc_parse_stock_id (GScanner *scanner, return G_TOKEN_NONE; } -static void -cleanup_source (GtkIconSource *source) -{ - g_free (source->filename); - g_free (source->size); -} - static guint -gtk_rc_parse_icon_source (GScanner *scanner, - GtkIconSet *icon_set) +gtk_rc_parse_icon_source (GtkRcContext *context, + GScanner *scanner, + GtkIconSet *icon_set, + gboolean *icon_set_valid) { guint token; - GtkIconSource source = { NULL, NULL, - 0, 0, 0, - TRUE, TRUE, TRUE }; + GtkIconSource *source; + gchar *full_filename; token = g_scanner_get_next_token (scanner); if (token != G_TOKEN_LEFT_CURLY) @@ -2747,20 +3649,28 @@ gtk_rc_parse_icon_source (GScanner *scanner, if (token != G_TOKEN_STRING) return G_TOKEN_STRING; + - source.filename = g_strdup (scanner->value.v_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) - { - gtk_icon_set_add_source (icon_set, &source); - cleanup_source (&source); - return G_TOKEN_NONE; - } + goto done; else if (token != G_TOKEN_COMMA) { - cleanup_source (&source); + gtk_icon_source_free (source); return G_TOKEN_COMMA; } @@ -2771,20 +3681,20 @@ gtk_rc_parse_icon_source (GScanner *scanner, switch (token) { case GTK_RC_TOKEN_RTL: - source.any_direction = FALSE; - source.direction = GTK_TEXT_DIR_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: - source.any_direction = FALSE; - source.direction = GTK_TEXT_DIR_LTR; + gtk_icon_source_set_direction_wildcarded (source, FALSE); + gtk_icon_source_set_direction (source, GTK_TEXT_DIR_LTR); break; case '*': break; default: - cleanup_source (&source); + gtk_icon_source_free (source); return GTK_RC_TOKEN_RTL; break; } @@ -2792,14 +3702,10 @@ gtk_rc_parse_icon_source (GScanner *scanner, token = g_scanner_get_next_token (scanner); if (token == G_TOKEN_RIGHT_CURLY) - { - gtk_icon_set_add_source (icon_set, &source); - cleanup_source (&source); - return G_TOKEN_NONE; - } + goto done; else if (token != G_TOKEN_COMMA) { - cleanup_source (&source); + gtk_icon_source_free (source); return G_TOKEN_COMMA; } @@ -2810,36 +3716,36 @@ gtk_rc_parse_icon_source (GScanner *scanner, switch (token) { case GTK_RC_TOKEN_NORMAL: - source.any_state = FALSE; - source.state = GTK_STATE_NORMAL; + gtk_icon_source_set_state_wildcarded (source, FALSE); + gtk_icon_source_set_state (source, GTK_STATE_NORMAL); break; case GTK_RC_TOKEN_PRELIGHT: - source.any_state = FALSE; - source.state = GTK_STATE_PRELIGHT; + gtk_icon_source_set_state_wildcarded (source, FALSE); + gtk_icon_source_set_state (source, GTK_STATE_PRELIGHT); break; case GTK_RC_TOKEN_INSENSITIVE: - source.any_state = FALSE; - source.state = GTK_STATE_INSENSITIVE; + gtk_icon_source_set_state_wildcarded (source, FALSE); + gtk_icon_source_set_state (source, GTK_STATE_INSENSITIVE); break; case GTK_RC_TOKEN_ACTIVE: - source.any_state = FALSE; - source.state = GTK_STATE_ACTIVE; + gtk_icon_source_set_state_wildcarded (source, FALSE); + gtk_icon_source_set_state (source, GTK_STATE_ACTIVE); break; case GTK_RC_TOKEN_SELECTED: - source.any_state = FALSE; - source.state = GTK_STATE_SELECTED; + gtk_icon_source_set_state_wildcarded (source, FALSE); + gtk_icon_source_set_state (source, GTK_STATE_SELECTED); break; case '*': break; default: - cleanup_source (&source); + gtk_icon_source_free (source); return GTK_RC_TOKEN_PRELIGHT; break; } @@ -2847,14 +3753,10 @@ gtk_rc_parse_icon_source (GScanner *scanner, token = g_scanner_get_next_token (scanner); if (token == G_TOKEN_RIGHT_CURLY) - { - gtk_icon_set_add_source (icon_set, &source); - cleanup_source (&source); - return G_TOKEN_NONE; - } + goto done; else if (token != G_TOKEN_COMMA) { - cleanup_source (&source); + gtk_icon_source_free (source); return G_TOKEN_COMMA; } @@ -2864,14 +3766,21 @@ gtk_rc_parse_icon_source (GScanner *scanner, if (token != '*') { + GtkIconSize size; + if (token != G_TOKEN_STRING) { - cleanup_source (&source); + gtk_icon_source_free (source); return G_TOKEN_STRING; } - - source.size = g_strdup (scanner->value.v_string); - source.any_size = FALSE; + + 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 */ @@ -2879,23 +3788,29 @@ gtk_rc_parse_icon_source (GScanner *scanner, token = g_scanner_get_next_token (scanner); if (token != G_TOKEN_RIGHT_CURLY) { - cleanup_source (&source); + gtk_icon_source_free (source); return G_TOKEN_RIGHT_CURLY; } - gtk_icon_set_add_source (icon_set, &source); - - cleanup_source (&source); + 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; } static guint -gtk_rc_parse_stock (GScanner *scanner, +gtk_rc_parse_stock (GtkRcContext *context, + GScanner *scanner, GtkRcStyle *rc_style, GtkIconFactory *factory) { GtkIconSet *icon_set = NULL; + gboolean icon_set_valid = FALSE; gchar *stock_id = NULL; guint token; @@ -2927,7 +3842,8 @@ gtk_rc_parse_stock (GScanner *scanner, if (icon_set == NULL) icon_set = gtk_icon_set_new (); - token = gtk_rc_parse_icon_source (scanner, icon_set); + token = gtk_rc_parse_icon_source (context, + scanner, icon_set, &icon_set_valid); if (token != G_TOKEN_NONE) { g_free (stock_id); @@ -2948,10 +3864,11 @@ gtk_rc_parse_stock (GScanner *scanner, if (icon_set) { - gtk_icon_factory_add (factory, - stock_id, - icon_set); - + if (icon_set_valid) + gtk_icon_factory_add (factory, + stock_id, + icon_set); + gtk_icon_set_unref (icon_set); } @@ -2959,37 +3876,3 @@ gtk_rc_parse_stock (GScanner *scanner, return G_TOKEN_NONE; } - -/* -typedef GdkPixmap * (*GtkImageLoader) (GdkWindow *window, - GdkColormap *colormap, - GdkBitmap **mask, - GdkColor *transparent_color, - const gchar *filename); -*/ - -void -gtk_rc_set_image_loader(GtkImageLoader loader) -{ - image_loader = loader; -} - -GdkPixmap * -gtk_rc_load_image (GdkColormap *colormap, - GdkColor *transparent_color, - const gchar *filename) -{ - if (strcmp (filename, "") == 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); - } -}