3 files changed, 37 insertions, 3 deletions

diff --git a/src/FbCommandFactory.cc b/src/FbCommandFactory.cc
index 0daec6d..1e5b506 100644
--- a/src/FbCommandFactory.cc
+++ b/src/FbCommandFactory.cc
@@ -85,6 +85,7 @@ FbCommandFactory::FbCommandFactory() {
     // setup commands that we can handle
     const char* commands[] = {
         "arrangewindows",
+        "attach",
         "bindkey",
         "clientmenu",
         "close",
@@ -487,6 +488,11 @@ FbTk::Command *FbCommandFactory::stringToCommand(const std::string &command,
         cerr<<"*** WARNING: 'Workspace<n>' actions are deprecated! Use 'Workspace <n>' instead"<<endl;
         return new JumpToWorkspaceCmd(getint(command.substr(9).c_str(), 1) - 1);
 
+    } else if (command == "attach") {
+        int opts; // not used
+        string pat;
+        parseNextWindowArgs(arguments, opts, pat);
+        return new AttachCmd(pat);
     } else if (command == "nextwindow") {
         int opts;
         string pat;
diff --git a/src/WorkspaceCmd.cc b/src/WorkspaceCmd.cc
index 75cf4d3..a9b7aca 100644
--- a/src/WorkspaceCmd.cc
+++ b/src/WorkspaceCmd.cc
@@ -49,10 +49,10 @@ void WindowListCmd::execute() {
 
     BScreen *screen = Fluxbox::instance()->keyScreen();
     if (screen != 0) {
-        FocusControl::Focusables *win_list = &screen->focusControl().creationOrderWinList();
+        FocusControl::Focusables win_list(screen->focusControl().creationOrderWinList());
 
-        FocusControl::Focusables::iterator it = win_list->begin(),
-                                           it_end = win_list->end();
+        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());
@@ -60,6 +60,26 @@ void WindowListCmd::execute() {
     }
 }
 
+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)
diff --git a/src/WorkspaceCmd.hh b/src/WorkspaceCmd.hh
index 7687175..e1727f5 100644
--- a/src/WorkspaceCmd.hh
+++ b/src/WorkspaceCmd.hh
@@ -46,6 +46,14 @@ private:
     ClientPattern m_pat;
 };
 
+class AttachCmd: public FbTk::Command {
+public:
+    explicit AttachCmd(const std::string &pat): m_pat(pat.c_str()) { }
+    void execute();
+private:
+    const ClientPattern m_pat;
+};
+
 class NextWindowCmd: public FbTk::Command {
 public:
     explicit NextWindowCmd(int option, std::string &pat):