X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fui%2Fclipboard.cpp;h=d405afb8f6ec9b33ce237247f37e1c82e9fa7924;hb=9dc68827cbd515262ecb8d5ae8547d9e82c72e00;hp=17dabed82f2b256dbae1675acb5ba78074e608a0;hpb=c78c35019180c391926bce7d8a000490452743b3;p=inkscape.git diff --git a/src/ui/clipboard.cpp b/src/ui/clipboard.cpp index 17dabed82..d405afb8f 100644 --- a/src/ui/clipboard.cpp +++ b/src/ui/clipboard.cpp @@ -3,9 +3,12 @@ */ /* Authors: * Krzysztof Kosiński + * Jon A. Cruz * Incorporates some code from selection-chemistry.cpp, see that file for more credits. + * Abhishek Sharma * * Copyright (C) 2008 authors + * Copyright (C) 2010 Jon A. Cruz * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -44,6 +47,9 @@ #include "extension/output.h" #include "selection-chemistry.h" #include "libnr/nr-rect.h" +#include "libnr/nr-convert2geom.h" +#include <2geom/rect.h> +#include <2geom/transforms.h> #include "box3d.h" #include "gradient-drag.h" #include "sp-item.h" @@ -66,16 +72,16 @@ #include "svg/svg.h" // for sp_svg_transform_write, used in _copySelection #include "svg/css-ostringstream.h" // used in _parseColor #include "file.h" // for file_import, used in _pasteImage -#include "prefs-utils.h" // for prefs_get_string_attribute, used in _pasteImage #include "text-context.h" #include "text-editing.h" #include "tools-switch.h" -#include "libnr/n-art-bpath-2geom.h" #include "path-chemistry.h" #include "id-clash.h" #include "unit-constants.h" #include "helper/png-write.h" #include "svg/svg-color.h" +#include "sp-namedview.h" +#include "snap.h" /// @brief Made up mimetype to represent Gdk::Pixbuf clipboard contents #define CLIPBOARD_GDK_PIXBUF_TARGET "image/x-gdk-pixbuf" @@ -101,14 +107,14 @@ namespace UI { */ class ClipboardManagerImpl : public ClipboardManager { public: - virtual void copy(); + virtual void copy(SPDesktop *desktop); virtual void copyPathParameter(Inkscape::LivePathEffect::PathParam *); - virtual bool paste(bool in_place); - virtual bool pasteStyle(); - virtual bool pasteSize(bool, bool, bool); - virtual bool pastePathEffect(); - virtual Glib::ustring getPathParameter(); - virtual Glib::ustring getShapeOrTextObjectId(); + virtual bool paste(SPDesktop *desktop, bool in_place); + virtual bool pasteStyle(SPDesktop *desktop); + virtual bool pasteSize(SPDesktop *desktop, bool separately, bool apply_x, bool apply_y); + virtual bool pastePathEffect(SPDesktop *desktop); + virtual Glib::ustring getPathParameter(SPDesktop* desktop); + virtual Glib::ustring getShapeOrTextObjectId(SPDesktop *desktop); virtual const gchar *getFirstObjectID(); ClipboardManagerImpl(); @@ -122,10 +128,10 @@ private: void _copyTextPath(SPTextPath *); Inkscape::XML::Node *_copyNode(Inkscape::XML::Node *, Inkscape::XML::Document *, Inkscape::XML::Node *); - void _pasteDocument(SPDocument *, bool in_place); - void _pasteDefs(SPDocument *); - bool _pasteImage(); - bool _pasteText(); + void _pasteDocument(SPDesktop *desktop, SPDocument *clipdoc, bool in_place); + void _pasteDefs(SPDesktop *desktop, SPDocument *clipdoc); + bool _pasteImage(SPDocument *doc); + bool _pasteText(SPDesktop *desktop); SPCSSAttr *_parseColor(const Glib::ustring &); void _applyPathEffect(SPItem *, gchar const *); SPDocument *_retrieveClipboard(Glib::ustring = ""); @@ -138,12 +144,14 @@ private: void _createInternalClipboard(); void _discardInternalClipboard(); Inkscape::XML::Node *_createClipNode(); - NR::scale _getScale(Geom::Point &, Geom::Point &, NR::Rect &, bool, bool); + Geom::Scale _getScale(SPDesktop *desktop, Geom::Point const &min, Geom::Point const &max, Geom::Rect const &obj_rect, bool apply_x, bool apply_y); Glib::ustring _getBestTarget(); void _setClipboardTargets(); void _setClipboardColor(guint32); void _userWarn(SPDesktop *, char const *); + void _inkscape_wait_for_targets(std::list &); + // private properites SPDocument *_clipboardSPDoc; ///< Document that stores the clipboard until someone requests it Inkscape::XML::Node *_defs; ///< Reference to the clipboard document's defs node @@ -151,6 +159,10 @@ private: Inkscape::XML::Node *_clipnode; ///< The node that holds extra information Inkscape::XML::Document *_doc; ///< Reference to the clipboard's Inkscape::XML::Document + // we need a way to copy plain text AND remember its style; + // the standard _clipnode is only available in an SVG tree, hence this special storage + SPCSSAttr *_text_style; ///< Style copied along with plain text fragment + Glib::RefPtr _clipboard; ///< Handle to the system wide clipboard - for convenience std::list _preferred_targets; ///< List of supported clipboard targets }; @@ -162,6 +174,7 @@ ClipboardManagerImpl::ClipboardManagerImpl() _root(NULL), _clipnode(NULL), _doc(NULL), + _text_style(NULL), _clipboard( Gtk::Clipboard::get() ) { // push supported clipboard targets, in order of preference @@ -182,17 +195,41 @@ ClipboardManagerImpl::~ClipboardManagerImpl() {} /** * @brief Copy selection contents to the clipboard */ -void ClipboardManagerImpl::copy() +void ClipboardManagerImpl::copy(SPDesktop *desktop) { - SPDesktop *desktop = SP_ACTIVE_DESKTOP; - if ( desktop == NULL ) return; + if ( desktop == NULL ) { + return; + } Inkscape::Selection *selection = sp_desktop_selection(desktop); // Special case for when the gradient dragger is active - copies gradient color if (desktop->event_context->get_drag()) { GrDrag *drag = desktop->event_context->get_drag(); if (drag->hasSelection()) { - _setClipboardColor(drag->getColor()); + guint32 col = drag->getColor(); + + // set the color as clipboard content (text in RRGGBBAA format) + _setClipboardColor(col); + + // create a style with this color on fill and opacity in master opacity, so it can be + // pasted on other stops or objects + if (_text_style) { + sp_repr_css_attr_unref(_text_style); + _text_style = NULL; + } + _text_style = sp_repr_css_attr_new(); + // print and set properties + gchar color_str[16]; + g_snprintf(color_str, 16, "#%06x", col >> 8); + sp_repr_css_set_property(_text_style, "fill", color_str); + float opacity = SP_RGBA32_A_F(col); + if (opacity > 1.0) { + opacity = 1.0; // safeguard + } + Inkscape::CSSOStringStream opcss; + opcss << opacity; + sp_repr_css_set_property(_text_style, "opacity", opcss.str().data()); + _discardInternalClipboard(); return; } @@ -206,14 +243,19 @@ void ClipboardManagerImpl::copy() } // Special case for when the text tool is active - if some text is selected, copy plain text, - // not the object that holds it + // not the object that holds it; also copy the style at cursor into if (tools_isactive(desktop, TOOLS_TEXT)) { + _discardInternalClipboard(); Glib::ustring selected_text = sp_text_get_selected_text(desktop->event_context); if (!selected_text.empty()) { _clipboard->set_text(selected_text); - _discardInternalClipboard(); - return; } + if (_text_style) { + sp_repr_css_attr_unref(_text_style); + _text_style = NULL; + } + _text_style = sp_text_get_style_at_cursor(desktop->event_context); + return; } if (selection->isEmpty()) { // check whether something is selected @@ -236,9 +278,13 @@ void ClipboardManagerImpl::copy() */ void ClipboardManagerImpl::copyPathParameter(Inkscape::LivePathEffect::PathParam *pp) { - if ( pp == NULL ) return; + if ( pp == NULL ) { + return; + } gchar *svgd = sp_svg_write_path( pp->get_pathvector() ); - if ( svgd == NULL || *svgd == '\0' ) return; + if ( svgd == NULL || *svgd == '\0' ) { + return; + } _discardInternalClipboard(); _createInternalClipboard(); @@ -257,23 +303,30 @@ void ClipboardManagerImpl::copyPathParameter(Inkscape::LivePathEffect::PathParam * @brief Paste from the system clipboard into the active desktop * @param in_place Whether to put the contents where they were when copied */ -bool ClipboardManagerImpl::paste(bool in_place) +bool ClipboardManagerImpl::paste(SPDesktop *desktop, bool in_place) { // do any checking whether we really are able to paste before requesting the contents - SPDesktop *desktop = SP_ACTIVE_DESKTOP; - if ( desktop == NULL ) return false; - if ( Inkscape::have_viable_layer(desktop, desktop->messageStack()) == false ) return false; + if ( desktop == NULL ) { + return false; + } + if ( Inkscape::have_viable_layer(desktop, desktop->messageStack()) == false ) { + return false; + } Glib::ustring target = _getBestTarget(); - // Special cases of clipboard content handling go here 00ff00 + // Special cases of clipboard content handling go here // Note that target priority is determined in _getBestTarget. // TODO: Handle x-special/gnome-copied-files and text/uri-list to support pasting files // if there is an image on the clipboard, paste it - if ( target == CLIPBOARD_GDK_PIXBUF_TARGET ) return _pasteImage(); + if ( target == CLIPBOARD_GDK_PIXBUF_TARGET ) { + return _pasteImage(desktop->doc()); + } // if there's only text, paste it into a selected text object or create a new one - if ( target == CLIPBOARD_TEXT_TARGET ) return _pasteText(); + if ( target == CLIPBOARD_TEXT_TARGET ) { + return _pasteText(desktop); + } // otherwise, use the import extensions SPDocument *tempdoc = _retrieveClipboard(target); @@ -282,8 +335,8 @@ bool ClipboardManagerImpl::paste(bool in_place) return false; } - _pasteDocument(tempdoc, in_place); - sp_document_unref(tempdoc); + _pasteDocument(desktop, tempdoc, in_place); + tempdoc->doUnref(); return true; } @@ -298,22 +351,23 @@ const gchar *ClipboardManagerImpl::getFirstObjectID() return NULL; } - Inkscape::XML::Node - *root = sp_document_repr_root(tempdoc); + Inkscape::XML::Node *root = tempdoc->getReprRoot(); - if (!root) + if (!root) { return NULL; + } Inkscape::XML::Node *ch = sp_repr_children(root); - while (ch != NULL && + while (ch != NULL && strcmp(ch->name(), "svg:g") && strcmp(ch->name(), "svg:path") && strcmp(ch->name(), "svg:use") && strcmp(ch->name(), "svg:text") && strcmp(ch->name(), "svg:image") && strcmp(ch->name(), "svg:rect") - ) + ) { ch = ch->next(); + } if (ch) { return ch->attribute("id"); @@ -326,10 +380,11 @@ const gchar *ClipboardManagerImpl::getFirstObjectID() /** * @brief Implements the Paste Style action */ -bool ClipboardManagerImpl::pasteStyle() +bool ClipboardManagerImpl::pasteStyle(SPDesktop *desktop) { - SPDesktop *desktop = SP_ACTIVE_DESKTOP; - if (desktop == NULL) return false; + if (desktop == NULL) { + return false; + } // check whether something is selected Inkscape::Selection *selection = sp_desktop_selection(desktop); @@ -340,18 +395,23 @@ bool ClipboardManagerImpl::pasteStyle() SPDocument *tempdoc = _retrieveClipboard("image/x-inkscape-svg"); if ( tempdoc == NULL ) { - _userWarn(desktop, _("No style on the clipboard.")); - return false; + // no document, but we can try _text_style + if (_text_style) { + sp_desktop_set_style(desktop, _text_style); + return true; + } else { + _userWarn(desktop, _("No style on the clipboard.")); + return false; + } } - Inkscape::XML::Node - *root = sp_document_repr_root(tempdoc), - *clipnode = sp_repr_lookup_name(root, "inkscape:clipboard", 1); + Inkscape::XML::Node *root = tempdoc->getReprRoot(); + Inkscape::XML::Node *clipnode = sp_repr_lookup_name(root, "inkscape:clipboard", 1); bool pasted = false; if (clipnode) { - _pasteDefs(tempdoc); + _pasteDefs(desktop, tempdoc); SPCSSAttr *style = sp_repr_css_attr(clipnode, "style"); sp_desktop_set_style(desktop, style); pasted = true; @@ -360,7 +420,7 @@ bool ClipboardManagerImpl::pasteStyle() _userWarn(desktop, _("No style on the clipboard.")); } - sp_document_unref(tempdoc); + tempdoc->doUnref(); return pasted; } @@ -371,12 +431,15 @@ bool ClipboardManagerImpl::pasteStyle() * @param apply_x Whether to scale the width of objects / selection * @param apply_y Whether to scale the height of objects / selection */ -bool ClipboardManagerImpl::pasteSize(bool separately, bool apply_x, bool apply_y) +bool ClipboardManagerImpl::pasteSize(SPDesktop *desktop, bool separately, bool apply_x, bool apply_y) { - if(!apply_x && !apply_y) return false; // pointless parameters + if (!apply_x && !apply_y) { + return false; // pointless parameters + } - SPDesktop *desktop = SP_ACTIVE_DESKTOP; - if ( desktop == NULL ) return false; + if ( desktop == NULL ) { + return false; + } Inkscape::Selection *selection = sp_desktop_selection(desktop); if (selection->isEmpty()) { _userWarn(desktop, _("Select object(s) to paste size to.")); @@ -391,7 +454,7 @@ bool ClipboardManagerImpl::pasteSize(bool separately, bool apply_x, bool apply_y } // retrieve size ifomration from the clipboard - Inkscape::XML::Node *root = sp_document_repr_root(tempdoc); + Inkscape::XML::Node *root = tempdoc->getReprRoot(); Inkscape::XML::Node *clipnode = sp_repr_lookup_name(root, "inkscape:clipboard", 1); bool pasted = false; if (clipnode) { @@ -403,22 +466,24 @@ bool ClipboardManagerImpl::pasteSize(bool separately, bool apply_x, bool apply_y if (separately) { for (GSList *i = const_cast(selection->itemList()) ; i ; i = i->next) { SPItem *item = SP_ITEM(i->data); - NR::Maybe obj_size = sp_item_bbox_desktop(item); - if ( !obj_size || obj_size->isEmpty() ) continue; - sp_item_scale_rel(item, _getScale(min, max, *obj_size, apply_x, apply_y)); + Geom::OptRect obj_size = item->getBboxDesktop(); + if ( !obj_size ) { + continue; + } + sp_item_scale_rel(item, _getScale(desktop, min, max, *obj_size, apply_x, apply_y)); } } // resize the selection as a whole else { - NR::Maybe sel_size = selection->bounds(); - if ( sel_size && !sel_size->isEmpty() ) { + Geom::OptRect sel_size = selection->bounds(); + if ( sel_size ) { sp_selection_scale_relative(selection, sel_size->midpoint(), - _getScale(min, max, *sel_size, apply_x, apply_y)); + _getScale(desktop, min, max, *sel_size, apply_x, apply_y)); } } pasted = true; } - sp_document_unref(tempdoc); + tempdoc->doUnref(); return pasted; } @@ -426,14 +491,14 @@ bool ClipboardManagerImpl::pasteSize(bool separately, bool apply_x, bool apply_y /** * @brief Applies a path effect from the clipboard to the selected path */ -bool ClipboardManagerImpl::pastePathEffect() +bool ClipboardManagerImpl::pastePathEffect(SPDesktop *desktop) { /** @todo FIXME: pastePathEffect crashes when moving the path with the applied effect, segfaulting in fork_private_if_necessary(). */ - SPDesktop *desktop = SP_ACTIVE_DESKTOP; - if ( desktop == NULL ) + if ( desktop == NULL ) { return false; + } Inkscape::Selection *selection = sp_desktop_selection(desktop); if (selection && selection->isEmpty()) { @@ -443,16 +508,17 @@ bool ClipboardManagerImpl::pastePathEffect() SPDocument *tempdoc = _retrieveClipboard("image/x-inkscape-svg"); if ( tempdoc ) { - Inkscape::XML::Node *root = sp_document_repr_root(tempdoc); + Inkscape::XML::Node *root = tempdoc->getReprRoot(); Inkscape::XML::Node *clipnode = sp_repr_lookup_name(root, "inkscape:clipboard", 1); if ( clipnode ) { - gchar const *effect = clipnode->attribute("inkscape:path-effect"); - if ( effect ) { - _pasteDefs(tempdoc); + gchar const *effectstack = clipnode->attribute("inkscape:path-effect"); + if ( effectstack ) { + _pasteDefs(desktop, tempdoc); // make sure all selected items are converted to paths first (i.e. rectangles) - sp_selected_path_to_curves(false); - for (GSList *item = const_cast(selection->itemList()) ; item ; item = item->next) { - _applyPathEffect(reinterpret_cast(item->data), effect); + sp_selected_to_lpeitems(desktop); + for (GSList *itemptr = const_cast(selection->itemList()) ; itemptr ; itemptr = itemptr->next) { + SPItem *item = reinterpret_cast(itemptr->data); + _applyPathEffect(item, effectstack); } return true; @@ -470,19 +536,18 @@ bool ClipboardManagerImpl::pastePathEffect() * @brief Get LPE path data from the clipboard * @return The retrieved path data (contents of the d attribute), or "" if no path was found */ -Glib::ustring ClipboardManagerImpl::getPathParameter() +Glib::ustring ClipboardManagerImpl::getPathParameter(SPDesktop* desktop) { SPDocument *tempdoc = _retrieveClipboard(); // any target will do here if ( tempdoc == NULL ) { - _userWarn(SP_ACTIVE_DESKTOP, _("Nothing on the clipboard.")); + _userWarn(desktop, _("Nothing on the clipboard.")); return ""; } - Inkscape::XML::Node - *root = sp_document_repr_root(tempdoc), - *path = sp_repr_lookup_name(root, "svg:path", -1); // unlimited search depth + Inkscape::XML::Node *root = tempdoc->getReprRoot(); + Inkscape::XML::Node *path = sp_repr_lookup_name(root, "svg:path", -1); // unlimited search depth if ( path == NULL ) { - _userWarn(SP_ACTIVE_DESKTOP, _("Clipboard does not contain a path.")); - sp_document_unref(tempdoc); + _userWarn(desktop, _("Clipboard does not contain a path.")); + tempdoc->doUnref(); return ""; } gchar const *svgd = path->attribute("d"); @@ -494,22 +559,23 @@ Glib::ustring ClipboardManagerImpl::getPathParameter() * @brief Get object id of a shape or text item from the clipboard * @return The retrieved id string (contents of the id attribute), or "" if no shape or text item was found */ -Glib::ustring ClipboardManagerImpl::getShapeOrTextObjectId() +Glib::ustring ClipboardManagerImpl::getShapeOrTextObjectId(SPDesktop *desktop) { SPDocument *tempdoc = _retrieveClipboard(); // any target will do here if ( tempdoc == NULL ) { - _userWarn(SP_ACTIVE_DESKTOP, _("Nothing on the clipboard.")); + _userWarn(desktop, _("Nothing on the clipboard.")); return ""; } - Inkscape::XML::Node *root = sp_document_repr_root(tempdoc); + Inkscape::XML::Node *root = tempdoc->getReprRoot(); Inkscape::XML::Node *repr = sp_repr_lookup_name(root, "svg:path", -1); // unlimited search depth - if ( repr == NULL ) + if ( repr == NULL ) { repr = sp_repr_lookup_name(root, "svg:text", -1); + } if ( repr == NULL ) { - _userWarn(SP_ACTIVE_DESKTOP, _("Clipboard does not contain a path.")); - sp_document_unref(tempdoc); + _userWarn(desktop, _("Clipboard does not contain a path.")); + tempdoc->doUnref(); return ""; } gchar const *svgd = repr->attribute("id"); @@ -533,7 +599,9 @@ void ClipboardManagerImpl::_copySelection(Inkscape::Selection *selection) sorted_items = g_slist_sort(sorted_items, (GCompareFunc) sp_object_compare_position); for (GSList *i = sorted_items ; i ; i = i->next) { - if (!SP_IS_ITEM(i->data)) continue; + if (!SP_IS_ITEM(i->data)) { + continue; + } Inkscape::XML::Node *obj = SP_OBJECT_REPR(i->data); Inkscape::XML::Node *obj_copy = _copyNode(obj, _doc, _root); @@ -545,14 +613,14 @@ void ClipboardManagerImpl::_copySelection(Inkscape::Selection *selection) // write the complete accumulated transform passed to us // (we're dealing with unattached representations, so we write to their attributes // instead of using sp_item_set_transform) - gchar *transform_str = sp_svg_transform_write(from_2geom(sp_item_i2doc_affine(SP_ITEM(i->data)))); + gchar *transform_str = sp_svg_transform_write(SP_ITEM(i->data)->i2doc_affine()); obj_copy->setAttribute("transform", transform_str); g_free(transform_str); } // copy style for Paste Style action if (sorted_items) { - if(SP_IS_ITEM(sorted_items->data)) { + if (SP_IS_ITEM(sorted_items->data)) { SPCSSAttr *style = take_style_from_item((SPItem *) sorted_items->data); sp_repr_css_set(_clipnode, style, "style"); sp_repr_css_attr_unref(style); @@ -567,10 +635,10 @@ void ClipboardManagerImpl::_copySelection(Inkscape::Selection *selection) } } - NR::Maybe size = selection->bounds(); + Geom::OptRect size = selection->bounds(); if (size) { - sp_repr_set_point(_clipnode, "min", size->min().to_2geom()); - sp_repr_set_point(_clipnode, "max", size->max().to_2geom()); + sp_repr_set_point(_clipnode, "min", size->min()); + sp_repr_set_point(_clipnode, "max", size->max()); } g_slist_free(sorted_items); @@ -583,21 +651,25 @@ void ClipboardManagerImpl::_copySelection(Inkscape::Selection *selection) void ClipboardManagerImpl::_copyUsedDefs(SPItem *item) { // copy fill and stroke styles (patterns and gradients) - SPStyle *style = SP_OBJECT_STYLE(item); + SPStyle *style = item->style; if (style && (style->fill.isPaintserver())) { - SPObject *server = SP_OBJECT_STYLE_FILL_SERVER(item); - if (SP_IS_LINEARGRADIENT(server) || SP_IS_RADIALGRADIENT(server)) + SPPaintServer *server = item->style->getFillPaintServer(); + if ( SP_IS_LINEARGRADIENT(server) || SP_IS_RADIALGRADIENT(server) ) { _copyGradient(SP_GRADIENT(server)); - if (SP_IS_PATTERN(server)) + } + if ( SP_IS_PATTERN(server) ) { _copyPattern(SP_PATTERN(server)); + } } if (style && (style->stroke.isPaintserver())) { - SPObject *server = SP_OBJECT_STYLE_STROKE_SERVER(item); - if (SP_IS_LINEARGRADIENT(server) || SP_IS_RADIALGRADIENT(server)) + SPPaintServer *server = item->style->getStrokePaintServer(); + if ( SP_IS_LINEARGRADIENT(server) || SP_IS_RADIALGRADIENT(server) ) { _copyGradient(SP_GRADIENT(server)); - if (SP_IS_PATTERN(server)) + } + if ( SP_IS_PATTERN(server) ) { _copyPattern(SP_PATTERN(server)); + } } // For shapes, copy all of the shape's markers @@ -616,8 +688,9 @@ void ClipboardManagerImpl::_copyUsedDefs(SPItem *item) for (PathEffectList::iterator it = lpeitem->path_effect_list->begin(); it != lpeitem->path_effect_list->end(); ++it) { LivePathEffectObject *lpeobj = (*it)->lpeobject; - if (lpeobj) + if (lpeobj) { _copyNode(SP_OBJECT_REPR(SP_OBJECT(lpeobj)), _doc, _defs); + } } } } @@ -627,7 +700,7 @@ void ClipboardManagerImpl::_copyUsedDefs(SPItem *item) } // Copy text paths if (SP_IS_TEXT_TEXTPATH(item)) { - _copyTextPath(SP_TEXTPATH(sp_object_first_child(SP_OBJECT(item)))); + _copyTextPath(SP_TEXTPATH(item->firstChild())); } // Copy clipping objects if (item->clip_ref->getObject()) { @@ -639,8 +712,9 @@ void ClipboardManagerImpl::_copyUsedDefs(SPItem *item) _copyNode(SP_OBJECT_REPR(mask), _doc, _defs); // 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)) + if (SP_IS_ITEM(o)) { _copyUsedDefs(SP_ITEM(o)); + } } } // Copy filters @@ -653,8 +727,9 @@ void ClipboardManagerImpl::_copyUsedDefs(SPItem *item) // recurse for (SPObject *o = SP_OBJECT(item)->children ; o != NULL ; o = o->next) { - if (SP_IS_ITEM(o)) + if (SP_IS_ITEM(o)) { _copyUsedDefs(SP_ITEM(o)); + } } } @@ -682,8 +757,10 @@ void ClipboardManagerImpl::_copyPattern(SPPattern *pattern) _copyNode(SP_OBJECT_REPR(pattern), _doc, _defs); // items in the pattern may also use gradients and other patterns, so recurse - for (SPObject *child = sp_object_first_child(SP_OBJECT(pattern)) ; child != NULL ; child = SP_OBJECT_NEXT(child) ) { - if (!SP_IS_ITEM (child)) continue; + for ( SPObject *child = pattern->firstChild() ; child ; child = child->getNext() ) { + if (!SP_IS_ITEM (child)) { + continue; + } _copyUsedDefs(SP_ITEM(child)); } pattern = pattern->ref->getObject(); @@ -697,11 +774,15 @@ void ClipboardManagerImpl::_copyPattern(SPPattern *pattern) void ClipboardManagerImpl::_copyTextPath(SPTextPath *tp) { SPItem *path = sp_textpath_get_path_item(tp); - if(!path) return; + if (!path) { + return; + } Inkscape::XML::Node *path_node = SP_OBJECT_REPR(path); // Do not copy the text path to defs if it's already copied - if(sp_repr_lookup_child(_root, "id", path_node->attribute("id"))) return; + if (sp_repr_lookup_child(_root, "id", path_node->attribute("id"))) { + return; + } _copyNode(path_node, _doc, _defs); } @@ -728,57 +809,73 @@ Inkscape::XML::Node *ClipboardManagerImpl::_copyNode(Inkscape::XML::Node *node, * @param in_place Whether to paste the selection where it was when copied * @pre @c clipdoc is not empty and items can be added to the current layer */ -void ClipboardManagerImpl::_pasteDocument(SPDocument *clipdoc, bool in_place) +void ClipboardManagerImpl::_pasteDocument(SPDesktop *desktop, SPDocument *clipdoc, bool in_place) { - SPDesktop *desktop = SP_ACTIVE_DESKTOP; SPDocument *target_document = sp_desktop_document(desktop); - Inkscape::XML::Node - *root = sp_document_repr_root(clipdoc), - *target_parent = SP_OBJECT_REPR(desktop->currentLayer()); - Inkscape::XML::Document *target_xmldoc = sp_document_repr_doc(target_document); + Inkscape::XML::Node *root = clipdoc->getReprRoot(); + Inkscape::XML::Node *target_parent = SP_OBJECT_REPR(desktop->currentLayer()); + Inkscape::XML::Document *target_xmldoc = target_document->getReprDoc(); // copy definitions - _pasteDefs(clipdoc); + _pasteDefs(desktop, clipdoc); // copy objects GSList *pasted_objects = NULL; for (Inkscape::XML::Node *obj = root->firstChild() ; obj ; obj = obj->next()) { // Don't copy metadata, defs, named views and internal clipboard contents to the document - if (!strcmp(obj->name(), "svg:defs")) continue; - if (!strcmp(obj->name(), "svg:metadata")) continue; - if (!strcmp(obj->name(), "sodipodi:namedview")) continue; - if (!strcmp(obj->name(), "inkscape:clipboard")) continue; + if (!strcmp(obj->name(), "svg:defs")) { + continue; + } + if (!strcmp(obj->name(), "svg:metadata")) { + continue; + } + if (!strcmp(obj->name(), "sodipodi:namedview")) { + continue; + } + if (!strcmp(obj->name(), "inkscape:clipboard")) { + continue; + } Inkscape::XML::Node *obj_copy = _copyNode(obj, target_xmldoc, target_parent); pasted_objects = g_slist_prepend(pasted_objects, (gpointer) obj_copy); } + // Change the selection to the freshly pasted objects Inkscape::Selection *selection = sp_desktop_selection(desktop); selection->setReprList(pasted_objects); - // move the selection to the right position - if(in_place) - { + // invers apply parent transform + Geom::Matrix doc2parent = SP_ITEM(desktop->currentLayer())->i2doc_affine().inverse(); + sp_selection_apply_affine(selection, desktop->dt2doc() * doc2parent * desktop->doc2dt(), true, false); + + // Update (among other things) all curves in paths, for bounds() to work + target_document->ensureUpToDate(); + + // move selection either to original position (in_place) or to mouse pointer + Geom::OptRect sel_bbox = selection->bounds(); + if (sel_bbox) { + // get offset of selection to original position of copied elements + Geom::Point pos_original; Inkscape::XML::Node *clipnode = sp_repr_lookup_name(root, "inkscape:clipboard", 1); if (clipnode) { Geom::Point min, max; sp_repr_get_point(clipnode, "min", &min); sp_repr_get_point(clipnode, "max", &max); - - // this formula was discovered empyrically - min[Geom::Y] += ((max[Geom::Y] - min[Geom::Y]) - sp_document_height(target_document)); - sp_selection_move_relative(selection, NR::Point(min)); + pos_original = Geom::Point(min[Geom::X], max[Geom::Y]); } - } - // copied from former sp_selection_paste in selection-chemistry.cpp - else { - sp_document_ensure_up_to_date(target_document); - NR::Maybe sel_size = selection->bounds(); + Geom::Point offset = pos_original - sel_bbox->corner(3); - NR::Point m( desktop->point() ); - if (sel_size) { - m -= sel_size->midpoint(); + if (!in_place) { + SnapManager &m = desktop->namedview->snap_manager; + m.setup(desktop); + sp_event_context_discard_delayed_snap_event(desktop->event_context); + + // get offset from mouse pointer to bbox center, snap to grid if enabled + Geom::Point mouse_offset = desktop->point() - sel_bbox->midpoint(); + offset = m.multipleOfGridPitch(mouse_offset - offset, sel_bbox->midpoint() + offset) + offset; + m.unSetup(); } - sp_selection_move_relative(selection, m); + + sp_selection_move_relative(selection, offset); } g_slist_free(pasted_objects); @@ -790,19 +887,17 @@ void ClipboardManagerImpl::_pasteDocument(SPDocument *clipdoc, bool in_place) * @param clipdoc The document to paste * @pre @c clipdoc != NULL and pasting into the active document is possible */ -void ClipboardManagerImpl::_pasteDefs(SPDocument *clipdoc) +void ClipboardManagerImpl::_pasteDefs(SPDesktop *desktop, SPDocument *clipdoc) { // boilerplate vars copied from _pasteDocument - SPDesktop *desktop = SP_ACTIVE_DESKTOP; SPDocument *target_document = sp_desktop_document(desktop); - Inkscape::XML::Node - *root = sp_document_repr_root(clipdoc), - *defs = sp_repr_lookup_name(root, "svg:defs", 1), - *target_defs = SP_OBJECT_REPR(SP_DOCUMENT_DEFS(target_document)); - Inkscape::XML::Document *target_xmldoc = sp_document_repr_doc(target_document); + Inkscape::XML::Node *root = clipdoc->getReprRoot(); + Inkscape::XML::Node *defs = sp_repr_lookup_name(root, "svg:defs", 1); + Inkscape::XML::Node *target_defs = SP_OBJECT_REPR(SP_DOCUMENT_DEFS(target_document)); + Inkscape::XML::Document *target_xmldoc = target_document->getReprDoc(); prevent_id_clashes(clipdoc, target_document); - + for (Inkscape::XML::Node *def = defs->firstChild() ; def ; def = def->next()) { _copyNode(def, target_xmldoc, target_defs); } @@ -812,34 +907,38 @@ void ClipboardManagerImpl::_pasteDefs(SPDocument *clipdoc) /** * @brief Retrieve a bitmap image from the clipboard and paste it into the active document */ -bool ClipboardManagerImpl::_pasteImage() +bool ClipboardManagerImpl::_pasteImage(SPDocument *doc) { - SPDocument *doc = SP_ACTIVE_DOCUMENT; - if ( doc == NULL ) return false; + if ( doc == NULL ) { + return false; + } // retrieve image data Glib::RefPtr img = _clipboard->wait_for_image(); - if (!img) return false; - - // Very stupid hack: Write into a file, then import the file into the document. - // To avoid using tmpfile and POSIX file handles, make the filename based on current time. - // This wasn't my idea, I just copied this from selection-chemistry.cpp - // and just can't think of something saner at the moment. Pasting more than - // one image per second will overwrite the image. - // However, I don't think anyone is able to copy a _different_ image into inkscape - // in 1 second. - time_t rawtime; - char image_filename[128]; - gchar const *save_folder; - - time(&rawtime); - strftime(image_filename, 128, "inkscape_pasted_image_%Y%m%d_%H%M%S.png", localtime( &rawtime )); - save_folder = (gchar const *) prefs_get_string_attribute("dialogs.save_as", "path"); - - gchar *image_path = g_build_filename(save_folder, image_filename, NULL); - img->save(image_path, "png"); - file_import(doc, image_path, NULL); - g_free(image_path); + if (!img) { + return false; + } + + // TODO unify with interface.cpp's sp_ui_drag_data_received() + // AARGH stupid + Inkscape::Extension::DB::InputList o; + Inkscape::Extension::db.get_input_list(o); + Inkscape::Extension::DB::InputList::const_iterator i = o.begin(); + while (i != o.end() && strcmp( (*i)->get_mimetype(), "image/png" ) != 0) { + ++i; + } + Inkscape::Extension::Extension *png = *i; + bool save = (strcmp(png->get_param_optiongroup("link"), "embed") == 0); + png->set_param_optiongroup("link", "embed"); + png->set_gui(false); + + gchar *filename = g_build_filename( g_get_tmp_dir(), "inkscape-clipboard-import", NULL ); + img->save(filename, "png"); + file_import(doc, filename, png); + g_free(filename); + + png->set_param_optiongroup("link", save ? "embed" : "link"); + png->set_gui(true); return true; } @@ -847,14 +946,16 @@ bool ClipboardManagerImpl::_pasteImage() /** * @brief Paste text into the selected text object or create a new one to hold it */ -bool ClipboardManagerImpl::_pasteText() +bool ClipboardManagerImpl::_pasteText(SPDesktop *desktop) { - SPDesktop *desktop = SP_ACTIVE_DESKTOP; - if ( desktop == NULL ) return false; + if ( desktop == NULL ) { + return false; + } // if the text editing tool is active, paste the text into the active text object - if (tools_isactive(desktop, TOOLS_TEXT)) + if (tools_isactive(desktop, TOOLS_TEXT)) { return sp_text_paste_inline(desktop->event_context); + } // try to parse the text as a color and, if successful, apply it as the current style SPCSSAttr *css = _parseColor(_clipboard->wait_for_text()); @@ -874,32 +975,47 @@ bool ClipboardManagerImpl::_pasteText() */ SPCSSAttr *ClipboardManagerImpl::_parseColor(const Glib::ustring &text) { +// TODO reuse existing code instead of replicating here. Glib::ustring::size_type len = text.bytes(); char *str = const_cast(text.data()); bool attempt_alpha = false; - if ( !str || ( *str == '\0' ) ) return NULL; // this is OK due to boolean short-circuit + if ( !str || ( *str == '\0' ) ) { + return NULL; // this is OK due to boolean short-circuit + } // those conditionals guard against parsing e.g. the string "fab" as "fab000" // (incomplete color) and "45fab71" as "45fab710" (incomplete alpha) if ( *str == '#' ) { - if ( len < 7 ) return NULL; - if ( len >= 9 ) attempt_alpha = true; + if ( len < 7 ) { + return NULL; + } + if ( len >= 9 ) { + attempt_alpha = true; + } } else { - if ( len < 6 ) return NULL; - if ( len >= 8 ) attempt_alpha = true; + if ( len < 6 ) { + return NULL; + } + if ( len >= 8 ) { + attempt_alpha = true; + } } unsigned int color = 0, alpha = 0xff; // skip a leading #, if present - if ( *str == '#' ) ++str; + if ( *str == '#' ) { + ++str; + } // try to parse first 6 digits int res = sscanf(str, "%6x", &color); if ( res && ( res != EOF ) ) { if (attempt_alpha) {// try to parse alpha if there's enough characters sscanf(str + 6, "%2x", &alpha); - if ( !res || res == EOF ) alpha = 0xff; + if ( !res || res == EOF ) { + alpha = 0xff; + } } SPCSSAttr *color_css = sp_repr_css_attr_new(); @@ -910,7 +1026,9 @@ SPCSSAttr *ClipboardManagerImpl::_parseColor(const Glib::ustring &text) sp_repr_css_set_property(color_css, "fill", color_str); float opacity = static_cast(alpha)/static_cast(0xff); - if (opacity > 1.0) opacity = 1.0; // safeguard + if (opacity > 1.0) { + opacity = 1.0; // safeguard + } Inkscape::CSSOStringStream opcss; opcss << opacity; sp_repr_css_set_property(color_css, "fill-opacity", opcss.str().data()); @@ -923,19 +1041,32 @@ SPCSSAttr *ClipboardManagerImpl::_parseColor(const Glib::ustring &text) /** * @brief Applies a pasted path effect to a given item */ -void ClipboardManagerImpl::_applyPathEffect(SPItem *item, gchar const *effect) +void ClipboardManagerImpl::_applyPathEffect(SPItem *item, gchar const *effectstack) { - if ( item == NULL ) return; - if ( SP_IS_RECT(item) ) return; + if ( item == NULL ) { + return; + } + if ( SP_IS_RECT(item) ) { + return; + } if (SP_IS_LPE_ITEM(item)) { SPLPEItem *lpeitem = SP_LPE_ITEM(item); - SPObject *obj = sp_uri_reference_resolve(_clipboardSPDoc, effect); - if (!obj) return; - // if the effect is not used by anyone, we might as well take it - LivePathEffectObject *lpeobj = LIVEPATHEFFECT(obj)->fork_private_if_necessary(1); - sp_lpe_item_add_path_effect(lpeitem, lpeobj); + // for each effect in the stack, check if we need to fork it before adding it to the item + sp_lpe_item_fork_path_effects_if_necessary(lpeitem, 1); + + std::istringstream iss(effectstack); + std::string href; + while (std::getline(iss, href, ';')) + { + SPObject *obj = sp_uri_reference_resolve(_clipboardSPDoc, href.c_str()); + if (!obj) { + return; + } + LivePathEffectObject *lpeobj = LIVEPATHEFFECT(obj); + sp_lpe_item_add_path_effect(lpeitem, lpeobj); + } } } @@ -947,10 +1078,11 @@ void ClipboardManagerImpl::_applyPathEffect(SPItem *item, gchar const *effect) SPDocument *ClipboardManagerImpl::_retrieveClipboard(Glib::ustring required_target) { Glib::ustring best_target; - if ( required_target == "" ) + if ( required_target == "" ) { best_target = _getBestTarget(); - else + } else { best_target = required_target; + } if ( best_target == "" ) { return NULL; @@ -1000,15 +1132,18 @@ SPDocument *ClipboardManagerImpl::_retrieveClipboard(Glib::ustring required_targ // there is no specific plain SVG input extension, so if we can paste the Inkscape SVG format, // we use the image/svg+xml mimetype to look up the input extension - if(target == "image/x-inkscape-svg") + if (target == "image/x-inkscape-svg") { target = "image/svg+xml"; + } Inkscape::Extension::DB::InputList inlist; Inkscape::Extension::db.get_input_list(inlist); Inkscape::Extension::DB::InputList::const_iterator in = inlist.begin(); - for (; in != inlist.end() && target != (*in)->get_mimetype() ; ++in); - if ( in == inlist.end() ) + for (; in != inlist.end() && target != (*in)->get_mimetype() ; ++in) { + }; + if ( in == inlist.end() ) { return NULL; // this shouldn't happen unless _getBestTarget returns something bogus + } SPDocument *tempdoc = NULL; try { @@ -1032,14 +1167,23 @@ void ClipboardManagerImpl::_onGet(Gtk::SelectionData &sel, guint /*info*/) { g_assert( _clipboardSPDoc != NULL ); - const Glib::ustring target = sel.get_target(); - if(target == "") return; // this shouldn't happen + Glib::ustring target = sel.get_target(); + if (target == "") { + return; // this shouldn't happen + } + + if (target == CLIPBOARD_TEXT_TARGET) { + target = "image/x-inkscape-svg"; + } Inkscape::Extension::DB::OutputList outlist; Inkscape::Extension::db.get_output_list(outlist); Inkscape::Extension::DB::OutputList::const_iterator out = outlist.begin(); - for ( ; out != outlist.end() && target != (*out)->get_mimetype() ; ++out); - if ( out == outlist.end() && target != "image/png") return; // this also shouldn't happen + for ( ; out != outlist.end() && target != (*out)->get_mimetype() ; ++out) { + }; + if ( out == outlist.end() && target != "image/png") { + return; // this also shouldn't happen + } // FIXME: Temporary hack until we add support for memory output. // Save to a temporary file, read it back and then set the clipboard contents @@ -1049,29 +1193,32 @@ void ClipboardManagerImpl::_onGet(Gtk::SelectionData &sel, guint /*info*/) try { if (out == outlist.end() && target == "image/png") { - NRRect area; gdouble dpi = PX_PER_IN; guint32 bgcolor = 0x00000000; - area.x0 = SP_ROOT(_clipboardSPDoc->root)->x.computed; - area.y0 = SP_ROOT(_clipboardSPDoc->root)->y.computed; - area.x1 = area.x0 + sp_document_width (_clipboardSPDoc); - area.y1 = area.y0 + sp_document_height (_clipboardSPDoc); + Geom::Point origin (SP_ROOT(_clipboardSPDoc->root)->x.computed, SP_ROOT(_clipboardSPDoc->root)->y.computed); + Geom::Rect area = Geom::Rect(origin, origin + _clipboardSPDoc->getDimensions()); - unsigned long int width = (unsigned long int) ((area.x1 - area.x0) * dpi / PX_PER_IN + 0.5); - unsigned long int height = (unsigned long int) ((area.y1 - area.y0) * dpi / PX_PER_IN + 0.5); + unsigned long int width = (unsigned long int) (area.width() * dpi / PX_PER_IN + 0.5); + unsigned long int height = (unsigned long int) (area.height() * dpi / PX_PER_IN + 0.5); // read from namedview Inkscape::XML::Node *nv = sp_repr_lookup_name (_clipboardSPDoc->rroot, "sodipodi:namedview"); - if (nv && nv->attribute("pagecolor")) + if (nv && nv->attribute("pagecolor")) { bgcolor = sp_svg_read_color(nv->attribute("pagecolor"), 0xffffff00); - if (nv && nv->attribute("inkscape:pageopacity")) + } + if (nv && nv->attribute("inkscape:pageopacity")) { bgcolor |= SP_COLOR_F_TO_U(sp_repr_get_double_attribute (nv, "inkscape:pageopacity", 1.0)); + } - sp_export_png_file(_clipboardSPDoc, filename, area.x0, area.y0, area.x1, area.y1, width, height, dpi, dpi, bgcolor, NULL, NULL, true, NULL); + sp_export_png_file(_clipboardSPDoc, filename, area, width, height, dpi, dpi, bgcolor, NULL, NULL, true, NULL); } else { + if (!(*out)->loaded()) { + // Need to load the extension. + (*out)->set_state(Inkscape::Extension::Extension::STATE_LOADED); + } (*out)->save(_clipboardSPDoc, filename); } g_file_get_contents(filename, &data, &len, NULL); @@ -1104,15 +1251,21 @@ void ClipboardManagerImpl::_onClear() void ClipboardManagerImpl::_createInternalClipboard() { if ( _clipboardSPDoc == NULL ) { - _clipboardSPDoc = sp_document_new(NULL, false, true); + _clipboardSPDoc = SPDocument::createNewDoc(NULL, false, true); //g_assert( _clipboardSPDoc != NULL ); _defs = SP_OBJECT_REPR(SP_DOCUMENT_DEFS(_clipboardSPDoc)); - _doc = sp_document_repr_doc(_clipboardSPDoc); - _root = sp_document_repr_root(_clipboardSPDoc); + _doc = _clipboardSPDoc->getReprDoc(); + _root = _clipboardSPDoc->getReprRoot(); _clipnode = _doc->createElement("inkscape:clipboard"); _root->appendChild(_clipnode); Inkscape::GC::release(_clipnode); + + // once we create a SVG document, style will be stored in it, so flush _text_style + if (_text_style) { + sp_repr_css_attr_unref(_text_style); + _text_style = NULL; + } } } @@ -1123,7 +1276,7 @@ void ClipboardManagerImpl::_createInternalClipboard() void ClipboardManagerImpl::_discardInternalClipboard() { if ( _clipboardSPDoc != NULL ) { - sp_document_unref(_clipboardSPDoc); + _clipboardSPDoc->doUnref(); _clipboardSPDoc = NULL; _defs = NULL; _doc = NULL; @@ -1136,26 +1289,29 @@ void ClipboardManagerImpl::_discardInternalClipboard() /** * @brief Get the scale to resize an item, based on the command and desktop state */ -NR::scale ClipboardManagerImpl::_getScale(Geom::Point &min, Geom::Point &max, NR::Rect &obj_rect, bool apply_x, bool apply_y) +Geom::Scale ClipboardManagerImpl::_getScale(SPDesktop *desktop, Geom::Point const &min, Geom::Point const &max, Geom::Rect const &obj_rect, bool apply_x, bool apply_y) { - SPDesktop *desktop = SP_ACTIVE_DESKTOP; double scale_x = 1.0; double scale_y = 1.0; if (apply_x) { - scale_x = (max[Geom::X] - min[Geom::X]) / obj_rect.extent(NR::X); + scale_x = (max[Geom::X] - min[Geom::X]) / obj_rect[Geom::X].extent(); } if (apply_y) { - scale_y = (max[Geom::Y] - min[Geom::Y]) / obj_rect.extent(NR::Y); + scale_y = (max[Geom::Y] - min[Geom::Y]) / obj_rect[Geom::Y].extent(); } // If the "lock aspect ratio" button is pressed and we paste only a single coordinate, // resize the second one by the same ratio too if (desktop->isToolboxButtonActive("lock")) { - if (apply_x && !apply_y) scale_y = scale_x; - if (apply_y && !apply_x) scale_x = scale_y; + if (apply_x && !apply_y) { + scale_y = scale_x; + } + if (apply_y && !apply_x) { + scale_x = scale_y; + } } - return NR::scale(scale_x, scale_y); + return Geom::Scale(scale_x, scale_y); } @@ -1164,7 +1320,9 @@ NR::scale ClipboardManagerImpl::_getScale(Geom::Point &min, Geom::Point &max, NR */ Glib::ustring ClipboardManagerImpl::_getBestTarget() { - std::list targets = _clipboard->wait_for_targets(); + // GTKmm's wait_for_targets() is broken, see the comment in _inkscape_wait_for_targets() + std::list targets; // = _clipboard->wait_for_targets(); + _inkscape_wait_for_targets(targets); // clipboard target debugging snippet /* @@ -1174,36 +1332,43 @@ Glib::ustring ClipboardManagerImpl::_getBestTarget() g_debug("End clipboard targets\n"); //*/ - for(std::list::iterator i = _preferred_targets.begin() ; + for (std::list::iterator i = _preferred_targets.begin() ; i != _preferred_targets.end() ; ++i) { - if ( std::find(targets.begin(), targets.end(), *i) != targets.end() ) + if ( std::find(targets.begin(), targets.end(), *i) != targets.end() ) { return *i; + } } #ifdef WIN32 if (OpenClipboard(NULL)) { // If both bitmap and metafile are present, pick the one that was exported first. UINT format = EnumClipboardFormats(0); while (format) { - if (format == CF_ENHMETAFILE || format == CF_DIB || format == CF_BITMAP) + if (format == CF_ENHMETAFILE || format == CF_DIB || format == CF_BITMAP) { break; + } format = EnumClipboardFormats(format); } CloseClipboard(); - - if (format == CF_ENHMETAFILE) + + if (format == CF_ENHMETAFILE) { return CLIPBOARD_WIN32_EMF_TARGET; - if (format == CF_DIB || format == CF_BITMAP) + } + if (format == CF_DIB || format == CF_BITMAP) { return CLIPBOARD_GDK_PIXBUF_TARGET; + } } - - if (IsClipboardFormatAvailable(CF_ENHMETAFILE)) + + if (IsClipboardFormatAvailable(CF_ENHMETAFILE)) { return CLIPBOARD_WIN32_EMF_TARGET; + } #endif - if (_clipboard->wait_is_image_available()) + if (_clipboard->wait_is_image_available()) { return CLIPBOARD_GDK_PIXBUF_TARGET; - if (_clipboard->wait_is_text_available()) + } + if (_clipboard->wait_is_text_available()) { return CLIPBOARD_TEXT_TARGET; + } return ""; } @@ -1217,8 +1382,18 @@ void ClipboardManagerImpl::_setClipboardTargets() Inkscape::Extension::DB::OutputList outlist; Inkscape::Extension::db.get_output_list(outlist); std::list target_list; + bool plaintextSet = false; for (Inkscape::Extension::DB::OutputList::const_iterator out = outlist.begin() ; out != outlist.end() ; ++out) { - target_list.push_back(Gtk::TargetEntry( (*out)->get_mimetype() )); + if ( !(*out)->deactivated() ) { + Glib::ustring mime = (*out)->get_mimetype(); + if (mime != CLIPBOARD_TEXT_TARGET) { + if ( !plaintextSet && (mime.find("svg") == Glib::ustring::npos) ) { + target_list.push_back(Gtk::TargetEntry(CLIPBOARD_TEXT_TARGET)); + plaintextSet = true; + } + target_list.push_back(Gtk::TargetEntry(mime)); + } + } } // Add PNG export explicitly since there is no extension for this... @@ -1248,7 +1423,8 @@ void ClipboardManagerImpl::_setClipboardTargets() Inkscape::Extension::DB::OutputList outlist; Inkscape::Extension::db.get_output_list(outlist); Inkscape::Extension::DB::OutputList::const_iterator out = outlist.begin(); - for ( ; out != outlist.end() && target != (*out)->get_mimetype() ; ++out); + for ( ; out != outlist.end() && target != (*out)->get_mimetype() ; ++out) { + } if ( out != outlist.end() ) { // FIXME: Temporary hack until we add support for memory output. // Save to a temporary file, read it back and then set the clipboard contents @@ -1293,6 +1469,37 @@ void ClipboardManagerImpl::_userWarn(SPDesktop *desktop, char const *msg) } +// GTKMM's clipboard::wait_for_targets is buggy and might return bogus, see +// +// https://bugs.launchpad.net/inkscape/+bug/296778 +// http://mail.gnome.org/archives/gtk-devel-list/2009-June/msg00062.html +// +// for details. Until this has been fixed upstream we will use our own implementation +// of this method, as copied from /gtkmm-2.16.0/gtk/gtkmm/clipboard.cc. +void ClipboardManagerImpl::_inkscape_wait_for_targets(std::list &listTargets) +{ + //Get a newly-allocated array of atoms: + GdkAtom* targets = 0; + gint n_targets = 0; + gboolean test = gtk_clipboard_wait_for_targets( gtk_clipboard_get(GDK_SELECTION_CLIPBOARD), &targets, &n_targets ); + if (!test) { + n_targets = 0; //otherwise it will be -1. + } + + //Add the targets to the C++ container: + for (int i = 0; i < n_targets; i++) + { + //Convert the atom to a string: + gchar* const atom_name = gdk_atom_name(targets[i]); + + Glib::ustring target; + if (atom_name) { + target = Glib::ScopedPtr(atom_name).get(); //This frees the gchar*. + } + + listTargets.push_back(target); + } +} /* ####################################### ClipboardManager class @@ -1304,8 +1511,10 @@ ClipboardManager::ClipboardManager() {} ClipboardManager::~ClipboardManager() {} ClipboardManager *ClipboardManager::get() { - if ( _instance == NULL ) + if ( _instance == NULL ) { _instance = new ClipboardManagerImpl; + } + return _instance; } @@ -1321,4 +1530,4 @@ ClipboardManager *ClipboardManager::get() fill-column:99 End: */ -// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 : +// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :