![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/style.h b/src/style.h
index 333344ad9b2fd280b21d645cc1b8805d56022a38..9a2c72f16a694005d01076a0ced930f2905e63a0 100644 (file)
--- a/src/style.h
+++ b/src/style.h
/** \file
* SPStyle - a style object for SPItem objects
- *
- * Authors:
+ */
+/* Authors:
* Lauris Kaplinski <lauris@kaplinski.com>
*
* Copyright (C) 2001-2002 Lauris Kaplinski
#include "color.h"
#include "forward.h"
#include "sp-marker-loc.h"
+#include "sp-filter.h"
+#include "sp-filter-reference.h"
+#include "uri-references.h"
+#include "uri.h"
+#include "sp-paint-server.h"
+
+#include <sigc++/connection.h>
namespace Inkscape {
namespace XML {
class SPCSSAttr;
-namespace Inkscape {
-gchar *parse_css_url(gchar const *string);
-}
-
class SPIFloat;
class SPIScale24;
class SPIInt;
float computed;
};
-#define SP_STYLE_FILL_SERVER(s) (((SPStyle *) (s))->fill.value.paint.server)
-#define SP_STYLE_STROKE_SERVER(s) (((SPStyle *) (s))->stroke.value.paint.server)
-#define SP_OBJECT_STYLE_FILL_SERVER(o) (SP_OBJECT (o)->style->fill.value.paint.server)
-#define SP_OBJECT_STYLE_STROKE_SERVER(o) (SP_OBJECT (o)->style->stroke.value.paint.server)
+#define SP_STYLE_FILL_SERVER(s) (((SPStyle *) (s))->getFillPaintServer())
+#define SP_STYLE_STROKE_SERVER(s) (((SPStyle *) (s))->getStrokePaintServer())
+#define SP_OBJECT_STYLE_FILL_SERVER(o) (SP_OBJECT (o)->style->getFillPaintServer())
+#define SP_OBJECT_STYLE_STROKE_SERVER(o) (SP_OBJECT (o)->style->getStrokePaintServer())
-enum {
- SP_PAINT_TYPE_NONE,
- SP_PAINT_TYPE_COLOR,
- SP_PAINT_TYPE_PAINTSERVER,
- SP_PAINT_TYPE_IMPOSSIBLE
-};
+class SVGICCColor;
/// Paint type internal to SPStyle.
struct SPIPaint {
unsigned set : 1;
unsigned inherit : 1;
unsigned currentcolor : 1;
- unsigned type : 2;
- union {
- SPColor color;
- struct {
- SPPaintServer *server;
- gchar *uri;
- } paint;
+ unsigned int colorSet : 1;
+ unsigned int noneSet : 1;
+ struct {
+ SPPaintServerReference *href;
+ SPColor color;
} value;
+
+
+ bool isSet() const { return true; /* set || colorSet*/}
+ bool isSameType( SPIPaint const & other ) const {return (isPaintserver() == other.isPaintserver()) && (colorSet == other.colorSet) && (currentcolor == other.currentcolor);}
+
+ bool isNoneSet() const {return noneSet;}
+
+ bool isNone() const {return !currentcolor && !colorSet && !isPaintserver();} // TODO refine
+ bool isColor() const {return colorSet && !isPaintserver();}
+ bool isPaintserver() const {return value.href && value.href->getObject();}
+
+ void clear();
+
+ void setColor( float r, float g, float b ) {value.color.set( r, g, b ); colorSet = true;}
+ void setColor( guint32 val ) {value.color.set( val ); colorSet = true;}
+ void setColor( SPColor const& color ) {value.color = color; colorSet = true;}
+};
+
+/// Filter type internal to SPStyle
+struct SPIFilter {
+ unsigned set : 1;
+ unsigned inherit : 1;
+ SPFilterReference *href;
};
enum {
/// An SVG style object.
struct SPStyle {
int refcount;
+
/** Object we are attached to */
SPObject *object;
+ /** Document we are associated with */
+ SPDocument *document;
+
/** Our text style component */
SPTextStyle *text;
unsigned text_private : 1;
unsigned stroke_dasharray_set : 1;
unsigned stroke_dasharray_inherit : 1;
unsigned stroke_dashoffset_set : 1;
+ unsigned stroke_dashoffset_inherit : 1;
/** stroke-opacity */
SPIScale24 stroke_opacity;
/** Marker list */
SPIString marker[SP_MARKER_LOC_QTY];
- /// style belongs to a cloned object, must not href anything
+ /** Filter effect */
+ SPIFilter filter;
+
+ SPIEnum filter_blend_mode;
+
+ /** normally not used, but duplicates the Gaussian blur deviation (if any) from the attached
+ filter when the style is used for querying */
+ SPILength filter_gaussianBlur_deviation;
+
+ /** enable-background, used for defining where filter effects get
+ * their background image */
+ SPIEnum enable_background;
+
+ /// style belongs to a cloned object
bool cloned;
- /// style has hreffed its paintservers, needs to release
- bool hreffed;
- /// style is listening to changes in paintservers, need to disconnect
- bool listening;
+
+ sigc::connection release_connection;
+
+ sigc::connection filter_modified_connection;
+ sigc::connection fill_ps_modified_connection;
+ sigc::connection stroke_ps_modified_connection;
+
+ SPObject *getFilter() {if (filter.href) return filter.href->getObject(); else return NULL;}
+ const gchar *getFilterURI() {if (filter.href) return filter.href->getURI()->toString(); else return NULL;}
+ SPPaintServer *getFillPaintServer() {if (fill.value.href) return fill.value.href->getObject(); else return NULL;}
+ const gchar *getFillURI() {if (fill.value.href) return fill.value.href->getURI()->toString(); else return NULL;}
+ SPPaintServer *getStrokePaintServer() {if (stroke.value.href) return stroke.value.href->getObject(); else return NULL;}
+ const gchar *getStrokeURI() {if (stroke.value.href) return stroke.value.href->getURI()->toString(); else return NULL;}
};
-SPStyle *sp_style_new();
+SPStyle *sp_style_new(SPDocument *document);
SPStyle *sp_style_new_from_object(SPObject *object);
void sp_style_read_from_object(SPStyle *style, SPObject *object);
-void sp_style_read_from_repr(SPStyle *style, Inkscape::XML::Node *repr);
+void sp_style_read_from_prefs(SPStyle *style, Glib::ustring const &path);
void sp_style_merge_from_style_string(SPStyle *style, gchar const *p);
@@ -349,6 +395,8 @@ gchar *sp_style_write_string(SPStyle const *style, guint flags = SP_STYLE_FLAG_I
gchar *sp_style_write_difference(SPStyle const *from, SPStyle const *to);
+void sp_style_set_to_uri_string (SPStyle *style, bool isfill, const gchar *uri);
+
/* SPTextStyle */
enum SPCSSFontSize {
SP_CSS_DISPLAY_TABLE_CAPTION
};
+enum SPEnableBackground {
+ SP_CSS_BACKGROUND_ACCUMULATE,
+ SP_CSS_BACKGROUND_NEW
+};
+
/// An SPTextStyle has a refcount, a font family, and a font name.
struct SPTextStyle {
int refcount;
/* CSS font properties */
SPIString font_family;
+ /* Full font name, as font_factory::ConstructFontSpecification would give */
+ SPIString font_specification;
+
/** \todo fixme: The 'font' property is ugly, and not working (lauris) */
SPIString font;
};
void sp_style_unset_property_attrs(SPObject *o);
+void sp_style_set_property_url (SPObject *item, gchar const *property, SPObject *linked, bool recursive);
+
+gchar *attribute_unquote(gchar const *val);
+gchar *css2_escape_quote(gchar const *val);
+
#endif