make epist compile with the new code base

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

diff --git a/util/epist/epist.hh b/util/epist/epist.hh
index 1932902db45918bec99c83ac61fc9a5f9f892c71..64970e57904872f346a47d247d287ed3d9b9ef89 100644 (file)
--- a/util/epist/epist.hh
+++ b/util/epist/epist.hh
@@ -1,5 +1,5 @@
-// -*- mode: C++; indent-tabs-mode: nil; -*-
-// epist.hh for Epistophy - a key handler for NETWM/EWMH window managers.
+// -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*-
+// epist.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,8 +32,10 @@ extern "C" {
 
 #include "actions.hh"
 #include "window.hh"
+#include "keytree.hh"
+#include "config.hh"
 
-#include "../../src/BaseDisplay.hh"
+#include "../../src/basedisplay.hh"
 
 class XAtom;
 class screen;
@@ -43,6 +45,8 @@ private:
   std::string _rc_file;
   XAtom *_xatom;
   char **_argv;
+  keytree *_ktree;
+  Config *_config;
 
   typedef std::vector<screen *> ScreenList;
   ScreenList _screens;
@@ -60,10 +64,6 @@ private:
   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);
@@ -83,7 +83,9 @@ public:
   }
   
   const ActionList &actions(void) { return _actions; }
-  
+  keytree &getKeyTree(void) { return *_ktree; }
+  inline const Config *getConfig(void) { return _config; }
+
   WindowList& clientsList() { return _clients; }
   WindowList::iterator& activeWindow() { return _active; }
 };