wmii

commit 0728d68133ff668c9f85939b7d87b7fb61c0c15d
parent e23ca5ca5924f543150d17c1c45cf7fa5dc26195
Author: Anselm R. Garbe <garbeam@wmii.de>
Date:   Thu,  2 Mar 2006 15:54:32 +0100

small fix, still an oddifty on send next


Diffstat:
cmd/wm/area.c
 | 
8
++++----
cmd/wm/client.c
 | 
2
+-
cmd/wm/wm.h
 | 
2
+-

3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/cmd/wm/area.c b/cmd/wm/area.c
@@ -97,7 +97,7 @@ select_area(Area *a, char *arg)
 void
 sendto_area(Area *to, Client *c)
 {
-	detach_client_area(c);
+	detach_client_area(c, True);
 	attach_client2area(to, c);
 	focus_client(c);
 }
@@ -135,7 +135,7 @@ attach_client2area(Area *a, Client *c)
 }
 
 void
-detach_client_area(Client *c)
+detach_client_area(Client *c, Bool ignfetch)
 {
 	Area *a = c->area;
 	Page *p = a->page;
@@ -144,7 +144,7 @@ detach_client_area(Client *c)
 	a->nclient--;
 	if(a->sel >= a->nclient)
 		a->sel = 0;
-	if(i) { /* area */
+	if(i && !ignfetch) { /* area */
 		if(a->capacity && (a->nclient < a->capacity)) {
 			for(++i; i < p->narea; i++) {
 				Area *tmp = p->area[i];
@@ -174,7 +174,7 @@ match_capacity(Area *a)
 {
 	while(a->nclient > a->capacity) {
 		Client *c = a->client[a->nclient - 1];
-		detach_client_area(c);
+		detach_client_area(c, True);
 		attach_client(c);
 	}
 }
diff --git a/cmd/wm/client.c b/cmd/wm/client.c
@@ -388,7 +388,7 @@ detach_client(Client *c, Bool unmap)
 			reparent_client(c, root, c->rect.x, c->rect.y);
 			XUnmapWindow(dpy, c->frame.win);
 		}
-		detach_client_area(c);
+		detach_client_area(c, False);
 	}
 	c->area = nil;
 	if(c->revert)
diff --git a/cmd/wm/wm.h b/cmd/wm/wm.h
@@ -197,7 +197,7 @@ void update_area_geometry(Area *a);
 void select_area(Area *a, char *arg);
 void sendto_area(Area *to, Client *c);
 void attach_client2area(Area *a, Client *c);
-void detach_client_area(Client *c);
+void detach_client_area(Client *c, Bool ignfetch);
 void arrange_page(Page *p, Bool update_area_geometry);
 void arrange_area(Area *a);
 void resize_area(Client *c, XRectangle *r, XPoint *pt);