![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/sp-clippath.cpp b/src/sp-clippath.cpp
index d8d2acc9fcf76d4ddcbbcf278a92e372c833dc89..4bbabc965fbaf3360018461fe9bec96615e81192 100644 (file)
--- a/src/sp-clippath.cpp
+++ b/src/sp-clippath.cpp
* Released under GNU GPL, read the file 'COPYING' for more information
*/
-
+#include <cstring>
+#include <string>
#include "display/nr-arena.h"
#include "display/nr-arena-group.h"
#include "enums.h"
#include "attributes.h"
#include "document.h"
+#include "document-private.h"
#include "sp-item.h"
+#include "libnr/nr-matrix-ops.h"
+#include <2geom/transforms.h>
+
#include "sp-clippath.h"
struct SPClipPathView {
static void sp_clippath_child_added(SPObject *object, Inkscape::XML::Node *child, Inkscape::XML::Node *ref);
static void sp_clippath_update(SPObject *object, SPCtx *ctx, guint flags);
static void sp_clippath_modified(SPObject *object, guint flags);
-static Inkscape::XML::Node *sp_clippath_write(SPObject *object, Inkscape::XML::Node *repr, guint flags);
+static Inkscape::XML::Node *sp_clippath_write(SPObject *object, Inkscape::XML::Document *doc, Inkscape::XML::Node *repr, guint flags);
SPClipPathView *sp_clippath_view_new_prepend(SPClipPathView *list, unsigned int key, NRArenaItem *arenaitem);
SPClipPathView *sp_clippath_view_list_remove(SPClipPathView *list, SPClipPathView *view);
static void
sp_clippath_class_init(SPClipPathClass *klass)
{
- GObjectClass *gobject_class;
- SPObjectClass *sp_object_class;
-
- gobject_class = (GObjectClass *) klass;
- sp_object_class = (SPObjectClass *) klass;
+ SPObjectClass *sp_object_class = (SPObjectClass *) klass;
parent_class = (SPObjectGroupClass*)g_type_class_ref(SP_TYPE_OBJECTGROUP);
static void
sp_clippath_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr)
{
- SPClipPath *cp;
-
- cp = SP_CLIPPATH(object);
-
if (((SPObjectClass *) parent_class)->build)
((SPObjectClass *) parent_class)->build(object, document, repr);
@@ -116,30 +113,26 @@ sp_clippath_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *r
static void
sp_clippath_release(SPObject * object)
{
- SPClipPath *cp;
-
- cp = SP_CLIPPATH(object);
-
if (SP_OBJECT_DOCUMENT(object)) {
/* Unregister ourselves */
sp_document_remove_resource(SP_OBJECT_DOCUMENT(object), "clipPath", object);
}
+ SPClipPath *cp = SP_CLIPPATH(object);
while (cp->display) {
- /* We simply unref and let item to manage this in handler */
+ /* We simply unref and let item manage this in handler */
cp->display = sp_clippath_view_list_remove(cp->display, cp->display);
}
- if (((SPObjectClass *) (parent_class))->release)
+ if (((SPObjectClass *) (parent_class))->release) {
((SPObjectClass *) parent_class)->release(object);
+ }
}
static void
sp_clippath_set(SPObject *object, unsigned int key, gchar const *value)
{
- SPClipPath *cp;
-
- cp = SP_CLIPPATH(object);
+ SPClipPath *cp = SP_CLIPPATH(object);
switch (key) {
case SP_ATTR_CLIPPATHUNITS:
static void
sp_clippath_child_added(SPObject *object, Inkscape::XML::Node *child, Inkscape::XML::Node *ref)
{
- SPClipPath *cp;
- SPObject *ochild;
-
- cp = SP_CLIPPATH(object);
-
/* Invoke SPObjectGroup implementation */
((SPObjectClass *) (parent_class))->child_added(object, child, ref);
/* Show new object */
- ochild = SP_OBJECT_DOCUMENT(object)->getObjectByRepr(child);
+ SPObject *ochild = SP_OBJECT_DOCUMENT(object)->getObjectByRepr(child);
if (SP_IS_ITEM(ochild)) {
- SPClipPathView *v;
- for (v = cp->display; v != NULL; v = v->next) {
- NRArenaItem *ac;
- ac = sp_item_invoke_show(SP_ITEM(ochild), NR_ARENA_ITEM_ARENA(v->arenaitem), v->key, SP_ITEM_REFERENCE_FLAGS);
+ SPClipPath *cp = SP_CLIPPATH(object);
+ for (SPClipPathView *v = cp->display; v != NULL; v = v->next) {
+ NRArenaItem *ac = sp_item_invoke_show(SP_ITEM(ochild),
+ NR_ARENA_ITEM_ARENA(v->arenaitem),
+ v->key,
+ SP_ITEM_REFERENCE_FLAGS);
if (ac) {
nr_arena_item_add_child(v->arenaitem, ac, NULL);
- nr_arena_item_unref(ac);
}
}
}
@@ -191,26 +180,21 @@ sp_clippath_child_added(SPObject *object, Inkscape::XML::Node *child, Inkscape::
static void
sp_clippath_update(SPObject *object, SPCtx *ctx, guint flags)
{
- SPObjectGroup *og;
- SPClipPath *cp;
- SPObject *child;
- SPClipPathView *v;
- GSList *l;
-
- og = SP_OBJECTGROUP(object);
- cp = SP_CLIPPATH(object);
+ if (flags & SP_OBJECT_MODIFIED_FLAG) {
+ flags |= SP_OBJECT_PARENT_MODIFIED_FLAG;
+ }
- if (flags & SP_OBJECT_MODIFIED_FLAG) flags |= SP_OBJECT_PARENT_MODIFIED_FLAG;
flags &= SP_OBJECT_MODIFIED_CASCADE;
- l = NULL;
- for (child = sp_object_first_child(SP_OBJECT(og)); child != NULL; child = SP_OBJECT_NEXT(child)) {
+ SPObjectGroup *og = SP_OBJECTGROUP(object);
+ GSList *l = NULL;
+ for (SPObject *child = sp_object_first_child(SP_OBJECT(og)); child != NULL; child = SP_OBJECT_NEXT(child)) {
g_object_ref(G_OBJECT(child));
l = g_slist_prepend(l, child);
}
l = g_slist_reverse(l);
while (l) {
- child = SP_OBJECT(l->data);
+ SPObject *child = SP_OBJECT(l->data);
l = g_slist_remove(l, child);
if (flags || (child->uflags & (SP_OBJECT_MODIFIED_FLAG | SP_OBJECT_CHILD_MODIFIED_FLAG))) {
child->updateDisplay(ctx, flags);
g_object_unref(G_OBJECT(child));
}
- for (v = cp->display; v != NULL; v = v->next) {
+ SPClipPath *cp = SP_CLIPPATH(object);
+ for (SPClipPathView *v = cp->display; v != NULL; v = v->next) {
if (cp->clipPathUnits == SP_CONTENT_UNITS_OBJECTBOUNDINGBOX) {
- NRMatrix t;
- nr_matrix_set_scale(&t, v->bbox.x1 - v->bbox.x0, v->bbox.y1 - v->bbox.y0);
- t.c[4] = v->bbox.x0;
- t.c[5] = v->bbox.y0;
+ Geom::Matrix t(Geom::Scale(v->bbox.x1 - v->bbox.x0, v->bbox.y1 - v->bbox.y0));
+ t[4] = v->bbox.x0;
+ t[5] = v->bbox.y0;
nr_arena_group_set_child_transform(NR_ARENA_GROUP(v->arenaitem), &t);
} else {
nr_arena_group_set_child_transform(NR_ARENA_GROUP(v->arenaitem), NULL);
static void
sp_clippath_modified(SPObject *object, guint flags)
{
- SPObjectGroup *og;
- SPClipPath *cp;
- SPObject *child;
- GSList *l;
-
- og = SP_OBJECTGROUP(object);
- cp = SP_CLIPPATH(object);
+ if (flags & SP_OBJECT_MODIFIED_FLAG) {
+ flags |= SP_OBJECT_PARENT_MODIFIED_FLAG;
+ }
- if (flags & SP_OBJECT_MODIFIED_FLAG) flags |= SP_OBJECT_PARENT_MODIFIED_FLAG;
flags &= SP_OBJECT_MODIFIED_CASCADE;
- l = NULL;
- for (child = sp_object_first_child(SP_OBJECT(og)); child != NULL; child = SP_OBJECT_NEXT(child)) {
+ SPObjectGroup *og = SP_OBJECTGROUP(object);
+ GSList *l = NULL;
+ for (SPObject *child = sp_object_first_child(SP_OBJECT(og)); child != NULL; child = SP_OBJECT_NEXT(child)) {
g_object_ref(G_OBJECT(child));
l = g_slist_prepend(l, child);
}
l = g_slist_reverse(l);
while (l) {
- child = SP_OBJECT(l->data);
+ SPObject *child = SP_OBJECT(l->data);
l = g_slist_remove(l, child);
if (flags || (child->mflags & (SP_OBJECT_MODIFIED_FLAG | SP_OBJECT_CHILD_MODIFIED_FLAG))) {
child->emitModified(flags);
}
static Inkscape::XML::Node *
-sp_clippath_write(SPObject *object, Inkscape::XML::Node *repr, guint flags)
+sp_clippath_write(SPObject *object, Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, guint flags)
{
- SPClipPath *cp;
-
- cp = SP_CLIPPATH(object);
-
if ((flags & SP_OBJECT_WRITE_BUILD) && !repr) {
- repr = sp_repr_new("svg:clipPath");
+ repr = xml_doc->createElement("svg:clipPath");
}
if (((SPObjectClass *) (parent_class))->write)
- ((SPObjectClass *) (parent_class))->write(object, repr, flags);
+ ((SPObjectClass *) (parent_class))->write(object, xml_doc, repr, flags);
return repr;
}
NRArenaItem *
sp_clippath_show(SPClipPath *cp, NRArena *arena, unsigned int key)
{
- NRArenaItem *ai, *ac;
- SPObject *child;
-
g_return_val_if_fail(cp != NULL, NULL);
g_return_val_if_fail(SP_IS_CLIPPATH(cp), NULL);
g_return_val_if_fail(arena != NULL, NULL);
g_return_val_if_fail(NR_IS_ARENA(arena), NULL);
- ai = NRArenaGroup::create(arena);
+ NRArenaItem *ai = NRArenaGroup::create(arena);
cp->display = sp_clippath_view_new_prepend(cp->display, key, ai);
- for (child = sp_object_first_child(SP_OBJECT(cp)) ; child != NULL; child = SP_OBJECT_NEXT(child)) {
+ for (SPObject *child = sp_object_first_child(SP_OBJECT(cp)) ; child != NULL; child = SP_OBJECT_NEXT(child)) {
if (SP_IS_ITEM(child)) {
- ac = sp_item_invoke_show(SP_ITEM(child), arena, key, SP_ITEM_REFERENCE_FLAGS);
+ NRArenaItem *ac = sp_item_invoke_show(SP_ITEM(child), arena, key, SP_ITEM_REFERENCE_FLAGS);
if (ac) {
/* The order is not important in clippath */
nr_arena_item_add_child(ai, ac, NULL);
- nr_arena_item_unref(ac);
}
}
}
if (cp->clipPathUnits == SP_CONTENT_UNITS_OBJECTBOUNDINGBOX) {
- NRMatrix t;
- nr_matrix_set_scale(&t, cp->display->bbox.x1 - cp->display->bbox.x0, cp->display->bbox.y1 - cp->display->bbox.y0);
- t.c[4] = cp->display->bbox.x0;
- t.c[5] = cp->display->bbox.y0;
+ Geom::Matrix t(Geom::Scale(cp->display->bbox.x1 - cp->display->bbox.x0, cp->display->bbox.y1 - cp->display->bbox.y0));
+ t[4] = cp->display->bbox.x0;
+ t[5] = cp->display->bbox.y0;
nr_arena_group_set_child_transform(NR_ARENA_GROUP(ai), &t);
}
void
sp_clippath_hide(SPClipPath *cp, unsigned int key)
{
- SPClipPathView *v;
- SPObject *child;
-
g_return_if_fail(cp != NULL);
g_return_if_fail(SP_IS_CLIPPATH(cp));
- for (child = sp_object_first_child(SP_OBJECT(cp)) ; child != NULL; child = SP_OBJECT_NEXT(child)) {
+ for (SPObject *child = sp_object_first_child(SP_OBJECT(cp)) ; child != NULL; child = SP_OBJECT_NEXT(child)) {
if (SP_IS_ITEM(child)) {
sp_item_invoke_hide(SP_ITEM(child), key);
}
}
- for (v = cp->display; v != NULL; v = v->next) {
+ for (SPClipPathView *v = cp->display; v != NULL; v = v->next) {
if (v->key == key) {
/* We simply unref and let item to manage this in handler */
cp->display = sp_clippath_view_list_remove(cp->display, v);
void
sp_clippath_set_bbox(SPClipPath *cp, unsigned int key, NRRect *bbox)
{
- SPClipPathView *v;
-
- for (v = cp->display; v != NULL; v = v->next) {
+ for (SPClipPathView *v = cp->display; v != NULL; v = v->next) {
if (v->key == key) {
if (!NR_DF_TEST_CLOSE(v->bbox.x0, bbox->x0, NR_EPSILON) ||
!NR_DF_TEST_CLOSE(v->bbox.y0, bbox->y0, NR_EPSILON) ||
!NR_DF_TEST_CLOSE(v->bbox.x1, bbox->x1, NR_EPSILON) ||
!NR_DF_TEST_CLOSE(v->bbox.y1, bbox->y1, NR_EPSILON)) {
v->bbox = *bbox;
- SP_OBJECT(cp)->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG);
}
break;
}
}
}
+void
+sp_clippath_get_bbox(SPClipPath *cp, NRRect *bbox, Geom::Matrix const &transform, unsigned const /*flags*/)
+{
+ SPObject *i;
+ for (i = sp_object_first_child(SP_OBJECT(cp)); i && !SP_IS_ITEM(i); i = SP_OBJECT_NEXT(i)){};
+ if (!i) return;
+
+ sp_item_invoke_bbox_full(SP_ITEM(i), bbox, Geom::Matrix(SP_ITEM(i)->transform) * transform, SPItem::GEOMETRIC_BBOX, FALSE);
+ SPObject *i_start = i;
+
+ while (i != NULL) {
+ if (i != i_start) {
+ NRRect i_box;
+ sp_item_invoke_bbox_full(SP_ITEM(i), &i_box, Geom::Matrix(SP_ITEM(i)->transform) * transform, SPItem::GEOMETRIC_BBOX, FALSE);
+ nr_rect_d_union (bbox, bbox, &i_box);
+ }
+ i = SP_OBJECT_NEXT(i);
+ for (; i && !SP_IS_ITEM(i); i = SP_OBJECT_NEXT(i)){};
+ }
+}
+
/* ClipPath views */
SPClipPathView *
sp_clippath_view_new_prepend(SPClipPathView *list, unsigned int key, NRArenaItem *arenaitem)
{
- SPClipPathView *new_path_view;
-
- new_path_view = g_new(SPClipPathView, 1);
+ SPClipPathView *new_path_view = g_new(SPClipPathView, 1);
new_path_view->next = list;
new_path_view->key = key;
return list;
}
+// Create a mask element (using passed elements), add it to <defs>
+const gchar *
+sp_clippath_create (GSList *reprs, SPDocument *document, Geom::Matrix const* applyTransform)
+{
+ Inkscape::XML::Node *defsrepr = SP_OBJECT_REPR (SP_DOCUMENT_DEFS (document));
+
+ Inkscape::XML::Document *xml_doc = sp_document_repr_doc(document);
+ Inkscape::XML::Node *repr = xml_doc->createElement("svg:clipPath");
+ repr->setAttribute("clipPathUnits", "userSpaceOnUse");
+
+ defsrepr->appendChild(repr);
+ const gchar *id = repr->attribute("id");
+ SPObject *clip_path_object = document->getObjectById(id);
+
+ for (GSList *it = reprs; it != NULL; it = it->next) {
+ Inkscape::XML::Node *node = (Inkscape::XML::Node *)(it->data);
+ SPItem *item = SP_ITEM(clip_path_object->appendChildRepr(node));
+
+ if (NULL != applyTransform) {
+ Geom::Matrix transform (item->transform);
+ transform *= (*applyTransform);
+ sp_item_write_transform(item, SP_OBJECT_REPR(item), transform);
+ }
+ }
+
+ Inkscape::GC::release(repr);
+ return id;
+}
/*
Local Variables: