git.stevedylan.dev

cleaned up 9f3b0c6e

Connor Lane Smith · 2010-06-25 04:33 2 file(s) · +10 −9

dinput.c +4 −4

static void drawcursor(void);
static void drawinput(void);
static Bool grabkeyboard(void);
static void kpress(XKeyEvent * e);
static void kpress(XKeyEvent *e);
static void run(void);
static void setup(Bool topbar);


}

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

			ksym = XK_BackSpace;
			break;
		case XK_j:
		case XK_m:
			ksym = XK_Return;
			break;
		case XK_k:

	selcol[ColBG] = getcolor(&dc, selbgcolor);
	selcol[ColFG] = getcolor(&dc, selfgcolor);
	initfont(&dc, font);
	fprintf(stderr, "dc.font.xfont: %u\n", (size_t)dc.font.xfont);

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

	/* input window geometry */
	mh = dc.font.height + 2;

dmenu.c +6 −5

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);

	dc.w = spaceitem;
	drawtext(&dc, curr->left ? "<" : NULL, normcol);
	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);
		dc.x += dc.w;

	dc.w = mw - dc.x;
	dc.h = dc.font.height + 2;
	dc.y = dc.h;
	for(i = curr; i != next; i=i->right) {
	for(i = curr; i != next; i = i->right) {
		drawtext(&dc, i->text, (sel == i) ? selcol : normcol);
		dc.y += dc.h;
	}

}

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

			ksym = XK_Tab;
			break;
		case XK_j:
		case XK_m:
			ksym = XK_Return;
			break;
		case XK_n:

	/* 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);

25	25		static void drawcursor(void);
26	26		static void drawinput(void);
27	27		static Bool grabkeyboard(void);
28		-	static void kpress(XKeyEvent * e);
	28	+	static void kpress(XKeyEvent *e);
29	29		static void run(void);
30	30		static void setup(Bool topbar);
31	31

100	100		}
101	101
102	102		void
103		-	kpress(XKeyEvent * e) {
	103	+	kpress(XKeyEvent *e) {
104	104		char buf[sizeof text];
105	105		int num;
106	106		unsigned int i, len;

140	140		ksym = XK_BackSpace;
141	141		break;
142	142		case XK_j:
	143	+	case XK_m:
143	144		ksym = XK_Return;
144	145		break;
145	146		case XK_k:

274	275		selcol[ColBG] = getcolor(&dc, selbgcolor);
275	276		selcol[ColFG] = getcolor(&dc, selfgcolor);
276	277		initfont(&dc, font);
277		-	fprintf(stderr, "dc.font.xfont: %u\n", (size_t)dc.font.xfont);
278	278
279	279		/* input window */
280	280		wa.override_redirect = True;
281	281		wa.background_pixmap = ParentRelative;
282		-	wa.event_mask = ExposureMask \| ButtonPressMask \| KeyPressMask \| VisibilityChangeMask;
	282	+	wa.event_mask = ExposureMask \| KeyPressMask \| VisibilityChangeMask;
283	283
284	284		/* input window geometry */
285	285		mh = dc.font.height + 2;

39	39		static void drawmenuh(void);
40	40		static void drawmenuv(void);
41	41		static Bool grabkeyboard(void);
42		-	static void kpress(XKeyEvent * e);
	42	+	static void kpress(XKeyEvent *e);
43	43		static void match(char *pattern);
44	44		static void readstdin(void);
45	45		static void run(void);

191	191		dc.w = spaceitem;
192	192		drawtext(&dc, curr->left ? "<" : NULL, normcol);
193	193		dc.x += dc.w;
194		-	for(i = curr; i != next; i=i->right) {
	194	+	for(i = curr; i != next; i = i->right) {
195	195		dc.w = MIN(textw(&dc, i->text), mw / 3);
196	196		drawtext(&dc, i->text, (sel == i) ? selcol : normcol);
197	197		dc.x += dc.w;

208	208		dc.w = mw - dc.x;
209	209		dc.h = dc.font.height + 2;
210	210		dc.y = dc.h;
211		-	for(i = curr; i != next; i=i->right) {
	211	+	for(i = curr; i != next; i = i->right) {
212	212		drawtext(&dc, i->text, (sel == i) ? selcol : normcol);
213	213		dc.y += dc.h;
214	214		}

230	230		}
231	231
232	232		void
233		-	kpress(XKeyEvent * e) {
	233	+	kpress(XKeyEvent *e) {
234	234		char buf[sizeof text];
235	235		int num;
236	236		unsigned int i, len;

273	273		ksym = XK_Tab;
274	274		break;
275	275		case XK_j:
	276	+	case XK_m:
276	277		ksym = XK_Return;
277	278		break;
278	279		case XK_n:

501	502		/* menu window */
502	503		wa.override_redirect = True;
503	504		wa.background_pixmap = ParentRelative;
504		-	wa.event_mask = ExposureMask \| ButtonPressMask \| KeyPressMask \| VisibilityChangeMask;
	505	+	wa.event_mask = ExposureMask \| KeyPressMask \| VisibilityChangeMask;
505	506
506	507		/* menu window geometry */
507	508		mh = (dc.font.height + 2) * (lines + 1);