group next/prev commands together

[chaz/openbox] / util / epist / actions.hh

diff --git a/util/epist/actions.hh b/util/epist/actions.hh
index b13149ae231e293fdc1cfb7b0a95bead8038bccd..afe508168a369f7605276f99283ce2c6bae94ca2 100644 (file)
--- 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.
+// 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
@@ -46,27 +46,35 @@ 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
 
     changeWorkspace, //done
     nextWorkspace, //done
     prevWorkspace, //done
 
+    nextScreen, //done for now
+    prevScreen, //done for now
+  
     // these are openbox extensions
     showRootMenu,
     showWorkspaceMenu,
@@ -85,8 +93,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 +103,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;