X-Git-Url: http://git.subgeniuskitty.com/xmenu/.git/blobdiff_plain/f15fc33987e48f42dc42bbdc41992107a7e3faa8..dddba407f43a5b9ef23e8a0ed387742a740e08f5:/xmenu.c

diff --git a/xmenu.c b/xmenu.c
index 4bd78cb..41303cc 100644
--- a/xmenu.c
+++ b/xmenu.c
@@ -8,6 +8,8 @@
 
 /* macros */
 #define LEN(x) (sizeof (x) / sizeof (x[0]))
+#define MAX(x,y) ((x)>(y)?(x):(y))
+#define MIN(x,y) ((x)<(y)?(x):(y))
 
 /* color enum */
 enum {ColorFG, ColorBG, ColorLast};
@@ -41,23 +43,25 @@ struct ScreenGeometry {
 
 /* menu item structure */
 struct Item {
-	char *label;
-	char *output;
-	int y;
-	int h;
-	struct Item *next;
-	struct Menu *submenu;
+	char *label;            /* string to be drawed on menu */
+	char *output;           /* string to be outputed when item is clicked */
+	int y;                  /* item y position relative to menu */
+	int h;                  /* item height */
+	size_t labellen;        /* strlen(label) */
+	struct Item *next;      /* next item */
+	struct Menu *submenu;   /* submenu spawned by clicking on item */
 };
 
 /* menu structure */
 struct Menu {
-	struct Menu *parent;
-	struct Item *list;
-	struct Item *selected;
-	int x, y, w, h;
-	unsigned level;
-	Drawable pixmap;
-	Window win;
+	struct Menu *parent;    /* parent menu */
+	struct Item *caller;    /* item that spawned the menu */
+	struct Item *list;      /* list of items contained by the menu */
+	struct Item *selected;  /* item currently selected in the menu */
+	int x, y, w, h;         /* menu geometry */
+	unsigned level;         /* menu level relative to root */
+	Drawable pixmap;        /* pixmap to draw the menu on */
+	Window win;             /* menu window to map on the screen */
 };
 
 /* function declarations */
@@ -75,7 +79,7 @@ static void setcurrmenu(struct Menu *currmenu_new);
 static void parsestdin(void);
 static void run(void);
 static void freewindow(struct Menu *menu);
-static void cleanupexit(void);
+static void cleanup(void);
 static void usage(void);
 
 /* X variables */
@@ -135,10 +139,16 @@ main(int argc, char *argv[])
 	calcscreengeom();
 	calcmenu(rootmenu);
 
+	/* map root menu */
+	currmenu = rootmenu;
+	XMapWindow(dpy, rootmenu->win);
+
 	/* run event loop */
 	run();
 
-	return 1;   /* UNREACHABLE */
+	cleanup();
+
+	return 0;
 }
 
 /* get color from color string */
@@ -212,6 +222,10 @@ allocitem(const char *label, const char *output)
 	}
 	item->y = 0;
 	item->h = item->label ? geom.itemh : geom.separator;
+	if (item->label == NULL)
+		item->labellen = 0;
+	else
+		item->labellen = strlen(item->label);
 	item->next = NULL;
 	item->submenu = NULL;
 
@@ -229,6 +243,7 @@ allocmenu(struct Menu *parent, struct Item *list, unsigned level)
 		err(1, "malloc");
 	menu->parent = parent;
 	menu->list = list;
+	menu->caller = NULL;
 	menu->selected = NULL;
 	menu->w = geom.itemw;
 	menu->h = 0;    /* calculated by calcmenu() */
@@ -321,6 +336,7 @@ parsestdin(void)
 				;
 
 			item->submenu = menu;
+			menu->caller = item;
 
 			prevmenu = menu;
 		}
@@ -348,14 +364,19 @@ calcmenu(struct Menu *menu)
 	XWindowChanges changes;
 	XSizeHints sizeh;
 	struct Item *item;
+	int labelwidth;
 
-	/* calculate items positions and menu height */
+	/* calculate items positions and menu width and height */
+	menu->w = geom.itemw;
 	for (item = menu->list; item != NULL; item = item->next) {
 		item->y = menu->h;
 		if (item->label == NULL)   /* height for separator item */
 			menu->h += geom.separator;
 		else
 			menu->h += geom.itemh;
+
+		labelwidth = XTextWidth(dc.font, item->label, item->labellen) + dc.fonth * 2;
+		menu->w = MAX(menu->w, labelwidth);
 	}
 
 	/* calculate menu's x and y positions */
@@ -390,9 +411,10 @@ calcmenu(struct Menu *menu)
 
 	/* update menu geometry */
 	changes.height = menu->h;
+	changes.width = menu->w;
 	changes.x = menu->x;
 	changes.y = menu->y;
-	XConfigureWindow(dpy, menu->win, CWHeight | CWX | CWY, &changes);
+	XConfigureWindow(dpy, menu->win, CWWidth | CWHeight | CWX | CWY, &changes);
 
 	/* set window manager size hints */
 	sizeh.flags = PMaxSize | PMinSize;
@@ -439,19 +461,52 @@ done:
 static void
 setcurrmenu(struct Menu *currmenu_new)
 {
-	struct Menu *menu;
+	struct Menu *menu, *menu_;
+	struct Item *item;
+	struct Menu *lcamenu;   /* lowest common ancestor menu */
+	unsigned minlevel;      /* level of the closest to root menu */
+	unsigned maxlevel;      /* level of the closest to root menu */
 
 	if (currmenu_new == currmenu)
 		return;
 
-	for (menu = currmenu; menu != NULL; menu = menu->parent) {
+	/* find lowest common ancestor menu */
+	lcamenu = rootmenu;
+	if (currmenu != NULL) {
+		minlevel = MIN(currmenu_new->level, currmenu->level);
+		maxlevel = MAX(currmenu_new->level, currmenu->level);
+		if (currmenu_new->level == maxlevel) {
+			menu = currmenu_new;
+			menu_ = currmenu;
+		} else {
+			menu = currmenu;
+			menu_ = currmenu_new;
+		}
+		while (menu->level > minlevel)
+			menu = menu->parent;
+
+		while (menu != menu_) {
+			menu = menu->parent;
+			menu_ = menu_->parent;
+		}
+		lcamenu = menu;
+	}
+
+	/* unmap menus from currmenu (inclusive) until lcamenu (exclusive) */
+	for (menu = currmenu; menu != lcamenu; menu = menu->parent) {
 		XUnmapWindow(dpy, menu->win);
 	}
 
 	currmenu = currmenu_new;
 
-	for (menu = currmenu; menu != NULL; menu = menu->parent)
+	/* map menus from currmenu (inclusive) until lcamenu (exclusive) */
+	item = NULL;
+	for (menu = currmenu; menu != lcamenu; menu = menu->parent) {
 		XMapWindow(dpy, menu->win);
+		if (item != NULL)
+			menu->selected = item;
+		item = menu->caller;
+	}
 }
 
 /* draw items of the current menu and of its ancestors */
@@ -464,7 +519,6 @@ drawmenu(void)
 	for (menu = currmenu; menu != NULL; menu = menu->parent) {
 		for (item = menu->list; item != NULL; item = item->next) {
 			unsigned long *color;
-			size_t labellen;
 			int labelx, labely;
 
 			/* determine item color */
@@ -477,29 +531,31 @@ drawmenu(void)
 
 			/* draw item box */
 			XSetForeground(dpy, dc.gc, color[ColorBG]);
+			XDrawRectangle(dpy, menu->pixmap, dc.gc, 0, item->y,
+			               menu->w, item->h);
 			XFillRectangle(dpy, menu->pixmap, dc.gc, 0, item->y,
-			               geom.itemw, item->h);
+			               menu->w, item->h);
 
 			/* continue if item is a separator */
 			if (item->label == NULL)
 				continue;
 
 			/* draw item label */
-			labellen = strlen(item->label);
 			labelx = 0 + dc.fonth;
 			labely = item->y + dc.fonth + geom.itemb;
 			XSetForeground(dpy, dc.gc, color[ColorFG]);
-			XDrawString(dpy, menu->pixmap, dc.gc, labelx, labely, item->label, labellen);
+			XDrawString(dpy, menu->pixmap, dc.gc, labelx, labely,
+			            item->label, item->labellen);
 
 			/* draw triangle, if item contains a submenu */
 			if (item->submenu != NULL) {
-				int trianglex = geom.itemw - (geom.itemb + dc.fonth);
-				int triangley = item->y + geom.itemb;
+				int trianglex = menu->w - dc.fonth + geom.itemb - 1;
+				int triangley = item->y + (3 * item->h)/8 -1;
 
 				XPoint triangle[] = {
 					{trianglex, triangley},
-					{trianglex + dc.fonth, triangley + dc.fonth/2},
-					{trianglex, triangley + dc.fonth},
+					{trianglex + item->h/8 + 1, item->y + item->h/2},
+					{trianglex, triangley + item->h/4 + 2},
 					{trianglex, triangley}
 				};
 
@@ -522,8 +578,6 @@ run(void)
 	struct Item *previtem = NULL;
 	XEvent ev;
 
-	setcurrmenu(rootmenu);
-
 	while (!XNextEvent(dpy, &ev)) {
 		switch(ev.type) {
 		case Expose:
@@ -538,9 +592,11 @@ run(void)
 					else
 						setcurrmenu(menu);
 					previtem = item;
-				} else if (menu->selected != item)
+					drawmenu();
+				} else if (menu->selected != item) {
 					menu->selected = item;
-				drawmenu();
+					drawmenu();
+				}
 			}
 			break;
 		case ButtonRelease:
@@ -552,11 +608,11 @@ run(void)
 					setcurrmenu(item->submenu);
 				} else {
 					printf("%s\n", item->output);
-					cleanupexit();
+					return;
 				}
 				drawmenu();
 			} else {
-				cleanupexit();
+				return;
 			}
 			break;
 		case LeaveNotify:
@@ -583,19 +639,18 @@ freewindow(struct Menu *menu)
 
 /* cleanup and exit */
 static void
-cleanupexit(void)
+cleanup(void)
 {
 	freewindow(rootmenu);
 	XFreeFont(dpy, dc.font);
 	XFreeGC(dpy, dc.gc);
 	XCloseDisplay(dpy);
-	exit(0);
 }
 
 /* show usage */
 static void
 usage(void)
 {
-	(void)fprintf(stderr, "usage: xmenu [-w] menuname\n");
+	(void)fprintf(stderr, "usage: xmenu [-w]\n");
 	exit(1);
 }