Merge branch 'master' into to_push

1 files changed, 11 insertions, 3 deletions

diff --git a/src/main.cc b/src/main.cc
index 9da51ec..fb47bc7 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -26,7 +26,7 @@
 
 #include "FbTk/Theme.hh"
 #include "FbTk/I18n.hh"
-#include "FbTk/StringUtil.hh"
+#include "FbTk/CommandParser.hh"
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -221,7 +221,7 @@ int main(int argc, char **argv) {
             }
         } else if (arg == "-version" || arg == "-v") {
             // print current version string
-            cout << "Fluxbox " << __fluxbox_version << " : (c) 2001-2007 Fluxbox Team " << endl << endl;
+            cout << "Fluxbox " << __fluxbox_version << " : (c) 2001-2008 Fluxbox Team " << endl << endl;
             exit(EXIT_SUCCESS);
         } else if (arg == "-log") {
             if (++i >= argc) {
@@ -239,15 +239,23 @@ int main(int argc, char **argv) {
                            "-rc <string>\t\t\tuse alternate resource file.\n"
                            "-version\t\t\tdisplay version and exit.\n"
                            "-info\t\t\t\tdisplay some useful information.\n"
+                           "-list-commands\t\t\tlist all valid key commands.\n"
                            "-log <filename>\t\t\tlog output to file.\n"
                            "-help\t\t\t\tdisplay this help text and exit.\n\n",
 
                            "Main usage string. Please lay it out nicely. There is one %s that is given the version").c_str(),
-                   __fluxbox_version, "2001-2007");
+                   __fluxbox_version, "2001-2008");
             exit(EXIT_SUCCESS);
         } else if (arg == "-info" || arg == "-i") {
             showInfo(cout);
             exit(EXIT_SUCCESS);
+        } else if (arg == "-list-commands") {
+            FbTk::CommandParser<void>::CreatorMap cmap = FbTk::CommandParser<void>::instance().creatorMap();
+            FbTk::CommandParser<void>::CreatorMap::const_iterator it = cmap.begin();
+            const FbTk::CommandParser<void>::CreatorMap::const_iterator it_end = cmap.end();
+            for (; it != it_end; ++it)
+                cout << it->first << endl;
+            exit(EXIT_SUCCESS);
         } else if (arg == "-verbose") {
             FbTk::ThemeManager::instance().setVerbose(true);
         }