X-Git-Url: https://git.xinqibao.xyz/dmenu.git/blobdiff_plain/e149c531b876e666a42870816834723d97a656f4..75a19c35bd9c880bbfdc5cbf3fd807803d04de89:/dmenu.c?ds=sidebyside

diff --git a/dmenu.c b/dmenu.c
index a8bdcb9..9dd0363 100644
--- a/dmenu.c
+++ b/dmenu.c
@@ -13,10 +13,8 @@
 #include <draw.h>
 
 #define INRECT(x,y,rx,ry,rw,rh) ((x) >= (rx) && (x) < (rx)+(rw) && (y) >= (ry) && (y) < (ry)+(rh))
-#define LINEH                   (dc->font.height + 2)
 #define MIN(a,b)                ((a) < (b) ? (a) : (b))
 #define MAX(a,b)                ((a) > (b) ? (a) : (b))
-#define UTF8_CODEPOINT(c)       (((c) & 0xc0) != 0x80)
 
 typedef struct Item Item;
 struct Item {
@@ -27,12 +25,13 @@ struct Item {
 
 static void appenditem(Item *item, Item **list, Item **last);
 static void calcoffsets(void);
-static char *cistrstr(const char *s, const char *sub);
 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 keypress(XKeyEvent *ev);
 static void match(void);
+static size_t nextrune(int incr);
 static void paste(void);
 static void readstdin(void);
 static void run(void);
@@ -40,6 +39,10 @@ static void setup(void);
 static void usage(void);
 
 static char text[BUFSIZ];
+static int bh, mw, mh;
+static int inputw = 0;
+static int lines = 0;
+static int promptw;
 static size_t cursor = 0;
 static const char *font = NULL;
 static const char *prompt = NULL;
@@ -47,21 +50,17 @@ static const char *normbgcolor = "#cccccc";
 static const char *normfgcolor = "#000000";
 static const char *selbgcolor  = "#0066ff";
 static const char *selfgcolor  = "#ffffff";
-static unsigned int inputw = 0;
-static unsigned int lines = 0;
-static unsigned int mw, mh;
-static unsigned int promptw;
 static unsigned long normcol[ColLast];
 static unsigned long selcol[ColLast];
 static Atom utf8;
 static Bool topbar = True;
 static DC *dc;
-static Item *allitems, *matches;
-static Item *curr, *prev, *next, *sel;
+static Item *items = NULL;
+static Item *matches, *sel;
+static Item *prev, *curr, *next;
 static Window root, win;
 
 static int (*fstrncmp)(const char *, const char *, size_t) = strncmp;
-static char *(*fstrstr)(const char *, const char *) = strstr;
 
 void
 appenditem(Item *item, Item **list, Item **last) {
@@ -79,28 +78,18 @@ calcoffsets(void) {
 	unsigned int i, n;
 
 	if(lines > 0)
-		n = lines * LINEH;
+		n = lines * bh;
 	else
-		n = mw - (promptw + inputw + textw(dc, "<") + textw(dc, ">"));
+		n = mw - (promptw + inputw + dc_textw(dc, "<") + dc_textw(dc, ">"));
 
 	for(i = 0, next = curr; next; next = next->right)
-		if((i += (lines > 0) ? LINEH : MIN(textw(dc, next->text), mw/3)) > n)
+		if((i += (lines > 0) ? bh : MIN(dc_textw(dc, next->text), n)) > n)
 			break;
 	for(i = 0, prev = curr; prev && prev->left; prev = prev->left)
-		if((i += (lines > 0) ? LINEH : MIN(textw(dc, prev->left->text), mw/3)) > n)
+		if((i += (lines > 0) ? bh : MIN(dc_textw(dc, prev->left->text), n)) > n)
 			break;
 }
 
-char *
-cistrstr(const char *s, const char *sub) {
-	size_t len;
-
-	for(len = strlen(sub); *s; s++)
-		if(!strncasecmp(s, sub, len))
-			return (char *)s;
-	return NULL;
-}
-
 void
 drawmenu(void) {
 	int curpos;
@@ -108,42 +97,52 @@ drawmenu(void) {
 
 	dc->x = 0;
 	dc->y = 0;
-	dc->h = LINEH;
-	drawrect(dc, 0, 0, mw, mh, BG(dc, normcol));
+	dc->h = bh;
+	dc_drawrect(dc, 0, 0, mw, mh, True, BG(dc, normcol));
 
 	if(prompt) {
 		dc->w = promptw;
-		drawtext(dc, prompt, selcol);
+		dc_drawtext(dc, prompt, selcol);
 		dc->x = dc->w;
 	}
 	dc->w = (lines > 0 || !matches) ? mw - dc->x : inputw;
-	drawtext(dc, text, normcol);
-	if((curpos = textnw(dc, text, cursor) + dc->h/2 - 2) < dc->w)
-		drawrect(dc, curpos, 2, 1, dc->h - 4, FG(dc, normcol));
+	dc_drawtext(dc, text, normcol);
+	if((curpos = dc_textnw(dc, text, cursor) + dc->h/2 - 2) < dc->w)
+		dc_drawrect(dc, curpos, 2, 1, dc->h - 4, True, FG(dc, normcol));
 
 	if(lines > 0) {
 		dc->w = mw - dc->x;
 		for(item = curr; item != next; item = item->right) {
 			dc->y += dc->h;
-			drawtext(dc, item->text, (item == sel) ? selcol : normcol);
+			dc_drawtext(dc, item->text, (item == sel) ? selcol : normcol);
 		}
 	}
 	else if(matches) {
 		dc->x += inputw;
-		dc->w = textw(dc, "<");
+		dc->w = dc_textw(dc, "<");
 		if(curr->left)
-			drawtext(dc, "<", normcol);
+			dc_drawtext(dc, "<", normcol);
 		for(item = curr; item != next; item = item->right) {
 			dc->x += dc->w;
-			dc->w = MIN(textw(dc, item->text), mw/3);
-			drawtext(dc, item->text, (item == sel) ? selcol : normcol);
+			dc->w = MIN(dc_textw(dc, item->text), mw - dc->x - dc_textw(dc, ">"));
+			dc_drawtext(dc, item->text, (item == sel) ? selcol : normcol);
 		}
-		dc->w = textw(dc, ">");
+		dc->w = dc_textw(dc, ">");
 		dc->x = mw - dc->w;
 		if(next)
-			drawtext(dc, ">", normcol);
+			dc_drawtext(dc, ">", normcol);
 	}
-	commitdraw(dc, win);
+	dc_map(dc, win, mw, mh);
+}
+
+char *
+fstrstr(const char *s, const char *sub) {
+	size_t len;
+
+	for(len = strlen(sub); *s; s++)
+		if(!fstrncmp(s, sub, len))
+			return (char *)s;
+	return NULL;
 }
 
 void
@@ -160,7 +159,9 @@ grabkeyboard(void) {
 
 void
 insert(const char *s, ssize_t n) {
-	memmove(text + cursor + n, text + cursor, sizeof text - cursor - 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);
 	cursor += n;
@@ -170,7 +171,6 @@ insert(const char *s, ssize_t n) {
 void
 keypress(XKeyEvent *ev) {
 	char buf[32];
-	int n;
 	size_t len;
 	KeySym ksym;
 
@@ -218,38 +218,28 @@ keypress(XKeyEvent *ev) {
 			ksym = XK_Up;
 			break;
 		case XK_u:  /* delete left */
-			insert(NULL, -cursor);
+			insert(NULL, 0 - cursor);
 			break;
 		case XK_w:  /* delete word */
-			if(cursor == 0)
-				return;
-			n = 0;
-			while(cursor - n++ > 0 && text[cursor - n] == ' ');
-			while(cursor - n++ > 0 && text[cursor - n] != ' ');
-			insert(NULL, 1-n);
+			while(cursor > 0 && text[nextrune(-1)] == ' ')
+				insert(NULL, nextrune(-1) - cursor);
+			while(cursor > 0 && text[nextrune(-1)] != ' ')
+				insert(NULL, nextrune(-1) - cursor);
 			break;
-		case XK_y:  /* paste selection */
-			XConvertSelection(dc->dpy, XA_PRIMARY, utf8, None, win, CurrentTime);
-			return;
 		}
 	}
 	switch(ksym) {
 	default:
 		if(isprint(*buf))
-			insert(buf, MIN(strlen(buf), sizeof text - cursor));
-		break;
-	case XK_BackSpace:
-		if(cursor == 0)
-			return;
-		for(n = 1; cursor - n > 0 && !UTF8_CODEPOINT(text[cursor - n]); n++);
-		insert(NULL, -n);
+			insert(buf, strlen(buf));
 		break;
 	case XK_Delete:
 		if(cursor == len)
 			return;
-		for(n = 1; cursor + n < len && !UTF8_CODEPOINT(text[cursor + n]); n++);
-		cursor += n;
-		insert(NULL, -n);
+		cursor = nextrune(+1);
+	case XK_BackSpace:
+		if(cursor > 0)
+			insert(NULL, nextrune(-1) - cursor);
 		break;
 	case XK_End:
 		if(cursor < len) {
@@ -273,17 +263,19 @@ keypress(XKeyEvent *ev) {
 		sel = curr = matches;
 		calcoffsets();
 		break;
+	case XK_Insert:  /* paste selection */
+		if(ev->state & ShiftMask)
+			XConvertSelection(dc->dpy, XA_PRIMARY, utf8, utf8, win, CurrentTime);
+		return;
 	case XK_Left:
 		if(cursor > 0 && (!sel || !sel->left || lines > 0)) {
-			while(cursor-- > 0 && !UTF8_CODEPOINT(text[cursor]));
+			cursor = nextrune(-1);
 			break;
 		}
 		else if(lines > 0)
 			return;
 	case XK_Up:
-		if(!sel || !sel->left)
-			return;
-		if((sel = sel->left)->right == curr) {
+		if(sel && sel->left && (sel = sel->left)->right == curr) {
 			curr = prev;
 			calcoffsets();
 		}
@@ -307,15 +299,13 @@ keypress(XKeyEvent *ev) {
 		exit(EXIT_SUCCESS);
 	case XK_Right:
 		if(cursor < len) {
-			while(cursor++ < len && !UTF8_CODEPOINT(text[cursor]));
+			cursor = nextrune(+1);
 			break;
 		}
 		else if(lines > 0)
 			return;
 	case XK_Down:
-		if(!sel || !sel->right)
-			return;
-		if((sel = sel->right) == next) {
+		if(sel && sel->right && (sel = sel->right) == next) {
 			curr = next;
 			calcoffsets();
 		}
@@ -338,13 +328,14 @@ match(void) {
 
 	len = strlen(text);
 	matches = lexact = lprefix = lsubstr = itemend = exactend = prefixend = substrend = NULL;
-	for(item = allitems; item; item = item->next)
+	for(item = items; item; item = item->next)
 		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;
 		itemend = exactend;
@@ -370,6 +361,15 @@ match(void) {
 	calcoffsets();
 }
 
+size_t
+nextrune(int incr) {
+	size_t n, len;
+
+	len = strlen(text);
+	for(n = cursor + incr; n >= 0 && n < len && (text[n] & 0xc0) == 0x80; n += incr);
+	return n;
+}
+
 void
 paste(void) {
 	char *p, *q;
@@ -377,7 +377,7 @@ paste(void) {
 	unsigned long dl;
 	Atom da;
 
-	XGetWindowProperty(dc->dpy, win, utf8, 0, sizeof text - cursor, True,
+	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));
 	XFree(p);
@@ -387,22 +387,17 @@ paste(void) {
 void
 readstdin(void) {
 	char buf[sizeof text], *p;
-	Item *item, *new;
+	Item *item, **end;
 
-	allitems = NULL;
-	for(item = NULL; fgets(buf, sizeof buf, stdin); item = new) {
+	for(end = &items; fgets(buf, sizeof buf, stdin); *end = item, end = &item->next) {
 		if((p = strchr(buf, '\n')))
 			*p = '\0';
-		if(!(new = malloc(sizeof *new)))
-			eprintf("cannot malloc %u bytes\n", sizeof *new);
-		if(!(new->text = strdup(buf)))
+		if(!(item = malloc(sizeof *item)))
+			eprintf("cannot malloc %u bytes\n", sizeof *item);
+		if(!(item->text = strdup(buf)))
 			eprintf("cannot strdup %u bytes\n", strlen(buf)+1);
-		inputw = MAX(inputw, textw(dc, new->text));
-		new->next = new->left = new->right = NULL;
-		if(item)
-			item->next = new;
-		else
-			allitems = new;
+		item->next = item->left = item->right = NULL;
+		inputw = MAX(inputw, dc_textw(dc, item->text));
 	}
 }
 
@@ -443,13 +438,15 @@ setup(void) {
 	root = RootWindow(dc->dpy, screen);
 	utf8 = XInternAtom(dc->dpy, "UTF8_STRING", False);
 
-	normcol[ColBG] = getcolor(dc, normbgcolor);
-	normcol[ColFG] = getcolor(dc, normfgcolor);
-	selcol[ColBG] = getcolor(dc, selbgcolor);
-	selcol[ColFG] = getcolor(dc, selfgcolor);
+	normcol[ColBG] = dc_color(dc, normbgcolor);
+	normcol[ColFG] = dc_color(dc, normfgcolor);
+	selcol[ColBG] = dc_color(dc, selbgcolor);
+	selcol[ColFG] = dc_color(dc, selfgcolor);
 
 	/* menu geometry */
-	mh = (lines + 1) * LINEH;
+	bh = dc->font.height + 2;
+	lines = MAX(lines, 0);
+	mh = (lines + 1) * bh;
 #ifdef XINERAMA
 	if((info = XineramaQueryScreens(dc->dpy, &n))) {
 		int i, di;
@@ -482,9 +479,9 @@ setup(void) {
 	                    CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa);
 
 	grabkeyboard();
-	setcanvas(dc, mw, mh);
+	dc_resize(dc, mw, mh);
 	inputw = MIN(inputw, mw/3);
-	promptw = prompt ? MIN(textw(dc, prompt), mw/5) : 0;
+	promptw = prompt ? dc_textw(dc, prompt) : 0;
 	XMapRaised(dc->dpy, win);
 	text[0] = '\0';
 	match();
@@ -510,10 +507,8 @@ main(int argc, char *argv[]) {
 		}
 		else if(!strcmp(argv[i], "-b"))
 			topbar = False;
-		else if(!strcmp(argv[i], "-i")) {
+		else if(!strcmp(argv[i], "-i"))
 			fstrncmp = strncasecmp;
-			fstrstr = cistrstr;
-		}
 		else if(i == argc-1)
 			usage();
 		/* double flags */
@@ -534,8 +529,8 @@ main(int argc, char *argv[]) {
 		else
 			usage();
 
-	dc = initdraw();
-	initfont(dc, font);
+	dc = dc_init();
+	dc_font(dc, font);
 	readstdin();
 	setup();
 	run();