X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=draw.c;h=4ebda125c62d9036cb71692533d80f2a085c49cf;hb=2e834e941f695481894123e0665416f96333653b;hp=9743ec1d56cd467464defc810d70165e7fb5f2b5;hpb=adaa28a6e600f636f5e86244ccef69e98419ba1a;p=dwm.git diff --git a/draw.c b/draw.c index 9743ec1..4ebda12 100644 --- a/draw.c +++ b/draw.c @@ -3,19 +3,36 @@ * See LICENSE file for license details. */ #include "dwm.h" - #include #include #include -/* static functions */ +/* static */ + +static unsigned int +textnw(const char *text, unsigned int len) +{ + XRectangle r; + + if(dc.font.set) { + XmbTextExtents(dc.font.set, text, len, NULL, &r); + return r.width; + } + return XTextWidth(dc.font.xfont, text, len); +} static void -drawborder(void) +drawtext(const char *text, Bool invert, Bool underline) { + int x, y, w, h; + static char buf[256]; + unsigned int len, olen; + XGCValues gcv; XPoint points[5]; - XSetLineAttributes(dpy, dc.gc, 1, LineSolid, CapButt, JoinMiter); - XSetForeground(dpy, dc.gc, dc.border); + XRectangle r = { dc.x, dc.y, dc.w, dc.h }; + + XSetForeground(dpy, dc.gc, invert ? dc.fg : dc.bg); + XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1); points[0].x = dc.x; points[0].y = dc.y; points[1].x = dc.w - 1; @@ -26,10 +43,58 @@ drawborder(void) points[3].y = 0; points[4].x = 0; points[4].y = -(dc.h - 1); + XSetForeground(dpy, dc.gc, dc.border); XDrawLines(dpy, dc.drawable, dc.gc, points, 5, CoordModePrevious); + + if(!text) + return; + + w = 0; + olen = len = strlen(text); + if(len >= sizeof(buf)) + len = sizeof(buf) - 1; + memcpy(buf, text, len); + buf[len] = 0; + + h = dc.font.ascent + dc.font.descent; + y = dc.y + (dc.h / 2) - (h / 2) + dc.font.ascent; + x = dc.x + (h / 2); + + /* 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 */ + gcv.foreground = invert ? dc.bg : dc.fg; + gcv.background = invert ? dc.fg : dc.bg; + if(dc.font.set) { + XChangeGC(dpy, dc.gc, GCForeground | GCBackground, &gcv); + XmbDrawString(dpy, dc.drawable, dc.font.set, dc.gc, x, y, buf, len); + } + else { + gcv.font = dc.font.xfont->fid; + XChangeGC(dpy, dc.gc, GCForeground | GCBackground | GCFont, &gcv); + XDrawString(dpy, dc.drawable, dc.gc, x, y, buf, len); + } + if(underline) { + points[0].x = dc.x + (h / 2) - 1; + points[0].y = dc.y + dc.h - 3; + points[1].x = dc.w - h + 2; + points[1].y = 0; + XDrawLines(dpy, dc.drawable, dc.gc, points, 2, CoordModePrevious); + } } -/* extern functions */ +/* extern */ void drawall() @@ -44,7 +109,7 @@ drawall() void drawstatus() { - int i; + int i, x; Bool istile = arrange == dotile; dc.x = dc.y = 0; @@ -52,75 +117,29 @@ drawstatus() drawtext(NULL, !istile, False); dc.w = 0; - for(i = 0; i < TLast; i++) { + for(i = 0; i < ntags; i++) { dc.x += dc.w; dc.w = textw(tags[i]); if(istile) - drawtext(tags[i], (i == tsel), True); + drawtext(tags[i], seltag[i], sel && sel->tags[i]); else - drawtext(tags[i], (i != tsel), True); - } - if(sel) { - dc.x += dc.w; - dc.w = textw(sel->name); - drawtext(sel->name, istile, True); + drawtext(tags[i], !seltag[i], sel && sel->tags[i]); } + x = dc.x + dc.w; dc.w = textw(stext); dc.x = bx + bw - dc.w; + if(dc.x < x) { + dc.x = x; + dc.w = bw - x; + } drawtext(stext, !istile, False); - XCopyArea(dpy, dc.drawable, barwin, dc.gc, 0, 0, bw, bh, 0, 0); - XFlush(dpy); -} - -void -drawtext(const char *text, Bool invert, Bool border) -{ - int x, y, w, h; - unsigned int len; - static char buf[256]; - XGCValues gcv; - XRectangle r = { dc.x, dc.y, dc.w, dc.h }; - - XSetForeground(dpy, dc.gc, invert ? dc.fg : dc.bg); - XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1); - - w = 0; - if(border) - drawborder(); - - if(!text) - return; - - len = strlen(text); - if(len >= sizeof(buf)) - len = sizeof(buf) - 1; - memcpy(buf, text, len); - buf[len] = 0; - - h = dc.font.ascent + dc.font.descent; - y = dc.y + (dc.h / 2) - (h / 2) + dc.font.ascent; - x = dc.x + (h / 2); - - /* shorten text if necessary */ - while(len && (w = textnw(buf, len)) > dc.w - h) - buf[--len] = 0; - - if(w > dc.w) - return; /* too long */ - - gcv.foreground = invert ? dc.bg : dc.fg; - gcv.background = invert ? dc.fg : dc.bg; - if(dc.font.set) { - XChangeGC(dpy, dc.gc, GCForeground | GCBackground, &gcv); - XmbDrawImageString(dpy, dc.drawable, dc.font.set, dc.gc, - x, y, buf, len); - } - 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); + if(sel && ((dc.w = dc.x - x) > bh)) { + dc.x = x; + drawtext(sel->name, istile, False); } + XCopyArea(dpy, dc.drawable, barwin, dc.gc, 0, 0, bw, bh, 0, 0); + XSync(dpy, False); } void @@ -129,39 +148,27 @@ drawtitle(Client *c) int i; Bool istile = arrange == dotile; - if(c == sel) { + if(c == sel && issel) { drawstatus(); - XUnmapWindow(dpy, c->title); + XUnmapWindow(dpy, c->twin); XSetWindowBorder(dpy, c->win, dc.fg); return; } XSetWindowBorder(dpy, c->win, dc.bg); - XMapWindow(dpy, c->title); - + XMapWindow(dpy, c->twin); dc.x = dc.y = 0; - - dc.w = 0; - for(i = 0; i < TLast; i++) { - if(c->tags[i]) { - dc.x += dc.w; - dc.w = textw(c->tags[i]); - drawtext(c->tags[i], !istile, True); - } - } - dc.x += dc.w; - dc.w = textw(c->name); - drawtext(c->name, !istile, True); - XCopyArea(dpy, dc.drawable, c->title, dc.gc, - 0, 0, c->tw, c->th, 0, 0); - XFlush(dpy); + dc.w = c->tw; + drawtext(c->name, !istile, False); + XCopyArea(dpy, dc.drawable, c->twin, dc.gc, 0, 0, c->tw, c->th, 0, 0); + XSync(dpy, False); } unsigned long getcolor(const char *colstr) { - XColor color; Colormap cmap = DefaultColormap(dpy, screen); + XColor color; XAllocNamedColor(dpy, cmap, colstr, &color, &color); return color.pixel; @@ -219,18 +226,7 @@ setfont(const char *fontstr) } unsigned int -textnw(char *text, unsigned int len) -{ - XRectangle r; - if(dc.font.set) { - XmbTextExtents(dc.font.set, text, len, NULL, &r); - return r.width; - } - return XTextWidth(dc.font.xfont, text, len); -} - -unsigned int -textw(char *text) +textw(const char *text) { return textnw(text, strlen(text)) + dc.font.height; }