wmii

commit 049fa9e0c0fea7ff895bcee4ba61f9f016b9f62e
parent c94252bf33d42fff7c951712fb9b3f9a835fea4c
Author: Anselm R. Garbe <garbeam@wmii.de>
Date:   Sun, 14 May 2006 17:27:00 +0200

several small fixes


Diffstat:
cmd/wm/client.c
 | 
11
+++++------
cmd/wm/mouse.c
 | 
1
-
cmd/wm/wm.c
 | 
3
++-

3 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/cmd/wm/client.c b/cmd/wm/client.c
@@ -434,16 +434,16 @@ destroy_client(Client *c)
 	XGrabServer(dpy);
 	XSetErrorHandler(dummy_error_handler);
 
-	for(i = 0; i < view.size; i++)
-		detach_from_view(view.data[i], c);
-
-	unmap_client(c);
-
 	if(c->frame.size) {
 		c->rect.x = c->frame.data[c->sel]->rect.x;
 		c->rect.y = c->frame.data[c->sel]->rect.y;
 	}
 
+	for(i = 0; i < view.size; i++)
+		detach_from_view(view.data[i], c);
+
+	unmap_client(c);
+
 	reparent_client(c, root, c->rect.x, c->rect.y);
 	XFreeGC(dpy, c->gc);
 	XDestroyWindow(dpy, c->framewin);
@@ -645,7 +645,6 @@ send_client_to(Client *c, char *arg)
 			if(!(to = new_left_column(v)))
 				return;
 		}
-		else
 			return;
 	}
 	else if(!strncmp(arg, "next", 5) && i) {
diff --git a/cmd/wm/mouse.c b/cmd/wm/mouse.c
@@ -429,7 +429,6 @@ do_mouse_resize(Client *c, BlitzAlign align)
 	XRectangle *rects = rects_of_view(f->area->view, idx_of_area(f->area) == 0, &num);
 	XRectangle frect = f->rect;
 	XRectangle origin = frect;
-	XPoint pt;
 
 	XQueryPointer(dpy, c->framewin, &dummy, &dummy, &i, &i, &ox, &oy, &dmask);
 	XSync(dpy, False);
diff --git a/cmd/wm/wm.c b/cmd/wm/wm.c
@@ -178,7 +178,8 @@ wmii_error_handler(Display *dpy, XErrorEvent *error)
 			|| (error->request_code == X_GrabKey
 				&& error->error_code == BadMatch))
 		return 0;
-	fprintf(stderr, "%s", "wmiiwm: fatal error");
+	fprintf(stderr, "wmiiwm: fatal error: Xrequest code=%d, Xerror code=%d\n",
+			error->request_code, error->error_code);
 	return x_error_handler(dpy, error); /* calls exit() */
 }