some NULL fixes

[dwm.git] / dwm.c

diff --git a/dwm.c b/dwm.c
index 77a91ac..613b6f1 100644 (file)
--- a/dwm.c
+++ b/dwm.c
@@ -128,7 +128,6 @@ typedef struct {
 } Rule;
 
 /* function declarations */
-static void adjustborder(Client *c, unsigned int bw);
 static void applyrules(Client *c);
 static void arrange(void);
 static void attach(Client *c);
@@ -179,7 +178,7 @@ static void setclientstate(Client *c, long state);
 static void setlayout(const Arg *arg);
 static void setmfact(const Arg *arg);
 static void setup(void);
-static void showhide(Client *c);
+static void showhide(Client *c, unsigned int ntiled);
 static void sigchld(int signal);
 static void spawn(const Arg *arg);
 static void tag(const Arg *arg);
@@ -246,16 +245,6 @@ struct NumTags { char limitexceeded[sizeof(unsigned int) * 8 < LENGTH(tags) ? -1
 
 /* function implementations */
 void
-adjustborder(Client *c, unsigned int bw) {
-       XWindowChanges wc;
-
-       if(c->bw != bw) {
-               c->bw = wc.border_width = bw;
-               XConfigureWindow(dpy, c->win, CWBorderWidth, &wc);
-       }
-}
-
-void
 applyrules(Client *c) {
        unsigned int i;
        Rule *r;
@@ -283,7 +272,11 @@ applyrules(Client *c) {
 
 void
 arrange(void) {
-       showhide(stack);
+       unsigned int nt;
+       Client *c;
+
+       for(nt = 0, c = nexttiled(clients); c; c = nexttiled(c->next), nt++);
+       showhide(stack, nt);
        focus(NULL);
        if(lt[sellt]->arrange)
                lt[sellt]->arrange();
@@ -935,12 +928,9 @@ maprequest(XEvent *e) {
 
 void
 monocle(void) {
-       unsigned int n;
        Client *c;
 
-       for(n = 0, c = nexttiled(clients); c && n < 2; c = nexttiled(c->next), n++);
        for(c = nexttiled(clients); c; c = nexttiled(c->next)) {
-               adjustborder(c, n == 1 ? 0 : borderpx);
                resize(c, wx, wy, ww - 2 * c->bw, wh - 2 * c->bw, resizehints);
        }
 }
@@ -1011,7 +1001,7 @@ propertynotify(XEvent *e) {
        Window trans;
        XPropertyEvent *ev = &e->xproperty;
 
-       if((ev->window == root) && (ev->atom = XA_WM_NAME))
+       if((ev->window == root) && (ev->atom == XA_WM_NAME))
                updatestatus();
        else if(ev->state == PropertyDelete)
                return; /* ignore */
@@ -1147,8 +1137,8 @@ resizemouse(const Arg *arg) {
                        handler[ev.type](&ev);
                        break;
                case MotionNotify:
-                       nw = MAX(ev.xmotion.x - ocx - 2*c->bw + 1, 1);
-                       nh = MAX(ev.xmotion.y - ocy - 2*c->bw + 1, 1);
+                       nw = MAX(ev.xmotion.x - ocx - 2 * c->bw + 1, 1);
+                       nh = MAX(ev.xmotion.y - ocy - 2 * c->bw + 1, 1);
 
                        if(snap && nw >= wx && nw <= wx + ww
                                && nh >= wy && nh <= wy + wh) {
@@ -1304,7 +1294,7 @@ setup(void) {
        dc.sel[ColBG] = getcolor(selbgcolor);
        dc.sel[ColFG] = getcolor(selfgcolor);
        dc.drawable = XCreatePixmap(dpy, root, DisplayWidth(dpy, screen), bh, DefaultDepth(dpy, screen));
-       dc.gc = XCreateGC(dpy, root, 0, 0);
+       dc.gc = XCreateGC(dpy, root, 0, NULL);
        XSetLineAttributes(dpy, dc.gc, 1, LineSolid, CapButt, JoinMiter);
        if(!dc.font.set)
                XSetFont(dpy, dc.gc, dc.font.xfont->fid);
@@ -1315,7 +1305,7 @@ setup(void) {
                blw = MAX(blw, w);
        }
 
-       wa.override_redirect = 1;
+       wa.override_redirect = True;
        wa.background_pixmap = ParentRelative;
        wa.event_mask = ButtonPressMask|ExposureMask;
 
@@ -1341,18 +1331,17 @@ setup(void) {
 }
 
 void
-showhide(Client *c) {
+showhide(Client *c, unsigned int ntiled) {
        if(!c)
                return;
        if(ISVISIBLE(c)) { /* show clients top down */
-               adjustborder(c, borderpx);
                XMoveWindow(dpy, c->win, c->x, c->y);
                if(!lt[sellt]->arrange || c->isfloating)
                        resize(c, c->x, c->y, c->w, c->h, True);
-               showhide(c->snext);
+               showhide(c->snext, ntiled);
        }
        else { /* hide clients bottom up */
-               showhide(c->snext);
+               showhide(c->snext, ntiled);
                XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
        }
 }
@@ -1409,7 +1398,6 @@ tile(void) {
        /* master */
        c = nexttiled(clients);
        mw = mfact * ww;
-       adjustborder(c, n == 1 ? 0 : borderpx);
        resize(c, wx, wy, (n == 1 ? ww : mw) - 2 * c->bw, wh - 2 * c->bw, resizehints);
 
        if(--n == 0)
@@ -1424,7 +1412,6 @@ tile(void) {
                h = wh;
 
        for(i = 0, c = nexttiled(c->next); c; c = nexttiled(c->next), i++) {
-               adjustborder(c, borderpx);
                resize(c, x, y, w - 2 * c->bw, /* remainder */ ((i + 1 == n)
                       ? wy + wh - y - 2 * c->bw : h - 2 * c->bw), resizehints);
                if(h != wh)
@@ -1458,7 +1445,7 @@ toggletag(const Arg *arg) {
                return;
        
        mask = sel->tags ^ (arg->ui & TAGMASK);
-       if(sel && mask) {
+       if(mask) {
                sel->tags = mask;
                arrange();
        }
@@ -1703,14 +1690,14 @@ zoom(const Arg *arg) {
 int
 main(int argc, char *argv[]) {
        if(argc == 2 && !strcmp("-v", argv[1]))
-               die("dwm-"VERSION", © 2006-2008 dwm engineers, see LICENSE for details\n");
+               die("dwm-"VERSION", © 2006-2009 dwm engineers, see LICENSE for details\n");
        else if(argc != 1)
                die("usage: dwm [-v]\n");
 
        if(!setlocale(LC_CTYPE, "") || !XSupportsLocale())
-               fprintf(stderr, "warning: no locale support\n");
+               fputs("warning: no locale support\n", stderr);
 
-       if(!(dpy = XOpenDisplay(0)))
+       if(!(dpy = XOpenDisplay(NULL)))
                die("dwm: cannot open display\n");
 
        checkotherwm();