git.stevedylan.dev

Revert "Print highlighted input text only on single match" aa92cd68

This reverts commit a4053bc4e403ae57343f43b7e363a0911bba5a3a.

My bad, was working on the wrong branch and accidently pushed it...
*facepalm*

Hiltjo Posthuma · 2016-07-26 23:02 1 file(s) · +3 −13

dmenu.c +3 −13

{
	unsigned int curpos;
	struct item *item;
	int x = 0, y = 0, w, inputscheme;
	int x = 0, y = 0, w;

	drw_setscheme(drw, scheme[SchemeNorm]);
	drw_rect(drw, 0, 0, mw, mh, 1, 1);

	if (prompt && *prompt) {
		drw_setscheme(drw, scheme[SchemeSel]);
		x = drw_text(drw, x, 0, promptw, bh, lrpad / 2, prompt, 0);
		x += 2;
	}
	/* draw input field */
	w = (lines > 0 || !matches) ? mw - x : inputw;
	if (matches && !strcmp(text, curr->text))
		inputscheme = SchemeSel;
	else
		inputscheme = SchemeNorm;
	drw_setscheme(drw, scheme[inputscheme]);

	drw_setscheme(drw, scheme[SchemeNorm]);
	drw_text(drw, x, 0, w, bh, lrpad / 2, text, 0);

	drw_font_getexts(drw->fonts, text, cursor, &curpos, NULL);
	if ((curpos += lrpad / 2 - 1) < w) {
		drw_setscheme(drw, scheme[inputscheme]);
		drw_setscheme(drw, scheme[SchemeNorm]);
		drw_rect(drw, x + curpos, 2, 2, bh - 4, 1, 0);
	}

	if (inputscheme == SchemeSel)
		goto drawmap;

	if (lines > 0) {
		/* draw vertical list */

			drw_text(drw, mw - w, 0, w, bh, lrpad / 2, ">", 0);
		}
	}
drawmap:
	drw_map(drw, win, 0, 0, mw, mh);
}


130	130		{
131	131		unsigned int curpos;
132	132		struct item *item;
133		-	int x = 0, y = 0, w, inputscheme;
	133	+	int x = 0, y = 0, w;
134	134
135	135		drw_setscheme(drw, scheme[SchemeNorm]);
136	136		drw_rect(drw, 0, 0, mw, mh, 1, 1);

138	138		if (prompt && *prompt) {
139	139		drw_setscheme(drw, scheme[SchemeSel]);
140	140		x = drw_text(drw, x, 0, promptw, bh, lrpad / 2, prompt, 0);
141		-	x += 2;
142	141		}
143	142		/* draw input field */
144	143		w = (lines > 0 \|\| !matches) ? mw - x : inputw;
145		-	if (matches && !strcmp(text, curr->text))
146		-	inputscheme = SchemeSel;
147		-	else
148		-	inputscheme = SchemeNorm;
149		-	drw_setscheme(drw, scheme[inputscheme]);
150		-
	144	+	drw_setscheme(drw, scheme[SchemeNorm]);
151	145		drw_text(drw, x, 0, w, bh, lrpad / 2, text, 0);
152	146
153	147		drw_font_getexts(drw->fonts, text, cursor, &curpos, NULL);
154	148		if ((curpos += lrpad / 2 - 1) < w) {
155		-	drw_setscheme(drw, scheme[inputscheme]);
	149	+	drw_setscheme(drw, scheme[SchemeNorm]);
156	150		drw_rect(drw, x + curpos, 2, 2, bh - 4, 1, 0);
157	151		}
158		-
159		-	if (inputscheme == SchemeSel)
160		-	goto drawmap;
161	152
162	153		if (lines > 0) {
163	154		/* draw vertical list */

180	171		drw_text(drw, mw - w, 0, w, bh, lrpad / 2, ">", 0);
181	172		}
182	173		}
183		-	drawmap:
184	174		drw_map(drw, win, 0, 0, mw, mh);
185	175		}
186	176