X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=util%2Fepist%2Fscreen.cc;h=f40bff3ca1cd15c37606935477b5ac4612e673a6;hb=b0239459c3486c9f5b4913b6071245265e6a19a2;hp=e91685a89a68e2899da294ddcdf12ba00fd68c7d;hpb=97c3b159c2477b337186e6ee14aba2baf0f4933f;p=chaz%2Fopenbox diff --git a/util/epist/screen.cc b/util/epist/screen.cc index e91685a8..f40bff3c 100644 --- a/util/epist/screen.cc +++ b/util/epist/screen.cc @@ -146,164 +146,162 @@ void screen::processEvent(const XEvent &e) { void screen::handleKeypress(const XEvent &e) { int scrolllockMask, numlockMask; - - ActionList::const_iterator it = _epist->actions().begin(); - ActionList::const_iterator end = _epist->actions().end(); - _epist->getLockModifiers(numlockMask, scrolllockMask); - for (; it != end; ++it) { - unsigned int state = e.xkey.state & ~(LockMask|scrolllockMask|numlockMask); - - if (e.xkey.keycode == it->keycode() && - state == it->modifierMask()) { - switch (it->type()) { - case Action::nextScreen: - _epist->cycleScreen(_number, true); - return; - - case Action::prevScreen: - _epist->cycleScreen(_number, false); - return; - - case Action::nextWorkspace: - cycleWorkspace(true); - return; + // Mask out the lock modifiers. We want our keys to always work + // This should be made an option + unsigned int state = e.xkey.state & ~(LockMask|scrolllockMask|numlockMask); + const Action *it = _epist->getKeyTree().getAction(e, state, this); + + if (!it) + return; - case Action::prevWorkspace: - cycleWorkspace(false); - return; + switch (it->type()) { + case Action::nextScreen: + _epist->cycleScreen(_number, true); + return; - case Action::nextWindow: - cycleWindow(true); - return; + case Action::prevScreen: + _epist->cycleScreen(_number, false); + return; - case Action::prevWindow: - cycleWindow(false); - return; + case Action::nextWorkspace: + cycleWorkspace(true); + return; - case Action::nextWindowOnAllWorkspaces: - cycleWindow(true, false, true); - return; + case Action::prevWorkspace: + cycleWorkspace(false); + return; - case Action::prevWindowOnAllWorkspaces: - cycleWindow(false, false, true); - return; + case Action::nextWindow: + cycleWindow(true); + return; - case Action::nextWindowOnAllScreens: - cycleWindow(true, true); - return; + case Action::prevWindow: + cycleWindow(false); + return; - case Action::prevWindowOnAllScreens: - cycleWindow(false, true); - return; + case Action::nextWindowOnAllWorkspaces: + cycleWindow(true, false, true); + return; - case Action::nextWindowOfClass: - cycleWindow(true, false, false, true, it->string()); - return; + case Action::prevWindowOnAllWorkspaces: + cycleWindow(false, false, true); + return; - case Action::prevWindowOfClass: - cycleWindow(false, false, false, true, it->string()); - return; + case Action::nextWindowOnAllScreens: + cycleWindow(true, true); + return; - case Action::nextWindowOfClassOnAllWorkspaces: - cycleWindow(true, false, true, true, it->string()); - return; + case Action::prevWindowOnAllScreens: + cycleWindow(false, true); + return; - case Action::prevWindowOfClassOnAllWorkspaces: - cycleWindow(false, false, true, true, it->string()); - return; + case Action::nextWindowOfClass: + cycleWindow(true, false, false, true, it->string()); + return; - case Action::changeWorkspace: - changeWorkspace(it->number()); - return; + case Action::prevWindowOfClass: + cycleWindow(false, false, false, true, it->string()); + return; + + case Action::nextWindowOfClassOnAllWorkspaces: + cycleWindow(true, false, true, true, it->string()); + return; + + case Action::prevWindowOfClassOnAllWorkspaces: + cycleWindow(false, false, true, true, it->string()); + return; - case Action::execute: - execCommand(it->string()); - return; + case Action::changeWorkspace: + // we subtract one so counting starts at 1 in the config file + changeWorkspace(it->number() - 1); + return; - default: - break; - } + case Action::execute: + execCommand(it->string()); + return; - // these actions require an active window - if (_active != _clients.end()) { - XWindow *window = *_active; + default: + break; + } - switch (it->type()) { - case Action::iconify: + // these actions require an active window + if (_active != _clients.end()) { + XWindow *window = *_active; + + switch (it->type()) { + case Action::iconify: window->iconify(); return; - case Action::close: + case Action::close: window->close(); return; - case Action::raise: + case Action::raise: window->raise(); return; - case Action::lower: + case Action::lower: window->lower(); return; - case Action::sendToWorkspace: + case Action::sendToWorkspace: window->sendTo(it->number()); return; - case Action::toggleomnipresent: + case Action::toggleomnipresent: if (window->desktop() == 0xffffffff) window->sendTo(_active_desktop); else window->sendTo(0xffffffff); return; - case Action::moveWindowUp: + case Action::moveWindowUp: window->move(window->x(), window->y() - it->number()); return; - case Action::moveWindowDown: + case Action::moveWindowDown: window->move(window->x(), window->y() + it->number()); return; - case Action::moveWindowLeft: + case Action::moveWindowLeft: window->move(window->x() - it->number(), window->y()); return; - case Action::moveWindowRight: + case Action::moveWindowRight: window->move(window->x() + it->number(), window->y()); return; - case Action::resizeWindowWidth: + case Action::resizeWindowWidth: window->resize(window->width() + it->number(), window->height()); return; - case Action::resizeWindowHeight: + case Action::resizeWindowHeight: window->resize(window->width(), window->height() + it->number()); return; - case Action::toggleshade: + case Action::toggleshade: window->shade(! window->shaded()); return; - case Action::toggleMaximizeHorizontal: + case Action::toggleMaximizeHorizontal: window->toggleMaximize(XWindow::Max_Horz); return; - case Action::toggleMaximizeVertical: + case Action::toggleMaximizeVertical: window->toggleMaximize(XWindow::Max_Vert); return; - case Action::toggleMaximizeFull: + case Action::toggleMaximizeFull: window->toggleMaximize(XWindow::Max_Full); return; - default: + default: assert(false); // unhandled action type! break; - } } - } } } @@ -455,21 +453,13 @@ void screen::updateActiveWindow() { void screen::execCommand(const string &cmd) const { pid_t pid; if ((pid = fork()) == 0) { - extern char **environ; - - char *const argv[] = { - "sh", - "-c", - const_cast(cmd.c_str()), - 0 - }; // make the command run on the correct screen if (putenv(const_cast(_info->displayString().c_str()))) { cout << "warning: couldn't set environment variable 'DISPLAY'\n"; perror("putenv()"); } - execve("/bin/sh", argv, environ); - exit(127); + execl("/bin/sh", "sh", "-c", cmd.c_str(), NULL); + exit(-1); } else if (pid == -1) { cout << _epist->getApplicationName() << ": Could not fork a process for executing a command\n"; @@ -498,8 +488,6 @@ void screen::cycleWindow(const bool forward, const bool allscreens, target = begin; } else { ++target; - if (target == end) - target = begin; } } else { if (target == begin) @@ -511,6 +499,10 @@ void screen::cycleWindow(const bool forward, const bool allscreens, if (target == _active) return; + // start back at the beginning of the loop + if (target == end) + continue; + // determine if this window is invalid for cycling to const XWindow *t = *target; if (t->iconic()) continue; @@ -589,3 +581,21 @@ void screen::grabKey(const KeyCode keyCode, const int modifierMask) const { modifierMask|numlockMask|LockMask|scrolllockMask, _root, True, GrabModeAsync, GrabModeAsync); } + +void screen::ungrabKey(const KeyCode keyCode, const int modifierMask) const { + + Display *display = _epist->getXDisplay(); + int numlockMask, scrolllockMask; + + _epist->getLockModifiers(numlockMask, scrolllockMask); + + XUngrabKey(display, keyCode, modifierMask, _root); + XUngrabKey(display, keyCode, modifierMask|LockMask, _root); + XUngrabKey(display, keyCode, modifierMask|scrolllockMask, _root); + XUngrabKey(display, keyCode, modifierMask|numlockMask, _root); + XUngrabKey(display, keyCode, modifierMask|LockMask|scrolllockMask, _root); + XUngrabKey(display, keyCode, modifierMask|scrolllockMask|numlockMask, _root); + XUngrabKey(display, keyCode, modifierMask|numlockMask|LockMask, _root); + XUngrabKey(display, keyCode, modifierMask|numlockMask|LockMask| + scrolllockMask, _root); +}