[hackers] [dmenu] [PATCHES] Improve code readability

[Klemens Nanni]

Hello,

those patches speak for themselves and apply cleanly on origin/HEAD.

Best regards,
kl3

From 9c23731e6eca581cbeed4a17ea734f857f816ef0 Mon Sep 17 00:00:00 2001
From: Klemens Nanni <k...@posteo.org>
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


From 4b3896ef24c913d3be391ae0740ac2b38b68e5c7 Mon Sep 17 00:00:00 2001
From: Klemens Nanni <k...@posteo.org>
Date: Tue, 24 May 2016 15:30:44 +0200
Subject: [PATCH 2/2] Use while not for loop

---
 dmenu.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dmenu.c b/dmenu.c
index 9d488d8..fe2501a 100644
--- a/dmenu.c
+++ b/dmenu.c
@@ -269,11 +269,11 @@ insert(const char *str, ssize_t n)
 static size_t
 nextrune(int inc)
 {
-       ssize_t n;
+       ssize_t n = cursor + inc;
 
        /* return location of next utf8 rune in the given direction (+1 or -1) 
*/
-       for (n = cursor + inc; n + inc >= 0 && (text[n] & 0xc0) == 0x80; n += 
inc)
-               ;
+       while (n + inc >= 0 && (text[n] & 0xc0) == 0x80)
+               n += inc;
        return n;
 }
 
-- 
2.8.3

signature.asc
Description: PGP signature