X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=util%2Fepist%2Factions.hh;h=81b3920c9a6011509ddd8d47ed249e90d7569a75;hb=843f9726ab6fd99fe3a2f285e6c85bd2880a275f;hp=09ee523f2ed8ca26ce60dfe8b3ff9482f984cf8c;hpb=b4411cb1ef1c25a287181b570e974545e1010530;p=chaz%2Fopenbox

diff --git a/util/epist/actions.hh b/util/epist/actions.hh
index 09ee523f..81b3920c 100644
--- a/util/epist/actions.hh
+++ b/util/epist/actions.hh
@@ -28,6 +28,7 @@ extern "C" {
 }
 
 #include <list>
+#include <string>
 
 class Action {
 public:
@@ -35,23 +36,28 @@ public:
   enum ActionType {
     noaction = 0,
     execute,
-    iconify,
-    raiseWindow,
-    lowerWindow,
-    closeWindow,
-    shade,
+    iconify, //done
+    raise, //done
+    lower, //done
+    close, //done
+    toggleshade, //done
+    toggleomnipresent, //done
     moveWindowUp,
     moveWindowDown,
     moveWindowLeft,
     moveWindowRight,
 
-    nextWindow,
-    prevWindow,
-    nextWindowOnAllWorkspaces,
-    prevWindowOnAllWorkspaces,
+    sendToWorkspace, //done
 
-    nextWindowOfClass,
-    prevWindowOfClass,
+    nextWindow, //done for now
+    prevWindow, //done for now
+    nextWindowOnAllWorkspaces, //done
+    prevWindowOnAllWorkspaces, //done
+
+    nextWindowOfClass, //done
+    prevWindowOfClass, //done
+    nextWindowOfClassOnAllWorkspaces, //done
+    prevWindowOfClassOnAllWorkspaces, //done
 
     changeWorkspace, //done
     nextWorkspace, //done
@@ -73,17 +79,21 @@ 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(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 std::list<Action> ActionList;