aboutsummaryrefslogtreecommitdiff
path: root/src/Screen.cc
diff options
context:
space:
mode:
authormarkt <markt>2007-11-12 21:59:43 (GMT)
committermarkt <markt>2007-11-12 21:59:43 (GMT)
commit5d7043320da1378e7dd3b10f7e425f3b47455b28 (patch)
tree305db18a58ab6768b78ab230074da576d09e372d /src/Screen.cc
parent807a1b557552e43dbdc169c1e7a3065a3f12aac7 (diff)
downloadfluxbox-5d7043320da1378e7dd3b10f7e425f3b47455b28.zip
fluxbox-5d7043320da1378e7dd3b10f7e425f3b47455b28.tar.bz2
allow arbitrary window patterns in iconbar
Diffstat (limited to 'src/Screen.cc')
-rw-r--r--src/Screen.cc16
1 files changed, 4 insertions, 12 deletions
diff --git a/src/Screen.cc b/src/Screen.cc
index e618216..a53792b 100644
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -346,6 +346,7 @@ BScreen::BScreen(FbTk::ResourceManager &rm,
346 m_workspacenames_sig(*this), // workspace names signal 346 m_workspacenames_sig(*this), // workspace names signal
347 m_workspace_area_sig(*this), // workspace area signal 347 m_workspace_area_sig(*this), // workspace area signal
348 m_currentworkspace_sig(*this), // current workspace signal 348 m_currentworkspace_sig(*this), // current workspace signal
349 m_focusedwindow_sig(*this), // focused window signal
349 m_reconfigure_sig(*this), // reconfigure signal 350 m_reconfigure_sig(*this), // reconfigure signal
350 m_resize_sig(*this), 351 m_resize_sig(*this),
351 m_bg_change_sig(*this), 352 m_bg_change_sig(*this),
@@ -871,19 +872,10 @@ void BScreen::cycleFocus(int options, const ClientPattern *pat, bool reverse) {
871 } 872 }
872 873
873 if (mods == 0) // can't stacked cycle unless there is a mod to grab 874 if (mods == 0) // can't stacked cycle unless there is a mod to grab
874 options |= FocusControl::CYCLELINEAR; 875 options |= FocusableList::STATIC_ORDER;
875
876 const FocusControl::Focusables *win_list = 0;
877 if (options & FocusControl::CYCLEGROUPS) {
878 win_list = (options & FocusControl::CYCLELINEAR) ?
879 &focusControl().creationOrderWinList() :
880 &focusControl().focusedOrderWinList();
881 } else {
882 win_list = (options & FocusControl::CYCLELINEAR) ?
883 &focusControl().creationOrderList() :
884 &focusControl().focusedOrderList();
885 }
886 876
877 const FocusableList *win_list =
878 FocusableList::getListFromOptions(*this, options);
887 focusControl().cycleFocus(*win_list, pat, reverse); 879 focusControl().cycleFocus(*win_list, pat, reverse);
888 880
889} 881}