X-Git-Url: https://git.xinqibao.xyz/dmenu.git/blobdiff_plain/d0051e7bb858815866fbaf3a8fd5b50319c0c86d..3a60b19514705f7f61908fd727d2e69565ee1947:/dmenu.c

diff --git a/dmenu.c b/dmenu.c
index d54b1b3..c4b7908 100644
--- a/dmenu.c
+++ b/dmenu.c
@@ -3,6 +3,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <strings.h>
 #include <unistd.h>
 #include <X11/Xlib.h>
 #include <X11/Xatom.h>
@@ -27,10 +28,10 @@ static void calcoffsets(void);
 static void drawmenu(void);
 static char *fstrstr(const char *s, const char *sub);
 static void grabkeyboard(void);
-static void insert(const char *s, ssize_t n);
+static void insert(const char *str, ssize_t n);
 static void keypress(XKeyEvent *ev);
-static void match(void);
-static size_t nextrune(int incr);
+static void match(Bool sub);
+static size_t nextrune(int inc);
 static void paste(void);
 static void readstdin(void);
 static void run(void);
@@ -134,7 +135,7 @@ appenditem(Item *item, Item **list, Item **last) {
 
 void
 calcoffsets(void) {
-	unsigned int i, n;
+	int i, n;
 
 	if(lines > 0)
 		n = lines * bh;
@@ -218,26 +219,27 @@ grabkeyboard(void) {
 }
 
 void
-insert(const char *s, ssize_t n) {
+insert(const char *str, ssize_t n) {
 	if(strlen(text) + n > sizeof text - 1)
 		return;
 	memmove(&text[cursor + n], &text[cursor], sizeof text - cursor - MAX(n, 0));
 	if(n > 0)
-		memcpy(&text[cursor], s, n);
+		memcpy(&text[cursor], str, n);
 	cursor += n;
-	match();
+	match(n > 0);
 }
 
 void
 keypress(XKeyEvent *ev) {
 	char buf[32];
-	size_t len;
 	KeySym ksym;
 
-	len = strlen(text);
 	XLookupString(ev, buf, sizeof buf, &ksym, NULL);
-	if(ev->state & ControlMask)
-		switch(tolower(ksym)) {
+	if(ev->state & ControlMask) {
+		KeySym lower, upper;
+
+		XConvertCase(ksym, &lower, &upper);
+		switch(lower) {
 		default:
 			return;
 		case XK_a:
@@ -269,7 +271,7 @@ keypress(XKeyEvent *ev) {
 			break;
 		case XK_k:  /* delete right */
 			text[cursor] = '\0';
-			match();
+			match(False);
 			break;
 		case XK_n:
 			ksym = XK_Down;
@@ -290,13 +292,14 @@ keypress(XKeyEvent *ev) {
 			XConvertSelection(dc->dpy, XA_PRIMARY, utf8, utf8, win, CurrentTime);
 			return;
 		}
+	}
 	switch(ksym) {
 	default:
 		if(!iscntrl(*buf))
 			insert(buf, strlen(buf));
 		break;
 	case XK_Delete:
-		if(cursor == len)
+		if(text[cursor] == '\0')
 			return;
 		cursor = nextrune(+1);
 	case XK_BackSpace:
@@ -304,8 +307,8 @@ keypress(XKeyEvent *ev) {
 			insert(NULL, nextrune(-1) - cursor);
 		break;
 	case XK_End:
-		if(cursor < len) {
-			cursor = len;
+		if(text[cursor] != '\0') {
+			cursor = strlen(text);
 			break;
 		}
 		if(next) {
@@ -358,7 +361,7 @@ keypress(XKeyEvent *ev) {
 		fputs((sel && !(ev->state & ShiftMask)) ? sel->text : text, stdout);
 		exit(EXIT_SUCCESS);
 	case XK_Right:
-		if(cursor < len) {
+		if(text[cursor] != '\0') {
 			cursor = nextrune(+1);
 			break;
 		}
@@ -375,30 +378,31 @@ keypress(XKeyEvent *ev) {
 			return;
 		strncpy(text, sel->text, sizeof text);
 		cursor = strlen(text);
-		match();
+		match(True);
 		break;
 	}
 	drawmenu();
 }
 
 void
-match(void) {
+match(Bool sub) {
 	size_t len = strlen(text);
-	Item *item, *lexact, *lprefix, *lsubstr, *exactend, *prefixend, *substrend;
+	Item *lexact, *lprefix, *lsubstr, *exactend, *prefixend, *substrend;
+	Item *item, *lnext;
 
-	matches = lexact = lprefix = lsubstr = matchend = exactend = prefixend = substrend = NULL;
-	for(item = items; item && item->text; item++)
+	lexact = lprefix = lsubstr = exactend = prefixend = substrend = NULL;
+	for(item = sub ? matches : items; item && item->text; item = lnext) {
+		lnext = sub ? item->right : item + 1;
 		if(!fstrncmp(text, item->text, len + 1))
 			appenditem(item, &lexact, &exactend);
 		else if(!fstrncmp(text, item->text, len))
 			appenditem(item, &lprefix, &prefixend);
 		else if(fstrstr(item->text, text))
 			appenditem(item, &lsubstr, &substrend);
-
-	if(lexact) {
-		matches = lexact;
-		matchend = exactend;
 	}
+	matches = lexact;
+	matchend = exactend;
+
 	if(lprefix) {
 		if(matchend) {
 			matchend->right = lprefix;
@@ -422,10 +426,10 @@ match(void) {
 }
 
 size_t
-nextrune(int incr) {
-	size_t n, len = strlen(text);
+nextrune(int inc) {
+	ssize_t n;
 
-	for(n = cursor + incr; n >= 0 && n < len && (text[n] & 0xc0) == 0x80; n += incr);
+	for(n = cursor + inc; n + inc >= 0 && (text[n] & 0xc0) == 0x80; n += inc);
 	return n;
 }
 
@@ -438,7 +442,7 @@ paste(void) {
 
 	XGetWindowProperty(dc->dpy, win, utf8, 0, (sizeof text / 4) + 1, False,
 	                   utf8, &da, &di, &dl, &dl, (unsigned char **)&p);
-	insert(p, (q = strchr(p, '\n')) ? q-p : strlen(p));
+	insert(p, (q = strchr(p, '\n')) ? q-p : (ssize_t)strlen(p));
 	XFree(p);
 	drawmenu();
 }
@@ -498,8 +502,8 @@ setup(void) {
 
 	normcol[ColBG] = getcolor(dc, normbgcolor);
 	normcol[ColFG] = getcolor(dc, normfgcolor);
-	selcol[ColBG] = getcolor(dc, selbgcolor);
-	selcol[ColFG] = getcolor(dc, selfgcolor);
+	selcol[ColBG]  = getcolor(dc, selbgcolor);
+	selcol[ColFG]  = getcolor(dc, selfgcolor);
 
 	utf8 = XInternAtom(dc->dpy, "UTF8_STRING", False);
 
@@ -530,6 +534,10 @@ setup(void) {
 		y = topbar ? 0 : DisplayHeight(dc->dpy, screen) - mh;
 		mw = DisplayWidth(dc->dpy, screen);
 	}
+	inputw = MIN(inputw, mw/3);
+	promptw = prompt ? textw(dc, prompt) : 0;
+	match(False);
+
 	/* menu window */
 	wa.override_redirect = True;
 	wa.background_pixmap = ParentRelative;
@@ -539,10 +547,7 @@ setup(void) {
 	                    DefaultVisual(dc->dpy, screen),
 	                    CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa);
 
-	resizedc(dc, mw, mh);
-	inputw = MIN(inputw, mw/3);
-	promptw = prompt ? textw(dc, prompt) : 0;
 	XMapRaised(dc->dpy, win);
+	resizedc(dc, mw, mh);
 	drawmenu();
-	match();
 }