git.stevedylan.dev

removed ido-matching, changed behavior of -i meaning case insensitive matching now, commented -x, -y, -w arguments in dmenu.1 540a7876

Anselm R Garbe · 2008-03-12 15:41 4 file(s) · +37 −36

LICENSE +1 −1

MIT/X Consortium License

© 2006-2007 Anselm R. Garbe <garbeam at gmail dot com>
© 2006-2008 Anselm R. Garbe <garbeam at gmail dot com>
© 2006-2007 Sander van Dijk <a dot h dot vandijk at gmail dot com>
© 2006-2007 Michał Janeczek <janeczek at gmail dot com>


config.h +1 −1

/* See LICENSE file for copyright and license details. */

/* appearance */
#define FONT			"-*-terminus-medium-*-*-*-*-*-*-*-*-*-*-*"
#define FONT			"-*-terminus-medium-r-normal-*-14-*-*-*-*-*-*-*"
#define NORMBGCOLOR             "#cccccc"
#define NORMFGCOLOR             "#000000"
#define SELBGCOLOR              "#0066ff"

dmenu.1 +12 −4

dmenu \- dynamic menu
.SH SYNOPSIS
.B dmenu
.RB [ \-b ]
.RB [ \-i ]
.RB [ \-x " <x>"]
.RB [ \-y " <y>"]
.RB [ \-w " <width>"]
.RB [ \-fn " <font>"]
.RB [ \-nb " <color>"]
.RB [ \-nf " <color>"]

efficiently.
.SS Options
.TP
.B \-b
makes dmenu appear at the screen bottom (by default it appears at the screen top).
.B \-x
defines the x coordinate dmenu appears at (0 by default).
.TP
.B \-y
defines the y coordinate dmenu appears at (0 by default).
.TP
.B \-w
defines the width of the dmenu window (screen width by default).
.TP
.B \-i
makes dmenu match menu entries with ignoring intermediate characters.
makes dmenu match menu entries case insensitively.
.TP
.B \-fn <font>
defines the font.

dmenu.c +23 −30

void match(char *pattern);
void readstdin(void);
void run(void);
void setup(Bool bottom);
int strcaseido(const char *text, const char *pattern);
void setup(int x, int y, int w);
char *cistrstr(const char *s, const char *sub);
unsigned int textnw(const char *text, unsigned int len);
unsigned int textw(const char *text);

unsigned int promptw = 0;
unsigned int nitem = 0;
unsigned int numlockmask = 0;
Bool idomatch = False;
Bool running = True;
Display *dpy;
DC dc = {0};

Item *prev = NULL;
Item *curr = NULL;
Window root, win;
char *(*fstrstr)(const char *, const char *) = strstr;

Item *
appenditem(Item *i, Item *last) {

		if(!i->matched && !strncasecmp(pattern, i->text, plen))
			j = appenditem(i, j);
	for(i = allitems; i; i = i->next)
		if(!i->matched && cistrstr(i->text, pattern))
		if(!i->matched && fstrstr(i->text, pattern))
			j = appenditem(i, j);
	if(idomatch)
		for(i = allitems; i; i = i->next)
			if(!i->matched && strcaseido(i->text, pattern))
				j = appenditem(i, j);
	curr = prev = next = sel = item;
	calcoffsets();
}

}

void
setup(Bool bottom) {
setup(int x, int y, int w) {
	unsigned int i, j;
	XModifierKeymap *modmap;
	XSetWindowAttributes wa;

	wa.override_redirect = 1;
	wa.background_pixmap = ParentRelative;
	wa.event_mask = ExposureMask | ButtonPressMask | KeyPressMask;
	mw = DisplayWidth(dpy, screen);
	mw = w ? w : DisplayWidth(dpy, screen);
	mh = dc.font.height + 2;
	win = XCreateWindow(dpy, root, 0,
			bottom ? DisplayHeight(dpy, screen) - mh : 0, mw, mh, 0,
	win = XCreateWindow(dpy, root, x, y, mw, mh, 0,
			DefaultDepth(dpy, screen), CopyFromParent,
			DefaultVisual(dpy, screen),
			CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa);

	match(text);
	XMapRaised(dpy, win);
}

int
strcaseido(const char *text, const char *pattern) {
	for(; *text && *pattern; text++)
		if(tolower((int)*text) == tolower((int)*pattern))
			pattern++;
	return !*pattern;
}                                  

char *
cistrstr(const char *s, const char *sub) {


int
main(int argc, char *argv[]) {
	Bool bottom = False;
	int x = 0, y = 0, w = 0;
	unsigned int i;

	/* command line args */
	for(i = 1; i < argc; i++)
		if(!strcmp(argv[i], "-b")) {
			bottom = True;
		}
		else if(!strcmp(argv[i], "-i"))
			idomatch = True;
		if(!strcmp(argv[i], "-i"))
			fstrstr = cistrstr;
		else if(!strcmp(argv[i], "-fn")) {
			if(++i < argc) font = argv[i];
		}

		else if(!strcmp(argv[i], "-sf")) {
			if(++i < argc) selfg = argv[i];
		}
		else if(!strcmp(argv[i], "-x")) {
			if(++i < argc) x = atoi(argv[i]);
		}
		else if(!strcmp(argv[i], "-y")) {
			if(++i < argc) y = atoi(argv[i]);
		}
		else if(!strcmp(argv[i], "-w")) {
			if(++i < argc) w = atoi(argv[i]);
		}
		else if(!strcmp(argv[i], "-v"))
			eprint("dmenu-"VERSION", © 2006-2007 Anselm R. Garbe, Sander van Dijk, Michał Janeczek\n");
			eprint("dmenu-"VERSION", © 2006-2008 dmenu engineers, see LICENSE for details\n");
		else
			eprint("usage: dmenu [-b] [-i] [-fn <font>] [-nb <color>] [-nf <color>]\n"
			"             [-p <prompt>] [-sb <color>] [-sf <color>] [-v]\n");
			eprint("usage: dmenu [-i] [-fn <font>] [-nb <color>] [-nf <color>]\n"
			       "             [-p <prompt>] [-sb <color>] [-sf <color>]\n"
			       "             [-x <x>] [-y <y>] [-w <w>] [-v]\n");
	setlocale(LC_CTYPE, "");
	dpy = XOpenDisplay(0);
	if(!dpy)

		readstdin();
	}

	setup(bottom);
	setup(x, y, w);
	drawmenu();
	XSync(dpy, False);
	run();

56	56		void match(char *pattern);
57	57		void readstdin(void);
58	58		void run(void);
59		-	void setup(Bool bottom);
60		-	int strcaseido(const char text, const char pattern);
	59	+	void setup(int x, int y, int w);
61	60		char cistrstr(const char s, const char *sub);
62	61		unsigned int textnw(const char *text, unsigned int len);
63	62		unsigned int textw(const char *text);

80	79		unsigned int promptw = 0;
81	80		unsigned int nitem = 0;
82	81		unsigned int numlockmask = 0;
83		-	Bool idomatch = False;
84	82		Bool running = True;
85	83		Display *dpy;
86	84		DC dc = {0};

91	89		Item *prev = NULL;
92	90		Item *curr = NULL;
93	91		Window root, win;
	92	+	char (fstrstr)(const char , const char ) = strstr;
94	93
95	94		Item *
96	95		appenditem(Item i, Item last) {

512	511		if(!i->matched && !strncasecmp(pattern, i->text, plen))
513	512		j = appenditem(i, j);
514	513		for(i = allitems; i; i = i->next)
515		-	if(!i->matched && cistrstr(i->text, pattern))
	514	+	if(!i->matched && fstrstr(i->text, pattern))
516	515		j = appenditem(i, j);
517		-	if(idomatch)
518		-	for(i = allitems; i; i = i->next)
519		-	if(!i->matched && strcaseido(i->text, pattern))
520		-	j = appenditem(i, j);
521	516		curr = prev = next = sel = item;
522	517		calcoffsets();
523	518		}

569	564		}
570	565
571	566		void
572		-	setup(Bool bottom) {
	567	+	setup(int x, int y, int w) {
573	568		unsigned int i, j;
574	569		XModifierKeymap *modmap;
575	570		XSetWindowAttributes wa;

595	590		wa.override_redirect = 1;
596	591		wa.background_pixmap = ParentRelative;
597	592		wa.event_mask = ExposureMask \| ButtonPressMask \| KeyPressMask;
598		-	mw = DisplayWidth(dpy, screen);
	593	+	mw = w ? w : DisplayWidth(dpy, screen);
599	594		mh = dc.font.height + 2;
600		-	win = XCreateWindow(dpy, root, 0,
601		-	bottom ? DisplayHeight(dpy, screen) - mh : 0, mw, mh, 0,
	595	+	win = XCreateWindow(dpy, root, x, y, mw, mh, 0,
602	596		DefaultDepth(dpy, screen), CopyFromParent,
603	597		DefaultVisual(dpy, screen),
604	598		CWOverrideRedirect \| CWBackPixmap \| CWEventMask, &wa);

621	615		match(text);
622	616		XMapRaised(dpy, win);
623	617		}
624		-
625		-	int
626		-	strcaseido(const char text, const char pattern) {
627		-	for(; text && pattern; text++)
628		-	if(tolower((int)text) == tolower((int)pattern))
629		-	pattern++;
630		-	return !*pattern;
631		-	}
632	618
633	619		char *
634	620		cistrstr(const char s, const char sub) {

671	657
672	658		int
673	659		main(int argc, char *argv[]) {
674		-	Bool bottom = False;
	660	+	int x = 0, y = 0, w = 0;
675	661		unsigned int i;
676	662
677	663		/* command line args */
678	664		for(i = 1; i < argc; i++)
679		-	if(!strcmp(argv[i], "-b")) {
680		-	bottom = True;
681		-	}
682		-	else if(!strcmp(argv[i], "-i"))
683		-	idomatch = True;
	665	+	if(!strcmp(argv[i], "-i"))
	666	+	fstrstr = cistrstr;
684	667		else if(!strcmp(argv[i], "-fn")) {
685	668		if(++i < argc) font = argv[i];
686	669		}

699	682		else if(!strcmp(argv[i], "-sf")) {
700	683		if(++i < argc) selfg = argv[i];
701	684		}
	685	+	else if(!strcmp(argv[i], "-x")) {
	686	+	if(++i < argc) x = atoi(argv[i]);
	687	+	}
	688	+	else if(!strcmp(argv[i], "-y")) {
	689	+	if(++i < argc) y = atoi(argv[i]);
	690	+	}
	691	+	else if(!strcmp(argv[i], "-w")) {
	692	+	if(++i < argc) w = atoi(argv[i]);
	693	+	}
702	694		else if(!strcmp(argv[i], "-v"))
703		-	eprint("dmenu-"VERSION", © 2006-2007 Anselm R. Garbe, Sander van Dijk, Michał Janeczek\n");
	695	+	eprint("dmenu-"VERSION", © 2006-2008 dmenu engineers, see LICENSE for details\n");
704	696		else
705		-	eprint("usage: dmenu [-b] [-i] [-fn <font>] [-nb <color>] [-nf <color>]\n"
706		-	" [-p <prompt>] [-sb <color>] [-sf <color>] [-v]\n");
	697	+	eprint("usage: dmenu [-i] [-fn <font>] [-nb <color>] [-nf <color>]\n"
	698	+	" [-p <prompt>] [-sb <color>] [-sf <color>]\n"
	699	+	" [-x <x>] [-y <y>] [-w <w>] [-v]\n");
707	700		setlocale(LC_CTYPE, "");
708	701		dpy = XOpenDisplay(0);
709	702		if(!dpy)

720	713		readstdin();
721	714		}
722	715
723		-	setup(bottom);
	716	+	setup(x, y, w);
724	717		drawmenu();
725	718		XSync(dpy, False);
726	719		run();

1	1		MIT/X Consortium License
2	2
3		-	© 2006-2007 Anselm R. Garbe <garbeam at gmail dot com>
	3	+	© 2006-2008 Anselm R. Garbe <garbeam at gmail dot com>
4	4		© 2006-2007 Sander van Dijk <a dot h dot vandijk at gmail dot com>
5	5		© 2006-2007 Michał Janeczek <janeczek at gmail dot com>
6	6

1	1		/* See LICENSE file for copyright and license details. */
2	2
3	3		/* appearance */
4		-	#define FONT "--terminus-medium-----------"
	4	+	#define FONT "--terminus-medium-r-normal--14-------*"
5	5		#define NORMBGCOLOR "#cccccc"
6	6		#define NORMFGCOLOR "#000000"
7	7		#define SELBGCOLOR "#0066ff"

3	3		dmenu \- dynamic menu
4	4		.SH SYNOPSIS
5	5		.B dmenu
6		-	.RB [ \-b ]
7	6		.RB [ \-i ]
	7	+	.RB [ \-x " <x>"]
	8	+	.RB [ \-y " <y>"]
	9	+	.RB [ \-w " <width>"]
8	10		.RB [ \-fn " <font>"]
9	11		.RB [ \-nb " <color>"]
10	12		.RB [ \-nf " <color>"]

20	22		efficiently.
21	23		.SS Options
22	24		.TP
23		-	.B \-b
24		-	makes dmenu appear at the screen bottom (by default it appears at the screen top).
	25	+	.B \-x
	26	+	defines the x coordinate dmenu appears at (0 by default).
	27	+	.TP
	28	+	.B \-y
	29	+	defines the y coordinate dmenu appears at (0 by default).
	30	+	.TP
	31	+	.B \-w
	32	+	defines the width of the dmenu window (screen width by default).
25	33		.TP
26	34		.B \-i
27		-	makes dmenu match menu entries with ignoring intermediate characters.
	35	+	makes dmenu match menu entries case insensitively.
28	36		.TP
29	37		.B \-fn <font>
30	38		defines the font.