Xinqi Bao's Git

projects / dwm.git / blobdiff
summary | log | commit | diff | tree
raw | inline | side by side
calculating the remainder for master and stack area correctly
[dwm.git] / layout.c
diff --git a/layout.c b/layout.c
index 21ee99c..0865050 100644 (file)
--- a/layout.c
+++ b/layout.c
@@ -1,6 +1,6 @@
-/* (C)opyright MMVI-MMVII Anselm R. Garbe <garbeam at gmail dot com>
- * See LICENSE file for license details.
- */
+/* © 2006-2007 Anselm R. Garbe <garbeam at gmail dot com>
+ * © 2006-2007 Sander van Dijk <a dot h dot vandijk at gmail dot com>
+ * See LICENSE file for license details. */
 #include "dwm.h"
 #include <stdlib.h>
 
 #include "dwm.h"
 #include <stdlib.h>
 
@@ -31,25 +31,31 @@ tile(void) {
                        if(c->isbanned)
                                XMoveWindow(dpy, c->win, c->x, c->y);
                        c->isbanned = False;
                        if(c->isbanned)
                                XMoveWindow(dpy, c->win, c->x, c->y);
                        c->isbanned = False;
-                       if(c->isversatile)
+                       if(c->isfloating)
                                continue;
                        c->ismax = False;
                        nx = wax;
                        ny = way;
                        if(i < nmaster) {
                                ny += i * mh;
                                continue;
                        c->ismax = False;
                        nx = wax;
                        ny = way;
                        if(i < nmaster) {
                                ny += i * mh;
-                               nw = mw - 2 * BORDERPX;
-                               nh = mh - 2 * BORDERPX;
+                               nw = mw - 2 * c->border;
+                               nh = mh;
+                               if(i + 1 == nmaster) /* remainder */
+                                       nh = wah - mh * i;
+                               nh -= 2 * c->border;
                        }
                        else {  /* tile window */
                                nx += mw;
                        }
                        else {  /* tile window */
                                nx += mw;
-                               nw = tw - 2 * BORDERPX;
-                               if(th > 2 * BORDERPX) {
+                               nw = tw - 2 * c->border;
+                               if(th > 2 * c->border) {
                                        ny += (i - nmaster) * th;
                                        ny += (i - nmaster) * th;
-                                       nh = th - 2 * BORDERPX;
+                                       nh = th;
+                                       if(i + 1 == n) /* remainder */
+                                               nh = wah - th * (i - nmaster);
+                                       nh -= 2 * c->border;
                                }
                                }
-                               else /* fallback if th <= 2 * BORDERPX */
-                                       nh = wah - 2 * BORDERPX;
+                               else /* fallback if th <= 2 * c->border */
+                                       nh = wah - 2 * c->border;
                        }
                        resize(c, nx, ny, nw, nh, False);
                        i++;
                        }
                        resize(c, nx, ny, nw, nh, False);
                        i++;
@@ -58,10 +64,8 @@ tile(void) {
                        c->isbanned = True;
                        XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
                }
                        c->isbanned = True;
                        XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
                }
-       if(!sel || !isvisible(sel)) {
-               for(c = stack; c && !isvisible(c); c = c->snext);
-               focus(c);
-       }
+       if(!sel || !isvisible(sel)) 
+               focustopvisible();
        restack();
 }
 
        restack();
 }
 
@@ -70,30 +74,43 @@ LAYOUTS
 /* extern */
 
 void
 /* extern */
 
 void
-focusnext(const char *arg) {
+floating(void) {
        Client *c;
        Client *c;
-   
-       if(!sel)
-               return;
-       for(c = sel->next; c && !isvisible(c); c = c->next);
-       if(!c)
-               for(c = clients; c && !isvisible(c); c = c->next);
-       if(c) {
-               focus(c);
-               restack();
+
+       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();
+       restack();
 }
 
 void
 }
 
 void
-focusprev(const char *arg) {
+focusclient(const char *arg) {
        Client *c;
        Client *c;
-
-       if(!sel)
+   
+       if(!sel || !arg)
                return;
                return;
-       for(c = sel->prev; c && !isvisible(c); c = c->prev);
-       if(!c) {
-               for(c = clients; c && c->next; c = c->next);
-               for(; c && !isvisible(c); c = c->prev);
+       if(atoi(arg) < 0) {
+               for(c = sel->prev; c && !isvisible(c); c = c->prev);
+               if(!c) {
+                       for(c = clients; c && c->next; c = c->next);
+                       for(; c && !isvisible(c); c = c->prev);
+               }
+       }
+       else {
+               for(c = sel->next; c && !isvisible(c); c = c->next);
+               if(!c)
+                       for(c = clients; c && !isvisible(c); c = c->next);
        }
        if(c) {
                focus(c);
        }
        if(c) {
                focus(c);
@@ -110,7 +127,7 @@ incmasterw(const char *arg) {
                masterw = MASTERWIDTH;
        else {
                i = atoi(arg);
                masterw = MASTERWIDTH;
        else {
                i = atoi(arg);
-               if(waw * (masterw + i) / 1000 >= waw - 2 * BORDERPX
+               if(waw * (masterw + i) / 1000 >= waw - 2 * BORDERPX 
                || waw * (masterw + i) / 1000 <= 2 * BORDERPX)
                        return;
                masterw += i;
                || waw * (masterw + i) / 1000 <= 2 * BORDERPX)
                        return;
                masterw += i;
@@ -120,11 +137,17 @@ incmasterw(const char *arg) {
 
 void
 incnmaster(const char *arg) {
 
 void
 incnmaster(const char *arg) {
-       int i = arg ? atoi(arg) : 0;
-       if((lt->arrange != tile) || (nmaster + i < 1)
-       || (wah / (nmaster + i) <= 2 * BORDERPX))
-               return;
-       nmaster += i;
+       int i;
+
+       if(!arg)
+               nmaster = NMASTER;
+       else {
+               i = atoi(arg);
+               if((lt->arrange != tile) || (nmaster + i < 1)
+               || (wah / (nmaster + i) <= 2 * BORDERPX))
+                       return;
+               nmaster += i;
+       }
        if(sel)
                lt->arrange();
        else
        if(sel)
                lt->arrange();
        else
@@ -146,7 +169,7 @@ initlayouts(void) {
 
 Client *
 nexttiled(Client *c) {
 
 Client *
 nexttiled(Client *c) {
-       for(; c && (c->isversatile || !isvisible(c)); c = c->next);
+       for(; c && (c->isfloating || !isvisible(c)); c = c->next);
        return c;
 }
 
        return c;
 }
 
@@ -158,10 +181,10 @@ restack(void) {
        drawstatus();
        if(!sel)
                return;
        drawstatus();
        if(!sel)
                return;
-       if(sel->isversatile || lt->arrange == versatile)
+       if(sel->isfloating || lt->arrange == floating)
                XRaiseWindow(dpy, sel->win);
                XRaiseWindow(dpy, sel->win);
-       if(lt->arrange != versatile) {
-               if(!sel->isversatile)
+       if(lt->arrange != floating) {
+               if(!sel->isfloating)
                        XLowerWindow(dpy, sel->win);
                for(c = nexttiled(clients); c; c = nexttiled(c->next)) {
                        if(c == sel)
                        XLowerWindow(dpy, sel->win);
                for(c = nexttiled(clients); c; c = nexttiled(c->next)) {
                        if(c == sel)
@@ -175,14 +198,12 @@ restack(void) {
 
 void
 setlayout(const char *arg) {
 
 void
 setlayout(const char *arg) {
-       unsigned int i;
+       int i;
 
        if(!arg) {
 
        if(!arg) {
-               for(i = 0; i < nlayouts && lt != &layout[i]; i++);
-               if(i == nlayouts - 1)
-                       lt = &layout[0];
-               else
-                       lt = &layout[++i];
+               lt++;
+               if(lt == layout + nlayouts)
+                       lt = layout;
        }
        else {
                i = atoi(arg);
        }
        else {
                i = atoi(arg);
@@ -196,11 +217,21 @@ setlayout(const char *arg) {
                drawstatus();
 }
 
                drawstatus();
 }
 
+void
+togglebar(const char *arg) {
+       if(bpos == BarOff)
+               bpos = (BARPOS == BarOff) ? BarTop : BARPOS;
+       else
+               bpos = BarOff;
+       updatebarpos();
+       lt->arrange();
+}
+
 void
 togglemax(const char *arg) {
        XEvent ev;
 
 void
 togglemax(const char *arg) {
        XEvent ev;
 
-       if(!sel || (lt->arrange != versatile && !sel->isversatile) || sel->isfixed)
+       if(!sel || (lt->arrange != floating && !sel->isfloating) || sel->isfixed)
                return;
        if((sel->ismax = !sel->ismax)) {
                sel->rx = sel->x;
                return;
        if((sel->ismax = !sel->ismax)) {
                sel->rx = sel->x;
@@ -215,38 +246,12 @@ togglemax(const char *arg) {
        while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
 }
 
        while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
 }
 
-void
-versatile(void) {
-       Client *c;
-
-       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)) {
-               for(c = stack; c && !isvisible(c); c = c->snext);
-               focus(c);
-       }
-       restack();
-}
-
 void
 zoom(const char *arg) {
 void
 zoom(const char *arg) {
-       unsigned int n;
        Client *c;
 
        Client *c;
 
-       if(!sel || lt->arrange != tile || sel->isversatile)
+       if(!sel || lt->arrange == floating || sel->isfloating)
                return;
                return;
-       for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next))
-               n++;
        if((c = sel) == nexttiled(clients))
                if(!(c = nexttiled(c->next)))
                        return;
        if((c = sel) == nexttiled(clients))
                if(!(c = nexttiled(c->next)))
                        return;