simplified buttonpress

[dwm.git] / draw.c

diff --git a/draw.c b/draw.c
index 812f398..b8b6c1d 100644 (file)
--- a/draw.c
+++ b/draw.c
@@ -22,22 +22,22 @@ textnw(const char *text, unsigned int len)
 }
 
 static void
 }
 
 static void

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

 {
        int x, y, w, h;
        static char buf[256];
 {
        int x, y, w, h;
        static char buf[256];

-       unsigned int len;
+       unsigned int len, olen;

        XGCValues gcv;
        XRectangle r = { dc.x, dc.y, dc.w, dc.h };
 
        XGCValues gcv;
        XRectangle r = { dc.x, dc.y, dc.w, dc.h };
 

-       XSetForeground(dpy, dc.gc, invert ? dc.fg : dc.bg);
+       XSetForeground(dpy, dc.gc, col[ColBG]);

        XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
 
        if(!text)
                return;
 
        w = 0;
        XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
 
        if(!text)
                return;
 
        w = 0;

-       len = strlen(text);
+       olen = len = strlen(text);

        if(len >= sizeof(buf))
                len = sizeof(buf) - 1;
        memcpy(buf, text, len);
        if(len >= sizeof(buf))
                len = sizeof(buf) - 1;
        memcpy(buf, text, len);


@@ -50,21 +50,32 @@ drawtext(const char *text, Bool invert)
        /* shorten text if necessary */
        while(len && (w = textnw(buf, len)) > dc.w - h)
                buf[--len] = 0;
        /* shorten text if necessary */
        while(len && (w = textnw(buf, len)) > dc.w - h)
                buf[--len] = 0;

+       if(len < olen) {
+               if(len > 1)
+                       buf[len - 1] = '.';
+               if(len > 2)
+                       buf[len - 2] = '.';
+               if(len > 3)
+                       buf[len - 3] = '.';
+       }

 
        if(w > dc.w)
                return; /* too long */
 
        if(w > dc.w)
                return; /* too long */

-
-       gcv.foreground = invert ? dc.bg : dc.fg;
-       gcv.background = invert ? dc.fg : dc.bg;
+       gcv.foreground = col[ColFG];

        if(dc.font.set) {
        if(dc.font.set) {

-               XChangeGC(dpy, dc.gc, GCForeground | GCBackground, &gcv);
-               XmbDrawImageString(dpy, dc.drawable, dc.font.set, dc.gc,
-                               x, y, buf, len);
+               XChangeGC(dpy, dc.gc, GCForeground, &gcv);
+               XmbDrawString(dpy, dc.drawable, dc.font.set, dc.gc, x, y, buf, len);

        }
        else {
                gcv.font = dc.font.xfont->fid;
        }
        else {
                gcv.font = dc.font.xfont->fid;

-               XChangeGC(dpy, dc.gc, GCForeground | GCBackground | GCFont, &gcv);
-               XDrawImageString(dpy, dc.drawable, dc.gc, x, y, buf, len);
+               XChangeGC(dpy, dc.gc, GCForeground | GCFont, &gcv);
+               XDrawString(dpy, dc.drawable, dc.gc, x, y, buf, len);
+       }
+       if(highlight) {
+               r.x = dc.x + 2;
+               r.y = dc.y + 2;
+               r.width = r.height = 3;
+               XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);

        }
 }
 
        }
 }
 


@@ -84,28 +95,36 @@ void
 drawstatus()
 {
        int i, x;
 drawstatus()
 {
        int i, x;

-       Bool istile = arrange == dotile;

 
        dc.x = dc.y = 0;
 
        dc.x = dc.y = 0;

-       dc.w = bw;
-       drawtext(NULL, !istile);

 
 

-       dc.w = 0;

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

-               dc.x += dc.w;

                dc.w = textw(tags[i]);
                dc.w = textw(tags[i]);

-               if(istile)
-                       drawtext(tags[i], (i == tsel));
+               if(seltag[i])
+                       drawtext(tags[i], dc.sel, sel && sel->tags[i]);

                else
                else

-                       drawtext(tags[i], (i != tsel));
+                       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;

-       drawtext(stext, !istile);
-       if(sel && ((dc.w = dc.x - x) >= bh)) {
+       if(dc.x < x) {

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

-               drawtext(sel->name, istile);
+               dc.w = bw - x;
+       }
+       drawtext(stext, dc.status, False);
+
+       if((dc.w = dc.x - x) > bh) {
+               dc.x = x;
+               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);


@@ -114,33 +133,19 @@ drawstatus()
 void
 drawtitle(Client *c)
 {
 void
 drawtitle(Client *c)
 {

-       int i;
-       Bool istile = arrange == dotile;
-
-       if(c == sel) {
+       if(c == sel && issel) {

                drawstatus();
                drawstatus();

-               XUnmapWindow(dpy, c->title);
-               XSetWindowBorder(dpy, c->win, dc.fg);
+               XUnmapWindow(dpy, c->twin);
+               XSetWindowBorder(dpy, c->win, dc.sel[ColBG]);

                return;
        }
 
                return;
        }
 

-       XSetWindowBorder(dpy, c->win, dc.bg);
-       XMapWindow(dpy, c->title);
-
+       XSetWindowBorder(dpy, c->win, dc.norm[ColBG]);
+       XMapWindow(dpy, c->twin);

        dc.x = dc.y = 0;
        dc.x = dc.y = 0;

-
-       dc.w = 0;
-       for(i = 0; i < ntags; i++) {
-               if(c->tags[i]) {
-                       dc.x += dc.w;
-                       dc.w = textw(tags[i]);
-                       drawtext(tags[i], !istile);
-               }
-       }
-       dc.x += dc.w;
-       dc.w = textw(c->name);
-       drawtext(c->name, !istile);
-       XCopyArea(dpy, dc.drawable, c->title, dc.gc, 0, 0, c->tw, c->th, 0, 0);
+       dc.w = c->tw;
+       drawtext(c->name, dc.norm, False);
+       XCopyArea(dpy, dc.drawable, c->twin, dc.gc, 0, 0, c->tw, c->th, 0, 0);

        XSync(dpy, False);
 }
 
        XSync(dpy, False);
 }