dont use an invalid iterator in handleKeypress, also, update _last_active is it needs...

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

diff --git a/util/epist/screen.cc b/util/epist/screen.cc
index 7845e55f9489f8b11c2fa36cefe478584f74252b..c3ea4fb5f0e51ff6ef71105669f9286d30c19d0c 100644 (file)
--- a/util/epist/screen.cc
+++ b/util/epist/screen.cc
@@ -384,15 +384,19 @@ void screen::handleKeyrelease(const XEvent &) {
   // the only keyrelease event we care about (for now) is when we do stacked
   // cycling and the modifier is released
   if (_stacked_cycling && _cycling && nothingIsPressed()) {
-    XWindow *w = *_active;
-
     // all modifiers have been released. ungrab the keyboard, move the
     // focused window to the top of the Z-order and raise it
     ungrabModifiers();
 
-    _clients.remove(w);
-    _clients.push_front(w);
-    w->raise();
+    if (_active != _clients.end()) {
+      XWindow *w = *_active;
+      bool e = _last_active == _active;
+      _clients.remove(w);
+      _clients.push_front(w);
+      _active = _clients.begin();
+      if (e) _last_active = _active;
+      w->raise();
+    }
 
     _cycling = false;
   }
@@ -461,16 +465,21 @@ void screen::updateClientList() {
   const WindowList::iterator end = _clients.end();
   unsigned long i;
   
-  // insert new clients after the active window
   for (i = 0; i < num; ++i) {
     for (it = _clients.begin(); it != end; ++it)
       if (**it == rootclients[i])
         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, this,
-                                                  rootclients[i]));
+//        cout << "Added window: 0x" << hex << rootclients[i] << dec << endl;
+        if (_stacked_cycling) {
+          // insert new clients after the active window
+          _clients.insert(insert_point, new XWindow(_epist, this,
+                                                    rootclients[i]));
+        } else {
+          // insert new clients at the front of the list
+          _clients.push_front(new XWindow(_epist, this, rootclients[i]));
+        }
       }
     }
   }
@@ -536,16 +545,19 @@ void screen::updateActiveWindow() {
 
   _active = it;
 
-  /* if we're not cycling and a window gets focus, add it to the top of the
-   * cycle stack.
-   */
-  if (_stacked_cycling && !_cycling) {
-    _clients.remove(*_active);
-    _clients.push_front(*_active);
-  }
+  if (_active != end) {
+    /* if we're not cycling and a window gets focus, add it to the top of the
+     * cycle stack.
+     */
+    if (_stacked_cycling && !_cycling) {
+      XWindow *win = *_active;
+      _clients.remove(win);
+      _clients.push_front(win);
+      _active = _clients.begin();
+    }
 
-  if (it != end)
-    _last_active = it;
+    _last_active = _active;
+  }
 
   /*  cout << "Active window is now: ";
       if (_active == _clients.end()) cout << "None\n";