X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=util%2Fepist%2Factions.hh;h=aefe6282728c63a06e59ff60fcb29e1a75330173;hb=4aeca296e895bfe74d59d4732e740c2d49c10080;hp=531d54d21f3349a7db99ed8904f5ecd117c7b47e;hpb=be77122bee3300e982ff257929ce1d1224f45803;p=chaz%2Fopenbox

diff --git a/util/epist/actions.hh b/util/epist/actions.hh
index 531d54d2..aefe6282 100644
--- a/util/epist/actions.hh
+++ b/util/epist/actions.hh
@@ -28,34 +28,44 @@ extern "C" {
 }
 
 #include <list>
+#include <string>
 
 class Action {
 public:
     // xOr: this is crap.
   enum ActionType {
     noaction = 0,
-    execute,
-    iconify,
-    raiseWindow,
-    lowerWindow,
-    closeWindow,
-    shade,
-    moveWindowUp,
-    moveWindowDown,
-    moveWindowLeft,
-    moveWindowRight,
-
-    nextWindow,
-    prevWindow,
-    nextWindowOnAllDesktops,
-    prevWindowOnAllDesktops,
-
-    nextWindowOfClass,
-    prevWindowOfClass,
-
-    changeDesktop,
-    nextDesktop,
-    prevDesktop,
+    execute, //done
+    iconify, //done
+    raise, //done
+    lower, //done
+    close, //done
+    toggleshade, //done
+    toggleomnipresent, //done
+    moveWindowUp, //done
+    moveWindowDown, //done
+    moveWindowLeft, //done
+    moveWindowRight, //done
+
+    toggleMaximizeFull, //done
+    toggleMaximizeVertical, //done
+    toggleMaximizeHorizontal, //done
+
+    sendToWorkspace, //done
+
+    nextWindow, //done for now
+    prevWindow, //done for now
+    nextWindowOnAllWorkspaces, //done
+    prevWindowOnAllWorkspaces, //done
+
+    nextWindowOfClass, //done
+    prevWindowOfClass, //done
+    nextWindowOfClassOnAllWorkspaces, //done
+    prevWindowOfClassOnAllWorkspaces, //done
+
+    changeWorkspace, //done
+    nextWorkspace, //done
+    prevWorkspace, //done
 
     // these are openbox extensions
     showRootMenu,
@@ -73,16 +83,23 @@ public:
 private:
   enum ActionType _type;
   const KeyCode _keycode;
-  const int _modifierMask;
-  
+  const unsigned int _modifierMask;
+
+  const int _numberParam;
+  const std::string _stringParam;
 public:
   inline enum ActionType type() const { return _type;}
   inline const KeyCode keycode() const { return _keycode; }
-  inline const int modifierMask() const { return _modifierMask; }
+  inline const unsigned int modifierMask() const { return _modifierMask; }
+  inline const int number() const { return _numberParam; }
+  inline const std::string &string() const { return _stringParam; }
 
-  Action::Action(enum ActionType type, KeyCode keycode, int modifierMask);
+  Action(enum ActionType type, KeyCode keycode, unsigned int modifierMask,
+         int number = 0);
+  Action(enum ActionType type, KeyCode keycode, unsigned int modifierMask,
+         const std::string &str);
 };
   
-typedef list<Action> ActionList;
+typedef std::list<Action> ActionList;
 
 #endif