fix workspace warping and netizen updates for warping (Simon)

7 files changed, 30 insertions, 22 deletions

diff --git a/src/Netizen.cc b/src/Netizen.cc
index 28019d0..95460b8 100644
--- a/src/Netizen.cc
+++ b/src/Netizen.cc
@@ -69,10 +69,10 @@ void Netizen::sendWindowFocus(Window w) {
 }
 
 
-void Netizen::sendWindowAdd(Window w, unsigned long p) {
+void Netizen::sendWindowAdd(Window w, unsigned long wkspc) {
     event.xclient.data.l[0] = FbAtoms::instance()->getFluxboxNotifyWindowAddAtom();
     event.xclient.data.l[1] = w;
-    event.xclient.data.l[2] = p;
+    event.xclient.data.l[2] = wkspc;
 
     XSendEvent(m_display, window, False, NoEventMask, &event);
 
diff --git a/src/Netizen.hh b/src/Netizen.hh
index 914cd08..d872ebe 100644
--- a/src/Netizen.hh
+++ b/src/Netizen.hh
@@ -38,7 +38,7 @@ public:
     void sendCurrentWorkspace();
 
     void sendWindowFocus(Window w);
-    void sendWindowAdd(Window w, unsigned long p);
+    void sendWindowAdd(Window w, unsigned long wkspc);
     void sendWindowDel(Window w);
     void sendWindowRaise(Window w);
     void sendWindowLower(Window w);
diff --git a/src/Screen.cc b/src/Screen.cc
index 7f3efd3..c25de83 100644
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -22,7 +22,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: Screen.cc,v 1.124 2003/04/16 00:37:19 fluxgen Exp $
+// $Id: Screen.cc,v 1.125 2003/04/16 14:43:01 rathnor Exp $
 
 
 #include "Screen.hh"
@@ -934,7 +934,7 @@ void BScreen::changeWorkspaceID(unsigned int id) {
 
         if (focused && focused->isMoving()) {
             if (doOpaqueMove())
-                reassociateGroup(focused, id, true);
+                reassociateWindow(focused, id, true);
             // don't reassociate if not opaque moving
             focused->pauseMoving();
         }
@@ -945,7 +945,7 @@ void BScreen::changeWorkspaceID(unsigned int id) {
         Workspace::Windows::iterator it = wins.begin();
         for (; it != wins.end(); ++it) {
             if ((*it)->isStuck()) {
-                reassociateGroup(*it, id, true);
+                reassociateWindow(*it, id, true);
             }
         }
 
@@ -1323,11 +1323,6 @@ string BScreen::getNameOfWorkspace(unsigned int workspace) const {
     }
 }
 
-void BScreen::reassociateGroup(FluxboxWindow *w, unsigned int wkspc_id, bool ignore_sticky) {
-    //!! TODO
-    cerr<<__FILE__<<"("<<__FUNCTION__<<") TODO!"<<endl;
-}
-
 void BScreen::reassociateWindow(FluxboxWindow *w, unsigned int wkspc_id, bool ignore_sticky) {
     if (w == 0)
         return;
diff --git a/src/Screen.hh b/src/Screen.hh
index 33fa03c..21d31f3 100644
--- a/src/Screen.hh
+++ b/src/Screen.hh
@@ -22,7 +22,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: Screen.hh,v 1.78 2003/04/16 13:43:42 rathnor Exp $
+// $Id: Screen.hh,v 1.79 2003/04/16 14:43:02 rathnor Exp $
 
 #ifndef  SCREEN_HH
 #define  SCREEN_HH
@@ -269,7 +269,6 @@ public:
     std::string getNameOfWorkspace(unsigned int workspace) const;
     void changeWorkspaceID(unsigned int);
     void sendToWorkspace(unsigned int workspace, FluxboxWindow *win=0, bool changeworkspace=true);
-    void reassociateGroup(FluxboxWindow *window, unsigned int workspace_id, bool ignore_sticky);
     void reassociateWindow(FluxboxWindow *window, unsigned int workspace_id, bool ignore_sticky);
     void prevFocus() { prevFocus(0); }
     void nextFocus() { nextFocus(0); }
diff --git a/src/Window.cc b/src/Window.cc
index fd070f9..6b55372 100644
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -22,7 +22,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: Window.cc,v 1.141 2003/04/16 13:43:50 rathnor Exp $
+// $Id: Window.cc,v 1.142 2003/04/16 14:43:04 rathnor Exp $
 
 #include "Window.hh"
 
@@ -2598,7 +2598,7 @@ void FluxboxWindow::stopMoving() {
                        frame().height() + 2*frame().window().borderWidth());
         moveResize(last_move_x, last_move_y, m_frame.width(), m_frame.height());
         if (workspace_number != getScreen().getCurrentWorkspaceID()) {
-            screen.reassociateGroup(this, getScreen().getCurrentWorkspaceID(), true);
+            screen.reassociateWindow(this, getScreen().getCurrentWorkspaceID(), true);
             m_frame.show();
         }
         fluxbox->ungrab();
diff --git a/src/Workspace.cc b/src/Workspace.cc
index 2bc0d78..9ddce15 100644
--- a/src/Workspace.cc
+++ b/src/Workspace.cc
@@ -22,7 +22,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: Workspace.cc,v 1.52 2003/04/15 12:20:27 fluxgen Exp $
+// $Id: Workspace.cc,v 1.53 2003/04/16 14:43:06 rathnor Exp $
 
 #include "Workspace.hh"
 
@@ -194,9 +194,14 @@ int Workspace::addWindow(FluxboxWindow &w, bool place) {
     m_windowlist.push_back(&w);
     updateClientmenu();
 
-        
-    if (!w.isStuck()) 
-        screen.updateNetizenWindowAdd(w.getClientWindow(), m_id);
+    if (!w.isStuck()) {
+        FluxboxWindow::ClientList::iterator client_it = 
+            w.clientList().begin();
+        FluxboxWindow::ClientList::iterator client_it_end = 
+            w.clientList().end();
+        for (; client_it != client_it_end; ++client_it)
+            screen.updateNetizenWindowAdd((*client_it)->window(), m_id);
+    }
 
     return w.getWindowNumber();
 }
@@ -274,6 +279,15 @@ int Workspace::removeWindow(FluxboxWindow *w) {
     if (lastfocus == w || m_windowlist.empty())
         lastfocus = 0;
 
+    if (!w->isStuck()) {
+        FluxboxWindow::ClientList::iterator client_it = 
+            w->clientList().begin();
+        FluxboxWindow::ClientList::iterator client_it_end = 
+            w->clientList().end();
+        for (; client_it != client_it_end; ++client_it)
+            screen.updateNetizenWindowDel((*client_it)->window());
+    }
+
     return m_windowlist.size();
 }
 
diff --git a/src/fluxbox.cc b/src/fluxbox.cc
index 7e9c1da..b01e420 100644
--- a/src/fluxbox.cc
+++ b/src/fluxbox.cc
@@ -22,7 +22,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: fluxbox.cc,v 1.112 2003/04/16 10:49:59 rathnor Exp $
+// $Id: fluxbox.cc,v 1.113 2003/04/16 14:43:06 rathnor Exp $
 
 #include "fluxbox.hh"
 
@@ -685,9 +685,9 @@ void Fluxbox::handleEvent(XEvent * const e) {
                 cerr<<"Fluxbox Warning! Could not find screen to map window on!"<<endl;
         }
         // handled in FluxboxWindow::handleEvent
-        if (win) 
+        
+        if (win)
             win->mapRequestEvent(e->xmaprequest);
-                        
     }
         break;
     case MapNotify: {