X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fdesktop-style.cpp;h=236130173fec7f4536e6429f23c2f540ddcd920a;hb=963f23115db07f460bdd862b957f8bd9dba88b9b;hp=4f5ab982edaf33d1aa68a2cb8e5fbf2b4754b456;hpb=28a38cc6b34b86f6e970a6b009cbe4aaa0cef749;p=inkscape.git diff --git a/src/desktop-style.cpp b/src/desktop-style.cpp index 4f5ab982e..236130173 100644 --- a/src/desktop-style.cpp +++ b/src/desktop-style.cpp @@ -18,25 +18,29 @@ #include "svg/svg.h" #include "svg/svg-color.h" #include "selection.h" -#include "sp-tspan.h" -#include "sp-textpath.h" #include "inkscape.h" #include "style.h" #include "prefs-utils.h" #include "sp-use.h" +#include "sp-feblend.h" #include "sp-filter.h" +#include "sp-filter-reference.h" #include "sp-gaussian-blur.h" #include "sp-flowtext.h" #include "sp-flowregion.h" #include "sp-flowdiv.h" #include "sp-linear-gradient.h" -#include "sp-radial-gradient.h" #include "sp-pattern.h" +#include "sp-radial-gradient.h" +#include "sp-textpath.h" +#include "sp-tref.h" +#include "sp-tspan.h" #include "xml/repr.h" #include "libnrtype/font-style-to-pos.h" - +#include "sp-path.h" #include "desktop-style.h" +#include "svg/svg-icc-color.h" /** * Set color on selection on desktop. @@ -52,7 +56,7 @@ sp_desktop_set_color(SPDesktop *desktop, ColorRGBA const &color, bool is_relativ guint32 rgba = SP_RGBA32_F_COMPOSE(color[0], color[1], color[2], color[3]); gchar b[64]; - sp_svg_write_color(b, 64, rgba); + sp_svg_write_color(b, sizeof(b), rgba); SPCSSAttr *css = sp_repr_css_attr_new(); if (fill) { sp_repr_css_set_property(css, "fill", b); @@ -159,6 +163,17 @@ sp_desktop_set_style(SPDesktop *desktop, SPCSSAttr *css, bool change, bool write sp_repr_css_merge(css_write, css); sp_css_attr_unset_uris(css_write); sp_repr_css_change(inkscape_get_repr(INKSCAPE, "desktop"), css_write, "style"); + for (const GSList *i = desktop->selection->itemList(); i != NULL; i = i->next) { + /* last used styles for 3D box faces are stored separately */ + if (SP_IS_PATH (i->data)) { + const char * descr = SP_OBJECT_REPR (G_OBJECT (i->data))->attribute ("inkscape:box3dface"); + if (descr != NULL) { + gchar *style_grp = g_strconcat ("desktop.", descr, NULL); + sp_repr_css_change(inkscape_get_repr(INKSCAPE, style_grp), css_write, "style"); + g_free (style_grp); + } + } + } sp_repr_css_attr_unref(css_write); } @@ -337,6 +352,7 @@ sp_desktop_apply_style_tool(SPDesktop *desktop, Inkscape::XML::Node *repr, char double sp_desktop_get_font_size_tool(SPDesktop *desktop) { + (void)desktop; // TODO cleanup gchar const *desktop_style = inkscape_get_repr(INKSCAPE, "desktop")->attribute("style"); gchar const *style_str = NULL; if ((prefs_get_int_attribute("tools.text", "usecurrent", 0) != 0) && desktop_style) { @@ -350,7 +366,7 @@ sp_desktop_get_font_size_tool(SPDesktop *desktop) double ret = 12; if (style_str) { - SPStyle *style = sp_style_new(); + SPStyle *style = sp_style_new(SP_ACTIVE_DOCUMENT); sp_style_merge_from_style_string(style, style_str); ret = style->font_size.computed; sp_style_unref(style); @@ -378,7 +394,7 @@ stroke_average_width (GSList const *objects) SPObject *object = SP_OBJECT(l->data); - if ( object->style->stroke.type == SP_PAINT_TYPE_NONE ) { + if ( object->style->stroke.isNone() ) { ++n_notstroked; // do not count nonstroked objects continue; } else { @@ -406,15 +422,17 @@ objects_query_fillstroke (GSList *objects, SPStyle *style_res, bool const isfill } SPIPaint *paint_res = isfill? &style_res->fill : &style_res->stroke; - paint_res->type = SP_PAINT_TYPE_IMPOSSIBLE; + bool paintImpossible = true; paint_res->set = TRUE; + SVGICCColor* iccColor = 0; + bool iccSeen = false; gfloat c[4]; c[0] = c[1] = c[2] = c[3] = 0.0; gint num = 0; - gfloat prev[4]; - prev[0] = prev[1] = prev[2] = prev[3] = 0.0; + gfloat prev[3]; + prev[0] = prev[1] = prev[2] = 0.0; bool same_color = true; for (GSList const *i = objects; i != NULL; i = i->next) { @@ -426,15 +444,18 @@ objects_query_fillstroke (GSList *objects, SPStyle *style_res, bool const isfill // We consider paint "effectively set" for anything within text hierarchy SPObject *parent = SP_OBJECT_PARENT (obj); - bool paint_effectively_set = paint->set || (SP_IS_TEXT(parent) || SP_IS_TEXTPATH(parent) || SP_IS_TSPAN(parent) || SP_IS_FLOWTEXT(parent) || SP_IS_FLOWDIV(parent) || SP_IS_FLOWPARA(parent) || SP_IS_FLOWTSPAN(parent) || SP_IS_FLOWLINE(parent)); + bool paint_effectively_set = + paint->set || (SP_IS_TEXT(parent) || SP_IS_TEXTPATH(parent) || SP_IS_TSPAN(parent) + || SP_IS_FLOWTEXT(parent) || SP_IS_FLOWDIV(parent) || SP_IS_FLOWPARA(parent) + || SP_IS_FLOWTSPAN(parent) || SP_IS_FLOWLINE(parent)); // 1. Bail out with QUERY_STYLE_MULTIPLE_DIFFERENT if necessary - if ((paint_res->type != SP_PAINT_TYPE_IMPOSSIBLE) && (paint->type != paint_res->type || (paint_res->set != paint_effectively_set))) { + if ((!paintImpossible) && (!paint->isSameType(*paint_res) || (paint_res->set != paint_effectively_set))) { return QUERY_STYLE_MULTIPLE_DIFFERENT; // different types of paint } - if (paint_res->set && paint->set && paint_res->type == SP_PAINT_TYPE_PAINTSERVER) { + if (paint_res->set && paint->set && paint_res->isPaintserver()) { // both previous paint and this paint were a server, see if the servers are compatible SPPaintServer *server_res = isfill? SP_STYLE_FILL_SERVER (style_res) : SP_STYLE_STROKE_SERVER (style_res); @@ -474,20 +495,27 @@ objects_query_fillstroke (GSList *objects, SPStyle *style_res, bool const isfill // 2. Sum color, copy server from paint to paint_res - if (paint_res->set && paint_effectively_set && paint->type == SP_PAINT_TYPE_COLOR) { - + if (paint_res->set && paint_effectively_set && paint->isColor()) { gfloat d[3]; sp_color_get_rgb_floatv (&paint->value.color, d); // Check if this color is the same as previous - if (paint_res->type == SP_PAINT_TYPE_IMPOSSIBLE) { + if (paintImpossible) { prev[0] = d[0]; prev[1] = d[1]; prev[2] = d[2]; - prev[3] = d[3]; + paint_res->setColor(d[0], d[1], d[2]); + iccColor = paint->value.color.icc; + iccSeen = true; } else { - if (same_color && (prev[0] != d[0] || prev[1] != d[1] || prev[2] != d[2] || prev[3] != d[3])) + if (same_color && (prev[0] != d[0] || prev[1] != d[1] || prev[2] != d[2])) same_color = false; + if ( iccSeen ) { + if(paint->value.color.icc) { + // TODO fix this + iccColor = 0; + } + } } // average color @@ -498,32 +526,42 @@ objects_query_fillstroke (GSList *objects, SPStyle *style_res, bool const isfill num ++; } - if (paint_res->set && paint_effectively_set && paint->type == SP_PAINT_TYPE_PAINTSERVER) { // copy the server + paintImpossible = false; + paint_res->colorSet = paint->colorSet; + paint_res->currentcolor = paint->currentcolor; + if (paint_res->set && paint_effectively_set && paint->isPaintserver()) { // copy the server if (isfill) { - SP_STYLE_FILL_SERVER (style_res) = SP_STYLE_FILL_SERVER (style); + sp_style_set_to_uri_string (style_res, true, style->getFillURI()); } else { - SP_STYLE_STROKE_SERVER (style_res) = SP_STYLE_STROKE_SERVER (style); + sp_style_set_to_uri_string (style_res, false, style->getStrokeURI()); } } - paint_res->type = paint->type; paint_res->set = paint_effectively_set; style_res->fill_rule.computed = style->fill_rule.computed; // no averaging on this, just use the last one } // After all objects processed, divide the color if necessary and return - if (paint_res->set && paint_res->type == SP_PAINT_TYPE_COLOR) { // set the color + if (paint_res->set && paint_res->isColor()) { // set the color g_assert (num >= 1); c[0] /= num; c[1] /= num; c[2] /= num; c[3] /= num; - sp_color_set_rgb_float(&paint_res->value.color, c[0], c[1], c[2]); + paint_res->setColor(c[0], c[1], c[2]); if (isfill) { style_res->fill_opacity.value = SP_SCALE24_FROM_FLOAT (c[3]); } else { style_res->stroke_opacity.value = SP_SCALE24_FROM_FLOAT (c[3]); } + + + if ( iccSeen && iccColor ) { + // TODO check for existing + SVGICCColor* tmp = new SVGICCColor(*iccColor); + paint_res->value.color.icc = tmp; + } + if (num > 1) { if (same_color) return QUERY_STYLE_MULTIPLE_SAME; @@ -612,7 +650,7 @@ objects_query_strokewidth (GSList *objects, SPStyle *style_res) SPStyle *style = SP_OBJECT_STYLE (obj); if (!style) continue; - if ( style->stroke.type == SP_PAINT_TYPE_NONE ) { + if ( style->stroke.isNone() ) { continue; } @@ -669,7 +707,7 @@ objects_query_miterlimit (GSList *objects, SPStyle *style_res) SPStyle *style = SP_OBJECT_STYLE (obj); if (!style) continue; - if ( style->stroke.type == SP_PAINT_TYPE_NONE ) { + if ( style->stroke.isNone() ) { continue; } @@ -722,7 +760,7 @@ objects_query_strokecap (GSList *objects, SPStyle *style_res) SPStyle *style = SP_OBJECT_STYLE (obj); if (!style) continue; - if ( style->stroke.type == SP_PAINT_TYPE_NONE ) { + if ( style->stroke.isNone() ) { continue; } @@ -772,7 +810,7 @@ objects_query_strokejoin (GSList *objects, SPStyle *style_res) SPStyle *style = SP_OBJECT_STYLE (obj); if (!style) continue; - if ( style->stroke.type == SP_PAINT_TYPE_NONE ) { + if ( style->stroke.isNone() ) { continue; } @@ -826,7 +864,7 @@ objects_query_fontnumbers (GSList *objects, SPStyle *style_res) SPObject *obj = SP_OBJECT (i->data); if (!SP_IS_TEXT(obj) && !SP_IS_FLOWTEXT(obj) - && !SP_IS_TSPAN(obj) && !SP_IS_TEXTPATH(obj) + && !SP_IS_TSPAN(obj) && !SP_IS_TREF(obj) && !SP_IS_TEXTPATH(obj) && !SP_IS_FLOWDIV(obj) && !SP_IS_FLOWPARA(obj) && !SP_IS_FLOWTSPAN(obj)) continue; @@ -919,7 +957,7 @@ objects_query_fontstyle (GSList *objects, SPStyle *style_res) SPObject *obj = SP_OBJECT (i->data); if (!SP_IS_TEXT(obj) && !SP_IS_FLOWTEXT(obj) - && !SP_IS_TSPAN(obj) && !SP_IS_TEXTPATH(obj) + && !SP_IS_TSPAN(obj) && !SP_IS_TREF(obj) && !SP_IS_TEXTPATH(obj) && !SP_IS_FLOWDIV(obj) && !SP_IS_FLOWPARA(obj) && !SP_IS_FLOWTSPAN(obj)) continue; @@ -974,7 +1012,7 @@ objects_query_fontfamily (GSList *objects, SPStyle *style_res) SPObject *obj = SP_OBJECT (i->data); if (!SP_IS_TEXT(obj) && !SP_IS_FLOWTEXT(obj) - && !SP_IS_TSPAN(obj) && !SP_IS_TEXTPATH(obj) + && !SP_IS_TSPAN(obj) && !SP_IS_TREF(obj) && !SP_IS_TEXTPATH(obj) && !SP_IS_FLOWDIV(obj) && !SP_IS_FLOWPARA(obj) && !SP_IS_FLOWTSPAN(obj)) continue; @@ -1011,6 +1049,84 @@ objects_query_fontfamily (GSList *objects, SPStyle *style_res) } } +int +objects_query_blend (GSList *objects, SPStyle *style_res) +{ + const int empty_prev = -2; + const int complex_filter = 5; + int blend = 0; + float blend_prev = empty_prev; + bool same_blend = true; + guint items = 0; + + for (GSList const *i = objects; i != NULL; i = i->next) { + SPObject *obj = SP_OBJECT (i->data); + SPStyle *style = SP_OBJECT_STYLE (obj); + if(!style || !SP_IS_ITEM(obj)) continue; + + items++; + + //if object has a filter + if (style->filter.set && style->getFilter()) { + int blurcount = 0; + int blendcount = 0; + + // determine whether filter is simple (blend and/or blur) or complex + for(SPObject *primitive_obj = style->getFilter()->children; + primitive_obj && SP_IS_FILTER_PRIMITIVE(primitive_obj); + primitive_obj = primitive_obj->next) { + SPFilterPrimitive *primitive = SP_FILTER_PRIMITIVE(primitive_obj); + if(SP_IS_FEBLEND(primitive)) + ++blendcount; + else if(SP_IS_GAUSSIANBLUR(primitive)) + ++blurcount; + else { + blurcount = complex_filter; + break; + } + } + + // simple filter + if(blurcount == 1 || blendcount == 1) { + for(SPObject *primitive_obj = style->getFilter()->children; + primitive_obj && SP_IS_FILTER_PRIMITIVE(primitive_obj); + primitive_obj = primitive_obj->next) { + if(SP_IS_FEBLEND(primitive_obj)) { + SPFeBlend *spblend = SP_FEBLEND(primitive_obj); + blend = spblend->blend_mode; + } + } + } + else { + blend = complex_filter; + } + } + // defaults to blend mode = "normal" + else { + blend = 0; + } + + if(blend_prev != empty_prev && blend_prev != blend) + same_blend = false; + blend_prev = blend; + } + + if (items > 0) { + style_res->filter_blend_mode.value = blend; + } + + if (items == 0) { + return QUERY_STYLE_NOTHING; + } else if (items == 1) { + return QUERY_STYLE_SINGLE; + } else { + if(same_blend) + return QUERY_STYLE_MULTIPLE_SAME; + else + return QUERY_STYLE_MULTIPLE_DIFFERENT; + } +} + /** * Write to style_res the average blurring of a list of objects. */ @@ -1032,31 +1148,35 @@ objects_query_blur (GSList *objects, SPStyle *style_res) SPObject *obj = SP_OBJECT (i->data); SPStyle *style = SP_OBJECT_STYLE (obj); if (!style) continue; + if (!SP_IS_ITEM(obj)) continue; NR::Matrix i2d = sp_item_i2d_affine (SP_ITEM(obj)); items ++; //if object has a filter - if (style->filter.set && style->filter.filter) { + if (style->filter.set && style->getFilter()) { //cycle through filter primitives - for(int i=0; ifilter.filter->_primitive_count; i++) - { - SPFilterPrimitive *primitive = style->filter.filter->_primitives[i]; - //if primitive is gaussianblur - if(SP_IS_GAUSSIANBLUR(primitive)) { - SPGaussianBlur * spblur = SP_GAUSSIANBLUR(primitive); - float num = spblur->stdDeviation.getNumber(); - blur_sum += num * NR::expansion(i2d); - if (blur_prev != -1 && fabs (num - blur_prev) > 1e-2) // rather low tolerance because difference in blur radii is much harder to notice than e.g. difference in sizes - same_blur = false; - blur_prev = num; - //TODO: deal with opt number, for the moment it's not necessary to the ui. - blur_items ++; + SPObject *primitive_obj = style->getFilter()->children; + while (primitive_obj) { + if (SP_IS_FILTER_PRIMITIVE(primitive_obj)) { + SPFilterPrimitive *primitive = SP_FILTER_PRIMITIVE(primitive_obj); + + //if primitive is gaussianblur + if(SP_IS_GAUSSIANBLUR(primitive)) { + SPGaussianBlur * spblur = SP_GAUSSIANBLUR(primitive); + float num = spblur->stdDeviation.getNumber(); + blur_sum += num * NR::expansion(i2d); + if (blur_prev != -1 && fabs (num - blur_prev) > 1e-2) // rather low tolerance because difference in blur radii is much harder to notice than e.g. difference in sizes + same_blur = false; + blur_prev = num; + //TODO: deal with opt number, for the moment it's not necessary to the ui. + blur_items ++; + } } + primitive_obj = primitive_obj->next; } } - } if (items > 0) { @@ -1108,6 +1228,8 @@ sp_desktop_query_style_from_list (GSList *list, SPStyle *style, int property) } else if (property == QUERY_STYLE_PROPERTY_FONTNUMBERS) { return objects_query_fontnumbers (list, style); + } else if (property == QUERY_STYLE_PROPERTY_BLEND) { + return objects_query_blend (list, style); } else if (property == QUERY_STYLE_PROPERTY_BLUR) { return objects_query_blur (list, style); }