X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=dwm.c;h=dc14bfd7e2a460d71601da48ecfdc1ce818016d3;hb=2ce50a9cada450b0538bb12f0424005652fc1355;hp=265ffb9a371ed61ad5f15b419b29152672d46f71;hpb=6d7285fd6e40508c35eadfdcc2b8940953cac06d;p=dwm.git diff --git a/dwm.c b/dwm.c index 265ffb9..dc14bfd 100644 --- 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) { - int i, x, y, h, len, olen; 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]); @@ -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 */ - 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); @@ -865,7 +865,7 @@ killclient(const Arg *arg) { void manage(Window w, XWindowAttributes *wa) { Client *c, *t = NULL; - Window trans = 0; + Window trans = None; XWindowChanges wc; if(!(c = calloc(1, sizeof(Client)))) @@ -909,7 +909,7 @@ manage(Window w, XWindowAttributes *wa) { 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);