From: Connor Lane Smith <cls@lubutu.com>
Date: Mon, 19 Sep 2011 23:11:01 +0000 (+0100)
Subject: merge token -> default
X-Git-Url: https://git.danieliu.xyz/?p=dmenu.git;a=commitdiff_plain;h=50207344084b385839cef251f77f5129dc85874e;hp=-c

merge token -> default
---

50207344084b385839cef251f77f5129dc85874e
diff --combined dmenu.c
index 6c1407d,1cd9f61..9d479f9
--- a/dmenu.c
+++ b/dmenu.c
@@@ -30,7 -30,7 +30,7 @@@ static void drawmenu(void)
  static void grabkeyboard(void);
  static void insert(const char *str, ssize_t n);
  static void keypress(XKeyEvent *ev);
- static void match(Bool sub);
+ static void match(void);
  static size_t nextrune(int inc);
  static void paste(void);
  static void readstdin(void);
@@@ -120,10 -120,10 +120,10 @@@ main(int argc, char *argv[]) 
  
  void
  appenditem(Item *item, Item **list, Item **last) {
- 	if(!*last)
- 		*list = item;
- 	else
+ 	if(*last)
  		(*last)->right = item;
+ 	else
+ 		*list = item;
  
  	item->left = *last;
  	item->right = NULL;
@@@ -223,7 -223,7 +223,7 @@@ insert(const char *str, ssize_t n) 
  	if(n > 0)
  		memcpy(&text[cursor], str, n);
  	cursor += n;
- 	match(n > 0 && text[cursor] == '\0');
+ 	match();
  }
  
  void
@@@ -252,7 -252,7 +252,7 @@@ keypress(XKeyEvent *ev) 
  
  		case XK_k: /* delete right */
  			text[cursor] = '\0';
- 			match(False);
+ 			match();
  			break;
  		case XK_u: /* delete left */
  			insert(NULL, 0 - cursor);
@@@ -355,33 -355,44 +355,44 @@@
  			return;
  		strncpy(text, sel->text, sizeof text);
  		cursor = strlen(text);
- 		match(True);
+ 		match();
  		break;
  	}
  	drawmenu();
  }
  
  void
- match(Bool sub) {
- 	size_t len = strlen(text);
- 	Item *lexact, *lprefix, *lsubstr, *exactend, *prefixend, *substrend;
- 	Item *item, *lnext;
- 
- 	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))
+ match(void) {
+ 	static char **tokv = NULL;
+ 	static int tokn = 0;
+ 
+ 	char buf[sizeof text], *s;
+ 	int i, tokc = 0;
+ 	size_t len;
+ 	Item *item, *lprefix, *lsubstr, *prefixend, *substrend;
+ 
+ 	strcpy(buf, text);
+ 	for(s = strtok(buf, " "); s; tokv[tokc-1] = s, s = strtok(NULL, " "))
+ 		if(++tokc > tokn && !(tokv = realloc(tokv, ++tokn * sizeof *tokv)))
+ 			eprintf("cannot realloc %u bytes\n", tokn * sizeof *tokv);
+ 	len = tokc ? strlen(tokv[0]) : 0;
+ 
+ 	matches = lprefix = lsubstr = matchend = prefixend = substrend = NULL;
+ 	for(item = items; item && item->text; item++) {
+ 		for(i = 0; i < tokc; i++)
+ 			if(!fstrstr(item->text, tokv[i]))
+ 				break;
+ 		if(i != tokc)
+ 			continue;
+ 		if(!tokc || !fstrncmp(tokv[0], item->text, len+1))
+ 			appenditem(item, &matches, &matchend);
+ 		else if(!fstrncmp(tokv[0], item->text, len))
  			appenditem(item, &lprefix, &prefixend);
- 		else if(fstrstr(item->text, text))
+ 		else
  			appenditem(item, &lsubstr, &substrend);
  	}
- 	matches = lexact;
- 	matchend = exactend;
- 
  	if(lprefix) {
- 		if(matchend) {
+ 		if(matches) {
  			matchend->right = lprefix;
  			lprefix->left = matchend;
  		}
@@@ -390,7 -401,7 +401,7 @@@
  		matchend = prefixend;
  	}
  	if(lsubstr) {
- 		if(matchend) {
+ 		if(matches) {
  			matchend->right = lsubstr;
  			lsubstr->left = matchend;
  		}
@@@ -473,7 -484,7 +484,7 @@@ voi
  setup(void) {
  	int x, y, screen = DefaultScreen(dc->dpy);
  	Window root = RootWindow(dc->dpy, screen);
 -	XSetWindowAttributes wa;
 +	XSetWindowAttributes swa;
  #ifdef XINERAMA
  	int n;
  	XineramaScreenInfo *info;
@@@ -494,14 -505,9 +505,14 @@@
  	if((info = XineramaQueryScreens(dc->dpy, &n))) {
  		int i, di;
  		unsigned int du;
 -		Window dw;
 +		Window w, dw;
 +		XWindowAttributes wa;
  
 -		XQueryPointer(dc->dpy, root, &dw, &dw, &x, &y, &di, &di, &du);
 +		XGetInputFocus(dc->dpy, &w, &di);
 +		if(w != root && XGetWindowAttributes(dc->dpy, w, &wa))
 +			XTranslateCoordinates(dc->dpy, root, root, wa.x, wa.y, &x, &y, &dw);
 +		else
 +			XQueryPointer(dc->dpy, root, &dw, &dw, &x, &y, &di, &di, &du);
  		for(i = 0; i < n-1; i++)
  			if(INRECT(x, y, info[i].x_org, info[i].y_org, info[i].width, info[i].height))
  				break;
@@@ -519,16 -525,16 +530,16 @@@
  	}
  	promptw = prompt ? textw(dc, prompt) : 0;
  	inputw = MIN(inputw, mw/3);
- 	match(False);
+ 	match();
  
  	/* menu window */
 -	wa.override_redirect = True;
 -	wa.background_pixmap = ParentRelative;
 -	wa.event_mask = ExposureMask | KeyPressMask | VisibilityChangeMask;
 +	swa.override_redirect = True;
 +	swa.background_pixmap = ParentRelative;
 +	swa.event_mask = ExposureMask | KeyPressMask | VisibilityChangeMask;
  	win = XCreateWindow(dc->dpy, root, x, y, mw, mh, 0,
  	                    DefaultDepth(dc->dpy, screen), CopyFromParent,
  	                    DefaultVisual(dc->dpy, screen),
 -	                    CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa);
 +	                    CWOverrideRedirect | CWBackPixmap | CWEventMask, &swa);
  
  	XMapRaised(dc->dpy, win);
  	resizedc(dc, mw, mh);