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.

1 files changed, 8 insertions, 20 deletions

diff --git a/src/fluxbox.cc b/src/fluxbox.cc
index e293606..f66d83d 100644
--- a/src/fluxbox.cc
+++ b/src/fluxbox.cc
@@ -310,7 +310,7 @@ Fluxbox::Fluxbox(int argc, char **argv,
     // Because when the command is executed we shouldn't do reconfig directly
     // because it could affect ongoing menu stuff so we need to reconfig in
     // the next event "round".
-    FbTk::RefCount<FbTk::Command<void> > reconfig_cmd(new FbTk::SimpleCommand<Fluxbox>(*this, &Fluxbox::timed_reconfigure));
+    FbTk::RefCount<FbTk::Command<void> > reconfig_cmd(new FbTk::SimpleCommand<Fluxbox>(*this, &Fluxbox::reconfigure));
     m_reconfig_timer.setTimeout(1);
     m_reconfig_timer.setCommand(reconfig_cmd);
     m_reconfig_timer.fireOnce(true);
@@ -438,8 +438,6 @@ Fluxbox::Fluxbox(int argc, char **argv,
     //XSynchronize(disp, False);
     sync(false);
 
-    m_reconfigure_wait = false;
-
     ungrab();
 
     m_starting = false;
@@ -905,7 +903,7 @@ void Fluxbox::handleSignal(int signum) {
         load_rc();
         break;
     case SIGUSR2:
-        reconfigure();
+        m_reconfig_timer.start();
         break;
 #endif
     case SIGSEGV:
@@ -1190,17 +1188,6 @@ void Fluxbox::load_rc() {
         *m_rc_stylefile = DEFAULTSTYLE;
 }
 
-void Fluxbox::reconfigure() {
-    load_rc();
-    m_reconfigure_wait = true;
-    m_reconfig_timer.start();
-}
-
-
-void Fluxbox::real_reconfigure() {
-    STLUtil::forAll(m_screen_list, mem_fun(&BScreen::reconfigure));
-}
-
 BScreen *Fluxbox::findScreen(int id) {
 
     BScreen* result = 0;
@@ -1213,11 +1200,12 @@ BScreen *Fluxbox::findScreen(int id) {
     return result;
 }
 
-void Fluxbox::timed_reconfigure() {
-    if (m_reconfigure_wait)
-        real_reconfigure();
-
-    m_reconfigure_wait = false;
+void Fluxbox::reconfigure() {
+    std::auto_ptr<FbTk::Lua> t = m_l;
+    m_l.reset(new Lua);
+    m_resourcemanager.setLua(*m_l);
+    load_rc();
+    STLUtil::forAll(m_screen_list, mem_fun(&BScreen::reconfigure));
 }
 
 void Fluxbox::revertFocus() {