fixed an issue reported by Nibble, also fixed s/2008/2009/

[dwm.git] / dwm.c

diff --git a/dwm.c b/dwm.c
index c9a6b0a..db9e9c0 100644 (file)
--- a/dwm.c
+++ b/dwm.c
@@ -179,7 +179,7 @@ static void setclientstate(Client *c, long state);
 static void setlayout(const Arg *arg);
 static void setmfact(const Arg *arg);
 static void setup(void);
 static void setlayout(const Arg *arg);
 static void setmfact(const Arg *arg);
 static void setup(void);

-static void showhide(Client *c);
+static void showhide(Client *c, unsigned int ntiled);

 static void sigchld(int signal);
 static void spawn(const Arg *arg);
 static void tag(const Arg *arg);
 static void sigchld(int signal);
 static void spawn(const Arg *arg);
 static void tag(const Arg *arg);


@@ -283,7 +283,11 @@ applyrules(Client *c) {
 
 void
 arrange(void) {
 
 void
 arrange(void) {

-       showhide(stack);
+       unsigned int nt;
+       Client *c;
+
+       for(nt = 0, c = nexttiled(clients); c; c = nexttiled(c->next), nt++);
+       showhide(stack, nt);

        focus(NULL);
        if(lt[sellt]->arrange)
                lt[sellt]->arrange();
        focus(NULL);
        if(lt[sellt]->arrange)
                lt[sellt]->arrange();


@@ -1341,18 +1345,19 @@ setup(void) {
 }
 
 void
 }
 
 void

-showhide(Client *c) {
+showhide(Client *c, unsigned int ntiled) {

        if(!c)
                return;
        if(ISVISIBLE(c)) { /* show clients top down */
        if(!c)
                return;
        if(ISVISIBLE(c)) { /* show clients top down */

-               adjustborder(c, borderpx);
+               if(c->isfloating || ntiled > 1) /* avoid unnecessary border reverts */
+                       adjustborder(c, borderpx);

                XMoveWindow(dpy, c->win, c->x, c->y);
                if(!lt[sellt]->arrange || c->isfloating)
                        resize(c, c->x, c->y, c->w, c->h, True);
                XMoveWindow(dpy, c->win, c->x, c->y);
                if(!lt[sellt]->arrange || c->isfloating)
                        resize(c, c->x, c->y, c->w, c->h, True);

-               showhide(c->snext);
+               showhide(c->snext, ntiled);

        }
        else { /* hide clients bottom up */
        }
        else { /* hide clients bottom up */

-               showhide(c->snext);
+               showhide(c->snext, ntiled);

                XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
        }
 }
                XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
        }
 }


@@ -1703,7 +1708,7 @@ zoom(const Arg *arg) {
 int
 main(int argc, char *argv[]) {
        if(argc == 2 && !strcmp("-v", argv[1]))
 int
 main(int argc, char *argv[]) {
        if(argc == 2 && !strcmp("-v", argv[1]))

-               die("dwm-"VERSION", © 2006-2008 dwm engineers, see LICENSE for details\n");
+               die("dwm-"VERSION", © 2006-2009 dwm engineers, see LICENSE for details\n");

        else if(argc != 1)
                die("usage: dwm [-v]\n");
 
        else if(argc != 1)
                die("usage: dwm [-v]\n");