M ChangeLog → ChangeLog

@@ -1,5 +1,8 @@ 
  (Format: Year/Month/Day)
 Changes for 1.0rc3:
+*06/07/10:
+   * Next/PrevWindow toolbar buttons break MouseFocus: bug #1519913 (Mark)
+     WorkspaceCmd.cc FocusControl.cc
 *06/07/08:
    * Fix implementation of _NET_MOVERESIZE_WINDOW (Mark)
      Ewmh.cc

M src/FocusControl.cc → src/FocusControl.cc

@@ -86,7 +86,8 @@ return;
 
     FocusedWindows *window_list = (opts & CYCLELINEAR) ? &m_creation_order_list : &m_focused_list;
     if (!m_cycling_focus) {
-        m_cycling_focus = true;
+        if (Fluxbox::instance()->watchingScreen())
+            m_cycling_focus = true;
         if (opts & CYCLELINEAR) {
             m_cycling_creation_order = true;
             m_cycling_window = find(window_list->begin(),window_list->end(),s_focused_window);

M src/WorkspaceCmd.cc → src/WorkspaceCmd.cc

@@ -60,7 +60,7 @@ Fluxbox::instance()->watchKeyRelease(*screen, mods);
                 screen->focusControl().nextFocus(m_option);
             }
         } else
-            screen->focusControl().nextFocus(m_option);
+            screen->focusControl().nextFocus(m_option | FocusControl::CYCLELINEAR);
     }
 }
 
@@ -82,7 +82,7 @@ Fluxbox::instance()->watchKeyRelease(*screen, mods);
                 screen->focusControl().prevFocus(m_option);
             }
         } else
-            screen->focusControl().nextFocus(m_option);
+            screen->focusControl().nextFocus(m_option | FocusControl::CYCLELINEAR);
     }
 }