![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/document.cpp b/src/document.cpp
index ebc65830f1bbc90c9db4969b5ea5129cf8c8aed1..a61dffc0b4a1c3fd78d7a9045dc88c51dcc1ab86 100644 (file)
--- a/src/document.cpp
+++ b/src/document.cpp
static gint sp_document_idle_handler(gpointer data);
-// JON: This must stay as gboolean because its used as a callback into
-// our legacy c stuff in here. Would like to make bool
gboolean sp_document_resource_list_free(gpointer key, gpointer value, gpointer data);
static gint doc_count = 0;
p->history_size = 0;
p->undo = NULL;
p->redo = NULL;
-
- p->undoStackObservers.add(p->event_log);
- p->event_log.setDocument(this);
+ p->seeking = false;
priv = p;
collectOrphans();
if (priv) {
- inkscape_remove_document(this);
-
if (priv->partial) {
sp_repr_free_log(priv->partial);
priv->partial = NULL;
Inkscape::XML::Node *rroot;
Inkscape::Version sodipodi_version;
- rroot = sp_repr_document_root(rdoc);
+ rroot = rdoc->root();
document = new SPDocument();
/* Quick hack 3 - Set uri attributes */
if (uri) {
- /* fixme: Think, what this means for images (Lauris) */
rroot->setAttribute("sodipodi:docname", uri);
- if (document->base)
- rroot->setAttribute("sodipodi:docbase", document->base);
}
/* End of quick hack 3 */
// 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
- rnew = r->duplicate();
+ rnew = r->duplicate(rroot->document());
}
// insert into the document
rroot->addChild(rnew, NULL);
/* 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()) {
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));
}
- inkscape_add_document(document);
return document;
}
rdoc = sp_repr_read_file(uri, SP_SVG_NS_URI);
/* If file cannot be loaded, return NULL without warning */
if (rdoc == NULL) return NULL;
- rroot = sp_repr_document_root(rdoc);
+ rroot = rdoc->root();
/* If xml file is not svg, return NULL without warning */
/* fixme: destroy document */
if (strcmp(rroot->name(), "svg:svg") != 0) return NULL;
@@ -395,7 +385,7 @@ sp_document_new_from_mem(gchar const *buffer, gint length, unsigned int keepaliv
/* If it cannot be loaded, return NULL without warning */
if (rdoc == NULL) return NULL;
- rroot = sp_repr_document_root(rdoc);
+ rroot = rdoc->root();
/* If xml file is not svg, return NULL without warning */
/* fixme: destroy document */
if (strcmp(rroot->name(), "svg:svg") != 0) return NULL;
@@ -409,7 +399,6 @@ sp_document_new_from_mem(gchar const *buffer, gint length, unsigned int keepaliv
SPDocument *sp_document_new_dummy() {
SPDocument *document = new SPDocument();
- inkscape_add_document(document);
return document;
}
*/
void SPDocument::fitToRect(NRRect const & rect)
{
- g_return_if_fail(!empty(rect));
+ g_return_if_fail(!nr_rect_d_test_empty(&rect));
gdouble w = rect.x1 - rect.x0;
gdouble h = rect.y1 - rect.y0;
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);
- if (document->base)
- repr->setAttribute("sodipodi:docbase", document->base);
+ sp_document_set_undo_sensitive(document, false);
repr->setAttribute("sodipodi:docname", document->name);
sp_document_set_undo_sensitive(document, saved);
this->priv->undoStackObservers.remove(observer);
}
-Inkscape::EventLog&
-SPDocument::getEventLog() const
-{
- return priv->event_log;
-}
-
SPObject *SPDocument::getObjectById(gchar const *id) {
g_return_val_if_fail(id != NULL, NULL);
sp_document_setup_viewport (this, &ctx);
bool saved = sp_document_get_undo_sensitive(this);
- sp_document_set_undo_sensitive(this, FALSE);
+ sp_document_set_undo_sensitive(this, false);
this->root->updateDisplay((SPCtx *)&ctx, 0);
s = find_items_in_area(s, SP_GROUP(o), dkey, area, test);
} else {
SPItem *child = SP_ITEM(o);
- NR::Rect box = sp_item_bbox_desktop(child);
- if (test(area, box) && (take_insensitive || child->isVisibleAndUnlocked(dkey))) {
+ NR::Maybe<NR::Rect> box = sp_item_bbox_desktop(child);
+ if ( box && test(area, *box) && (take_insensitive || child->isVisibleAndUnlocked(dkey))) {
s = g_slist_append(s, child);
}
}
guaranteed to be lower than upto).
*/
SPItem*
-find_item_at_point(unsigned int dkey, SPGroup *group, NR::Point const p, bool into_groups, bool take_insensitive = false, SPItem *upto = NULL)
+find_item_at_point(unsigned int dkey, SPGroup *group, NR::Point const p, gboolean into_groups, bool take_insensitive = false, SPItem *upto = NULL)
{
SPItem *seen = NULL, *newseen = NULL;
@@ -1015,9 +996,33 @@ GSList *sp_document_partial_items_in_box(SPDocument *document, unsigned int dkey
return find_items_in_area(NULL, SP_GROUP(document->root), dkey, box, overlaps);
}
+GSList *
+sp_document_items_at_points(SPDocument *document, unsigned const key, std::vector<NR::Point> points)
+{
+ GSList *items = NULL;
+
+ // 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);
+
+ for(unsigned int i = 0; i < points.size(); i++) {
+ SPItem *item = sp_document_item_at_point(document, 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);
+
+ return items;
+}
+
SPItem *
sp_document_item_at_point(SPDocument *document, unsigned const key, NR::Point const p,
- bool const into_groups, SPItem *upto)
+ gboolean const into_groups, SPItem *upto)
{
g_return_val_if_fail(document != NULL, NULL);
g_return_val_if_fail(document->priv != NULL, NULL);
@@ -1037,7 +1042,7 @@ sp_document_group_at_point(SPDocument *document, unsigned int key, NR::Point con
/* Resource management */
-bool
+gboolean
sp_document_add_resource(SPDocument *document, gchar const *key, SPObject *object)
{
GSList *rlist;
@@ -1062,7 +1067,7 @@ sp_document_add_resource(SPDocument *document, gchar const *key, SPObject *objec
return TRUE;
}
-bool
+gboolean
sp_document_remove_resource(SPDocument *document, gchar const *key, SPObject *object)
{
GSList *rlist;
/* Helpers */
-// JON: This must stay this way because it is used as a callback for
-// legacy glib code which needs to be moved to glibmm
gboolean
sp_document_resource_list_free(gpointer key, gpointer value, gpointer data)
{
return start - newend;
}
+bool SPDocument::isSeeking() const {
+ return priv->seeking;
+}
+
/*
Local Variables: