code polishing, removed unnecessary newlines

[dwm.git] / view.c

diff --git a/view.c b/view.c
index 0f9cb68..24b0349 100644 (file)
--- a/view.c
+++ b/view.c
@@ -1,5 +1,4 @@
-/*
- * (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
+/* (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
  * See LICENSE file for license details.
  */
 #include "dwm.h"
@@ -43,9 +42,9 @@ reorder(void) {
 }
 
 static void
-togglemax(Client *c)
-{
+togglemax(Client *c) {
        XEvent ev;
+
        if((c->ismax = !c->ismax)) {
                c->rx = c->x; c->x = sx;
                c->ry = c->y; c->y = bh;
@@ -95,28 +94,21 @@ dofloat(Arg *arg) {
        restack();
 }
 
-/* This algorithm is based on a (M)aster area and a (S)tacking area.
- * It supports following arrangements:
- *     SSMMM   MMMMM   MMMSS
- *     SSMMM   SSSSS   MMMSS
- */
 void
 dotile(Arg *arg) {
-       unsigned int i, n, md, stackw, stackh, th;
+       unsigned int i, n, mpx, stackw, stackh, th;
        Client *c;
 
        for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next))
                n++;
-
-       md = (sw * master) / 1000;
-       stackw = sw - md;
+       mpx = (sw * master) / 1000;
+       stackw = sw - mpx;
        stackh = sh - bh;
-
        th = stackh;
        if(n > 1)
                th /= (n - 1);
 
-       for(i = 0, c = clients; c; c = c->next) {
+       for(i = 0, c = clients; c; c = c->next, i++)
                if(isvisible(c)) {
                        if(c->isfloat) {
                                resize(c, True, TopLeft);
@@ -130,29 +122,27 @@ dotile(Arg *arg) {
                                c->h = sh - 2 * BORDERPX - bh;
                        }
                        else if(i == 0) { /* master window */
-                               c->w = md - 2 * BORDERPX;
+                               c->w = mpx - 2 * BORDERPX;
                                c->h = sh - bh - 2 * BORDERPX;
                        }
                        else {  /* tile window */
-                               c->x += md;
+                               c->x += mpx;
+                               c->w = stackw - 2 * BORDERPX;
                                if(th > bh) {
                                        c->y = sy + (i - 1) * th + bh;
                                        if(i + 1 == n)
                                                c->h = sh - c->y - 2 * BORDERPX;
-                                       c->w = stackw - 2 * BORDERPX;
-                                       c->h = th - 2 * BORDERPX;
+                                       else
+                                               c->h = th - 2 * BORDERPX;
                                }
-                               else { /* fallback if th < bh */
-                                       c->w = stackw - 2 * BORDERPX;
+                               else /* fallback if th < bh */
                                        c->h = stackh - 2 * BORDERPX;
-                               }
                        }
                        resize(c, False, TopLeft);
-                       i++;
                }
                else
                        ban(c);
-       }
+
        if(!sel || !isvisible(sel)) {
                for(c = stack; c && !isvisible(c); c = c->snext);
                focus(c);
@@ -166,7 +156,6 @@ focusnext(Arg *arg) {
    
        if(!sel)
                return;
-
        if(!(c = getnext(sel->next)))
                c = getnext(clients);
        if(c) {
@@ -181,7 +170,6 @@ focusprev(Arg *arg) {
 
        if(!sel)
                return;
-
        if(!(c = getprev(sel->prev))) {
                for(c = clients; c && c->next; c = c->next);
                c = getprev(c);
@@ -212,7 +200,6 @@ resizecol(Arg *arg) {
                        n++;
        if(!sel || sel->isfloat || n < 2 || (arrange == dofloat))
                return;
-
        if(sel == getnext(clients)) {
                if(master + arg->i > 950 || master + arg->i < 50)
                        return;
@@ -298,8 +285,6 @@ viewall(Arg *arg) {
        arrange(NULL);
 }
 
-
-
 void
 zoom(Arg *arg) {
        unsigned int n;
@@ -307,18 +292,15 @@ zoom(Arg *arg) {
 
        if(!sel)
                return;
-
        if(sel->isfloat || (arrange == dofloat)) {
                togglemax(sel);
                return;
        }
-
        for(n = 0, c = clients; c; c = c->next)
                if(isvisible(c) && !c->isfloat)
                        n++;
        if(n < 2 || (arrange == dofloat))
                return;
-
        if((c = sel) == nexttiled(clients))
                if(!(c = nexttiled(c->next)))
                        return;