X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fselection-chemistry.cpp;h=f8548cdc4eda0fb199276a687c923b59de6597b8;hb=2566c299e475ce148c1b7f840d1bbe25b79096c1;hp=0ba60a91cac30868e47ed6d025261d3e3b23fd5e;hpb=8aa49e31e078deab4a1383d7adf83e96f9979533;p=inkscape.git diff --git a/src/selection-chemistry.cpp b/src/selection-chemistry.cpp index 0ba60a91c..f8548cdc4 100644 --- a/src/selection-chemistry.cpp +++ b/src/selection-chemistry.cpp @@ -8,8 +8,9 @@ * Frank Felfe * MenTaLguY * bulia byak + * Andrius R. * - * Copyright (C) 1999-2005 authors + * Copyright (C) 1999-2006 authors * Copyright (C) 2001-2002 Ximian, Inc. * * Released under GNU GPL, read the file 'COPYING' for more information @@ -30,7 +31,7 @@ #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" @@ -38,6 +39,9 @@ #include "sp-flowregion.h" #include "text-editing.h" #include "text-context.h" +#include "connector-context.h" +#include "sp-path.h" +#include "sp-conn-end.h" #include "dropper-context.h" #include #include "libnr/nr-matrix-rotate-ops.h" @@ -58,49 +62,62 @@ #include "sp-namedview.h" #include "prefs-utils.h" #include "sp-offset.h" +#include "sp-clippath.h" +#include "sp-mask.h" #include "file.h" +#include "helper/png-write.h" #include "layer-fns.h" #include "context-fns.h" +#include +#include "helper/units.h" +#include "sp-item.h" +#include "unit-constants.h" +#include "xml/simple-document.h" + using NR::X; using NR::Y; #include "selection-chemistry.h" /* fixme: find a better place */ +Inkscape::XML::Document *clipboard_document = NULL; GSList *clipboard = NULL; GSList *defs_clipboard = NULL; SPCSSAttr *style_clipboard = NULL; +NR::Maybe size_clipboard; -static void sp_copy_stuff_used_by_item(GSList **defs_clip, SPItem *item, const GSList *items); +static void sp_copy_stuff_used_by_item(GSList **defs_clip, SPItem *item, const GSList *items, Inkscape::XML::Document* xml_doc); -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 (const GSList *items, GSList **clip, GSList **defs_clip, SPCSSAttr **style_clip, Inkscape::XML::Document* xml_doc) { // 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); + sp_copy_stuff_used_by_item (defs_clip, SP_ITEM (i->data), items, xml_doc); } *defs_clip = g_slist_reverse(*defs_clip); } @@ -118,7 +135,7 @@ void sp_selection_copy_impl (const GSList *items, GSList **clip, GSList **defs_c // 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); + sp_selection_copy_one (SP_OBJECT_REPR (i->data), sp_item_i2doc_affine(SP_ITEM (i->data)), clip, xml_doc); } *clip = g_slist_reverse(*clip); @@ -127,9 +144,11 @@ void sp_selection_copy_impl (const GSList *items, GSList **clip, GSList **defs_c } /** -Add gradients/patterns/markers referenced by copied objects to defs -*/ -void + * Add gradients/patterns/markers referenced by copied objects to defs. + * Iterates through 'defs_clip', and for each item it adds the data + * repr into the global defs. + */ +void paste_defs (GSList **defs_clip, SPDocument *doc) { if (!defs_clip) @@ -140,22 +159,24 @@ paste_defs (GSList **defs_clip, SPDocument *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(); + Inkscape::XML::Document *xml_doc = sp_document_repr_doc(doc); + Inkscape::XML::Node *copy = repr->duplicate(xml_doc); 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) +GSList *sp_selection_paste_impl (SPDocument *doc, SPObject *parent, GSList **clip, GSList **defs_clip) { - paste_defs (defs_clip, document); + Inkscape::XML::Document *xml_doc = sp_document_repr_doc(doc); + paste_defs (defs_clip, 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)); @@ -166,12 +187,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); @@ -203,11 +221,12 @@ void sp_selection_delete() if (tools_isactive (desktop, TOOLS_TEXT)) if (sp_text_delete_selection(desktop->event_context)) { - sp_document_done(SP_DT_DOCUMENT(desktop)); + sp_document_done(sp_desktop_document(desktop), SP_VERB_CONTEXT_TEXT, + _("Delete text")); return; } - Inkscape::Selection *selection = SP_DT_SELECTION(desktop); + Inkscape::Selection *selection = sp_desktop_selection(desktop); // check if something is selected if (selection->isEmpty()) { @@ -228,7 +247,8 @@ void sp_selection_delete() */ tools_switch ( desktop, tools_active ( desktop ) ); - sp_document_done(SP_DT_DOCUMENT(desktop)); + sp_document_done(sp_desktop_document(desktop), SP_VERB_EDIT_DELETE, + _("Delete")); } /* fixme: sequencing */ @@ -238,7 +258,8 @@ void sp_selection_duplicate() if (desktop == NULL) return; - Inkscape::Selection *selection = SP_DT_SELECTION(desktop); + Inkscape::XML::Document* xml_doc = sp_document_repr_doc(desktop->doc()); + Inkscape::Selection *selection = sp_desktop_selection(desktop); // check if something is selected if (selection->isEmpty()) { @@ -257,7 +278,7 @@ void sp_selection_duplicate() 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); @@ -266,7 +287,8 @@ void sp_selection_duplicate() Inkscape::GC::release(copy); } - sp_document_done(SP_DT_DOCUMENT(desktop)); + sp_document_done(sp_desktop_document(desktop), SP_VERB_EDIT_DUPLICATE, + _("Duplicate")); selection->setReprList(newsel); @@ -279,8 +301,8 @@ void sp_edit_clear_all() if (!dt) return; - SPDocument *doc = SP_DT_DOCUMENT(dt); - SP_DT_SELECTION(dt)->clear(); + SPDocument *doc = sp_desktop_document(dt); + sp_desktop_selection(dt)->clear(); g_return_if_fail(SP_IS_GROUP(dt->currentLayer())); GSList *items = sp_item_group_item_list(SP_GROUP(dt->currentLayer())); @@ -290,7 +312,8 @@ void sp_edit_clear_all() items = g_slist_remove(items, items->data); } - sp_document_done(doc); + sp_document_done(doc, SP_VERB_EDIT_CLEAR_ALL, + _("Delete all")); } GSList * @@ -299,7 +322,7 @@ get_all_items (GSList *list, SPObject *from, SPDesktop *desktop, bool onlyvisibl for (SPObject *child = sp_object_first_child(SP_OBJECT(from)) ; child != NULL; child = SP_OBJECT_NEXT(child) ) { if (SP_IS_ITEM(child) && !desktop->isLayer(SP_ITEM(child)) && - (!onlysensitive || !SP_ITEM(child)->isLocked()) && + (!onlysensitive || !SP_ITEM(child)->isLocked()) && (!onlyvisible || !desktop->itemIsHidden(SP_ITEM(child))) && (!exclude || !g_slist_find ((GSList *) exclude, child)) ) @@ -321,11 +344,11 @@ void sp_edit_select_all_full (bool force_all_layers, bool invert) if (!dt) return; - Inkscape::Selection *selection = SP_DT_SELECTION(dt); + Inkscape::Selection *selection = sp_desktop_selection(dt); g_return_if_fail(SP_IS_GROUP(dt->currentLayer())); - bool inlayer = prefs_get_int_attribute ("options.kbselection", "inlayer", 1); + PrefsSelectionContext inlayer = (PrefsSelectionContext)prefs_get_int_attribute ("options.kbselection", "inlayer", PREFS_SELECTION_LAYER); bool onlyvisible = prefs_get_int_attribute ("options.kbselection", "onlyvisible", 1); bool onlysensitive = prefs_get_int_attribute ("options.kbselection", "onlysensitive", 1); @@ -336,8 +359,11 @@ void sp_edit_select_all_full (bool force_all_layers, bool invert) exclude = selection->itemList(); } - if (inlayer && !force_all_layers) { + if (force_all_layers) + inlayer = PREFS_SELECTION_ALL; + switch (inlayer) { + case PREFS_SELECTION_LAYER: { if ( (onlysensitive && SP_ITEM(dt->currentLayer())->isLocked()) || (onlyvisible && dt->itemIsHidden(SP_ITEM(dt->currentLayer()))) ) return; @@ -359,9 +385,16 @@ void sp_edit_select_all_full (bool force_all_layers, bool invert) } g_slist_free (all_items); - - } else { + break; + } + case PREFS_SELECTION_LAYER_RECURSIVE: { + items = get_all_items (NULL, dt->currentLayer(), dt, onlyvisible, onlysensitive, exclude); + break; + } + default: { items = get_all_items (NULL, dt->currentRoot(), dt, onlyvisible, onlysensitive, exclude); + break; + } } selection->setList (items); @@ -397,24 +430,19 @@ void sp_selection_group() if (desktop == NULL) return; - SPDocument *document = SP_DT_DOCUMENT (desktop); + SPDocument *doc = sp_desktop_document (desktop); + Inkscape::XML::Document *xml_doc = sp_document_repr_doc(doc); - Inkscape::Selection *selection = SP_DT_SELECTION(desktop); + Inkscape::Selection *selection = sp_desktop_selection(desktop); // Check if something is selected. if (selection->isEmpty()) { - desktop->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("Select two or more objects to group.")); + desktop->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("Select some objects 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 at least two objects to group.")); - return; - } - GSList *p = g_slist_copy((GSList *) l); selection->clear(); @@ -425,13 +453,13 @@ void sp_selection_group() 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); @@ -445,7 +473,7 @@ void sp_selection_group() 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 *= 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 @@ -453,17 +481,17 @@ void sp_selection_group() //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, NULL); 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 @@ -481,7 +509,8 @@ void sp_selection_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_DT_DOCUMENT(desktop)); + sp_document_done(sp_desktop_document(desktop), SP_VERB_SELECTION_GROUP, + _("Group")); selection->set(group); Inkscape::GC::release(group); @@ -493,7 +522,7 @@ void sp_selection_ungroup() if (desktop == NULL) return; - Inkscape::Selection *selection = SP_DT_SELECTION(desktop); + Inkscape::Selection *selection = sp_desktop_selection(desktop); if (selection->isEmpty()) { desktop->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("Select a group to ungroup.")); @@ -542,7 +571,8 @@ void sp_selection_ungroup() g_slist_free(items); - sp_document_done(SP_DT_DOCUMENT(desktop)); + sp_document_done(sp_desktop_document(desktop), SP_VERB_SELECTION_UNGROUP, + _("Ungroup")); } static SPGroup * @@ -552,7 +582,7 @@ sp_item_list_common_parent_group(const GSList *items) return NULL; } SPObject *parent = SP_OBJECT_PARENT(items->data); - /* Strictly speaking this CAN happen, if user selects from XML editor */ + /* Strictly speaking this CAN happen, if user selects from Inkscape::XML editor */ if (!SP_IS_GROUP(parent)) { return NULL; } @@ -567,17 +597,15 @@ sp_item_list_common_parent_group(const GSList *items) /** Finds out the minimum common bbox of the selected items */ -NR::Rect +static NR::Maybe enclose_items(const GSList *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)); + NR::Maybe r = NR::Nothing(); + for (GSList const *i = items; i; i = i->next) { + r = NR::union_bounds(r, sp_item_bbox_desktop((SPItem *) i->data)); } - return r; } @@ -602,7 +630,7 @@ sp_selection_raise() if (!desktop) return; - Inkscape::Selection *selection = SP_DT_SELECTION(desktop); + Inkscape::Selection *selection = sp_desktop_selection(desktop); GSList const *items = (GSList *) selection->itemList(); if (!items) { @@ -623,27 +651,35 @@ sp_selection_raise() 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); + NR::Maybe 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)); + 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)) { + NR::Maybe 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_DT_DOCUMENT(desktop)); + sp_document_done(sp_desktop_document(desktop), SP_VERB_SELECTION_RAISE, + _("Raise")); } void sp_selection_raise_to_top() @@ -652,8 +688,8 @@ void sp_selection_raise_to_top() if (desktop == NULL) return; - SPDocument *document = SP_DT_DOCUMENT(desktop); - Inkscape::Selection *selection = SP_DT_SELECTION(desktop); + SPDocument *document = sp_desktop_document(desktop); + Inkscape::Selection *selection = sp_desktop_selection(desktop); if (selection->isEmpty()) { desktop->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("Select object(s) to raise to top.")); @@ -678,7 +714,8 @@ void sp_selection_raise_to_top() g_slist_free(rl); - sp_document_done(document); + sp_document_done(document, SP_VERB_SELECTION_TO_FRONT, + _("Raise to top")); } void @@ -688,7 +725,7 @@ sp_selection_lower() if (desktop == NULL) return; - Inkscape::Selection *selection = SP_DT_SELECTION(desktop); + Inkscape::Selection *selection = sp_desktop_selection(desktop); GSList const *items = (GSList *) selection->itemList(); if (!items) { @@ -705,7 +742,7 @@ sp_selection_lower() Inkscape::XML::Node *grepr = SP_OBJECT_REPR(group); // find out the common bbox of the selected items - NR::Rect selected = enclose_items(items); + NR::Maybe selected = enclose_items(items); /* construct direct-ordered list of selected children */ GSList *rev = g_slist_copy((GSList *) items); @@ -713,29 +750,36 @@ sp_selection_lower() 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); + 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)) { + NR::Maybe 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_DT_DOCUMENT(desktop)); - + sp_document_done(sp_desktop_document(desktop), SP_VERB_SELECTION_LOWER, + _("Lower")); } void sp_selection_lower_to_bottom() @@ -744,8 +788,8 @@ void sp_selection_lower_to_bottom() if (desktop == NULL) return; - SPDocument *document = SP_DT_DOCUMENT(desktop); - Inkscape::Selection *selection = SP_DT_SELECTION(desktop); + SPDocument *document = sp_desktop_document(desktop); + Inkscape::Selection *selection = sp_desktop_selection(desktop); if (selection->isEmpty()) { desktop->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("Select object(s) to lower to bottom.")); @@ -782,20 +826,21 @@ void sp_selection_lower_to_bottom() g_slist_free(rl); - sp_document_done(document); + sp_document_done(document, SP_VERB_SELECTION_TO_BACK, + _("Lower to bottom")); } void -sp_undo(SPDesktop *desktop, SPDocument *doc) +sp_undo(SPDesktop *desktop, SPDocument *) { - if (!sp_document_undo(SP_DT_DOCUMENT(desktop))) + if (!sp_document_undo(sp_desktop_document(desktop))) desktop->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("Nothing to undo.")); } void -sp_redo(SPDesktop *desktop, SPDocument *doc) +sp_redo(SPDesktop *desktop, SPDocument *) { - if (!sp_document_redo(SP_DT_DOCUMENT(desktop))) + if (!sp_document_redo(sp_desktop_document(desktop))) desktop->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("Nothing to redo.")); } @@ -805,94 +850,119 @@ void sp_selection_cut() sp_selection_delete(); } -void sp_copy_gradient (GSList **defs_clip, SPGradient *gradient) +void sp_copy_gradient (GSList **defs_clip, SPGradient *gradient, Inkscape::XML::Document* xml_doc) { SPGradient *ref = gradient; - while (ref) { + while (ref) { // climb up the refs, copying each one in the chain - Inkscape::XML::Node *grad_repr = SP_OBJECT_REPR(ref)->duplicate(); + Inkscape::XML::Node *grad_repr = SP_OBJECT_REPR(ref)->duplicate(xml_doc); *defs_clip = g_slist_prepend (*defs_clip, grad_repr); ref = ref->ref->getObject(); } } -void sp_copy_pattern (GSList **defs_clip, SPPattern *pattern) +void sp_copy_pattern (GSList **defs_clip, SPPattern *pattern, Inkscape::XML::Document* xml_doc) { 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(); + Inkscape::XML::Node *pattern_repr = SP_OBJECT_REPR(ref)->duplicate(xml_doc); *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); + sp_copy_stuff_used_by_item (defs_clip, (SPItem *) child, NULL, xml_doc); } ref = ref->ref->getObject(); } } -void sp_copy_marker (GSList **defs_clip, SPMarker *marker) +void sp_copy_single (GSList **defs_clip, SPObject *thing, Inkscape::XML::Document* xml_doc) { - Inkscape::XML::Node *marker_repr = SP_OBJECT_REPR(marker)->duplicate(); - *defs_clip = g_slist_prepend (*defs_clip, marker_repr); + Inkscape::XML::Node *duplicate_repr = SP_OBJECT_REPR(thing)->duplicate(xml_doc); + *defs_clip = g_slist_prepend (*defs_clip, duplicate_repr); } -void sp_copy_textpath_path (GSList **defs_clip, SPTextPath *tp, const GSList *items) +void sp_copy_textpath_path (GSList **defs_clip, SPTextPath *tp, const GSList *items, Inkscape::XML::Document* xml_doc) { 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(); + Inkscape::XML::Node *repr = SP_OBJECT_REPR(path)->duplicate(xml_doc); *defs_clip = g_slist_prepend (*defs_clip, repr); } -void sp_copy_stuff_used_by_item (GSList **defs_clip, SPItem *item, const GSList *items) +/** + * Copies things like patterns, markers, gradients, etc. + */ +void sp_copy_stuff_used_by_item (GSList **defs_clip, SPItem *item, const GSList *items, Inkscape::XML::Document* xml_doc) { - SPStyle *style = SP_OBJECT_STYLE (item); + SPStyle *style = SP_OBJECT_STYLE (item); - if (style && (style->fill.type == SP_PAINT_TYPE_PAINTSERVER)) { + 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)); + sp_copy_gradient (defs_clip, SP_GRADIENT(server), xml_doc); if (SP_IS_PATTERN (server)) - sp_copy_pattern (defs_clip, SP_PATTERN(server)); + sp_copy_pattern (defs_clip, SP_PATTERN(server), xml_doc); } - if (style && (style->stroke.type == SP_PAINT_TYPE_PAINTSERVER)) { + 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)); + sp_copy_gradient (defs_clip, SP_GRADIENT(server), xml_doc); if (SP_IS_PATTERN (server)) - sp_copy_pattern (defs_clip, SP_PATTERN(server)); + sp_copy_pattern (defs_clip, SP_PATTERN(server), xml_doc); } - if (SP_IS_SHAPE (item)) { + // For shapes, copy all of the shape's markers into defs_clip + 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_marker (defs_clip, SP_MARKER (shape->marker[i])); + sp_copy_single (defs_clip, SP_OBJECT (shape->marker[i]), xml_doc); } } } if (SP_IS_TEXT_TEXTPATH (item)) { - sp_copy_textpath_path (defs_clip, SP_TEXTPATH(sp_object_first_child(SP_OBJECT(item))), items); + sp_copy_textpath_path (defs_clip, SP_TEXTPATH(sp_object_first_child(SP_OBJECT(item))), items, xml_doc); + } + + if (item->clip_ref->getObject()) { + sp_copy_single (defs_clip, item->clip_ref->getObject(), xml_doc); + } + + if (item->mask_ref->getObject()) { + SPObject *mask = item->mask_ref->getObject(); + sp_copy_single (defs_clip, mask, xml_doc); + // 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, xml_doc); + } + } + + if (style->filter.filter) { + SPObject *filter = style->filter.filter; + if (SP_IS_FILTER(filter)) { + sp_copy_single (defs_clip, filter, xml_doc); + } } // 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); + sp_copy_stuff_used_by_item (defs_clip, SP_ITEM (o), items, xml_doc); } } @@ -943,7 +1013,11 @@ void sp_selection_copy() if (desktop == NULL) return; - Inkscape::Selection *selection = SP_DT_SELECTION(desktop); + if (!clipboard_document) { + clipboard_document = new Inkscape::XML::SimpleDocument(); + } + + Inkscape::Selection *selection = sp_desktop_selection(desktop); if (tools_isactive (desktop, TOOLS_DROPPER)) { sp_dropper_context_copy(desktop->event_context); @@ -959,7 +1033,7 @@ void sp_selection_copy() 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; + // FIXME: for non-texts, put serialized Inkscape::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)) { @@ -998,14 +1072,14 @@ void sp_selection_copy() sp_repr_css_attr_unref (style_clipboard); style_clipboard = NULL; } - - //clear main clipboard + + //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); + sp_selection_copy_impl (items, &clipboard, &defs_clipboard, &style_clipboard, clipboard_document); 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(); @@ -1024,24 +1098,26 @@ void sp_selection_copy() g_free (query); } + size_clipboard = selection->bounds(); + g_slist_free ((GSList *) items); } void sp_selection_paste(bool in_place) { SPDesktop *desktop = SP_ACTIVE_DESKTOP; - + if (desktop == NULL) { return; } - SPDocument *document = SP_DT_DOCUMENT(desktop); + SPDocument *document = sp_desktop_document(desktop); if (Inkscape::have_viable_layer(desktop, desktop->messageStack()) == false) { return; } - Inkscape::Selection *selection = SP_DT_SELECTION(desktop); + Inkscape::Selection *selection = sp_desktop_selection(desktop); if (tools_isactive (desktop, TOOLS_TEXT)) { if (sp_text_paste_inline(desktop->event_context)) @@ -1062,11 +1138,15 @@ void sp_selection_paste(bool in_place) if (!in_place) { sp_document_ensure_up_to_date(document); - NR::Point m( desktop->point() - selection->bounds().midpoint() ); + NR::Maybe sel_bbox = selection->bounds(); + NR::Point m( desktop->point() ); + if (sel_bbox) { + m -= sel_bbox->midpoint(); + } /* Snap the offset of the new item(s) to the grid */ /* FIXME: this gridsnap fiddling is a hack. */ - Inkscape::GridSnapper &s = desktop->namedview->grid_snapper; + 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(); @@ -1074,7 +1154,8 @@ void sp_selection_paste(bool in_place) sp_selection_move_relative(selection, m); } - sp_document_done(document); + sp_document_done(document, SP_VERB_EDIT_PASTE, + _("Paste")); } void sp_selection_paste_style() @@ -1082,7 +1163,7 @@ void sp_selection_paste_style() SPDesktop *desktop = SP_ACTIVE_DESKTOP; if (desktop == NULL) return; - Inkscape::Selection *selection = SP_DT_SELECTION(desktop); + Inkscape::Selection *selection = sp_desktop_selection(desktop); // check if something is in the clipboard if (clipboard == NULL) { @@ -1096,18 +1177,96 @@ void sp_selection_paste_style() return; } - paste_defs (&defs_clipboard, SP_DT_DOCUMENT(desktop)); + paste_defs (&defs_clipboard, sp_desktop_document(desktop)); sp_desktop_set_style (desktop, style_clipboard); - sp_document_done(SP_DT_DOCUMENT (desktop)); + sp_document_done(sp_desktop_document (desktop), SP_VERB_EDIT_PASTE_STYLE, + _("Paste style")); } -void sp_selection_to_next_layer () +void sp_selection_paste_size (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) { + 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 object(s) to paste size to.")); + return; + } + + NR::Maybe current = selection->bounds(); + if ( !current || current->isEmpty() ) { + return; + } + + 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_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, + _("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 ) { + 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 object(s) to paste size to.")); + return; + } + + for (GSList const *l = selection->itemList(); l != NULL; l = l->next) { + SPItem *item = SP_ITEM(l->data); + + NR::Maybe current = sp_item_bbox_desktop(item); + if ( !current || current->isEmpty() ) { + 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, + _("Paste size separately")); +} + +void sp_selection_to_next_layer () { SPDesktop *dt = SP_ACTIVE_DESKTOP; - Inkscape::Selection *selection = SP_DT_SELECTION(dt); + Inkscape::Selection *selection = sp_desktop_selection(dt); // check if something is selected if (selection->isEmpty()) { @@ -1117,29 +1276,42 @@ void sp_selection_to_next_layer () const GSList *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_copy_impl (items, &temp_clip, NULL, NULL, sp_document_repr_doc(dt->doc())); // we're in the same doc, so no need to copy defs sp_selection_delete_impl (items); - GSList *copied = sp_selection_paste_impl (SP_DT_DOCUMENT (dt), next, &temp_clip, NULL); + 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); + } else { + copied = sp_selection_paste_impl (sp_desktop_document (dt), dt->currentLayer(), &temp_clip, NULL); + no_more = true; + } selection->setReprList((GSList const *) copied); g_slist_free (copied); if (temp_clip) g_slist_free (temp_clip); - dt->setCurrentLayer(next); - sp_document_done(SP_DT_DOCUMENT (dt)); + if (next) dt->setCurrentLayer(next); + sp_document_done(sp_desktop_document (dt), SP_VERB_LAYER_MOVE_TO_NEXT, + _("Raise to next layer")); } else { + no_more = true; + } + + if (no_more) { dt->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("No more layers above.")); } g_slist_free ((GSList *) items); } -void sp_selection_to_prev_layer () +void sp_selection_to_prev_layer () { SPDesktop *dt = SP_ACTIVE_DESKTOP; - Inkscape::Selection *selection = SP_DT_SELECTION(dt); + Inkscape::Selection *selection = sp_desktop_selection(dt); // check if something is selected if (selection->isEmpty()) { @@ -1149,24 +1321,70 @@ void sp_selection_to_prev_layer () const GSList *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); - GSList *copied = sp_selection_paste_impl (SP_DT_DOCUMENT (dt), next, &temp_clip, NULL); + sp_selection_copy_impl (items, &temp_clip, NULL, NULL, sp_document_repr_doc(dt->doc())); // we're in the same doc, so no need to copy defs + sp_selection_delete_impl (items); + 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); + } else { + copied = sp_selection_paste_impl (sp_desktop_document (dt), dt->currentLayer(), &temp_clip, NULL); + no_more = true; + } selection->setReprList((GSList const *) copied); g_slist_free (copied); if (temp_clip) g_slist_free (temp_clip); - dt->setCurrentLayer(next); - sp_document_done(SP_DT_DOCUMENT (dt)); + if (next) dt->setCurrentLayer(next); + sp_document_done(sp_desktop_document (dt), SP_VERB_LAYER_MOVE_TO_PREV, + _("Lower to previous layer")); } else { + no_more = true; + } + + if (no_more) { dt->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("No more layers below.")); } 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); + } + 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 @@ -1182,7 +1400,7 @@ void sp_selection_apply_affine(Inkscape::Selection *selection, NR::Matrix const SPItem *item = SP_ITEM(l->data); NR::Point old_center(0,0); - if (set_i2d && item->isCenterSet()) + if (set_i2d && item->isCenterSet()) old_center = item->getCenter(); #if 0 /* Re-enable this once persistent guides have a graphical indication. @@ -1190,12 +1408,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); @@ -1231,8 +1466,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 = sp_item_i2root_affine(SP_ITEM(SP_OBJECT_PARENT (item))); + NR::Matrix t = parent_transform * matrix_to_desktop (matrix_from_desktop (affine, item), item) * parent_transform.inverse(); + NR::Matrix t_inv =parent_transform * matrix_to_desktop (matrix_from_desktop (affine.inverse(), item), item) * parent_transform.inverse(); NR::Matrix result = t_inv * item->transform * t; if ((prefs_parallel || prefs_unmoved) && affine.is_translation()) { @@ -1247,15 +1483,15 @@ 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 { @@ -1280,7 +1516,7 @@ void sp_selection_remove_transform() if (desktop == NULL) return; - Inkscape::Selection *selection = SP_DT_SELECTION(desktop); + Inkscape::Selection *selection = sp_desktop_selection(desktop); GSList const *l = (GSList *) selection->reprList(); while (l != NULL) { @@ -1288,7 +1524,8 @@ void sp_selection_remove_transform() l = l->next; } - sp_document_done(SP_DT_DOCUMENT(desktop)); + sp_document_done(sp_desktop_document(desktop), SP_VERB_OBJECT_FLATTEN, + _("Remove transform")); } void @@ -1299,16 +1536,16 @@ sp_selection_scale_absolute(Inkscape::Selection *selection, if (selection->isEmpty()) return; - NR::Rect const bbox(selection->bounds()); - if (bbox.isEmpty()) { - return; + NR::Maybe 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 ); @@ -1321,15 +1558,15 @@ void sp_selection_scale_relative(Inkscape::Selection *selection, NR::Point const if (selection->isEmpty()) return; - NR::Rect const bbox(selection->bounds()); + NR::Maybe 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; } @@ -1384,7 +1621,7 @@ void sp_selection_rotate_90_cw() { SPDesktop *desktop = SP_ACTIVE_DESKTOP; - Inkscape::Selection *selection = SP_DT_SELECTION(desktop); + Inkscape::Selection *selection = sp_desktop_selection(desktop); if (selection->isEmpty()) return; @@ -1396,7 +1633,8 @@ void sp_selection_rotate_90_cw() sp_item_rotate_rel(item, rot_neg_90); } - sp_document_done(SP_DT_DOCUMENT(desktop)); + sp_document_done(sp_desktop_document(desktop), SP_VERB_OBJECT_ROTATE_90_CCW, + _("Rotate 90° CW")); } @@ -1411,7 +1649,7 @@ void sp_selection_rotate_90_ccw() { SPDesktop *desktop = SP_ACTIVE_DESKTOP; - Inkscape::Selection *selection = SP_DT_SELECTION(desktop); + Inkscape::Selection *selection = sp_desktop_selection(desktop); if (selection->isEmpty()) return; @@ -1423,7 +1661,8 @@ void sp_selection_rotate_90_ccw() sp_item_rotate_rel(item, rot_neg_90); } - sp_document_done(SP_DT_DOCUMENT(desktop)); + sp_document_done(sp_desktop_document(desktop), SP_VERB_OBJECT_ROTATE_90_CW, + _("Rotate 90° CCW")); } void @@ -1432,14 +1671,19 @@ sp_selection_rotate(Inkscape::Selection *selection, gdouble const angle_degrees) if (selection->isEmpty()) return; - NR::Point const center(selection->bounds().midpoint()); + NR::Maybe 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_DT_DOCUMENT(selection->desktop()), + sp_document_maybe_done(sp_desktop_document(selection->desktop()), ( ( angle_degrees > 0 ) ? "selector:rotate:ccw" - : "selector:rotate:cw" )); + : "selector:rotate:cw" ), + SP_VERB_CONTEXT_SELECT, + _("Rotate")); } /** @@ -1451,21 +1695,27 @@ sp_selection_rotate_screen(Inkscape::Selection *selection, gdouble angle) if (selection->isEmpty()) return; - NR::Rect const bbox(selection->bounds()); - NR::Point const center(bbox.midpoint()); + NR::Maybe const bbox(selection->bounds()); + NR::Maybe 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->max() - *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_DT_DOCUMENT(selection->desktop()), + sp_document_maybe_done(sp_desktop_document(selection->desktop()), ( (angle > 0) ? "selector:rotate:ccw" - : "selector:rotate:cw" )); + : "selector:rotate:cw" ), + SP_VERB_CONTEXT_SELECT, + _("Rotate by pixels")); } void @@ -1474,11 +1724,15 @@ sp_selection_scale(Inkscape::Selection *selection, gdouble grow) if (selection->isEmpty()) return; - NR::Rect const bbox(selection->bounds()); - NR::Point const center(bbox.midpoint()); - double const max_len = bbox.maxExtent(); + NR::Maybe 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; } @@ -1486,10 +1740,12 @@ sp_selection_scale(Inkscape::Selection *selection, gdouble grow) double const times = 1.0 + grow / max_len; sp_selection_scale_relative(selection, center, NR::scale(times, times)); - sp_document_maybe_done(SP_DT_DOCUMENT(selection->desktop()), + sp_document_maybe_done(sp_desktop_document(selection->desktop()), ( (grow > 0) ? "selector:scale:larger" - : "selector:scale:smaller" )); + : "selector:scale:smaller" ), + SP_VERB_CONTEXT_SELECT, + _("Scale")); } void @@ -1505,16 +1761,23 @@ sp_selection_scale_times(Inkscape::Selection *selection, gdouble times) if (selection->isEmpty()) return; - NR::Point const center(selection->bounds().midpoint()); + NR::Maybe 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_DT_DOCUMENT(selection->desktop())); + sp_document_done(sp_desktop_document(selection->desktop()), SP_VERB_CONTEXT_SELECT, + _("Scale by whole factor")); } void sp_selection_move(gdouble dx, gdouble dy) { SPDesktop *desktop = SP_ACTIVE_DESKTOP; - Inkscape::Selection *selection = SP_DT_SELECTION(desktop); + Inkscape::Selection *selection = sp_desktop_selection(desktop); if (selection->isEmpty()) { return; } @@ -1522,11 +1785,14 @@ sp_selection_move(gdouble dx, gdouble dy) sp_selection_move_relative(selection, dx, dy); if (dx == 0) { - sp_document_maybe_done(SP_DT_DOCUMENT(desktop), "selector:move:vertical"); + 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_DT_DOCUMENT(desktop), "selector:move:horizontal"); + sp_document_maybe_done(sp_desktop_document(desktop), "selector:move:horizontal", SP_VERB_CONTEXT_SELECT, + _("Move horizontally")); } else { - sp_document_done(SP_DT_DOCUMENT(desktop)); + sp_document_done(sp_desktop_document(desktop), SP_VERB_CONTEXT_SELECT, + _("Move")); } } @@ -1535,7 +1801,7 @@ sp_selection_move_screen(gdouble dx, gdouble dy) { SPDesktop *desktop = SP_ACTIVE_DESKTOP; - Inkscape::Selection *selection = SP_DT_SELECTION(desktop); + Inkscape::Selection *selection = sp_desktop_selection(desktop); if (selection->isEmpty()) { return; } @@ -1547,11 +1813,14 @@ sp_selection_move_screen(gdouble dx, gdouble dy) sp_selection_move_relative(selection, zdx, zdy); if (dx == 0) { - sp_document_maybe_done(SP_DT_DOCUMENT(desktop), "selector:move:vertical"); + 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_DT_DOCUMENT(desktop), "selector:move:horizontal"); + sp_document_maybe_done(sp_desktop_document(desktop), "selector:move:horizontal", SP_VERB_CONTEXT_SELECT, + _("Move horizontally by pixels")); } else { - sp_document_done(SP_DT_DOCUMENT(desktop)); + sp_document_done(sp_desktop_document(desktop), SP_VERB_CONTEXT_SELECT, + _("Move")); } } @@ -1559,11 +1828,11 @@ namespace { template SPItem *next_item(SPDesktop *desktop, GSList *path, SPObject *root, - bool only_in_viewport, bool inlayer, bool onlyvisible, bool onlysensitive); + bool only_in_viewport, PrefsSelectionContext inlayer, bool onlyvisible, bool onlysensitive); template -SPItem *next_item_from_list(SPDesktop *desktop, GSList const *items, SPObject *root, - bool only_in_viewport, bool inlayer, bool onlyvisible, bool onlysensitive); +SPItem *next_item_from_list(SPDesktop *desktop, GSList const *items, SPObject *root, + bool only_in_viewport, PrefsSelectionContext inlayer, bool onlyvisible, bool onlysensitive); struct Forward { typedef SPObject *Iterator; @@ -1612,15 +1881,15 @@ sp_selection_item_next(void) { SPDesktop *desktop = SP_ACTIVE_DESKTOP; g_return_if_fail(desktop != NULL); - Inkscape::Selection *selection = SP_DT_SELECTION(desktop); + Inkscape::Selection *selection = sp_desktop_selection(desktop); - bool inlayer = prefs_get_int_attribute ("options.kbselection", "inlayer", 1); + PrefsSelectionContext inlayer = (PrefsSelectionContext)prefs_get_int_attribute ("options.kbselection", "inlayer", PREFS_SELECTION_LAYER); bool onlyvisible = prefs_get_int_attribute ("options.kbselection", "onlyvisible", 1); bool onlysensitive = prefs_get_int_attribute ("options.kbselection", "onlysensitive", 1); SPObject *root; - if (inlayer) { - root = desktop->currentLayer(); + if (PREFS_SELECTION_ALL != inlayer) { + root = selection->activeContext(); } else { root = desktop->currentRoot(); } @@ -1628,7 +1897,7 @@ sp_selection_item_next(void) SPItem *item=next_item_from_list(desktop, selection->itemList(), root, SP_CYCLING == SP_CYCLE_VISIBLE, inlayer, onlyvisible, onlysensitive); if (item) { - selection->set(item); + selection->set(item, PREFS_SELECTION_LAYER_RECURSIVE == inlayer); if ( SP_CYCLING == SP_CYCLE_FOCUS ) { scroll_to_show_item(desktop, item); } @@ -1642,15 +1911,15 @@ sp_selection_item_prev(void) SPDesktop *desktop = SP_ACTIVE_DESKTOP; g_return_if_fail(document != NULL); g_return_if_fail(desktop != NULL); - Inkscape::Selection *selection = SP_DT_SELECTION(desktop); + Inkscape::Selection *selection = sp_desktop_selection(desktop); - bool inlayer = prefs_get_int_attribute ("options.kbselection", "inlayer", 1); + PrefsSelectionContext inlayer = (PrefsSelectionContext)prefs_get_int_attribute ("options.kbselection", "inlayer", PREFS_SELECTION_LAYER); bool onlyvisible = prefs_get_int_attribute ("options.kbselection", "onlyvisible", 1); bool onlysensitive = prefs_get_int_attribute ("options.kbselection", "onlysensitive", 1); SPObject *root; - if (inlayer) { - root = desktop->currentLayer(); + if (PREFS_SELECTION_ALL != inlayer) { + root = selection->activeContext(); } else { root = desktop->currentRoot(); } @@ -1658,7 +1927,7 @@ sp_selection_item_prev(void) SPItem *item=next_item_from_list(desktop, selection->itemList(), root, SP_CYCLING == SP_CYCLE_VISIBLE, inlayer, onlyvisible, onlysensitive); if (item) { - selection->set(item); + selection->set(item, PREFS_SELECTION_LAYER_RECURSIVE == inlayer); if ( SP_CYCLING == SP_CYCLE_FOCUS ) { scroll_to_show_item(desktop, item); } @@ -1669,7 +1938,7 @@ namespace { template SPItem *next_item_from_list(SPDesktop *desktop, GSList const *items, - SPObject *root, bool only_in_viewport, bool inlayer, bool onlyvisible, bool onlysensitive) + SPObject *root, bool only_in_viewport, PrefsSelectionContext inlayer, bool onlyvisible, bool onlysensitive) { SPObject *current=root; while (items) { @@ -1703,7 +1972,7 @@ SPItem *next_item_from_list(SPDesktop *desktop, GSList const *items, template SPItem *next_item(SPDesktop *desktop, GSList *path, SPObject *root, - bool only_in_viewport, bool inlayer, bool onlyvisible, bool onlysensitive) + bool only_in_viewport, PrefsSelectionContext inlayer, bool onlyvisible, bool onlysensitive) { typename D::Iterator children; typename D::Iterator iter; @@ -1724,7 +1993,7 @@ SPItem *next_item(SPDesktop *desktop, GSList *path, SPObject *root, while ( iter && !found ) { SPObject *object=D::object(iter); if (desktop->isLayer(object)) { - if (!inlayer) { // recurse into sublayers + if (PREFS_SELECTION_LAYER != inlayer) { // recurse into sublayers found = next_item(desktop, NULL, object, only_in_viewport, inlayer, onlyvisible, onlysensitive); } } else if ( SP_IS_ITEM(object) && @@ -1752,10 +2021,10 @@ SPItem *next_item(SPDesktop *desktop, GSList *path, SPObject *root, void scroll_to_show_item(SPDesktop *desktop, SPItem *item) { NR::Rect dbox = desktop->get_display_area(); - NR::Rect sbox = sp_item_bbox_desktop(item); + NR::Maybe 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); @@ -1774,7 +2043,9 @@ sp_selection_clone() if (desktop == NULL) return; - Inkscape::Selection *selection = SP_DT_SELECTION(desktop); + 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()) { @@ -1782,27 +2053,41 @@ sp_selection_clone() return; } - // Check if more than one object is selected. - if (g_slist_length((GSList *) selection->itemList()) > 1) { - desktop->messageStack()->flash(Inkscape::ERROR_MESSAGE, _("If you want to clone several objects, group them and clone the group.")); - return; - } + 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); - Inkscape::XML::Node *sel_repr = SP_OBJECT_REPR(selection->singleItem()); - Inkscape::XML::Node *parent = sp_repr_parent(sel_repr); + 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"); - clone->setAttribute("x", "0"); - clone->setAttribute("y", "0"); - clone->setAttribute("xlink:href", g_strdup_printf("#%s", sel_repr->attribute("id"))); + Inkscape::XML::Node *clone = xml_doc->createElement("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"))); - // add the new clone to the top of the original's parent - parent->appendChild(clone); + 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")); + + // add the new clone to the top of the original's parent + parent->appendChild(clone); - sp_document_done(SP_DT_DOCUMENT(desktop)); + newsel = g_slist_prepend(newsel, clone); + reprs = g_slist_remove(reprs, sel_repr); + Inkscape::GC::release(clone); + } + + sp_document_done(sp_desktop_document(desktop), SP_VERB_EDIT_CLONE, + Q_("action|Clone")); - selection->set(clone); - Inkscape::GC::release(clone); + selection->setReprList(newsel); + + g_slist_free(newsel); } void @@ -1812,7 +2097,7 @@ sp_selection_unlink() if (!desktop) return; - Inkscape::Selection *selection = SP_DT_SELECTION(desktop); + Inkscape::Selection *selection = sp_desktop_selection(desktop); if (selection->isEmpty()) { desktop->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("Select a clone to unlink.")); @@ -1849,7 +2134,8 @@ sp_selection_unlink() desktop->messageStack()->flash(Inkscape::ERROR_MESSAGE, _("No clones to unlink in the selection.")); } - sp_document_done(SP_DT_DOCUMENT(desktop)); + sp_document_done(sp_desktop_document(desktop), SP_VERB_EDIT_UNLINK_CLONE, + _("Unlink clone")); } void @@ -1859,7 +2145,7 @@ sp_select_clone_original() if (desktop == NULL) return; - Inkscape::Selection *selection = SP_DT_SELECTION(desktop); + Inkscape::Selection *selection = sp_desktop_selection(desktop); SPItem *item = selection->singleItem(); @@ -1913,9 +2199,10 @@ sp_selection_tile(bool apply) if (desktop == NULL) return; - SPDocument *document = SP_DT_DOCUMENT(desktop); + SPDocument *doc = sp_desktop_document(desktop); + Inkscape::XML::Document *xml_doc = sp_document_repr_doc(doc); - Inkscape::Selection *selection = SP_DT_SELECTION(desktop); + Inkscape::Selection *selection = sp_desktop_selection(desktop); // check if something is selected if (selection->isEmpty()) { @@ -1923,14 +2210,14 @@ sp_selection_tile(bool apply) return; } - sp_document_ensure_up_to_date(document); - NR::Rect r = selection->bounds(); - if (r.isEmpty()) { + sp_document_ensure_up_to_date(doc); + NR::Maybe 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)); @@ -1941,17 +2228,19 @@ sp_selection_tile(bool apply) // bottommost object, after sorting SPObject *parent = SP_OBJECT_PARENT (items->data); + NR::Matrix parent_transform = 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); } - 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 @@ -1967,24 +2256,28 @@ sp_selection_tile(bool apply) 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])))), move); + const gchar *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)); - sp_repr_set_svg_double(rect, "width", bounds.extent(NR::X)); - sp_repr_set_svg_double(rect, "height", bounds.extent(NR::Y)); - sp_repr_set_svg_double(rect, "x", bounds.min()[NR::X]); - sp_repr_set_svg_double(rect, "y", bounds.min()[NR::Y]); + + NR::Point min = bounds.min() * parent_transform.inverse(); + NR::Point max = bounds.max() * parent_transform.inverse(); + + sp_repr_set_svg_double(rect, "width", max[NR::X] - min[NR::X]); + sp_repr_set_svg_double(rect, "height", max[NR::Y] - min[NR::Y]); + sp_repr_set_svg_double(rect, "x", min[NR::X]); + sp_repr_set_svg_double(rect, "y", min[NR::Y]); // restore parent and position SP_OBJECT_REPR (parent)->appendChild(rect); rect->setPosition(pos > 0 ? pos : 0); - SPItem *rectangle = (SPItem *) SP_DT_DOCUMENT (desktop)->getObjectByRepr(rect); + SPItem *rectangle = (SPItem *) sp_desktop_document (desktop)->getObjectByRepr(rect); Inkscape::GC::release(rect); @@ -1994,7 +2287,8 @@ sp_selection_tile(bool apply) g_slist_free (items); - sp_document_done (document); + sp_document_done (doc, SP_VERB_EDIT_TILE, + _("Objects to pattern")); } void @@ -2004,9 +2298,10 @@ sp_selection_untile() if (desktop == NULL) return; - SPDocument *document = SP_DT_DOCUMENT(desktop); + SPDocument *doc = sp_desktop_document(desktop); + Inkscape::XML::Document *xml_doc = sp_document_repr_doc(doc); - Inkscape::Selection *selection = SP_DT_SELECTION(desktop); + Inkscape::Selection *selection = sp_desktop_selection(desktop); // check if something is selected if (selection->isEmpty()) { @@ -2026,7 +2321,7 @@ sp_selection_untile() SPStyle *style = SP_OBJECT_STYLE (item); - if (!style || style->fill.type != SP_PAINT_TYPE_PAINTSERVER) + if (!style || style->fill.type != SP_PAINT_TYPE_PAINTSERVER) continue; SPObject *server = SP_OBJECT_STYLE_FILL_SERVER(item); @@ -2042,14 +2337,14 @@ sp_selection_untile() 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 + // 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); @@ -2065,11 +2360,79 @@ sp_selection_untile() if (!did) { desktop->messageStack()->flash(Inkscape::ERROR_MESSAGE, _("No pattern fills in the selection.")); } else { - sp_document_done(SP_DT_DOCUMENT(desktop)); + 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) +{ + if (selection->isEmpty()) { + return; + } + + const GSList * reprlst = selection->reprList(); + bool filename_search = TRUE; + bool xdpi_search = TRUE; + bool ydpi_search = TRUE; + + for(; reprlst != NULL && + filename_search && + xdpi_search && + ydpi_search; + reprlst = reprlst->next) { + const gchar * dpi_string; + Inkscape::XML::Node * repr = (Inkscape::XML::Node *)reprlst->data; + + if (filename_search) { + *filename = repr->attribute("inkscape:export-filename"); + if (*filename != NULL) + filename_search = FALSE; + } + + if (xdpi_search) { + dpi_string = NULL; + dpi_string = repr->attribute("inkscape:export-xdpi"); + if (dpi_string != NULL) { + *xdpi = atof(dpi_string); + xdpi_search = FALSE; + } + } + + if (ydpi_search) { + dpi_string = NULL; + dpi_string = repr->attribute("inkscape:export-ydpi"); + if (dpi_string != NULL) { + *ydpi = atof(dpi_string); + ydpi_search = FALSE; + } + } + } +} + +void +sp_document_get_export_hints (SPDocument * doc, const char **filename, float *xdpi, float *ydpi) +{ + Inkscape::XML::Node * repr = sp_document_repr_root(doc); + const gchar * dpi_string; + + *filename = repr->attribute("inkscape:export-filename"); + + dpi_string = NULL; + dpi_string = repr->attribute("inkscape:export-xdpi"); + if (dpi_string != NULL) { + *xdpi = atof(dpi_string); + } + + dpi_string = NULL; + dpi_string = repr->attribute("inkscape:export-ydpi"); + if (dpi_string != NULL) { + *ydpi = atof(dpi_string); + } +} + void sp_selection_create_bitmap_copy () { @@ -2077,9 +2440,10 @@ sp_selection_create_bitmap_copy () if (desktop == NULL) return; - SPDocument *document = SP_DT_DOCUMENT(desktop); + SPDocument *document = sp_desktop_document(desktop); + Inkscape::XML::Document *xml_doc = sp_document_repr_doc(document); - Inkscape::Selection *selection = SP_DT_SELECTION(desktop); + Inkscape::Selection *selection = sp_desktop_selection(desktop); // check if something is selected if (selection->isEmpty()) { @@ -2105,7 +2469,7 @@ sp_selection_create_bitmap_copy () // multiple times, and this is done so that they don't clash) GTimeVal cu; g_get_current_time (&cu); - guint current = (int) (cu.tv_sec * 1000000 + cu.tv_usec) % 1024; + guint current = (int) (cu.tv_sec * 1000000 + cu.tv_usec) % 1024; // Create the filename gchar *filename = g_strdup_printf ("%s-%s-%u.png", document->name, SP_OBJECT_REPR(items->data)->attribute("id"), current); @@ -2125,18 +2489,35 @@ sp_selection_create_bitmap_copy () // Calculate resolution double res; int const prefs_res = prefs_get_int_attribute ("options.createbitmap", "resolution", 0); + int const prefs_min = prefs_get_int_attribute ("options.createbitmap", "minsize", 0); if (0 < prefs_res) { // If it's given explicitly in prefs, take it res = prefs_res; + } else if (0 < prefs_min) { + // If minsize is given, look up minimum bitmap size (default 250 pixels) and calculate resolution from it + res = PX_PER_IN * prefs_min / MIN ((bbox.x1 - bbox.x0), (bbox.y1 - bbox.y0)); } else { - // Otherwise look up minimum bitmap size (default 250 pixels) and calculate resolution from it - int const prefs_min = prefs_get_int_attribute ("options.createbitmap", "minsize", 250); - res = prefs_min / MIN ((bbox.x1 - bbox.x0), (bbox.y1 - bbox.y0)); + float hint_xdpi = 0, hint_ydpi = 0; + const char *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) { + res = hint_xdpi; + } else { + // take resolution hint from the document + sp_document_get_export_hints (document, &hint_filename, &hint_xdpi, &hint_ydpi); + if (hint_xdpi != 0) { + res = hint_xdpi; + } else { + // if all else fails, take the default 90 dpi + res = PX_PER_IN; + } + } } // The width and height of the bitmap in pixels - unsigned width = (unsigned) floor ((bbox.x1 - bbox.x0) * res); - unsigned height =(unsigned) floor ((bbox.y1 - bbox.y0) * res); + 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; @@ -2164,12 +2545,20 @@ sp_selection_create_bitmap_copy () // 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 t = NR::scale (1/res, -1/res) * NR::translate (bbox.x0, bbox.y1) * eek.inverse(); + 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 + 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, bbox.x0, bbox.y0, bbox.x1, bbox.y1, - width, height, + width, height, res, res, (guint32) 0xffffff00, NULL, NULL, true, /*bool force_overwrite,*/ @@ -2187,22 +2576,26 @@ sp_selection_create_bitmap_copy () 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); - sp_repr_set_svg_double(repr, "width", gdk_pixbuf_get_width(pb)); - sp_repr_set_svg_double(repr, "height", gdk_pixbuf_get_height(pb)); + if (res == PX_PER_IN) { // for default 90 dpi, snap it to pixel grid + sp_repr_set_svg_double(repr, "width", width); + sp_repr_set_svg_double(repr, "height", height); + } else { + sp_repr_set_svg_double(repr, "width", (bbox.x1 - bbox.x0)); + sp_repr_set_svg_double(repr, "height", (bbox.y1 - bbox.y0)); + } // 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); - // move to the saved position + // move to the saved position repr->setPosition(pos > 0 ? pos + 1 : 1); // Set selection to the new image @@ -2214,13 +2607,335 @@ sp_selection_create_bitmap_copy () gdk_pixbuf_unref (pb); // Complete undoable transaction - sp_document_done (document); + sp_document_done (document, SP_VERB_SELECTION_CREATE_BITMAP, + _("Create bitmap")); } g_free (filename); g_free (filepath); } +/** + * \brief sp_selection_set_mask + * + * This function 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) +{ + 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 + bool is_empty = selection->isEmpty(); + if ( apply_to_layer && is_empty) { + desktop->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("Select object(s) to create clippath or mask from.")); + return; + } else if (!apply_to_layer && ( is_empty || NULL == selection->itemList()->next )) { + desktop->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("Select mask object and object(s) to apply clippath or mask to.")); + return; + } + + // 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 *mask_items = NULL; + GSList *apply_to_items = NULL; + 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(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); + } + } + } 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(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); + } + } else { + GSList *i = NULL; + for (i = items; NULL != i->next; i = i->next) { + apply_to_items = g_slist_prepend (apply_to_items, i->data); + } + + 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); + } + } + + g_slist_free (items); + items = NULL; + + gchar const* attributeName = apply_clip_path ? "clip-path" : "mask"; + for (GSList *i = apply_to_items; NULL != i; i = i->next) { + SPItem *item = reinterpret_cast(i->data); + // inverted object transform should be applied to a mask object, + // as mask is calculated in user space (after applying transform) + NR::Matrix maskTransform (item->transform.inverse()); + + 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(mask_item->data)->duplicate(xml_doc); + mask_items_dup = g_slist_prepend (mask_items_dup, dup); + } + + const gchar *mask_id = NULL; + if (apply_clip_path) { + mask_id = sp_clippath_create(mask_items_dup, doc, &maskTransform); + } else { + mask_id = sp_mask_create(mask_items_dup, doc, &maskTransform); + } + + g_slist_free (mask_items_dup); + mask_items_dup = NULL; + + SP_OBJECT_REPR(i->data)->setAttribute(attributeName, g_strdup_printf("url(#%s)", mask_id)); + } + + g_slist_free (mask_items); + g_slist_free (apply_to_items); + + for (GSList *i = items_to_delete; NULL != i; i = i->next) { + SPObject *item = SP_OBJECT (i->data); + item->deleteObject (false); + } + g_slist_free (items_to_delete); + + 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 *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 object(s) to remove clippath or mask from.")); + return; + } + + bool remove_original = prefs_get_int_attribute ("options.maskobject", "remove", 1); + sp_document_ensure_up_to_date(doc); + + gchar const* attributeName = apply_clip_path ? "clip-path" : "mask"; + std::map referenced_objects; + 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(i->data); + Inkscape::URIReference *uri_ref = NULL; + + if (apply_clip_path) { + uri_ref = item->clip_ref; + } else { + uri_ref = item->mask_ref; + } + + // collect distinct mask object (and associate with item to apply transform) + if (NULL != uri_ref && NULL != uri_ref->getObject()) { + referenced_objects[uri_ref->getObject()] = item; + } + } + + SP_OBJECT_REPR(i->data)->setAttribute(attributeName, "none"); + } + + // restore mask objects into a document + for ( std::map::iterator it = referenced_objects.begin() ; it != referenced_objects.end() ; ++it) { + SPObject *obj = (*it).first; + 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(xml_doc); + items_to_move = g_slist_prepend (items_to_move, copy); + } + + if (!obj->isReferenced()) { + // delete from defs if no other object references this mask + obj->deleteObject(false); + } + + // remember parent and position of the item to which the clippath/mask was applied + Inkscape::XML::Node *parent = SP_OBJECT_REPR((*it).second)->parent(); + gint pos = SP_OBJECT_REPR((*it).second)->position(); + + for (GSList *i = items_to_move; NULL != i; i = i->next) { + Inkscape::XML::Node *repr = (Inkscape::XML::Node *)i->data; + + // insert into parent, restore pos + parent->appendChild(repr); + repr->setPosition((pos + 1) > 0 ? (pos + 1) : 0); + + SPItem *mask_item = (SPItem *) sp_desktop_document (desktop)->getObjectByRepr(repr); + selection->add(repr); + + // transform mask, so it is moved the same spot where mask was applied + NR::Matrix transform (mask_item->transform); + transform *= (*it).second->transform; + sp_item_write_transform(mask_item, SP_OBJECT_REPR(mask_item), transform); + } + + g_slist_free (items_to_move); + } + + 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); + 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); + + desktop->selection->bounds(&bbox); + if (!nr_rect_d_test_empty(&bbox)) { + doc->fitToRect(bbox); + } +}; + +void fit_canvas_to_drawing(SPDocument *doc) { + g_return_if_fail(doc != NULL); + NRRect bbox(0, 0, 0, 0); + + 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); + + if (!nr_rect_d_test_empty(&bbox)) { + doc->fitToRect(bbox); + } +}; + +void fit_canvas_to_selection_or_drawing(SPDesktop *desktop) { + g_return_if_fail(desktop != NULL); + SPDocument *doc = sp_desktop_document(desktop); + + g_return_if_fail(doc != NULL); + g_return_if_fail(desktop->selection != NULL); + + if (desktop->selection->isEmpty()) { + fit_canvas_to_drawing(doc); + } else { + fit_canvas_to_selection(desktop); + } + + sp_document_done(doc, SP_VERB_FIT_CANVAS_TO_DRAWING, + _("Fit page to selection")); +}; + +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 { + root = dt->currentRoot(); + } + + 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: