X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=util%2Fepist%2Fepist.hh;h=7bd0d27661c830ca0c2755b7cec2538d01b0058c;hb=8e601e4a64b37f333fc3a5f844e4d72d6f289415;hp=2f5d7399d534fdd87d8450b9603d34cd285c0686;hpb=0aae72418670c23f3fac604aca62cc8a461704f6;p=chaz%2Fopenbox

diff --git a/util/epist/epist.hh b/util/epist/epist.hh
index 2f5d7399..7bd0d276 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
@@ -27,11 +27,47 @@ extern "C" {
 #include <X11/Xlib.h>
 }
 
+#include <string>
+#include <map>
+
+#include <actions.hh>
+
+#include "../../src/BaseDisplay.hh"
+
 class XAtom;
+class screen;
+class XWindow;
+
+class epist : public BaseDisplay {
+private:
+  std::string     _rc_file;
+  XAtom          *_xatom;
+  char          **_argv;
+
+  typedef std::vector<screen *> ScreenList;
+  ScreenList      _screens;
+
+  typedef std::map<Window, XWindow*> WindowLookup;
+  typedef WindowLookup::value_type WindowLookupPair;
+  WindowLookup    _windows;
+
+  ActionList      _actions;
+  
+  virtual void process_event(XEvent *e);
+  virtual bool handleSignal(int sig);
+
+  void activateGrabs();
+public:
+  epist(char **argv, char *display_name, char *rc_file);
+  virtual ~epist();
+
+  inline XAtom *xatom() { return _xatom; }
+
+  void addWindow(XWindow *window);
+  void removeWindow(XWindow *window);
+  XWindow *findWindow(Window window) const;
 
-extern bool _shutdown;
-extern Display *_display;
-extern Window _root;
-extern XAtom *_xatom;
+  const ActionList &actions(void) { return _actions; }
+};
 
 #endif // __epist_hh