![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
index 58decfad76c443bfc87bf74e1c37903ffd5390bd..114ed9c645a67470811fe9d9502201820303eab0 100644 (file)
#define __SP_SELECTION_CHEMISTRY_C__
-/*
- * Miscellanous operations on selected items
- *
- * Authors:
+/** @file
+ * @brief Miscellanous operations on selected items
+ */
+/* Authors:
* Lauris Kaplinski <lauris@kaplinski.com>
* Frank Felfe <innerspace@iname.com>
* MenTaLguY <mental@rydia.net>
# include "config.h"
#endif
+#include "selection-chemistry.h"
+
#include <gtkmm/clipboard.h>
#include "svg/svg.h"
#include "desktop-handles.h"
#include "message-stack.h"
#include "sp-item-transform.h"
-#include "sp-marker.h"
+#include "marker.h"
#include "sp-use.h"
#include "sp-textpath.h"
#include "sp-tspan.h"
+#include "sp-tref.h"
#include "sp-flowtext.h"
#include "sp-flowregion.h"
#include "text-editing.h"
#include "layer-fns.h"
#include "context-fns.h"
#include <map>
+#include <cstring>
+#include <string>
#include "helper/units.h"
#include "sp-item.h"
+#include "box3d.h"
#include "unit-constants.h"
-using NR::X;
-using NR::Y;
+#include "xml/simple-document.h"
+#include "sp-filter-reference.h"
+#include "gradient-drag.h"
+#include "uri-references.h"
+#include "libnr/nr-convert2geom.h"
-#include "selection-chemistry.h"
+// For clippath editing
+#include "tools-switch.h"
+#include "shape-editor.h"
+#include "node-context.h"
+#include "nodepath.h"
+
+#include "ui/clipboard.h"
-/* fixme: find a better place */
-GSList *clipboard = NULL;
-GSList *defs_clipboard = NULL;
-SPCSSAttr *style_clipboard = NULL;
-NR::Rect size_clipboard(NR::Point(0,0), NR::Point(0,0));
+using NR::X;
+using NR::Y;
-static void sp_copy_stuff_used_by_item(GSList **defs_clip, SPItem *item, const GSList *items);
+/* The clipboard handling is in ui/clipboard.cpp now. There are some legacy functions left here,
+because the layer manipulation code uses them. It should be rewritten specifically
+for that purpose. */
-void sp_selection_copy_one (Inkscape::XML::Node *repr, NR::Matrix full_t, GSList **clip)
+/**
+ * Copies repr and its inherited css style elements, along with the accumulated transform 'full_t',
+ * then prepends the copy to 'clip'.
+ */
+void sp_selection_copy_one (Inkscape::XML::Node *repr, NR::Matrix full_t, GSList **clip, Inkscape::XML::Document* xml_doc)
{
- Inkscape::XML::Node *copy = repr->duplicate();
+ Inkscape::XML::Node *copy = repr->duplicate(xml_doc);
// copy complete inherited style
SPCSSAttr *css = sp_repr_css_attr_inherited(repr, "style");
sp_repr_css_set(copy, css, "style");
sp_repr_css_attr_unref(css);
- // write the complete accummulated transform passed to us
- // (we're dealing with unattached repr, so we write to its attr instead of using sp_item_set_transform)
- gchar affinestr[80];
- if (sp_svg_transform_write(affinestr, 79, full_t)) {
- copy->setAttribute("transform", affinestr);
- } else {
- copy->setAttribute("transform", NULL);
- }
+ // write the complete accumulated transform passed to us
+ // (we're dealing with unattached repr, so we write to its attr
+ // instead of using sp_item_set_transform)
+ gchar *affinestr=sp_svg_transform_write(full_t);
+ copy->setAttribute("transform", affinestr);
+ g_free(affinestr);
*clip = g_slist_prepend(*clip, copy);
}
-void sp_selection_copy_impl (const GSList *items, GSList **clip, GSList **defs_clip, SPCSSAttr **style_clip)
+void sp_selection_copy_impl (GSList const *items, GSList **clip, Inkscape::XML::Document* xml_doc)
{
+ // Sort items:
+ GSList *sorted_items = g_slist_copy ((GSList *) items);
+ sorted_items = g_slist_sort((GSList *) sorted_items, (GCompareFunc) sp_object_compare_position);
- // Copy stuff referenced by all items to defs_clip:
- if (defs_clip) {
- for (GSList *i = (GSList *) items; i != NULL; i = i->next) {
- sp_copy_stuff_used_by_item (defs_clip, SP_ITEM (i->data), items);
- }
- *defs_clip = g_slist_reverse(*defs_clip);
- }
-
- // Store style:
- if (style_clip) {
- SPItem *item = SP_ITEM (items->data); // take from the first selected item
- *style_clip = take_style_from_item (item);
+ // Copy item reprs:
+ for (GSList *i = (GSList *) sorted_items; i != NULL; i = i->next) {
+ sp_selection_copy_one (SP_OBJECT_REPR (i->data), from_2geom(sp_item_i2doc_affine(SP_ITEM (i->data))), clip, xml_doc);
}
- if (clip) {
- // Sort items:
- GSList *sorted_items = g_slist_copy ((GSList *) items);
- sorted_items = g_slist_sort((GSList *) sorted_items, (GCompareFunc) sp_object_compare_position);
-
- // Copy item reprs:
- for (GSList *i = (GSList *) sorted_items; i != NULL; i = i->next) {
- sp_selection_copy_one (SP_OBJECT_REPR (i->data), sp_item_i2doc_affine(SP_ITEM (i->data)), clip);
- }
-
- *clip = g_slist_reverse(*clip);
- g_slist_free ((GSList *) sorted_items);
- }
+ *clip = g_slist_reverse(*clip);
+ g_slist_free ((GSList *) sorted_items);
}
-/**
-Add gradients/patterns/markers referenced by copied objects to defs
-*/
-void
-paste_defs (GSList **defs_clip, SPDocument *doc)
+GSList *sp_selection_paste_impl (SPDocument *doc, SPObject *parent, GSList **clip)
{
- if (!defs_clip)
- return;
-
- for (GSList *gl = *defs_clip; gl != NULL; gl = gl->next) {
- SPDefs *defs= (SPDefs *) SP_DOCUMENT_DEFS(doc);
- Inkscape::XML::Node *repr = (Inkscape::XML::Node *) gl->data;
- gchar const *id = repr->attribute("id");
- if (!id || !doc->getObjectById(id)) {
- Inkscape::XML::Node *copy = repr->duplicate();
- SP_OBJECT_REPR(defs)->addChild(copy, NULL);
- Inkscape::GC::release(copy);
- }
- }
-}
-
-GSList *sp_selection_paste_impl (SPDocument *document, SPObject *parent, GSList **clip, GSList **defs_clip)
-{
- paste_defs (defs_clip, document);
+ Inkscape::XML::Document *xml_doc = sp_document_repr_doc(doc);
GSList *copied = NULL;
// add objects to document
for (GSList *l = *clip; l != NULL; l = l->next) {
Inkscape::XML::Node *repr = (Inkscape::XML::Node *) l->data;
- Inkscape::XML::Node *copy = repr->duplicate();
+ Inkscape::XML::Node *copy = repr->duplicate(xml_doc);
// premultiply the item transform by the accumulated parent transform in the paste layer
- NR::Matrix local = sp_item_i2doc_affine(SP_ITEM(parent));
+ NR::Matrix local = from_2geom(sp_item_i2doc_affine(SP_ITEM(parent)));
if (!local.test_identity()) {
gchar const *t_str = copy->attribute("transform");
NR::Matrix item_t (NR::identity());
@@ -178,12 +156,9 @@ GSList *sp_selection_paste_impl (SPDocument *document, SPObject *parent, GSList
sp_svg_transform_read(t_str, &item_t);
item_t *= local.inverse();
// (we're dealing with unattached repr, so we write to its attr instead of using sp_item_set_transform)
- gchar affinestr[80];
- if (sp_svg_transform_write(affinestr, 79, item_t)) {
- copy->setAttribute("transform", affinestr);
- } else {
- copy->setAttribute("transform", NULL);
- }
+ gchar *affinestr=sp_svg_transform_write(item_t);
+ copy->setAttribute("transform", affinestr);
+ g_free(affinestr);
}
parent->appendChildRepr(copy);
@@ -193,14 +168,14 @@ GSList *sp_selection_paste_impl (SPDocument *document, SPObject *parent, GSList
return copied;
}
-void sp_selection_delete_impl(const GSList *items)
+void sp_selection_delete_impl(GSList const *items, bool propagate = true, bool propagate_descendants = true)
{
- for (const GSList *i = items ; i ; i = i->next ) {
+ for (GSList const *i = items ; i ; i = i->next ) {
sp_object_ref((SPObject *)i->data, NULL);
}
- for (const GSList *i = items; i != NULL; i = i->next) {
+ for (GSList const *i = items; i != NULL; i = i->next) {
SPItem *item = (SPItem *) i->data;
- SP_OBJECT(item)->deleteObject();
+ SP_OBJECT(item)->deleteObject(propagate, propagate_descendants);
sp_object_unref((SPObject *)item, NULL);
}
}
return;
}
- const GSList *selected = g_slist_copy(const_cast<GSList *>(selection->itemList()));
+ GSList const *selected = g_slist_copy(const_cast<GSList *>(selection->itemList()));
selection->clear();
sp_selection_delete_impl (selected);
g_slist_free ((GSList *) selected);
*/
tools_switch ( desktop, tools_active ( desktop ) );
- sp_document_done(sp_desktop_document(desktop), SP_VERB_EDIT_DELETE,
+ sp_document_done(sp_desktop_document(desktop), SP_VERB_EDIT_DELETE,
_("Delete"));
}
/* fixme: sequencing */
-void sp_selection_duplicate()
+void sp_selection_duplicate(bool suppressDone)
{
SPDesktop *desktop = SP_ACTIVE_DESKTOP;
if (desktop == NULL)
return;
+ Inkscape::XML::Document* xml_doc = sp_document_repr_doc(desktop->doc());
Inkscape::Selection *selection = sp_desktop_selection(desktop);
// check if something is selected
while (reprs) {
Inkscape::XML::Node *parent = ((Inkscape::XML::Node *) reprs->data)->parent();
- Inkscape::XML::Node *copy = ((Inkscape::XML::Node *) reprs->data)->duplicate();
+ Inkscape::XML::Node *copy = ((Inkscape::XML::Node *) reprs->data)->duplicate(xml_doc);
parent->appendChild(copy);
Inkscape::GC::release(copy);
}
- sp_document_done(sp_desktop_document(desktop), SP_VERB_EDIT_DUPLICATE,
- _("Duplicate"));
+ if ( !suppressDone ) {
+ sp_document_done(sp_desktop_document(desktop), SP_VERB_EDIT_DUPLICATE,
+ _("Duplicate"));
+ }
selection->setReprList(newsel);
}
GSList *
-get_all_items (GSList *list, SPObject *from, SPDesktop *desktop, bool onlyvisible, bool onlysensitive, const GSList *exclude)
+get_all_items (GSList *list, SPObject *from, SPDesktop *desktop, bool onlyvisible, bool onlysensitive, GSList const *exclude)
{
for (SPObject *child = sp_object_first_child(SP_OBJECT(from)) ; child != NULL; child = SP_OBJECT_NEXT(child) ) {
if (SP_IS_ITEM(child) &&
GSList *items = NULL;
- const GSList *exclude = NULL;
+ GSList const *exclude = NULL;
if (invert) {
exclude = selection->itemList();
}
if (desktop == NULL)
return;
- SPDocument *document = sp_desktop_document (desktop);
+ SPDocument *doc = sp_desktop_document (desktop);
+ Inkscape::XML::Document *xml_doc = sp_document_repr_doc(doc);
Inkscape::Selection *selection = sp_desktop_selection(desktop);
// Check if something is selected.
if (selection->isEmpty()) {
- desktop->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("Select <b>two or more objects</b> to group."));
+ desktop->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("Select <b>some objects</b> to group."));
return;
}
GSList const *l = (GSList *) selection->reprList();
- // Check if at least two objects are selected.
- if (l->next == NULL) {
- desktop->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("Select <b>at least two objects</b> to group."));
- return;
- }
-
GSList *p = g_slist_copy((GSList *) l);
selection->clear();
gint topmost = ((Inkscape::XML::Node *) g_slist_last(p)->data)->position();
Inkscape::XML::Node *topmost_parent = ((Inkscape::XML::Node *) g_slist_last(p)->data)->parent();
- Inkscape::XML::Node *group = sp_repr_new("svg:g");
+ Inkscape::XML::Node *group = xml_doc->createElement("svg:g");
while (p) {
Inkscape::XML::Node *current = (Inkscape::XML::Node *) p->data;
if (current->parent() == topmost_parent) {
- Inkscape::XML::Node *spnew = current->duplicate();
+ Inkscape::XML::Node *spnew = current->duplicate(xml_doc);
sp_repr_unparent(current);
group->appendChild(spnew);
Inkscape::GC::release(spnew);
NR::Matrix item_t (NR::identity());
if (t_str)
sp_svg_transform_read(t_str, &item_t);
- item_t *= sp_item_i2doc_affine(SP_ITEM(document->getObjectByRepr(current->parent())));
+ item_t *= from_2geom(sp_item_i2doc_affine(SP_ITEM(doc->getObjectByRepr(current->parent()))));
//FIXME: when moving both clone and original from a transformed group (either by
//grouping into another parent, or by cut/paste) the transform from the original's
//parent becomes embedded into original itself, and this affects its clones. Fix
//then, if this is clone, looking up its original in that array and pre-multiplying
//it by the inverse of that original's transform diff.
- sp_selection_copy_one (current, item_t, &temp_clip);
+ sp_selection_copy_one (current, item_t, &temp_clip, xml_doc);
sp_repr_unparent(current);
// paste into topmost_parent (temporarily)
- GSList *copied = sp_selection_paste_impl (document, document->getObjectByRepr(topmost_parent), &temp_clip, NULL);
+ GSList *copied = sp_selection_paste_impl (doc, doc->getObjectByRepr(topmost_parent), &temp_clip);
if (temp_clip) g_slist_free (temp_clip);
if (copied) { // if success,
// take pasted object (now in topmost_parent)
Inkscape::XML::Node *in_topmost = (Inkscape::XML::Node *) copied->data;
// make a copy
- Inkscape::XML::Node *spnew = in_topmost->duplicate();
+ Inkscape::XML::Node *spnew = in_topmost->duplicate(xml_doc);
// remove pasted
sp_repr_unparent(in_topmost);
// put its copy into group
// Move to the position of the topmost, reduced by the number of items deleted from topmost_parent
group->setPosition(topmost + 1);
- sp_document_done(sp_desktop_document(desktop), SP_VERB_SELECTION_GROUP,
+ sp_document_done(sp_desktop_document(desktop), SP_VERB_SELECTION_GROUP,
_("Group"));
selection->set(group);
g_slist_free(items);
- sp_document_done(sp_desktop_document(desktop), SP_VERB_SELECTION_UNGROUP,
+ sp_document_done(sp_desktop_document(desktop), SP_VERB_SELECTION_UNGROUP,
_("Ungroup"));
}
static SPGroup *
-sp_item_list_common_parent_group(const GSList *items)
+sp_item_list_common_parent_group(GSList const *items)
{
if (!items) {
return NULL;
}
SPObject *parent = SP_OBJECT_PARENT(items->data);
- /* Strictly speaking this CAN happen, if user selects <svg> from XML editor */
+ /* Strictly speaking this CAN happen, if user selects <svg> from Inkscape::XML editor */
if (!SP_IS_GROUP(parent)) {
return NULL;
}
return SP_GROUP(parent);
}
-/** Finds out the minimum common bbox of the selected items
- */
-NR::Rect
-enclose_items(const GSList *items)
+/** Finds out the minimum common bbox of the selected items. */
+static boost::optional<NR::Rect>
+enclose_items(GSList const *items)
{
g_assert(items != NULL);
- NR::Rect r = sp_item_bbox_desktop((SPItem *) items->data);
-
- for (GSList *i = items->next; i; i = i->next) {
- r = NR::Rect::union_bounds(r, sp_item_bbox_desktop((SPItem *) i->data));
+ boost::optional<NR::Rect> r;
+ for (GSList const *i = items; i; i = i->next) {
+ r = NR::union_bounds(r, sp_item_bbox_desktop((SPItem *) i->data));
}
-
return r;
}
Inkscape::XML::Node *grepr = SP_OBJECT_REPR(group);
- /* construct reverse-ordered list of selected children */
+ /* Construct reverse-ordered list of selected children. */
GSList *rev = g_slist_copy((GSList *) items);
rev = g_slist_sort(rev, (GCompareFunc) sp_item_repr_compare_position);
- // find out the common bbox of the selected items
- NR::Rect selected = enclose_items(items);
-
- // for all objects in the selection (starting from top)
- while (rev) {
- SPObject *child = SP_OBJECT(rev->data);
- // for each selected object, find the next sibling
- for (SPObject *newref = child->next; newref; newref = newref->next) {
- // if the sibling is an item AND overlaps our selection,
- if (SP_IS_ITEM(newref) && selected.intersects(sp_item_bbox_desktop(SP_ITEM(newref)))) {
- // AND if it's not one of our selected objects,
- if (!g_slist_find((GSList *) items, newref)) {
- // move the selected object after that sibling
- grepr->changeOrder(SP_OBJECT_REPR(child), SP_OBJECT_REPR(newref));
+ // Determine the common bbox of the selected items.
+ boost::optional<NR::Rect> selected = enclose_items(items);
+
+ // Iterate over all objects in the selection (starting from top).
+ if (selected) {
+ while (rev) {
+ SPObject *child = SP_OBJECT(rev->data);
+ // for each selected object, find the next sibling
+ for (SPObject *newref = child->next; newref; newref = newref->next) {
+ // if the sibling is an item AND overlaps our selection,
+ if (SP_IS_ITEM(newref)) {
+ boost::optional<NR::Rect> newref_bbox = sp_item_bbox_desktop(SP_ITEM(newref));
+ if ( newref_bbox && selected->intersects(*newref_bbox) ) {
+ // AND if it's not one of our selected objects,
+ if (!g_slist_find((GSList *) items, newref)) {
+ // move the selected object after that sibling
+ grepr->changeOrder(SP_OBJECT_REPR(child), SP_OBJECT_REPR(newref));
+ }
+ break;
+ }
}
- break;
}
+ rev = g_slist_remove(rev, child);
}
- rev = g_slist_remove(rev, child);
+ } else {
+ g_slist_free(rev);
}
sp_document_done(sp_desktop_document(desktop), SP_VERB_SELECTION_RAISE,
- _("Raise"));
+ //TRANSLATORS: Only put the word "Raise" in the translation. Means "to raise an object" in the undo history
+ Q_("undo_action|Raise"));
}
void sp_selection_raise_to_top()
g_slist_free(rl);
- sp_document_done(document, SP_VERB_SELECTION_TO_FRONT,
+ sp_document_done(document, SP_VERB_SELECTION_TO_FRONT,
_("Raise to top"));
}
Inkscape::XML::Node *grepr = SP_OBJECT_REPR(group);
- // find out the common bbox of the selected items
- NR::Rect selected = enclose_items(items);
+ // Determine the common bbox of the selected items.
+ boost::optional<NR::Rect> selected = enclose_items(items);
- /* construct direct-ordered list of selected children */
+ /* Construct direct-ordered list of selected children. */
GSList *rev = g_slist_copy((GSList *) items);
rev = g_slist_sort(rev, (GCompareFunc) sp_item_repr_compare_position);
rev = g_slist_reverse(rev);
- // for all objects in the selection (starting from top)
- while (rev) {
- SPObject *child = SP_OBJECT(rev->data);
- // for each selected object, find the prev sibling
- for (SPObject *newref = prev_sibling(child); newref; newref = prev_sibling(newref)) {
- // if the sibling is an item AND overlaps our selection,
- if (SP_IS_ITEM(newref) && selected.intersects(sp_item_bbox_desktop(SP_ITEM(newref)))) {
- // AND if it's not one of our selected objects,
- if (!g_slist_find((GSList *) items, newref)) {
- // move the selected object before that sibling
- SPObject *put_after = prev_sibling(newref);
- if (put_after)
- grepr->changeOrder(SP_OBJECT_REPR(child), SP_OBJECT_REPR(put_after));
- else
- SP_OBJECT_REPR(child)->setPosition(0);
+ // Iterate over all objects in the selection (starting from top).
+ if (selected) {
+ while (rev) {
+ SPObject *child = SP_OBJECT(rev->data);
+ // for each selected object, find the prev sibling
+ for (SPObject *newref = prev_sibling(child); newref; newref = prev_sibling(newref)) {
+ // if the sibling is an item AND overlaps our selection,
+ if (SP_IS_ITEM(newref)) {
+ boost::optional<NR::Rect> ref_bbox = sp_item_bbox_desktop(SP_ITEM(newref));
+ if ( ref_bbox && selected->intersects(*ref_bbox) ) {
+ // AND if it's not one of our selected objects,
+ if (!g_slist_find((GSList *) items, newref)) {
+ // move the selected object before that sibling
+ SPObject *put_after = prev_sibling(newref);
+ if (put_after)
+ grepr->changeOrder(SP_OBJECT_REPR(child), SP_OBJECT_REPR(put_after));
+ else
+ SP_OBJECT_REPR(child)->setPosition(0);
+ }
+ break;
+ }
}
- break;
}
+ rev = g_slist_remove(rev, child);
}
- rev = g_slist_remove(rev, child);
+ } else {
+ g_slist_free(rev);
}
- sp_document_done(sp_desktop_document(desktop), SP_VERB_SELECTION_LOWER,
+ sp_document_done(sp_desktop_document(desktop), SP_VERB_SELECTION_LOWER,
_("Lower"));
-
}
void sp_selection_lower_to_bottom()
g_slist_free(rl);
- sp_document_done(document, SP_VERB_SELECTION_TO_BACK,
+ sp_document_done(document, SP_VERB_SELECTION_TO_BACK,
_("Lower to bottom"));
}
sp_selection_delete();
}
-void sp_copy_gradient (GSList **defs_clip, SPGradient *gradient)
-{
- SPGradient *ref = gradient;
-
- while (ref) {
- // climb up the refs, copying each one in the chain
- Inkscape::XML::Node *grad_repr = SP_OBJECT_REPR(ref)->duplicate();
- *defs_clip = g_slist_prepend (*defs_clip, grad_repr);
-
- ref = ref->ref->getObject();
- }
-}
-
-void sp_copy_pattern (GSList **defs_clip, SPPattern *pattern)
-{
- SPPattern *ref = pattern;
-
- while (ref) {
- // climb up the refs, copying each one in the chain
- Inkscape::XML::Node *pattern_repr = SP_OBJECT_REPR(ref)->duplicate();
- *defs_clip = g_slist_prepend (*defs_clip, pattern_repr);
-
- // items in the pattern may also use gradients and other patterns, so we need to recurse here as well
- for (SPObject *child = sp_object_first_child(SP_OBJECT(ref)) ; child != NULL; child = SP_OBJECT_NEXT(child) ) {
- if (!SP_IS_ITEM (child))
- continue;
- sp_copy_stuff_used_by_item (defs_clip, (SPItem *) child, NULL);
- }
-
- ref = ref->ref->getObject();
- }
-}
-
-void sp_copy_single (GSList **defs_clip, SPObject *thing)
-{
- Inkscape::XML::Node *duplicate_repr = SP_OBJECT_REPR(thing)->duplicate();
- *defs_clip = g_slist_prepend (*defs_clip, duplicate_repr);
-}
-
-
-void sp_copy_textpath_path (GSList **defs_clip, SPTextPath *tp, const GSList *items)
-{
- SPItem *path = sp_textpath_get_path_item (tp);
- if (!path)
- return;
- if (items && g_slist_find ((GSList *) items, path)) // do not copy it to defs if it is already in the list of items copied
- return;
- Inkscape::XML::Node *repr = SP_OBJECT_REPR(path)->duplicate();
- *defs_clip = g_slist_prepend (*defs_clip, repr);
-}
-
-void sp_copy_stuff_used_by_item (GSList **defs_clip, SPItem *item, const GSList *items)
-{
- SPStyle *style = SP_OBJECT_STYLE (item);
-
- if (style && (style->fill.type == SP_PAINT_TYPE_PAINTSERVER)) {
- SPObject *server = SP_OBJECT_STYLE_FILL_SERVER(item);
- if (SP_IS_LINEARGRADIENT (server) || SP_IS_RADIALGRADIENT (server))
- sp_copy_gradient (defs_clip, SP_GRADIENT(server));
- if (SP_IS_PATTERN (server))
- sp_copy_pattern (defs_clip, SP_PATTERN(server));
- }
-
- if (style && (style->stroke.type == SP_PAINT_TYPE_PAINTSERVER)) {
- SPObject *server = SP_OBJECT_STYLE_STROKE_SERVER(item);
- if (SP_IS_LINEARGRADIENT (server) || SP_IS_RADIALGRADIENT (server))
- sp_copy_gradient (defs_clip, SP_GRADIENT(server));
- if (SP_IS_PATTERN (server))
- sp_copy_pattern (defs_clip, SP_PATTERN(server));
- }
-
- if (SP_IS_SHAPE (item)) {
- SPShape *shape = SP_SHAPE (item);
- for (int i = 0 ; i < SP_MARKER_LOC_QTY ; i++) {
- if (shape->marker[i]) {
- sp_copy_single (defs_clip, SP_OBJECT (shape->marker[i]));
- }
- }
- }
-
- if (SP_IS_TEXT_TEXTPATH (item)) {
- sp_copy_textpath_path (defs_clip, SP_TEXTPATH(sp_object_first_child(SP_OBJECT(item))), items);
- }
-
- if (item->clip_ref->getObject()) {
- sp_copy_single (defs_clip, item->clip_ref->getObject());
- }
-
- if (item->mask_ref->getObject()) {
- SPObject *mask = item->mask_ref->getObject();
- sp_copy_single (defs_clip, mask);
- // recurse into the mask for its gradients etc.
- for (SPObject *o = SP_OBJECT(mask)->children; o != NULL; o = o->next) {
- if (SP_IS_ITEM(o))
- sp_copy_stuff_used_by_item (defs_clip, SP_ITEM (o), items);
- }
- }
-
- if (style->filter.filter) {
- SPObject *filter = style->filter.filter;
- if (SP_IS_FILTER(filter)) {
- sp_copy_single (defs_clip, filter);
- }
- }
-
- // recurse
- for (SPObject *o = SP_OBJECT(item)->children; o != NULL; o = o->next) {
- if (SP_IS_ITEM(o))
- sp_copy_stuff_used_by_item (defs_clip, SP_ITEM (o), items);
- }
-}
-
/**
* \pre item != NULL
*/
}
}
}
- if (!(SP_IS_TEXT (item) || SP_IS_TSPAN (item) || SP_IS_STRING (item))) {
+ if (!(SP_IS_TEXT (item) || SP_IS_TSPAN (item) || SP_IS_TREF(item) || SP_IS_STRING (item))) {
// do not copy text properties from non-text objects, it's confusing
css = sp_css_attr_unset_text (css);
}
// FIXME: also transform gradient/pattern fills, by forking? NO, this must be nondestructive
- double ex = NR::expansion(sp_item_i2doc_affine(item));
+ double ex = NR::expansion(from_2geom(sp_item_i2doc_affine(item)));
if (ex != 1.0) {
css = sp_css_attr_scale (css, ex);
}
void sp_selection_copy()
{
- SPDesktop *desktop = SP_ACTIVE_DESKTOP;
- if (desktop == NULL)
- return;
-
- Inkscape::Selection *selection = sp_desktop_selection(desktop);
-
- if (tools_isactive (desktop, TOOLS_DROPPER)) {
- sp_dropper_context_copy(desktop->event_context);
- return; // copied color under cursor, nothing else to do
- }
-
- // check if something is selected
- if (selection->isEmpty()) {
- desktop->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("Nothing was copied."));
- return;
- }
-
- const GSList *items = g_slist_copy ((GSList *) selection->itemList());
-
- // 0. Copy text to system clipboard
- // FIXME: for non-texts, put serialized XML as text to the clipboard;
- //for this sp_repr_write_stream needs to be rewritten with iostream instead of FILE
- Glib::ustring text;
- if (tools_isactive (desktop, TOOLS_TEXT)) {
- text = sp_text_get_selected_text(desktop->event_context);
- }
-
- if (text.empty()) {
- guint texts = 0;
- for (GSList *i = (GSList *) items; i; i = i->next) {
- SPItem *item = SP_ITEM (i->data);
- if (SP_IS_TEXT (item) || SP_IS_FLOWTEXT(item)) {
- if (texts > 0) // if more than one text object is copied, separate them by spaces
- text += " ";
- gchar *this_text = sp_te_get_string_multiline (item);
- if (this_text) {
- text += this_text;
- g_free(this_text);
- }
- texts++;
- }
- }
- }
- if (!text.empty()) {
- Glib::RefPtr<Gtk::Clipboard> refClipboard = Gtk::Clipboard::get();
- refClipboard->set_text(text);
- }
-
- // clear old defs clipboard
- while (defs_clipboard) {
- Inkscape::GC::release((Inkscape::XML::Node *) defs_clipboard->data);
- defs_clipboard = g_slist_remove (defs_clipboard, defs_clipboard->data);
- }
-
- // clear style clipboard
- if (style_clipboard) {
- sp_repr_css_attr_unref (style_clipboard);
- style_clipboard = NULL;
- }
-
- //clear main clipboard
- while (clipboard) {
- Inkscape::GC::release((Inkscape::XML::Node *) clipboard->data);
- clipboard = g_slist_remove(clipboard, clipboard->data);
- }
-
- sp_selection_copy_impl (items, &clipboard, &defs_clipboard, &style_clipboard);
-
- if (tools_isactive (desktop, TOOLS_TEXT)) { // take style from cursor/text selection, overwriting the style just set by copy_impl
- SPStyle *const query = sp_style_new();
- if (sp_desktop_query_style_all (desktop, query)) {
- SPCSSAttr *css = sp_css_attr_from_style (query, SP_STYLE_FLAG_ALWAYS);
- if (css != NULL) {
- // clear style clipboard
- if (style_clipboard) {
- sp_repr_css_attr_unref (style_clipboard);
- style_clipboard = NULL;
- }
- //sp_repr_css_print (css);
- style_clipboard = css;
- }
- }
- g_free (query);
- }
-
- size_clipboard = selection->bounds();
-
- g_slist_free ((GSList *) items);
+ Inkscape::UI::ClipboardManager *cm = Inkscape::UI::ClipboardManager::get();
+ cm->copy();
}
void sp_selection_paste(bool in_place)
{
- SPDesktop *desktop = SP_ACTIVE_DESKTOP;
-
- if (desktop == NULL) {
- return;
- }
-
- SPDocument *document = sp_desktop_document(desktop);
-
- if (Inkscape::have_viable_layer(desktop, desktop->messageStack()) == false) {
- return;
- }
-
- Inkscape::Selection *selection = sp_desktop_selection(desktop);
-
- if (tools_isactive (desktop, TOOLS_TEXT)) {
- if (sp_text_paste_inline(desktop->event_context))
- return; // pasted from system clipboard into text, nothing else to do
- }
+ Inkscape::UI::ClipboardManager *cm = Inkscape::UI::ClipboardManager::get();
+ if(cm->paste(in_place))
+ sp_document_done(SP_ACTIVE_DOCUMENT, SP_VERB_EDIT_PASTE, _("Paste"));
+}
- // check if something is in the clipboard
- if (clipboard == NULL) {
- desktop->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("Nothing on the clipboard."));
- return;
- }
+void sp_selection_paste_style()
+{
+ Inkscape::UI::ClipboardManager *cm = Inkscape::UI::ClipboardManager::get();
+ if(cm->pasteStyle())
+ sp_document_done(SP_ACTIVE_DOCUMENT, SP_VERB_EDIT_PASTE_STYLE, _("Paste style"));
+}
- GSList *copied = sp_selection_paste_impl(document, desktop->currentLayer(), &clipboard, &defs_clipboard);
- // add pasted objects to selection
- selection->setReprList((GSList const *) copied);
- g_slist_free (copied);
- if (!in_place) {
- sp_document_ensure_up_to_date(document);
+void sp_selection_paste_livepatheffect()
+{
+ Inkscape::UI::ClipboardManager *cm = Inkscape::UI::ClipboardManager::get();
+ if(cm->pastePathEffect())
+ sp_document_done(SP_ACTIVE_DOCUMENT, SP_VERB_EDIT_PASTE_LIVEPATHEFFECT,
+ _("Paste live path effect"));
+}
- NR::Point m( desktop->point() - selection->bounds().midpoint() );
- /* Snap the offset of the new item(s) to the grid */
- /* FIXME: this gridsnap fiddling is a hack. */
- Inkscape::GridSnapper &s = desktop->namedview->snap_manager.grid;
- gdouble const curr_gridsnap = s.getDistance();
- s.setDistance(NR_HUGE);
- m = s.freeSnap(Inkscape::Snapper::SNAP_POINT, m, NULL).getPoint();
- s.setDistance(curr_gridsnap);
- sp_selection_move_relative(selection, m);
+void sp_selection_remove_livepatheffect_impl(SPItem *item)
+{
+ if ( item && SP_IS_LPE_ITEM(item) ) {
+ sp_lpe_item_remove_all_path_effects(SP_LPE_ITEM(item), false);
}
-
- sp_document_done(document, SP_VERB_EDIT_PASTE,
- _("Paste"));
}
-void sp_selection_paste_style()
+void sp_selection_remove_livepatheffect()
{
SPDesktop *desktop = SP_ACTIVE_DESKTOP;
if (desktop == NULL) return;
Inkscape::Selection *selection = sp_desktop_selection(desktop);
- // check if something is in the clipboard
- if (clipboard == NULL) {
- desktop->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("Nothing on the clipboard."));
- return;
- }
-
// check if something is selected
if (selection->isEmpty()) {
- desktop->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("Select <b>object(s)</b> to paste style to."));
+ desktop->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("Select <b>object(s)</b> to remove live path effects from."));
return;
}
- paste_defs (&defs_clipboard, sp_desktop_document(desktop));
+ for ( GSList const *itemlist = selection->itemList(); itemlist != NULL; itemlist = g_slist_next(itemlist) ) {
+ SPItem *item = reinterpret_cast<SPItem*>(itemlist->data);
- sp_desktop_set_style (desktop, style_clipboard);
+ sp_selection_remove_livepatheffect_impl(item);
+
+ }
- sp_document_done(sp_desktop_document (desktop), SP_VERB_EDIT_PASTE_STYLE,
- _("Paste style"));
+ sp_document_done(sp_desktop_document (desktop), SP_VERB_EDIT_REMOVE_LIVEPATHEFFECT,
+ _("Remove live path effect"));
}
-void sp_selection_paste_size (bool apply_x, bool apply_y)
+void sp_selection_remove_filter ()
{
SPDesktop *desktop = SP_ACTIVE_DESKTOP;
if (desktop == NULL) return;
Inkscape::Selection *selection = sp_desktop_selection(desktop);
- // check if something is in the clipboard
- if (size_clipboard.extent(NR::X) < 1e-6 || size_clipboard.extent(NR::Y) < 1e-6) {
- desktop->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("Nothing on the clipboard."));
- return;
- }
-
// check if something is selected
if (selection->isEmpty()) {
- desktop->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("Select <b>object(s)</b> to paste size to."));
+ desktop->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("Select <b>object(s)</b> to remove filters from."));
return;
}
- NR::Rect current = selection->bounds();
- if (current.extent(NR::X) < 1e-6 || current.extent(NR::Y) < 1e-6) {
- return;
- }
+ SPCSSAttr *css = sp_repr_css_attr_new();
+ sp_repr_css_unset_property(css, "filter");
+ sp_desktop_set_style(desktop, css);
+ sp_repr_css_attr_unref(css);
- double scale_x = size_clipboard.extent(NR::X) / current.extent(NR::X);
- double scale_y = size_clipboard.extent(NR::Y) / current.extent(NR::Y);
+ sp_document_done(sp_desktop_document (desktop), SP_VERB_EDIT_REMOVE_FILTER,
+ _("Remove filter"));
+}
- sp_selection_scale_relative (selection, current.midpoint(),
- NR::scale(
- apply_x? scale_x : (desktop->isToolboxButtonActive ("lock")? scale_y : 1.0),
- apply_y? scale_y : (desktop->isToolboxButtonActive ("lock")? scale_x : 1.0)));
- sp_document_done(sp_desktop_document (desktop), SP_VERB_EDIT_PASTE_SIZE,
+void sp_selection_paste_size (bool apply_x, bool apply_y)
+{
+ Inkscape::UI::ClipboardManager *cm = Inkscape::UI::ClipboardManager::get();
+ if(cm->pasteSize(false, apply_x, apply_y))
+ sp_document_done(sp_desktop_document(SP_ACTIVE_DESKTOP), SP_VERB_EDIT_PASTE_SIZE,
_("Paste size"));
}
void sp_selection_paste_size_separately (bool apply_x, bool apply_y)
{
- SPDesktop *desktop = SP_ACTIVE_DESKTOP;
- if (desktop == NULL) return;
-
- Inkscape::Selection *selection = sp_desktop_selection(desktop);
-
- // check if something is in the clipboard
- if (size_clipboard.extent(NR::X) < 1e-6 || size_clipboard.extent(NR::Y) < 1e-6) {
- desktop->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("Nothing on the clipboard."));
- return;
- }
-
- // check if something is selected
- if (selection->isEmpty()) {
- desktop->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("Select <b>object(s)</b> to paste size to."));
- return;
- }
-
- for (GSList const *l = selection->itemList(); l != NULL; l = l->next) {
- SPItem *item = SP_ITEM(l->data);
-
- NR::Rect current = sp_item_bbox_desktop(item);
- if (current.extent(NR::X) < 1e-6 || current.extent(NR::Y) < 1e-6) {
- continue;
- }
-
- double scale_x = size_clipboard.extent(NR::X) / current.extent(NR::X);
- double scale_y = size_clipboard.extent(NR::Y) / current.extent(NR::Y);
-
- sp_item_scale_rel (item,
- NR::scale(
- apply_x? scale_x : (desktop->isToolboxButtonActive ("lock")? scale_y : 1.0),
- apply_y? scale_y : (desktop->isToolboxButtonActive ("lock")? scale_x : 1.0)));
-
- }
-
- sp_document_done(sp_desktop_document (desktop), SP_VERB_EDIT_PASTE_SIZE_SEPARATELY,
+ Inkscape::UI::ClipboardManager *cm = Inkscape::UI::ClipboardManager::get();
+ if(cm->pasteSize(true, apply_x, apply_y))
+ sp_document_done(sp_desktop_document(SP_ACTIVE_DESKTOP), SP_VERB_EDIT_PASTE_SIZE_SEPARATELY,
_("Paste size separately"));
}
-void sp_selection_to_next_layer ()
+void sp_selection_to_next_layer(bool suppressDone)
{
SPDesktop *dt = SP_ACTIVE_DESKTOP;
return;
}
- const GSList *items = g_slist_copy ((GSList *) selection->itemList());
+ GSList const *items = g_slist_copy ((GSList *) selection->itemList());
bool no_more = false; // Set to true, if no more layers above
SPObject *next=Inkscape::next_layer(dt->currentRoot(), dt->currentLayer());
if (next) {
GSList *temp_clip = NULL;
- sp_selection_copy_impl (items, &temp_clip, NULL, NULL); // we're in the same doc, so no need to copy defs
- sp_selection_delete_impl (items);
+ sp_selection_copy_impl (items, &temp_clip, sp_document_repr_doc(dt->doc()));
+ sp_selection_delete_impl (items, false, false);
next=Inkscape::next_layer(dt->currentRoot(), dt->currentLayer()); // Fixes bug 1482973: crash while moving layers
GSList *copied;
if(next) {
- copied = sp_selection_paste_impl (sp_desktop_document (dt), next, &temp_clip, NULL);
+ copied = sp_selection_paste_impl (sp_desktop_document (dt), next, &temp_clip);
} else {
- copied = sp_selection_paste_impl (sp_desktop_document (dt), dt->currentLayer(), &temp_clip, NULL);
+ copied = sp_selection_paste_impl (sp_desktop_document (dt), dt->currentLayer(), &temp_clip);
no_more = true;
}
selection->setReprList((GSList const *) copied);
g_slist_free (copied);
if (temp_clip) g_slist_free (temp_clip);
if (next) dt->setCurrentLayer(next);
- sp_document_done(sp_desktop_document (dt), SP_VERB_LAYER_MOVE_TO_NEXT,
- _("Raise to next layer"));
+ if ( !suppressDone ) {
+ sp_document_done(sp_desktop_document (dt), SP_VERB_LAYER_MOVE_TO_NEXT,
+ _("Raise to next layer"));
+ }
} else {
no_more = true;
}
g_slist_free ((GSList *) items);
}
-void sp_selection_to_prev_layer ()
+void sp_selection_to_prev_layer(bool suppressDone)
{
SPDesktop *dt = SP_ACTIVE_DESKTOP;
return;
}
- const GSList *items = g_slist_copy ((GSList *) selection->itemList());
+ GSList const *items = g_slist_copy ((GSList *) selection->itemList());
bool no_more = false; // Set to true, if no more layers below
SPObject *next=Inkscape::previous_layer(dt->currentRoot(), dt->currentLayer());
if (next) {
GSList *temp_clip = NULL;
- sp_selection_copy_impl (items, &temp_clip, NULL, NULL); // we're in the same doc, so no need to copy defs
- sp_selection_delete_impl (items);
+ sp_selection_copy_impl (items, &temp_clip, sp_document_repr_doc(dt->doc())); // we're in the same doc, so no need to copy defs
+ sp_selection_delete_impl (items, false, false);
next=Inkscape::previous_layer(dt->currentRoot(), dt->currentLayer()); // Fixes bug 1482973: crash while moving layers
GSList *copied;
if(next) {
- copied = sp_selection_paste_impl (sp_desktop_document (dt), next, &temp_clip, NULL);
+ copied = sp_selection_paste_impl (sp_desktop_document (dt), next, &temp_clip);
} else {
- copied = sp_selection_paste_impl (sp_desktop_document (dt), dt->currentLayer(), &temp_clip, NULL);
+ copied = sp_selection_paste_impl (sp_desktop_document (dt), dt->currentLayer(), &temp_clip);
no_more = true;
}
selection->setReprList((GSList const *) copied);
g_slist_free (copied);
if (temp_clip) g_slist_free (temp_clip);
if (next) dt->setCurrentLayer(next);
- sp_document_done(sp_desktop_document (dt), SP_VERB_LAYER_MOVE_TO_PREV,
- _("Lower to previous layer"));
+ if ( !suppressDone ) {
+ sp_document_done(sp_desktop_document (dt), SP_VERB_LAYER_MOVE_TO_PREV,
+ _("Lower to previous layer"));
+ }
} else {
no_more = true;
}
g_slist_free ((GSList *) items);
}
+bool
+selection_contains_original (SPItem *item, Inkscape::Selection *selection)
+{
+ bool contains_original = false;
+
+ bool is_use = SP_IS_USE(item);
+ SPItem *item_use = item;
+ SPItem *item_use_first = item;
+ while (is_use && item_use && !contains_original)
+ {
+ item_use = sp_use_get_original (SP_USE(item_use));
+ contains_original |= selection->includes(item_use);
+ if (item_use == item_use_first)
+ break;
+ is_use = SP_IS_USE(item_use);
+ }
+
+ // If it's a tref, check whether the object containing the character
+ // data is part of the selection
+ if (!contains_original && SP_IS_TREF(item)) {
+ contains_original = selection->includes(SP_TREF(item)->getObjectReferredTo());
+ }
+
+ return contains_original;
+}
+
+
+bool
+selection_contains_both_clone_and_original (Inkscape::Selection *selection)
+{
+ bool clone_with_original = false;
+ for (GSList const *l = selection->itemList(); l != NULL; l = l->next) {
+ SPItem *item = SP_ITEM(l->data);
+ clone_with_original |= selection_contains_original(item, selection);
+ if (clone_with_original)
+ break;
+ }
+ return clone_with_original;
+}
+
+
/** Apply matrix to the selection. \a set_i2d is normally true, which means objects are in the
original transform, synced with their reprs, and need to jump to the new transform in one go. A
value of set_i2d==false is only used by seltrans when it's dragging objects live (not outlines); in
@@ -1350,26 +1120,29 @@ void sp_selection_apply_affine(Inkscape::Selection *selection, NR::Matrix const
sp_item_update_cns(*item, selection->desktop());
#endif
- // we're moving both a clone and its original
- bool transform_clone_with_original = (SP_IS_USE(item) && selection->includes( sp_use_get_original (SP_USE(item)) ));
+ // we're moving both a clone and its original or any ancestor in clone chain?
+ bool transform_clone_with_original = selection_contains_original(item, selection);
+ // ...both a text-on-path and its path?
bool transform_textpath_with_path = (SP_IS_TEXT_TEXTPATH(item) && selection->includes( sp_textpath_get_path_item (SP_TEXTPATH(sp_object_first_child(SP_OBJECT(item)))) ));
- bool transform_flowtext_with_frame = (SP_IS_FLOWTEXT(item) && selection->includes( SP_FLOWTEXT(item)->get_frame (NULL))); // only the first frame so far
+ // ...both a flowtext and its frame?
+ bool transform_flowtext_with_frame = (SP_IS_FLOWTEXT(item) && selection->includes( SP_FLOWTEXT(item)->get_frame (NULL))); // (only the first frame is checked so far)
+ // ...both an offset and its source?
bool transform_offset_with_source = (SP_IS_OFFSET(item) && SP_OFFSET (item)->sourceHref) && selection->includes( sp_offset_get_source (SP_OFFSET(item)) );
-
+
// If we're moving a connector, we want to detach it
// from shapes that aren't part of the selection, but
// leave it attached if they are
if (cc_item_is_connector(item)) {
SPItem *attItem[2];
SP_PATH(item)->connEndPair.getAttachedItems(attItem);
-
+
for (int n = 0; n < 2; ++n) {
if (!selection->includes(attItem[n])) {
sp_conn_end_detach(item, n);
}
}
}
-
+
// "clones are unmoved when original is moved" preference
int compensation = prefs_get_int_attribute("options.clonecompensation", "value", SP_CLONE_COMPENSATION_UNMOVED);
bool prefs_unmoved = (compensation == SP_CLONE_COMPENSATION_UNMOVED);
@@ -1405,8 +1178,9 @@ void sp_selection_apply_affine(Inkscape::Selection *selection, NR::Matrix const
sp_object_read_attr (SP_OBJECT (item), "transform");
// calculate the matrix we need to apply to the clone to cancel its induced transform from its original
- NR::Matrix t = matrix_to_desktop (matrix_from_desktop (affine, item), item);
- NR::Matrix t_inv = matrix_to_desktop (matrix_from_desktop (affine.inverse(), item), item);
+ NR::Matrix parent_transform = from_2geom(sp_item_i2root_affine(SP_ITEM(SP_OBJECT_PARENT (item))));
+ NR::Matrix t = parent_transform * from_2geom(matrix_to_desktop (matrix_from_desktop (to_2geom(affine), item), item)) * parent_transform.inverse();
+ NR::Matrix t_inv =parent_transform * from_2geom(matrix_to_desktop (matrix_from_desktop (to_2geom(affine.inverse()), item), item)) * parent_transform.inverse();
NR::Matrix result = t_inv * item->transform * t;
if ((prefs_parallel || prefs_unmoved) && affine.is_translation()) {
@@ -1421,20 +1195,20 @@ void sp_selection_apply_affine(Inkscape::Selection *selection, NR::Matrix const
sp_item_write_transform(item, SP_OBJECT_REPR(item), move, &move);
} else if (prefs_unmoved) {
- if (SP_IS_USE(sp_use_get_original(SP_USE(item))))
- clone_move = NR::identity();
+ //if (SP_IS_USE(sp_use_get_original(SP_USE(item))))
+ // clone_move = NR::identity();
NR::Matrix move = result * clone_move;
- sp_item_write_transform(item, SP_OBJECT_REPR(item), move, &move);
+ sp_item_write_transform(item, SP_OBJECT_REPR(item), move, &t);
}
} else {
// just apply the result
- sp_item_write_transform(item, SP_OBJECT_REPR(item), result, &result);
+ sp_item_write_transform(item, SP_OBJECT_REPR(item), result, &t);
}
} else {
if (set_i2d) {
- sp_item_set_i2d_affine(item, sp_item_i2d_affine(item) * affine);
+ sp_item_set_i2d_affine(item, sp_item_i2d_affine(item) * to_2geom(affine));
}
sp_item_write_transform(item, SP_OBJECT_REPR(item), item->transform, NULL);
}
GSList const *l = (GSList *) selection->reprList();
while (l != NULL) {
- sp_repr_set_attr((Inkscape::XML::Node*)l->data, "transform", NULL);
+ ((Inkscape::XML::Node*)l->data)->setAttribute("transform", NULL, false);
l = l->next;
}
- sp_document_done(sp_desktop_document(desktop), SP_VERB_OBJECT_FLATTEN,
+ sp_document_done(sp_desktop_document(desktop), SP_VERB_OBJECT_FLATTEN,
_("Remove transform"));
}
if (selection->isEmpty())
return;
- NR::Rect const bbox(selection->bounds());
- if (bbox.isEmpty()) {
+ boost::optional<NR::Rect> const bbox(selection->bounds());
+ if ( !bbox || bbox->isEmpty() ) {
return;
}
- NR::translate const p2o(-bbox.min());
+ NR::translate const p2o(-bbox->min());
NR::scale const newSize(x1 - x0,
y1 - y0);
- NR::scale const scale( newSize / NR::scale(bbox.dimensions()) );
+ NR::scale const scale( newSize / NR::scale(bbox->dimensions()) );
NR::translate const o2n(x0, y0);
NR::Matrix const final( p2o * scale * o2n );
@@ -1496,15 +1270,15 @@ void sp_selection_scale_relative(Inkscape::Selection *selection, NR::Point const
if (selection->isEmpty())
return;
- NR::Rect const bbox(selection->bounds());
+ boost::optional<NR::Rect> const bbox(selection->bounds());
- if (bbox.isEmpty()) {
+ if ( !bbox || bbox->isEmpty() ) {
return;
}
// FIXME: ARBITRARY LIMIT: don't try to scale above 1 Mpx, it won't display properly and will crash sooner or later anyway
- if ( bbox.extent(NR::X) * scale[NR::X] > 1e6 ||
- bbox.extent(NR::Y) * scale[NR::Y] > 1e6 )
+ if ( bbox->extent(NR::X) * scale[NR::X] > 1e6 ||
+ bbox->extent(NR::Y) * scale[NR::Y] > 1e6 )
{
return;
}
sp_item_rotate_rel(item, rot_neg_90);
}
- sp_document_done(sp_desktop_document(desktop), SP_VERB_OBJECT_ROTATE_90_CCW,
+ sp_document_done(sp_desktop_document(desktop), SP_VERB_OBJECT_ROTATE_90_CCW,
_("Rotate 90° CW"));
}
/**
- * \brief sp_selection_rotate_90_ccw
- *
- * This function rotates selected objects 90 degrees counter-clockwise.
- *
+ * @brief Rotates selected objects 90 degrees counter-clockwise.
*/
-
void sp_selection_rotate_90_ccw()
{
SPDesktop *desktop = SP_ACTIVE_DESKTOP;
@@ -1609,15 +1379,18 @@ sp_selection_rotate(Inkscape::Selection *selection, gdouble const angle_degrees)
if (selection->isEmpty())
return;
- NR::Point center = selection->center();
+ boost::optional<NR::Point> center = selection->center();
+ if (!center) {
+ return;
+ }
- sp_selection_rotate_relative(selection, center, angle_degrees);
+ sp_selection_rotate_relative(selection, *center, angle_degrees);
sp_document_maybe_done(sp_desktop_document(selection->desktop()),
( ( angle_degrees > 0 )
? "selector:rotate:ccw"
- : "selector:rotate:cw" ),
- SP_VERB_CONTEXT_SELECT,
+ : "selector:rotate:cw" ),
+ SP_VERB_CONTEXT_SELECT,
_("Rotate"));
}
if (selection->isEmpty())
return;
- NR::Rect const bbox(selection->bounds());
+ boost::optional<NR::Rect> const bbox(selection->bounds());
+ boost::optional<NR::Point> center = selection->center();
- NR::Point center = selection->center();
+ if ( !bbox || !center ) {
+ return;
+ }
gdouble const zoom = selection->desktop()->current_zoom();
gdouble const zmove = angle / zoom;
- gdouble const r = NR::L2(bbox.max() - center);
+ gdouble const r = NR::L2(bbox->cornerFarthestFrom(*center) - *center);
gdouble const zangle = 180 * atan2(zmove, r) / M_PI;
- sp_selection_rotate_relative(selection, center, zangle);
+ sp_selection_rotate_relative(selection, *center, zangle);
sp_document_maybe_done(sp_desktop_document(selection->desktop()),
( (angle > 0)
? "selector:rotate:ccw"
: "selector:rotate:cw" ),
- SP_VERB_CONTEXT_SELECT,
+ SP_VERB_CONTEXT_SELECT,
_("Rotate by pixels"));
}
if (selection->isEmpty())
return;
- NR::Rect const bbox(selection->bounds());
- NR::Point const center(bbox.midpoint());
- double const max_len = bbox.maxExtent();
+ boost::optional<NR::Rect> const bbox(selection->bounds());
+ if (!bbox) {
+ return;
+ }
+
+ NR::Point const center(bbox->midpoint());
// you can't scale "do nizhe pola" (below zero)
+ double const max_len = bbox->maxExtent();
if ( max_len + grow <= 1e-3 ) {
return;
}
if (selection->isEmpty())
return;
- NR::Point const center(selection->bounds().midpoint());
+ boost::optional<NR::Rect> sel_bbox = selection->bounds();
+
+ if (!sel_bbox) {
+ return;
+ }
+
+ NR::Point const center(sel_bbox->midpoint());
sp_selection_scale_relative(selection, center, NR::scale(times, times));
- sp_document_done(sp_desktop_document(selection->desktop()), SP_VERB_CONTEXT_SELECT,
+ sp_document_done(sp_desktop_document(selection->desktop()), SP_VERB_CONTEXT_SELECT,
_("Scale by whole factor"));
}
sp_selection_move_relative(selection, dx, dy);
if (dx == 0) {
- sp_document_maybe_done(sp_desktop_document(desktop), "selector:move:vertical", SP_VERB_CONTEXT_SELECT,
+ sp_document_maybe_done(sp_desktop_document(desktop), "selector:move:vertical", SP_VERB_CONTEXT_SELECT,
_("Move vertically"));
} else if (dy == 0) {
- sp_document_maybe_done(sp_desktop_document(desktop), "selector:move:horizontal", SP_VERB_CONTEXT_SELECT,
+ sp_document_maybe_done(sp_desktop_document(desktop), "selector:move:horizontal", SP_VERB_CONTEXT_SELECT,
_("Move horizontally"));
} else {
- sp_document_done(sp_desktop_document(desktop), SP_VERB_CONTEXT_SELECT,
+ sp_document_done(sp_desktop_document(desktop), SP_VERB_CONTEXT_SELECT,
_("Move"));
}
}
sp_selection_move_relative(selection, zdx, zdy);
if (dx == 0) {
- sp_document_maybe_done(sp_desktop_document(desktop), "selector:move:vertical", SP_VERB_CONTEXT_SELECT,
- _("Nudge vertically by pixels"));
+ sp_document_maybe_done(sp_desktop_document(desktop), "selector:move:vertical", SP_VERB_CONTEXT_SELECT,
+ _("Move vertically by pixels"));
} else if (dy == 0) {
- sp_document_maybe_done(sp_desktop_document(desktop), "selector:move:horizontal", SP_VERB_CONTEXT_SELECT,
- _("Nudge horizontally by pixels"));
+ sp_document_maybe_done(sp_desktop_document(desktop), "selector:move:horizontal", SP_VERB_CONTEXT_SELECT,
+ _("Move horizontally by pixels"));
} else {
- sp_document_done(sp_desktop_document(desktop), SP_VERB_CONTEXT_SELECT,
+ sp_document_done(sp_desktop_document(desktop), SP_VERB_CONTEXT_SELECT,
_("Move"));
}
}
static Iterator children(SPObject *o) { return sp_object_first_child(o); }
static Iterator siblings_after(SPObject *o) { return SP_OBJECT_NEXT(o); }
- static void dispose(Iterator i) {}
+ static void dispose(Iterator /*i*/) {}
static SPObject *object(Iterator i) { return i; }
static Iterator next(Iterator i) { return SP_OBJECT_NEXT(i); }
}
}
+void sp_selection_next_patheffect_param(SPDesktop * dt)
+{
+ if (!dt) return;
+
+ Inkscape::Selection *selection = sp_desktop_selection(dt);
+ if ( selection && !selection->isEmpty() ) {
+ SPItem *item = selection->singleItem();
+ if ( item && SP_IS_SHAPE(item)) {
+ if (sp_lpe_item_has_path_effect(SP_LPE_ITEM(item))) {
+ sp_lpe_item_edit_next_param_oncanvas(SP_LPE_ITEM(item), dt);
+ } else {
+ dt->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("The selection has no applied path effect."));
+ }
+ }
+ }
+}
+
+void sp_selection_edit_clip_or_mask(SPDesktop * dt, bool clip)
+{
+ if (!dt) return;
+
+ Inkscape::Selection *selection = sp_desktop_selection(dt);
+ if ( selection && !selection->isEmpty() ) {
+ SPItem *item = selection->singleItem();
+ if ( item ) {
+ SPObject *obj = NULL;
+ if (clip)
+ obj = item->clip_ref ? SP_OBJECT(item->clip_ref->getObject()) : NULL;
+ else
+ obj = item->mask_ref ? SP_OBJECT(item->mask_ref->getObject()) : NULL;
+
+ if (obj) {
+ // obj is a group object, the children are the actual clippers
+ for ( SPObject *child = obj->children ; child ; child = child->next ) {
+ if ( SP_IS_ITEM(child) ) {
+ // If not already in nodecontext, goto it!
+ if (!tools_isactive(dt, TOOLS_NODES)) {
+ tools_switch_current(TOOLS_NODES);
+ }
+
+ ShapeEditor * shape_editor = SP_NODE_CONTEXT( dt->event_context )->shape_editor;
+ // TODO: should we set the item for nodepath or knotholder or both? seems to work with both.
+ shape_editor->set_item(SP_ITEM(child), SH_NODEPATH);
+ shape_editor->set_item(SP_ITEM(child), SH_KNOTHOLDER);
+ Inkscape::NodePath::Path *np = shape_editor->get_nodepath();
+ if (np) {
+ // take colors from prefs (same as used in outline mode)
+ np->helperpath_rgba = clip ?
+ prefs_get_int_attribute("options.wireframecolors", "clips", 0x00ff00ff) :
+ prefs_get_int_attribute("options.wireframecolors", "masks", 0x0000ffff);
+ np->helperpath_width = 1.0;
+ sp_nodepath_show_helperpath(np, true);
+ }
+ break; // break out of for loop after 1st encountered item
+ }
+ }
+ } else if (clip) {
+ dt->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("The selection has no applied clip path."));
+ } else {
+ dt->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("The selection has no applied mask."));
+ }
+ }
+ }
+}
+
+
namespace {
template <typename D>
void scroll_to_show_item(SPDesktop *desktop, SPItem *item)
{
NR::Rect dbox = desktop->get_display_area();
- NR::Rect sbox = sp_item_bbox_desktop(item);
+ boost::optional<NR::Rect> sbox = sp_item_bbox_desktop(item);
- if (dbox.contains(sbox) == false) {
- NR::Point const s_dt = sbox.midpoint();
+ if ( sbox && dbox.contains(*sbox) == false ) {
+ NR::Point const s_dt = sbox->midpoint();
NR::Point const s_w = desktop->d2w(s_dt);
NR::Point const d_dt = dbox.midpoint();
NR::Point const d_w = desktop->d2w(d_dt);
Inkscape::Selection *selection = sp_desktop_selection(desktop);
+ Inkscape::XML::Document *xml_doc = sp_document_repr_doc(desktop->doc());
+
// check if something is selected
if (selection->isEmpty()) {
desktop->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("Select an <b>object</b> to clone."));
}
GSList *reprs = g_slist_copy((GSList *) selection->reprList());
-
+
selection->clear();
-
+
// sorting items from different parents sorts each parent's subset without possibly mixing them, just what we need
reprs = g_slist_sort(reprs, (GCompareFunc) sp_repr_compare_position);
GSList *newsel = NULL;
-
+
while (reprs) {
Inkscape::XML::Node *sel_repr = (Inkscape::XML::Node *) reprs->data;
Inkscape::XML::Node *parent = sp_repr_parent(sel_repr);
- Inkscape::XML::Node *clone = sp_repr_new("svg:use");
- sp_repr_set_attr(clone, "x", "0");
- sp_repr_set_attr(clone, "y", "0");
- sp_repr_set_attr(clone, "xlink:href", g_strdup_printf("#%s", sel_repr->attribute("id")));
-
- sp_repr_set_attr(clone, "inkscape:transform-center-x", sel_repr->attribute("inkscape:transform-center-x"));
- sp_repr_set_attr(clone, "inkscape:transform-center-y", sel_repr->attribute("inkscape:transform-center-y"));
+ Inkscape::XML::Node *clone = xml_doc->createElement("svg:use");
+ clone->setAttribute("x", "0", false);
+ clone->setAttribute("y", "0", false);
+ clone->setAttribute("xlink:href", g_strdup_printf("#%s", sel_repr->attribute("id")), false);
+ clone->setAttribute("inkscape:transform-center-x", sel_repr->attribute("inkscape:transform-center-x"), false);
+ clone->setAttribute("inkscape:transform-center-y", sel_repr->attribute("inkscape:transform-center-y"), false);
+
// add the new clone to the top of the original's parent
parent->appendChild(clone);
reprs = g_slist_remove(reprs, sel_repr);
Inkscape::GC::release(clone);
}
-
- sp_document_done(sp_desktop_document(desktop), SP_VERB_EDIT_CLONE,
- _("Clone"));
+
+ // TRANSLATORS: only translate "string" in "context|string".
+ // For more details, see http://developer.gnome.org/doc/API/2.0/glib/glib-I18N.html#Q-:CAPS
+ sp_document_done(sp_desktop_document(desktop), SP_VERB_EDIT_CLONE,
+ Q_("action|Clone"));
selection->setReprList(newsel);
-
+
g_slist_free(newsel);
}
+void
+sp_selection_relink()
+{
+ SPDesktop *desktop = SP_ACTIVE_DESKTOP;
+ if (!desktop)
+ return;
+
+ Inkscape::Selection *selection = sp_desktop_selection(desktop);
+
+ if (selection->isEmpty()) {
+ desktop->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("Select <b>clones</b> to relink."));
+ return;
+ }
+
+ Inkscape::UI::ClipboardManager *cm = Inkscape::UI::ClipboardManager::get();
+ const gchar *newid = cm->getFirstObjectID();
+ if (!newid) {
+ desktop->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("Copy an <b>object</b> to clipboard to relink clones to."));
+ return;
+ }
+ gchar *newref = g_strdup_printf ("#%s", newid);
+
+ // Get a copy of current selection.
+ bool relinked = false;
+ for (GSList *items = (GSList *) selection->itemList();
+ items != NULL;
+ items = items->next)
+ {
+ SPItem *item = (SPItem *) items->data;
+
+ if (!SP_IS_USE(item))
+ continue;
+
+ SP_OBJECT_REPR(item)->setAttribute("xlink:href", newref);
+ SP_OBJECT(item)->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG);
+ relinked = true;
+ }
+
+ g_free(newref);
+
+ if (!relinked) {
+ desktop->messageStack()->flash(Inkscape::ERROR_MESSAGE, _("<b>No clones to relink</b> in the selection."));
+ } else {
+ sp_document_done(sp_desktop_document(desktop), SP_VERB_EDIT_UNLINK_CLONE,
+ _("Relink clone"));
+ }
+}
+
+
void
sp_selection_unlink()
{
Inkscape::Selection *selection = sp_desktop_selection(desktop);
if (selection->isEmpty()) {
- desktop->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("Select a <b>clone</b> to unlink."));
+ desktop->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("Select <b>clones</b> to unlink."));
return;
}
items != NULL;
items = items->next)
{
- SPItem *use = (SPItem *) items->data;
+ SPItem *item = (SPItem *) items->data;
+
+ if (SP_IS_TEXT(item)) {
+ SPObject *tspan = sp_tref_convert_to_tspan(SP_OBJECT(item));
+
+ if (tspan) {
+ SP_OBJECT(item)->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG);
+ }
+
+ // Set unlink to true, and fall into the next if which
+ // will include this text item in the new selection
+ unlinked = true;
+ }
- if (!SP_IS_USE(use)) {
- // keep the non-yse item in the new selection
- new_select = g_slist_prepend(new_select, use);
+ if (!(SP_IS_USE(item) || SP_IS_TREF(item))) {
+ // keep the non-use item in the new selection
+ new_select = g_slist_prepend(new_select, item);
continue;
}
- SPItem *unlink = sp_use_unlink(SP_USE(use));
+ SPItem *unlink;
+ if (SP_IS_USE(item)) {
+ unlink = sp_use_unlink(SP_USE(item));
+ } else /*if (SP_IS_TREF(use))*/ {
+ unlink = SP_ITEM(sp_tref_convert_to_tspan(SP_OBJECT(item)));
+ }
+
unlinked = true;
// Add ungrouped items to the new selection.
new_select = g_slist_prepend(new_select, unlink);
SPItem *item = selection->singleItem();
- const gchar *error = _("Select a <b>clone</b> to go to its original. Select a <b>linked offset</b> to go to its source. Select a <b>text on path</b> to go to the path. Select a <b>flowed text</b> to go to its frame.");
+ gchar const *error = _("Select a <b>clone</b> to go to its original. Select a <b>linked offset</b> to go to its source. Select a <b>text on path</b> to go to the path. Select a <b>flowed text</b> to go to its frame.");
// Check if other than two objects are selected
if (g_slist_length((GSList *) selection->itemList()) != 1 || !item) {
}
}
+
+void sp_selection_to_marker(bool apply)
+{
+ SPDesktop *desktop = SP_ACTIVE_DESKTOP;
+ if (desktop == NULL)
+ return;
+
+ SPDocument *doc = sp_desktop_document(desktop);
+ Inkscape::XML::Document *xml_doc = sp_document_repr_doc(doc);
+
+ Inkscape::Selection *selection = sp_desktop_selection(desktop);
+
+ // check if something is selected
+ if (selection->isEmpty()) {
+ desktop->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("Select <b>object(s)</b> to convert to marker."));
+ return;
+ }
+
+ sp_document_ensure_up_to_date(doc);
+ boost::optional<NR::Rect> r = selection->bounds();
+ boost::optional<NR::Point> c = selection->center();
+ if ( !r || !c || r->isEmpty() ) {
+ return;
+ }
+
+ // calculate the transform to be applied to objects to move them to 0,0
+ NR::Point move_p = NR::Point(0, sp_document_height(doc)) - *c;
+ move_p[NR::Y] = -move_p[NR::Y];
+ NR::Matrix move = NR::Matrix (NR::translate (move_p));
+
+ GSList *items = g_slist_copy((GSList *) selection->itemList());
+
+ items = g_slist_sort (items, (GCompareFunc) sp_object_compare_position);
+
+ // bottommost object, after sorting
+ SPObject *parent = SP_OBJECT_PARENT (items->data);
+
+ NR::Matrix parent_transform = from_2geom(sp_item_i2root_affine(SP_ITEM(parent)));
+
+ // remember the position of the first item
+ gint pos = SP_OBJECT_REPR (items->data)->position();
+ (void)pos; // TODO check why this was remembered
+
+ // create a list of duplicates
+ GSList *repr_copies = NULL;
+ for (GSList *i = items; i != NULL; i = i->next) {
+ Inkscape::XML::Node *dup = (SP_OBJECT_REPR (i->data))->duplicate(xml_doc);
+ repr_copies = g_slist_prepend (repr_copies, dup);
+ }
+
+ NR::Rect bounds(desktop->dt2doc(r->min()), desktop->dt2doc(r->max()));
+
+ if (apply) {
+ // delete objects so that their clones don't get alerted; this object will be restored shortly
+ for (GSList *i = items; i != NULL; i = i->next) {
+ SPObject *item = SP_OBJECT (i->data);
+ item->deleteObject (false);
+ }
+ }
+
+ // Hack: Temporarily set clone compensation to unmoved, so that we can move clone-originals
+ // without disturbing clones.
+ // See ActorAlign::on_button_click() in src/ui/dialog/align-and-distribute.cpp
+ int saved_compensation = prefs_get_int_attribute("options.clonecompensation", "value", SP_CLONE_COMPENSATION_UNMOVED);
+ prefs_set_int_attribute("options.clonecompensation", "value", SP_CLONE_COMPENSATION_UNMOVED);
+
+ gchar const *mark_id = generate_marker(repr_copies, bounds, doc,
+ ( NR::Matrix(NR::translate(desktop->dt2doc(NR::Point(r->min()[NR::X],
+ r->max()[NR::Y]))))
+ * parent_transform.inverse() ),
+ parent_transform * move);
+ (void)mark_id;
+
+ // restore compensation setting
+ prefs_set_int_attribute("options.clonecompensation", "value", saved_compensation);
+
+
+ g_slist_free (items);
+
+ sp_document_done (doc, SP_VERB_EDIT_SELECTION_2_MARKER,
+ _("Objects to marker"));
+}
+
+static void sp_selection_to_guides_recursive(SPItem *item, bool deleteitem, bool wholegroups) {
+ if (SP_IS_GROUP(item) && !SP_IS_BOX3D(item) && !wholegroups) {
+ for (GSList *i = sp_item_group_item_list (SP_GROUP(item)); i != NULL; i = i->next) {
+ sp_selection_to_guides_recursive(SP_ITEM(i->data), deleteitem, wholegroups);
+ }
+ } else {
+ sp_item_convert_item_to_guides(item);
+
+ if (deleteitem) {
+ SP_OBJECT(item)->deleteObject(true);
+ }
+ }
+}
+
+void sp_selection_to_guides()
+{
+ SPDesktop *desktop = SP_ACTIVE_DESKTOP;
+ if (desktop == NULL)
+ return;
+
+ SPDocument *doc = sp_desktop_document(desktop);
+ Inkscape::Selection *selection = sp_desktop_selection(desktop);
+ // we need to copy the list because it gets reset when objects are deleted
+ GSList *items = g_slist_copy((GSList *) selection->itemList());
+
+ if (!items) {
+ desktop->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("Select <b>object(s)</b> to convert to guides."));
+ return;
+ }
+
+ bool deleteitem = (prefs_get_int_attribute("tools", "cvg_keep_objects", 0) == 0);
+ bool wholegroups = (prefs_get_int_attribute("tools", "cvg_convert_whole_groups", 0) != 0);
+
+ for (GSList const *i = items; i != NULL; i = i->next) {
+ sp_selection_to_guides_recursive(SP_ITEM(i->data), deleteitem, wholegroups);
+ }
+
+ sp_document_done (doc, SP_VERB_EDIT_SELECTION_2_GUIDES, _("Objects to guides"));
+}
+
void
sp_selection_tile(bool apply)
{
if (desktop == NULL)
return;
- SPDocument *document = sp_desktop_document(desktop);
+ SPDocument *doc = sp_desktop_document(desktop);
+ Inkscape::XML::Document *xml_doc = sp_document_repr_doc(doc);
Inkscape::Selection *selection = sp_desktop_selection(desktop);
return;
}
- sp_document_ensure_up_to_date(document);
- NR::Rect r = selection->bounds();
- if (r.isEmpty()) {
+ sp_document_ensure_up_to_date(doc);
+ boost::optional<NR::Rect> r = selection->bounds();
+ if ( !r || r->isEmpty() ) {
return;
}
// calculate the transform to be applied to objects to move them to 0,0
- NR::Point move_p = NR::Point(0, sp_document_height(document)) - (r.min() + NR::Point (0, r.extent(NR::Y)));
+ NR::Point move_p = NR::Point(0, sp_document_height(doc)) - (r->min() + NR::Point (0, r->extent(NR::Y)));
move_p[NR::Y] = -move_p[NR::Y];
NR::Matrix move = NR::Matrix (NR::translate (move_p));
// bottommost object, after sorting
SPObject *parent = SP_OBJECT_PARENT (items->data);
- NR::Matrix parent_transform = sp_item_i2root_affine(SP_ITEM(parent));
+ NR::Matrix parent_transform = from_2geom(sp_item_i2root_affine(SP_ITEM(parent)));
// remember the position of the first item
gint pos = SP_OBJECT_REPR (items->data)->position();
// create a list of duplicates
GSList *repr_copies = NULL;
for (GSList *i = items; i != NULL; i = i->next) {
- Inkscape::XML::Node *dup = (SP_OBJECT_REPR (i->data))->duplicate();
+ Inkscape::XML::Node *dup = (SP_OBJECT_REPR (i->data))->duplicate(xml_doc);
repr_copies = g_slist_prepend (repr_copies, dup);
}
+ // restore the z-order after prepends
+ repr_copies = g_slist_reverse (repr_copies);
- NR::Rect bounds(desktop->dt2doc(r.min()), desktop->dt2doc(r.max()));
+ NR::Rect bounds(desktop->dt2doc(r->min()), desktop->dt2doc(r->max()));
if (apply) {
// delete objects so that their clones don't get alerted; this object will be restored shortly
int saved_compensation = prefs_get_int_attribute("options.clonecompensation", "value", SP_CLONE_COMPENSATION_UNMOVED);
prefs_set_int_attribute("options.clonecompensation", "value", SP_CLONE_COMPENSATION_UNMOVED);
- const gchar *pat_id = pattern_tile (repr_copies, bounds, document,
- NR::Matrix(NR::translate(desktop->dt2doc(NR::Point(r.min()[NR::X], r.max()[NR::Y])))) * parent_transform.inverse(), parent_transform * move);
+ gchar const *pat_id = pattern_tile(repr_copies, bounds, doc,
+ ( NR::Matrix(NR::translate(desktop->dt2doc(NR::Point(r->min()[NR::X],
+ r->max()[NR::Y]))))
+ * parent_transform.inverse() ),
+ parent_transform * move);
// restore compensation setting
prefs_set_int_attribute("options.clonecompensation", "value", saved_compensation);
if (apply) {
- Inkscape::XML::Node *rect = sp_repr_new ("svg:rect");
+ Inkscape::XML::Node *rect = xml_doc->createElement("svg:rect");
rect->setAttribute("style", g_strdup_printf("stroke:none;fill:url(#%s)", pat_id));
NR::Point min = bounds.min() * parent_transform.inverse();
g_slist_free (items);
- sp_document_done (document, SP_VERB_EDIT_TILE,
+ sp_document_done (doc, SP_VERB_EDIT_TILE,
_("Objects to pattern"));
}
if (desktop == NULL)
return;
- SPDocument *document = sp_desktop_document(desktop);
+ SPDocument *doc = sp_desktop_document(desktop);
+ Inkscape::XML::Document *xml_doc = sp_document_repr_doc(doc);
Inkscape::Selection *selection = sp_desktop_selection(desktop);
SPStyle *style = SP_OBJECT_STYLE (item);
- if (!style || style->fill.type != SP_PAINT_TYPE_PAINTSERVER)
+ if (!style || !style->fill.isPaintserver())
continue;
SPObject *server = SP_OBJECT_STYLE_FILL_SERVER(item);
pat_transform *= item->transform;
for (SPObject *child = sp_object_first_child(SP_OBJECT(pattern)) ; child != NULL; child = SP_OBJECT_NEXT(child) ) {
- Inkscape::XML::Node *copy = SP_OBJECT_REPR(child)->duplicate();
+ Inkscape::XML::Node *copy = SP_OBJECT_REPR(child)->duplicate(xml_doc);
SPItem *i = SP_ITEM (desktop->currentLayer()->appendChildRepr(copy));
// FIXME: relink clones to the new canvas objects
// use SPObject::setid when mental finishes it to steal ids of
// this is needed to make sure the new item has curve (simply requestDisplayUpdate does not work)
- sp_document_ensure_up_to_date (document);
+ sp_document_ensure_up_to_date (doc);
NR::Matrix transform( i->transform * pat_transform );
sp_item_write_transform(i, SP_OBJECT_REPR(i), transform);
if (!did) {
desktop->messageStack()->flash(Inkscape::ERROR_MESSAGE, _("<b>No pattern fills</b> in the selection."));
} else {
- sp_document_done(sp_desktop_document(desktop), SP_VERB_EDIT_UNTILE,
+ sp_document_done(sp_desktop_document(desktop), SP_VERB_EDIT_UNTILE,
_("Pattern to objects"));
selection->setList(new_select);
}
}
void
-sp_selection_get_export_hints (Inkscape::Selection *selection, const char **filename, float *xdpi, float *ydpi)
+sp_selection_get_export_hints (Inkscape::Selection *selection, char const **filename, float *xdpi, float *ydpi)
{
if (selection->isEmpty()) {
return;
}
- const GSList * reprlst = selection->reprList();
+ GSList const *reprlst = selection->reprList();
bool filename_search = TRUE;
bool xdpi_search = TRUE;
bool ydpi_search = TRUE;
@@ -2301,7 +2354,7 @@ sp_selection_get_export_hints (Inkscape::Selection *selection, const char **file
xdpi_search &&
ydpi_search;
reprlst = reprlst->next) {
- const gchar * dpi_string;
+ gchar const *dpi_string;
Inkscape::XML::Node * repr = (Inkscape::XML::Node *)reprlst->data;
if (filename_search) {
@@ -2331,10 +2384,10 @@ sp_selection_get_export_hints (Inkscape::Selection *selection, const char **file
}
void
-sp_document_get_export_hints (SPDocument * doc, const char **filename, float *xdpi, float *ydpi)
+sp_document_get_export_hints (SPDocument *doc, char const **filename, float *xdpi, float *ydpi)
{
Inkscape::XML::Node * repr = sp_document_repr_root(doc);
- const gchar * dpi_string;
+ gchar const *dpi_string;
*filename = repr->attribute("inkscape:export-filename");
return;
SPDocument *document = sp_desktop_document(desktop);
+ Inkscape::XML::Document *xml_doc = sp_document_repr_doc(document);
Inkscape::Selection *selection = sp_desktop_selection(desktop);
return;
}
+ desktop->messageStack()->flash(Inkscape::IMMEDIATE_MESSAGE, _("Rendering bitmap..."));
+ // set "busy" cursor
+ desktop->setWaitingCursor();
+
// Get the bounding box of the selection
NRRect bbox;
sp_document_ensure_up_to_date (document);
selection->bounds(&bbox);
if (NR_RECT_DFLS_TEST_EMPTY(&bbox)) {
+ desktop->clearWaitingCursor();
return; // exceptional situation, so not bother with a translatable error message, just quit quietly
}
res = PX_PER_IN * prefs_min / MIN ((bbox.x1 - bbox.x0), (bbox.y1 - bbox.y0));
} else {
float hint_xdpi = 0, hint_ydpi = 0;
- const char *hint_filename;
+ char const *hint_filename;
// take resolution hint from the selected objects
sp_selection_get_export_hints (selection, &hint_filename, &hint_xdpi, &hint_ydpi);
if (hint_xdpi != 0) {
unsigned width = (unsigned) floor ((bbox.x1 - bbox.x0) * res / PX_PER_IN);
unsigned height =(unsigned) floor ((bbox.y1 - bbox.y0) * res / PX_PER_IN);
- // Find out if we have to run a filter
- const gchar *run = NULL;
- const gchar *filter = prefs_get_string_attribute ("options.createbitmap", "filter");
+ // Find out if we have to run an external filter
+ gchar const *run = NULL;
+ gchar const *filter = prefs_get_string_attribute ("options.createbitmap", "filter");
if (filter) {
// filter command is given;
// see if we have a parameter to pass to it
- const gchar *param1 = prefs_get_string_attribute ("options.createbitmap", "filter_param1");
+ gchar const *param1 = prefs_get_string_attribute ("options.createbitmap", "filter_param1");
if (param1) {
if (param1[strlen(param1) - 1] == '%') {
// if the param string ends with %, interpret it as a percentage of the image's max dimension
}
// Calculate the matrix that will be applied to the image so that it exactly overlaps the source objects
- NR::Matrix eek = sp_item_i2d_affine (SP_ITEM(parent_object));
+ NR::Matrix eek = from_2geom(sp_item_i2d_affine (SP_ITEM(parent_object)));
NR::Matrix t;
+
+ double shift_x = bbox.x0;
+ double shift_y = bbox.y1;
if (res == PX_PER_IN) { // for default 90 dpi, snap it to pixel grid
- t = NR::scale (1, -1) * NR::translate ((unsigned) (bbox.x0 + 0.5), (unsigned) (bbox.y1 + 0.5)) * eek.inverse();
- } else {
- t = NR::scale (1, -1) * NR::translate (bbox.x0, bbox.y1) * eek.inverse();
+ shift_x = round (shift_x);
+ shift_y = -round (-shift_y); // this gets correct rounding despite coordinate inversion, remove the negations when the inversion is gone
}
+ t = NR::scale(1, -1) * NR::translate (shift_x, shift_y) * eek.inverse();
// Do the export
sp_export_png_file(document, filepath,
// Run filter, if any
if (run) {
g_print ("Running external filter: %s\n", run);
- system (run);
+ int retval;
+ retval = system (run);
}
// Import the image back
GdkPixbuf *pb = gdk_pixbuf_new_from_file (filepath, NULL);
if (pb) {
// Create the repr for the image
- Inkscape::XML::Node * repr = sp_repr_new ("svg:image");
+ Inkscape::XML::Node * repr = xml_doc->createElement("svg:image");
repr->setAttribute("xlink:href", filename);
repr->setAttribute("sodipodi:absref", filepath);
if (res == PX_PER_IN) { // for default 90 dpi, snap it to pixel grid
}
// Write transform
- gchar c[256];
- if (sp_svg_transform_write(c, 256, t)) {
- repr->setAttribute("transform", c);
- }
+ gchar *c=sp_svg_transform_write(t);
+ repr->setAttribute("transform", c);
+ g_free(c);
// add the new repr to the parent
parent->appendChild(repr);
_("Create bitmap"));
}
+ desktop->clearWaitingCursor();
+
g_free (filename);
g_free (filepath);
}
/**
- * \brief sp_selection_set_mask
- *
- * This function creates a mask or clipPath from selection
+ * \brief Creates a mask or clipPath from selection
* Two different modes:
* if applyToLayer, all selection is moved to DEFS as mask/clippath
* and is applied to current layer
* otherwise, topmost object is used as mask for other objects
* If \a apply_clip_path parameter is true, clipPath is created, otherwise mask
- *
+ *
*/
void
sp_selection_set_mask(bool apply_clip_path, bool apply_to_layer)
if (desktop == NULL)
return;
- SPDocument *document = sp_desktop_document(desktop);
-
+ SPDocument *doc = sp_desktop_document(desktop);
+ Inkscape::XML::Document *xml_doc = sp_document_repr_doc(doc);
+
Inkscape::Selection *selection = sp_desktop_selection(desktop);
// check if something is selected
desktop->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("Select mask object and <b>object(s)</b> to apply clippath or mask to."));
return;
}
-
- sp_document_ensure_up_to_date(document);
+
+ // FIXME: temporary patch to prevent crash!
+ // Remove this when bboxes are fixed to not blow up on an item clipped/masked with its own clone
+ bool clone_with_original = selection_contains_both_clone_and_original (selection);
+ if (clone_with_original) {
+ return; // in this version, you cannot clip/mask an object with its own clone
+ }
+ // /END FIXME
+
+ sp_document_ensure_up_to_date(doc);
GSList *items = g_slist_copy((GSList *) selection->itemList());
-
+
items = g_slist_sort (items, (GCompareFunc) sp_object_compare_position);
// create a list of duplicates
GSList *items_to_delete = NULL;
bool topmost = prefs_get_int_attribute ("options.maskobject", "topmost", 1);
bool remove_original = prefs_get_int_attribute ("options.maskobject", "remove", 1);
-
+
if (apply_to_layer) {
// all selected items are used for mask, which is applied to a layer
apply_to_items = g_slist_prepend (apply_to_items, desktop->currentLayer());
for (GSList *i = items; i != NULL; i = i->next) {
- Inkscape::XML::Node *dup = (SP_OBJECT_REPR (i->data))->duplicate();
+ Inkscape::XML::Node *dup = (SP_OBJECT_REPR (i->data))->duplicate(xml_doc);
mask_items = g_slist_prepend (mask_items, dup);
if (remove_original) {
} else if (!topmost) {
// topmost item is used as a mask, which is applied to other items in a selection
GSList *i = items;
- Inkscape::XML::Node *dup = (SP_OBJECT_REPR (i->data))->duplicate();
+ Inkscape::XML::Node *dup = (SP_OBJECT_REPR (i->data))->duplicate(xml_doc);
mask_items = g_slist_prepend (mask_items, dup);
if (remove_original) {
SPObject *item = SP_OBJECT (i->data);
items_to_delete = g_slist_prepend (items_to_delete, item);
}
-
+
for (i = i->next; i != NULL; i = i->next) {
apply_to_items = g_slist_prepend (apply_to_items, i->data);
}
apply_to_items = g_slist_prepend (apply_to_items, i->data);
}
- Inkscape::XML::Node *dup = (SP_OBJECT_REPR (i->data))->duplicate();
+ Inkscape::XML::Node *dup = (SP_OBJECT_REPR (i->data))->duplicate(xml_doc);
mask_items = g_slist_prepend (mask_items, dup);
if (remove_original) {
items_to_delete = g_slist_prepend (items_to_delete, item);
}
}
-
+
g_slist_free (items);
items = NULL;
-
- gchar const* attributeName = apply_clip_path ? "clip-path" : "mask";
+
+ gchar const *attributeName = apply_clip_path ? "clip-path" : "mask";
for (GSList *i = apply_to_items; NULL != i; i = i->next) {
SPItem *item = reinterpret_cast<SPItem *>(i->data);
// inverted object transform should be applied to a mask object,
GSList *mask_items_dup = NULL;
for (GSList *mask_item = mask_items; NULL != mask_item; mask_item = mask_item->next) {
- Inkscape::XML::Node *dup = reinterpret_cast<Inkscape::XML::Node *>(mask_item->data)->duplicate();
+ Inkscape::XML::Node *dup = reinterpret_cast<Inkscape::XML::Node *>(mask_item->data)->duplicate(xml_doc);
mask_items_dup = g_slist_prepend (mask_items_dup, dup);
}
- const gchar *mask_id = NULL;
+ gchar const *mask_id = NULL;
if (apply_clip_path) {
- mask_id = sp_clippath_create(mask_items_dup, document, &maskTransform);
+ mask_id = sp_clippath_create(mask_items_dup, doc, &maskTransform);
} else {
- mask_id = sp_mask_create(mask_items_dup, document, &maskTransform);
+ mask_id = sp_mask_create(mask_items_dup, doc, &maskTransform);
}
g_slist_free (mask_items_dup);
}
g_slist_free (items_to_delete);
- if (apply_clip_path)
- sp_document_done (document, SP_VERB_OBJECT_SET_CLIPPATH, _("Set clipping path"));
- else
- sp_document_done (document, SP_VERB_OBJECT_SET_MASK, _("Set mask"));
+ if (apply_clip_path)
+ sp_document_done (doc, SP_VERB_OBJECT_SET_CLIPPATH, _("Set clipping path"));
+ else
+ sp_document_done (doc, SP_VERB_OBJECT_SET_MASK, _("Set mask"));
}
void sp_selection_unset_mask(bool apply_clip_path) {
SPDesktop *desktop = SP_ACTIVE_DESKTOP;
if (desktop == NULL)
return;
-
- SPDocument *document = sp_desktop_document(desktop);
+
+ SPDocument *doc = sp_desktop_document(desktop);
+ Inkscape::XML::Document *xml_doc = sp_document_repr_doc(doc);
Inkscape::Selection *selection = sp_desktop_selection(desktop);
// check if something is selected
desktop->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("Select <b>object(s)</b> to remove clippath or mask from."));
return;
}
-
+
bool remove_original = prefs_get_int_attribute ("options.maskobject", "remove", 1);
- sp_document_ensure_up_to_date(document);
+ sp_document_ensure_up_to_date(doc);
- gchar const* attributeName = apply_clip_path ? "clip-path" : "mask";
- std::map<SPObject*,SPItem*> referenced_objects;
- for (GSList const*i = selection->itemList(); NULL != i; i = i->next) {
+ gchar const *attributeName = apply_clip_path ? "clip-path" : "mask";
+ std::map<SPObject*,SPItem*> referenced_objects;
+ // SPObject* refers to a group containing the clipped path or mask itself,
+ // whereas SPItem* refers to the item being clipped or masked
+ for (GSList const *i = selection->itemList(); NULL != i; i = i->next) {
if (remove_original) {
// remember referenced mask/clippath, so orphaned masks can be moved back to document
SPItem *item = reinterpret_cast<SPItem *>(i->data);
Inkscape::URIReference *uri_ref = NULL;
-
+
if (apply_clip_path) {
uri_ref = item->clip_ref;
} else {
// restore mask objects into a document
for ( std::map<SPObject*,SPItem*>::iterator it = referenced_objects.begin() ; it != referenced_objects.end() ; ++it) {
- SPObject *obj = (*it).first;
+ SPObject *obj = (*it).first; // Group containing the clipped paths or masks
GSList *items_to_move = NULL;
for (SPObject *child = sp_object_first_child(obj) ; child != NULL; child = SP_OBJECT_NEXT(child) ) {
- Inkscape::XML::Node *copy = SP_OBJECT_REPR(child)->duplicate();
+ // Collect all clipped paths and masks within a single group
+ Inkscape::XML::Node *copy = SP_OBJECT_REPR(child)->duplicate(xml_doc);
items_to_move = g_slist_prepend (items_to_move, copy);
}
Inkscape::XML::Node *parent = SP_OBJECT_REPR((*it).second)->parent();
gint pos = SP_OBJECT_REPR((*it).second)->position();
+ // Iterate through all clipped paths / masks
for (GSList *i = items_to_move; NULL != i; i = i->next) {
Inkscape::XML::Node *repr = (Inkscape::XML::Node *)i->data;
g_slist_free (items_to_move);
}
- if (apply_clip_path)
- sp_document_done (document, SP_VERB_OBJECT_UNSET_CLIPPATH, _("Release clipping path"));
- else
- sp_document_done (document, SP_VERB_OBJECT_UNSET_MASK, _("Release mask"));
+ if (apply_clip_path)
+ sp_document_done (doc, SP_VERB_OBJECT_UNSET_CLIPPATH, _("Release clipping path"));
+ else
+ sp_document_done (doc, SP_VERB_OBJECT_UNSET_MASK, _("Release mask"));
}
-void fit_canvas_to_selection(SPDesktop *desktop) {
- g_return_if_fail(desktop != NULL);
+/**
+ * Returns true if an undoable change should be recorded.
+ */
+bool
+fit_canvas_to_selection(SPDesktop *desktop)
+{
+ g_return_val_if_fail(desktop != NULL, false);
SPDocument *doc = sp_desktop_document(desktop);
- g_return_if_fail(doc != NULL);
- g_return_if_fail(desktop->selection != NULL);
- g_return_if_fail(!desktop->selection->isEmpty());
- NRRect bbox = {0,0,0,0};
+ g_return_val_if_fail(doc != NULL, false);
+ g_return_val_if_fail(desktop->selection != NULL, false);
- desktop->selection->bounds(&bbox);
- if (!empty(bbox)) {
- doc->fitToRect(bbox);
+ if (desktop->selection->isEmpty()) {
+ desktop->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("Select <b>object(s)</b> to fit canvas to."));
+ return false;
}
-};
+ boost::optional<NR::Rect> const bbox(desktop->selection->bounds());
+ if (bbox && !bbox->isEmpty()) {
+ doc->fitToRect(*bbox);
+ return true;
+ } else {
+ return false;
+ }
+}
-void fit_canvas_to_drawing(SPDocument *doc) {
- g_return_if_fail(doc != NULL);
- NRRect bbox = {0,0,0,0};
+/**
+ * Fit canvas to the bounding box of the selection, as an undoable action.
+ */
+void
+verb_fit_canvas_to_selection(SPDesktop *const desktop)
+{
+ if (fit_canvas_to_selection(desktop)) {
+ sp_document_done(sp_desktop_document(desktop), SP_VERB_FIT_CANVAS_TO_SELECTION,
+ _("Fit Page to Selection"));
+ }
+}
- sp_document_ensure_up_to_date (doc);
- sp_item_invoke_bbox(SP_ITEM(doc->root), &bbox, sp_item_i2r_affine(SP_ITEM(doc->root)), TRUE);
+bool
+fit_canvas_to_drawing(SPDocument *doc)
+{
+ g_return_val_if_fail(doc != NULL, false);
- if (!empty(bbox)) {
- doc->fitToRect(bbox);
+ sp_document_ensure_up_to_date(doc);
+ SPItem const *const root = SP_ITEM(doc->root);
+ boost::optional<NR::Rect> const bbox(root->getBounds(from_2geom(sp_item_i2r_affine(root))));
+ if (bbox && !bbox->isEmpty()) {
+ doc->fitToRect(*bbox);
+ return true;
+ } else {
+ return false;
}
-};
+}
+
+void
+verb_fit_canvas_to_drawing(SPDesktop *desktop)
+{
+ if (fit_canvas_to_drawing(sp_desktop_document(desktop))) {
+ sp_document_done(sp_desktop_document(desktop), SP_VERB_FIT_CANVAS_TO_DRAWING,
+ _("Fit Page to Drawing"));
+ }
+}
void fit_canvas_to_selection_or_drawing(SPDesktop *desktop) {
g_return_if_fail(desktop != NULL);
g_return_if_fail(doc != NULL);
g_return_if_fail(desktop->selection != NULL);
- if (desktop->selection->isEmpty()) {
- fit_canvas_to_drawing(doc);
+ bool const changed = ( desktop->selection->isEmpty()
+ ? fit_canvas_to_drawing(doc)
+ : fit_canvas_to_selection(desktop) );
+ if (changed) {
+ sp_document_done(sp_desktop_document(desktop), SP_VERB_FIT_CANVAS_TO_SELECTION_OR_DRAWING,
+ _("Fit Page to Selection or Drawing"));
+ }
+};
+
+static void itemtree_map(void (*f)(SPItem *, SPDesktop *), SPObject *root, SPDesktop *desktop) {
+ // don't operate on layers
+ if (SP_IS_ITEM(root) && !desktop->isLayer(SP_ITEM(root))) {
+ f(SP_ITEM(root), desktop);
+ }
+ for ( SPObject::SiblingIterator iter = root->firstChild() ; iter ; ++iter ) {
+ //don't recurse into locked layers
+ if (!(SP_IS_ITEM(&*iter) && desktop->isLayer(SP_ITEM(&*iter)) && SP_ITEM(&*iter)->isLocked())) {
+ itemtree_map(f, iter, desktop);
+ }
+ }
+}
+
+static void unlock(SPItem *item, SPDesktop */*desktop*/) {
+ if (item->isLocked()) {
+ item->setLocked(FALSE);
+ }
+}
+
+static void unhide(SPItem *item, SPDesktop *desktop) {
+ if (desktop->itemIsHidden(item)) {
+ item->setExplicitlyHidden(FALSE);
+ }
+}
+
+static void process_all(void (*f)(SPItem *, SPDesktop *), SPDesktop *dt, bool layer_only) {
+ if (!dt) return;
+
+ SPObject *root;
+ if (layer_only) {
+ root = dt->currentLayer();
} else {
- fit_canvas_to_selection(desktop);
+ root = dt->currentRoot();
}
- sp_document_done(doc, SP_VERB_FIT_CANVAS_TO_DRAWING,
- _("Fit page to selection"));
-};
+ itemtree_map(f, root, dt);
+}
+
+void unlock_all(SPDesktop *dt) {
+ process_all(&unlock, dt, true);
+}
+
+void unlock_all_in_all_layers(SPDesktop *dt) {
+ process_all(&unlock, dt, false);
+}
+
+void unhide_all(SPDesktop *dt) {
+ process_all(&unhide, dt, true);
+}
+
+void unhide_all_in_all_layers(SPDesktop *dt) {
+ process_all(&unhide, dt, false);
+}
+
/*
Local Variables:
fill-column:99
End:
*/
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4 :
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 :