X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=draw.c;h=614d6d18c46d7622396331c0e172eea5b11f93ae;hb=2e0c767d74da024c3cd4dbd524e1364039704451;hp=5bb6fc2ae294a25be0f8b4716cd4892d6b86154a;hpb=29355bd38284ed9aec8d3ffabde61db73947c9f9;p=dwm.git diff --git a/draw.c b/draw.c index 5bb6fc2..614d6d1 100644 --- a/draw.c +++ b/draw.c @@ -2,85 +2,36 @@ * (C)opyright MMIV-MMVI Anselm R. Garbe * See LICENSE file for license details. */ - +#include "dwm.h" #include #include - #include -#include "dwm.h" - -void -draw_bar() -{ - int i; - - dc.x = dc.y = 0; - dc.w = bw; - drawtext(NULL, False, False); - - if(arrange == floating) { - dc.w = textw("~"); - drawtext("~", False, False); - } - else - dc.w = 0; - for(i = 0; i < TLast; i++) { - dc.x += dc.w; - dc.w = textw(tags[i]); - drawtext(tags[i], i == tsel, True); - } - if(sel) { - dc.x += dc.w; - dc.w = textw(sel->name); - drawtext(sel->name, True, True); - } - dc.w = textw(stext); - dc.x = bx + bw - dc.w; - drawtext(stext, False, False); - - XCopyArea(dpy, dc.drawable, barwin, dc.gc, 0, 0, bw, bh, 0, 0); - XFlush(dpy); -} +/* static */ -void -draw_client(Client *c) +static unsigned int +textnw(const char *text, unsigned int len) { - int i; - if(c == sel) { - draw_bar(); - XUnmapWindow(dpy, c->title); - XSetWindowBorder(dpy, c->win, dc.fg); - return; - } - - XSetWindowBorder(dpy, c->win, dc.bg); - XMapWindow(dpy, c->title); - - dc.x = dc.y = 0; + XRectangle r; - 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], False, True); - } + if(dc.font.set) { + XmbTextExtents(dc.font.set, text, len, NULL, &r); + return r.width; } - dc.x += dc.w; - dc.w = textw(c->name); - drawtext(c->name, False, True); - XCopyArea(dpy, dc.drawable, c->title, dc.gc, - 0, 0, c->tw, c->th, 0, 0); - XFlush(dpy); + return XTextWidth(dc.font.xfont, text, len); } static void -drawborder(void) +drawtext(const char *text, unsigned int colidx, Bool highlight) { + int x, y, w, h; + static char buf[256]; + unsigned int len, olen; 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, dc.bg[colidx]); + XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1); points[0].x = dc.x; points[0].y = dc.y; points[1].x = dc.w - 1; @@ -91,29 +42,14 @@ drawborder(void) points[3].y = 0; points[4].x = 0; points[4].y = -(dc.h - 1); + XSetForeground(dpy, dc.gc, dc.fg[colidx]); XDrawLines(dpy, dc.drawable, dc.gc, points, 5, CoordModePrevious); -} - -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); + w = 0; + olen = len = strlen(text); if(len >= sizeof(buf)) len = sizeof(buf) - 1; memcpy(buf, text, len); @@ -126,53 +62,120 @@ drawtext(const char *text, Bool invert, Bool border) /* 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); - XmbDrawImageString(dpy, dc.drawable, dc.font.set, dc.gc, - x, y, buf, len); - } + if(dc.font.set) + 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); - XDrawImageString(dpy, dc.drawable, dc.gc, x, y, buf, len); + XSetFont(dpy, dc.gc, dc.font.xfont->fid); + XDrawString(dpy, dc.drawable, dc.gc, x, y, buf, len); + } + if(highlight) { + points[0].x = dc.x + 1; + points[0].y = dc.y + 1; + points[1].x = dc.w - 3; + points[1].y = 0; + points[2].x = 0; + points[2].y = dc.h - 3; + points[3].x = -(dc.w - 3); + points[3].y = 0; + points[4].x = 0; + points[4].y = -(dc.h - 3); + XDrawLines(dpy, dc.drawable, dc.gc, points, 5, CoordModePrevious); } } -unsigned long -initcolor(const char *colstr) +/* extern */ + +void +drawall() { - XColor color; - Colormap cmap = DefaultColormap(dpy, screen); + Client *c; - XAllocNamedColor(dpy, cmap, colstr, &color, &color); - return color.pixel; + for(c = clients; c; c = getnext(c->next)) + drawtitle(c); + drawstatus(); } -unsigned int -textnw(char *text, unsigned int len) +void +drawstatus() { - XRectangle r; - if(dc.font.set) { - XmbTextExtents(dc.font.set, text, len, NULL, &r); - return r.width; + int i, x; + Bool istile = arrange == dotile; + + dc.x = dc.y = 0; + dc.w = bw; + drawtext(NULL, !istile, False); + + dc.w = 0; + for(i = 0; i < ntags; i++) { + dc.x += dc.w; + dc.w = textw(tags[i]); + if(istile) + drawtext(tags[i], seltag[i], sel && sel->tags[i]); + else + drawtext(tags[i], !seltag[i], sel && sel->tags[i]); } - return XTextWidth(dc.font.xfont, text, len); + 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); + + 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); } -unsigned int -textw(char *text) +void +drawtitle(Client *c) { - return textnw(text, strlen(text)) + dc.font.height; + int i; + Bool istile = arrange == dotile; + + if(c == sel && issel) { + drawstatus(); + XUnmapWindow(dpy, c->twin); + XSetWindowBorder(dpy, c->win, dc.fg[1]); + return; + } + + XSetWindowBorder(dpy, c->win, dc.bg[0]); + XMapWindow(dpy, c->twin); + dc.x = dc.y = 0; + 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) +{ + Colormap cmap = DefaultColormap(dpy, screen); + XColor color; + + XAllocNamedColor(dpy, cmap, colstr, &color, &color); + return color.pixel; } void -initfont(const char *fontstr) +setfont(const char *fontstr) { char **missing, *def; int i, n; @@ -215,9 +218,15 @@ initfont(const char *fontstr) if (!dc.font.xfont) dc.font.xfont = XLoadQueryFont(dpy, "fixed"); if (!dc.font.xfont) - error("error, cannot init 'fixed' font\n"); + eprint("error, cannot init 'fixed' font\n"); dc.font.ascent = dc.font.xfont->ascent; dc.font.descent = dc.font.xfont->descent; } dc.font.height = dc.font.ascent + dc.font.descent; } + +unsigned int +textw(const char *text) +{ + return textnw(text, strlen(text)) + dc.font.height; +}