X-Git-Url: https://jasonwoof.com/gitweb/?p=dwm.git;a=blobdiff_plain;f=draw.c;h=ce2435445cca8cd1466b1d135c8bf0828ab0539e;hp=1046322c7bc003acc3673c843afcb105bad25c54;hb=a730213c3b47397c890eea0df7e03e45d5d38b6d;hpb=d7e17087ed2fc5eed57efa03e81460e3e41f7238 diff --git a/draw.c b/draw.c index 1046322..ce24354 100644 --- a/draw.c +++ b/draw.c @@ -1,172 +1,136 @@ -/* - * (C)opyright MMIV-MMVI Anselm R. Garbe - * See LICENSE file for license details. - */ - -#include +/* © 2006-2007 Anselm R. Garbe + * © 2006-2007 Sander van Dijk + * See LICENSE file for license details. */ +#include "dwm.h" #include -#include - -#include "wm.h" +/* static */ static void -drawborder(Brush *b) -{ - XPoint points[5]; - XSetLineAttributes(dpy, b->gc, 1, LineSolid, CapButt, JoinMiter); - XSetForeground(dpy, b->gc, b->border); - points[0].x = b->x; - points[0].y = b->y; - points[1].x = b->w - 1; - points[1].y = 0; - points[2].x = 0; - points[2].y = b->h - 1; - points[3].x = -(b->w - 1); - points[3].y = 0; - points[4].x = 0; - points[4].y = -(b->h - 1); - XDrawLines(dpy, b->drawable, b->gc, points, 5, CoordModePrevious); -} - -void -draw(Brush *b, Bool border, const char *text) -{ - int x, y, w, h; - unsigned int len; - static char buf[256]; +drawsquare(Bool filled, Bool empty, unsigned long col[ColLast]) { + int x; XGCValues gcv; - XRectangle r = { b->x, b->y, b->w, b->h }; - - XSetForeground(dpy, b->gc, b->bg); - XFillRectangles(dpy, b->drawable, b->gc, &r, 1); - - w = 0; - if(border) - drawborder(b); - - if(!text) - return; - - len = strlen(text); - if(len >= sizeof(buf)) - len = sizeof(buf) - 1; - memcpy(buf, text, len); - buf[len] = 0; - - h = b->font.ascent + b->font.descent; - y = b->y + (b->h / 2) - (h / 2) + b->font.ascent; - x = b->x + (h / 2); - - /* shorten text if necessary */ - while(len && (w = textnw(&b->font, buf, len)) > b->w - h) - buf[--len] = 0; - - if(w > b->w) - return; /* too long */ - - gcv.foreground = b->fg; - gcv.background = b->bg; - if(b->font.set) { - XChangeGC(dpy, b->gc, GCForeground | GCBackground, &gcv); - XmbDrawImageString(dpy, b->drawable, b->font.set, b->gc, - x, y, buf, len); + XRectangle r = { dc.x, dc.y, dc.w, dc.h }; + + gcv.foreground = col[ColFG]; + XChangeGC(dpy, dc.gc, GCForeground, &gcv); + x = (dc.font.ascent + dc.font.descent + 2) / 4; + r.x = dc.x + 1; + r.y = dc.y + 1; + if(filled) { + r.width = r.height = x + 1; + XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1); } - else { - gcv.font = b->font.xfont->fid; - XChangeGC(dpy, b->gc, GCForeground | GCBackground | GCFont, &gcv); - XDrawImageString(dpy, b->drawable, b->gc, x, y, buf, len); + else if(empty) { + r.width = r.height = x; + XDrawRectangles(dpy, dc.drawable, dc.gc, &r, 1); } } -static unsigned long -xloadcolors(Colormap cmap, const char *colstr) -{ - XColor color; - XAllocNamedColor(dpy, cmap, colstr, &color, &color); - return color.pixel; -} +static Bool +isoccupied(unsigned int t) { + Client *c; -void -loadcolors(int scr, Brush *b, - const char *bg, const char *fg, const char *border) -{ - Colormap cmap = DefaultColormap(dpy, scr); - b->bg = xloadcolors(cmap, bg); - b->fg = xloadcolors(cmap, fg); - b->border = xloadcolors(cmap, border); + for(c = clients; c; c = c->next) + if(c->tags[t]) + return True; + return False; } -unsigned int -textnw(Fnt *font, char *text, unsigned int len) -{ +static unsigned int +textnw(const char *text, unsigned int len) { XRectangle r; - if(font->set) { - XmbTextExtents(font->set, text, len, NULL, &r); + + if(dc.font.set) { + XmbTextExtents(dc.font.set, text, len, NULL, &r); return r.width; } - return XTextWidth(font->xfont, text, len); + return XTextWidth(dc.font.xfont, text, len); } -unsigned int -textw(Fnt *font, char *text) -{ - return textnw(font, text, strlen(text)); -} - -unsigned int -texth(Fnt *font) -{ - return font->height + 4; -} +/* extern */ void -loadfont(Fnt *font, const char *fontstr) -{ - char **missing, *def; - int i, n; - - missing = NULL; - setlocale(LC_ALL, ""); - if(font->set) - XFreeFontSet(dpy, font->set); - font->set = XCreateFontSet(dpy, fontstr, &missing, &n, &def); - if(missing) { - while(n--) - fprintf(stderr, "missing fontset: %s\n", missing[n]); - XFreeStringList(missing); - if(font->set) { - XFreeFontSet(dpy, font->set); - font->set = NULL; +drawstatus(void) { + int i, x; + + dc.x = dc.y = 0; + for(i = 0; i < ntags; i++) { + dc.w = textw(tags[i]); + if(seltag[i]) { + drawtext(tags[i], dc.sel); + drawsquare(sel && sel->tags[i], isoccupied(i), dc.sel); + } + else { + drawtext(tags[i], dc.norm); + drawsquare(sel && sel->tags[i], isoccupied(i), dc.norm); } + dc.x += dc.w; } - if(font->set) { - XFontSetExtents *font_extents; - XFontStruct **xfonts; - char **font_names; - - font->ascent = font->descent = 0; - font_extents = XExtentsOfFontSet(font->set); - n = XFontsOfFontSet(font->set, &xfonts, &font_names); - for(i = 0, font->ascent = 0, font->descent = 0; i < n; i++) { - if(font->ascent < (*xfonts)->ascent) - font->ascent = (*xfonts)->ascent; - if(font->descent < (*xfonts)->descent) - font->descent = (*xfonts)->descent; - xfonts++; + dc.w = blw; + drawtext(lt->symbol, dc.norm); + x = dc.x + dc.w; + dc.w = textw(stext); + dc.x = sw - dc.w; + if(dc.x < x) { + dc.x = x; + dc.w = sw - x; + } + drawtext(stext, dc.norm); + if((dc.w = dc.x - x) > bh) { + dc.x = x; + if(sel) { + drawtext(sel->name, dc.sel); + drawsquare(sel->ismax, sel->isfloating, dc.sel); } + else + drawtext(NULL, dc.norm); } - else { - if(font->xfont) - XFreeFont(dpy, font->xfont); - font->xfont = NULL; - font->xfont = XLoadQueryFont(dpy, fontstr); - if (!font->xfont) - font->xfont = XLoadQueryFont(dpy, "fixed"); - if (!font->xfont) - error("error, cannot load 'fixed' font\n"); - font->ascent = font->xfont->ascent; - font->descent = font->xfont->descent; + XCopyArea(dpy, dc.drawable, barwin, dc.gc, 0, 0, sw, bh, 0, 0); + XSync(dpy, False); +} + +void +drawtext(const char *text, unsigned long col[ColLast]) { + int x, y, w, h; + static char buf[256]; + unsigned int len, olen; + XRectangle r = { dc.x, dc.y, dc.w, dc.h }; + + XSetForeground(dpy, dc.gc, col[ColBG]); + XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1); + 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] = '.'; } - font->height = font->ascent + font->descent; + if(w > dc.w) + return; /* too long */ + XSetForeground(dpy, dc.gc, col[ColFG]); + if(dc.font.set) + XmbDrawString(dpy, dc.drawable, dc.font.set, dc.gc, x, y, buf, len); + else + XDrawString(dpy, dc.drawable, dc.gc, x, y, buf, len); +} + +unsigned int +textw(const char *text) { + return textnw(text, strlen(text)) + dc.font.height; }