void screen::handleKeypress(const XEvent &e) {
ActionList::const_iterator it = _epist->actions().begin();
ActionList::const_iterator end = _epist->actions().end();
- cout << "key press\n";
for (; it != end; ++it) {
if (e.xkey.keycode == it->keycode() &&
e.xkey.state == it->modifierMask()) {
switch (it->type()) {
case Action::nextWorkspace:
cycleWorkspace(true);
- break;
+ return;
case Action::prevWorkspace:
cycleWorkspace(false);
- break;
+ return;
+
+ case Action::nextWindow:
+ cycleWindow(true);
+ return;
+
+ case Action::prevWindow:
+ cycleWindow(false);
+ return;
case Action::changeWorkspace:
changeWorkspace(it->number());
- break;
-
- case Action::shade:
- (*_active)->shade(! (*_active)->shaded());
- break;
+ return;
}
- break;
+ // these actions require an active window
+ if (_active != _clients.end()) {
+ XWindow *window = *_active;
+
+ switch (it->type()) {
+ case Action::close:
+ window->close();
+ return;
+
+ case Action::toggleshade:
+ window->shade(! window->shaded());
+ return;
+ }
+ }
}
}
}
}
*/
+
+void screen::cycleWindow(const bool forward) const {
+ 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());
+
+ if (target != _clients.end()) {
+ // we dont send an ACTIVE_WINDOW client message because that would also
+ // unshade the window if it was shaded
+ XSetInputFocus(_epist->getXDisplay(), (*target)->window(), RevertToNone,
+ CurrentTime);
+ XRaiseWindow(_epist->getXDisplay(), (*target)->window());
+ }
+}
+
+
void screen::cycleWorkspace(const bool forward) const {
unsigned long currentDesktop = 0;
unsigned long numDesktops = 0;
}
}
+
void screen::changeWorkspace(const int num) const {
_xatom->sendClientMessage(_root, XAtom::net_current_desktop, _root, num);
}