-Action::Action(enum ActionType type, KeyCode keycode, 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)
+{
+ // 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;
+}