X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkthemingbackground.c;h=579d2be4dea32abe70be40ad73cd70fa39cd87b1;hb=6f1476edd3fbe31259e59ca3f03a01bf0f8ff67b;hp=92ef8e22e232c5204b2042fd93214ce58927ae78;hpb=65166c36b91bf990d476e63060065486b73940e2;p=~andy%2Fgtk diff --git a/gtk/gtkthemingbackground.c b/gtk/gtkthemingbackground.c index 92ef8e22e..579d2be4d 100644 --- a/gtk/gtkthemingbackground.c +++ b/gtk/gtkthemingbackground.c @@ -42,81 +42,21 @@ */ #include "fallback-c89.c" -typedef struct { - cairo_rectangle_t image_rect; - GtkCssImage *image; - GtkRoundedBox clip_box; - - gint idx; -} GtkThemingBackgroundLayer; - -static void -_gtk_theming_background_layer_apply_origin (GtkThemingBackground *bg, - GtkThemingBackgroundLayer *layer) +static const GtkRoundedBox * +gtk_theming_background_get_box (GtkThemingBackground *bg, + GtkCssArea area) { - cairo_rectangle_t image_rect; - GtkCssValue *value = _gtk_style_context_peek_property (bg->context, GTK_CSS_PROPERTY_BACKGROUND_ORIGIN); - GtkCssArea origin = _gtk_css_area_value_get (_gtk_css_array_value_get_nth (value, layer->idx)); - - /* The default size of the background image depends on the - background-origin value as this affects the top left - and the bottom right corners. */ - switch (origin) { - case GTK_CSS_AREA_BORDER_BOX: - image_rect.x = 0; - image_rect.y = 0; - image_rect.width = bg->paint_area.width; - image_rect.height = bg->paint_area.height; - break; - case GTK_CSS_AREA_CONTENT_BOX: - image_rect.x = bg->border.left + bg->padding.left; - image_rect.y = bg->border.top + bg->padding.top; - image_rect.width = bg->paint_area.width - bg->border.left - bg->border.right - bg->padding.left - bg->padding.right; - image_rect.height = bg->paint_area.height - bg->border.top - bg->border.bottom - bg->padding.top - bg->padding.bottom; - break; - case GTK_CSS_AREA_PADDING_BOX: - default: - image_rect.x = bg->border.left; - image_rect.y = bg->border.top; - image_rect.width = bg->paint_area.width - bg->border.left - bg->border.right; - image_rect.height = bg->paint_area.height - bg->border.top - bg->border.bottom; - break; - } - - /* XXX: image_rect might have negative width/height here. - * Do we need to do something about it? */ - layer->image_rect = image_rect; -} - -static void -_gtk_theming_background_apply_clip (GtkThemingBackground *bg, - GtkRoundedBox *box, - GtkCssArea clip) -{ - if (clip == GTK_CSS_AREA_PADDING_BOX) + switch (area) { - _gtk_rounded_box_shrink (box, - bg->border.top, bg->border.right, - bg->border.bottom, bg->border.left); - } - else if (clip == GTK_CSS_AREA_CONTENT_BOX) - { - _gtk_rounded_box_shrink (box, - bg->border.top + bg->padding.top, - bg->border.right + bg->padding.right, - bg->border.bottom + bg->padding.bottom, - bg->border.left + bg->padding.left); - } -} - -static void -_gtk_theming_background_layer_apply_clip (GtkThemingBackground *bg, - GtkThemingBackgroundLayer *layer) -{ - GtkCssValue *value = _gtk_style_context_peek_property (bg->context, GTK_CSS_PROPERTY_BACKGROUND_CLIP); - GtkCssArea clip = _gtk_css_area_value_get (_gtk_css_array_value_get_nth (value, layer->idx)); - - _gtk_theming_background_apply_clip (bg, &layer->clip_box, clip); + case GTK_CSS_AREA_BORDER_BOX: + return &bg->border_box; + case GTK_CSS_AREA_PADDING_BOX: + return &bg->padding_box; + case GTK_CSS_AREA_CONTENT_BOX: + return &bg->content_box; + default: + g_return_val_if_reached (&bg->border_box); + } } static void @@ -124,18 +64,14 @@ _gtk_theming_background_paint_color (GtkThemingBackground *bg, cairo_t *cr, GtkCssValue *background_image) { - GtkRoundedBox clip_box; gint n_values = _gtk_css_array_value_get_n_values (background_image); GtkCssArea clip = _gtk_css_area_value_get (_gtk_css_array_value_get_nth (_gtk_style_context_peek_property (bg->context, GTK_CSS_PROPERTY_BACKGROUND_CLIP), n_values - 1)); - clip_box = bg->border_box; - _gtk_theming_background_apply_clip (bg, &clip_box, clip); - cairo_save (cr); - _gtk_rounded_box_path (&clip_box, cr); + _gtk_rounded_box_path (gtk_theming_background_get_box (bg, clip), cr); cairo_clip (cr); gdk_cairo_set_source_rgba (cr, &bg->bg_color); @@ -146,161 +82,184 @@ _gtk_theming_background_paint_color (GtkThemingBackground *bg, static void _gtk_theming_background_paint_layer (GtkThemingBackground *bg, - GtkThemingBackgroundLayer *layer, + guint idx, cairo_t *cr) { + GtkCssRepeatStyle hrepeat, vrepeat; + const GtkCssValue *pos, *repeat; + GtkCssImage *image; + const GtkRoundedBox *origin; + double image_width, image_height; + double width, height; + + pos = _gtk_css_array_value_get_nth (_gtk_style_context_peek_property (bg->context, GTK_CSS_PROPERTY_BACKGROUND_POSITION), idx); + repeat = _gtk_css_array_value_get_nth (_gtk_style_context_peek_property (bg->context, GTK_CSS_PROPERTY_BACKGROUND_REPEAT), idx); + hrepeat = _gtk_css_background_repeat_value_get_x (repeat); + vrepeat = _gtk_css_background_repeat_value_get_y (repeat); + image = _gtk_css_image_value_get_image ( + _gtk_css_array_value_get_nth ( + _gtk_style_context_peek_property (bg->context, GTK_CSS_PROPERTY_BACKGROUND_IMAGE), + idx)); + origin = gtk_theming_background_get_box ( + bg, + _gtk_css_area_value_get ( + _gtk_css_array_value_get_nth ( + _gtk_style_context_peek_property (bg->context, GTK_CSS_PROPERTY_BACKGROUND_ORIGIN), + idx))); + width = origin->box.width; + height = origin->box.height; + + if (image == NULL || width <= 0 || height <= 0) + return; + + _gtk_css_bg_size_value_compute_size (_gtk_css_array_value_get_nth (_gtk_style_context_peek_property (bg->context, GTK_CSS_PROPERTY_BACKGROUND_SIZE), idx), + image, + width, + height, + &image_width, + &image_height); + + if (image_width <= 0 || image_height <= 0) + return; + + /* optimization */ + if (image_width == width) + hrepeat = GTK_CSS_REPEAT_STYLE_NO_REPEAT; + if (image_height == height) + vrepeat = GTK_CSS_REPEAT_STYLE_NO_REPEAT; + + cairo_save (cr); - _gtk_rounded_box_path (&layer->clip_box, cr); + _gtk_rounded_box_path ( + gtk_theming_background_get_box ( + bg, + _gtk_css_area_value_get ( + _gtk_css_array_value_get_nth ( + _gtk_style_context_peek_property (bg->context, GTK_CSS_PROPERTY_BACKGROUND_CLIP), + idx))), + cr); cairo_clip (cr); - if (layer->image - && layer->image_rect.width > 0 - && layer->image_rect.height > 0) + + cairo_translate (cr, origin->box.x, origin->box.y); + + if (hrepeat == GTK_CSS_REPEAT_STYLE_NO_REPEAT && vrepeat == GTK_CSS_REPEAT_STYLE_NO_REPEAT) { - const GtkCssValue *pos, *repeat; - double image_width, image_height; - double width, height; - GtkCssRepeatStyle hrepeat, vrepeat; - - pos = _gtk_css_array_value_get_nth (_gtk_style_context_peek_property (bg->context, GTK_CSS_PROPERTY_BACKGROUND_POSITION), layer->idx); - repeat = _gtk_css_array_value_get_nth (_gtk_style_context_peek_property (bg->context, GTK_CSS_PROPERTY_BACKGROUND_REPEAT), layer->idx); - hrepeat = _gtk_css_background_repeat_value_get_x (repeat); - vrepeat = _gtk_css_background_repeat_value_get_y (repeat); - width = layer->image_rect.width; - height = layer->image_rect.height; - - _gtk_css_bg_size_value_compute_size (_gtk_css_array_value_get_nth (_gtk_style_context_peek_property (bg->context, GTK_CSS_PROPERTY_BACKGROUND_SIZE), layer->idx), - layer->image, - width, - height, - &image_width, - &image_height); - - /* optimization */ - if (image_width == width) - hrepeat = GTK_CSS_REPEAT_STYLE_NO_REPEAT; - if (image_height == height) - vrepeat = GTK_CSS_REPEAT_STYLE_NO_REPEAT; - - cairo_translate (cr, layer->image_rect.x, layer->image_rect.y); - - if (hrepeat == GTK_CSS_REPEAT_STYLE_NO_REPEAT && vrepeat == GTK_CSS_REPEAT_STYLE_NO_REPEAT) + cairo_translate (cr, + _gtk_css_position_value_get_x (pos, width - image_width), + _gtk_css_position_value_get_y (pos, height - image_height)); + /* shortcut for normal case */ + _gtk_css_image_draw (image, cr, image_width, image_height); + } + else + { + int surface_width, surface_height; + cairo_rectangle_t fill_rect; + cairo_surface_t *surface; + cairo_t *cr2; + + /* If ‘background-repeat’ is ‘round’ for one (or both) dimensions, + * there is a second step. The UA must scale the image in that + * dimension (or both dimensions) so that it fits a whole number of + * times in the background positioning area. In the case of the width + * (height is analogous): + * + * If X ≠ 0 is the width of the image after step one and W is the width + * of the background positioning area, then the rounded width + * X' = W / round(W / X) where round() is a function that returns the + * nearest natural number (integer greater than zero). + * + * If ‘background-repeat’ is ‘round’ for one dimension only and if + * ‘background-size’ is ‘auto’ for the other dimension, then there is + * a third step: that other dimension is scaled so that the original + * aspect ratio is restored. + */ + if (hrepeat == GTK_CSS_REPEAT_STYLE_ROUND) { - cairo_translate (cr, - _gtk_css_position_value_get_x (pos, width - image_width), - _gtk_css_position_value_get_y (pos, height - image_height)); - /* shortcut for normal case */ - _gtk_css_image_draw (layer->image, cr, image_width, image_height); + double n = round (width / image_width); + + n = MAX (1, n); + + if (vrepeat != GTK_CSS_REPEAT_STYLE_ROUND + /* && vsize == auto (it is by default) */) + image_height *= width / (image_width * n); + image_width = width / n; + } + if (vrepeat == GTK_CSS_REPEAT_STYLE_ROUND) + { + double n = round (height / image_height); + + n = MAX (1, n); + + if (hrepeat != GTK_CSS_REPEAT_STYLE_ROUND + /* && hsize == auto (it is by default) */) + image_width *= height / (image_height * n); + image_height = height / n; + } + + /* if hrepeat or vrepeat is 'space', we create a somewhat larger surface + * to store the extra space. */ + if (hrepeat == GTK_CSS_REPEAT_STYLE_SPACE) + { + double n = floor (width / image_width); + surface_width = n ? round (width / n) : 0; } else + surface_width = round (image_width); + + if (vrepeat == GTK_CSS_REPEAT_STYLE_SPACE) { - int surface_width, surface_height; - cairo_rectangle_t fill_rect; - cairo_surface_t *surface; - cairo_t *cr2; - - /* If ‘background-repeat’ is ‘round’ for one (or both) dimensions, - * there is a second step. The UA must scale the image in that - * dimension (or both dimensions) so that it fits a whole number of - * times in the background positioning area. In the case of the width - * (height is analogous): - * - * If X ≠ 0 is the width of the image after step one and W is the width - * of the background positioning area, then the rounded width - * X' = W / round(W / X) where round() is a function that returns the - * nearest natural number (integer greater than zero). - * - * If ‘background-repeat’ is ‘round’ for one dimension only and if - * ‘background-size’ is ‘auto’ for the other dimension, then there is - * a third step: that other dimension is scaled so that the original - * aspect ratio is restored. - */ - if (hrepeat == GTK_CSS_REPEAT_STYLE_ROUND) - { - double n = round (width / image_width); - - n = MAX (1, n); - - if (vrepeat != GTK_CSS_REPEAT_STYLE_ROUND - /* && vsize == auto (it is by default) */) - image_height *= width / (image_width * n); - image_width = width / n; - } - if (vrepeat == GTK_CSS_REPEAT_STYLE_ROUND) - { - double n = round (height / image_height); - - n = MAX (1, n); - - if (hrepeat != GTK_CSS_REPEAT_STYLE_ROUND - /* && hsize == auto (it is by default) */) - image_width *= height / (image_height * n); - image_height = height / n; - } - - /* if hrepeat or vrepeat is 'space', we create a somewhat larger surface - * to store the extra space. */ - if (hrepeat == GTK_CSS_REPEAT_STYLE_SPACE) - { - double n = floor (width / image_width); - surface_width = n ? round (width / n) : 0; - } - else - surface_width = round (image_width); - - if (vrepeat == GTK_CSS_REPEAT_STYLE_SPACE) - { - double n = floor (height / image_height); - surface_height = n ? round (height / n) : 0; - } - else - surface_height = round (image_height); - - surface = cairo_surface_create_similar (cairo_get_target (cr), - CAIRO_CONTENT_COLOR_ALPHA, - surface_width, surface_height); - cr2 = cairo_create (surface); - cairo_translate (cr2, - 0.5 * (surface_width - image_width), - 0.5 * (surface_height - image_height)); - _gtk_css_image_draw (layer->image, cr2, image_width, image_height); - cairo_destroy (cr2); - - cairo_set_source_surface (cr, surface, - _gtk_css_position_value_get_x (pos, width - image_width), - _gtk_css_position_value_get_y (pos, height - image_height)); - cairo_pattern_set_extend (cairo_get_source (cr), CAIRO_EXTEND_REPEAT); - cairo_surface_destroy (surface); - - if (hrepeat == GTK_CSS_REPEAT_STYLE_NO_REPEAT) - { - fill_rect.x = _gtk_css_position_value_get_x (pos, width - image_width); - fill_rect.width = image_width; - } - else - { - fill_rect.x = 0; - fill_rect.width = width; - } - - if (vrepeat == GTK_CSS_REPEAT_STYLE_NO_REPEAT) - { - fill_rect.y = _gtk_css_position_value_get_y (pos, height - image_height); - fill_rect.height = image_height; - } - else - { - fill_rect.y = 0; - fill_rect.height = height; - } - - cairo_rectangle (cr, fill_rect.x, fill_rect.y, - fill_rect.width, fill_rect.height); - cairo_fill (cr); + double n = floor (height / image_height); + surface_height = n ? round (height / n) : 0; } + else + surface_height = round (image_height); + + surface = cairo_surface_create_similar (cairo_get_target (cr), + CAIRO_CONTENT_COLOR_ALPHA, + surface_width, surface_height); + cr2 = cairo_create (surface); + cairo_translate (cr2, + 0.5 * (surface_width - image_width), + 0.5 * (surface_height - image_height)); + _gtk_css_image_draw (image, cr2, image_width, image_height); + cairo_destroy (cr2); + + cairo_set_source_surface (cr, surface, + _gtk_css_position_value_get_x (pos, width - image_width), + _gtk_css_position_value_get_y (pos, height - image_height)); + cairo_pattern_set_extend (cairo_get_source (cr), CAIRO_EXTEND_REPEAT); + cairo_surface_destroy (surface); + + if (hrepeat == GTK_CSS_REPEAT_STYLE_NO_REPEAT) + { + fill_rect.x = _gtk_css_position_value_get_x (pos, width - image_width); + fill_rect.width = image_width; + } + else + { + fill_rect.x = 0; + fill_rect.width = width; + } + + if (vrepeat == GTK_CSS_REPEAT_STYLE_NO_REPEAT) + { + fill_rect.y = _gtk_css_position_value_get_y (pos, height - image_height); + fill_rect.height = image_height; + } + else + { + fill_rect.y = 0; + fill_rect.height = height; + } + + cairo_rectangle (cr, fill_rect.x, fill_rect.y, + fill_rect.width, fill_rect.height); + cairo_fill (cr); } + cairo_restore (cr); } @@ -313,29 +272,15 @@ _gtk_theming_background_apply_shadow (GtkThemingBackground *bg, &bg->padding_box); } -static void -_gtk_theming_background_init_layer (GtkThemingBackground *bg, - GtkThemingBackgroundLayer *layer, - GtkCssValue *background_image, - gint idx) -{ - layer->idx = idx; - layer->clip_box = bg->border_box; - - _gtk_theming_background_layer_apply_clip (bg, layer); - _gtk_theming_background_layer_apply_origin (bg, layer); - - layer->image = _gtk_css_image_value_get_image (_gtk_css_array_value_get_nth (background_image, layer->idx)); -} - static void _gtk_theming_background_init_context (GtkThemingBackground *bg) { - bg->flags = gtk_style_context_get_state (bg->context); + GtkStateFlags flags = gtk_style_context_get_state (bg->context); + GtkBorder border, padding; - gtk_style_context_get_border (bg->context, bg->flags, &bg->border); - gtk_style_context_get_padding (bg->context, bg->flags, &bg->padding); - gtk_style_context_get_background_color (bg->context, bg->flags, &bg->bg_color); + gtk_style_context_get_border (bg->context, flags, &border); + gtk_style_context_get_padding (bg->context, flags, &padding); + gtk_style_context_get_background_color (bg->context, flags, &bg->bg_color); /* In the CSS box model, by default the background positioning area is * the padding-box, i.e. all the border-box minus the borders themselves, @@ -350,8 +295,13 @@ _gtk_theming_background_init_context (GtkThemingBackground *bg) bg->padding_box = bg->border_box; _gtk_rounded_box_shrink (&bg->padding_box, - bg->border.top, bg->border.right, - bg->border.bottom, bg->border.left); + border.top, border.right, + border.bottom, border.left); + + bg->content_box = bg->padding_box; + _gtk_rounded_box_shrink (&bg->content_box, + padding.top, padding.right, + padding.bottom, padding.left); } void @@ -401,7 +351,6 @@ _gtk_theming_background_render (GtkThemingBackground *bg, cairo_t *cr) { gint idx; - GtkThemingBackgroundLayer layer; GtkCssValue *background_image; background_image = _gtk_style_context_peek_property (bg->context, GTK_CSS_PROPERTY_BACKGROUND_IMAGE); @@ -413,8 +362,7 @@ _gtk_theming_background_render (GtkThemingBackground *bg, for (idx = _gtk_css_array_value_get_n_values (background_image) - 1; idx >= 0; idx--) { - _gtk_theming_background_init_layer (bg, &layer, background_image, idx); - _gtk_theming_background_paint_layer (bg, &layer, cr); + _gtk_theming_background_paint_layer (bg, idx, cr); } _gtk_theming_background_apply_shadow (bg, cr);