take bar into account

[dwm.git] / tile.c

diff --git a/tile.c b/tile.c
index e1c68f8..8269676 100644 (file)
--- a/tile.c
+++ b/tile.c
@@ -1,79 +1,102 @@
 /* See LICENSE file for copyright and license details. */
-#include "dwm.h"
-#include <stdio.h>
+int bx, by, bw, bh, blw, mx, my, mw, mh, tx, ty, tw, th, wx, wy, ww, wh;
 
-/* static */
-
-static double mwfact = MWFACT;
-
-/* extern */
+void setmfact(const char *arg);
+void tile(void);
+void tileresize(Client *c, int x, int y, int w, int h);
+void updatetilegeom(void);
 
 void
-addtomwfact(const char *arg) {
-       double delta;
+setmfact(const char *arg) {
+       double d;
 
-       if(!isarrange(tile))
+       if(!arg || lt->arrange != tile)
                return;
-
-       /* arg handling, manipulate mwfact */
-       if(arg && (1 == sscanf(arg, "%lf", &delta))) {
-               if(delta + mwfact > 0.1 && delta + mwfact < 0.9)
-                       mwfact += delta;
+       else {
+               d = strtod(arg, NULL);
+               if(arg[0] == '-' || arg[0] == '+')
+                       d += mfact;
+               if(d < 0.1 || d > 0.9)
+                       return;
+               mfact = d;
        }
+       updatetilegeom();
        arrange();
 }
 
 void
 tile(void) {
-       unsigned int i, n, nx, ny, nw, nh, mw, th;
+       int x, y, h, w;
+       unsigned int i, n;
        Client *c;
 
-       for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next))
-               n++;
+       for(n = 0, c = nextunfloating(clients); c; c = nextunfloating(c->next), n++);
+       if(n == 0)
+               return;
+
+       /* master */
+       c = nextunfloating(clients);
+
+       if(n == 1)
+               tileresize(c, wx, wy, ww - 2 * c->bw, wh - 2 * c->bw);
+       else
+               tileresize(c, mx, my, mw - 2 * c->bw, mh - 2 * c->bw);
 
-       /* window geoms */
-       mw = (n == 1) ? waw : mwfact * waw;
-       th = (n > 1) ? wah / (n - 1) : 0;
-       if(n > 1 && th < bh)
-               th = wah;
+       if(--n == 0)
+               return;
 
-       nx = wax;
-       ny = way;
-       for(i = 0, c = nexttiled(clients); c; c = nexttiled(c->next)) {
-               c->ismax = False;
-               if(i == 0) { /* master */
-                       nw = mw - 2 * c->border;
-                       nh = wah - 2 * c->border;
-               }
-               else {  /* tile window */
-                       if(i == 1) {
-                               ny = way;
-                               nx += mw;
-                       }
-                       nw = waw - mw - 2 * c->border;
-                       if(i + 1 == n) /* remainder */
-                               nh = (way + wah) - ny - 2 * c->border;
-                       else
-                               nh = th - 2 * c->border;
-               }
-               resize(c, nx, ny, nw, nh, False);
-               if(n > 1 && th != wah)
-                       ny += nh + 2 * c->border;
-               i++;
+       /* tile stack */
+       x = (tx > c->x + c->w) ? c->x + c->w + 2 * c->bw : tw;
+       y = ty;
+       w = (tx > c->x + c->w) ? wx + ww - x : tw;
+       h = th / n;
+       if(h < bh)
+               h = th;
+
+       for(i = 0, c = nextunfloating(c->next); c; c = nextunfloating(c->next), i++) {
+               if(i + 1 == n) /* remainder */
+                       tileresize(c, x, y, w - 2 * c->bw, (ty + th) - y - 2 * c->bw);
+               else
+                       tileresize(c, x, y, w - 2 * c->bw, h - 2 * c->bw);
+               if(h != th)
+                       y = c->y + c->h + 2 * c->bw;
        }
 }
 
 void
+tileresize(Client *c, int x, int y, int w, int h) {
+       resize(c, x, y, w, h, resizehints);
+       if(resizehints && ((c->h < bh) || (c->h > h) || (c->w < bh) || (c->w > w)))
+               /* client doesn't accept size constraints */
+               resize(c, x, y, w, h, False);
+}
+
+void
 zoom(const char *arg) {
-       Client *c;
+       Client *c = sel;
 
-       if(!sel || !isarrange(tile) || sel->isfloating)
-               return;
-       if((c = sel) == nexttiled(clients))
-               if(!(c = nexttiled(c->next)))
+       if(c == nextunfloating(clients))
+               if(!c || !(c = nextunfloating(c->next)))
                        return;
-       detach(c);
-       attach(c);
-       focus(c);
+       if(lt->arrange == tile && !sel->isfloating) {
+               detach(c);
+               attach(c);
+               focus(c);
+       }
        arrange();
 }
+
+void
+updatetilegeom(void) {
+       /* master area geometry */
+       mx = wx;
+       my = wy;
+       mw = mfact * ww;
+       mh = wh;
+
+       /* tile area geometry */
+       tx = mx + mw;
+       ty = wy;
+       tw = ww - mw;
+       th = wh;
+}