-// -*- 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>
//
#ifdef HAVE_LIBGEN_H
# include <libgen.h>
#endif // HAVE_LIBGEN_H
+
+#ifdef HAVE_UNISTD_H
+# include <sys/types.h>
+# include <unistd.h>
+#endif // HAVE_UNISTD_H
+
+#ifdef HAVE_SYS_STAT_H
+# include <sys/types.h>
+# include <sys/stat.h>
+#endif // HAVE_SYS_STAT_H
}
#include <iostream>
if (rc_file)
_rc_file = rc_file;
else
- _rc_file = expandTilde("~/.epistrc");
+ _rc_file = expandTilde("~/.openbox/epistrc");
- _xatom = new XAtom(getXDisplay());
+ struct stat buf;
+ if (0 != stat(_rc_file.c_str(), &buf) ||
+ !S_ISREG(buf.st_mode))
+ _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);
::exit(1);
}
- _ktree = new keytree(getXDisplay());
-
- // set up the key tree
- parser p(_ktree);
- p.parse(_rc_file);
-
activateGrabs();
}
bool epist::handleSignal(int sig) {
switch (sig) {
- case SIGHUP:
+ case SIGHUP: {
cout << "epist: Restarting on request.\n";
+
execvp(_argv[0], _argv);
- execvp(basename(_argv[0]), _argv);
+
+ string base(basename(_argv[0]));
+ execvp(base.c_str(), _argv);
+
return false; // this should be unreachable
+ }
case SIGTERM:
case SIGINT: