#include "config.h"
+#include "glib.h"
+#include "gdkconfig.h"
+
#ifdef GDK_WINDOWING_X11
#include <X11/Xlocale.h> /* so we get the right setlocale */
#else
#endif
#ifdef G_OS_WIN32
+#include <windows.h> /* For GetWindowsDirectory */
#include <io.h>
#endif
gboolean reload;
};
-static guint gtk_rc_style_hash (const char *name);
-static gint gtk_rc_style_compare (const char *a,
- const char *b);
-static guint gtk_rc_styles_hash (const GSList *rc_styles);
-static gint gtk_rc_styles_compare (const GSList *a,
- const GSList *b);
-static GtkRcStyle* gtk_rc_style_find (const char *name);
-static GSList * gtk_rc_styles_match (GSList *rc_styles,
- GSList *sets,
- guint path_length,
- gchar *path,
- gchar *path_reversed);
-static GtkStyle * gtk_rc_style_to_style (GtkRcStyle *rc_style);
-static GtkStyle* gtk_rc_style_init (GSList *rc_styles);
-static void gtk_rc_parse_file (const gchar *filename,
- gboolean reload);
-
-static void gtk_rc_parse_any (const gchar *input_name,
- gint input_fd,
- const gchar *input_string);
-static guint gtk_rc_parse_statement (GScanner *scanner);
-static guint gtk_rc_parse_style (GScanner *scanner);
-static guint gtk_rc_parse_base (GScanner *scanner,
- GtkRcStyle *style);
-static guint gtk_rc_parse_bg (GScanner *scanner,
- GtkRcStyle *style);
-static guint gtk_rc_parse_fg (GScanner *scanner,
- GtkRcStyle *style);
-static guint gtk_rc_parse_text (GScanner *scanner,
- GtkRcStyle *style);
-static guint gtk_rc_parse_bg_pixmap (GScanner *scanner,
- GtkRcStyle *rc_style);
-static guint gtk_rc_parse_font (GScanner *scanner,
- GtkRcStyle *rc_style);
-static guint gtk_rc_parse_fontset (GScanner *scanner,
- GtkRcStyle *rc_style);
-static guint gtk_rc_parse_engine (GScanner *scanner,
- GtkRcStyle *rc_style);
-static guint gtk_rc_parse_pixmap_path (GScanner *scanner);
-static void gtk_rc_parse_pixmap_path_string (gchar *pix_path);
-static guint gtk_rc_parse_module_path (GScanner *scanner);
-static void gtk_rc_parse_module_path_string (gchar *mod_path);
-static guint gtk_rc_parse_path_pattern (GScanner *scanner);
-static void gtk_rc_clear_hash_node (gpointer key,
- gpointer data,
- gpointer user_data);
+static guint gtk_rc_style_hash (const char *name);
+static gint gtk_rc_style_compare (const char *a,
+ const char *b);
+static guint gtk_rc_styles_hash (const GSList *rc_styles);
+static gint gtk_rc_styles_compare (const GSList *a,
+ const GSList *b);
+static GtkRcStyle* gtk_rc_style_find (const char *name);
+static GSList * gtk_rc_styles_match (GSList *rc_styles,
+ GSList *sets,
+ guint path_length,
+ gchar *path,
+ gchar *path_reversed);
+static GtkStyle * gtk_rc_style_to_style (GtkRcStyle *rc_style);
+static GtkStyle* gtk_rc_init_style (GSList *rc_styles);
+static void gtk_rc_parse_file (const gchar *filename,
+ gboolean reload);
+static void gtk_rc_parse_any (const gchar *input_name,
+ gint input_fd,
+ const gchar *input_string);
+static guint gtk_rc_parse_statement (GScanner *scanner);
+static guint gtk_rc_parse_style (GScanner *scanner);
+static guint gtk_rc_parse_bg (GScanner *scanner,
+ GtkRcStyle *style);
+static guint gtk_rc_parse_fg (GScanner *scanner,
+ GtkRcStyle *style);
+static guint gtk_rc_parse_text (GScanner *scanner,
+ GtkRcStyle *style);
+static guint gtk_rc_parse_base (GScanner *scanner,
+ GtkRcStyle *style);
+static guint gtk_rc_parse_xthickness (GScanner *scanner,
+ GtkRcStyle *style);
+static guint gtk_rc_parse_ythickness (GScanner *scanner,
+ GtkRcStyle *style);
+static guint gtk_rc_parse_bg_pixmap (GScanner *scanner,
+ GtkRcStyle *rc_style);
+static guint gtk_rc_parse_font (GScanner *scanner,
+ GtkRcStyle *rc_style);
+static guint gtk_rc_parse_fontset (GScanner *scanner,
+ GtkRcStyle *rc_style);
+static guint gtk_rc_parse_font_name (GScanner *scanner,
+ GtkRcStyle *rc_style);
+static guint gtk_rc_parse_engine (GScanner *scanner,
+ GtkRcStyle **rc_style);
+static guint gtk_rc_parse_pixmap_path (GScanner *scanner);
+static void gtk_rc_parse_pixmap_path_string (gchar *pix_path);
+static guint gtk_rc_parse_module_path (GScanner *scanner);
+static void gtk_rc_parse_module_path_string (gchar *mod_path);
+static guint gtk_rc_parse_path_pattern (GScanner *scanner);
+static void gtk_rc_clear_hash_node (gpointer key,
+ gpointer data,
+ gpointer user_data);
static void gtk_rc_clear_styles (void);
-static void gtk_rc_append_default_pixmap_path (void);
static void gtk_rc_append_default_module_path (void);
-static void gtk_rc_append_pixmap_path (gchar *dir);
static void gtk_rc_add_initial_default_files (void);
+static void gtk_rc_style_init (GtkRcStyle *style);
+static void gtk_rc_style_class_init (GtkRcStyleClass *klass);
+static void gtk_rc_style_finalize (GObject *object);
+static void gtk_rc_style_real_merge (GtkRcStyle *dest,
+ GtkRcStyle *src);
+static GtkRcStyle *gtk_rc_style_real_clone (GtkRcStyle *rc_style);
+static GtkStyle * gtk_rc_style_real_create_style (GtkRcStyle *rc_style);
+
+static gpointer parent_class = NULL;
static const GScannerConfig gtk_rc_scanner_config =
{
{ "INSENSITIVE", GTK_RC_TOKEN_INSENSITIVE },
{ "fg", GTK_RC_TOKEN_FG },
{ "bg", GTK_RC_TOKEN_BG },
- { "base", GTK_RC_TOKEN_BASE },
{ "text", GTK_RC_TOKEN_TEXT },
+ { "base", GTK_RC_TOKEN_BASE },
+ { "xthickness", GTK_RC_TOKEN_XTHICKNESS },
+ { "ythickness", GTK_RC_TOKEN_YTHICKNESS },
{ "font", GTK_RC_TOKEN_FONT },
{ "fontset", GTK_RC_TOKEN_FONTSET },
+ { "font_name", GTK_RC_TOKEN_FONT_NAME },
{ "bg_pixmap", GTK_RC_TOKEN_BG_PIXMAP },
{ "pixmap_path", GTK_RC_TOKEN_PIXMAP_PATH },
{ "style", GTK_RC_TOKEN_STYLE },
#define GTK_RC_MAX_MODULE_PATHS 128
static gchar *module_path[GTK_RC_MAX_MODULE_PATHS];
+/* A stack of directories for RC files we are parsing currently.
+ * these are implicitely added to the end of PIXMAP_PATHS
+ */
+GSList *rc_dir_stack = NULL;
+
/* The files we have parsed, to reread later if necessary */
GSList *rc_files = NULL;
#ifdef G_OS_WIN32
gchar *
-get_gtk_sysconf_directory (void)
+gtk_win32_get_installation_directory (void)
{
- static gchar gtk_sysconf_dir[200];
+ static gboolean been_here = FALSE;
+ static gchar gtk_installation_dir[200];
gchar win_dir[100];
+ HKEY reg_key = NULL;
+ DWORD type;
+ DWORD nbytes = sizeof (gtk_installation_dir);
+
+ if (been_here)
+ return gtk_installation_dir;
- GetWindowsDirectory (win_dir, sizeof (win_dir));
- sprintf (gtk_sysconf_dir, "%s\\gtk+", win_dir);
- return gtk_sysconf_dir;
+ been_here = TRUE;
+
+ if (RegOpenKeyEx (HKEY_LOCAL_MACHINE, "Software\\GNU\\GTk+", 0,
+ KEY_QUERY_VALUE, ®_key) != ERROR_SUCCESS
+ || RegQueryValueEx (reg_key, "InstallationDirectory", 0,
+ &type, gtk_installation_dir, &nbytes) != ERROR_SUCCESS
+ || type != REG_SZ)
+ {
+ /* Uh oh. Use the old hard-coded %WinDir%\GTk+ value */
+ GetWindowsDirectory (win_dir, sizeof (win_dir));
+ sprintf (gtk_installation_dir, "%s\\gtk+", win_dir);
+ }
+
+ if (reg_key != NULL)
+ RegCloseKey (reg_key);
+
+ return gtk_installation_dir;
}
static gchar *
get_themes_directory (void)
{
- /* We really should fetch this from the Registry. The GIMP
- * installation program stores the Themes installation
- * directory in HKLM\Software\GNU\GTk+\Themes\InstallDirectory.
- * Later.
- */
static gchar themes_dir[200];
- sprintf (themes_dir, "%s\\themes", get_gtk_sysconf_directory ());
+ sprintf (themes_dir, "%s\\themes", gtk_win32_get_installation_directory ());
return themes_dir;
}
#ifndef G_OS_WIN32
var = getenv("GTK_EXE_PREFIX");
if (var)
- path = g_strdup_printf("%s%s", var, "/lib/gtk/themes/engines");
+ path = g_strdup_printf("%s%s", var, "/lib/gtk-2.0/" GTK_VERSION "/engines");
else
- path = g_strdup_printf("%s%s", GTK_EXE_PREFIX, "/lib/gtk/themes/engines");
+ path = g_strdup_printf("%s%s", GTK_EXE_PREFIX, "/lib/gtk-2.0/" GTK_VERSION "/engines");
#else
path = g_strdup_printf ("%s%s", get_themes_directory (), "\\engines");
#endif
return path;
}
-static void
-gtk_rc_append_default_pixmap_path(void)
-{
- gchar *var, *path;
- gint n;
-
-#ifndef G_OS_WIN32
- var = getenv("GTK_DATA_PREFIX");
- if (var)
- path = g_strdup_printf("%s%s", var, "/share/gtk/themes");
- else
- path = g_strdup_printf("%s%s", GTK_DATA_PREFIX, "/share/gtk/themes");
-#else
- path = g_strdup (get_themes_directory ());
-#endif
-
- for (n = 0; pixmap_path[n]; n++) ;
- if (n >= GTK_RC_MAX_PIXMAP_PATHS - 1)
- {
- g_free (path);
- return;
- }
- pixmap_path[n++] = path;
- pixmap_path[n] = NULL;
-}
-
-static void
-gtk_rc_append_pixmap_path(gchar *dir)
-{
- gint n;
-
- for (n = 0; pixmap_path[n]; n++) ;
- if (n >= GTK_RC_MAX_MODULE_PATHS - 1)
- return;
- pixmap_path[n++] = g_strdup(dir);
- pixmap_path[n] = NULL;
-}
-
static void
gtk_rc_append_default_module_path(void)
{
#ifndef G_OS_WIN32
var = getenv("GTK_EXE_PREFIX");
if (var)
- path = g_strdup_printf("%s%s", var, "/lib/gtk/themes/engines");
+ path = g_strdup_printf("%s%s", var, "/lib/gtk-2.0/" GTK_VERSION "/engines");
else
- path = g_strdup_printf("%s%s", GTK_EXE_PREFIX, "/lib/gtk/themes/engines");
+ path = g_strdup_printf("%s%s", GTK_EXE_PREFIX, "/lib/gtk-2.0/" GTK_VERSION "/engines");
#else
path = g_strdup_printf ("%s%s", get_themes_directory (), "\\engines");
#endif
if (var)
{
#ifndef G_OS_WIN32
- path = g_strdup_printf ("%s%s", var, "/.gtk/lib/themes/engines");
+ path = g_strdup_printf ("%s%s", var, "/.gtk-2.0/" GTK_VERSION "/engines");
#else
path = g_strdup_printf ("%s%s", var, "\\_gtk\\themes\\engines");
#endif
else
{
#ifndef G_OS_WIN32
- str = g_strdup (GTK_SYSCONFDIR G_DIR_SEPARATOR_S "gtk" G_DIR_SEPARATOR_S "gtkrc");
+ str = g_strdup (GTK_SYSCONFDIR G_DIR_SEPARATOR_S "gtk-2.0" G_DIR_SEPARATOR_S "gtkrc");
#else
- str = g_strdup_printf ("%s\\gtkrc", get_gtk_sysconf_directory ());
+ str = g_strdup_printf ("%s\\gtkrc", gtk_win32_get_installation_directory ());
#endif
+
gtk_rc_add_default_file (str);
g_free (str);
var = g_get_home_dir ();
if (var)
{
- str = g_strdup_printf ("%s" G_DIR_SEPARATOR_S ".gtkrc", var);
+ str = g_strdup_printf ("%s" G_DIR_SEPARATOR_S ".gtkrc-2.0", var);
gtk_rc_add_default_file (str);
g_free (str);
}
return gtk_rc_default_files;
}
+ /* The following routine is based on _nl_normalize_codeset from
+ * the GNU C library. Contributed by
+ *
+ * Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
+ * Copyright (C) 1995, 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+ *
+ * Normalize codeset name. There is no standard for the codeset
+ * names. Normalization allows the user to use any of the common
+ * names.
+ */
+ static char *
+ _gtk_normalize_codeset (const char *codeset, int name_len)
+ {
+ int len = 0;
+ int only_digit = 1;
+ char *retval;
+ char *wp;
+ int cnt;
+
+ for (cnt = 0; cnt < name_len; ++cnt)
+ if (isalnum (codeset[cnt]))
+ {
+ ++len;
+
+ if (isalpha (codeset[cnt]))
+ only_digit = 0;
+ }
+
+ retval = g_malloc ((only_digit ? 3 : 0) + len + 1);
+
+ if (only_digit)
+ {
+ strcpy (retval, "iso");
+ wp = retval + 3;
+ }
+ else
+ wp = retval;
+
+ for (cnt = 0; cnt < name_len; ++cnt)
+ if (isalpha (codeset[cnt]))
+ *wp++ = isupper(codeset[cnt]) ? tolower (codeset[cnt]) : codeset[cnt];
+ else if (isdigit (codeset[cnt]))
+ *wp++ = codeset[cnt];
+
+ *wp = '\0';
+
+ return retval;
+ }
+
void
gtk_rc_init (void)
{
- gchar *locale_suffixes[3];
- gint n_locale_suffixes = 0;
+ static gchar *locale_suffixes[3];
+ static gint n_locale_suffixes = 0;
+
gint i, j;
-#ifdef G_OS_WIN32
- char *locale = g_win32_getlocale ();
-#else
-#ifdef HAVE_LC_MESSAGES
- char *locale = setlocale (LC_MESSAGES, NULL);
-#else
- char *locale = setlocale (LC_CTYPE, NULL);
-#endif
-#endif
- guint length;
- char *p;
-
- rc_style_ht = g_hash_table_new ((GHashFunc) gtk_rc_style_hash,
- (GCompareFunc) gtk_rc_style_compare);
- pixmap_path[0] = NULL;
- module_path[0] = NULL;
- gtk_rc_append_default_pixmap_path();
- gtk_rc_append_default_module_path();
- gtk_rc_add_initial_default_files ();
+ static gboolean initted = FALSE;
- if (strcmp (locale, "C") && strcmp (locale, "POSIX"))
+ if (!initted)
{
- /* Determine locale-specific suffixes for RC files
- */
- p = strchr (locale, '@');
- length = p ? (p -locale) : strlen (locale);
+ gint length;
+ gchar *locale;
+ gchar *p;
+
+#ifdef G_OS_WIN32
+ locale = g_win32_getlocale ();
+#else
+ locale = setlocale (LC_CTYPE, NULL);
+#endif
- p = strchr (locale, '.');
- if (p)
- {
- locale_suffixes[n_locale_suffixes++] = g_strndup (locale, length);
- length = p - locale;
- }
+ initted = TRUE;
+
+ pixmap_path[0] = NULL;
+ module_path[0] = NULL;
+ gtk_rc_append_default_module_path();
- p = strchr (locale, '_');
- if (p)
+ gtk_rc_add_initial_default_files ();
+
+ if (strcmp (locale, "C") && strcmp (locale, "POSIX"))
{
- locale_suffixes[n_locale_suffixes++] = g_strndup (locale, length);
- length = p - locale;
- }
+ /* Determine locale-specific suffixes for RC files
+ *
+ * We normalize the charset into a standard form,
+ * which has all '-' and '_' characters removed,
+ * and is lowercase.
+ */
+ gchar *normalized_locale;
+
+ p = strchr (locale, '@');
+ length = p ? (p -locale) : strlen (locale);
+
+ p = strchr (locale, '.');
+ if (p)
+ {
+ gchar *tmp1 = g_strndup (locale, p - locale + 1);
+ gchar *tmp2 = _gtk_normalize_codeset (p + 1, length - (p - locale + 1));
+
+ normalized_locale = g_strconcat (tmp1, tmp2, NULL);
+ g_free (tmp1);
+ g_free (tmp2);
+
+ locale_suffixes[n_locale_suffixes++] = g_strdup (normalized_locale);
+ length = p - locale;
+ }
+ else
+ normalized_locale = g_strndup (locale, length);
+
+ p = strchr (normalized_locale, '_');
+ if (p)
+ {
+ locale_suffixes[n_locale_suffixes++] = g_strndup (normalized_locale, length);
+ length = p - normalized_locale;
+ }
+
+ locale_suffixes[n_locale_suffixes++] = g_strndup (normalized_locale, length);
- locale_suffixes[n_locale_suffixes++] = g_strndup (locale, length);
+ g_free (normalized_locale);
+ }
}
i = 0;
gtk_rc_parse (gtk_rc_default_files[i]);
i++;
}
- }
+}
void
gtk_rc_parse_string (const gchar *rc_string)
if (!lstat (rc_file->canonical_name, &statbuf))
{
gint fd;
+ GSList *tmp_list;
rc_file->mtime = statbuf.st_mtime;
if (fd < 0)
return;
- {
- gint i;
- gchar *dir;
-
- dir = g_strdup(rc_file->canonical_name);
- for (i = strlen(dir) - 1; (i >= 0) && (dir[i] != G_DIR_SEPARATOR); i--)
- dir[i] = 0;
- if (i >= 0 && dir[i] == G_DIR_SEPARATOR)
- dir[i] = 0;
- gtk_rc_append_pixmap_path(dir);
- g_free(dir);
- }
+ /* Temporarily push directory name for this file on
+ * a stack of directory names while parsing it
+ */
+ rc_dir_stack = g_slist_prepend (rc_dir_stack,
+ g_dirname (rc_file->canonical_name));
gtk_rc_parse_any (filename, fd, NULL);
+
+ tmp_list = rc_dir_stack;
+ rc_dir_stack = rc_dir_stack->next;
+
+ g_free (tmp_list->data);
+ g_slist_free_1 (tmp_list);
close (fd);
}
/* Handling of RC styles */
-GtkRcStyle *
-gtk_rc_style_new (void)
+GType
+gtk_rc_style_get_type (void)
{
- GtkRcStyle *new_style;
+ static GType object_type = 0;
+
+ if (!object_type)
+ {
+ static const GTypeInfo object_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,
+ };
+
+ object_type = g_type_register_static (G_TYPE_OBJECT,
+ "GtkRcStyle",
+ &object_info);
+ }
+
+ return object_type;
+}
- new_style = g_new0 (GtkRcStyle, 1);
- new_style->ref_count = 1;
+static void
+gtk_rc_style_init (GtkRcStyle *style)
+{
+ guint i;
- return new_style;
+ style->name = NULL;
+ for (i = 0; i < 5; i++)
+ {
+ static const GdkColor init_color = { 0, 0, 0, 0, };
+
+ style->bg_pixmap_name[i] = NULL;
+ style->color_flags[i] = 0;
+ style->fg[i] = init_color;
+ style->bg[i] = init_color;
+ style->text[i] = init_color;
+ style->base[i] = init_color;
+ }
+ style->xthickness = -1;
+ style->ythickness = -1;
+ style->rc_style_lists = NULL;
+}
+
+static void
+gtk_rc_style_class_init (GtkRcStyleClass *klass)
+{
+ GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+ parent_class = g_type_class_peek_parent (klass);
+
+ object_class->finalize = gtk_rc_style_finalize;
+
+ klass->parse = NULL;
+ klass->clone = gtk_rc_style_real_clone;
+ klass->merge = gtk_rc_style_real_merge;
+ klass->create_style = gtk_rc_style_real_create_style;
+}
+
+/* Like g_slist_remove, but remove all copies of data */
+static GSList*
+gtk_rc_slist_remove_all (GSList *list,
+ gpointer data)
+{
+ GSList *tmp;
+ GSList *prev;
+
+ prev = NULL;
+ tmp = list;
+
+ while (tmp)
+ {
+ if (tmp->data == data)
+ {
+ if (list == tmp)
+ list = list->next;
+
+ if (prev)
+ prev->next = tmp->next;
+
+ g_slist_free_1 (tmp);
+
+ if (prev)
+ tmp = prev->next;
+ else
+ tmp = list;
+ }
+ else
+ {
+ prev = tmp;
+ tmp = tmp->next;
+ }
+ }
+
+ return list;
+}
+
+static void
+gtk_rc_style_finalize (GObject *object)
+{
+ gint i;
+ GSList *tmp_list1, *tmp_list2;
+ GtkRcStyle *rc_style;
+
+ rc_style = GTK_RC_STYLE (object);
+
+ if (rc_style->name)
+ g_free (rc_style->name);
+ if (rc_style->font_desc)
+ pango_font_description_free (rc_style->font_desc);
+
+ for (i=0 ; i < 5 ; i++)
+ if (rc_style->bg_pixmap_name[i])
+ g_free (rc_style->bg_pixmap_name[i]);
+
+ /* Now remove all references to this rc_style from
+ * realized_style_ht
+ */
+ tmp_list1 = rc_style->rc_style_lists;
+ while (tmp_list1)
+ {
+ GSList *rc_styles = tmp_list1->data;
+ GtkStyle *style = g_hash_table_lookup (realized_style_ht, rc_styles);
+ gtk_style_unref (style);
+
+ /* Remove the list of styles from the other rc_styles
+ * in the list
+ */
+ tmp_list2 = rc_styles;
+ while (tmp_list2)
+ {
+ GtkRcStyle *other_style = tmp_list2->data;
+
+ if (other_style != rc_style)
+ other_style->rc_style_lists =
+ gtk_rc_slist_remove_all (other_style->rc_style_lists, rc_styles);
+
+ tmp_list2 = tmp_list2->next;
+ }
+
+ /* And from the hash table itself
+ */
+ g_hash_table_remove (realized_style_ht, rc_styles);
+ g_slist_free (rc_styles);
+
+ tmp_list1 = tmp_list1->next;
+ }
+ g_slist_free (rc_style->rc_style_lists);
+
+ G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+GtkRcStyle *
+gtk_rc_style_new (void)
+{
+ GtkRcStyle *style;
+
+ style = g_object_new (GTK_TYPE_RC_STYLE, NULL);
+
+ return style;
}
void
gtk_rc_style_ref (GtkRcStyle *rc_style)
{
- g_return_if_fail (rc_style != NULL);
+ g_return_if_fail (GTK_IS_RC_STYLE (rc_style));
- rc_style->ref_count++;
+ g_object_ref (G_OBJECT (rc_style));
}
void
gtk_rc_style_unref (GtkRcStyle *rc_style)
{
- gint i;
+ g_return_if_fail (GTK_IS_RC_STYLE (rc_style));
- g_return_if_fail (rc_style != NULL);
- g_return_if_fail (rc_style->ref_count > 0);
+ g_object_unref (G_OBJECT (rc_style));
+}
- rc_style->ref_count--;
+static GtkRcStyle *
+gtk_rc_style_real_clone (GtkRcStyle *style)
+{
+ return GTK_RC_STYLE (g_object_new (G_OBJECT_TYPE (style), NULL));
+}
- if (rc_style->ref_count == 0)
+static void
+gtk_rc_style_real_merge (GtkRcStyle *dest,
+ GtkRcStyle *src)
+{
+ gint i;
+
+ for (i = 0; i < 5; i++)
{
- if (rc_style->engine)
+ if (!dest->bg_pixmap_name[i] && src->bg_pixmap_name[i])
+ dest->bg_pixmap_name[i] = g_strdup (src->bg_pixmap_name[i]);
+
+ if (!(dest->color_flags[i] & GTK_RC_FG) &&
+ src->color_flags[i] & GTK_RC_FG)
{
- rc_style->engine->destroy_rc_style (rc_style);
- gtk_theme_engine_unref (rc_style->engine);
+ dest->fg[i] = src->fg[i];
+ dest->color_flags[i] |= GTK_RC_FG;
+ }
+ if (!(dest->color_flags[i] & GTK_RC_BG) &&
+ src->color_flags[i] & GTK_RC_BG)
+ {
+ dest->bg[i] = src->bg[i];
+ dest->color_flags[i] |= GTK_RC_BG;
+ }
+ if (!(dest->color_flags[i] & GTK_RC_TEXT) &&
+ src->color_flags[i] & GTK_RC_TEXT)
+ {
+ dest->text[i] = src->text[i];
+ dest->color_flags[i] |= GTK_RC_TEXT;
+ }
+ if (!(dest->color_flags[i] & GTK_RC_BASE) &&
+ src->color_flags[i] & GTK_RC_BASE)
+ {
+ dest->base[i] = src->base[i];
+ dest->color_flags[i] |= GTK_RC_BASE;
}
-
- if (rc_style->name)
- g_free (rc_style->name);
- if (rc_style->fontset_name)
- g_free (rc_style->fontset_name);
- if (rc_style->font_name)
- g_free (rc_style->font_name);
-
- for (i=0 ; i<5 ; i++)
- if (rc_style->bg_pixmap_name[i])
- g_free (rc_style->bg_pixmap_name[i]);
-
- g_free (rc_style);
}
+
+ if (dest->xthickness < 0 && src->xthickness >= 0)
+ dest->xthickness = src->xthickness;
+ if (dest->ythickness < 0 && src->ythickness >= 0)
+ dest->ythickness = src->ythickness;
+
+ if (!dest->font_desc && src->font_desc)
+ dest->font_desc = pango_font_description_copy (src->font_desc);
}
-static void
-gtk_rc_clear_realized_node (gpointer key,
- gpointer data,
- gpointer user_data)
+static GtkStyle *
+gtk_rc_style_real_create_style (GtkRcStyle *rc_style)
{
- gtk_style_unref (data);
+ return gtk_style_new ();
}
static void
rc_style_ht = NULL;
}
- if (realized_style_ht)
- {
- g_hash_table_foreach (realized_style_ht, gtk_rc_clear_realized_node, NULL);
- g_hash_table_destroy (realized_style_ht);
- realized_style_ht = NULL;
- }
-
gtk_rc_free_rc_sets (gtk_rc_sets_widget);
g_slist_free (gtk_rc_sets_widget);
gtk_rc_sets_widget = NULL;
gtk_rc_free_rc_sets (gtk_rc_sets_class);
g_slist_free (gtk_rc_sets_class);
gtk_rc_sets_class = NULL;
-
- gtk_rc_init ();
}
gboolean
}
if (rc_styles)
- return gtk_rc_style_init (rc_styles);
+ return gtk_rc_init_style (rc_styles);
return NULL;
}
new_style = gtk_rc_style_new ();
*new_style = *rc_style;
new_style->name = g_strdup (rc_style->name);
- new_style->font_name = g_strdup (rc_style->font_name);
- new_style->fontset_name = g_strdup (rc_style->fontset_name);
+ 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]);
static GtkRcStyle*
gtk_rc_style_find (const char *name)
{
- GtkRcStyle *rc_style;
-
- rc_style = g_hash_table_lookup (rc_style_ht, (gpointer) name);
-
- return rc_style;
+ if (rc_style_ht)
+ return g_hash_table_lookup (rc_style_ht, (gpointer) name);
+ else
+ return NULL;
}
-/* Assumes ownership of rc_style */
static GtkStyle *
gtk_rc_style_to_style (GtkRcStyle *rc_style)
{
GtkStyle *style;
- GdkFont *old_font;
- gint i;
- style = gtk_style_new ();
+ style = GTK_RC_STYLE_GET_CLASS (rc_style)->create_style (rc_style);
style->rc_style = rc_style;
+ gtk_rc_style_ref (rc_style);
- if (rc_style->fontset_name)
- {
- old_font = style->font;
- style->font = gdk_fontset_load (rc_style->fontset_name);
- if (style->font)
- gdk_font_unref (old_font);
- else
- style->font = old_font;
- }
- else if (rc_style->font_name)
- {
- old_font = style->font;
- style->font = gdk_font_load (rc_style->font_name);
- if (style->font)
- gdk_font_unref (old_font);
- else
- style->font = old_font;
- }
+ GTK_STYLE_GET_CLASS (style)->init_from_rc (style, rc_style);
- for (i = 0; i < 5; i++)
- {
- if (rc_style->color_flags[i] & GTK_RC_FG)
- style->fg[i] = rc_style->fg[i];
- if (rc_style->color_flags[i] & GTK_RC_BG)
- style->bg[i] = rc_style->bg[i];
- if (rc_style->color_flags[i] & GTK_RC_TEXT)
- style->text[i] = rc_style->text[i];
- if (rc_style->color_flags[i] & GTK_RC_BASE)
- style->base[i] = rc_style->base[i];
- }
-
- if (rc_style->engine)
- {
- style->engine = rc_style->engine;
- gtk_theme_engine_ref (style->engine);
- rc_style->engine->rc_style_to_style (style, rc_style);
- }
-
return style;
}
/* Reuses or frees rc_styles */
static GtkStyle *
-gtk_rc_style_init (GSList *rc_styles)
+gtk_rc_init_style (GSList *rc_styles)
{
- gint i;
-
GtkStyle *style = NULL;
- GtkRcStyle *proto_style;
+ gint i;
+ g_return_val_if_fail (rc_styles != NULL, NULL);
+
if (!realized_style_ht)
- realized_style_ht = g_hash_table_new ((GHashFunc)gtk_rc_styles_hash,
- (GCompareFunc)gtk_rc_styles_compare);
+ realized_style_ht = g_hash_table_new ((GHashFunc) gtk_rc_styles_hash,
+ (GCompareFunc) gtk_rc_styles_compare);
style = g_hash_table_lookup (realized_style_ht, rc_styles);
if (!style)
{
- GSList *tmp_styles = rc_styles;
-
- proto_style = gtk_rc_style_new ();
-
+ GtkRcStyle *base_style = NULL;
+ GtkRcStyle *proto_style;
+ GtkRcStyleClass *proto_style_class;
+ GSList *tmp_styles;
+ GType rc_style_type = GTK_TYPE_RC_STYLE;
+
+ /* Find the first derived style in the list, and use that to
+ * create the merged style. If we only have raw GtkRcStyles, use
+ * the first style to create the merged style.
+ */
+ base_style = rc_styles->data;
+ tmp_styles = rc_styles;
while (tmp_styles)
{
GtkRcStyle *rc_style = tmp_styles->data;
- for (i=0; i<5; i++)
+ if (G_OBJECT_TYPE (rc_style) != rc_style_type)
{
- if (!proto_style->bg_pixmap_name[i] && rc_style->bg_pixmap_name[i])
- proto_style->bg_pixmap_name[i] = g_strdup (rc_style->bg_pixmap_name[i]);
-
- if (!(proto_style->color_flags[i] & GTK_RC_FG) &&
- rc_style->color_flags[i] & GTK_RC_FG)
- {
- proto_style->fg[i] = rc_style->fg[i];
- proto_style->color_flags[i] |= GTK_RC_FG;
- }
- if (!(proto_style->color_flags[i] & GTK_RC_BG) &&
- rc_style->color_flags[i] & GTK_RC_BG)
- {
- proto_style->bg[i] = rc_style->bg[i];
- proto_style->color_flags[i] |= GTK_RC_BG;
- }
- if (!(proto_style->color_flags[i] & GTK_RC_TEXT) &&
- rc_style->color_flags[i] & GTK_RC_TEXT)
- {
- proto_style->text[i] = rc_style->text[i];
- proto_style->color_flags[i] |= GTK_RC_TEXT;
- }
- if (!(proto_style->color_flags[i] & GTK_RC_BASE) &&
- rc_style->color_flags[i] & GTK_RC_BASE)
- {
- proto_style->base[i] = rc_style->base[i];
- proto_style->color_flags[i] |= GTK_RC_BASE;
- }
+ base_style = rc_style;
+ break;
}
- if (!proto_style->font_name && rc_style->font_name)
- proto_style->font_name = g_strdup (rc_style->font_name);
- if (!proto_style->fontset_name && rc_style->fontset_name)
- proto_style->fontset_name = g_strdup (rc_style->fontset_name);
-
- if (!proto_style->engine && rc_style->engine)
- {
- proto_style->engine = rc_style->engine;
- gtk_theme_engine_ref (proto_style->engine);
- }
+ tmp_styles = tmp_styles->next;
+ }
+
+ proto_style_class = GTK_RC_STYLE_GET_CLASS (base_style);
+ proto_style = proto_style_class->clone (base_style);
+
+ tmp_styles = rc_styles;
+ while (tmp_styles)
+ {
+ GtkRcStyle *rc_style = tmp_styles->data;
+
+ 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);
- if (proto_style->engine &&
- (proto_style->engine == rc_style->engine))
- proto_style->engine->merge_rc_style (proto_style, rc_style);
-
tmp_styles = tmp_styles->next;
}
- for (i=0; i<5; i++)
+ for (i = 0; i < 5; i++)
if (proto_style->bg_pixmap_name[i] &&
(strcmp (proto_style->bg_pixmap_name[i], "<none>") == 0))
{
}
style = gtk_rc_style_to_style (proto_style);
+ gtk_rc_style_unref (proto_style);
g_hash_table_insert (realized_style_ht, rc_styles, style);
}
+ else
+ g_slist_free (rc_styles);
return style;
}
return G_TOKEN_STRING;
insert = FALSE;
- rc_style = g_hash_table_lookup (rc_style_ht, scanner->value.v_string);
+ rc_style = gtk_rc_style_find (scanner->value.v_string);
if (!rc_style)
{
for (i = 0; i < 5; i++)
rc_style->color_flags[i] = 0;
-
- rc_style->engine = NULL;
- rc_style->engine_data = NULL;
}
token = g_scanner_peek_next_token (scanner);
return G_TOKEN_STRING;
}
- parent_style = g_hash_table_lookup (rc_style_ht, scanner->value.v_string);
+ parent_style = gtk_rc_style_find (scanner->value.v_string);
if (parent_style)
{
for (i = 0; i < 5; i++)
rc_style->text[i] = parent_style->text[i];
rc_style->base[i] = parent_style->base[i];
}
+
+ rc_style->xthickness = parent_style->xthickness;
+ rc_style->ythickness = parent_style->ythickness;
- if (parent_style->fontset_name)
- {
- if (rc_style->fontset_name)
- g_free (rc_style->fontset_name);
- rc_style->fontset_name = g_strdup (parent_style->fontset_name);
- }
- else if (parent_style->font_name)
+ if (parent_style->font_desc)
{
- if (rc_style->font_name)
- g_free (rc_style->font_name);
- rc_style->font_name = g_strdup (parent_style->font_name);
+ if (rc_style->font_desc)
+ pango_font_description_free (rc_style->font_desc);
+ rc_style->font_desc = pango_font_description_copy (parent_style->font_desc);
}
for (i = 0; i < 5; i++)
{
switch (token)
{
- case GTK_RC_TOKEN_BASE:
- token = gtk_rc_parse_base (scanner, rc_style);
- break;
case GTK_RC_TOKEN_BG:
token = gtk_rc_parse_bg (scanner, rc_style);
break;
case GTK_RC_TOKEN_TEXT:
token = gtk_rc_parse_text (scanner, rc_style);
break;
+ case GTK_RC_TOKEN_BASE:
+ token = gtk_rc_parse_base (scanner, rc_style);
+ break;
+ case GTK_RC_TOKEN_XTHICKNESS:
+ token = gtk_rc_parse_xthickness (scanner, rc_style);
+ break;
+ case GTK_RC_TOKEN_YTHICKNESS:
+ token = gtk_rc_parse_ythickness (scanner, rc_style);
+ break;
case GTK_RC_TOKEN_BG_PIXMAP:
token = gtk_rc_parse_bg_pixmap (scanner, rc_style);
break;
case GTK_RC_TOKEN_FONTSET:
token = gtk_rc_parse_fontset (scanner, rc_style);
break;
+ case GTK_RC_TOKEN_FONT_NAME:
+ token = gtk_rc_parse_font_name (scanner, rc_style);
+ break;
case GTK_RC_TOKEN_ENGINE:
- token = gtk_rc_parse_engine (scanner, rc_style);
+ token = gtk_rc_parse_engine (scanner, &rc_style);
break;
default:
g_scanner_get_next_token (scanner);
{
if (insert)
{
- if (rc_style->fontset_name)
- g_free (rc_style->fontset_name);
- if (rc_style->font_name)
- g_free (rc_style->font_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]);
{
if (insert)
{
- if (rc_style->fontset_name)
- g_free (rc_style->fontset_name);
- if (rc_style->font_name)
- g_free (rc_style->font_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])
}
if (insert)
- g_hash_table_insert (rc_style_ht, rc_style->name, rc_style);
+ {
+ if (!rc_style_ht)
+ rc_style_ht = g_hash_table_new ((GHashFunc) gtk_rc_style_hash,
+ (GCompareFunc) gtk_rc_style_compare);
+
+ g_hash_table_insert (rc_style_ht, rc_style->name, rc_style);
+ }
return G_TOKEN_NONE;
}
-static guint
-gtk_rc_parse_base (GScanner *scanner,
- GtkRcStyle *style)
-{
- GtkStateType state;
- guint token;
-
- token = g_scanner_get_next_token (scanner);
- if (token != GTK_RC_TOKEN_BASE)
- return GTK_RC_TOKEN_BASE;
-
- token = gtk_rc_parse_state (scanner, &state);
- if (token != G_TOKEN_NONE)
- return token;
-
- token = g_scanner_get_next_token (scanner);
- if (token != G_TOKEN_EQUAL_SIGN)
- return G_TOKEN_EQUAL_SIGN;
-
- style->color_flags[state] |= GTK_RC_BASE;
- return gtk_rc_parse_color (scanner, &style->base[state]);
-}
-
static guint
gtk_rc_parse_bg (GScanner *scanner,
GtkRcStyle *style)
return gtk_rc_parse_color (scanner, &style->text[state]);
}
+static guint
+gtk_rc_parse_base (GScanner *scanner,
+ GtkRcStyle *style)
+{
+ GtkStateType state;
+ guint token;
+
+ token = g_scanner_get_next_token (scanner);
+ if (token != GTK_RC_TOKEN_BASE)
+ return GTK_RC_TOKEN_BASE;
+
+ token = gtk_rc_parse_state (scanner, &state);
+ if (token != G_TOKEN_NONE)
+ return token;
+
+ token = g_scanner_get_next_token (scanner);
+ if (token != G_TOKEN_EQUAL_SIGN)
+ return G_TOKEN_EQUAL_SIGN;
+
+ style->color_flags[state] |= GTK_RC_BASE;
+ return gtk_rc_parse_color (scanner, &style->base[state]);
+}
+
+static guint
+gtk_rc_parse_xthickness (GScanner *scanner,
+ GtkRcStyle *style)
+{
+ if (g_scanner_get_next_token (scanner) != GTK_RC_TOKEN_XTHICKNESS)
+ return GTK_RC_TOKEN_XTHICKNESS;
+
+ if (g_scanner_get_next_token (scanner) != G_TOKEN_EQUAL_SIGN)
+ return G_TOKEN_EQUAL_SIGN;
+
+ if (g_scanner_get_next_token (scanner) != G_TOKEN_INT)
+ return G_TOKEN_INT;
+
+ style->xthickness = scanner->value.v_int;
+
+ return G_TOKEN_NONE;
+}
+
+static guint
+gtk_rc_parse_ythickness (GScanner *scanner,
+ GtkRcStyle *style)
+{
+ if (g_scanner_get_next_token (scanner) != GTK_RC_TOKEN_YTHICKNESS)
+ return GTK_RC_TOKEN_YTHICKNESS;
+
+ if (g_scanner_get_next_token (scanner) != G_TOKEN_EQUAL_SIGN)
+ return G_TOKEN_EQUAL_SIGN;
+
+ if (g_scanner_get_next_token (scanner) != G_TOKEN_INT)
+ return G_TOKEN_INT;
+
+ style->ythickness = scanner->value.v_int;
+
+ return G_TOKEN_NONE;
+}
+
static guint
gtk_rc_parse_bg_pixmap (GScanner *scanner,
GtkRcStyle *rc_style)
return G_TOKEN_NONE;
}
+static gchar*
+gtk_rc_check_pixmap_dir (const gchar *dir, const gchar *pixmap_file)
+{
+ gchar *buf;
+ gint fd;
+
+ buf = g_strdup_printf ("%s" G_DIR_SEPARATOR_S "%s", dir, pixmap_file);
+
+ fd = open (buf, O_RDONLY);
+ if (fd >= 0)
+ {
+ close (fd);
+ return buf;
+ }
+
+ g_free (buf);
+
+ return NULL;
+ }
+
gchar*
gtk_rc_find_pixmap_in_path (GScanner *scanner,
- const gchar *pixmap_file)
+ const gchar *pixmap_file)
{
gint i;
- gint fd;
- gchar *buf;
-
+ gchar *filename;
+ GSList *tmp_list;
+
for (i = 0; (i < GTK_RC_MAX_PIXMAP_PATHS) && (pixmap_path[i] != NULL); i++)
{
- buf = g_strdup_printf ("%s" G_DIR_SEPARATOR_S "%s",
- pixmap_path[i], pixmap_file);
-
- fd = open (buf, O_RDONLY);
- if (fd >= 0)
- {
- close (fd);
- return buf;
- }
-
- g_free (buf);
+ filename = gtk_rc_check_pixmap_dir (pixmap_path[i], pixmap_file);
+ if (filename)
+ return filename;
}
-
+
+ tmp_list = rc_dir_stack;
+ while (tmp_list)
+ {
+ filename = gtk_rc_check_pixmap_dir (tmp_list->data, pixmap_file);
+ if (filename)
+ return filename;
+
+ tmp_list = tmp_list->next;
+ }
+
if (scanner)
g_warning (_("Unable to locate image file in pixmap_path: \"%s\" line %d"),
pixmap_file, scanner->line);
token = g_scanner_get_next_token (scanner);
if (token != G_TOKEN_STRING)
return G_TOKEN_STRING;
-
- if (rc_style->font_name)
- g_free (rc_style->font_name);
- rc_style->font_name = g_strdup (scanner->value.v_string);
+
+ /* Ignore, do nothing */
return G_TOKEN_NONE;
}
token = g_scanner_get_next_token (scanner);
if (token != G_TOKEN_STRING)
return G_TOKEN_STRING;
+
+ /* Do nothing - silently ignore */
+
+ return G_TOKEN_NONE;
+}
+
+static guint
+gtk_rc_parse_font_name (GScanner *scanner,
+ GtkRcStyle *rc_style)
+{
+ guint token;
+
+ token = g_scanner_get_next_token (scanner);
+ if (token != GTK_RC_TOKEN_FONT_NAME)
+ return GTK_RC_TOKEN_FONT;
+
+ token = g_scanner_get_next_token (scanner);
+ if (token != G_TOKEN_EQUAL_SIGN)
+ return G_TOKEN_EQUAL_SIGN;
- if (rc_style->fontset_name)
- g_free (rc_style->fontset_name);
- rc_style->fontset_name = g_strdup (scanner->value.v_string);
+ token = g_scanner_get_next_token (scanner);
+ if (token != G_TOKEN_STRING)
+ return G_TOKEN_STRING;
+
+ rc_style->font_desc = pango_font_description_from_string (scanner->value.v_string);
return G_TOKEN_NONE;
}
static guint
gtk_rc_parse_engine (GScanner *scanner,
- GtkRcStyle *rc_style)
+ GtkRcStyle **rc_style)
{
guint token;
-
+ GtkThemeEngine *engine;
+ guint result = G_TOKEN_NONE;
+ GtkRcStyle *new_style = NULL;
+ gboolean parsed_curlies = FALSE;
+
token = g_scanner_get_next_token (scanner);
if (token != GTK_RC_TOKEN_ENGINE)
return GTK_RC_TOKEN_ENGINE;
if (token != G_TOKEN_STRING)
return G_TOKEN_STRING;
- rc_style->engine = gtk_theme_engine_get (scanner->value.v_string);
-
+ engine = gtk_theme_engine_get (scanner->value.v_string);
+
token = g_scanner_get_next_token (scanner);
if (token != G_TOKEN_LEFT_CURLY)
return G_TOKEN_LEFT_CURLY;
- if (rc_style->engine)
- return rc_style->engine->parse_rc_style (scanner, rc_style);
- else
+ if (engine)
+ {
+ GtkRcStyleClass *new_class;
+
+ new_style = gtk_theme_engine_create_rc_style (engine);
+ gtk_theme_engine_unref (engine);
+
+ new_class = GTK_RC_STYLE_GET_CLASS (new_style);
+
+ new_class->merge (new_style, *rc_style);
+ if ((*rc_style)->name)
+ new_style->name = g_strdup ((*rc_style)->name);
+
+ if (new_class->parse)
+ {
+ parsed_curlies = TRUE;
+ result = new_class->parse (new_style, scanner);
+
+ if (result != G_TOKEN_NONE)
+ {
+ g_object_unref (G_OBJECT (new_style));
+ new_style = NULL;
+ }
+ }
+ }
+
+ if (!parsed_curlies)
{
- /* Skip over remainder, looking for nested {}'s */
+ /* Skip over remainder, looking for nested {}'s
+ */
guint count = 1;
+ result = G_TOKEN_RIGHT_CURLY;
while ((token = g_scanner_get_next_token (scanner)) != G_TOKEN_EOF)
{
if (token == G_TOKEN_LEFT_CURLY)
count++;
else if (token == G_TOKEN_RIGHT_CURLY)
count--;
-
+
if (count == 0)
- return G_TOKEN_NONE;
+ {
+ result = G_TOKEN_NONE;
+ break;
+ }
}
+ }
- return G_TOKEN_RIGHT_CURLY;
+ if (new_style)
+ {
+ g_object_unref (G_OBJECT (*rc_style));
+ *rc_style = new_style;
}
+
+ return result;
}
guint
}
}
g_free (buf);
- gtk_rc_append_default_pixmap_path();
}
static guint
projects / ~andy / gtk / blobdiff