final fix for man page

[dwm.git] / draw.c

diff --git a/draw.c b/draw.c
index ff6f779..bbcfadb 100644 (file)
--- a/draw.c
+++ b/draw.c
@@ -10,8 +10,7 @@
 /* static */
 
 static unsigned int
 /* static */
 
 static unsigned int

-textnw(const char *text, unsigned int len)
-{
+textnw(const char *text, unsigned int len) {

        XRectangle r;
 
        if(dc.font.set) {
        XRectangle r;
 
        if(dc.font.set) {


@@ -22,8 +21,7 @@ textnw(const char *text, unsigned int len)
 }
 
 static void
 }
 
 static void

-drawtext(const char *text, unsigned long col[ColLast], Bool highlight)
-{
+drawtext(const char *text, unsigned long col[ColLast], Bool highlight) {

        int x, y, w, h;
        static char buf[256];
        unsigned int len, olen;
        int x, y, w, h;
        static char buf[256];
        unsigned int len, olen;


@@ -74,7 +72,7 @@ drawtext(const char *text, unsigned long col[ColLast], Bool highlight)
        if(highlight) {
                r.x = dc.x + 2;
                r.y = dc.y + 2;
        if(highlight) {
                r.x = dc.x + 2;
                r.y = dc.y + 2;

-               r.width = r.height = 3;
+               r.width = r.height = (h + 2) / 4;

                XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
        }
 }
                XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
        }
 }


@@ -82,8 +80,7 @@ drawtext(const char *text, unsigned long col[ColLast], Bool highlight)
 /* extern */
 
 void
 /* extern */
 
 void

-drawall()
-{
+drawall(void) {

        Client *c;
 
        for(c = clients; c; c = getnext(c->next))
        Client *c;
 
        for(c = clients; c; c = getnext(c->next))


@@ -92,28 +89,25 @@ drawall()
 }
 
 void
 }
 
 void

-drawstatus()
-{
-       static const char *mode[] = { "~", "=" };
+drawstatus(void) {

        int i, x;
 
        dc.x = dc.y = 0;
        int i, x;
 
        dc.x = dc.y = 0;

-       dc.w = bw;

 
 

-       if(!modew)
-               modew = textw(mode[0]) > textw(mode[1]) ? textw(mode[0]) : textw(mode[1]);
-       drawtext(mode[arrange == dotile ? 1 : 0], dc.status, False);
-
-       dc.w = 0;
-       dc.x = modew;

        for(i = 0; i < ntags; i++) {
        for(i = 0; i < ntags; i++) {

-               dc.x += dc.w;

                dc.w = textw(tags[i]);
                if(seltag[i])
                        drawtext(tags[i], dc.sel, sel && sel->tags[i]);
                else
                        drawtext(tags[i], dc.norm, sel && sel->tags[i]);
                dc.w = textw(tags[i]);
                if(seltag[i])
                        drawtext(tags[i], dc.sel, sel && sel->tags[i]);
                else
                        drawtext(tags[i], dc.norm, sel && sel->tags[i]);

+               dc.x += dc.w;

        }
        }

+
+       dc.w = bmw;
+       drawtext(arrange == dofloat ?
+               FLOATSYMBOL : stackpos == StackBottom ?
+                       BSTACKSYMBOL : VSTACKSYMBOL, dc.status, False);
+

        x = dc.x + dc.w;
        dc.w = textw(stext);
        dc.x = bx + bw - dc.w;
        x = dc.x + dc.w;
        dc.w = textw(stext);
        dc.x = bx + bw - dc.w;


@@ -123,19 +117,19 @@ drawstatus()
        }
        drawtext(stext, dc.status, False);
 
        }
        drawtext(stext, dc.status, False);
 

-       if(sel && ((dc.w = dc.x - x) > bh)) {
+       if((dc.w = dc.x - x) > bh) {

                dc.x = x;
                dc.x = x;

-               drawtext(sel->name, dc.sel, False);
+               if(sel)
+                       drawtext(sel->name, dc.sel, False);
+               else
+                       drawtext(NULL, dc.norm, False);

        }
        XCopyArea(dpy, dc.drawable, barwin, dc.gc, 0, 0, bw, bh, 0, 0);
        XSync(dpy, False);
 }
 
 void
        }
        XCopyArea(dpy, dc.drawable, barwin, dc.gc, 0, 0, bw, bh, 0, 0);
        XSync(dpy, False);
 }
 
 void

-drawtitle(Client *c)
-{
-       int i;
-
+drawtitle(Client *c) {

        if(c == sel && issel) {
                drawstatus();
                XUnmapWindow(dpy, c->twin);
        if(c == sel && issel) {
                drawstatus();
                XUnmapWindow(dpy, c->twin);


@@ -153,18 +147,17 @@ drawtitle(Client *c)
 }
 
 unsigned long
 }
 
 unsigned long

-getcolor(const char *colstr)
-{
+getcolor(const char *colstr) {

        Colormap cmap = DefaultColormap(dpy, screen);
        XColor color;
 
        Colormap cmap = DefaultColormap(dpy, screen);
        XColor color;
 

-       XAllocNamedColor(dpy, cmap, colstr, &color, &color);
+       if(!XAllocNamedColor(dpy, cmap, colstr, &color, &color))
+               eprint("error, cannot allocate color '%s'\n", colstr);

        return color.pixel;
 }
 
 void
        return color.pixel;
 }
 
 void

-setfont(const char *fontstr)
-{
+setfont(const char *fontstr) {

        char **missing, *def;
        int i, n;
 
        char **missing, *def;
        int i, n;
 


@@ -214,7 +207,6 @@ setfont(const char *fontstr)
 }
 
 unsigned int
 }
 
 unsigned int

-textw(const char *text)
-{
+textw(const char *text) {

        return textnw(text, strlen(text)) + dc.font.height;
 }
        return textnw(text, strlen(text)) + dc.font.height;
 }