make epist compile with the new code base

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

diff --git a/util/epist/epist.cc b/util/epist/epist.cc
index f3084e8c9aecbbabb3146718eac9e2fb8b6bfe33..74a11d1a4d92bef98a46ab251d4274965bf74a70 100644 (file)
--- a/util/epist/epist.cc
+++ b/util/epist/epist.cc
@@ -1,5 +1,5 @@
-// -*- mode: C++; indent-tabs-mode: nil; -*-
-// epist.cc for Epistophy - a key handler for NETWM/EWMH window managers.
+// -*- 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>
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
@@ -41,6 +41,16 @@ extern "C" {
 #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>
@@ -54,7 +64,8 @@ using std::string;
 #include "epist.hh"
 #include "screen.hh"
 #include "window.hh"
-#include "../../src/XAtom.hh"
+#include "parser.hh"
+#include "../../src/xatom.hh"
 
 
 epist::epist(char **argv, char *dpy_name, char *rc_file)
@@ -67,9 +78,20 @@ epist::epist(char **argv, char *dpy_name, char *rc_file)
   else
     _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);
@@ -83,51 +105,6 @@ epist::epist(char **argv, char *dpy_name, char *rc_file)
     ::exit(1);
   }
 
-  addAction(Action::nextWorkspace, ControlMask, "Tab");
-  addAction(Action::prevWorkspace, ControlMask | ShiftMask, "Tab");
-  addAction(Action::nextWindow, Mod1Mask, "Tab");
-  addAction(Action::prevWindow, Mod1Mask | ShiftMask, "Tab");
-  addAction(Action::toggleshade, Mod1Mask, "F5");
-  addAction(Action::close, Mod1Mask, "F4");
-  addAction(Action::nextWindowOnAllWorkspaces, Mod1Mask | ControlMask, "Tab");
-  addAction(Action::prevWindowOnAllWorkspaces,
-            Mod1Mask | ShiftMask | ControlMask, "Tab");
-  addAction(Action::raise, Mod1Mask, "Up");
-  addAction(Action::lower, Mod1Mask, "Down");
-  addAction(Action::moveWindowUp, Mod1Mask | ControlMask, "Up", 1);
-  addAction(Action::moveWindowDown, Mod1Mask | ControlMask, "Down", 1);
-  addAction(Action::moveWindowLeft, Mod1Mask | ControlMask, "Left", 1);
-  addAction(Action::moveWindowRight, Mod1Mask | ControlMask, "Right", 1);
-  addAction(Action::resizeWindowHeight, ShiftMask | Mod1Mask | ControlMask,
-            "Up", -1);
-  addAction(Action::resizeWindowHeight, ShiftMask | Mod1Mask | ControlMask,
-            "Down", 1);
-  addAction(Action::resizeWindowWidth, ShiftMask | Mod1Mask | ControlMask,
-            "Left", -1);
-  addAction(Action::resizeWindowWidth, ShiftMask | Mod1Mask | ControlMask,
-            "Right", 1);
-  addAction(Action::iconify, Mod1Mask | ControlMask, "I");
-  addAction(Action::toggleomnipresent, Mod1Mask | ControlMask, "O");
-  addAction(Action::toggleMaximizeHorizontal, ShiftMask | Mod1Mask, "X");
-  addAction(Action::toggleMaximizeVertical, ShiftMask | ControlMask, "X");
-  addAction(Action::toggleMaximizeFull, Mod1Mask | ControlMask, "X");
-  addAction(Action::changeWorkspace, Mod1Mask | ControlMask, "1", 0);
-  addAction(Action::changeWorkspace, Mod1Mask | ControlMask, "2", 1);
-  addAction(Action::changeWorkspace, Mod1Mask | ControlMask, "3", 2);
-  addAction(Action::changeWorkspace, Mod1Mask | ControlMask, "4", 3);
-  addAction(Action::sendToWorkspace, Mod1Mask | ControlMask | ShiftMask,
-            "1", 0);
-  addAction(Action::sendToWorkspace, Mod1Mask | ControlMask | ShiftMask,
-            "2", 1);
-  addAction(Action::sendToWorkspace, Mod1Mask | ControlMask | ShiftMask,
-            "3", 2);
-  addAction(Action::sendToWorkspace, Mod1Mask | ControlMask | ShiftMask,
-            "4", 3);
-  addAction(Action::execute, Mod1Mask | ControlMask, "Escape",
-            "sleep 1 && xset dpms force off");
-  addAction(Action::execute, Mod1Mask, "space",
-            "rxvt");
-
   activateGrabs();
 }
 
@@ -140,23 +117,23 @@ void epist::activateGrabs() {
 
   ScreenList::const_iterator scrit, scrend = _screens.end();
   
-  for (scrit = _screens.begin(); scrit != scrend; ++scrit) {
-    ActionList::const_iterator ait, end = _actions.end();
-
-    for(ait = _actions.begin(); ait != end; ++ait) {
-      (*scrit)->grabKey(ait->keycode(), ait->modifierMask());
-    }
-  }
+  for (scrit = _screens.begin(); scrit != scrend; ++scrit)
+      _ktree->grabDefaults(*scrit);
 }
 
 
 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:
@@ -204,6 +181,14 @@ XWindow *epist::findWindow(Window window) const {
 
 
 void epist::cycleScreen(int current, bool forward) const {
+  unsigned int i;
+  for (i = 0; i < _screens.size(); ++i)
+    if (_screens[i]->number() == current) {
+      current = i;
+      break;
+    }
+  assert(i < _screens.size());  // current is for an unmanaged screen
+  
   int dest = current + (forward ? 1 : -1);
 
   if (dest < 0) dest = (signed)_screens.size() - 1;
@@ -212,19 +197,3 @@ void epist::cycleScreen(int current, bool forward) const {
   const XWindow *target = _screens[dest]->lastActiveWindow();
   if (target) target->focus();
 }
-
-
-void epist::addAction(Action::ActionType act, unsigned int modifiers,
-                      string key, int number) {
-  _actions.push_back(Action(act, XKeysymToKeycode(getXDisplay(),
-                                                  XStringToKeysym(key.c_str())),
-                            modifiers, number));
-}
-
-
-void epist::addAction(Action::ActionType act, unsigned int modifiers,
-                      string key, std::string str) {
-  _actions.push_back(Action(act, XKeysymToKeycode(getXDisplay(),
-                                                  XStringToKeysym(key.c_str())),
-                            modifiers, str));
-}