fixes for --program-prefix and --program-suffix, plus fixed overwriting init file on reconfigure

8 files changed, 40 insertions, 25 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index 5b74800..b6cb024 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -28,6 +28,8 @@ DEFAULT_MENU=@DEFAULT_MENU@
 DEFAULT_STYLE=$(pkgdatadir)/styles/Clean
 DEFAULT_KEYSFILE=@DEFAULT_KEYS@
 DEFAULT_INITFILE=@DEFAULT_INIT@
+PROGRAM_PREFIX=@program_prefix@
+PROGRAM_SUFFIX=@program_suffix@
 
 AM_CPPFLAGS=-I$(srcdir)/FbTk
 
@@ -37,14 +39,25 @@ CONFIG_CLEAN_FILES = defaults.hh
 defaults.hh: Makefile
         @( \
                 echo '// This file is generated from Makefile. Do not edit!'; \
+                echo '#include <string>'; \
+                echo ''; \
                 echo '#define DEFAULTMENU "$(DEFAULT_MENU)"'; \
                 echo '#define DEFAULTSTYLE "$(DEFAULT_STYLE)"'; \
                 echo '#define DEFAULTKEYSFILE "$(DEFAULT_KEYSFILE)"'; \
                 echo '#define DEFAULT_INITFILE "$(DEFAULT_INITFILE)"'; \
+                echo '#define PROGRAM_PREFIX "$(PROGRAM_PREFIX:NONE=)"'; \
+                echo '#define PROGRAM_SUFFIX "$(PROGRAM_SUFFIX:NONE=)"'; \
+                echo 'std::string realProgramName(std::string name);'; \
                 echo 'const char* svnversion(void);' ) > defaults.hh
 
 defaults.cc: force
         @( \
+                echo '#include "defaults.hh"'; \
+                echo ''; \
+                echo 'std::string realProgramName(std::string name) {'; \
+                echo '  return PROGRAM_PREFIX + name + PROGRAM_SUFFIX;'; \
+                echo '}'; \
+                echo ''; \
                 echo 'const char* svnversion(void) {'; \
                 echo '  return "'`(svnversion . | sed "s/[^0-9].*//") 2> /dev/null`'";';\
                 echo '}' ) > defaults_tmp.cc
diff --git a/src/MenuCreator.cc b/src/MenuCreator.cc
index 552e514..1aa8877 100644
--- a/src/MenuCreator.cc
+++ b/src/MenuCreator.cc
@@ -24,6 +24,7 @@
 
 #include "MenuCreator.hh"
 
+#include "defaults.hh"
 #include "Screen.hh"
 #include "CommandParser.hh"
 #include "fluxbox.hh"
@@ -349,7 +350,7 @@ static void translateMenuItem(Parser &parse, ParseItem &pitem, FbTk::StringConve
     else if (str_key == "wallpapers" || str_key == "wallpapermenu" ||
              str_key == "rootcommands") {
          createRootCmdMenu(menu, str_label, str_label,
-                          str_cmd == "" ? "fbsetbg" : str_cmd);
+                          str_cmd == "" ? realProgramName("fbsetbg") : str_cmd);
     } // end of wallpapers
     else if (str_key == "workspaces") {
         BScreen *screen = Fluxbox::instance()->findScreen(screen_number);
diff --git a/src/RootCmdMenuItem.cc b/src/RootCmdMenuItem.cc
index eabc5d3..a52a4d8 100644
--- a/src/RootCmdMenuItem.cc
+++ b/src/RootCmdMenuItem.cc
@@ -23,6 +23,7 @@
 
 #include "RootCmdMenuItem.hh"
 
+#include "defaults.hh"
 #include "FbCommands.hh"
 #include "fluxbox.hh"
 
@@ -33,9 +34,10 @@ RootCmdMenuItem::RootCmdMenuItem(const FbTk::FbString &label,
                              const std::string &cmd):
     FbTk::MenuItem(label), 
     m_filename(filename) {
-    
-      FbTk::RefCount<FbTk::Command> 
-        setwp_cmd(new FbCommands::ExecuteCmd(cmd + " \"" + m_filename + "\""));
+
+    std::string prog = cmd.empty() ? realProgramName("fbsetbg") : cmd;
+    FbTk::RefCount<FbTk::Command>
+        setwp_cmd(new FbCommands::ExecuteCmd(prog + " \"" + m_filename + "\""));
     setCommand(setwp_cmd);
     setToggleItem(true);
 }
diff --git a/src/RootCmdMenuItem.hh b/src/RootCmdMenuItem.hh
index 8c8ac8d..4a541d9 100644
--- a/src/RootCmdMenuItem.hh
+++ b/src/RootCmdMenuItem.hh
@@ -31,7 +31,7 @@ class RootCmdMenuItem: public FbTk::MenuItem {
 public:
     RootCmdMenuItem(const FbTk::FbString &label, 
                   const std::string &filename,
-                  const std::string &cmd = "fbsetbg");
+                  const std::string &cmd = "");
     bool isSelected() const;
 private:
     const std::string m_filename;
diff --git a/src/RootTheme.cc b/src/RootTheme.cc
index 5189fbb..90478e3 100644
--- a/src/RootTheme.cc
+++ b/src/RootTheme.cc
@@ -23,6 +23,7 @@
 
 #include "RootTheme.hh"
 
+#include "defaults.hh"
 #include "FbRootWindow.hh"
 #include "FbCommands.hh"
 #include "Screen.hh"
@@ -212,7 +213,8 @@ void RootTheme::reconfigTheme() {
             options = "-A ";
             
         // compose wallpaper application "fbsetbg" with argumetns
-        std::string commandargs = "fbsetbg " + options + filename;
+        std::string commandargs = realProgramName("fbsetbg") + " " + options +
+                                  filename;
 
         // call command with options
         FbCommands::ExecuteCmd exec(commandargs, screenNum());
@@ -220,7 +222,8 @@ void RootTheme::reconfigTheme() {
 
     } else if (FbTk::FileUtil::isDirectory(filename.c_str()) &&
             strstr(m_background->options().c_str(), "random") != 0) {
-        std::string commandargs = "fbsetbg -R " + filename;
+        std::string commandargs = realProgramName("fbsetbg") + " -R " +
+                                  filename;
         FbCommands::ExecuteCmd exec(commandargs, screenNum());
         exec.execute();
     } else {
@@ -251,7 +254,7 @@ void RootTheme::reconfigTheme() {
             options += "-gradient '" + m_background->options() + "'";
         }
 
-        std::string commandargs = "fbsetroot " + options;
+        std::string commandargs = realProgramName("fbsetroot") + " " + options;
 
         FbCommands::ExecuteCmd exec(commandargs, screenNum());
         exec.execute();
diff --git a/src/Workspace.cc b/src/Workspace.cc
index 35fcf54..2f575af 100644
--- a/src/Workspace.cc
+++ b/src/Workspace.cc
@@ -371,6 +371,8 @@ void Workspace::update(FbTk::Subject *subj) {
 
 void Workspace::setName(const string &name) {
     if (!name.empty() && name != "") {
+        if (name == m_name)
+            return;
         m_name = name;
     } else { //if name == 0 then set default name from nls
         _FB_USES_NLS;
diff --git a/src/fluxbox.cc b/src/fluxbox.cc
index 4ebfe95..7745a89 100644
--- a/src/fluxbox.cc
+++ b/src/fluxbox.cc
@@ -202,12 +202,12 @@ Fluxbox::Fluxbox(int argc, char **argv, const char *dpy_name, const char *rcfile
       m_rc_double_click_interval(m_resourcemanager, 250, "session.doubleClickInterval", "Session.DoubleClickInterval"),
       m_rc_tabs_padding(m_resourcemanager, 0, "session.tabPadding", "Session.TabPadding"),
       m_rc_stylefile(m_resourcemanager, DEFAULTSTYLE, "session.styleFile", "Session.StyleFile"),
-      m_rc_styleoverlayfile(m_resourcemanager, "~/.fluxbox/overlay", "session.styleOverlay", "Session.StyleOverlay"),
+      m_rc_styleoverlayfile(m_resourcemanager, "~/." + realProgramName("fluxbox") + "/overlay", "session.styleOverlay", "Session.StyleOverlay"),
       m_rc_menufile(m_resourcemanager, DEFAULTMENU, "session.menuFile", "Session.MenuFile"),
       m_rc_keyfile(m_resourcemanager, DEFAULTKEYSFILE, "session.keyFile", "Session.KeyFile"),
-      m_rc_slitlistfile(m_resourcemanager, "~/.fluxbox/slitlist", "session.slitlistFile", "Session.SlitlistFile"),
-      m_rc_groupfile(m_resourcemanager, "~/.fluxbox/groups", "session.groupFile", "Session.GroupFile"),
-      m_rc_appsfile(m_resourcemanager, "~/.fluxbox/apps", "session.appsFile", "Session.AppsFile"),
+      m_rc_slitlistfile(m_resourcemanager, "~/." + realProgramName("fluxbox") + "/slitlist", "session.slitlistFile", "Session.SlitlistFile"),
+      m_rc_groupfile(m_resourcemanager, "~/." + realProgramName("fluxbox") + "/groups", "session.groupFile", "Session.GroupFile"),
+      m_rc_appsfile(m_resourcemanager, "~/." + realProgramName("fluxbox") + "/apps", "session.appsFile", "Session.AppsFile"),
       m_rc_tabs_attach_area(m_resourcemanager, ATTACH_AREA_WINDOW, "session.tabsAttachArea", "Session.TabsAttachArea"),
       m_rc_cache_life(m_resourcemanager, 5, "session.cacheLife", "Session.CacheLife"),
       m_rc_cache_max(m_resourcemanager, 200, "session.cacheMax", "Session.CacheMax"),
@@ -227,7 +227,7 @@ Fluxbox::Fluxbox(int argc, char **argv, const char *dpy_name, const char *rcfile
       m_shutdown(false),
       m_server_grabs(0),
       m_randr_event_type(0),
-      m_RC_PATH("fluxbox"),
+      m_RC_PATH(realProgramName("fluxbox")),
       m_RC_INIT_FILE("init") {
 
     _FB_USES_NLS;
@@ -588,7 +588,7 @@ void Fluxbox::setupConfigFiles() {
 
     bool create_init = false, create_keys = false, create_menu = false;
 
-    string dirname = getenv("HOME") + string("/.") + string(m_RC_PATH) + "/";
+    string dirname = getenv("HOME") + string("/.") + m_RC_PATH + "/";
     string init_file, keys_file, menu_file, slitlist_file;
     init_file = dirname + m_RC_INIT_FILE;
     keys_file = dirname + "keys";
@@ -645,8 +645,8 @@ void Fluxbox::setupConfigFiles() {
     if (*config_version < CONFIG_VERSION) {
         // configs are out of date, so run fluxbox-update_configs
 
-        string commandargs = "fluxbox-update_configs -rc ";
-        commandargs += init_file;
+        string commandargs = realProgramName("fluxbox-update_configs");
+        commandargs += " -rc " + init_file;
 
 #ifdef HAVE_GETPID
         // add the fluxbox pid so fbuc can have us reload rc if necessary
@@ -1084,7 +1084,7 @@ void Fluxbox::handleSignal(int signum) {
         load_rc();
         break;
     case SIGUSR2:
-        reload_rc();
+        reconfigure();
         break;
     case SIGSEGV:
         abort();
@@ -1559,13 +1559,8 @@ void Fluxbox::load_rc(BScreen &screen) {
     }
 }
 
-void Fluxbox::reload_rc() {
-    load_rc();
-    reconfigure();
-}
-
-
 void Fluxbox::reconfigure() {
+    load_rc();
     m_reconfigure_wait = true;
     m_reconfig_timer.start();
 }
diff --git a/src/fluxbox.hh b/src/fluxbox.hh
index 66fdff5..51ecc06 100644
--- a/src/fluxbox.hh
+++ b/src/fluxbox.hh
@@ -216,7 +216,6 @@ private:
 
     std::string getRcFilename();
     void load_rc();
-    void reload_rc();
 
     void real_rereadMenu();
     void real_reconfigure();
@@ -305,7 +304,7 @@ 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
-    const char *m_RC_PATH;
+    std::string m_RC_PATH;
     const char *m_RC_INIT_FILE;
     Atom m_kwm1_dockwindow, m_kwm2_dockwindow;