![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/document.cpp b/src/document.cpp
index f69c480f75e4a3f108cfdc9ce792283d166a3d4f..9fc6dc4dae13491a348cbecf999dbe60164a39e8 100644 (file)
--- a/src/document.cpp
+++ b/src/document.cpp
/** \class SPDocument
* SPDocument serves as the container of both model trees (agnostic XML
* and typed object tree), and implements all of the document-level
- * functionality used by the program. Many document level operations, like
+ * functionality used by the program. Many document level operations, like
* load, save, print, export and so on, use SPDocument as their basic datatype.
*
* SPDocument implements undo and redo stacks and an id-based object
#include "dir-util.h"
#include "unit-constants.h"
#include "prefs-utils.h"
+#include "libavoid/router.h"
+#include "libnr/nr-rect.h"
+#include "sp-item-group.h"
#include "display/nr-arena-item.h"
_collection_queue = NULL;
+ // Initialise instance of connector router.
+ router = new Avoid::Router();
+ // Don't use the Consolidate moves optimisation.
+ router->ConsolidateMoves = false;
+
p = new SPDocumentPrivate();
p->iddef = g_hash_table_new(g_direct_hash, g_direct_equal);
p->redo = NULL;
priv = p;
+
+ // XXX only for testing!
+ priv->undoStackObservers.add(p->console_output_undo_observer);
}
SPDocument::~SPDocument() {
sp_document_clear_undo(this);
if (root) {
- sp_object_invoke_release(root);
- g_object_unref(G_OBJECT(root));
+ root->releaseReferences();
+ sp_object_unref(root);
root = NULL;
}
keepalive = FALSE;
}
+ if (router) {
+ delete router;
+ router = NULL;
+ }
+
//delete this->_whiteboard_session_manager;
}
{
actionkey = NULL;
}
-
-static SPDocument *
+
+SPDocument *
sp_document_create(Inkscape::XML::Document *rdoc,
gchar const *uri,
gchar const *base,
// see if there's a template with id="base" in the preferences
if (!r) {
// if there's none, create an empty element
- rnew = sp_repr_new("sodipodi:namedview");
+ rnew = rdoc->createElement("sodipodi:namedview");
rnew->setAttribute("id", "base");
} else {
// otherwise, take from preferences
/* Defs */
if (!SP_ROOT(document->root)->defs) {
Inkscape::XML::Node *r;
- r = sp_repr_new("svg:defs");
+ r = rdoc->createElement("svg:defs");
rroot->addChild(r, NULL);
Inkscape::GC::release(r);
g_assert(SP_ROOT(document->root)->defs);
inkscape_ref();
}
- sp_document_set_undo_sensitive(document, TRUE);
+ sp_document_set_undo_sensitive(document, true);
// reset undo key when selection changes, so that same-key actions on different objects are not coalesced
if (!Inkscape::NSApplication::Application::getNewGui()) {
}
/**
- * Fetches document from URI, or creates new, if NULL; public document
+ * Fetches document from URI, or creates new, if NULL; public document
* appears in document list.
*/
SPDocument *
return SP_ROOT(document->root)->height.computed;
}
+/**
+ * Given an NRRect 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.
+ */
+void SPDocument::fitToRect(NRRect const & rect)
+{
+ g_return_if_fail(!empty(rect));
+
+ gdouble w = rect.x1 - rect.x0;
+ gdouble h = rect.y1 - rect.y0;
+ gdouble old_height = sp_document_height(this);
+ SPUnit unit = sp_unit_get_by_id(SP_UNIT_PX);
+ sp_document_set_width(this, w, &unit);
+ sp_document_set_height(this, h, &unit);
+
+ NR::translate tr = NR::translate::translate(-rect.x0,-(rect.y0 + (h - old_height)));
+ static_cast<SPGroup *>(root)->translateChildItems(tr);
+}
+
void sp_document_set_uri(SPDocument *document, gchar const *uri)
{
g_return_if_fail(document != NULL);
// Update saveable repr attributes.
Inkscape::XML::Node *repr = sp_document_repr_root(document);
// changing uri in the document repr must not be not undoable
- gboolean saved = sp_document_get_undo_sensitive(document);
- sp_document_set_undo_sensitive(document, FALSE);
+ bool saved = sp_document_get_undo_sensitive(document);
+ sp_document_set_undo_sensitive(document, false);
if (document->base)
repr->setAttribute("sodipodi:docbase", document->base);
return;
}
+sigc::connection SPDocument::connectCommit(SPDocument::CommitSignal::slot_type slot)
+{
+ return priv->commit_signal.connect(slot);
+}
+
+
void SPDocument::_emitModified() {
static guint const flags = SP_OBJECT_MODIFIED_FLAG | SP_OBJECT_CHILD_MODIFIED_FLAG | SP_OBJECT_PARENT_MODIFIED_FLAG;
return (SPObject*)g_hash_table_lookup(priv->reprdef, repr);
}
+Glib::ustring SPDocument::getLanguage() {
+ gchar const *document_language = rdf_get_work_entity(this, rdf_find_entity("language"));
+ if (document_language) {
+ while (isspace(*document_language))
+ document_language++;
+ }
+ if ( !document_language || 0 == *document_language) {
+ // retrieve system language
+ document_language = getenv("LC_ALL");
+ if ( NULL == document_language || *document_language == 0 ) {
+ document_language = getenv ("LC_MESSAGES");
+ }
+ if ( NULL == document_language || *document_language == 0 ) {
+ document_language = getenv ("LANG");
+ }
+
+ if ( NULL != document_language ) {
+ gchar *pos = strchr(document_language, '_');
+ if ( NULL != pos ) {
+ return Glib::ustring(document_language, pos - document_language);
+ }
+ }
+ }
+
+ if ( NULL == document_language )
+ return Glib::ustring();
+ return document_language;
+}
+
/* Object modification root handler */
void
ctx->i2vp = NR::identity();
}
+/**
+ * Tries to update the document state based on the modified and
+ * "update required" flags, and return true if the document has
+ * been brought fully up to date.
+ */
+bool
+SPDocument::_updateDocument()
+{
+ /* Process updates */
+ if (this->root->uflags || this->root->mflags) {
+ if (this->root->uflags) {
+ SPItemCtx ctx;
+ sp_document_setup_viewport (this, &ctx);
+
+ bool saved = sp_document_get_undo_sensitive(this);
+ sp_document_set_undo_sensitive(this, false);
+
+ this->root->updateDisplay((SPCtx *)&ctx, 0);
+
+ sp_document_set_undo_sensitive(this, saved);
+ }
+ this->_emitModified();
+ }
+
+ return !(this->root->uflags || this->root->mflags);
+}
+
+
+/**
+ * Repeatedly works on getting the document updated, since sometimes
+ * it takes more than one pass to get the document updated. But it
+ * usually should not take more than a few loops, and certainly never
+ * 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)
{
- int lc;
- lc = 32;
- while (doc->root->uflags || doc->root->mflags) {
- lc -= 1;
- if (lc < 0) {
- g_warning("More than 32 iterations while updating document '%s'", doc->uri);
- if (doc->modified_id) {
- /* Remove handler */
- gtk_idle_remove(doc->modified_id);
- doc->modified_id = 0;
- }
- return FALSE;
- }
- /* Process updates */
- if (doc->root->uflags) {
- SPItemCtx ctx;
- sp_document_setup_viewport (doc, &ctx);
- doc->root->updateDisplay((SPCtx *)&ctx, 0);
+ int counter = 32;
+ while (!doc->_updateDocument()) {
+ if (counter == 0) {
+ g_warning("More than 32 iteration while updating document '%s'", doc->uri);
+ break;
}
- doc->_emitModified();
+ counter--;
}
+
if (doc->modified_id) {
/* Remove handler */
gtk_idle_remove(doc->modified_id);
doc->modified_id = 0;
}
- return TRUE;
+ return counter>0;
}
+/**
+ * An idle handler to update the document. Returns true if
+ * the document needs further updates.
+ */
static gint
sp_document_idle_handler(gpointer data)
{
- SPDocument *doc;
- int repeat;
-
- doc = static_cast<SPDocument *>(data);
-
-#ifdef SP_DOCUMENT_DEBUG_IDLE
- g_print("->\n");
-#endif
-
- /* Process updates */
- if (doc->root->uflags) {
- SPItemCtx ctx;
- sp_document_setup_viewport (doc, &ctx);
-
- gboolean saved = sp_document_get_undo_sensitive(doc);
- sp_document_set_undo_sensitive(doc, FALSE);
-
- doc->root->updateDisplay((SPCtx *)&ctx, 0);
-
- sp_document_set_undo_sensitive(doc, saved);
- /* if (doc->root->uflags & SP_OBJECT_MODIFIED_FLAG) return TRUE; */
+ SPDocument *doc = static_cast<SPDocument *>(data);
+ if (doc->_updateDocument()) {
+ doc->modified_id = 0;
+ return false;
+ } else {
+ return true;
}
-
- doc->_emitModified();
-
- repeat = (doc->root->uflags || doc->root->mflags);
- if (!repeat) doc->modified_id = 0;
- return repeat;
}
static bool is_within(NR::Rect const &area, NR::Rect const &box)
@@ -986,6 +1063,9 @@ sp_document_remove_resource(SPDocument *document, gchar const *key, SPObject *ob
g_return_val_if_fail(object != NULL, FALSE);
g_return_val_if_fail(SP_IS_OBJECT(object), FALSE);
+ if (SP_OBJECT_IS_CLONED(object))
+ return FALSE;
+
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);