aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorThomas Lübking <thomas.luebking@gmail.com>2016-07-06 15:35:28 (GMT)
committerThomas Lübking <thomas.luebking@gmail.com>2016-07-30 13:08:41 (GMT)
commit34bf7d31c4f3997893cc76e3e5c78b2ccf91eecf (patch)
tree08cb4c727a217f1e105b1b245fecb18dea4fa9ba /src
parent4bc08709f196e513914e453e2a1117c0823d0a41 (diff)
downloadfluxbox-34bf7d31c4f3997893cc76e3e5c78b2ccf91eecf.zip
fluxbox-34bf7d31c4f3997893cc76e3e5c78b2ccf91eecf.tar.bz2
prefer m_cycling_next over s_focused_window
as cycle start (former is where we wanted to go and X11 is still async)
Diffstat (limited to 'src')
-rw-r--r--src/FocusControl.cc7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/FocusControl.cc b/src/FocusControl.cc
index 716883b..f60e9dd 100644
--- a/src/FocusControl.cc
+++ b/src/FocusControl.cc
@@ -110,7 +110,11 @@ void FocusControl::cycleFocus(const FocusableList &window_list,
110 Focusables::const_iterator it_end = window_list.clientList().end(); 110 Focusables::const_iterator it_end = window_list.clientList().end();
111 111
112 // too many things can go wrong with remembering this 112 // too many things can go wrong with remembering this
113 m_cycling_window = find(it_begin, it_end, s_focused_window); 113 m_cycling_window = it_end;
114 if (m_cycling_next)
115 m_cycling_window = find(it_begin, it_end, m_cycling_next);
116 if (m_cycling_window == it_end)
117 m_cycling_window = find(it_begin, it_end, s_focused_window);
114 if (m_cycling_window == it_end) 118 if (m_cycling_window == it_end)
115 m_cycling_window = find(it_begin, it_end, s_focused_fbwindow); 119 m_cycling_window = find(it_begin, it_end, s_focused_fbwindow);
116 120
@@ -144,6 +148,7 @@ void FocusControl::cycleFocus(const FocusableList &window_list,
144 // now we actually try to focus the window 148 // now we actually try to focus the window
145 if (!doSkipWindow(**it, pat) && (m_cycling_next = *it) && (*it)->focus()) 149 if (!doSkipWindow(**it, pat) && (m_cycling_next = *it) && (*it)->focus())
146 break; 150 break;
151 m_cycling_next = 0;
147 } 152 }
148 m_cycling_window = it; 153 m_cycling_window = it;
149 154