From: Timm Bäder Date: Thu, 9 Jan 2020 10:57:00 +0000 (+0100) Subject: cssvalue: Add type names for all classes X-Git-Tag: archive/raspbian/4.4.1+ds1-2+rpi1^2~18^2~20^2~304 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=1200fe2daf91df4bec11d3fdd97f06eedb01a976;p=gtk4.git cssvalue: Add type names for all classes This is important to have for debugging and e.g. to print statistics for the individual css value types --- diff --git a/gtk/gtkcssarrayvalue.c b/gtk/gtkcssarrayvalue.c index 11cfebbc94..25bfbe47de 100644 --- a/gtk/gtkcssarrayvalue.c +++ b/gtk/gtkcssarrayvalue.c @@ -369,6 +369,7 @@ gtk_css_value_array_print (const GtkCssValue *value, } static const GtkCssValueClass GTK_CSS_VALUE_ARRAY = { + "GtkCssArrayValue", gtk_css_value_array_free, gtk_css_value_array_compute, gtk_css_value_array_equal, diff --git a/gtk/gtkcssbgsizevalue.c b/gtk/gtkcssbgsizevalue.c index 9b31b60033..7b9c0d1c10 100644 --- a/gtk/gtkcssbgsizevalue.c +++ b/gtk/gtkcssbgsizevalue.c @@ -153,6 +153,7 @@ gtk_css_value_bg_size_print (const GtkCssValue *value, } static const GtkCssValueClass GTK_CSS_VALUE_BG_SIZE = { + "GtkCssBgSizeValue", gtk_css_value_bg_size_free, gtk_css_value_bg_size_compute, gtk_css_value_bg_size_equal, diff --git a/gtk/gtkcssbordervalue.c b/gtk/gtkcssbordervalue.c index 3c45ad8146..b00d674cb0 100644 --- a/gtk/gtkcssbordervalue.c +++ b/gtk/gtkcssbordervalue.c @@ -140,6 +140,7 @@ gtk_css_value_border_print (const GtkCssValue *value, } static const GtkCssValueClass GTK_CSS_VALUE_BORDER = { + "GtkCssBorderValue", gtk_css_value_border_free, gtk_css_value_border_compute, gtk_css_value_border_equal, diff --git a/gtk/gtkcsscalcvalue.c b/gtk/gtkcsscalcvalue.c index 8a5ea6b065..162f948b55 100644 --- a/gtk/gtkcsscalcvalue.c +++ b/gtk/gtkcsscalcvalue.c @@ -245,6 +245,7 @@ gtk_css_value_calc_get_calc_term_order (const GtkCssValue *value) static const GtkCssNumberValueClass GTK_CSS_VALUE_CALC = { { + "GtkCssCalcValue", gtk_css_value_calc_free, gtk_css_value_calc_compute, gtk_css_value_calc_equal, diff --git a/gtk/gtkcsscolorvalue.c b/gtk/gtkcsscolorvalue.c index 822c91faca..de0c765bb0 100644 --- a/gtk/gtkcsscolorvalue.c +++ b/gtk/gtkcsscolorvalue.c @@ -280,6 +280,7 @@ gtk_css_value_color_print (const GtkCssValue *value, } static const GtkCssValueClass GTK_CSS_VALUE_COLOR = { + "GtkCssColorValue", gtk_css_value_color_free, gtk_css_value_color_compute, gtk_css_value_color_equal, diff --git a/gtk/gtkcsscornervalue.c b/gtk/gtkcsscornervalue.c index ec7a166f70..49b6bd1605 100644 --- a/gtk/gtkcsscornervalue.c +++ b/gtk/gtkcsscornervalue.c @@ -99,6 +99,7 @@ gtk_css_value_corner_print (const GtkCssValue *corner, } static const GtkCssValueClass GTK_CSS_VALUE_CORNER = { + "GtkCssCornerValue", gtk_css_value_corner_free, gtk_css_value_corner_compute, gtk_css_value_corner_equal, diff --git a/gtk/gtkcssdimensionvalue.c b/gtk/gtkcssdimensionvalue.c index 1e9e758e63..a45d2a50d5 100644 --- a/gtk/gtkcssdimensionvalue.c +++ b/gtk/gtkcssdimensionvalue.c @@ -279,6 +279,7 @@ gtk_css_value_dimension_get_calc_term_order (const GtkCssValue *value) static const GtkCssNumberValueClass GTK_CSS_VALUE_DIMENSION = { { + "GtkCssDimensionValue", gtk_css_value_dimension_free, gtk_css_value_dimension_compute, gtk_css_value_dimension_equal, diff --git a/gtk/gtkcsseasevalue.c b/gtk/gtkcsseasevalue.c index 4d79f4fe29..7e7c6be7bd 100644 --- a/gtk/gtkcsseasevalue.c +++ b/gtk/gtkcsseasevalue.c @@ -135,6 +135,7 @@ gtk_css_value_ease_print (const GtkCssValue *ease, } static const GtkCssValueClass GTK_CSS_VALUE_EASE = { + "GtkCssEaseValue", gtk_css_value_ease_free, gtk_css_value_ease_compute, gtk_css_value_ease_equal, diff --git a/gtk/gtkcssenumvalue.c b/gtk/gtkcssenumvalue.c index 6e2828a23d..1d40344866 100644 --- a/gtk/gtkcssenumvalue.c +++ b/gtk/gtkcssenumvalue.c @@ -78,6 +78,7 @@ gtk_css_value_enum_print (const GtkCssValue *value, /* GtkBorderStyle */ static const GtkCssValueClass GTK_CSS_VALUE_BORDER_STYLE = { + "GtkCssBorderStyleValue", gtk_css_value_enum_free, gtk_css_value_enum_compute, gtk_css_value_enum_equal, @@ -135,6 +136,7 @@ _gtk_css_border_style_value_get (const GtkCssValue *value) /* GtkCssBlendMode */ static const GtkCssValueClass GTK_CSS_VALUE_BLEND_MODE = { + "GtkCssBlendModeValue", gtk_css_value_enum_free, gtk_css_value_enum_compute, gtk_css_value_enum_equal, @@ -285,6 +287,7 @@ gtk_css_value_font_size_compute (GtkCssValue *value, } static const GtkCssValueClass GTK_CSS_VALUE_FONT_SIZE = { + "GtkCssFontSizeValue", gtk_css_value_enum_free, gtk_css_value_font_size_compute, gtk_css_value_enum_equal, @@ -341,6 +344,7 @@ _gtk_css_font_size_value_get (const GtkCssValue *value) /* PangoStyle */ static const GtkCssValueClass GTK_CSS_VALUE_FONT_STYLE = { + "GtkCssFontStyleValue", gtk_css_value_enum_free, gtk_css_value_enum_compute, gtk_css_value_enum_equal, @@ -439,6 +443,7 @@ gtk_css_value_font_weight_compute (GtkCssValue *value, } static const GtkCssValueClass GTK_CSS_VALUE_FONT_WEIGHT = { + "GtkCssFontWeightValue", gtk_css_value_enum_free, gtk_css_value_font_weight_compute, gtk_css_value_enum_equal, @@ -488,6 +493,7 @@ gtk_css_font_weight_value_get (const GtkCssValue *value) /* PangoStretch */ static const GtkCssValueClass GTK_CSS_VALUE_FONT_STRETCH = { + "GtkCssFontStretchValue", gtk_css_value_enum_free, gtk_css_value_enum_compute, gtk_css_value_enum_equal, @@ -544,6 +550,7 @@ _gtk_css_font_stretch_value_get (const GtkCssValue *value) /* GtkTextDecorationLine */ static const GtkCssValueClass GTK_CSS_VALUE_TEXT_DECORATION_LINE = { + "GtkCssTextDecorationLineValue", gtk_css_value_enum_free, gtk_css_value_enum_compute, gtk_css_value_enum_equal, @@ -594,6 +601,7 @@ _gtk_css_text_decoration_line_value_get (const GtkCssValue *value) /* GtkTextDecorationStyle */ static const GtkCssValueClass GTK_CSS_VALUE_TEXT_DECORATION_STYLE = { + "GtkCssTextDecorationStyleValue", gtk_css_value_enum_free, gtk_css_value_enum_compute, gtk_css_value_enum_equal, @@ -644,6 +652,7 @@ _gtk_css_text_decoration_style_value_get (const GtkCssValue *value) /* GtkCssArea */ static const GtkCssValueClass GTK_CSS_VALUE_AREA = { + "GtkCssAreaValue", gtk_css_value_enum_free, gtk_css_value_enum_compute, gtk_css_value_enum_equal, @@ -700,6 +709,7 @@ _gtk_css_area_value_get (const GtkCssValue *value) /* GtkCssDirection */ static const GtkCssValueClass GTK_CSS_VALUE_DIRECTION = { + "GtkCssDirectionValue", gtk_css_value_enum_free, gtk_css_value_enum_compute, gtk_css_value_enum_equal, @@ -760,6 +770,7 @@ _gtk_css_direction_value_get (const GtkCssValue *value) /* GtkCssPlayState */ static const GtkCssValueClass GTK_CSS_VALUE_PLAY_STATE = { + "GtkCssPlayStateValue", gtk_css_value_enum_free, gtk_css_value_enum_compute, gtk_css_value_enum_equal, @@ -815,6 +826,7 @@ _gtk_css_play_state_value_get (const GtkCssValue *value) /* GtkCssFillMode */ static const GtkCssValueClass GTK_CSS_VALUE_FILL_MODE = { + "GtkCssFillModeValue", gtk_css_value_enum_free, gtk_css_value_enum_compute, gtk_css_value_enum_equal, @@ -872,6 +884,7 @@ _gtk_css_fill_mode_value_get (const GtkCssValue *value) /* GtkCssIconStyle */ static const GtkCssValueClass GTK_CSS_VALUE_ICON_STYLE = { + "GtkCssIconStyleValue", gtk_css_value_enum_free, gtk_css_value_enum_compute, gtk_css_value_enum_equal, @@ -928,6 +941,7 @@ _gtk_css_icon_style_value_get (const GtkCssValue *value) /* GtkCssFontKerning */ static const GtkCssValueClass GTK_CSS_VALUE_FONT_KERNING = { + "GtkCssFontKerningValue", gtk_css_value_enum_free, gtk_css_value_enum_compute, gtk_css_value_enum_equal, @@ -984,6 +998,7 @@ _gtk_css_font_kerning_value_get (const GtkCssValue *value) /* GtkCssFontVariantPos */ static const GtkCssValueClass GTK_CSS_VALUE_FONT_VARIANT_POSITION = { + "GtkCssFontVariationPositionValue", gtk_css_value_enum_free, gtk_css_value_enum_compute, gtk_css_value_enum_equal, @@ -1040,6 +1055,7 @@ _gtk_css_font_variant_position_value_get (const GtkCssValue *value) /* GtkCssFontVariantCaps */ static const GtkCssValueClass GTK_CSS_VALUE_FONT_VARIANT_CAPS = { + "GtkCssFontVariantCapsValue", gtk_css_value_enum_free, gtk_css_value_enum_compute, gtk_css_value_enum_equal, @@ -1100,6 +1116,7 @@ _gtk_css_font_variant_caps_value_get (const GtkCssValue *value) /* GtkCssFontVariantAlternate */ static const GtkCssValueClass GTK_CSS_VALUE_FONT_VARIANT_ALTERNATE = { + "GtkCssFontVariantAlternateValue", gtk_css_value_enum_free, gtk_css_value_enum_compute, gtk_css_value_enum_equal, @@ -1213,6 +1230,7 @@ gtk_css_font_variant_ligature_value_print (const GtkCssValue *value, } static const GtkCssValueClass GTK_CSS_VALUE_FONT_VARIANT_LIGATURE = { + "GtkCssFontVariantLigatureValue", gtk_css_value_enum_free, gtk_css_value_enum_compute, gtk_css_value_flags_equal, @@ -1319,6 +1337,7 @@ gtk_css_font_variant_numeric_value_print (const GtkCssValue *value, } static const GtkCssValueClass GTK_CSS_VALUE_FONT_VARIANT_NUMERIC = { + "GtkCssFontVariantNumbericValue", gtk_css_value_enum_free, gtk_css_value_enum_compute, gtk_css_value_flags_equal, @@ -1422,6 +1441,7 @@ gtk_css_font_variant_east_asian_value_print (const GtkCssValue *value, } static const GtkCssValueClass GTK_CSS_VALUE_FONT_VARIANT_EAST_ASIAN = { + "GtkCssFontVariantEastAsianValue", gtk_css_value_enum_free, gtk_css_value_enum_compute, gtk_css_value_flags_equal, diff --git a/gtk/gtkcssfiltervalue.c b/gtk/gtkcssfiltervalue.c index ad9f2e6554..b22d0e272c 100644 --- a/gtk/gtkcssfiltervalue.c +++ b/gtk/gtkcssfiltervalue.c @@ -693,6 +693,7 @@ gtk_css_value_filter_print (const GtkCssValue *value, } static const GtkCssValueClass GTK_CSS_VALUE_FILTER = { + "GtkCssFilterValue", gtk_css_value_filter_free, gtk_css_value_filter_compute, gtk_css_value_filter_equal, diff --git a/gtk/gtkcssfontfeaturesvalue.c b/gtk/gtkcssfontfeaturesvalue.c index 5a64e9176e..f42b7ec212 100644 --- a/gtk/gtkcssfontfeaturesvalue.c +++ b/gtk/gtkcssfontfeaturesvalue.c @@ -154,6 +154,7 @@ gtk_css_value_font_features_print (const GtkCssValue *value, } static const GtkCssValueClass GTK_CSS_VALUE_FONT_FEATURES = { + "GtkCssFontFeaturesValue", gtk_css_value_font_features_free, gtk_css_value_font_features_compute, gtk_css_value_font_features_equal, diff --git a/gtk/gtkcssfontvariationsvalue.c b/gtk/gtkcssfontvariationsvalue.c index e15a8c715b..a803458cad 100644 --- a/gtk/gtkcssfontvariationsvalue.c +++ b/gtk/gtkcssfontvariationsvalue.c @@ -154,6 +154,7 @@ gtk_css_value_font_variations_print (const GtkCssValue *value, } static const GtkCssValueClass GTK_CSS_VALUE_FONT_VARIATIONS = { + "GtkCssFontVariationsValue", gtk_css_value_font_variations_free, gtk_css_value_font_variations_compute, gtk_css_value_font_variations_equal, diff --git a/gtk/gtkcssiconthemevalue.c b/gtk/gtkcssiconthemevalue.c index 8d98e4b50d..e3838f5201 100644 --- a/gtk/gtkcssiconthemevalue.c +++ b/gtk/gtkcssiconthemevalue.c @@ -111,6 +111,7 @@ gtk_css_value_icon_theme_print (const GtkCssValue *icon_theme, } static const GtkCssValueClass GTK_CSS_VALUE_ICON_THEME = { + "GtkCssIconThemeValue", gtk_css_value_icon_theme_free, gtk_css_value_icon_theme_compute, gtk_css_value_icon_theme_equal, diff --git a/gtk/gtkcssimagevalue.c b/gtk/gtkcssimagevalue.c index c5923e96d6..1a628a568f 100644 --- a/gtk/gtkcssimagevalue.c +++ b/gtk/gtkcssimagevalue.c @@ -123,6 +123,7 @@ gtk_css_value_image_print (const GtkCssValue *value, } static const GtkCssValueClass GTK_CSS_VALUE_IMAGE = { + "GtkCssImageValue", gtk_css_value_image_free, gtk_css_value_image_compute, gtk_css_value_image_equal, diff --git a/gtk/gtkcssinheritvalue.c b/gtk/gtkcssinheritvalue.c index f99471f37f..d30b844e29 100644 --- a/gtk/gtkcssinheritvalue.c +++ b/gtk/gtkcssinheritvalue.c @@ -78,6 +78,7 @@ gtk_css_value_inherit_print (const GtkCssValue *value, } static const GtkCssValueClass GTK_CSS_VALUE_INHERIT = { + "GtkCssInheritValue", gtk_css_value_inherit_free, gtk_css_value_inherit_compute, gtk_css_value_inherit_equal, diff --git a/gtk/gtkcssinitialvalue.c b/gtk/gtkcssinitialvalue.c index 258d9f604d..ad3c2e352e 100644 --- a/gtk/gtkcssinitialvalue.c +++ b/gtk/gtkcssinitialvalue.c @@ -102,6 +102,7 @@ gtk_css_value_initial_print (const GtkCssValue *value, } static const GtkCssValueClass GTK_CSS_VALUE_INITIAL = { + "GtkCssInitialValue", gtk_css_value_initial_free, gtk_css_value_initial_compute, gtk_css_value_initial_equal, diff --git a/gtk/gtkcsspalettevalue.c b/gtk/gtkcsspalettevalue.c index b133152a74..53866bae76 100644 --- a/gtk/gtkcsspalettevalue.c +++ b/gtk/gtkcsspalettevalue.c @@ -244,6 +244,7 @@ gtk_css_value_palette_print (const GtkCssValue *value, } static const GtkCssValueClass GTK_CSS_VALUE_PALETTE = { + "GtkCssPaletteValue", gtk_css_value_palette_free, gtk_css_value_palette_compute, gtk_css_value_palette_equal, diff --git a/gtk/gtkcsspositionvalue.c b/gtk/gtkcsspositionvalue.c index b5cde9de9c..853158a056 100644 --- a/gtk/gtkcsspositionvalue.c +++ b/gtk/gtkcsspositionvalue.c @@ -150,6 +150,7 @@ done: } static const GtkCssValueClass GTK_CSS_VALUE_POSITION = { + "GtkCssPositionValue", gtk_css_value_position_free, gtk_css_value_position_compute, gtk_css_value_position_equal, diff --git a/gtk/gtkcssrepeatvalue.c b/gtk/gtkcssrepeatvalue.c index 9c8b8642ab..5a98c49e78 100644 --- a/gtk/gtkcssrepeatvalue.c +++ b/gtk/gtkcssrepeatvalue.c @@ -113,6 +113,7 @@ gtk_css_value_border_repeat_print (const GtkCssValue *repeat, } static const GtkCssValueClass GTK_CSS_VALUE_BACKGROUND_REPEAT = { + "GtkCssBackgroundRepeatValue", gtk_css_value_repeat_free, gtk_css_value_repeat_compute, gtk_css_value_repeat_equal, @@ -123,6 +124,7 @@ static const GtkCssValueClass GTK_CSS_VALUE_BACKGROUND_REPEAT = { }; static const GtkCssValueClass GTK_CSS_VALUE_BORDER_REPEAT = { + "GtkCssBorderRepeatValue", gtk_css_value_repeat_free, gtk_css_value_repeat_compute, gtk_css_value_repeat_equal, diff --git a/gtk/gtkcssrgbavalue.c b/gtk/gtkcssrgbavalue.c index fda15fddf0..dad1f3ee39 100644 --- a/gtk/gtkcssrgbavalue.c +++ b/gtk/gtkcssrgbavalue.c @@ -98,6 +98,7 @@ gtk_css_value_rgba_print (const GtkCssValue *rgba, } static const GtkCssValueClass GTK_CSS_VALUE_RGBA = { + "GtkCssRgbaValue", gtk_css_value_rgba_free, gtk_css_value_rgba_compute, gtk_css_value_rgba_equal, diff --git a/gtk/gtkcssshadowsvalue.c b/gtk/gtkcssshadowsvalue.c index 88ab7261a8..60e3a548ec 100644 --- a/gtk/gtkcssshadowsvalue.c +++ b/gtk/gtkcssshadowsvalue.c @@ -200,6 +200,7 @@ gtk_css_value_shadows_print (const GtkCssValue *value, } static const GtkCssValueClass GTK_CSS_VALUE_SHADOWS = { + "GtkCssShadowsValue", gtk_css_value_shadows_free, gtk_css_value_shadows_compute, gtk_css_value_shadows_equal, diff --git a/gtk/gtkcssshadowvalue.c b/gtk/gtkcssshadowvalue.c index dc11a50367..79a2950b8e 100644 --- a/gtk/gtkcssshadowvalue.c +++ b/gtk/gtkcssshadowvalue.c @@ -155,6 +155,7 @@ gtk_css_value_shadow_print (const GtkCssValue *shadow, } static const GtkCssValueClass GTK_CSS_VALUE_SHADOW = { + "GtkCssShadowValue", gtk_css_value_shadow_free, gtk_css_value_shadow_compute, gtk_css_value_shadow_equal, diff --git a/gtk/gtkcssstringvalue.c b/gtk/gtkcssstringvalue.c index 0cd7249698..286b86e0d9 100644 --- a/gtk/gtkcssstringvalue.c +++ b/gtk/gtkcssstringvalue.c @@ -117,6 +117,7 @@ out: } static const GtkCssValueClass GTK_CSS_VALUE_STRING = { + "GtkCssStringValue", gtk_css_value_string_free, gtk_css_value_string_compute, gtk_css_value_string_equal, @@ -127,6 +128,7 @@ static const GtkCssValueClass GTK_CSS_VALUE_STRING = { }; static const GtkCssValueClass GTK_CSS_VALUE_IDENT = { + "GtkCssIdentValue", gtk_css_value_string_free, gtk_css_value_string_compute, gtk_css_value_string_equal, diff --git a/gtk/gtkcsstransformvalue.c b/gtk/gtkcsstransformvalue.c index ca6b2c778b..5285d7104b 100644 --- a/gtk/gtkcsstransformvalue.c +++ b/gtk/gtkcsstransformvalue.c @@ -790,6 +790,7 @@ gtk_css_value_transform_print (const GtkCssValue *value, } static const GtkCssValueClass GTK_CSS_VALUE_TRANSFORM = { + "GtkCssTransformValue", gtk_css_value_transform_free, gtk_css_value_transform_compute, gtk_css_value_transform_equal, diff --git a/gtk/gtkcssunsetvalue.c b/gtk/gtkcssunsetvalue.c index 78d143bf20..76fb64d5b7 100644 --- a/gtk/gtkcssunsetvalue.c +++ b/gtk/gtkcssunsetvalue.c @@ -82,6 +82,7 @@ gtk_css_value_unset_print (const GtkCssValue *value, } static const GtkCssValueClass GTK_CSS_VALUE_UNSET = { + "GtkCssUnsetValue", gtk_css_value_unset_free, gtk_css_value_unset_compute, gtk_css_value_unset_equal, diff --git a/gtk/gtkcssvalueprivate.h b/gtk/gtkcssvalueprivate.h index 7aba6b023c..3071d2bd17 100644 --- a/gtk/gtkcssvalueprivate.h +++ b/gtk/gtkcssvalueprivate.h @@ -40,6 +40,7 @@ typedef struct _GtkCssValueClass GtkCssValueClass; gint ref_count; struct _GtkCssValueClass { + const char *type_name; void (* free) (GtkCssValue *value); GtkCssValue * (* compute) (GtkCssValue *value,