* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
-#include <config.h>
+#include "config.h"
#include <locale.h>
#ifdef HAVE_UNISTD_H
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);
static guint gtk_rc_parse_logical_color (GScanner *scanner,
GtkRcStyle *rc_style,
GHashTable *hash);
-static guint gtk_rc_parse_color_full (GScanner *scanner,
- GtkRcStyle *style,
- GdkColor *color);
static void gtk_rc_clear_hash_node (gpointer key,
gpointer data,
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 const GScannerConfig gtk_rc_scanner_config =
{
"im_module_file\0"
"LTR\0"
"RTL\0"
- "color\0";
+ "color\0"
+ "unbind\0";
static const struct
{
{ 245, GTK_RC_TOKEN_IM_MODULE_FILE },
{ 260, GTK_RC_TOKEN_LTR },
{ 264, GTK_RC_TOKEN_RTL },
- { 268, GTK_RC_TOKEN_COLOR }
+ { 268, GTK_RC_TOKEN_COLOR },
+ { 274, GTK_RC_TOKEN_UNBIND }
};
static GHashTable *realized_style_ht = NULL;
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;
}
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;
else
{
const gchar *home;
- str = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtkrc", NULL);
+ str = g_build_filename (GTK_SYSCONFDIR, "gtk-3.0", "gtkrc", NULL);
gtk_rc_add_default_file (str);
g_free (str);
home = g_get_home_dir ();
if (home)
{
- str = g_build_filename (home, ".gtkrc-2.0", NULL);
+ str = g_build_filename (home, ".gtkrc-3.0", NULL);
gtk_rc_add_default_file (str);
g_free (str);
}
GParamSpec *pspec,
GtkRcContext *context)
{
- if (context->color_hash)
- g_hash_table_unref (context->color_hash);
-
+ GHashTable *old_hash;
+
+ old_hash = context->color_hash;
+
g_object_get (settings, "color-hash", &context->color_hash, NULL);
- if (context->color_hash)
- g_hash_table_ref (context->color_hash);
+ if (old_hash)
+ g_hash_table_unref (old_hash);
- if (!context->reloading)
- gtk_rc_reparse_all_for_settings (settings, TRUE);
+ 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,
"color-hash", &context->color_hash,
NULL);
- if (context->color_hash)
- g_hash_table_ref (context->color_hash);
-
g_signal_connect (settings,
"notify::gtk-theme-name",
G_CALLBACK (gtk_rc_settings_changed),
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);
}
" 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"
" text[PRELIGHT] = \"#ffffff\"\n"
"}\n"
"\n"
- "style \"gtk-default-tray-icon-style\" {\n"
- " bg_pixmap[NORMAL] = \"<parent>\"\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"
- "class \"GtkTrayIcon\" style : gtk \"gtk-default-tray-icon-style\"\n"
- "widget \"gtk-tooltips*\" style : gtk \"gtk-default-tooltips-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"
);
}
rc_style = GTK_RC_STYLE (object);
rc_priv = GTK_RC_STYLE_GET_PRIVATE (rc_style);
- if (rc_style->name)
- g_free (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]);
+ g_free (rc_style->bg_pixmap_name[i]);
/* Now remove all references to this rc_style from
* realized_style_ht
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 *
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
gtk_rc_properties_cmp (gconstpointer bsearch_node1,
gconstpointer bsearch_node2)
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
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
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_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
return NULL;
}
-static GSList *
-gtk_rc_add_rc_sets (GSList *slist,
- GtkRcStyle *rc_style,
- const gchar *pattern,
- GtkPathType path_type)
-{
- 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->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;
-
- 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, GTK_PATH_WIDGET);
-}
-
-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, GTK_PATH_WIDGET_CLASS);
-}
-
-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, GTK_PATH_CLASS);
-}
-
GScanner*
gtk_rc_scanner_new (void)
{
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 = symbol_names + symbols[i].name_offset;
- 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 = 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);
{
GtkRcStyle *base_style = NULL;
GtkRcStyle *proto_style;
- GtkRcStylePrivate *proto_priv;
GtkRcStyleClass *proto_style_class;
GSList *tmp_styles;
GType rc_style_type = GTK_TYPE_RC_STYLE;
proto_style_class = GTK_RC_STYLE_GET_CLASS (base_style);
proto_style = proto_style_class->create_rc_style (base_style);
- proto_priv = GTK_RC_STYLE_GET_PRIVATE (proto_style);
tmp_styles = rc_styles;
while (tmp_styles)
{
GtkRcStyle *rc_style = tmp_styles->data;
- GtkRcStylePrivate *rc_priv = GTK_RC_STYLE_GET_PRIVATE (rc_style);
- GSList *concat_list;
-
+
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);
- concat_list = g_slist_copy (rc_style->icon_factories);
- g_slist_foreach (concat_list, (GFunc) g_object_ref, NULL);
- proto_style->icon_factories = g_slist_concat (proto_style->icon_factories,
- concat_list);
-
- concat_list = g_slist_copy (rc_priv->color_hashes);
- g_slist_foreach (concat_list, (GFunc) g_hash_table_ref, NULL);
- proto_priv->color_hashes = g_slist_concat (proto_priv->color_hashes,
- concat_list);
+ 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 */
if (g_getenv ("GTK_DEBUG"))
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, ' ');
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;
}
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_DIGITS "-_" G_CSET_a_2_z G_CSET_A_2_Z, '-');
+ 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;
parent_style = gtk_rc_style_find (context, scanner->value.v_string);
if (parent_style)
{
- GtkRcStylePrivate *parent_priv = GTK_RC_STYLE_GET_PRIVATE (parent_style);
- GSList *concat_list;
-
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);
- }
-
- concat_list = g_slist_copy (parent_style->icon_factories);
- g_slist_foreach (concat_list, (GFunc) g_object_ref, NULL);
- rc_style->icon_factories = g_slist_concat (rc_style->icon_factories,
- concat_list);
- }
-
- /* Also append parent's color hashes, adding a ref to them */
- if (parent_priv->color_hashes != NULL)
- {
- /* See comment above .. */
- if (our_hash == NULL)
- {
- our_hash = g_hash_table_new_full (g_str_hash, g_str_equal,
- g_free,
- (GDestroyNotify) gdk_color_free);
- rc_priv->color_hashes = g_slist_prepend (rc_priv->color_hashes,
- our_hash);
- }
-
- concat_list = g_slist_copy (parent_priv->color_hashes);
- g_slist_foreach (concat_list, (GFunc) g_hash_table_ref, NULL);
- rc_priv->color_hashes = g_slist_concat (rc_priv->color_hashes,
- concat_list);
- }
}
}
- /* if we didn't get color hashes from our parent style, initialize
- * the list with the settings' color scheme (if it exists)
+ /* 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)
*/
- if (our_hash == NULL && context->color_hash != NULL)
- {
- our_hash = g_hash_table_new_full (g_str_hash, g_str_equal,
- g_free,
- (GDestroyNotify) gdk_color_free);
- rc_priv->color_hashes = g_slist_prepend (rc_priv->color_hashes,
- our_hash);
- rc_priv->color_hashes = g_slist_append (rc_priv->color_hashes,
- g_hash_table_ref (context->color_hash));
- }
+ 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)
- {
- our_factory = gtk_icon_factory_new ();
- rc_style->icon_factories = g_slist_prepend (rc_style->icon_factories,
- our_factory);
- }
+ 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_hash = g_hash_table_new_full (g_str_hash, g_str_equal,
- g_free,
- (GDestroyNotify) gdk_color_free);
- rc_priv->color_hashes = g_slist_prepend (rc_priv->color_hashes,
- our_hash);
+ gtk_rc_style_prepend_empty_color_hash (rc_style);
+ our_hash = rc_priv->color_hashes->data;
}
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;
/* it's important that we do the same canonification as GParamSpecPool here */
name = g_strdup (scanner->value.v_identifier);
- g_strcanon (name, G_CSET_DIGITS "-_" G_CSET_a_2_z G_CSET_A_2_Z, '-');
+ 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 (G_VALUE_TYPE (&prop.value) != 0, G_TOKEN_ERROR);
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);
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;
}
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;
}
-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;
-}
-
+/**
+ * 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);
}
-static guint
+/**
+ * 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)
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);
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);
}
return match_widget_class_recursive (list, length, path, path_reversed);
}
-#ifdef G_OS_WIN32
+#if defined (G_OS_WIN32) && !defined (_WIN64)
/* DLL ABI stability backward compatibility versions */
projects / ~andy / gtk / blobdiff