summary refs log tree commit diff
diff options
context:
space:
mode:
authorokan <okan>2017-12-12 15:37:16 +0000
committerokan <okan>2017-12-12 15:37:16 +0000
commitadd109c0069ae420b53b8ba1c10023ae384ecbc3 (patch)
treeff7474b2e1271482eab00162094e323fb67be3da
parent888f6c53195e2a6d4145e5e9d761fc8289c6f650 (diff)
downloadcwm-add109c0069ae420b53b8ba1c10023ae384ecbc3.tar.gz
cwm-add109c0069ae420b53b8ba1c10023ae384ecbc3.tar.xz
cwm-add109c0069ae420b53b8ba1c10023ae384ecbc3.zip
clean up after previous (noprompt removal)
-rw-r--r--menu.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/menu.c b/menu.c
index 6374bef..2e84970 100644
--- a/menu.c
+++ b/menu.c
@@ -88,10 +88,9 @@ menu_filter(struct screen_ctx *sc, struct menu_q *menuq, const char *prompt,
 
 	TAILQ_INIT(&resultq);
 
-	(void)memset(&mc, 0, sizeof(mc));
-
 	xu_ptr_getpos(sc->rootwin, &xsave, &ysave);
 
+	(void)memset(&mc, 0, sizeof(mc));
 	mc.sc = sc;
 	mc.flags = flags;
 	mc.match = match;
@@ -337,21 +336,17 @@ menu_draw(struct menu_ctx *mc, struct menu_q *menuq, struct menu_q *resultq)
 
 	(void)snprintf(mc->dispstr, sizeof(mc->dispstr), "%s%s%s%s",
 	    mc->promptstr, PROMPT_SCHAR, mc->searchstr, PROMPT_ECHAR);
-
 	XftTextExtentsUtf8(X_Dpy, sc->xftfont,
 	    (const FcChar8*)mc->dispstr, strlen(mc->dispstr), &extents);
-
 	mc->geom.w = extents.xOff;
 	mc->geom.h = sc->xftfont->height + 1;
 	mc->num = 1;
 
 	TAILQ_FOREACH(mi, resultq, resultentry) {
 		(*mc->print)(mi, mc->listing);
-
 		XftTextExtentsUtf8(X_Dpy, sc->xftfont,
 		    (const FcChar8*)mi->print,
 		    MIN(strlen(mi->print), MENU_MAXENTRY), &extents);
-
 		mc->geom.w = MAX(mc->geom.w, extents.xOff);
 		mc->geom.h += sc->xftfont->height + 1;
 		mc->num++;