![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/style.cpp b/src/style.cpp
index 0eb8b0869cbcd28463ff48f1464b1e1ec303aed2..e15c54636adf10b496766cfd5eebe0431e27ff93 100644 (file)
--- a/src/style.cpp
+++ b/src/style.cpp
#include "attributes.h"
#include "document.h"
#include "extract-uri.h"
-#include "marker-status.h"
#include "uri-references.h"
#include "sp-paint-server.h"
#include "streq.h"
static void sp_style_merge_property(SPStyle *style, gint id, gchar const *val);
static void sp_style_merge_ipaint(SPStyle *style, SPIPaint *paint, SPIPaint const *parent);
-static void sp_style_merge_ifilter(SPIFilter *child, SPIFilter const *parent);
+static void sp_style_merge_ifilter(SPStyle *style, SPIFilter const *parent);
static void sp_style_read_dash(SPStyle *style, gchar const *str);
static SPTextStyle *sp_text_style_new(void);
@@ -138,7 +137,7 @@ static void sp_style_read_itextdecoration(SPITextDecoration *val, gchar const *s
static void sp_style_read_icolor(SPIPaint *paint, gchar const *str, SPStyle *style, SPDocument *document);
static void sp_style_read_ipaint(SPIPaint *paint, gchar const *str, SPStyle *style, SPDocument *document);
static void sp_style_read_ifontsize(SPIFontSize *val, gchar const *str);
-static void sp_style_read_ifilter(SPIFilter *f, gchar const *str, SPDocument *document);
+static void sp_style_read_ifilter(gchar const *str, SPStyle *style, SPDocument *document);
static void sp_style_read_penum(SPIEnum *val, Inkscape::XML::Node *repr, gchar const *key, SPStyleEnum const *dict, bool can_explicitly_inherit);
static void sp_style_read_plength(SPILength *val, Inkscape::XML::Node *repr, gchar const *key);
@@ -156,10 +155,10 @@ static gint sp_style_write_ilengthornormal(gchar *p, gint const len, gchar const
static gint sp_style_write_itextdecoration(gchar *p, gint const len, gchar const *const key, SPITextDecoration const *const val, SPITextDecoration const *const base, guint const flags);
static gint sp_style_write_ifilter(gchar *b, gint len, gchar const *key, SPIFilter const *filter, SPIFilter const *base, guint flags);
-static void css2_unescape_unquote(SPIString *val);
-
static void sp_style_paint_clear(SPStyle *style, SPIPaint *paint);
+static void sp_style_filter_clear(SPStyle *style);
+
#define SPS_READ_IENUM_IF_UNSET(v,s,d,i) if (!(v)->set) {sp_style_read_ienum((v), (s), (d), (i));}
#define SPS_READ_PENUM_IF_UNSET(v,r,k,d,i) if (!(v)->set) {sp_style_read_penum((v), (r), (k), (d), (i));}
style->fill_hreffed = false;
style->stroke_hreffed = false;
+ style->filter_hreffed = false;
new (&style->release_connection) sigc::connection();
new (&style->stroke_release_connection) sigc::connection();
new (&style->stroke_modified_connection) sigc::connection();
+ new (&style->filter_release_connection) sigc::connection();
+ new (&style->filter_modified_connection) sigc::connection();
+
return style;
}
if (style->text) sp_text_style_unref(style->text);
sp_style_paint_clear(style, &style->fill);
sp_style_paint_clear(style, &style->stroke);
+ sp_style_filter_clear(style);
style->fill_release_connection.disconnect();
style->fill_release_connection.~connection();
style->fill_modified_connection.disconnect();
style->stroke_release_connection.~connection();
style->stroke_modified_connection.disconnect();
style->stroke_modified_connection.~connection();
+ style->filter_modified_connection.disconnect();
+ style->filter_modified_connection.~connection();
+ style->filter_release_connection.disconnect();
+ style->filter_release_connection.~connection();
g_free(style->stroke_dash.dash);
g_free(style);
}
style->cloned = true;
}
- /* 1. Style itself */
+ /* 1. Style attribute */
gchar const *val = repr->attribute("style");
if (val != NULL) {
sp_style_merge_from_style_string(style, val);
val = repr->attribute("font-family");
if (val) {
if (!style->text_private) sp_style_privatize_text(style);
- sp_style_read_istring(&style->text->font_family, val);
- css2_unescape_unquote(&style->text->font_family);
+ gchar *val_unquoted = attribute_unquote(val);
+ sp_style_read_istring(&style->text->font_family, val_unquoted);
+ if (val_unquoted) g_free (val_unquoted);
}
}
if (!style->filter.set) {
val = repr->attribute("filter");
if (val) {
- sp_style_read_ifilter(&style->filter, val,
- (object) ? SP_OBJECT_DOCUMENT(object) : NULL);
+ sp_style_read_ifilter(val, style, (object) ? SP_OBJECT_DOCUMENT(object) : NULL);
}
}
SPS_READ_PENUM_IF_UNSET(&style->enable_background, repr,
"enable-background", enum_enable_background, true);
-
+
/* 3. Merge from parent */
if (object) {
if (object->parent) {
case SP_PROP_FONT_FAMILY:
if (!style->text_private) sp_style_privatize_text(style);
if (!style->text->font_family.set) {
- sp_style_read_istring(&style->text->font_family, val);
- css2_unescape_unquote(&style->text->font_family);
+ gchar *val_unquoted = attribute_unquote(val);
+ sp_style_read_istring(&style->text->font_family, val_unquoted);
+ if (val_unquoted) g_free (val_unquoted);
}
break;
case SP_PROP_FONT_SIZE:
/* Filter */
case SP_PROP_FILTER:
if (!style->filter.set && !style->filter.inherit) {
- sp_style_read_ifilter(&style->filter, val, (style->object) ? SP_OBJECT_DOCUMENT(style->object) : NULL);
+ sp_style_read_ifilter(val, style, (style->object) ? SP_OBJECT_DOCUMENT(style->object) : NULL);
}
break;
case SP_PROP_FLOOD_COLOR:
case SP_PROP_MARKER:
/* TODO: Call sp_uri_reference_resolve(SPDocument *document, guchar const *uri) */
/* style->marker[SP_MARKER_LOC] = g_quark_from_string(val); */
- marker_status("Setting SP_PROP_MARKER");
if (!style->marker[SP_MARKER_LOC].set) {
g_free(style->marker[SP_MARKER_LOC].value);
style->marker[SP_MARKER_LOC].value = g_strdup(val);
case SP_PROP_MARKER_START:
/* TODO: Call sp_uri_reference_resolve(SPDocument *document, guchar const *uri) */
- marker_status("Setting SP_PROP_MARKER_START");
if (!style->marker[SP_MARKER_LOC_START].set) {
g_free(style->marker[SP_MARKER_LOC_START].value);
style->marker[SP_MARKER_LOC_START].value = g_strdup(val);
break;
case SP_PROP_MARKER_MID:
/* TODO: Call sp_uri_reference_resolve(SPDocument *document, guchar const *uri) */
- marker_status("Setting SP_PROP_MARKER_MID");
if (!style->marker[SP_MARKER_LOC_MID].set) {
g_free(style->marker[SP_MARKER_LOC_MID].value);
style->marker[SP_MARKER_LOC_MID].value = g_strdup(val);
break;
case SP_PROP_MARKER_END:
/* TODO: Call sp_uri_reference_resolve(SPDocument *document, guchar const *uri) */
- marker_status("Setting SP_PROP_MARKER_END");
if (!style->marker[SP_MARKER_LOC_END].set) {
g_free(style->marker[SP_MARKER_LOC_END].value);
style->marker[SP_MARKER_LOC_END].value = g_strdup(val);
static void
sp_style_merge_from_decl_list(SPStyle *const style, CRDeclaration const *const decl_list)
{
+ // read the decls from end to start, using head recursion, so that latter declarations override
+ // (Ref: http://www.w3.org/TR/REC-CSS2/cascade.html#cascading-order point 4.)
+ // because sp_style_merge_style_from_decl only sets properties that are unset
if (decl_list->next) {
sp_style_merge_from_decl_list(style, decl_list->next);
}
}
/* Filter effects */
- if(style->filter.set && style->filter.inherit) {
- sp_style_merge_ifilter(&style->filter, &parent->filter);
+ if (style->filter.inherit) {
+ sp_style_merge_ifilter(style, &parent->filter);
}
if(style->enable_background.inherit) {
@@ -1927,6 +1935,14 @@ sp_style_merge_from_dying_parent(SPStyle *const style, SPStyle const *const pare
style->enable_background.value = parent->enable_background.value;
}
+ if (!style->filter.set || style->filter.inherit)
+ {
+ // FIXME:
+ // instead of just copying over, we need to _really merge_ the two filters by combining their
+ // filter primitives
+ sp_style_merge_ifilter(style, &parent->filter);
+ }
+
/** \todo
* fixme: Check that we correctly handle all properties that don't
* inherit by default (as shown in
@@ -1984,8 +2000,6 @@ sp_style_merge_from_dying_parent(SPStyle *const style, SPStyle const *const pare
* represent it as a normal SPILength; though will need to do something about existing
* users of stroke_dash.offset and stroke_dashoffset_set. */
}
-
- /* TODO: deal with filters */
}
+/**
+ * Disconnects from filter.
+ */
+static void
+sp_style_filter_release(SPObject *obj, SPStyle *style)
+{
+ SPFilter *filter=static_cast<SPFilter *>(obj);
+ if (style->filter.filter == filter)
+ {
+ sp_style_filter_clear(style);
+ }
+}
+
+
+/**
+ * Emit style modified signal on style's object if the filter changed.
+ */
+static void
+sp_style_filter_modified(SPObject *obj, guint flags, SPStyle *style)
+{
+ SPFilter *filter=static_cast<SPFilter *>(obj);
+ if (style->filter.filter == filter)
+ {
+ if (style->object) {
+ style->object->requestModified(SP_OBJECT_MODIFIED_FLAG | SP_OBJECT_STYLE_MODIFIED_FLAG);
+ }
+ }
+}
+
+
/**
*
*/
@@ -2113,12 +2157,26 @@ sp_style_merge_ipaint(SPStyle *style, SPIPaint *paint, SPIPaint const *parent)
* Filter effects do not inherit by default
*/
static void
-sp_style_merge_ifilter(SPIFilter *child, SPIFilter const *parent)
+sp_style_merge_ifilter(SPStyle *style, SPIFilter const *parent)
{
- child->set = parent->set;
- child->inherit = parent->inherit;
- child->filter = parent->filter;
- child->uri = parent->uri;
+ sp_style_filter_clear(style);
+ style->filter.set = parent->set;
+ style->filter.inherit = parent->inherit;
+ style->filter.filter = parent->filter;
+ style->filter.uri = parent->uri;
+ if (style->filter.filter) {
+ if (style->object && !style->cloned) { // href filter for style of non-clones only
+ sp_object_href(SP_OBJECT(style->filter.filter), style);
+ style->filter_hreffed = true;
+ }
+ if (style->object || style->cloned) { // connect to signals for style of real objects or clones (this excludes temp styles)
+ SPObject *filter = style->filter.filter;
+ style->filter_release_connection
+ = filter->connectRelease(sigc::bind<1>(sigc::ptr_fun(&sp_style_filter_release), style));
+ style->filter_modified_connection
+ = filter->connectModified(sigc::bind<2>(sigc::ptr_fun(&sp_style_filter_modified), style));
+ }
+ }
}
/**
p += sp_style_write_ienum(p, c + BMAX - p, "stroke-linecap", enum_stroke_linecap, &style->stroke_linecap, NULL, flags);
p += sp_style_write_ienum(p, c + BMAX - p, "stroke-linejoin", enum_stroke_linejoin, &style->stroke_linejoin, NULL, flags);
- marker_status("sp_style_write_string: Writing markers");
if (style->marker[SP_MARKER_LOC].set) {
p += g_snprintf(p, c + BMAX - p, "marker:%s;", style->marker[SP_MARKER_LOC].value);
} else if (flags == SP_STYLE_FLAG_ALWAYS) {
p += sp_style_write_iscale24(p, c + BMAX - p, "stroke-opacity", &from->stroke_opacity, &to->stroke_opacity, SP_STYLE_FLAG_IFDIFF);
/* markers */
- marker_status("sp_style_write_difference: Writing markers");
if (from->marker[SP_MARKER_LOC].value != NULL) {
p += g_snprintf(p, c + BMAX - p, "marker:%s;", from->marker[SP_MARKER_LOC].value);
}
sp_style_paint_clear(style, &style->fill);
sp_style_paint_clear(style, &style->stroke);
+ sp_style_filter_clear(style);
if (style->stroke_dash.dash) {
g_free(style->stroke_dash.dash);
}
}
style->filter.set = FALSE;
- //Are these really needed?
- style->filter.inherit = FALSE;
style->filter.uri = NULL;
- style->filter.filter = FALSE;
+ style->filter.filter = NULL;
style->enable_background.value = SP_CSS_BACKGROUND_ACCUMULATE;
style->enable_background.set = false;
@@ -3022,7 +3077,7 @@ sp_style_read_ipaint(SPIPaint *paint, gchar const *str, SPStyle *style, SPDocume
delete tmp;
tmp = 0;
}
- paint->iccColor = tmp;
+ paint->value.iccColor = tmp;
}
}
}
* Set SPIFilter object from string.
*/
static void
-sp_style_read_ifilter(SPIFilter *f, gchar const *str, SPDocument *document)
+sp_style_read_ifilter(gchar const *str, SPStyle * style, SPDocument *document)
{
+ SPIFilter *f = &(style->filter);
/* Try all possible values: inherit, none, uri */
if (streq(str, "inherit")) {
f->set = TRUE;
f->inherit = FALSE;
f->filter = NULL;
if (document) {
- SPObject *obj;
- obj = sp_uri_reference_resolve(document, str);
+ SPObject *obj = sp_uri_reference_resolve(document, str);
if (SP_IS_FILTER(obj)) {
f->filter = SP_FILTER(obj);
- //g_signal_connect(G_OBJECT(f->filter), "release",
- // G_CALLBACK(sp_style_filter_release), style);
- //g_signal_connect(G_OBJECT(f->filter), "modified",
- // G_CALLBACK(sp_style_filter_modified), style);
+ if (style->object && !style->cloned) {
+ sp_object_href(obj, style);
+ style->filter_hreffed = true;
+ }
+ if (style->object || style->cloned) { // connect to signals for style of real objects or clones (this excludes temp styles)
+ SPObject *filter = style->filter.filter;
+ style->filter_release_connection
+ = filter->connectRelease(sigc::bind<1>(sigc::ptr_fun(&sp_style_filter_release), style));
+ style->filter_modified_connection
+ = filter->connectModified(sigc::bind<2>(sigc::ptr_fun(&sp_style_filter_modified), style));
+ }
} else {
g_warning("Element '%s' not found or is not a filter", f->uri);
}
if (val->inherit) {
return g_snprintf(p, len, "%s:inherit;", key);
} else {
- return g_snprintf(p, len, "%s:%s;", key, val->value);
+ gchar *val_quoted = css2_escape_quote(val->value);
+ return g_snprintf(p, len, "%s:%s;", key, val_quoted);
+ g_free (val_quoted);
}
}
return 0;
return true;
if (a->type == SP_PAINT_TYPE_COLOR)
return !(sp_color_is_equal(&a->value.color, &b->value.color)
- && ((a->iccColor == b->iccColor)
- || (a->iccColor && b->iccColor
- && (a->iccColor->colorProfile == b->iccColor->colorProfile)
- && (a->iccColor->colors == b->iccColor->colors))));
+ && ((a->value.iccColor == b->value.iccColor)
+ || (a->value.iccColor && b->value.iccColor
+ && (a->value.iccColor->colorProfile == b->value.iccColor->colorProfile)
+ && (a->value.iccColor->colors == b->value.iccColor->colors))));
/* todo: Allow for epsilon differences in iccColor->colors, e.g. changes small enough not to show up
* in the string representation. */
if (a->type == SP_PAINT_TYPE_PAINTSERVER)
case SP_PAINT_TYPE_COLOR: {
char color_buf[8];
sp_svg_write_color(color_buf, sizeof(color_buf), sp_color_get_rgba32_ualpha(&paint->value.color, 0));
- if (paint->iccColor) {
+ if (paint->value.iccColor) {
CSSOStringStream css;
- css << color_buf << " icc-color(" << paint->iccColor->colorProfile;
- for (vector<double>::const_iterator i(paint->iccColor->colors.begin()),
- iEnd(paint->iccColor->colors.end());
+ css << color_buf << " icc-color(" << paint->value.iccColor->colorProfile;
+ for (vector<double>::const_iterator i(paint->value.iccColor->colors.begin()),
+ iEnd(paint->value.iccColor->colors.end());
i != iEnd; ++i) {
css << ", " << *i;
}
}
paint->value.paint.uri = NULL;
paint->type = SP_PAINT_TYPE_NONE;
- delete paint->iccColor;
- paint->iccColor = NULL;
+ delete paint->value.iccColor;
+ paint->value.iccColor = NULL;
}
+
+/**
+ * Clear filter object, and disconnect style from paintserver (if present).
+ */
+static void
+sp_style_filter_clear(SPStyle *style)
+{
+
+ if (style->filter_hreffed) {
+ sp_object_hunref(SP_OBJECT(style->filter.filter), style);
+ style->filter_hreffed = false;
+ }
+ style->filter_release_connection.disconnect();
+ style->filter_modified_connection.disconnect();
+
+ style->filter.filter = NULL;
+}
+
+
+// FIXME: Everything below this line belongs in a different file - css-chemistry?
+
+void
+sp_style_set_property_url (SPObject *item, gchar const *property, SPObject *linked, bool recursive)
+{
+ Inkscape::XML::Node *repr = SP_OBJECT_REPR(item);
+
+ if (repr == NULL) return;
+
+ g_return_if_fail(linked != NULL);
+
+ gchar *val = g_strdup_printf("url(#%s)", SP_OBJECT_ID(linked));
+
+ SPCSSAttr *css = sp_repr_css_attr_new();
+ sp_repr_css_set_property(css, property, val);
+ g_free(val);
+ if (recursive) {
+ sp_repr_css_change_recursive(repr, css, "style");
+ } else {
+ sp_repr_css_change(repr, css, "style");
+ }
+ sp_repr_css_attr_unref(css);
+}
+
+
/**
* Clear all style property attributes in object.
*/
/**
- * Remove quotes from SPIString object value.
- *
- * \todo FIXME: now used for font family, but perhaps this should apply to
- * ALL strings (check CSS spec), in which case this should be part of
- * read_istring.
+ * Remove quotes and escapes from a string. Returned value must be g_free'd.
+ * Note: in CSS (in style= and in stylesheets), unquoting and unescaping is done
+ * by libcroco, our CSS parser, though it adds a new pair of "" quotes for the strings
+ * it parsed for us. So this function is only used to remove those quotes and for
+ * presentation attributes, without any unescaping. (XML unescaping
+ * (& etc) is done by XML parser.)
*/
-static void
-css2_unescape_unquote(SPIString *val)
+gchar *
+attribute_unquote(gchar const *val)
{
- if (val->set && val->value && strlen(val->value) >= 2) {
+ if (val) {
+ if (*val == '\'' || *val == '"') {
+ int l = strlen(val);
+ if (l >= 2) {
+ if ( ( val[0] == '"' && val[l - 1] == '"' ) ||
+ ( val[0] == '\'' && val[l - 1] == '\'' ) ) {
+ return (g_strndup (val+1, l-2));
+ }
+ }
+ }
+ }
- /// \todo unescape all \-escaped chars
+ return (val? g_strdup (val) : NULL);
+}
- int l = strlen(val->value);
- if ( ( val->value[0] == '"' && val->value[l - 1] == '"' ) ||
- ( val->value[0] == '\'' && val->value[l - 1] == '\'' ) ) {
- memcpy(val->value, val->value + 1, l - 2);
- val->value[l - 2] = '\0';
+/**
+ * Quote and/or escape string for writing to CSS (style=). Returned value must be g_free'd.
+ */
+gchar *
+css2_escape_quote(gchar const *val) {
+
+ Glib::ustring t;
+ bool quote = false;
+
+ for (gchar const *i = val; *i; i++) {
+ if (g_ascii_isalnum(*i) || *i=='-' || *i=='_') {
+ t.push_back(*i);
+ } else if (*i=='\'') {
+ t.push_back('\\');
+ t.push_back(*i);
+ quote = true;
+ } else {
+ t.push_back(*i);
+ quote = true;
+ }
+ if (i == val && !g_ascii_isalpha(*i)) {
+ quote = true;
}
}
-}
+ if (quote) { // we use the ' quotes so the result can go to the XML attribute
+ t.insert(t.begin(), '\'');
+ t.push_back('\'');
+ }
+
+ return (t.empty() ? NULL : g_strdup (t.c_str()));
+}
/*
Local Variables: