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

diff --git a/xmenu.c b/xmenu.c
index 4a4ffca..9aa3fb6 100644
--- a/xmenu.c
+++ b/xmenu.c
@@ -30,7 +30,7 @@ static void ealloccolor(const char *s, XftColor *color);
 static void initmonitor(void);
 static void initresources(void);
 static void initdc(void);
-static void initconfig(void);
+static void initiconsize(void);
 static void initatoms(void);
 
 /* structure builders, and their helper routines */
@@ -41,6 +41,7 @@ static struct Menu *parsestdin(void);
 
 /* text drawer, and its helper routine */
 static FcChar32 getnextutf8char(const char *s, const char **end_ret);
+static XftFont *getfontucode(FcChar32 ucode);
 static int drawtext(XftDraw *draw, XftColor *color, int x, int y, unsigned h, const char *text);
 
 /* structure setters, and their helper routines */
@@ -160,7 +161,7 @@ main(int argc, char *argv[])
 	initmonitor();
 	initresources();
 	initdc();
-	initconfig();
+	initiconsize();
 	initatoms();
 
 	/* set window class */
@@ -255,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");
 	}
@@ -297,8 +303,8 @@ initmonitor(void)
 
 		if (!mflag || (mflag && (config.monitor < 0 || config.monitor >= nmons))) {
 			for (i = 0; i < nmons; i++) {
-				if (cursx >= info[i].x_org && cursx <= info[i].x_org + info[i].width &&
-				    cursy >= info[i].y_org && cursy <= info[i].y_org + info[i].height) {
+				if (BETWEEN(cursx, info[i].x_org, info[i].x_org + info[i].width) &&
+				    BETWEEN(cursy, info[i].y_org, info[i].y_org + info[i].height)) {
 					selmon = i;
 					break;
 				}
@@ -390,12 +396,10 @@ initdc(void)
 	dc.gc = XCreateGC(dpy, rootwin, 0, NULL);
 }
 
-/* calculate configuration values that are not set manually */
+/* calculate icon size */
 static void
-initconfig(void)
+initiconsize(void)
 {
-	config.screenw = DisplayWidth(dpy, screen);
-	config.screenh = DisplayHeight(dpy, screen);
 	config.iconsize = config.height_pixels - config.iconpadding * 2;
 }
 
@@ -439,10 +443,6 @@ allocitem(const char *label, const char *output, char *file)
 	}
 	item->y = 0;
 	item->h = 0;
-	if (item->label == NULL)
-		item->labellen = 0;
-	else
-		item->labellen = strlen(item->label);
 	item->next = NULL;
 	item->submenu = NULL;
 	item->icon = NULL;
@@ -463,12 +463,13 @@ allocmenu(struct Menu *parent, struct Item *list, unsigned level)
 	menu->list = list;
 	menu->caller = NULL;
 	menu->selected = NULL;
-	menu->w = 0;    /* calculated by setupmenu() */
-	menu->h = 0;    /* calculated by setupmenu() */
-	menu->x = 0;    /* calculated by setupmenu() */
-	menu->y = 0;    /* calculated by setupmenu() */
+	menu->w = 0;        /* recalculated by setupmenu() */
+	menu->h = 0;        /* recalculated by setupmenu() */
+	menu->x = mon.x;    /* recalculated by setupmenu() */
+	menu->y = mon.y;    /* recalculated by setupmenu() */
 	menu->level = level;
 	menu->drawn = 0;
+	menu->hasicon = 0;
 
 	swa.override_redirect = (wflag) ? False : True;
 	swa.background_pixel = dc.normal[ColorBG].pixel;
@@ -543,6 +544,9 @@ buildmenutree(unsigned level, const char *label, const char *output, char *file)
 		curritem->prev = NULL;
 	}
 
+	if (curritem->file)
+		prevmenu->hasicon = 1;
+
 	return rootmenu;
 }
 
@@ -636,51 +640,87 @@ getnextutf8char(const char *s, const char **next_ret)
 	return ucode;
 }
 
-/* draw text into XftDraw */
+/* get which font contains a given code point */
+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];
+
+	/* 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 */
 static int
 drawtext(XftDraw *draw, XftColor *color, int x, int y, unsigned h, const char *text)
 {
-	const char *s, *nexts;
-	FcChar32 ucode;
-	XftFont *currfont;
-	int textlen = 0;
+	int textwidth = 0;
 
-	s = text;
-	while (*s) {
+	while (*text) {
+		XftFont *currfont;
 		XGlyphInfo ext;
-		int charexists;
+		FcChar32 ucode;
+		const char *next;
 		size_t len;
-		size_t i;
-
-		charexists = 0;
-		ucode = getnextutf8char(s, &nexts);
-		for (i = 0; i < dc.nfonts; i++) {
-			charexists = XftCharExists(dpy, dc.fonts[i], ucode);
-			if (charexists)
-				break;
-		}
-		if (charexists)
-			currfont = dc.fonts[i];
 
-		len = nexts - s;
+		ucode = getnextutf8char(text, &next);
+		currfont = getfontucode(ucode);
 
-		XftTextExtentsUtf8(dpy, currfont, (XftChar8 *)s,
-		                   len, &ext);
-		textlen += ext.xOff;
+		len = next - text;
+		XftTextExtentsUtf8(dpy, currfont, (XftChar8 *)text, len, &ext);
+		textwidth += ext.xOff;
 
 		if (draw) {
 			int texty;
 
-			texty = y + (h + currfont->ascent) / 2;
-			XftDrawStringUtf8(draw, color, currfont, x, texty,
-			                  (XftChar8 *)s, len);
+			texty = y + (h - (currfont->ascent + currfont->descent))/2 + currfont->ascent;
+			XftDrawStringUtf8(draw, color, currfont, x, texty, (XftChar8 *)text, len);
 			x += ext.xOff;
 		}
 
-		s = nexts;
+		text = next;
 	}
 
-	return textlen;
+	return textwidth;
 }
 
 /* setup the height, width and icon of the items of a menu */
@@ -703,7 +743,7 @@ setupitems(struct Menu *menu)
 		menu->h += item->h;
 
 		if (item->label)
-			textwidth = drawtext(NULL, NULL, 0, 0, item->h, item->label);
+			textwidth = drawtext(NULL, NULL, 0, 0, 0, item->label);
 		else
 			textwidth = 0;
 
@@ -720,7 +760,7 @@ setupitems(struct Menu *menu)
 		 * padding appears 3 times: before the label and around the triangle.
 		 */
 		itemwidth = textwidth + config.triangle_width + config.horzpadding * 3;
-		itemwidth += (iflag) ? 0 : config.iconsize + config.horzpadding;
+		itemwidth += (iflag || !menu->hasicon) ? 0 : config.iconsize + config.horzpadding;
 		menu->w = MAX(menu->w, itemwidth);
 	}
 }
@@ -741,7 +781,7 @@ setupmenupos(struct Menu *menu)
 
 		if (pflag || (config.posy > mon.y && mon.y + mon.h - config.posy >= height))
 			menu->y = config.posy;
-		else if (config.screenh > height)
+		else if (mon.y + mon.h > height)
 			menu->y = mon.y + mon.h - height;
 	} else {                    /* else, calculate in respect to parent menu */
 		int parentwidth;
@@ -753,10 +793,8 @@ setupmenupos(struct Menu *menu)
 		else if (menu->parent->x > menu->w + config.border_pixels + config.gap_pixels)
 			menu->x = menu->parent->x - menu->w - config.border_pixels - config.gap_pixels;
 
-		if (mon.y + mon.h - (menu->caller->y + menu->parent->y) > height)
+		if (mon.y + mon.h - (menu->caller->y + menu->parent->y) >= height)
 			menu->y = menu->caller->y + menu->parent->y;
-		else if (mon.y + mon.h - menu->parent->y > height)
-			menu->y = menu->parent->y;
 		else if (mon.y + mon.h > height)
 			menu->y = mon.y + mon.h - height;
 	}
@@ -793,7 +831,7 @@ setupmenu(struct Menu *menu, XClassHint *classh)
 	XStringListToTextProperty(&title, 1, &wintitle);
 
 	/* set window manager hints */
-	sizeh.flags = PMaxSize | PMinSize;
+	sizeh.flags = USPosition | PMaxSize | PMinSize;
 	sizeh.min_width = sizeh.max_width = menu->w;
 	sizeh.min_height = sizeh.max_height = menu->h;
 	XSetWMProperties(dpy, menu->win, &wintitle, NULL, NULL, 0, &sizeh, NULL, classh);
@@ -904,7 +942,7 @@ drawitems(struct Menu *menu)
 
 			/* draw text */
 			x = config.horzpadding;
-			x += (iflag) ? 0 : config.horzpadding + config.iconsize;
+			x += (iflag || !menu->hasicon) ? 0 : config.horzpadding + config.iconsize;
 			dsel = XftDrawCreate(dpy, item->sel, visual, colormap);
 			dunsel = XftDrawCreate(dpy, item->unsel, visual, colormap);
 			XSetForeground(dpy, dc.gc, dc.selected[ColorFG].pixel);
@@ -1253,6 +1291,8 @@ cleanmenu(struct Menu *menu)
 static void
 cleanup(void)
 {
+	size_t i;
+
 	XUngrabPointer(dpy, CurrentTime);
 	XUngrabKeyboard(dpy, CurrentTime);
 
@@ -1263,6 +1303,9 @@ cleanup(void)
 	XftColorFree(dpy, visual, colormap, &dc.separator);
 	XftColorFree(dpy, visual, colormap, &dc.border);
 
+	for (i = 0; i < dc.nfonts; i++)
+		XftFontClose(dpy, dc.fonts[i]);
+
 	XFreeGC(dpy, dc.gc);
 	XCloseDisplay(dpy);
 }