#include "epist.hh"
-screen::screen(epist *epist, int number) {
+screen::screen(epist *epist, int number)
+ : _clients(epist->clientsList()),
+ _active(epist->activeWindow()) {
_epist = epist;
_xatom = _epist->xatom();
+ _last_active = _clients.end();
_number = number;
- _active = _clients.end();
_info = _epist->getScreenInfo(_number);
_root = _info->getRootWindow();
_managed = false;
while (! (_epist->doShutdown() || _managed || count <= 0)) {
if (! (_managed = findSupportingWM()))
- usleep(1000);
+ sleep(1);
--count;
}
if (_managed)
}
XSelectInput(_epist->getXDisplay(), _root, PropertyChangeMask);
-
- updateNumDesktops();
- updateActiveDesktop();
- updateClientList();
- updateActiveWindow();
}
-
screen::~screen() {
if (_managed)
XSelectInput(_epist->getXDisplay(), _root, None);
if (e.xkey.keycode == it->keycode() &&
state == it->modifierMask()) {
switch (it->type()) {
+ case Action::nextScreen:
+ _epist->cycleScreen(_number, true);
+ return;
+
+ case Action::prevScreen:
+ _epist->cycleScreen(_number, false);
+ return;
+
case Action::nextWorkspace:
cycleWorkspace(true);
return;
return;
case Action::nextWindowOnAllWorkspaces:
- cycleWindow(true, true);
+ cycleWindow(true, false, true);
return;
case Action::prevWindowOnAllWorkspaces:
+ cycleWindow(false, false, true);
+ return;
+
+ case Action::nextWindowOnAllScreens:
+ cycleWindow(true, true);
+ return;
+
+ case Action::prevWindowOnAllScreens:
cycleWindow(false, true);
return;
case Action::nextWindowOfClass:
- cycleWindow(true, false, true, it->string());
+ cycleWindow(true, false, false, true, it->string());
return;
case Action::prevWindowOfClass:
- cycleWindow(false, false, true, it->string());
+ cycleWindow(false, false, false, true, it->string());
return;
case Action::nextWindowOfClassOnAllWorkspaces:
- cycleWindow(true, true, true, it->string());
+ cycleWindow(true, false, true, true, it->string());
return;
case Action::prevWindowOfClassOnAllWorkspaces:
- cycleWindow(false, true, true, it->string());
+ cycleWindow(false, false, true, true, it->string());
return;
case Action::changeWorkspace:
}
+void screen::updateEverything() {
+ updateNumDesktops();
+ updateActiveDesktop();
+ updateClientList();
+ updateActiveWindow();
+}
+
+
void screen::updateNumDesktops() {
assert(_managed);
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
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;
_clients.insert(insert_point, new XWindow(_epist, this,
rootclients[i]));
}
}
}
- // remove clients that no longer exist
+ // remove clients that no longer exist (that belong to this screen)
for (it = _clients.begin(); it != end;) {
- WindowList::iterator it2 = it++;
+ WindowList::iterator it2 = it;
+ ++it;
+
+ // is on another screen?
+ if ((*it2)->getScreen() != this)
+ continue;
+
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;
+// cout << "Removed window: 0x" << hex << (*it2)->window() << dec << endl;
+ // watch for the active and last-active window
+ if (it2 == _active)
+ _active = _clients.end();
+ if (it2 == _last_active)
+ _last_active = _clients.end();
delete *it2;
_clients.erase(it2);
}
}
+const XWindow *screen::lastActiveWindow() const {
+ if (_last_active != _clients.end())
+ return *_last_active;
+
+ // find a window if one exists
+ 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))
+ return *it;
+
+ // no windows on this screen
+ return 0;
+}
+
+
void screen::updateActiveWindow() {
assert(_managed);
WindowList::iterator it, end = _clients.end();
for (it = _clients.begin(); it != end; ++it) {
- if (**it == a)
+ if (**it == a) {
+ if ((*it)->getScreen() != this)
+ return;
break;
+ }
}
_active = it;
+ 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;
+/* cout << "Active window is now: ";
+ if (_active == _clients.end()) cout << "None\n";
+ else cout << "0x" << hex << (*_active)->window() << dec << endl;
+*/
}
-void screen::execCommand(const std::string &cmd) const {
+void screen::execCommand(const string &cmd) const {
pid_t pid;
if ((pid = fork()) == 0) {
extern char **environ;
}
-void screen::cycleWindow(const bool forward, const bool alldesktops,
- const bool sameclass, const string &cn) const {
+void screen::cycleWindow(const bool forward, const bool allscreens,
+ const bool alldesktops, const bool sameclass,
+ const string &cn) const {
assert(_managed);
if (_clients.empty()) return;
-
- WindowList::const_iterator target = _active;
-
- string classname = cn;
- if (sameclass && classname.empty() && target != _clients.end())
- classname = (*target)->appClass();
+
+ string classname(cn);
+ if (sameclass && classname.empty() && _active != _clients.end())
+ classname = (*_active)->appClass();
- if (target == _clients.end())
- target = _clients.begin();
+ WindowList::const_iterator target = _active,
+ begin = _clients.begin(),
+ end = _clients.end();
- do {
+ while (1) {
if (forward) {
- ++target;
- if (target == _clients.end())
- target = _clients.begin();
+ if (target == end) {
+ target = begin;
+ } else {
+ ++target;
+ if (target == end)
+ target = begin;
+ }
} else {
- if (target == _clients.begin())
- target = _clients.end();
+ if (target == begin)
+ target = end;
--target;
}
- } while (target == _clients.end() ||
- (*target)->iconic() ||
- (! alldesktops && (*target)->desktop() != _active_desktop) ||
- (sameclass && ! classname.empty() &&
- (*target)->appClass() != classname));
-
- if (target != _clients.end())
- (*target)->focus();
+
+ // must be no window to focus
+ if (target == _active)
+ return;
+
+ // determine if this window is invalid for cycling to
+ const XWindow *t = *target;
+ if (t->iconic()) continue;
+ if (! allscreens && t->getScreen() != this) continue;
+ if (! alldesktops && ! (t->desktop() == _active_desktop ||
+ t->desktop() == 0xffffffff)) continue;
+ if (sameclass && ! classname.empty() &&
+ t->appClass() != classname) continue;
+ if (! t->canFocus()) continue;
+
+ // found a good window!
+ t->focus();
+ }
}
projects / chaz / openbox / blobdiff