X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=util%2Fepist%2Fepist.cc;h=3654150d62c3cd31f928900c57eeddf18046a5f9;hb=b94699afc339c469534521c44470aa6d19e5b4cc;hp=25f7e62ab9a6e5e6031678528efbe17aec873f76;hpb=8cfa247c3fd0dde18ea5cda42f8e319f01545fd6;p=chaz%2Fopenbox

diff --git a/util/epist/epist.cc b/util/epist/epist.cc
index 25f7e62a..3654150d 100644
--- a/util/epist/epist.cc
+++ b/util/epist/epist.cc
@@ -76,14 +76,38 @@ 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::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")),
-                           ControlMask));
+                           Mod1Mask | ShiftMask));
+  _actions.push_back(Action(Action::raise,
+                           XKeysymToKeycode(getXDisplay(),
+                                             XStringToKeysym("Up")),
+                           Mod1Mask));
+  _actions.push_back(Action(Action::lower,
+                           XKeysymToKeycode(getXDisplay(),
+                                             XStringToKeysym("Down")),
+                           Mod1Mask));
   activateGrabs();
 }
 
@@ -92,22 +116,16 @@ 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();
   
   for (scrit = _screens.begin(); scrit != scrend; ++scrit) {
-    ActionList::const_iterator end = _actions.end();
+    ActionList::const_iterator ait, end = _actions.end();
 
-    for(ActionList::const_iterator ait = _actions.begin();
-        ait != end; ++ait) {
+    for(ait = _actions.begin(); ait != end; ++ait) {
       XGrabKey(getXDisplay(), ait->keycode(), ait->modifierMask(),
-               (*scrit)->rootWindow(), True, GrabModeAsync, GrabModeAsync);
+               (*scrit)->rootWindow(), False, GrabModeAsync, GrabModeAsync);
     }
   }
 }