git.stevedylan.dev

sync updated drw code from dmenu 646b351c

important:
- drw_rect: didn't use w and h, change the dwm code accordingly.
- drw_text: text is NULL is not allowed, use drw_rect().

Hiltjo Posthuma · 2015-10-20 23:34 5 file(s) · +163 −157

drw.c +118 −131

#include "util.h"

#define UTF_INVALID 0xFFFD
#define UTF_SIZ 4
#define UTF_SIZ     4

static const unsigned char utfbyte[UTF_SIZ + 1] = {0x80,    0, 0xC0, 0xE0, 0xF0};
static const unsigned char utfmask[UTF_SIZ + 1] = {0xC0, 0x80, 0xE0, 0xF0, 0xF8};

static const long utfmax[UTF_SIZ + 1] = {0x10FFFF, 0x7F, 0x7FF, 0xFFFF, 0x10FFFF};

static long
utf8decodebyte(const char c, size_t *i) {
	for(*i = 0; *i < (UTF_SIZ + 1); ++(*i))
		if(((unsigned char)c & utfmask[*i]) == utfbyte[*i])
utf8decodebyte(const char c, size_t *i)
{
	for (*i = 0; *i < (UTF_SIZ + 1); ++(*i))
		if (((unsigned char)c & utfmask[*i]) == utfbyte[*i])
			return (unsigned char)c & ~utfmask[*i];
	return 0;
}

static size_t
utf8validate(long *u, size_t i) {
	if(!BETWEEN(*u, utfmin[i], utfmax[i]) || BETWEEN(*u, 0xD800, 0xDFFF))
utf8validate(long *u, size_t i)
{
	if (!BETWEEN(*u, utfmin[i], utfmax[i]) || BETWEEN(*u, 0xD800, 0xDFFF))
		*u = UTF_INVALID;
	for(i = 1; *u > utfmax[i]; ++i)
	for (i = 1; *u > utfmax[i]; ++i)
		;
	return i;
}

static size_t
utf8decode(const char *c, long *u, size_t clen) {
utf8decode(const char *c, long *u, size_t clen)
{
	size_t i, j, len, type;
	long udecoded;

	*u = UTF_INVALID;
	if(!clen)
	if (!clen)
		return 0;
	udecoded = utf8decodebyte(c[0], &len);
	if(!BETWEEN(len, 1, UTF_SIZ))
	if (!BETWEEN(len, 1, UTF_SIZ))
		return 1;
	for(i = 1, j = 1; i < clen && j < len; ++i, ++j) {
	for (i = 1, j = 1; i < clen && j < len; ++i, ++j) {
		udecoded = (udecoded << 6) | utf8decodebyte(c[i], &type);
		if(type != 0)
		if (type)
			return j;
	}
	if(j < len)
	if (j < len)
		return 0;
	*u = udecoded;
	utf8validate(u, len);

	return len;
}

Drw *
drw_create(Display *dpy, int screen, Window root, unsigned int w, unsigned int h) {
	Drw *drw = (Drw *)calloc(1, sizeof(Drw));
	if(!drw)
		return NULL;
drw_create(Display *dpy, int screen, Window root, unsigned int w, unsigned int h)
{
	Drw *drw;

	drw = ecalloc(1, sizeof(Drw));
	drw->dpy = dpy;
	drw->screen = screen;
	drw->root = root;

	drw->gc = XCreateGC(dpy, root, 0, NULL);
	drw->fontcount = 0;
	XSetLineAttributes(dpy, drw->gc, 1, LineSolid, CapButt, JoinMiter);

	return drw;
}

void
drw_resize(Drw *drw, unsigned int w, unsigned int h) {
	if(!drw)
		return;
drw_resize(Drw *drw, unsigned int w, unsigned int h)
{
	drw->w = w;
	drw->h = h;
	if(drw->drawable != 0)
	if (drw->drawable)
		XFreePixmap(drw->dpy, drw->drawable);
	drw->drawable = XCreatePixmap(drw->dpy, drw->root, w, h, DefaultDepth(drw->dpy, drw->screen));
}

void
drw_free(Drw *drw) {
drw_free(Drw *drw)
{
	size_t i;
	for (i = 0; i < drw->fontcount; i++) {

	for (i = 0; i < drw->fontcount; i++)
		drw_font_free(drw->fonts[i]);
	}
	XFreePixmap(drw->dpy, drw->drawable);
	XFreeGC(drw->dpy, drw->gc);
	free(drw);

 * drw_font_create instead.
 */
static Fnt *
drw_font_xcreate(Drw *drw, const char *fontname, FcPattern *fontpattern) {
drw_font_xcreate(Drw *drw, const char *fontname, FcPattern *fontpattern)
{
	Fnt *font;

	if (!(fontname || fontpattern))
		die("No font specified.\n");

	if (!(font = (Fnt *)calloc(1, sizeof(Fnt))))
		return NULL;
	XftFont *xfont = NULL;
	FcPattern *pattern = NULL;

	if (fontname) {
		/* Using the pattern found at font->xfont->pattern does not yield same

		 * behaviour whereas the former just results in
		 * missing-character-rectangles being drawn, at least with some fonts.
		 */
		if (!(font->xfont = XftFontOpenName(drw->dpy, drw->screen, fontname)) ||
		    !(font->pattern = FcNameParse((FcChar8 *) fontname))) {
			if (font->xfont) {
				XftFontClose(drw->dpy, font->xfont);
				font->xfont = NULL;
			}
		if (!(xfont = XftFontOpenName(drw->dpy, drw->screen, fontname))) {
			fprintf(stderr, "error, cannot load font: '%s'\n", fontname);
			return NULL;
		}
		if (!(pattern = FcNameParse((FcChar8 *) fontname))) {
			fprintf(stderr, "error, cannot load font: '%s'\n", fontname);
			XftFontClose(drw->dpy, xfont);
			return NULL;
		}
	} else if (fontpattern) {
		if (!(font->xfont = XftFontOpenPattern(drw->dpy, fontpattern))) {
		if (!(xfont = XftFontOpenPattern(drw->dpy, fontpattern))) {
			fprintf(stderr, "error, cannot load font pattern.\n");
		} else {
			font->pattern = NULL;
			return NULL;
		}
	} else {
		die("no font specified.\n");
	}

	if (!font->xfont) {
		free(font);
		return NULL;
	}

	font->ascent = font->xfont->ascent;
	font->descent = font->xfont->descent;
	font = ecalloc(1, sizeof(Fnt));
	font->xfont = xfont;
	font->pattern = pattern;
	font->ascent = xfont->ascent;
	font->descent = xfont->descent;
	font->h = font->ascent + font->descent;
	font->dpy = drw->dpy;

	return font;
}

Fnt*
drw_font_create(Drw *drw, const char *fontname) {
drw_font_create(Drw *drw, const char *fontname)
{
	return drw_font_xcreate(drw, fontname, NULL);
}

void
drw_load_fonts(Drw* drw, const char *fonts[], size_t fontcount) {
drw_load_fonts(Drw* drw, const char *fonts[], size_t fontcount)
{
	size_t i;
	Fnt *font;

	for (i = 0; i < fontcount; i++) {
		if (drw->fontcount >= DRW_FONT_CACHE_SIZE) {
			die("Font cache exhausted.\n");
			die("font cache exhausted.\n");
		} else if ((font = drw_font_xcreate(drw, fonts[i], NULL))) {
			drw->fonts[drw->fontcount++] = font;
		}

}

void
drw_font_free(Fnt *font) {
	if(!font)
drw_font_free(Fnt *font)
{
	if (!font)
		return;
	if(font->pattern)
	if (font->pattern)
		FcPatternDestroy(font->pattern);
	XftFontClose(font->dpy, font->xfont);
	free(font);
}

Clr *
drw_clr_create(Drw *drw, const char *clrname) {
drw_clr_create(Drw *drw, const char *clrname)
{
	Clr *clr;
	Colormap cmap;
	Visual *vis;

	if(!drw)
		return NULL;
	clr = (Clr *)calloc(1, sizeof(Clr));
	if(!clr)
		return NULL;
	cmap = DefaultColormap(drw->dpy, drw->screen);
	vis = DefaultVisual(drw->dpy, drw->screen);
	if(!XftColorAllocName(drw->dpy, vis, cmap, clrname, &clr->rgb))
	clr = ecalloc(1, sizeof(Clr));
	if (!XftColorAllocName(drw->dpy, DefaultVisual(drw->dpy, drw->screen),
	                       DefaultColormap(drw->dpy, drw->screen),
	                       clrname, &clr->rgb))
		die("error, cannot allocate color '%s'\n", clrname);
	clr->pix = clr->rgb.pixel;

	return clr;
}

void
drw_clr_free(Clr *clr) {
	if(clr)
		free(clr);
drw_clr_free(Clr *clr)
{
	free(clr);
}

void
drw_setscheme(Drw *drw, ClrScheme *scheme) {
	if(drw && scheme)
		drw->scheme = scheme;
drw_setscheme(Drw *drw, ClrScheme *scheme)
{
	drw->scheme = scheme;
}

void
drw_rect(Drw *drw, int x, int y, unsigned int w, unsigned int h, int filled, int empty, int invert) {
	int dx;

	if(!drw || !drw->fontcount || !drw->scheme)
drw_rect(Drw *drw, int x, int y, unsigned int w, unsigned int h, int filled, int empty, int invert)
{
	if (!drw->scheme)
		return;
	XSetForeground(drw->dpy, drw->gc, invert ? drw->scheme->bg->pix : drw->scheme->fg->pix);
	dx = (drw->fonts[0]->ascent + drw->fonts[0]->descent + 2) / 4;
	if(filled)
		XFillRectangle(drw->dpy, drw->drawable, drw->gc, x+1, y+1, dx+1, dx+1);
	else if(empty)
		XDrawRectangle(drw->dpy, drw->drawable, drw->gc, x+1, y+1, dx, dx);
	if (filled)
		XFillRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w + 1, h + 1);
	else if (empty)
		XDrawRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w, h);
}

int
drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, const char *text, int invert) {
drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, const char *text, int invert)
{
	char buf[1024];
	int tx, ty, th;
	Extnts tex;
	Colormap cmap;
	Visual *vis;
	XftDraw *d;
	XftDraw *d = NULL;
	Fnt *curfont, *nextfont;
	size_t i, len;
	int utf8strlen, utf8charlen, render;

	XftResult result;
	int charexists = 0;

	if (!drw->scheme || !drw->fontcount)
		return 0;

	if (!(render = x || y || w || h)) {
		w = ~w;
	}

	if (!drw || !drw->scheme) {
		return 0;
	} else if (render) {
		XSetForeground(drw->dpy, drw->gc, invert ? drw->scheme->fg->pix : drw->scheme->bg->pix);
	} else {
		XSetForeground(drw->dpy, drw->gc, invert ?
		               drw->scheme->fg->pix : drw->scheme->bg->pix);
		XFillRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w, h);
	}

	if (!text || !drw->fontcount) {
		return 0;
	} else if (render) {
		cmap = DefaultColormap(drw->dpy, drw->screen);
		vis = DefaultVisual(drw->dpy, drw->screen);
		d = XftDrawCreate(drw->dpy, drw->drawable, vis, cmap);
		d = XftDrawCreate(drw->dpy, drw->drawable,
		                  DefaultVisual(drw->dpy, drw->screen),
		                  DefaultColormap(drw->dpy, drw->screen));
	}

	curfont = drw->fonts[0];

				}
			}

			if (!charexists || (nextfont && nextfont != curfont)) {
			if (!charexists || (nextfont && nextfont != curfont))
				break;
			} else {
			else
				charexists = 0;
			}
		}

		if (utf8strlen) {
			drw_font_getexts(curfont, utf8str, utf8strlen, &tex);
			/* shorten text if necessary */
			for(len = MIN(utf8strlen, (sizeof buf) - 1); len && (tex.w > w - drw->fonts[0]->h || w < drw->fonts[0]->h); len--)
			for (len = MIN(utf8strlen, (sizeof buf) - 1); len && (tex.w > w - drw->fonts[0]->h || w < drw->fonts[0]->h); len--)
				drw_font_getexts(curfont, utf8str, len, &tex);

			if (len) {
				memcpy(buf, utf8str, len);
				buf[len] = '\0';
				if(len < utf8strlen)
					for(i = len; i && i > len - 3; buf[--i] = '.');
				if (len < utf8strlen)
					for (i = len; i && i > len - 3; buf[--i] = '.');

				if (render) {
					th = curfont->ascent + curfont->descent;

					tx = x + (h / 2);
					XftDrawStringUtf8(d, invert ? &drw->scheme->bg->rgb : &drw->scheme->fg->rgb, curfont->xfont, tx, ty, (XftChar8 *)buf, len);
				}

				x += tex.w;
				w -= tex.w;
			}

			 */
			charexists = 1;

			if (drw->fontcount >= DRW_FONT_CACHE_SIZE) {
			if (drw->fontcount >= DRW_FONT_CACHE_SIZE)
				continue;
			}

			fccharset = FcCharSetCreate();
			FcCharSetAddChar(fccharset, utf8codepoint);

			if (!drw->fonts[0]->pattern) {
				/* Refer to the comment in drw_font_xcreate for more
				 * information.
				 */
				die("The first font in the cache must be loaded from a font string.\n");
				 * information. */
				die("the first font in the cache must be loaded from a font string.\n");
			}

			fcpattern = FcPatternDuplicate(drw->fonts[0]->pattern);

				if (curfont && XftCharExists(drw->dpy, curfont->xfont, utf8codepoint)) {
					drw->fonts[drw->fontcount++] = curfont;
				} else {
					if (curfont) {
						drw_font_free(curfont);
					}
					drw_font_free(curfont);
					curfont = drw->fonts[0];
				}
			}
		}
	}

	if (render) {
	if (d)
		XftDrawDestroy(d);
	}

	return x;
}

void
drw_map(Drw *drw, Window win, int x, int y, unsigned int w, unsigned int h) {
	if(!drw)
		return;
drw_map(Drw *drw, Window win, int x, int y, unsigned int w, unsigned int h)
{
	XCopyArea(drw->dpy, drw->drawable, win, drw->gc, x, y, w, h, x, y);
	XSync(drw->dpy, False);
}


void
drw_font_getexts(Fnt *font, const char *text, unsigned int len, Extnts *tex) {
drw_font_getexts(Fnt *font, const char *text, unsigned int len, Extnts *tex)
{
	XGlyphInfo ext;

	if(!font || !text)
		return;
	XftTextExtentsUtf8(font->dpy, font->xfont, (XftChar8 *)text, len, &ext);
	tex->h = font->h;
	tex->w = ext.xOff;
}

unsigned int
drw_font_getexts_width(Fnt *font, const char *text, unsigned int len) {
drw_font_getexts_width(Fnt *font, const char *text, unsigned int len)
{
	Extnts tex;

	if(!font)
		return -1;
	drw_font_getexts(font, text, len, &tex);

	return tex.w;
}

Cur *
drw_cur_create(Drw *drw, int shape) {
	Cur *cur = (Cur *)calloc(1, sizeof(Cur));
drw_cur_create(Drw *drw, int shape)
{
	Cur *cur;

	if(!drw || !cur)
		return NULL;
	cur = ecalloc(1, sizeof(Cur));
	cur->cursor = XCreateFontCursor(drw->dpy, shape);

	return cur;
}

void
drw_cur_free(Drw *drw, Cur *cursor) {
	if(!drw || !cursor)
drw_cur_free(Drw *drw, Cur *cursor)
{
	if (!cursor)
		return;
	XFreeCursor(drw->dpy, cursor->cursor);
	free(cursor);

drw.h +17 −17

} Extnts;

/* Drawable abstraction */
Drw *drw_create(Display *dpy, int screen, Window win, unsigned int w, unsigned int h);
void drw_resize(Drw *drw, unsigned int w, unsigned int h);
void drw_free(Drw *drw);
Drw *drw_create(Display *, int, Window, unsigned int, unsigned int);
void drw_resize(Drw *, unsigned int, unsigned int);
void drw_free(Drw *);

/* Fnt abstraction */
Fnt *drw_font_create(Drw *drw, const char *fontname);
void drw_load_fonts(Drw* drw, const char *fonts[], size_t fontcount);
void drw_font_free(Fnt *font);
void drw_font_getexts(Fnt *font, const char *text, unsigned int len, Extnts *extnts);
unsigned int drw_font_getexts_width(Fnt *font, const char *text, unsigned int len);
Fnt *drw_font_create(Drw *, const char *);
void drw_load_fonts(Drw *, const char *[], size_t);
void drw_font_free(Fnt *);
void drw_font_getexts(Fnt *, const char *, unsigned int, Extnts *);
unsigned int drw_font_getexts_width(Fnt *, const char *, unsigned int);

/* Colour abstraction */
Clr *drw_clr_create(Drw *drw, const char *clrname);
void drw_clr_free(Clr *clr);
Clr *drw_clr_create(Drw *, const char *);
void drw_clr_free(Clr *);

/* Cursor abstraction */
Cur *drw_cur_create(Drw *drw, int shape);
void drw_cur_free(Drw *drw, Cur *cursor);
Cur *drw_cur_create(Drw *, int);
void drw_cur_free(Drw *, Cur *);

/* Drawing context manipulation */
void drw_setfont(Drw *drw, Fnt *font);
void drw_setscheme(Drw *drw, ClrScheme *scheme);
void drw_setfont(Drw *, Fnt *);
void drw_setscheme(Drw *, ClrScheme *);

/* Drawing functions */
void drw_rect(Drw *drw, int x, int y, unsigned int w, unsigned int h, int filled, int empty, int invert);
int drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, const char *text, int invert);
void drw_rect(Drw *, int, int, unsigned int, unsigned int, int, int, int);
int drw_text(Drw *, int, int, unsigned int, unsigned int, const char *, int);

/* Map functions */
void drw_map(Drw *drw, Window win, int x, int y, unsigned int w, unsigned int h);
void drw_map(Drw *, Window, int, int, unsigned int, unsigned int);

dwm.c +6 −4


void
drawbar(Monitor *m) {
	int x, xx, w;
	int x, xx, w, dx;
	unsigned int i, occ = 0, urg = 0;
	Client *c;

	dx = (drw->fonts[0]->ascent + drw->fonts[0]->descent + 2) / 4;

	for(c = m->clients; c; c = c->next) {
		occ |= c->tags;

		w = TEXTW(tags[i]);
		drw_setscheme(drw, m->tagset[m->seltags] & 1 << i ? &scheme[SchemeSel] : &scheme[SchemeNorm]);
		drw_text(drw, x, 0, w, bh, tags[i], urg & 1 << i);
		drw_rect(drw, x, 0, w, bh, m == selmon && selmon->sel && selmon->sel->tags & 1 << i,
		drw_rect(drw, x + 1, 1, dx, dx, m == selmon && selmon->sel && selmon->sel->tags & 1 << i,
		           occ & 1 << i, urg & 1 << i);
		x += w;
	}

		if(m->sel) {
			drw_setscheme(drw, m == selmon ? &scheme[SchemeSel] : &scheme[SchemeNorm]);
			drw_text(drw, x, 0, w, bh, m->sel->name, 0);
			drw_rect(drw, x, 0, w, bh, m->sel->isfixed, m->sel->isfloating, 0);
			drw_rect(drw, x + 1, 1, dx, dx, m->sel->isfixed, m->sel->isfloating, 0);
		}
		else {
			drw_setscheme(drw, &scheme[SchemeNorm]);
			drw_text(drw, x, 0, w, bh, NULL, 0);
			drw_rect(drw, x, 0, w, bh, 1, 0, 1);
		}
	}
	drw_map(drw, m->barwin, 0, 0, m->ww, bh);

util.c +21 −5

#include <stdarg.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>

#include "util.h"

void *
ecalloc(size_t nmemb, size_t size)
{
	void *p;

	if (!(p = calloc(nmemb, size)))
		perror(NULL);
	return p;
}

void
die(const char *errstr, ...) {
die(const char *fmt, ...) {
	va_list ap;

	va_start(ap, errstr);
	vfprintf(stderr, errstr, ap);
	va_start(ap, fmt);
	vfprintf(stderr, fmt, ap);
	va_end(ap);
	exit(EXIT_FAILURE);
}

	if (fmt[0] && fmt[strlen(fmt)-1] == ':') {
		fputc(' ', stderr);
		perror(NULL);
	}

	exit(1);
}

util.h +1 −0

5	5		#define BETWEEN(X, A, B) ((A) <= (X) && (X) <= (B))
6	6
7	7		void die(const char *errstr, ...);
	8	+	void *ecalloc(size_t, size_t);

43	43		} Extnts;
44	44
45	45		/* Drawable abstraction */
46		-	Drw drw_create(Display dpy, int screen, Window win, unsigned int w, unsigned int h);
47		-	void drw_resize(Drw *drw, unsigned int w, unsigned int h);
48		-	void drw_free(Drw *drw);
	46	+	Drw drw_create(Display , int, Window, unsigned int, unsigned int);
	47	+	void drw_resize(Drw *, unsigned int, unsigned int);
	48	+	void drw_free(Drw *);
49	49
50	50		/* Fnt abstraction */
51		-	Fnt drw_font_create(Drw drw, const char *fontname);
52		-	void drw_load_fonts(Drw* drw, const char *fonts[], size_t fontcount);
53		-	void drw_font_free(Fnt *font);
54		-	void drw_font_getexts(Fnt font, const char text, unsigned int len, Extnts *extnts);
55		-	unsigned int drw_font_getexts_width(Fnt font, const char text, unsigned int len);
	51	+	Fnt drw_font_create(Drw , const char *);
	52	+	void drw_load_fonts(Drw , const char [], size_t);
	53	+	void drw_font_free(Fnt *);
	54	+	void drw_font_getexts(Fnt , const char , unsigned int, Extnts *);
	55	+	unsigned int drw_font_getexts_width(Fnt , const char , unsigned int);
56	56
57	57		/* Colour abstraction */
58		-	Clr drw_clr_create(Drw drw, const char *clrname);
59		-	void drw_clr_free(Clr *clr);
	58	+	Clr drw_clr_create(Drw , const char *);
	59	+	void drw_clr_free(Clr *);
60	60
61	61		/* Cursor abstraction */
62		-	Cur drw_cur_create(Drw drw, int shape);
63		-	void drw_cur_free(Drw drw, Cur cursor);
	62	+	Cur drw_cur_create(Drw , int);
	63	+	void drw_cur_free(Drw , Cur );
64	64
65	65		/* Drawing context manipulation */
66		-	void drw_setfont(Drw drw, Fnt font);
67		-	void drw_setscheme(Drw drw, ClrScheme scheme);
	66	+	void drw_setfont(Drw , Fnt );
	67	+	void drw_setscheme(Drw , ClrScheme );
68	68
69	69		/* Drawing functions */
70		-	void drw_rect(Drw *drw, int x, int y, unsigned int w, unsigned int h, int filled, int empty, int invert);
71		-	int drw_text(Drw drw, int x, int y, unsigned int w, unsigned int h, const char text, int invert);
	70	+	void drw_rect(Drw *, int, int, unsigned int, unsigned int, int, int, int);
	71	+	int drw_text(Drw , int, int, unsigned int, unsigned int, const char , int);
72	72
73	73		/* Map functions */
74		-	void drw_map(Drw *drw, Window win, int x, int y, unsigned int w, unsigned int h);
	74	+	void drw_map(Drw *, Window, int, int, unsigned int, unsigned int);

689	689
690	690		void
691	691		drawbar(Monitor *m) {
692		-	int x, xx, w;
	692	+	int x, xx, w, dx;
693	693		unsigned int i, occ = 0, urg = 0;
694	694		Client *c;
	695	+
	696	+	dx = (drw->fonts[0]->ascent + drw->fonts[0]->descent + 2) / 4;
695	697
696	698		for(c = m->clients; c; c = c->next) {
697	699		occ \|= c->tags;

703	705		w = TEXTW(tags[i]);
704	706		drw_setscheme(drw, m->tagset[m->seltags] & 1 << i ? &scheme[SchemeSel] : &scheme[SchemeNorm]);
705	707		drw_text(drw, x, 0, w, bh, tags[i], urg & 1 << i);
706		-	drw_rect(drw, x, 0, w, bh, m == selmon && selmon->sel && selmon->sel->tags & 1 << i,
	708	+	drw_rect(drw, x + 1, 1, dx, dx, m == selmon && selmon->sel && selmon->sel->tags & 1 << i,
707	709		occ & 1 << i, urg & 1 << i);
708	710		x += w;
709	711		}

728	730		if(m->sel) {
729	731		drw_setscheme(drw, m == selmon ? &scheme[SchemeSel] : &scheme[SchemeNorm]);
730	732		drw_text(drw, x, 0, w, bh, m->sel->name, 0);
731		-	drw_rect(drw, x, 0, w, bh, m->sel->isfixed, m->sel->isfloating, 0);
	733	+	drw_rect(drw, x + 1, 1, dx, dx, m->sel->isfixed, m->sel->isfloating, 0);
732	734		}
733	735		else {
734	736		drw_setscheme(drw, &scheme[SchemeNorm]);
735		-	drw_text(drw, x, 0, w, bh, NULL, 0);
	737	+	drw_rect(drw, x, 0, w, bh, 1, 0, 1);
736	738		}
737	739		}
738	740		drw_map(drw, m->barwin, 0, 0, m->ww, bh);

9	9		#include "util.h"
10	10
11	11		#define UTF_INVALID 0xFFFD
12		-	#define UTF_SIZ 4
	12	+	#define UTF_SIZ 4
13	13
14	14		static const unsigned char utfbyte[UTF_SIZ + 1] = {0x80, 0, 0xC0, 0xE0, 0xF0};
15	15		static const unsigned char utfmask[UTF_SIZ + 1] = {0xC0, 0x80, 0xE0, 0xF0, 0xF8};

17	17		static const long utfmax[UTF_SIZ + 1] = {0x10FFFF, 0x7F, 0x7FF, 0xFFFF, 0x10FFFF};
18	18
19	19		static long
20		-	utf8decodebyte(const char c, size_t *i) {
21		-	for(i = 0; i < (UTF_SIZ + 1); ++(*i))
22		-	if(((unsigned char)c & utfmask[i]) == utfbyte[i])
	20	+	utf8decodebyte(const char c, size_t *i)
	21	+	{
	22	+	for (i = 0; i < (UTF_SIZ + 1); ++(*i))
	23	+	if (((unsigned char)c & utfmask[i]) == utfbyte[i])
23	24		return (unsigned char)c & ~utfmask[*i];
24	25		return 0;
25	26		}
26	27
27	28		static size_t
28		-	utf8validate(long *u, size_t i) {
29		-	if(!BETWEEN(u, utfmin[i], utfmax[i]) \|\| BETWEEN(u, 0xD800, 0xDFFF))
	29	+	utf8validate(long *u, size_t i)
	30	+	{
	31	+	if (!BETWEEN(u, utfmin[i], utfmax[i]) \|\| BETWEEN(u, 0xD800, 0xDFFF))
30	32		*u = UTF_INVALID;
31		-	for(i = 1; *u > utfmax[i]; ++i)
	33	+	for (i = 1; *u > utfmax[i]; ++i)
32	34		;
33	35		return i;
34	36		}
35	37
36	38		static size_t
37		-	utf8decode(const char c, long u, size_t clen) {
	39	+	utf8decode(const char c, long u, size_t clen)
	40	+	{
38	41		size_t i, j, len, type;
39	42		long udecoded;
40	43
41	44		*u = UTF_INVALID;
42		-	if(!clen)
	45	+	if (!clen)
43	46		return 0;
44	47		udecoded = utf8decodebyte(c[0], &len);
45		-	if(!BETWEEN(len, 1, UTF_SIZ))
	48	+	if (!BETWEEN(len, 1, UTF_SIZ))
46	49		return 1;
47		-	for(i = 1, j = 1; i < clen && j < len; ++i, ++j) {
	50	+	for (i = 1, j = 1; i < clen && j < len; ++i, ++j) {
48	51		udecoded = (udecoded << 6) \| utf8decodebyte(c[i], &type);
49		-	if(type != 0)
	52	+	if (type)
50	53		return j;
51	54		}
52		-	if(j < len)
	55	+	if (j < len)
53	56		return 0;
54	57		*u = udecoded;
55	58		utf8validate(u, len);
	59	+
56	60		return len;
57	61		}
58	62
59	63		Drw *
60		-	drw_create(Display *dpy, int screen, Window root, unsigned int w, unsigned int h) {
61		-	Drw drw = (Drw )calloc(1, sizeof(Drw));
62		-	if(!drw)
63		-	return NULL;
	64	+	drw_create(Display *dpy, int screen, Window root, unsigned int w, unsigned int h)
	65	+	{
	66	+	Drw *drw;
	67	+
	68	+	drw = ecalloc(1, sizeof(Drw));
64	69		drw->dpy = dpy;
65	70		drw->screen = screen;
66	71		drw->root = root;

70	75		drw->gc = XCreateGC(dpy, root, 0, NULL);
71	76		drw->fontcount = 0;
72	77		XSetLineAttributes(dpy, drw->gc, 1, LineSolid, CapButt, JoinMiter);
	78	+
73	79		return drw;
74	80		}
75	81
76	82		void
77		-	drw_resize(Drw *drw, unsigned int w, unsigned int h) {
78		-	if(!drw)
79		-	return;
	83	+	drw_resize(Drw *drw, unsigned int w, unsigned int h)
	84	+	{
80	85		drw->w = w;
81	86		drw->h = h;
82		-	if(drw->drawable != 0)
	87	+	if (drw->drawable)
83	88		XFreePixmap(drw->dpy, drw->drawable);
84	89		drw->drawable = XCreatePixmap(drw->dpy, drw->root, w, h, DefaultDepth(drw->dpy, drw->screen));
85	90		}
86	91
87	92		void
88		-	drw_free(Drw *drw) {
	93	+	drw_free(Drw *drw)
	94	+	{
89	95		size_t i;
90		-	for (i = 0; i < drw->fontcount; i++) {
	96	+
	97	+	for (i = 0; i < drw->fontcount; i++)
91	98		drw_font_free(drw->fonts[i]);
92		-	}
93	99		XFreePixmap(drw->dpy, drw->drawable);
94	100		XFreeGC(drw->dpy, drw->gc);
95	101		free(drw);

99	105		* drw_font_create instead.
100	106		*/
101	107		static Fnt *
102		-	drw_font_xcreate(Drw drw, const char fontname, FcPattern *fontpattern) {
	108	+	drw_font_xcreate(Drw drw, const char fontname, FcPattern *fontpattern)
	109	+	{
103	110		Fnt *font;
104		-
105		-	if (!(fontname \|\| fontpattern))
106		-	die("No font specified.\n");
107		-
108		-	if (!(font = (Fnt *)calloc(1, sizeof(Fnt))))
109		-	return NULL;
	111	+	XftFont *xfont = NULL;
	112	+	FcPattern *pattern = NULL;
110	113
111	114		if (fontname) {
112	115		/* Using the pattern found at font->xfont->pattern does not yield same

115	118		* behaviour whereas the former just results in
116	119		* missing-character-rectangles being drawn, at least with some fonts.
117	120		*/
118		-	if (!(font->xfont = XftFontOpenName(drw->dpy, drw->screen, fontname)) \|\|
119		-	!(font->pattern = FcNameParse((FcChar8 *) fontname))) {
120		-	if (font->xfont) {
121		-	XftFontClose(drw->dpy, font->xfont);
122		-	font->xfont = NULL;
123		-	}
	121	+	if (!(xfont = XftFontOpenName(drw->dpy, drw->screen, fontname))) {
124	122		fprintf(stderr, "error, cannot load font: '%s'\n", fontname);
	123	+	return NULL;
	124	+	}
	125	+	if (!(pattern = FcNameParse((FcChar8 *) fontname))) {
	126	+	fprintf(stderr, "error, cannot load font: '%s'\n", fontname);
	127	+	XftFontClose(drw->dpy, xfont);
	128	+	return NULL;
125	129		}
126	130		} else if (fontpattern) {
127		-	if (!(font->xfont = XftFontOpenPattern(drw->dpy, fontpattern))) {
	131	+	if (!(xfont = XftFontOpenPattern(drw->dpy, fontpattern))) {
128	132		fprintf(stderr, "error, cannot load font pattern.\n");
129		-	} else {
130		-	font->pattern = NULL;
	133	+	return NULL;
131	134		}
	135	+	} else {
	136	+	die("no font specified.\n");
132	137		}
133	138
134		-	if (!font->xfont) {
135		-	free(font);
136		-	return NULL;
137		-	}
138		-
139		-	font->ascent = font->xfont->ascent;
140		-	font->descent = font->xfont->descent;
	139	+	font = ecalloc(1, sizeof(Fnt));
	140	+	font->xfont = xfont;
	141	+	font->pattern = pattern;
	142	+	font->ascent = xfont->ascent;
	143	+	font->descent = xfont->descent;
141	144		font->h = font->ascent + font->descent;
142	145		font->dpy = drw->dpy;
	146	+
143	147		return font;
144	148		}
145	149
146	150		Fnt*
147		-	drw_font_create(Drw drw, const char fontname) {
	151	+	drw_font_create(Drw drw, const char fontname)
	152	+	{
148	153		return drw_font_xcreate(drw, fontname, NULL);
149	154		}
150	155
151	156		void
152		-	drw_load_fonts(Drw* drw, const char *fonts[], size_t fontcount) {
	157	+	drw_load_fonts(Drw* drw, const char *fonts[], size_t fontcount)
	158	+	{
153	159		size_t i;
154	160		Fnt *font;
	161	+
155	162		for (i = 0; i < fontcount; i++) {
156	163		if (drw->fontcount >= DRW_FONT_CACHE_SIZE) {
157		-	die("Font cache exhausted.\n");
	164	+	die("font cache exhausted.\n");
158	165		} else if ((font = drw_font_xcreate(drw, fonts[i], NULL))) {
159	166		drw->fonts[drw->fontcount++] = font;
160	167		}

162	169		}
163	170
164	171		void
165		-	drw_font_free(Fnt *font) {
166		-	if(!font)
	172	+	drw_font_free(Fnt *font)
	173	+	{
	174	+	if (!font)
167	175		return;
168		-	if(font->pattern)
	176	+	if (font->pattern)
169	177		FcPatternDestroy(font->pattern);
170	178		XftFontClose(font->dpy, font->xfont);
171	179		free(font);
172	180		}
173	181
174	182		Clr *
175		-	drw_clr_create(Drw drw, const char clrname) {
	183	+	drw_clr_create(Drw drw, const char clrname)
	184	+	{
176	185		Clr *clr;
177		-	Colormap cmap;
178		-	Visual *vis;
179	186
180		-	if(!drw)
181		-	return NULL;
182		-	clr = (Clr *)calloc(1, sizeof(Clr));
183		-	if(!clr)
184		-	return NULL;
185		-	cmap = DefaultColormap(drw->dpy, drw->screen);
186		-	vis = DefaultVisual(drw->dpy, drw->screen);
187		-	if(!XftColorAllocName(drw->dpy, vis, cmap, clrname, &clr->rgb))
	187	+	clr = ecalloc(1, sizeof(Clr));
	188	+	if (!XftColorAllocName(drw->dpy, DefaultVisual(drw->dpy, drw->screen),
	189	+	DefaultColormap(drw->dpy, drw->screen),
	190	+	clrname, &clr->rgb))
188	191		die("error, cannot allocate color '%s'\n", clrname);
189	192		clr->pix = clr->rgb.pixel;
	193	+
190	194		return clr;
191	195		}
192	196
193	197		void
194		-	drw_clr_free(Clr *clr) {
195		-	if(clr)
196		-	free(clr);
	198	+	drw_clr_free(Clr *clr)
	199	+	{
	200	+	free(clr);
197	201		}
198	202
199	203		void
200		-	drw_setscheme(Drw drw, ClrScheme scheme) {
201		-	if(drw && scheme)
202		-	drw->scheme = scheme;
	204	+	drw_setscheme(Drw drw, ClrScheme scheme)
	205	+	{
	206	+	drw->scheme = scheme;
203	207		}
204	208
205	209		void
206		-	drw_rect(Drw *drw, int x, int y, unsigned int w, unsigned int h, int filled, int empty, int invert) {
207		-	int dx;
208		-
209		-	if(!drw \|\| !drw->fontcount \|\| !drw->scheme)
	210	+	drw_rect(Drw *drw, int x, int y, unsigned int w, unsigned int h, int filled, int empty, int invert)
	211	+	{
	212	+	if (!drw->scheme)
210	213		return;
211	214		XSetForeground(drw->dpy, drw->gc, invert ? drw->scheme->bg->pix : drw->scheme->fg->pix);
212		-	dx = (drw->fonts[0]->ascent + drw->fonts[0]->descent + 2) / 4;
213		-	if(filled)
214		-	XFillRectangle(drw->dpy, drw->drawable, drw->gc, x+1, y+1, dx+1, dx+1);
215		-	else if(empty)
216		-	XDrawRectangle(drw->dpy, drw->drawable, drw->gc, x+1, y+1, dx, dx);
	215	+	if (filled)
	216	+	XFillRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w + 1, h + 1);
	217	+	else if (empty)
	218	+	XDrawRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w, h);
217	219		}
218	220
219	221		int
220		-	drw_text(Drw drw, int x, int y, unsigned int w, unsigned int h, const char text, int invert) {
	222	+	drw_text(Drw drw, int x, int y, unsigned int w, unsigned int h, const char text, int invert)
	223	+	{
221	224		char buf[1024];
222	225		int tx, ty, th;
223	226		Extnts tex;
224		-	Colormap cmap;
225		-	Visual *vis;
226		-	XftDraw *d;
	227	+	XftDraw *d = NULL;
227	228		Fnt curfont, nextfont;
228	229		size_t i, len;
229	230		int utf8strlen, utf8charlen, render;

235	236		XftResult result;
236	237		int charexists = 0;
237	238
	239	+	if (!drw->scheme \|\| !drw->fontcount)
	240	+	return 0;
	241	+
238	242		if (!(render = x \|\| y \|\| w \|\| h)) {
239	243		w = ~w;
240		-	}
241		-
242		-	if (!drw \|\| !drw->scheme) {
243		-	return 0;
244		-	} else if (render) {
245		-	XSetForeground(drw->dpy, drw->gc, invert ? drw->scheme->fg->pix : drw->scheme->bg->pix);
	244	+	} else {
	245	+	XSetForeground(drw->dpy, drw->gc, invert ?
	246	+	drw->scheme->fg->pix : drw->scheme->bg->pix);
246	247		XFillRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w, h);
247		-	}
248		-
249		-	if (!text \|\| !drw->fontcount) {
250		-	return 0;
251		-	} else if (render) {
252		-	cmap = DefaultColormap(drw->dpy, drw->screen);
253		-	vis = DefaultVisual(drw->dpy, drw->screen);
254		-	d = XftDrawCreate(drw->dpy, drw->drawable, vis, cmap);
	248	+	d = XftDrawCreate(drw->dpy, drw->drawable,
	249	+	DefaultVisual(drw->dpy, drw->screen),
	250	+	DefaultColormap(drw->dpy, drw->screen));
255	251		}
256	252
257	253		curfont = drw->fonts[0];

274	270		}
275	271		}
276	272
277		-	if (!charexists \|\| (nextfont && nextfont != curfont)) {
	273	+	if (!charexists \|\| (nextfont && nextfont != curfont))
278	274		break;
279		-	} else {
	275	+	else
280	276		charexists = 0;
281		-	}
282	277		}
283	278
284	279		if (utf8strlen) {
285	280		drw_font_getexts(curfont, utf8str, utf8strlen, &tex);
286	281		/* shorten text if necessary */
287		-	for(len = MIN(utf8strlen, (sizeof buf) - 1); len && (tex.w > w - drw->fonts[0]->h \|\| w < drw->fonts[0]->h); len--)
	282	+	for (len = MIN(utf8strlen, (sizeof buf) - 1); len && (tex.w > w - drw->fonts[0]->h \|\| w < drw->fonts[0]->h); len--)
288	283		drw_font_getexts(curfont, utf8str, len, &tex);
289	284
290	285		if (len) {
291	286		memcpy(buf, utf8str, len);
292	287		buf[len] = '\0';
293		-	if(len < utf8strlen)
294		-	for(i = len; i && i > len - 3; buf[--i] = '.');
	288	+	if (len < utf8strlen)
	289	+	for (i = len; i && i > len - 3; buf[--i] = '.');
295	290
296	291		if (render) {
297	292		th = curfont->ascent + curfont->descent;

299	294		tx = x + (h / 2);
300	295		XftDrawStringUtf8(d, invert ? &drw->scheme->bg->rgb : &drw->scheme->fg->rgb, curfont->xfont, tx, ty, (XftChar8 *)buf, len);
301	296		}
302		-
303	297		x += tex.w;
304	298		w -= tex.w;
305	299		}

316	310		*/
317	311		charexists = 1;
318	312
319		-	if (drw->fontcount >= DRW_FONT_CACHE_SIZE) {
	313	+	if (drw->fontcount >= DRW_FONT_CACHE_SIZE)
320	314		continue;
321		-	}
322	315
323	316		fccharset = FcCharSetCreate();
324	317		FcCharSetAddChar(fccharset, utf8codepoint);
325	318
326	319		if (!drw->fonts[0]->pattern) {
327	320		/* Refer to the comment in drw_font_xcreate for more
328		-	* information.
329		-	*/
330		-	die("The first font in the cache must be loaded from a font string.\n");
	321	+	* information. */
	322	+	die("the first font in the cache must be loaded from a font string.\n");
331	323		}
332	324
333	325		fcpattern = FcPatternDuplicate(drw->fonts[0]->pattern);

346	338		if (curfont && XftCharExists(drw->dpy, curfont->xfont, utf8codepoint)) {
347	339		drw->fonts[drw->fontcount++] = curfont;
348	340		} else {
349		-	if (curfont) {
350		-	drw_font_free(curfont);
351		-	}
	341	+	drw_font_free(curfont);
352	342		curfont = drw->fonts[0];
353	343		}
354	344		}
355	345		}
356	346		}
357		-
358		-	if (render) {
	347	+	if (d)
359	348		XftDrawDestroy(d);
360		-	}
361	349
362	350		return x;
363	351		}
364	352
365	353		void
366		-	drw_map(Drw *drw, Window win, int x, int y, unsigned int w, unsigned int h) {
367		-	if(!drw)
368		-	return;
	354	+	drw_map(Drw *drw, Window win, int x, int y, unsigned int w, unsigned int h)
	355	+	{
369	356		XCopyArea(drw->dpy, drw->drawable, win, drw->gc, x, y, w, h, x, y);
370	357		XSync(drw->dpy, False);
371	358		}
372	359
373		-
374	360		void
375		-	drw_font_getexts(Fnt font, const char text, unsigned int len, Extnts *tex) {
	361	+	drw_font_getexts(Fnt font, const char text, unsigned int len, Extnts *tex)
	362	+	{
376	363		XGlyphInfo ext;
377	364
378		-	if(!font \|\| !text)
379		-	return;
380	365		XftTextExtentsUtf8(font->dpy, font->xfont, (XftChar8 *)text, len, &ext);
381	366		tex->h = font->h;
382	367		tex->w = ext.xOff;
383	368		}
384	369
385	370		unsigned int
386		-	drw_font_getexts_width(Fnt font, const char text, unsigned int len) {
	371	+	drw_font_getexts_width(Fnt font, const char text, unsigned int len)
	372	+	{
387	373		Extnts tex;
388	374
389		-	if(!font)
390		-	return -1;
391	375		drw_font_getexts(font, text, len, &tex);
	376	+
392	377		return tex.w;
393	378		}
394	379
395	380		Cur *
396		-	drw_cur_create(Drw *drw, int shape) {
397		-	Cur cur = (Cur )calloc(1, sizeof(Cur));
	381	+	drw_cur_create(Drw *drw, int shape)
	382	+	{
	383	+	Cur *cur;
398	384
399		-	if(!drw \|\| !cur)
400		-	return NULL;
	385	+	cur = ecalloc(1, sizeof(Cur));
401	386		cur->cursor = XCreateFontCursor(drw->dpy, shape);
	387	+
402	388		return cur;
403	389		}
404	390
405	391		void
406		-	drw_cur_free(Drw drw, Cur cursor) {
407		-	if(!drw \|\| !cursor)
	392	+	drw_cur_free(Drw drw, Cur cursor)
	393	+	{
	394	+	if (!cursor)
408	395		return;
409	396		XFreeCursor(drw->dpy, cursor->cursor);
410	397		free(cursor);

2	2		#include <stdarg.h>
3	3		#include <stdio.h>
4	4		#include <stdlib.h>
	5	+	#include <string.h>
5	6
6	7		#include "util.h"
7	8
	9	+	void *
	10	+	ecalloc(size_t nmemb, size_t size)
	11	+	{
	12	+	void *p;
	13	+
	14	+	if (!(p = calloc(nmemb, size)))
	15	+	perror(NULL);
	16	+	return p;
	17	+	}
	18	+
8	19		void
9		-	die(const char *errstr, ...) {
	20	+	die(const char *fmt, ...) {
10	21		va_list ap;
11	22
12		-	va_start(ap, errstr);
13		-	vfprintf(stderr, errstr, ap);
	23	+	va_start(ap, fmt);
	24	+	vfprintf(stderr, fmt, ap);
14	25		va_end(ap);
15		-	exit(EXIT_FAILURE);
16		-	}
	26	+
	27	+	if (fmt[0] && fmt[strlen(fmt)-1] == ':') {
	28	+	fputc(' ', stderr);
	29	+	perror(NULL);
	30	+	}
17	31
	32	+	exit(1);
	33	+	}