acquire and provide Xinerama information for the window manager. now we just gotta...

[chaz/openbox] / util / epist / screen.cc

diff --git a/util/epist/screen.cc b/util/epist/screen.cc
index 1ccf9833d0be96b75d3bb7b01718e6d32ca88489..1086ce4ab861aa0a0844c9f250012fbd286c2773 100644 (file)
--- a/util/epist/screen.cc
+++ b/util/epist/screen.cc
@@ -155,11 +155,18 @@ void screen::processEvent(const XEvent &e) {
 }
 
 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);
@@ -360,7 +367,7 @@ void screen::updateClientList() {
         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]));
       }
@@ -374,7 +381,7 @@ void screen::updateClientList() {
       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);
     }
@@ -397,9 +404,9 @@ void screen::updateActiveWindow() {
   }
   _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;
 }
 
 
@@ -491,3 +498,37 @@ void screen::changeWorkspace(const int num) const {
 
   _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);
+}