nilix/fluxbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

prefer m_cycling_next over s_focused_window

Browse source 
as cycle start (former is where we wanted to go and X11 is still async)
This commit is contained in:
Thomas Lübking 2016-07-06 17:35:28 +02:00
parent 4bc08709f1
commit 34bf7d31c4
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/FocusControl.cc
View file

@ -110,7 +110,11 @@ void FocusControl::cycleFocus(const FocusableList &window_list,
Focusables::const_iterator it_end = window_list.clientList().end();
// too many things can go wrong with remembering this
m_cycling_window = find(it_begin, it_end, s_focused_window);
m_cycling_window = it_end;
if (m_cycling_next)
m_cycling_window = find(it_begin, it_end, m_cycling_next);
if (m_cycling_window == it_end)
m_cycling_window = find(it_begin, it_end, s_focused_window);
if (m_cycling_window == it_end)
m_cycling_window = find(it_begin, it_end, s_focused_fbwindow);
@ -144,6 +148,7 @@ void FocusControl::cycleFocus(const FocusableList &window_list,
// now we actually try to focus the window
if (!doSkipWindow(**it, pat) && (m_cycling_next = *it) && (*it)->focus())
break;
m_cycling_next = 0;
}
m_cycling_window = it;