merged changes from pre-devel

1 files changed, 76 insertions, 15 deletions

diff --git a/src/WorkspaceCmd.cc b/src/WorkspaceCmd.cc
index 9859dd6..e7d92ee 100644
--- a/src/WorkspaceCmd.cc
+++ b/src/WorkspaceCmd.cc
@@ -41,16 +41,90 @@
 #include <algorithm>
 #include <functional>
 
+void WindowListCmd::execute() {
+    if (m_pat.error()) {
+        m_cmd->execute();
+        return;
+    }
+
+    BScreen *screen = Fluxbox::instance()->keyScreen();
+    if (screen != 0) {
+        FocusControl::Focusables win_list(screen->focusControl().creationOrderWinList());
+
+        FocusControl::Focusables::iterator it = win_list.begin(),
+                                           it_end = win_list.end();
+        for (; it != it_end; ++it) {
+            if (m_pat.match(**it) && (*it)->fbwindow())
+                m_cmd->execute(*(*it)->fbwindow());
+        }
+    }
+}
+
+void AttachCmd::execute() {
+    BScreen *screen = Fluxbox::instance()->keyScreen();
+    if (screen != 0) {
+        FocusControl::Focusables win_list(screen->focusControl().focusedOrderWinList());
+
+        FocusControl::Focusables::iterator it = win_list.begin(),
+                                           it_end = win_list.end();
+        FluxboxWindow *first = 0;
+        for (; it != it_end; ++it) {
+            if (m_pat.match(**it) && (*it)->fbwindow()) {
+                if (first == 0)
+                    first = (*it)->fbwindow();
+                else
+                    first->attachClient((*it)->fbwindow()->winClient());
+            }
+        }
+                
+    }
+}
+
 void NextWindowCmd::execute() {
     BScreen *screen = Fluxbox::instance()->keyScreen();
     if (screen != 0)
-        screen->cycleFocus(m_option, false);
+        screen->cycleFocus(m_option, &m_pat, false);
 }
 
 void PrevWindowCmd::execute() {
     BScreen *screen = Fluxbox::instance()->keyScreen();
     if (screen != 0)
-        screen->cycleFocus(m_option, true);
+        screen->cycleFocus(m_option, &m_pat, true);
+}
+
+void TypeAheadFocusCmd::execute() {
+    BScreen *screen = Fluxbox::instance()->keyScreen();
+    if (screen != 0) {
+        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();
+        }
+        
+        screen->startTypeAheadFocus(*win_list, &m_pat);
+    }
+}
+
+void GoToWindowCmd::execute() {
+    BScreen *screen = Fluxbox::instance()->keyScreen();
+    if (screen != 0) {
+        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();
+        }
+        screen->focusControl().goToWindowNumber(*win_list, m_num, &m_pat);
+    }
 }
 
 void DirFocusCmd::execute() {
@@ -250,19 +324,6 @@ void ShowDesktopCmd::execute() {
                   std::mem_fun(&FluxboxWindow::iconify));
 }
 
-void MinimizeLayerCmd::execute() {
-    FluxboxWindow *win = FocusControl::focusedFbWindow();
-    if (!win)
-        return;
-
-    Workspace::Windows windows(win->screen().currentWorkspace()->windowList());
-    Workspace::Windows::iterator it = windows.begin(), it_end = windows.end();
-    for (; it != it_end; ++it) {
-        if (win->layerNum() == (*it)->layerNum())
-            (*it)->iconify();
-    }
-}
-
 void CloseAllWindowsCmd::execute() {
     BScreen *screen = Fluxbox::instance()->mouseScreen();
     if (screen == 0)