// -*- mode: C++; indent-tabs-mode: nil; -*-
-// screen.cc for Epistory - a key handler for NETWM/EWMH window managers.
+// screen.cc for Epistophy - a key handler for NETWM/EWMH window managers.
// Copyright (c) 2002 - 2002 Ben Jansens <ben at orodu.net>
//
// Permission is hereby granted, free of charge, to any person obtaining a
}
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();
+ cout << "key press\n";
for (; it != end; ++it) {
if (e.xkey.keycode == it->keycode() &&
- e.xkey.state == it->modifierMask() )
- {
- switch (it->type()) {
- case Action::nextDesktop:
- cycleWorkspace(true);
- break;
- case Action::prevDesktop:
- cycleWorkspace(false);
- break;
- }
+ e.xkey.state == it->modifierMask()) {
+ switch (it->type()) {
+ case Action::nextWorkspace:
+ cycleWorkspace(true);
+ break;
+
+ case Action::prevWorkspace:
+ cycleWorkspace(false);
+ break;
+
+ case Action::changeWorkspace:
+ changeWorkspace(it->number());
+ break;
+
+ case Action::shade:
+ (*_active)->shade(! (*_active)->shaded());
break;
}
+
+ 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::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);
+}