![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/ui/clipboard.cpp b/src/ui/clipboard.cpp
index 7d771c0d4695e1f20062fde860ce6ba8c87543e4..bd3edadda28ab8487585e0c042015b0794d44a87 100644 (file)
--- a/src/ui/clipboard.cpp
+++ b/src/ui/clipboard.cpp
#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 "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 "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"
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);
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
@@ -403,15 +407,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);
}
// 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_i2doc_affine(SP_ITEM(i->data)));
obj_copy->setAttribute("transform", transform_str);
g_free(transform_str);
}
}
}
- NR::Maybe<NR::Rect> size = selection->bounds();
+ Geom::OptRect size = selection->bounds();
if (size) {
sp_repr_set_point(_clipnode, "min", size->min());
sp_repr_set_point(_clipnode, "max", size->max());
Inkscape::XML::Node *obj_copy = _copyNode(obj, target_xmldoc, target_parent);
pasted_objects = g_slist_prepend(pasted_objects, (gpointer) obj_copy);
}
-
+
+ /* The pasted objects are at the origin of the document coordinates (i.e. the upper left corner
+ * of the bounding box of the pasted selection is aligned to the upper left page corner).
+ * Now we will move the pasted objects to where we want them to be, which is either at the
+ * original position ("in place") or at the location of the mouse pointer (optionaly with snapping
+ * to the grid)
+ */
+
+ Geom::Point rel_pos_original, rel_pos_mouse;
+
+ // Calculate the relative location of the original objects
+ Inkscape::XML::Node *clipnode = sp_repr_lookup_name(root, "inkscape:clipboard", 1);
+ if (clipnode) {
+ Geom::Point min, max;
+ // Get two bounding box corners of the data in the clipboard (still in it's original position)
+ sp_repr_get_point(clipnode, "min", &min); //In desktop coordinates
+ sp_repr_get_point(clipnode, "max", &max);
+ // Calculate the upper-left page corner in desktop coordinates (where the pasted objects are located)
+ Geom::Point ul_page_corner = desktop->doc2dt(Geom::Point(0,0));
+ // Calculate the upper-left bbox corner of the original objects
+ Geom::Point ul_sel_corner = Geom::Point(min[Geom::X], max[Geom::Y]);
+ // Now calculate how far we would have to move the pasted objects to get them
+ // at the location of the original
+ rel_pos_original = ul_sel_corner - ul_page_corner; // in desktop coordinates
+ }
+
+ // Calculate the relative location of the mouse pointer
Inkscape::Selection *selection = sp_desktop_selection(desktop);
- selection->setReprList(pasted_objects);
-
- // move the selection to the right position
- if(in_place)
- {
- 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));
- }
+ selection->setReprList(pasted_objects); // Change the selection to the freshly pasted objects
+ sp_document_ensure_up_to_date(target_document); // Update (among other things) all curves in paths, for bounds() to work
+
+ Geom::OptRect sel_bbox = selection->bounds(); //In desktop coordinates
+ // PS: We could also have used the min/max corners calculated above, instead of selection->bounds() because
+ // we know that after pasting the upper left corner of the selection will be aligend to the corresponding
+ // page corner. Using the boundingbox of the selection is more foolproof though
+ if (sel_bbox) {
+ Geom::Point pos_mouse = desktop->point(); //Location of mouse pointer in desktop coordinates
+ // Now calculate how far we would have to move the pasted objects to get their
+ // midpoint at the location of the mouse pointer
+ rel_pos_mouse = pos_mouse - to_2geom(sel_bbox->midpoint());
}
- // 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();
-
- NR::Point m( desktop->point() );
- if (sel_size) {
- m -= sel_size->midpoint();
- }
- sp_selection_move_relative(selection, m);
+
+ // Determine which offset we need to apply to the pasted objects
+ Geom::Point offset;
+ if (in_place) { // Align the pasted objects with their originals
+ offset = rel_pos_original;
+ } else { // Stick to the grid if snapping is enabled, otherwise paste at mouse position;
+ SnapManager &m = desktop->namedview->snap_manager;
+ m.setup(desktop, false); //Don't display the snapindicator
+ offset = rel_pos_original + m.multipleOfGridPitch(rel_pos_mouse - rel_pos_original);
}
-
+
+ // Apply the offset to the pasted objects
+ sp_selection_move_relative(selection, offset);
g_slist_free(pasted_objects);
}
// 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;
{
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();
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 + sp_document_dimensions(_clipboardSPDoc));
- 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("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);
/**
* @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
@@ -1155,7 +1190,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);
}
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...