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

diff --git a/util/epist/epist.cc b/util/epist/epist.cc
index b9dac6a8..29116da3 100644
--- a/util/epist/epist.cc
+++ b/util/epist/epist.cc
@@ -58,7 +58,7 @@ using std::string;
 
 epist::epist(char **argv, char *dpy_name, char *rc_file)
   : BaseDisplay(argv[0], dpy_name) {
-
+    
   _argv = argv;
 
   if (rc_file)
@@ -68,98 +68,61 @@ 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::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));
+  addAction(Action::nextWorkspace, ControlMask, "Tab");
+  addAction(Action::prevWorkspace, ControlMask | ShiftMask, "Tab");
+  addAction(Action::nextWindow, Mod1Mask, "Tab");
+  addAction(Action::prevWindow, Mod1Mask | ShiftMask, "Tab");
+  addAction(Action::toggleshade, Mod1Mask, "F5");
+  addAction(Action::close, Mod1Mask, "F4");
+  addAction(Action::nextWindowOnAllWorkspaces, Mod1Mask | ControlMask, "Tab");
+  addAction(Action::prevWindowOnAllWorkspaces,
+            Mod1Mask | ShiftMask | ControlMask, "Tab");
+  addAction(Action::raise, Mod1Mask, "Up");
+  addAction(Action::lower, Mod1Mask, "Down");
+  addAction(Action::moveWindowUp, Mod1Mask | ControlMask, "Up", 1);
+  addAction(Action::moveWindowDown, Mod1Mask | ControlMask, "Down", 1);
+  addAction(Action::moveWindowLeft, Mod1Mask | ControlMask, "Left", 1);
+  addAction(Action::moveWindowRight, Mod1Mask | ControlMask, "Right", 1);
+  addAction(Action::resizeWindowHeight, ShiftMask | Mod1Mask | ControlMask,
+            "Up", -1);
+  addAction(Action::resizeWindowHeight, ShiftMask | Mod1Mask | ControlMask,
+            "Down", 1);
+  addAction(Action::resizeWindowWidth, ShiftMask | Mod1Mask | ControlMask,
+            "Left", -1);
+  addAction(Action::resizeWindowWidth, ShiftMask | Mod1Mask | ControlMask,
+            "Right", 1);
+  addAction(Action::iconify, Mod1Mask | ControlMask, "I");
+  addAction(Action::toggleomnipresent, Mod1Mask | ControlMask, "O");
+  addAction(Action::toggleMaximizeHorizontal, ShiftMask | Mod1Mask, "X");
+  addAction(Action::toggleMaximizeVertical, ShiftMask | ControlMask, "X");
+  addAction(Action::toggleMaximizeFull, Mod1Mask | ControlMask, "X");
+  addAction(Action::changeWorkspace, Mod1Mask | ControlMask, "1", 0);
+  addAction(Action::changeWorkspace, Mod1Mask | ControlMask, "2", 1);
+  addAction(Action::changeWorkspace, Mod1Mask | ControlMask, "3", 2);
+  addAction(Action::changeWorkspace, Mod1Mask | ControlMask, "4", 3);
+  addAction(Action::sendToWorkspace, Mod1Mask | ControlMask | ShiftMask,
+            "1", 0);
+  addAction(Action::sendToWorkspace, Mod1Mask | ControlMask | ShiftMask,
+            "2", 1);
+  addAction(Action::sendToWorkspace, Mod1Mask | ControlMask | ShiftMask,
+            "3", 2);
+  addAction(Action::sendToWorkspace, Mod1Mask | ControlMask | ShiftMask,
+            "4", 3);
+  addAction(Action::execute, Mod1Mask | ControlMask, "Escape",
+            "sleep 1 && xset dpms force off");
+  addAction(Action::execute, Mod1Mask, "space",
+            "rxvt");
+
   activateGrabs();
 }
 
@@ -176,8 +139,7 @@ void epist::activateGrabs() {
     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);
+      (*scrit)->grabKey(ait->keycode(), ait->modifierMask());
     }
   }
 }
@@ -203,16 +165,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 +196,18 @@ XWindow *epist::findWindow(Window window) const {
 
   return 0;
 }
+
+void epist::addAction(Action::ActionType act, unsigned int modifiers,
+                      string key, int number) {
+  _actions.push_back(Action(act, XKeysymToKeycode(getXDisplay(),
+                                                  XStringToKeysym(key.c_str())),
+                            modifiers, number));
+}
+
+
+void epist::addAction(Action::ActionType act, unsigned int modifiers,
+                      string key, std::string str) {
+  _actions.push_back(Action(act, XKeysymToKeycode(getXDisplay(),
+                                                  XStringToKeysym(key.c_str())),
+                            modifiers, str));
+}