#include <stdio.h>
#include <stdlib.h>
-#ifndef HAVE_LSTAT
-#define lstat stat
-#endif
#include <glib.h>
+#include <glib/gstdio.h>
#include "gdkconfig.h"
#include "gtkversion.h"
#include "gtkintl.h"
#include "gtkiconfactory.h"
#include "gtkmain.h"
+#include "gtkmodules.h"
#include "gtkprivate.h"
#include "gtksettings.h"
#include "gtkwindow.h"
+#include "gtkalias.h"
+
#ifdef G_OS_WIN32
#include <io.h>
#endif
typedef struct _GtkRcNode GtkRcNode;
typedef struct _GtkRcFile GtkRcFile;
+enum
+{
+ PATH_ELT_PSPEC,
+ PATH_ELT_UNRESOLVED,
+ PATH_ELT_TYPE
+};
+
+typedef struct
+{
+ gint type;
+ union
+ {
+ GType class_type;
+ gchar *class_name;
+ GPatternSpec *pspec;
+ } elt;
+} PathElt;
+
struct _GtkRcSet
{
+ GtkPathType type;
+
GPatternSpec *pspec;
- GtkRcStyle *rc_style;
- gint priority;
+ GSList *path;
+
+ 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;
gchar *directory;
- guint reload;
+ guint reload : 1;
+ guint is_string : 1; /* If TRUE, name is a string to parse with gtk_rc_parse_string() */
};
-#define GTK_RC_MAX_PIXMAP_PATHS 128
struct _GtkRcContext
{
gchar *key_theme_name;
gchar *font_name;
- gchar *pixmap_path[GTK_RC_MAX_PIXMAP_PATHS];
+ gchar **pixmap_path;
gint default_priority;
GtkStyle *default_style;
+
+ GHashTable *color_hash;
+
+ guint reloading : 1;
+};
+
+#define GTK_RC_STYLE_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GTK_TYPE_RC_STYLE, GtkRcStylePrivate))
+
+typedef struct _GtkRcStylePrivate GtkRcStylePrivate;
+
+struct _GtkRcStylePrivate
+{
+ GSList *color_hashes;
};
static GtkRcContext *gtk_rc_context_get (GtkSettings *settings);
static GSList * gtk_rc_styles_match (GSList *rc_styles,
GSList *sets,
guint path_length,
- const gchar *path,
- const gchar *path_reversed);
+ gchar *path,
+ gchar *path_reversed);
static GtkStyle * gtk_rc_style_to_style (GtkRcContext *context,
GtkRcStyle *rc_style);
static GtkStyle* gtk_rc_init_style (GtkRcContext *context,
static guint gtk_rc_parse_style (GtkRcContext *context,
GScanner *scanner);
static guint gtk_rc_parse_assignment (GScanner *scanner,
+ GtkRcStyle *style,
GtkRcProperty *prop);
static guint gtk_rc_parse_bg (GScanner *scanner,
GtkRcStyle *style);
GScanner *scanner,
GtkRcStyle *rc_style,
GtkIconFactory *factory);
+static guint gtk_rc_parse_logical_color (GScanner *scanner,
+ GtkRcStyle *rc_style,
+ GHashTable *hash);
+
static void gtk_rc_clear_hash_node (gpointer key,
gpointer data,
gpointer user_data);
static void gtk_rc_clear_styles (GtkRcContext *context);
static void gtk_rc_add_initial_default_files (void);
-static void gtk_rc_style_init (GtkRcStyle *style);
-static void gtk_rc_style_class_init (GtkRcStyleClass *klass);
static void gtk_rc_style_finalize (GObject *object);
static void gtk_rc_style_real_merge (GtkRcStyle *dest,
GtkRcStyle *src);
static GtkRcStyle* gtk_rc_style_real_create_rc_style (GtkRcStyle *rc_style);
static GtkStyle* gtk_rc_style_real_create_style (GtkRcStyle *rc_style);
+static void gtk_rc_style_copy_icons_and_colors(GtkRcStyle *rc_style,
+ GtkRcStyle *src_style,
+ GtkRcContext *context);
static gint gtk_rc_properties_cmp (gconstpointer bsearch_node1,
gconstpointer bsearch_node2);
+static void gtk_rc_set_free (GtkRcSet *rc_set);
+
+static void insert_rc_property (GtkRcStyle *style,
+ GtkRcProperty *property,
+ gboolean replace);
-static gpointer parent_class = NULL;
static const GScannerConfig gtk_rc_scanner_config =
{
" \t\r\n"
) /* cset_skip_characters */,
(
- G_CSET_a_2_z
"_"
+ G_CSET_a_2_z
G_CSET_A_2_Z
) /* cset_identifier_first */,
(
+ G_CSET_DIGITS
+ "-_"
G_CSET_a_2_z
- "_-0123456789"
G_CSET_A_2_Z
) /* cset_identifier_nth */,
( "#\n" ) /* cpair_comment_single */,
TRUE /* symbol_2_token */,
FALSE /* scope_0_fallback */,
};
+
+static const gchar symbol_names[] =
+ "include\0"
+ "NORMAL\0"
+ "ACTIVE\0"
+ "PRELIGHT\0"
+ "SELECTED\0"
+ "INSENSITIVE\0"
+ "fg\0"
+ "bg\0"
+ "text\0"
+ "base\0"
+ "xthickness\0"
+ "ythickness\0"
+ "font\0"
+ "fontset\0"
+ "font_name\0"
+ "bg_pixmap\0"
+ "pixmap_path\0"
+ "style\0"
+ "binding\0"
+ "bind\0"
+ "widget\0"
+ "widget_class\0"
+ "class\0"
+ "lowest\0"
+ "gtk\0"
+ "application\0"
+ "theme\0"
+ "rc\0"
+ "highest\0"
+ "engine\0"
+ "module_path\0"
+ "stock\0"
+ "im_module_file\0"
+ "LTR\0"
+ "RTL\0"
+ "color\0"
+ "unbind\0";
static const struct
{
- gchar *name;
+ guint name_offset;
guint token;
} symbols[] = {
- { "include", GTK_RC_TOKEN_INCLUDE },
- { "NORMAL", GTK_RC_TOKEN_NORMAL },
- { "ACTIVE", GTK_RC_TOKEN_ACTIVE },
- { "PRELIGHT", GTK_RC_TOKEN_PRELIGHT },
- { "SELECTED", GTK_RC_TOKEN_SELECTED },
- { "INSENSITIVE", GTK_RC_TOKEN_INSENSITIVE },
- { "fg", GTK_RC_TOKEN_FG },
- { "bg", GTK_RC_TOKEN_BG },
- { "text", GTK_RC_TOKEN_TEXT },
- { "base", GTK_RC_TOKEN_BASE },
- { "xthickness", GTK_RC_TOKEN_XTHICKNESS },
- { "ythickness", GTK_RC_TOKEN_YTHICKNESS },
- { "font", GTK_RC_TOKEN_FONT },
- { "fontset", GTK_RC_TOKEN_FONTSET },
- { "font_name", GTK_RC_TOKEN_FONT_NAME },
- { "bg_pixmap", GTK_RC_TOKEN_BG_PIXMAP },
- { "pixmap_path", GTK_RC_TOKEN_PIXMAP_PATH },
- { "style", GTK_RC_TOKEN_STYLE },
- { "binding", GTK_RC_TOKEN_BINDING },
- { "bind", GTK_RC_TOKEN_BIND },
- { "widget", GTK_RC_TOKEN_WIDGET },
- { "widget_class", GTK_RC_TOKEN_WIDGET_CLASS },
- { "class", GTK_RC_TOKEN_CLASS },
- { "lowest", GTK_RC_TOKEN_LOWEST },
- { "gtk", GTK_RC_TOKEN_GTK },
- { "application", GTK_RC_TOKEN_APPLICATION },
- { "theme", GTK_RC_TOKEN_THEME },
- { "rc", GTK_RC_TOKEN_RC },
- { "highest", GTK_RC_TOKEN_HIGHEST },
- { "engine", GTK_RC_TOKEN_ENGINE },
- { "module_path", GTK_RC_TOKEN_MODULE_PATH },
- { "stock", GTK_RC_TOKEN_STOCK },
- { "im_module_file", GTK_RC_TOKEN_IM_MODULE_FILE },
- { "LTR", GTK_RC_TOKEN_LTR },
- { "RTL", GTK_RC_TOKEN_RTL }
+ { 0, GTK_RC_TOKEN_INCLUDE },
+ { 8, GTK_RC_TOKEN_NORMAL },
+ { 15, GTK_RC_TOKEN_ACTIVE },
+ { 22, GTK_RC_TOKEN_PRELIGHT },
+ { 31, GTK_RC_TOKEN_SELECTED },
+ { 40, GTK_RC_TOKEN_INSENSITIVE },
+ { 52, GTK_RC_TOKEN_FG },
+ { 55, GTK_RC_TOKEN_BG },
+ { 58, GTK_RC_TOKEN_TEXT },
+ { 63, GTK_RC_TOKEN_BASE },
+ { 68, GTK_RC_TOKEN_XTHICKNESS },
+ { 79, GTK_RC_TOKEN_YTHICKNESS },
+ { 90, GTK_RC_TOKEN_FONT },
+ { 95, GTK_RC_TOKEN_FONTSET },
+ { 103, GTK_RC_TOKEN_FONT_NAME },
+ { 113, GTK_RC_TOKEN_BG_PIXMAP },
+ { 123, GTK_RC_TOKEN_PIXMAP_PATH },
+ { 135, GTK_RC_TOKEN_STYLE },
+ { 141, GTK_RC_TOKEN_BINDING },
+ { 149, GTK_RC_TOKEN_BIND },
+ { 154, GTK_RC_TOKEN_WIDGET },
+ { 161, GTK_RC_TOKEN_WIDGET_CLASS },
+ { 174, GTK_RC_TOKEN_CLASS },
+ { 180, GTK_RC_TOKEN_LOWEST },
+ { 187, GTK_RC_TOKEN_GTK },
+ { 191, GTK_RC_TOKEN_APPLICATION },
+ { 203, GTK_RC_TOKEN_THEME },
+ { 209, GTK_RC_TOKEN_RC },
+ { 212, GTK_RC_TOKEN_HIGHEST },
+ { 220, GTK_RC_TOKEN_ENGINE },
+ { 227, GTK_RC_TOKEN_MODULE_PATH },
+ { 239, GTK_RC_TOKEN_STOCK },
+ { 245, GTK_RC_TOKEN_IM_MODULE_FILE },
+ { 260, GTK_RC_TOKEN_LTR },
+ { 264, GTK_RC_TOKEN_RTL },
+ { 268, GTK_RC_TOKEN_COLOR },
+ { 274, GTK_RC_TOKEN_UNBIND }
};
static GHashTable *realized_style_ht = NULL;
static gchar *im_module_file = NULL;
-#define GTK_RC_MAX_DEFAULT_FILES 128
-static gchar *gtk_rc_default_files[GTK_RC_MAX_DEFAULT_FILES];
+static gint max_default_files = 0;
+static gchar **gtk_rc_default_files = NULL;
/* A stack of information of RC files we are parsing currently.
* The directories for these files are implicitely added to the end of
gchar *path;
var = g_getenv ("GTK_EXE_PREFIX");
+
if (var)
- path = g_build_filename (var, "lib", "gtk-2.0", GTK_BINARY_VERSION, type, NULL);
+ path = g_build_filename (var, "lib", "gtk-3.0", GTK_BINARY_VERSION, type, NULL);
else
- path = g_build_filename (GTK_LIBDIR, "gtk-2.0", GTK_BINARY_VERSION, type, NULL);
+ path = g_build_filename (GTK_LIBDIR, "gtk-3.0", GTK_BINARY_VERSION, type, NULL);
return path;
}
gchar *
gtk_rc_get_im_module_file (void)
{
- gchar *result = g_strdup (g_getenv ("GTK_IM_MODULE_FILE"));
+ const gchar *var = g_getenv ("GTK_IM_MODULE_FILE");
+ gchar *result = NULL;
+
+ if (var)
+ result = g_strdup (var);
if (!result)
{
if (im_module_file)
result = g_strdup (im_module_file);
else
- result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtk.immodules", NULL);
+ result = g_build_filename (GTK_SYSCONFDIR, "gtk-3.0", "gtk.immodules", NULL);
}
return result;
gchar *path;
var = g_getenv ("GTK_DATA_PREFIX");
+
if (var)
path = g_build_filename (var, "share", "themes", NULL);
else
if (init)
return;
-
+
+ gtk_rc_default_files = g_new (gchar*, 10);
+ max_default_files = 10;
+
gtk_rc_default_files[0] = NULL;
init = TRUE;
var = g_getenv ("GTK2_RC_FILES");
+
if (var)
{
- files = g_strsplit (var, G_SEARCHPATH_SEPARATOR_S, 128);
+ files = g_strsplit (var, G_SEARCHPATH_SEPARATOR_S, -1);
i=0;
while (files[i])
{
}
else
{
- str = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtkrc", NULL);
+ const gchar *home;
+ str = g_build_filename (GTK_SYSCONFDIR, "gtk-3.0", "gtkrc", NULL);
gtk_rc_add_default_file (str);
g_free (str);
- var = g_get_home_dir ();
- if (var)
+ home = g_get_home_dir ();
+ if (home)
{
- str = g_build_filename (var, ".gtkrc-2.0", NULL);
+ str = g_build_filename (home, ".gtkrc-3.0", NULL);
gtk_rc_add_default_file (str);
g_free (str);
}
gtk_rc_add_initial_default_files ();
- for (n = 0; gtk_rc_default_files[n]; n++) ;
- if (n >= GTK_RC_MAX_DEFAULT_FILES - 1)
- return;
+ for (n = 0; n < max_default_files; n++)
+ {
+ if (gtk_rc_default_files[n] == NULL)
+ break;
+ }
+
+ if (n == max_default_files)
+ {
+ max_default_files += 10;
+ gtk_rc_default_files = g_renew (gchar*, gtk_rc_default_files, max_default_files);
+ }
gtk_rc_default_files[n++] = g_strdup (filename);
gtk_rc_default_files[n] = NULL;
gchar *new_theme_name;
gchar *new_key_theme_name;
+ if (context->reloading)
+ return;
+
g_object_get (settings,
"gtk-theme-name", &new_theme_name,
"gtk-key-theme-name", &new_key_theme_name,
GParamSpec *pspec,
GtkRcContext *context)
{
- _gtk_rc_context_get_default_font_name (settings);
+ if (!context->reloading)
+ _gtk_rc_context_get_default_font_name (settings);
+}
+
+static void
+gtk_rc_color_hash_changed (GtkSettings *settings,
+ GParamSpec *pspec,
+ GtkRcContext *context)
+{
+ GHashTable *old_hash;
+
+ old_hash = context->color_hash;
+
+ g_object_get (settings, "color-hash", &context->color_hash, NULL);
+
+ if (old_hash)
+ g_hash_table_unref (old_hash);
+
+ gtk_rc_reparse_all_for_settings (settings, TRUE);
}
static GtkRcContext *
context->rc_sets_class = NULL;
context->rc_files = NULL;
context->default_style = NULL;
+ context->reloading = FALSE;
g_object_get (settings,
"gtk-theme-name", &context->theme_name,
"gtk-key-theme-name", &context->key_theme_name,
"gtk-font-name", &context->font_name,
+ "color-hash", &context->color_hash,
NULL);
g_signal_connect (settings,
"notify::gtk-font-name",
G_CALLBACK (gtk_rc_font_name_changed),
context);
+ g_signal_connect (settings,
+ "notify::color-hash",
+ G_CALLBACK (gtk_rc_color_hash_changed),
+ context);
-
- context->pixmap_path[0] = NULL;
+ context->pixmap_path = NULL;
context->default_priority = GTK_PATH_PRIO_RC;
return settings->rc_context;
}
+static void
+gtk_rc_clear_rc_files (GtkRcContext *context)
+{
+ GSList *list;
+
+ list = context->rc_files;
+ while (list)
+ {
+ GtkRcFile *rc_file = list->data;
+
+ if (rc_file->canonical_name != rc_file->name)
+ g_free (rc_file->canonical_name);
+ g_free (rc_file->directory);
+ g_free (rc_file->name);
+ g_free (rc_file);
+
+ list = list->next;
+ }
+
+ g_slist_free (context->rc_files);
+ context->rc_files = NULL;
+}
+
+void
+_gtk_rc_context_destroy (GtkSettings *settings)
+{
+ GtkRcContext *context;
+
+ g_return_if_fail (GTK_IS_SETTINGS (settings));
+
+ context = settings->rc_context;
+ if (!context)
+ return;
+
+ _gtk_settings_reset_rc_values (context->settings);
+ gtk_rc_clear_styles (context);
+ gtk_rc_clear_rc_files (context);
+
+ if (context->default_style)
+ g_object_unref (context->default_style);
+
+ g_strfreev (context->pixmap_path);
+
+ g_free (context->theme_name);
+ g_free (context->key_theme_name);
+ g_free (context->font_name);
+
+ if (context->color_hash)
+ g_hash_table_unref (context->color_hash);
+
+ g_signal_handlers_disconnect_by_func (settings,
+ gtk_rc_settings_changed, context);
+ g_signal_handlers_disconnect_by_func (settings,
+ gtk_rc_font_name_changed, context);
+ g_signal_handlers_disconnect_by_func (settings,
+ gtk_rc_color_hash_changed, context);
+
+ rc_contexts = g_slist_remove (rc_contexts, context);
+
+ g_free (context);
+
+ settings->rc_context = NULL;
+}
+
static void
gtk_rc_parse_named (GtkRcContext *context,
const gchar *name,
gchar *subpath;
if (type)
- subpath = g_strconcat ("gtk-2.0-", type,
+ subpath = g_strconcat ("gtk-3.0-", type,
G_DIR_SEPARATOR_S "gtkrc",
NULL);
else
- subpath = g_strdup ("gtk-2.0" G_DIR_SEPARATOR_S "gtkrc");
+ subpath = g_strdup ("gtk-3.0" G_DIR_SEPARATOR_S "gtkrc");
/* First look in the users home directory
*/
{
gint i;
+ gtk_rc_add_initial_default_files ();
+
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);
}
"style \"gtk-default-progress-bar-style\" {\n"
" bg[PRELIGHT] = \"#4b6983\"\n"
" fg[PRELIGHT] = \"#ffffff\"\n"
- " bg[NORMAL] = \"#bab5ab\"\n"
+ " bg[NORMAL] = \"#c4c2bd\"\n"
+ "}\n"
+ "\n"
+ "style \"gtk-default-entry-style\" {\n"
+ " bg[SELECTED] = \"#b7c3cd\"\n"
+ " fg[SELECTED] = \"#000000\"\n"
+ "}\n"
+ "\n"
+ "style \"gtk-default-menu-bar-item-style\" {\n"
+ " GtkMenuItem::horizontal_padding = 5\n"
"}\n"
"\n"
"style \"gtk-default-menu-item-style\" {\n"
" text[PRELIGHT] = \"#ffffff\"\n"
"}\n"
"\n"
+ /* Work around clipping of accelerator underlines */
+ "style \"gtk-default-label-style\" {\n"
+ " GtkWidget::draw-border = {0,0,0,1}\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"
+ "class \"GtkEntry\" style : gtk \"gtk-default-entry-style\"\n"
+ "widget \"gtk-tooltip*\" style : gtk \"gtk-default-tooltips-style\"\n"
+ "widget_class \"*<GtkMenuItem>*\" style : gtk \"gtk-default-menu-item-style\"\n"
+ "widget_class \"*<GtkMenuBar>*<GtkMenuItem>\" style : gtk \"gtk-default-menu-bar-item-style\"\n"
+ "class \"GtkLabel\" style : gtk \"gtk-default-label-style\"\n"
);
}
if (g_slist_find (current_files_stack, rc_file))
return;
- if (!lstat (rc_file->canonical_name, &statbuf))
+ if (!g_lstat (rc_file->canonical_name, &statbuf))
{
gint fd;
rc_file->mtime = statbuf.st_mtime;
- fd = open (rc_file->canonical_name, O_RDONLY);
+ fd = g_open (rc_file->canonical_name, O_RDONLY, 0);
if (fd < 0)
goto out;
/* Handling of RC styles */
-GType
-gtk_rc_style_get_type (void)
-{
- static GType rc_style_type = 0;
-
- if (!rc_style_type)
- {
- static const GTypeInfo rc_style_info =
- {
- sizeof (GtkRcStyleClass),
- (GBaseInitFunc) NULL,
- (GBaseFinalizeFunc) NULL,
- (GClassInitFunc) gtk_rc_style_class_init,
- NULL, /* class_finalize */
- NULL, /* class_data */
- sizeof (GtkRcStyle),
- 0, /* n_preallocs */
- (GInstanceInitFunc) gtk_rc_style_init,
- };
-
- rc_style_type = g_type_register_static (G_TYPE_OBJECT, "GtkRcStyle",
- &rc_style_info, 0);
- }
-
- return rc_style_type;
-}
+G_DEFINE_TYPE (GtkRcStyle, gtk_rc_style, G_TYPE_OBJECT)
static void
gtk_rc_style_init (GtkRcStyle *style)
{
+ GtkRcStylePrivate *priv = GTK_RC_STYLE_GET_PRIVATE (style);
guint i;
style->name = NULL;
style->rc_style_lists = NULL;
style->icon_factories = NULL;
+
+ priv->color_hashes = NULL;
}
static void
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
- parent_class = g_type_class_peek_parent (klass);
-
object_class->finalize = gtk_rc_style_finalize;
klass->parse = NULL;
klass->create_rc_style = gtk_rc_style_real_create_rc_style;
klass->merge = gtk_rc_style_real_merge;
klass->create_style = gtk_rc_style_real_create_style;
+
+ g_type_class_add_private (object_class, sizeof (GtkRcStylePrivate));
}
static void
{
GSList *tmp_list1, *tmp_list2;
GtkRcStyle *rc_style;
+ GtkRcStylePrivate *rc_priv;
gint i;
rc_style = GTK_RC_STYLE (object);
-
- if (rc_style->name)
- g_free (rc_style->name);
+ rc_priv = GTK_RC_STYLE_GET_PRIVATE (rc_style);
+
+ g_free (rc_style->name);
if (rc_style->font_desc)
pango_font_description_free (rc_style->font_desc);
for (i = 0; i < 5; i++)
- if (rc_style->bg_pixmap_name[i])
- g_free (rc_style->bg_pixmap_name[i]);
+ g_free (rc_style->bg_pixmap_name[i]);
/* Now remove all references to this rc_style from
* realized_style_ht
rc_style->rc_properties = NULL;
}
- tmp_list1 = rc_style->icon_factories;
- while (tmp_list1)
- {
- g_object_unref (tmp_list1->data);
- tmp_list1 = tmp_list1->next;
- }
+ g_slist_foreach (rc_style->icon_factories, (GFunc) g_object_unref, NULL);
g_slist_free (rc_style->icon_factories);
-
- G_OBJECT_CLASS (parent_class)->finalize (object);
+
+ g_slist_foreach (rc_priv->color_hashes, (GFunc) g_hash_table_unref, NULL);
+ g_slist_free (rc_priv->color_hashes);
+
+ G_OBJECT_CLASS (gtk_rc_style_parent_class)->finalize (object);
}
GtkRcStyle *
style = GTK_RC_STYLE_GET_CLASS (orig)->create_rc_style (orig);
GTK_RC_STYLE_GET_CLASS (style)->merge (style, orig);
+ gtk_rc_style_copy_icons_and_colors (style, orig, NULL);
+
return style;
}
-void
-gtk_rc_style_ref (GtkRcStyle *rc_style)
+void
+_gtk_rc_style_set_rc_property (GtkRcStyle *rc_style,
+ GtkRcProperty *property)
{
g_return_if_fail (GTK_IS_RC_STYLE (rc_style));
+ g_return_if_fail (property != NULL);
- g_object_ref (rc_style);
+ insert_rc_property (rc_style, property, TRUE);
}
-void
-gtk_rc_style_unref (GtkRcStyle *rc_style)
+void
+_gtk_rc_style_unset_rc_property (GtkRcStyle *rc_style,
+ GQuark type_name,
+ GQuark property_name)
{
+ GtkRcProperty *node;
+
g_return_if_fail (GTK_IS_RC_STYLE (rc_style));
- g_object_unref (rc_style);
+ node = (GtkRcProperty *) _gtk_rc_style_lookup_rc_property (rc_style,
+ type_name,
+ property_name);
+
+ if (node != NULL)
+ {
+ guint index = node - (GtkRcProperty *) rc_style->rc_properties->data;
+ g_value_unset (&node->value);
+ g_free (node->origin);
+ g_array_remove_index (rc_style->rc_properties, index);
+ }
}
static GtkRcStyle *
gtk_rc_style_real_create_rc_style (GtkRcStyle *style)
{
- return GTK_RC_STYLE (g_object_new (G_OBJECT_TYPE (style), NULL));
+ return g_object_new (G_OBJECT_TYPE (style), NULL);
+}
+
+GSList *
+_gtk_rc_style_get_color_hashes (GtkRcStyle *rc_style)
+{
+ GtkRcStylePrivate *priv = GTK_RC_STYLE_GET_PRIVATE (rc_style);
+
+ return priv->color_hashes;
+}
+
+static void gtk_rc_style_prepend_empty_color_hash (GtkRcStyle *rc_style);
+
+void
+_gtk_rc_style_set_symbolic_color (GtkRcStyle *rc_style,
+ const gchar *name,
+ const GdkColor *color)
+{
+ GtkRcStylePrivate *priv = GTK_RC_STYLE_GET_PRIVATE (rc_style);
+ GHashTable *our_hash = NULL;
+
+ if (priv->color_hashes)
+ our_hash = priv->color_hashes->data;
+
+ if (our_hash == NULL)
+ {
+ if (color == NULL)
+ return;
+
+ gtk_rc_style_prepend_empty_color_hash (rc_style);
+ our_hash = priv->color_hashes->data;
+ }
+
+ if (color)
+ g_hash_table_insert (our_hash, g_strdup (name), gdk_color_copy (color));
+ else
+ g_hash_table_remove (our_hash, name);
}
static gint
GtkRcStyle *src)
{
gint i;
-
+
for (i = 0; i < 5; i++)
{
if (!dest->bg_pixmap_name[i] && src->bg_pixmap_name[i])
return gtk_style_new ();
}
+static void
+gtk_rc_style_prepend_empty_icon_factory (GtkRcStyle *rc_style)
+{
+ GtkIconFactory *factory = gtk_icon_factory_new ();
+
+ rc_style->icon_factories = g_slist_prepend (rc_style->icon_factories, factory);
+}
+
+static void
+gtk_rc_style_prepend_empty_color_hash (GtkRcStyle *rc_style)
+{
+ GtkRcStylePrivate *priv = GTK_RC_STYLE_GET_PRIVATE (rc_style);
+ GHashTable *hash = g_hash_table_new_full (g_str_hash, g_str_equal,
+ g_free,
+ (GDestroyNotify) gdk_color_free);
+
+ priv->color_hashes = g_slist_prepend (priv->color_hashes, hash);
+}
+
+static void
+gtk_rc_style_append_icon_factories (GtkRcStyle *rc_style,
+ GtkRcStyle *src_style)
+{
+ GSList *concat = g_slist_copy (src_style->icon_factories);
+
+ g_slist_foreach (concat, (GFunc) g_object_ref, NULL);
+
+ rc_style->icon_factories = g_slist_concat (rc_style->icon_factories, concat);
+}
+
+static void
+gtk_rc_style_append_color_hashes (GtkRcStyle *rc_style,
+ GtkRcStyle *src_style)
+{
+ GtkRcStylePrivate *priv = GTK_RC_STYLE_GET_PRIVATE (rc_style);
+ GtkRcStylePrivate *src_priv = GTK_RC_STYLE_GET_PRIVATE (src_style);
+ GSList *concat = g_slist_copy (src_priv->color_hashes);
+
+ g_slist_foreach (concat, (GFunc) g_hash_table_ref, NULL);
+
+ priv->color_hashes = g_slist_concat (priv->color_hashes, concat);
+}
+
+static void
+gtk_rc_style_copy_icons_and_colors (GtkRcStyle *rc_style,
+ GtkRcStyle *src_style,
+ GtkRcContext *context)
+{
+ GtkRcStylePrivate *priv = GTK_RC_STYLE_GET_PRIVATE (rc_style);
+
+ if (src_style)
+ {
+ GtkRcStylePrivate *src_priv = GTK_RC_STYLE_GET_PRIVATE (src_style);
+
+ /* Append src_style's factories, adding a ref to them */
+ if (src_style->icon_factories != NULL)
+ {
+ /* Add a factory for ourselves if we have none,
+ * in case we end up defining more stock icons.
+ * I see no real way around this; we need to maintain
+ * the invariant that the first factory in the list
+ * is always our_factory, the one belonging to us,
+ * and if we put src_style factories in the list we can't
+ * do that if the style is reopened.
+ */
+ if (rc_style->icon_factories == NULL)
+ gtk_rc_style_prepend_empty_icon_factory (rc_style);
+
+ gtk_rc_style_append_icon_factories (rc_style, src_style);
+ }
+
+ /* Also append src_style's color hashes, adding a ref to them */
+ if (src_priv->color_hashes != NULL)
+ {
+ /* See comment above .. */
+ if (priv->color_hashes == NULL)
+ gtk_rc_style_prepend_empty_color_hash (rc_style);
+
+ gtk_rc_style_append_color_hashes (rc_style, src_style);
+ }
+ }
+
+ /* if we didn't get color hashes from the src_style, initialize
+ * the list with the settings' color scheme (if it exists)
+ */
+ if (priv->color_hashes == NULL && context && context->color_hash != NULL)
+ {
+ gtk_rc_style_prepend_empty_color_hash (rc_style);
+
+ priv->color_hashes = g_slist_append (priv->color_hashes,
+ g_hash_table_ref (context->color_hash));
+ }
+}
+
static void
gtk_rc_clear_hash_node (gpointer key,
gpointer data,
gpointer user_data)
{
- gtk_rc_style_unref (data);
+ g_object_unref (data);
}
static void
GtkRcSet *rc_set;
rc_set = slist->data;
- g_pattern_spec_free (rc_set->pspec);
- g_free (rc_set);
+ gtk_rc_set_free (rc_set);
slist = slist->next;
}
if (gtk_widget_get_screen (list->data) == settings->screen)
{
gtk_widget_reset_rc_styles (list->data);
- g_object_unref (list->data);
}
+
+ g_object_unref (list->data);
}
g_list_free (toplevels);
}
gpointer data)
{
GSList *rc_styles = key;
+ GtkStyle *style = value;
GSList *tmp_list = rc_styles;
+ g_object_unref (style);
+
while (tmp_list)
{
GtkRcStyle *rc_style = tmp_list->data;
g_free (context->font_name);
context->font_name = g_strdup (new_font_name);
- _gtk_rc_reset_styles (settings);
+ gtk_rc_reset_styles (settings);
}
g_free (new_font_name);
GtkRcFile *rc_file;
GSList *tmp_list;
GtkRcContext *context;
-
struct stat statbuf;
g_return_val_if_fail (GTK_IS_SETTINGS (settings), FALSE);
context = gtk_rc_context_get (settings);
+ if (context->reloading)
+ return FALSE;
+
if (!force_load)
{
/* Check through and see if any of the RC's have had their
if (!rc_file->is_string)
{
- if (!lstat (rc_file->name, &statbuf) &&
- (statbuf.st_mtime > rc_file->mtime))
+ if (!g_lstat (rc_file->name, &statbuf) &&
+ (statbuf.st_mtime != rc_file->mtime))
{
mtime_modified = TRUE;
break;
{
_gtk_binding_reset_parsed ();
gtk_rc_clear_styles (context);
- g_object_freeze_notify (G_OBJECT (context->settings));
+ context->reloading = TRUE;
_gtk_settings_reset_rc_values (context->settings);
- tmp_list = context->rc_files;
- while (tmp_list)
- {
- rc_file = tmp_list->data;
-
- if (rc_file->canonical_name != rc_file->name)
- g_free (rc_file->canonical_name);
- g_free (rc_file->directory);
- 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_clear_rc_files (context);
gtk_rc_parse_default_files (context);
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));
+
+ context->reloading = FALSE;
gtk_rc_reset_widgets (context->settings);
}
gtk_rc_styles_match (GSList *rc_styles,
GSList *sets,
guint path_length,
- const gchar *path,
- const gchar *path_reversed)
+ gchar *path,
+ gchar *path_reversed)
{
GtkRcSet *rc_set;
rc_set = sets->data;
sets = sets->next;
- if (g_pattern_match (rc_set->pspec, path_length, path, path_reversed))
- rc_styles = g_slist_append (rc_styles, rc_set);
+ if (rc_set->type == GTK_PATH_WIDGET_CLASS)
+ {
+ if (_gtk_rc_match_widget_class (rc_set->path, path_length, path, path_reversed))
+ rc_styles = g_slist_append (rc_styles, rc_set);
+ }
+ else
+ {
+ if (g_pattern_match (rc_set->pspec, path_length, path, path_reversed))
+ rc_styles = g_slist_append (rc_styles, rc_set);
+ }
}
-
+
return rc_styles;
}
type = G_TYPE_FROM_INSTANCE (widget);
while (type)
{
- const gchar *path;
+ gchar *path;
gchar *path_reversed;
guint path_length;
- path = g_type_name (type);
+ path = g_strdup (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);
g_free (path_reversed);
type = g_type_parent (type);
/**
* gtk_rc_get_style_by_paths:
* @settings: a #GtkSettings object
- * @widget_path: the widget path to use when looking up the style, or %NULL
+ * @widget_path: (allow-none): 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
+ * @class_path: (allow-none): 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
* would be items inside a GNOME canvas widget.
*
* The action of gtk_rc_get_style() is similar to:
- * <informalexample><programlisting>
- * gtk_widget_path (widget, NULL, &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,
+ * |[
+ * 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));
- * </programlisting></informalexample>
+ * ]|
*
* Return value: A style created by matching with the supplied paths,
* or %NULL if nothing matching was specified and the default style should
if (widget_path && context->rc_sets_widget)
{
+ gchar *path;
gchar *path_reversed;
guint path_length;
path_length = strlen (widget_path);
+ path = g_strdup (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);
+ 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 (class_path && context->rc_sets_widget_class)
{
+ gchar *path;
gchar *path_reversed;
guint path_length;
+ path = g_strdup (class_path);
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);
+ 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);
}
{
while (type)
{
- const gchar *path;
+ gchar *path;
gchar *path_reversed;
guint path_length;
- path = g_type_name (type);
+ path = g_strdup (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);
g_free (path_reversed);
type = g_type_parent (type);
return NULL;
}
-static GSList *
-gtk_rc_add_rc_sets (GSList *slist,
- GtkRcStyle *rc_style,
- const gchar *pattern)
-{
- GtkRcStyle *new_style;
- GtkRcSet *rc_set;
- guint i;
-
- new_style = gtk_rc_style_new ();
- *new_style = *rc_style;
- new_style->name = g_strdup (rc_style->name);
- if (rc_style->font_desc)
- new_style->font_desc = pango_font_description_copy (rc_style->font_desc);
-
- for (i = 0; i < 5; i++)
- new_style->bg_pixmap_name[i] = g_strdup (rc_style->bg_pixmap_name[i]);
-
- rc_set = g_new (GtkRcSet, 1);
- rc_set->pspec = g_pattern_spec_new (pattern);
- rc_set->rc_style = rc_style;
-
- return g_slist_prepend (slist, rc_set);
-}
-
-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);
-
- 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);
-
- 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);
-
- 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)
{
scanner->input_name = input_name;
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));
-
+ g_scanner_scope_add_symbol (scanner, 0, symbol_names + symbols[i].name_offset, GINT_TO_POINTER (symbols[i].token));
done = FALSE;
while (!done)
{
if (expected_token != G_TOKEN_NONE)
{
- gchar *symbol_name;
- gchar *msg;
-
- msg = NULL;
- symbol_name = NULL;
+ const gchar *symbol_name = NULL;
+ gchar *msg = NULL;
+
if (scanner->scope_id == 0)
{
/* if we are in scope 0, we know the symbol names
if (expected_token > GTK_RC_TOKEN_INVALID &&
expected_token < GTK_RC_TOKEN_LAST)
{
+ const gchar *sym = NULL;
+
for (i = 0; i < G_N_ELEMENTS (symbols); i++)
if (symbols[i].token == expected_token)
- msg = symbols[i].name;
- if (msg)
- msg = g_strconcat ("e.g. `", msg, "'", NULL);
+ sym = symbol_names + symbols[i].name_offset;
+
+ if (sym)
+ msg = g_strconcat ("e.g. `", sym, "'", NULL);
}
+
if (scanner->token > GTK_RC_TOKEN_INVALID &&
scanner->token < GTK_RC_TOKEN_LAST)
{
symbol_name = "???";
for (i = 0; i < G_N_ELEMENTS (symbols); i++)
if (symbols[i].token == scanner->token)
- symbol_name = symbols[i].name;
+ symbol_name = symbol_names + symbols[i].name_offset;
}
}
+
g_scanner_unexp_token (scanner,
expected_token,
NULL,
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;
-
- gtk_rc_style_ref (rc_style);
+ style->rc_style = g_object_ref (rc_style);
GTK_STYLE_GET_CLASS (style)->init_from_rc (style, rc_style);
GSList *tmp_styles;
GType rc_style_type = GTK_TYPE_RC_STYLE;
- /* Find the the first style where the RC file specified engine "" {}
+ /* Find 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.
proto_style_class = GTK_RC_STYLE_GET_CLASS (base_style);
proto_style = proto_style_class->create_rc_style (base_style);
-
+
tmp_styles = rc_styles;
while (tmp_styles)
{
GtkRcStyle *rc_style = tmp_styles->data;
- GSList *factories;
-
+
proto_style_class->merge (proto_style, rc_style);
/* Point from each rc_style to the list of styles */
if (!g_slist_find (rc_style->rc_style_lists, rc_styles))
rc_style->rc_style_lists = g_slist_prepend (rc_style->rc_style_lists, rc_styles);
- factories = g_slist_copy (rc_style->icon_factories);
- if (factories)
- {
- GSList *iter;
-
- iter = factories;
- while (iter != NULL)
- {
- g_object_ref (iter->data);
- iter = g_slist_next (iter);
- }
-
- proto_style->icon_factories = g_slist_concat (proto_style->icon_factories,
- factories);
+ gtk_rc_style_append_icon_factories (proto_style, rc_style);
+ gtk_rc_style_append_color_hashes (proto_style, rc_style);
- }
-
tmp_styles = tmp_styles->next;
}
}
style = gtk_rc_style_to_style (context, proto_style);
- gtk_rc_style_unref (proto_style);
+ g_object_unref (proto_style);
g_hash_table_insert (realized_style_ht, rc_styles, style);
}
* Parsing functions *
*********************/
+static gboolean
+lookup_color (GtkRcStyle *style,
+ const char *color_name,
+ GdkColor *color)
+{
+ GtkRcStylePrivate *priv = GTK_RC_STYLE_GET_PRIVATE (style);
+ GSList *iter;
+
+ for (iter = priv->color_hashes; iter != NULL; iter = iter->next)
+ {
+ GHashTable *hash = iter->data;
+ GdkColor *match = g_hash_table_lookup (hash, color_name);
+
+ if (match)
+ {
+ color->red = match->red;
+ color->green = match->green;
+ color->blue = match->blue;
+ return TRUE;
+ }
+ }
+
+ return FALSE;
+}
+
static guint
-rc_parse_token_or_compound (GScanner *scanner,
- GString *gstring,
- GTokenType delimiter)
+rc_parse_token_or_compound (GScanner *scanner,
+ GtkRcStyle *style,
+ GString *gstring,
+ GTokenType delimiter)
{
guint token = g_scanner_get_next_token (scanner);
break;
case G_TOKEN_COMMENT_SINGLE:
case G_TOKEN_COMMENT_MULTI:
- return rc_parse_token_or_compound (scanner, gstring, delimiter);
+ return rc_parse_token_or_compound (scanner, style, 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);
+ token = rc_parse_token_or_compound (scanner, style, 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);
+ token = rc_parse_token_or_compound (scanner, style, 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);
+ token = rc_parse_token_or_compound (scanner, style, gstring, G_TOKEN_RIGHT_BRACE);
if (token != G_TOKEN_NONE)
return token;
break;
+ case '@':
+ if (g_scanner_peek_next_token (scanner) == G_TOKEN_IDENTIFIER)
+ {
+ GdkColor color;
+ gchar rbuf[G_ASCII_DTOSTR_BUF_SIZE];
+ gchar gbuf[G_ASCII_DTOSTR_BUF_SIZE];
+ gchar bbuf[G_ASCII_DTOSTR_BUF_SIZE];
+
+ g_scanner_get_next_token (scanner);
+
+ if (!style || !lookup_color (style, scanner->value.v_identifier,
+ &color))
+ {
+ g_scanner_warn (scanner, "Invalid symbolic color '%s'",
+ scanner->value.v_identifier);
+ return G_TOKEN_IDENTIFIER;
+ }
+
+
+ g_string_append_printf (gstring, " { %s, %s, %s }",
+ g_ascii_formatd (rbuf, sizeof (rbuf),
+ "%0.4f",
+ color.red / 65535.0),
+ g_ascii_formatd (gbuf, sizeof (gbuf),
+ "%0.4f",
+ color.green / 65535.0),
+ g_ascii_formatd (bbuf, sizeof (bbuf),
+ "%0.4f",
+ color.blue / 65535.0));
+ break;
+ }
+ else
+ return G_TOKEN_IDENTIFIER;
default:
if (token >= 256 || token < 1)
return delimiter ? delimiter : G_TOKEN_STRING;
if (!delimiter)
return G_TOKEN_NONE;
else
- return rc_parse_token_or_compound (scanner, gstring, delimiter);
+ return rc_parse_token_or_compound (scanner, style, gstring, delimiter);
}
static guint
gtk_rc_parse_assignment (GScanner *scanner,
+ GtkRcStyle *style,
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;
+#define MY_SCAN_IDENTIFIER TRUE
+#define MY_SCAN_SYMBOLS FALSE
+#define MY_IDENTIFIER_2_STRING FALSE
+#define MY_CHAR_2_TOKEN TRUE
+#define MY_SCAN_IDENTIFIER_NULL FALSE
+#define MY_NUMBERS_2_INT TRUE
+
+ 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 numbers_2_int = scanner->config->numbers_2_int;
gboolean negate = FALSE;
- guint token;
+ gboolean is_color = 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;
+ scanner->config->scan_identifier = MY_SCAN_IDENTIFIER;
+ scanner->config->scan_symbols = MY_SCAN_SYMBOLS;
+ scanner->config->identifier_2_string = MY_IDENTIFIER_2_STRING;
+ scanner->config->char_2_token = MY_CHAR_2_TOKEN;
+ scanner->config->scan_identifier_NULL = MY_SCAN_IDENTIFIER_NULL;
+ scanner->config->numbers_2_int = MY_NUMBERS_2_INT;
/* record location */
- prop->origin = g_strdup_printf ("%s:%u", scanner->input_name, scanner->line);
+ if (g_getenv ("GTK_DEBUG"))
+ prop->origin = g_strdup_printf ("%s:%u", scanner->input_name, scanner->line);
+ else
+ prop->origin = NULL;
+
+ /* parse optional symbolic color prefix */
+ if (g_scanner_peek_next_token (scanner) == '@')
+ {
+ g_scanner_get_next_token (scanner); /* eat color prefix */
+ is_color = TRUE;
+ }
/* parse optional sign */
- if (g_scanner_peek_next_token (scanner) == '-')
+ if (!is_color && 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 */
+ /* parse one of LONG, DOUBLE and STRING or, if that fails, create an
+ * unparsed compund
+ */
token = g_scanner_peek_next_token (scanner);
+
+ if (is_color && token != G_TOKEN_IDENTIFIER)
+ {
+ token = G_TOKEN_IDENTIFIER;
+ goto out;
+ }
+
switch (token)
{
case G_TOKEN_INT:
}
break;
case G_TOKEN_IDENTIFIER:
+ if (is_color)
+ {
+ GdkColor color;
+ gchar rbuf[G_ASCII_DTOSTR_BUF_SIZE];
+ gchar gbuf[G_ASCII_DTOSTR_BUF_SIZE];
+ gchar bbuf[G_ASCII_DTOSTR_BUF_SIZE];
+ GString *gstring;
+
+ g_scanner_get_next_token (scanner);
+
+ if (!style || !lookup_color (style, scanner->value.v_identifier,
+ &color))
+ {
+ g_scanner_warn (scanner, "Invalid symbolic color '%s'",
+ scanner->value.v_identifier);
+ token = G_TOKEN_IDENTIFIER;
+ break;
+ }
+
+ gstring = g_string_new (NULL);
+
+ g_string_append_printf (gstring, " { %s, %s, %s }",
+ g_ascii_formatd (rbuf, sizeof (rbuf),
+ "%0.4f",
+ color.red / 65535.0),
+ g_ascii_formatd (gbuf, sizeof (gbuf),
+ "%0.4f",
+ color.green / 65535.0),
+ g_ascii_formatd (bbuf, sizeof (bbuf),
+ "%0.4f",
+ color.blue / 65535.0));
+
+ g_value_init (&prop->value, G_TYPE_GSTRING);
+ g_value_take_boxed (&prop->value, gstring);
+ token = G_TOKEN_NONE;
+ break;
+ }
+ /* fall through */
case G_TOKEN_LEFT_PAREN:
case G_TOKEN_LEFT_CURLY:
case G_TOKEN_LEFT_BRACE:
if (!negate)
{
- GString *gstring = g_string_new (NULL);
+ GString *gstring = g_string_new (NULL);
+ gboolean parse_on = TRUE;
+
+ /* allow identifier(foobar) to support color expressions */
+ if (token == G_TOKEN_IDENTIFIER)
+ {
+ g_scanner_get_next_token (scanner);
+
+ g_string_append_c (gstring, ' ');
+ g_string_append (gstring, scanner->value.v_identifier);
+
+ /* temporarily reset scanner mode to default, so we
+ * don't peek the next token in a mode that only makes
+ * sense in this function; because if anything but
+ * G_TOKEN_LEFT_PAREN follows, the next token will be
+ * parsed by our caller.
+ *
+ * FIXME: right fix would be to call g_scanner_unget()
+ * but that doesn't exist
+ */
+ 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;
+
+ token = g_scanner_peek_next_token (scanner);
+
+ /* restore adjusted scanner mode */
+ scanner->config->scan_identifier = MY_SCAN_IDENTIFIER;
+ scanner->config->scan_symbols = MY_SCAN_SYMBOLS;
+ scanner->config->identifier_2_string = MY_IDENTIFIER_2_STRING;
+ scanner->config->char_2_token = MY_CHAR_2_TOKEN;
+ scanner->config->scan_identifier_NULL = MY_SCAN_IDENTIFIER_NULL;
+ scanner->config->numbers_2_int = MY_NUMBERS_2_INT;
+
+ if (token != G_TOKEN_LEFT_PAREN)
+ {
+ token = G_TOKEN_NONE;
+ parse_on = FALSE;
+ }
+ }
+
+ if (parse_on)
+ token = rc_parse_token_or_compound (scanner, style, gstring, 0);
- 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);
+ g_value_take_boxed (&prop->value, gstring);
}
else
g_string_free (gstring, TRUE);
break;
}
+ out:
+
/* 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 = 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;
+ scanner->config->numbers_2_int = numbers_2_int;
return token;
}
const gchar *p;
gboolean is_varname;
- is_varname = strchr (G_CSET_a_2_z G_CSET_A_2_Z "_", string[0]) != NULL;
+ 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;
+ is_varname &= strchr (G_CSET_DIGITS "-_" G_CSET_a_2_z G_CSET_A_2_Z, *p) != NULL;
return is_varname;
}
return gtk_rc_parse_style (context, scanner);
case GTK_RC_TOKEN_BINDING:
- return gtk_binding_parse_binding (scanner);
+ return _gtk_binding_parse_binding (scanner);
case GTK_RC_TOKEN_PIXMAP_PATH:
return gtk_rc_parse_pixmap_path (context, scanner);
g_scanner_get_next_token (scanner); /* eat identifier */
name = g_strdup (scanner->value.v_identifier);
- token = gtk_rc_parse_assignment (scanner, &prop);
+ token = gtk_rc_parse_assignment (scanner, NULL, &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 "-", '-');
+ g_strcanon (name, G_CSET_DIGITS "-" G_CSET_a_2_z G_CSET_A_2_Z, '-');
_gtk_settings_set_property_value_from_rc (context->settings,
name,
&svalue);
{
GtkRcStyle *rc_style;
GtkRcStyle *orig_style;
- GtkRcStyle *parent_style;
+ GtkRcStyle *parent_style = NULL;
+ GtkRcStylePrivate *rc_priv = NULL;
guint token;
gint i;
GtkIconFactory *our_factory = NULL;
-
+ GHashTable *our_hash = NULL;
+
token = g_scanner_get_next_token (scanner);
if (token != GTK_RC_TOKEN_STYLE)
return GTK_RC_TOKEN_STYLE;
else
orig_style = NULL;
- /* If there's a list, its first member is always the factory belonging
- * to this RcStyle
- */
- if (rc_style && rc_style->icon_factories)
- our_factory = rc_style->icon_factories->data;
-
if (!rc_style)
{
rc_style = gtk_rc_style_new ();
rc_style->color_flags[i] = 0;
}
+ rc_priv = GTK_RC_STYLE_GET_PRIVATE (rc_style);
+
+ /* If there's a list, its first member is always the factory belonging
+ * to this RcStyle
+ */
+ if (rc_style->icon_factories)
+ our_factory = rc_style->icon_factories->data;
+ if (rc_priv->color_hashes)
+ our_hash = rc_priv->color_hashes->data;
+
token = g_scanner_peek_next_token (scanner);
if (token == G_TOKEN_EQUAL_SIGN)
{
parent_style = gtk_rc_style_find (context, scanner->value.v_string);
if (parent_style)
{
- GSList *factories;
-
for (i = 0; i < 5; i++)
{
rc_style->color_flags[i] = parent_style->color_flags[i];
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->bg_pixmap_name[i]);
rc_style->bg_pixmap_name[i] = g_strdup (parent_style->bg_pixmap_name[i]);
}
-
- /* Append parent's factories, adding a ref to them */
- if (parent_style->icon_factories != NULL)
- {
- /* Add a factory for ourselves if we have none,
- * in case we end up defining more stock icons.
- * I see no real way around this; we need to maintain
- * the invariant that the first factory in the list
- * is always our_factory, the one belonging to us,
- * and if we put parent factories in the list we can't
- * do that if the style is reopened.
- */
- if (our_factory == NULL)
- {
- our_factory = gtk_icon_factory_new ();
- rc_style->icon_factories = g_slist_prepend (rc_style->icon_factories,
- our_factory);
- }
-
- rc_style->icon_factories = g_slist_concat (rc_style->icon_factories,
- g_slist_copy (parent_style->icon_factories));
-
- factories = parent_style->icon_factories;
- while (factories != NULL)
- {
- g_object_ref (factories->data);
- factories = factories->next;
- }
- }
}
}
-
+
+ /* get icon_factories and color_hashes from the parent style;
+ * if the parent_style doesn't have color_hashes, initializes
+ * the color_hashes with the settings' color scheme (if it exists)
+ */
+ gtk_rc_style_copy_icons_and_colors (rc_style, parent_style, context);
+
+ if (rc_style->icon_factories)
+ our_factory = rc_style->icon_factories->data;
+ if (rc_priv->color_hashes)
+ our_hash = rc_priv->color_hashes->data;
+
token = g_scanner_get_next_token (scanner);
if (token != G_TOKEN_LEFT_CURLY)
{
break;
case GTK_RC_TOKEN_STOCK:
if (our_factory == NULL)
+ gtk_rc_style_prepend_empty_icon_factory (rc_style);
+ our_factory = rc_style->icon_factories->data;
+ token = gtk_rc_parse_stock (context, scanner, rc_style, our_factory);
+ break;
+ case GTK_RC_TOKEN_COLOR:
+ if (our_hash == NULL)
{
- our_factory = gtk_icon_factory_new ();
- rc_style->icon_factories = g_slist_prepend (rc_style->icon_factories,
- our_factory);
+ gtk_rc_style_prepend_empty_color_hash (rc_style);
+ our_hash = rc_priv->color_hashes->data;
}
- token = gtk_rc_parse_stock (context, scanner, rc_style, our_factory);
+ token = gtk_rc_parse_logical_color (scanner, rc_style, our_hash);
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 */
+ if (is_c_identifier (scanner->next_value.v_identifier))
{
GtkRcProperty prop = { 0, 0, NULL, { 0, }, };
-
+ gchar *name;
+
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) != ':' ||
}
/* 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);
+ name = g_strdup (scanner->value.v_identifier);
+ g_strcanon (name, G_CSET_DIGITS "-" G_CSET_a_2_z G_CSET_A_2_Z, '-');
+ prop.property_name = g_quark_from_string (name);
+ g_free (name);
- token = gtk_rc_parse_assignment (scanner, &prop);
+ token = gtk_rc_parse_assignment (scanner, rc_style, &prop);
if (token == G_TOKEN_NONE)
{
- g_return_val_if_fail (prop.origin != NULL && G_VALUE_TYPE (&prop.value) != 0, G_TOKEN_ERROR);
+ g_return_val_if_fail (G_VALUE_TYPE (&prop.value) != 0, G_TOKEN_ERROR);
insert_rc_property (rc_style, &prop, TRUE);
}
err:
if (rc_style != orig_style)
- gtk_rc_style_unref (rc_style);
+ g_object_unref (rc_style);
if (orig_style)
g_object_unref (orig_style);
return G_TOKEN_EQUAL_SIGN;
style->color_flags[state] |= GTK_RC_BG;
- return gtk_rc_parse_color (scanner, &style->bg[state]);
+ return gtk_rc_parse_color_full (scanner, style, &style->bg[state]);
}
static guint
return G_TOKEN_EQUAL_SIGN;
style->color_flags[state] |= GTK_RC_FG;
- return gtk_rc_parse_color (scanner, &style->fg[state]);
+ return gtk_rc_parse_color_full (scanner, style, &style->fg[state]);
}
static guint
return G_TOKEN_EQUAL_SIGN;
style->color_flags[state] |= GTK_RC_TEXT;
- return gtk_rc_parse_color (scanner, &style->text[state]);
+ return gtk_rc_parse_color_full (scanner, style, &style->text[state]);
}
static guint
return G_TOKEN_EQUAL_SIGN;
style->color_flags[state] |= GTK_RC_BASE;
- return gtk_rc_parse_color (scanner, &style->base[state]);
+ return gtk_rc_parse_color_full (scanner, style, &style->base[state]);
}
static guint
if (pixmap_file)
{
- if (rc_style->bg_pixmap_name[state])
- g_free (rc_style->bg_pixmap_name[state]);
+ g_free (rc_style->bg_pixmap_name[state]);
rc_style->bg_pixmap_name[state] = pixmap_file;
}
}
static gchar*
-gtk_rc_check_pixmap_dir (const gchar *dir, const gchar *pixmap_file)
+gtk_rc_check_pixmap_dir (const gchar *dir,
+ const gchar *pixmap_file)
{
gchar *buf;
- gint fd;
buf = g_build_filename (dir, pixmap_file, NULL);
-
- fd = open (buf, O_RDONLY);
- if (fd >= 0)
- {
- close (fd);
- return buf;
- }
+
+ if (g_file_test (buf, G_FILE_TEST_EXISTS))
+ return buf;
g_free (buf);
GtkRcContext *context = gtk_rc_context_get (settings);
- for (i = 0; (i < GTK_RC_MAX_PIXMAP_PATHS) && (context->pixmap_path[i] != NULL); i++)
- {
- filename = gtk_rc_check_pixmap_dir (context->pixmap_path[i], pixmap_file);
- if (filename)
- return filename;
- }
-
+ if (context->pixmap_path)
+ for (i = 0; context->pixmap_path[i] != NULL; i++)
+ {
+ filename = gtk_rc_check_pixmap_dir (context->pixmap_path[i], pixmap_file);
+ if (filename)
+ return filename;
+ }
+
tmp_list = current_files_stack;
while (tmp_list)
{
guint result = G_TOKEN_NONE;
GtkRcStyle *new_style = NULL;
gboolean parsed_curlies = FALSE;
+ GtkRcStylePrivate *rc_priv, *new_priv;
token = g_scanner_get_next_token (scanner);
if (token != GTK_RC_TOKEN_ENGINE)
parsed_curlies = TRUE;
+ rc_priv = GTK_RC_STYLE_GET_PRIVATE (*rc_style);
+
if (G_OBJECT_TYPE (*rc_style) != GTK_TYPE_RC_STYLE)
{
new_style = gtk_rc_style_new ();
gtk_rc_style_real_merge (new_style, *rc_style);
-
- if ((*rc_style)->name)
- new_style->name = g_strdup ((*rc_style)->name);
+
+ new_style->name = g_strdup ((*rc_style)->name);
+
+ /* take over icon factories and color hashes
+ * from the to-be-deleted style
+ */
+ new_style->icon_factories = (*rc_style)->icon_factories;
+ (*rc_style)->icon_factories = NULL;
+ new_priv = GTK_RC_STYLE_GET_PRIVATE (new_style);
+ new_priv->color_hashes = rc_priv->color_hashes;
+ rc_priv->color_hashes = NULL;
}
else
(*rc_style)->engine_specified = TRUE;
{
GtkRcStyleClass *new_class;
+ rc_priv = GTK_RC_STYLE_GET_PRIVATE (*rc_style);
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);
+
+ new_style->name = g_strdup ((*rc_style)->name);
+
+ /* take over icon factories and color hashes
+ * from the to-be-deleted style
+ */
+ new_style->icon_factories = (*rc_style)->icon_factories;
+ (*rc_style)->icon_factories = NULL;
+ new_priv = GTK_RC_STYLE_GET_PRIVATE (new_style);
+ new_priv->color_hashes = rc_priv->color_hashes;
+ rc_priv->color_hashes = NULL;
if (new_class->parse)
{
if (result != G_TOKEN_NONE)
{
+ /* copy icon factories and color hashes back
+ */
+ (*rc_style)->icon_factories = new_style->icon_factories;
+ new_style->icon_factories = NULL;
+ rc_priv->color_hashes = new_priv->color_hashes;
+ new_priv->color_hashes = NULL;
+
g_object_unref (new_style);
new_style = NULL;
}
return G_TOKEN_NONE;
}
+/**
+ * gtk_rc_parse_color:
+ * @scanner: a #GScanner
+ * @color: a pointer to a #GdkColor structure in which to store the result
+ *
+ * Parses a color in the <link linkend="color=format">format</link> expected
+ * in a RC file.
+ *
+ * Note that theme engines should use gtk_rc_parse_color_full() in
+ * order to support symbolic colors.
+ *
+ * Returns: %G_TOKEN_NONE if parsing succeeded, otherwise the token
+ * that was expected but not found
+ */
guint
gtk_rc_parse_color (GScanner *scanner,
GdkColor *color)
+{
+ return gtk_rc_parse_color_full (scanner, NULL, color);
+}
+
+/**
+ * gtk_rc_parse_color_full:
+ * @scanner: a #GScanner
+ * @style: (allow-none): a #GtkRcStyle, or %NULL
+ * @color: a pointer to a #GdkColor structure in which to store the result
+ *
+ * Parses a color in the <link linkend="color=format">format</link> expected
+ * in a RC file. If @style is not %NULL, it will be consulted to resolve
+ * references to symbolic colors.
+ *
+ * Returns: %G_TOKEN_NONE if parsing succeeded, otherwise the token
+ * that was expected but not found
+ *
+ * Since: 2.12
+ */
+guint
+gtk_rc_parse_color_full (GScanner *scanner,
+ GtkRcStyle *style,
+ GdkColor *color)
{
guint token;
switch (token)
{
gint token_int;
-
+ GdkColor c1, c2;
+ gboolean negate;
+ gdouble l;
+
case G_TOKEN_LEFT_CURLY:
token = g_scanner_get_next_token (scanner);
if (token == G_TOKEN_INT)
case G_TOKEN_STRING:
if (!gdk_color_parse (scanner->value.v_string, color))
{
- g_scanner_warn (scanner, "Invalid color constant '%s'",
- scanner->value.v_string);
- return G_TOKEN_STRING;
+ g_scanner_warn (scanner, "Invalid color constant '%s'",
+ scanner->value.v_string);
+ return G_TOKEN_STRING;
+ }
+ return G_TOKEN_NONE;
+
+ case '@':
+ token = g_scanner_get_next_token (scanner);
+ if (token != G_TOKEN_IDENTIFIER)
+ return G_TOKEN_IDENTIFIER;
+
+ if (!style || !lookup_color (style, scanner->value.v_identifier, color))
+ {
+ g_scanner_warn (scanner, "Invalid symbolic color '%s'",
+ scanner->value.v_identifier);
+ return G_TOKEN_IDENTIFIER;
+ }
+
+ return G_TOKEN_NONE;
+
+ case G_TOKEN_IDENTIFIER:
+ if (strcmp (scanner->value.v_identifier, "mix") == 0)
+ {
+ token = g_scanner_get_next_token (scanner);
+ if (token != G_TOKEN_LEFT_PAREN)
+ return G_TOKEN_LEFT_PAREN;
+
+ negate = FALSE;
+ if (g_scanner_peek_next_token (scanner) == '-')
+ {
+ g_scanner_get_next_token (scanner); /* eat sign */
+ negate = TRUE;
+ }
+
+ token = g_scanner_get_next_token (scanner);
+ if (token != G_TOKEN_FLOAT)
+ return G_TOKEN_FLOAT;
+
+ l = negate ? -scanner->value.v_float : scanner->value.v_float;
+
+ token = g_scanner_get_next_token (scanner);
+ if (token != G_TOKEN_COMMA)
+ return G_TOKEN_COMMA;
+
+ token = gtk_rc_parse_color_full (scanner, style, &c1);
+ if (token != G_TOKEN_NONE)
+ return token;
+
+ token = g_scanner_get_next_token (scanner);
+ if (token != G_TOKEN_COMMA)
+ return G_TOKEN_COMMA;
+
+ token = gtk_rc_parse_color_full (scanner, style, &c2);
+ if (token != G_TOKEN_NONE)
+ return token;
+
+ token = g_scanner_get_next_token (scanner);
+ if (token != G_TOKEN_RIGHT_PAREN)
+ return G_TOKEN_RIGHT_PAREN;
+
+ color->red = l * c1.red + (1.0 - l) * c2.red;
+ color->green = l * c1.green + (1.0 - l) * c2.green;
+ color->blue = l * c1.blue + (1.0 - l) * c2.blue;
+
+ return G_TOKEN_NONE;
}
+ else if (strcmp (scanner->value.v_identifier, "shade") == 0)
+ {
+ token = g_scanner_get_next_token (scanner);
+ if (token != G_TOKEN_LEFT_PAREN)
+ return G_TOKEN_LEFT_PAREN;
+
+ negate = FALSE;
+ if (g_scanner_peek_next_token (scanner) == '-')
+ {
+ g_scanner_get_next_token (scanner); /* eat sign */
+ negate = TRUE;
+ }
+
+ token = g_scanner_get_next_token (scanner);
+ if (token != G_TOKEN_FLOAT)
+ return G_TOKEN_FLOAT;
+
+ l = negate ? -scanner->value.v_float : scanner->value.v_float;
+
+ token = g_scanner_get_next_token (scanner);
+ if (token != G_TOKEN_COMMA)
+ return G_TOKEN_COMMA;
+
+ token = gtk_rc_parse_color_full (scanner, style, &c1);
+ if (token != G_TOKEN_NONE)
+ return token;
+
+ token = g_scanner_get_next_token (scanner);
+ if (token != G_TOKEN_RIGHT_PAREN)
+ return G_TOKEN_RIGHT_PAREN;
+
+ _gtk_style_shade (&c1, color, l);
+
+ return G_TOKEN_NONE;
+ }
+ else if (strcmp (scanner->value.v_identifier, "lighter") == 0 ||
+ strcmp (scanner->value.v_identifier, "darker") == 0)
+ {
+ if (scanner->value.v_identifier[0] == 'l')
+ l = 1.3;
+ else
+ l = 0.7;
+
+ token = g_scanner_get_next_token (scanner);
+ if (token != G_TOKEN_LEFT_PAREN)
+ return G_TOKEN_LEFT_PAREN;
+
+ token = gtk_rc_parse_color_full (scanner, style, &c1);
+ if (token != G_TOKEN_NONE)
+ return token;
+
+ token = g_scanner_get_next_token (scanner);
+ if (token != G_TOKEN_RIGHT_PAREN)
+ return G_TOKEN_RIGHT_PAREN;
+
+ _gtk_style_shade (&c1, color, l);
+
+ return G_TOKEN_NONE;
+ }
else
- return G_TOKEN_NONE;
-
+ return G_TOKEN_IDENTIFIER;
+
default:
return G_TOKEN_STRING;
}
GScanner *scanner,
const gchar *pix_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; context->pixmap_path[path_num]; path_num++)
- {
- g_free (context->pixmap_path[path_num]);
- context->pixmap_path[path_num] = NULL;
- }
-
- path_num = 0;
-
- path_len = strlen (pix_path);
-
- for (end_offset = 0; end_offset <= path_len; end_offset++)
- {
- if ((pix_path[end_offset] == G_SEARCHPATH_SEPARATOR) ||
- (end_offset == path_len))
- {
- 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_strfreev (context->pixmap_path);
+ context->pixmap_path = g_strsplit (pix_path, G_SEARCHPATH_SEPARATOR_S, -1);
}
static guint
if (token != G_TOKEN_STRING)
return G_TOKEN_STRING;
- if (im_module_file)
- g_free (im_module_file);
+ g_free (im_module_file);
im_module_file = g_strdup (scanner->value.v_string);
}
rc_set = g_new (GtkRcSet, 1);
- rc_set->pspec = g_pattern_spec_new (pattern);
+ rc_set->type = path_type;
+
+ if (path_type == GTK_PATH_WIDGET_CLASS)
+ {
+ rc_set->pspec = NULL;
+ rc_set->path = _gtk_rc_parse_widget_class_path (pattern);
+ }
+ else
+ {
+ rc_set->pspec = g_pattern_spec_new (pattern);
+ rc_set->path = NULL;
+ }
+
rc_set->rc_style = rc_style;
rc_set->priority = priority;
}
static guint
-gtk_rc_parse_stock_id (GScanner *scanner,
- gchar **stock_id)
+gtk_rc_parse_hash_key (GScanner *scanner,
+ gchar **hash_key)
{
guint token;
if (token != G_TOKEN_STRING)
return G_TOKEN_STRING;
- *stock_id = g_strdup (scanner->value.v_string);
+ *hash_key = g_strdup (scanner->value.v_string);
token = g_scanner_get_next_token (scanner);
if (token != G_TOKEN_RIGHT_BRACE)
{
- g_free (*stock_id);
+ g_free (*hash_key);
return G_TOKEN_RIGHT_BRACE;
}
gboolean *icon_set_valid)
{
guint token;
- GtkIconSource *source;
gchar *full_filename;
-
+ GtkIconSource *source = NULL;
+
token = g_scanner_get_next_token (scanner);
if (token != G_TOKEN_LEFT_CURLY)
return G_TOKEN_LEFT_CURLY;
if (token != G_TOKEN_STRING && token != '@')
return G_TOKEN_STRING;
- source = gtk_icon_source_new ();
-
if (token == G_TOKEN_STRING)
{
/* Filename */
-
+
+ source = gtk_icon_source_new ();
full_filename = gtk_rc_find_pixmap_in_path (context->settings, scanner, scanner->value.v_string);
if (full_filename)
{
if (token != G_TOKEN_STRING)
return G_TOKEN_STRING;
+ source = gtk_icon_source_new ();
gtk_icon_source_set_icon_name (source, scanner->value.v_string);
}
if (token != GTK_RC_TOKEN_STOCK)
return GTK_RC_TOKEN_STOCK;
- token = gtk_rc_parse_stock_id (scanner, &stock_id);
+ token = gtk_rc_parse_hash_key (scanner, &stock_id);
if (token != G_TOKEN_NONE)
return token;
return G_TOKEN_NONE;
}
+
+static guint
+gtk_rc_parse_logical_color (GScanner *scanner,
+ GtkRcStyle *rc_style,
+ GHashTable *hash)
+{
+ gchar *color_id = NULL;
+ guint token;
+ GdkColor color;
+
+ token = g_scanner_get_next_token (scanner);
+ if (token != GTK_RC_TOKEN_COLOR)
+ return GTK_RC_TOKEN_COLOR;
+
+ token = gtk_rc_parse_hash_key (scanner, &color_id);
+ if (token != G_TOKEN_NONE)
+ return token;
+
+ token = g_scanner_get_next_token (scanner);
+ if (token != G_TOKEN_EQUAL_SIGN)
+ {
+ g_free (color_id);
+ return G_TOKEN_EQUAL_SIGN;
+ }
+
+ token = gtk_rc_parse_color_full (scanner, rc_style, &color);
+ if (token != G_TOKEN_NONE)
+ {
+ g_free (color_id);
+ return token;
+ }
+
+ /* Because the hash is created with destroy functions,
+ * g_hash_table_insert will free any old values for us,
+ * if a mapping with the specified key already exists.
+ */
+ g_hash_table_insert (hash, color_id, gdk_color_copy (&color));
+
+ return G_TOKEN_NONE;
+}
+
+
+GSList *
+_gtk_rc_parse_widget_class_path (const gchar *pattern)
+{
+ GSList *result;
+ PathElt *path_elt;
+ const gchar *current;
+ const gchar *class_start;
+ const gchar *class_end;
+ const gchar *pattern_end;
+ const gchar *pattern_start;
+ gchar *sub_pattern;
+
+ result = NULL;
+ current = pattern;
+ while ((class_start = strchr (current, '<')) &&
+ (class_end = strchr (class_start, '>')))
+ {
+ /* Add patterns, but ignore single dots */
+ if (!(class_start == current ||
+ (class_start == current + 1 && current[0] == '.')))
+ {
+ pattern_end = class_start - 1;
+ pattern_start = current;
+
+ path_elt = g_new (PathElt, 1);
+
+ sub_pattern = g_strndup (pattern_start, pattern_end - pattern_start + 1);
+ path_elt->type = PATH_ELT_PSPEC;
+ path_elt->elt.pspec = g_pattern_spec_new (sub_pattern);
+ g_free (sub_pattern);
+
+ result = g_slist_prepend (result, path_elt);
+ }
+
+ path_elt = g_new (PathElt, 1);
+
+ /* The < > need to be removed from the string. */
+ sub_pattern = g_strndup (class_start + 1, class_end - class_start - 1);
+
+ path_elt->type = PATH_ELT_UNRESOLVED;
+ path_elt->elt.class_name = sub_pattern;
+
+ result = g_slist_prepend (result, path_elt);
+
+ current = class_end + 1;
+ }
+
+ /* Add the rest, if anything is left */
+ if (strlen (current) > 0)
+ {
+ path_elt = g_new (PathElt, 1);
+ path_elt->type = PATH_ELT_PSPEC;
+ path_elt->elt.pspec = g_pattern_spec_new (current);
+
+ result = g_slist_prepend (result, path_elt);
+ }
+
+ return g_slist_reverse (result);
+}
+
+static void
+free_path_elt (gpointer data,
+ gpointer user_data)
+{
+ PathElt *path_elt = data;
+
+ switch (path_elt->type)
+ {
+ case PATH_ELT_PSPEC:
+ g_pattern_spec_free (path_elt->elt.pspec);
+ break;
+ case PATH_ELT_UNRESOLVED:
+ g_free (path_elt->elt.class_name);
+ break;
+ case PATH_ELT_TYPE:
+ break;
+ default:
+ g_assert_not_reached ();
+ }
+
+ g_free (path_elt);
+}
+
+void
+_gtk_rc_free_widget_class_path (GSList *list)
+{
+ g_slist_foreach (list, free_path_elt, NULL);
+ g_slist_free (list);
+}
+
+static void
+gtk_rc_set_free (GtkRcSet *rc_set)
+{
+ if (rc_set->pspec)
+ g_pattern_spec_free (rc_set->pspec);
+
+ _gtk_rc_free_widget_class_path (rc_set->path);
+
+ g_free (rc_set);
+}
+
+static gboolean
+match_class (PathElt *path_elt,
+ gchar *type_name)
+{
+ GType type;
+
+ if (path_elt->type == PATH_ELT_UNRESOLVED)
+ {
+ type = g_type_from_name (path_elt->elt.class_name);
+ if (type != G_TYPE_INVALID)
+ {
+ g_free (path_elt->elt.class_name);
+ path_elt->elt.class_type = type;
+ path_elt->type = PATH_ELT_TYPE;
+ }
+ else
+ return g_str_equal (type_name, path_elt->elt.class_name);
+ }
+
+ return g_type_is_a (g_type_from_name (type_name), path_elt->elt.class_type);
+}
+
+static gboolean
+match_widget_class_recursive (GSList *list,
+ guint length,
+ gchar *path,
+ gchar *path_reversed)
+{
+ PathElt *path_elt;
+
+ /* break out if we cannot match anymore. */
+ if (list == NULL)
+ {
+ if (length > 0)
+ return FALSE;
+ else
+ return TRUE;
+ }
+
+ /* there are two possibilities:
+ * 1. The next pattern should match the class.
+ * 2. First normal matching, and then maybe a class */
+
+ path_elt = list->data;
+
+ if (path_elt->type != PATH_ELT_PSPEC)
+ {
+ gchar *class_start = path;
+ gchar *class_end;
+
+ /* ignore leading dot */
+ if (class_start[0] == '.')
+ class_start++;
+ class_end = strchr (class_start, '.');
+
+ if (class_end == NULL)
+ {
+ if (!match_class (path_elt, class_start))
+ return FALSE;
+ else
+ return match_widget_class_recursive (list->next, 0, "", "");
+ }
+ else
+ {
+ class_end[0] = '\0';
+ if (!match_class (path_elt, class_start))
+ {
+ class_end[0] = '.';
+ return FALSE;
+ }
+ else
+ {
+ gboolean result;
+ gint new_length = length - (class_end - path);
+ gchar old_char = path_reversed[new_length];
+
+ class_end[0] = '.';
+
+ path_reversed[new_length] = '\0';
+ result = match_widget_class_recursive (list->next, new_length, class_end, path_reversed);
+ path_reversed[new_length] = old_char;
+
+ return result;
+ }
+ }
+ }
+ else
+ {
+ PathElt *class_elt;
+ gchar *class_start;
+ gchar *class_end;
+ gboolean result = FALSE;
+
+ /* If there is nothing after this (ie. no class match),
+ * just compare the pspec.
+ */
+ if (list->next == NULL)
+ return g_pattern_match (path_elt->elt.pspec, length, path, path_reversed);
+
+ class_elt = (PathElt *)list->next->data;
+ g_assert (class_elt->type != PATH_ELT_PSPEC);
+
+ class_start = path;
+ if (class_start[0] == '.')
+ class_start++;
+
+ while (TRUE)
+ {
+ class_end = strchr (class_start, '.');
+
+ /* It should be cheaper to match the class first. (either the pattern
+ * is simple, and will match most of the times, or it may be complex
+ * and matching is slow)
+ */
+ if (class_end == NULL)
+ {
+ result = match_class (class_elt, class_start);
+ }
+ else
+ {
+ class_end[0] = '\0';
+ result = match_class (class_elt, class_start);
+ class_end[0] = '.';
+ }
+
+ if (result)
+ {
+ gchar old_char;
+ result = FALSE;
+
+ /* terminate the string in front of the class. It does not matter
+ * that the class becomes unusable, because it is not needed
+ * inside the recursion
+ */
+ old_char = class_start[0];
+ class_start[0] = '\0';
+
+ if (g_pattern_match (path_elt->elt.pspec, class_start - path, path, path_reversed + length - (class_start - path)))
+ {
+ if (class_end != NULL)
+ {
+ gint new_length = length - (class_end - path);
+ gchar path_reversed_char = path_reversed[new_length];
+
+ path_reversed[new_length] = '\0';
+
+ result = match_widget_class_recursive (list->next->next, new_length, class_end, path_reversed);
+
+ path_reversed[new_length] = path_reversed_char;
+ }
+ else
+ result = match_widget_class_recursive (list->next->next, 0, "", "");
+ }
+
+ class_start[0] = old_char;
+ }
+
+ if (result)
+ return TRUE;
+
+ /* get next class in path, or break out */
+ if (class_end != NULL)
+ class_start = class_end + 1;
+ else
+ return FALSE;
+ }
+ }
+}
+
+gboolean
+_gtk_rc_match_widget_class (GSList *list,
+ gint length,
+ gchar *path,
+ gchar *path_reversed)
+{
+ return match_widget_class_recursive (list, length, path, path_reversed);
+}
+
+#if defined (G_OS_WIN32) && !defined (_WIN64)
+
+/* DLL ABI stability backward compatibility versions */
+
+#undef gtk_rc_add_default_file
+
+void
+gtk_rc_add_default_file (const gchar *filename)
+{
+ gchar *utf8_filename = g_locale_to_utf8 (filename, -1, NULL, NULL, NULL);
+
+ gtk_rc_add_default_file_utf8 (utf8_filename);
+
+ g_free (utf8_filename);
+}
+
+#undef gtk_rc_set_default_files
+
+void
+gtk_rc_set_default_files (gchar **filenames)
+{
+ gchar **utf8_filenames;
+ int n = 0, i;
+
+ while (filenames[n++] != NULL)
+ ;
+
+ utf8_filenames = g_new (gchar *, n + 1);
+
+ for (i = 0; i < n; i++)
+ utf8_filenames[i] = g_locale_to_utf8 (filenames[i], -1, NULL, NULL, NULL);
+
+ utf8_filenames[n] = NULL;
+
+ gtk_rc_set_default_files_utf8 (utf8_filenames);
+
+ g_strfreev (utf8_filenames);
+}
+
+#undef gtk_rc_parse
+
+void
+gtk_rc_parse (const gchar *filename)
+{
+ gchar *utf8_filename = g_locale_to_utf8 (filename, -1, NULL, NULL, NULL);
+
+ gtk_rc_parse_utf8 (utf8_filename);
+
+ g_free (utf8_filename);
+}
+
+#endif
+
+#define __GTK_RC_C__
+#include "gtkaliasdef.c"
projects / ~andy / gtk / blobdiff