X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=util%2Fepist%2Fepist.cc;h=bfa7989ce89462588ef83cfa02fc6412480c1cd2;hb=e8f387ea481470dd69257f0e7d4644ab1270b64a;hp=7ac2daf564b2d15c389a5bfe0482c455d56dc870;hpb=a9dfa0439bd8d4f525d5b41a22a3eb14b94d1200;p=chaz%2Fopenbox

diff --git a/util/epist/epist.cc b/util/epist/epist.cc
index 7ac2daf5..bfa7989c 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,9 +68,11 @@ 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);
@@ -116,10 +118,99 @@ epist::epist(char **argv, char *dpy_name, char *rc_file)
                            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::resizeWindowHeight,
+                           XKeysymToKeycode(getXDisplay(),
+                                             XStringToKeysym("Up")),
+                           ShiftMask | Mod1Mask | ControlMask, -1));
+  _actions.push_back(Action(Action::resizeWindowHeight,
+                           XKeysymToKeycode(getXDisplay(),
+                                             XStringToKeysym("Down")),
+                           ShiftMask | Mod1Mask | ControlMask, 1));
+  _actions.push_back(Action(Action::resizeWindowWidth,
+                           XKeysymToKeycode(getXDisplay(),
+                                             XStringToKeysym("Left")),
+                           ShiftMask | Mod1Mask | ControlMask, -1));
+  _actions.push_back(Action(Action::resizeWindowWidth,
+                           XKeysymToKeycode(getXDisplay(),
+                                             XStringToKeysym("Right")),
+                           ShiftMask | 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("Escape")),
+                           Mod1Mask | ControlMask,
+                           "sleep 1 && xset dpms force off"));
+  _actions.push_back(Action(Action::execute,
+                           XKeysymToKeycode(getXDisplay(),
+                                             XStringToKeysym("space")),
+                           Mod1Mask, "rxvt"));
   activateGrabs();
 }
 
@@ -136,8 +227,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());
     }
   }
 }
@@ -163,16 +253,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;
     }