From 9c23731e6eca581cbeed4a17ea734f857f816ef0 Mon Sep 17 00:00:00 2001 From: Klemens Nanni Date: Tue, 24 May 2016 15:29:02 +0200 Subject: [PATCH 1/2] Use parantheses in ternary operators for better readability --- dmenu.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dmenu.c b/dmenu.c index e0c2f80..9d488d8 100644 --- a/dmenu.c +++ b/dmenu.c @@ -130,7 +130,7 @@ drawmenu(void) x += promptw; } /* draw input field */ - w = (lines > 0 || !matches) ? mw - x : inputw; + w = (lines > 0 || !matches) ? (mw - x) : inputw; drw_setscheme(drw, &scheme[SchemeNorm]); drw_text(drw, x, 0, w, bh, text, 0); @@ -461,7 +461,7 @@ paste(void) /* we have been given the current selection, now insert it into input */ XGetWindowProperty(dpy, win, utf8, 0, (sizeof text / 4) + 1, False, utf8, &da, &di, &dl, &dl, (unsigned char **)&p); - insert(p, (q = strchr(p, '\n')) ? q - p : (ssize_t)strlen(p)); + insert(p, (q = strchr(p, '\n')) ? (q - p) : (ssize_t)strlen(p)); XFree(p); drawmenu(); } @@ -574,14 +574,14 @@ setup(void) break; x = info[i].x_org; - y = info[i].y_org + (topbar ? 0 : info[i].height - mh); + y = info[i].y_org + (topbar ? 0 : (info[i].height - mh)); mw = info[i].width; XFree(info); } else #endif { x = 0; - y = topbar ? 0 : sh - mh; + y = topbar ? 0 : (sh - mh); mw = sw; } promptw = (prompt && *prompt) ? TEXTW(prompt) : 0; -- 2.8.3