added window cycling

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

diff --git a/util/epist/epist.cc b/util/epist/epist.cc
index a9d017928c5148d5e5cdf077d6f222e29e4714cd..3fb064631d3ade4bd04f78e33577fff548a8ab3a 100644 (file)
--- a/util/epist/epist.cc
+++ b/util/epist/epist.cc
@@ -76,14 +76,26 @@ epist::epist(char **argv, char *dpy_name, char *rc_file)
     ::exit(1);
   }
 
-  _actions.push_back(Action(Action::nextDesktop,
+  _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::prevDesktop,
+  _actions.push_back(Action(Action::nextWindow,
+                            XKeysymToKeycode(getXDisplay(),
+                                             XStringToKeysym("Tab")),
+                            Mod1Mask));
+  _actions.push_back(Action(Action::prevWindow,
                            XKeysymToKeycode(getXDisplay(),
                                              XStringToKeysym("Tab")),
-                           ControlMask));
+                           Mod1Mask | ShiftMask));
   activateGrabs();
 }
 
@@ -92,11 +104,6 @@ epist::~epist() {
   delete _xatom;
 }
 
-
-//   XGrabKey(_epist->getXDisplay(), XKeysymToKeycode(_epist->getXDisplay(),
-//                                            XStringToKeysym("F5")),
-//            Mod1Mask, _root, True, GrabModeAsync, GrabModeAsync);
-                  
 void epist::activateGrabs() {
 
   ScreenList::const_iterator scrit, scrend = _screens.end();
@@ -106,7 +113,7 @@ void epist::activateGrabs() {
 
     for(ait = _actions.begin(); ait != end; ++ait) {
       XGrabKey(getXDisplay(), ait->keycode(), ait->modifierMask(),
-               (*scrit)->rootWindow(), True, GrabModeAsync, GrabModeAsync);
+               (*scrit)->rootWindow(), False, GrabModeAsync, GrabModeAsync);
     }
   }
 }