X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkrc.c;h=82700ebf47e1ee3db5c0222509b187a6fe231a00;hb=439d61b96fab7635c5487c7eb5bc89fe90bf78bd;hp=dabbfa041f849ca9a2052b3c2eb1860397ed2ece;hpb=ab65e779883b65130a0c7840361943ca82f4ceb6;p=~andy%2Fgtk diff --git a/gtk/gtkrc.c b/gtk/gtkrc.c index dabbfa041..82700ebf4 100644 --- a/gtk/gtkrc.c +++ b/gtk/gtkrc.c @@ -27,7 +27,6 @@ #include "config.h" #include -#include #ifdef HAVE_UNISTD_H #include #endif @@ -53,6 +52,7 @@ #include "gtkthemes.h" #include "gtkintl.h" #include "gtkiconfactory.h" +#include "gtkmain.h" #include "gtkprivate.h" #include "gtksettings.h" #include "gtkwindow.h" @@ -96,10 +96,12 @@ struct _GtkRcContext 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 GtkRcContext *gtk_rc_context_get (GtkSettings *settings); @@ -117,13 +119,15 @@ static GSList * gtk_rc_styles_match (GSList *rc_styles guint path_length, const gchar *path, const gchar *path_reversed); -static GtkStyle * gtk_rc_style_to_style (GtkRcStyle *rc_style); -static GtkStyle* gtk_rc_init_style (GSList *rc_styles); +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_parse_file (GtkRcContext *context, +static void gtk_rc_context_parse_file (GtkRcContext *context, const gchar *filename, gint priority, gboolean reload); @@ -167,8 +171,6 @@ 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 (const 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 (GtkRcContext *context, GScanner *scanner); @@ -180,7 +182,6 @@ static void gtk_rc_clear_hash_node (gpointer key, gpointer data, gpointer user_data); static void gtk_rc_clear_styles (GtkRcContext *context); -static void gtk_rc_append_default_module_path (void); static void gtk_rc_add_initial_default_files (void); static void gtk_rc_style_init (GtkRcStyle *style); @@ -273,7 +274,6 @@ static const struct { "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 } @@ -281,20 +281,24 @@ static const struct static GHashTable *realized_style_ht = NULL; -static gchar *im_module_path = NULL; static gchar *im_module_file = NULL; #define GTK_RC_MAX_DEFAULT_FILES 128 static gchar *gtk_rc_default_files[GTK_RC_MAX_DEFAULT_FILES]; -#define GTK_RC_MAX_MODULE_PATHS 128 -static gchar *module_path[GTK_RC_MAX_MODULE_PATHS]; - /* A stack of directories for RC files we are parsing currently. * these are implicitely added to the end of PIXMAP_PATHS */ static GSList *rc_dir_stack = NULL; +/* RC files and strings that are parsed for every context + */ +static GSList *global_rc_files = NULL; + +/* Keep list of all current RC contexts for convenience + */ +static GSList *rc_contexts; + /* RC file handling */ static gchar * @@ -305,9 +309,9 @@ gtk_rc_make_default_dir (const gchar *type) var = g_getenv ("GTK_EXE_PREFIX"); if (var) - path = g_build_filename (var, "lib", "gtk-2.0", type, GTK_BINARY_VERSION, NULL); + path = g_build_filename (var, "lib", "gtk-2.0", GTK_BINARY_VERSION, type, NULL); else - path = g_build_filename (GTK_LIBDIR, "gtk-2.0", type, GTK_BINARY_VERSION, NULL); + path = g_build_filename (GTK_LIBDIR, "gtk-2.0", GTK_BINARY_VERSION, type, NULL); return path; } @@ -318,29 +322,25 @@ gtk_rc_make_default_dir (const gchar *type) * look for IM modules. * * Obtains the path in which to look for IM modules. See the documentation - * of the GTK_IM_MODULE_PATH - * environment variable for more details. + * 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) { - const gchar *result = g_getenv ("GTK_IM_MODULE_PATH"); + gchar **paths = _gtk_get_module_path ("immodules"); + gchar *result = g_strjoinv (G_SEARCHPATH_SEPARATOR_S, paths); + g_strfreev (paths); - if (!result) - { - if (im_module_path) - result = im_module_path; - else - return gtk_rc_make_default_dir ("immodules"); - } - - 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 to load + * listing the IM modules available for loading * * Obtains the path to the IM modules file. See the documentation * of the GTK_IM_MODULE_FILE @@ -377,39 +377,22 @@ gtk_rc_get_theme_dir (void) 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) { return gtk_rc_make_default_dir ("engines"); } -static void -gtk_rc_append_default_module_path (void) -{ - const gchar *var; - gchar *path; - gint n; - - for (n = 0; module_path[n]; n++) ; - if (n >= GTK_RC_MAX_MODULE_PATHS - 1) - return; - - var = g_getenv ("GTK_EXE_PREFIX"); - if (var) - path = g_build_filename (var, "lib", "gtk-2.0", GTK_VERSION, "engines", NULL); - else - path = g_build_filename (GTK_LIBDIR, "gtk-2.0", GTK_VERSION, "engines", NULL); - module_path[n++] = path; - - var = g_get_home_dir (); - if (var) - { - path = g_build_filename (var, ".gtk-2.0", GTK_VERSION, "engines", NULL); - module_path[n++] = path; - } - module_path[n] = NULL; -} - static void gtk_rc_add_initial_default_files (void) { @@ -425,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); @@ -456,7 +439,8 @@ gtk_rc_add_initial_default_files (void) /** * gtk_rc_add_default_file: - * @filename: the pathname to the 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(). @@ -550,6 +534,14 @@ gtk_rc_settings_changed (GtkSettings *settings, 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) { @@ -563,10 +555,12 @@ gtk_rc_context_get (GtkSettings *settings) 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, @@ -577,10 +571,17 @@ gtk_rc_context_get (GtkSettings *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); + context->pixmap_path[0] = NULL; context->default_priority = GTK_PATH_PRIO_RC; + + rc_contexts = g_slist_prepend (rc_contexts, settings->rc_context); } return settings->rc_context; @@ -630,7 +631,7 @@ gtk_rc_parse_named (GtkRcContext *context, if (path) { - gtk_rc_parse_file (context, path, GTK_PATH_PRIO_THEME, FALSE); + gtk_rc_context_parse_file (context, path, GTK_PATH_PRIO_THEME, FALSE); g_free (path); } @@ -643,7 +644,7 @@ gtk_rc_parse_default_files (GtkRcContext *context) gint i; for (i = 0; gtk_rc_default_files[i] != NULL; i++) - gtk_rc_parse_file (context, gtk_rc_default_files[i], GTK_PATH_PRIO_RC, FALSE); + gtk_rc_context_parse_file (context, gtk_rc_default_files[i], GTK_PATH_PRIO_RC, FALSE); } void @@ -655,23 +656,52 @@ _gtk_rc_init (void) { initialized = TRUE; - module_path[0] = NULL; - gtk_rc_append_default_module_path(); - gtk_rc_add_initial_default_files (); } - gtk_rc_reparse_all_for_settings (gtk_settings_get_default (), TRUE); + /* Default RC string */ + gtk_rc_parse_string ("style \"gtk-default-tooltips-style\" {\n" + " bg[NORMAL] = \"#eee1b3\"\n" + " fg[NORMAL] = \"#000000\"\n" + "}\n" + "\n" + "style \"gtk-default-progress-bar-style\" {\n" + " bg[PRELIGHT] = \"#4b6983\"\n" + " fg[PRELIGHT] = \"#ffffff\"\n" + " bg[NORMAL] = \"#bab5ab\"\n" + "}\n" + "\n" + "style \"gtk-default-menu-item-style\" {\n" + " bg[PRELIGHT] = \"#4b6983\"\n" + " fg[PRELIGHT] = \"#ffffff\"\n" + " base[PRELIGHT] = \"#4b6983\"\n" + " text[PRELIGHT] = \"#ffffff\"\n" + "}\n" + "\n" + "class \"GtkProgressBar\" style : gtk \"gtk-default-progress-bar-style\"\n" + "widget \"gtk-tooltips*\" style : gtk \"gtk-default-tooltips-style\"\n" + "class \"GtkMenuItem\" style : gtk \"gtk-default-menu-item-style\"\n" + "widget_class \"*.GtkMenuItem.*\" style : gtk \"gtk-default-menu-item-style\"\n" + "widget_class \"*.GtkAccelMenuItem.*\" style : gtk \"gtk-default-menu-item-style\"\n" + "widget_class \"*.GtkRadioMenuItem.*\" style : gtk \"gtk-default-menu-item-style\"\n" + "widget_class \"*.GtkCheckMenuItem.*\" style : gtk \"gtk-default-menu-item-style\"\n" + "widget_class \"*.GtkImageMenuItem.*\" style : gtk \"gtk-default-menu-item-style\"\n" + "widget_class \"*.GtkSeparatorMenuItem.*\" style : gtk \"gtk-default-menu-item-style\"\n" + ); } +static void +gtk_rc_context_parse_string (GtkRcContext *context, + const gchar *rc_string) +{ + gtk_rc_parse_any (context, "-", -1, rc_string); +} + void gtk_rc_parse_string (const gchar *rc_string) { GtkRcFile *rc_file; - /* This is wrong; once we have meaningful multiple RC contexts, we need to parse the - * string in all contexts, and in fact, in future contexts as well. - */ - GtkRcContext *context = gtk_rc_context_get (gtk_settings_get_default ()); + GSList *tmp_list; g_return_if_fail (rc_string != NULL); @@ -682,49 +712,59 @@ gtk_rc_parse_string (const gchar *rc_string) rc_file->mtime = 0; rc_file->reload = TRUE; - context->rc_files = g_slist_append (context->rc_files, rc_file); + global_rc_files = g_slist_append (global_rc_files, rc_file); - gtk_rc_parse_any (context, "-", -1, rc_string); + for (tmp_list = rc_contexts; tmp_list; tmp_list = tmp_list->next) + gtk_rc_context_parse_string (tmp_list->data, rc_string); } -static void -gtk_rc_parse_one_file (GtkRcContext *context, - const gchar *filename, - gint priority, - gboolean reload) +static GtkRcFile * +add_to_rc_file_list (GSList **rc_file_list, + const char *filename, + gboolean reload) { - GtkRcFile *rc_file = NULL; - struct stat statbuf; GSList *tmp_list; - gint saved_priority; - - g_return_if_fail (filename != NULL); - - saved_priority = context->default_priority; - context->default_priority = priority; + GtkRcFile *rc_file; - tmp_list = context->rc_files; + 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->is_string = FALSE; - 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; +} - context->rc_files = g_slist_append (context->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 */ @@ -788,10 +828,10 @@ strchr_len (const gchar *str, gint len, char c) } static void -gtk_rc_parse_file (GtkRcContext *context, - const gchar *filename, - gint priority, - gboolean reload) +gtk_rc_context_parse_file (GtkRcContext *context, + const gchar *filename, + gint priority, + gboolean reload) { gchar *locale_suffixes[2]; gint n_locale_suffixes = 0; @@ -800,7 +840,7 @@ gtk_rc_parse_file (GtkRcContext *context, gint length, j; gboolean found = FALSE; - #ifdef G_OS_WIN32 +#ifdef G_OS_WIN32 locale = g_win32_getlocale (); #else locale = setlocale (LC_CTYPE, NULL); @@ -808,11 +848,7 @@ gtk_rc_parse_file (GtkRcContext *context, 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. + /* Determine locale-specific suffixes for RC files. */ length = strlen (locale); @@ -834,7 +870,7 @@ gtk_rc_parse_file (GtkRcContext *context, } } - gtk_rc_parse_one_file (context, filename, priority, reload); + gtk_rc_context_parse_one_file (context, filename, priority, reload); for (j = 0; j < n_locale_suffixes; j++) { if (!found) @@ -842,7 +878,7 @@ gtk_rc_parse_file (GtkRcContext *context, gchar *name = g_strconcat (filename, ".", locale_suffixes[j], NULL); if (g_file_test (name, G_FILE_TEST_EXISTS)) { - gtk_rc_parse_one_file (context, name, priority, FALSE); + gtk_rc_context_parse_one_file (context, name, priority, FALSE); found = TRUE; } @@ -856,13 +892,14 @@ gtk_rc_parse_file (GtkRcContext *context, void gtk_rc_parse (const gchar *filename) { + GSList *tmp_list; + g_return_if_fail (filename != NULL); - /* This is wrong; once we have meaningful multiple RC contexts, we need to parse the - * file in all contexts, and in fact, in future contexts as well. - */ - gtk_rc_parse_file (gtk_rc_context_get (gtk_settings_get_default ()), - filename, GTK_PATH_PRIO_RC, 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 */ @@ -870,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, @@ -887,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 @@ -963,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 @@ -1006,8 +1042,7 @@ gtk_rc_style_finalize (GObject *object) tmp_list1 = rc_style->icon_factories; while (tmp_list1) { - g_object_unref (G_OBJECT (tmp_list1->data)); - + g_object_unref (tmp_list1->data); tmp_list1 = tmp_list1->next; } g_slist_free (rc_style->icon_factories); @@ -1049,19 +1084,19 @@ gtk_rc_style_copy (GtkRcStyle *orig) } 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 * @@ -1254,10 +1289,10 @@ gtk_rc_clear_styles (GtkRcContext *context) * icon sets so they get re-rendered. */ static void -gtk_rc_reset_widgets (GtkRcContext *context) +gtk_rc_reset_widgets (GtkSettings *settings) { GList *list, *toplevels; - + _gtk_icon_set_invalidate_caches (); toplevels = gtk_window_list_toplevels (); @@ -1265,12 +1300,109 @@ gtk_rc_reset_widgets (GtkRcContext *context) for (list = toplevels; list; list = list->next) { - gtk_widget_reset_rc_styles (list->data); - gtk_widget_unref (list->data); + 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) + { + GtkRcStyle *rc_style = tmp_list->data; + + rc_style->rc_style_lists = g_slist_remove_all (rc_style->rc_style_lists, + rc_styles); + tmp_list = tmp_list->next; + } + + g_slist_free (rc_styles); +} + +/** + * _gtk_rc_reset_styles: + * @settings: a #GtkSettings + * + * This setting resets all of our styles; we use it when the font + * rendering parameters or the icon sizes have changed. It's both less + * and more comprehensive then we actually need: + * + * Less comprehensive: it doesn't affect widgets that have a style + * set on them. + * + * More comprehensive: it resets the styles, but the styles haven't + * changed. The main reason for resetting the styles is becaues + * most widgets will redo all their font stuff when their style + * change. + **/ +void +_gtk_rc_reset_styles (GtkSettings *settings) +{ + GtkRcContext *context; + gboolean reset = FALSE; + + g_return_if_fail (GTK_IS_SETTINGS (settings)); + + context = gtk_rc_context_get (settings); + + if (context->default_style) + { + g_object_unref (G_OBJECT (context->default_style)); + context->default_style = NULL; + reset = TRUE; + } + + /* Clear out styles that have been looked up already + */ + if (realized_style_ht) + { + g_hash_table_foreach (realized_style_ht, gtk_rc_clear_realized_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 @@ -1323,40 +1455,45 @@ gtk_rc_reparse_all_for_settings (GtkSettings *settings, if (force_load || mtime_modified) { - GSList *old_files; - + _gtk_binding_reset_parsed (); gtk_rc_clear_styles (context); g_object_freeze_notify (G_OBJECT (context->settings)); - old_files = context->rc_files; - context->rc_files = NULL; - - gtk_rc_parse_default_files (context); - - tmp_list = old_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) - { - if (rc_file->is_string) - gtk_rc_parse_string (rc_file->name); - else - gtk_rc_parse_file (context, rc_file->name, GTK_PATH_PRIO_RC, TRUE); - } 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 (old_files);; + 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, @@ -1369,10 +1506,10 @@ gtk_rc_reparse_all_for_settings (GtkSettings *settings, g_object_thaw_notify (G_OBJECT (context->settings)); - gtk_rc_reset_widgets (context); + gtk_rc_reset_widgets (context->settings); } - return mtime_modified; + return force_load || mtime_modified; } /** @@ -1387,7 +1524,17 @@ gtk_rc_reparse_all_for_settings (GtkSettings *settings, gboolean gtk_rc_reparse_all (void) { - return gtk_rc_reparse_all_for_settings (gtk_settings_get_default (), FALSE); + GSList *tmp_list; + gboolean result = FALSE; + + for (tmp_list = rc_contexts; tmp_list; tmp_list = tmp_list->next) + { + GtkRcContext *context = tmp_list->data; + if (gtk_rc_reparse_all_for_settings (context->settings, FALSE)) + result = TRUE; + } + + return result; } static GSList * @@ -1512,16 +1659,16 @@ gtk_rc_get_style (GtkWidget *widget) if (context->rc_sets_class) { - GtkType type; + GType type; - type = GTK_OBJECT_TYPE (widget); + type = G_TYPE_FROM_INSTANCE (widget); while (type) { 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); @@ -1529,29 +1676,38 @@ gtk_rc_get_style (GtkWidget *widget) 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); - widget_rc_style = gtk_object_get_data_by_id (GTK_OBJECT (widget), - rc_style_key_id); + 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 (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 NULL; + 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 * @@ -1563,10 +1719,10 @@ gtk_rc_get_style (GtkWidget *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)); + * 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, @@ -1592,7 +1748,7 @@ gtk_rc_get_style_by_paths (GtkSettings *settings, context = gtk_rc_context_get (settings); - if (context->rc_sets_widget) + if (widget_path && context->rc_sets_widget) { gchar *path_reversed; guint path_length; @@ -1605,7 +1761,7 @@ gtk_rc_get_style_by_paths (GtkSettings *settings, g_free (path_reversed); } - if (context->rc_sets_widget_class) + if (class_path && context->rc_sets_widget_class) { gchar *path_reversed; guint path_length; @@ -1641,7 +1797,7 @@ gtk_rc_get_style_by_paths (GtkSettings *settings, 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; } @@ -1867,11 +2023,13 @@ gtk_rc_style_find (GtkRcContext *context, } 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; @@ -1884,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; @@ -1949,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); } @@ -1969,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); @@ -2177,7 +2336,7 @@ parse_include_file (GtkRcContext *context, if (g_path_is_absolute (filename)) { - /* For abolute paths, we call gtk_rc_parse_file unconditionally. We + /* 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); @@ -2208,7 +2367,7 @@ parse_include_file (GtkRcContext *context, if (to_parse) { - gtk_rc_parse_file (context, to_parse, context->default_priority, FALSE); + gtk_rc_context_parse_file (context, to_parse, context->default_priority, FALSE); g_free (to_parse); } else @@ -2260,9 +2419,6 @@ gtk_rc_parse_statement (GtkRcContext *context, 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); @@ -2283,9 +2439,9 @@ gtk_rc_parse_statement (GtkRcContext *context, 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 (context->settings, - name, - &svalue); + _gtk_settings_set_property_value_from_rc (context->settings, + name, + &svalue); } g_free (prop.origin); if (G_VALUE_TYPE (&prop.value)) @@ -2449,7 +2605,7 @@ gtk_rc_parse_style (GtkRcContext *context, factories = parent_style->icon_factories; while (factories != NULL) { - g_object_ref (G_OBJECT (factories->data)); + g_object_ref (factories->data); factories = factories->next; } } @@ -2868,28 +3024,20 @@ gtk_rc_find_pixmap_in_path (GtkSettings *settings, 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_build_filename (module_path[i], module_file, NULL); - - 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 @@ -2956,7 +3104,11 @@ 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; } @@ -3033,7 +3185,7 @@ gtk_rc_parse_engine (GtkRcContext *context, if (result != G_TOKEN_NONE) { - g_object_unref (G_OBJECT (new_style)); + g_object_unref (new_style); new_style = NULL; } } @@ -3065,8 +3217,8 @@ gtk_rc_parse_engine (GtkRcContext *context, if (new_style) { new_style->engine_specified = TRUE; - - g_object_unref (G_OBJECT (*rc_style)); + + g_object_unref (*rc_style); *rc_style = new_style; } @@ -3323,29 +3475,8 @@ gtk_rc_parse_module_path (GScanner *scanner) token = g_scanner_get_next_token (scanner); if (token != G_TOKEN_STRING) return G_TOKEN_STRING; - - gtk_rc_parse_module_path_string (scanner->value.v_string); - - 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; } @@ -3371,39 +3502,6 @@ gtk_rc_parse_im_module_file (GScanner *scanner) return G_TOKEN_NONE; } -static void -gtk_rc_parse_module_path_string (const gchar *mod_path) -{ - 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); - - for (end_offset = 0; end_offset <= path_len; end_offset++) - { - if ((mod_path[end_offset] == G_SEARCHPATH_SEPARATOR) || - (end_offset == path_len)) - { - module_path[path_num] = g_strndup (mod_path + start_offset, end_offset - start_offset); - path_num++; - module_path[path_num] = NULL; - start_offset = end_offset + 1; - } - } - gtk_rc_append_default_module_path(); -} - static guint gtk_rc_parse_path_pattern (GtkRcContext *context, GScanner *scanner) @@ -3764,12 +3862,13 @@ gtk_rc_parse_stock (GtkRcContext *context, } } - if (icon_set && icon_set_valid) + 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); }