using None instead of 0 for trans

[dwm.git] / dwm.c

diff --git a/dwm.c b/dwm.c
index 4ad7cea..dc14bfd 100644 (file)
--- a/dwm.c
+++ b/dwm.c
@@ -568,8 +568,8 @@ drawsquare(Bool filled, Bool empty, Bool invert, unsigned long col[ColLast]) {
 
 void
 drawtext(const char *text, unsigned long col[ColLast], Bool invert) {
 
 void
 drawtext(const char *text, unsigned long col[ColLast], Bool invert) {

-       int i, x, y, h, len, olen;

        char buf[256];
        char buf[256];

+       int i, x, y, h, len, olen;

        XRectangle r = { dc.x, dc.y, dc.w, dc.h };
 
        XSetForeground(dpy, dc.gc, col[invert ? ColFG : ColBG]);
        XRectangle r = { dc.x, dc.y, dc.w, dc.h };
 
        XSetForeground(dpy, dc.gc, col[invert ? ColFG : ColBG]);


@@ -581,7 +581,7 @@ drawtext(const char *text, unsigned long col[ColLast], Bool invert) {
        y = dc.y + (dc.h / 2) - (h / 2) + dc.font.ascent;
        x = dc.x + (h / 2);
        /* shorten text if necessary */
        y = dc.y + (dc.h / 2) - (h / 2) + dc.font.ascent;
        x = dc.x + (h / 2);
        /* shorten text if necessary */

-       for(len = MIN(olen, sizeof buf); len && (i = textnw(buf, len)) > dc.w - h; len--);
+       for(len = MIN(olen, sizeof buf); len && textnw(buf, len) > dc.w - h; len--);

        if(!len)
                return;
        memcpy(buf, text, len);
        if(!len)
                return;
        memcpy(buf, text, len);


@@ -865,7 +865,7 @@ killclient(const Arg *arg) {
 void
 manage(Window w, XWindowAttributes *wa) {
        Client *c, *t = NULL;
 void
 manage(Window w, XWindowAttributes *wa) {
        Client *c, *t = NULL;

-       Window trans = 0;
+       Window trans = None;

        XWindowChanges wc;
 
        if(!(c = calloc(1, sizeof(Client))))
        XWindowChanges wc;
 
        if(!(c = calloc(1, sizeof(Client))))


@@ -909,7 +909,7 @@ manage(Window w, XWindowAttributes *wa) {
        else
                applyrules(c);
        if(!c->isfloating)
        else
                applyrules(c);
        if(!c->isfloating)

-               c->isfloating = trans || c->isfixed;
+               c->isfloating = trans != None || c->isfixed;

        if(c->isfloating)
                XRaiseWindow(dpy, c->win);
        attach(c);
        if(c->isfloating)
                XRaiseWindow(dpy, c->win);
        attach(c);


@@ -1246,10 +1246,9 @@ run(void) {
 void
 scan(void) {
        unsigned int i, num;
 void
 scan(void) {
        unsigned int i, num;

-       Window *wins, d1, d2;
+       Window d1, d2, *wins = NULL;

        XWindowAttributes wa;
 
        XWindowAttributes wa;
 

-       wins = NULL;

        if(XQueryTree(dpy, root, &d1, &d2, &wins, &num)) {
                for(i = 0; i < num; i++) {
                        if(!XGetWindowAttributes(dpy, wins[i], &wa)
        if(XQueryTree(dpy, root, &d1, &d2, &wins, &num)) {
                for(i = 0; i < num; i++) {
                        if(!XGetWindowAttributes(dpy, wins[i], &wa)


@@ -1265,9 +1264,9 @@ scan(void) {
                        && (wa.map_state == IsViewable || getstate(wins[i]) == IconicState))
                                manage(wins[i], &wa);
                }
                        && (wa.map_state == IsViewable || getstate(wins[i]) == IconicState))
                                manage(wins[i], &wa);
                }

+               if(wins)
+                       XFree(wins);

        }
        }

-       if(wins)
-               XFree(wins);

 }
 
 void
 }
 
 void