X-Git-Url: https://git.subgeniuskitty.com/xmenu/.git/blobdiff_plain/ed1650a70f7523b2b3503773340c50850cc44101..7b166488b17ae35da1cbcb86e645a68a174e93a2:/xmenu.c

diff --git a/xmenu.c b/xmenu.c
index d6b2cde..0cc56ac 100644
--- a/xmenu.c
+++ b/xmenu.c
@@ -316,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) {
@@ -331,9 +333,9 @@ initmonitor(void)
 static void
 initresources(void)
 {
-	char *xrm;
 	long n;
 	char *type;
+	char *xrm;
 	XrmDatabase xdb;
 	XrmValue xval;
 
@@ -574,8 +576,6 @@ parsestdin(void)
 			file = label + 4;
 			label = strtok(NULL, "\t\n");
 		}
-		if (file && *file == '\0')
-			errx(1, "blank icon filename");
 
 		/* get the output */
 		output = strtok(NULL, "\n");
@@ -897,7 +897,10 @@ loadicon(const char *file)
 	int imgsize;
 
 	icon = imlib_load_image_with_error_return(file, &errcode);
-	if (icon == NULL) {
+	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";
@@ -933,7 +936,8 @@ loadicon(const char *file)
 			errstr = "unknown error";
 			break;
 		}
-		errx(1, "could not load icon (%s): %s", errstr, file);
+		warnx("could not load icon (%s): %s", errstr, file);
+		return NULL;
 	}
 
 	imlib_context_set_image(icon);
@@ -1011,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();
 			}
 		}
 	}
@@ -1140,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;
@@ -1247,15 +1272,19 @@ 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) &&
+			} 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;
@@ -1311,13 +1340,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);
 	}