X-Git-Url: https://jasonwoof.com/gitweb/?p=dwm.git;a=blobdiff_plain;f=client.c;h=c4b0941a996b753e665e7abc41ecc91f8548df22;hp=64da34374a1ec0f7b41472b1b1f3f704f570f7fe;hb=9fdd2cd1a9dbe9b533fab9a8a98b9849dc4c7b59;hpb=b8bccb4ac5222a01ecd6a5f82997ea2ee3b84b8b

diff --git a/client.c b/client.c
index 64da343..c4b0941 100644
--- a/client.c
+++ b/client.c
@@ -1,5 +1,7 @@
 /* © 2006-2007 Anselm R. Garbe <garbeam at gmail dot com>
  * © 2006-2007 Sander van Dijk <a dot h dot vandijk at gmail dot com>
+ * © 2007 Premysl Hruby <dfenze at gmail dot com>
+ * © 2007 Szabolcs Nagy <nszabolcs at gmail dot com>
  * See LICENSE file for license details. */
 #include "dwm.h"
 #include <stdlib.h>
@@ -129,8 +131,8 @@ detach(Client *c) {
 
 void
 focus(Client *c) {
-	if(c && !isvisible(c))
-		return;
+	if( !c && selscreen || c && !isvisible(c))
+		for(c = stack; c && !isvisible(c); c = c->snext);
 	if(sel && sel != c) {
 		grabbuttons(sel, False);
 		XSetWindowBorder(dpy, sel->win, dc.norm[ColBorder]);
@@ -222,8 +224,7 @@ manage(Window w, XWindowAttributes *wa) {
 	XMoveWindow(dpy, w, c->x + 2 * sw, c->y);
 	XMapWindow(dpy, w);
 	setclientstate(c, NormalState);
-	if(isvisible(c))
-		focus(c);
+	focus(c);
 	lt->arrange();
 }
 
@@ -297,6 +298,8 @@ togglefloating(const char *arg) {
 	if(!sel || lt->arrange == floating)
 		return;
 	sel->isfloating = !sel->isfloating;
+	if(sel->isfloating)
+		resize(sel, sel->x, sel->y, sel->w, sel->h, True);
 	lt->arrange();
 }
 
@@ -365,9 +368,8 @@ updatetitle(Client *c) {
 		XGetWMName(dpy, c->win, &name);
 	if(!name.nitems)
 		return;
-	if(name.encoding == XA_STRING) {
+	if(name.encoding == XA_STRING)
 		strncpy(c->name, (char *)name.value, sizeof c->name - 1);
-	}
 	else {
 		if(XmbTextPropertyToTextList(dpy, &name, &list, &n) >= Success
 		&& n > 0 && *list)
@@ -382,7 +384,6 @@ updatetitle(Client *c) {
 
 void
 unmanage(Client *c) {
-	Client *nc;
 	XWindowChanges wc;
 
 	wc.border_width = c->oldborder;
@@ -392,10 +393,8 @@ unmanage(Client *c) {
 	XConfigureWindow(dpy, c->win, CWBorderWidth, &wc); /* restore border */
 	detach(c);
 	detachstack(c);
-	if(sel == c) {
-		for(nc = stack; nc && !isvisible(nc); nc = nc->snext);
-		focus(nc);
-	}
+	if(sel == c)
+		focus(NULL);
 	XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
 	setclientstate(c, WithdrawnState);
 	free(c->tags);