X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=dmenu.c;h=be9b41b5e0c8615d69941f28e45cb86083f879ee;hb=569a1f925a7cf351e6ec3e38529f46a1d9becf3f;hp=fa7bbe801424e0bf5e94e5203de5b69bb9298174;hpb=2cef0ddb014622fe96ad38614b540325911a8696;p=dmenu.git

diff --git a/dmenu.c b/dmenu.c
index fa7bbe8..be9b41b 100644
--- a/dmenu.c
+++ b/dmenu.c
@@ -15,18 +15,19 @@
 #endif
 
 /* macros */
-#define CLEANMASK(mask) (mask & ~(numlockmask | LockMask))
+#define CLEANMASK(mask)         (mask & ~(numlockmask | LockMask))
+#define INRECT(X,Y,RX,RY,RW,RH) ((X) >= (RX) && (X) < (RX) + (RW) && (Y) >= (RY) && (Y) < (RY) + (RH))
+#define MIN(a, b)               ((a) < (b) ? (a) : (b))
+#define MAX(a, b)               ((a) > (b) ? (a) : (b))
 
 /* enums */
 enum { ColFG, ColBG, ColLast };
 
 /* typedefs */
-typedef unsigned int uint;
-typedef unsigned long ulong;
 typedef struct {
 	int x, y, w, h;
-	ulong norm[ColLast];
-	ulong sel[ColLast];
+	unsigned long norm[ColLast];
+	unsigned long sel[ColLast];
 	Drawable drawable;
 	GC gc;
 	struct {
@@ -47,13 +48,15 @@ struct Item {
 
 /* forward declarations */
 static void appenditem(Item *i, Item **list, Item **last);
-static void calcoffsets(void);
+static void calcoffsetsh(void);
+static void calcoffsetsv(void);
 static char *cistrstr(const char *s, const char *sub);
 static void cleanup(void);
-static void drawmenu(void);
-static void drawtext(const char *text, ulong col[ColLast]);
+static void drawmenuh(void);
+static void drawmenuv(void);
+static void drawtext(const char *text, unsigned long col[ColLast]);
 static void eprint(const char *errstr, ...);
-static ulong getcolor(const char *colstr);
+static unsigned long getcolor(const char *colstr);
 static Bool grabkeyboard(void);
 static void initfont(const char *fontstr);
 static void kpress(XKeyEvent * e);
@@ -61,7 +64,7 @@ static void match(char *pattern);
 static void readstdin(void);
 static void run(void);
 static void setup(Bool topbar);
-static int textnw(const char *text, uint len);
+static int textnw(const char *text, unsigned int len);
 static int textw(const char *text);
 
 #include "config.h"
@@ -73,12 +76,13 @@ static char text[4096];
 static int cmdw = 0;
 static int promptw = 0;
 static int ret = 0;
+static int cursor = 0;
 static int screen;
-static uint mw, mh;
-static uint numlockmask = 0;
+static unsigned int mw, mh;
+static unsigned int numlockmask = 0;
 static Bool running = True;
 static Display *dpy;
-static DC dc = {0};
+static DC dc;
 static Item *allitems = NULL;	/* first of all items */
 static Item *item = NULL;	/* first of pattern matching items */
 static Item *sel = NULL;
@@ -88,6 +92,10 @@ static Item *curr = NULL;
 static Window root, win;
 static int (*fstrncmp)(const char *, const char *, size_t n) = strncmp;
 static char *(*fstrstr)(const char *, const char *) = strstr;
+static Bool vlist = False;
+static unsigned int lines = 5;
+static void (*calcoffsets)(void) = calcoffsetsh;
+static void (*drawmenu)(void) = drawmenuh;
 
 void
 appenditem(Item *i, Item **list, Item **last) {
@@ -101,9 +109,9 @@ appenditem(Item *i, Item **list, Item **last) {
 }
 
 void
-calcoffsets(void) {
+calcoffsetsh(void) {
 	int tw;
-	uint w;
+	unsigned int w;
 
 	if(!curr)
 		return;
@@ -127,10 +135,30 @@ calcoffsets(void) {
 	}
 }
 
+void
+calcoffsetsv(void) {
+	static unsigned int w;
+
+	if(!curr)
+		return;
+	w = (dc.font.height + 2) * (lines + 1);
+	for(next = curr; next; next=next->right) {
+		w -= dc.font.height + 2;
+		if(w <= 0)
+			break;
+	}
+	w = (dc.font.height + 2) * (lines + 1);
+	for(prev = curr; prev && prev->left; prev=prev->left) {
+		w -= dc.font.height + 2;
+		if(w <= 0)
+			break;
+	}
+}
+
 char *
 cistrstr(const char *s, const char *sub) {
 	int c, csub;
-	uint len;
+	unsigned int len;
 
 	if(!sub)
 		return (char *)s;
@@ -140,7 +168,7 @@ cistrstr(const char *s, const char *sub) {
 		do {
 			do {
 				if((csub = *s++) == 0)
-					return (NULL);
+					return NULL;
 			}
 			while(tolower(csub) != c);
 		}
@@ -171,7 +199,17 @@ cleanup(void) {
 }
 
 void
-drawmenu(void) {
+drawcursor(void) {
+	XRectangle r = { dc.x, dc.y + 2, 1, dc.h - 4 };
+
+	r.x += textnw(text, cursor) + dc.font.height / 2;
+
+	XSetForeground(dpy, dc.gc, dc.norm[ColFG]);
+	XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
+}
+
+void
+drawmenuh(void) {
 	Item *i;
 
 	dc.x = 0;
@@ -190,6 +228,7 @@ drawmenu(void) {
 	if(cmdw && item)
 		dc.w = cmdw;
 	drawtext(text[0] ? text : NULL, dc.norm);
+	drawcursor();
 	dc.x += cmdw;
 	if(curr) {
 		dc.w = spaceitem;
@@ -212,38 +251,59 @@ drawmenu(void) {
 }
 
 void
-drawtext(const char *text, ulong col[ColLast]) {
-	int x, y, w, h;
-	static char buf[256];
-	uint len, olen;
+drawmenuv(void) {
+	Item *i;
+
+	dc.x = 0;
+	dc.y = 0;
+	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 */
+	drawtext(text[0] ? text : NULL, dc.norm);
+	if(curr) {
+		dc.x = 0;
+		dc.w = mw;
+		dc.y += dc.font.height + 2;
+		/* determine maximum items */
+		for(i = curr; i != next; i=i->right) {
+			drawtext(i->text, (sel == i) ? dc.sel : dc.norm);
+			dc.y += dc.font.height + 2;
+		}
+		drawtext(NULL, dc.norm);
+	}
+	XCopyArea(dpy, dc.drawable, win, dc.gc, 0, 0, mw, mh, 0, 0);
+	XFlush(dpy);
+}
+
+void
+drawtext(const char *text, unsigned long col[ColLast]) {
+	char buf[256];
+	int i, x, y, h, len, olen;
 	XRectangle r = { dc.x, dc.y, dc.w, dc.h };
 
 	XSetForeground(dpy, dc.gc, col[ColBG]);
 	XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
 	if(!text)
 		return;
-	w = 0;
-	olen = len = strlen(text);
-	if(len >= sizeof buf)
-		len = sizeof buf - 1;
-	memcpy(buf, text, len);
-	buf[len] = 0;
-	h = dc.font.ascent + dc.font.descent;
-	y = dc.y + (dc.h / 2) - (h / 2) + dc.font.ascent;
+	olen = strlen(text);
+	h = dc.font.height;
+	y = dc.y + ((h+2) / 2) - (h / 2) + dc.font.ascent;
 	x = dc.x + (h / 2);
 	/* shorten text if necessary */
-	while(len && (w = textnw(buf, len)) > dc.w - h)
-		buf[--len] = 0;
-	if(len < olen) {
-		if(len > 1)
-			buf[len - 1] = '.';
-		if(len > 2)
-			buf[len - 2] = '.';
-		if(len > 3)
-			buf[len - 3] = '.';
-	}
-	if(w > dc.w)
-		return; /* too long */
+	for(len = MIN(olen, sizeof buf); len && textnw(text, len) > dc.w - h; len--);
+	if(!len)
+		return;
+	memcpy(buf, text, len);
+	if(len < olen)
+		for(i = len; i && i > len - 3; buf[--i] = '.');
 	XSetForeground(dpy, dc.gc, col[ColFG]);
 	if(dc.font.set)
 		XmbDrawString(dpy, dc.drawable, dc.font.set, dc.gc, x, y, buf, len);
@@ -261,7 +321,7 @@ eprint(const char *errstr, ...) {
 	exit(EXIT_FAILURE);
 }
 
-ulong
+unsigned long
 getcolor(const char *colstr) {
 	Colormap cmap = DefaultColormap(dpy, screen);
 	XColor color;
@@ -273,7 +333,7 @@ getcolor(const char *colstr) {
 
 Bool
 grabkeyboard(void) {
-	uint len;
+	unsigned int len;
 
 	for(len = 1000; len; len--) {
 		if(XGrabKeyboard(dpy, root, True, GrabModeAsync, GrabModeAsync, CurrentTime)
@@ -292,8 +352,6 @@ initfont(const char *fontstr) {
 	if(!fontstr || fontstr[0] == '\0')
 		eprint("error, cannot load font: '%s'\n", fontstr);
 	missing = NULL;
-	if(dc.font.set)
-		XFreeFontSet(dpy, dc.font.set);
 	dc.font.set = XCreateFontSet(dpy, fontstr, &missing, &n, &def);
 	if(missing)
 		XFreeStringList(missing);
@@ -313,9 +371,6 @@ initfont(const char *fontstr) {
 		}
 	}
 	else {
-		if(dc.font.xfont)
-			XFreeFont(dpy, dc.font.xfont);
-		dc.font.xfont = NULL;
 		if(!(dc.font.xfont = XLoadQueryFont(dpy, fontstr))
 		&& !(dc.font.xfont = XLoadQueryFont(dpy, "fixed")))
 			eprint("error, cannot load font: '%s'\n", fontstr);
@@ -329,12 +384,12 @@ void
 kpress(XKeyEvent * e) {
 	char buf[32];
 	int i, num;
-	uint len;
+	unsigned int len;
 	KeySym ksym;
 
 	len = strlen(text);
 	buf[0] = 0;
-	num = XLookupString(e, buf, sizeof buf, &ksym, 0);
+	num = XLookupString(e, buf, sizeof buf, &ksym, NULL);
 	if(IsKeypadKey(ksym)) {
 		if(ksym == XK_KP_Enter)
 			ksym = XK_Return;
@@ -370,7 +425,7 @@ kpress(XKeyEvent * e) {
 			text[0] = 0;
 			match(text);
 			drawmenu();
-			return;
+			break;
 		case XK_w:
 		case XK_W:
 			if(len) {
@@ -382,7 +437,7 @@ kpress(XKeyEvent * e) {
 				match(text);
 				drawmenu();
 			}
-			return;
+			break;
 		}
 	}
 	if(CLEANMASK(e->state) & Mod1Mask) {
@@ -406,22 +461,39 @@ kpress(XKeyEvent * e) {
 		case XK_G:
 			ksym = XK_End;
 			break;
+		case XK_p:
+			{
+				FILE *fp;
+				char *c;
+				if(!(fp = (FILE*)popen("sselp", "r")))
+					fprintf(stderr, "dmenu: Could not popen sselp\n");
+				c = fgets(text + len, sizeof(text) - len, fp);
+				pclose(fp);
+				if(c == NULL)
+					return;
+			}
+			len = strlen(text);
+			if(len && text[len-1] == '\n')
+				text[--len] = '\0';
+			match(text);
+			drawmenu();
+			return;
 		}
 	}
 	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);
+			memmove(text + cursor + num, text + cursor, sizeof text - cursor);
+			strncpy(text + cursor, buf, sizeof text - cursor);
+			cursor+=num;
 			match(text);
 		}
 		break;
 	case XK_BackSpace:
-		if(len) {
-			text[--len] = 0;
+		if(cursor > 0) {
+			memmove(text + cursor + -1, text + cursor, sizeof text - cursor);
+			cursor--;
 			match(text);
 		}
 		break;
@@ -446,13 +518,18 @@ kpress(XKeyEvent * e) {
 		calcoffsets();
 		break;
 	case XK_Left:
-		if(!(sel && sel->left))
-			return;
-		sel=sel->left;
-		if(sel->right == curr) {
-			curr = prev;
-			calcoffsets();
+	case XK_Up:
+		if(sel && sel->left){
+			sel=sel->left;
+			if(sel->right == curr) {
+				curr = prev;
+				calcoffsets();
+			}
 		}
+		else if(cursor > 0)
+			cursor--;
+		else
+			return;
 		break;
 	case XK_Next:
 		if(!next)
@@ -477,27 +554,36 @@ kpress(XKeyEvent * e) {
 		running = False;
 		break;
 	case XK_Right:
-		if(!(sel && sel->right))
-			return;
-		sel=sel->right;
-		if(sel == next) {
-			curr = next;
-			calcoffsets();
+	case XK_Down:
+		if(cursor < len)
+			cursor++;
+		else if(sel && sel->right) {
+			sel=sel->right;
+			if(sel == next) {
+				curr = next;
+				calcoffsets();
+			}
 		}
+		else
+			return;
 		break;
 	case XK_Tab:
 		if(!sel)
 			return;
 		strncpy(text, sel->text, sizeof text);
+		cursor = strlen(text);
 		match(text);
 		break;
 	}
+	len = strlen(text);
+	cursor = MIN(cursor, len);
+	cursor = MAX(cursor, 0);
 	drawmenu();
 }
 
 void
 match(char *pattern) {
-	uint plen;
+	unsigned int plen;
 	Item *i, *itemend, *lexact, *lprefix, *lsubstr, *exactend, *prefixend, *substrend;
 
 	if(!pattern)
@@ -539,7 +625,7 @@ match(char *pattern) {
 void
 readstdin(void) {
 	char *p, buf[1024];
-	uint len = 0, max = 0;
+	unsigned int len = 0, max = 0;
 	Item *i, *new;
 
 	i = 0;
@@ -553,7 +639,7 @@ readstdin(void) {
 			maxname = p;
 			max = len;
 		}
-		if((new = (Item *)malloc(sizeof(Item))) == NULL)
+		if(!(new = (Item *)malloc(sizeof(Item))))
 			eprint("fatal: could not malloc() %u bytes\n", sizeof(Item));
 		new->next = new->left = new->right = NULL;
 		new->text = p;
@@ -587,11 +673,12 @@ run(void) {
 void
 setup(Bool topbar) {
 	int i, j, x, y;
-	XModifierKeymap *modmap;
-	XSetWindowAttributes wa;
 #if XINERAMA
+	int n;
 	XineramaScreenInfo *info = NULL;
 #endif
+	XModifierKeymap *modmap;
+	XSetWindowAttributes wa;
 
 	/* init modifier map */
 	modmap = XGetModifierMapping(dpy);
@@ -611,18 +698,28 @@ setup(Bool topbar) {
 	initfont(font);
 
 	/* menu window */
-	wa.override_redirect = 1;
+	wa.override_redirect = True;
 	wa.background_pixmap = ParentRelative;
 	wa.event_mask = ExposureMask | ButtonPressMask | KeyPressMask;
 
 	/* menu window geometry */
 	mh = dc.font.height + 2;
+	mh = vlist ? mh * (lines+1) : mh;
 #if XINERAMA
-	if(XineramaIsActive(dpy)) {
-		info = XineramaQueryScreens(dpy, &i);
-		x = info[xidx].x_org;
-		y = topbar ? info[xidx].y_org : info[xidx].y_org + info[xidx].height - mh;
-		mw = info[xidx].width;
+	if(XineramaIsActive(dpy) && (info = XineramaQueryScreens(dpy, &n))) {
+		i = 0;
+		if(n > 1) {
+			int di;
+			unsigned int dui;
+			Window dummy;
+			if(XQueryPointer(dpy, root, &dummy, &dummy, &x, &y, &di, &di, &dui))
+				for(i = 0; i < n; i++)
+					if(INRECT(x, y, info[i].x_org, info[i].y_org, info[i].width, info[i].height))
+						break;
+		}
+		x = info[i].x_org;
+		y = topbar ? info[i].y_org : info[i].y_org + info[i].height - mh;
+		mw = info[i].width;
 		XFree(info);
 	}
 	else
@@ -640,7 +737,7 @@ setup(Bool topbar) {
 
 	/* pixmap */
 	dc.drawable = XCreatePixmap(dpy, root, mw, mh, DefaultDepth(dpy, screen));
-	dc.gc = XCreateGC(dpy, root, 0, 0);
+	dc.gc = XCreateGC(dpy, root, 0, NULL);
 	XSetLineAttributes(dpy, dc.gc, 1, LineSolid, CapButt, JoinMiter);
 	if(!dc.font.set)
 		XSetFont(dpy, dc.gc, dc.font.xfont->fid);
@@ -658,7 +755,7 @@ setup(Bool topbar) {
 }
 
 int
-textnw(const char *text, uint len) {
+textnw(const char *text, unsigned int len) {
 	XRectangle r;
 
 	if(dc.font.set) {
@@ -675,7 +772,7 @@ textw(const char *text) {
 
 int
 main(int argc, char *argv[]) {
-	uint i;
+	unsigned int i;
 	Bool topbar = True;
 
 	/* command line args */
@@ -686,6 +783,12 @@ main(int argc, char *argv[]) {
 		}
 		else if(!strcmp(argv[i], "-b"))
 			topbar = False;
+		else if(!strcmp(argv[i], "-l")) {
+			vlist = True;
+			calcoffsets = calcoffsetsv;
+			drawmenu = drawmenuv;
+			if(++i < argc) lines += atoi(argv[i]);
+		}
 		else if(!strcmp(argv[i], "-fn")) {
 			if(++i < argc) font = argv[i];
 		}
@@ -705,12 +808,13 @@ main(int argc, char *argv[]) {
 			if(++i < argc) selfgcolor = argv[i];
 		}
 		else if(!strcmp(argv[i], "-v"))
-			eprint("dmenu-"VERSION", © 2006-2008 dmenu engineers, see LICENSE for details\n");
+			eprint("dmenu-"VERSION", © 2006-2009 dmenu engineers, see LICENSE for details\n");
 		else
-			eprint("usage: dmenu [-i] [-b] [-fn <font>] [-nb <color>] [-nf <color>]\n"
+			eprint("usage: dmenu [-i] [-b] [-l <lines>] [-fn <font>] [-nb <color>] [-nf <color>]\n"
 			       "             [-p <prompt>] [-sb <color>] [-sf <color>] [-v]\n");
-	setlocale(LC_CTYPE, "");
-	if(!(dpy = XOpenDisplay(0)))
+	if(!setlocale(LC_CTYPE, "") || !XSupportsLocale())
+		fprintf(stderr, "warning: no locale support\n");
+	if(!(dpy = XOpenDisplay(NULL)))
 		eprint("dmenu: cannot open display\n");
 	screen = DefaultScreen(dpy);
 	root = RootWindow(dpy, screen);