X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=util%2Fepist%2Factions.hh;h=f2d5423ab3552aa9a2a4553af3c3a5fc96f0386d;hb=9be80896ef4bc12bfd6a1d218b976c06482b6e2b;hp=b13149ae231e293fdc1cfb7b0a95bead8038bccd;hpb=f7a41999bfa20750f192d7fa5447bb133451db76;p=chaz%2Fopenbox

diff --git a/util/epist/actions.hh b/util/epist/actions.hh
index b13149ae..f2d5423a 100644
--- a/util/epist/actions.hh
+++ b/util/epist/actions.hh
@@ -1,5 +1,5 @@
-// -*- mode: C++; indent-tabs-mode: nil; -*-
-// actions.hh for Epistophy - a key handler for NETWM/EWMH window managers.
+// -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*-
+// actions.hh for Epistrophy - a key handler for NETWM/EWMH window managers.
 // Copyright (c) 2002 - 2002 Ben Jansens <ben at orodu.net>
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
@@ -32,7 +32,6 @@ extern "C" {
 
 class Action {
 public:
-    // xOr: this is crap.
   enum ActionType {
     noaction = 0,
     execute, //done
@@ -46,27 +45,45 @@ public:
     moveWindowDown, //done
     moveWindowLeft, //done
     moveWindowRight, //done
+    resizeWindowWidth, //done
+    resizeWindowHeight, //done
 
-    toggleMaximizeFull,
-    toggleMaximizeVertical,
-    toggleMaximizeHorizontal,
+    toggleMaximizeFull, //done
+    toggleMaximizeVertical, //done
+    toggleMaximizeHorizontal, //done
 
     sendToWorkspace, //done
 
     nextWindow, //done for now
     prevWindow, //done for now
-    nextWindowOnAllWorkspaces, //done
-    prevWindowOnAllWorkspaces, //done
+    nextWindowOnAllWorkspaces, //done for now
+    prevWindowOnAllWorkspaces, //done for now
 
-    nextWindowOfClass, //done
-    prevWindowOfClass, //done
-    nextWindowOfClassOnAllWorkspaces, //done
-    prevWindowOfClassOnAllWorkspaces, //done
+    nextWindowOnAllScreens, //done for now
+    prevWindowOnAllScreens, //done for now
+
+    nextWindowOfClass, //done for now
+    prevWindowOfClass, //done for now
+    nextWindowOfClassOnAllWorkspaces, //done for now
+    prevWindowOfClassOnAllWorkspaces, //done for now
+
+    upWindow,
+    downWindow,
+    leftWindow,
+    rightWindow,
 
     changeWorkspace, //done
     nextWorkspace, //done
     prevWorkspace, //done
 
+    upWorkspace, //all done
+    downWorkspace,
+    leftWorkspace,
+    rightWorkspace,
+
+    nextScreen, //done for now
+    prevScreen, //done for now
+  
     // these are openbox extensions
     showRootMenu,
     showWorkspaceMenu,
@@ -75,7 +92,7 @@ public:
     keyChain,
     numberChain,
 
-    cancel,
+    cancelChain, //done
 
     NUM_ACTIONS
   };
@@ -85,8 +102,8 @@ private:
   const KeyCode _keycode;
   const unsigned int _modifierMask;
 
-  const int _numberParam;
-  const std::string _stringParam;
+  int _numberParam;
+  std::string _stringParam;
 public:
   inline enum ActionType type() const { return _type;}
   inline const KeyCode keycode() const { return _keycode; }
@@ -95,9 +112,7 @@ public:
   inline const std::string &string() const { return _stringParam; }
 
   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);
+         const std::string &str = "");
 };
   
 typedef std::list<Action> ActionList;