simplified buttonpress

[dwm.git] / draw.c

diff --git a/draw.c b/draw.c
index ff6f779..b8b6c1d 100644 (file)
--- a/draw.c
+++ b/draw.c
@@ -94,26 +94,22 @@ drawall()
 void
 drawstatus()
 {
 void
 drawstatus()
 {

-       static const char *mode[] = { "~", "=" };

        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 == dotile ? TILESYMBOL : FLOATSYMBOL, 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,9 +119,12 @@ 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);
        }
        XCopyArea(dpy, dc.drawable, barwin, dc.gc, 0, 0, bw, bh, 0, 0);
        XSync(dpy, False);


@@ -134,8 +133,6 @@ drawstatus()
 void
 drawtitle(Client *c)
 {
 void
 drawtitle(Client *c)
 {

-       int i;
-

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