X-Git-Url: https://git.xinqibao.xyz/dmenu.git/blobdiff_plain/723361fa124aa666d637e3fc9f5df1210a9e02b4..7afd296c40a2e8af9477add1c3d02a7c4b444747:/dmenu.c

diff --git a/dmenu.c b/dmenu.c
index 6641ba2..764e0f0 100644
--- a/dmenu.c
+++ b/dmenu.c
@@ -39,16 +39,17 @@ static void drawmenu(void);
 static void drawmenuh(void);
 static void drawmenuv(void);
 static Bool grabkeyboard(void);
-static void kpress(XKeyEvent * e);
+static void kpress(XKeyEvent *e);
 static void match(char *pattern);
 static void readstdin(void);
 static void run(void);
-static void setup(Bool topbar);
+static void setup(void);
 
 #include "config.h"
 #include "draw.h"
 
 /* variables */
+static char **argp = NULL;
 static char *maxname = NULL;
 static char *prompt = NULL;
 static char text[4096];
@@ -62,6 +63,7 @@ static unsigned int mw, mh;
 static unsigned long normcol[ColLast];
 static unsigned long selcol[ColLast];
 static Bool running = True;
+static Bool topbar = True;
 static DC dc;
 static Display *dpy;
 static Item *allitems = NULL;  /* first of all items */
@@ -107,6 +109,7 @@ calcoffsetsv(void) {
 	next = prev = curr;
 	for(i = 0; i < lines && next; i++)
 		next = next->right;
+	mh = (dc.font.height + 2) * (i + 1);
 	for(i = 0; i < lines && prev && prev->left; i++)
 		prev = prev->left;
 }
@@ -151,7 +154,9 @@ cleanup(void) {
 void
 dinput(void) {
 	cleanup();
-	execlp("dinput", "dinput", text, NULL); /* todo: argv */
+	argp[0] = "dinput";
+	argp[1] = text;
+	execvp("dinput", argp);
 	eprint("cannot exec dinput\n");
 }
 
@@ -161,24 +166,24 @@ drawmenu(void) {
 	dc.y = 0;
 	dc.w = mw;
 	dc.h = mh;
-	drawtext(&dc, NULL, normcol);
+	drawtext(&dc, NULL, normcol, False);
+	dc.h = dc.font.height + 2;
+	dc.y = topbar ? 0 : mh - dc.h;
 	/* print prompt? */
 	if(prompt) {
 		dc.w = promptw;
-		drawtext(&dc, prompt, selcol);
+		drawtext(&dc, prompt, selcol, False);
 		dc.x += dc.w;
 	}
 	dc.w = mw - dc.x;
 	/* print command */
 	if(cmdw && item && lines == 0)
 		dc.w = cmdw;
-	drawtext(&dc, *text ? text : NULL, normcol);
-	if(curr) {
-		if(lines > 0)
-			drawmenuv();
-		else
-			drawmenuh();
-	}
+	drawtext(&dc, *text ? text : NULL, normcol, False);
+	if(lines > 0)
+		drawmenuv();
+	else
+		drawmenuh();
 	XCopyArea(dpy, dc.drawable, win, dc.gc, 0, 0, mw, mh, 0, 0);
 	XFlush(dpy);
 }
@@ -189,31 +194,32 @@ drawmenuh(void) {
 
 	dc.x += cmdw;
 	dc.w = spaceitem;
-	drawtext(&dc, curr->left ? "<" : NULL, normcol);
+	drawtext(&dc, curr && curr->left ? "<" : NULL, normcol, False);
 	dc.x += dc.w;
-	for(i = curr; i != next; i=i->right) {
+	for(i = curr; i != next; i = i->right) {
 		dc.w = MIN(textw(&dc, i->text), mw / 3);
-		drawtext(&dc, i->text, (sel == i) ? selcol : normcol);
+		drawtext(&dc, i->text, (sel == i) ? selcol : normcol, False);
 		dc.x += dc.w;
 	}
 	dc.w = spaceitem;
 	dc.x = mw - dc.w;
-	drawtext(&dc, next ? ">" : NULL, normcol);
+	drawtext(&dc, next ? ">" : NULL, normcol, False);
 }
 
 void
 drawmenuv(void) {
 	Item *i;
+	XWindowAttributes wa;
 
+	dc.y = topbar ? dc.h : 0;
 	dc.w = mw - dc.x;
-	dc.h = dc.font.height + 2;
-	dc.y = dc.h;
-	for(i = curr; i != next; i=i->right) {
-		drawtext(&dc, i->text, (sel == i) ? selcol : normcol);
+	for(i = curr; i != next; i = i->right) {
+		drawtext(&dc, i->text, (sel == i) ? selcol : normcol, False);
 		dc.y += dc.h;
 	}
-	dc.h = mh - dc.y;
-	drawtext(&dc, NULL, normcol);
+	if(!XGetWindowAttributes(dpy, win, &wa))
+		eprint("cannot get window attributes");
+	XMoveResizeWindow(dpy, win, wa.x, wa.y + (topbar ? 0 : wa.height - mh), mw, mh);
 }
 
 Bool
@@ -230,7 +236,7 @@ grabkeyboard(void) {
 }
 
 void
-kpress(XKeyEvent * e) {
+kpress(XKeyEvent *e) {
 	char buf[sizeof text];
 	int num;
 	unsigned int i, len;
@@ -273,6 +279,7 @@ kpress(XKeyEvent * e) {
 			ksym = XK_Tab;
 			break;
 		case XK_j:
+		case XK_m:
 			ksym = XK_Return;
 			break;
 		case XK_n:
@@ -294,9 +301,6 @@ kpress(XKeyEvent * e) {
 			text[++i] = '\0';
 			match(text);
 			break;
-		case XK_x:
-			dinput();
-			break;
 		}
 	}
 	switch(ksym) {
@@ -355,10 +359,9 @@ kpress(XKeyEvent * e) {
 		calcoffsets();
 		break;
 	case XK_Return:
-		if((e->state & ShiftMask) || !sel)
-			fprintf(stdout, "%s", text);
-		else
-			fprintf(stdout, "%s", sel->text);
+		if(e->state & ShiftMask)
+			dinput();
+		fprintf(stdout, "%s", sel ? sel->text : text);
 		fflush(stdout);
 		running = False;
 		return;
@@ -455,7 +458,7 @@ run(void) {
 
 	/* main event loop */
 	while(running && !XNextEvent(dpy, &ev))
-		switch (ev.type) {
+		switch(ev.type) {
 		case KeyPress:
 			kpress(&ev.xkey);
 			break;
@@ -471,7 +474,7 @@ run(void) {
 }
 
 void
-setup(Bool topbar) {
+setup(void) {
 	int i, j, x, y;
 #if XINERAMA
 	int n;
@@ -501,7 +504,7 @@ setup(Bool topbar) {
 	/* menu window */
 	wa.override_redirect = True;
 	wa.background_pixmap = ParentRelative;
-	wa.event_mask = ExposureMask | ButtonPressMask | KeyPressMask | VisibilityChangeMask;
+	wa.event_mask = ExposureMask | KeyPressMask | VisibilityChangeMask;
 
 	/* menu window geometry */
 	mh = (dc.font.height + 2) * (lines + 1);
@@ -525,7 +528,8 @@ setup(Bool topbar) {
 	else
 #endif
 	{
-		XGetWindowAttributes(dpy, parent, &pwa);
+		if(!XGetWindowAttributes(dpy, parent, &pwa))
+			eprint("cannot get window attributes");
 		x = 0;
 		y = topbar ? 0 : pwa.height - mh;
 		mw = pwa.width;
@@ -549,7 +553,6 @@ setup(Bool topbar) {
 int
 main(int argc, char *argv[]) {
 	unsigned int i;
-	Bool topbar = True;
 
 	/* command line args */
 	progname = argv[0];
@@ -586,11 +589,15 @@ main(int argc, char *argv[]) {
 		else if(!strcmp(argv[i], "-sf")) {
 			if(++i < argc) selfgcolor = argv[i];
 		}
-		else if(!strcmp(argv[i], "-v"))
-			eprint("dmenu-"VERSION", © 2006-2010 dmenu engineers, see LICENSE for details\n");
-		else
-			eprint("usage: dmenu [-i] [-b] [-e <xid>] [-l <lines>] [-fn <font>] [-nb <color>]\n"
-			       "             [-nf <color>] [-p <prompt>] [-sb <color>] [-sf <color>] [-v]\n");
+		else if(!strcmp(argv[i], "-v")) {
+			printf("dmenu-"VERSION", © 2006-2010 dmenu engineers, see LICENSE for details\n");
+			exit(EXIT_SUCCESS);
+		}
+		else {
+			fputs("usage: dmenu [-i] [-b] [-e <xid>] [-l <lines>] [-fn <font>] [-nb <color>]\n"
+			       "             [-nf <color>] [-p <prompt>] [-sb <color>] [-sf <color>] [-v]\n", stderr);
+			exit(EXIT_FAILURE);
+		}
 	if(!setlocale(LC_CTYPE, "") || !XSupportsLocale())
 		fprintf(stderr, "dmenu: warning: no locale support\n");
 	if(!(dpy = XOpenDisplay(NULL)))
@@ -598,11 +605,14 @@ main(int argc, char *argv[]) {
 	screen = DefaultScreen(dpy);
 	if(!parent)
 		parent = RootWindow(dpy, screen);
+	if(!(argp = malloc(sizeof *argp * (argc+2))))
+		eprint("cannot malloc %u bytes\n", sizeof *argp * (argc+2));
+	memcpy(argp + 2, argv + 1, sizeof *argp * argc);
 
 	readstdin();
 	running = grabkeyboard();
 
-	setup(topbar);
+	setup();
 	drawmenu();
 	XSync(dpy, False);
 	run();