allow arbitrary window patterns in iconbar

1 files changed, 5 insertions, 13 deletions

diff --git a/src/FbCommands.cc b/src/FbCommands.cc
index 698f2db..28c0a30 100644
--- a/src/FbCommands.cc
+++ b/src/FbCommands.cc
@@ -277,20 +277,12 @@ void ShowClientMenuCmd::execute() {
         return;
 
     // TODO: ClientMenu only accepts lists of FluxboxWindows for now
-    const FocusControl::Focusables *win_list = 0;
-//    if (m_option & FocusControl::CYCLEGROUPS) {
-        win_list = (m_option & FocusControl::CYCLELINEAR) ?
-            &screen->focusControl().creationOrderWinList() :
-            &screen->focusControl().focusedOrderWinList();
-/*    } else {
-        win_list = (m_option & FocusControl::CYCLELINEAR) ?
-            &screen->focusControl().creationOrderList() :
-            &screen->focusControl().focusedOrderList();
-    } */
-
+    //       when that's fixed, use a FocusableList for m_list
+    const FocusableList *list =
+        FocusableList::getListFromOptions(*screen, m_option);
     m_list.clear();
-    FocusControl::Focusables::const_iterator it = win_list->begin(),
-                                             it_end = win_list->end();
+    FocusControl::Focusables::const_iterator it = list->clientList().begin(),
+                                             it_end = list->clientList().end();
     for (; it != it_end; ++it) {
         if (typeid(**it) == typeid(FluxboxWindow) && m_pat.match(**it))
             m_list.push_back(static_cast<FluxboxWindow *>(*it));