X-Git-Url: https://jasonwoof.com/gitweb/?p=dwm.git;a=blobdiff_plain;f=draw.c;h=ce2435445cca8cd1466b1d135c8bf0828ab0539e;hp=e4b2b88a5e6bebc57a1ecf90a7c3c6c25b3275b0;hb=a730213c3b47397c890eea0df7e03e45d5d38b6d;hpb=857d825eeb9f0d91a3d8a2507e8955196646f9a1 diff --git a/draw.c b/draw.c index e4b2b88..ce24354 100644 --- a/draw.c +++ b/draw.c @@ -1,17 +1,36 @@ -/* (C)opyright MMIV-MMVI Anselm R. Garbe - * See LICENSE file for license details. - */ +/* © 2006-2007 Anselm R. Garbe + * © 2006-2007 Sander van Dijk + * See LICENSE file for license details. */ #include "dwm.h" -#include #include -#include /* static */ +static void +drawsquare(Bool filled, Bool empty, unsigned long col[ColLast]) { + int x; + XGCValues gcv; + 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 if(empty) { + r.width = r.height = x; + XDrawRectangles(dpy, dc.drawable, dc.gc, &r, 1); + } +} + static Bool -isoccupied(unsigned int t) -{ +isoccupied(unsigned int t) { Client *c; + for(c = clients; c; c = c->next) if(c->tags[t]) return True; @@ -29,14 +48,54 @@ textnw(const char *text, unsigned int len) { return XTextWidth(dc.font.xfont, text, len); } -static void -drawtext(const char *text, unsigned long col[ColLast], Bool filledsquare, Bool emptysquare) { +/* extern */ + +void +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; + } + 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); + } + 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; - XGCValues gcv; XRectangle r = { dc.x, dc.y, dc.w, dc.h }; - XPoint pt[5]; XSetForeground(dpy, dc.gc, col[ColBG]); XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1); @@ -64,152 +123,11 @@ drawtext(const char *text, unsigned long col[ColLast], Bool filledsquare, Bool e } if(w > dc.w) return; /* too long */ - gcv.foreground = col[ColFG]; - if(dc.font.set) { - XChangeGC(dpy, dc.gc, GCForeground, &gcv); + XSetForeground(dpy, dc.gc, col[ColFG]); + 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 | GCFont, &gcv); + else XDrawString(dpy, dc.drawable, dc.gc, x, y, buf, len); - } - x = (h + 2) / 4; - if(filledsquare) { - r.x = dc.x + 1; - r.y = dc.y + 1; - r.width = r.height = x + 1; - XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1); - } - else if(emptysquare) { - pt[0].x = dc.x + 1; - pt[0].y = dc.y + 1; - pt[1].x = x; - pt[1].y = 0; - pt[2].x = 0; - pt[2].y = x; - pt[3].x = -x; - pt[3].y = 0; - pt[4].x = 0; - pt[4].y = -x; - XDrawLines(dpy, dc.drawable, dc.gc, pt, 5, CoordModePrevious); - } -} - -/* extern */ - -void -drawall(void) { - Client *c; - - for(c = clients; c; c = getnext(c->next)) - drawtitle(c); - drawstatus(); -} - -void -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, sel && sel->tags[i], isoccupied(i)); - else - drawtext(tags[i], dc.norm, sel && sel->tags[i], isoccupied(i)); - dc.x += dc.w; - } - dc.w = bmw; - drawtext(arrange == dofloat ? FLOATSYMBOL : TILESYMBOL, dc.status, False, False); - x = dc.x + dc.w; - dc.w = textw(stext); - dc.x = bw - dc.w; - if(dc.x < x) { - dc.x = x; - dc.w = bw - x; - } - drawtext(stext, dc.status, False, False); - if((dc.w = dc.x - x) > bh) { - dc.x = x; - drawtext(sel ? sel->name : NULL, sel ? dc.sel : dc.norm, False, False); - } - XCopyArea(dpy, dc.drawable, barwin, dc.gc, 0, 0, bw, bh, 0, 0); - XSync(dpy, False); -} - -void -drawtitle(Client *c) { - if(c == sel && issel) { - drawstatus(); - XUnmapWindow(dpy, c->twin); - XSetWindowBorder(dpy, c->win, dc.sel[ColBG]); - return; - } - XSetWindowBorder(dpy, c->win, dc.norm[ColBG]); - XMapWindow(dpy, c->twin); - dc.x = dc.y = 0; - dc.w = c->tw; - drawtext(c->name, dc.norm, False,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; - - if(!XAllocNamedColor(dpy, cmap, colstr, &color, &color)) - eprint("error, cannot allocate color '%s'\n", colstr); - return color.pixel; -} - -void -setfont(const char *fontstr) { - char *def, *lc, **missing; - int i, n; - - lc = setlocale(LC_CTYPE, NULL); - setlocale(LC_CTYPE, "UTF-8"); - missing = NULL; - if(dc.font.set) - XFreeFontSet(dpy, dc.font.set); - dc.font.set = XCreateFontSet(dpy, fontstr, &missing, &n, &def); - setlocale(LC_CTYPE, lc); - if(missing) { - while(n--) - fprintf(stderr, "missing fontset: %s\n", missing[n]); - XFreeStringList(missing); - } - if(dc.font.set) { - XFontSetExtents *font_extents; - XFontStruct **xfonts; - char **font_names; - dc.font.ascent = dc.font.descent = 0; - font_extents = XExtentsOfFontSet(dc.font.set); - n = XFontsOfFontSet(dc.font.set, &xfonts, &font_names); - for(i = 0, dc.font.ascent = 0, dc.font.descent = 0; i < n; i++) { - if(dc.font.ascent < (*xfonts)->ascent) - dc.font.ascent = (*xfonts)->ascent; - if(dc.font.descent < (*xfonts)->descent) - dc.font.descent = (*xfonts)->descent; - xfonts++; - } - } - else { - if(dc.font.xfont) - XFreeFont(dpy, dc.font.xfont); - dc.font.xfont = NULL; - dc.font.xfont = XLoadQueryFont(dpy, fontstr); - if (!dc.font.xfont) - dc.font.xfont = XLoadQueryFont(dpy, "fixed"); - if (!dc.font.xfont) - 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