X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=draw.c;h=ba99ee0a75c3186bc95b2bf00fd6ad8a2166498c;hb=ae0b4fdd92bc787f14ee21f1dd5c2ced06c6a36f;hp=3bf687e159cab0f8bbd3358500eedfb81f581872;hpb=a308b7507abb77940f3b4ba34655c5a7c234bee3;p=dwm.git diff --git a/draw.c b/draw.c index 3bf687e..ba99ee0 100644 --- a/draw.c +++ b/draw.c @@ -1,4 +1,4 @@ -/* (C)opyright MMIV-MMVI Anselm R. Garbe +/* (C)opyright MMIV-MMVII Anselm R. Garbe * See LICENSE file for license details. */ #include "dwm.h" @@ -102,7 +102,7 @@ drawall(void) { Client *c; for(c = clients; c; c = getnext(c->next)) - drawtitle(c); + drawclient(c); drawstatus(); } @@ -120,7 +120,7 @@ drawstatus(void) { dc.x += dc.w; } dc.w = bmw; - drawtext(arrange == dofloat ? FLOATSYMBOL : TILESYMBOL, dc.status, False, False); + drawtext(mtext, dc.status, False, False); x = dc.x + dc.w; dc.w = textw(stext); dc.x = bw - dc.w; @@ -138,7 +138,7 @@ drawstatus(void) { } void -drawtitle(Client *c) { +drawclient(Client *c) { if(c == sel && issel) { drawstatus(); XUnmapWindow(dpy, c->twin); @@ -149,7 +149,7 @@ drawtitle(Client *c) { XMapWindow(dpy, c->twin); dc.x = dc.y = 0; dc.w = c->tw; - drawtext(c->name, dc.norm, False,False); + drawtext(c->name, dc.norm, False, False); XCopyArea(dpy, dc.drawable, c->twin, dc.gc, 0, 0, c->tw, c->th, 0, 0); XSync(dpy, False); } @@ -198,7 +198,7 @@ setfont(const char *fontstr) { XFreeFont(dpy, dc.font.xfont); dc.font.xfont = NULL; if(!(dc.font.xfont = XLoadQueryFont(dpy, fontstr))) - eprint("error, cannot init 'fixed' font\n"); + eprint("error, cannot load font: '%s'\n", fontstr); dc.font.ascent = dc.font.xfont->ascent; dc.font.descent = dc.font.xfont->descent; }