X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=util%2Fepist%2Fepist.cc;h=13f663c92c3bd695f8e86b939a08992207f51129;hb=4aeca296e895bfe74d59d4732e740c2d49c10080;hp=6e954aec9a787fd0ae60d0a1347a852d144fd4ca;hpb=a0e50e15b507f1f8752bd7858c9e758265a34fc4;p=chaz%2Fopenbox

diff --git a/util/epist/epist.cc b/util/epist/epist.cc
index 6e954aec..13f663c9 100644
--- a/util/epist/epist.cc
+++ b/util/epist/epist.cc
@@ -68,22 +68,128 @@ epist::epist(char **argv, char *dpy_name, char *rc_file)
 
   _xatom = new XAtom(getXDisplay());
 
-  screen *s = new screen(this, DefaultScreen(getXDisplay()));
-  if (s->managed())
-    _screens.push_back(s);
+  for (unsigned int i = 0; i < getNumberOfScreens(); ++i) {
+    screen *s = new screen(this, i);
+    if (s->managed())
+      _screens.push_back(s);
+  }
   if (_screens.empty()) {
     cout << "No compatible window manager found on any screens. Aborting.\n";
     ::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::close,
+                            XKeysymToKeycode(getXDisplay(),
+                                             XStringToKeysym("F4")),
+                            Mod1Mask));
+  _actions.push_back(Action(Action::nextWindow,
                             XKeysymToKeycode(getXDisplay(),
                                              XStringToKeysym("Tab")),
                             Mod1Mask));
-  _actions.push_back(Action(Action::prevDesktop,
+  _actions.push_back(Action(Action::prevWindow,
                            XKeysymToKeycode(getXDisplay(),
                                              XStringToKeysym("Tab")),
-                           ControlMask));
+                           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::moveWindowUp,
+                           XKeysymToKeycode(getXDisplay(),
+                                             XStringToKeysym("Up")),
+                           Mod1Mask | ControlMask, 1));
+  _actions.push_back(Action(Action::moveWindowDown,
+                           XKeysymToKeycode(getXDisplay(),
+                                             XStringToKeysym("Down")),
+                           Mod1Mask | ControlMask, 1));
+  _actions.push_back(Action(Action::moveWindowLeft,
+                           XKeysymToKeycode(getXDisplay(),
+                                             XStringToKeysym("Left")),
+                           Mod1Mask | ControlMask, 1));
+  _actions.push_back(Action(Action::moveWindowRight,
+                           XKeysymToKeycode(getXDisplay(),
+                                             XStringToKeysym("Right")),
+                           Mod1Mask | ControlMask, 1));
+  _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::toggleMaximizeHorizontal,
+                           XKeysymToKeycode(getXDisplay(),
+                                             XStringToKeysym("X")),
+                           ShiftMask | Mod1Mask));
+  _actions.push_back(Action(Action::toggleMaximizeVertical,
+                           XKeysymToKeycode(getXDisplay(),
+                                             XStringToKeysym("X")),
+                           ShiftMask | ControlMask));
+  _actions.push_back(Action(Action::toggleMaximizeFull,
+                           XKeysymToKeycode(getXDisplay(),
+                                             XStringToKeysym("X")),
+                           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("space")),
+                           Mod1Mask, "rxvt"));
   activateGrabs();
 }
 
@@ -92,24 +198,21 @@ 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);
     }
   }
 }
+
+
 bool epist::handleSignal(int sig) {
   switch (sig) {
   case SIGHUP: