git.stevedylan.dev

no -m, cleanup bb3e33de

Connor Lane Smith · 2011-05-18 16:20 3 file(s) · +33 −41

dmenu.1 +6 −11

.RB [ \-i ]
.RB [ \-l
.IR lines ]
.RB [ \-m
.IR monitor ]
.RB [ \-p
.IR prompt ]
.RB [ \-fn

.BI \-l " lines"
dmenu lists items vertically, with the given number of lines.
.TP
.BI \-m " monitor"
dmenu appears on the given Xinerama screen.
.TP
.BI \-p " prompt"
defines the prompt to be displayed to the left of the input field.
.TP

prints version information to stdout, then exits.
.SH USAGE
dmenu is completely controlled by the keyboard.  Besides standard Unix line
editing and item selection (Up/Down/Left/Right, PageUp/PageDown, Home/End), the
editing and item selection (arrow keys, page up/down, home and end), the
following keys are recognized:
.TP
.B Tab (Control\-i)
.B Tab (Ctrl\-i)
Copy the selected item to the input field.
.TP
.B Return (Control\-j)
.B Return (Ctrl\-j)
Confirm selection.  Prints the selected item to stdout and exits, returning
success.
.TP
.B Shift\-Return (Control\-Shift\-j)
.B Shift\-Return (Ctrl\-Shift\-j)
Confirm input.  Prints the input text to stdout and exits, returning success.
.TP
.B Escape (Control\-c)
.B Escape (Ctrl\-c)
Exit without selecting an item, returning failure.
.TP
.B Control\-y
.B Ctrl\-y
Paste the current X selection into the input field.
.SH SEE ALSO
.BR dwm (1)

dmenu.c +18 −17

static void readstdin(void);
static void run(void);
static void setup(void);
static void usage(void);

static char text[BUFSIZ] = "";
static int bh, mw, mh;
static int inputw;
static int inputw, 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;

	for(i = 1; i < argc; i++)
		/* single flags */
		if(!strcmp(argv[i], "-v")) {
			fputs("dmenu-"VERSION", © 2006-2011 dmenu engineers, see LICENSE for details\n", stdout);
			puts("dmenu-"VERSION", © 2006-2011 dmenu engineers, see LICENSE for details");
			exit(EXIT_SUCCESS);
		}
		else if(!strcmp(argv[i], "-b"))

		else if(!strcmp(argv[i], "-i"))
			fstrncmp = strncasecmp;
		else if(i+1 == argc)
			goto usage;
			usage();
		/* 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"))

		else if(!strcmp(argv[i], "-sf"))
			selfgcolor = argv[++i];
		else
			goto usage;
			usage();

	dc = initdc();
	initfont(dc, font);

	}
	setup();
	run();
	return EXIT_FAILURE;

usage:
	fputs("usage: dmenu [-b] [-f] [-i] [-l lines] [-m monitor] [-p prompt] [-fn font]\n"
	      "             [-nb color] [-nf color] [-sb color] [-sf color] [-v]\n", stderr);
	return EXIT_FAILURE;
	return EXIT_FAILURE;  /* should not reach */
}

void

	char buf[sizeof text], *p, *maxstr = NULL;
	size_t i, max = 0, size = 0;

	for(i = 0; fgets(buf, sizeof buf, stdin); items[++i].text = NULL) {
	for(i = 0; fgets(buf, sizeof buf, stdin); i++) {
		if(i+1 >= size / sizeof *items)
			if(!(items = realloc(items, (size += BUFSIZ))))
				eprintf("cannot realloc %u bytes:", size);

		if(strlen(items[i].text) > max)
			max = strlen(maxstr = items[i].text);
	}
	if(items)
		items[i].text = NULL;
	inputw = maxstr ? textw(dc, maxstr) : 0;
}



		XQueryPointer(dc->dpy, root, &dw, &dw, &x, &y, &di, &di, &du);
		for(i = 0; i < n-1; i++)
			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)))
			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 = info[i].y_org + (topbar ? 0 : info[i].height - mh);

		y = topbar ? 0 : DisplayHeight(dc->dpy, screen) - mh;
		mw = DisplayWidth(dc->dpy, screen);
	}
	inputw = MIN(inputw, mw/3);
	promptw = prompt ? textw(dc, prompt) : 0;
	inputw = MIN(inputw, mw/3);
	match(False);

	/* menu window */

	resizedc(dc, mw, mh);
	drawmenu();
}

void
usage(void) {
	fputs("usage: dmenu [-b] [-f] [-i] [-l lines] [-p prompt] [-fn font]\n"
	      "             [-nb color] [-nf color] [-sb color] [-sf color] [-v]\n", stderr);
	exit(EXIT_FAILURE);
}

draw.c +9 −13


#define MAX(a, b)  ((a) > (b) ? (a) : (b))
#define MIN(a, b)  ((a) < (b) ? (a) : (b))
#define DEFFONT    "fixed"
#define DEFAULTFN  "fixed"

static Bool loadfont(DC *dc, const char *fontstr);

void
drawrect(DC *dc, int x, int y, unsigned int w, unsigned int h, Bool fill, unsigned long color) {
	XRectangle r;

	r.x = dc->x + x;
	r.y = dc->y + y;
	r.width  = fill ? w : w-1;
	r.height = fill ? h : h-1;

	XSetForeground(dc->dpy, dc->gc, color);
	(fill ? XFillRectangles : XDrawRectangles)(dc->dpy, dc->canvas, dc->gc, &r, 1);
	if(fill)
		XFillRectangle(dc->dpy, dc->canvas, dc->gc, dc->x + x, dc->y + y, w, h);
	else
		XDrawRectangle(dc->dpy, dc->canvas, dc->gc, dc->x + x, dc->y + y, w-1, h-1);
}

void

	vfprintf(stderr, fmt, ap);
	va_end(ap);

	if(fmt[strlen(fmt)-1] == ':') {
	if(fmt[0] != '\0' && fmt[strlen(fmt)-1] == ':') {
		fputc(' ', stderr);
		perror(NULL);
	}


void
initfont(DC *dc, const char *fontstr) {
	if(!loadfont(dc, fontstr ? fontstr : DEFFONT)) {
	if(!loadfont(dc, fontstr ? fontstr : DEFAULTFN)) {
		if(fontstr != NULL)
			fprintf(stderr, "cannot load font '%s'\n", fontstr);
		if(fontstr == NULL || !loadfont(dc, DEFFONT))
			eprintf("cannot load font '%s'\n", DEFFONT);
		if(fontstr == NULL || !loadfont(dc, DEFAULTFN))
			eprintf("cannot load font '%s'\n", DEFAULTFN);
	}
	dc->font.height = dc->font.ascent + dc->font.descent;
}

8	8		.RB [ \-i ]
9	9		.RB [ \-l
10	10		.IR lines ]
11		-	.RB [ \-m
12		-	.IR monitor ]
13	11		.RB [ \-p
14	12		.IR prompt ]
15	13		.RB [ \-fn

58	56		.BI \-l " lines"
59	57		dmenu lists items vertically, with the given number of lines.
60	58		.TP
61		-	.BI \-m " monitor"
62		-	dmenu appears on the given Xinerama screen.
63		-	.TP
64	59		.BI \-p " prompt"
65	60		defines the prompt to be displayed to the left of the input field.
66	61		.TP

86	81		prints version information to stdout, then exits.
87	82		.SH USAGE
88	83		dmenu is completely controlled by the keyboard. Besides standard Unix line
89		-	editing and item selection (Up/Down/Left/Right, PageUp/PageDown, Home/End), the
	84	+	editing and item selection (arrow keys, page up/down, home and end), the
90	85		following keys are recognized:
91	86		.TP
92		-	.B Tab (Control\-i)
	87	+	.B Tab (Ctrl\-i)
93	88		Copy the selected item to the input field.
94	89		.TP
95		-	.B Return (Control\-j)
	90	+	.B Return (Ctrl\-j)
96	91		Confirm selection. Prints the selected item to stdout and exits, returning
97	92		success.
98	93		.TP
99		-	.B Shift\-Return (Control\-Shift\-j)
	94	+	.B Shift\-Return (Ctrl\-Shift\-j)
100	95		Confirm input. Prints the input text to stdout and exits, returning success.
101	96		.TP
102		-	.B Escape (Control\-c)
	97	+	.B Escape (Ctrl\-c)
103	98		Exit without selecting an item, returning failure.
104	99		.TP
105		-	.B Control\-y
	100	+	.B Ctrl\-y
106	101		Paste the current X selection into the input field.
107	102		.SH SEE ALSO
108	103		.BR dwm (1)

36	36		static void readstdin(void);
37	37		static void run(void);
38	38		static void setup(void);
	39	+	static void usage(void);
39	40
40	41		static char text[BUFSIZ] = "";
41	42		static int bh, mw, mh;
42		-	static int inputw;
	43	+	static int inputw, promptw;
43	44		static int lines = 0;
44		-	static int monitor = -1;
45		-	static int promptw;
46	45		static size_t cursor = 0;
47	46		static const char *font = NULL;
48	47		static const char *prompt = NULL;

70	69		for(i = 1; i < argc; i++)
71	70		/* single flags */
72	71		if(!strcmp(argv[i], "-v")) {
73		-	fputs("dmenu-"VERSION", © 2006-2011 dmenu engineers, see LICENSE for details\n", stdout);
	72	+	puts("dmenu-"VERSION", © 2006-2011 dmenu engineers, see LICENSE for details");
74	73		exit(EXIT_SUCCESS);
75	74		}
76	75		else if(!strcmp(argv[i], "-b"))

80	79		else if(!strcmp(argv[i], "-i"))
81	80		fstrncmp = strncasecmp;
82	81		else if(i+1 == argc)
83		-	goto usage;
	82	+	usage();
84	83		/* double flags */
85	84		else if(!strcmp(argv[i], "-l"))
86	85		lines = atoi(argv[++i]);
87		-	else if(!strcmp(argv[i], "-m"))
88		-	monitor = atoi(argv[++i]);
89	86		else if(!strcmp(argv[i], "-p"))
90	87		prompt = argv[++i];
91	88		else if(!strcmp(argv[i], "-fn"))

99	96		else if(!strcmp(argv[i], "-sf"))
100	97		selfgcolor = argv[++i];
101	98		else
102		-	goto usage;
	99	+	usage();
103	100
104	101		dc = initdc();
105	102		initfont(dc, font);

114	111		}
115	112		setup();
116	113		run();
117		-	return EXIT_FAILURE;
118	114
119		-	usage:
120		-	fputs("usage: dmenu [-b] [-f] [-i] [-l lines] [-m monitor] [-p prompt] [-fn font]\n"
121		-	" [-nb color] [-nf color] [-sb color] [-sf color] [-v]\n", stderr);
122		-	return EXIT_FAILURE;
	115	+	return EXIT_FAILURE; /* should not reach */
123	116		}
124	117
125	118		void

452	445		char buf[sizeof text], p, maxstr = NULL;
453	446		size_t i, max = 0, size = 0;
454	447
455		-	for(i = 0; fgets(buf, sizeof buf, stdin); items[++i].text = NULL) {
	448	+	for(i = 0; fgets(buf, sizeof buf, stdin); i++) {
456	449		if(i+1 >= size / sizeof *items)
457	450		if(!(items = realloc(items, (size += BUFSIZ))))
458	451		eprintf("cannot realloc %u bytes:", size);

463	456		if(strlen(items[i].text) > max)
464	457		max = strlen(maxstr = items[i].text);
465	458		}
	459	+	if(items)
	460	+	items[i].text = NULL;
466	461		inputw = maxstr ? textw(dc, maxstr) : 0;
467	462		}
468	463

519	514
520	515		XQueryPointer(dc->dpy, root, &dw, &dw, &x, &y, &di, &di, &du);
521	516		for(i = 0; i < n-1; i++)
522		-	if((monitor == info[i].screen_number)
523		-	\|\| (monitor < 0 && INRECT(x, y, info[i].x_org, info[i].y_org, info[i].width, info[i].height)))
	517	+	if(INRECT(x, y, info[i].x_org, info[i].y_org, info[i].width, info[i].height))
524	518		break;
525	519		x = info[i].x_org;
526	520		y = info[i].y_org + (topbar ? 0 : info[i].height - mh);

534	528		y = topbar ? 0 : DisplayHeight(dc->dpy, screen) - mh;
535	529		mw = DisplayWidth(dc->dpy, screen);
536	530		}
537		-	inputw = MIN(inputw, mw/3);
538	531		promptw = prompt ? textw(dc, prompt) : 0;
	532	+	inputw = MIN(inputw, mw/3);
539	533		match(False);
540	534
541	535		/* menu window */

551	545		resizedc(dc, mw, mh);
552	546		drawmenu();
553	547		}
	548	+
	549	+	void
	550	+	usage(void) {
	551	+	fputs("usage: dmenu [-b] [-f] [-i] [-l lines] [-p prompt] [-fn font]\n"
	552	+	" [-nb color] [-nf color] [-sb color] [-sf color] [-v]\n", stderr);
	553	+	exit(EXIT_FAILURE);
	554	+	}

9	9
10	10		#define MAX(a, b) ((a) > (b) ? (a) : (b))
11	11		#define MIN(a, b) ((a) < (b) ? (a) : (b))
12		-	#define DEFFONT "fixed"
	12	+	#define DEFAULTFN "fixed"
13	13
14	14		static Bool loadfont(DC dc, const char fontstr);
15	15
16	16		void
17	17		drawrect(DC *dc, int x, int y, unsigned int w, unsigned int h, Bool fill, unsigned long color) {
18		-	XRectangle r;
19		-
20		-	r.x = dc->x + x;
21		-	r.y = dc->y + y;
22		-	r.width = fill ? w : w-1;
23		-	r.height = fill ? h : h-1;
24		-
25	18		XSetForeground(dc->dpy, dc->gc, color);
26		-	(fill ? XFillRectangles : XDrawRectangles)(dc->dpy, dc->canvas, dc->gc, &r, 1);
	19	+	if(fill)
	20	+	XFillRectangle(dc->dpy, dc->canvas, dc->gc, dc->x + x, dc->y + y, w, h);
	21	+	else
	22	+	XDrawRectangle(dc->dpy, dc->canvas, dc->gc, dc->x + x, dc->y + y, w-1, h-1);
27	23		}
28	24
29	25		void

65	61		vfprintf(stderr, fmt, ap);
66	62		va_end(ap);
67	63
68		-	if(fmt[strlen(fmt)-1] == ':') {
	64	+	if(fmt[0] != '\0' && fmt[strlen(fmt)-1] == ':') {
69	65		fputc(' ', stderr);
70	66		perror(NULL);
71	67		}

113	109
114	110		void
115	111		initfont(DC dc, const char fontstr) {
116		-	if(!loadfont(dc, fontstr ? fontstr : DEFFONT)) {
	112	+	if(!loadfont(dc, fontstr ? fontstr : DEFAULTFN)) {
117	113		if(fontstr != NULL)
118	114		fprintf(stderr, "cannot load font '%s'\n", fontstr);
119		-	if(fontstr == NULL \|\| !loadfont(dc, DEFFONT))
120		-	eprintf("cannot load font '%s'\n", DEFFONT);
	115	+	if(fontstr == NULL \|\| !loadfont(dc, DEFAULTFN))
	116	+	eprintf("cannot load font '%s'\n", DEFAULTFN);
121	117		}
122	118		dc->font.height = dc->font.ascent + dc->font.descent;
123	119		}