Update to freshest dwm-6.1 version. Ignore all changes

1 files changed, 302 insertions, 217 deletions

diff --git a/drw.c b/drw.c
index f02d26c..f49200b 100644
--- a/drw.c
+++ b/drw.c
@@ -3,20 +3,69 @@
 #include <stdlib.h>
 #include <string.h>
 #include <X11/Xlib.h>
+#include <X11/Xft/Xft.h>
 
 #include "drw.h"
 #include "util.h"
 
-#ifdef CONFIG_DWM_PANGO
-//char stext[512];
-//extern Bool statusmarkup;
-#endif
+#define UTF_INVALID 0xFFFD
+#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 utfmin[UTF_SIZ + 1] = {       0,    0,  0x80,  0x800,  0x10000};
+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])
+			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))
+		*u = UTF_INVALID;
+	for (i = 1; *u > utfmax[i]; ++i)
+		;
+	return i;
+}
+
+static size_t
+utf8decode(const char *c, long *u, size_t clen)
+{
+	size_t i, j, len, type;
+	long udecoded;
+
+	*u = UTF_INVALID;
+	if (!clen)
+		return 0;
+	udecoded = utf8decodebyte(c[0], &len);
+	if (!BETWEEN(len, 1, UTF_SIZ))
+		return 1;
+	for (i = 1, j = 1; i < clen && j < len; ++i, ++j) {
+		udecoded = (udecoded << 6) | utf8decodebyte(c[i], &type);
+		if (type)
+			return j;
+	}
+	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;
@@ -24,289 +73,325 @@ drw_create(Display *dpy, int screen, Window root, unsigned int w, unsigned int h
 	drw->h = h;
 	drw->drawable = XCreatePixmap(dpy, root, w, h, DefaultDepth(dpy, screen));
 	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++)
+		drw_font_free(drw->fonts[i]);
 	XFreePixmap(drw->dpy, drw->drawable);
 	XFreeGC(drw->dpy, drw->gc);
 	free(drw);
 }
 
-Fnt *
-drw_font_create(Display *dpy, const char *fontname) {
+/* This function is an implementation detail. Library users should use
+ * drw_font_create instead.
+ */
+static Fnt *
+drw_font_xcreate(Drw *drw, const char *fontname, FcPattern *fontpattern)
+{
 	Fnt *font;
-	char *def, **missing;
-	int n;
-
-	font = (Fnt *)calloc(1, sizeof(Fnt));
-	if(!font)
-		return NULL;
-
-#ifdef CONFIG_DWM_PANGO
-	PangoFontMap *fontmap;
-	PangoContext *context;
-	PangoFontDescription *desc;
-	PangoFontMetrics *metrics;
-
-	int screen = DefaultScreen(dpy);
-	fontmap = pango_xft_get_font_map(dpy, screen);
-	context = pango_font_map_create_context(fontmap);
-	desc = pango_font_description_from_string(fontname);
-	font->layout = pango_layout_new(context);
-	pango_layout_set_font_description(font->layout, desc);
-
-	metrics = pango_context_get_metrics(context, desc, NULL);
-	font->ascent = pango_font_metrics_get_ascent(metrics) / PANGO_SCALE;
-	font->descent = pango_font_metrics_get_descent(metrics) / PANGO_SCALE;
-	font->h = font->ascent + font->descent;
-
-	pango_font_metrics_unref(metrics);
-	g_object_unref(context);
-#else
-	font->set = XCreateFontSet(dpy, fontname, &missing, &n, &def);
-	if(missing) {
-		while(n--)
-			fprintf(stderr, "drw: missing fontset: %s\n", missing[n]);
-		XFreeStringList(missing);
-	}
-	if(font->set) {
-		XFontStruct **xfonts;
-		char **font_names;
-		XExtentsOfFontSet(font->set);
-		n = XFontsOfFontSet(font->set, &xfonts, &font_names);
-		while(n--) {
-			font->ascent = MAX(font->ascent, (*xfonts)->ascent);
-			font->descent = MAX(font->descent,(*xfonts)->descent);
-			xfonts++;
+	XftFont *xfont = NULL;
+	FcPattern *pattern = NULL;
+
+	if (fontname) {
+		/* Using the pattern found at font->xfont->pattern does not yield same
+		 * the same substitution results as using the pattern returned by
+		 * FcNameParse; using the latter results in the desired fallback
+		 * behaviour whereas the former just results in
+		 * missing-character-rectangles being drawn, at least with some fonts.
+		 */
+		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 (!(xfont = XftFontOpenPattern(drw->dpy, fontpattern))) {
+			fprintf(stderr, "error, cannot load font pattern.\n");
+			return NULL;
+		}
+	} else {
+		die("no font specified.\n");
 	}
-	else {
-		if(!(font->xfont = XLoadQueryFont(dpy, fontname))
-		&& !(font->xfont = XLoadQueryFont(dpy, "fixed")))
-			die("error, cannot load font: '%s'\n", fontname);
-		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;
-#endif
+	font->dpy = drw->dpy;
+
 	return font;
 }
 
+Fnt*
+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)
+{
+	size_t i;
+	Fnt *font;
+
+	for (i = 0; i < fontcount; i++) {
+		if (drw->fontcount >= DRW_FONT_CACHE_SIZE) {
+			die("font cache exhausted.\n");
+		} else if ((font = drw_font_xcreate(drw, fonts[i], NULL))) {
+			drw->fonts[drw->fontcount++] = font;
+		}
+	}
+}
+
 void
-drw_font_free(Display *dpy, Fnt *font) {
-	if(!font)
+drw_font_free(Fnt *font)
+{
+	if (!font)
 		return;
-#ifdef CONFIG_DWM_PANGO
-	g_object_unref(font->layout);
-#else
-	if(font->set)
-		XFreeFontSet(dpy, font->set);
-	else
-		XFreeFont(dpy, font->xfont);
-#endif
+	if (font->pattern)
+		FcPatternDestroy(font->pattern);
+	XftFontClose(font->dpy, font->xfont);
 	free(font);
 }
 
 Clr *
-#ifdef CONFIG_DWM_PANGO
-drw_clr_create(Drw *drw, const char *clrname, XftColor *color) {
-#else
-drw_clr_create(Drw *drw, const char *clrname) {
-#endif
+drw_clr_create(Drw *drw, const char *clrname)
+{
 	Clr *clr;
-	Colormap cmap;
-#ifdef CONFIG_DWM_PANGO
-	Visual *vis = DefaultVisual(drw->dpy, drw->screen);
-#else
-	XColor color;
-#endif
-
-	if(!drw)
-		return NULL;
-	clr = (Clr *)calloc(1, sizeof(Clr));
-	if(!clr)
-		return NULL;
-	cmap = DefaultColormap(drw->dpy, drw->screen);
-
-#ifdef CONFIG_DWM_PANGO
-	if(!XftColorAllocName(drw->dpy, vis, cmap, clrname, color))
-#else
-	if(!XAllocNamedColor(drw->dpy, cmap, clrname, &color, &color))
-#endif
 
+	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);
-
-#ifdef CONFIG_DWM_PANGO
-	clr->rgb = color->pixel;
-#else
-	clr->rgb = color.pixel;
-#endif
+	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_setfont(Drw *drw, Fnt *font) {
-	if(drw)
-		drw->font = font;
+drw_setscheme(Drw *drw, ClrScheme *scheme)
+{
+	drw->scheme = scheme;
 }
 
 void
-drw_setscheme(Drw *drw, ClrScheme *scheme) {
-	if(drw && 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->font || !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->rgb : drw->scheme->fg->rgb);
-	dx = (drw->font->ascent + drw->font->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);
+	XSetForeground(drw->dpy, drw->gc, invert ? drw->scheme->bg->pix : drw->scheme->fg->pix);
+	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);
 }
 
-void
-drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, const char *text, int invert) {
-#ifdef CONFIG_DWM_PANGO
-	char buf[512];
-#else
-	char buf[256];
-#endif
-	int i, tx, ty, th, len, olen;
+int
+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;
+	XftDraw *d = NULL;
+	Fnt *curfont, *nextfont;
+	size_t i, len;
+	int utf8strlen, utf8charlen, render;
+	long utf8codepoint = 0;
+	const char *utf8str;
+	FcCharSet *fccharset;
+	FcPattern *fcpattern;
+	FcPattern *match;
+	XftResult result;
+	int charexists = 0;
+
+	if (!drw->scheme || !drw->fontcount)
+		return 0;
+
+	if (!(render = x || y || w || h)) {
+		w = ~w;
+	} 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);
+		d = XftDrawCreate(drw->dpy, drw->drawable,
+		                  DefaultVisual(drw->dpy, drw->screen),
+		                  DefaultColormap(drw->dpy, drw->screen));
+	}
 
-	if(!drw || !drw->scheme)
-		return;
-	XSetForeground(drw->dpy, drw->gc, invert ? drw->scheme->fg->rgb : drw->scheme->bg->rgb);
-	XFillRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w, h);
-	if(!text || !drw->font)
-		return;
-	olen = strlen(text);
-	drw_font_getexts(drw->font, text, olen, &tex);
-	th = drw->font->ascent + drw->font->descent;
-#ifdef CONFIG_DWM_PANGO
-	ty = y + (h / 2) - (th / 2);
-#else
-	ty = y + (h / 2) - (th / 2) + drw->font->ascent;
-#endif
-	tx = x + (h / 2);
-	/* shorten text if necessary */
-	/* shorten text if necessary (this could wreak havoc with pango markup but fortunately
-	   dc.w is adjusted to the width of the status text and not the other way around) */
-	for(len = MIN(olen, sizeof buf); len && (tex.w > w - tex.h || w < tex.h); len--)
-		drw_font_getexts(drw->font, text, len, &tex);
-	if(!len)
-		return;
-	memcpy(buf, text, len);
-	if(len < olen)
-		for(i = len; i && i > len - 3; buf[--i] = '.');
-#ifdef CONFIG_DWM_PANGO
-	//if(text == stext && statusmarkup)
-	//	pango_layout_set_markup(drw->font->layout, buf, len);
-	//else
-		pango_layout_set_text(drw->font->layout, buf, len);
-	//pango_xft_render_layout(drw->xft.drawable,
-	//	(struct XftColor*)(invert ? drw->scheme->bg->rgb : drw->scheme->fg->rgb),
-	//	drw->font->layout, x * PANGO_SCALE, y * PANGO_SCALE);
-	//if(text == stext && statusmarkup) /* clear markup attributes */
-	//	pango_layout_set_attributes(drw->font->layout, NULL);
-#else
-	XSetForeground(drw->dpy, drw->gc, invert ? drw->scheme->bg->rgb : drw->scheme->fg->rgb);
-	if(drw->font->set)
-		XmbDrawString(drw->dpy, drw->drawable, drw->font->set, drw->gc, tx, ty, buf, len);
-	else
-		XDrawString(drw->dpy, drw->drawable, drw->gc, tx, ty, buf, len);
-#endif
+	curfont = drw->fonts[0];
+	while (1) {
+		utf8strlen = 0;
+		utf8str = text;
+		nextfont = NULL;
+		while (*text) {
+			utf8charlen = utf8decode(text, &utf8codepoint, UTF_SIZ);
+			for (i = 0; i < drw->fontcount; i++) {
+				charexists = charexists || XftCharExists(drw->dpy, drw->fonts[i]->xfont, utf8codepoint);
+				if (charexists) {
+					if (drw->fonts[i] == curfont) {
+						utf8strlen += utf8charlen;
+						text += utf8charlen;
+					} else {
+						nextfont = drw->fonts[i];
+					}
+					break;
+				}
+			}
+
+			if (!charexists || (nextfont && nextfont != curfont))
+				break;
+			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--)
+				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 (render) {
+					th = curfont->ascent + curfont->descent;
+					ty = y + (h / 2) - (th / 2) + curfont->ascent;
+					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;
+			}
+		}
+
+		if (!*text) {
+			break;
+		} else if (nextfont) {
+			charexists = 0;
+			curfont = nextfont;
+		} else {
+			/* Regardless of whether or not a fallback font is found, the
+			 * character must be drawn.
+			 */
+			charexists = 1;
+
+			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");
+			}
+
+			fcpattern = FcPatternDuplicate(drw->fonts[0]->pattern);
+			FcPatternAddCharSet(fcpattern, FC_CHARSET, fccharset);
+			FcPatternAddBool(fcpattern, FC_SCALABLE, FcTrue);
+
+			FcConfigSubstitute(NULL, fcpattern, FcMatchPattern);
+			FcDefaultSubstitute(fcpattern);
+			match = XftFontMatch(drw->dpy, drw->screen, fcpattern, &result);
+
+			FcCharSetDestroy(fccharset);
+			FcPatternDestroy(fcpattern);
+
+			if (match) {
+				curfont = drw_font_xcreate(drw, NULL, match);
+				if (curfont && XftCharExists(drw->dpy, curfont->xfont, utf8codepoint)) {
+					drw->fonts[drw->fontcount++] = curfont;
+				} else {
+					drw_font_free(curfont);
+					curfont = drw->fonts[0];
+				}
+			}
+		}
+	}
+	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) {
-	if(!font || !text)
-		return;
+drw_font_getexts(Fnt *font, const char *text, unsigned int len, Extnts *tex)
+{
+	XGlyphInfo ext;
 
-#ifdef CONFIG_DWM_PANGO
-	PangoRectangle r;
-	//if(text == stext && statusmarkup)
-	//	pango_layout_set_markup(font->layout, text, len);
-	//else
-		pango_layout_set_text(font->layout, text, len);
-	pango_layout_get_extents(font->layout, 0, &r);
-	//if(text == stext && statusmarkup) /* clear markup attributes */
-	//	pango_layout_set_attributes(font->layout, NULL);
-	tex->h = r.height;
-	tex->w = r.width / PANGO_SCALE;
-#else
-	XRectangle r;
-	if(font->set) {
-		XmbTextExtents(font->set, text, len, NULL, &r);
-		tex->w = r.width;
-		tex->h = r.height;
-	}
-	else {
-		tex->h = font->ascent + font->descent;
-		tex->w = XTextWidth(font->xfont, text, len);
-	}
-#endif
+	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);