X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;ds=sidebyside;f=util%2Fepist%2Factions.hh;h=6fdd48f0e9820e7407af7eef68cb3d899a97bde9;hb=7cac1f19acf894aaf4470460732574abc158fd78;hp=25f1e9685d220fd4a43b72148167ad7542646a20;hpb=28594da6de001f1d8b6b975286032302db3a6491;p=chaz%2Fopenbox

diff --git a/util/epist/actions.hh b/util/epist/actions.hh
index 25f1e968..6fdd48f0 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
@@ -68,22 +67,34 @@ public:
     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,
+    toggleDecorations,
 
+    toggleGrabs,
     stringChain, 
     keyChain,
     numberChain,
 
-    cancel,
+    cancelChain, //done
 
     NUM_ACTIONS
   };
@@ -93,8 +104,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; }
@@ -103,9 +114,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;