X-Git-Url: https://git.subgeniuskitty.com/xmenu/.git/blobdiff_plain/f8d55995dffb94166a38f510ea47bb0218e7bfbf..a48473fd8dfd9c8caa5eb9475d899c9b3b518523:/xmenu.c

diff --git a/xmenu.c b/xmenu.c
index 6e189cc..9aa3fb6 100644
--- a/xmenu.c
+++ b/xmenu.c
@@ -96,7 +96,6 @@ static Atom wmdelete;
 static Atom netatom[NetLast];
 
 /* flags */
-static int fflag = 0;   /* whether glyphs should align based on the first font */
 static int iflag = 0;   /* whether to disable icons */
 static int mflag = 0;   /* whether the user specified a monitor with -p */
 static int pflag = 0;   /* whether the user specified a position with -p */
@@ -118,11 +117,8 @@ main(int argc, char *argv[])
 	XClassHint classh;
 	int ch;
 
-	while ((ch = getopt(argc, argv, "fip:w")) != -1) {
+	while ((ch = getopt(argc, argv, "ip:w")) != -1) {
 		switch (ch) {
-		case 'f':
-			fflag = 1;
-			break;
 		case 'i':
 			iflag = 1;
 			break;
@@ -260,12 +256,17 @@ parsefonts(const char *s)
 		i = 0;
 		while (isspace(*p))
 			p++;
-		while (*p != '\0' && *p != ',') {
+		while (i < sizeof buf && *p != '\0' && *p != ',') {
 			buf[i++] = *p++;
 		}
+		if (i >= sizeof buf)
+			errx(1, "font name too long");
 		if (*p == ',')
 			p++;
 		buf[i] = '\0';
+		if (nfont == 0)
+			if ((dc.pattern = FcNameParse((FcChar8 *)buf)) == NULL)
+				errx(1, "the first font in the cache must be loaded from a font string");
 		if ((dc.fonts[nfont++] = XftFontOpenName(dpy, screen, buf)) == NULL)
 			errx(1, "cannot load font");
 	}
@@ -643,12 +644,49 @@ getnextutf8char(const char *s, const char **next_ret)
 static XftFont *
 getfontucode(FcChar32 ucode)
 {
+	FcCharSet *fccharset = NULL;
+	FcPattern *fcpattern = NULL;
+	FcPattern *match = NULL;
+	XftFont *retfont = NULL;
+	XftResult result;
 	size_t i;
 
 	for (i = 0; i < dc.nfonts; i++)
 		if (XftCharExists(dpy, dc.fonts[i], ucode) == FcTrue)
 			return dc.fonts[i];
-	return NULL;
+
+	/* create a charset containing our code point */
+	fccharset = FcCharSetCreate();
+	FcCharSetAddChar(fccharset, ucode);
+
+	/* create a pattern akin to the dc.pattern but containing our charset */
+	if (fccharset) {
+		fcpattern = FcPatternDuplicate(dc.pattern);
+		FcPatternAddCharSet(fcpattern, FC_CHARSET, fccharset);
+	}
+
+	/* find pattern matching fcpattern */
+	if (fcpattern) {
+		FcConfigSubstitute(NULL, fcpattern, FcMatchPattern);
+		FcDefaultSubstitute(fcpattern);
+		match = XftFontMatch(dpy, screen, fcpattern, &result);
+	}
+
+	/* if found a pattern, open its font */
+	if (match) {
+		retfont = XftFontOpenPattern(dpy, match);
+		if (retfont && XftCharExists(dpy, retfont, ucode) == FcTrue) {
+			if ((dc.fonts = realloc(dc.fonts, dc.nfonts+1)) == NULL)
+				err(1, "realloc");
+			dc.fonts[dc.nfonts] = retfont;
+			return dc.fonts[dc.nfonts++];
+		} else {
+			XftFontClose(dpy, retfont);
+		}
+	}
+
+	/* in case no fount was found, return the first one */
+	return dc.fonts[0];
 }
 
 /* draw text into XftDraw, return width of text glyphs */
@@ -656,9 +694,6 @@ static int
 drawtext(XftDraw *draw, XftColor *color, int x, int y, unsigned h, const char *text)
 {
 	int textwidth = 0;
-	int texty;
-
-	texty = y + (h - (dc.fonts[0]->ascent + dc.fonts[0]->descent))/2 + dc.fonts[0]->ascent;
 
 	while (*text) {
 		XftFont *currfont;
@@ -668,17 +703,16 @@ drawtext(XftDraw *draw, XftColor *color, int x, int y, unsigned h, const char *t
 		size_t len;
 
 		ucode = getnextutf8char(text, &next);
-		if ((currfont = getfontucode(ucode)) == NULL)
-			currfont = dc.fonts[0];
+		currfont = getfontucode(ucode);
 
 		len = next - text;
-
 		XftTextExtentsUtf8(dpy, currfont, (XftChar8 *)text, len, &ext);
 		textwidth += ext.xOff;
 
 		if (draw) {
-			if (!fflag)
-				texty = y + (h - (currfont->ascent + currfont->descent))/2 + currfont->ascent;
+			int texty;
+
+			texty = y + (h - (currfont->ascent + currfont->descent))/2 + currfont->ascent;
 			XftDrawStringUtf8(draw, color, currfont, x, texty, (XftChar8 *)text, len);
 			x += ext.xOff;
 		}
@@ -1280,6 +1314,6 @@ cleanup(void)
 static void
 usage(void)
 {
-	(void)fprintf(stderr, "usage: xmenu [-fiw] [-p position] [title]\n");
+	(void)fprintf(stderr, "usage: xmenu [-iw] [-p position] [title]\n");
 	exit(1);
 }