// 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
# include <sys/types.h>
# include <unistd.h>
#endif // HAVE_UNISTD_H
+
+#include <X11/keysym.h>
}
#include <iostream>
#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)
+{
_epist = epist;
_xatom = _epist->xatom();
_last_active = _clients.end();
_info = _epist->getScreenInfo(_number);
_root = _info->getRootWindow();
+ _config->getValue(Config::stackedCycling, _stacked_cycling);
+
// find a window manager supporting NETWM, waiting for it to load if we must
int count = 20; // try for 20 seconds
_managed = false;
case KeyPress:
handleKeypress(e);
break;
+
+ case KeyRelease:
+ handleKeyrelease(e);
+ break;
+
+ default:
+ break;
}
}
// 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);
-
+ keytree &ktree = _epist->getKeyTree();
+ const Action *it = ktree.getAction(e, state, this);
+
if (!it)
return;
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;
None);
return;
+ case Action::toggleGrabs: {
+ if (_grabbed) {
+ ktree.ungrabDefaults(this);
+ _grabbed = false;
+ } else {
+ ktree.grabDefaults(this);
+ _grabbed = true;
+ }
+ return;
+ }
+
default:
break;
}
window->sendTo(it->number());
return;
- case Action::toggleomnipresent:
+ case Action::toggleOmnipresent:
if (window->desktop() == 0xffffffff)
window->sendTo(_active_desktop);
else
window->resizeRel(0, it->number());
return;
- case Action::toggleshade:
+ case Action::toggleShade:
window->shade(! window->shaded());
return;
}
}
+
+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()) {
+ XWindow *w = *_active;
+
+ // all modifiers have been released. ungrab the keyboard, move the
+ // focused window to the top of the Z-order and raise it
+ ungrabModifiers();
+
+ _clients.remove(w);
+ _clients.push_front(w);
+ w->raise();
+
+ _cycling = false;
+ }
+}
+
+
// do we want to add this window to our list?
bool screen::doAddWindow(Window window) const {
assert(_managed);
break;
}
}
+
_active = it;
+
+ /* if we're not cycling and a window gets focus, add it to the top of the
+ * cycle stack.
+ */
+ if (_stacked_cycling && !_cycling) {
+ _clients.remove(*_active);
+ _clients.push_front(*_active);
+ }
+
if (it != end)
_last_active = it;
}
-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);
begin = _clients.begin(),
end = _clients.end();
- const XWindow *t = 0;
+ XWindow *t = 0;
for (int x = 0; x < increment; ++x) {
while (1) {
}
// 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 (t->desktop() == _active_desktop || t->desktop() == 0xffffffff)
+ t->focus(false); // focus, but don't raise
+ else
+ t->focus(); // change workspace and focus
+ }
+ else {
+ t->focus();
+ }
}
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)
+ if (width > num_desktops || width <= 0)
return;
- int wnum;
-
// a cookie to the person that makes this pretty
if (num < 0) {
- wnum = _active_desktop - width;
+ wnum = active_desktop - width;
if (wnum < 0) {
- wnum = _num_desktops/width * width + _active_desktop;
- if (wnum >= _num_desktops)
- wnum = _num_desktops - 1;
+ wnum = num_desktops/width * width + active_desktop;
+ if (wnum >= num_desktops)
+ wnum = num_desktops - 1;
}
}
else {
- wnum = _active_desktop + width;
- if (wnum >= _num_desktops) {
- wnum = (_active_desktop + width) % _num_desktops - 1;
+ wnum = active_desktop + width;
+ if (wnum >= num_desktops) {
+ wnum = (active_desktop + width) % num_desktops - 1;
if (wnum < 0)
wnum = 0;
}
void screen::changeWorkspaceHorz(const int num) const {
assert(_managed);
- const Config *conf = _epist->getConfig();
- int width = conf->getNumberValue(Config::workspaceColumns);
- int wnum;
-
- if (width > _num_desktops || width <= 0)
+ 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;
if (num < 0) {
- if (_active_desktop % width != 0)
- changeWorkspace(_active_desktop - 1);
+ if (active_desktop % width != 0)
+ changeWorkspace(active_desktop - 1);
else {
- wnum = _active_desktop + width - 1;
- if (wnum >= _num_desktops)
- wnum = _num_desktops - 1;
+ wnum = active_desktop + width - 1;
+ if (wnum >= num_desktops)
+ wnum = num_desktops - 1;
}
}
else {
- if (_active_desktop % width != width - 1) {
- wnum = _active_desktop + 1;
- if (wnum >= _num_desktops)
- wnum = _num_desktops / width * width;
+ if (active_desktop % width != width - 1) {
+ wnum = active_desktop + 1;
+ if (wnum >= num_desktops)
+ wnum = num_desktops / width * width;
}
else
- wnum = _active_desktop - width + 1;
+ wnum = active_desktop - width + 1;
}
changeWorkspace(wnum);
}
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;
+}
projects / chaz / openbox / blobdiff