Big fat merge for epist.

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

diff --git a/util/epist/epist.cc b/util/epist/epist.cc
index 474d8fe8cdbcd9030e5f45d2d13fd137a1da1f76..c10f5a8e6caaa7d83367e5d058ebd6815284eff7 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 Epistory - a key handler for NETWM/EWMH window managers.
+// epist.cc 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
@@ -38,9 +38,9 @@ extern "C" {
 #  include <signal.h>
 #endif // HAVE_SIGNAL_H
 
-/*#ifdef    HAVE_LIBGEN_H
+#ifdef    HAVE_LIBGEN_H
 #  include <libgen.h>
-#endif // HAVE_LIBGEN_H*/
+#endif // HAVE_LIBGEN_H
 }
 
 #include <iostream>
@@ -50,32 +50,47 @@ using std::cout;
 using std::endl;
 using std::string;
 
+#include "actions.hh"
 #include "epist.hh"
-#include "process.hh"
 #include "screen.hh"
 #include "window.hh"
+#include "parser.hh"
 #include "../../src/XAtom.hh"
 
 
 epist::epist(char **argv, char *dpy_name, char *rc_file)
   : BaseDisplay(argv[0], dpy_name) {
-
+    
   _argv = argv;
 
   if (rc_file)
     _rc_file = rc_file;
   else
-    _rc_file = expandTilde("~/.openbox/epistrc");
+    _rc_file = expandTilde("~/.epistrc");
 
   _xatom = new XAtom(getXDisplay());
 
-  screen *s = new screen(this, DefaultScreen(getXDisplay()));
-  if (s->managed())
-    _screens.push_back(s);
+  _active = _clients.end();
+  
+  for (unsigned int i = 0; i < getNumberOfScreens(); ++i) {
+    screen *s = new screen(this, i);
+    if (s->managed()) {
+      _screens.push_back(s);
+      s->updateEverything();
+    }
+  }
   if (_screens.empty()) {
     cout << "No compatible window manager found on any screens. Aborting.\n";
     ::exit(1);
   }
+
+  _ktree = new keytree(getXDisplay());
+
+  // set up the key tree
+  parser p(_ktree);
+  p.parse(_rc_file);
+
+  activateGrabs();
 }
 
 
@@ -83,6 +98,14 @@ epist::~epist() {
   delete _xatom;
 }
 
+void epist::activateGrabs() {
+
+  ScreenList::const_iterator scrit, scrend = _screens.end();
+  
+  for (scrit = _screens.begin(); scrit != scrend; ++scrit)
+      _ktree->grabDefaults(*scrit);
+}
+
 
 bool epist::handleSignal(int sig) {
   switch (sig) {
@@ -104,16 +127,9 @@ bool epist::handleSignal(int sig) {
 
 
 void epist::process_event(XEvent *e) {
-  Window root;
-
-  if (e->xany.type == KeyPress)
-    root = e->xkey.root;
-  else
-    root = e->xany.window;
-  
   ScreenList::const_iterator it, end = _screens.end();
   for (it = _screens.begin(); it != end; ++it) {
-    if ((*it)->rootWindow() == root) {
+    if ((*it)->rootWindow() == e->xany.window) {
       (*it)->processEvent(*e);
       return;
     }
@@ -142,3 +158,22 @@ XWindow *epist::findWindow(Window window) const {
 
   return 0;
 }
+
+
+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;
+  else if (dest >= (signed)_screens.size()) dest = 0;
+
+  const XWindow *target = _screens[dest]->lastActiveWindow();
+  if (target) target->focus();
+}