git.stevedylan.dev

added dmenu.h, common.c 855a5663

Connor Lane Smith · 2010-07-02 06:49 6 file(s) · +204 −314

Makefile +7 −3


include config.mk

SRC = dinput.c dmenu.c
SRC = dinput.c dmenu.c common.c
OBJ = ${SRC:.c=.o}

all: options dinput dmenu

	@echo creating $@ from config.def.h
	@cp config.def.h $@

.o:
dinput: dinput.o common.o
	@echo CC -o $@
	@${CC} -o $@ $< ${LDFLAGS}
	@${CC} -o $@ $+ ${LDFLAGS}

dmenu: dmenu.o common.o
	@echo CC -o $@
	@${CC} -o $@ $+ ${LDFLAGS}

clean:
	@echo cleaning

common.c (added) +129 −0

1	+	/* See LICENSE file for copyright and license details. */
2	+	#include <stdlib.h>
3	+	#include <string.h>
4	+	#include <unistd.h>
5	+	#include <X11/keysym.h>
6	+	#ifdef XINERAMA
7	+	#include <X11/extensions/Xinerama.h>
8	+	#endif
9	+	#include "dmenu.h"
10	+
11	+	/* variables */
12	+	char *prompt = NULL;
13	+	char text[4096] = "";
14	+	int promptw = 0;
15	+	int screen;
16	+	unsigned int numlockmask = 0;
17	+	unsigned int mw, mh;
18	+	unsigned long normcol[ColLast];
19	+	unsigned long selcol[ColLast];
20	+	Bool topbar = True;
21	+	DC dc;
22	+	Display *dpy;
23	+	Window win, root;
24	+
25	+	void
26	+	grabkeyboard(void) {
27	+	unsigned int len;
28	+
29	+	for(len = 1000; len; len--) {
30	+	if(XGrabKeyboard(dpy, root, True, GrabModeAsync, GrabModeAsync, CurrentTime)
31	+	== GrabSuccess)
32	+	return;
33	+	usleep(1000);
34	+	}
35	+	exit(EXIT_FAILURE);
36	+	}
37	+
38	+	void
39	+	run(void) {
40	+	XEvent ev;
41	+
42	+	/* main event loop */
43	+	XSync(dpy, False);
44	+	while(!XNextEvent(dpy, &ev))
45	+	switch(ev.type) {
46	+	case KeyPress:
47	+	kpress(&ev.xkey);
48	+	break;
49	+	case Expose:
50	+	if(ev.xexpose.count == 0)
51	+	drawbar();
52	+	break;
53	+	case VisibilityNotify:
54	+	if(ev.xvisibility.state != VisibilityUnobscured)
55	+	XRaiseWindow(dpy, win);
56	+	break;
57	+	}
58	+	exit(EXIT_FAILURE);
59	+	}
60	+
61	+	void
62	+	setup(unsigned int lines) {
63	+	int i, j, x, y;
64	+	#if XINERAMA
65	+	int n;
66	+	XineramaScreenInfo *info = NULL;
67	+	#endif
68	+	XModifierKeymap *modmap;
69	+	XSetWindowAttributes wa;
70	+
71	+	/* init modifier map */
72	+	modmap = XGetModifierMapping(dpy);
73	+	for(i = 0; i < 8; i++)
74	+	for(j = 0; j < modmap->max_keypermod; j++) {
75	+	if(modmap->modifiermap[i * modmap->max_keypermod + j]
76	+	== XKeysymToKeycode(dpy, XK_Num_Lock))
77	+	numlockmask = (1 << i);
78	+	}
79	+	XFreeModifiermap(modmap);
80	+
81	+	dc.dpy = dpy;
82	+	normcol[ColBG] = getcolor(&dc, normbgcolor);
83	+	normcol[ColFG] = getcolor(&dc, normfgcolor);
84	+	selcol[ColBG] = getcolor(&dc, selbgcolor);
85	+	selcol[ColFG] = getcolor(&dc, selfgcolor);
86	+	initfont(&dc, font);
87	+
88	+	/* input window */
89	+	wa.override_redirect = True;
90	+	wa.background_pixmap = ParentRelative;
91	+	wa.event_mask = ExposureMask \| KeyPressMask \| VisibilityChangeMask;
92	+
93	+	/* input window geometry */
94	+	mh = (dc.font.height + 2) * (lines + 1);
95	+	#if XINERAMA
96	+	if(XineramaIsActive(dpy) && (info = XineramaQueryScreens(dpy, &n))) {
97	+	i = 0;
98	+	if(n > 1) {
99	+	int di;
100	+	unsigned int dui;
101	+	Window dummy;
102	+	if(XQueryPointer(dpy, root, &dummy, &dummy, &x, &y, &di, &di, &dui))
103	+	for(i = 0; i < n; i++)
104	+	if(INRECT(x, y, info[i].x_org, info[i].y_org, info[i].width, info[i].height))
105	+	break;
106	+	}
107	+	x = info[i].x_org;
108	+	y = topbar ? info[i].y_org : info[i].y_org + info[i].height - mh;
109	+	mw = info[i].width;
110	+	XFree(info);
111	+	}
112	+	else
113	+	#endif
114	+	{
115	+	x = 0;
116	+	y = topbar ? 0 : DisplayHeight(dpy, screen) - mh;
117	+	mw = DisplayWidth(dpy, screen);
118	+	}
119	+
120	+	win = XCreateWindow(dpy, root, x, y, mw, mh, 0,
121	+	DefaultDepth(dpy, screen), CopyFromParent,
122	+	DefaultVisual(dpy, screen),
123	+	CWOverrideRedirect \| CWBackPixmap \| CWEventMask, &wa);
124	+
125	+	setupdraw(&dc, win);
126	+	if(prompt)
127	+	promptw = MIN(textw(&dc, prompt), mw / 5);
128	+	XMapRaised(dpy, win);
129	+	}

config.def.h +5 −6

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

/* appearance */
const char *font        = "-*-terminus-medium-r-normal-*-14-*-*-*-*-*-*-*";
const char *normbgcolor = "#cccccc";
const char *normfgcolor = "#000000";
const char *selbgcolor  = "#0066ff";
const char *selfgcolor  = "#ffffff";
unsigned int spaceitem  = 30; /* px between menu items */
static const char *font        = "-*-terminus-medium-r-normal-*-14-*-*-*-*-*-*-*";
static const char *normbgcolor = "#cccccc";
static const char *normfgcolor = "#000000";
static const char *selbgcolor  = "#0066ff";
static const char *selfgcolor  = "#ffffff";

dinput.c +8 −142

#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#include <X11/keysym.h>
#include <X11/Xlib.h>
#include <X11/Xutil.h>
#ifdef XINERAMA
#include <X11/extensions/Xinerama.h>
#endif
#include <draw.h>

/* macros */
#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))
#define IS_UTF8_1ST_CHAR(c)     ((((c) & 0xc0) == 0xc0) || !((c) & 0x80))
#include "dmenu.h"

/* forward declarations */
static void cleanup(void);
static void drawinput(void);
static void grabkeyboard(void);
static void kpress(XKeyEvent *e);
static void run(void);
static void setup(void);

#include "config.h"

/* variables */
static char *prompt = NULL;
static char text[4096];
static int promptw = 0;
static int screen;
static size_t cursor = 0;
static unsigned int numlockmask = 0;
static unsigned int mw, mh;
static unsigned long normcol[ColLast];
static unsigned long selcol[ColLast];
static Bool topbar = True;
static DC dc;
static Display *dpy;
static Window win, root;

void
cleanup(void) {

}

void
drawinput(void)
drawbar(void)
{
	dc.x = 0;
	dc.y = 0;

	drawtext(&dc, text, normcol);
	drawcursor(&dc, text, cursor, normcol);
	commitdraw(&dc, win);
}

void
grabkeyboard(void) {
	unsigned int len;

	for(len = 1000; len; len--) {
		if(XGrabKeyboard(dpy, root, True, GrabModeAsync, GrabModeAsync, CurrentTime)
		== GrabSuccess)
			return;
		usleep(1000);
	}
	exit(EXIT_FAILURE);
}

void

		while(cursor++ < len && !IS_UTF8_1ST_CHAR(text[cursor]));
		break;
	}
	drawinput();
}

void
run(void) {
	XEvent ev;

	/* main event loop */
	XSync(dpy, False);
	while(!XNextEvent(dpy, &ev))
		switch(ev.type) {
		case KeyPress:
			kpress(&ev.xkey);
			break;
		case Expose:
			if(ev.xexpose.count == 0)
				drawinput();
			break;
		case VisibilityNotify:
			if(ev.xvisibility.state != VisibilityUnobscured)
				XRaiseWindow(dpy, win);
			break;
		}
	exit(EXIT_FAILURE);
}

void
setup(void) {
	int i, j, x, y;
#if XINERAMA
	int n;
	XineramaScreenInfo *info = NULL;
#endif
	XModifierKeymap *modmap;
	XSetWindowAttributes wa;

	/* init modifier map */
	modmap = XGetModifierMapping(dpy);
	for(i = 0; i < 8; i++)
		for(j = 0; j < modmap->max_keypermod; j++) {
			if(modmap->modifiermap[i * modmap->max_keypermod + j]
			== XKeysymToKeycode(dpy, XK_Num_Lock))
				numlockmask = (1 << i);
		}
	XFreeModifiermap(modmap);

	dc.dpy = dpy;
	normcol[ColBG] = getcolor(&dc, normbgcolor);
	normcol[ColFG] = getcolor(&dc, normfgcolor);
	selcol[ColBG] = getcolor(&dc, selbgcolor);
	selcol[ColFG] = getcolor(&dc, selfgcolor);
	initfont(&dc, font);

	/* input window */
	wa.override_redirect = True;
	wa.background_pixmap = ParentRelative;
	wa.event_mask = ExposureMask | KeyPressMask | VisibilityChangeMask;

	/* input window geometry */
	mh = dc.font.height + 2;
#if XINERAMA
	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
#endif
	{
		x = 0;
		y = topbar ? 0 : DisplayHeight(dpy, screen) - mh;
		mw = DisplayWidth(dpy, screen);
	}

	win = XCreateWindow(dpy, root, x, y, mw, mh, 0,
			DefaultDepth(dpy, screen), CopyFromParent,
			DefaultVisual(dpy, screen),
			CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa);

	setupdraw(&dc, win);
	if(prompt)
		promptw = MIN(textw(&dc, prompt), mw / 5);
	cursor = strlen(text);
	XMapRaised(dpy, win);
	drawbar();
}

int

			if(++i < argc) selfgcolor = argv[i];
		}
		else if(!strcmp(argv[i], "-v")) {
			printf("dinput-"VERSION", © 2006-2010 dinput engineers, see LICENSE for details\n");
			printf("dinput-"VERSION", © 2006-2010 dmenu engineers, see LICENSE for details\n");
			exit(EXIT_SUCCESS);
		}
		else if(!*text)
		else if(!*text) {
			strncpy(text, argv[i], sizeof text);
			cursor = strlen(text);
		}
		else {
			fputs("usage: dinput [-b] [-fn <font>] [-nb <color>] [-nf <color>]\n"
			      "              [-p <prompt>] [-sb <color>] [-sf <color>] [-v] [<text>]\n", stderr);

	root = RootWindow(dpy, screen);

	grabkeyboard();
	setup();
	setup(0);
	run();
	return 0;
}

dmenu.c +25 −163

#include <X11/keysym.h>
#include <X11/Xlib.h>
#include <X11/Xutil.h>
#ifdef XINERAMA
#include <X11/extensions/Xinerama.h>
#endif
#include <draw.h>

/* macros */
#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))
#define IS_UTF8_1ST_CHAR(c)     ((((c) & 0xc0) == 0xc0) || !((c) & 0x80))
#include "dmenu.h"

typedef struct Item Item;
struct Item {

static char *cistrstr(const char *s, const char *sub);
static void cleanup(void);
static void dinput(void);
static void drawmenu(void);
static void drawmenuh(void);
static void drawmenuv(void);
static void grabkeyboard(void);
static void kpress(XKeyEvent *e);
static void match(char *pattern);
static void match(void);
static void readstdin(void);
static void run(void);
static void setup(void);

#include "config.h"

/* variables */
static char **argp = NULL;
static char *maxname = NULL;
static char *prompt = NULL;
static char text[4096];
static int cmdw = 0;
static int promptw = 0;
static int screen;
static unsigned int cmdw = 0;
static unsigned int lines = 0;
static unsigned int numlockmask = 0;
static unsigned int mw, mh;
static unsigned long normcol[ColLast];
static unsigned long selcol[ColLast];
static Bool topbar = True;
static DC dc;
static Display *dpy;
static Item *allitems = NULL;  /* first of all items */
static Item *item = NULL;      /* first of pattern matching items */
static Item *sel = NULL;
static Item *next = NULL;
static Item *prev = NULL;
static Item *curr = NULL;
static Window win, root;
static int (*fstrncmp)(const char *, const char *, size_t) = strncmp;
static char *(*fstrstr)(const char *, const char *) = strstr;
static void (*calcoffsets)(void) = calcoffsetsh;


void
calcoffsetsh(void) {
	unsigned int x;
	unsigned int w, x;

	x = promptw + cmdw + (2 * spaceitem);
	for(next = curr; next; next = next->right)
	w = promptw + cmdw + textw(&dc, "<") + textw(&dc, ">");
	for(x = w, next = curr; next; next = next->right)
		if((x += MIN(textw(&dc, next->text), mw / 3)) > mw)
			break;
	x = promptw + cmdw + (2 * spaceitem);
	for(prev = curr; prev && prev->left; prev = prev->left)
	for(x = w, prev = curr; prev && prev->left; prev = prev->left)
		if((x += MIN(textw(&dc, prev->left->text), mw / 3)) > mw)
			break;
}

}

void
drawmenu(void) {
drawbar(void) {
	dc.x = 0;
	dc.y = 0;
	dc.w = mw;

	Item *i;

	dc.x += cmdw;
	dc.w = spaceitem;
	dc.w = textw(&dc, "<");
	drawtext(&dc, curr->left ? "<" : NULL, normcol);
	dc.x += dc.w;
	for(i = curr; i != next; i = i->right) {

		drawtext(&dc, i->text, (sel == i) ? selcol : normcol);
		dc.x += dc.w;
	}
	dc.w = spaceitem;
	dc.w = textw(&dc, ">");
	dc.x = mw - dc.w;
	drawtext(&dc, next ? ">" : NULL, normcol);
}

}

void
grabkeyboard(void) {
	unsigned int len;

	for(len = 1000; len; len--) {
		if(XGrabKeyboard(dpy, root, True, GrabModeAsync, GrabModeAsync, CurrentTime)
		== GrabSuccess)
			return;
		usleep(1000);
	}
	exit(EXIT_FAILURE);
}

void
kpress(XKeyEvent *e) {
	char buf[sizeof text];
	int num;

			break;
		case XK_u:
			text[0] = '\0';
			match(text);
			match();
			break;
		case XK_w:
			if(len == 0)

			while(i-- > 0 && text[i] == ' ');
			while(i-- > 0 && text[i] != ' ');
			text[++i] = '\0';
			match(text);
			match();
			break;
		}
	}

		if(num && !iscntrl((int) buf[0])) {
			memcpy(text + len, buf, num + 1);
			len += num;
			match(text);
			match();
		}
		break;
	case XK_BackSpace:

		for(i = 1; len - i > 0 && !IS_UTF8_1ST_CHAR(text[len - i]); i++);
		len -= i;
		text[len] = '\0';
		match(text);
		match();
		break;
	case XK_End:
		while(next) {

		dinput();
		break;
	}
	drawmenu();
	drawbar();
}

void
match(char *pattern) {
	unsigned int plen;
match(void) {
	unsigned int len;
	Item *i, *itemend, *lexact, *lprefix, *lsubstr, *exactend, *prefixend, *substrend;

	if(!pattern)
		return;
	plen = strlen(pattern);
	len = strlen(text);
	item = lexact = lprefix = lsubstr = itemend = exactend = prefixend = substrend = NULL;
	for(i = allitems; i; i = i->next)
		if(!fstrncmp(pattern, i->text, plen + 1))
		if(!fstrncmp(text, i->text, len + 1))
			appenditem(i, &lexact, &exactend);
		else if(!fstrncmp(pattern, i->text, plen))
		else if(!fstrncmp(text, i->text, len))
			appenditem(i, &lprefix, &prefixend);
		else if(fstrstr(i->text, pattern))
		else if(fstrstr(i->text, text))
			appenditem(i, &lsubstr, &substrend);
	if(lexact) {
		item = lexact;

	}
}

void
run(void) {
	XEvent ev;

	/* main event loop */
	XSync(dpy, False);
	while(!XNextEvent(dpy, &ev))
		switch(ev.type) {
		case KeyPress:
			kpress(&ev.xkey);
			break;
		case Expose:
			if(ev.xexpose.count == 0)
				drawmenu();
			break;
		case VisibilityNotify:
			if(ev.xvisibility.state != VisibilityUnobscured)
				XRaiseWindow(dpy, win);
			break;
		}
	exit(EXIT_FAILURE);
}

void
setup(void) {
	int i, j, x, y;
#if XINERAMA
	int n;
	XineramaScreenInfo *info = NULL;
#endif
	XModifierKeymap *modmap;
	XSetWindowAttributes wa;

	/* init modifier map */
	modmap = XGetModifierMapping(dpy);
	for(i = 0; i < 8; i++)
		for(j = 0; j < modmap->max_keypermod; j++) {
			if(modmap->modifiermap[i * modmap->max_keypermod + j]
			== XKeysymToKeycode(dpy, XK_Num_Lock))
				numlockmask = (1 << i);
		}
	XFreeModifiermap(modmap);

	dc.dpy = dpy;
	normcol[ColBG] = getcolor(&dc, normbgcolor);
	normcol[ColFG] = getcolor(&dc, normfgcolor);
	selcol[ColBG] = getcolor(&dc, selbgcolor);
	selcol[ColFG] = getcolor(&dc, selfgcolor);
	initfont(&dc, font);

	/* menu window */
	wa.override_redirect = True;
	wa.background_pixmap = ParentRelative;
	wa.event_mask = ExposureMask | KeyPressMask | VisibilityChangeMask;

	/* menu window geometry */
	mh = (dc.font.height + 2) * (lines + 1);
#if XINERAMA
	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
#endif
	{
		x = 0;
		y = topbar ? 0 : mh - DisplayHeight(dpy, screen);
		mw = DisplayWidth(dpy, screen);
	}

	win = XCreateWindow(dpy, root, x, y, mw, mh, 0,
			DefaultDepth(dpy, screen), CopyFromParent,
			DefaultVisual(dpy, screen),
			CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa);

	setupdraw(&dc, win);
	if(maxname)
		cmdw = MIN(textw(&dc, maxname), mw / 3);
	if(prompt)
		promptw = MIN(textw(&dc, prompt), mw / 5);
	text[0] = '\0';
	match(text);
	XMapRaised(dpy, win);
}

int
main(int argc, char *argv[]) {
	unsigned int i;


	readstdin();
	grabkeyboard();
	setup();
	setup(lines);
	if(maxname)
		cmdw = MIN(textw(&dc, maxname), mw / 3);
	match();
	run();
	return 0;
}

dmenu.h (added) +30 −0

1	+	#include <X11/Xlib.h>
2	+	#include <draw.h>
3	+	#include "config.h"
4	+
5	+	/* macros */
6	+	#define INRECT(X,Y,RX,RY,RW,RH) ((X) >= (RX) && (X) < (RX) + (RW) && (Y) >= (RY) && (Y) < (RY) + (RH))
7	+	#define MIN(a, b) ((a) < (b) ? (a) : (b))
8	+	#define MAX(a, b) ((a) > (b) ? (a) : (b))
9	+	#define IS_UTF8_1ST_CHAR(c) ((((c) & 0xc0) == 0xc0) \|\| !((c) & 0x80))
10	+
11	+	/* forward declarations */
12	+	void drawbar(void);
13	+	void grabkeyboard(void);
14	+	void kpress(XKeyEvent *e);
15	+	void run(void);
16	+	void setup(unsigned int lines);
17	+
18	+	/* variables */
19	+	extern char *prompt;
20	+	extern char text[4096];
21	+	extern int promptw;
22	+	extern int screen;
23	+	extern unsigned int numlockmask;
24	+	extern unsigned int mw, mh;
25	+	extern unsigned long normcol[ColLast];
26	+	extern unsigned long selcol[ColLast];
27	+	extern Bool topbar;
28	+	extern DC dc;
29	+	extern Display *dpy;
30	+	extern Window win, root;

3	3
4	4		include config.mk
5	5
6		-	SRC = dinput.c dmenu.c
	6	+	SRC = dinput.c dmenu.c common.c
7	7		OBJ = ${SRC:.c=.o}
8	8
9	9		all: options dinput dmenu

24	24		@echo creating $@ from config.def.h
25	25		@cp config.def.h $@
26	26
27		-	.o:
	27	+	dinput: dinput.o common.o
28	28		@echo CC -o $@
29		-	@${CC} -o $@ $< ${LDFLAGS}
	29	+	@${CC} -o $@ $+ ${LDFLAGS}
	30	+
	31	+	dmenu: dmenu.o common.o
	32	+	@echo CC -o $@
	33	+	@${CC} -o $@ $+ ${LDFLAGS}
30	34
31	35		clean:
32	36		@echo cleaning

1	1		/* See LICENSE file for copyright and license details. */
2	2
3	3		/* appearance */
4		-	const char font = "--terminus-medium-r-normal--14-------";
5		-	const char *normbgcolor = "#cccccc";
6		-	const char *normfgcolor = "#000000";
7		-	const char *selbgcolor = "#0066ff";
8		-	const char *selfgcolor = "#ffffff";
9		-	unsigned int spaceitem = 30; /* px between menu items */
	4	+	static const char font = "--terminus-medium-r-normal--14-------";
	5	+	static const char *normbgcolor = "#cccccc";
	6	+	static const char *normfgcolor = "#000000";
	7	+	static const char *selbgcolor = "#0066ff";
	8	+	static const char *selfgcolor = "#ffffff";

4	4		#include <stdio.h>
5	5		#include <stdlib.h>
6	6		#include <string.h>
7		-	#include <unistd.h>
8	7		#include <X11/keysym.h>
9	8		#include <X11/Xlib.h>
10	9		#include <X11/Xutil.h>
11		-	#ifdef XINERAMA
12		-	#include <X11/extensions/Xinerama.h>
13		-	#endif
14		-	#include <draw.h>
15		-
16		-	/* macros */
17		-	#define INRECT(X,Y,RX,RY,RW,RH) ((X) >= (RX) && (X) < (RX) + (RW) && (Y) >= (RY) && (Y) < (RY) + (RH))
18		-	#define MIN(a, b) ((a) < (b) ? (a) : (b))
19		-	#define MAX(a, b) ((a) > (b) ? (a) : (b))
20		-	#define IS_UTF8_1ST_CHAR(c) ((((c) & 0xc0) == 0xc0) \|\| !((c) & 0x80))
	10	+	#include "dmenu.h"
21	11
22	12		/* forward declarations */
23	13		static void cleanup(void);
24		-	static void drawinput(void);
25		-	static void grabkeyboard(void);
26		-	static void kpress(XKeyEvent *e);
27		-	static void run(void);
28		-	static void setup(void);
29		-
30		-	#include "config.h"
31	14
32	15		/* variables */
33		-	static char *prompt = NULL;
34		-	static char text[4096];
35		-	static int promptw = 0;
36		-	static int screen;
37	16		static size_t cursor = 0;
38		-	static unsigned int numlockmask = 0;
39		-	static unsigned int mw, mh;
40		-	static unsigned long normcol[ColLast];
41		-	static unsigned long selcol[ColLast];
42		-	static Bool topbar = True;
43		-	static DC dc;
44		-	static Display *dpy;
45		-	static Window win, root;
46	17
47	18		void
48	19		cleanup(void) {

53	24		}
54	25
55	26		void
56		-	drawinput(void)
	27	+	drawbar(void)
57	28		{
58	29		dc.x = 0;
59	30		dc.y = 0;

70	41		drawtext(&dc, text, normcol);
71	42		drawcursor(&dc, text, cursor, normcol);
72	43		commitdraw(&dc, win);
73		-	}
74		-
75		-	void
76		-	grabkeyboard(void) {
77		-	unsigned int len;
78		-
79		-	for(len = 1000; len; len--) {
80		-	if(XGrabKeyboard(dpy, root, True, GrabModeAsync, GrabModeAsync, CurrentTime)
81		-	== GrabSuccess)
82		-	return;
83		-	usleep(1000);
84		-	}
85		-	exit(EXIT_FAILURE);
86	44		}
87	45
88	46		void

207	165		while(cursor++ < len && !IS_UTF8_1ST_CHAR(text[cursor]));
208	166		break;
209	167		}
210		-	drawinput();
211		-	}
212		-
213		-	void
214		-	run(void) {
215		-	XEvent ev;
216		-
217		-	/* main event loop */
218		-	XSync(dpy, False);
219		-	while(!XNextEvent(dpy, &ev))
220		-	switch(ev.type) {
221		-	case KeyPress:
222		-	kpress(&ev.xkey);
223		-	break;
224		-	case Expose:
225		-	if(ev.xexpose.count == 0)
226		-	drawinput();
227		-	break;
228		-	case VisibilityNotify:
229		-	if(ev.xvisibility.state != VisibilityUnobscured)
230		-	XRaiseWindow(dpy, win);
231		-	break;
232		-	}
233		-	exit(EXIT_FAILURE);
234		-	}
235		-
236		-	void
237		-	setup(void) {
238		-	int i, j, x, y;
239		-	#if XINERAMA
240		-	int n;
241		-	XineramaScreenInfo *info = NULL;
242		-	#endif
243		-	XModifierKeymap *modmap;
244		-	XSetWindowAttributes wa;
245		-
246		-	/* init modifier map */
247		-	modmap = XGetModifierMapping(dpy);
248		-	for(i = 0; i < 8; i++)
249		-	for(j = 0; j < modmap->max_keypermod; j++) {
250		-	if(modmap->modifiermap[i * modmap->max_keypermod + j]
251		-	== XKeysymToKeycode(dpy, XK_Num_Lock))
252		-	numlockmask = (1 << i);
253		-	}
254		-	XFreeModifiermap(modmap);
255		-
256		-	dc.dpy = dpy;
257		-	normcol[ColBG] = getcolor(&dc, normbgcolor);
258		-	normcol[ColFG] = getcolor(&dc, normfgcolor);
259		-	selcol[ColBG] = getcolor(&dc, selbgcolor);
260		-	selcol[ColFG] = getcolor(&dc, selfgcolor);
261		-	initfont(&dc, font);
262		-
263		-	/* input window */
264		-	wa.override_redirect = True;
265		-	wa.background_pixmap = ParentRelative;
266		-	wa.event_mask = ExposureMask \| KeyPressMask \| VisibilityChangeMask;
267		-
268		-	/* input window geometry */
269		-	mh = dc.font.height + 2;
270		-	#if XINERAMA
271		-	if(XineramaIsActive(dpy) && (info = XineramaQueryScreens(dpy, &n))) {
272		-	i = 0;
273		-	if(n > 1) {
274		-	int di;
275		-	unsigned int dui;
276		-	Window dummy;
277		-	if(XQueryPointer(dpy, root, &dummy, &dummy, &x, &y, &di, &di, &dui))
278		-	for(i = 0; i < n; i++)
279		-	if(INRECT(x, y, info[i].x_org, info[i].y_org, info[i].width, info[i].height))
280		-	break;
281		-	}
282		-	x = info[i].x_org;
283		-	y = topbar ? info[i].y_org : info[i].y_org + info[i].height - mh;
284		-	mw = info[i].width;
285		-	XFree(info);
286		-	}
287		-	else
288		-	#endif
289		-	{
290		-	x = 0;
291		-	y = topbar ? 0 : DisplayHeight(dpy, screen) - mh;
292		-	mw = DisplayWidth(dpy, screen);
293		-	}
294		-
295		-	win = XCreateWindow(dpy, root, x, y, mw, mh, 0,
296		-	DefaultDepth(dpy, screen), CopyFromParent,
297		-	DefaultVisual(dpy, screen),
298		-	CWOverrideRedirect \| CWBackPixmap \| CWEventMask, &wa);
299		-
300		-	setupdraw(&dc, win);
301		-	if(prompt)
302		-	promptw = MIN(textw(&dc, prompt), mw / 5);
303		-	cursor = strlen(text);
304		-	XMapRaised(dpy, win);
	168	+	drawbar();
305	169		}
306	170
307	171		int

336	200		if(++i < argc) selfgcolor = argv[i];
337	201		}
338	202		else if(!strcmp(argv[i], "-v")) {
339		-	printf("dinput-"VERSION", © 2006-2010 dinput engineers, see LICENSE for details\n");
	203	+	printf("dinput-"VERSION", © 2006-2010 dmenu engineers, see LICENSE for details\n");
340	204		exit(EXIT_SUCCESS);
341	205		}
342		-	else if(!*text)
	206	+	else if(!*text) {
343	207		strncpy(text, argv[i], sizeof text);
	208	+	cursor = strlen(text);
	209	+	}
344	210		else {
345	211		fputs("usage: dinput [-b] [-fn <font>] [-nb <color>] [-nf <color>]\n"
346	212		" [-p <prompt>] [-sb <color>] [-sf <color>] [-v] [<text>]\n", stderr);

356	222		root = RootWindow(dpy, screen);
357	223
358	224		grabkeyboard();
359		-	setup();
	225	+	setup(0);
360	226		run();
361	227		return 0;
362	228		}