From bd05f7ec58f3e1f5839c372ad4fb007a8d8866f5 Mon Sep 17 00:00:00 2001
From: Scott Moynes <smoynes@nexus.carleton.ca>
Date: Wed, 21 Aug 2002 00:27:16 +0000
Subject: uber patch. Added configuration options. Added workspace grid
 changing. Added keychain timeouts. Fixed some whitespace.

---
 util/epist/epist.cc | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'util/epist/epist.cc')

diff --git a/util/epist/epist.cc b/util/epist/epist.cc
index a5b829b0..a6919687 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>
 //
@@ -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();
 }
 
-- 
cgit v1.2.3