X-Git-Url: http://git.subgeniuskitty.com/xmenu/.git/blobdiff_plain/d2304ecf9371041fd4e58709ace7fefb22cef53c..c2959cf43954975a2b5913009799b8308463d6c1:/xmenu.c

diff --git a/xmenu.c b/xmenu.c
index e624ac0..76761cc 100644
--- a/xmenu.c
+++ b/xmenu.c
@@ -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 */
@@ -141,7 +142,7 @@ main(int argc, char *argv[])
 
 	/* open connection to server and set X variables */
 	if ((dpy = XOpenDisplay(NULL)) == NULL)
-		errx(1, "cannot open display");
+		errx(1, "could not open display");
 	screen = DefaultScreen(dpy);
 	visual = DefaultVisual(dpy, screen);
 	rootwin = RootWindow(dpy, screen);
@@ -255,14 +256,18 @@ 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");
+			errx(1, "could not load font");
 	}
 }
 
@@ -271,7 +276,7 @@ static void
 ealloccolor(const char *s, XftColor *color)
 {
 	if(!XftColorAllocName(dpy, visual, colormap, s, color))
-		errx(1, "cannot allocate color: %s", s);
+		errx(1, "could not allocate color: %s", s);
 }
 
 /* query monitor information and cursor position */
@@ -295,7 +300,7 @@ initmonitor(void)
 	if ((info = XineramaQueryScreens(dpy, &nmons)) != NULL) {
 		int selmon = 0;
 
-		if (!mflag || (mflag && (config.monitor < 0 || config.monitor >= nmons))) {
+		if (!mflag || config.monitor < 0 || config.monitor >= nmons) {
 			for (i = 0; i < nmons; i++) {
 				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)) {
@@ -311,6 +316,8 @@ initmonitor(void)
 		mon.y = info[selmon].y_org;
 		mon.w = info[selmon].width;
 		mon.h = info[selmon].height;
+
+		XFree(info);
 	}
 
 	if (!pflag) {
@@ -326,9 +333,9 @@ initmonitor(void)
 static void
 initresources(void)
 {
-	char *xrm;
 	long n;
 	char *type;
+	char *xrm;
 	XrmDatabase xdb;
 	XrmValue xval;
 
@@ -509,7 +516,7 @@ buildmenutree(unsigned level, const char *label, const char *output, char *file)
 			  menu = menu->parent, i++)
 			;
 		if (menu == NULL)
-			errx(1, "reached NULL menu");
+			errx(1, "improper indentation detected");
 
 		/* find last item in the new menu */
 		for (item = menu->list; item->next != NULL; item = item->next)
@@ -634,51 +641,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 + currfont->descent))/2 + currfont->ascent;
-			XftDrawStringUtf8(draw, color, currfont, x, texty,
-			                  (XftChar8 *)s, len);
+			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 */
@@ -823,7 +866,7 @@ grabpointer(void)
 			return;
 		nanosleep(&ts, NULL);
 	}
-	errx(1, "cannot grab keyboard");
+	errx(1, "could not grab pointer");
 }
 
 /* try to grab keyboard, we may have to wait for another process to ungrab */
@@ -839,7 +882,7 @@ grabkeyboard(void)
 			return;
 		nanosleep(&ts, NULL);
 	}
-	errx(1, "cannot grab keyboard");
+	errx(1, "could not grab keyboard");
 }
 
 /* load and scale icon */
@@ -847,13 +890,55 @@ static Imlib_Image
 loadicon(const char *file)
 {
 	Imlib_Image icon;
+	Imlib_Load_Error errcode;
+	const char *errstr;
 	int width;
 	int height;
 	int imgsize;
 
-	icon = imlib_load_image(file);
-	if (icon == NULL)
-		errx(1, "cannot load icon %s", file);
+	icon = imlib_load_image_with_error_return(file, &errcode);
+	if (*file == '\0') {
+		warnx("could not load icon (file name is blank)");
+		return NULL;
+	} else if (icon == NULL) {
+		switch (errcode) {
+		case IMLIB_LOAD_ERROR_FILE_DOES_NOT_EXIST:
+			errstr = "file does not exist";
+			break;
+		case IMLIB_LOAD_ERROR_FILE_IS_DIRECTORY:
+			errstr = "file is directory";
+			break;
+		case IMLIB_LOAD_ERROR_PERMISSION_DENIED_TO_READ:
+		case IMLIB_LOAD_ERROR_PERMISSION_DENIED_TO_WRITE:
+			errstr = "permission denied";
+			break;
+		case IMLIB_LOAD_ERROR_NO_LOADER_FOR_FILE_FORMAT:
+			errstr = "unknown file format";
+			break;
+		case IMLIB_LOAD_ERROR_PATH_TOO_LONG:
+			errstr = "path too long";
+			break;
+		case IMLIB_LOAD_ERROR_PATH_COMPONENT_NON_EXISTANT:
+		case IMLIB_LOAD_ERROR_PATH_COMPONENT_NOT_DIRECTORY:
+		case IMLIB_LOAD_ERROR_PATH_POINTS_OUTSIDE_ADDRESS_SPACE:
+			errstr = "improper path";
+			break;
+		case IMLIB_LOAD_ERROR_TOO_MANY_SYMBOLIC_LINKS:
+			errstr = "too many symbolic links";
+			break;
+		case IMLIB_LOAD_ERROR_OUT_OF_MEMORY:
+			errstr = "out of memory";
+			break;
+		case IMLIB_LOAD_ERROR_OUT_OF_FILE_DESCRIPTORS:
+			errstr = "out of file descriptors";
+			break;
+		default:
+			errstr = "unknown error";
+			break;
+		}
+		warnx("could not load icon (%s): %s", errstr, file);
+		return NULL;
+	}
 
 	imlib_context_set_image(icon);
 
@@ -930,15 +1015,21 @@ drawitems(struct Menu *menu)
 				             Convex, CoordModeOrigin);
 			}
 
-			/* draw icon */
-			if (item->file != NULL && !iflag) {
+			/* try to load icon */
+			if (item->file && !iflag) {
 				item->icon = loadicon(item->file);
+				free(item->file);
+			}
 
+			/* draw icon if properly loaded */
+			if (item->icon) {
 				imlib_context_set_image(item->icon);
 				imlib_context_set_drawable(item->sel);
 				imlib_render_image_on_drawable(config.horzpadding, config.iconpadding);
 				imlib_context_set_drawable(item->unsel);
 				imlib_render_image_on_drawable(config.horzpadding, config.iconpadding);
+				imlib_context_set_image(item->icon);
+				imlib_free_image();
 			}
 		}
 	}
@@ -1059,38 +1150,53 @@ getitem(struct Menu *menu, int y)
 static struct Item *
 itemcycle(struct Menu *currmenu, int direction)
 {
-	struct Item *item;
+	struct Item *item = NULL;
 	struct Item *lastitem;
 
-	item = NULL;
+	for (lastitem = currmenu->list; lastitem && lastitem->next; lastitem = lastitem->next)
+		;
 
-	if (direction == ITEMNEXT) {
+	/* select item (either separator or labeled item) in given direction */
+	switch (direction) {
+	case ITEMNEXT:
 		if (currmenu->selected == NULL)
 			item = currmenu->list;
 		else if (currmenu->selected->next != NULL)
 			item = currmenu->selected->next;
-
-		while (item != NULL && item->label == NULL)
-			item = item->next;
-
-		if (item == NULL)
-			item = currmenu->list;
-	} else {
-		for (lastitem = currmenu->list;
-		     lastitem != NULL && lastitem->next != NULL;
-		     lastitem = lastitem->next)
-			;
-
+		break;
+	case ITEMPREV:
 		if (currmenu->selected == NULL)
 			item = lastitem;
 		else if (currmenu->selected->prev != NULL)
 			item = currmenu->selected->prev;
+		break;
+	case ITEMFIRST:
+		item = currmenu->list;
+		break;
+	case ITEMLAST:
+		item = lastitem;
+		break;
+	}
 
+	/*
+	 * the selected item can be a separator
+	 * let's select the closest labeled item (ie., one that isn't a separator)
+	 */
+	switch (direction) {
+	case ITEMNEXT:
+	case ITEMFIRST:
+		while (item != NULL && item->label == NULL)
+			item = item->next;
+		if (item == NULL)
+			item = currmenu->list;
+		break;
+	case ITEMPREV:
+	case ITEMLAST:
 		while (item != NULL && item->label == NULL)
 			item = item->prev;
-
 		if (item == NULL)
 			item = lastitem;
+		break;
 	}
 
 	return item;
@@ -1103,6 +1209,7 @@ run(struct Menu *currmenu)
 	struct Menu *menu;
 	struct Item *item;
 	struct Item *previtem = NULL;
+	struct Item *lastitem;
 	KeySym ksym;
 	XEvent ev;
 
@@ -1166,15 +1273,26 @@ selectitem:
 
 			/* cycle through menu */
 			item = NULL;
-			if (ksym == XK_ISO_Left_Tab || ksym == XK_Up) {
+			if (ksym == XK_Home || ksym == KSYMFIRST) {
+				item = itemcycle(currmenu, ITEMFIRST);
+			} else if (ksym == XK_End || ksym == KSYMLAST) {
+				item = itemcycle(currmenu, ITEMLAST);
+			} else if (ksym == XK_ISO_Left_Tab || ksym == XK_Up || ksym == KSYMUP) {
 				item = itemcycle(currmenu, ITEMPREV);
-			} else if (ksym == XK_Tab || ksym == XK_Down) {
+			} else if (ksym == XK_Tab || ksym == XK_Down || ksym == KSYMDOWN) {
 				item = itemcycle(currmenu, ITEMNEXT);
-			} else if ((ksym == XK_Return || ksym == XK_Right) &&
-			           currmenu->selected != NULL) {
+			} else if (ksym >= XK_1 && ksym <= XK_9){
+				item = itemcycle(currmenu, ITEMFIRST);
+				lastitem = itemcycle(currmenu, ITEMLAST);
+				for (int i = ksym - XK_1; i > 0 && item != lastitem; i--) {
+					currmenu->selected = item;
+					item = itemcycle(currmenu, ITEMNEXT);
+				}
+			} else if ((ksym == XK_Return || ksym == XK_Right || ksym == KSYMRIGHT) &&
+			            currmenu->selected != NULL) {
 				item = currmenu->selected;
 				goto selectitem;
-			} else if ((ksym == XK_Escape || ksym == XK_Left) &&
+			} else if ((ksym == XK_Escape || ksym == XK_Left || ksym == KSYMLEFT) &&
 			           currmenu->parent != NULL) {
 				item = currmenu->parent->selected;
 				currmenu = currmenu->parent;
@@ -1230,13 +1348,6 @@ cleanmenu(struct Menu *menu)
 		if (tmp->label != tmp->output)
 			free(tmp->label);
 		free(tmp->output);
-		if (tmp->file != NULL) {
-			free(tmp->file);
-			if (tmp->icon != NULL) {
-				imlib_context_set_image(tmp->icon);
-				imlib_free_image();
-			}
-		}
 		item = item->next;
 		free(tmp);
 	}
@@ -1249,6 +1360,8 @@ cleanmenu(struct Menu *menu)
 static void
 cleanup(void)
 {
+	size_t i;
+
 	XUngrabPointer(dpy, CurrentTime);
 	XUngrabKeyboard(dpy, CurrentTime);
 
@@ -1259,6 +1372,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);
 }