[hackers] [dwm] calculating the remainder for master and stack area correctly

changeset: 898:6c8b43d7b616
tag: tip
user: Anselm R. Garbe <arg_AT_suckless.org>
date: Thu May 24 15:40:07 2007 +0200
summary: calculating the remainder for master and stack area correctly

diff -r 0a78c9e46e24 -r 6c8b43d7b616 layout.c
--- a/layout.c Thu May 24 11:35:32 2007 +0200
+++ b/layout.c Thu May 24 15:40:07 2007 +0200
@@ -15,7 +15,7 @@ static unsigned int nmaster = NMASTER;
 
 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,7 +24,6 @@ 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)
@@ -40,16 +39,20 @@ tile(void) {
                         if(i < nmaster) {
                                 ny += i * mh;
                                 nw = mw - 2 * c->border;
- nh = mh - 2 * c->border;
+ nh = mh;
+ if(i + 1 == 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;
Received on Thu May 24 2007 - 15:40:16 UTC