// 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();
+ 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;
}
if (it == end) { // didn't already exist
if (doAddWindow(rootclients[i])) {
// cout << "Added window: 0x" << hex << rootclients[i] << dec << endl;
- if (_stacked_cycling) {
- // insert new clients after the active window
- _clients.insert(insert_point, new XWindow(_epist, this,
- rootclients[i]));
- } else {
- // insert new clients at the front of the list
- _clients.push_front(new XWindow(_epist, this, rootclients[i]));
- }
+ // insert new clients after the active window
+ _clients.insert(insert_point, new XWindow(_epist, this,
+ rootclients[i]));
}
}
}
_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 (_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;
+ }
}
- if (it != end)
- _last_active = it;
-
/* cout << "Active window is now: ";
if (_active == _clients.end()) cout << "None\n";
else cout << "0x" << hex << (*_active)->window() << dec << endl;