// find a window if one exists
WindowList::const_iterator it, end = _clients.end();
for (it = _clients.begin(); it != end; ++it)
- if ((*it)->getScreen() == this)
+ if ((*it)->getScreen() == this && ! (*it)->iconic() &&
+ ((*it)->desktop() == 0xffffffff || (*it)->desktop() == _active_desktop))
return *it;
// no windows on this screen
}
}
_active = it;
- _last_active = it;
+ if (it != end)
+ _last_active = it;
/* cout << "Active window is now: ";
if (_active == _clients.end()) cout << "None\n";
return;
} while ((*target)->iconic() ||
(! allscreens && (*target)->getScreen() != this) ||
- (! alldesktops && (*target)->desktop() != _active_desktop) ||
+ (! alldesktops &&
+ (*target)->desktop() != _active_desktop &&
+ (*target)->desktop() != 0xffffffff) ||
(sameclass && ! classname.empty() &&
(*target)->appClass() != classname));