void screen::processEvent(const XEvent &e) {
assert(_managed);
+ assert(e.xany.window == _root);
switch (e.type) {
case PropertyNotify:
Window *rootclients = 0;
unsigned long num = (unsigned) -1;
if (! _xatom->getValue(_root, XAtom::net_client_list, XAtom::window, num,
- &rootclients)) {
- while (! _clients.empty()) {
- delete _clients.front();
- _clients.erase(_clients.begin());
- }
- if (rootclients) delete [] rootclients;
- return;
- }
-
- WindowList::iterator it, end = _clients.end();
+ &rootclients))
+ num = 0;
+
+ WindowList::iterator it;
+ const WindowList::iterator end = _clients.end();
unsigned long i;
// insert new clients after the active window
// remove clients that no longer exist
for (it = _clients.begin(); it != end;) {
- WindowList::iterator it2 = it++;
+ WindowList::iterator it2 = it;
+ ++it;
+
for (i = 0; i < num; ++i)
if (**it2 == rootclients[i])
break;
if (i == num) { // no longer exists
//cout << "Removed window: 0x" << hex << (*it2)->window() << dec << endl;
+ // watch for the active window
+ if (it2 == _active)
+ _active = _clients.end();
delete *it2;
_clients.erase(it2);
}
const bool sameclass, const string &cn) const {
assert(_managed);
- if (_clients.empty()) return;
-
WindowList::const_iterator target = _active;
string classname = cn;
if (target == _clients.end())
target = _clients.begin();
+
+ WindowList::const_iterator begin = target;
do {
if (forward) {
target = _clients.end();
--target;
}
+
+ // no window to focus
+ if (target == begin)
+ return;
} while (target == _clients.end() ||
(*target)->iconic() ||
(! alldesktops && (*target)->desktop() != _active_desktop) ||