removed bx and bw, unnecessary

[dwm.git] / dwm.c

diff --git a/dwm.c b/dwm.c
index 0e4703e..235365b 100644 (file)
--- a/dwm.c
+++ b/dwm.c
@@ -170,7 +170,6 @@ void spawn(const void *arg);
 void tag(const void *arg);
 uint textnw(const char *text, uint len);
 void tile(void);
-void tileresize(Client *c, int x, int y, int w, int h);
 void togglebar(const void *arg);
 void togglefloating(const void *arg);
 void togglelayout(const void *arg);
@@ -194,7 +193,7 @@ void zoom(const void *arg);
 /* variables */
 char stext[256];
 int screen, sx, sy, sw, sh;
-int bx, by, bw, bh, blw, wx, wy, ww, wh;
+int by, bh, blw, wx, wy, ww, wh;
 uint seltags = 0;
 int (*xerrorxlib)(Display *, XErrorEvent *);
 uint numlockmask = 0;
@@ -213,7 +212,7 @@ void (*handler[LASTEvent]) (XEvent *) = {
        [UnmapNotify] = unmapnotify
 };
 Atom wmatom[WMLast], netatom[NetLast];
-Bool domax = False;
+Bool ismax = False;
 Bool otherwm, readin;
 Bool running = True;
 uint tagset[] = {1, 1}; /* after start, first tag is selected */
@@ -274,7 +273,7 @@ arrange(void) {
                }
 
        focus(NULL);
-       if(lt->arrange && !domax)
+       if(lt->arrange && !ismax)
                lt->arrange();
        restack();
 }
@@ -329,7 +328,7 @@ buttonpress(XEvent *e) {
        }
        else if((c = getclient(ev->window))) {
                focus(c);
-               if(CLEANMASK(ev->state) != MODKEY || domax)
+               if(CLEANMASK(ev->state) != MODKEY || ismax)
                        return;
                if(ev->button == Button1)
                        movemouse(c);
@@ -501,16 +500,16 @@ drawbar(void) {
        }
        if(blw > 0) {
                dc.w = blw;
-               drawtext(lt->symbol, dc.norm, domax);
+               drawtext(lt->symbol, dc.norm, ismax);
                x = dc.x + dc.w;
        }
        else
                x = dc.x;
        dc.w = TEXTW(stext);
-       dc.x = bw - dc.w;
+       dc.x = ww - dc.w;
        if(dc.x < x) {
                dc.x = x;
-               dc.w = bw - x;
+               dc.w = ww - x;
        }
        drawtext(stext, dc.norm, False);
        if((dc.w = dc.x - x) > bh) {
@@ -522,7 +521,7 @@ drawbar(void) {
                else
                        drawtext(NULL, dc.norm, False);
        }
-       XCopyArea(dpy, dc.drawable, barwin, dc.gc, 0, 0, bw, bh, 0, 0);
+       XCopyArea(dpy, dc.drawable, barwin, dc.gc, 0, 0, ww, bh, 0, 0);
        XSync(dpy, False);
 }
 
@@ -630,7 +629,7 @@ focus(Client *c) {
        }
        sel = c;
        if(c) {
-               if(domax) {
+               if(ismax) {
                        XMoveResizeWindow(dpy, c->win, wx, wy, ww - 2 * c->bw, wh - 2 * c->bw);
                        c->ismax = True;
                }
@@ -1123,6 +1122,10 @@ resize(Client *c, int x, int y, int w, int h, Bool sizehints) {
                x = sx;
        if(y + h + 2 * c->bw < sy)
                y = sy;
+       if(h < bh)
+               h = bh;
+       if(w < bh)
+               w = bh;
        if(c->x != x || c->y != y || c->w != w || c->h != h || c->isbanned || c->ismax) {
                c->isbanned = c->ismax = False;
                c->x = wc.x = x;
@@ -1191,9 +1194,9 @@ restack(void) {
        drawbar();
        if(!sel)
                return;
-       if(domax || sel->isfloating || !lt->arrange)
+       if(ismax || sel->isfloating || !lt->arrange)
                XRaiseWindow(dpy, sel->win);
-       if(!domax && lt->arrange) {
+       if(!ismax && lt->arrange) {
                wc.stack_mode = Below;
                wc.sibling = barwin;
                for(c = stack; c; c = c->snext)
@@ -1369,7 +1372,7 @@ setup(void) {
        wa.background_pixmap = ParentRelative;
        wa.event_mask = ButtonPressMask|ExposureMask;
 
-       barwin = XCreateWindow(dpy, root, bx, by, bw, bh, 0, DefaultDepth(dpy, screen),
+       barwin = XCreateWindow(dpy, root, wx, by, ww, bh, 0, DefaultDepth(dpy, screen),
                        CopyFromParent, DefaultVisual(dpy, screen),
                        CWOverrideRedirect|CWBackPixmap|CWEventMask, &wa);
        XDefineCursor(dpy, barwin, cursor[CurNormal]);
@@ -1435,7 +1438,7 @@ textnw(const char *text, uint len) {
 
 void
 tile(void) {
-       int x, y, h, w, mx, my, mw, mh, tx, ty, tw, th;
+       int x, y, h, w, mw;
        uint i, n;
        Client *c;
 
@@ -1443,55 +1446,30 @@ tile(void) {
        if(n == 0)
                return;
 
-       /* 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;
-
        /* master */
        c = nexttiled(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);
+       mw = mfact * ww;
+       resize(c, wx, wy, ((n == 1) ? ww : mw) - 2 * c->bw, wh - 2 * c->bw, resizehints);
 
        if(--n == 0)
                return;
 
        /* 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;
+       x = (wx + mw > c->x + c->w) ? c->x + c->w + 2 * c->bw : ww - mw;
+       y = wy;
+       w = (wx + mw > c->x + c->w) ? wx + ww - x : ww - mw;
+       h = wh / n;
        if(h < bh)
-               h = th;
+               h = wh;
 
        for(i = 0, c = nexttiled(c->next); c; c = nexttiled(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)
+               resize(c, x, y, w - 2 * c->bw, /* remainder */ ((i + 1 == n)
+                      ? (wy + wh) - y : h) - 2 * c->bw, resizehints);
+               if(h != wh)
                        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
 togglebar(const void *arg) {
        showbar = !showbar;
@@ -1534,7 +1512,7 @@ togglelayout(const void *arg) {
 
 void
 togglemax(const void *arg) {
-       domax = !domax;
+       ismax = !ismax;
        arrange();
 }
 
@@ -1589,8 +1567,8 @@ void
 updatebar(void) {
        if(dc.drawable != 0)
                XFreePixmap(dpy, dc.drawable);
-       dc.drawable = XCreatePixmap(dpy, root, bw, bh, DefaultDepth(dpy, screen));
-       XMoveResizeWindow(dpy, barwin, bx, by, bw, bh);
+       dc.drawable = XCreatePixmap(dpy, root, ww, bh, DefaultDepth(dpy, screen));
+       XMoveResizeWindow(dpy, barwin, wx, by, ww, bh);
 }
 
 void
@@ -1617,10 +1595,8 @@ updategeom(void) {
                wh = showbar ? sh - bh : sh;
        }
 
-       /* bar geometry */
-       bx = wx;
+       /* bar position */
        by = showbar ? (topbar ? wy - bh : wy + wh) : -bh;
-       bw = ww;
 }
 
 void