diff options
author | markt <markt> | 2006-12-28 18:11:17 (GMT) |
---|---|---|
committer | markt <markt> | 2006-12-28 18:11:17 (GMT) |
commit | a58453fac24c4c4b2987e9716d87ef3f59f312d8 (patch) | |
tree | 22b94f826d7af514e9c6fdca5100763a48a2daa7 /src | |
parent | e9f7c0f2c03706e39fd97ec39a20aad5517f0371 (diff) | |
download | fluxbox-a58453fac24c4c4b2987e9716d87ef3f59f312d8.zip fluxbox-a58453fac24c4c4b2987e9716d87ef3f59f312d8.tar.bz2 |
allow focus to revert to stuck windows, and we'll see if it still causes
problems with normal focus -- that comment is older than FocusControl.cc, and
I've made a lot of changes to focus handling since then; just disabling it
wasn't the right thing to do, anyway
Diffstat (limited to 'src')
-rw-r--r-- | src/FocusControl.cc | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/FocusControl.cc b/src/FocusControl.cc index 014a9df..d3e6838 100644 --- a/src/FocusControl.cc +++ b/src/FocusControl.cc | |||
@@ -190,11 +190,8 @@ WinClient *FocusControl::lastFocusedWindow(int workspace) { | |||
190 | FocusedWindows::iterator it_end = m_focused_list.end(); | 190 | FocusedWindows::iterator it_end = m_focused_list.end(); |
191 | for (; it != it_end; ++it) { | 191 | for (; it != it_end; ++it) { |
192 | if ((*it)->fbwindow() && | 192 | if ((*it)->fbwindow() && |
193 | (((int)(*it)->fbwindow()->workspaceNumber()) == workspace | 193 | ((((int)(*it)->fbwindow()->workspaceNumber()) == workspace || |
194 | && !(*it)->fbwindow()->isIconic() | 194 | (*it)->fbwindow()->isStuck()) && !(*it)->fbwindow()->isIconic())) |
195 | && (!(*it)->fbwindow()->isStuck() || (*it)->fbwindow()->isFocused()))) | ||
196 | // only give focus to a stuck window if it is currently focused | ||
197 | // otherwise they tend to override normal workspace focus | ||
198 | return *it; | 195 | return *it; |
199 | } | 196 | } |
200 | return 0; | 197 | return 0; |