#include <cairo-gobject.h>
#include <math.h>
+#include "gtkcssarrayvalueprivate.h"
+#include "gtkcssbgsizevalueprivate.h"
+#include "gtkcssbordervalueprivate.h"
+#include "gtkcsscolorvalueprivate.h"
+#include "gtkcsscornervalueprivate.h"
+#include "gtkcsseasevalueprivate.h"
+#include "gtkcssenumvalueprivate.h"
#include "gtkcssimageprivate.h"
+#include "gtkcssimagevalueprivate.h"
#include "gtkcssnumbervalueprivate.h"
+#include "gtkcsspositionvalueprivate.h"
+#include "gtkcssrepeatvalueprivate.h"
+#include "gtkcssstringvalueprivate.h"
#include "gtkcssstylefuncsprivate.h"
-#include "gtkcsstypesprivate.h"
#include "gtkcssvalueprivate.h"
-#include "gtkprivatetypebuiltins.h"
#include "gtkstylepropertiesprivate.h"
-#include "gtksymboliccolorprivate.h"
#include "gtktypebuiltins.h"
/* this is in case round() is not provided by the compiler,
value_is_done_parsing (GtkCssParser *parser)
{
return _gtk_css_parser_is_eof (parser) ||
+ _gtk_css_parser_begins_with (parser, ',') ||
_gtk_css_parser_begins_with (parser, ';') ||
_gtk_css_parser_begins_with (parser, '}');
}
static gboolean
parse_margin (GtkCssShorthandProperty *shorthand,
GtkCssValue **values,
- GtkCssParser *parser,
- GFile *base)
+ GtkCssParser *parser)
{
return parse_four_numbers (shorthand,
values,
static gboolean
parse_padding (GtkCssShorthandProperty *shorthand,
GtkCssValue **values,
- GtkCssParser *parser,
- GFile *base)
+ GtkCssParser *parser)
{
return parse_four_numbers (shorthand,
values,
static gboolean
parse_border_width (GtkCssShorthandProperty *shorthand,
GtkCssValue **values,
- GtkCssParser *parser,
- GFile *base)
+ GtkCssParser *parser)
{
return parse_four_numbers (shorthand,
values,
static gboolean
parse_border_radius (GtkCssShorthandProperty *shorthand,
GtkCssValue **values,
- GtkCssParser *parser,
- GFile *base)
+ GtkCssParser *parser)
{
- GtkCssBorderCornerRadius borders[4];
+ GtkCssValue *x[4] = { NULL, }, *y[4] = { NULL, };
guint i;
- for (i = 0; i < G_N_ELEMENTS (borders); i++)
+ for (i = 0; i < 4; i++)
{
if (!_gtk_css_parser_has_number (parser))
break;
- if (!_gtk_css_parser_read_number (parser,
- &borders[i].horizontal,
- GTK_CSS_POSITIVE_ONLY
- | GTK_CSS_PARSE_PERCENT
- | GTK_CSS_NUMBER_AS_PIXELS
- | GTK_CSS_PARSE_LENGTH))
- return FALSE;
+ x[i] = _gtk_css_number_value_parse (parser,
+ GTK_CSS_POSITIVE_ONLY
+ | GTK_CSS_PARSE_PERCENT
+ | GTK_CSS_NUMBER_AS_PIXELS
+ | GTK_CSS_PARSE_LENGTH);
+ if (x[i] == NULL)
+ goto fail;
}
if (i == 0)
{
_gtk_css_parser_error (parser, "Expected a number");
- return FALSE;
+ goto fail;
}
/* The magic (i - 1) >> 1 below makes it take the correct value
* according to spec. Feel free to check the 4 cases */
- for (; i < G_N_ELEMENTS (borders); i++)
- borders[i].horizontal = borders[(i - 1) >> 1].horizontal;
+ for (; i < 4; i++)
+ x[i] = _gtk_css_value_ref (x[(i - 1) >> 1]);
if (_gtk_css_parser_try (parser, "/", TRUE))
{
- for (i = 0; i < G_N_ELEMENTS (borders); i++)
+ for (i = 0; i < 4; i++)
{
if (!_gtk_css_parser_has_number (parser))
break;
- if (!_gtk_css_parser_read_number (parser,
- &borders[i].vertical,
- GTK_CSS_POSITIVE_ONLY
- | GTK_CSS_PARSE_PERCENT
- | GTK_CSS_NUMBER_AS_PIXELS
- | GTK_CSS_PARSE_LENGTH))
- return FALSE;
+ y[i] = _gtk_css_number_value_parse (parser,
+ GTK_CSS_POSITIVE_ONLY
+ | GTK_CSS_PARSE_PERCENT
+ | GTK_CSS_NUMBER_AS_PIXELS
+ | GTK_CSS_PARSE_LENGTH);
+ if (y[i] == NULL)
+ goto fail;
}
if (i == 0)
{
_gtk_css_parser_error (parser, "Expected a number");
- return FALSE;
+ goto fail;
}
- for (; i < G_N_ELEMENTS (borders); i++)
- borders[i].vertical = borders[(i - 1) >> 1].vertical;
-
+ for (; i < 4; i++)
+ y[i] = _gtk_css_value_ref (y[(i - 1) >> 1]);
}
else
{
- for (i = 0; i < G_N_ELEMENTS (borders); i++)
- borders[i].vertical = borders[i].horizontal;
+ for (i = 0; i < 4; i++)
+ y[i] = _gtk_css_value_ref (x[i]);
}
- for (i = 0; i < G_N_ELEMENTS (borders); i++)
+ for (i = 0; i < 4; i++)
{
- values[i] = _gtk_css_value_new_from_border_corner_radius (&borders[i]);
+ values[i] = _gtk_css_corner_value_new (x[i], y[i]);
}
return TRUE;
+
+fail:
+ for (i = 0; i < 4; i++)
+ {
+ if (x[i])
+ _gtk_css_value_unref (x[i]);
+ if (y[i])
+ _gtk_css_value_unref (y[i]);
+ }
+ return FALSE;
}
static gboolean
parse_border_color (GtkCssShorthandProperty *shorthand,
GtkCssValue **values,
- GtkCssParser *parser,
- GFile *base)
+ GtkCssParser *parser)
{
- GtkSymbolicColor *symbolic;
guint i;
for (i = 0; i < 4; i++)
{
- if (_gtk_css_parser_try (parser, "currentcolor", TRUE))
- {
- symbolic = gtk_symbolic_color_ref (_gtk_symbolic_color_get_current_color ());
- }
- else
- {
- symbolic = _gtk_css_parser_read_symbolic_color (parser);
- if (symbolic == NULL)
- return FALSE;
- }
-
- values[i] = _gtk_css_value_new_take_symbolic_color (symbolic);
+ values[i] = _gtk_css_color_value_parse (parser);
+ if (values[i] == NULL)
+ return FALSE;
if (value_is_done_parsing (parser))
break;
static gboolean
parse_border_style (GtkCssShorthandProperty *shorthand,
GtkCssValue **values,
- GtkCssParser *parser,
- GFile *base)
+ GtkCssParser *parser)
{
- GtkBorderStyle styles[4];
guint i;
for (i = 0; i < 4; i++)
{
- if (!_gtk_css_parser_try_enum (parser, GTK_TYPE_BORDER_STYLE, (int *)&styles[i]))
+ values[i] = _gtk_css_border_style_value_try_parse (parser);
+ if (values[i] == NULL)
break;
}
return FALSE;
}
- for (; i < G_N_ELEMENTS (styles); i++)
- styles[i] = styles[(i - 1) >> 1];
-
- for (i = 0; i < G_N_ELEMENTS (styles); i++)
- {
- values[i] = _gtk_css_value_new_from_enum (GTK_TYPE_BORDER_STYLE, styles[i]);
- }
+ for (; i < 4; i++)
+ values[i] = _gtk_css_value_ref (values[(i - 1) >> 1]);
return TRUE;
}
static gboolean
parse_border_image (GtkCssShorthandProperty *shorthand,
GtkCssValue **values,
- GtkCssParser *parser,
- GFile *base)
+ GtkCssParser *parser)
{
- GValue value = G_VALUE_INIT;
- GtkCssImage *image;
-
- if (_gtk_css_parser_try (parser, "none", TRUE))
- image = NULL;
- else
+ do
{
- image = _gtk_css_image_new_parse (parser, base);
- if (!image)
- return FALSE;
- }
- values[0] = _gtk_css_value_new_take_image (image);
+ if (values[0] == NULL &&
+ (_gtk_css_parser_has_prefix (parser, "none") ||
+ _gtk_css_image_can_parse (parser)))
+ {
+ GtkCssImage *image;
- if (value_is_done_parsing (parser))
- return TRUE;
+ if (_gtk_css_parser_try (parser, "none", TRUE))
+ image = NULL;
+ else
+ {
+ image = _gtk_css_image_new_parse (parser);
+ if (image == NULL)
+ return FALSE;
+ }
- g_value_init (&value, GTK_TYPE_BORDER);
- if (!_gtk_css_style_parse_value (&value, parser, base))
- return FALSE;
- values[1] = _gtk_css_value_new_from_gvalue (&value);
- g_value_unset (&value);
+ values[0] = _gtk_css_image_value_new (image);
+ }
+ else if (values[3] == NULL &&
+ (values[3] = _gtk_css_border_repeat_value_try_parse (parser)))
+ {
+ /* please move along */
+ }
+ else if (values[1] == NULL)
+ {
+ values[1] = _gtk_css_border_value_parse (parser,
+ GTK_CSS_PARSE_PERCENT
+ | GTK_CSS_PARSE_NUMBER
+ | GTK_CSS_POSITIVE_ONLY,
+ FALSE,
+ TRUE);
+ if (values[1] == NULL)
+ return FALSE;
- if (_gtk_css_parser_try (parser, "/", TRUE))
- {
- g_value_init (&value, GTK_TYPE_BORDER);
- if (!_gtk_css_style_parse_value (&value, parser, base))
- return FALSE;
- values[2] = _gtk_css_value_new_from_gvalue (&value);
- g_value_unset (&value);
+ if (_gtk_css_parser_try (parser, "/", TRUE))
+ {
+ values[2] = _gtk_css_border_value_parse (parser,
+ GTK_CSS_PARSE_PERCENT
+ | GTK_CSS_PARSE_LENGTH
+ | GTK_CSS_PARSE_NUMBER
+ | GTK_CSS_POSITIVE_ONLY,
+ TRUE,
+ FALSE);
+ if (values[2] == NULL)
+ return FALSE;
+ }
+ }
+ else
+ {
+ /* We parsed everything and there's still stuff left?
+ * Pretend we didn't notice and let the normal code produce
+ * a 'junk at end of value' error */
+ break;
+ }
}
-
- if (value_is_done_parsing (parser))
- return TRUE;
-
- g_value_init (&value, GTK_TYPE_CSS_BORDER_IMAGE_REPEAT);
- if (!_gtk_css_style_parse_value (&value, parser, base))
- return FALSE;
- values[3] = _gtk_css_value_new_from_gvalue (&value);
- g_value_unset (&value);
+ while (!value_is_done_parsing (parser));
return TRUE;
}
static gboolean
parse_border_side (GtkCssShorthandProperty *shorthand,
GtkCssValue **values,
- GtkCssParser *parser,
- GFile *base)
+ GtkCssParser *parser)
{
- int style;
-
do
{
if (values[0] == NULL &&
return FALSE;
}
else if (values[1] == NULL &&
- _gtk_css_parser_try_enum (parser, GTK_TYPE_BORDER_STYLE, &style))
+ (values[1] = _gtk_css_border_style_value_try_parse (parser)))
{
- values[1] = _gtk_css_value_new_from_enum (GTK_TYPE_BORDER_STYLE, style);
+ /* Nothing to do */
}
else if (values[2] == NULL)
{
- GtkSymbolicColor *symbolic;
-
- symbolic = _gtk_css_parser_read_symbolic_color (parser);
- if (symbolic == NULL)
+ values[2] = _gtk_css_color_value_parse (parser);
+ if (values[2] == NULL)
return FALSE;
-
- values[2] = _gtk_css_value_new_take_symbolic_color (symbolic);
- }
- else
- {
- /* We parsed everything and there's still stuff left?
- * Pretend we didn't notice and let the normal code produce
- * a 'junk at end of value' error */
- break;
}
}
while (!value_is_done_parsing (parser));
static gboolean
parse_border (GtkCssShorthandProperty *shorthand,
GtkCssValue **values,
- GtkCssParser *parser,
- GFile *base)
+ GtkCssParser *parser)
{
- int style;
-
do
{
if (values[0] == NULL &&
values[3] = _gtk_css_value_ref (values[0]);
}
else if (values[4] == NULL &&
- _gtk_css_parser_try_enum (parser, GTK_TYPE_BORDER_STYLE, &style))
+ (values[4] = _gtk_css_border_style_value_try_parse (parser)))
{
- values[4] = _gtk_css_value_new_from_enum (GTK_TYPE_BORDER_STYLE, style);
values[5] = _gtk_css_value_ref (values[4]);
values[6] = _gtk_css_value_ref (values[4]);
values[7] = _gtk_css_value_ref (values[4]);
}
else if (!G_IS_VALUE (&values[8]))
{
- GtkSymbolicColor *symbolic;
-
- symbolic = _gtk_css_parser_read_symbolic_color (parser);
- if (symbolic == NULL)
+ values[8] = _gtk_css_color_value_parse (parser);
+ if (values[8] == NULL)
return FALSE;
- values[8] = _gtk_css_value_new_take_symbolic_color (symbolic);
values[9] = _gtk_css_value_ref (values[8]);
values[10] = _gtk_css_value_ref (values[8]);
values[11] = _gtk_css_value_ref (values[8]);
static gboolean
parse_font (GtkCssShorthandProperty *shorthand,
GtkCssValue **values,
- GtkCssParser *parser,
- GFile *base)
+ GtkCssParser *parser)
{
PangoFontDescription *desc;
guint mask;
if (mask & PANGO_FONT_MASK_FAMILY)
{
- char **strv = g_new0 (char *, 2);
-
- strv[0] = g_strdup (pango_font_description_get_family (desc));
- values[0] = _gtk_css_value_new_take_strv (strv);
+ values[0] = _gtk_css_array_value_new (_gtk_css_string_value_new (pango_font_description_get_family (desc)));
}
if (mask & PANGO_FONT_MASK_STYLE)
{
- values[1] = _gtk_css_value_new_from_enum (PANGO_TYPE_STYLE,
- pango_font_description_get_style (desc));
+ values[1] = _gtk_css_font_style_value_new (pango_font_description_get_style (desc));
}
if (mask & PANGO_FONT_MASK_VARIANT)
{
- values[2] = _gtk_css_value_new_from_enum (PANGO_TYPE_VARIANT,
- pango_font_description_get_variant (desc));
+ values[2] = _gtk_css_font_variant_value_new (pango_font_description_get_variant (desc));
}
if (mask & PANGO_FONT_MASK_WEIGHT)
{
- values[3] = _gtk_css_value_new_from_enum (PANGO_TYPE_WEIGHT,
- pango_font_description_get_weight (desc));
+ values[3] = _gtk_css_font_weight_value_new (pango_font_description_get_weight (desc));
}
if (mask & PANGO_FONT_MASK_SIZE)
{
- values[4] = _gtk_css_value_new_from_double ((double) pango_font_description_get_size (desc) / PANGO_SCALE);
+ values[4] = _gtk_css_number_value_new ((double) pango_font_description_get_size (desc) / PANGO_SCALE, GTK_CSS_PX);
}
pango_font_description_free (desc);
}
static gboolean
-parse_background (GtkCssShorthandProperty *shorthand,
- GtkCssValue **values,
- GtkCssParser *parser,
- GFile *base)
+parse_one_background (GtkCssShorthandProperty *shorthand,
+ GtkCssValue **values,
+ GtkCssParser *parser)
{
- int enum_value;
+ GtkCssValue *value = NULL;
do
{
image = NULL;
else
{
- image = _gtk_css_image_new_parse (parser, base);
+ image = _gtk_css_image_new_parse (parser);
if (image == NULL)
return FALSE;
}
- values[0] = _gtk_css_value_new_take_image (image);
+ values[0] = _gtk_css_image_value_new (image);
}
else if (values[1] == NULL &&
- _gtk_css_parser_try_enum (parser, GTK_TYPE_CSS_BACKGROUND_REPEAT, &enum_value))
+ (value = _gtk_css_position_value_try_parse (parser)))
{
- if (enum_value <= GTK_CSS_BACKGROUND_REPEAT_MASK)
+ values[1] = value;
+ value = NULL;
+
+ if (_gtk_css_parser_try (parser, "/", TRUE) &&
+ (value = _gtk_css_bg_size_value_parse (parser)))
{
- int vertical;
-
- 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 for border-repeat");
- return FALSE;
- }
- else
- enum_value |= vertical << GTK_CSS_BACKGROUND_REPEAT_SHIFT;
- }
- else
- enum_value |= enum_value << GTK_CSS_BACKGROUND_REPEAT_SHIFT;
+ values[2] = value;
+ value = NULL;
}
+ }
+ else if (values[3] == NULL &&
+ (value = _gtk_css_background_repeat_value_try_parse (parser)))
+ {
+ values[3] = value;
+ value = NULL;
+ }
+ else if ((values[4] == NULL || values[5] == NULL) &&
+ (value = _gtk_css_area_value_try_parse (parser)))
+ {
+ values[4] = value;
- values[1] = _gtk_css_value_new_from_enum (GTK_TYPE_CSS_BACKGROUND_REPEAT, enum_value);
+ if (values[5] == NULL)
+ {
+ values[5] = values[4];
+ values[4] = NULL;
+ }
+ value = NULL;
}
- else if ((values[2] == NULL || values[3] == NULL) &&
- _gtk_css_parser_try_enum (parser, GTK_TYPE_CSS_AREA, &enum_value))
+ else if (values[6] == NULL)
{
- guint idx = values[2] == NULL ? 2 : 3;
- values[idx] = _gtk_css_value_new_from_enum (GTK_TYPE_CSS_AREA, enum_value);
+ value = _gtk_css_color_value_parse (parser);
+ if (value == NULL)
+ values[6] = _gtk_css_value_ref (_gtk_css_style_property_get_initial_value
+ (_gtk_css_shorthand_property_get_subproperty (shorthand, 6)));
+ else
+ values[6] = value;
+
+ value = NULL;
}
- else if (values[4] == NULL)
+ else
{
- GtkSymbolicColor *symbolic;
-
- symbolic = _gtk_css_parser_read_symbolic_color (parser);
- if (symbolic == NULL)
+ /* We parsed everything and there's still stuff left?
+ * Pretend we didn't notice and let the normal code produce
+ * a 'junk at end of value' error */
+ break;
+ }
+ }
+ while (!value_is_done_parsing (parser));
+
+ if (values[5] != NULL && values[4] == NULL)
+ values[4] = _gtk_css_value_ref (values[5]);
+
+ return TRUE;
+}
+
+static gboolean
+parse_background (GtkCssShorthandProperty *shorthand,
+ GtkCssValue **values,
+ GtkCssParser *parser)
+{
+ GtkCssValue *step_values[7];
+ GPtrArray *arrays[6];
+ guint i;
+
+ for (i = 0; i < 6; i++)
+ {
+ arrays[i] = g_ptr_array_new ();
+ step_values[i] = NULL;
+ }
+
+ step_values[6] = NULL;
+
+ do {
+ if (!parse_one_background (shorthand, step_values, parser))
+ {
+ for (i = 0; i < 6; i++)
+ {
+ g_ptr_array_set_free_func (arrays[i], (GDestroyNotify) _gtk_css_value_unref);
+ g_ptr_array_unref (arrays[i]);
+ }
+ return FALSE;
+ }
+
+ for (i = 0; i < 6; i++)
+ {
+ if (step_values[i] == NULL)
+ {
+ GtkCssValue *initial = _gtk_css_style_property_get_initial_value (
+ _gtk_css_shorthand_property_get_subproperty (shorthand, i));
+ step_values[i] = _gtk_css_value_ref (_gtk_css_array_value_get_nth (initial, 0));
+ }
+
+ g_ptr_array_add (arrays[i], step_values[i]);
+ step_values[i] = NULL;
+ }
+ } while (_gtk_css_parser_try (parser, ",", TRUE));
+
+ for (i = 0; i < 6; i++)
+ {
+ values[i] = _gtk_css_array_value_new_from_array ((GtkCssValue **) arrays[i]->pdata, arrays[i]->len);
+ g_ptr_array_unref (arrays[i]);
+ }
+
+ values[6] = step_values[6];
+
+ return TRUE;
+}
+
+static gboolean
+parse_one_transition (GtkCssShorthandProperty *shorthand,
+ GtkCssValue **values,
+ GtkCssParser *parser)
+{
+ do
+ {
+ /* the image part */
+ if (values[2] == NULL &&
+ _gtk_css_parser_has_number (parser) && !_gtk_css_parser_begins_with (parser, '-'))
+ {
+ GtkCssValue *number = _gtk_css_number_value_parse (parser, GTK_CSS_PARSE_TIME);
+
+ if (number == NULL)
+ return FALSE;
+
+ if (values[1] == NULL)
+ values[1] = number;
+ else
+ values[2] = number;
+ }
+ else if (values[3] == NULL &&
+ _gtk_css_ease_value_can_parse (parser))
+ {
+ values[3] = _gtk_css_ease_value_parse (parser);
+
+ if (values[3] == NULL)
return FALSE;
+ }
+ else if (values[0] == NULL)
+ {
+ values[0] = _gtk_css_ident_value_try_parse (parser);
+ if (values[0] == NULL)
+ {
+ _gtk_css_parser_error (parser, "Unknown value for property");
+ return FALSE;
+ }
+
+ }
+ else
+ {
+ /* We parsed everything and there's still stuff left?
+ * Pretend we didn't notice and let the normal code produce
+ * a 'junk at end of value' error */
+ break;
+ }
+ }
+ while (!value_is_done_parsing (parser));
+
+ return TRUE;
+}
+
+static gboolean
+parse_transition (GtkCssShorthandProperty *shorthand,
+ GtkCssValue **values,
+ GtkCssParser *parser)
+{
+ GtkCssValue *step_values[4];
+ GPtrArray *arrays[4];
+ guint i;
+
+ for (i = 0; i < 4; i++)
+ {
+ arrays[i] = g_ptr_array_new ();
+ step_values[i] = NULL;
+ }
+
+ do {
+ if (!parse_one_transition (shorthand, step_values, parser))
+ {
+ for (i = 0; i < 4; i++)
+ {
+ g_ptr_array_set_free_func (arrays[i], (GDestroyNotify) _gtk_css_value_unref);
+ g_ptr_array_unref (arrays[i]);
+ }
+ return FALSE;
+ }
+
+ for (i = 0; i < 4; i++)
+ {
+ if (step_values[i] == NULL)
+ {
+ GtkCssValue *initial = _gtk_css_style_property_get_initial_value (
+ _gtk_css_shorthand_property_get_subproperty (shorthand, i));
+ step_values[i] = _gtk_css_value_ref (_gtk_css_array_value_get_nth (initial, 0));
+ }
+
+ g_ptr_array_add (arrays[i], step_values[i]);
+ step_values[i] = NULL;
+ }
+ } while (_gtk_css_parser_try (parser, ",", TRUE));
+
+ for (i = 0; i < 4; i++)
+ {
+ values[i] = _gtk_css_array_value_new_from_array ((GtkCssValue **) arrays[i]->pdata, arrays[i]->len);
+ g_ptr_array_unref (arrays[i]);
+ }
+
+ return TRUE;
+}
+
+static gboolean
+parse_one_animation (GtkCssShorthandProperty *shorthand,
+ GtkCssValue **values,
+ GtkCssParser *parser)
+{
+ do
+ {
+ if (values[1] == NULL && _gtk_css_parser_try (parser, "infinite", TRUE))
+ {
+ values[1] = _gtk_css_number_value_new (HUGE_VAL, GTK_CSS_NUMBER);
+ }
+ else if ((values[1] == NULL || values[3] == NULL) &&
+ _gtk_css_parser_has_number (parser))
+ {
+ GtkCssValue *value;
+
+ value = _gtk_css_number_value_parse (parser,
+ GTK_CSS_POSITIVE_ONLY
+ | (values[1] == NULL ? GTK_CSS_PARSE_NUMBER : 0)
+ | (values[3] == NULL ? GTK_CSS_PARSE_TIME : 0));
+ if (_gtk_css_number_value_get_unit (value) == GTK_CSS_NUMBER)
+ values[1] = value;
+ else if (values[2] == NULL)
+ values[2] = value;
+ else
+ values[3] = value;
+ }
+ else if (values[4] == NULL &&
+ _gtk_css_ease_value_can_parse (parser))
+ {
+ values[4] = _gtk_css_ease_value_parse (parser);
- values[4] = _gtk_css_value_new_take_symbolic_color (symbolic);
+ if (values[4] == NULL)
+ return FALSE;
+ }
+ else if (values[5] == NULL &&
+ (values[5] = _gtk_css_direction_value_try_parse (parser)))
+ {
+ /* nothing to do */
+ }
+ else if (values[6] == NULL &&
+ (values[6] = _gtk_css_fill_mode_value_try_parse (parser)))
+ {
+ /* nothing to do */
+ }
+ else if (values[0] == NULL &&
+ (values[0] = _gtk_css_ident_value_try_parse (parser)))
+ {
+ /* nothing to do */
+ /* keep in mind though that this needs to come last as fill modes, directions
+ * etc are valid idents */
}
else
{
return TRUE;
}
+static gboolean
+parse_animation (GtkCssShorthandProperty *shorthand,
+ GtkCssValue **values,
+ GtkCssParser *parser)
+{
+ GtkCssValue *step_values[7];
+ GPtrArray *arrays[6];
+ guint i;
+
+ for (i = 0; i < 6; i++)
+ {
+ arrays[i] = g_ptr_array_new ();
+ step_values[i] = NULL;
+ }
+
+ step_values[6] = NULL;
+
+ do {
+ if (!parse_one_animation (shorthand, step_values, parser))
+ {
+ for (i = 0; i < 6; i++)
+ {
+ g_ptr_array_set_free_func (arrays[i], (GDestroyNotify) _gtk_css_value_unref);
+ g_ptr_array_unref (arrays[i]);
+ }
+ return FALSE;
+ }
+
+ for (i = 0; i < 6; i++)
+ {
+ if (step_values[i] == NULL)
+ {
+ GtkCssValue *initial = _gtk_css_style_property_get_initial_value (
+ _gtk_css_shorthand_property_get_subproperty (shorthand, i));
+ step_values[i] = _gtk_css_value_ref (_gtk_css_array_value_get_nth (initial, 0));
+ }
+
+ g_ptr_array_add (arrays[i], step_values[i]);
+ step_values[i] = NULL;
+ }
+ } while (_gtk_css_parser_try (parser, ",", TRUE));
+
+ for (i = 0; i < 6; i++)
+ {
+ values[i] = _gtk_css_array_value_new_from_array ((GtkCssValue **) arrays[i]->pdata, arrays[i]->len);
+ g_ptr_array_unref (arrays[i]);
+ }
+
+ values[6] = step_values[6];
+
+ return TRUE;
+}
+
/*** PACKING ***/
static void
{
GtkCssStyleProperty *prop;
GtkBorder border;
- GtkCssValue *v;
+ GValue v;
prop = _gtk_css_shorthand_property_get_subproperty (shorthand, 0);
- v = (* query_func) (_gtk_css_style_property_get_id (prop), query_data);
- if (v)
- border.top = _gtk_css_value_get_int (v);
+ _gtk_style_property_query (GTK_STYLE_PROPERTY (prop), &v, query_func, query_data);
+ border.top = g_value_get_int (&v);
+ g_value_unset (&v);
+
prop = _gtk_css_shorthand_property_get_subproperty (shorthand, 1);
- v = (* query_func) (_gtk_css_style_property_get_id (prop), query_data);
- if (v)
- border.right = _gtk_css_value_get_int (v);
+ _gtk_style_property_query (GTK_STYLE_PROPERTY (prop), &v, query_func, query_data);
+ border.right = g_value_get_int (&v);
+ g_value_unset (&v);
+
prop = _gtk_css_shorthand_property_get_subproperty (shorthand, 2);
- v = (* query_func) (_gtk_css_style_property_get_id (prop), query_data);
- if (v)
- border.bottom = _gtk_css_value_get_int (v);
+ _gtk_style_property_query (GTK_STYLE_PROPERTY (prop), &v, query_func, query_data);
+ border.bottom = g_value_get_int (&v);
+ g_value_unset (&v);
+
prop = _gtk_css_shorthand_property_get_subproperty (shorthand, 3);
- v = (* query_func) (_gtk_css_style_property_get_id (prop), query_data);
- if (v)
- border.left = _gtk_css_value_get_int (v);
+ _gtk_style_property_query (GTK_STYLE_PROPERTY (prop), &v, query_func, query_data);
+ border.left = g_value_get_int (&v);
+ g_value_unset (&v);
g_value_init (value, GTK_TYPE_BORDER);
g_value_set_boxed (value, &border);
GtkStateFlags state,
const GValue *value)
{
- GtkCssBorderCornerRadius border;
- GValue v = G_VALUE_INIT;
+ GtkCssValue *css_value;
guint i;
- _gtk_css_number_init (&border.horizontal, g_value_get_int (value), GTK_CSS_PX);
- border.vertical = border.horizontal;
- g_value_init (&v, GTK_TYPE_CSS_BORDER_CORNER_RADIUS);
- g_value_set_boxed (&v, &border);
+ css_value = _gtk_css_corner_value_new (_gtk_css_number_value_new (g_value_get_int (value), GTK_CSS_PX),
+ _gtk_css_number_value_new (g_value_get_int (value), GTK_CSS_PX));
for (i = 0; i < 4; i++)
- _gtk_style_property_assign (GTK_STYLE_PROPERTY (_gtk_css_shorthand_property_get_subproperty (shorthand, i)), props, state, &v);
+ _gtk_style_properties_set_property_by_property (props,
+ _gtk_css_shorthand_property_get_subproperty (shorthand, i),
+ state,
+ css_value);
- g_value_unset (&v);
+ _gtk_css_value_unref (css_value);
}
static void
GtkStyleQueryFunc query_func,
gpointer query_data)
{
- const GtkCssBorderCornerRadius *top_left;
GtkCssStyleProperty *prop;
GtkCssValue *v;
int i = 0;
prop = GTK_CSS_STYLE_PROPERTY (_gtk_style_property_lookup ("border-top-left-radius"));
v = (* query_func) (_gtk_css_style_property_get_id (prop), query_data);
if (v)
- {
- top_left = _gtk_css_value_get_border_corner_radius (v);
- if (top_left)
- i = top_left->horizontal.value;
- }
+ i = _gtk_css_corner_value_get_x (v, 100);
g_value_init (value, G_TYPE_INT);
g_value_set_int (value, i);
v = (* query_func) (_gtk_css_style_property_get_id (GTK_CSS_STYLE_PROPERTY (_gtk_style_property_lookup ("font-family"))), query_data);
if (v)
{
- const char **families = _gtk_css_value_get_strv (v);
/* xxx: Can we set all the families here somehow? */
- if (families)
- pango_font_description_set_family (description, families[0]);
+ pango_font_description_set_family (description, _gtk_css_string_value_get (_gtk_css_array_value_get_nth (v, 0)));
}
v = (* query_func) (_gtk_css_style_property_get_id (GTK_CSS_STYLE_PROPERTY (_gtk_style_property_lookup ("font-size"))), query_data);
if (v)
- pango_font_description_set_size (description, round (_gtk_css_value_get_double (v) * PANGO_SCALE));
+ pango_font_description_set_size (description, round (_gtk_css_number_value_get (v, 100) * PANGO_SCALE));
v = (* query_func) (_gtk_css_style_property_get_id (GTK_CSS_STYLE_PROPERTY (_gtk_style_property_lookup ("font-style"))), query_data);
if (v)
- pango_font_description_set_style (description, _gtk_css_value_get_pango_style (v));
+ pango_font_description_set_style (description, _gtk_css_font_style_value_get (v));
v = (* query_func) (_gtk_css_style_property_get_id (GTK_CSS_STYLE_PROPERTY (_gtk_style_property_lookup ("font-variant"))), query_data);
if (v)
- pango_font_description_set_variant (description, _gtk_css_value_get_pango_variant (v));
+ pango_font_description_set_variant (description, _gtk_css_font_variant_value_get (v));
v = (* query_func) (_gtk_css_style_property_get_id (GTK_CSS_STYLE_PROPERTY (_gtk_style_property_lookup ("font-weight"))), query_data);
if (v)
- pango_font_description_set_weight (description, _gtk_css_value_get_pango_weight (v));
+ pango_font_description_set_weight (description, _gtk_css_font_weight_value_get (v));
g_value_init (value, PANGO_TYPE_FONT_DESCRIPTION);
g_value_take_boxed (value, description);
"border-top-color", "border-right-color", "border-bottom-color", "border-left-color",
"border-image-source", "border-image-slice", "border-image-width", "border-image-repeat", NULL };
const char *outline_subproperties[] = { "outline-width", "outline-style", "outline-color", NULL };
- const char *background_subproperties[] = { "background-image", "background-repeat", "background-clip", "background-origin",
+ const char *background_subproperties[] = { "background-image", "background-position", "background-size", "background-repeat", "background-clip", "background-origin",
"background-color", NULL };
+ const char *transition_subproperties[] = { "transition-property", "transition-duration", "transition-delay", "transition-timing-function", NULL };
+ const char *animation_subproperties[] = { "animation-name", "animation-iteration-count", "animation-duration", "animation-delay",
+ "animation-timing-function", "animation-direction", "animation-fill-mode", NULL };
_gtk_css_shorthand_property_register ("font",
PANGO_TYPE_FONT_DESCRIPTION,
parse_background,
NULL,
NULL);
+ _gtk_css_shorthand_property_register ("transition",
+ G_TYPE_NONE,
+ transition_subproperties,
+ parse_transition,
+ NULL,
+ NULL);
+ _gtk_css_shorthand_property_register ("animation",
+ G_TYPE_NONE,
+ animation_subproperties,
+ parse_animation,
+ NULL,
+ NULL);
}
projects / ~andy / gtk / blobdiff