X-Git-Url: https://git.subgeniuskitty.com/xmenu/.git/blobdiff_plain/693735f7eb04e5da225ff8b6ccc47e50edbb9032..c90d164c0aec8cfd6bafcad6d1c5adb81c86cf1f:/xmenu.c

diff --git a/xmenu.c b/xmenu.c
index 61e154c..8658a9d 100644
--- a/xmenu.c
+++ b/xmenu.c
@@ -1208,6 +1208,25 @@ matchitem(struct Menu *menu, char *text, int dir)
 	return NULL;
 }
 
+/* check keysyms defined on config.h */
+static KeySym
+normalizeksym(KeySym ksym)
+{
+	if (ksym == KSYMFIRST)
+		return XK_Home;
+	if (ksym == KSYMLAST)
+		return XK_End;
+	if (ksym == KSYMUP)
+		return XK_Up;
+	if (ksym == KSYMDOWN)
+		return XK_Down;
+	if (ksym == KSYMLEFT)
+		return XK_Left;
+	if (ksym == KSYMRIGHT)
+		return XK_Right;
+	return ksym;
+}
+
 /* run event loop */
 static void
 run(struct Menu *currmenu)
@@ -1223,6 +1242,7 @@ run(struct Menu *currmenu)
 	XEvent ev;
 	int action;
 	int len;
+	int i;
 
 	text[0] = '\0';
 	mapmenu(currmenu);
@@ -1295,59 +1315,78 @@ enteritem:
 				ksym = XK_ISO_Left_Tab;
 
 			/* cycle through menu */
-			item = NULL;
-			if (ksym == XK_Home || ksym == KSYMFIRST) {
-				item = itemcycle(currmenu, ITEMFIRST);
-				action = ACTION_CLEAR;
-			} else if (ksym == XK_End || ksym == KSYMLAST) {
-				item = itemcycle(currmenu, ITEMLAST);
-				action = ACTION_CLEAR;
-			} else if (ksym == XK_ISO_Left_Tab || ksym == XK_Up || ksym == KSYMUP) {
+			select = NULL;
+			ksym = normalizeksym(ksym);
+			switch (ksym) {
+			case XK_Home:
+				select = itemcycle(currmenu, ITEMFIRST);
+				action = ACTION_CLEAR | ACTION_SELECT | ACTION_DRAW;
+				break;
+			case XK_End:
+				select = itemcycle(currmenu, ITEMLAST);
+				action = ACTION_CLEAR | ACTION_SELECT | ACTION_DRAW;
+				break;
+			case XK_ISO_Left_Tab:
 				if (*text) {
-					item = matchitem(currmenu, text, -1);
-				} else {
-					item = itemcycle(currmenu, ITEMPREV);
-					action = ACTION_CLEAR;
+					select = matchitem(currmenu, text, -1);
+					action = ACTION_SELECT | ACTION_DRAW;
+					break;
 				}
-			} else if (ksym == XK_Tab || ksym == XK_Down || ksym == KSYMDOWN) {
+				/* FALLTHROUGH */
+			case XK_Up:
+				select = itemcycle(currmenu, ITEMPREV);
+				action = ACTION_CLEAR | ACTION_SELECT | ACTION_DRAW;
+				break;
+			case XK_Tab:
 				if (*text) {
-					item = matchitem(currmenu, text, 1);
-				} else {
-					item = itemcycle(currmenu, ITEMNEXT);
-					action = ACTION_CLEAR;
+					select = matchitem(currmenu, text, 1);
+					action = ACTION_SELECT | ACTION_DRAW;
+					break;
 				}
-			} else if (ksym >= XK_1 && ksym <= XK_9){
+				/* FALLTHROUGH */
+			case XK_Down:
+				select = itemcycle(currmenu, ITEMNEXT);
+				action = ACTION_CLEAR | ACTION_SELECT | ACTION_DRAW;
+				break;
+			case XK_1: case XK_2: case XK_3: case XK_4: case XK_5: case XK_6: case XK_7: case XK_8: case 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);
 				}
-				action = ACTION_CLEAR;
-			} else if ((ksym == XK_Return || ksym == XK_Right || ksym == KSYMRIGHT) &&
-			            currmenu->selected != NULL) {
-				item = currmenu->selected;
-				goto enteritem;
-			} else if ((ksym == XK_Escape || ksym == XK_Left || ksym == KSYMLEFT) &&
-			           currmenu->parent != NULL) {
-				item = currmenu->parent->selected;
-				currmenu = currmenu->parent;
-				action = ACTION_CLEAR | ACTION_MAP;
-			} else if (ksym == XK_BackSpace || ksym == XK_Clear || ksym == XK_Delete) {
-				action = ACTION_CLEAR;
+				select = item;
+				action = ACTION_CLEAR | ACTION_SELECT | ACTION_DRAW;
 				break;
-			} else {
+			case XK_Return: case XK_Right:
+				if (currmenu->selected) {
+					item = currmenu->selected;
+					goto enteritem;
+				}
+				break;
+			case XK_Escape: case XK_Left:
+				if (currmenu->parent) {
+					select = currmenu->parent->selected;
+					currmenu = currmenu->parent;
+					action = ACTION_CLEAR | ACTION_MAP | ACTION_SELECT | ACTION_DRAW;
+				}
+				break;
+			case XK_BackSpace: case XK_Clear: case XK_Delete:
+				action = ACTION_CLEAR | ACTION_SELECT | ACTION_DRAW;
+				break;
+			default:
 append:
-				if (append(text, buf, sizeof text, len)) {
-					if (!(item = matchitem(currmenu, text, 0))) {
-						item = NULL;
-					}
-				} else if (len == 0) {
-					break; /* we may have pressed a dead key */
+				if (*buf == '\0' || iscntrl(*buf))
+					break;
+				for (i = 0; i < 2; i++) {
+					append(text, buf, sizeof text, len);
+					if ((select = matchitem(currmenu, text, 0)))
+						break;
+					text[0] = '\0';
 				}
+				action = ACTION_SELECT | ACTION_DRAW;
+				break;
 			}
-			select = item;
-			action |= ACTION_SELECT | ACTION_DRAW;
 			break;
 		case LeaveNotify:
 			previtem = NULL;
@@ -1450,7 +1489,7 @@ main(int argc, char *argv[])
 	if ((xim = XOpenIM(dpy, NULL, NULL, NULL)) == NULL)
 		errx(1, "XOpenIM: could not open input device");
 
-	/* get configuration */
+	/* process configuration and window class */
 	getresources();
 	classh.res_class = PROGNAME;
 	classh.res_name = getoptions(argc, argv);