X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=util%2Fepist%2Fepist.cc;h=eea8502d9889b0209aa2ea9eba32fad2b89d7102;hb=a16ae8733983b7e4c7733512cf1c5b9f2cb0b2db;hp=7ac2daf564b2d15c389a5bfe0482c455d56dc870;hpb=a9dfa0439bd8d4f525d5b41a22a3eb14b94d1200;p=chaz%2Fopenbox diff --git a/util/epist/epist.cc b/util/epist/epist.cc index 7ac2daf5..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); @@ -120,6 +122,46 @@ epist::epist(char **argv, char *dpy_name, char *rc_file) 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(); }