aboutsummaryrefslogtreecommitdiff
path: root/src/WorkspaceCmd.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/WorkspaceCmd.cc
parent807a1b557552e43dbdc169c1e7a3065a3f12aac7 (diff)
downloadfluxbox_pavel-5d7043320da1378e7dd3b10f7e425f3b47455b28.zip
fluxbox_pavel-5d7043320da1378e7dd3b10f7e425f3b47455b28.tar.bz2
allow arbitrary window patterns in iconbar
Diffstat (limited to 'src/WorkspaceCmd.cc')
-rw-r--r--src/WorkspaceCmd.cc16
1 files changed, 4 insertions, 12 deletions
diff --git a/src/WorkspaceCmd.cc b/src/WorkspaceCmd.cc
index a525078..79ceb40 100644
--- a/src/WorkspaceCmd.cc
+++ b/src/WorkspaceCmd.cc
@@ -49,7 +49,7 @@ void WindowListCmd::execute() {
49 49
50 BScreen *screen = Fluxbox::instance()->keyScreen(); 50 BScreen *screen = Fluxbox::instance()->keyScreen();
51 if (screen != 0) { 51 if (screen != 0) {
52 FocusControl::Focusables win_list(screen->focusControl().creationOrderWinList()); 52 FocusControl::Focusables win_list(screen->focusControl().creationOrderWinList().clientList());
53 53
54 FocusControl::Focusables::iterator it = win_list.begin(), 54 FocusControl::Focusables::iterator it = win_list.begin(),
55 it_end = win_list.end(); 55 it_end = win_list.end();
@@ -63,7 +63,7 @@ void WindowListCmd::execute() {
63void AttachCmd::execute() { 63void AttachCmd::execute() {
64 BScreen *screen = Fluxbox::instance()->keyScreen(); 64 BScreen *screen = Fluxbox::instance()->keyScreen();
65 if (screen != 0) { 65 if (screen != 0) {
66 FocusControl::Focusables win_list(screen->focusControl().focusedOrderWinList()); 66 FocusControl::Focusables win_list(screen->focusControl().focusedOrderWinList().clientList());
67 67
68 FocusControl::Focusables::iterator it = win_list.begin(), 68 FocusControl::Focusables::iterator it = win_list.begin(),
69 it_end = win_list.end(); 69 it_end = win_list.end();
@@ -95,16 +95,8 @@ void PrevWindowCmd::execute() {
95void GoToWindowCmd::execute() { 95void GoToWindowCmd::execute() {
96 BScreen *screen = Fluxbox::instance()->keyScreen(); 96 BScreen *screen = Fluxbox::instance()->keyScreen();
97 if (screen != 0) { 97 if (screen != 0) {
98 const FocusControl::Focusables *win_list = 0; 98 const FocusableList *win_list =
99 if (m_option & FocusControl::CYCLEGROUPS) { 99 FocusableList::getListFromOptions(*screen, m_option);
100 win_list = (m_option & FocusControl::CYCLELINEAR) ?
101 &screen->focusControl().creationOrderWinList() :
102 &screen->focusControl().focusedOrderWinList();
103 } else {
104 win_list = (m_option & FocusControl::CYCLELINEAR) ?
105 &screen->focusControl().creationOrderList() :
106 &screen->focusControl().focusedOrderList();
107 }
108 screen->focusControl().goToWindowNumber(*win_list, m_num, &m_pat); 100 screen->focusControl().goToWindowNumber(*win_list, m_num, &m_pat);
109 } 101 }
110} 102}