AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity
716e0db690
gtk2/gtk/gtkcssstyle.c

773 lines
26 KiB
C
Raw Normal View History

cssstyle: Rename GtkCssComputedValues => GtkCssStyle This is literally just renaming of the object (and the associated source files). No other changes are in there.
2014-10-22 21:41:50 +00:00
/*
* Copyright © 2012 Red Hat Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* 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, see <http://www.gnu.org/licenses/>.
*
* Authors: Benjamin Otte <otte@gnome.org>
*/
#include "config.h"
#include "gtkprivate.h"
#include "gtkcssstyleprivate.h"
#include "gtkcssanimationprivate.h"
#include "gtkcssarrayvalueprivate.h"
#include "gtkcssenumvalueprivate.h"
#include "gtkcssinheritvalueprivate.h"
#include "gtkcssinitialvalueprivate.h"
#include "gtkcssnumbervalueprivate.h"
Remove GtkCssRgbaValue The differenciation between a literal color value and an RGBA value caused problems in various situations. Just treat the two the same but don't allow access to the rgba value of a non-literal color value. This gets rid of around 1.6k rgba values in the widget-factory.
2020-01-10 12:02:33 +00:00
#include "gtkcsscolorvalueprivate.h"
cssstyle: Rename GtkCssComputedValues => GtkCssStyle This is literally just renaming of the object (and the associated source files). No other changes are in there.
2014-10-22 21:41:50 +00:00
#include "gtkcssshorthandpropertyprivate.h"
#include "gtkcssstringvalueprivate.h"
cssstyle: set font variations in get_pango_font() Doesn't make sense to set all the css values on the font description in there except for the font variations, so do these here as well.
2020-01-16 10:33:12 +00:00
#include "gtkcssfontvariationsvalueprivate.h"
Implement font-feature-settings This is a missing part of the CSS font level 3 module.
2017-12-20 15:29:33 +00:00
#include "gtkcssfontfeaturesvalueprivate.h"
cssstyle: Rename GtkCssComputedValues => GtkCssStyle This is literally just renaming of the object (and the associated source files). No other changes are in there.
2014-10-22 21:41:50 +00:00
#include "gtkcssstylepropertyprivate.h"
#include "gtkcsstransitionprivate.h"
#include "gtkstyleanimationprivate.h"
#include "gtkstylepropertyprivate.h"
#include "gtkstyleproviderprivate.h"
cssstyle: Split into GtkCssStyle and GtkCssAnimatedStyle GtkCssStyle is the base class to be used for all types of styles that do exist. GtkCssAnimatedStyle is the only implementation so far, that is exactly a copy/paste of the old GtkCssStyle code.
2014-10-23 02:10:03 +00:00
G_DEFINE_ABSTRACT_TYPE (GtkCssStyle, gtk_css_style, G_TYPE_OBJECT)
cssstyle: Rename GtkCssComputedValues => GtkCssStyle This is literally just renaming of the object (and the associated source files). No other changes are in there.
2014-10-22 21:41:50 +00:00
cssstyle: Split into GtkCssStyle and GtkCssAnimatedStyle GtkCssStyle is the base class to be used for all types of styles that do exist. GtkCssAnimatedStyle is the only implementation so far, that is exactly a copy/paste of the old GtkCssStyle code.
2014-10-23 02:10:03 +00:00
static GtkCssSection *
gtk_css_style_real_get_section (GtkCssStyle *style,
guint id)
cssstyle: Rename GtkCssComputedValues => GtkCssStyle This is literally just renaming of the object (and the associated source files). No other changes are in there.
2014-10-22 21:41:50 +00:00
{
cssstyle: Split into GtkCssStyle and GtkCssAnimatedStyle GtkCssStyle is the base class to be used for all types of styles that do exist. GtkCssAnimatedStyle is the only implementation so far, that is exactly a copy/paste of the old GtkCssStyle code.
2014-10-23 02:10:03 +00:00
return NULL;
cssstyle: Rename GtkCssComputedValues => GtkCssStyle This is literally just renaming of the object (and the associated source files). No other changes are in there.
2014-10-22 21:41:50 +00:00
}
cssstyle: Add gtk_css_style_is_static() Gets rid of the need to do if (ANIMATED_STYLE() && animated_style_is_static(ANIMATED_STYLE(style))
2015-02-27 17:41:13 +00:00
static gboolean
gtk_css_style_real_is_static (GtkCssStyle *style)
{
return TRUE;
}
css: Split styles into groups Introduce refcounted structs for groups of related css properties, and use them to store the style values. Both GtkCssStaticStyle and GtkCssAnimatedStyle fill in the structs in GtkCssStyle, and we can avoid vfuncs for value access, which should be much faster. We can even start accessing style->core->color directly.
2020-01-26 04:16:06 +00:00
static void
gtk_css_style_finalize (GObject *object)
{
GtkCssStyle *style = GTK_CSS_STYLE (object);
gtk_css_values_unref ((GtkCssValues *)style->core);
gtk_css_values_unref ((GtkCssValues *)style->background);
gtk_css_values_unref ((GtkCssValues *)style->border);
gtk_css_values_unref ((GtkCssValues *)style->icon);
gtk_css_values_unref ((GtkCssValues *)style->outline);
gtk_css_values_unref ((GtkCssValues *)style->font);
gtk_css_values_unref ((GtkCssValues *)style->font_variant);
gtk_css_values_unref ((GtkCssValues *)style->animation);
gtk_css_values_unref ((GtkCssValues *)style->transition);
gtk_css_values_unref ((GtkCssValues *)style->size);
gtk_css_values_unref ((GtkCssValues *)style->other);
G_OBJECT_CLASS (gtk_css_style_parent_class)->finalize (object);
}
cssstyle: Rename GtkCssComputedValues => GtkCssStyle This is literally just renaming of the object (and the associated source files). No other changes are in there.
2014-10-22 21:41:50 +00:00
static void
gtk_css_style_class_init (GtkCssStyleClass *klass)
{
css: Split styles into groups Introduce refcounted structs for groups of related css properties, and use them to store the style values. Both GtkCssStaticStyle and GtkCssAnimatedStyle fill in the structs in GtkCssStyle, and we can avoid vfuncs for value access, which should be much faster. We can even start accessing style->core->color directly.
2020-01-26 04:16:06 +00:00
GObjectClass *object_class = G_OBJECT_CLASS (klass);
object_class->finalize = gtk_css_style_finalize;
cssstyle: Split into GtkCssStyle and GtkCssAnimatedStyle GtkCssStyle is the base class to be used for all types of styles that do exist. GtkCssAnimatedStyle is the only implementation so far, that is exactly a copy/paste of the old GtkCssStyle code.
2014-10-23 02:10:03 +00:00
klass->get_section = gtk_css_style_real_get_section;
cssstyle: Add gtk_css_style_is_static() Gets rid of the need to do if (ANIMATED_STYLE() && animated_style_is_static(ANIMATED_STYLE(style))
2015-02-27 17:41:13 +00:00
klass->is_static = gtk_css_style_real_is_static;
cssstyle: Rename GtkCssComputedValues => GtkCssStyle This is literally just renaming of the object (and the associated source files). No other changes are in there.
2014-10-22 21:41:50 +00:00
}
static void
gtk_css_style_init (GtkCssStyle *style)
{
}
GtkCssValue *
gtk_css_style_get_value (GtkCssStyle *style,
css: Split styles into groups Introduce refcounted structs for groups of related css properties, and use them to store the style values. Both GtkCssStaticStyle and GtkCssAnimatedStyle fill in the structs in GtkCssStyle, and we can avoid vfuncs for value access, which should be much faster. We can even start accessing style->core->color directly.
2020-01-26 04:16:06 +00:00
guint id)
cssstyle: Rename GtkCssComputedValues => GtkCssStyle This is literally just renaming of the object (and the associated source files). No other changes are in there.
2014-10-22 21:41:50 +00:00
{
css: Split styles into groups Introduce refcounted structs for groups of related css properties, and use them to store the style values. Both GtkCssStaticStyle and GtkCssAnimatedStyle fill in the structs in GtkCssStyle, and we can avoid vfuncs for value access, which should be much faster. We can even start accessing style->core->color directly.
2020-01-26 04:16:06 +00:00
switch (id)
{
case GTK_CSS_PROPERTY_COLOR:
return style->core->color;
case GTK_CSS_PROPERTY_DPI:
return style->core->dpi;
case GTK_CSS_PROPERTY_FONT_SIZE:
return style->core->font_size;
case GTK_CSS_PROPERTY_ICON_PALETTE:
return style->core->icon_palette;
case GTK_CSS_PROPERTY_BACKGROUND_COLOR:
return style->background->background_color;
case GTK_CSS_PROPERTY_FONT_FAMILY:
return style->font->font_family;
case GTK_CSS_PROPERTY_FONT_STYLE:
return style->font->font_style;
case GTK_CSS_PROPERTY_FONT_WEIGHT:
return style->font->font_weight;
case GTK_CSS_PROPERTY_FONT_STRETCH:
return style->font->font_stretch;
case GTK_CSS_PROPERTY_LETTER_SPACING:
return style->font->letter_spacing;
case GTK_CSS_PROPERTY_TEXT_DECORATION_LINE:
return style->font_variant->text_decoration_line;
case GTK_CSS_PROPERTY_TEXT_DECORATION_COLOR:
return style->font_variant->text_decoration_color ? style->font_variant->text_decoration_color : style->core->color;
case GTK_CSS_PROPERTY_TEXT_DECORATION_STYLE:
return style->font_variant->text_decoration_style;
case GTK_CSS_PROPERTY_FONT_KERNING:
return style->font_variant->font_kerning;
case GTK_CSS_PROPERTY_FONT_VARIANT_LIGATURES:
return style->font_variant->font_variant_ligatures;
case GTK_CSS_PROPERTY_FONT_VARIANT_POSITION:
return style->font_variant->font_variant_position;
case GTK_CSS_PROPERTY_FONT_VARIANT_CAPS:
return style->font_variant->font_variant_caps;
case GTK_CSS_PROPERTY_FONT_VARIANT_NUMERIC:
return style->font_variant->font_variant_numeric;
case GTK_CSS_PROPERTY_FONT_VARIANT_ALTERNATES:
return style->font_variant->font_variant_alternates;
case GTK_CSS_PROPERTY_FONT_VARIANT_EAST_ASIAN:
return style->font_variant->font_variant_east_asian;
case GTK_CSS_PROPERTY_TEXT_SHADOW:
return style->font->text_shadow;
case GTK_CSS_PROPERTY_BOX_SHADOW:
return style->background->box_shadow;
case GTK_CSS_PROPERTY_MARGIN_TOP:
return style->size->margin_top;
case GTK_CSS_PROPERTY_MARGIN_LEFT:
return style->size->margin_left;
case GTK_CSS_PROPERTY_MARGIN_BOTTOM:
return style->size->margin_bottom;
case GTK_CSS_PROPERTY_MARGIN_RIGHT:
return style->size->margin_right;
case GTK_CSS_PROPERTY_PADDING_TOP:
return style->size->padding_top;
case GTK_CSS_PROPERTY_PADDING_LEFT:
return style->size->padding_left;
case GTK_CSS_PROPERTY_PADDING_BOTTOM:
return style->size->padding_bottom;
case GTK_CSS_PROPERTY_PADDING_RIGHT:
return style->size->padding_right;
case GTK_CSS_PROPERTY_BORDER_TOP_STYLE:
return style->border->border_top_style;
case GTK_CSS_PROPERTY_BORDER_TOP_WIDTH:
return style->border->border_top_width;
case GTK_CSS_PROPERTY_BORDER_LEFT_STYLE:
return style->border->border_left_style;
case GTK_CSS_PROPERTY_BORDER_LEFT_WIDTH:
return style->border->border_left_width;
case GTK_CSS_PROPERTY_BORDER_BOTTOM_STYLE:
return style->border->border_bottom_style;
case GTK_CSS_PROPERTY_BORDER_BOTTOM_WIDTH:
return style->border->border_bottom_width;
case GTK_CSS_PROPERTY_BORDER_RIGHT_STYLE:
return style->border->border_right_style;
case GTK_CSS_PROPERTY_BORDER_RIGHT_WIDTH:
return style->border->border_right_width;
case GTK_CSS_PROPERTY_BORDER_TOP_LEFT_RADIUS:
return style->border->border_top_left_radius;
case GTK_CSS_PROPERTY_BORDER_TOP_RIGHT_RADIUS:
return style->border->border_top_right_radius;
case GTK_CSS_PROPERTY_BORDER_BOTTOM_RIGHT_RADIUS:
return style->border->border_bottom_right_radius;
case GTK_CSS_PROPERTY_BORDER_BOTTOM_LEFT_RADIUS:
return style->border->border_bottom_left_radius;
case GTK_CSS_PROPERTY_OUTLINE_STYLE:
return style->outline->outline_style;
case GTK_CSS_PROPERTY_OUTLINE_WIDTH:
return style->outline->outline_width;
case GTK_CSS_PROPERTY_OUTLINE_OFFSET:
return style->outline->outline_offset;
case GTK_CSS_PROPERTY_BACKGROUND_CLIP:
return style->background->background_clip;
case GTK_CSS_PROPERTY_BACKGROUND_ORIGIN:
return style->background->background_origin;
case GTK_CSS_PROPERTY_BACKGROUND_SIZE:
return style->background->background_size;
case GTK_CSS_PROPERTY_BACKGROUND_POSITION:
return style->background->background_position;
case GTK_CSS_PROPERTY_BORDER_TOP_COLOR:
return style->border->border_top_color ? style->border->border_top_color : style->core->color;
case GTK_CSS_PROPERTY_BORDER_RIGHT_COLOR:
return style->border->border_right_color ? style->border->border_right_color : style->core->color;
case GTK_CSS_PROPERTY_BORDER_BOTTOM_COLOR:
return style->border->border_bottom_color ? style->border->border_bottom_color : style->core->color;
case GTK_CSS_PROPERTY_BORDER_LEFT_COLOR:
return style->border->border_left_color ? style->border->border_left_color: style->core->color;
case GTK_CSS_PROPERTY_OUTLINE_COLOR:
return style->outline->outline_color ? style->outline->outline_color : style->core->color;
case GTK_CSS_PROPERTY_BACKGROUND_REPEAT:
return style->background->background_repeat;
case GTK_CSS_PROPERTY_BACKGROUND_IMAGE:
return style->background->background_image;
case GTK_CSS_PROPERTY_BACKGROUND_BLEND_MODE:
return style->background->background_blend_mode;
case GTK_CSS_PROPERTY_BORDER_IMAGE_SOURCE:
return style->border->border_image_source;
case GTK_CSS_PROPERTY_BORDER_IMAGE_REPEAT:
return style->border->border_image_repeat;
case GTK_CSS_PROPERTY_BORDER_IMAGE_SLICE:
return style->border->border_image_slice;
case GTK_CSS_PROPERTY_BORDER_IMAGE_WIDTH:
return style->border->border_image_width;
case GTK_CSS_PROPERTY_ICON_SOURCE:
return style->other->icon_source;
case GTK_CSS_PROPERTY_ICON_SIZE:
return style->icon->icon_size;
case GTK_CSS_PROPERTY_ICON_SHADOW:
return style->icon->icon_shadow;
case GTK_CSS_PROPERTY_ICON_STYLE:
return style->icon->icon_style;
case GTK_CSS_PROPERTY_ICON_TRANSFORM:
return style->other->icon_transform;
case GTK_CSS_PROPERTY_ICON_FILTER:
return style->other->icon_filter;
case GTK_CSS_PROPERTY_BORDER_SPACING:
return style->size->border_spacing;
case GTK_CSS_PROPERTY_TRANSFORM:
return style->other->transform;
case GTK_CSS_PROPERTY_MIN_WIDTH:
return style->size->min_width;
case GTK_CSS_PROPERTY_MIN_HEIGHT:
return style->size->min_height;
case GTK_CSS_PROPERTY_TRANSITION_PROPERTY:
return style->transition->transition_property;
case GTK_CSS_PROPERTY_TRANSITION_DURATION:
return style->transition->transition_duration;
case GTK_CSS_PROPERTY_TRANSITION_TIMING_FUNCTION:
return style->transition->transition_timing_function;
case GTK_CSS_PROPERTY_TRANSITION_DELAY:
return style->transition->transition_delay;
case GTK_CSS_PROPERTY_ANIMATION_NAME:
return style->animation->animation_name;
case GTK_CSS_PROPERTY_ANIMATION_DURATION:
return style->animation->animation_duration;
case GTK_CSS_PROPERTY_ANIMATION_TIMING_FUNCTION:
return style->animation->animation_timing_function;
case GTK_CSS_PROPERTY_ANIMATION_ITERATION_COUNT:
return style->animation->animation_iteration_count;
case GTK_CSS_PROPERTY_ANIMATION_DIRECTION:
return style->animation->animation_direction;
case GTK_CSS_PROPERTY_ANIMATION_PLAY_STATE:
return style->animation->animation_play_state;
case GTK_CSS_PROPERTY_ANIMATION_DELAY:
return style->animation->animation_delay;
case GTK_CSS_PROPERTY_ANIMATION_FILL_MODE:
return style->animation->animation_fill_mode;
case GTK_CSS_PROPERTY_OPACITY:
return style->other->opacity;
case GTK_CSS_PROPERTY_FILTER:
return style->other->filter;
case GTK_CSS_PROPERTY_CARET_COLOR:
return style->font->caret_color ? style->font->caret_color : style->core->color;
case GTK_CSS_PROPERTY_SECONDARY_CARET_COLOR:
return style->font->secondary_caret_color ? style->font->secondary_caret_color : style->core->color;
case GTK_CSS_PROPERTY_FONT_FEATURE_SETTINGS:
return style->font->font_feature_settings;
case GTK_CSS_PROPERTY_FONT_VARIATION_SETTINGS:
return style->font->font_variation_settings;
default:
g_assert_not_reached ();
}
cssstyle: Rename GtkCssComputedValues => GtkCssStyle This is literally just renaming of the object (and the associated source files). No other changes are in there.
2014-10-22 21:41:50 +00:00
}
GtkCssSection *
gtk_css_style_get_section (GtkCssStyle *style,
guint id)
{
gtk_internal_return_val_if_fail (GTK_IS_CSS_STYLE (style), NULL);
cssstyle: Split into GtkCssStyle and GtkCssAnimatedStyle GtkCssStyle is the base class to be used for all types of styles that do exist. GtkCssAnimatedStyle is the only implementation so far, that is exactly a copy/paste of the old GtkCssStyle code.
2014-10-23 02:10:03 +00:00
return GTK_CSS_STYLE_GET_CLASS (style)->get_section (style, id);
cssstyle: Rename GtkCssComputedValues => GtkCssStyle This is literally just renaming of the object (and the associated source files). No other changes are in there.
2014-10-22 21:41:50 +00:00
}
cssstyle: Add gtk_css_style_is_static() Gets rid of the need to do if (ANIMATED_STYLE() && animated_style_is_static(ANIMATED_STYLE(style))
2015-02-27 17:41:13 +00:00
gboolean
gtk_css_style_is_static (GtkCssStyle *style)
{
return GTK_CSS_STYLE_GET_CLASS (style)->is_static (style);
}
Change the signature of gtk_css_style_get_static_style It is clearer if this function returns a GtkCssStaticStyle.
2020-01-16 18:56:07 +00:00
GtkCssStaticStyle *
css: Add gtk_css_style_get_static_style This lets us avoid poking directly at the GtkCssAnimatedStyle struct in gtkcssnode.c.
2020-01-13 03:44:58 +00:00
gtk_css_style_get_static_style (GtkCssStyle *style)
{
gtk_internal_return_val_if_fail (GTK_IS_CSS_STYLE (style), NULL);
return GTK_CSS_STYLE_GET_CLASS (style)->get_static_style (style);
}
Improve formatting of CSS style prints Add a newline after CSS properties, so things don't run into each other.
2016-01-03 22:05:16 +00:00
/*
* gtk_css_style_print:
* @style: a #GtkCssStyle
* @string: the #GString to print to
* @indent: level of indentation to use
* @skip_initial: %TRUE to skip properties that have their initial value
*
* Print the @style to @string, in CSS format. Every property is printed
* on a line by itself, indented by @indent spaces. If @skip_initial is
* %TRUE, properties are only printed if their value in @style is different
* from the initial value of the property.
*
* Returns: %TRUE is any properties have been printed
*/
gboolean
cssstyle: Rename GtkCssComputedValues => GtkCssStyle This is literally just renaming of the object (and the associated source files). No other changes are in there.
2014-10-22 21:41:50 +00:00
gtk_css_style_print (GtkCssStyle *style,
Redo CSS style printing Drop the custom style printing implementation in gtkcssnode.c and instead reuse the existing gtk_css_style_print function, extending it a bit to suit our needs. Instead of computing values, just recognize initial values by having no CSS section. Also do away with the show-initial flag, and just always filter out initial values. The flag can come back when it is needed.
2016-01-03 20:34:08 +00:00
GString *string,
guint indent,
gboolean skip_initial)
cssstyle: Rename GtkCssComputedValues => GtkCssStyle This is literally just renaming of the object (and the associated source files). No other changes are in there.
2014-10-22 21:41:50 +00:00
{
guint i;
Improve formatting of CSS style prints Add a newline after CSS properties, so things don't run into each other.
2016-01-03 22:05:16 +00:00
gboolean retval = FALSE;
cssstyle: Rename GtkCssComputedValues => GtkCssStyle This is literally just renaming of the object (and the associated source files). No other changes are in there.
2014-10-22 21:41:50 +00:00
cssstyle: fix a compiler warning
2016-01-04 01:20:06 +00:00
g_return_val_if_fail (GTK_IS_CSS_STYLE (style), FALSE);
g_return_val_if_fail (string != NULL, FALSE);
cssstyle: Rename GtkCssComputedValues => GtkCssStyle This is literally just renaming of the object (and the associated source files). No other changes are in there.
2014-10-22 21:41:50 +00:00
for (i = 0; i < _gtk_css_style_property_get_n_properties (); i++)
{
Redo CSS style printing Drop the custom style printing implementation in gtkcssnode.c and instead reuse the existing gtk_css_style_print function, extending it a bit to suit our needs. Instead of computing values, just recognize initial values by having no CSS section. Also do away with the show-initial flag, and just always filter out initial values. The flag can come back when it is needed.
2016-01-03 20:34:08 +00:00
GtkCssSection *section;
GtkCssStyleProperty *prop;
GtkCssValue *value;
const char *name;
section = gtk_css_style_get_section (style, i);
if (!section && skip_initial)
continue;
prop = _gtk_css_style_property_lookup_by_id (i);
name = _gtk_style_property_get_name (GTK_STYLE_PROPERTY (prop));
value = gtk_css_style_get_value (style, i);
g_string_append_printf (string, "%*s%s: ", indent, "", name);
_gtk_css_value_print (value, string);
g_string_append_c (string, ';');
cssstyle: Rename GtkCssComputedValues => GtkCssStyle This is literally just renaming of the object (and the associated source files). No other changes are in there.
2014-10-22 21:41:50 +00:00
if (section)
{
g_string_append (string, " /* ");
csssection: Make printing functions public
2019-04-10 15:23:14 +00:00
gtk_css_section_print (section, string);
cssstyle: Rename GtkCssComputedValues => GtkCssStyle This is literally just renaming of the object (and the associated source files). No other changes are in there.
2014-10-22 21:41:50 +00:00
g_string_append (string, " */");
}
Redo CSS style printing Drop the custom style printing implementation in gtkcssnode.c and instead reuse the existing gtk_css_style_print function, extending it a bit to suit our needs. Instead of computing values, just recognize initial values by having no CSS section. Also do away with the show-initial flag, and just always filter out initial values. The flag can come back when it is needed.
2016-01-03 20:34:08 +00:00
g_string_append_c (string, '\n');
Improve formatting of CSS style prints Add a newline after CSS properties, so things don't run into each other.
2016-01-03 22:05:16 +00:00
retval = TRUE;
cssstyle: Rename GtkCssComputedValues => GtkCssStyle This is literally just renaming of the object (and the associated source files). No other changes are in there.
2014-10-22 21:41:50 +00:00
}
Improve formatting of CSS style prints Add a newline after CSS properties, so things don't run into each other.
2016-01-03 22:05:16 +00:00
return retval;
cssstyle: Rename GtkCssComputedValues => GtkCssStyle This is literally just renaming of the object (and the associated source files). No other changes are in there.
2014-10-22 21:41:50 +00:00
}
char *
gtk_css_style_to_string (GtkCssStyle *style)
{
GString *string;
g_return_val_if_fail (GTK_IS_CSS_STYLE (style), NULL);
string = g_string_new ("");
Redo CSS style printing Drop the custom style printing implementation in gtkcssnode.c and instead reuse the existing gtk_css_style_print function, extending it a bit to suit our needs. Instead of computing values, just recognize initial values by having no CSS section. Also do away with the show-initial flag, and just always filter out initial values. The flag can come back when it is needed.
2016-01-03 20:34:08 +00:00
gtk_css_style_print (style, string, 0, FALSE);
cssstyle: Rename GtkCssComputedValues => GtkCssStyle This is literally just renaming of the object (and the associated source files). No other changes are in there.
2014-10-22 21:41:50 +00:00
return g_string_free (string, FALSE);
}
Add a function to turn a css style into pango attributes This is _gtk_style_context_get_pango_attributes, decoupled from the GtkStyleContext. This will be used to drive css-styled text rendering from css subnodes of widgets, e.g. for the value in GtkScale.
2016-06-03 04:19:24 +00:00
static PangoUnderline
get_pango_underline_from_style (GtkTextDecorationStyle style)
{
switch (style)
{
case GTK_CSS_TEXT_DECORATION_STYLE_DOUBLE:
return PANGO_UNDERLINE_DOUBLE;
case GTK_CSS_TEXT_DECORATION_STYLE_WAVY:
return PANGO_UNDERLINE_ERROR;
case GTK_CSS_TEXT_DECORATION_STYLE_SOLID:
default:
return PANGO_UNDERLINE_SINGLE;
}
g_return_val_if_reached (PANGO_UNDERLINE_SINGLE);
}
static PangoAttrList *
add_pango_attr (PangoAttrList *attrs,
PangoAttribute *attr)
{
if (attrs == NULL)
attrs = pango_attr_list_new ();
pango_attr_list_insert (attrs, attr);
return attrs;
}
css: Use enums instead of idents for font-variant properties As Benjamin says, ident should only be used if any value is valid, which is not the case here. So use enums instead, which should also be more efficient. To handle the more complicated cases like font-variant-ligatures, we have to introduce flags-like values.
2017-09-18 22:38:16 +00:00
static void
cssstyle: Only create PangoAttrList if there are attribtues Don't allocate a new GString if we never need it and therefore don't create the PangoAttrList if we have no attributes anyway. Update callers to handle the possible NULL return value.
2020-04-12 07:22:38 +00:00
append_separated (GString **s,
const char *text)
css: Use enums instead of idents for font-variant properties As Benjamin says, ident should only be used if any value is valid, which is not the case here. So use enums instead, which should also be more efficient. To handle the more complicated cases like font-variant-ligatures, we have to introduce flags-like values.
2017-09-18 22:38:16 +00:00
{
cssstyle: Only create PangoAttrList if there are attribtues Don't allocate a new GString if we never need it and therefore don't create the PangoAttrList if we have no attributes anyway. Update callers to handle the possible NULL return value.
2020-04-12 07:22:38 +00:00
if (G_UNLIKELY (!*s))
*s = g_string_new (NULL);
if ((*s)->len > 0)
g_string_append (*s, ", ");
g_string_append (*s, text);
css: Use enums instead of idents for font-variant properties As Benjamin says, ident should only be used if any value is valid, which is not the case here. So use enums instead, which should also be more efficient. To handle the more complicated cases like font-variant-ligatures, we have to introduce flags-like values.
2017-09-18 22:38:16 +00:00
}
Add a function to turn a css style into pango attributes This is _gtk_style_context_get_pango_attributes, decoupled from the GtkStyleContext. This will be used to drive css-styled text rendering from css subnodes of widgets, e.g. for the value in GtkScale.
2016-06-03 04:19:24 +00:00
PangoAttrList *
gtk_css_style_get_pango_attributes (GtkCssStyle *style)
{
PangoAttrList *attrs = NULL;
GtkTextDecorationLine decoration_line;
GtkTextDecorationStyle decoration_style;
const GdkRGBA *color;
const GdkRGBA *decoration_color;
gint letter_spacing;
css: Use enums instead of idents for font-variant properties As Benjamin says, ident should only be used if any value is valid, which is not the case here. So use enums instead, which should also be more efficient. To handle the more complicated cases like font-variant-ligatures, we have to introduce flags-like values.
2017-09-18 22:38:16 +00:00
GtkCssFontVariantLigature ligatures;
GtkCssFontVariantNumeric numeric;
GtkCssFontVariantEastAsian east_asian;
css: Implement font-variant-ligatures This gets translated into corresponding OpenType features.
2017-09-18 03:52:04 +00:00
GString *s;
Implement font-feature-settings This is a missing part of the CSS font level 3 module.
2017-12-20 15:29:33 +00:00
char *settings;
Add a function to turn a css style into pango attributes This is _gtk_style_context_get_pango_attributes, decoupled from the GtkStyleContext. This will be used to drive css-styled text rendering from css subnodes of widgets, e.g. for the value in GtkScale.
2016-06-03 04:19:24 +00:00
/* text-decoration */
Use style values directly Replace uses of gtk_css_style_get_value with direct access, throughout the tree. We don't replace all uses, just those where we are dealing with a fixed property. Be careful to handle the currentColor special case for color properties.
2020-01-28 07:38:25 +00:00
decoration_line = _gtk_css_text_decoration_line_value_get (style->font_variant->text_decoration_line);
decoration_style = _gtk_css_text_decoration_style_value_get (style->font_variant->text_decoration_style);
color = gtk_css_color_value_get_rgba (style->core->color);
decoration_color = gtk_css_color_value_get_rgba (style->font_variant->text_decoration_color
? style->font_variant->text_decoration_color
: style->core->color);
Add a function to turn a css style into pango attributes This is _gtk_style_context_get_pango_attributes, decoupled from the GtkStyleContext. This will be used to drive css-styled text rendering from css subnodes of widgets, e.g. for the value in GtkScale.
2016-06-03 04:19:24 +00:00
switch (decoration_line)
{
case GTK_CSS_TEXT_DECORATION_LINE_UNDERLINE:
attrs = add_pango_attr (attrs, pango_attr_underline_new (get_pango_underline_from_style (decoration_style)));
if (!gdk_rgba_equal (color, decoration_color))
attrs = add_pango_attr (attrs, pango_attr_underline_color_new (decoration_color->red * 65535. + 0.5,
decoration_color->green * 65535. + 0.5,
decoration_color->blue * 65535. + 0.5));
break;
case GTK_CSS_TEXT_DECORATION_LINE_LINE_THROUGH:
attrs = add_pango_attr (attrs, pango_attr_strikethrough_new (TRUE));
if (!gdk_rgba_equal (color, decoration_color))
attrs = add_pango_attr (attrs, pango_attr_strikethrough_color_new (decoration_color->red * 65535. + 0.5,
decoration_color->green * 65535. + 0.5,
decoration_color->blue * 65535. + 0.5));
break;
case GTK_CSS_TEXT_DECORATION_LINE_NONE:
default:
break;
}
/* letter-spacing */
Use style values directly Replace uses of gtk_css_style_get_value with direct access, throughout the tree. We don't replace all uses, just those where we are dealing with a fixed property. Be careful to handle the currentColor special case for color properties.
2020-01-28 07:38:25 +00:00
letter_spacing = _gtk_css_number_value_get (style->font->letter_spacing, 100);
Add a function to turn a css style into pango attributes This is _gtk_style_context_get_pango_attributes, decoupled from the GtkStyleContext. This will be used to drive css-styled text rendering from css subnodes of widgets, e.g. for the value in GtkScale.
2016-06-03 04:19:24 +00:00
if (letter_spacing != 0)
{
attrs = add_pango_attr (attrs, pango_attr_letter_spacing_new (letter_spacing * PANGO_SCALE));
}
css: Implement font-variant-ligatures This gets translated into corresponding OpenType features.
2017-09-18 03:52:04 +00:00
/* OpenType features */
css: Implement font-variant-position This gets translated to the corresponding OpenType features.
2017-09-18 04:01:39 +00:00
cssstyle: Only create PangoAttrList if there are attribtues Don't allocate a new GString if we never need it and therefore don't create the PangoAttrList if we have no attributes anyway. Update callers to handle the possible NULL return value.
2020-04-12 07:22:38 +00:00
s = NULL;
css: Implement font-variant-ligatures This gets translated into corresponding OpenType features.
2017-09-18 03:52:04 +00:00
Use style values directly Replace uses of gtk_css_style_get_value with direct access, throughout the tree. We don't replace all uses, just those where we are dealing with a fixed property. Be careful to handle the currentColor special case for color properties.
2020-01-28 07:38:25 +00:00
switch (_gtk_css_font_kerning_value_get (style->font_variant->font_kerning))
css: Implement font-variant-ligatures This gets translated into corresponding OpenType features.
2017-09-18 03:52:04 +00:00
{
css: Use enums instead of idents for font-variant properties As Benjamin says, ident should only be used if any value is valid, which is not the case here. So use enums instead, which should also be more efficient. To handle the more complicated cases like font-variant-ligatures, we have to introduce flags-like values.
2017-09-18 22:38:16 +00:00
case GTK_CSS_FONT_KERNING_NORMAL:
cssstyle: Only create PangoAttrList if there are attribtues Don't allocate a new GString if we never need it and therefore don't create the PangoAttrList if we have no attributes anyway. Update callers to handle the possible NULL return value.
2020-04-12 07:22:38 +00:00
append_separated (&s, "kern 1");
css: Use enums instead of idents for font-variant properties As Benjamin says, ident should only be used if any value is valid, which is not the case here. So use enums instead, which should also be more efficient. To handle the more complicated cases like font-variant-ligatures, we have to introduce flags-like values.
2017-09-18 22:38:16 +00:00
break;
case GTK_CSS_FONT_KERNING_NONE:
cssstyle: Only create PangoAttrList if there are attribtues Don't allocate a new GString if we never need it and therefore don't create the PangoAttrList if we have no attributes anyway. Update callers to handle the possible NULL return value.
2020-04-12 07:22:38 +00:00
append_separated (&s, "kern 0");
css: Use enums instead of idents for font-variant properties As Benjamin says, ident should only be used if any value is valid, which is not the case here. So use enums instead, which should also be more efficient. To handle the more complicated cases like font-variant-ligatures, we have to introduce flags-like values.
2017-09-18 22:38:16 +00:00
break;
build: Enable -Wswitch-enum and -Wswitch-default This patch makes that work using 1 of 2 options: 1. Add all missing enums to the switch statement or 2. Cast the switch argument to a uint to avoid having to do that (mostly for GdkEventType). I even found a bug while doing that: clearing a GtkImage with a surface did not notify thae surface property. The reason for enabling this flag even though it is tedious at times is that it is very useful when adding values to an enum, because it makes GTK immediately warn about all the switch statements where this enum is relevant. And I expect changes to enums to be frequent during the GTK4 development cycle.
2017-10-06 19:19:42 +00:00
case GTK_CSS_FONT_KERNING_AUTO:
default:
break;
css: Implement font-variant-ligatures This gets translated into corresponding OpenType features.
2017-09-18 03:52:04 +00:00
}
Use style values directly Replace uses of gtk_css_style_get_value with direct access, throughout the tree. We don't replace all uses, just those where we are dealing with a fixed property. Be careful to handle the currentColor special case for color properties.
2020-01-28 07:38:25 +00:00
ligatures = _gtk_css_font_variant_ligature_value_get (style->font_variant->font_variant_ligatures);
css: Use enums instead of idents for font-variant properties As Benjamin says, ident should only be used if any value is valid, which is not the case here. So use enums instead, which should also be more efficient. To handle the more complicated cases like font-variant-ligatures, we have to introduce flags-like values.
2017-09-18 22:38:16 +00:00
if (ligatures == GTK_CSS_FONT_VARIANT_LIGATURE_NORMAL)
css: Implement font-variant-position This gets translated to the corresponding OpenType features.
2017-09-18 04:01:39 +00:00
{
css: Use enums instead of idents for font-variant properties As Benjamin says, ident should only be used if any value is valid, which is not the case here. So use enums instead, which should also be more efficient. To handle the more complicated cases like font-variant-ligatures, we have to introduce flags-like values.
2017-09-18 22:38:16 +00:00
/* all defaults */
css: Implement font-variant-position This gets translated to the corresponding OpenType features.
2017-09-18 04:01:39 +00:00
}
css: Use enums instead of idents for font-variant properties As Benjamin says, ident should only be used if any value is valid, which is not the case here. So use enums instead, which should also be more efficient. To handle the more complicated cases like font-variant-ligatures, we have to introduce flags-like values.
2017-09-18 22:38:16 +00:00
else if (ligatures == GTK_CSS_FONT_VARIANT_LIGATURE_NONE)
cssstyle: Only create PangoAttrList if there are attribtues Don't allocate a new GString if we never need it and therefore don't create the PangoAttrList if we have no attributes anyway. Update callers to handle the possible NULL return value.
2020-04-12 07:22:38 +00:00
append_separated (&s, "liga 0, clig 0, dlig 0, hlig 0, calt 0");
css: Use enums instead of idents for font-variant properties As Benjamin says, ident should only be used if any value is valid, which is not the case here. So use enums instead, which should also be more efficient. To handle the more complicated cases like font-variant-ligatures, we have to introduce flags-like values.
2017-09-18 22:38:16 +00:00
else
css: Implement font-variant-position This gets translated to the corresponding OpenType features.
2017-09-18 04:01:39 +00:00
{
css: Use enums instead of idents for font-variant properties As Benjamin says, ident should only be used if any value is valid, which is not the case here. So use enums instead, which should also be more efficient. To handle the more complicated cases like font-variant-ligatures, we have to introduce flags-like values.
2017-09-18 22:38:16 +00:00
if (ligatures & GTK_CSS_FONT_VARIANT_LIGATURE_COMMON_LIGATURES)
cssstyle: Only create PangoAttrList if there are attribtues Don't allocate a new GString if we never need it and therefore don't create the PangoAttrList if we have no attributes anyway. Update callers to handle the possible NULL return value.
2020-04-12 07:22:38 +00:00
append_separated (&s, "liga 1, clig 1");
css: Use enums instead of idents for font-variant properties As Benjamin says, ident should only be used if any value is valid, which is not the case here. So use enums instead, which should also be more efficient. To handle the more complicated cases like font-variant-ligatures, we have to introduce flags-like values.
2017-09-18 22:38:16 +00:00
if (ligatures & GTK_CSS_FONT_VARIANT_LIGATURE_NO_COMMON_LIGATURES)
cssstyle: Only create PangoAttrList if there are attribtues Don't allocate a new GString if we never need it and therefore don't create the PangoAttrList if we have no attributes anyway. Update callers to handle the possible NULL return value.
2020-04-12 07:22:38 +00:00
append_separated (&s, "liga 0, clig 0");
css: Use enums instead of idents for font-variant properties As Benjamin says, ident should only be used if any value is valid, which is not the case here. So use enums instead, which should also be more efficient. To handle the more complicated cases like font-variant-ligatures, we have to introduce flags-like values.
2017-09-18 22:38:16 +00:00
if (ligatures & GTK_CSS_FONT_VARIANT_LIGATURE_DISCRETIONARY_LIGATURES)
cssstyle: Only create PangoAttrList if there are attribtues Don't allocate a new GString if we never need it and therefore don't create the PangoAttrList if we have no attributes anyway. Update callers to handle the possible NULL return value.
2020-04-12 07:22:38 +00:00
append_separated (&s, "dlig 1");
css: Use enums instead of idents for font-variant properties As Benjamin says, ident should only be used if any value is valid, which is not the case here. So use enums instead, which should also be more efficient. To handle the more complicated cases like font-variant-ligatures, we have to introduce flags-like values.
2017-09-18 22:38:16 +00:00
if (ligatures & GTK_CSS_FONT_VARIANT_LIGATURE_NO_DISCRETIONARY_LIGATURES)
cssstyle: Only create PangoAttrList if there are attribtues Don't allocate a new GString if we never need it and therefore don't create the PangoAttrList if we have no attributes anyway. Update callers to handle the possible NULL return value.
2020-04-12 07:22:38 +00:00
append_separated (&s, "dlig 0");
css: Use enums instead of idents for font-variant properties As Benjamin says, ident should only be used if any value is valid, which is not the case here. So use enums instead, which should also be more efficient. To handle the more complicated cases like font-variant-ligatures, we have to introduce flags-like values.
2017-09-18 22:38:16 +00:00
if (ligatures & GTK_CSS_FONT_VARIANT_LIGATURE_HISTORICAL_LIGATURES)
cssstyle: Only create PangoAttrList if there are attribtues Don't allocate a new GString if we never need it and therefore don't create the PangoAttrList if we have no attributes anyway. Update callers to handle the possible NULL return value.
2020-04-12 07:22:38 +00:00
append_separated (&s, "hlig 1");
css: Use enums instead of idents for font-variant properties As Benjamin says, ident should only be used if any value is valid, which is not the case here. So use enums instead, which should also be more efficient. To handle the more complicated cases like font-variant-ligatures, we have to introduce flags-like values.
2017-09-18 22:38:16 +00:00
if (ligatures & GTK_CSS_FONT_VARIANT_LIGATURE_NO_HISTORICAL_LIGATURES)
cssstyle: Only create PangoAttrList if there are attribtues Don't allocate a new GString if we never need it and therefore don't create the PangoAttrList if we have no attributes anyway. Update callers to handle the possible NULL return value.
2020-04-12 07:22:38 +00:00
append_separated (&s, "hlig 0");
css: Use enums instead of idents for font-variant properties As Benjamin says, ident should only be used if any value is valid, which is not the case here. So use enums instead, which should also be more efficient. To handle the more complicated cases like font-variant-ligatures, we have to introduce flags-like values.
2017-09-18 22:38:16 +00:00
if (ligatures & GTK_CSS_FONT_VARIANT_LIGATURE_CONTEXTUAL)
cssstyle: Only create PangoAttrList if there are attribtues Don't allocate a new GString if we never need it and therefore don't create the PangoAttrList if we have no attributes anyway. Update callers to handle the possible NULL return value.
2020-04-12 07:22:38 +00:00
append_separated (&s, "calt 1");
css: Use enums instead of idents for font-variant properties As Benjamin says, ident should only be used if any value is valid, which is not the case here. So use enums instead, which should also be more efficient. To handle the more complicated cases like font-variant-ligatures, we have to introduce flags-like values.
2017-09-18 22:38:16 +00:00
if (ligatures & GTK_CSS_FONT_VARIANT_LIGATURE_NO_CONTEXTUAL)
cssstyle: Only create PangoAttrList if there are attribtues Don't allocate a new GString if we never need it and therefore don't create the PangoAttrList if we have no attributes anyway. Update callers to handle the possible NULL return value.
2020-04-12 07:22:38 +00:00
append_separated (&s, "calt 0");
css: Implement font-variant-position This gets translated to the corresponding OpenType features.
2017-09-18 04:01:39 +00:00
}
Use style values directly Replace uses of gtk_css_style_get_value with direct access, throughout the tree. We don't replace all uses, just those where we are dealing with a fixed property. Be careful to handle the currentColor special case for color properties.
2020-01-28 07:38:25 +00:00
switch (_gtk_css_font_variant_position_value_get (style->font_variant->font_variant_position))
css: Implement font-variant-caps This gets translated to the corresponding OpenType features.
2017-09-18 04:12:12 +00:00
{
css: Use enums instead of idents for font-variant properties As Benjamin says, ident should only be used if any value is valid, which is not the case here. So use enums instead, which should also be more efficient. To handle the more complicated cases like font-variant-ligatures, we have to introduce flags-like values.
2017-09-18 22:38:16 +00:00
case GTK_CSS_FONT_VARIANT_POSITION_SUB:
cssstyle: Only create PangoAttrList if there are attribtues Don't allocate a new GString if we never need it and therefore don't create the PangoAttrList if we have no attributes anyway. Update callers to handle the possible NULL return value.
2020-04-12 07:22:38 +00:00
append_separated (&s, "subs 1");
css: Use enums instead of idents for font-variant properties As Benjamin says, ident should only be used if any value is valid, which is not the case here. So use enums instead, which should also be more efficient. To handle the more complicated cases like font-variant-ligatures, we have to introduce flags-like values.
2017-09-18 22:38:16 +00:00
break;
case GTK_CSS_FONT_VARIANT_POSITION_SUPER:
cssstyle: Only create PangoAttrList if there are attribtues Don't allocate a new GString if we never need it and therefore don't create the PangoAttrList if we have no attributes anyway. Update callers to handle the possible NULL return value.
2020-04-12 07:22:38 +00:00
append_separated (&s, "sups 1");
css: Use enums instead of idents for font-variant properties As Benjamin says, ident should only be used if any value is valid, which is not the case here. So use enums instead, which should also be more efficient. To handle the more complicated cases like font-variant-ligatures, we have to introduce flags-like values.
2017-09-18 22:38:16 +00:00
break;
build: Enable -Wswitch-enum and -Wswitch-default This patch makes that work using 1 of 2 options: 1. Add all missing enums to the switch statement or 2. Cast the switch argument to a uint to avoid having to do that (mostly for GdkEventType). I even found a bug while doing that: clearing a GtkImage with a surface did not notify thae surface property. The reason for enabling this flag even though it is tedious at times is that it is very useful when adding values to an enum, because it makes GTK immediately warn about all the switch statements where this enum is relevant. And I expect changes to enums to be frequent during the GTK4 development cycle.
2017-10-06 19:19:42 +00:00
case GTK_CSS_FONT_VARIANT_POSITION_NORMAL:
default:
break;
css: Implement font-variant-caps This gets translated to the corresponding OpenType features.
2017-09-18 04:12:12 +00:00
}
css: Use enums instead of idents for font-variant properties As Benjamin says, ident should only be used if any value is valid, which is not the case here. So use enums instead, which should also be more efficient. To handle the more complicated cases like font-variant-ligatures, we have to introduce flags-like values.
2017-09-18 22:38:16 +00:00
Use style values directly Replace uses of gtk_css_style_get_value with direct access, throughout the tree. We don't replace all uses, just those where we are dealing with a fixed property. Be careful to handle the currentColor special case for color properties.
2020-01-28 07:38:25 +00:00
switch (_gtk_css_font_variant_caps_value_get (style->font_variant->font_variant_caps))
css: Implement font-variant-caps This gets translated to the corresponding OpenType features.
2017-09-18 04:12:12 +00:00
{
css: Use enums instead of idents for font-variant properties As Benjamin says, ident should only be used if any value is valid, which is not the case here. So use enums instead, which should also be more efficient. To handle the more complicated cases like font-variant-ligatures, we have to introduce flags-like values.
2017-09-18 22:38:16 +00:00
case GTK_CSS_FONT_VARIANT_CAPS_SMALL_CAPS:
cssstyle: Only create PangoAttrList if there are attribtues Don't allocate a new GString if we never need it and therefore don't create the PangoAttrList if we have no attributes anyway. Update callers to handle the possible NULL return value.
2020-04-12 07:22:38 +00:00
append_separated (&s, "smcp 1");
css: Use enums instead of idents for font-variant properties As Benjamin says, ident should only be used if any value is valid, which is not the case here. So use enums instead, which should also be more efficient. To handle the more complicated cases like font-variant-ligatures, we have to introduce flags-like values.
2017-09-18 22:38:16 +00:00
break;
case GTK_CSS_FONT_VARIANT_CAPS_ALL_SMALL_CAPS:
cssstyle: Only create PangoAttrList if there are attribtues Don't allocate a new GString if we never need it and therefore don't create the PangoAttrList if we have no attributes anyway. Update callers to handle the possible NULL return value.
2020-04-12 07:22:38 +00:00
append_separated (&s, "c2sc 1, smcp 1");
css: Use enums instead of idents for font-variant properties As Benjamin says, ident should only be used if any value is valid, which is not the case here. So use enums instead, which should also be more efficient. To handle the more complicated cases like font-variant-ligatures, we have to introduce flags-like values.
2017-09-18 22:38:16 +00:00
break;
case GTK_CSS_FONT_VARIANT_CAPS_PETITE_CAPS:
cssstyle: Only create PangoAttrList if there are attribtues Don't allocate a new GString if we never need it and therefore don't create the PangoAttrList if we have no attributes anyway. Update callers to handle the possible NULL return value.
2020-04-12 07:22:38 +00:00
append_separated (&s, "pcap 1");
css: Use enums instead of idents for font-variant properties As Benjamin says, ident should only be used if any value is valid, which is not the case here. So use enums instead, which should also be more efficient. To handle the more complicated cases like font-variant-ligatures, we have to introduce flags-like values.
2017-09-18 22:38:16 +00:00
break;
case GTK_CSS_FONT_VARIANT_CAPS_ALL_PETITE_CAPS:
cssstyle: Only create PangoAttrList if there are attribtues Don't allocate a new GString if we never need it and therefore don't create the PangoAttrList if we have no attributes anyway. Update callers to handle the possible NULL return value.
2020-04-12 07:22:38 +00:00
append_separated (&s, "c2pc 1, pcap 1");
css: Use enums instead of idents for font-variant properties As Benjamin says, ident should only be used if any value is valid, which is not the case here. So use enums instead, which should also be more efficient. To handle the more complicated cases like font-variant-ligatures, we have to introduce flags-like values.
2017-09-18 22:38:16 +00:00
break;
case GTK_CSS_FONT_VARIANT_CAPS_UNICASE:
cssstyle: Only create PangoAttrList if there are attribtues Don't allocate a new GString if we never need it and therefore don't create the PangoAttrList if we have no attributes anyway. Update callers to handle the possible NULL return value.
2020-04-12 07:22:38 +00:00
append_separated (&s, "unic 1");
css: Use enums instead of idents for font-variant properties As Benjamin says, ident should only be used if any value is valid, which is not the case here. So use enums instead, which should also be more efficient. To handle the more complicated cases like font-variant-ligatures, we have to introduce flags-like values.
2017-09-18 22:38:16 +00:00
break;
case GTK_CSS_FONT_VARIANT_CAPS_TITLING_CAPS:
cssstyle: Only create PangoAttrList if there are attribtues Don't allocate a new GString if we never need it and therefore don't create the PangoAttrList if we have no attributes anyway. Update callers to handle the possible NULL return value.
2020-04-12 07:22:38 +00:00
append_separated (&s, "titl 1");
build: Enable -Wswitch-enum and -Wswitch-default This patch makes that work using 1 of 2 options: 1. Add all missing enums to the switch statement or 2. Cast the switch argument to a uint to avoid having to do that (mostly for GdkEventType). I even found a bug while doing that: clearing a GtkImage with a surface did not notify thae surface property. The reason for enabling this flag even though it is tedious at times is that it is very useful when adding values to an enum, because it makes GTK immediately warn about all the switch statements where this enum is relevant. And I expect changes to enums to be frequent during the GTK4 development cycle.
2017-10-06 19:19:42 +00:00
break;
case GTK_CSS_FONT_VARIANT_CAPS_NORMAL:
default:
break;
css: Implement font-variant-caps This gets translated to the corresponding OpenType features.
2017-09-18 04:12:12 +00:00
}
css: Use enums instead of idents for font-variant properties As Benjamin says, ident should only be used if any value is valid, which is not the case here. So use enums instead, which should also be more efficient. To handle the more complicated cases like font-variant-ligatures, we have to introduce flags-like values.
2017-09-18 22:38:16 +00:00
Use style values directly Replace uses of gtk_css_style_get_value with direct access, throughout the tree. We don't replace all uses, just those where we are dealing with a fixed property. Be careful to handle the currentColor special case for color properties.
2020-01-28 07:38:25 +00:00
numeric = _gtk_css_font_variant_numeric_value_get (style->font_variant->font_variant_numeric);
css: Use enums instead of idents for font-variant properties As Benjamin says, ident should only be used if any value is valid, which is not the case here. So use enums instead, which should also be more efficient. To handle the more complicated cases like font-variant-ligatures, we have to introduce flags-like values.
2017-09-18 22:38:16 +00:00
if (numeric == GTK_CSS_FONT_VARIANT_NUMERIC_NORMAL)
css: Implement font-variant-caps This gets translated to the corresponding OpenType features.
2017-09-18 04:12:12 +00:00
{
css: Use enums instead of idents for font-variant properties As Benjamin says, ident should only be used if any value is valid, which is not the case here. So use enums instead, which should also be more efficient. To handle the more complicated cases like font-variant-ligatures, we have to introduce flags-like values.
2017-09-18 22:38:16 +00:00
/* all defaults */
css: Implement font-variant-caps This gets translated to the corresponding OpenType features.
2017-09-18 04:12:12 +00:00
}
css: Use enums instead of idents for font-variant properties As Benjamin says, ident should only be used if any value is valid, which is not the case here. So use enums instead, which should also be more efficient. To handle the more complicated cases like font-variant-ligatures, we have to introduce flags-like values.
2017-09-18 22:38:16 +00:00
else
css: Implement font-variant-caps This gets translated to the corresponding OpenType features.
2017-09-18 04:12:12 +00:00
{
css: Use enums instead of idents for font-variant properties As Benjamin says, ident should only be used if any value is valid, which is not the case here. So use enums instead, which should also be more efficient. To handle the more complicated cases like font-variant-ligatures, we have to introduce flags-like values.
2017-09-18 22:38:16 +00:00
if (numeric & GTK_CSS_FONT_VARIANT_NUMERIC_LINING_NUMS)
cssstyle: Only create PangoAttrList if there are attribtues Don't allocate a new GString if we never need it and therefore don't create the PangoAttrList if we have no attributes anyway. Update callers to handle the possible NULL return value.
2020-04-12 07:22:38 +00:00
append_separated (&s, "lnum 1");
css: Use enums instead of idents for font-variant properties As Benjamin says, ident should only be used if any value is valid, which is not the case here. So use enums instead, which should also be more efficient. To handle the more complicated cases like font-variant-ligatures, we have to introduce flags-like values.
2017-09-18 22:38:16 +00:00
if (numeric & GTK_CSS_FONT_VARIANT_NUMERIC_OLDSTYLE_NUMS)
cssstyle: Only create PangoAttrList if there are attribtues Don't allocate a new GString if we never need it and therefore don't create the PangoAttrList if we have no attributes anyway. Update callers to handle the possible NULL return value.
2020-04-12 07:22:38 +00:00
append_separated (&s, "onum 1");
css: Use enums instead of idents for font-variant properties As Benjamin says, ident should only be used if any value is valid, which is not the case here. So use enums instead, which should also be more efficient. To handle the more complicated cases like font-variant-ligatures, we have to introduce flags-like values.
2017-09-18 22:38:16 +00:00
if (numeric & GTK_CSS_FONT_VARIANT_NUMERIC_PROPORTIONAL_NUMS)
cssstyle: Only create PangoAttrList if there are attribtues Don't allocate a new GString if we never need it and therefore don't create the PangoAttrList if we have no attributes anyway. Update callers to handle the possible NULL return value.
2020-04-12 07:22:38 +00:00
append_separated (&s, "pnum 1");
css: Use enums instead of idents for font-variant properties As Benjamin says, ident should only be used if any value is valid, which is not the case here. So use enums instead, which should also be more efficient. To handle the more complicated cases like font-variant-ligatures, we have to introduce flags-like values.
2017-09-18 22:38:16 +00:00
if (numeric & GTK_CSS_FONT_VARIANT_NUMERIC_TABULAR_NUMS)
cssstyle: Only create PangoAttrList if there are attribtues Don't allocate a new GString if we never need it and therefore don't create the PangoAttrList if we have no attributes anyway. Update callers to handle the possible NULL return value.
2020-04-12 07:22:38 +00:00
append_separated (&s, "tnum 1");
css: Use enums instead of idents for font-variant properties As Benjamin says, ident should only be used if any value is valid, which is not the case here. So use enums instead, which should also be more efficient. To handle the more complicated cases like font-variant-ligatures, we have to introduce flags-like values.
2017-09-18 22:38:16 +00:00
if (numeric & GTK_CSS_FONT_VARIANT_NUMERIC_DIAGONAL_FRACTIONS)
cssstyle: Only create PangoAttrList if there are attribtues Don't allocate a new GString if we never need it and therefore don't create the PangoAttrList if we have no attributes anyway. Update callers to handle the possible NULL return value.
2020-04-12 07:22:38 +00:00
append_separated (&s, "frac 1");
css: Use enums instead of idents for font-variant properties As Benjamin says, ident should only be used if any value is valid, which is not the case here. So use enums instead, which should also be more efficient. To handle the more complicated cases like font-variant-ligatures, we have to introduce flags-like values.
2017-09-18 22:38:16 +00:00
if (numeric & GTK_CSS_FONT_VARIANT_NUMERIC_STACKED_FRACTIONS)
cssstyle: Only create PangoAttrList if there are attribtues Don't allocate a new GString if we never need it and therefore don't create the PangoAttrList if we have no attributes anyway. Update callers to handle the possible NULL return value.
2020-04-12 07:22:38 +00:00
append_separated (&s, "afrc 1");
css: Use enums instead of idents for font-variant properties As Benjamin says, ident should only be used if any value is valid, which is not the case here. So use enums instead, which should also be more efficient. To handle the more complicated cases like font-variant-ligatures, we have to introduce flags-like values.
2017-09-18 22:38:16 +00:00
if (numeric & GTK_CSS_FONT_VARIANT_NUMERIC_ORDINAL)
cssstyle: Only create PangoAttrList if there are attribtues Don't allocate a new GString if we never need it and therefore don't create the PangoAttrList if we have no attributes anyway. Update callers to handle the possible NULL return value.
2020-04-12 07:22:38 +00:00
append_separated (&s, "ordn 1");
css: Use enums instead of idents for font-variant properties As Benjamin says, ident should only be used if any value is valid, which is not the case here. So use enums instead, which should also be more efficient. To handle the more complicated cases like font-variant-ligatures, we have to introduce flags-like values.
2017-09-18 22:38:16 +00:00
if (numeric & GTK_CSS_FONT_VARIANT_NUMERIC_SLASHED_ZERO)
cssstyle: Only create PangoAttrList if there are attribtues Don't allocate a new GString if we never need it and therefore don't create the PangoAttrList if we have no attributes anyway. Update callers to handle the possible NULL return value.
2020-04-12 07:22:38 +00:00
append_separated (&s, "zero 1");
css: Implement font-variant-caps This gets translated to the corresponding OpenType features.
2017-09-18 04:12:12 +00:00
}
Use style values directly Replace uses of gtk_css_style_get_value with direct access, throughout the tree. We don't replace all uses, just those where we are dealing with a fixed property. Be careful to handle the currentColor special case for color properties.
2020-01-28 07:38:25 +00:00
switch (_gtk_css_font_variant_alternate_value_get (style->font_variant->font_variant_alternates))
css: Implement font-variant-numeric This gets translated to the corresponding OpenType features.
2017-09-18 11:34:46 +00:00
{
css: Use enums instead of idents for font-variant properties As Benjamin says, ident should only be used if any value is valid, which is not the case here. So use enums instead, which should also be more efficient. To handle the more complicated cases like font-variant-ligatures, we have to introduce flags-like values.
2017-09-18 22:38:16 +00:00
case GTK_CSS_FONT_VARIANT_ALTERNATE_HISTORICAL_FORMS:
cssstyle: Only create PangoAttrList if there are attribtues Don't allocate a new GString if we never need it and therefore don't create the PangoAttrList if we have no attributes anyway. Update callers to handle the possible NULL return value.
2020-04-12 07:22:38 +00:00
append_separated (&s, "hist 1");
css: Use enums instead of idents for font-variant properties As Benjamin says, ident should only be used if any value is valid, which is not the case here. So use enums instead, which should also be more efficient. To handle the more complicated cases like font-variant-ligatures, we have to introduce flags-like values.
2017-09-18 22:38:16 +00:00
break;
build: Enable -Wswitch-enum and -Wswitch-default This patch makes that work using 1 of 2 options: 1. Add all missing enums to the switch statement or 2. Cast the switch argument to a uint to avoid having to do that (mostly for GdkEventType). I even found a bug while doing that: clearing a GtkImage with a surface did not notify thae surface property. The reason for enabling this flag even though it is tedious at times is that it is very useful when adding values to an enum, because it makes GTK immediately warn about all the switch statements where this enum is relevant. And I expect changes to enums to be frequent during the GTK4 development cycle.
2017-10-06 19:19:42 +00:00
case GTK_CSS_FONT_VARIANT_ALTERNATE_NORMAL:
default:
break;
css: Implement font-variant-numeric This gets translated to the corresponding OpenType features.
2017-09-18 11:34:46 +00:00
}
Use style values directly Replace uses of gtk_css_style_get_value with direct access, throughout the tree. We don't replace all uses, just those where we are dealing with a fixed property. Be careful to handle the currentColor special case for color properties.
2020-01-28 07:38:25 +00:00
east_asian = _gtk_css_font_variant_east_asian_value_get (style->font_variant->font_variant_east_asian);
css: Use enums instead of idents for font-variant properties As Benjamin says, ident should only be used if any value is valid, which is not the case here. So use enums instead, which should also be more efficient. To handle the more complicated cases like font-variant-ligatures, we have to introduce flags-like values.
2017-09-18 22:38:16 +00:00
if (east_asian == GTK_CSS_FONT_VARIANT_EAST_ASIAN_NORMAL)
css: Implement font-variant-alternatives This is only a partial implementation, since we don't support @font-feature-values. The only supported value is historical-forms, for now.
2017-09-18 14:01:05 +00:00
{
css: Use enums instead of idents for font-variant properties As Benjamin says, ident should only be used if any value is valid, which is not the case here. So use enums instead, which should also be more efficient. To handle the more complicated cases like font-variant-ligatures, we have to introduce flags-like values.
2017-09-18 22:38:16 +00:00
/* all defaults */
css: Implement font-variant-alternatives This is only a partial implementation, since we don't support @font-feature-values. The only supported value is historical-forms, for now.
2017-09-18 14:01:05 +00:00
}
css: Use enums instead of idents for font-variant properties As Benjamin says, ident should only be used if any value is valid, which is not the case here. So use enums instead, which should also be more efficient. To handle the more complicated cases like font-variant-ligatures, we have to introduce flags-like values.
2017-09-18 22:38:16 +00:00
else
css: Implement font-variant-east-asian This is translated to the corresponding OpenType features.
2017-09-18 16:42:42 +00:00
{
css: Use enums instead of idents for font-variant properties As Benjamin says, ident should only be used if any value is valid, which is not the case here. So use enums instead, which should also be more efficient. To handle the more complicated cases like font-variant-ligatures, we have to introduce flags-like values.
2017-09-18 22:38:16 +00:00
if (east_asian & GTK_CSS_FONT_VARIANT_EAST_ASIAN_JIS78)
cssstyle: Only create PangoAttrList if there are attribtues Don't allocate a new GString if we never need it and therefore don't create the PangoAttrList if we have no attributes anyway. Update callers to handle the possible NULL return value.
2020-04-12 07:22:38 +00:00
append_separated (&s, "jp78 1");
css: Use enums instead of idents for font-variant properties As Benjamin says, ident should only be used if any value is valid, which is not the case here. So use enums instead, which should also be more efficient. To handle the more complicated cases like font-variant-ligatures, we have to introduce flags-like values.
2017-09-18 22:38:16 +00:00
if (east_asian & GTK_CSS_FONT_VARIANT_EAST_ASIAN_JIS83)
cssstyle: Only create PangoAttrList if there are attribtues Don't allocate a new GString if we never need it and therefore don't create the PangoAttrList if we have no attributes anyway. Update callers to handle the possible NULL return value.
2020-04-12 07:22:38 +00:00
append_separated (&s, "jp83 1");
css: Use enums instead of idents for font-variant properties As Benjamin says, ident should only be used if any value is valid, which is not the case here. So use enums instead, which should also be more efficient. To handle the more complicated cases like font-variant-ligatures, we have to introduce flags-like values.
2017-09-18 22:38:16 +00:00
if (east_asian & GTK_CSS_FONT_VARIANT_EAST_ASIAN_JIS90)
cssstyle: Only create PangoAttrList if there are attribtues Don't allocate a new GString if we never need it and therefore don't create the PangoAttrList if we have no attributes anyway. Update callers to handle the possible NULL return value.
2020-04-12 07:22:38 +00:00
append_separated (&s, "jp90 1");
css: Use enums instead of idents for font-variant properties As Benjamin says, ident should only be used if any value is valid, which is not the case here. So use enums instead, which should also be more efficient. To handle the more complicated cases like font-variant-ligatures, we have to introduce flags-like values.
2017-09-18 22:38:16 +00:00
if (east_asian & GTK_CSS_FONT_VARIANT_EAST_ASIAN_JIS04)
cssstyle: Only create PangoAttrList if there are attribtues Don't allocate a new GString if we never need it and therefore don't create the PangoAttrList if we have no attributes anyway. Update callers to handle the possible NULL return value.
2020-04-12 07:22:38 +00:00
append_separated (&s, "jp04 1");
css: Use enums instead of idents for font-variant properties As Benjamin says, ident should only be used if any value is valid, which is not the case here. So use enums instead, which should also be more efficient. To handle the more complicated cases like font-variant-ligatures, we have to introduce flags-like values.
2017-09-18 22:38:16 +00:00
if (east_asian & GTK_CSS_FONT_VARIANT_EAST_ASIAN_SIMPLIFIED)
cssstyle: Only create PangoAttrList if there are attribtues Don't allocate a new GString if we never need it and therefore don't create the PangoAttrList if we have no attributes anyway. Update callers to handle the possible NULL return value.
2020-04-12 07:22:38 +00:00
append_separated (&s, "smpl 1");
css: Use enums instead of idents for font-variant properties As Benjamin says, ident should only be used if any value is valid, which is not the case here. So use enums instead, which should also be more efficient. To handle the more complicated cases like font-variant-ligatures, we have to introduce flags-like values.
2017-09-18 22:38:16 +00:00
if (east_asian & GTK_CSS_FONT_VARIANT_EAST_ASIAN_TRADITIONAL)
cssstyle: Only create PangoAttrList if there are attribtues Don't allocate a new GString if we never need it and therefore don't create the PangoAttrList if we have no attributes anyway. Update callers to handle the possible NULL return value.
2020-04-12 07:22:38 +00:00
append_separated (&s, "trad 1");
css: Use enums instead of idents for font-variant properties As Benjamin says, ident should only be used if any value is valid, which is not the case here. So use enums instead, which should also be more efficient. To handle the more complicated cases like font-variant-ligatures, we have to introduce flags-like values.
2017-09-18 22:38:16 +00:00
if (east_asian & GTK_CSS_FONT_VARIANT_EAST_ASIAN_FULL_WIDTH)
cssstyle: Only create PangoAttrList if there are attribtues Don't allocate a new GString if we never need it and therefore don't create the PangoAttrList if we have no attributes anyway. Update callers to handle the possible NULL return value.
2020-04-12 07:22:38 +00:00
append_separated (&s, "fwid 1");
css: Use enums instead of idents for font-variant properties As Benjamin says, ident should only be used if any value is valid, which is not the case here. So use enums instead, which should also be more efficient. To handle the more complicated cases like font-variant-ligatures, we have to introduce flags-like values.
2017-09-18 22:38:16 +00:00
if (east_asian & GTK_CSS_FONT_VARIANT_EAST_ASIAN_PROPORTIONAL)
cssstyle: Only create PangoAttrList if there are attribtues Don't allocate a new GString if we never need it and therefore don't create the PangoAttrList if we have no attributes anyway. Update callers to handle the possible NULL return value.
2020-04-12 07:22:38 +00:00
append_separated (&s, "pwid 1");
css: Use enums instead of idents for font-variant properties As Benjamin says, ident should only be used if any value is valid, which is not the case here. So use enums instead, which should also be more efficient. To handle the more complicated cases like font-variant-ligatures, we have to introduce flags-like values.
2017-09-18 22:38:16 +00:00
if (east_asian & GTK_CSS_FONT_VARIANT_EAST_ASIAN_RUBY)
cssstyle: Only create PangoAttrList if there are attribtues Don't allocate a new GString if we never need it and therefore don't create the PangoAttrList if we have no attributes anyway. Update callers to handle the possible NULL return value.
2020-04-12 07:22:38 +00:00
append_separated (&s, "ruby 1");
css: Implement font-variant-east-asian This is translated to the corresponding OpenType features.
2017-09-18 16:42:42 +00:00
}
Use style values directly Replace uses of gtk_css_style_get_value with direct access, throughout the tree. We don't replace all uses, just those where we are dealing with a fixed property. Be careful to handle the currentColor special case for color properties.
2020-01-28 07:38:25 +00:00
settings = gtk_css_font_features_value_get_features (style->font->font_feature_settings);
Implement font-feature-settings This is a missing part of the CSS font level 3 module.
2017-12-20 15:29:33 +00:00
if (settings)
{
cssstyle: Only create PangoAttrList if there are attribtues Don't allocate a new GString if we never need it and therefore don't create the PangoAttrList if we have no attributes anyway. Update callers to handle the possible NULL return value.
2020-04-12 07:22:38 +00:00
append_separated (&s, settings);
Implement font-feature-settings This is a missing part of the CSS font level 3 module.
2017-12-20 15:29:33 +00:00
g_free (settings);
}
cssstyle: Only create PangoAttrList if there are attribtues Don't allocate a new GString if we never need it and therefore don't create the PangoAttrList if we have no attributes anyway. Update callers to handle the possible NULL return value.
2020-04-12 07:22:38 +00:00
if (s)
{
attrs = add_pango_attr (attrs, pango_attr_font_features_new (s->str));
g_string_free (s, TRUE);
}
css: Implement font-kerning This gets translated to the OpenType feature kern.
2017-09-18 01:27:59 +00:00
Add a function to turn a css style into pango attributes This is _gtk_style_context_get_pango_attributes, decoupled from the GtkStyleContext. This will be used to drive css-styled text rendering from css subnodes of widgets, e.g. for the value in GtkScale.
2016-06-03 04:19:24 +00:00
return attrs;
}
Add a function to get a font from a css style Similar in spirit to gtk_style_context_get (ctx, state, "font", ...) but avoids the need for a style context. This will be used to for css-styled text rendering from css subnodes.
2016-06-03 04:29:05 +00:00
PangoFontDescription *
gtk_css_style_get_pango_font (GtkCssStyle *style)
{
cssstyle: Implement get_pango_font() directly Instead of going through the slow GValue code path. This function was unused, so use it in GtkWidget's update_pango_context() now.
2020-01-16 10:27:37 +00:00
PangoFontDescription *description;
GtkCssValue *v;
cssstyle: set font variations in get_pango_font() Doesn't make sense to set all the css values on the font description in there except for the font variations, so do these here as well.
2020-01-16 10:33:12 +00:00
char *str;
cssstyle: Implement get_pango_font() directly Instead of going through the slow GValue code path. This function was unused, so use it in GtkWidget's update_pango_context() now.
2020-01-16 10:27:37 +00:00
description = pango_font_description_new ();
Use style values directly Replace uses of gtk_css_style_get_value with direct access, throughout the tree. We don't replace all uses, just those where we are dealing with a fixed property. Be careful to handle the currentColor special case for color properties.
2020-01-28 07:38:25 +00:00
v = style->font->font_family;
cssstyle: Implement get_pango_font() directly Instead of going through the slow GValue code path. This function was unused, so use it in GtkWidget's update_pango_context() now.
2020-01-16 10:27:37 +00:00
if (_gtk_css_array_value_get_n_values (v) > 1)
{
int i;
GString *s = g_string_new ("");
for (i = 0; i < _gtk_css_array_value_get_n_values (v); i++)
{
if (i > 0)
g_string_append (s, ",");
g_string_append (s, _gtk_css_string_value_get (_gtk_css_array_value_get_nth (v, i)));
}
pango_font_description_set_family (description, s->str);
g_string_free (s, TRUE);
}
else
{
pango_font_description_set_family (description,
_gtk_css_string_value_get (_gtk_css_array_value_get_nth (v, 0)));
}
Use style values directly Replace uses of gtk_css_style_get_value with direct access, throughout the tree. We don't replace all uses, just those where we are dealing with a fixed property. Be careful to handle the currentColor special case for color properties.
2020-01-28 07:38:25 +00:00
v = style->core->font_size;
cssstyle: Implement get_pango_font() directly Instead of going through the slow GValue code path. This function was unused, so use it in GtkWidget's update_pango_context() now.
2020-01-16 10:27:37 +00:00
pango_font_description_set_absolute_size (description, round (_gtk_css_number_value_get (v, 100) * PANGO_SCALE));
Use style values directly Replace uses of gtk_css_style_get_value with direct access, throughout the tree. We don't replace all uses, just those where we are dealing with a fixed property. Be careful to handle the currentColor special case for color properties.
2020-01-28 07:38:25 +00:00
v = style->font->font_style;
cssstyle: Implement get_pango_font() directly Instead of going through the slow GValue code path. This function was unused, so use it in GtkWidget's update_pango_context() now.
2020-01-16 10:27:37 +00:00
pango_font_description_set_style (description, _gtk_css_font_style_value_get (v));
Use style values directly Replace uses of gtk_css_style_get_value with direct access, throughout the tree. We don't replace all uses, just those where we are dealing with a fixed property. Be careful to handle the currentColor special case for color properties.
2020-01-28 07:38:25 +00:00
v = style->font->font_weight;
cssstyle: Implement get_pango_font() directly Instead of going through the slow GValue code path. This function was unused, so use it in GtkWidget's update_pango_context() now.
2020-01-16 10:27:37 +00:00
pango_font_description_set_weight (description, _gtk_css_number_value_get (v, 100));
Add a function to get a font from a css style Similar in spirit to gtk_style_context_get (ctx, state, "font", ...) but avoids the need for a style context. This will be used to for css-styled text rendering from css subnodes.
2016-06-03 04:29:05 +00:00
Use style values directly Replace uses of gtk_css_style_get_value with direct access, throughout the tree. We don't replace all uses, just those where we are dealing with a fixed property. Be careful to handle the currentColor special case for color properties.
2020-01-28 07:38:25 +00:00
v = style->font->font_stretch;
cssstyle: Implement get_pango_font() directly Instead of going through the slow GValue code path. This function was unused, so use it in GtkWidget's update_pango_context() now.
2020-01-16 10:27:37 +00:00
pango_font_description_set_stretch (description, _gtk_css_font_stretch_value_get (v));
Add a function to get a font from a css style Similar in spirit to gtk_style_context_get (ctx, state, "font", ...) but avoids the need for a style context. This will be used to for css-styled text rendering from css subnodes.
2016-06-03 04:29:05 +00:00
Use style values directly Replace uses of gtk_css_style_get_value with direct access, throughout the tree. We don't replace all uses, just those where we are dealing with a fixed property. Be careful to handle the currentColor special case for color properties.
2020-01-28 07:38:25 +00:00
v = style->font->font_variation_settings;
cssstyle: set font variations in get_pango_font() Doesn't make sense to set all the css values on the font description in there except for the font variations, so do these here as well.
2020-01-16 10:33:12 +00:00
str = gtk_css_font_variations_value_get_variations (v);
cssstyle: Only create PangoAttrList if there are attribtues Don't allocate a new GString if we never need it and therefore don't create the PangoAttrList if we have no attributes anyway. Update callers to handle the possible NULL return value.
2020-04-12 07:22:38 +00:00
if (str)
pango_font_description_set_variations (description, str);
cssstyle: set font variations in get_pango_font() Doesn't make sense to set all the css values on the font description in there except for the font variations, so do these here as well.
2020-01-16 10:33:12 +00:00
g_free (str);
cssstyle: Implement get_pango_font() directly Instead of going through the slow GValue code path. This function was unused, so use it in GtkWidget's update_pango_context() now.
2020-01-16 10:27:37 +00:00
return description;
Add a function to get a font from a css style Similar in spirit to gtk_style_context_get (ctx, state, "font", ...) but avoids the need for a style context. This will be used to for css-styled text rendering from css subnodes.
2016-06-03 04:29:05 +00:00
}
css: Split styles into groups Introduce refcounted structs for groups of related css properties, and use them to store the style values. Both GtkCssStaticStyle and GtkCssAnimatedStyle fill in the structs in GtkCssStyle, and we can avoid vfuncs for value access, which should be much faster. We can even start accessing style->core->color directly.
2020-01-26 04:16:06 +00:00
/* Refcounted value structs */
css: Make some local variables const
2020-02-04 09:17:15 +00:00
static const int values_size[] = {
css: Split styles into groups Introduce refcounted structs for groups of related css properties, and use them to store the style values. Both GtkCssStaticStyle and GtkCssAnimatedStyle fill in the structs in GtkCssStyle, and we can avoid vfuncs for value access, which should be much faster. We can even start accessing style->core->color directly.
2020-01-26 04:16:06 +00:00
sizeof (GtkCssCoreValues),
sizeof (GtkCssBackgroundValues),
sizeof (GtkCssBorderValues),
sizeof (GtkCssIconValues),
sizeof (GtkCssOutlineValues),
sizeof (GtkCssFontValues),
sizeof (GtkCssFontVariantValues),
sizeof (GtkCssAnimationValues),
sizeof (GtkCssTransitionValues),
sizeof (GtkCssSizeValues),
sizeof (GtkCssOtherValues)
};
css: Fix the initial values optimization Fix up the index computation. We have duplicate entries in the type enum, so to go from one of the 'initial' types to it corresponding type you subtract one, but to find the size array entry for a type, you divide by 2.
2020-02-04 11:19:23 +00:00
#define TYPE_INDEX(type) ((type) - ((type) % 2))
#define VALUES_SIZE(type) (values_size[(type) / 2])
#define N_VALUES(type) ((VALUES_SIZE(type) - sizeof (GtkCssValues)) / sizeof (GtkCssValue *))
css: Split styles into groups Introduce refcounted structs for groups of related css properties, and use them to store the style values. Both GtkCssStaticStyle and GtkCssAnimatedStyle fill in the structs in GtkCssStyle, and we can avoid vfuncs for value access, which should be much faster. We can even start accessing style->core->color directly.
2020-01-26 04:16:06 +00:00
Build fix for GtkCssValues
2020-01-31 08:35:41 +00:00
#define GET_VALUES(v) (GtkCssValue **)((guint8 *)(v) + sizeof (GtkCssValues))
css: Split styles into groups Introduce refcounted structs for groups of related css properties, and use them to store the style values. Both GtkCssStaticStyle and GtkCssAnimatedStyle fill in the structs in GtkCssStyle, and we can avoid vfuncs for value access, which should be much faster. We can even start accessing style->core->color directly.
2020-01-26 04:16:06 +00:00
GtkCssValues *gtk_css_values_ref (GtkCssValues *values)
{
values->ref_count++;
return values;
}
static void
gtk_css_values_free (GtkCssValues *values)
{
int i;
Build fix for GtkCssValues
2020-01-31 08:35:41 +00:00
GtkCssValue **v = GET_VALUES (values);
css: Split styles into groups Introduce refcounted structs for groups of related css properties, and use them to store the style values. Both GtkCssStaticStyle and GtkCssAnimatedStyle fill in the structs in GtkCssStyle, and we can avoid vfuncs for value access, which should be much faster. We can even start accessing style->core->color directly.
2020-01-26 04:16:06 +00:00
for (i = 0; i < N_VALUES (values->type); i++)
{
Build fix for GtkCssValues
2020-01-31 08:35:41 +00:00
if (v[i])
gtk_css_value_unref (v[i]);
css: Split styles into groups Introduce refcounted structs for groups of related css properties, and use them to store the style values. Both GtkCssStaticStyle and GtkCssAnimatedStyle fill in the structs in GtkCssStyle, and we can avoid vfuncs for value access, which should be much faster. We can even start accessing style->core->color directly.
2020-01-26 04:16:06 +00:00
}
g_free (values);
}
void gtk_css_values_unref (GtkCssValues *values)
{
if (!values)
return;
values->ref_count--;
if (values->ref_count == 0)
gtk_css_values_free (values);
}
GtkCssValues *
gtk_css_values_copy (GtkCssValues *values)
{
GtkCssValues *copy;
Build fix for GtkCssValues
2020-01-31 08:35:41 +00:00
GtkCssValue **v, **v2;
css: Split styles into groups Introduce refcounted structs for groups of related css properties, and use them to store the style values. Both GtkCssStaticStyle and GtkCssAnimatedStyle fill in the structs in GtkCssStyle, and we can avoid vfuncs for value access, which should be much faster. We can even start accessing style->core->color directly.
2020-01-26 04:16:06 +00:00
int i;
css: Fix the initial values optimization Fix up the index computation. We have duplicate entries in the type enum, so to go from one of the 'initial' types to it corresponding type you subtract one, but to find the size array entry for a type, you divide by 2.
2020-02-04 11:19:23 +00:00
copy = gtk_css_values_new (TYPE_INDEX(values->type));
css: Split styles into groups Introduce refcounted structs for groups of related css properties, and use them to store the style values. Both GtkCssStaticStyle and GtkCssAnimatedStyle fill in the structs in GtkCssStyle, and we can avoid vfuncs for value access, which should be much faster. We can even start accessing style->core->color directly.
2020-01-26 04:16:06 +00:00
Build fix for GtkCssValues
2020-01-31 08:35:41 +00:00
v = GET_VALUES (values);
v2 = GET_VALUES (copy);
css: Split styles into groups Introduce refcounted structs for groups of related css properties, and use them to store the style values. Both GtkCssStaticStyle and GtkCssAnimatedStyle fill in the structs in GtkCssStyle, and we can avoid vfuncs for value access, which should be much faster. We can even start accessing style->core->color directly.
2020-01-26 04:16:06 +00:00
for (i = 0; i < N_VALUES (values->type); i++)
{
Build fix for GtkCssValues
2020-01-31 08:35:41 +00:00
if (v[i])
v2[i] = gtk_css_value_ref (v[i]);
css: Split styles into groups Introduce refcounted structs for groups of related css properties, and use them to store the style values. Both GtkCssStaticStyle and GtkCssAnimatedStyle fill in the structs in GtkCssStyle, and we can avoid vfuncs for value access, which should be much faster. We can even start accessing style->core->color directly.
2020-01-26 04:16:06 +00:00
}
return copy;
}
GtkCssValues *
gtk_css_values_new (GtkCssValuesType type)
{
GtkCssValues *values;
css: Fix the initial values optimization Fix up the index computation. We have duplicate entries in the type enum, so to go from one of the 'initial' types to it corresponding type you subtract one, but to find the size array entry for a type, you divide by 2.
2020-02-04 11:19:23 +00:00
values = (GtkCssValues *)g_malloc0 (VALUES_SIZE(type));
css: Split styles into groups Introduce refcounted structs for groups of related css properties, and use them to store the style values. Both GtkCssStaticStyle and GtkCssAnimatedStyle fill in the structs in GtkCssStyle, and we can avoid vfuncs for value access, which should be much faster. We can even start accessing style->core->color directly.
2020-01-26 04:16:06 +00:00
values->ref_count = 1;
css: Fix the initial values optimization Fix up the index computation. We have duplicate entries in the type enum, so to go from one of the 'initial' types to it corresponding type you subtract one, but to find the size array entry for a type, you divide by 2.
2020-02-04 11:19:23 +00:00
values->type = type;
css: Split styles into groups Introduce refcounted structs for groups of related css properties, and use them to store the style values. Both GtkCssStaticStyle and GtkCssAnimatedStyle fill in the structs in GtkCssStyle, and we can avoid vfuncs for value access, which should be much faster. We can even start accessing style->core->color directly.
2020-01-26 04:16:06 +00:00
css: Make some local variables const
2020-02-04 09:17:15 +00:00
return values;
css: Split styles into groups Introduce refcounted structs for groups of related css properties, and use them to store the style values. Both GtkCssStaticStyle and GtkCssAnimatedStyle fill in the structs in GtkCssStyle, and we can avoid vfuncs for value access, which should be much faster. We can even start accessing style->core->color directly.
2020-01-26 04:16:06 +00:00
}
Reference in New Issue Copy Permalink