X-Git-Url: https://git.xinqibao.xyz/dmenu.git/blobdiff_plain/d094ebea968e3d08b985a754aa9df30f56f649c6..540a78761b26b2af4f47e46d27ad6406548c8a1c:/dmenu.c?ds=sidebyside

diff --git a/dmenu.c b/dmenu.c
index 34df9ed..864c8f0 100644
--- a/dmenu.c
+++ b/dmenu.c
@@ -37,9 +37,11 @@ struct Item {
 	Item *next;		/* traverses all items */
 	Item *left, *right;	/* traverses items matching current search pattern */
 	char *text;
+	Bool matched;
 };
 
 /* forward declarations */
+Item *appenditem(Item *i, Item *last);
 void calcoffsets(void);
 void cleanup(void);
 void drawmenu(void);
@@ -54,8 +56,8 @@ void kpress(XKeyEvent * e);
 void match(char *pattern);
 void readstdin(void);
 void run(void);
-void setup(Bool bottom);
-int strido(const char *text, const char *pattern);
+void setup(int x, int y, int w);
+char *cistrstr(const char *s, const char *sub);
 unsigned int textnw(const char *text, unsigned int len);
 unsigned int textw(const char *text);
 
@@ -87,6 +89,21 @@ Item *next = NULL;
 Item *prev = NULL;
 Item *curr = NULL;
 Window root, win;
+char *(*fstrstr)(const char *, const char *) = strstr;
+
+Item *
+appenditem(Item *i, Item *last) {
+	if(!last)
+		item = i;
+	else
+		last->right = i;
+	i->matched = True;
+	i->left = last;
+	i->right = NULL;
+	last = i;
+	nitem++;
+	return last;
+}
 
 void
 calcoffsets(void) {
@@ -298,10 +315,9 @@ initfont(const char *fontstr) {
 		if(dc.font.xfont)
 			XFreeFont(dpy, dc.font.xfont);
 		dc.font.xfont = NULL;
-		if(!(dc.font.xfont = XLoadQueryFont(dpy, fontstr))) {
-			if(!(dc.font.xfont = XLoadQueryFont(dpy, "fixed")))
-				eprint("error, cannot load font: '%s'\n", fontstr);
-		}
+		if(!(dc.font.xfont = XLoadQueryFont(dpy, fontstr))
+		&& !(dc.font.xfont = XLoadQueryFont(dpy, "fixed")))
+			eprint("error, cannot load font: '%s'\n", fontstr);
 		dc.font.ascent = dc.font.xfont->ascent;
 		dc.font.descent = dc.font.xfont->descent;
 	}
@@ -490,41 +506,13 @@ match(char *pattern) {
 	item = j = NULL;
 	nitem = 0;
 	for(i = allitems; i; i=i->next)
-		if(!plen || !strncmp(pattern, i->text, plen)) {
-			if(!j)
-				item = i;
-			else
-				j->right = i;
-			i->left = j;
-			i->right = NULL;
-			j = i;
-			nitem++;
-		}
-	for(i = allitems; i; i=i->next)
-		if(plen && strncmp(pattern, i->text, plen)
-				&& strstr(i->text, pattern)) {
-			if(!j)                               
-				item = i;                              
-			else                                     
-				j->right = i;                          
-			i->left = j;      
-			i->right = NULL;                         
-			j = i;                                      
-			nitem++;                                       
-		}                                              
-	for(i = allitems; i; i=i->next)                            
-		if(plen && strncmp(pattern, i->text, plen)             
-				&& !strstr(i->text, pattern)          
-				&& strido(i->text,pattern)) { 
-			if(!j)
-				item = i;
-			else
-				j->right = i;
-			i->left = j;
-			i->right = NULL;
-			j = i;
-			nitem++;
-		}
+		i->matched = False;
+	for(i = allitems; i; i = i->next)
+		if(!i->matched && !strncasecmp(pattern, i->text, plen))
+			j = appenditem(i, j);
+	for(i = allitems; i; i = i->next)
+		if(!i->matched && fstrstr(i->text, pattern))
+			j = appenditem(i, j);
 	curr = prev = next = sel = item;
 	calcoffsets();
 }
@@ -576,7 +564,7 @@ run(void) {
 }
 
 void
-setup(Bool bottom) {
+setup(int x, int y, int w) {
 	unsigned int i, j;
 	XModifierKeymap *modmap;
 	XSetWindowAttributes wa;
@@ -602,10 +590,9 @@ setup(Bool bottom) {
 	wa.override_redirect = 1;
 	wa.background_pixmap = ParentRelative;
 	wa.event_mask = ExposureMask | ButtonPressMask | KeyPressMask;
-	mw = DisplayWidth(dpy, screen);
+	mw = w ? w : DisplayWidth(dpy, screen);
 	mh = dc.font.height + 2;
-	win = XCreateWindow(dpy, root, 0,
-			bottom ? DisplayHeight(dpy, screen) - mh : 0, mw, mh, 0,
+	win = XCreateWindow(dpy, root, x, y, mw, mh, 0,
 			DefaultDepth(dpy, screen), CopyFromParent,
 			DefaultVisual(dpy, screen),
 			CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa);
@@ -629,13 +616,28 @@ setup(Bool bottom) {
 	XMapRaised(dpy, win);
 }
 
-int
-strido(const char *text, const char *pattern) {
-	for(; *text && *pattern; text++)
-		if (*text == *pattern)
-			pattern++;
-	return !*pattern;
-}                                  
+char *
+cistrstr(const char *s, const char *sub) {
+	int c, csub;
+	unsigned int len;
+
+	if(!sub)
+		return (char *)s;
+	if((c = *sub++) != 0) {
+		c = tolower(c);
+		len = strlen(sub);
+		do {
+			do {
+				if((csub = *s++) == 0)
+					return (NULL);
+			}
+			while(tolower(csub) != c);
+		}
+		while(strncasecmp(s, sub, len) != 0);
+		s--;
+	}
+	return (char *)s;
+}
 
 unsigned int
 textnw(const char *text, unsigned int len) {
@@ -655,14 +657,13 @@ textw(const char *text) {
 
 int
 main(int argc, char *argv[]) {
-	Bool bottom = False;
+	int x = 0, y = 0, w = 0;
 	unsigned int i;
 
 	/* command line args */
 	for(i = 1; i < argc; i++)
-		if(!strcmp(argv[i], "-b")) {
-			bottom = True;
-		}
+		if(!strcmp(argv[i], "-i"))
+			fstrstr = cistrstr;
 		else if(!strcmp(argv[i], "-fn")) {
 			if(++i < argc) font = argv[i];
 		}
@@ -681,11 +682,21 @@ main(int argc, char *argv[]) {
 		else if(!strcmp(argv[i], "-sf")) {
 			if(++i < argc) selfg = argv[i];
 		}
+		else if(!strcmp(argv[i], "-x")) {
+			if(++i < argc) x = atoi(argv[i]);
+		}
+		else if(!strcmp(argv[i], "-y")) {
+			if(++i < argc) y = atoi(argv[i]);
+		}
+		else if(!strcmp(argv[i], "-w")) {
+			if(++i < argc) w = atoi(argv[i]);
+		}
 		else if(!strcmp(argv[i], "-v"))
-			eprint("dmenu-"VERSION", © 2006-2007 Anselm R. Garbe, Sander van Dijk\n");
+			eprint("dmenu-"VERSION", © 2006-2008 dmenu engineers, see LICENSE for details\n");
 		else
-			eprint("usage: dmenu [-b] [-fn <font>] [-nb <color>] [-nf <color>]\n"
-			"             [-p <prompt>] [-sb <color>] [-sf <color>] [-v]\n");
+			eprint("usage: dmenu [-i] [-fn <font>] [-nb <color>] [-nf <color>]\n"
+			       "             [-p <prompt>] [-sb <color>] [-sf <color>]\n"
+			       "             [-x <x>] [-y <y>] [-w <w>] [-v]\n");
 	setlocale(LC_CTYPE, "");
 	dpy = XOpenDisplay(0);
 	if(!dpy)
@@ -702,7 +713,7 @@ main(int argc, char *argv[]) {
 		readstdin();
 	}
 
-	setup(bottom);
+	setup(x, y, w);
 	drawmenu();
 	XSync(dpy, False);
 	run();