implemented nmaster appearance in mode label (using %u)

[dwm.git] / draw.c

diff --git a/draw.c b/draw.c
index 3bf687e..fe73867 100644 (file)
--- a/draw.c
+++ b/draw.c
@@ -1,4 +1,4 @@
-/* (C)opyright MMIV-MMVI Anselm R. Garbe <garbeam at gmail dot com>
+/* (C)opyright MMIV-MMVII Anselm R. Garbe <garbeam at gmail dot com>
  * 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);
@@ -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;
        }