X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkcssstyleproperty.c;h=0b7491524e421174e64c9185dfbc85e64e601ffb;hb=aaedf5a35219b034a244730564b8fdf2b7d32540;hp=66ce7ff020a5c971dc3fd95fd0e7f64f28db312a;hpb=341a738dc6ac8e79472c27db1a5ad0cbf0450b41;p=~andy%2Fgtk diff --git a/gtk/gtkcssstyleproperty.c b/gtk/gtkcssstyleproperty.c index 66ce7ff02..0b7491524 100644 --- a/gtk/gtkcssstyleproperty.c +++ b/gtk/gtkcssstyleproperty.c @@ -12,8 +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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * License along with this library. If not, see . * * Authors: Benjamin Otte */ @@ -22,10 +21,25 @@ #include "gtkcssstylepropertyprivate.h" +#include "gtkcssenumvalueprivate.h" +#include "gtkcssinheritvalueprivate.h" +#include "gtkcssinitialvalueprivate.h" +#include "gtkcssstylefuncsprivate.h" +#include "gtkcsstypesprivate.h" #include "gtkintl.h" +#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" enum { PROP_0, + PROP_ANIMATED, + PROP_AFFECTS_SIZE, + PROP_AFFECTS_FONT, PROP_ID, PROP_INHERIT, PROP_INITIAL @@ -33,6 +47,11 @@ enum { G_DEFINE_TYPE (GtkCssStyleProperty, _gtk_css_style_property, GTK_TYPE_STYLE_PROPERTY) +static GtkBitmask *_properties_affecting_size = NULL; +static GtkBitmask *_properties_affecting_font = NULL; + +static GtkCssStylePropertyClass *gtk_css_style_property_class = NULL; + static void gtk_css_style_property_constructed (GObject *object) { @@ -42,6 +61,12 @@ gtk_css_style_property_constructed (GObject *object) property->id = klass->style_properties->len; g_ptr_array_add (klass->style_properties, property); + if (property->affects_size) + _properties_affecting_size = _gtk_bitmask_set (_properties_affecting_size, property->id, TRUE); + + if (property->affects_font) + _properties_affecting_font = _gtk_bitmask_set (_properties_affecting_font, property->id, TRUE); + G_OBJECT_CLASS (_gtk_css_style_property_parent_class)->constructed (object); } @@ -52,18 +77,24 @@ gtk_css_style_property_set_property (GObject *object, GParamSpec *pspec) { GtkCssStyleProperty *property = GTK_CSS_STYLE_PROPERTY (object); - const GValue *initial; switch (prop_id) { + case PROP_ANIMATED: + property->animated = g_value_get_boolean (value); + break; + case PROP_AFFECTS_SIZE: + property->affects_size = g_value_get_boolean (value); + break; + case PROP_AFFECTS_FONT: + property->affects_font = g_value_get_boolean (value); + break; case PROP_INHERIT: property->inherit = g_value_get_boolean (value); break; case PROP_INITIAL: - initial = g_value_get_boxed (value); - g_assert (initial); - g_value_init (&property->initial_value, G_VALUE_TYPE (initial)); - g_value_copy (initial, &property->initial_value); + property->initial_value = g_value_dup_boxed (value); + g_assert (property->initial_value != NULL); break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); @@ -81,6 +112,15 @@ gtk_css_style_property_get_property (GObject *object, switch (prop_id) { + case PROP_ANIMATED: + g_value_set_boolean (value, property->animated); + break; + case PROP_AFFECTS_SIZE: + g_value_set_boolean (value, property->affects_size); + break; + case PROP_AFFECTS_FONT: + g_value_set_boolean (value, property->affects_font); + break; case PROP_ID: g_value_set_boolean (value, property->id); break; @@ -88,7 +128,7 @@ gtk_css_style_property_get_property (GObject *object, g_value_set_boolean (value, property->inherit); break; case PROP_INITIAL: - g_value_set_boxed (value, &property->initial_value); + g_value_set_boxed (value, property->initial_value); break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); @@ -96,15 +136,160 @@ gtk_css_style_property_get_property (GObject *object, } } +static void +_gtk_css_style_property_assign (GtkStyleProperty *property, + GtkStyleProperties *props, + GtkStateFlags state, + const GValue *value) +{ + GtkCssStyleProperty *style; + GtkCssValue *css_value; + + style = GTK_CSS_STYLE_PROPERTY (property); + css_value = style->assign_value (style, value); + + _gtk_style_properties_set_property_by_property (props, + style, + state, + css_value); + _gtk_css_value_unref (css_value); +} + +static gboolean +_gtk_css_style_property_query_special_case (GtkCssStyleProperty *property, + GValue *value, + GtkStyleQueryFunc query_func, + gpointer query_data) +{ + GtkBorderStyle border_style; + + switch (property->id) + { + case GTK_CSS_PROPERTY_BORDER_TOP_WIDTH: + border_style = _gtk_css_border_style_value_get (query_func (GTK_CSS_PROPERTY_BORDER_TOP_STYLE, query_data)); + if (border_style == GTK_BORDER_STYLE_NONE || border_style == GTK_BORDER_STYLE_HIDDEN) + { + g_value_init (value, G_TYPE_INT); + return TRUE; + } + break; + case GTK_CSS_PROPERTY_BORDER_RIGHT_WIDTH: + border_style = _gtk_css_border_style_value_get (query_func (GTK_CSS_PROPERTY_BORDER_RIGHT_STYLE, query_data)); + if (border_style == GTK_BORDER_STYLE_NONE || border_style == GTK_BORDER_STYLE_HIDDEN) + { + g_value_init (value, G_TYPE_INT); + return TRUE; + } + break; + case GTK_CSS_PROPERTY_BORDER_BOTTOM_WIDTH: + border_style = _gtk_css_border_style_value_get (query_func (GTK_CSS_PROPERTY_BORDER_BOTTOM_STYLE, query_data)); + if (border_style == GTK_BORDER_STYLE_NONE || border_style == GTK_BORDER_STYLE_HIDDEN) + { + g_value_init (value, G_TYPE_INT); + return TRUE; + } + break; + case GTK_CSS_PROPERTY_BORDER_LEFT_WIDTH: + border_style = _gtk_css_border_style_value_get (query_func (GTK_CSS_PROPERTY_BORDER_LEFT_STYLE, query_data)); + if (border_style == GTK_BORDER_STYLE_NONE || border_style == GTK_BORDER_STYLE_HIDDEN) + { + g_value_init (value, G_TYPE_INT); + return TRUE; + } + break; + case GTK_CSS_PROPERTY_OUTLINE_WIDTH: + border_style = _gtk_css_border_style_value_get (query_func (GTK_CSS_PROPERTY_OUTLINE_STYLE, query_data)); + if (border_style == GTK_BORDER_STYLE_NONE || border_style == GTK_BORDER_STYLE_HIDDEN) + { + g_value_init (value, G_TYPE_INT); + return TRUE; + } + break; + default: + break; + } + + return FALSE; +} + +static void +_gtk_css_style_property_query (GtkStyleProperty *property, + GValue *value, + GtkStyleQueryFunc query_func, + gpointer query_data) +{ + GtkCssStyleProperty *style_property = GTK_CSS_STYLE_PROPERTY (property); + GtkCssValue *css_value; + + /* I don't like this special case being here in this generic code path, but no idea where else to put it. */ + if (_gtk_css_style_property_query_special_case (style_property, value, query_func, query_data)) + return; + + css_value = (* query_func) (GTK_CSS_STYLE_PROPERTY (property)->id, query_data); + if (css_value == NULL) + css_value =_gtk_css_style_property_get_initial_value (style_property); + + style_property->query_value (style_property, css_value, value); +} + +static GtkCssValue * +gtk_css_style_property_parse_value (GtkStyleProperty *property, + GtkCssParser *parser) +{ + GtkCssStyleProperty *style_property = GTK_CSS_STYLE_PROPERTY (property); + + if (_gtk_css_parser_try (parser, "initial", TRUE)) + { + /* the initial value can be explicitly specified with the + * ‘initial’ keyword which all properties accept. + */ + return _gtk_css_initial_value_new (); + } + else if (_gtk_css_parser_try (parser, "inherit", TRUE)) + { + /* All properties accept the ‘inherit’ value which + * explicitly specifies that the value will be determined + * by inheritance. The ‘inherit’ value can be used to + * strengthen inherited values in the cascade, and it can + * also be used on properties that are not normally inherited. + */ + return _gtk_css_inherit_value_new (); + } + + return (* style_property->parse_value) (style_property, parser); +} + static void _gtk_css_style_property_class_init (GtkCssStylePropertyClass *klass) { GObjectClass *object_class = G_OBJECT_CLASS (klass); + GtkStylePropertyClass *property_class = GTK_STYLE_PROPERTY_CLASS (klass); object_class->constructed = gtk_css_style_property_constructed; object_class->set_property = gtk_css_style_property_set_property; object_class->get_property = gtk_css_style_property_get_property; + g_object_class_install_property (object_class, + PROP_ANIMATED, + g_param_spec_boolean ("animated", + P_("Animated"), + P_("Set if the value can be animated"), + FALSE, + G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY)); + g_object_class_install_property (object_class, + PROP_AFFECTS_SIZE, + g_param_spec_boolean ("affects-size", + P_("Affects size"), + P_("Set if the value affects the sizing of elements"), + TRUE, + G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY)); + g_object_class_install_property (object_class, + PROP_AFFECTS_FONT, + g_param_spec_boolean ("affects-font", + P_("Affects font"), + P_("Set if the value affects the font"), + FALSE, + G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY)); g_object_class_install_property (object_class, PROP_ID, g_param_spec_uint ("id", @@ -124,16 +309,33 @@ _gtk_css_style_property_class_init (GtkCssStylePropertyClass *klass) g_param_spec_boxed ("initial-value", P_("Initial value"), P_("The initial specified value used for this property"), - G_TYPE_VALUE, + GTK_TYPE_CSS_VALUE, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY)); + property_class->assign = _gtk_css_style_property_assign; + property_class->query = _gtk_css_style_property_query; + property_class->parse_value = gtk_css_style_property_parse_value; + klass->style_properties = g_ptr_array_new (); + + _properties_affecting_size = _gtk_bitmask_new (); + _properties_affecting_font = _gtk_bitmask_new (); + + gtk_css_style_property_class = klass; } +static GtkCssValue * +gtk_css_style_property_real_parse_value (GtkCssStyleProperty *property, + GtkCssParser *parser) +{ + g_assert_not_reached (); + return NULL; +} static void -_gtk_css_style_property_init (GtkCssStyleProperty *style_property) +_gtk_css_style_property_init (GtkCssStyleProperty *property) { + property->parse_value = gtk_css_style_property_real_parse_value; } /** @@ -147,11 +349,13 @@ _gtk_css_style_property_init (GtkCssStyleProperty *style_property) guint _gtk_css_style_property_get_n_properties (void) { - GtkCssStylePropertyClass *klass; - - klass = g_type_class_peek (GTK_TYPE_CSS_STYLE_PROPERTY); + if (G_UNLIKELY (gtk_css_style_property_class == NULL)) + { + _gtk_style_property_init_properties (); + g_assert (gtk_css_style_property_class); + } - return klass->style_properties->len; + return gtk_css_style_property_class->style_properties->len; } /** @@ -167,11 +371,16 @@ _gtk_css_style_property_get_n_properties (void) GtkCssStyleProperty * _gtk_css_style_property_lookup_by_id (guint id) { - GtkCssStylePropertyClass *klass; - klass = g_type_class_peek (GTK_TYPE_CSS_STYLE_PROPERTY); + if (G_UNLIKELY (gtk_css_style_property_class == NULL)) + { + _gtk_style_property_init_properties (); + g_assert (gtk_css_style_property_class); + } + + g_return_val_if_fail (id < gtk_css_style_property_class->style_properties->len, NULL); - return g_ptr_array_index (klass->style_properties, id); + return g_ptr_array_index (gtk_css_style_property_class->style_properties, id); } /** @@ -187,11 +396,65 @@ _gtk_css_style_property_lookup_by_id (guint id) gboolean _gtk_css_style_property_is_inherit (GtkCssStyleProperty *property) { - g_return_val_if_fail (GTK_IS_CSS_STYLE_PROPERTY (property), 0); + g_return_val_if_fail (GTK_IS_CSS_STYLE_PROPERTY (property), FALSE); return property->inherit; } +/** + * _gtk_css_style_property_is_animated: + * @property: the property + * + * Queries if the given @property can be is animated. See + *