![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/ui/clipboard.cpp b/src/ui/clipboard.cpp
index 09521008bef951fb523ca0db0999b244fce11e98..af0ec0129b7c4a3637e56a9fda776d38c0fbebfc 100644 (file)
--- a/src/ui/clipboard.cpp
+++ b/src/ui/clipboard.cpp
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
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
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") &&
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
@@ -407,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);
- boost::optional<Geom::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 {
- boost::optional<Geom::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));
}
}
}
- boost::optional<Geom::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
+
+ // Change the selection to the freshly pasted objects
Inkscape::Selection *selection = sp_desktop_selection(desktop);
- selection->setReprList(pasted_objects); // Change the selection to the freshly pasted objects
- sp_document_ensure_up_to_date(target_document); // What does this do?
-
- boost::optional<Geom::Rect> 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
+ selection->setReprList(pasted_objects);
+
+ // 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) {
- 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());
- }
-
- // 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);
+ // 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);
+ pos_original = Geom::Point(min[Geom::X], max[Geom::Y]);
+ }
+ Geom::Point offset = pos_original - sel_bbox->corner(3);
+
+ if (!in_place) {
+ SnapManager &m = desktop->namedview->snap_manager;
+ m.setup(desktop, false); // Don't display the snapindicator
+
+ // 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) + offset;
+ }
+
+ sp_selection_move_relative(selection, offset);
}
-
- // Apply the offset to the pasted objects
- sp_selection_move_relative(selection, offset);
+
g_slist_free(pasted_objects);
}
Inkscape::XML::Document *target_xmldoc = sp_document_repr_doc(target_document);
prevent_id_clashes(clipdoc, target_document);
-
+
for (Inkscape::XML::Node *def = defs->firstChild() ; def ; def = def->next()) {
_copyNode(def, target_xmldoc, target_defs);
}
strftime(image_filename, 128, "inkscape_pasted_image_%Y%m%d_%H%M%S.png", localtime( &rawtime ));
/// @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"));
+ std::string save_folder = Glib::filename_from_utf8(prefs->getString("/dialogs/save_as/path"));
gchar *image_path = g_build_filename(save_folder.data(), image_filename, NULL);
img->save(image_path, "png");
@@ -1036,7 +1059,7 @@ 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
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() && target != "image/png") return; // this also shouldn't happen
// FIXME: Temporary hack until we add support for memory output.
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
{
_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;
+ }
}
}
@@ -1202,7 +1228,9 @@ Geom::Scale ClipboardManagerImpl::_getScale(Geom::Point const &min, Geom::Point
*/
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
/*
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
}
+// 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