10 files changed, 31 insertions, 20 deletions

diff --git a/src/FbTk/MacroCommand.cc b/src/FbTk/MacroCommand.cc
index 511683b..555e5f5 100644
--- a/src/FbTk/MacroCommand.cc
+++ b/src/FbTk/MacroCommand.cc
@@ -33,16 +33,18 @@ namespace {
 template <typename M>
 M *addCommands(M *macro, const std::string &args, bool trusted) {
 
-    std::string blah;
+    std::string remainder;
     std::list<std::string> cmds;
-    StringUtil::stringTokensBetween(cmds, args, blah, '{', '}');
+    StringUtil::stringTokensBetween(cmds, args, remainder, '{', '}');
     RefCount<Command<void> > cmd(0);
 
-    std::list<std::string>::iterator it = cmds.begin(), it_end = cmds.end();
-    for (; it != it_end; ++it) {
-        cmd = CommandParser<void>::instance().parse(*it, trusted);
-        if (*cmd)
-            macro->add(cmd);
+    if (remainder.length() == 0) {
+        std::list<std::string>::iterator it = cmds.begin(), it_end = cmds.end();
+        for (; it != it_end; ++it) {
+            cmd = CommandParser<void>::instance().parse(*it, trusted);
+            if (*cmd)
+                macro->add(cmd);
+        }
     }
 
     if (macro->size() > 0)
diff --git a/src/FbTk/StringUtil.hh b/src/FbTk/StringUtil.hh
index 75fa69e..35f23a2 100644
--- a/src/FbTk/StringUtil.hh
+++ b/src/FbTk/StringUtil.hh
@@ -84,7 +84,7 @@ static void stringTokensBetween(Container &container, const std::string &in,
     while (true) {
         err = getStringBetween(token, in.c_str() + pos, first, last, ok_chars,
                                allow_nesting);
-        if (err == 0)
+        if (err <= 0)
             break;
         container.push_back(token);
         pos += err;
diff --git a/src/Keys.cc b/src/Keys.cc
index ac25588..794aad4 100644
--- a/src/Keys.cc
+++ b/src/Keys.cc
@@ -35,6 +35,7 @@
 #include "FbTk/CommandParser.hh"
 #include "FbTk/I18n.hh"
 #include "FbTk/AutoReloadHelper.hh"
+#include "FbTk/STLUtil.hh"
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -102,6 +103,8 @@ using std::vector;
 using std::ifstream;
 using std::pair;
 
+using FbTk::STLUtil::destroyAndClearSecond;
+
 // helper class 'keytree'
 class Keys::t_key {
 public:
@@ -185,9 +188,8 @@ Keys::~Keys() {
 
 /// Destroys the keytree
 void Keys::deleteTree() {
-    for (keyspace_t::iterator map_it = m_map.begin(); map_it != m_map.end(); ++map_it)
-        delete map_it->second;
-    m_map.clear();
+
+    destroyAndClearSecond(m_map);
     next_key = 0;
     saved_keymode = 0;
 }
diff --git a/src/Makefile.am b/src/Makefile.am
index 6861506..24153a8 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -54,7 +54,7 @@ defaults.hh: Makefile
                 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
+                echo 'const char* gitrevision();' ) > defaults.hh
 
 defaults.cc: force
         @( \
@@ -64,7 +64,7 @@ defaults.cc: force
                 echo '  return PROGRAM_PREFIX + name + PROGRAM_SUFFIX;'; \
                 echo '}'; \
                 echo ''; \
-                echo 'const char* svnversion(void) {'; \
+                echo 'const char* gitrevision() {'; \
                 echo '  return "'`cat ../.git/$$(cat ../.git/HEAD | cut -f 2 -d ' ')`'";';\
                 echo '}' ) > defaults_tmp.cc
         @if ! cmp defaults_tmp.cc defaults.cc ; then cp defaults_tmp.cc defaults.cc; fi
@@ -84,8 +84,7 @@ if GNOME
 gnome_SOURCE= Gnome.hh Gnome.cc
 endif
 if REMEMBER_SRC
-REMEMBER_SOURCE= Remember.hh Remember.cc \
-        ClientPattern.hh ClientPattern.cc
+REMEMBER_SOURCE= Remember.hh Remember.cc
 endif
 if TOOLBAR_SRC
 TOOLBAR_SOURCE = Toolbar.hh Toolbar.cc \
@@ -132,6 +131,7 @@ fluxbox_SOURCES = AtomHandler.hh ArrowButton.hh ArrowButton.cc \
         RootCmdMenuItem.hh RootCmdMenuItem.cc\
         MenuCreator.hh MenuCreator.cc \
         ClientMenu.hh ClientMenu.cc \
+        ClientPattern.hh ClientPattern.cc \
         WorkspaceMenu.hh WorkspaceMenu.cc \
         FocusModelMenuItem.hh \
         ToggleMenu.hh \
diff --git a/src/RootTheme.cc b/src/RootTheme.cc
index 049eb27..34c06e9 100644
--- a/src/RootTheme.cc
+++ b/src/RootTheme.cc
@@ -202,6 +202,10 @@ void RootTheme::reconfigTheme() {
     filename = FbTk::StringUtil::expandFilename(filename);
     std::string cmd = realProgramName("fbsetbg") + (m_first ? " -z " : " -Z ");
 
+    // user explicitly requests NO background be set at all
+    if (strstr(m_background->options().c_str(), "unset") != 0) {
+        return;
+    }
     // style doesn't wish to change the background
     if (strstr(m_background->options().c_str(), "none") != 0) {
         if (!m_first)
diff --git a/src/Screen.cc b/src/Screen.cc
index 4d9a65f..1581571 100644
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -39,7 +39,7 @@
 #include "FbTk/IntMenuItem.hh"
 #include "FbTk/MenuSeparator.hh"
 #include "FocusModelMenuItem.hh"
-#include "RadioMenuItem.hh"
+#include "FbTk/RadioMenuItem.hh"
 
 // menus
 #include "FbMenu.hh"
diff --git a/src/SystemTray.cc b/src/SystemTray.cc
index 0c3e550..05d8d09 100644
--- a/src/SystemTray.cc
+++ b/src/SystemTray.cc
@@ -25,13 +25,13 @@
 #include "FbTk/ImageControl.hh"
 #include "FbTk/TextUtils.hh"
 #include "FbTk/MemFun.hh"
+#include "FbTk/SimpleObserver.hh"
 
 #include "AtomHandler.hh"
 #include "fluxbox.hh"
 #include "WinClient.hh"
 #include "Screen.hh"
 #include "ButtonTheme.hh"
-#include "SimpleObserver.hh"
 
 #include <X11/Xutil.h>
 #include <X11/Xatom.h>
diff --git a/src/TextDialog.cc b/src/TextDialog.cc
index 7f95c13..17f5f37 100644
--- a/src/TextDialog.cc
+++ b/src/TextDialog.cc
@@ -33,7 +33,6 @@
 #include <X11/Xutil.h>
 
 #include <memory>
-#include <stdexcept>
 
 using std::string;
 
diff --git a/src/Window.cc b/src/Window.cc
index 1104e50..b2bfcf7 100644
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -36,7 +36,9 @@
 #include "WinButton.hh"
 #include "WinButtonTheme.hh"
 #include "WindowCmd.hh"
+#ifdef REMEMBER
 #include "Remember.hh"
+#endif
 #include "MenuCreator.hh"
 #include "FocusControl.hh"
 #include "IconButton.hh"
@@ -2197,9 +2199,11 @@ void FluxboxWindow::propertyNotifyEvent(WinClient &client, Atom atom) {
         } else if (atom == fbatoms->getMWMHintsAtom()) {
             client.updateMWMHints();
             updateMWMHintsFromClient(client);
+#ifdef REMEMBER
             if (!m_toggled_decos) {
                 Remember::instance().updateDecoStateFromClient(client);
             }
+#endif
             applyDecorations(); // update decorations (if they changed)
         }
         break;
diff --git a/src/main.cc b/src/main.cc
index 1cca774..32d4cc5 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -72,8 +72,8 @@ static void showInfo(ostream &ostr) {
     _FB_USES_NLS;
     ostr<<_FB_CONSOLETEXT(Common, FluxboxVersion, "Fluxbox version", "Fluxbox version heading")<<": "<<__fluxbox_version<<endl;
 
-    if (strlen(svnversion()) > 0)
-        ostr << _FB_CONSOLETEXT(Common, SvnRevision, "GIT Revision", "Revision number in GIT repositary") << ": " << svnversion() << endl;
+    if (strlen(gitrevision()) > 0)
+        ostr << _FB_CONSOLETEXT(Common, SvnRevision, "GIT Revision", "Revision number in GIT repositary") << ": " << gitrevision() << endl;
 #if defined(__DATE__) && defined(__TIME__)
     ostr<<_FB_CONSOLETEXT(Common, Compiled, "Compiled", "Time fluxbox was compiled")<<": "<<__DATE__<<" "<<__TIME__<<endl;
 #endif