X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fdocument-subset.cpp;h=aa4046d864605f112fdbdb157281cd3548bab46c;hb=e5d48f600ce8a65ae81353fd39860227b2ef6e60;hp=d156b045b23dab2d2f58525e24f600ddb65f8995;hpb=995ef36b2f4a73356bc05e380e05f1a66c8b2c8a;p=inkscape.git

diff --git a/src/document-subset.cpp b/src/document-subset.cpp
index d156b045b..aa4046d86 100644
--- a/src/document-subset.cpp
+++ b/src/document-subset.cpp
@@ -36,10 +36,10 @@ struct DocumentSubset::Relations : public GC::Managed<GC::ATOMIC>,
         SPObject *parent;
         Siblings children;
 
-        gulong release_connection;
+        sigc::connection release_connection;
         sigc::connection position_changed_connection;
 
-        Record() : parent(NULL), release_connection(0) {}
+        Record() : parent(NULL) {}
 
         unsigned childIndex(SPObject *obj) {
             Siblings::iterator found;
@@ -57,17 +57,31 @@ struct DocumentSubset::Relations : public GC::Managed<GC::ATOMIC>,
             } else {
                 Siblings::const_iterator first=children.begin();
                 Siblings::const_iterator last=children.end() - 1;
+
                 while ( first != last ) {
-                    Siblings::const_iterator mid=first + ( last - first + 1 ) / 2;
-                    int pos=sp_object_compare_position(*mid, obj);
+                    Siblings::const_iterator mid = first + ( last - first + 1 ) / 2;
+                    int pos = sp_object_compare_position(*mid, obj);
                     if ( pos < 0 ) {
                         first = mid;
                     } else if ( pos > 0 ) {
-                        last = mid;
+                        if ( last == mid ) {
+                            last = mid - 1; // already at the top limit
+                        } else {
+                            last = mid;
+                        }
                     } else {
                         g_assert_not_reached();
                     }
                 }
+
+                if ( first == last ) {
+                    // compare to the single possiblity left
+                    int pos = sp_object_compare_position(*last, obj);
+                    if ( pos < 0 ) {
+                        last++;
+                    }
+                }
+
                 return last - children.begin();
             }
         }
@@ -126,7 +140,12 @@ struct DocumentSubset::Relations : public GC::Managed<GC::ATOMIC>,
         for ( Map::iterator iter=records.begin()
             ; iter != records.end() ; ++iter )
         {
-            sp_object_unref((*iter).first);
+            if ((*iter).first) {
+                sp_object_unref((*iter).first);
+                Record &record=(*iter).second;
+                record.release_connection.disconnect();
+                record.position_changed_connection.disconnect();
+            }
         }
     }
 
@@ -142,14 +161,16 @@ struct DocumentSubset::Relations : public GC::Managed<GC::ATOMIC>,
     void addOne(SPObject *obj);
     void remove(SPObject *obj, bool subtree);
     void reorder(SPObject *obj);
+    void clear();
 
 private:
     Record &_doAdd(SPObject *obj) {
         sp_object_ref(obj);
         Record &record=records[obj];
         record.release_connection
-          = g_signal_connect(obj, "release",
-                             (GCallback)&Relations::_release_object, this);
+          = obj->connectRelease(
+              sigc::mem_fun(this, &Relations::_release_object)
+            );
         record.position_changed_connection
           = obj->connectPositionChanged(
               sigc::mem_fun(this, &Relations::reorder)
@@ -163,12 +184,20 @@ private:
 
     void _doRemove(SPObject *obj) {
         Record &record=records[obj];
-        if (record.release_connection) {
-            g_signal_handler_disconnect(obj, record.release_connection);
-            record.release_connection = 0;
-        }
+        record.release_connection.disconnect();
         record.position_changed_connection.disconnect();
         records.erase(obj);
+
+        if ( record.parent == NULL ) {
+            Record &root = records[NULL];
+            for ( Siblings::iterator it = root.children.begin(); it != root.children.end(); ++it ) {
+                if ( *it == obj ) {
+                    root.children.erase( it );
+                    break;
+                }
+            }
+        }
+
         removed_signal.emit(obj);
         sp_object_unref(obj);
     }
@@ -186,22 +215,21 @@ private:
         }
     }
 
-    static void _release_object(SPObject *obj, void *relations_p) {
-        Relations &relations=*static_cast<Relations *>(relations_p);
-        if (relations.get(obj)) {
-            relations.remove(obj, true);
+    void _release_object(SPObject *obj) {
+        if (get(obj)) {
+            remove(obj, true);
         }
     }
 };
 
-DocumentSubset::DocumentSubset(SPDocument *document)
-: _document(document), _relations(new DocumentSubset::Relations())
+DocumentSubset::DocumentSubset()
+: _relations(new DocumentSubset::Relations())
 {
 }
 
 void DocumentSubset::Relations::addOne(SPObject *obj) {
     g_return_if_fail( obj != NULL );
-    g_return_if_fail( get(obj) != NULL );
+    g_return_if_fail( get(obj) == NULL );
 
     Record &record=_doAdd(obj);
 
@@ -277,6 +305,16 @@ void DocumentSubset::Relations::remove(SPObject *obj, bool subtree) {
     changed_signal.emit();
 }
 
+void DocumentSubset::Relations::clear() {
+    Record &root=records[NULL];
+
+    while (!root.children.empty()) {
+        _doRemoveSubtree(root.children.front());
+    }
+
+    changed_signal.emit();
+}
+
 void DocumentSubset::Relations::reorder(SPObject *obj) {
     SPObject::ParentIterator parent=obj;
 
@@ -316,6 +354,10 @@ void DocumentSubset::_remove(SPObject *obj, bool subtree) {
     _relations->remove(obj, subtree);
 }
 
+void DocumentSubset::_clear() {
+    _relations->clear();
+}
+
 bool DocumentSubset::includes(SPObject *obj) const {
     return _relations->get(obj);
 }