From bf3aee5f674a7ce2e27ad6294c4c19db9885aa7b Mon Sep 17 00:00:00 2001
From: markt <markt>
Date: Mon, 10 Jul 2006 18:00:42 +0000
Subject: next/prevwindow toolbar buttons break mousefocus

---
 ChangeLog           | 3 +++
 src/FocusControl.cc | 3 ++-
 src/WorkspaceCmd.cc | 4 ++--
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 33f0de9..90f7627 100644
--- a/ChangeLog
+++ b/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
diff --git a/src/FocusControl.cc b/src/FocusControl.cc
index 48ae36f..6f919ef 100644
--- a/src/FocusControl.cc
+++ b/src/FocusControl.cc
@@ -86,7 +86,8 @@ void FocusControl::cycleFocus(int opts, bool cycle_reverse) {
 
     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);
diff --git a/src/WorkspaceCmd.cc b/src/WorkspaceCmd.cc
index 3bd79c5..c3dd402 100644
--- a/src/WorkspaceCmd.cc
+++ b/src/WorkspaceCmd.cc
@@ -60,7 +60,7 @@ void NextWindowCmd::execute() {
                 screen->focusControl().nextFocus(m_option);
             }
         } else
-            screen->focusControl().nextFocus(m_option);
+            screen->focusControl().nextFocus(m_option | FocusControl::CYCLELINEAR);
     }
 }
 
@@ -82,7 +82,7 @@ void PrevWindowCmd::execute() {
                 screen->focusControl().prevFocus(m_option);
             }
         } else
-            screen->focusControl().nextFocus(m_option);
+            screen->focusControl().nextFocus(m_option | FocusControl::CYCLELINEAR);
     }
 }
 
-- 
cgit v0.11.2