X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=util%2Fepist%2Fepist.hh;h=6da3818188283a9c16bbde93e9eaec6c3c7dcce5;hb=fc792813a24d22330b49eda8b3ef7054eadf20d3;hp=755fec8cd8a705958d40ab0c9ff50b7070abaac1;hpb=f586e55a8cd3d740a1b7b3a0801bad27030926f9;p=chaz%2Fopenbox

diff --git a/util/epist/epist.hh b/util/epist/epist.hh
index 755fec8c..6da38181 100644
--- a/util/epist/epist.hh
+++ b/util/epist/epist.hh
@@ -1,5 +1,5 @@
 // -*- mode: C++; indent-tabs-mode: nil; -*-
-// epist.hh for Epistory - a key handler for NETWM/EWMH window managers.
+// epist.hh for Epistophy - 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
@@ -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;
 
-  list<Action> actions(void) { return _actions; }
+  void getLockModifiers(int &numlockMask, int &scrolllockMask) const {
+    numlockMask = NumLockMask;
+    scrolllockMask = ScrollLockMask;
+  }
+  
+  const ActionList &actions(void) { return _actions; }
 };
 
 #endif // __epist_hh