assert(_managed);
assert(e.xany.window == _root);
- XWindow *window = 0;
- if (e.xany.window != _root) {
- window = findWindow(e); // find the window
- assert(window); // we caught an event for a window we don't know about!?
- }
-
switch (e.type) {
case PropertyNotify:
// root window
}
void screen::handleKeypress(const XEvent &e) {
+ int scrolllockMask, numlockMask;
+
ActionList::const_iterator it = _epist->actions().begin();
ActionList::const_iterator end = _epist->actions().end();
+
+ _epist->getLockModifiers(numlockMask, scrolllockMask);
+
for (; it != end; ++it) {
+ unsigned int state = e.xkey.state & ~(LockMask|scrolllockMask|numlockMask);
+
if (e.xkey.keycode == it->keycode() &&
- e.xkey.state == it->modifierMask()) {
+ state == it->modifierMask()) {
switch (it->type()) {
case Action::nextWorkspace:
cycleWorkspace(true);
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
for (it = _clients.begin(); it != end;) {
- WindowList::iterator it2 = it++;
+ WindowList::iterator it2 = it;
+ ++it;
+
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 window
+ if (it2 == _active)
+ _active = _clients.end();
delete *it2;
_clients.erase(it2);
}
}
_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;
}
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() && _active != _clients.end())
+ classname = (*_active)->appClass();
- string classname = cn;
- if (sameclass && classname.empty() && target != _clients.end())
- classname = (*target)->appClass();
+ WindowList::const_iterator target = _active;
if (target == _clients.end())
target = _clients.begin();
+
+ WindowList::const_iterator begin = target;
do {
if (forward) {
target = _clients.end();
--target;
}
+
+ // no window to focus
+ if (target == begin)
+ return;
} while (target == _clients.end() ||
(*target)->iconic() ||
(! alldesktops && (*target)->desktop() != _active_desktop) ||
_xatom->sendClientMessage(_root, XAtom::net_current_desktop, _root, num);
}
+
+void screen::grabKey(const KeyCode keyCode, const int modifierMask) const {
+
+ Display *display = _epist->getXDisplay();
+ int numlockMask, scrolllockMask;
+
+ _epist->getLockModifiers(numlockMask, scrolllockMask);
+
+ XGrabKey(display, keyCode, modifierMask,
+ _root, True, GrabModeAsync, GrabModeAsync);
+ XGrabKey(display, keyCode,
+ modifierMask|LockMask,
+ _root, True, GrabModeAsync, GrabModeAsync);
+ XGrabKey(display, keyCode,
+ modifierMask|scrolllockMask,
+ _root, True, GrabModeAsync, GrabModeAsync);
+ XGrabKey(display, keyCode,
+ modifierMask|numlockMask,
+ _root, True, GrabModeAsync, GrabModeAsync);
+
+ XGrabKey(display, keyCode,
+ modifierMask|LockMask|scrolllockMask,
+ _root, True, GrabModeAsync, GrabModeAsync);
+ XGrabKey(display, keyCode,
+ modifierMask|scrolllockMask|numlockMask,
+ _root, True, GrabModeAsync, GrabModeAsync);
+ XGrabKey(display, keyCode,
+ modifierMask|numlockMask|LockMask,
+ _root, True, GrabModeAsync, GrabModeAsync);
+
+ XGrabKey(display, keyCode,
+ modifierMask|numlockMask|LockMask|scrolllockMask,
+ _root, True, GrabModeAsync, GrabModeAsync);
+}