}
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);
return;
case Action::moveWindowUp:
- window->move(0, -it->number());
+ window->move(window->x(), window->y() - it->number());
return;
case Action::moveWindowDown:
- window->move(0, it->number());
+ window->move(window->x(), window->y() + it->number());
return;
case Action::moveWindowLeft:
- window->move(-it->number(), 0);
+ window->move(window->x() - it->number(), window->y());
return;
case Action::moveWindowRight:
- window->move(it->number(), 0);
+ window->move(window->x() + it->number(), window->y());
+ return;
+
+ case Action::resizeWindowWidth:
+ window->resize(window->width() + it->number(), window->height());
+ return;
+
+ case Action::resizeWindowHeight:
+ window->resize(window->width(), window->height() + it->number());
return;
case Action::toggleshade:
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]));
}
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;
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;
}
_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);
+}