![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/ui/clipboard.cpp b/src/ui/clipboard.cpp
index 7973f82af968442942037d24ce70409406857db6..f213160f4e2598bab6939b5f39fd40f112dbf948 100644 (file)
--- a/src/ui/clipboard.cpp
+++ b/src/ui/clipboard.cpp
* See the file COPYING for details.
*/
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-#include "path-prefix.h"
-
#include "ui/clipboard.h"
// TODO: reduce header bloat if possible
#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"
#include "sp-textpath.h"
#include "sp-rect.h"
#include "live_effects/lpeobject.h"
+#include "live_effects/lpeobject-reference.h"
#include "live_effects/parameter/path.h"
#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 "preferences.h" // for used in _pasteImage
#include "text-context.h"
#include "text-editing.h"
#include "tools-switch.h"
-#include "live_effects/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"
#define CLIPBOARD_TEXT_TARGET "text/plain"
+#ifdef WIN32
+#include <windows.h>
+// Clipboard Formats: http://msdn.microsoft.com/en-us/library/ms649013(VS.85).aspx
+// On Windows, most graphical applications can handle CF_DIB/CF_BITMAP and/or CF_ENHMETAFILE
+// GTK automatically presents an "image/bmp" target as CF_DIB/CF_BITMAP
+// Presenting "image/x-emf" as CF_ENHMETAFILE must be done by Inkscape ?
+#define CLIPBOARD_WIN32_EMF_TARGET "CF_ENHMETAFILE"
+#define CLIPBOARD_WIN32_EMF_MIME "image/x-emf"
+#endif
+
namespace Inkscape {
namespace UI {
virtual bool pastePathEffect();
virtual Glib::ustring getPathParameter();
virtual Glib::ustring getShapeOrTextObjectId();
+ virtual const gchar *getFirstObjectID();
ClipboardManagerImpl();
~ClipboardManagerImpl();
void _createInternalClipboard();
void _discardInternalClipboard();
Inkscape::XML::Node *_createClipNode();
- NR::scale _getScale(Geom::Point &, Geom::Point &, NR::Rect &, bool, bool);
+ Geom::Scale _getScale(Geom::Point const &, Geom::Point const &, Geom::Rect const &, bool, bool);
Glib::ustring _getBestTarget();
void _setClipboardTargets();
void _setClipboardColor(guint32);
void _userWarn(SPDesktop *, char const *);
+ void _inkscape_wait_for_targets(std::list<Glib::ustring> &);
+
// 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
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<Gtk::Clipboard> _clipboard; ///< Handle to the system wide clipboard - for convenience
std::list<Glib::ustring> _preferred_targets; ///< List of supported clipboard targets
};
_root(NULL),
_clipnode(NULL),
_doc(NULL),
+ _text_style(NULL),
_clipboard( Gtk::Clipboard::get() )
{
// push supported clipboard targets, in order of preference
_preferred_targets.push_back("image/svg+xml");
_preferred_targets.push_back("image/svg+xml-compressed");
#ifdef WIN32
- _preferred_targets.push_back("image/x-emf");
+ _preferred_targets.push_back(CLIPBOARD_WIN32_EMF_MIME);
#endif
_preferred_targets.push_back("application/pdf");
_preferred_targets.push_back("image/x-adobe-illustrator");
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;
}
}
// 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
void ClipboardManagerImpl::copyPathParameter(Inkscape::LivePathEffect::PathParam *pp)
{
if ( pp == NULL ) return;
- gchar *svgd = SVGD_from_2GeomPath( pp->get_pathvector() );
+ gchar *svgd = sp_svg_write_path( pp->get_pathvector() );
if ( svgd == NULL || *svgd == '\0' ) return;
_discardInternalClipboard();
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
return true;
}
+/**
+ * @brief Returns the id of the first visible copied object
+ */
+const gchar *ClipboardManagerImpl::getFirstObjectID()
+{
+ SPDocument *tempdoc = _retrieveClipboard("image/x-inkscape-svg");
+ if ( tempdoc == NULL ) {
+ return NULL;
+ }
+
+ Inkscape::XML::Node
+ *root = sp_document_repr_root(tempdoc);
+
+ if (!root)
+ return NULL;
+
+ Inkscape::XML::Node *ch = sp_repr_children(root);
+ 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");
+ }
+
+ return NULL;
+}
+
/**
* @brief Implements the Paste Style action
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
@@ -358,15 +446,15 @@ bool ClipboardManagerImpl::pasteSize(bool separately, bool apply_x, bool apply_y
if (separately) {
for (GSList *i = const_cast<GSList*>(selection->itemList()) ; i ; i = i->next) {
SPItem *item = SP_ITEM(i->data);
- NR::Maybe<NR::Rect> obj_size = sp_item_bbox_desktop(item);
- if ( !obj_size || obj_size->isEmpty() ) continue;
+ Geom::OptRect obj_size = sp_item_bbox_desktop(item);
+ if ( !obj_size ) continue;
sp_item_scale_rel(item, _getScale(min, max, *obj_size, apply_x, apply_y));
}
}
// resize the selection as a whole
else {
- NR::Maybe<NR::Rect> 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));
}
if ( effect ) {
_pasteDefs(tempdoc);
// make sure all selected items are converted to paths first (i.e. rectangles)
- sp_selected_path_to_curves(false);
+ sp_selected_path_to_curves(desktop, false);
for (GSList *item = const_cast<GSList *>(selection->itemList()) ; item ; item = item->next) {
_applyPathEffect(reinterpret_cast<SPItem*>(item->data), effect);
}
}
}
- NR::Maybe<NR::Rect> 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);
}
}
}
- // For lpe items, copy liveeffect if applicable
+ // For lpe items, copy lpe stack if applicable
if (SP_IS_LPE_ITEM(item)) {
SPLPEItem *lpeitem = SP_LPE_ITEM (item);
if (sp_lpe_item_has_path_effect(lpeitem)) {
- _copyNode(SP_OBJECT_REPR(SP_OBJECT(sp_lpe_item_get_livepatheffectobject(lpeitem))), _doc, _defs);
+ for (PathEffectList::iterator it = lpeitem->path_effect_list->begin(); it != lpeitem->path_effect_list->end(); ++it)
+ {
+ LivePathEffectObject *lpeobj = (*it)->lpeobject;
+ if (lpeobj)
+ _copyNode(SP_OBJECT_REPR(SP_OBJECT(lpeobj)), _doc, _defs);
+ }
}
}
// For 3D boxes, copy perspectives
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_i2doc_affine(SP_ITEM(desktop->currentLayer())).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
+ sp_document_ensure_up_to_date(target_document);
+
+ // 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<NR::Rect> sel_size = selection->bounds();
+ Geom::Point offset = pos_original - sel_bbox->corner(3);
+
+ if (!in_place) {
+ SnapManager &m = desktop->namedview->snap_manager;
+ m.setup(desktop);
+ sp_event_context_discard_delayed_snap_event(desktop->event_context);
- NR::Point m( desktop->point() );
- if (sel_size) {
- m -= sel_size->midpoint();
+ // 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;
}
- sp_selection_move_relative(selection, m);
+
+ sp_selection_move_relative(selection, offset);
}
g_slist_free(pasted_objects);
*target_defs = SP_OBJECT_REPR(SP_DOCUMENT_DEFS(target_document));
Inkscape::XML::Document *target_xmldoc = sp_document_repr_doc(target_document);
- for (Inkscape::XML::Node *def = defs->firstChild() ; def ; def = def->next()) {
- /// @todo TODO: implement def id collision resolution in ClipboardManagerImpl::_pasteDefs()
-
- /*
- // simplistic solution: when a collision occurs, add "a" to id until it's unique
- Glib::ustring pasted_id = def->attribute("id");
- if ( pasted_id.empty() ) continue; // defs without id are useless
- Glib::ustring pasted_id_original = pasted_id;
-
- while(sp_repr_lookup_child(target_defs, "id", pasted_id.data())) {
- pasted_id.append("a");
- }
-
- if ( pasted_id != pasted_id_original ) {
- def->setAttribute("id", pasted_id.data());
- // Update the id in the rest of the document so there are no dangling references
- // How to do that?
- _changeIdReferences(clipdoc, pasted_id_original, pasted_id);
- }
- */
- if (sp_repr_lookup_child(target_defs, "id", def->attribute("id")))
- continue; // skip duplicate defs - temporary non-solution
+ prevent_id_clashes(clipdoc, target_document);
+ for (Inkscape::XML::Node *def = defs->firstChild() ; def ; def = def->next()) {
_copyNode(def, target_xmldoc, target_defs);
}
}
// 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");
+ /// @todo Check whether the encoding is correct here
+ Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+ std::string save_folder = Glib::filename_from_utf8(prefs->getString("/dialogs/save_as/path"));
- gchar *image_path = g_build_filename(save_folder, image_filename, NULL);
+ gchar *image_path = g_build_filename(save_folder.data(), image_filename, NULL);
img->save(image_path, "png");
file_import(doc, image_path, NULL);
g_free(image_path);
*/
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<char *>(text.data());
bool attempt_alpha = false;
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_set_path_effect(lpeitem, lpeobj);
+ sp_lpe_item_add_path_effect(lpeitem, lpeobj);
}
}
@@ -926,16 +1010,47 @@ SPDocument *ClipboardManagerImpl::_retrieveClipboard(Glib::ustring required_targ
return NULL;
}
- if ( !_clipboard->wait_is_target_available(best_target) ) {
- return NULL;
+ // FIXME: Temporary hack until we add memory input.
+ // Save the clipboard contents to some file, then read it
+ gchar *filename = g_build_filename( g_get_tmp_dir(), "inkscape-clipboard-import", NULL );
+
+ bool file_saved = false;
+ Glib::ustring target = best_target;
+
+#ifdef WIN32
+ if (best_target == CLIPBOARD_WIN32_EMF_TARGET)
+ { // Try to save clipboard data as en emf file (using win32 api)
+ if (OpenClipboard(NULL)) {
+ HGLOBAL hglb = GetClipboardData(CF_ENHMETAFILE);
+ if (hglb) {
+ HENHMETAFILE hemf = CopyEnhMetaFile((HENHMETAFILE) hglb, filename);
+ if (hemf) {
+ file_saved = true;
+ target = CLIPBOARD_WIN32_EMF_MIME;
+ DeleteEnhMetaFile(hemf);
+ }
+ }
+ CloseClipboard();
+ }
}
+#endif
+
+ if (!file_saved) {
+ if ( !_clipboard->wait_is_target_available(best_target) ) {
+ return NULL;
+ }
- // doing this synchronously makes better sense
- // TODO: use another method because this one is badly broken imo.
- // from documentation: "Returns: A SelectionData object, which will be invalid if retrieving the given target failed."
- // I don't know how to check whether an object is 'valid' or not, unusable if that's not possible...
- Gtk::SelectionData sel = _clipboard->wait_for_contents(best_target);
- Glib::ustring target = sel.get_target(); // this can crash if the result was invalid of last function. No way to check for this :(
+ // doing this synchronously makes better sense
+ // TODO: use another method because this one is badly broken imo.
+ // from documentation: "Returns: A SelectionData object, which will be invalid if retrieving the given target failed."
+ // I don't know how to check whether an object is 'valid' or not, unusable if that's not possible...
+ Gtk::SelectionData sel = _clipboard->wait_for_contents(best_target);
+ target = sel.get_target(); // this can crash if the result was invalid of last function. No way to check for this :(
+
+ // FIXME: Temporary hack until we add memory input.
+ // Save the clipboard contents to some file, then read it
+ g_file_set_contents(filename, (const gchar *) sel.get_data(), sel.get_length(), NULL);
+ }
// 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
@@ -945,16 +1060,15 @@ SPDocument *ClipboardManagerImpl::_retrieveClipboard(Glib::ustring required_targ
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);
+ for (; in != inlist.end() && target != (*in)->get_mimetype() ; ++in){};
if ( in == inlist.end() )
return NULL; // this shouldn't happen unless _getBestTarget returns something bogus
- // FIXME: Temporary hack until we add memory input.
- // Save the clipboard contents to some file, then read it
- gchar *filename = g_build_filename( g_get_tmp_dir(), "inkscape-clipboard-import", NULL );
- g_file_set_contents(filename, (const gchar *) sel.get_data(), sel.get_length(), NULL);
-
- SPDocument *tempdoc = (*in)->open(filename);
+ SPDocument *tempdoc = NULL;
+ try {
+ tempdoc = (*in)->open(filename);
+ } catch (...) {
+ }
g_unlink(filename);
g_free(filename);
@@ -968,30 +1082,65 @@ SPDocument *ClipboardManagerImpl::_retrieveClipboard(Glib::ustring required_targ
* Finds a suitable output extension to save the internal clipboard document,
* then saves it to memory and sets the clipboard contents.
*/
-void ClipboardManagerImpl::_onGet(Gtk::SelectionData &sel, guint info)
+void ClipboardManagerImpl::_onGet(Gtk::SelectionData &sel, guint /*info*/)
{
g_assert( _clipboardSPDoc != NULL );
- const Glib::ustring target = sel.get_target();
+ 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() ) 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
gchar *filename = g_build_filename( g_get_tmp_dir(), "inkscape-clipboard-export", NULL );
gsize len; gchar *data;
- (*out)->save(_clipboardSPDoc, filename);
- g_file_get_contents(filename, &data, &len, NULL);
+ try {
+ if (out == outlist.end() && target == "image/png")
+ {
+ gdouble dpi = PX_PER_IN;
+ guint32 bgcolor = 0x00000000;
+
+ Geom::Point origin (SP_ROOT(_clipboardSPDoc->root)->x.computed, SP_ROOT(_clipboardSPDoc->root)->y.computed);
+ Geom::Rect area = Geom::Rect(origin, origin + sp_document_dimensions(_clipboardSPDoc));
+
+ 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"))
+ bgcolor = sp_svg_read_color(nv->attribute("pagecolor"), 0xffffff00);
+ 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, 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);
+
+ sel.set(8, (guint8 const *) data, len);
+ } catch (...) {
+ }
+
g_unlink(filename); // delete the temporary file
g_free(filename);
-
- sel.set(8, (guint8 const *) data, len);
}
_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;
+ }
}
}
/**
* @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(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
@@ -1065,7 +1220,7 @@ NR::scale ClipboardManagerImpl::_getScale(Geom::Point &min, Geom::Point &max, NR
if (apply_y && !apply_x) scale_x = scale_y;
}
- return NR::scale(scale_x, scale_y);
+ return Geom::Scale(scale_x, scale_y);
}
@@ -1074,7 +1229,9 @@ NR::scale ClipboardManagerImpl::_getScale(Geom::Point &min, Geom::Point &max, NR
*/
Glib::ustring ClipboardManagerImpl::_getBestTarget()
{
- std::list<Glib::ustring> targets = _clipboard->wait_for_targets();
+ // GTKmm's wait_for_targets() is broken, see the comment in _inkscape_wait_for_targets()
+ std::list<Glib::ustring> targets; // = _clipboard->wait_for_targets();
+ _inkscape_wait_for_targets(targets);
// clipboard target debugging snippet
/*
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)
+ break;
+ format = EnumClipboardFormats(format);
+ }
+ CloseClipboard();
+
+ if (format == CF_ENHMETAFILE)
+ return CLIPBOARD_WIN32_EMF_TARGET;
+ if (format == CF_DIB || format == CF_BITMAP)
+ return CLIPBOARD_GDK_PIXBUF_TARGET;
+ }
+
+ if (IsClipboardFormatAvailable(CF_ENHMETAFILE))
+ return CLIPBOARD_WIN32_EMF_TARGET;
+#endif
if (_clipboard->wait_is_image_available())
return CLIPBOARD_GDK_PIXBUF_TARGET;
if (_clipboard->wait_is_text_available())
Inkscape::Extension::DB::OutputList outlist;
Inkscape::Extension::db.get_output_list(outlist);
std::list<Gtk::TargetEntry> 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...
+ // On Windows, GTK will also present this as a CF_DIB/CF_BITMAP
+ target_list.push_back(Gtk::TargetEntry( "image/png" ));
+
_clipboard->set(target_list,
sigc::mem_fun(*this, &ClipboardManagerImpl::_onGet),
sigc::mem_fun(*this, &ClipboardManagerImpl::_onClear));
+
+#ifdef WIN32
+ // If the "image/x-emf" target handled by the emf extension would be
+ // presented as a CF_ENHMETAFILE automatically (just like an "image/bmp"
+ // is presented as a CF_BITMAP) this code would not be needed.. ???
+ // Or maybe there is some other way to achieve the same?
+
+ // Note: Metafile is the only format that is rendered and stored in clipboard
+ // on Copy, all other formats are rendered only when needed by a Paste command.
+
+ // FIXME: This should at least be rewritten to use "delayed rendering".
+ // If possible make it delayed rendering by using GTK API only.
+
+ if (OpenClipboard(NULL)) {
+ if ( _clipboardSPDoc != NULL ) {
+ const Glib::ustring target = CLIPBOARD_WIN32_EMF_MIME;
+
+ 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() ) {
+ // FIXME: Temporary hack until we add support for memory output.
+ // Save to a temporary file, read it back and then set the clipboard contents
+ gchar *filename = g_build_filename( g_get_tmp_dir(), "inkscape-clipboard-export.emf", NULL );
+
+ try {
+ (*out)->save(_clipboardSPDoc, filename);
+ HENHMETAFILE hemf = GetEnhMetaFileA(filename);
+ if (hemf) {
+ SetClipboardData(CF_ENHMETAFILE, hemf);
+ DeleteEnhMetaFile(hemf);
+ }
+ } catch (...) {
+ }
+ g_unlink(filename); // delete the temporary file
+ g_free(filename);
+ }
+ }
+ CloseClipboard();
+ }
+#endif
}
}
+// 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<Glib::ustring> &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<char>(atom_name).get(); //This frees the gchar*.
+
+ listTargets.push_back(target);
+ }
+}
/* #######################################
ClipboardManager class