some updates for the startup file in modern times

2 files changed, 12 insertions, 2 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index 8fe65a6..0fc5a7a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -28,6 +28,7 @@ DEFAULT_MENU=@DEFAULT_MENU@
 DEFAULT_STYLE=@DEFAULT_STYLE@
 DEFAULT_KEYSFILE=@DEFAULT_KEYS@
 DEFAULT_APPSFILE=@DEFAULT_APPS@
+DEFAULT_OVERLAY=@DEFAULT_OVERLAY@
 DEFAULT_INITFILE=@DEFAULT_INIT@
 PROGRAM_PREFIX=@program_prefix@
 PROGRAM_SUFFIX=@program_suffix@
@@ -46,6 +47,7 @@ defaults.hh: Makefile
                 echo '#define DEFAULTSTYLE "$(DEFAULT_STYLE)"'; \
                 echo '#define DEFAULTKEYSFILE "$(DEFAULT_KEYSFILE)"'; \
                 echo '#define DEFAULT_APPSFILE "$(DEFAULT_APPSFILE)"'; \
+                echo '#define DEFAULT_OVERLAY "$(DEFAULT_OVERLAY)"'; \
                 echo '#define DEFAULT_INITFILE "$(DEFAULT_INITFILE)"'; \
                 echo '#define PROGRAM_PREFIX "$(PROGRAM_PREFIX:NONE=)"'; \
                 echo '#define PROGRAM_SUFFIX "$(PROGRAM_SUFFIX:NONE=)"'; \
diff --git a/src/fluxbox.cc b/src/fluxbox.cc
index 1045430..8fcc194 100644
--- a/src/fluxbox.cc
+++ b/src/fluxbox.cc
@@ -524,14 +524,16 @@ void Fluxbox::ungrab() {
 void Fluxbox::setupConfigFiles() {
 
     bool create_init = false, create_keys = false, create_menu = false,
-         create_apps = false;
+         create_apps = false, create_overlay = false;
 
     string dirname = getenv("HOME") + string("/.") + m_RC_PATH + "/";
-    string init_file, keys_file, menu_file, slitlist_file, apps_file;
+    string init_file, keys_file, menu_file, slitlist_file, apps_file,
+           overlay_file;
     init_file = dirname + m_RC_INIT_FILE;
     keys_file = dirname + "keys";
     menu_file = dirname + "menu";
     apps_file = dirname + "apps";
+    overlay_file = dirname + "overlay";
 
     struct stat buf;
 
@@ -547,6 +549,8 @@ void Fluxbox::setupConfigFiles() {
             create_menu = true;
         if (stat(apps_file.c_str(), &buf))
             create_apps = true;
+        if (stat(overlay_file.c_str(), &buf))
+            create_overlay = true;
 
     } else {
 #ifdef DEBUG
@@ -580,6 +584,10 @@ void Fluxbox::setupConfigFiles() {
     if (create_apps)
         FbTk::FileUtil::copyFile(DEFAULT_APPSFILE, apps_file.c_str());
 
+    // copy overlay file
+    if (create_overlay)
+        FbTk::FileUtil::copyFile(DEFAULT_OVERLAY, overlay_file.c_str());
+
     // copy init file
     if (create_init)
         FbTk::FileUtil::copyFile(DEFAULT_INITFILE, init_file.c_str());