X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=util%2Fepist%2Fscreen.cc;h=25f16193e95e1fe6b522fe1b5bbdcf4b58cd287a;hb=6ca5c5891a58c616b32b733c99fe373aa58bc360;hp=0f8dfa5640ed58e7bcd020552a45c036b3bd329c;hpb=7cac1f19acf894aaf4470460732574abc158fd78;p=chaz%2Fopenbox diff --git a/util/epist/screen.cc b/util/epist/screen.cc index 0f8dfa56..25f16193 100644 --- a/util/epist/screen.cc +++ b/util/epist/screen.cc @@ -20,6 +20,17 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. +/* A few comments about stacked cycling: + * When stacked cycling is turned on, the focused window is always at the top + * (front) of the list (_clients), EXCEPT for when we are in cycling mode. + * (_cycling is true) If we were to add the focused window to the top of the + * stack while we were cycling, we would end in a deadlock between 2 windows. + * When the modifiers are released, the window that has focus (but it's not + * at the top of the stack, since we are cycling) is placed at the top of the + * stack and raised. + * Hooray and Bummy. - Marius + */ + #ifdef HAVE_CONFIG_H # include "../../config.h" #endif // HAVE_CONFIG_H @@ -33,6 +44,8 @@ extern "C" { # include # include #endif // HAVE_UNISTD_H + +#include } #include @@ -44,22 +57,27 @@ using std::hex; using std::dec; using std::string; -#include "../../src/BaseDisplay.hh" -#include "../../src/XAtom.hh" +#include "../../src/basedisplay.hh" +#include "../../src/xatom.hh" #include "screen.hh" #include "epist.hh" #include "config.hh" screen::screen(epist *epist, int number) - : _clients(epist->clientsList()), - _active(epist->activeWindow()) { + : _clients(epist->clientsList()), _active(epist->activeWindow()), + _config(epist->getConfig()), _grabbed(true), _cycling(false), + _stacked_cycling(false), _stacked_raise(false) +{ _epist = epist; _xatom = _epist->xatom(); _last_active = _clients.end(); _number = number; _info = _epist->getScreenInfo(_number); _root = _info->getRootWindow(); - _grabbed = true; + + _config->getValue(Config::stackedCycling, _stacked_cycling); + if (_stacked_cycling) + _config->getValue(Config::stackedCyclingRaise, _stacked_raise); // find a window manager supporting NETWM, waiting for it to load if we must int count = 20; // try for 20 seconds @@ -133,7 +151,9 @@ void screen::processEvent(const XEvent &e) { DestroyNotify, &ev) || XCheckTypedWindowEvent(_epist->getXDisplay(), e.xany.window, UnmapNotify, &ev)) { - processEvent(ev); + + XWindow *win = _epist->findWindow(e.xany.window); + if (win) win->processEvent(ev); } updateClientList(); @@ -142,6 +162,13 @@ void screen::processEvent(const XEvent &e) { case KeyPress: handleKeypress(e); break; + + case KeyRelease: + handleKeyrelease(e); + break; + + default: + break; } } @@ -177,46 +204,46 @@ void screen::handleKeypress(const XEvent &e) { case Action::nextWindow: - cycleWindow(true, it->number() != 0 ? it->number(): 1); + cycleWindow(state, true, it->number() != 0 ? it->number(): 1); return; case Action::prevWindow: - cycleWindow(false, it->number() != 0 ? it->number(): 1); + cycleWindow(state, false, it->number() != 0 ? it->number(): 1); return; case Action::nextWindowOnAllWorkspaces: - cycleWindow(true, it->number() != 0 ? it->number(): 1, false, true); + cycleWindow(state, true, it->number() != 0 ? it->number(): 1, false, true); return; case Action::prevWindowOnAllWorkspaces: - cycleWindow(false, it->number() != 0 ? it->number(): 1, false, true); + cycleWindow(state, false, it->number() != 0 ? it->number(): 1, false, true); return; case Action::nextWindowOnAllScreens: - cycleWindow(true, it->number() != 0 ? it->number(): 1, true); + cycleWindow(state, true, it->number() != 0 ? it->number(): 1, true); return; case Action::prevWindowOnAllScreens: - cycleWindow(false, it->number() != 0 ? it->number(): 1, true); + cycleWindow(state, false, it->number() != 0 ? it->number(): 1, true); return; case Action::nextWindowOfClass: - cycleWindow(true, it->number() != 0 ? it->number(): 1, + cycleWindow(state, true, it->number() != 0 ? it->number(): 1, false, false, true, it->string()); return; case Action::prevWindowOfClass: - cycleWindow(false, it->number() != 0 ? it->number(): 1, + cycleWindow(state, false, it->number() != 0 ? it->number(): 1, false, false, true, it->string()); return; case Action::nextWindowOfClassOnAllWorkspaces: - cycleWindow(true, it->number() != 0 ? it->number(): 1, + cycleWindow(state, true, it->number() != 0 ? it->number(): 1, false, true, true, it->string()); return; case Action::prevWindowOfClassOnAllWorkspaces: - cycleWindow(false, it->number() != 0 ? it->number(): 1, + cycleWindow(state, false, it->number() != 0 ? it->number(): 1, false, true, true, it->string()); return; @@ -294,7 +321,7 @@ void screen::handleKeypress(const XEvent &e) { window->sendTo(it->number()); return; - case Action::toggleomnipresent: + case Action::toggleOmnipresent: if (window->desktop() == 0xffffffff) window->sendTo(_active_desktop); else @@ -329,7 +356,7 @@ void screen::handleKeypress(const XEvent &e) { window->resizeRel(0, it->number()); return; - case Action::toggleshade: + case Action::toggleShade: window->shade(! window->shaded()); return; @@ -356,6 +383,30 @@ void screen::handleKeypress(const XEvent &e) { } } + +void screen::handleKeyrelease(const XEvent &) { + // the only keyrelease event we care about (for now) is when we do stacked + // cycling and the modifier is released + if (_stacked_cycling && _cycling && nothingIsPressed()) { + // all modifiers have been released. ungrab the keyboard, move the + // focused window to the top of the Z-order and raise it + ungrabModifiers(); + + if (_active != _clients.end()) { + XWindow *w = *_active; + bool e = _last_active == _active; + _clients.remove(w); + _clients.push_front(w); + _active = _clients.begin(); + if (e) _last_active = _active; + w->raise(); + } + + _cycling = false; + } +} + + // do we want to add this window to our list? bool screen::doAddWindow(Window window) const { assert(_managed); @@ -418,14 +469,14 @@ void screen::updateClientList() { const WindowList::iterator end = _clients.end(); unsigned long i; - // insert new clients after the active window for (i = 0; i < num; ++i) { for (it = _clients.begin(); it != end; ++it) if (**it == rootclients[i]) break; if (it == end) { // didn't already exist if (doAddWindow(rootclients[i])) { - // cout << "Added window: 0x" << hex << rootclients[i] << dec << endl; +// cout << "Added window: 0x" << hex << rootclients[i] << dec << endl; + // insert new clients after the active window _clients.insert(insert_point, new XWindow(_epist, this, rootclients[i])); } @@ -468,7 +519,9 @@ const XWindow *screen::lastActiveWindow() const { WindowList::const_iterator it, end = _clients.end(); for (it = _clients.begin(); it != end; ++it) if ((*it)->getScreen() == this && ! (*it)->iconic() && - ((*it)->desktop() == 0xffffffff || (*it)->desktop() == _active_desktop)) + (*it)->canFocus() && + ((*it)->desktop() == 0xffffffff || + (*it)->desktop() == _active_desktop)) return *it; // no windows on this screen @@ -490,9 +543,22 @@ void screen::updateActiveWindow() { break; } } + _active = it; - if (it != end) - _last_active = it; + + if (_active != end) { + /* if we're not cycling and a window gets focus, add it to the top of the + * cycle stack. + */ + if (_stacked_cycling && !_cycling) { + XWindow *win = *_active; + _clients.remove(win); + _clients.push_front(win); + _active = _clients.begin(); + + _last_active = _active; + } + } /* cout << "Active window is now: "; if (_active == _clients.end()) cout << "None\n"; @@ -504,6 +570,12 @@ void screen::updateActiveWindow() { void screen::execCommand(const string &cmd) const { pid_t pid; if ((pid = fork()) == 0) { + // disconnect the child from epist's session and the tty + if (setsid() == -1) { + cout << "warning: could not start a new process group\n"; + perror("setsid"); + } + // 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"; @@ -518,9 +590,11 @@ void screen::execCommand(const string &cmd) const { } -void screen::cycleWindow(const bool forward, const int increment, - const bool allscreens, const bool alldesktops, - const bool sameclass, const string &cn) const { +void screen::cycleWindow(unsigned int state, const bool forward, + const int increment, const bool allscreens, + const bool alldesktops, const bool sameclass, + const string &cn) +{ assert(_managed); assert(increment > 0); @@ -534,7 +608,7 @@ void screen::cycleWindow(const bool forward, const int increment, begin = _clients.begin(), end = _clients.end(); - const XWindow *t = 0; + XWindow *t = 0; for (int x = 0; x < increment; ++x) { while (1) { @@ -575,7 +649,24 @@ void screen::cycleWindow(const bool forward, const int increment, } // phew. we found the window, so focus it. - t->focus(); + if (_stacked_cycling && state) { + if (!_cycling) { + // grab modifiers so we can intercept KeyReleases from them + grabModifiers(); + _cycling = true; + } + + // if the window is on another desktop, we can't use XSetInputFocus, since + // it doesn't imply a workspace change. + if (_stacked_raise || (t->desktop() != _active_desktop && + t->desktop() != 0xffffffff)) + t->focus(); // raise + else + t->focus(false); // don't raise + } + else { + t->focus(); + } } @@ -613,12 +704,13 @@ void screen::changeWorkspace(const int num) const { void screen::changeWorkspaceVert(const int num) const { assert(_managed); - const Config *conf = _epist->getConfig(); - int width = conf->getNumberValue(Config::workspaceColumns); + int width = 0; int num_desktops = (signed)_num_desktops; int active_desktop = (signed)_active_desktop; int wnum = 0; + _config->getValue(Config::workspaceColumns, width); + if (width > num_desktops || width <= 0) return; @@ -644,12 +736,13 @@ void screen::changeWorkspaceVert(const int num) const { void screen::changeWorkspaceHorz(const int num) const { assert(_managed); - const Config *conf = _epist->getConfig(); - int width = conf->getNumberValue(Config::workspaceColumns); + int width = 0; int num_desktops = (signed)_num_desktops; int active_desktop = (signed)_active_desktop; int wnum = 0; - + + _config->getValue(Config::workspaceColumns, width); + if (width > num_desktops || width <= 0) return; @@ -725,3 +818,32 @@ void screen::ungrabKey(const KeyCode keyCode, const int modifierMask) const { XUngrabKey(display, keyCode, modifierMask|numlockMask|LockMask| scrolllockMask, _root); } + + +void screen::grabModifiers() const { + Display *display = _epist->getXDisplay(); + + XGrabKeyboard(display, rootWindow(), True, GrabModeAsync, + GrabModeAsync, CurrentTime); +} + + +void screen::ungrabModifiers() const { + Display *display = _epist->getXDisplay(); + + XUngrabKeyboard(display, CurrentTime); +} + + +bool screen::nothingIsPressed(void) const +{ + char keys[32]; + XQueryKeymap(_epist->getXDisplay(), keys); + + for (int i = 0; i < 32; ++i) { + if (keys[i] != 0) + return false; + } + + return true; +}