changed -v output (now also anydot and nsz are contained in this output)

[dwm.git] / layout.c

diff --git a/layout.c b/layout.c
index 47e9e49..92c6a53 100644 (file)
--- a/layout.c
+++ b/layout.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>
@@ -13,9 +15,25 @@ static unsigned int nlayouts = 0;
 static unsigned int masterw = MASTERWIDTH;
 static unsigned int nmaster = NMASTER;
 
+static void
+ban(Client *c) {
+       if (c->isbanned)
+               return;
+       XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
+       c->isbanned = True;
+}
+
+static void
+unban(Client *c) {
+       if (!c->isbanned)
+               return;
+       XMoveWindow(dpy, c->win, c->x, c->y);
+       c->isbanned = False;
+}
+
 static void
 tile(void) {
-       unsigned int i, n, nx, ny, nw, nh, mw, mh, tw, th, remainder;
+       unsigned int i, n, nx, ny, nw, nh, mw, mh, tw, th;
        Client *c;
 
        for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next))
@@ -24,14 +42,11 @@ tile(void) {
        mh = (n > nmaster) ? wah / nmaster : wah / (n > 0 ? n : 1);
        mw = (n > nmaster) ? (waw * masterw) / 1000 : waw;
        th = (n > nmaster) ? wah / (n - nmaster) : 0;
-       remainder = (n > nmaster) ? wah - th * (n - nmaster) : 0;
        tw = waw - mw;
 
        for(i = 0, c = clients; c; c = c->next)
                if(isvisible(c)) {
-                       if(c->isbanned)
-                               XMoveWindow(dpy, c->win, c->x, c->y);
-                       c->isbanned = False;
+                       unban(c);
                        if(c->isfloating)
                                continue;
                        c->ismax = False;
@@ -40,16 +55,20 @@ tile(void) {
                        if(i < nmaster) {
                                ny += i * mh;
                                nw = mw - 2 * c->border;
-                               nh = mh - 2 * c->border;
+                               nh = mh;
+                               if(i + 1 == (n < nmaster ? n : nmaster)) /* remainder */
+                                       nh = wah - mh * i;
+                               nh -= 2 * c->border;
                        }
                        else {  /* tile window */
                                nx += mw;
                                nw = tw - 2 * c->border;
                                if(th > 2 * c->border) {
                                        ny += (i - nmaster) * th;
-                                       nh = th - 2 * c->border;
-                                       if (i == n - 1)
-                                               nh += remainder;
+                                       nh = th;
+                                       if(i + 1 == n) /* remainder */
+                                               nh = wah - th * (i - nmaster);
+                                       nh -= 2 * c->border;
                                }
                                else /* fallback if th <= 2 * c->border */
                                        nh = wah - 2 * c->border;
@@ -57,12 +76,9 @@ tile(void) {
                        resize(c, nx, ny, nw, nh, False);
                        i++;
                }
-               else {
-                       c->isbanned = True;
-                       XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
-               }
-       if(!sel || !isvisible(sel)) 
-               focustopvisible();
+               else
+                       ban(c);
+       focus(NULL);
        restack();
 }
 
@@ -74,20 +90,16 @@ void
 floating(void) {
        Client *c;
 
-       for(c = clients; c; c = c->next) {
+       for(c = clients; c; c = c->next)
                if(isvisible(c)) {
                        if(c->isbanned)
                                XMoveWindow(dpy, c->win, c->x, c->y);
                        c->isbanned = False;
                        resize(c, c->x, c->y, c->w, c->h, True);
                }
-               else {
-                       c->isbanned = True;
-                       XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
-               }
-       }
-       if(!sel || !isvisible(sel))
-               focustopvisible();
+               else
+                       ban(c);
+       focus(NULL);
        restack();
 }
 
@@ -247,7 +259,7 @@ void
 zoom(const char *arg) {
        Client *c;
 
-       if(!sel || lt->arrange != tile || sel->isfloating)
+       if(!sel || lt->arrange == floating || sel->isfloating)
                return;
        if((c = sel) == nexttiled(clients))
                if(!(c = nexttiled(c->next)))