sendTo and goto workspaces both need to start at 0, not 1

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

diff --git a/util/epist/actions.cc b/util/epist/actions.cc
index 35ddbb80976c8a962d35ea11ac233cbbc6a48c6a..c4874983e51e50119d34a59bceca74ac385c1c88 100644 (file)
--- a/util/epist/actions.cc
+++ b/util/epist/actions.cc
@@ -22,14 +22,37 @@
 
 #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]) {
+      // the first and last characters of the string are quotes, and we need to
+      // get rid of them
+      assert(str.size() >= 2);
+      assert(str[0] == '"');
+      assert(str[str.size() - 1] == '"');
+
+      _stringParam = str.substr(1, str.size() - 2);
+      return;
+    }
+  }
+  
+  _numberParam = atoi( str.c_str() );
+
+  // workspace 1 to the user is workspace 0 to us
+  if (type == changeWorkspace || type == sendToWorkspace)
+    _numberParam--;
+}