X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=util%2Fepist%2Fepist.cc;h=c10f5a8e6caaa7d83367e5d058ebd6815284eff7;hb=6d40002093a5d8e665d4f310ea028d22e93e88cb;hp=b9dac6a842d6cc7c6aa17bdeddd2bb993d72931d;hpb=f32096dcd2c5a4e44763def56c290ce37aa548ba;p=chaz%2Fopenbox

diff --git a/util/epist/epist.cc b/util/epist/epist.cc
index b9dac6a8..c10f5a8e 100644
--- a/util/epist/epist.cc
+++ b/util/epist/epist.cc
@@ -50,116 +50,46 @@ using std::cout;
 using std::endl;
 using std::string;
 
+#include "actions.hh"
 #include "epist.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);
   }
 
-  _actions.push_back(Action(Action::nextWorkspace,
-                            XKeysymToKeycode(getXDisplay(),
-                                             XStringToKeysym("Tab")),
-                            ControlMask));
-  _actions.push_back(Action(Action::prevWorkspace,
-                           XKeysymToKeycode(getXDisplay(),
-                                             XStringToKeysym("Tab")),
-                           ControlMask | ShiftMask));
-  _actions.push_back(Action(Action::toggleshade,
-                            XKeysymToKeycode(getXDisplay(),
-                                             XStringToKeysym("F5")),
-                            Mod1Mask));
-  _actions.push_back(Action(Action::close,
-                            XKeysymToKeycode(getXDisplay(),
-                                             XStringToKeysym("F4")),
-                            Mod1Mask));
-  _actions.push_back(Action(Action::nextWindow,
-                            XKeysymToKeycode(getXDisplay(),
-                                             XStringToKeysym("Tab")),
-                            Mod1Mask));
-  _actions.push_back(Action(Action::prevWindow,
-                           XKeysymToKeycode(getXDisplay(),
-                                             XStringToKeysym("Tab")),
-                           Mod1Mask | ShiftMask));
-  _actions.push_back(Action(Action::nextWindowOnAllWorkspaces,
-                            XKeysymToKeycode(getXDisplay(),
-                                             XStringToKeysym("Tab")),
-                            Mod1Mask | ControlMask));
-  _actions.push_back(Action(Action::prevWindowOnAllWorkspaces,
-                           XKeysymToKeycode(getXDisplay(),
-                                             XStringToKeysym("Tab")),
-                           Mod1Mask | ShiftMask | ControlMask));
-  _actions.push_back(Action(Action::raise,
-                           XKeysymToKeycode(getXDisplay(),
-                                             XStringToKeysym("Up")),
-                           Mod1Mask));
-  _actions.push_back(Action(Action::lower,
-                           XKeysymToKeycode(getXDisplay(),
-                                             XStringToKeysym("Down")),
-                           Mod1Mask));
-  _actions.push_back(Action(Action::iconify,
-                           XKeysymToKeycode(getXDisplay(),
-                                             XStringToKeysym("I")),
-                           Mod1Mask | ControlMask));
-  _actions.push_back(Action(Action::toggleomnipresent,
-                           XKeysymToKeycode(getXDisplay(),
-                                             XStringToKeysym("O")),
-                           Mod1Mask | ControlMask));
-  _actions.push_back(Action(Action::changeWorkspace,
-                           XKeysymToKeycode(getXDisplay(),
-                                             XStringToKeysym("1")),
-                           Mod1Mask | ControlMask, 0));
-  _actions.push_back(Action(Action::changeWorkspace,
-                           XKeysymToKeycode(getXDisplay(),
-                                             XStringToKeysym("2")),
-                           Mod1Mask | ControlMask, 1));
-  _actions.push_back(Action(Action::changeWorkspace,
-                           XKeysymToKeycode(getXDisplay(),
-                                             XStringToKeysym("3")),
-                           Mod1Mask | ControlMask, 2));
-  _actions.push_back(Action(Action::changeWorkspace,
-                           XKeysymToKeycode(getXDisplay(),
-                                             XStringToKeysym("4")),
-                           Mod1Mask | ControlMask, 3));
-  _actions.push_back(Action(Action::sendToWorkspace,
-                           XKeysymToKeycode(getXDisplay(),
-                                             XStringToKeysym("1")),
-                           Mod1Mask | ControlMask | ShiftMask, 0));
-  _actions.push_back(Action(Action::sendToWorkspace,
-                           XKeysymToKeycode(getXDisplay(),
-                                             XStringToKeysym("2")),
-                           Mod1Mask | ControlMask | ShiftMask, 1));
-  _actions.push_back(Action(Action::sendToWorkspace,
-                           XKeysymToKeycode(getXDisplay(),
-                                             XStringToKeysym("3")),
-                           Mod1Mask | ControlMask | ShiftMask, 2));
-  _actions.push_back(Action(Action::sendToWorkspace,
-                           XKeysymToKeycode(getXDisplay(),
-                                             XStringToKeysym("4")),
-                           Mod1Mask | ControlMask | ShiftMask, 3));
-  _actions.push_back(Action(Action::execute,
-                           XKeysymToKeycode(getXDisplay(),
-                                             XStringToKeysym("F6")),
-                           Mod1Mask));
+  _ktree = new keytree(getXDisplay());
+
+  // set up the key tree
+  parser p(_ktree);
+  p.parse(_rc_file);
+
   activateGrabs();
 }
 
@@ -172,14 +102,8 @@ 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) {
-      XGrabKey(getXDisplay(), ait->keycode(), ait->modifierMask(),
-               (*scrit)->rootWindow(), False, GrabModeAsync, GrabModeAsync);
-    }
-  }
+  for (scrit = _screens.begin(); scrit != scrend; ++scrit)
+      _ktree->grabDefaults(*scrit);
 }
 
 
@@ -203,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;
     }
@@ -241,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();
+}