M ChangeLog → ChangeLog

@@ -9,6 +9,8 @@ - added `background: none' for styles that do not include a background
      - fixed bug with style backgrounds not getting set when changing styles
      - updated default styles to be valid wrt background options
      RootTheme.cc/hh Screen.cc FbTk/Theme.hh
+   * Minor fix for window cycling on multiple screens (Mark)
+     fluxbox.cc
 *07/01/13:
    * Only change focus order when user specifically focuses a window (Mark)
      Screen.cc Window.cc FocusControl.cc/hh

M src/fluxbox.cc → src/fluxbox.cc

@@ -1129,8 +1129,11 @@ m_watching_screen = 0;
         if (!m_key->doAction(ke)) // could still be cycling
             m_watching_screen = old_watching_screen;
         else if (old_watching_screen &&
-                 m_watching_screen != old_watching_screen)
+                 m_watching_screen != old_watching_screen) {
             old_watching_screen->notifyReleasedKeys(ke);
+            if (!m_watching_screen)
+                XUngrabKeyboard(FbTk::App::instance()->display(), CurrentTime);
+        }
         break;
     case KeyRelease: {
         // we ignore most key releases unless we need to use
@@ -1852,6 +1855,8 @@ m_watching_screen = &screen;
 
     // just make sure we are saving the mods with any other flags (xkb)
     m_watch_keyrelease = FbTk::KeyUtil::instance().isolateModifierMask(mods);
+    // TODO: it's possible (and happens to me sometimes) for the mods to be
+    // released before we grab the keyboard -- not sure of a good way to fix it
     XGrabKeyboard(FbTk::App::instance()->display(),
                   screen.rootWindow().window(), True,
                   GrabModeAsync, GrabModeAsync, CurrentTime);