2 files changed, 10 insertions, 2 deletions

diff --git a/src/FbTk/CommandParser.hh b/src/FbTk/CommandParser.hh
index 45ce001..3e40ed6 100644
--- a/src/FbTk/CommandParser.hh
+++ b/src/FbTk/CommandParser.hh
@@ -128,7 +128,7 @@ public:
         return it->second;
     }
 
-    const CreatorMap creatorMap() const { return m_creators; }
+    const CreatorMap &creatorMap() const { return m_creators; }
 
 private:
     CommandParser() {}
diff --git a/src/main.cc b/src/main.cc
index 9da51ec..bc43a93 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"
@@ -239,6 +239,7 @@ 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",
 
@@ -248,6 +249,13 @@ int main(int argc, char **argv) {
         } 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);
         }