X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=client.c;h=90399aefc2b0ff834b9835d64f46f8037f81f5db;hb=199a6016114875656102d11e79a80939bfaff3b3;hp=3e9b2395bf963b1ee14a00aec2e8533f46dcba7a;hpb=6ee8e3e93b79b7c92246d7d520d5a24be59e5807;p=dwm.git

diff --git a/client.c b/client.c
index 3e9b239..90399ae 100644
--- a/client.c
+++ b/client.c
@@ -129,8 +129,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]);
@@ -152,14 +152,6 @@ focus(Client *c) {
 		XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
 }
 
-void
-focustopvisible(void) {
-	Client *c;
-
-	for(c = stack; c && !isvisible(c); c = c->snext);
-	focus(c);
-}
-
 void
 killclient(const char *arg) {
 	XEvent ev;
@@ -230,8 +222,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();
 }
 
@@ -304,7 +295,9 @@ void
 togglefloating(const char *arg) {
 	if(!sel || lt->arrange == floating)
 		return;
-	sel->isfloating = !sel->isfloating || sel->isfixed;
+	sel->isfloating = !sel->isfloating;
+	if(sel->isfloating)
+		resize(sel, sel->x, sel->y, sel->w, sel->h, True);
 	lt->arrange();
 }
 
@@ -399,7 +392,7 @@ unmanage(Client *c) {
 	detach(c);
 	detachstack(c);
 	if(sel == c)
-		focustopvisible();
+		focus(NULL);
 	XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
 	setclientstate(c, WithdrawnState);
 	free(c->tags);