X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=util%2Fepist%2Fepist.cc;h=eea8502d9889b0209aa2ea9eba32fad2b89d7102;hb=a16ae8733983b7e4c7733512cf1c5b9f2cb0b2db;hp=feb6cd4cc33b918bcec9833bcb4964ea0ad51b34;hpb=5bf463ea955bd7e27b1f04a1eefb28ec52309cb8;p=chaz%2Fopenbox

diff --git a/util/epist/epist.cc b/util/epist/epist.cc
index feb6cd4c..eea8502d 100644
--- a/util/epist/epist.cc
+++ b/util/epist/epist.cc
@@ -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);
@@ -100,6 +102,66 @@ epist::epist(char **argv, char *dpy_name, char *rc_file)
                            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("space")),
+                           Mod1Mask, "rxvt"));
   activateGrabs();
 }