X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=dmenu.c;h=5c77560013bc5674c7cc73415217f3a0bf6b7579;hb=da81f57f6d7ef2149b1d6db55178b4beaa70c5d7;hp=a5a4cdd78a6ad4f1c4618289618acf4130a1c59f;hpb=e4fdaba88d94d049c4140593cb2fd3208c8cf0f1;p=dmenu.git

diff --git a/dmenu.c b/dmenu.c
index a5a4cdd..5c77560 100644
--- a/dmenu.c
+++ b/dmenu.c
@@ -10,7 +10,7 @@
 #ifdef XINERAMA
 #include <X11/extensions/Xinerama.h>
 #endif
-#include <draw.h>
+#include "draw.h"
 
 #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))
@@ -41,8 +41,9 @@ static void usage(void);
 static char text[BUFSIZ];
 static int bh, mw, mh;
 static int inputw = 0;
-static int promptw;
 static int lines = 0;
+static int monitor = -1;
+static int promptw;
 static size_t cursor = 0;
 static const char *font = NULL;
 static const char *prompt = NULL;
@@ -83,10 +84,10 @@ calcoffsets(void) {
 		n = mw - (promptw + inputw + textw(dc, "<") + textw(dc, ">"));
 
 	for(i = 0, next = curr; next; next = next->right)
-		if((i += (lines > 0) ? bh : MIN(textw(dc, next->text), mw/3)) > n)
+		if((i += (lines > 0) ? bh : MIN(textw(dc, next->text), n)) > n)
 			break;
 	for(i = 0, prev = curr; prev && prev->left; prev = prev->left)
-		if((i += (lines > 0) ? bh : MIN(textw(dc, prev->left->text), mw/3)) > n)
+		if((i += (lines > 0) ? bh : MIN(textw(dc, prev->left->text), n)) > n)
 			break;
 }
 
@@ -124,7 +125,7 @@ drawmenu(void) {
 			drawtext(dc, "<", normcol);
 		for(item = curr; item != next; item = item->right) {
 			dc->x += dc->w;
-			dc->w = MIN(textw(dc, item->text), mw/3);
+			dc->w = MIN(textw(dc, item->text), mw - dc->x - textw(dc, ">"));
 			drawtext(dc, item->text, (item == sel) ? selcol : normcol);
 		}
 		dc->w = textw(dc, ">");
@@ -132,7 +133,7 @@ drawmenu(void) {
 		if(next)
 			drawtext(dc, ">", normcol);
 	}
-	commitdraw(dc, win, mw, mh);
+	mapdc(dc, win, mw, mh);
 }
 
 char *
@@ -233,7 +234,7 @@ keypress(XKeyEvent *ev) {
 	}
 	switch(ksym) {
 	default:
-		if(isprint(*buf))
+		if(!iscntrl(*buf))
 			insert(buf, strlen(buf));
 		break;
 	case XK_Delete:
@@ -454,7 +455,8 @@ setup(void) {
 
 		XQueryPointer(dc->dpy, root, &dw, &dw, &x, &y, &di, &di, &du);
 		for(i = 0; i < n; i++)
-			if(INRECT(x, y, info[i].x_org, info[i].y_org, info[i].width, info[i].height))
+			if((monitor == info[i].screen_number)
+			|| (monitor < 0 && INRECT(x, y, info[i].x_org, info[i].y_org, info[i].width, info[i].height)))
 				break;
 		x = info[i].x_org;
 		y = info[i].y_org + (topbar ? 0 : info[i].height - mh);
@@ -478,9 +480,9 @@ setup(void) {
 	                    CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa);
 
 	grabkeyboard();
-	setcanvas(dc, mw, mh);
+	resizedc(dc, mw, mh);
 	inputw = MIN(inputw, mw/3);
-	promptw = prompt ? MIN(textw(dc, prompt), mw/5) : 0;
+	promptw = prompt ? textw(dc, prompt) : 0;
 	XMapRaised(dc->dpy, win);
 	text[0] = '\0';
 	match();
@@ -513,6 +515,8 @@ main(int argc, char *argv[]) {
 		/* double flags */
 		else if(!strcmp(argv[i], "-l"))
 			lines = atoi(argv[++i]);
+		else if(!strcmp(argv[i], "-m"))
+			monitor = atoi(argv[++i]);
 		else if(!strcmp(argv[i], "-p"))
 			prompt = argv[++i];
 		else if(!strcmp(argv[i], "-fn"))
@@ -528,7 +532,7 @@ main(int argc, char *argv[]) {
 		else
 			usage();
 
-	dc = initdraw();
+	dc = initdc();
 	initfont(dc, font);
 	readstdin();
 	setup();