X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fdocument.cpp;h=a473daa3ca640d341daf92bb280947ef7d8b784c;hb=2f0897fe50112b5e8ec11e37949077e5fd72fc38;hp=bf5ef089e625fb186c80860ce4e1fbf7a5020fea;hpb=fa0468e791e623b679faafdc40c97678316e30e1;p=inkscape.git diff --git a/src/document.cpp b/src/document.cpp index bf5ef089e..a473daa3c 100644 --- a/src/document.cpp +++ b/src/document.cpp @@ -1,5 +1,3 @@ -#define __SP_DOCUMENT_C__ - /** \file * SPDocument manipulation * @@ -7,6 +5,8 @@ * Lauris Kaplinski * MenTaLguY * bulia byak + * Jon A. Cruz + * Abhishek Sharma * * Copyright (C) 2004-2005 MenTaLguY * Copyright (C) 1999-2002 Lauris Kaplinski @@ -40,36 +40,39 @@ #include #include #include -#include "application/application.h" -#include "application/editor.h" -#include "libnr/nr-matrix-fns.h" -#include "xml/repr.h" -#include "helper/units.h" -#include "inkscape-private.h" -#include "inkscape_version.h" -#include "sp-object-repr.h" -#include "sp-namedview.h" + #include "desktop.h" -#include "document-private.h" #include "dir-util.h" -#include "unit-constants.h" -#include "prefs-utils.h" +#include "display/nr-arena-item.h" +#include "document-private.h" +#include "helper/units.h" +#include "inkscape-private.h" +#include "inkscape-version.h" #include "libavoid/router.h" -#include "libnr/nr-rect.h" -#include "sp-item-group.h" -#include "profile-manager.h" #include "persp3d.h" +#include "preferences.h" +#include "profile-manager.h" +#include "rdf.h" +#include "sp-item-group.h" +#include "sp-namedview.h" +#include "sp-object-repr.h" +#include "transf_mat_3x4.h" +#include "unit-constants.h" +#include "xml/repr.h" +#include "xml/rebase-hrefs.h" -#include "display/nr-arena-item.h" - -#include "dialogs/rdf.h" +using Inkscape::DocumentUndo; -#include "transf_mat_3x4.h" +// Higher number means lower priority. +#define SP_DOCUMENT_UPDATE_PRIORITY (G_PRIORITY_HIGH_IDLE - 2) -#define SP_DOCUMENT_UPDATE_PRIORITY (G_PRIORITY_HIGH_IDLE - 1) +// Should have a lower priority than SP_DOCUMENT_UPDATE_PRIORITY, +// since we want it to happen when there are no more updates. +#define SP_DOCUMENT_REROUTING_PRIORITY (G_PRIORITY_HIGH_IDLE - 1) static gint sp_document_idle_handler(gpointer data); +static gint sp_document_rerouting_handler(gpointer data); gboolean sp_document_resource_list_free(gpointer key, gpointer value, gpointer data); @@ -77,33 +80,32 @@ static gint doc_count = 0; static unsigned long next_serial = 0; -SPDocument::SPDocument() { - SPDocumentPrivate *p; - - keepalive = FALSE; - virgin = TRUE; - - modified_id = 0; - - rdoc = NULL; - rroot = NULL; - root = NULL; - style_cascade = cr_cascade_new(NULL, NULL, NULL); - - uri = NULL; - base = NULL; - name = NULL; - - _collection_queue = NULL; - - // Initialise instance of connector router. - router = new Avoid::Router(); - // Don't use the Consolidate moves optimisation. - router->ConsolidateMoves = false; - - perspectives = NULL; +SPDocument::SPDocument() : + keepalive(FALSE), + virgin(TRUE), + modified_since_save(FALSE), + rdoc(0), + rroot(0), + root(0), + style_cascade(cr_cascade_new(NULL, NULL, NULL)), + uri(0), + base(0), + name(0), + priv(0), // reset in ctor + actionkey(), + modified_id(0), + rerouting_handler_id(0), + profileManager(0), // deferred until after other initialization + router(new Avoid::Router(Avoid::PolyLineRouting|Avoid::OrthogonalRouting)), + _collection_queue(0), + oldSignalsConnected(false), + current_persp3d(0) +{ + // Penalise libavoid for choosing paths with needless extra segments. + // This results in much better looking orthogonal connector paths. + router->setRoutingPenalty(Avoid::segmentPenalty); - p = new SPDocumentPrivate(); + SPDocumentPrivate *p = new SPDocumentPrivate(); p->serial = next_serial++; @@ -137,14 +139,19 @@ SPDocument::~SPDocument() { profileManager = 0; } + if (router) { + delete router; + router = NULL; + } + if (priv) { if (priv->partial) { sp_repr_free_log(priv->partial); priv->partial = NULL; } - sp_document_clear_redo(this); - sp_document_clear_undo(this); + DocumentUndo::clearRedo(this); + DocumentUndo::clearUndo(this); if (root) { root->releaseReferences(); @@ -182,46 +189,77 @@ SPDocument::~SPDocument() { } if (modified_id) { - gtk_idle_remove(modified_id); + g_source_remove(modified_id); modified_id = 0; } - _selection_changed_connection.disconnect(); - _desktop_activated_connection.disconnect(); + if (rerouting_handler_id) { + g_source_remove(rerouting_handler_id); + rerouting_handler_id = 0; + } + + if (oldSignalsConnected) { + g_signal_handlers_disconnect_by_func(G_OBJECT(INKSCAPE), + reinterpret_cast(DocumentUndo::resetKey), + static_cast(this)); + } else { + _selection_changed_connection.disconnect(); + _desktop_activated_connection.disconnect(); + } if (keepalive) { inkscape_unref(); keepalive = FALSE; } + //delete this->_whiteboard_session_manager; +} - if (router) { - delete router; - router = NULL; +Persp3D * +SPDocument::getCurrentPersp3D() { + // Check if current_persp3d is still valid + std::vector plist; + getPerspectivesInDefs(plist); + for (unsigned int i = 0; i < plist.size(); ++i) { + if (current_persp3d == plist[i]) + return current_persp3d; } - //delete this->_whiteboard_session_manager; + // If not, return the first perspective in defs (which may be NULL of none exists) + current_persp3d = persp3d_document_first_persp (this); + + return current_persp3d; +} + +Persp3DImpl * +SPDocument::getCurrentPersp3DImpl() { + return current_persp3d_impl; +} +void +SPDocument::setCurrentPersp3D(Persp3D * const persp) { + current_persp3d = persp; + //current_persp3d_impl = persp->perspective_impl; } -void SPDocument::add_persp3d (Persp3D * const /*persp*/) +void SPDocument::getPerspectivesInDefs(std::vector &list) const { SPDefs *defs = SP_ROOT(this->root)->defs; - for (SPObject *i = sp_object_first_child(SP_OBJECT(defs)); i != NULL; i = SP_OBJECT_NEXT(i) ) { + for (SPObject *i = defs->firstChild(); i; i = i->getNext() ) { if (SP_IS_PERSP3D(i)) { - g_print ("Encountered a Persp3D in defs\n"); + list.push_back(SP_PERSP3D(i)); } } - - g_print ("Adding Persp3D to defs\n"); - persp3d_create_xml_element (this); } -void SPDocument::remove_persp3d (Persp3D * const /*persp*/) +/** +void SPDocument::initialize_current_persp3d() { - // TODO: Delete the repr, maybe perform a check if any boxes are still linked to the perspective. - // Anything else? - g_print ("Please implement deletion of perspectives here.\n"); + this->current_persp3d = persp3d_document_first_persp(this); + if (!this->current_persp3d) { + this->current_persp3d = persp3d_create_xml_element(this); + } } +**/ unsigned long SPDocument::serial() const { return priv->serial; @@ -250,23 +288,19 @@ void SPDocument::collectOrphans() { void SPDocument::reset_key (void */*dummy*/) { - actionkey = NULL; + actionkey.clear(); } -SPDocument * -sp_document_create(Inkscape::XML::Document *rdoc, - gchar const *uri, - gchar const *base, - gchar const *name, - unsigned int keepalive) +SPDocument *SPDocument::createDoc(Inkscape::XML::Document *rdoc, + gchar const *uri, + gchar const *base, + gchar const *name, + unsigned int keepalive) { - SPDocument *document; - Inkscape::XML::Node *rroot; - Inkscape::Version sodipodi_version; + SPDocument *document = new SPDocument(); - rroot = rdoc->root(); - - document = new SPDocument(); + Inkscape::Preferences *prefs = Inkscape::Preferences::get(); + Inkscape::XML::Node *rroot = rdoc->root(); document->keepalive = keepalive; @@ -274,7 +308,7 @@ sp_document_create(Inkscape::XML::Document *rdoc, document->rroot = rroot; #ifndef WIN32 - prepend_current_dir_if_relative(&(document->uri), uri); + document->uri = prepend_current_dir_if_relative(uri); #else // FIXME: it may be that prepend_current_dir_if_relative works OK on windows too, test! document->uri = uri? g_strdup(uri) : NULL; @@ -283,19 +317,17 @@ sp_document_create(Inkscape::XML::Document *rdoc, // base is simply the part of the path before filename; e.g. when running "inkscape ../file.svg" the base is "../" // which is why we use g_get_current_dir() in calculating the abs path above //This is NULL for a new document - if (base) + if (base) { document->base = g_strdup(base); - else + } else { document->base = NULL; + } document->name = g_strdup(name); document->root = sp_object_repr_build_tree(document, rroot); - sodipodi_version = SP_ROOT(document->root)->version.sodipodi; - /* fixme: Not sure about this, but lets assume ::build updates */ - rroot->setAttribute("sodipodi:version", SODIPODI_VERSION); - rroot->setAttribute("inkscape:version", INKSCAPE_VERSION); + rroot->setAttribute("inkscape:version", Inkscape::version_string); /* fixme: Again, I moved these here to allow version determining in ::build (Lauris) */ /* Quick hack 2 - get default image size into document */ @@ -309,21 +341,47 @@ sp_document_create(Inkscape::XML::Document *rdoc, } /* End of quick hack 3 */ + /* Eliminate obsolete sodipodi:docbase, for privacy reasons */ + rroot->setAttribute("sodipodi:docbase", NULL); + + /* Eliminate any claim to adhere to a profile, as we don't try to */ + rroot->setAttribute("baseProfile", NULL); + // creating namedview if (!sp_item_group_get_child_by_name((SPGroup *) document->root, NULL, "sodipodi:namedview")) { // if there's none in the document already, - Inkscape::XML::Node *r = NULL; Inkscape::XML::Node *rnew = NULL; - r = inkscape_get_repr(INKSCAPE, "template.base"); - // see if there's a template with id="base" in the preferences - if (!r) { - // if there's none, create an empty element - rnew = rdoc->createElement("sodipodi:namedview"); - rnew->setAttribute("id", "base"); - } else { - // otherwise, take from preferences - rnew = r->duplicate(rroot->document()); + + rnew = rdoc->createElement("sodipodi:namedview"); + //rnew->setAttribute("id", "base"); + + // Add namedview data from the preferences + // we can't use getAllEntries because this could produce non-SVG doubles + Glib::ustring pagecolor = prefs->getString("/template/base/pagecolor"); + if (!pagecolor.empty()) { + rnew->setAttribute("pagecolor", pagecolor.data()); } + Glib::ustring bordercolor = prefs->getString("/template/base/bordercolor"); + if (!bordercolor.empty()) { + rnew->setAttribute("bordercolor", bordercolor.data()); + } + sp_repr_set_svg_double(rnew, "borderopacity", + prefs->getDouble("/template/base/borderopacity", 1.0)); + sp_repr_set_svg_double(rnew, "objecttolerance", + prefs->getDouble("/template/base/objecttolerance", 10.0)); + sp_repr_set_svg_double(rnew, "gridtolerance", + prefs->getDouble("/template/base/gridtolerance", 10.0)); + sp_repr_set_svg_double(rnew, "guidetolerance", + prefs->getDouble("/template/base/guidetolerance", 10.0)); + sp_repr_set_svg_double(rnew, "inkscape:pageopacity", + prefs->getDouble("/template/base/inkscape:pageopacity", 0.0)); + sp_repr_set_int(rnew, "inkscape:pageshadow", + prefs->getInt("/template/base/inkscape:pageshadow", 2)); + sp_repr_set_int(rnew, "inkscape:window-width", + prefs->getInt("/template/base/inkscape:window-width", 640)); + sp_repr_set_int(rnew, "inkscape:window-height", + prefs->getInt("/template/base/inkscape:window-height", 480)); + // insert into the document rroot->addChild(rnew, NULL); // clean up @@ -346,27 +404,23 @@ sp_document_create(Inkscape::XML::Document *rdoc, inkscape_ref(); } - // Remark: Here, we used to create a "currentpersp3d" element in the document defs. - // But this is probably a bad idea since we need to adapt it for every change of selection, which will - // completely clutter the undo history. Maybe rather save it to prefs on exit and re-read it on startup? - - document->current_persp3d = persp3d_document_first_persp(document); - if (!document->current_persp3d) { - document->current_persp3d = persp3d_create_xml_element (document); + // Check if the document already has a perspective (e.g., when opening an existing + // document). If not, create a new one and set it as the current perspective. + document->setCurrentPersp3D(persp3d_document_first_persp(document)); + if (!document->getCurrentPersp3D()) { + //document->setCurrentPersp3D(persp3d_create_xml_element (document)); + Persp3DImpl *persp_impl = new Persp3DImpl(); + document->setCurrentPersp3DImpl(persp_impl); } - sp_document_set_undo_sensitive(document, true); + DocumentUndo::setUndoSensitive(document, true); // reset undo key when selection changes, so that same-key actions on different objects are not coalesced - if (!Inkscape::NSApplication::Application::getNewGui()) { - g_signal_connect(G_OBJECT(INKSCAPE), "change_selection", - G_CALLBACK(sp_document_reset_key), document); - g_signal_connect(G_OBJECT(INKSCAPE), "activate_desktop", - G_CALLBACK(sp_document_reset_key), document); - } else { - document->_selection_changed_connection = Inkscape::NSApplication::Editor::connectSelectionChanged (sigc::mem_fun (*document, &SPDocument::reset_key)); - document->_desktop_activated_connection = Inkscape::NSApplication::Editor::connectDesktopActivated (sigc::mem_fun (*document, &SPDocument::reset_key)); - } + g_signal_connect(G_OBJECT(INKSCAPE), "change_selection", + G_CALLBACK(DocumentUndo::resetKey), document); + g_signal_connect(G_OBJECT(INKSCAPE), "activate_desktop", + G_CALLBACK(DocumentUndo::resetKey), document); + document->oldSignalsConnected = true; return document; } @@ -375,8 +429,7 @@ sp_document_create(Inkscape::XML::Document *rdoc, * Fetches document from URI, or creates new, if NULL; public document * appears in document list. */ -SPDocument * -sp_document_new(gchar const *uri, unsigned int keepalive, bool make_new) +SPDocument *SPDocument::createNewDoc(gchar const *uri, unsigned int keepalive, bool make_new) { SPDocument *doc; Inkscape::XML::Document *rdoc; @@ -418,7 +471,7 @@ sp_document_new(gchar const *uri, unsigned int keepalive, bool make_new) //# These should be set by now g_assert(name); - doc = sp_document_create(rdoc, uri, base, name, keepalive); + doc = createDoc(rdoc, uri, base, name, keepalive); g_free(base); g_free(name); @@ -426,8 +479,7 @@ sp_document_new(gchar const *uri, unsigned int keepalive, bool make_new) return doc; } -SPDocument * -sp_document_new_from_mem(gchar const *buffer, gint length, unsigned int keepalive) +SPDocument *SPDocument::createNewDocFromMem(gchar const *buffer, gint length, unsigned int keepalive) { SPDocument *doc; Inkscape::XML::Document *rdoc; @@ -446,48 +498,43 @@ sp_document_new_from_mem(gchar const *buffer, gint length, unsigned int keepaliv name = g_strdup_printf(_("Memory document %d"), ++doc_count); - doc = sp_document_create(rdoc, NULL, NULL, name, keepalive); + doc = createDoc(rdoc, NULL, NULL, name, keepalive); return doc; } -SPDocument * -sp_document_ref(SPDocument *doc) +SPDocument *SPDocument::doRef() { - g_return_val_if_fail(doc != NULL, NULL); - Inkscape::GC::anchor(doc); - return doc; + Inkscape::GC::anchor(this); + return this; } -SPDocument * -sp_document_unref(SPDocument *doc) +SPDocument *SPDocument::doUnref() { - g_return_val_if_fail(doc != NULL, NULL); - Inkscape::GC::release(doc); + Inkscape::GC::release(this); return NULL; } -gdouble sp_document_width(SPDocument *document) +gdouble SPDocument::getWidth() const { - g_return_val_if_fail(document != NULL, 0.0); - g_return_val_if_fail(document->priv != NULL, 0.0); - g_return_val_if_fail(document->root != NULL, 0.0); + g_return_val_if_fail(this->priv != NULL, 0.0); + g_return_val_if_fail(this->root != NULL, 0.0); - SPRoot *root = SP_ROOT(document->root); + SPRoot *root = SP_ROOT(this->root); if (root->width.unit == SVGLength::PERCENT && root->viewBox_set) return root->viewBox.x1 - root->viewBox.x0; return root->width.computed; } -void -sp_document_set_width (SPDocument *document, gdouble width, const SPUnit *unit) +void SPDocument::setWidth(gdouble width, const SPUnit *unit) { - SPRoot *root = SP_ROOT(document->root); + SPRoot *root = SP_ROOT(this->root); if (root->width.unit == SVGLength::PERCENT && root->viewBox_set) { // set to viewBox= root->viewBox.x1 = root->viewBox.x0 + sp_units_get_pixels (width, *unit); } else { // set to width= + gdouble old_computed = root->width.computed; root->width.computed = sp_units_get_pixels (width, *unit); /* SVG does not support meters as a unit, so we must translate meters to * cm when writing */ @@ -498,18 +545,22 @@ sp_document_set_width (SPDocument *document, gdouble width, const SPUnit *unit) root->width.value = width; root->width.unit = (SVGLength::Unit) sp_unit_get_svg_unit(unit); } + + if (root->viewBox_set) + root->viewBox.x1 = root->viewBox.x0 + (root->width.computed / old_computed) * (root->viewBox.x1 - root->viewBox.x0); } SP_OBJECT (root)->updateRepr(); } -void sp_document_set_height (SPDocument * document, gdouble height, const SPUnit *unit) +void SPDocument::setHeight(gdouble height, const SPUnit *unit) { - SPRoot *root = SP_ROOT(document->root); + SPRoot *root = SP_ROOT(this->root); if (root->height.unit == SVGLength::PERCENT && root->viewBox_set) { // set to viewBox= root->viewBox.y1 = root->viewBox.y0 + sp_units_get_pixels (height, *unit); } else { // set to height= + gdouble old_computed = root->height.computed; root->height.computed = sp_units_get_pixels (height, *unit); /* SVG does not support meters as a unit, so we must translate meters to * cm when writing */ @@ -520,48 +571,88 @@ void sp_document_set_height (SPDocument * document, gdouble height, const SPUnit root->height.value = height; root->height.unit = (SVGLength::Unit) sp_unit_get_svg_unit(unit); } + + if (root->viewBox_set) + root->viewBox.y1 = root->viewBox.y0 + (root->height.computed / old_computed) * (root->viewBox.y1 - root->viewBox.y0); } SP_OBJECT (root)->updateRepr(); } -gdouble sp_document_height(SPDocument *document) +gdouble SPDocument::getHeight() const { - g_return_val_if_fail(document != NULL, 0.0); - g_return_val_if_fail(document->priv != NULL, 0.0); - g_return_val_if_fail(document->root != NULL, 0.0); + g_return_val_if_fail(this->priv != NULL, 0.0); + g_return_val_if_fail(this->root != NULL, 0.0); - SPRoot *root = SP_ROOT(document->root); + SPRoot *root = SP_ROOT(this->root); if (root->height.unit == SVGLength::PERCENT && root->viewBox_set) return root->viewBox.y1 - root->viewBox.y0; return root->height.computed; } +Geom::Point SPDocument::getDimensions() const +{ + return Geom::Point(getWidth(), getHeight()); +} + /** - * Given an NR::Rect that may, for example, correspond to the bbox of an object, + * Given a Geom::Rect that may, for example, correspond to the bbox of an object, * this function fits the canvas to that rect by resizing the canvas * and translating the document root into position. + * \param rect fit document size to this + * \param with_margins add margins to rect, by taking margins from this + * document's namedview ( "fit-margin-..." + * attributes, and "units") */ -void SPDocument::fitToRect(NR::Rect const &rect) +void SPDocument::fitToRect(Geom::Rect const &rect, bool with_margins) { - g_return_if_fail(!rect.isEmpty()); - - using NR::X; using NR::Y; - double const w = rect.extent(X); - double const h = rect.extent(Y); + double const w = rect.width(); + double const h = rect.height(); - double const old_height = sp_document_height(this); + double const old_height = getHeight(); SPUnit const &px(sp_unit_get_by_id(SP_UNIT_PX)); - sp_document_set_width(this, w, &px); - sp_document_set_height(this, h, &px); - - NR::translate const tr(NR::Point(0, (old_height - h)) - - rect.min()); - SP_GROUP(root)->translateChildItems(tr); + + /* in px */ + double margin_top = 0.0; + double margin_left = 0.0; + double margin_right = 0.0; + double margin_bottom = 0.0; + SPNamedView *nv = sp_document_namedview(this, 0); + + if (with_margins && nv) { + if (nv != NULL) { + gchar const * const units_abbr = nv->getAttribute("units"); + SPUnit const *margin_units = NULL; + if (units_abbr != NULL) { + margin_units = sp_unit_get_by_abbreviation(units_abbr); + } + if (margin_units == NULL) { + margin_units = &px; + } + margin_top = nv->getMarginLength("fit-margin-top",margin_units, &px, w, h, false); + margin_top = nv->getMarginLength("fit-margin-left",margin_units, &px, w, h, true); + margin_top = nv->getMarginLength("fit-margin-right",margin_units, &px, w, h, true); + margin_top = nv->getMarginLength("fit-margin-bottom",margin_units, &px, w, h, false); + } + } + + Geom::Rect const rect_with_margins( + rect.min() - Geom::Point(margin_left, margin_bottom), + rect.max() + Geom::Point(margin_right, margin_top)); + + + setWidth(rect_with_margins.width(), &px); + setHeight(rect_with_margins.height(), &px); + + Geom::Translate const tr( + Geom::Point(0, old_height - rect_with_margins.height()) + - to_2geom(rect_with_margins.min())); + SP_GROUP(root)->translateChildItems(tr); + if(nv) { - NR::translate tr2(-rect.min()); + Geom::Translate tr2(-rect_with_margins.min()); nv->translateGuides(tr2); // update the viewport so the drawing appears to stay where it was @@ -569,60 +660,90 @@ void SPDocument::fitToRect(NR::Rect const &rect) } } -void sp_document_set_uri(SPDocument *document, gchar const *uri) +void SPDocument::setBase( gchar const* base ) { - g_return_if_fail(document != NULL); - - if (document->name) { - g_free(document->name); - document->name = NULL; + if (this->base) { + g_free(this->base); + this->base = 0; } - if (document->base) { - g_free(document->base); - document->base = NULL; - } - if (document->uri) { - g_free(document->uri); - document->uri = NULL; + if (base) { + this->base = g_strdup(base); } +} - if (uri) { +void SPDocument::do_change_uri(gchar const *const filename, bool const rebase) +{ + gchar *new_base = 0; + gchar *new_name = 0; + gchar *new_uri = 0; + if (filename) { #ifndef WIN32 - prepend_current_dir_if_relative(&(document->uri), uri); + new_uri = prepend_current_dir_if_relative(filename); #else // FIXME: it may be that prepend_current_dir_if_relative works OK on windows too, test! - document->uri = g_strdup(uri); + new_uri = g_strdup(filename); #endif - /* fixme: Think, what this means for images (Lauris) */ - document->base = g_path_get_dirname(document->uri); - document->name = g_path_get_basename(document->uri); - + new_base = g_path_get_dirname(new_uri); + new_name = g_path_get_basename(new_uri); } else { - document->uri = g_strdup_printf(_("Unnamed document %d"), ++doc_count); - document->base = NULL; - document->name = g_strdup(document->uri); + new_uri = g_strdup_printf(_("Unnamed document %d"), ++doc_count); + new_base = NULL; + new_name = g_strdup(this->uri); } // Update saveable repr attributes. - Inkscape::XML::Node *repr = sp_document_repr_root(document); - // changing uri in the document repr must not be not undoable - bool saved = sp_document_get_undo_sensitive(document); - sp_document_set_undo_sensitive(document, false); + Inkscape::XML::Node *repr = getReprRoot(); + + // Changing uri in the document repr must not be not undoable. + bool const saved = DocumentUndo::getUndoSensitive(this); + DocumentUndo::setUndoSensitive(this, false); + + if (rebase) { + Inkscape::XML::rebase_hrefs(this, new_base, true); + } + + repr->setAttribute("sodipodi:docname", this->name); + DocumentUndo::setUndoSensitive(this, saved); - repr->setAttribute("sodipodi:docname", document->name); - sp_document_set_undo_sensitive(document, saved); - document->priv->uri_set_signal.emit(document->uri); + g_free(this->name); + g_free(this->base); + g_free(this->uri); + this->name = new_name; + this->base = new_base; + this->uri = new_uri; + + this->priv->uri_set_signal.emit(this->uri); } -void -sp_document_resized_signal_emit(SPDocument *doc, gdouble width, gdouble height) +/** + * Sets base, name and uri members of \a document. Doesn't update + * any relative hrefs in the document: thus, this is primarily for + * newly-created documents. + * + * \see sp_document_change_uri_and_hrefs + */ +void SPDocument::setUri(gchar const *filename) { - g_return_if_fail(doc != NULL); + do_change_uri(filename, false); +} - doc->priv->resized_signal.emit(width, height); +/** + * Changes the base, name and uri members of \a document, and updates any + * relative hrefs in the document to be relative to the new base. + * + * \see sp_document_set_uri + */ +void SPDocument::changeUriAndHrefs(gchar const *filename) +{ + do_change_uri(filename, true); +} + +void SPDocument::emitResizedSignal(gdouble width, gdouble height) +{ + this->priv->resized_signal.emit(width, height); } sigc::connection SPDocument::connectModified(SPDocument::ModifiedSignal::slot_type slot) @@ -665,7 +786,13 @@ SPDocument::emitReconstructionFinish(void) { // printf("Finishing Reconstruction\n"); priv->_reconstruction_finish_signal.emit(); + +/** + // Reference to the old persp3d object is invalid after reconstruction. + initialize_current_persp3d(); + return; +**/ } sigc::connection SPDocument::connectCommit(SPDocument::CommitSignal::slot_type slot) @@ -716,7 +843,8 @@ SPDocument::removeUndoObserver(Inkscape::UndoStackObserver& observer) this->priv->undoStackObservers.remove(observer); } -SPObject *SPDocument::getObjectById(gchar const *id) { +SPObject *SPDocument::getObjectById(gchar const *id) const +{ g_return_val_if_fail(id != NULL, NULL); GQuark idq = g_quark_from_string(id); @@ -729,7 +857,8 @@ sigc::connection SPDocument::connectIdChanged(gchar const *id, return priv->id_changed_signals[g_quark_from_string(id)].connect(slot); } -void SPDocument::bindObjectToRepr(Inkscape::XML::Node *repr, SPObject *object) { +void SPDocument::bindObjectToRepr(Inkscape::XML::Node *repr, SPObject *object) +{ if (object) { g_assert(g_hash_table_lookup(priv->reprdef, repr) == NULL); g_hash_table_insert(priv->reprdef, repr, object); @@ -739,12 +868,14 @@ void SPDocument::bindObjectToRepr(Inkscape::XML::Node *repr, SPObject *object) { } } -SPObject *SPDocument::getObjectByRepr(Inkscape::XML::Node *repr) { +SPObject *SPDocument::getObjectByRepr(Inkscape::XML::Node *repr) const +{ g_return_val_if_fail(repr != NULL, NULL); return (SPObject*)g_hash_table_lookup(priv->reprdef, repr); } -Glib::ustring SPDocument::getLanguage() { +Glib::ustring SPDocument::getLanguage() const +{ gchar const *document_language = rdf_get_work_entity(this, rdf_find_entity("language")); if (document_language) { while (isspace(*document_language)) @@ -761,7 +892,7 @@ Glib::ustring SPDocument::getLanguage() { } if ( NULL != document_language ) { - gchar *pos = strchr(document_language, '_'); + const char *pos = strchr(document_language, '_'); if ( NULL != pos ) { return Glib::ustring(document_language, pos - document_language); } @@ -775,11 +906,15 @@ Glib::ustring SPDocument::getLanguage() { /* Object modification root handler */ -void -sp_document_request_modified(SPDocument *doc) +void SPDocument::requestModified() { - if (!doc->modified_id) { - doc->modified_id = gtk_idle_add_priority(SP_DOCUMENT_UPDATE_PRIORITY, sp_document_idle_handler, doc); + if (!modified_id) { + modified_id = g_idle_add_full(SP_DOCUMENT_UPDATE_PRIORITY, + sp_document_idle_handler, this, NULL); + } + if (!rerouting_handler_id) { + rerouting_handler_id = g_idle_add_full(SP_DOCUMENT_REROUTING_PRIORITY, + sp_document_rerouting_handler, this, NULL); } } @@ -787,7 +922,7 @@ void sp_document_setup_viewport (SPDocument *doc, SPItemCtx *ctx) { ctx->ctx.flags = 0; - ctx->i2doc = NR::identity(); + ctx->i2doc = Geom::identity(); /* Set up viewport in case svg has it defined as percentages */ if (SP_ROOT(doc->root)->viewBox_set) { // if set, take from viewBox ctx->vp.x0 = SP_ROOT(doc->root)->viewBox.x0; @@ -800,7 +935,7 @@ sp_document_setup_viewport (SPDocument *doc, SPItemCtx *ctx) ctx->vp.x1 = 210 * PX_PER_MM; ctx->vp.y1 = 297 * PX_PER_MM; } - ctx->i2vp = NR::identity(); + ctx->i2vp = Geom::identity(); } /** @@ -817,12 +952,12 @@ SPDocument::_updateDocument() SPItemCtx ctx; sp_document_setup_viewport (this, &ctx); - bool saved = sp_document_get_undo_sensitive(this); - sp_document_set_undo_sensitive(this, false); + bool saved = DocumentUndo::getUndoSensitive(this); + DocumentUndo::setUndoSensitive(this, false); this->root->updateDisplay((SPCtx *)&ctx, 0); - sp_document_set_undo_sensitive(this, saved); + DocumentUndo::setUndoSensitive(this, saved); } this->_emitModified(); } @@ -838,22 +973,44 @@ SPDocument::_updateDocument() * more than 32 iterations. So we bail out if we hit 32 iterations, * since this typically indicates we're stuck in an update loop. */ -gint -sp_document_ensure_up_to_date(SPDocument *doc) +gint SPDocument::ensureUpToDate() { + // Bring the document up-to-date, specifically via the following: + // 1a) Process all document updates. + // 1b) When completed, process connector routing changes. + // 2a) Process any updates resulting from connector reroutings. int counter = 32; - while (!doc->_updateDocument()) { - if (counter == 0) { - g_warning("More than 32 iteration while updating document '%s'", doc->uri); + for (unsigned int pass = 1; pass <= 2; ++pass) { + // Process document updates. + while (!_updateDocument()) { + if (counter == 0) { + g_warning("More than 32 iteration while updating document '%s'", uri); + break; + } + counter--; + } + if (counter == 0) + { break; } - counter--; - } - if (doc->modified_id) { - /* Remove handler */ - gtk_idle_remove(doc->modified_id); - doc->modified_id = 0; + // After updates on the first pass we get libavoid to process all the + // changed objects and provide new routings. This may cause some objects + // to be modified, hence the second update pass. + if (pass == 1) { + router->processTransaction(); + } + } + + if (modified_id) { + // Remove handler + g_source_remove(modified_id); + modified_id = 0; + } + if (rerouting_handler_id) { + // Remove handler + g_source_remove(rerouting_handler_id); + rerouting_handler_id = 0; } return counter>0; } @@ -874,32 +1031,49 @@ sp_document_idle_handler(gpointer data) } } -static bool is_within(NR::Rect const &area, NR::Rect const &box) +/** + * An idle handler to reroute connectors in the document. + */ +static gint +sp_document_rerouting_handler(gpointer data) +{ + // Process any queued movement actions and determine new routings for + // object-avoiding connectors. Callbacks will be used to update and + // redraw affected connectors. + SPDocument *doc = static_cast(data); + doc->router->processTransaction(); + + // We don't need to handle rerouting again until there are further + // diagram updates. + doc->rerouting_handler_id = 0; + return false; +} + +static bool is_within(Geom::Rect const &area, Geom::Rect const &box) { return area.contains(box); } -static bool overlaps(NR::Rect const &area, NR::Rect const &box) +static bool overlaps(Geom::Rect const &area, Geom::Rect const &box) { return area.intersects(box); } -static GSList *find_items_in_area(GSList *s, SPGroup *group, unsigned int dkey, NR::Rect const &area, - bool (*test)(NR::Rect const &, NR::Rect const &), bool take_insensitive = false) +static GSList *find_items_in_area(GSList *s, SPGroup *group, unsigned int dkey, Geom::Rect const &area, + bool (*test)(Geom::Rect const &, Geom::Rect const &), bool take_insensitive = false) { g_return_val_if_fail(SP_IS_GROUP(group), s); - for (SPObject *o = sp_object_first_child(SP_OBJECT(group)) ; o != NULL ; o = SP_OBJECT_NEXT(o) ) { - if (!SP_IS_ITEM(o)) { - continue; - } - if (SP_IS_GROUP(o) && SP_GROUP(o)->effectiveLayerMode(dkey) == SPGroup::LAYER ) { - s = find_items_in_area(s, SP_GROUP(o), dkey, area, test); - } else { - SPItem *child = SP_ITEM(o); - NR::Maybe box = sp_item_bbox_desktop(child); - if ( box && test(area, *box) && (take_insensitive || child->isVisibleAndUnlocked(dkey))) { - s = g_slist_append(s, child); + for ( SPObject *o = group->firstChild() ; o ; o = o->getNext() ) { + if ( SP_IS_ITEM(o) ) { + if (SP_IS_GROUP(o) && SP_GROUP(o)->effectiveLayerMode(dkey) == SPGroup::LAYER ) { + s = find_items_in_area(s, SP_GROUP(o), dkey, area, test); + } else { + SPItem *child = SP_ITEM(o); + Geom::OptRect box = child->getBboxDesktop(); + if ( box && test(area, *box) && (take_insensitive || child->isVisibleAndUnlocked(dkey))) { + s = g_slist_append(s, child); + } } } } @@ -912,48 +1086,45 @@ Returns true if an item is among the descendants of group (recursively). */ bool item_is_in_group(SPItem *item, SPGroup *group) { - for (SPObject *o = sp_object_first_child(SP_OBJECT(group)) ; o != NULL ; o = SP_OBJECT_NEXT(o) ) { - if (!SP_IS_ITEM(o)) continue; - if (SP_ITEM(o) == item) - return true; - if (SP_IS_GROUP(o)) - if (item_is_in_group(item, SP_GROUP(o))) - return true; + bool inGroup = false; + for ( SPObject *o = group->firstChild() ; o && !inGroup; o = o->getNext() ) { + if ( SP_IS_ITEM(o) ) { + if (SP_ITEM(o) == item) { + inGroup = true; + } else if ( SP_IS_GROUP(o) ) { + inGroup = item_is_in_group(item, SP_GROUP(o)); + } + } } - return false; + return inGroup; } -/** -Returns the bottommost item from the list which is at the point, or NULL if none. -*/ -SPItem* -sp_document_item_from_list_at_point_bottom(unsigned int dkey, SPGroup *group, GSList const *list, - NR::Point const p, bool take_insensitive) +SPItem *SPDocument::getItemFromListAtPointBottom(unsigned int dkey, SPGroup *group, GSList const *list,Geom::Point const p, bool take_insensitive) { g_return_val_if_fail(group, NULL); + SPItem *bottomMost = 0; - gdouble delta = prefs_get_double_attribute ("options.cursortolerance", "value", 1.0); + Inkscape::Preferences *prefs = Inkscape::Preferences::get(); + gdouble delta = prefs->getDouble("/options/cursortolerance/value", 1.0); - for (SPObject *o = sp_object_first_child(SP_OBJECT(group)) ; o != NULL ; o = SP_OBJECT_NEXT(o) ) { - - if (!SP_IS_ITEM(o)) continue; - - SPItem *item = SP_ITEM(o); - NRArenaItem *arenaitem = sp_item_get_arenaitem(item, dkey); - if (arenaitem && nr_arena_item_invoke_pick(arenaitem, p, delta, 1) != NULL - && (take_insensitive || item->isVisibleAndUnlocked(dkey))) { - if (g_slist_find((GSList *) list, item) != NULL) - return item; - } + for ( SPObject *o = group->firstChild() ; o && !bottomMost; o = o->getNext() ) { + if ( SP_IS_ITEM(o) ) { + SPItem *item = SP_ITEM(o); + NRArenaItem *arenaitem = item->get_arenaitem(dkey); + if (arenaitem && nr_arena_item_invoke_pick(arenaitem, p, delta, 1) != NULL + && (take_insensitive || item->isVisibleAndUnlocked(dkey))) { + if (g_slist_find((GSList *) list, item) != NULL) { + bottomMost = item; + } + } - if (SP_IS_GROUP(o)) { - SPItem *found = sp_document_item_from_list_at_point_bottom(dkey, SP_GROUP(o), list, p, take_insensitive); - if (found) - return found; + if ( !bottomMost && SP_IS_GROUP(o) ) { + // return null if not found: + bottomMost = getItemFromListAtPointBottom(dkey, SP_GROUP(o), list, p, take_insensitive); + } } - } - return NULL; + return bottomMost; } /** @@ -964,18 +1135,21 @@ items. If upto != NULL, then if item upto is encountered (at any level), stops s upwards in z-order and returns what it has found so far (i.e. the found item is guaranteed to be lower than upto). */ -SPItem* -find_item_at_point(unsigned int dkey, SPGroup *group, NR::Point const p, gboolean into_groups, bool take_insensitive = false, SPItem *upto = NULL) +SPItem *find_item_at_point(unsigned int dkey, SPGroup *group, Geom::Point const p, gboolean into_groups, bool take_insensitive = false, SPItem *upto = NULL) { - SPItem *seen = NULL, *newseen = NULL; - - gdouble delta = prefs_get_double_attribute ("options.cursortolerance", "value", 1.0); + SPItem *seen = NULL; + SPItem *newseen = NULL; + Inkscape::Preferences *prefs = Inkscape::Preferences::get(); + gdouble delta = prefs->getDouble("/options/cursortolerance/value", 1.0); - for (SPObject *o = sp_object_first_child(SP_OBJECT(group)) ; o != NULL ; o = SP_OBJECT_NEXT(o) ) { - if (!SP_IS_ITEM(o)) continue; + for ( SPObject *o = group->firstChild() ; o ; o = o->getNext() ) { + if (!SP_IS_ITEM(o)) { + continue; + } - if (upto && SP_ITEM(o) == upto) + if (upto && SP_ITEM(o) == upto) { break; + } if (SP_IS_GROUP(o) && (SP_GROUP(o)->effectiveLayerMode(dkey) == SPGroup::LAYER || into_groups)) { // if nothing found yet, recurse into the group @@ -985,12 +1159,12 @@ find_item_at_point(unsigned int dkey, SPGroup *group, NR::Point const p, gboolea newseen = NULL; } - if (item_is_in_group(upto, SP_GROUP(o))) + if (item_is_in_group(upto, SP_GROUP(o))) { break; - + } } else { SPItem *child = SP_ITEM(o); - NRArenaItem *arenaitem = sp_item_get_arenaitem(child, dkey); + NRArenaItem *arenaitem = child->get_arenaitem(dkey); // seen remembers the last (topmost) of items pickable at this point if (arenaitem && nr_arena_item_invoke_pick(arenaitem, p, delta, 1) != NULL @@ -1006,15 +1180,16 @@ find_item_at_point(unsigned int dkey, SPGroup *group, NR::Point const p, gboolea Returns the topmost non-layer group from the descendants of group which is at point p, or NULL if none. Recurses into layers but not into groups. */ -SPItem* -find_group_at_point(unsigned int dkey, SPGroup *group, NR::Point const p) +SPItem *find_group_at_point(unsigned int dkey, SPGroup *group, Geom::Point const p) { SPItem *seen = NULL; + Inkscape::Preferences *prefs = Inkscape::Preferences::get(); + gdouble delta = prefs->getDouble("/options/cursortolerance/value", 1.0); - gdouble delta = prefs_get_double_attribute ("options.cursortolerance", "value", 1.0); - - for (SPObject *o = sp_object_first_child(SP_OBJECT(group)) ; o != NULL ; o = SP_OBJECT_NEXT(o) ) { - if (!SP_IS_ITEM(o)) continue; + for ( SPObject *o = group->firstChild() ; o ; o = o->getNext() ) { + if (!SP_IS_ITEM(o)) { + continue; + } if (SP_IS_GROUP(o) && SP_GROUP(o)->effectiveLayerMode(dkey) == SPGroup::LAYER) { SPItem *newseen = find_group_at_point(dkey, SP_GROUP(o), p); if (newseen) { @@ -1023,7 +1198,7 @@ find_group_at_point(unsigned int dkey, SPGroup *group, NR::Point const p) } if (SP_IS_GROUP(o) && SP_GROUP(o)->effectiveLayerMode(dkey) != SPGroup::LAYER ) { SPItem *child = SP_ITEM(o); - NRArenaItem *arenaitem = sp_item_get_arenaitem(child, dkey); + NRArenaItem *arenaitem = child->get_arenaitem(dkey); // seen remembers the last (topmost) of groups pickable at this point if (arenaitem && nr_arena_item_invoke_pick(arenaitem, p, delta, 1) != NULL) { @@ -1040,13 +1215,11 @@ find_group_at_point(unsigned int dkey, SPGroup *group, NR::Point const p) * Assumes box is normalized (and g_asserts it!) * */ - -GSList *sp_document_items_in_box(SPDocument *document, unsigned int dkey, NR::Rect const &box) +GSList *SPDocument::getItemsInBox(unsigned int dkey, Geom::Rect const &box) const { - g_return_val_if_fail(document != NULL, NULL); - g_return_val_if_fail(document->priv != NULL, NULL); + g_return_val_if_fail(this->priv != NULL, NULL); - return find_items_in_area(NULL, SP_GROUP(document->root), dkey, box, is_within); + return find_items_in_area(NULL, SP_GROUP(this->root), dkey, box, is_within); } /* @@ -1056,127 +1229,117 @@ GSList *sp_document_items_in_box(SPDocument *document, unsigned int dkey, NR::Re * */ -GSList *sp_document_partial_items_in_box(SPDocument *document, unsigned int dkey, NR::Rect const &box) +GSList *SPDocument::getItemsPartiallyInBox(unsigned int dkey, Geom::Rect const &box) const { - g_return_val_if_fail(document != NULL, NULL); - g_return_val_if_fail(document->priv != NULL, NULL); + g_return_val_if_fail(this->priv != NULL, NULL); - return find_items_in_area(NULL, SP_GROUP(document->root), dkey, box, overlaps); + return find_items_in_area(NULL, SP_GROUP(this->root), dkey, box, overlaps); } -GSList * -sp_document_items_at_points(SPDocument *document, unsigned const key, std::vector points) +GSList *SPDocument::getItemsAtPoints(unsigned const key, std::vector points) const { GSList *items = NULL; + Inkscape::Preferences *prefs = Inkscape::Preferences::get(); // When picking along the path, we don't want small objects close together // (such as hatching strokes) to obscure each other by their deltas, // so we temporarily set delta to a small value - gdouble saved_delta = prefs_get_double_attribute ("options.cursortolerance", "value", 1.0); - prefs_set_double_attribute ("options.cursortolerance", "value", 0.25); + gdouble saved_delta = prefs->getDouble("/options/cursortolerance/value", 1.0); + prefs->setDouble("/options/cursortolerance/value", 0.25); for(unsigned int i = 0; i < points.size(); i++) { - SPItem *item = sp_document_item_at_point(document, key, points[i], - false, NULL); + SPItem *item = getItemAtPoint(key, points[i], + false, NULL); if (item && !g_slist_find(items, item)) items = g_slist_prepend (items, item); } // and now we restore it back - prefs_set_double_attribute ("options.cursortolerance", "value", saved_delta); + prefs->setDouble("/options/cursortolerance/value", saved_delta); return items; } -SPItem * -sp_document_item_at_point(SPDocument *document, unsigned const key, NR::Point const p, - gboolean const into_groups, SPItem *upto) +SPItem *SPDocument::getItemAtPoint( unsigned const key, Geom::Point const p, + gboolean const into_groups, SPItem *upto) const { - g_return_val_if_fail(document != NULL, NULL); - g_return_val_if_fail(document->priv != NULL, NULL); + g_return_val_if_fail(this->priv != NULL, NULL); - return find_item_at_point(key, SP_GROUP(document->root), p, into_groups, false, upto); + return find_item_at_point(key, SP_GROUP(this->root), p, into_groups, false, upto); } -SPItem* -sp_document_group_at_point(SPDocument *document, unsigned int key, NR::Point const p) +SPItem *SPDocument::getGroupAtPoint(unsigned int key, Geom::Point const p) const { - g_return_val_if_fail(document != NULL, NULL); - g_return_val_if_fail(document->priv != NULL, NULL); + g_return_val_if_fail(this->priv != NULL, NULL); - return find_group_at_point(key, SP_GROUP(document->root), p); + return find_group_at_point(key, SP_GROUP(this->root), p); } -/* Resource management */ +// Resource management -gboolean -sp_document_add_resource(SPDocument *document, gchar const *key, SPObject *object) +bool SPDocument::addResource(gchar const *key, SPObject *object) { - GSList *rlist; - GQuark q = g_quark_from_string(key); + g_return_val_if_fail(key != NULL, false); + g_return_val_if_fail(*key != '\0', false); + g_return_val_if_fail(object != NULL, false); + g_return_val_if_fail(SP_IS_OBJECT(object), false); - g_return_val_if_fail(document != NULL, FALSE); - g_return_val_if_fail(key != NULL, FALSE); - g_return_val_if_fail(*key != '\0', FALSE); - g_return_val_if_fail(object != NULL, FALSE); - g_return_val_if_fail(SP_IS_OBJECT(object), FALSE); + bool result = false; - if (SP_OBJECT_IS_CLONED(object)) - return FALSE; + if ( !object->cloned ) { + GSList *rlist = (GSList*)g_hash_table_lookup(priv->resources, key); + g_return_val_if_fail(!g_slist_find(rlist, object), false); + rlist = g_slist_prepend(rlist, object); + g_hash_table_insert(priv->resources, (gpointer) key, rlist); - rlist = (GSList*)g_hash_table_lookup(document->priv->resources, key); - g_return_val_if_fail(!g_slist_find(rlist, object), FALSE); - rlist = g_slist_prepend(rlist, object); - g_hash_table_insert(document->priv->resources, (gpointer) key, rlist); + GQuark q = g_quark_from_string(key); + priv->resources_changed_signals[q].emit(); - document->priv->resources_changed_signals[q].emit(); + result = true; + } - return TRUE; + return result; } -gboolean -sp_document_remove_resource(SPDocument *document, gchar const *key, SPObject *object) +bool SPDocument::removeResource(gchar const *key, SPObject *object) { - GSList *rlist; - GQuark q = g_quark_from_string(key); + g_return_val_if_fail(key != NULL, false); + g_return_val_if_fail(*key != '\0', false); + g_return_val_if_fail(object != NULL, false); + g_return_val_if_fail(SP_IS_OBJECT(object), false); - g_return_val_if_fail(document != NULL, FALSE); - g_return_val_if_fail(key != NULL, FALSE); - g_return_val_if_fail(*key != '\0', FALSE); - g_return_val_if_fail(object != NULL, FALSE); - g_return_val_if_fail(SP_IS_OBJECT(object), FALSE); + bool result = false; - if (SP_OBJECT_IS_CLONED(object)) - return FALSE; + if ( !object->cloned ) { + GSList *rlist = (GSList*)g_hash_table_lookup(priv->resources, key); + g_return_val_if_fail(rlist != NULL, false); + g_return_val_if_fail(g_slist_find(rlist, object), false); + rlist = g_slist_remove(rlist, object); + g_hash_table_insert(priv->resources, (gpointer) key, rlist); - rlist = (GSList*)g_hash_table_lookup(document->priv->resources, key); - g_return_val_if_fail(rlist != NULL, FALSE); - g_return_val_if_fail(g_slist_find(rlist, object), FALSE); - rlist = g_slist_remove(rlist, object); - g_hash_table_insert(document->priv->resources, (gpointer) key, rlist); + GQuark q = g_quark_from_string(key); + priv->resources_changed_signals[q].emit(); - document->priv->resources_changed_signals[q].emit(); + result = true; + } - return TRUE; + return result; } -GSList const * -sp_document_get_resource_list(SPDocument *document, gchar const *key) +GSList const *SPDocument::getResourceList(gchar const *key) const { - g_return_val_if_fail(document != NULL, NULL); g_return_val_if_fail(key != NULL, NULL); g_return_val_if_fail(*key != '\0', NULL); - return (GSList*)g_hash_table_lookup(document->priv->resources, key); + return (GSList*)g_hash_table_lookup(this->priv->resources, key); } -sigc::connection sp_document_resources_changed_connect(SPDocument *document, - gchar const *key, - SPDocument::ResourcesChangedSignal::slot_type slot) +sigc::connection SPDocument::connectResourcesChanged(gchar const *key, + SPDocument::ResourcesChangedSignal::slot_type slot) { GQuark q = g_quark_from_string(key); - return document->priv->resources_changed_signals[q].connect(slot); + return this->priv->resources_changed_signals[q].connect(slot); } /* Helpers */ @@ -1188,44 +1351,40 @@ sp_document_resource_list_free(gpointer /*key*/, gpointer value, gpointer /*data return TRUE; } -unsigned int -count_objects_recursive(SPObject *obj, unsigned int count) +unsigned int count_objects_recursive(SPObject *obj, unsigned int count) { count++; // obj itself - for (SPObject *i = sp_object_first_child(obj); i != NULL; i = SP_OBJECT_NEXT(i)) { + for ( SPObject *i = obj->firstChild(); i; i = i->getNext() ) { count = count_objects_recursive(i, count); } return count; } -unsigned int -objects_in_document(SPDocument *document) +unsigned int objects_in_document(SPDocument *document) { - return count_objects_recursive(SP_DOCUMENT_ROOT(document), 0); + return count_objects_recursive(document->getRoot(), 0); } -void -vacuum_document_recursive(SPObject *obj) +void vacuum_document_recursive(SPObject *obj) { if (SP_IS_DEFS(obj)) { - for (SPObject *def = obj->firstChild(); def; def = SP_OBJECT_NEXT(def)) { - /* fixme: some inkscape-internal nodes in the future might not be collectable */ + for ( SPObject *def = obj->firstChild(); def; def = def->getNext()) { + // fixme: some inkscape-internal nodes in the future might not be collectable def->requestOrphanCollection(); } } else { - for (SPObject *i = sp_object_first_child(obj); i != NULL; i = SP_OBJECT_NEXT(i)) { + for ( SPObject *i = obj->firstChild(); i; i = i->getNext() ) { vacuum_document_recursive(i); } } } -unsigned int -vacuum_document(SPDocument *document) +unsigned int SPDocument::vacuumDocument() { - unsigned int start = objects_in_document(document); - unsigned int end; + unsigned int start = objects_in_document(this); + unsigned int end = start; unsigned int newend = start; unsigned int iterations = 0; @@ -1233,11 +1392,11 @@ vacuum_document(SPDocument *document) do { end = newend; - vacuum_document_recursive(SP_DOCUMENT_ROOT(document)); - document->collectOrphans(); + vacuum_document_recursive(root); + this->collectOrphans(); iterations++; - newend = objects_in_document(document); + newend = objects_in_document(this); } while (iterations < 100 && newend < end); @@ -1258,4 +1417,4 @@ bool SPDocument::isSeeking() const { 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 :