AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

css: Move binding set parsing to strfuncs

Browse Source
This commit is contained in:
Benjamin Otte 2011-05-18 18:03:23 +02:00
parent c73d1cf2a6
commit 03e84b7ee3
2 changed files with 56 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
gtk/gtkcssprovider.c
View File

@ -1376,32 +1376,6 @@ css_provider_commit (GtkCssProvider *css_provider,
g_slist_free (selectors);
}
static void
resolve_binding_sets (const gchar *value_str,
GValue *value)
{
GPtrArray *array;
gchar **bindings, **str;
bindings = g_strsplit (value_str, ",", -1);
array = g_ptr_array_new ();
for (str = bindings; *str; str++)
{
GtkBindingSet *binding_set;
binding_set = gtk_binding_set_find (g_strstrip (*str));
if (!binding_set)
continue;
g_ptr_array_add (array, binding_set);
}
g_value_take_boxed (value, array);
g_strfreev (bindings);
}
static void
gtk_css_provider_reset (GtkCssProvider *css_provider)
{
@ -1981,12 +1955,6 @@ parse_declaration (GtkCssScanner *scanner,
g_param_value_set_default (pspec, val);
gtk_css_ruleset_add (ruleset, pspec, val);
}
else if (strcmp (pspec->name, "gtk-key-bindings") == 0)
{
/* Private property holding the binding sets */
resolve_binding_sets (value_str, val);
gtk_css_ruleset_add (ruleset, pspec, val);
}
else if (parse_func)
{
GError *error = NULL;

56
gtk/gtkcssstringfuncs.c
View File

@ -33,6 +33,7 @@
/* the actual parsers we have */
#include "gtkanimationdescription.h"
#include "gtkbindings.h"
#include "gtk9slice.h"
#include "gtkgradient.h"
#include "gtkthemingengine.h"
@ -1231,6 +1232,58 @@ flags_value_to_string (const GValue *value)
return g_string_free (string, FALSE);
}
static gboolean
bindings_value_from_string (const char *str,
GFile *base,
GValue *value,
GError **error)
{
GPtrArray *array;
gchar **bindings, **name;
bindings = g_strsplit (str, ",", -1);
array = g_ptr_array_new ();
for (name = bindings; *name; name++)
{
GtkBindingSet *binding_set;
binding_set = gtk_binding_set_find (g_strstrip (*name));
if (!binding_set)
continue;
g_ptr_array_add (array, binding_set);
}
g_value_take_boxed (value, array);
g_strfreev (bindings);
return TRUE;
}
static char *
bindings_value_to_string (const GValue *value)
{
GPtrArray *array;
GString *str;
guint i;
array = g_value_get_boxed (value);
str = g_string_new (NULL);
for (i = 0; i < array->len; i++)
{
GtkBindingSet *binding_set = g_ptr_array_index (array, i);
if (i > 0)
g_string_append (str, ", ");
g_string_append (str, binding_set->set_name);
}
return g_string_free (str, FALSE);
}
/*** API ***/
static void
@ -1296,6 +1349,9 @@ css_string_funcs_init (void)
register_conversion_function (G_TYPE_FLAGS,
flags_value_from_string,
flags_value_to_string);
register_conversion_function (G_TYPE_PTR_ARRAY,
bindings_value_from_string,
bindings_value_to_string);
}
gboolean