}
XSelectInput(_epist->getXDisplay(), _root, PropertyChangeMask);
-
+
+ updateNumDesktops();
+ updateActiveDesktop();
updateClientList();
updateActiveWindow();
}
switch (e.type) {
case PropertyNotify:
// root window
+ if (e.xproperty.atom == _xatom->getAtom(XAtom::net_number_of_desktops))
+ updateNumDesktops();
+ if (e.xproperty.atom == _xatom->getAtom(XAtom::net_current_desktop))
+ updateActiveDesktop();
if (e.xproperty.atom == _xatom->getAtom(XAtom::net_active_window))
updateActiveWindow();
if (e.xproperty.atom == _xatom->getAtom(XAtom::net_client_list)) {
}
void screen::handleKeypress(const XEvent &e) {
- list<Action>::const_iterator it = _epist->actions().begin();
- list<Action>::const_iterator end = _epist->actions().end();
+ ActionList::const_iterator it = _epist->actions().begin();
+ ActionList::const_iterator end = _epist->actions().end();
for (; it != end; ++it) {
if (e.xkey.keycode == it->keycode() &&
- e.xkey.state == it->modifierMask() )
- {
+ e.xkey.state == it->modifierMask()) {
+ switch (it->type()) {
+ case Action::nextWorkspace:
+ cycleWorkspace(true);
+ return;
+
+ case Action::prevWorkspace:
+ cycleWorkspace(false);
+ return;
+
+ case Action::nextWindow:
+ cycleWindow(true);
+ return;
+
+ case Action::prevWindow:
+ cycleWindow(false);
+ return;
+
+ case Action::nextWindowOnAllWorkspaces:
+ cycleWindow(true, true);
+ return;
+
+ case Action::prevWindowOnAllWorkspaces:
+ cycleWindow(false, true);
+ return;
+
+ case Action::nextWindowOfClass:
+ cycleWindow(true, false, true);
+ return;
+
+ case Action::prevWindowOfClass:
+ cycleWindow(false, false, true);
+ return;
+
+ case Action::nextWindowOfClassOnAllWorkspaces:
+ cycleWindow(true, true, true);
+ return;
+
+ case Action::prevWindowOfClassOnAllWorkspaces:
+ cycleWindow(false, true, true);
+ return;
+
+ case Action::changeWorkspace:
+ changeWorkspace(it->number());
+ return;
+ }
+
+ // these actions require an active window
+ if (_active != _clients.end()) {
+ XWindow *window = *_active;
+
switch (it->type()) {
- case Action::nextDesktop:
- cycleWorkspace(true);
- break;
- case Action::prevDesktop:
- cycleWorkspace(false);
- break;
+ case Action::iconify:
+ window->iconify();
+ return;
+
+ case Action::close:
+ window->close();
+ return;
+
+ case Action::raise:
+ window->raise();
+ return;
+
+ case Action::lower:
+ window->lower();
+ return;
+
+ case Action::sendToWorkspace:
+ window->sendTo(it->number());
+ return;
+
+ case Action::toggleomnipresent:
+ if (window->desktop() == 0xffffffff)
+ window->sendTo(_active_desktop);
+ else
+ window->sendTo(0xffffffff);
+ return;
+
+ case Action::toggleshade:
+ window->shade(! window->shaded());
+ return;
}
- break;
}
+ }
}
}
}
+void screen::updateNumDesktops() {
+ assert(_managed);
+
+ if (! _xatom->getValue(_root, XAtom::net_number_of_desktops, XAtom::cardinal,
+ (unsigned long)_num_desktops))
+ _num_desktops = 1; // assume that there is at least 1 desktop!
+}
+
+
+void screen::updateActiveDesktop() {
+ assert(_managed);
+
+ if (! _xatom->getValue(_root, XAtom::net_current_desktop, XAtom::cardinal,
+ (unsigned long)_active_desktop))
+ _active_desktop = 0; // there must be at least one desktop, and it must
+ // be the current one
+}
+
+
void screen::updateClientList() {
assert(_managed);
if (it == end) { // didn't already exist
if (doAddWindow(rootclients[i])) {
cout << "Added window: 0x" << hex << rootclients[i] << dec << endl;
- _clients.insert(insert_point, new XWindow(_epist, rootclients[i]));
+ _clients.insert(insert_point, new XWindow(_epist, this,
+ rootclients[i]));
}
}
}
}
*/
-void screen::cycleWorkspace(const bool forward) {
- cout << "blef" << endl;
- unsigned long currentDesktop = 0;
- unsigned long numDesktops = 0;
+void screen::cycleWindow(const bool forward, const bool alldesktops,
+ const bool sameclass) const {
+ assert(_managed);
+
+ if (_clients.empty()) return;
+
+ WindowList::const_iterator target = _active;
+
+ if (target == _clients.end())
+ target = _clients.begin();
+
+ do {
+ if (forward) {
+ ++target;
+ if (target == _clients.end())
+ target = _clients.begin();
+ } else {
+ if (target == _clients.begin())
+ target = _clients.end();
+ --target;
+ }
+ } while (target == _clients.end() ||
+ (*target)->iconic() ||
+ (! alldesktops && (*target)->desktop() != _active_desktop) ||
+ (sameclass && _active != _clients.end() &&
+ (*target)->appClass() != (*_active)->appClass()));
- if (_xatom->getValue(_root, XAtom::net_current_desktop, XAtom::cardinal,
- currentDesktop)) {
- if (forward)
- ++currentDesktop;
- else
- --currentDesktop;
+ if (target != _clients.end())
+ (*target)->focus();
+}
- cout << currentDesktop << endl;
-
- _xatom->getValue(_root, XAtom::net_number_of_desktops, XAtom::cardinal,
- numDesktops);
-
- if ( ( (signed)currentDesktop) == -1)
- currentDesktop = numDesktops - 1;
- else if (currentDesktop >= numDesktops)
- currentDesktop = 0;
+void screen::cycleWorkspace(const bool forward, const bool loop) const {
+ assert(_managed);
-
- _xatom->sendClientMessage(_root, XAtom::net_current_desktop, _root,
- currentDesktop);
-
+ unsigned int destination = _active_desktop;
+
+ if (forward) {
+ if (destination < _num_desktops - 1)
+ ++destination;
+ else if (loop)
+ destination = 0;
+ } else {
+ if (destination > 0)
+ --destination;
+ else if (loop)
+ destination = _num_desktops - 1;
}
+
+ if (destination != _active_desktop)
+ changeWorkspace(destination);
+}
+
+
+void screen::changeWorkspace(const int num) const {
+ assert(_managed);
+
+ _xatom->sendClientMessage(_root, XAtom::net_current_desktop, _root, num);
}
-