X-Git-Url: https://git.xinqibao.xyz/dmenu.git/blobdiff_plain/c9465859a6eac7763d0b9049dca6bd34c163d8f6..65912f2a96d32600a07b963e9149f70ca22e73bb:/main.c?ds=inline

diff --git a/main.c b/main.c
index 77a61b9..964fad6 100644
--- a/main.c
+++ b/main.c
@@ -1,19 +1,17 @@
-/*
- * (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
+/* (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
  * (C)opyright MMVI Sander van Dijk <a dot h dot vandijk at gmail dot com>
  * See LICENSE file for license details.
  */
-
 #include "dmenu.h"
 
 #include <ctype.h>
+#include <locale.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
 #include <sys/select.h>
 #include <sys/time.h>
-#include <X11/cursorfont.h>
 #include <X11/Xutil.h>
 #include <X11/keysym.h>
 
@@ -27,10 +25,12 @@ struct Item {
 /* static */
 
 static char text[4096];
+static char *prompt = NULL;
 static int mx, my, mw, mh;
 static int ret = 0;
 static int nitem = 0;
 static unsigned int cmdw = 0;
+static unsigned int promptw = 0;
 static Bool running = True;
 static Item *allitems = NULL;	/* first of all items */
 static Item *item = NULL;	/* first of pattern matching items */
@@ -47,8 +47,7 @@ calcoffsets(void) {
 
 	if(!curr)
 		return;
-
-	w = cmdw + 2 * SPACE;
+	w = promptw + cmdw + 2 * SPACE;
 	for(next = curr; next; next=next->right) {
 		tw = textw(next->text);
 		if(tw > mw / 3)
@@ -57,8 +56,7 @@ calcoffsets(void) {
 		if(w > mw)
 			break;
 	}
-
-	w = cmdw + 2 * SPACE;
+	w = promptw + cmdw + 2 * SPACE;
 	for(prev = curr; prev && prev->left; prev=prev->left) {
 		tw = textw(prev->left->text);
 		if(tw > mw / 3)
@@ -78,18 +76,22 @@ drawmenu(void) {
 	dc.w = mw;
 	dc.h = mh;
 	drawtext(NULL, dc.norm);
-
+	/* print prompt? */
+	if(promptw) {
+		dc.w = promptw;
+		drawtext(prompt, dc.sel);
+	}
+	dc.x += promptw;
+	dc.w = mw - promptw;
 	/* print command */
 	if(cmdw && item)
 		dc.w = cmdw;
 	drawtext(text[0] ? text : NULL, dc.norm);
 	dc.x += cmdw;
-
 	if(curr) {
 		dc.w = SPACE;
 		drawtext((curr && curr->left) ? "<" : NULL, dc.norm);
 		dc.x += dc.w;
-
 		/* determine maximum items */
 		for(i = curr; i != next; i=i->right) {
 			dc.w = textw(i->text);
@@ -98,7 +100,6 @@ drawmenu(void) {
 			drawtext(i->text, (sel == i) ? dc.sel : dc.norm);
 			dc.x += dc.w;
 		}
-
 		dc.x = mw - SPACE;
 		dc.w = SPACE;
 		drawtext(next ? ">" : NULL, dc.norm);
@@ -114,14 +115,23 @@ match(char *pattern) {
 
 	if(!pattern)
 		return;
-
 	plen = strlen(pattern);
 	item = j = NULL;
 	nitem = 0;
-
 	for(i = allitems; i; i=i->next)
-		if(plen ? !strncmp(pattern, i->text, plen) :
-				strncmp(pattern, i->text, plen) && strstr(i->text, pattern)) {
+		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
@@ -131,7 +141,6 @@ match(char *pattern) {
 			j = i;
 			nitem++;
 		}
-
 	curr = prev = next = sel = item;
 	calcoffsets();
 }
@@ -145,13 +154,11 @@ kpress(XKeyEvent * e) {
 
 	len = strlen(text);
 	buf[0] = 0;
-	num = XLookupString(e, buf, sizeof(buf), &ksym, 0);
-
+	num = XLookupString(e, buf, sizeof buf, &ksym, 0);
 	if(IsFunctionKey(ksym) || IsKeypadKey(ksym)
 			|| IsMiscFunctionKey(ksym) || IsPFKey(ksym)
 			|| IsPrivateKeypadKey(ksym))
 		return;
-
 	/* first check if a control mask is omitted */
 	if(e->state & ControlMask) {
 		switch (ksym) {
@@ -172,6 +179,42 @@ kpress(XKeyEvent * e) {
 		}
 	}
 	switch(ksym) {
+	default:
+		if(num && !iscntrl((int) buf[0])) {
+			buf[num] = 0;
+			if(len > 0)
+				strncat(text, buf, sizeof text);
+			else
+				strncpy(text, buf, sizeof text);
+			match(text);
+		}
+		break;
+	case XK_BackSpace:
+		if((i = len)) {
+			prev_nitem = nitem;
+			do {
+				text[--i] = 0;
+				match(text);
+			} while(i && nitem && prev_nitem == nitem);
+			match(text);
+		}
+		break;
+	case XK_End:
+		while(next) {
+			sel = curr = next;
+			calcoffsets();
+		}
+		while(sel->right)
+			sel = sel->right;
+		break;
+	case XK_Escape:
+		ret = 1;
+		running = False;
+		break;
+	case XK_Home:
+		sel = curr = item;
+		calcoffsets();
+		break;
 	case XK_Left:
 		if(!(sel && sel->left))
 			return;
@@ -181,18 +224,15 @@ kpress(XKeyEvent * e) {
 			calcoffsets();
 		}
 		break;
-	case XK_Tab:
-		if(!sel)
-			return;
-		strncpy(text, sel->text, sizeof(text));
-		match(text);
+	case XK_Next:
+		if(next) {
+			sel = curr = next;
+			calcoffsets();
+		}
 		break;
-	case XK_Right:
-		if(!(sel && sel->right))
-			return;
-		sel=sel->right;
-		if(sel == next) {
-			curr = next;
+	case XK_Prior:
+		if(prev) {
+			sel = curr = prev;
 			calcoffsets();
 		}
 		break;
@@ -206,29 +246,21 @@ kpress(XKeyEvent * e) {
 		fflush(stdout);
 		running = False;
 		break;
-	case XK_Escape:
-		ret = 1;
-		running = False;
-		break;
-	case XK_BackSpace:
-		if((i = len)) {
-			prev_nitem = nitem;
-			do {
-				text[--i] = 0;
-				match(text);
-			} while(i && nitem && prev_nitem == nitem);
-			match(text);
+	case XK_Right:
+		if(!(sel && sel->right))
+			return;
+		sel=sel->right;
+		if(sel == next) {
+			curr = next;
+			calcoffsets();
 		}
 		break;
-	default:
-		if(num && !iscntrl((int) buf[0])) {
-			buf[num] = 0;
-			if(len > 0)
-				strncat(text, buf, sizeof(text));
-			else
-				strncpy(text, buf, sizeof(text));
-			match(text);
-		}
+	case XK_Tab:
+		if(!sel)
+			return;
+		strncpy(text, sel->text, sizeof text);
+		match(text);
+		break;
 	}
 	drawmenu();
 }
@@ -241,7 +273,7 @@ readstdin(void) {
 	Item *i, *new;
 
 	i = 0;
-	while(fgets(buf, sizeof(buf), stdin)) {
+	while(fgets(buf, sizeof buf, stdin)) {
 		len = strlen(buf);
 		if (buf[len - 1] == '\n')
 			buf[len - 1] = 0;
@@ -250,7 +282,6 @@ readstdin(void) {
 			maxname = p;
 			max = len;
 		}
-
 		new = emalloc(sizeof(Item));
 		new->next = new->left = new->right = NULL;
 		new->text = p;
@@ -272,20 +303,51 @@ DC dc = {0};
 
 int
 main(int argc, char *argv[]) {
+	char *font = FONT;
 	char *maxname;
+	char *normbg = NORMBGCOLOR;
+	char *normfg = NORMFGCOLOR;
+	char *selbg = SELBGCOLOR;
+	char *selfg = SELFGCOLOR;
 	fd_set rd;
+	int i;
 	struct timeval timeout;
-	Item *i;
+	Item *itm;
 	XEvent ev;
 	XSetWindowAttributes wa;
 
-	if(argc == 2 && !strncmp("-v", argv[1], 3)) {
-		fputs("dmenu-"VERSION", (C)opyright MMVI Anselm R. Garbe\n", stdout);
-		exit(EXIT_SUCCESS);
-	}
-	else if(argc != 1)
-		eprint("usage: dmenu [-v]\n");
-
+	timeout.tv_usec = 0;
+	timeout.tv_sec = 3;
+	/* command line args */
+	for(i = 1; i < argc; i++)
+		if(!strncmp(argv[i], "-font", 6)) {
+			if(++i < argc) font = argv[i];
+		}
+		else if(!strncmp(argv[i], "-normbg", 8)) {
+			if(++i < argc) normbg = argv[i];
+		}
+		else if(!strncmp(argv[i], "-normfg", 8)) {
+			if(++i < argc) normfg = argv[i];
+		}
+		else if(!strncmp(argv[i], "-selbg", 7)) {
+			if(++i < argc) selbg = argv[i];
+		}
+		else if(!strncmp(argv[i], "-selfg", 7)) {
+			if(++i < argc) selfg = argv[i];
+		}
+		else if(!strncmp(argv[i], "-p", 3)) {
+			if(++i < argc) prompt = argv[i];
+		}
+		else if(!strncmp(argv[i], "-t", 3)) {
+			if(++i < argc) timeout.tv_sec = atoi(argv[i]);
+		}
+		else if(!strncmp(argv[i], "-v", 3)) {
+			fputs("dmenu-"VERSION", (C)opyright MMVI Anselm R. Garbe\n", stdout);
+			exit(EXIT_SUCCESS);
+		}
+		else
+			eprint("usage: dmenu [-font <name>] [-{norm,sel}{bg,fg} <color>] [-p <prompt>] [-t <seconds>] [-v]\n", stdout);
+	setlocale(LC_CTYPE, "");
 	dpy = XOpenDisplay(0);
 	if(!dpy)
 		eprint("dmenu: cannot open display\n");
@@ -300,46 +362,40 @@ main(int argc, char *argv[]) {
 	while(XGrabKeyboard(dpy, root, True, GrabModeAsync,
 			 GrabModeAsync, CurrentTime) != GrabSuccess)
 		usleep(1000);
-
-	timeout.tv_usec = 0;
-	timeout.tv_sec = STDIN_TIMEOUT;
 	FD_ZERO(&rd);
 	FD_SET(STDIN_FILENO, &rd);
 	if(select(ConnectionNumber(dpy) + 1, &rd, NULL, NULL, &timeout) < 1)
 		goto UninitializedEnd;
 	maxname = readstdin();
-
 	/* style */
-	dc.sel[ColBG] = getcolor(SELBGCOLOR);
-	dc.sel[ColFG] = getcolor(SELFGCOLOR);
-	dc.norm[ColBG] = getcolor(NORMBGCOLOR);
-	dc.norm[ColFG] = getcolor(NORMFGCOLOR);
-	setfont(FONT);
-
+	dc.norm[ColBG] = getcolor(normbg);
+	dc.norm[ColFG] = getcolor(normfg);
+	dc.sel[ColBG] = getcolor(selbg);
+	dc.sel[ColFG] = getcolor(selfg);
+	setfont(font);
+	/* menu window */
 	wa.override_redirect = 1;
 	wa.background_pixmap = ParentRelative;
 	wa.event_mask = ExposureMask | ButtonPressMask | KeyPressMask;
-
 	mx = my = 0;
 	mw = DisplayWidth(dpy, screen);
 	mh = dc.font.height + 2;
-
 	win = XCreateWindow(dpy, root, mx, my, mw, mh, 0,
 			DefaultDepth(dpy, screen), CopyFromParent,
 			DefaultVisual(dpy, screen),
 			CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa);
-	XDefineCursor(dpy, win, XCreateFontCursor(dpy, XC_xterm));
-
 	/* pixmap */
 	dc.drawable = XCreatePixmap(dpy, root, mw, mh, DefaultDepth(dpy, screen));
 	dc.gc = XCreateGC(dpy, root, 0, 0);
 	XSetLineAttributes(dpy, dc.gc, 1, LineSolid, CapButt, JoinMiter);
-
 	if(maxname)
 		cmdw = textw(maxname);
 	if(cmdw > mw / 3)
 		cmdw = mw / 3;
-
+	if(prompt)
+		promptw = textw(prompt);
+	if(promptw > mw / 5)
+		promptw = mw / 5;
 	text[0] = 0;
 	match(text);
 	XMapRaised(dpy, win);
@@ -347,7 +403,7 @@ main(int argc, char *argv[]) {
 	XSync(dpy, False);
 
 	/* main event loop */
-	while(running && !XNextEvent(dpy, &ev)) {
+	while(running && !XNextEvent(dpy, &ev))
 		switch (ev.type) {
 		default:	/* ignore all crap */
 			break;
@@ -359,13 +415,13 @@ main(int argc, char *argv[]) {
 				drawmenu();
 			break;
 		}
-	}
 
+	/* cleanup */
 	while(allitems) {
-		i = allitems->next;
+		itm = allitems->next;
 		free(allitems->text);
 		free(allitems);
-		allitems = i;
+		allitems = itm;
 	}
 	if(dc.font.set)
 		XFreeFontSet(dpy, dc.font.set);
@@ -377,6 +433,5 @@ main(int argc, char *argv[]) {
 UninitializedEnd:
 	XUngrabKeyboard(dpy, CurrentTime);
 	XCloseDisplay(dpy);
-
 	return ret;
 }