X-Git-Url: https://git.subgeniuskitty.com/xmenu/.git/blobdiff_plain/c15958bd964018bc17969fc1d8be5471831de7f3..7539247be35bae830dcc467d5fb415fdcaf99eed:/xmenu.c

diff --git a/xmenu.c b/xmenu.c
index 0d964e0..c5a0795 100644
--- a/xmenu.c
+++ b/xmenu.c
@@ -297,8 +297,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;
 				}
@@ -437,10 +437,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;
@@ -461,12 +457,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;
@@ -541,6 +538,9 @@ buildmenutree(unsigned level, const char *label, const char *output, char *file)
 		curritem->prev = NULL;
 	}
 
+	if (curritem->file)
+		prevmenu->hasicon = 1;
+
 	return rootmenu;
 }
 
@@ -701,7 +701,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;
 
@@ -718,7 +718,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);
 	}
 }
@@ -751,10 +751,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;
 	}
@@ -902,7 +900,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);
@@ -1251,6 +1249,8 @@ cleanmenu(struct Menu *menu)
 static void
 cleanup(void)
 {
+	size_t i;
+
 	XUngrabPointer(dpy, CurrentTime);
 	XUngrabKeyboard(dpy, CurrentTime);
 
@@ -1261,6 +1261,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);
 }