Create a completely new lua state upon USR2 reconfigure

This way, global variables set by the scripts don't persist between hard reconfigures.
I also cleaned up the reconfig-handling code in fluxbox.cc. Instead of three reconfig functions
(real_reconfig, timed_reconfig, reconfig) we have just one.

2 files changed, 40 insertions, 15 deletions

diff --git a/src/FbTk/LResource.cc b/src/FbTk/LResource.cc
index d7627c9..0909520 100644
--- a/src/FbTk/LResource.cc
+++ b/src/FbTk/LResource.cc
@@ -101,17 +101,8 @@ void LResourceManager::convert(ResourceManager &old, const std::string &new_file
 }
 
 LResourceManager::LResourceManager(const std::string &root, Lua &l)
-                        : ResourceManager_base(root), m_l(&l) {
-    l.checkstack(2);
-    lua::stack_sentry s(l);
-
-    l.pushstring(root);
-
-    l.getfield(lua::REGISTRYINDEX, make_root);
-    l.pushstring(root);
-    l.call(1, 1);
-
-    l.readOnlySet(lua::GLOBALSINDEX);
+        : ResourceManager_base(root), m_l(&l) {
+    setLua(l);
 }
 
 bool LResourceManager::save(const char *filename, const char *) {
@@ -127,11 +118,20 @@ bool LResourceManager::save(const char *filename, const char *) {
 }
 
 void LResourceManager::addResource(Resource_base &r) {
+    ResourceManager_base::addResource(r);
+    try {
+        doAddResource(r);
+    }
+    catch(...) {
+        ResourceManager_base::removeResource(r);
+        throw;
+    }
+}
+
+void LResourceManager::doAddResource(Resource_base &r) {
     m_l->checkstack(5);
     lua::stack_sentry s(*m_l);
 
-    ResourceManager_base::addResource(r);
-
     m_l->getfield(lua::REGISTRYINDEX, register_resource);
     m_l->getfield(lua::GLOBALSINDEX, m_root.c_str());
     m_l->pushstring(r.name());
@@ -143,7 +143,12 @@ void LResourceManager::addResource(Resource_base &r) {
 }
 
 void LResourceManager::removeResource(Resource_base &r) {
-    m_l->checkstack(5);
+    doRemoveResource(r);
+    ResourceManager_base::removeResource(r);
+}
+
+void LResourceManager::doRemoveResource(Resource_base &r) {
+    m_l->checkstack(4);
     lua::stack_sentry s(*m_l);
 
     m_l->getfield(lua::REGISTRYINDEX, register_resource);
@@ -153,8 +158,25 @@ void LResourceManager::removeResource(Resource_base &r) {
     m_l->call(3, 1);
     *static_cast<Resource_base **>(m_l->touserdata(-1)) = NULL;
     m_l->pop();
+}
 
-    ResourceManager_base::removeResource(r);
+void LResourceManager::setLua(Lua &l) {
+    l.checkstack(2);
+    lua::stack_sentry s(l);
+
+    for(ResourceList::const_iterator i = begin(); i != end(); ++i)
+        doRemoveResource(**i);
+
+    l.getfield(lua::REGISTRYINDEX, make_root);
+    l.pushstring(m_root);
+    l.call(1, 1);
+
+    l.readOnlySetField(lua::GLOBALSINDEX, m_root.c_str());
+
+    m_l = &l;
+
+    for(ResourceList::const_iterator i = begin(); i != end(); ++i)
+        doAddResource(**i);
 }
 
 } // end namespace FbTk
diff --git a/src/FbTk/LResource.hh b/src/FbTk/LResource.hh
index 1567269..bb7f224 100644
--- a/src/FbTk/LResource.hh
+++ b/src/FbTk/LResource.hh
@@ -41,8 +41,11 @@ public:
     virtual bool save(const char *filename, const char *);
     virtual void addResource(Resource_base &r);
     virtual void removeResource(Resource_base &r);
+    void setLua(Lua &l);
 
 private:
+    void doAddResource(Resource_base &r);
+    void doRemoveResource(Resource_base &r);
 
     Lua *m_l;
 };