X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkcssstylepropertyimpl.c;h=26726d73d7a5f7850445699b45dedad96570644d;hb=d84f5ae17e5b891b30dd54ddc10fd22c2a609e0e;hp=447e1df88eb5c20ee5f0b0ce2c8c306c53e308ad;hpb=bc9373fb43a6668b36e59bb9a34a74e6979e74cb;p=~andy%2Fgtk diff --git a/gtk/gtkcssstylepropertyimpl.c b/gtk/gtkcssstylepropertyimpl.c index 447e1df88..26726d73d 100644 --- a/gtk/gtkcssstylepropertyimpl.c +++ b/gtk/gtkcssstylepropertyimpl.c @@ -12,9 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . */ #include "config.h" @@ -24,6 +22,7 @@ #include #include #include +#include #include "gtkcssparserprivate.h" #include "gtkcssstylefuncsprivate.h" @@ -33,359 +32,548 @@ #include "gtkprivatetypebuiltins.h" #include "gtkstylepropertiesprivate.h" +/* this is in case round() is not provided by the compiler, + * such as in the case of C89 compilers, like MSVC + */ +#include "fallback-c89.c" + /* the actual parsers we have */ -#include "gtkanimationdescription.h" #include "gtkbindings.h" +#include "gtkcssarrayvalueprivate.h" +#include "gtkcssbgsizevalueprivate.h" +#include "gtkcssbordervalueprivate.h" +#include "gtkcsscolorvalueprivate.h" +#include "gtkcsscornervalueprivate.h" +#include "gtkcsseasevalueprivate.h" +#include "gtkcssenginevalueprivate.h" #include "gtkcssimageprivate.h" -#include "gtkgradient.h" -#include "gtkshadowprivate.h" +#include "gtkcssimagegradientprivate.h" +#include "gtkcssimagevalueprivate.h" +#include "gtkcssinitialvalueprivate.h" +#include "gtkcssenumvalueprivate.h" +#include "gtkcssnumbervalueprivate.h" +#include "gtkcsspositionvalueprivate.h" +#include "gtkcssrepeatvalueprivate.h" +#include "gtkcssrgbavalueprivate.h" +#include "gtkcssshadowsvalueprivate.h" +#include "gtkcssstringvalueprivate.h" #include "gtkthemingengine.h" #include "gtktypebuiltins.h" #include "gtkwin32themeprivate.h" /*** REGISTRATION ***/ -static void -color_compute (GtkCssStyleProperty *property, - GValue *computed, - GtkStyleContext *context, - const GValue *specified) -{ - g_value_init (computed, GDK_TYPE_RGBA); - - /* for when resolvage fails */ -restart: - - if (G_VALUE_HOLDS (specified, GTK_TYPE_CSS_SPECIAL_VALUE)) - { - GtkStyleContext *parent = gtk_style_context_get_parent (context); - g_assert (g_value_get_enum (specified) == GTK_CSS_CURRENT_COLOR); - - if (parent) - g_value_copy (_gtk_style_context_peek_property (parent, "color"), computed); - else - _gtk_css_style_compute_value (computed, - context, - _gtk_css_style_property_get_initial_value (property)); - } - else if (G_VALUE_HOLDS (specified, GTK_TYPE_SYMBOLIC_COLOR)) - { - GdkRGBA rgba; - - if (!_gtk_style_context_resolve_color (context, - g_value_get_boxed (specified), - &rgba)) - { - specified = _gtk_css_style_property_get_initial_value (property); - goto restart; - } - - g_value_set_boxed (computed, &rgba); - } - else - g_value_copy (specified, computed); -} +typedef enum { + GTK_STYLE_PROPERTY_INHERIT = (1 << 0), + GTK_STYLE_PROPERTY_ANIMATED = (1 << 1), + GTK_STYLE_PROPERTY_NO_RESIZE = (1 << 2), + GTK_STYLE_PROPERTY_AFFECTS_FONT = (1 << 3) +} GtkStylePropertyFlags; static void -_gtk_style_property_register (const char * name, - GType value_type, - GtkStylePropertyFlags flags, - GtkCssStylePropertyParseFunc parse_value, - GtkCssStylePropertyPrintFunc print_value, - GtkCssStylePropertyComputeFunc compute_value, - const GValue * initial_value) +gtk_css_style_property_register (const char * name, + guint expected_id, + GType value_type, + GtkStylePropertyFlags flags, + GtkCssStylePropertyParseFunc parse_value, + GtkCssStylePropertyQueryFunc query_value, + GtkCssStylePropertyAssignFunc assign_value, + GtkCssValue * initial_value) { GtkCssStyleProperty *node; + g_assert (initial_value != NULL); + g_assert (parse_value != NULL); + g_assert (value_type == G_TYPE_NONE || query_value != NULL); + g_assert (value_type == G_TYPE_NONE || assign_value != NULL); + node = g_object_new (GTK_TYPE_CSS_STYLE_PROPERTY, + "value-type", value_type, + "affects-size", (flags & GTK_STYLE_PROPERTY_NO_RESIZE) ? FALSE : TRUE, + "affects-font", (flags & GTK_STYLE_PROPERTY_AFFECTS_FONT) ? TRUE : FALSE, + "animated", (flags & GTK_STYLE_PROPERTY_ANIMATED) ? TRUE : FALSE, "inherit", (flags & GTK_STYLE_PROPERTY_INHERIT) ? TRUE : FALSE, "initial-value", initial_value, "name", name, - "value-type", value_type, NULL); + + node->parse_value = parse_value; + node->query_value = query_value; + node->assign_value = assign_value; + + _gtk_css_value_unref (initial_value); - if (parse_value) - node->parse_value = parse_value; - if (print_value) - node->print_value = print_value; - if (compute_value) - node->compute_value = compute_value; + g_assert (_gtk_css_style_property_get_id (node) == expected_id); } -static void -gtk_style_property_register (const char * name, - GType value_type, - GtkStylePropertyFlags flags, - GtkCssStylePropertyParseFunc parse_value, - GtkCssStylePropertyPrintFunc print_value, - GtkCssStylePropertyComputeFunc compute_value, - ...) -{ - GValue initial_value = G_VALUE_INIT; - char *error = NULL; - va_list args; - - va_start (args, compute_value); - G_VALUE_COLLECT_INIT (&initial_value, value_type, - args, 0, &error); - if (error) - { - g_error ("property `%s' initial value is broken: %s", name, error); - g_value_unset (&initial_value); - return; - } +/*** IMPLEMENTATIONS ***/ - va_end (args); +static void +query_length_as_int (GtkCssStyleProperty *property, + const GtkCssValue *css_value, + GValue *value) +{ + g_value_init (value, G_TYPE_INT); + g_value_set_int (value, round (_gtk_css_number_value_get (css_value, 100))); +} - _gtk_style_property_register (name, - value_type, - flags, - parse_value, - print_value, - compute_value, - &initial_value); +static GtkCssValue * +assign_length_from_int (GtkCssStyleProperty *property, + const GValue *value) +{ + return _gtk_css_number_value_new (g_value_get_int (value), GTK_CSS_PX); +} - g_value_unset (&initial_value); +static void +query_length_as_double (GtkCssStyleProperty *property, + const GtkCssValue *css_value, + GValue *value) +{ + g_value_init (value, G_TYPE_DOUBLE); + g_value_set_double (value, _gtk_css_number_value_get (css_value, 100)); } -/*** HELPERS ***/ +static GtkCssValue * +assign_length_from_double (GtkCssStyleProperty *property, + const GValue *value) +{ + return _gtk_css_number_value_new (g_value_get_double (value), GTK_CSS_PX); +} static void -string_append_double (GString *string, - double d) +query_border (GtkCssStyleProperty *property, + const GtkCssValue *css_value, + GValue *value) { - char buf[G_ASCII_DTOSTR_BUF_SIZE]; + GtkBorder border; - g_ascii_dtostr (buf, sizeof (buf), d); - g_string_append (string, buf); + g_value_init (value, GTK_TYPE_BORDER); + + border.top = round (_gtk_css_number_value_get (_gtk_css_border_value_get_top (css_value), 100)); + border.right = round (_gtk_css_number_value_get (_gtk_css_border_value_get_right (css_value), 100)); + border.bottom = round (_gtk_css_number_value_get (_gtk_css_border_value_get_bottom (css_value), 100)); + border.left = round (_gtk_css_number_value_get (_gtk_css_border_value_get_left (css_value), 100)); + + g_value_set_boxed (value, &border); +} + +static GtkCssValue * +assign_border (GtkCssStyleProperty *property, + const GValue *value) +{ + const GtkBorder *border = g_value_get_boxed (value); + + if (border == NULL) + return _gtk_css_initial_value_new (); + else + return _gtk_css_border_value_new (_gtk_css_number_value_new (border->top, GTK_CSS_PX), + _gtk_css_number_value_new (border->right, GTK_CSS_PX), + _gtk_css_number_value_new (border->bottom, GTK_CSS_PX), + _gtk_css_number_value_new (border->left, GTK_CSS_PX)); +} + +static GtkCssValue * +color_parse (GtkCssStyleProperty *property, + GtkCssParser *parser) +{ + return _gtk_css_color_value_parse (parser); } static void -string_append_string (GString *str, - const char *string) -{ - gsize len; - - g_string_append_c (str, '"'); - - do { - len = strcspn (string, "\"\n\r\f"); - g_string_append (str, string); - string += len; - switch (*string) - { - case '\0': - break; - case '\n': - g_string_append (str, "\\A "); - break; - case '\r': - g_string_append (str, "\\D "); - break; - case '\f': - g_string_append (str, "\\C "); - break; - case '\"': - g_string_append (str, "\\\""); - break; - default: - g_assert_not_reached (); - break; - } - } while (*string); - - g_string_append_c (str, '"'); +color_query (GtkCssStyleProperty *property, + const GtkCssValue *css_value, + GValue *value) +{ + g_value_init (value, GDK_TYPE_RGBA); + g_value_set_boxed (value, _gtk_css_rgba_value_get_rgba (css_value)); } -/*** IMPLEMENTATIONS ***/ +static GtkCssValue * +color_assign (GtkCssStyleProperty *property, + const GValue *value) +{ + return _gtk_css_rgba_value_new_from_rgba (g_value_get_boxed (value)); +} -static gboolean -font_family_parse (GtkCssStyleProperty *property, - GValue *value, - GtkCssParser *parser, - GFile *base) +static GtkCssValue * +font_family_parse_one (GtkCssParser *parser) { - GPtrArray *names; char *name; - /* We don't special case generic families. Pango should do - * that for us */ - - names = g_ptr_array_new (); - - do { - name = _gtk_css_parser_try_ident (parser, TRUE); - if (name) - { - GString *string = g_string_new (name); - g_free (name); - while ((name = _gtk_css_parser_try_ident (parser, TRUE))) - { - g_string_append_c (string, ' '); - g_string_append (string, name); - g_free (name); - } - name = g_string_free (string, FALSE); - } - else - { - name = _gtk_css_parser_read_string (parser); - if (name == NULL) - { - g_ptr_array_free (names, TRUE); - return FALSE; - } - } - - g_ptr_array_add (names, name); - } while (_gtk_css_parser_try (parser, ",", TRUE)); - - /* NULL-terminate array */ - g_ptr_array_add (names, NULL); - g_value_set_boxed (value, g_ptr_array_free (names, FALSE)); - return TRUE; + name = _gtk_css_parser_try_ident (parser, TRUE); + if (name) + { + GString *string = g_string_new (name); + g_free (name); + while ((name = _gtk_css_parser_try_ident (parser, TRUE))) + { + g_string_append_c (string, ' '); + g_string_append (string, name); + g_free (name); + } + name = g_string_free (string, FALSE); + } + else + { + name = _gtk_css_parser_read_string (parser); + if (name == NULL) + return NULL; + } + + return _gtk_css_string_value_new_take (name); +} + +static GtkCssValue * +font_family_parse (GtkCssStyleProperty *property, + GtkCssParser *parser) +{ + return _gtk_css_array_value_parse (parser, font_family_parse_one); } static void -font_family_value_print (GtkCssStyleProperty *property, - const GValue *value, - GString *string) +font_family_query (GtkCssStyleProperty *property, + const GtkCssValue *css_value, + GValue *value) { - const char **names = g_value_get_boxed (value); + GPtrArray *array; + guint i; - if (names == NULL || *names == NULL) - { - g_string_append (string, "none"); - return; - } + array = g_ptr_array_new (); - string_append_string (string, *names); - names++; - while (*names) + for (i = 0; i < _gtk_css_array_value_get_n_values (css_value); i++) { - g_string_append (string, ", "); - string_append_string (string, *names); - names++; + g_ptr_array_add (array, g_strdup (_gtk_css_string_value_get (_gtk_css_array_value_get_nth (css_value, i)))); } + + /* NULL-terminate */ + g_ptr_array_add (array, NULL); + + g_value_init (value, G_TYPE_STRV); + g_value_set_boxed (value, g_ptr_array_free (array, FALSE)); } -static gboolean -bindings_value_parse (GtkCssStyleProperty *property, - GValue *value, - GtkCssParser *parser, - GFile *base) +static GtkCssValue * +font_family_assign (GtkCssStyleProperty *property, + const GValue *value) { + const char **names = g_value_get_boxed (value); + GtkCssValue *result; GPtrArray *array; - GtkBindingSet *binding_set; - char *name; array = g_ptr_array_new (); - do { - name = _gtk_css_parser_try_ident (parser, TRUE); - if (name == NULL) - { - _gtk_css_parser_error (parser, "Not a valid binding name"); - g_ptr_array_free (array, TRUE); - return FALSE; - } + for (names = g_value_get_boxed (value); *names; names++) + { + g_ptr_array_add (array, _gtk_css_string_value_new (*names)); + } - binding_set = gtk_binding_set_find (name); + result = _gtk_css_array_value_new_from_array ((GtkCssValue **) array->pdata, array->len); + g_ptr_array_free (array, TRUE); + return result; +} - if (!binding_set) - { - _gtk_css_parser_error (parser, "No binding set named '%s'", name); - g_free (name); - continue; - } +static GtkCssValue * +parse_pango_style (GtkCssStyleProperty *property, + GtkCssParser *parser) +{ + GtkCssValue *value = _gtk_css_font_style_value_try_parse (parser); + + if (value == NULL) + _gtk_css_parser_error (parser, "unknown value for property"); - g_ptr_array_add (array, binding_set); - g_free (name); - } - while (_gtk_css_parser_try (parser, ",", TRUE)); + return value; +} - g_value_take_boxed (value, array); +static void +query_pango_style (GtkCssStyleProperty *property, + const GtkCssValue *css_value, + GValue *value) +{ + g_value_init (value, PANGO_TYPE_STYLE); + g_value_set_enum (value, _gtk_css_font_style_value_get (css_value)); +} - return TRUE; +static GtkCssValue * +assign_pango_style (GtkCssStyleProperty *property, + const GValue *value) +{ + return _gtk_css_font_style_value_new (g_value_get_enum (value)); +} + +static GtkCssValue * +parse_pango_weight (GtkCssStyleProperty *property, + GtkCssParser *parser) +{ + GtkCssValue *value = _gtk_css_font_weight_value_try_parse (parser); + + if (value == NULL) + _gtk_css_parser_error (parser, "unknown value for property"); + + return value; } static void -bindings_value_print (GtkCssStyleProperty *property, - const GValue *value, - GString *string) +query_pango_weight (GtkCssStyleProperty *property, + const GtkCssValue *css_value, + GValue *value) { - GPtrArray *array; - guint i; + g_value_init (value, PANGO_TYPE_WEIGHT); + g_value_set_enum (value, _gtk_css_font_weight_value_get (css_value)); +} - array = g_value_get_boxed (value); +static GtkCssValue * +assign_pango_weight (GtkCssStyleProperty *property, + const GValue *value) +{ + return _gtk_css_font_weight_value_new (g_value_get_enum (value)); +} - for (i = 0; i < array->len; i++) - { - GtkBindingSet *binding_set = g_ptr_array_index (array, i); +static GtkCssValue * +parse_pango_variant (GtkCssStyleProperty *property, + GtkCssParser *parser) +{ + GtkCssValue *value = _gtk_css_font_variant_value_try_parse (parser); + + if (value == NULL) + _gtk_css_parser_error (parser, "unknown value for property"); - if (i > 0) - g_string_append (string, ", "); - g_string_append (string, binding_set->set_name); - } + return value; } -static gboolean -border_corner_radius_value_parse (GtkCssStyleProperty *property, - GValue *value, - GtkCssParser *parser, - GFile *base) +static void +query_pango_variant (GtkCssStyleProperty *property, + const GtkCssValue *css_value, + GValue *value) +{ + g_value_init (value, PANGO_TYPE_VARIANT); + g_value_set_enum (value, _gtk_css_font_variant_value_get (css_value)); +} + +static GtkCssValue * +assign_pango_variant (GtkCssStyleProperty *property, + const GValue *value) +{ + return _gtk_css_font_variant_value_new (g_value_get_enum (value)); +} + +static GtkCssValue * +parse_border_style (GtkCssStyleProperty *property, + GtkCssParser *parser) +{ + GtkCssValue *value = _gtk_css_border_style_value_try_parse (parser); + + if (value == NULL) + _gtk_css_parser_error (parser, "unknown value for property"); + + return value; +} + +static void +query_border_style (GtkCssStyleProperty *property, + const GtkCssValue *css_value, + GValue *value) +{ + g_value_init (value, GTK_TYPE_BORDER_STYLE); + g_value_set_enum (value, _gtk_css_border_style_value_get (css_value)); +} + +static GtkCssValue * +assign_border_style (GtkCssStyleProperty *property, + const GValue *value) +{ + return _gtk_css_border_style_value_new (g_value_get_enum (value)); +} + +static GtkCssValue * +parse_css_area_one (GtkCssParser *parser) +{ + GtkCssValue *value = _gtk_css_area_value_try_parse (parser); + + if (value == NULL) + _gtk_css_parser_error (parser, "unknown value for property"); + + return value; +} + +static GtkCssValue * +parse_css_area (GtkCssStyleProperty *property, + GtkCssParser *parser) +{ + return _gtk_css_array_value_parse (parser, parse_css_area_one); +} + +static GtkCssValue * +parse_one_css_direction (GtkCssParser *parser) +{ + GtkCssValue *value = _gtk_css_direction_value_try_parse (parser); + + if (value == NULL) + _gtk_css_parser_error (parser, "unknown value for property"); + + return value; +} + +static GtkCssValue * +parse_css_direction (GtkCssStyleProperty *property, + GtkCssParser *parser) +{ + return _gtk_css_array_value_parse (parser, parse_one_css_direction); +} + +static GtkCssValue * +opacity_parse (GtkCssStyleProperty *property, + GtkCssParser *parser) +{ + return _gtk_css_number_value_parse (parser, GTK_CSS_PARSE_NUMBER); +} + + +static GtkCssValue * +parse_one_css_play_state (GtkCssParser *parser) { - GtkCssBorderCornerRadius corner; + GtkCssValue *value = _gtk_css_play_state_value_try_parse (parser); + + if (value == NULL) + _gtk_css_parser_error (parser, "unknown value for property"); - if (!_gtk_css_parser_try_double (parser, &corner.horizontal)) + return value; +} + +static GtkCssValue * +parse_css_play_state (GtkCssStyleProperty *property, + GtkCssParser *parser) +{ + return _gtk_css_array_value_parse (parser, parse_one_css_play_state); +} + +static GtkCssValue * +parse_one_css_fill_mode (GtkCssParser *parser) +{ + GtkCssValue *value = _gtk_css_fill_mode_value_try_parse (parser); + + if (value == NULL) + _gtk_css_parser_error (parser, "unknown value for property"); + + return value; +} + +static GtkCssValue * +parse_css_fill_mode (GtkCssStyleProperty *property, + GtkCssParser *parser) +{ + return _gtk_css_array_value_parse (parser, parse_one_css_fill_mode); +} + +static GtkCssValue * +bindings_value_parse_one (GtkCssParser *parser) +{ + char *name; + + name = _gtk_css_parser_try_ident (parser, TRUE); + if (name == NULL) { - _gtk_css_parser_error (parser, "Expected a number"); - return FALSE; + _gtk_css_parser_error (parser, "Not a valid binding name"); + return NULL; } - else if (corner.horizontal < 0) - goto negative; - if (!_gtk_css_parser_try_double (parser, &corner.vertical)) - corner.vertical = corner.horizontal; - else if (corner.vertical < 0) - goto negative; + if (g_ascii_strcasecmp (name, "none")) + { + name = NULL; + } + else if (!gtk_binding_set_find (name)) + { + _gtk_css_parser_error (parser, "No binding set named '%s'", name); + g_free (name); + return NULL; + } - g_value_set_boxed (value, &corner); - return TRUE; + return _gtk_css_string_value_new_take (name); +} -negative: - _gtk_css_parser_error (parser, "Border radius values cannot be negative"); - return FALSE; +static GtkCssValue * +bindings_value_parse (GtkCssStyleProperty *property, + GtkCssParser *parser) +{ + return _gtk_css_array_value_parse (parser, bindings_value_parse_one); } static void -border_corner_radius_value_print (GtkCssStyleProperty *property, - const GValue *value, - GString *string) +bindings_value_query (GtkCssStyleProperty *property, + const GtkCssValue *css_value, + GValue *value) { - GtkCssBorderCornerRadius *corner; + GPtrArray *array; + guint i; + + g_value_init (value, G_TYPE_PTR_ARRAY); - corner = g_value_get_boxed (value); + if (_gtk_css_array_value_get_n_values (css_value) == 0) + return; - if (corner == NULL) + array = NULL; + + for (i = 0; i < _gtk_css_array_value_get_n_values (css_value); i++) { - g_string_append (string, "none"); - return; + const char *name; + GtkBindingSet *binding_set; + + name = _gtk_css_string_value_get (_gtk_css_array_value_get_nth (css_value, i)); + if (name == NULL) + continue; + + binding_set = gtk_binding_set_find (name); + if (binding_set == NULL) + continue; + + if (array == NULL) + array = g_ptr_array_new (); + g_ptr_array_add (array, binding_set); } - string_append_double (string, corner->horizontal); - if (corner->horizontal != corner->vertical) + g_value_take_boxed (value, array); +} + +static GtkCssValue * +bindings_value_assign (GtkCssStyleProperty *property, + const GValue *value) +{ + GPtrArray *binding_sets = g_value_get_boxed (value); + GtkCssValue **values, *result; + guint i; + + if (binding_sets == NULL || binding_sets->len == 0) + return _gtk_css_array_value_new (_gtk_css_string_value_new (NULL)); + + values = g_new (GtkCssValue *, binding_sets->len); + + for (i = 0; i < binding_sets->len; i++) { - g_string_append_c (string, ' '); - string_append_double (string, corner->vertical); + GtkBindingSet *binding_set = g_ptr_array_index (binding_sets, i); + values[i] = _gtk_css_string_value_new (binding_set->set_name); } + + result = _gtk_css_array_value_new_from_array (values, binding_sets->len); + g_free (values); + return result; +} + +static GtkCssValue * +shadow_value_parse (GtkCssStyleProperty *property, + GtkCssParser *parser) +{ + return _gtk_css_shadows_value_parse (parser); +} + +static GtkCssValue * +border_corner_radius_value_parse (GtkCssStyleProperty *property, + GtkCssParser *parser) +{ + return _gtk_css_corner_value_parse (parser); } -static gboolean +static GtkCssValue * css_image_value_parse (GtkCssStyleProperty *property, - GValue *value, - GtkCssParser *parser, - GFile *base) + GtkCssParser *parser) { GtkCssImage *image; @@ -393,452 +581,841 @@ css_image_value_parse (GtkCssStyleProperty *property, image = NULL; else { - image = _gtk_css_image_new_parse (parser, base); + image = _gtk_css_image_new_parse (parser); if (image == NULL) return FALSE; } - g_value_unset (value); - g_value_init (value, GTK_TYPE_CSS_IMAGE); - g_value_take_object (value, image); - return TRUE; + return _gtk_css_image_value_new (image); } static void -css_image_value_print (GtkCssStyleProperty *property, - const GValue *value, - GString *string) +css_image_value_query (GtkCssStyleProperty *property, + const GtkCssValue *css_value, + GValue *value) { - GtkCssImage *image = g_value_get_object (value); + GtkCssImage *image = _gtk_css_image_value_get_image (css_value); + cairo_pattern_t *pattern; + cairo_surface_t *surface; + cairo_matrix_t matrix; + + g_value_init (value, CAIRO_GOBJECT_TYPE_PATTERN); + + if (GTK_IS_CSS_IMAGE_GRADIENT (image)) + g_value_set_boxed (value, GTK_CSS_IMAGE_GRADIENT (image)->pattern); + else if (image != NULL) + { + double width, height; + + /* the 100, 100 is rather random */ + _gtk_css_image_get_concrete_size (image, 0, 0, 100, 100, &width, &height); + surface = _gtk_css_image_get_surface (image, NULL, width, height); + pattern = cairo_pattern_create_for_surface (surface); + cairo_matrix_init_scale (&matrix, width, height); + cairo_pattern_set_matrix (pattern, &matrix); + cairo_surface_destroy (surface); + g_value_take_boxed (value, pattern); + } +} - if (image) - _gtk_css_image_print (image, string); - else - g_string_append (string, "none"); +static GtkCssValue * +css_image_value_assign (GtkCssStyleProperty *property, + const GValue *value) +{ + g_warning ("FIXME: assigning images is not implemented"); + return _gtk_css_image_value_new (NULL); +} + +static GtkCssValue * +background_image_value_parse_one (GtkCssParser *parser) +{ + return css_image_value_parse (NULL, parser); +} + +static GtkCssValue * +background_image_value_parse (GtkCssStyleProperty *property, + GtkCssParser *parser) +{ + return _gtk_css_array_value_parse (parser, background_image_value_parse_one); } static void -css_image_value_compute (GtkCssStyleProperty *property, - GValue *computed, - GtkStyleContext *context, - const GValue *specified) +background_image_value_query (GtkCssStyleProperty *property, + const GtkCssValue *css_value, + GValue *value) { - GtkCssImage *image = g_value_get_object (specified); + css_image_value_query (property, _gtk_css_array_value_get_nth (css_value, 0), value); +} + +static GtkCssValue * +background_image_value_assign (GtkCssStyleProperty *property, + const GValue *value) +{ + return _gtk_css_array_value_new (css_image_value_assign (property, value)); +} + +static GtkCssValue * +font_size_parse (GtkCssStyleProperty *property, + GtkCssParser *parser) +{ + GtkCssValue *value; - if (image) - image = _gtk_css_image_compute (image, context); + value = _gtk_css_font_size_value_try_parse (parser); + if (value) + return value; - g_value_init (computed, GTK_TYPE_CSS_IMAGE); - g_value_take_object (computed, image); + return _gtk_css_number_value_parse (parser, + GTK_CSS_PARSE_LENGTH + | GTK_CSS_PARSE_PERCENT + | GTK_CSS_POSITIVE_ONLY + | GTK_CSS_NUMBER_AS_PIXELS); } -static gboolean -background_repeat_value_parse (GtkCssStyleProperty *property, - GValue *value, - GtkCssParser *parser, - GFile *base) +static GtkCssValue * +outline_parse (GtkCssStyleProperty *property, + GtkCssParser *parser) +{ + return _gtk_css_number_value_parse (parser, + GTK_CSS_NUMBER_AS_PIXELS + | GTK_CSS_PARSE_LENGTH); +} + +static GtkCssValue * +border_image_repeat_parse (GtkCssStyleProperty *property, + GtkCssParser *parser) { - int repeat, vertical; + GtkCssValue *value = _gtk_css_border_repeat_value_try_parse (parser); - if (!_gtk_css_parser_try_enum (parser, GTK_TYPE_CSS_BACKGROUND_REPEAT, &repeat)) + if (value == NULL) { _gtk_css_parser_error (parser, "Not a valid value"); - return FALSE; + return NULL; } - if (repeat <= GTK_CSS_BACKGROUND_REPEAT_MASK) + return value; +} + +static GtkCssValue * +border_image_slice_parse (GtkCssStyleProperty *property, + GtkCssParser *parser) +{ + return _gtk_css_border_value_parse (parser, + GTK_CSS_PARSE_PERCENT + | GTK_CSS_PARSE_NUMBER + | GTK_CSS_POSITIVE_ONLY, + FALSE, + TRUE); +} + +static GtkCssValue * +border_image_width_parse (GtkCssStyleProperty *property, + GtkCssParser *parser) +{ + return _gtk_css_border_value_parse (parser, + GTK_CSS_PARSE_PERCENT + | GTK_CSS_PARSE_LENGTH + | GTK_CSS_PARSE_NUMBER + | GTK_CSS_POSITIVE_ONLY, + TRUE, + FALSE); +} + +static GtkCssValue * +transition_property_parse_one (GtkCssParser *parser) +{ + GtkCssValue *value; + + value = _gtk_css_ident_value_try_parse (parser); + + if (value == NULL) { - if (_gtk_css_parser_try_enum (parser, GTK_TYPE_CSS_BACKGROUND_REPEAT, &vertical)) - { - if (vertical >= GTK_CSS_BACKGROUND_REPEAT_MASK) - { - _gtk_css_parser_error (parser, "Not a valid 2nd value"); - return FALSE; - } - else - repeat |= vertical << GTK_CSS_BACKGROUND_REPEAT_SHIFT; - } - else - repeat |= repeat << GTK_CSS_BACKGROUND_REPEAT_SHIFT; + _gtk_css_parser_error (parser, "Expected an identifier"); + return NULL; } - g_value_set_enum (value, repeat); - return TRUE; + return value; +} + +static GtkCssValue * +transition_property_parse (GtkCssStyleProperty *property, + GtkCssParser *parser) +{ + return _gtk_css_array_value_parse (parser, transition_property_parse_one); +} + +static GtkCssValue * +transition_time_parse_one (GtkCssParser *parser) +{ + return _gtk_css_number_value_parse (parser, GTK_CSS_PARSE_TIME); +} + +static GtkCssValue * +transition_time_parse (GtkCssStyleProperty *property, + GtkCssParser *parser) +{ + return _gtk_css_array_value_parse (parser, transition_time_parse_one); +} + +static GtkCssValue * +transition_timing_function_parse (GtkCssStyleProperty *property, + GtkCssParser *parser) +{ + return _gtk_css_array_value_parse (parser, _gtk_css_ease_value_parse); +} + +static GtkCssValue * +iteration_count_parse_one (GtkCssParser *parser) +{ + if (_gtk_css_parser_try (parser, "infinite", TRUE)) + return _gtk_css_number_value_new (HUGE_VAL, GTK_CSS_NUMBER); + + return _gtk_css_number_value_parse (parser, GTK_CSS_PARSE_NUMBER | GTK_CSS_POSITIVE_ONLY); +} + +static GtkCssValue * +iteration_count_parse (GtkCssStyleProperty *property, + GtkCssParser *parser) +{ + return _gtk_css_array_value_parse (parser, iteration_count_parse_one); +} + +static GtkCssValue * +engine_parse (GtkCssStyleProperty *property, + GtkCssParser *parser) +{ + return _gtk_css_engine_value_parse (parser); } static void -background_repeat_value_print (GtkCssStyleProperty *property, - const GValue *value, - GString *string) +engine_query (GtkCssStyleProperty *property, + const GtkCssValue *css_value, + GValue *value) +{ + g_value_init (value, GTK_TYPE_THEMING_ENGINE); + g_value_set_object (value, _gtk_css_engine_value_get_engine (css_value)); +} + +static GtkCssValue * +engine_assign (GtkCssStyleProperty *property, + const GValue *value) { - GEnumClass *enum_class; - GEnumValue *enum_value; - GtkCssBackgroundRepeat repeat; + return _gtk_css_engine_value_new (g_value_get_object (value)); +} - repeat = g_value_get_enum (value); - enum_class = g_type_class_ref (GTK_TYPE_CSS_BACKGROUND_REPEAT); - enum_value = g_enum_get_value (enum_class, repeat); +static GtkCssValue * +parse_margin (GtkCssStyleProperty *property, + GtkCssParser *parser) +{ + return _gtk_css_number_value_parse (parser, + GTK_CSS_NUMBER_AS_PIXELS + | GTK_CSS_PARSE_LENGTH); +} - /* only triggers for 'repeat-x' and 'repeat-y' */ - if (enum_value) - g_string_append (string, enum_value->value_nick); - else - { - enum_value = g_enum_get_value (enum_class, GTK_CSS_BACKGROUND_HORIZONTAL (repeat)); - g_string_append (string, enum_value->value_nick); +static GtkCssValue * +parse_padding (GtkCssStyleProperty *property, + GtkCssParser *parser) +{ + return _gtk_css_number_value_parse (parser, + GTK_CSS_POSITIVE_ONLY + | GTK_CSS_NUMBER_AS_PIXELS + | GTK_CSS_PARSE_LENGTH); +} - if (GTK_CSS_BACKGROUND_HORIZONTAL (repeat) != GTK_CSS_BACKGROUND_VERTICAL (repeat)) - { - enum_value = g_enum_get_value (enum_class, GTK_CSS_BACKGROUND_VERTICAL (repeat)); - g_string_append (string, " "); - g_string_append (string, enum_value->value_nick); - } +static GtkCssValue * +parse_border_width (GtkCssStyleProperty *property, + GtkCssParser *parser) +{ + return _gtk_css_number_value_parse (parser, + GTK_CSS_POSITIVE_ONLY + | GTK_CSS_NUMBER_AS_PIXELS + | GTK_CSS_PARSE_LENGTH); +} + +static GtkCssValue * +background_repeat_value_parse_one (GtkCssParser *parser) +{ + GtkCssValue *value = _gtk_css_background_repeat_value_try_parse (parser); + + if (value == NULL) + { + _gtk_css_parser_error (parser, "Not a valid value"); + return NULL; } - g_type_class_unref (enum_class); + return value; +} + +static GtkCssValue * +background_repeat_value_parse (GtkCssStyleProperty *property, + GtkCssParser *parser) +{ + return _gtk_css_array_value_parse (parser, background_repeat_value_parse_one); +} + +static GtkCssValue * +background_size_parse (GtkCssStyleProperty *property, + GtkCssParser *parser) +{ + return _gtk_css_array_value_parse (parser, _gtk_css_bg_size_value_parse); +} + +static GtkCssValue * +background_position_parse (GtkCssStyleProperty *property, + GtkCssParser *parser) +{ + return _gtk_css_array_value_parse (parser, _gtk_css_position_value_parse); } /*** REGISTRATION ***/ -#define rgba_init(rgba, r, g, b, a) G_STMT_START{ \ - (rgba)->red = (r); \ - (rgba)->green = (g); \ - (rgba)->blue = (b); \ - (rgba)->alpha = (a); \ -}G_STMT_END void _gtk_css_style_property_init_properties (void) { - GValue value = { 0, }; - char *default_font_family[] = { "Sans", NULL }; - GdkRGBA rgba; - GtkCssBorderCornerRadius no_corner_radius = { 0, }; - GtkBorder border_of_ones = { 1, 1, 1, 1 }; - GtkCssBorderImageRepeat border_image_repeat = { GTK_CSS_REPEAT_STYLE_STRETCH, GTK_CSS_REPEAT_STYLE_STRETCH }; - /* Initialize "color" and "font-size" first, * so that when computing values later they are * done first. That way, 'currentColor' and font * sizes in em can be looked up properly */ - rgba_init (&rgba, 1, 1, 1, 1); - gtk_style_property_register ("color", + gtk_css_style_property_register ("color", + GTK_CSS_PROPERTY_COLOR, GDK_TYPE_RGBA, - GTK_STYLE_PROPERTY_INHERIT, - NULL, - NULL, - color_compute, - &rgba); - gtk_style_property_register ("font-size", + GTK_STYLE_PROPERTY_INHERIT | GTK_STYLE_PROPERTY_ANIMATED | GTK_STYLE_PROPERTY_NO_RESIZE, + color_parse, + color_query, + color_assign, + _gtk_css_color_value_new_rgba (1, 1, 1, 1)); + gtk_css_style_property_register ("font-size", + GTK_CSS_PROPERTY_FONT_SIZE, G_TYPE_DOUBLE, - GTK_STYLE_PROPERTY_INHERIT, - NULL, - NULL, - NULL, - 10.0); + GTK_STYLE_PROPERTY_INHERIT | GTK_STYLE_PROPERTY_ANIMATED | GTK_STYLE_PROPERTY_AFFECTS_FONT, + font_size_parse, + query_length_as_double, + assign_length_from_double, + _gtk_css_font_size_value_new (GTK_CSS_FONT_SIZE_MEDIUM)); /* properties that aren't referenced when computing values * start here */ - rgba_init (&rgba, 0, 0, 0, 0); - gtk_style_property_register ("background-color", + gtk_css_style_property_register ("background-color", + GTK_CSS_PROPERTY_BACKGROUND_COLOR, GDK_TYPE_RGBA, - 0, - NULL, - NULL, - color_compute, - &rgba); - - gtk_style_property_register ("font-family", + GTK_STYLE_PROPERTY_ANIMATED | GTK_STYLE_PROPERTY_NO_RESIZE, + color_parse, + color_query, + color_assign, + _gtk_css_color_value_new_rgba (0, 0, 0, 0)); + + gtk_css_style_property_register ("font-family", + GTK_CSS_PROPERTY_FONT_FAMILY, G_TYPE_STRV, - GTK_STYLE_PROPERTY_INHERIT, + GTK_STYLE_PROPERTY_INHERIT | GTK_STYLE_PROPERTY_AFFECTS_FONT, font_family_parse, - font_family_value_print, - NULL, - default_font_family); - gtk_style_property_register ("font-style", + font_family_query, + font_family_assign, + _gtk_css_array_value_new (_gtk_css_string_value_new ("Sans"))); + gtk_css_style_property_register ("font-style", + GTK_CSS_PROPERTY_FONT_STYLE, PANGO_TYPE_STYLE, - GTK_STYLE_PROPERTY_INHERIT, - NULL, - NULL, - NULL, - PANGO_STYLE_NORMAL); - gtk_style_property_register ("font-variant", + GTK_STYLE_PROPERTY_INHERIT | GTK_STYLE_PROPERTY_AFFECTS_FONT, + parse_pango_style, + query_pango_style, + assign_pango_style, + _gtk_css_font_style_value_new (PANGO_STYLE_NORMAL)); + gtk_css_style_property_register ("font-variant", + GTK_CSS_PROPERTY_FONT_VARIANT, PANGO_TYPE_VARIANT, - GTK_STYLE_PROPERTY_INHERIT, - NULL, - NULL, - NULL, - PANGO_VARIANT_NORMAL); - /* xxx: need to parse this properly, ie parse the numbers */ - gtk_style_property_register ("font-weight", + GTK_STYLE_PROPERTY_INHERIT | GTK_STYLE_PROPERTY_AFFECTS_FONT, + parse_pango_variant, + query_pango_variant, + assign_pango_variant, + _gtk_css_font_variant_value_new (PANGO_VARIANT_NORMAL)); + gtk_css_style_property_register ("font-weight", + GTK_CSS_PROPERTY_FONT_WEIGHT, PANGO_TYPE_WEIGHT, - GTK_STYLE_PROPERTY_INHERIT, - NULL, - NULL, - NULL, - PANGO_WEIGHT_NORMAL); + GTK_STYLE_PROPERTY_INHERIT | GTK_STYLE_PROPERTY_AFFECTS_FONT, + parse_pango_weight, + query_pango_weight, + assign_pango_weight, + _gtk_css_font_weight_value_new (PANGO_WEIGHT_NORMAL)); - gtk_style_property_register ("text-shadow", - GTK_TYPE_SHADOW, - GTK_STYLE_PROPERTY_INHERIT, - NULL, + gtk_css_style_property_register ("text-shadow", + GTK_CSS_PROPERTY_TEXT_SHADOW, + G_TYPE_NONE, + GTK_STYLE_PROPERTY_INHERIT | GTK_STYLE_PROPERTY_ANIMATED | GTK_STYLE_PROPERTY_NO_RESIZE, + shadow_value_parse, NULL, NULL, - NULL); + _gtk_css_shadows_value_new_none ()); - gtk_style_property_register ("icon-shadow", - GTK_TYPE_SHADOW, - GTK_STYLE_PROPERTY_INHERIT, + gtk_css_style_property_register ("icon-shadow", + GTK_CSS_PROPERTY_ICON_SHADOW, + G_TYPE_NONE, + GTK_STYLE_PROPERTY_INHERIT | GTK_STYLE_PROPERTY_ANIMATED | GTK_STYLE_PROPERTY_NO_RESIZE, + shadow_value_parse, NULL, NULL, - NULL, - NULL); + _gtk_css_shadows_value_new_none ()); - gtk_style_property_register ("box-shadow", - GTK_TYPE_SHADOW, - 0, - NULL, + gtk_css_style_property_register ("box-shadow", + GTK_CSS_PROPERTY_BOX_SHADOW, + G_TYPE_NONE, + GTK_STYLE_PROPERTY_ANIMATED | GTK_STYLE_PROPERTY_NO_RESIZE, + shadow_value_parse, NULL, NULL, - NULL); + _gtk_css_shadows_value_new_none ()); - gtk_style_property_register ("margin-top", + gtk_css_style_property_register ("margin-top", + GTK_CSS_PROPERTY_MARGIN_TOP, G_TYPE_INT, - 0, - NULL, - NULL, - NULL, - 0); - gtk_style_property_register ("margin-left", + GTK_STYLE_PROPERTY_ANIMATED, + parse_margin, + query_length_as_int, + assign_length_from_int, + _gtk_css_number_value_new (0.0, GTK_CSS_PX)); + gtk_css_style_property_register ("margin-left", + GTK_CSS_PROPERTY_MARGIN_LEFT, G_TYPE_INT, - 0, - NULL, - NULL, - NULL, - 0); - gtk_style_property_register ("margin-bottom", + GTK_STYLE_PROPERTY_ANIMATED, + parse_margin, + query_length_as_int, + assign_length_from_int, + _gtk_css_number_value_new (0.0, GTK_CSS_PX)); + gtk_css_style_property_register ("margin-bottom", + GTK_CSS_PROPERTY_MARGIN_BOTTOM, G_TYPE_INT, - 0, - NULL, - NULL, - NULL, - 0); - gtk_style_property_register ("margin-right", + GTK_STYLE_PROPERTY_ANIMATED, + parse_margin, + query_length_as_int, + assign_length_from_int, + _gtk_css_number_value_new (0.0, GTK_CSS_PX)); + gtk_css_style_property_register ("margin-right", + GTK_CSS_PROPERTY_MARGIN_RIGHT, G_TYPE_INT, - 0, - NULL, - NULL, - NULL, - 0); - gtk_style_property_register ("padding-top", + GTK_STYLE_PROPERTY_ANIMATED, + parse_margin, + query_length_as_int, + assign_length_from_int, + _gtk_css_number_value_new (0.0, GTK_CSS_PX)); + gtk_css_style_property_register ("padding-top", + GTK_CSS_PROPERTY_PADDING_TOP, G_TYPE_INT, - 0, - NULL, - NULL, - NULL, - 0); - gtk_style_property_register ("padding-left", + GTK_STYLE_PROPERTY_ANIMATED, + parse_padding, + query_length_as_int, + assign_length_from_int, + _gtk_css_number_value_new (0.0, GTK_CSS_PX)); + gtk_css_style_property_register ("padding-left", + GTK_CSS_PROPERTY_PADDING_LEFT, G_TYPE_INT, - 0, - NULL, - NULL, - NULL, - 0); - gtk_style_property_register ("padding-bottom", + GTK_STYLE_PROPERTY_ANIMATED, + parse_padding, + query_length_as_int, + assign_length_from_int, + _gtk_css_number_value_new (0.0, GTK_CSS_PX)); + gtk_css_style_property_register ("padding-bottom", + GTK_CSS_PROPERTY_PADDING_BOTTOM, G_TYPE_INT, - 0, - NULL, - NULL, - NULL, - 0); - gtk_style_property_register ("padding-right", + GTK_STYLE_PROPERTY_ANIMATED, + parse_padding, + query_length_as_int, + assign_length_from_int, + _gtk_css_number_value_new (0.0, GTK_CSS_PX)); + gtk_css_style_property_register ("padding-right", + GTK_CSS_PROPERTY_PADDING_RIGHT, G_TYPE_INT, - 0, - NULL, - NULL, - NULL, - 0); - gtk_style_property_register ("border-top-width", + GTK_STYLE_PROPERTY_ANIMATED, + parse_padding, + query_length_as_int, + assign_length_from_int, + _gtk_css_number_value_new (0.0, GTK_CSS_PX)); + /* IMPORTANT: the border-width properties must come after border-style properties, + * they depend on them for their value computation. + */ + gtk_css_style_property_register ("border-top-style", + GTK_CSS_PROPERTY_BORDER_TOP_STYLE, + GTK_TYPE_BORDER_STYLE, + GTK_STYLE_PROPERTY_NO_RESIZE, + parse_border_style, + query_border_style, + assign_border_style, + _gtk_css_border_style_value_new (GTK_BORDER_STYLE_NONE)); + gtk_css_style_property_register ("border-top-width", + GTK_CSS_PROPERTY_BORDER_TOP_WIDTH, G_TYPE_INT, - 0, - NULL, - NULL, - NULL, - 0); - gtk_style_property_register ("border-left-width", + GTK_STYLE_PROPERTY_ANIMATED, + parse_border_width, + query_length_as_int, + assign_length_from_int, + _gtk_css_number_value_new (0.0, GTK_CSS_PX)); + gtk_css_style_property_register ("border-left-style", + GTK_CSS_PROPERTY_BORDER_LEFT_STYLE, + GTK_TYPE_BORDER_STYLE, + GTK_STYLE_PROPERTY_NO_RESIZE, + parse_border_style, + query_border_style, + assign_border_style, + _gtk_css_border_style_value_new (GTK_BORDER_STYLE_NONE)); + gtk_css_style_property_register ("border-left-width", + GTK_CSS_PROPERTY_BORDER_LEFT_WIDTH, G_TYPE_INT, - 0, - NULL, - NULL, - NULL, - 0); - gtk_style_property_register ("border-bottom-width", + GTK_STYLE_PROPERTY_ANIMATED, + parse_border_width, + query_length_as_int, + assign_length_from_int, + _gtk_css_number_value_new (0.0, GTK_CSS_PX)); + gtk_css_style_property_register ("border-bottom-style", + GTK_CSS_PROPERTY_BORDER_BOTTOM_STYLE, + GTK_TYPE_BORDER_STYLE, + GTK_STYLE_PROPERTY_NO_RESIZE, + parse_border_style, + query_border_style, + assign_border_style, + _gtk_css_border_style_value_new (GTK_BORDER_STYLE_NONE)); + gtk_css_style_property_register ("border-bottom-width", + GTK_CSS_PROPERTY_BORDER_BOTTOM_WIDTH, G_TYPE_INT, - 0, - NULL, - NULL, - NULL, - 0); - gtk_style_property_register ("border-right-width", + GTK_STYLE_PROPERTY_ANIMATED, + parse_border_width, + query_length_as_int, + assign_length_from_int, + _gtk_css_number_value_new (0.0, GTK_CSS_PX)); + gtk_css_style_property_register ("border-right-style", + GTK_CSS_PROPERTY_BORDER_RIGHT_STYLE, + GTK_TYPE_BORDER_STYLE, + GTK_STYLE_PROPERTY_NO_RESIZE, + parse_border_style, + query_border_style, + assign_border_style, + _gtk_css_border_style_value_new (GTK_BORDER_STYLE_NONE)); + gtk_css_style_property_register ("border-right-width", + GTK_CSS_PROPERTY_BORDER_RIGHT_WIDTH, G_TYPE_INT, - 0, - NULL, + GTK_STYLE_PROPERTY_ANIMATED, + parse_border_width, + query_length_as_int, + assign_length_from_int, + _gtk_css_number_value_new (0.0, GTK_CSS_PX)); + + gtk_css_style_property_register ("border-top-left-radius", + GTK_CSS_PROPERTY_BORDER_TOP_LEFT_RADIUS, + G_TYPE_NONE, + GTK_STYLE_PROPERTY_ANIMATED | GTK_STYLE_PROPERTY_NO_RESIZE, + border_corner_radius_value_parse, NULL, NULL, - 0); - - gtk_style_property_register ("border-top-left-radius", - GTK_TYPE_CSS_BORDER_CORNER_RADIUS, - 0, + _gtk_css_corner_value_new (_gtk_css_number_value_new (0, GTK_CSS_PX), + _gtk_css_number_value_new (0, GTK_CSS_PX))); + gtk_css_style_property_register ("border-top-right-radius", + GTK_CSS_PROPERTY_BORDER_TOP_RIGHT_RADIUS, + G_TYPE_NONE, + GTK_STYLE_PROPERTY_ANIMATED | GTK_STYLE_PROPERTY_NO_RESIZE, border_corner_radius_value_parse, - border_corner_radius_value_print, NULL, - &no_corner_radius); - gtk_style_property_register ("border-top-right-radius", - GTK_TYPE_CSS_BORDER_CORNER_RADIUS, - 0, - border_corner_radius_value_parse, - border_corner_radius_value_print, NULL, - &no_corner_radius); - gtk_style_property_register ("border-bottom-right-radius", - GTK_TYPE_CSS_BORDER_CORNER_RADIUS, - 0, + _gtk_css_corner_value_new (_gtk_css_number_value_new (0, GTK_CSS_PX), + _gtk_css_number_value_new (0, GTK_CSS_PX))); + gtk_css_style_property_register ("border-bottom-right-radius", + GTK_CSS_PROPERTY_BORDER_BOTTOM_RIGHT_RADIUS, + G_TYPE_NONE, + GTK_STYLE_PROPERTY_ANIMATED | GTK_STYLE_PROPERTY_NO_RESIZE, border_corner_radius_value_parse, - border_corner_radius_value_print, NULL, - &no_corner_radius); - gtk_style_property_register ("border-bottom-left-radius", - GTK_TYPE_CSS_BORDER_CORNER_RADIUS, - 0, + NULL, + _gtk_css_corner_value_new (_gtk_css_number_value_new (0, GTK_CSS_PX), + _gtk_css_number_value_new (0, GTK_CSS_PX))); + gtk_css_style_property_register ("border-bottom-left-radius", + GTK_CSS_PROPERTY_BORDER_BOTTOM_LEFT_RADIUS, + G_TYPE_NONE, + GTK_STYLE_PROPERTY_ANIMATED | GTK_STYLE_PROPERTY_NO_RESIZE, border_corner_radius_value_parse, - border_corner_radius_value_print, NULL, - &no_corner_radius); + NULL, + _gtk_css_corner_value_new (_gtk_css_number_value_new (0, GTK_CSS_PX), + _gtk_css_number_value_new (0, GTK_CSS_PX))); - gtk_style_property_register ("border-style", + gtk_css_style_property_register ("outline-style", + GTK_CSS_PROPERTY_OUTLINE_STYLE, GTK_TYPE_BORDER_STYLE, - 0, - NULL, + GTK_STYLE_PROPERTY_NO_RESIZE, + parse_border_style, + query_border_style, + assign_border_style, + _gtk_css_border_style_value_new (GTK_BORDER_STYLE_NONE)); + gtk_css_style_property_register ("outline-width", + GTK_CSS_PROPERTY_OUTLINE_WIDTH, + G_TYPE_INT, + GTK_STYLE_PROPERTY_ANIMATED, + parse_border_width, + query_length_as_int, + assign_length_from_int, + _gtk_css_number_value_new (0.0, GTK_CSS_PX)); + gtk_css_style_property_register ("outline-offset", + GTK_CSS_PROPERTY_OUTLINE_OFFSET, + G_TYPE_INT, + GTK_STYLE_PROPERTY_NO_RESIZE, + outline_parse, + query_length_as_int, + assign_length_from_int, + _gtk_css_number_value_new (0.0, GTK_CSS_PX)); + + gtk_css_style_property_register ("background-clip", + GTK_CSS_PROPERTY_BACKGROUND_CLIP, + G_TYPE_NONE, + GTK_STYLE_PROPERTY_NO_RESIZE, + parse_css_area, NULL, NULL, - GTK_BORDER_STYLE_NONE); - gtk_style_property_register ("background-clip", - GTK_TYPE_CSS_AREA, - 0, + _gtk_css_array_value_new (_gtk_css_area_value_new (GTK_CSS_AREA_BORDER_BOX))); + gtk_css_style_property_register ("background-origin", + GTK_CSS_PROPERTY_BACKGROUND_ORIGIN, + G_TYPE_NONE, + GTK_STYLE_PROPERTY_NO_RESIZE, + parse_css_area, NULL, NULL, + _gtk_css_array_value_new (_gtk_css_area_value_new (GTK_CSS_AREA_PADDING_BOX))); + gtk_css_style_property_register ("background-size", + GTK_CSS_PROPERTY_BACKGROUND_SIZE, + G_TYPE_NONE, + GTK_STYLE_PROPERTY_ANIMATED | GTK_STYLE_PROPERTY_NO_RESIZE, + background_size_parse, NULL, - GTK_CSS_AREA_BORDER_BOX); - - gtk_style_property_register ("background-origin", - GTK_TYPE_CSS_AREA, - 0, NULL, + _gtk_css_array_value_new (_gtk_css_bg_size_value_new (NULL, NULL))); + gtk_css_style_property_register ("background-position", + GTK_CSS_PROPERTY_BACKGROUND_POSITION, + G_TYPE_NONE, + GTK_STYLE_PROPERTY_ANIMATED | GTK_STYLE_PROPERTY_NO_RESIZE, + background_position_parse, NULL, NULL, - GTK_CSS_AREA_PADDING_BOX); + _gtk_css_array_value_new (_gtk_css_position_value_new (_gtk_css_number_value_new (0, GTK_CSS_PERCENT), + _gtk_css_number_value_new (0, GTK_CSS_PERCENT)))); - g_value_init (&value, GTK_TYPE_CSS_SPECIAL_VALUE); - g_value_set_enum (&value, GTK_CSS_CURRENT_COLOR); - _gtk_style_property_register ("border-top-color", + gtk_css_style_property_register ("border-top-color", + GTK_CSS_PROPERTY_BORDER_TOP_COLOR, + GDK_TYPE_RGBA, + GTK_STYLE_PROPERTY_ANIMATED | GTK_STYLE_PROPERTY_NO_RESIZE, + color_parse, + color_query, + color_assign, + _gtk_css_color_value_new_current_color ()); + gtk_css_style_property_register ("border-right-color", + GTK_CSS_PROPERTY_BORDER_RIGHT_COLOR, + GDK_TYPE_RGBA, + GTK_STYLE_PROPERTY_ANIMATED | GTK_STYLE_PROPERTY_NO_RESIZE, + color_parse, + color_query, + color_assign, + _gtk_css_color_value_new_current_color ()); + gtk_css_style_property_register ("border-bottom-color", + GTK_CSS_PROPERTY_BORDER_BOTTOM_COLOR, + GDK_TYPE_RGBA, + GTK_STYLE_PROPERTY_ANIMATED | GTK_STYLE_PROPERTY_NO_RESIZE, + color_parse, + color_query, + color_assign, + _gtk_css_color_value_new_current_color ()); + gtk_css_style_property_register ("border-left-color", + GTK_CSS_PROPERTY_BORDER_LEFT_COLOR, + GDK_TYPE_RGBA, + GTK_STYLE_PROPERTY_ANIMATED | GTK_STYLE_PROPERTY_NO_RESIZE, + color_parse, + color_query, + color_assign, + _gtk_css_color_value_new_current_color ()); + gtk_css_style_property_register ("outline-color", + GTK_CSS_PROPERTY_OUTLINE_COLOR, GDK_TYPE_RGBA, - 0, + GTK_STYLE_PROPERTY_ANIMATED | GTK_STYLE_PROPERTY_NO_RESIZE, + color_parse, + color_query, + color_assign, + _gtk_css_color_value_new_current_color ()); + + gtk_css_style_property_register ("background-repeat", + GTK_CSS_PROPERTY_BACKGROUND_REPEAT, + G_TYPE_NONE, + GTK_STYLE_PROPERTY_NO_RESIZE, + background_repeat_value_parse, NULL, NULL, - color_compute, - &value); - _gtk_style_property_register ("border-right-color", - GDK_TYPE_RGBA, - 0, + _gtk_css_array_value_new (_gtk_css_background_repeat_value_new (GTK_CSS_REPEAT_STYLE_REPEAT, + GTK_CSS_REPEAT_STYLE_REPEAT))); + gtk_css_style_property_register ("background-image", + GTK_CSS_PROPERTY_BACKGROUND_IMAGE, + CAIRO_GOBJECT_TYPE_PATTERN, + GTK_STYLE_PROPERTY_ANIMATED | GTK_STYLE_PROPERTY_NO_RESIZE, + background_image_value_parse, + background_image_value_query, + background_image_value_assign, + _gtk_css_array_value_new (_gtk_css_image_value_new (NULL))); + + gtk_css_style_property_register ("border-image-source", + GTK_CSS_PROPERTY_BORDER_IMAGE_SOURCE, + CAIRO_GOBJECT_TYPE_PATTERN, + GTK_STYLE_PROPERTY_ANIMATED | GTK_STYLE_PROPERTY_NO_RESIZE, + css_image_value_parse, + css_image_value_query, + css_image_value_assign, + _gtk_css_image_value_new (NULL)); + gtk_css_style_property_register ("border-image-repeat", + GTK_CSS_PROPERTY_BORDER_IMAGE_REPEAT, + G_TYPE_NONE, + GTK_STYLE_PROPERTY_NO_RESIZE, + border_image_repeat_parse, NULL, NULL, - color_compute, - &value); - _gtk_style_property_register ("border-bottom-color", - GDK_TYPE_RGBA, - 0, + _gtk_css_border_repeat_value_new (GTK_CSS_REPEAT_STYLE_STRETCH, + GTK_CSS_REPEAT_STYLE_STRETCH)); + + gtk_css_style_property_register ("border-image-slice", + GTK_CSS_PROPERTY_BORDER_IMAGE_SLICE, + GTK_TYPE_BORDER, + GTK_STYLE_PROPERTY_NO_RESIZE, + border_image_slice_parse, + query_border, + assign_border, + _gtk_css_border_value_new (_gtk_css_number_value_new (100, GTK_CSS_PERCENT), + _gtk_css_number_value_new (100, GTK_CSS_PERCENT), + _gtk_css_number_value_new (100, GTK_CSS_PERCENT), + _gtk_css_number_value_new (100, GTK_CSS_PERCENT))); + gtk_css_style_property_register ("border-image-width", + GTK_CSS_PROPERTY_BORDER_IMAGE_WIDTH, + GTK_TYPE_BORDER, + GTK_STYLE_PROPERTY_NO_RESIZE, + border_image_width_parse, + query_border, + assign_border, + _gtk_css_border_value_new (_gtk_css_number_value_new (1, GTK_CSS_NUMBER), + _gtk_css_number_value_new (1, GTK_CSS_NUMBER), + _gtk_css_number_value_new (1, GTK_CSS_NUMBER), + _gtk_css_number_value_new (1, GTK_CSS_NUMBER))); + + gtk_css_style_property_register ("transition-property", + GTK_CSS_PROPERTY_TRANSITION_PROPERTY, + G_TYPE_NONE, + GTK_STYLE_PROPERTY_NO_RESIZE, + transition_property_parse, NULL, NULL, - color_compute, - &value); - _gtk_style_property_register ("border-left-color", - GDK_TYPE_RGBA, - 0, + _gtk_css_array_value_new (_gtk_css_ident_value_new ("all"))); + gtk_css_style_property_register ("transition-duration", + GTK_CSS_PROPERTY_TRANSITION_DURATION, + G_TYPE_NONE, + GTK_STYLE_PROPERTY_NO_RESIZE, + transition_time_parse, + NULL, NULL, + _gtk_css_array_value_new (_gtk_css_number_value_new (0, GTK_CSS_S))); + gtk_css_style_property_register ("transition-timing-function", + GTK_CSS_PROPERTY_TRANSITION_TIMING_FUNCTION, + G_TYPE_NONE, + GTK_STYLE_PROPERTY_NO_RESIZE, + transition_timing_function_parse, NULL, - color_compute, - &value); - g_value_unset (&value); - - gtk_style_property_register ("background-repeat", - GTK_TYPE_CSS_BACKGROUND_REPEAT, - 0, - background_repeat_value_parse, - background_repeat_value_print, NULL, - GTK_CSS_BACKGROUND_REPEAT | (GTK_CSS_BACKGROUND_REPEAT << GTK_CSS_BACKGROUND_REPEAT_SHIFT)); - g_value_init (&value, GTK_TYPE_CSS_IMAGE); - _gtk_style_property_register ("background-image", - CAIRO_GOBJECT_TYPE_PATTERN, - 0, - css_image_value_parse, - css_image_value_print, - css_image_value_compute, - &value); + _gtk_css_array_value_new ( + _gtk_css_ease_value_new_cubic_bezier (0.25, 0.1, 0.25, 1.0))); + gtk_css_style_property_register ("transition-delay", + GTK_CSS_PROPERTY_TRANSITION_DELAY, + G_TYPE_NONE, + GTK_STYLE_PROPERTY_NO_RESIZE, + transition_time_parse, + NULL, + NULL, + _gtk_css_array_value_new (_gtk_css_number_value_new (0, GTK_CSS_S))); - _gtk_style_property_register ("border-image-source", - CAIRO_GOBJECT_TYPE_PATTERN, - 0, - css_image_value_parse, - css_image_value_print, - css_image_value_compute, - &value); - g_value_unset (&value); - gtk_style_property_register ("border-image-repeat", - GTK_TYPE_CSS_BORDER_IMAGE_REPEAT, - 0, + gtk_css_style_property_register ("animation-name", + GTK_CSS_PROPERTY_ANIMATION_NAME, + G_TYPE_NONE, + GTK_STYLE_PROPERTY_NO_RESIZE, + transition_property_parse, NULL, NULL, + _gtk_css_array_value_new (_gtk_css_ident_value_new ("none"))); + gtk_css_style_property_register ("animation-duration", + GTK_CSS_PROPERTY_ANIMATION_DURATION, + G_TYPE_NONE, + GTK_STYLE_PROPERTY_NO_RESIZE, + transition_time_parse, NULL, - &border_image_repeat); - - /* XXX: The initial vaue is wrong, it should be 100% */ - gtk_style_property_register ("border-image-slice", - GTK_TYPE_BORDER, - 0, NULL, + _gtk_css_array_value_new (_gtk_css_number_value_new (0, GTK_CSS_S))); + gtk_css_style_property_register ("animation-timing-function", + GTK_CSS_PROPERTY_ANIMATION_TIMING_FUNCTION, + G_TYPE_NONE, + GTK_STYLE_PROPERTY_NO_RESIZE, + transition_timing_function_parse, NULL, NULL, - &border_of_ones); - gtk_style_property_register ("border-image-width", - GTK_TYPE_BORDER, - 0, + _gtk_css_array_value_new ( + _gtk_css_ease_value_new_cubic_bezier (0.25, 0.1, 0.25, 1.0))); + gtk_css_style_property_register ("animation-iteration-count", + GTK_CSS_PROPERTY_ANIMATION_ITERATION_COUNT, + G_TYPE_NONE, + GTK_STYLE_PROPERTY_NO_RESIZE, + iteration_count_parse, NULL, NULL, + _gtk_css_array_value_new (_gtk_css_number_value_new (1, GTK_CSS_NUMBER))); + gtk_css_style_property_register ("animation-direction", + GTK_CSS_PROPERTY_ANIMATION_DIRECTION, + G_TYPE_NONE, + GTK_STYLE_PROPERTY_NO_RESIZE, + parse_css_direction, NULL, - NULL); - gtk_style_property_register ("engine", - GTK_TYPE_THEMING_ENGINE, - 0, + NULL, + _gtk_css_array_value_new (_gtk_css_direction_value_new (GTK_CSS_DIRECTION_NORMAL))); + gtk_css_style_property_register ("animation-play-state", + GTK_CSS_PROPERTY_ANIMATION_PLAY_STATE, + G_TYPE_NONE, + GTK_STYLE_PROPERTY_NO_RESIZE, + parse_css_play_state, NULL, NULL, + _gtk_css_array_value_new (_gtk_css_play_state_value_new (GTK_CSS_PLAY_STATE_RUNNING))); + gtk_css_style_property_register ("animation-delay", + GTK_CSS_PROPERTY_ANIMATION_DELAY, + G_TYPE_NONE, + GTK_STYLE_PROPERTY_NO_RESIZE, + transition_time_parse, NULL, - gtk_theming_engine_load (NULL)); - gtk_style_property_register ("transition", - GTK_TYPE_ANIMATION_DESCRIPTION, - 0, NULL, + _gtk_css_array_value_new (_gtk_css_number_value_new (0, GTK_CSS_S))); + gtk_css_style_property_register ("animation-fill-mode", + GTK_CSS_PROPERTY_ANIMATION_FILL_MODE, + G_TYPE_NONE, + GTK_STYLE_PROPERTY_NO_RESIZE, + parse_css_fill_mode, NULL, NULL, - NULL); + _gtk_css_array_value_new (_gtk_css_fill_mode_value_new (GTK_CSS_FILL_NONE))); + gtk_css_style_property_register ("opacity", + GTK_CSS_PROPERTY_OPACITY, + G_TYPE_NONE, + GTK_STYLE_PROPERTY_ANIMATED | GTK_STYLE_PROPERTY_NO_RESIZE, + opacity_parse, + NULL, + NULL, + _gtk_css_number_value_new (1, GTK_CSS_NUMBER)); + + gtk_css_style_property_register ("engine", + GTK_CSS_PROPERTY_ENGINE, + GTK_TYPE_THEMING_ENGINE, + GTK_STYLE_PROPERTY_NO_RESIZE, + engine_parse, + engine_query, + engine_assign, + _gtk_css_engine_value_new (gtk_theming_engine_load (NULL))); /* Private property holding the binding sets */ - gtk_style_property_register ("gtk-key-bindings", + gtk_css_style_property_register ("gtk-key-bindings", + GTK_CSS_PROPERTY_GTK_KEY_BINDINGS, G_TYPE_PTR_ARRAY, - 0, + GTK_STYLE_PROPERTY_NO_RESIZE, bindings_value_parse, - bindings_value_print, - NULL, - NULL); + bindings_value_query, + bindings_value_assign, + _gtk_css_array_value_new (_gtk_css_string_value_new (NULL))); }