X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=util%2Fepist%2Fscreen.cc;h=6b7b08a005b145de6b64a37b6e3eb918a319ff35;hb=c6699031a0a87adf727fcf8c91ccf0203568a72d;hp=1ccf9833d0be96b75d3bb7b01718e6d32ca88489;hpb=6595476d81f01cee9001bbc90dda5b37915e5821;p=chaz%2Fopenbox

diff --git a/util/epist/screen.cc b/util/epist/screen.cc
index 1ccf9833..6b7b08a0 100644
--- a/util/epist/screen.cc
+++ b/util/epist/screen.cc
@@ -120,12 +120,6 @@ void screen::processEvent(const XEvent &e) {
   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
@@ -155,11 +149,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);
@@ -341,16 +342,11 @@ void screen::updateClientList() {
   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
@@ -360,7 +356,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]));
       }
@@ -369,12 +365,17 @@ void screen::updateClientList() {
 
   // 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);
     }
@@ -397,9 +398,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 +492,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);
+}