Big fat merge for epist.

[chaz/openbox] / util / epist / actions.cc

diff --git a/util/epist/actions.cc b/util/epist/actions.cc
index 35ddbb80976c8a962d35ea11ac233cbbc6a48c6a..82e61ae3fdd14854f027700c6f6c1146f3653caf 100644 (file)
--- a/util/epist/actions.cc
+++ b/util/epist/actions.cc
@@ -22,14 +22,30 @@
 
 #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;
+}