Big fat merge for epist.

This adds a config parser, chaining, and a tonne of other stuff.
Still need to fix up build system for the lex and yacc stuff.

1 files changed, 25 insertions, 9 deletions

diff --git a/util/epist/actions.cc b/util/epist/actions.cc
index 35ddbb80..82e61ae3 100644
--- a/util/epist/actions.cc
+++ b/util/epist/actions.cc
@@ -23,13 +23,29 @@
 #include "actions.hh"
 
 Action::Action(enum ActionType type, KeyCode keycode, unsigned int modifierMask,
-               int num)
-  : _type(type), _keycode(keycode),
-    _modifierMask(modifierMask), _numberParam(num)
-{ }
-
-Action::Action(enum ActionType type, KeyCode keycode, unsigned int modifierMask,
                const std::string &str)
-  : _type(type), _keycode(keycode),
-    _modifierMask(modifierMask), _stringParam(str)
-{ }
+  : _type(type), _keycode(keycode), _modifierMask(modifierMask)
+{
+  // These are the action types that take string arguments. This
+  // should probably be moved to a static member
+  ActionType str_types[] = {
+    execute,
+    nextWindowOfClass,
+    prevWindowOfClass,
+    nextWindowOfClassOnAllWorkspaces,
+    prevWindowOfClassOnAllWorkspaces,
+    noaction
+  };
+
+  for (int i = 0; str_types[i] != noaction; ++i) {
+    if (type == str_types[i]) {
+      _stringParam = str;
+      return;
+    }
+  }
+  
+  _numberParam = atoi( str.c_str() );
+
+  if (type == changeWorkspace)
+    _numberParam;
+}