Jukka also belongs to Copyright holders after all he has contributed and done for...

[dwm.git] / client.c

diff --git a/client.c b/client.c
index 040dd15..3be154b 100644 (file)
--- a/client.c
+++ b/client.c
@@ -1,5 +1,8 @@
 /* © 2006-2007 Anselm R. Garbe <garbeam at gmail dot com>
  * © 2006-2007 Sander van Dijk <a dot h dot vandijk at gmail dot com>
+ * © 2006-2007 Jukka Salmi <jukka at salmi dot ch>
+ * © 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 +132,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]);
@@ -153,14 +156,6 @@ focus(Client *c) {
 }
 
 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 +225,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();
 }
 
@@ -305,8 +299,8 @@ togglefloating(const char *arg) {
        if(!sel || lt->arrange == floating)
                return;
        sel->isfloating = !sel->isfloating;
-       if(sel->isfloating && sel->isfixed)
-               resize(sel, sel->x, sel->y, sel->minw, sel->minh, True);
+       if(sel->isfloating)
+               resize(sel, sel->x, sel->y, sel->w, sel->h, True);
        lt->arrange();
 }
 
@@ -401,7 +395,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);