changed the way we create the '~/.fluxbox' directory to avoid race conditions

before bringing up the first instance of Fluxbox we prepare the directory
and the files it needs. if the config version of exiting files is lower
than what we expect, we upgrade the config files. after that we bring
up Fluxbox.

the old way was problematic because setupConfigFiles() calls
'fluxbox-update_configs' which does its job in the background while
fluxbox continues to boot. 'fluxbox-update_configs' sends a USR2 signal
to the booting fluxbox (it might even be finished, no one knows) which
triggers 'load_rc()' which triggered 'setupConfigFiles()' again which
might trigger 'fluxbox-update_configs' again (on my machine
'fluxbox-update_configs' was called 3 times and left a pretty crippled
'keys' file when it was done).

bootstrapping before bringing up fluxbox resolves the issue. as a bonus:
no need to send USR2 to fluxbox to reload the config file because fluxbox
has not even tried to read it yet.

1 files changed, 7 insertions, 5 deletions

diff --git a/src/fluxbox.hh b/src/fluxbox.hh
index 75b868f..36b39ef 100644
--- a/src/fluxbox.hh
+++ b/src/fluxbox.hh
@@ -79,8 +79,10 @@ class Fluxbox : public FbTk::App,
                 public FbTk::Observer,
                 private FbTk::SignalTracker {
 public:
-    Fluxbox(int argc, char **argv, const char * dpy_name= 0,
-            const char *rcfilename = 0, bool xsync = false);
+    Fluxbox(int argc, char **argv,
+            const std::string& dpy_name,
+            const std::string& rc_path, const std::string& rc_filename,
+            bool xsync = false);
     virtual ~Fluxbox();
 
     static Fluxbox *instance() { return s_singleton; }
@@ -197,7 +199,6 @@ private:
 
     void handleEvent(XEvent *xe);
 
-    void setupConfigFiles();
     void handleUnmapNotify(XUnmapEvent &ue);
     void handleClientMessage(XClientMessageEvent &ce);
 
@@ -221,6 +222,9 @@ private:
 
     FbTk::ResourceManager m_resourcemanager, &m_screen_rm;
 
+    std::string m_RC_PATH;
+    const char *m_RC_INIT_FILE;
+
     //--- Resources
 
     FbTk::Resource<bool> m_rc_ignoreborder;
@@ -289,8 +293,6 @@ private:
     int m_randr_event_type; ///< the type number of randr event
     int m_shape_eventbase; ///< event base for shape events
     bool m_have_shape; ///< if shape is supported by server
-    std::string m_RC_PATH;
-    const char *m_RC_INIT_FILE;
     Atom m_kwm1_dockwindow, m_kwm2_dockwindow;
 
     AttentionNoticeHandler m_attention_handler;