}
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::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::close:
+ window->close();
+ return;
+
+ case Action::toggleshade:
+ window->shade(! window->shaded());
+ return;
}
- break;
}
+ }
}
}
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;
+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;
else
--currentDesktop;
- cout << currentDesktop << endl;
-
-
_xatom->getValue(_root, XAtom::net_number_of_desktops, XAtom::cardinal,
numDesktops);
else if (currentDesktop >= numDesktops)
currentDesktop = 0;
-
- _xatom->sendClientMessage(_root, XAtom::net_current_desktop, _root,
- currentDesktop);
-
+ changeWorkspace(currentDesktop);
}
}
-
+
+
+void screen::changeWorkspace(const int num) const {
+ _xatom->sendClientMessage(_root, XAtom::net_current_desktop, _root, num);
+}