including wrong

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

diff --git a/util/epist/epist.hh b/util/epist/epist.hh
index a3c4fdccdd8d5cce03cd0bb66ea82711b01c52fb..6da3818188283a9c16bbde93e9eaec6c3c7dcce5 100644 (file)
--- a/util/epist/epist.hh
+++ b/util/epist/epist.hh
@@ -30,7 +30,7 @@ extern "C" {
 #include <string>
 #include <map>
 
-#include <actions.hh>
+#include "actions.hh"
 
 #include "../../src/BaseDisplay.hh"
 
@@ -51,12 +51,17 @@ private:
   typedef WindowLookup::value_type WindowLookupPair;
   WindowLookup    _windows;
 
-  ActionList _actions;
+  ActionList      _actions;
   
   virtual void process_event(XEvent *e);
   virtual bool handleSignal(int sig);
 
   void activateGrabs();
+  void addAction(Action::ActionType act, unsigned int modifiers,
+                 std::string key, int number = 0);
+  void addAction(Action::ActionType act, unsigned int modifiers,
+                 std::string key, std::string str);
+
 public:
   epist(char **argv, char *display_name, char *rc_file);
   virtual ~epist();
@@ -67,7 +72,12 @@ public:
   void removeWindow(XWindow *window);
   XWindow *findWindow(Window window) const;
 
-  const ActionList actions(void) { return _actions; }
+  void getLockModifiers(int &numlockMask, int &scrolllockMask) const {
+    numlockMask = NumLockMask;
+    scrolllockMask = ScrollLockMask;
+  }
+  
+  const ActionList &actions(void) { return _actions; }
 };
 
 #endif // __epist_hh