![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/document.cpp b/src/document.cpp
index 71f607b6524dcdc2e88a1c974c565243c1d830fc..9fc6dc4dae13491a348cbecf999dbe60164a39e8 100644 (file)
--- a/src/document.cpp
+++ b/src/document.cpp
// Initialise instance of connector router.
router = new Avoid::Router();
+ // Don't use the Consolidate moves optimisation.
+ router->ConsolidateMoves = false;
p = new SPDocumentPrivate();
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);
+ root->releaseReferences();
sp_object_unref(root);
root = NULL;
}
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()) {
// 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;
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)