![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/layer-manager.cpp b/src/layer-manager.cpp
index 01af95424e53d6dec6bbdbcf2b42560d5b8b7a6b..e6a34852d9dc6c2baf7bda49d03fe96b96eee526 100644 (file)
--- a/src/layer-manager.cpp
+++ b/src/layer-manager.cpp
* Released under GNU GPL, read the file 'COPYING' for more information
*/
+#include <set>
#include <sigc++/functors/mem_fun.h>
#include <sigc++/adaptors/hide.h>
#include "gc-managed.h"
#include "gc-finalized.h"
#include "document.h"
#include "desktop.h"
+#include "desktop-handles.h"
#include "layer-manager.h"
+#include "prefs-utils.h"
#include "ui/view/view.h"
+#include "selection.h"
#include "sp-object.h"
+#include "xml/node.h"
+#include "xml/node-observer.h"
namespace Inkscape {
+
+using Inkscape::XML::Node;
+
+class LayerManager::LayerWatcher : public Inkscape::XML::NodeObserver {
+public:
+ LayerWatcher(LayerManager* mgr, SPObject* obj, sigc::connection c) :
+ _mgr(mgr),
+ _obj(obj),
+ _connection(c),
+ _lockedAttr(g_quark_from_string("sodipodi:insensitive")),
+ _labelAttr(g_quark_from_string("inkscape:label"))
+ {}
+
+ virtual void notifyChildAdded( Node &node, Node &child, Node *prev ) {}
+ virtual void notifyChildRemoved( Node &node, Node &child, Node *prev ) {}
+ virtual void notifyChildOrderChanged( Node &node, Node &child, Node *old_prev, Node *new_prev ) {}
+ virtual void notifyContentChanged( Node &node, Util::ptr_shared<char> old_content, Util::ptr_shared<char> new_content ) {}
+ virtual void notifyAttributeChanged( Node &node, GQuark name, Util::ptr_shared<char> old_value, Util::ptr_shared<char> new_value ) {
+ if ( name == _lockedAttr || name == _labelAttr ) {
+ if ( _mgr && _obj ) {
+ _mgr->_objectModified( _obj, 0 );
+ }
+ }
+ }
+
+ LayerManager* _mgr;
+ SPObject* _obj;
+ sigc::connection _connection;
+ GQuark _lockedAttr;
+ GQuark _labelAttr;
+};
+
+
LayerManager::LayerManager(SPDesktop *desktop)
: _desktop(desktop), _document(NULL)
{
- _layer_connection = desktop->connectCurrentLayerChanged(sigc::hide<0>(sigc::mem_fun(*this, &LayerManager::_rebuild)));
- _document_connection = desktop->connectDocumentReplaced(sigc::hide<0>(sigc::mem_fun(*this, &LayerManager::_setDocument)));
+ _layer_connection = desktop->connectCurrentLayerChanged( sigc::mem_fun(*this, &LayerManager::_selectedLayerChanged) );
+
+ sigc::bound_mem_functor1<void, Inkscape::LayerManager, SPDocument*> first = sigc::mem_fun(*this, &LayerManager::_setDocument);
+
+ // This next line has problems on gcc 4.0.2
+ sigc::slot<void, SPDocument*> base2 = first;
+
+ sigc::slot<void,SPDesktop*,SPDocument*> slot2 = sigc::hide<0>( base2 );
+ _document_connection = desktop->connectDocumentReplaced( slot2 );
+
_setDocument(desktop->doc());
}
+
+void LayerManager::setCurrentLayer( SPObject* obj )
+{
+ //g_return_if_fail( _desktop->currentRoot() );
+ if ( _desktop->currentRoot() ) {
+ _desktop->setCurrentLayer( obj );
+
+ if ( prefs_get_int_attribute_limited("options.selection", "layerdeselect", 1, 0, 1) ) {
+ sp_desktop_selection( _desktop )->clear();
+ }
+ }
+}
+
+void LayerManager::renameLayer( SPObject* obj, gchar const *label )
+{
+ Glib::ustring incoming( label ? label : "" );
+ Glib::ustring result(incoming);
+ Glib::ustring base(incoming);
+ guint startNum = 1;
+
+ Glib::ustring::size_type pos = base.rfind('#');
+ if ( pos != Glib::ustring::npos ) {
+ gchar* numpart = g_strdup(base.substr(pos+1).c_str());
+ if ( numpart ) {
+ gchar* endPtr = 0;
+ guint64 val = g_ascii_strtoull( numpart, &endPtr, 10);
+ if ( ((val > 0) || (endPtr != numpart)) && (val < 65536) ) {
+ base.erase( pos );
+ result = base;
+ startNum = static_cast<int>(val);
+ }
+ g_free(numpart);
+ }
+ }
+
+ std::set<Glib::ustring> currentNames;
+ GSList const *layers=sp_document_get_resource_list(_document, "layer");
+ SPObject *root=_desktop->currentRoot();
+ if ( root ) {
+ for ( GSList const *iter=layers ; iter ; iter = iter->next ) {
+ SPObject *layer=static_cast<SPObject *>(iter->data);
+ if ( layer != obj ) {
+ currentNames.insert( layer->label() ? Glib::ustring(layer->label()) : Glib::ustring() );
+ }
+ }
+ }
+
+ // Not sure if we need to cap it, but we'll just be paranoid for the moment
+ // Intentionally unsigned
+ guint endNum = startNum + 3000;
+ for ( guint i = startNum; (i < endNum) && (currentNames.find(result) != currentNames.end()); i++ ) {
+ gchar* suffix = g_strdup_printf("#%d", i);
+ result = base;
+ result += suffix;
+
+ g_free(suffix);
+ }
+
+ obj->setLabel( result.c_str() );
+}
+
+
+
void LayerManager::_setDocument(SPDocument *document) {
if (_document) {
_resource_connection.disconnect();
_rebuild();
}
+void LayerManager::_objectModified( SPObject* obj, guint flags )
+{
+ _details_changed_signal.emit( obj );
+}
+
void LayerManager::_rebuild() {
- _clear();
- GSList const *layers=sp_document_get_resource_list(_document, "layers");
- for ( GSList const *iter=layers ; iter ; iter = iter->next ) {
- SPObject *layer=static_cast<SPObject *>(iter->data);
- _addOne(layer);
+ while ( !_watchers.empty() ) {
+ LayerWatcher* one = _watchers.back();
+ _watchers.pop_back();
+ if ( one->_obj ) {
+ Node* node = SP_OBJECT_REPR(one->_obj);
+ if ( node ) {
+ node->removeObserver(*one);
+ }
+ one->_connection.disconnect();
+ }
}
+
+ _clear();
+
+ GSList const *layers=sp_document_get_resource_list(_document, "layer");
SPObject *root=_desktop->currentRoot();
- SPObject *layer=_desktop->currentLayer();
- for ( ; layer ; layer = SP_OBJECT_PARENT(layer) ) {
- if (!includes(layer)) {
- _addOne(layer);
- }
- if ( layer == root ) {
- break;
+ if ( root ) {
+ _addOne(root);
+
+ for ( GSList const *iter=layers ; iter ; iter = iter->next ) {
+ SPObject *layer=static_cast<SPObject *>(iter->data);
+
+ for ( SPObject* curr = layer; curr && (curr != root) ; curr = SP_OBJECT_PARENT(curr) ) {
+ if ( (curr != root) && root->isAncestorOf(curr) && !includes(curr) ) {
+ // Filter out objects in the middle of being deleted
+
+ // Such may have been the cause of bug 1339397.
+ // See http://sourceforge.net/tracker/index.php?func=detail&aid=1339397&group_id=93438&atid=604306
+
+ SPObject const *higher = curr;
+ while ( higher && (SP_OBJECT_PARENT(higher) != root) ) {
+ higher = SP_OBJECT_PARENT(higher);
+ }
+ Node* node = higher ? SP_OBJECT_REPR(higher) : 0;
+ if ( node && node->parent() ) {
+ sigc::connection connection = curr->connectModified(sigc::mem_fun(*this, &LayerManager::_objectModified));
+
+ LayerWatcher *eye = new LayerWatcher(this, curr, connection);
+ _watchers.push_back( eye );
+ SP_OBJECT_REPR(curr)->addObserver(*eye);
+
+ _addOne(curr);
+ }
+ }
+ }
}
}
}
+// Connected to the desktop's CurrentLayerChanged signal
+void LayerManager::_selectedLayerChanged(SPObject *layer)
+{
+ // notify anyone who's listening to this instead of directly to the desktop
+ _layer_changed_signal.emit(layer);
+}
+
}
/*