X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=util%2Fepist%2Fepist.cc;h=74a11d1a4d92bef98a46ab251d4274965bf74a70;hb=5dc5cc32b0c00c3bfba8ea5727599f49b56ae817;hp=a5b829b0063bb29133aa9ceea8df067831aa2455;hpb=544da8c704c14f2fd2533711dbf710c34d873e32;p=chaz%2Fopenbox

diff --git a/util/epist/epist.cc b/util/epist/epist.cc
index a5b829b0..74a11d1a 100644
--- a/util/epist/epist.cc
+++ b/util/epist/epist.cc
@@ -1,4 +1,4 @@
-// -*- mode: C++; indent-tabs-mode: nil; -*-
+// -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*-
 // epist.cc for Epistrophy - a key handler for NETWM/EWMH window managers.
 // Copyright (c) 2002 - 2002 Ben Jansens <ben at orodu.net>
 //
@@ -65,7 +65,7 @@ using std::string;
 #include "screen.hh"
 #include "window.hh"
 #include "parser.hh"
-#include "../../src/XAtom.hh"
+#include "../../src/xatom.hh"
 
 
 epist::epist(char **argv, char *dpy_name, char *rc_file)
@@ -84,8 +84,14 @@ epist::epist(char **argv, char *dpy_name, char *rc_file)
     _rc_file = DEFAULTRC;
 
   _xatom = new XAtom(getXDisplay());
-
   _active = _clients.end();
+
+  _config = new Config;
+  _ktree = new keytree(getXDisplay(), this);
+
+  // set up the key tree
+  parser p(_ktree, _config);
+  p.parse(_rc_file);
   
   for (unsigned int i = 0; i < getNumberOfScreens(); ++i) {
     screen *s = new screen(this, i);
@@ -99,12 +105,6 @@ epist::epist(char **argv, char *dpy_name, char *rc_file)
     ::exit(1);
   }
 
-  _ktree = new keytree(getXDisplay());
-
-  // set up the key tree
-  parser p(_ktree);
-  p.parse(_rc_file);
-
   activateGrabs();
 }