Don't treat clauses like functions

and add a space between the keyword and the parentheses. Signed-off-by: Christoph Lohmann <20h@r-36.net>
author: FRIGN <dev@frign.de> 2015-07-10 10:29:53 +0200
committer: Christoph Lohmann <20h@r-36.net> 2015-07-10 13:58:31 +0200
commit: f1307d91e2ec351a4a8b7352be8b5f6e4cb24294 (patch)
tree: 4c6c0fbbb257532d5ffab49afb3c6a4f3df596b1 /st.c
parent: 13233574ed1ead29bb7e99e71a0665e62c640617 (diff)
download: st-f1307d91e2ec351a4a8b7352be8b5f6e4cb24294.tar.gz
st-f1307d91e2ec351a4a8b7352be8b5f6e4cb24294.zip
1 files changed, 382 insertions, 382 deletions
diff --git a/st.c b/st.c
index 03866f1..274ac5d 100644
--- a/st.c
+++ b/st.c
@@ -554,9 +554,9 @@ xwrite(int fd, const char *s, size_t len)
 {
        size_t aux = len;
-        while(len > 0) {
+        while (len > 0) {
                ssize_t r = write(fd, s, len);
-                if(r < 0)
+                if (r < 0)
                        return r;
                len -= r;
                s += r;
@@ -569,7 +569,7 @@ xmalloc(size_t len)
 {
        void *p = malloc(len);
-        if(!p)
+        if (!p)
                die("Out of memory\n");
        return p;
@@ -578,7 +578,7 @@ xmalloc(size_t len)
 void *
 xrealloc(void *p, size_t len)
 {
-        if((p = realloc(p, len)) == NULL)
+        if ((p = realloc(p, len)) == NULL)
                die("Out of memory\n");
        return p;
@@ -587,7 +587,7 @@ xrealloc(void *p, size_t len)
 char *
 xstrdup(char *s)
 {
-        if((s = strdup(s)) == NULL)
+        if ((s = strdup(s)) == NULL)
                die("Out of memory\n");
        return s;
@@ -600,17 +600,17 @@ utf8decode(char *c, Rune *u, size_t clen)
        Rune udecoded;
        *u = UTF_INVALID;
-        if(!clen)
+        if (!clen)
                return 0;
        udecoded = utf8decodebyte(c[0], &len);
-        if(!BETWEEN(len, 1, UTF_SIZ))
+        if (!BETWEEN(len, 1, UTF_SIZ))
                return 1;
-        for(i = 1, j = 1; i < clen && j < len; ++i, ++j) {
+        for (i = 1, j = 1; i < clen && j < len; ++i, ++j) {
                udecoded = (udecoded << 6) | utf8decodebyte(c[i], &type);
-                if(type != 0)
+                if (type != 0)
                        return j;
        }
-        if(j < len)
+        if (j < len)
                return 0;
        *u = udecoded;
        utf8validate(u, len);
@@ -620,8 +620,8 @@ utf8decode(char *c, Rune *u, size_t clen)
 Rune
 utf8decodebyte(char c, size_t *i)
 {
-        for(*i = 0; *i < LEN(utfmask); ++(*i))
+        for (*i = 0; *i < LEN(utfmask); ++(*i))
-                if(((uchar)c & utfmask[*i]) == utfbyte[*i])
+                if (((uchar)c & utfmask[*i]) == utfbyte[*i])
                        return (uchar)c & ~utfmask[*i];
        return 0;
 }
@@ -632,9 +632,9 @@ utf8encode(Rune u, char *c)
        size_t len, i;
        len = utf8validate(&u, 0);
-        if(len > UTF_SIZ)
+        if (len > UTF_SIZ)
                return 0;
-        for(i = len - 1; i != 0; --i) {
+        for (i = len - 1; i != 0; --i) {
                c[i] = utf8encodebyte(u, 0);
                u >>= 6;
        }
@@ -655,10 +655,10 @@ utf8strchr(char *s, Rune u)
        size_t i, j, len;
        len = strlen(s);
-        for(i = 0, j = 0; i < len; i += j) {
+        for (i = 0, j = 0; i < len; i += j) {
-                if(!(j = utf8decode(&s[i], &r, len - i)))
+                if (!(j = utf8decode(&s[i], &r, len - i)))
                        break;
-                if(r == u)
+                if (r == u)
                        return &(s[i]);
        }
        return NULL;
@@ -667,9 +667,9 @@ utf8strchr(char *s, Rune u)
 size_t
 utf8validate(Rune *u, size_t i)
 {
-        if(!BETWEEN(*u, utfmin[i], utfmax[i]) || BETWEEN(*u, 0xD800, 0xDFFF))
+        if (!BETWEEN(*u, utfmin[i], utfmax[i]) || BETWEEN(*u, 0xD800, 0xDFFF))
                *u = UTF_INVALID;
-        for(i = 1; *u > utfmax[i]; ++i)
+        for (i = 1; *u > utfmax[i]; ++i)
                ;
        return i;
 }
@@ -684,7 +684,7 @@ selinit(void)
        sel.primary = NULL;
        sel.clipboard = NULL;
        sel.xtarget = XInternAtom(xw.dpy, "UTF8_STRING", 0);
-        if(sel.xtarget == None)
+        if (sel.xtarget == None)
                sel.xtarget = XA_STRING;
 }
@@ -711,10 +711,10 @@ tlinelen(int y)
 {
        int i = term.col;
-        if(term.line[y][i - 1].mode & ATTR_WRAP)
+        if (term.line[y][i - 1].mode & ATTR_WRAP)
                return i;
-        while(i > 0 && term.line[y][i - 1].u == ' ')
+        while (i > 0 && term.line[y][i - 1].u == ' ')
                --i;
        return i;
@@ -725,7 +725,7 @@ selnormalize(void)
 {
        int i;
-        if(sel.type == SEL_REGULAR && sel.ob.y != sel.oe.y) {
+        if (sel.type == SEL_REGULAR && sel.ob.y != sel.oe.y) {
                sel.nb.x = sel.ob.y < sel.oe.y ? sel.ob.x : sel.oe.x;
                sel.ne.x = sel.ob.y < sel.oe.y ? sel.oe.x : sel.ob.x;
        } else {
@@ -751,10 +751,10 @@ selnormalize(void)
 int
 selected(int x, int y)
 {
-        if(sel.mode == SEL_EMPTY)
+        if (sel.mode == SEL_EMPTY)
                return 0;
-        if(sel.type == SEL_RECTANGULAR)
+        if (sel.type == SEL_RECTANGULAR)
                return BETWEEN(y, sel.nb.y, sel.ne.y)
                    && BETWEEN(x, sel.nb.x, sel.ne.x);
@@ -770,7 +770,7 @@ selsnap(int *x, int *y, int direction)
        int delim, prevdelim;
        Glyph *gp, *prevgp;
-        switch(sel.snap) {
+        switch (sel.snap) {
        case SNAP_WORD:
                /*
                 * Snap around if the word wraps around at the end or
@@ -778,20 +778,20 @@ selsnap(int *x, int *y, int direction)
                 */
                prevgp = &term.line[*y][*x];
                prevdelim = ISDELIM(prevgp->u);
-                for(;;) {
+                for (;;) {
                        newx = *x + direction;
                        newy = *y;
-                        if(!BETWEEN(newx, 0, term.col - 1)) {
+                        if (!BETWEEN(newx, 0, term.col - 1)) {
                                newy += direction;
                                newx = (newx + term.col) % term.col;
                                if (!BETWEEN(newy, 0, term.row - 1))
                                        break;
-                                if(direction > 0)
+                                if (direction > 0)
                                        yt = *y, xt = *x;
                                else
                                        yt = newy, xt = newx;
-                                if(!(term.line[yt][xt].mode & ATTR_WRAP))
+                                if (!(term.line[yt][xt].mode & ATTR_WRAP))
                                        break;
                        }
@@ -800,7 +800,7 @@ selsnap(int *x, int *y, int direction)
                        gp = &term.line[newy][newx];
                        delim = ISDELIM(gp->u);
-                        if(!(gp->mode & ATTR_WDUMMY) && (delim != prevdelim
+                        if (!(gp->mode & ATTR_WDUMMY) && (delim != prevdelim
                                        || (delim && gp->u != prevgp->u)))
                                break;
@@ -817,16 +817,16 @@ selsnap(int *x, int *y, int direction)
                 * previous line will be selected.
                 */
                *x = (direction < 0) ? 0 : term.col - 1;
-                if(direction < 0) {
+                if (direction < 0) {
-                        for(; *y > 0; *y += direction) {
+                        for (; *y > 0; *y += direction) {
-                                if(!(term.line[*y-1][term.col-1].mode
+                                if (!(term.line[*y-1][term.col-1].mode
                                                & ATTR_WRAP)) {
                                        break;
                                }
                        }
-                } else if(direction > 0) {
+                } else if (direction > 0) {
-                        for(; *y < term.row-1; *y += direction) {
+                        for (; *y < term.row-1; *y += direction) {
-                                if(!(term.line[*y][term.col-1].mode
+                                if (!(term.line[*y][term.col-1].mode
                                                & ATTR_WRAP)) {
                                        break;
                                }
@@ -849,8 +849,8 @@ getbuttoninfo(XEvent *e)
        selnormalize();
        sel.type = SEL_REGULAR;
-        for(type = 1; type < LEN(selmasks); ++type) {
+        for (type = 1; type < LEN(selmasks); ++type) {
-                if(match(selmasks[type], state)) {
+                if (match(selmasks[type], state)) {
                        sel.type = type;
                        break;
                }
@@ -867,51 +867,51 @@ mousereport(XEvent *e)
        static int ox, oy;
        /* from urxvt */
-        if(e->xbutton.type == MotionNotify) {
+        if (e->xbutton.type == MotionNotify) {
-                if(x == ox && y == oy)
+                if (x == ox && y == oy)
                        return;
-                if(!IS_SET(MODE_MOUSEMOTION) && !IS_SET(MODE_MOUSEMANY))
+                if (!IS_SET(MODE_MOUSEMOTION) && !IS_SET(MODE_MOUSEMANY))
                        return;
                /* MOUSE_MOTION: no reporting if no button is pressed */
-                if(IS_SET(MODE_MOUSEMOTION) && oldbutton == 3)
+                if (IS_SET(MODE_MOUSEMOTION) && oldbutton == 3)
                        return;
                button = oldbutton + 32;
                ox = x;
                oy = y;
        } else {
-                if(!IS_SET(MODE_MOUSESGR) && e->xbutton.type == ButtonRelease) {
+                if (!IS_SET(MODE_MOUSESGR) && e->xbutton.type == ButtonRelease) {
                        button = 3;
                } else {
                        button -= Button1;
-                        if(button >= 3)
+                        if (button >= 3)
                                button += 64 - 3;
                }
-                if(e->xbutton.type == ButtonPress) {
+                if (e->xbutton.type == ButtonPress) {
                        oldbutton = button;
                        ox = x;
                        oy = y;
-                } else if(e->xbutton.type == ButtonRelease) {
+                } else if (e->xbutton.type == ButtonRelease) {
                        oldbutton = 3;
                        /* MODE_MOUSEX10: no button release reporting */
-                        if(IS_SET(MODE_MOUSEX10))
+                        if (IS_SET(MODE_MOUSEX10))
                                return;
                        if (button == 64 || button == 65)
                                return;
                }
        }
-        if(!IS_SET(MODE_MOUSEX10)) {
+        if (!IS_SET(MODE_MOUSEX10)) {
                button += ((state & ShiftMask  ) ? 4  : 0)
                        + ((state & Mod4Mask   ) ? 8  : 0)
                        + ((state & ControlMask) ? 16 : 0);
        }
-        if(IS_SET(MODE_MOUSESGR)) {
+        if (IS_SET(MODE_MOUSESGR)) {
                len = snprintf(buf, sizeof(buf), "\033[<%d;%d;%d%c",
                                button, x+1, y+1,
                                e->xbutton.type == ButtonRelease ? 'm' : 'M');
-        } else if(x < 223 && y < 223) {
+        } else if (x < 223 && y < 223) {
                len = snprintf(buf, sizeof(buf), "\033[M%c%c%c",
                                32+button, 32+x+1, 32+y+1);
        } else {
@@ -927,20 +927,20 @@ bpress(XEvent *e)
        struct timespec now;
        Mousekey *mk;
-        if(IS_SET(MODE_MOUSE) && !(e->xbutton.state & forceselmod)) {
+        if (IS_SET(MODE_MOUSE) && !(e->xbutton.state & forceselmod)) {
                mousereport(e);
                return;
        }
-        for(mk = mshortcuts; mk < mshortcuts + LEN(mshortcuts); mk++) {
+        for (mk = mshortcuts; mk < mshortcuts + LEN(mshortcuts); mk++) {
-                if(e->xbutton.button == mk->b
+                if (e->xbutton.button == mk->b
                                && match(mk->mask, e->xbutton.state)) {
                        ttysend(mk->s, strlen(mk->s));
                        return;
                }
        }
-        if(e->xbutton.button == Button1) {
+        if (e->xbutton.button == Button1) {
                clock_gettime(CLOCK_MONOTONIC, &now);
                /* Clear previous selection, logically and visually. */
@@ -954,16 +954,16 @@ bpress(XEvent *e)
                 * If the user clicks below predefined timeouts specific
                 * snapping behaviour is exposed.
                 */
-                if(TIMEDIFF(now, sel.tclick2) <= tripleclicktimeout) {
+                if (TIMEDIFF(now, sel.tclick2) <= tripleclicktimeout) {
                        sel.snap = SNAP_LINE;
-                } else if(TIMEDIFF(now, sel.tclick1) <= doubleclicktimeout) {
+                } else if (TIMEDIFF(now, sel.tclick1) <= doubleclicktimeout) {
                        sel.snap = SNAP_WORD;
                } else {
                        sel.snap = 0;
                }
                selnormalize();
-                if(sel.snap != 0)
+                if (sel.snap != 0)
                        sel.mode = SEL_READY;
                tsetdirt(sel.nb.y, sel.ne.y);
                sel.tclick2 = sel.tclick1;
@@ -978,17 +978,17 @@ getsel(void)
        int y, bufsize, lastx, linelen;
        Glyph *gp, *last;
-        if(sel.ob.x == -1)
+        if (sel.ob.x == -1)
                return NULL;
        bufsize = (term.col+1) * (sel.ne.y-sel.nb.y+1) * UTF_SIZ;
        ptr = str = xmalloc(bufsize);
        /* append every set & selected glyph to the selection */
-        for(y = sel.nb.y; y <= sel.ne.y; y++) {
+        for (y = sel.nb.y; y <= sel.ne.y; y++) {
                linelen = tlinelen(y);
-                if(sel.type == SEL_RECTANGULAR) {
+                if (sel.type == SEL_RECTANGULAR) {
                        gp = &term.line[y][sel.nb.x];
                        lastx = sel.ne.x;
                } else {
@@ -996,11 +996,11 @@ getsel(void)
                        lastx = (sel.ne.y == y) ? sel.ne.x : term.col-1;
                }
                last = &term.line[y][MIN(lastx, linelen-1)];
-                while(last >= gp && last->u == ' ')
+                while (last >= gp && last->u == ' ')
                        --last;
-                for( ; gp <= last; ++gp) {
+                for ( ; gp <= last; ++gp) {
-                        if(gp->mode & ATTR_WDUMMY)
+                        if (gp->mode & ATTR_WDUMMY)
                                continue;
                        ptr += utf8encode(gp->u, ptr);
@@ -1015,7 +1015,7 @@ getsel(void)
                 * st.
                 * FIXME: Fix the computer world.
                 */
-                if((y < sel.ne.y || lastx >= linelen) && !(last->mode & ATTR_WRAP))
+                if ((y < sel.ne.y || lastx >= linelen) && !(last->mode & ATTR_WRAP))
                        *ptr++ = '\n';
        }
        *ptr = 0;
@@ -1042,7 +1042,7 @@ selnotify(XEvent *e)
        if (xsev->property == None)
            return;
        do {
-                if(XGetWindowProperty(xw.dpy, xw.win, xsev->property, ofs,
+                if (XGetWindowProperty(xw.dpy, xw.win, xsev->property, ofs,
                                        BUFSIZ/4, False, AnyPropertyType,
                                        &type, &format, &nitems, &rem,
                                        &data)) {
@@ -1059,19 +1059,19 @@ selnotify(XEvent *e)
                 */
                repl = data;
                last = data + nitems * format / 8;
-                while((repl = memchr(repl, '\n', last - repl))) {
+                while ((repl = memchr(repl, '\n', last - repl))) {
                        *repl++ = '\r';
                }
-                if(IS_SET(MODE_BRCKTPASTE))
+                if (IS_SET(MODE_BRCKTPASTE))
                        ttywrite("\033[200~", 6);
                ttysend((char *)data, nitems * format / 8);
-                if(IS_SET(MODE_BRCKTPASTE))
+                if (IS_SET(MODE_BRCKTPASTE))
                        ttywrite("\033[201~", 6);
                XFree(data);
                /* number of 32-bit chunks returned */
                ofs += nitems * format / 32;
-        } while(rem > 0);
+        } while (rem > 0);
 }
 void
@@ -1086,10 +1086,10 @@ clipcopy(const Arg *dummy)
 {
        Atom clipboard;
-        if(sel.clipboard != NULL)
+        if (sel.clipboard != NULL)
                free(sel.clipboard);
-        if(sel.primary != NULL) {
+        if (sel.primary != NULL) {
                sel.clipboard = xstrdup(sel.primary);
                clipboard = XInternAtom(xw.dpy, "CLIPBOARD", 0);
                XSetSelectionOwner(xw.dpy, clipboard, xw.win, CurrentTime);
@@ -1109,7 +1109,7 @@ clippaste(const Arg *dummy)
 void
 selclear(XEvent *e)
 {
-        if(sel.ob.x == -1)
+        if (sel.ob.x == -1)
                return;
        sel.mode = SEL_IDLE;
        sel.ob.x = -1;
@@ -1137,22 +1137,22 @@ selrequest(XEvent *e)
        xev.property = None;
        xa_targets = XInternAtom(xw.dpy, "TARGETS", 0);
-        if(xsre->target == xa_targets) {
+        if (xsre->target == xa_targets) {
                /* respond with the supported type */
                string = sel.xtarget;
                XChangeProperty(xsre->display, xsre->requestor, xsre->property,
                                XA_ATOM, 32, PropModeReplace,
                                (uchar *) &string, 1);
                xev.property = xsre->property;
-        } else if(xsre->target == sel.xtarget || xsre->target == XA_STRING) {
+        } else if (xsre->target == sel.xtarget || xsre->target == XA_STRING) {
                /*
                 * xith XA_STRING non ascii characters may be incorrect in the
                 * requestor. It is not our problem, use utf8.
                 */
                clipboard = XInternAtom(xw.dpy, "CLIPBOARD", 0);
-                if(xsre->selection == XA_PRIMARY) {
+                if (xsre->selection == XA_PRIMARY) {
                        seltext = sel.primary;
-                } else if(xsre->selection == clipboard) {
+                } else if (xsre->selection == clipboard) {
                        seltext = sel.clipboard;
                } else {
                        fprintf(stderr,
@@ -1160,7 +1160,7 @@ selrequest(XEvent *e)
                                xsre->selection);
                        return;
                }
-                if(seltext != NULL) {
+                if (seltext != NULL) {
                        XChangeProperty(xsre->display, xsre->requestor,
                                        xsre->property, xsre->target,
                                        8, PropModeReplace,
@@ -1170,7 +1170,7 @@ selrequest(XEvent *e)
        }
        /* all done, send a notification to the listener */
-        if(!XSendEvent(xsre->display, xsre->requestor, 1, 0, (XEvent *) &xev))
+        if (!XSendEvent(xsre->display, xsre->requestor, 1, 0, (XEvent *) &xev))
                fprintf(stderr, "Error sending SelectionNotify event\n");
 }
@@ -1188,15 +1188,15 @@ xsetsel(char *str, Time t)
 void
 brelease(XEvent *e)
 {
-        if(IS_SET(MODE_MOUSE) && !(e->xbutton.state & forceselmod)) {
+        if (IS_SET(MODE_MOUSE) && !(e->xbutton.state & forceselmod)) {
                mousereport(e);
                return;
        }
-        if(e->xbutton.button == Button2) {
+        if (e->xbutton.button == Button2) {
                selpaste(NULL);
-        } else if(e->xbutton.button == Button1) {
+        } else if (e->xbutton.button == Button1) {
-                if(sel.mode == SEL_READY) {
+                if (sel.mode == SEL_READY) {
                        getbuttoninfo(e);
                        selcopy(e->xbutton.time);
                } else
@@ -1211,12 +1211,12 @@ bmotion(XEvent *e)
 {
        int oldey, oldex, oldsby, oldsey;
-        if(IS_SET(MODE_MOUSE) && !(e->xbutton.state & forceselmod)) {
+        if (IS_SET(MODE_MOUSE) && !(e->xbutton.state & forceselmod)) {
                mousereport(e);
                return;
        }
-        if(!sel.mode)
+        if (!sel.mode)
                return;
        sel.mode = SEL_READY;
@@ -1226,7 +1226,7 @@ bmotion(XEvent *e)
        oldsey = sel.ne.y;
        getbuttoninfo(e);
-        if(oldey != sel.oe.y || oldex != sel.oe.x)
+        if (oldey != sel.oe.y || oldex != sel.oe.x)
                tsetdirt(MIN(sel.nb.y, oldsby), MAX(sel.ne.y, oldsey));
 }
@@ -1249,8 +1249,8 @@ execsh(void)
        char buf[sizeof(long) * 8 + 1];
        errno = 0;
-        if((pw = getpwuid(getuid())) == NULL) {
+        if ((pw = getpwuid(getuid())) == NULL) {
-                if(errno)
+                if (errno)
                        die("getpwuid:%s\n", strerror(errno));
                else
                        die("who are you?\n");
@@ -1260,9 +1260,9 @@ execsh(void)
                sh = (pw->pw_shell[0]) ? pw->pw_shell : shell;
        }
-        if(opt_cmd)
+        if (opt_cmd)
                prog = opt_cmd[0];
-        else if(utmp)
+        else if (utmp)
                prog = utmp;
        else
                prog = sh;
@@ -1297,10 +1297,10 @@ sigchld(int a)
        int stat;
        pid_t p;
-        if((p = waitpid(pid, &stat, WNOHANG)) < 0)
+        if ((p = waitpid(pid, &stat, WNOHANG)) < 0)
                die("Waiting for pid %hd failed: %s\n", pid, strerror(errno));
-        if(pid != p)
+        if (pid != p)
                return;
        if (!WIFEXITED(stat) || WEXITSTATUS(stat))
@@ -1315,13 +1315,13 @@ stty(void)
        char cmd[_POSIX_ARG_MAX], **p, *q, *s;
        size_t n, siz;
-        if((n = strlen(stty_args)) > sizeof(cmd)-1)
+        if ((n = strlen(stty_args)) > sizeof(cmd)-1)
                die("incorrect stty parameters\n");
        memcpy(cmd, stty_args, n);
        q = cmd + n;
        siz = sizeof(cmd) - n;
-        for(p = opt_cmd; p && (s = *p); ++p) {
+        for (p = opt_cmd; p && (s = *p); ++p) {
-                if((n = strlen(s)) > siz-1)
+                if ((n = strlen(s)) > siz-1)
                        die("stty parameter length too long\n");
                *q++ = ' ';
                q = memcpy(q, s, n);
@@ -1339,18 +1339,18 @@ ttynew(void)
        int m, s;
        struct winsize w = {term.row, term.col, 0, 0};
-        if(opt_io) {
+        if (opt_io) {
                term.mode |= MODE_PRINT;
                iofd = (!strcmp(opt_io, "-")) ?
                          1 : open(opt_io, O_WRONLY | O_CREAT, 0666);
-                if(iofd < 0) {
+                if (iofd < 0) {
                        fprintf(stderr, "Error opening %s:%s\n",
                                opt_io, strerror(errno));
                }
        }
        if (opt_line) {
-                if((cmdfd = open(opt_line, O_RDWR)) < 0)
+                if ((cmdfd = open(opt_line, O_RDWR)) < 0)
                        die("open line failed: %s\n", strerror(errno));
                close(0);
                dup(cmdfd);
@@ -1359,10 +1359,10 @@ ttynew(void)
        }
        /* seems to work fine on linux, openbsd and freebsd */
-        if(openpty(&m, &s, NULL, NULL, &w) < 0)
+        if (openpty(&m, &s, NULL, NULL, &w) < 0)
                die("openpty failed: %s\n", strerror(errno));
-        switch(pid = fork()) {
+        switch (pid = fork()) {
        case -1:
                die("fork failed\n");
                break;
@@ -1372,7 +1372,7 @@ ttynew(void)
                dup2(s, 0);
                dup2(s, 1);
                dup2(s, 2);
-                if(ioctl(s, TIOCSCTTY, NULL) < 0)
+                if (ioctl(s, TIOCSCTTY, NULL) < 0)
                        die("ioctl TIOCSCTTY failed: %s\n", strerror(errno));
                close(s);
                close(m);
@@ -1397,13 +1397,13 @@ ttyread(void)
        int ret;
        /* append read bytes to unprocessed bytes */
-        if((ret = read(cmdfd, buf+buflen, LEN(buf)-buflen)) < 0)
+        if ((ret = read(cmdfd, buf+buflen, LEN(buf)-buflen)) < 0)
                die("Couldn't read from shell: %s\n", strerror(errno));
        /* process every complete utf8 char */
        buflen += ret;
        ptr = buf;
-        while((charsize = utf8decode(ptr, &unicodep, buflen))) {
+        while ((charsize = utf8decode(ptr, &unicodep, buflen))) {
                tputc(unicodep);
                ptr += charsize;
                buflen -= charsize;
@@ -1416,7 +1416,7 @@ ttyread(void)
 void
 ttywrite(const char *s, size_t n)
 {
-        if(xwrite(cmdfd, s, n) == -1)
+        if (xwrite(cmdfd, s, n) == -1)
                die("write error on tty: %s\n", strerror(errno));
 }
@@ -1427,8 +1427,8 @@ ttysend(char *s, size_t n)
        Rune u;
        ttywrite(s, n);
-        if(IS_SET(MODE_ECHO))
+        if (IS_SET(MODE_ECHO))
-                while((len = utf8decode(s, &u, n)) > 0) {
+                while ((len = utf8decode(s, &u, n)) > 0) {
                        techo(u);
                        n -= len;
                        s += len;
@@ -1444,7 +1444,7 @@ ttyresize(void)
        w.ws_col = term.col;
        w.ws_xpixel = xw.tw;
        w.ws_ypixel = xw.th;
-        if(ioctl(cmdfd, TIOCSWINSZ, &w) < 0)
+        if (ioctl(cmdfd, TIOCSWINSZ, &w) < 0)
                fprintf(stderr, "Couldn't set window size: %s\n", strerror(errno));
 }
@@ -1453,9 +1453,9 @@ tattrset(int attr)
 {
        int i, j;
-        for(i = 0; i < term.row-1; i++) {
+        for (i = 0; i < term.row-1; i++) {
-                for(j = 0; j < term.col-1; j++) {
+                for (j = 0; j < term.col-1; j++) {
-                        if(term.line[i][j].mode & attr)
+                        if (term.line[i][j].mode & attr)
                                return 1;
                }
        }
@@ -1471,7 +1471,7 @@ tsetdirt(int top, int bot)
        LIMIT(top, 0, term.row-1);
        LIMIT(bot, 0, term.row-1);
-        for(i = top; i <= bot; i++)
+        for (i = top; i <= bot; i++)
                term.dirty[i] = 1;
 }
@@ -1480,9 +1480,9 @@ tsetdirtattr(int attr)
 {
        int i, j;
-        for(i = 0; i < term.row-1; i++) {
+        for (i = 0; i < term.row-1; i++) {
-                for(j = 0; j < term.col-1; j++) {
+                for (j = 0; j < term.col-1; j++) {
-                        if(term.line[i][j].mode & attr) {
+                        if (term.line[i][j].mode & attr) {
                                tsetdirt(i, i);
                                break;
                        }
@@ -1502,9 +1502,9 @@ tcursor(int mode)
        static TCursor c[2];
        int alt = IS_SET(MODE_ALTSCREEN);
-        if(mode == CURSOR_SAVE) {
+        if (mode == CURSOR_SAVE) {
                c[alt] = term.c;
-        } else if(mode == CURSOR_LOAD) {
+        } else if (mode == CURSOR_LOAD) {
                term.c = c[alt];
                tmoveto(c[alt].x, c[alt].y);
        }
@@ -1522,7 +1522,7 @@ treset(void)
        }, .x = 0, .y = 0, .state = CURSOR_DEFAULT};
        memset(term.tabs, 0, term.col * sizeof(*term.tabs));
-        for(i = tabspaces; i < term.col; i += tabspaces)
+        for (i = tabspaces; i < term.col; i += tabspaces)
                term.tabs[i] = 1;
        term.top = 0;
        term.bot = term.row - 1;
@@ -1530,7 +1530,7 @@ treset(void)
        memset(term.trantbl, CS_USA, sizeof(term.trantbl));
        term.charset = 0;
-        for(i = 0; i < 2; i++) {
+        for (i = 0; i < 2; i++) {
                tmoveto(0, 0);
                tcursor(CURSOR_SAVE);
                tclearregion(0, 0, term.col-1, term.row-1);
@@ -1570,7 +1570,7 @@ tscrolldown(int orig, int n)
        tsetdirt(orig, term.bot-n);
        tclearregion(0, term.bot-n+1, term.col-1, term.bot);
-        for(i = term.bot; i >= orig+n; i--) {
+        for (i = term.bot; i >= orig+n; i--) {
                temp = term.line[i];
                term.line[i] = term.line[i-n];
                term.line[i-n] = temp;
@@ -1590,7 +1590,7 @@ tscrollup(int orig, int n)
        tclearregion(0, orig, term.col-1, orig+n-1);
        tsetdirt(orig+n, term.bot);
-        for(i = orig; i <= term.bot-n; i++) {
+        for (i = orig; i <= term.bot-n; i++) {
                temp = term.line[i];
                term.line[i] = term.line[i+n];
                term.line[i+n] = temp;
@@ -1602,25 +1602,25 @@ tscrollup(int orig, int n)
 void
 selscroll(int orig, int n)
 {
-        if(sel.ob.x == -1)
+        if (sel.ob.x == -1)
                return;
-        if(BETWEEN(sel.ob.y, orig, term.bot) || BETWEEN(sel.oe.y, orig, term.bot)) {
+        if (BETWEEN(sel.ob.y, orig, term.bot) || BETWEEN(sel.oe.y, orig, term.bot)) {
-                if((sel.ob.y += n) > term.bot || (sel.oe.y += n) < term.top) {
+                if ((sel.ob.y += n) > term.bot || (sel.oe.y += n) < term.top) {
                        selclear(NULL);
                        return;
                }
-                if(sel.type == SEL_RECTANGULAR) {
+                if (sel.type == SEL_RECTANGULAR) {
-                        if(sel.ob.y < term.top)
+                        if (sel.ob.y < term.top)
                                sel.ob.y = term.top;
-                        if(sel.oe.y > term.bot)
+                        if (sel.oe.y > term.bot)
                                sel.oe.y = term.bot;
                } else {
-                        if(sel.ob.y < term.top) {
+                        if (sel.ob.y < term.top) {
                                sel.ob.y = term.top;
                                sel.ob.x = 0;
                        }
-                        if(sel.oe.y > term.bot) {
+                        if (sel.oe.y > term.bot) {
                                sel.oe.y = term.bot;
                                sel.oe.x = term.col;
                        }
@@ -1634,7 +1634,7 @@ tnewline(int first_col)
 {
        int y = term.c.y;
-        if(y == term.bot) {
+        if (y == term.bot) {
                tscrollup(term.top, 1);
        } else {
                y++;
@@ -1649,22 +1649,22 @@ csiparse(void)
        long int v;
        csiescseq.narg = 0;
-        if(*p == '?') {
+        if (*p == '?') {
                csiescseq.priv = 1;
                p++;
        }
        csiescseq.buf[csiescseq.len] = '\0';
-        while(p < csiescseq.buf+csiescseq.len) {
+        while (p < csiescseq.buf+csiescseq.len) {
                np = NULL;
                v = strtol(p, &np, 10);
-                if(np == p)
+                if (np == p)
                        v = 0;
-                if(v == LONG_MAX || v == LONG_MIN)
+                if (v == LONG_MAX || v == LONG_MIN)
                        v = -1;
                csiescseq.arg[csiescseq.narg++] = v;
                p = np;
-                if(*p != ';' || csiescseq.narg == ESC_ARG_SIZ)
+                if (*p != ';' || csiescseq.narg == ESC_ARG_SIZ)
                        break;
                p++;
        }
@@ -1684,7 +1684,7 @@ tmoveto(int x, int y)
 {
        int miny, maxy;
-        if(term.c.state & CURSOR_ORIGIN) {
+        if (term.c.state & CURSOR_ORIGIN) {
                miny = term.top;
                maxy = term.bot;
        } else {
@@ -1713,16 +1713,16 @@ tsetchar(Rune u, Glyph *attr, int x, int y)
        /*
         * The table is proudly stolen from rxvt.
         */
-        if(term.trantbl[term.charset] == CS_GRAPHIC0 &&
+        if (term.trantbl[term.charset] == CS_GRAPHIC0 &&
           BETWEEN(u, 0x41, 0x7e) && vt100_0[u - 0x41])
                utf8decode(vt100_0[u - 0x41], &u, UTF_SIZ);
-        if(term.line[y][x].mode & ATTR_WIDE) {
+        if (term.line[y][x].mode & ATTR_WIDE) {
-                if(x+1 < term.col) {
+                if (x+1 < term.col) {
                        term.line[y][x+1].u = ' ';
                        term.line[y][x+1].mode &= ~ATTR_WDUMMY;
                }
-        } else if(term.line[y][x].mode & ATTR_WDUMMY) {
+        } else if (term.line[y][x].mode & ATTR_WDUMMY) {
                term.line[y][x-1].u = ' ';
                term.line[y][x-1].mode &= ~ATTR_WIDE;
        }
@@ -1738,9 +1738,9 @@ tclearregion(int x1, int y1, int x2, int y2)
        int x, y, temp;
        Glyph *gp;
-        if(x1 > x2)
+        if (x1 > x2)
                temp = x1, x1 = x2, x2 = temp;
-        if(y1 > y2)
+        if (y1 > y2)
                temp = y1, y1 = y2, y2 = temp;
        LIMIT(x1, 0, term.col-1);
@@ -1748,11 +1748,11 @@ tclearregion(int x1, int y1, int x2, int y2)
        LIMIT(y1, 0, term.row-1);
        LIMIT(y2, 0, term.row-1);
-        for(y = y1; y <= y2; y++) {
+        for (y = y1; y <= y2; y++) {
                term.dirty[y] = 1;
-                for(x = x1; x <= x2; x++) {
+                for (x = x1; x <= x2; x++) {
                        gp = &term.line[y][x];
-                        if(selected(x, y))
+                        if (selected(x, y))
                                selclear(NULL);
                        gp->fg = term.c.attr.fg;
                        gp->bg = term.c.attr.bg;
@@ -1799,14 +1799,14 @@ tinsertblank(int n)
 void
 tinsertblankline(int n)
 {
-        if(BETWEEN(term.c.y, term.top, term.bot))
+        if (BETWEEN(term.c.y, term.top, term.bot))
                tscrolldown(term.c.y, n);
 }
 void
 tdeleteline(int n)
 {
-        if(BETWEEN(term.c.y, term.top, term.bot))
+        if (BETWEEN(term.c.y, term.top, term.bot))
                tscrollup(term.c.y, n);
 }
@@ -1828,7 +1828,7 @@ tdefcolor(int *attr, int *npar, int l)
                g = attr[*npar + 3];
                b = attr[*npar + 4];
                *npar += 4;
-                if(!BETWEEN(r, 0, 255) || !BETWEEN(g, 0, 255) || !BETWEEN(b, 0, 255))
+                if (!BETWEEN(r, 0, 255) || !BETWEEN(g, 0, 255) || !BETWEEN(b, 0, 255))
                        fprintf(stderr, "erresc: bad rgb color (%u,%u,%u)\n",
                                r, g, b);
                else
@@ -1842,7 +1842,7 @@ tdefcolor(int *attr, int *npar, int l)
                        break;
                }
                *npar += 2;
-                if(!BETWEEN(attr[*npar], 0, 255))
+                if (!BETWEEN(attr[*npar], 0, 255))
                        fprintf(stderr, "erresc: bad fgcolor %d\n", attr[*npar]);
                else
                        idx = attr[*npar];
@@ -1866,8 +1866,8 @@ tsetattr(int *attr, int l)
        int i;
        int32_t idx;
-        for(i = 0; i < l; i++) {
+        for (i = 0; i < l; i++) {
-                switch(attr[i]) {
+                switch (attr[i]) {
                case 0:
                        term.c.attr.mode &= ~(
                                ATTR_BOLD       |
@@ -1943,13 +1943,13 @@ tsetattr(int *attr, int l)
                        term.c.attr.bg = defaultbg;
                        break;
                default:
-                        if(BETWEEN(attr[i], 30, 37)) {
+                        if (BETWEEN(attr[i], 30, 37)) {
                                term.c.attr.fg = attr[i] - 30;
-                        } else if(BETWEEN(attr[i], 40, 47)) {
+                        } else if (BETWEEN(attr[i], 40, 47)) {
                                term.c.attr.bg = attr[i] - 40;
-                        } else if(BETWEEN(attr[i], 90, 97)) {
+                        } else if (BETWEEN(attr[i], 90, 97)) {
                                term.c.attr.fg = attr[i] - 90 + 8;
-                        } else if(BETWEEN(attr[i], 100, 107)) {
+                        } else if (BETWEEN(attr[i], 100, 107)) {
                                term.c.attr.bg = attr[i] - 100 + 8;
                        } else {
                                fprintf(stderr,
@@ -1968,7 +1968,7 @@ tsetscroll(int t, int b)
        LIMIT(t, 0, term.row-1);
        LIMIT(b, 0, term.row-1);
-        if(t > b) {
+        if (t > b) {
                temp = t;
                t = b;
                b = temp;
@@ -1983,16 +1983,16 @@ tsetmode(int priv, int set, int *args, int narg)
        int *lim, mode;
        int alt;
-        for(lim = args + narg; args < lim; ++args) {
+        for (lim = args + narg; args < lim; ++args) {
-                if(priv) {
+                if (priv) {
-                        switch(*args) {
+                        switch (*args) {
                        case 1: /* DECCKM -- Cursor key */
                                MODBIT(term.mode, set, MODE_APPCURSOR);
                                break;
                        case 5: /* DECSCNM -- Reverse video */
                                mode = term.mode;
                                MODBIT(term.mode, set, MODE_REVERSE);
-                                if(mode != term.mode)
+                                if (mode != term.mode)
                                        redraw();
                                break;
                        case 6: /* DECOM -- Origin */
@@ -2054,13 +2054,13 @@ tsetmode(int priv, int set, int *args, int narg)
                                if (!allowaltscreen)
                                        break;
                                alt = IS_SET(MODE_ALTSCREEN);
-                                if(alt) {
+                                if (alt) {
                                        tclearregion(0, 0, term.col-1,
                                                        term.row-1);
                                }
-                                if(set ^ alt) /* set is always 1 or 0 */
+                                if (set ^ alt) /* set is always 1 or 0 */
                                        tswapscreen();
-                                if(*args != 1049)
+                                if (*args != 1049)
                                        break;
                                /* FALLTHROUGH */
                        case 1048:
@@ -2085,7 +2085,7 @@ tsetmode(int priv, int set, int *args, int narg)
                                break;
                        }
                } else {
-                        switch(*args) {
+                        switch (*args) {
                        case 0:  /* Error (IGNORED) */
                                break;
                        case 2:  /* KAM -- keyboard action */
@@ -2116,7 +2116,7 @@ csihandle(void)
        char buf[40];
        int len;
-        switch(csiescseq.mode[0]) {
+        switch (csiescseq.mode[0]) {
        default:
        unknown:
                fprintf(stderr, "erresc: unknown csi ");
@@ -2137,7 +2137,7 @@ csihandle(void)
                tmoveto(term.c.x, term.c.y+csiescseq.arg[0]);
                break;
        case 'i': /* MC -- Media Copy */
-                switch(csiescseq.arg[0]) {
+                switch (csiescseq.arg[0]) {
                case 0:
                        tdump();
                        break;
@@ -2156,7 +2156,7 @@ csihandle(void)
                }
                break;
        case 'c': /* DA -- Device Attributes */
-                if(csiescseq.arg[0] == 0)
+                if (csiescseq.arg[0] == 0)
                        ttywrite(vtiden, sizeof(vtiden) - 1);
                break;
        case 'C': /* CUF -- Cursor <n> Forward */
@@ -2177,7 +2177,7 @@ csihandle(void)
                tmoveto(0, term.c.y-csiescseq.arg[0]);
                break;
        case 'g': /* TBC -- Tabulation clear */
-                switch(csiescseq.arg[0]) {
+                switch (csiescseq.arg[0]) {
                case 0: /* clear current tab stop */
                        term.tabs[term.c.x] = 0;
                        break;
@@ -2205,16 +2205,16 @@ csihandle(void)
                break;
        case 'J': /* ED -- Clear screen */
                selclear(NULL);
-                switch(csiescseq.arg[0]) {
+                switch (csiescseq.arg[0]) {
                case 0: /* below */
                        tclearregion(term.c.x, term.c.y, term.col-1, term.c.y);
-                        if(term.c.y < term.row-1) {
+                        if (term.c.y < term.row-1) {
                                tclearregion(0, term.c.y+1, term.col-1,
                                                term.row-1);
                        }
                        break;
                case 1: /* above */
-                        if(term.c.y > 1)
+                        if (term.c.y > 1)
                                tclearregion(0, 0, term.col-1, term.c.y-1);
                        tclearregion(0, term.c.y, term.c.x, term.c.y);
                        break;
@@ -2226,7 +2226,7 @@ csihandle(void)
                }
                break;
        case 'K': /* EL -- Clear line */
-                switch(csiescseq.arg[0]) {
+                switch (csiescseq.arg[0]) {
                case 0: /* right */
                        tclearregion(term.c.x, term.c.y, term.col-1,
                                        term.c.y);
@@ -2289,7 +2289,7 @@ csihandle(void)
                }
                break;
        case 'r': /* DECSTBM -- Set Scrolling Region */
-                if(csiescseq.priv) {
+                if (csiescseq.priv) {
                        goto unknown;
                } else {
                        DEFAULT(csiescseq.arg[0], 1);
@@ -2327,15 +2327,15 @@ csidump(void)
        uint c;
        printf("ESC[");
-        for(i = 0; i < csiescseq.len; i++) {
+        for (i = 0; i < csiescseq.len; i++) {
                c = csiescseq.buf[i] & 0xff;
-                if(isprint(c)) {
+                if (isprint(c)) {
                        putchar(c);
-                } else if(c == '\n') {
+                } else if (c == '\n') {
                        printf("(\\n)");
-                } else if(c == '\r') {
+                } else if (c == '\r') {
                        printf("(\\r)");
-                } else if(c == 0x1b) {
+                } else if (c == 0x1b) {
                        printf("(\\e)");
                } else {
                        printf("(%02x)", c);
@@ -2360,23 +2360,23 @@ strhandle(void)
        strparse();
        par = (narg = strescseq.narg) ? atoi(strescseq.args[0]) : 0;
-        switch(strescseq.type) {
+        switch (strescseq.type) {
        case ']': /* OSC -- Operating System Command */
-                switch(par) {
+                switch (par) {
                case 0:
                case 1:
                case 2:
-                        if(narg > 1)
+                        if (narg > 1)
                                xsettitle(strescseq.args[1]);
                        return;
                case 4: /* color set */
-                        if(narg < 3)
+                        if (narg < 3)
                                break;
                        p = strescseq.args[2];
                        /* FALLTHROUGH */
                case 104: /* color reset, here p = NULL */
                        j = (narg > 1) ? atoi(strescseq.args[1]) : -1;
-                        if(xsetcolorname(j, p)) {
+                        if (xsetcolorname(j, p)) {
                                fprintf(stderr, "erresc: invalid color %s\n", p);
                        } else {
                                /*
@@ -2410,14 +2410,14 @@ strparse(void)
        strescseq.narg = 0;
        strescseq.buf[strescseq.len] = '\0';
-        if(*p == '\0')
+        if (*p == '\0')
                return;
-        while(strescseq.narg < STR_ARG_SIZ) {
+        while (strescseq.narg < STR_ARG_SIZ) {
                strescseq.args[strescseq.narg++] = p;
-                while((c = *p) != ';' && c != '\0')
+                while ((c = *p) != ';' && c != '\0')
                        ++p;
-                if(c == '\0')
+                if (c == '\0')
                        return;
                *p++ = '\0';
        }
@@ -2430,17 +2430,17 @@ strdump(void)
        uint c;
        printf("ESC%c", strescseq.type);
-        for(i = 0; i < strescseq.len; i++) {
+        for (i = 0; i < strescseq.len; i++) {
                c = strescseq.buf[i] & 0xff;
-                if(c == '\0') {
+                if (c == '\0') {
                        return;
-                } else if(isprint(c)) {
+                } else if (isprint(c)) {
                        putchar(c);
-                } else if(c == '\n') {
+                } else if (c == '\n') {
                        printf("(\\n)");
-                } else if(c == '\r') {
+                } else if (c == '\r') {
                        printf("(\\r)");
-                } else if(c == 0x1b) {
+                } else if (c == 0x1b) {
                        printf("(\\e)");
                } else {
                        printf("(%02x)", c);
@@ -2458,7 +2458,7 @@ strreset(void)
 void
 tprinter(char *s, size_t len)
 {
-        if(iofd != -1 && xwrite(iofd, s, len) < 0) {
+        if (iofd != -1 && xwrite(iofd, s, len) < 0) {
                fprintf(stderr, "Error writing in %s:%s\n",
                        opt_io, strerror(errno));
                close(iofd);
@@ -2489,7 +2489,7 @@ tdumpsel(void)
 {
        char *ptr;
-        if((ptr = getsel())) {
+        if ((ptr = getsel())) {
                tprinter(ptr, strlen(ptr));
                free(ptr);
        }
@@ -2503,8 +2503,8 @@ tdumpline(int n)
        bp = &term.line[n][0];
        end = &bp[MIN(tlinelen(n), term.col) - 1];
-        if(bp != end || bp->u != ' ') {
+        if (bp != end || bp->u != ' ') {
-                for( ;bp <= end; ++bp)
+                for ( ;bp <= end; ++bp)
                        tprinter(buf, utf8encode(bp->u, buf));
        }
        tprinter("\n", 1);
@@ -2515,7 +2515,7 @@ tdump(void)
 {
        int i;
-        for(i = 0; i < term.row; ++i)
+        for (i = 0; i < term.row; ++i)
                tdumpline(i);
 }
@@ -2524,13 +2524,13 @@ tputtab(int n)
 {
        uint x = term.c.x;
-        if(n > 0) {
+        if (n > 0) {
-                while(x < term.col && n--)
+                while (x < term.col && n--)
-                        for(++x; x < term.col && !term.tabs[x]; ++x)
+                        for (++x; x < term.col && !term.tabs[x]; ++x)
                                /* nothing */ ;
-        } else if(n < 0) {
+        } else if (n < 0) {
-                while(x > 0 && n++)
+                while (x > 0 && n++)
-                        for(--x; x > 0 && !term.tabs[x]; --x)
+                        for (--x; x > 0 && !term.tabs[x]; --x)
                                /* nothing */ ;
        }
        term.c.x = LIMIT(x, 0, term.col-1);
@@ -2539,12 +2539,12 @@ tputtab(int n)
 void
 techo(Rune u)
 {
-        if(ISCONTROL(u)) { /* control code */
+        if (ISCONTROL(u)) { /* control code */
-                if(u & 0x80) {
+                if (u & 0x80) {
                        u &= 0x7f;
                        tputc('^');
                        tputc('[');
-                } else if(u != '\n' && u != '\r' && u != '\t') {
+                } else if (u != '\n' && u != '\r' && u != '\t') {
                        u ^= 0x40;
                        tputc('^');
                }
@@ -2559,7 +2559,7 @@ tdeftran(char ascii)
        static int vcs[] = {CS_GRAPHIC0, CS_USA};
        char *p;
-        if((p = strchr(cs, ascii)) == NULL) {
+        if ((p = strchr(cs, ascii)) == NULL) {
                fprintf(stderr, "esc unhandled charset: ESC ( %c\n", ascii);
        } else {
                term.trantbl[term.icharset] = vcs[p - cs];
@@ -2571,9 +2571,9 @@ tdectest(char c)
 {
        int x, y;
-        if(c == '8') { /* DEC screen alignment test. */
+        if (c == '8') { /* DEC screen alignment test. */
-                for(x = 0; x < term.col; ++x) {
+                for (x = 0; x < term.col; ++x) {
-                        for(y = 0; y < term.row; ++y)
+                        for (y = 0; y < term.row; ++y)
                                tsetchar('E', &term.c.attr, x, y);
                }
        }
@@ -2604,7 +2604,7 @@ tstrsequence(uchar c)
 void
 tcontrolcode(uchar ascii)
 {
-        switch(ascii) {
+        switch (ascii) {
        case '\t':   /* HT */
                tputtab(1);
                return;
@@ -2621,11 +2621,11 @@ tcontrolcode(uchar ascii)
                tnewline(IS_SET(MODE_CRLF));
                return;
        case '\a':   /* BEL */
-                if(term.esc & ESC_STR_END) {
+                if (term.esc & ESC_STR_END) {
                        /* backwards compatibility to xterm */
                        strhandle();
                } else {
-                        if(!(xw.state & WIN_FOCUSED))
+                        if (!(xw.state & WIN_FOCUSED))
                                xseturgency(1);
                        if (bellvolume)
                                XkbBell(xw.dpy, xw.win, bellvolume, (Atom)NULL);
@@ -2688,7 +2688,7 @@ tcontrolcode(uchar ascii)
 int
 eschandle(uchar ascii)
 {
-        switch(ascii) {
+        switch (ascii) {
        case '[':
                term.esc |= ESC_CSI;
                return 0;
@@ -2714,7 +2714,7 @@ eschandle(uchar ascii)
                term.esc |= ESC_ALTCHARSET;
                return 0;
        case 'D': /* IND -- Linefeed */
-                if(term.c.y == term.bot) {
+                if (term.c.y == term.bot) {
                        tscrollup(term.top, 1);
                } else {
                        tmoveto(term.c.x, term.c.y+1);
@@ -2727,7 +2727,7 @@ eschandle(uchar ascii)
                term.tabs[term.c.x] = 1;
                break;
        case 'M': /* RI -- Reverse index */
-                if(term.c.y == term.top) {
+                if (term.c.y == term.top) {
                        tscrolldown(term.top, 1);
                } else {
                        tmoveto(term.c.x, term.c.y-1);
@@ -2754,7 +2754,7 @@ eschandle(uchar ascii)
                tcursor(CURSOR_LOAD);
                break;
        case '\\': /* ST -- String Terminator */
-                if(term.esc & ESC_STR_END)
+                if (term.esc & ESC_STR_END)
                        strhandle();
                break;
        default:
@@ -2774,12 +2774,12 @@ tputc(Rune u)
        Glyph *gp;
        len = utf8encode(u, c);
-        if((width = wcwidth(u)) == -1) {
+        if ((width = wcwidth(u)) == -1) {
                memcpy(c, "\357\277\275", 4); /* UTF_INVALID */
                width = 1;
        }
-        if(IS_SET(MODE_PRINT))
+        if (IS_SET(MODE_PRINT))
                tprinter(c, len);
        control = ISCONTROL(u);
@@ -2789,12 +2789,12 @@ tputc(Rune u)
         * receives a ESC, a SUB, a ST or any other C1 control
         * character.
         */
-        if(term.esc & ESC_STR) {
+        if (term.esc & ESC_STR) {
-                if(u == '\a' || u == 030 || u == 032 || u == 033 ||
+                if (u == '\a' || u == 030 || u == 032 || u == 033 ||
                   ISCONTROLC1(u)) {
                        term.esc &= ~(ESC_START|ESC_STR);
                        term.esc |= ESC_STR_END;
-                } else if(strescseq.len + len < sizeof(strescseq.buf) - 1) {
+                } else if (strescseq.len + len < sizeof(strescseq.buf) - 1) {
                        memmove(&strescseq.buf[strescseq.len], c, len);
                        strescseq.len += len;
                        return;
@@ -2821,16 +2821,16 @@ tputc(Rune u)
         * because they can be embedded inside a control sequence, and
         * they must not cause conflicts with sequences.
         */
-        if(control) {
+        if (control) {
                tcontrolcode(u);
                /*
                 * control codes are not shown ever
                 */
                return;
-        } else if(term.esc & ESC_START) {
+        } else if (term.esc & ESC_START) {
-                if(term.esc & ESC_CSI) {
+                if (term.esc & ESC_CSI) {
                        csiescseq.buf[csiescseq.len++] = u;
-                        if(BETWEEN(u, 0x40, 0x7E)
+                        if (BETWEEN(u, 0x40, 0x7E)
                                        || csiescseq.len >= \
                                        sizeof(csiescseq.buf)-1) {
                                term.esc = 0;
@@ -2838,9 +2838,9 @@ tputc(Rune u)
                                csihandle();
                        }
                        return;
-                } else if(term.esc & ESC_ALTCHARSET) {
+                } else if (term.esc & ESC_ALTCHARSET) {
                        tdeftran(u);
-                } else if(term.esc & ESC_TEST) {
+                } else if (term.esc & ESC_TEST) {
                        tdectest(u);
                } else {
                        if (!eschandle(u))
@@ -2854,34 +2854,34 @@ tputc(Rune u)
                 */
                return;
        }
-        if(sel.ob.x != -1 && BETWEEN(term.c.y, sel.ob.y, sel.oe.y))
+        if (sel.ob.x != -1 && BETWEEN(term.c.y, sel.ob.y, sel.oe.y))
                selclear(NULL);
        gp = &term.line[term.c.y][term.c.x];
-        if(IS_SET(MODE_WRAP) && (term.c.state & CURSOR_WRAPNEXT)) {
+        if (IS_SET(MODE_WRAP) && (term.c.state & CURSOR_WRAPNEXT)) {
                gp->mode |= ATTR_WRAP;
                tnewline(1);
                gp = &term.line[term.c.y][term.c.x];
        }
-        if(IS_SET(MODE_INSERT) && term.c.x+width < term.col)
+        if (IS_SET(MODE_INSERT) && term.c.x+width < term.col)
                memmove(gp+width, gp, (term.col - term.c.x - width) * sizeof(Glyph));
-        if(term.c.x+width > term.col) {
+        if (term.c.x+width > term.col) {
                tnewline(1);
                gp = &term.line[term.c.y][term.c.x];
        }
        tsetchar(u, &term.c.attr, term.c.x, term.c.y);
-        if(width == 2) {
+        if (width == 2) {
                gp->mode |= ATTR_WIDE;
-                if(term.c.x+1 < term.col) {
+                if (term.c.x+1 < term.col) {
                        gp[1].u = '\0';
                        gp[1].mode = ATTR_WDUMMY;
                }
        }
-        if(term.c.x+width < term.col) {
+        if (term.c.x+width < term.col) {
                tmoveto(term.c.x+width, term.c.y);
        } else {
                term.c.state |= CURSOR_WRAPNEXT;
@@ -2897,7 +2897,7 @@ tresize(int col, int row)
        int *bp;
        TCursor c;
-        if(col < 1 || row < 1) {
+        if (col < 1 || row < 1) {
                fprintf(stderr,
                        "tresize: error resizing to %dx%d\n", col, row);
                return;
@@ -2908,7 +2908,7 @@ tresize(int col, int row)
         * tscrollup would work here, but we can optimize to
         * memmove because we're freeing the earlier lines
         */
-        for(i = 0; i <= term.c.y - row; i++) {
+        for (i = 0; i <= term.c.y - row; i++) {
                free(term.line[i]);
                free(term.alt[i]);
        }
@@ -2917,7 +2917,7 @@ tresize(int col, int row)
                memmove(term.line, term.line + i, row * sizeof(Line));
                memmove(term.alt, term.alt + i, row * sizeof(Line));
        }
-        for(i += row; i < term.row; i++) {
+        for (i += row; i < term.row; i++) {
                free(term.line[i]);
                free(term.alt[i]);
        }
@@ -2932,23 +2932,23 @@ tresize(int col, int row)
        term.tabs = xrealloc(term.tabs, col * sizeof(*term.tabs));
        /* resize each row to new width, zero-pad if needed */
-        for(i = 0; i < minrow; i++) {
+        for (i = 0; i < minrow; i++) {
                term.line[i] = xrealloc(term.line[i], col * sizeof(Glyph));
                term.alt[i]  = xrealloc(term.alt[i],  col * sizeof(Glyph));
        }
        /* allocate any new rows */
-        for(/* i == minrow */; i < row; i++) {
+        for (/* i == minrow */; i < row; i++) {
                term.line[i] = xmalloc(col * sizeof(Glyph));
                term.alt[i] = xmalloc(col * sizeof(Glyph));
        }
-        if(col > term.col) {
+        if (col > term.col) {
                bp = term.tabs + term.col;
                memset(bp, 0, sizeof(*term.tabs) * (col - term.col));
-                while(--bp > term.tabs && !*bp)
+                while (--bp > term.tabs && !*bp)
                        /* nothing */ ;
-                for(bp += tabspaces; bp < term.tabs + col; bp += tabspaces)
+                for (bp += tabspaces; bp < term.tabs + col; bp += tabspaces)
                        *bp = 1;
        }
        /* update terminal size */
@@ -2960,11 +2960,11 @@ tresize(int col, int row)
        tmoveto(term.c.x, term.c.y);
        /* Clearing both screens (it makes dirty all lines) */
        c = term.c;
-        for(i = 0; i < 2; i++) {
+        for (i = 0; i < 2; i++) {
-                if(mincol < col && 0 < minrow) {
+                if (mincol < col && 0 < minrow) {
                        tclearregion(mincol, 0, col - 1, minrow - 1);
                }
-                if(0 < col && minrow < row) {
+                if (0 < col && minrow < row) {
                        tclearregion(0, minrow, col - 1, row - 1);
                }
                tswapscreen();
@@ -2997,9 +2997,9 @@ xloadcolor(int i, const char *name, Color *ncolor)
 {
        XRenderColor color = { .alpha = 0xffff };
-        if(!name) {
+        if (!name) {
-                if(BETWEEN(i, 16, 255)) { /* 256 color */
+                if (BETWEEN(i, 16, 255)) { /* 256 color */
-                        if(i < 6*6*6+16) { /* same colors as xterm */
+                        if (i < 6*6*6+16) { /* same colors as xterm */
                                color.red   = sixd_to_16bit( ((i-16)/36)%6 );
                                color.green = sixd_to_16bit( ((i-16)/6) %6 );
                                color.blue  = sixd_to_16bit( ((i-16)/1) %6 );
@@ -3022,14 +3022,14 @@ xloadcols(void)
        static int loaded;
        Color *cp;
-        if(loaded) {
+        if (loaded) {
                for (cp = dc.col; cp < &dc.col[LEN(dc.col)]; ++cp)
                        XftColorFree(xw.dpy, xw.vis, xw.cmap, cp);
        }
-        for(i = 0; i < LEN(dc.col); i++)
+        for (i = 0; i < LEN(dc.col); i++)
-                if(!xloadcolor(i, NULL, &dc.col[i])) {
+                if (!xloadcolor(i, NULL, &dc.col[i])) {
-                        if(colorname[i])
+                        if (colorname[i])
                                die("Could not allocate color '%s'\n", colorname[i]);
                        else
                                die("Could not allocate color %d\n", i);
@@ -3042,11 +3042,11 @@ xsetcolorname(int x, const char *name)
 {
        Color ncolor;
-        if(!BETWEEN(x, 0, LEN(dc.col)))
+        if (!BETWEEN(x, 0, LEN(dc.col)))
                return 1;
-        if(!xloadcolor(x, name, &ncolor))
+        if (!xloadcolor(x, name, &ncolor))
                return 1;
        XftColorFree(xw.dpy, xw.vis, xw.cmap, &dc.col[x]);
@@ -3092,12 +3092,12 @@ xhints(void)
        sizeh->width_inc = xw.cw;
        sizeh->base_height = 2 * borderpx;
        sizeh->base_width = 2 * borderpx;
-        if(xw.isfixed) {
+        if (xw.isfixed) {
                sizeh->flags |= PMaxSize | PMinSize;
                sizeh->min_width = sizeh->max_width = xw.w;
                sizeh->min_height = sizeh->max_height = xw.h;
        }
-        if(xw.gm & (XValue|YValue)) {
+        if (xw.gm & (XValue|YValue)) {
                sizeh->flags |= USPosition | PWinGravity;
                sizeh->x = xw.l;
                sizeh->y = xw.t;
@@ -3112,7 +3112,7 @@ xhints(void)
 int
 xgeommasktogravity(int mask)
 {
-        switch(mask & (XNegative|YNegative)) {
+        switch (mask & (XNegative|YNegative)) {
        case 0:
                return NorthWestGravity;
        case XNegative:
@@ -3130,10 +3130,10 @@ xloadfont(Font *f, FcPattern *pattern)
        FcResult result;
        match = FcFontMatch(NULL, pattern, &result);
-        if(!match)
+        if (!match)
                return 1;
-        if(!(f->match = XftFontOpenPattern(xw.dpy, match))) {
+        if (!(f->match = XftFontOpenPattern(xw.dpy, match))) {
                FcPatternDestroy(match);
                return 1;
        }
@@ -3159,25 +3159,25 @@ xloadfonts(char *fontstr, double fontsize)
        double fontval;
        float ceilf(float);
-        if(fontstr[0] == '-') {
+        if (fontstr[0] == '-') {
                pattern = XftXlfdParse(fontstr, False, False);
        } else {
                pattern = FcNameParse((FcChar8 *)fontstr);
        }
-        if(!pattern)
+        if (!pattern)
                die("st: can't open font %s\n", fontstr);
-        if(fontsize > 1) {
+        if (fontsize > 1) {
                FcPatternDel(pattern, FC_PIXEL_SIZE);
                FcPatternDel(pattern, FC_SIZE);
                FcPatternAddDouble(pattern, FC_PIXEL_SIZE, (double)fontsize);
                usedfontsize = fontsize;
        } else {
-                if(FcPatternGetDouble(pattern, FC_PIXEL_SIZE, 0, &fontval) ==
+                if (FcPatternGetDouble(pattern, FC_PIXEL_SIZE, 0, &fontval) ==
                                FcResultMatch) {
                        usedfontsize = fontval;
-                } else if(FcPatternGetDouble(pattern, FC_SIZE, 0, &fontval) ==
+                } else if (FcPatternGetDouble(pattern, FC_SIZE, 0, &fontval) ==
                                FcResultMatch) {
                        usedfontsize = -1;
                } else {
@@ -3194,14 +3194,14 @@ xloadfonts(char *fontstr, double fontsize)
        FcConfigSubstitute(0, pattern, FcMatchPattern);
        FcDefaultSubstitute(pattern);
-        if(xloadfont(&dc.font, pattern))
+        if (xloadfont(&dc.font, pattern))
                die("st: can't open font %s\n", fontstr);
-        if(usedfontsize < 0) {
+        if (usedfontsize < 0) {
                FcPatternGetDouble(dc.font.match->pattern,
                                   FC_PIXEL_SIZE, 0, &fontval);
                usedfontsize = fontval;
-                if(fontsize == 0)
+                if (fontsize == 0)
                        defaultfontsize = fontval;
        }
@@ -3211,17 +3211,17 @@ xloadfonts(char *fontstr, double fontsize)
        FcPatternDel(pattern, FC_SLANT);
        FcPatternAddInteger(pattern, FC_SLANT, FC_SLANT_ITALIC);
-        if(xloadfont(&dc.ifont, pattern))
+        if (xloadfont(&dc.ifont, pattern))
                die("st: can't open font %s\n", fontstr);
        FcPatternDel(pattern, FC_WEIGHT);
        FcPatternAddInteger(pattern, FC_WEIGHT, FC_WEIGHT_BOLD);
-        if(xloadfont(&dc.ibfont, pattern))
+        if (xloadfont(&dc.ibfont, pattern))
                die("st: can't open font %s\n", fontstr);
        FcPatternDel(pattern, FC_SLANT);
        FcPatternAddInteger(pattern, FC_SLANT, FC_SLANT_ROMAN);
-        if(xloadfont(&dc.bfont, pattern))
+        if (xloadfont(&dc.bfont, pattern))
                die("st: can't open font %s\n", fontstr);
        FcPatternDestroy(pattern);
@@ -3232,7 +3232,7 @@ xunloadfont(Font *f)
 {
        XftFontClose(xw.dpy, f->match);
        FcPatternDestroy(f->pattern);
-        if(f->set)
+        if (f->set)
                FcFontSetDestroy(f->set);
 }
@@ -3240,7 +3240,7 @@ void
 xunloadfonts(void)
 {
        /* Free the loaded fonts in the font cache.  */
-        while(frclen > 0)
+        while (frclen > 0)
                XftFontClose(xw.dpy, frc[--frclen].font);
        xunloadfont(&dc.font);
@@ -3273,7 +3273,7 @@ xzoomreset(const Arg *arg)
 {
        Arg larg;
-        if(defaultfontsize > 0) {
+        if (defaultfontsize > 0) {
                larg.f = defaultfontsize;
                xzoomabs(&larg);
        }
@@ -3287,13 +3287,13 @@ xinit(void)
        Window parent;
        pid_t thispid = getpid();
-        if(!(xw.dpy = XOpenDisplay(NULL)))
+        if (!(xw.dpy = XOpenDisplay(NULL)))
                die("Can't open display\n");
        xw.scr = XDefaultScreen(xw.dpy);
        xw.vis = XDefaultVisual(xw.dpy, xw.scr);
        /* font */
-        if(!FcInit())
+        if (!FcInit())
                die("Could not init fontconfig.\n");
        usedfont = (opt_font == NULL)? font : opt_font;
@@ -3306,9 +3306,9 @@ xinit(void)
        /* adjust fixed window geometry */
        xw.w = 2 * borderpx + term.col * xw.cw;
        xw.h = 2 * borderpx + term.row * xw.ch;
-        if(xw.gm & XNegative)
+        if (xw.gm & XNegative)
                xw.l += DisplayWidth(xw.dpy, xw.scr) - xw.w - 2;
-        if(xw.gm & YNegative)
+        if (xw.gm & YNegative)
                xw.t += DisplayWidth(xw.dpy, xw.scr) - xw.h - 2;
        /* Events */
@@ -3340,11 +3340,11 @@ xinit(void)
        xw.draw = XftDrawCreate(xw.dpy, xw.buf, xw.vis, xw.cmap);
        /* input methods */
-        if((xw.xim = XOpenIM(xw.dpy, NULL, NULL, NULL)) == NULL) {
+        if ((xw.xim = XOpenIM(xw.dpy, NULL, NULL, NULL)) == NULL) {
                XSetLocaleModifiers("@im=local");
-                if((xw.xim =  XOpenIM(xw.dpy, NULL, NULL, NULL)) == NULL) {
+                if ((xw.xim =  XOpenIM(xw.dpy, NULL, NULL, NULL)) == NULL) {
                        XSetLocaleModifiers("@im=");
-                        if((xw.xim = XOpenIM(xw.dpy,
+                        if ((xw.xim = XOpenIM(xw.dpy,
                                        NULL, NULL, NULL)) == NULL) {
                                die("XOpenIM failed. Could not open input"
                                        " device.\n");
@@ -3354,7 +3354,7 @@ xinit(void)
        xw.xic = XCreateIC(xw.xim, XNInputStyle, XIMPreeditNothing
                                           | XIMStatusNothing, XNClientWindow, xw.win,
                                           XNFocusWindow, xw.win, NULL);
-        if(xw.xic == NULL)
+        if (xw.xic == NULL)
                die("XCreateIC failed. Could not obtain input method.\n");
        /* white cursor, black outline */
@@ -3395,28 +3395,28 @@ xmakeglyphfontspecs(XftGlyphFontSpec *specs, const Glyph *glyphs, int len, int x
        FcCharSet *fccharset;
        int i, f, numspecs = 0;
-        for(i = 0, xp = winx, yp = winy + font->ascent; i < len; ++i) {
+        for (i = 0, xp = winx, yp = winy + font->ascent; i < len; ++i) {
                /* Fetch rune and mode for current glyph. */
                rune = glyphs[i].u;
                mode = glyphs[i].mode;
                /* Skip dummy wide-character spacing. */
-                if(mode == ATTR_WDUMMY)
+                if (mode == ATTR_WDUMMY)
                        continue;
                /* Determine font for glyph if different from previous glyph. */
-                if(prevmode != mode) {
+                if (prevmode != mode) {
                        prevmode = mode;
                        font = &dc.font;
                        frcflags = FRC_NORMAL;
                        runewidth = xw.cw * ((mode & ATTR_WIDE) ? 2.0f : 1.0f);
-                        if((mode & ATTR_ITALIC) && (mode & ATTR_BOLD)) {
+                        if ((mode & ATTR_ITALIC) && (mode & ATTR_BOLD)) {
                                font = &dc.ibfont;
                                frcflags = FRC_ITALICBOLD;
-                        } else if(mode & ATTR_ITALIC) {
+                        } else if (mode & ATTR_ITALIC) {
                                font = &dc.ifont;
                                frcflags = FRC_ITALIC;
-                        } else if(mode & ATTR_BOLD) {
+                        } else if (mode & ATTR_BOLD) {
                                font = &dc.bfont;
                                frcflags = FRC_BOLD;
                        }
@@ -3425,7 +3425,7 @@ xmakeglyphfontspecs(XftGlyphFontSpec *specs, const Glyph *glyphs, int len, int x
                /* Lookup character index with default font. */
                glyphidx = XftCharIndex(xw.dpy, font->match, rune);
-                if(glyphidx) {
+                if (glyphidx) {
                        specs[numspecs].font = font->match;
                        specs[numspecs].glyph = glyphidx;
                        specs[numspecs].x = (short)xp;
@@ -3436,21 +3436,21 @@ xmakeglyphfontspecs(XftGlyphFontSpec *specs, const Glyph *glyphs, int len, int x
                }
                /* Fallback on font cache, search the font cache for match. */
-                for(f = 0; f < frclen; f++) {
+                for (f = 0; f < frclen; f++) {
                        glyphidx = XftCharIndex(xw.dpy, frc[f].font, rune);
                        /* Everything correct. */
-                        if(glyphidx && frc[f].flags == frcflags)
+                        if (glyphidx && frc[f].flags == frcflags)
                                break;
                        /* We got a default font for a not found glyph. */
-                        if(!glyphidx && frc[f].flags == frcflags
+                        if (!glyphidx && frc[f].flags == frcflags
                                        && frc[f].unicodep == rune) {
                                break;
                        }
                }
                /* Nothing was found. Use fontconfig to find matching font. */
-                if(f >= frclen) {
+                if (f >= frclen) {
-                        if(!font->set)
+                        if (!font->set)
                                font->set = FcFontSort(0, font->pattern,
                                                       1, 0, &fcres);
                        fcsets[0] = font->set;
@@ -3480,7 +3480,7 @@ xmakeglyphfontspecs(XftGlyphFontSpec *specs, const Glyph *glyphs, int len, int x
                        /*
                         * Overwrite or create the new cache entry.
                         */
-                        if(frclen >= LEN(frc)) {
+                        if (frclen >= LEN(frc)) {
                                frclen = LEN(frc) - 1;
                                XftFontClose(xw.dpy, frc[frclen].font);
                                frc[frclen].unicodep = 0;
@@ -3522,16 +3522,16 @@ xdrawglyphfontspecs(const XftGlyphFontSpec *specs, Glyph base, int len, int x, i
        XRectangle r;
        /* Determine foreground and background colors based on mode. */
-        if(base.fg == defaultfg) {
+        if (base.fg == defaultfg) {
-                if(base.mode & ATTR_ITALIC)
+                if (base.mode & ATTR_ITALIC)
                        base.fg = defaultitalic;
-                else if((base.mode & ATTR_ITALIC) && (base.mode & ATTR_BOLD))
+                else if ((base.mode & ATTR_ITALIC) && (base.mode & ATTR_BOLD))
                        base.fg = defaultitalic;
-                else if(base.mode & ATTR_UNDERLINE)
+                else if (base.mode & ATTR_UNDERLINE)
                        base.fg = defaultunderline;
        }
-        if(IS_TRUECOL(base.fg)) {
+        if (IS_TRUECOL(base.fg)) {
                colfg.alpha = 0xffff;
                colfg.red = TRUERED(base.fg);
                colfg.green = TRUEGREEN(base.fg);
@@ -3542,7 +3542,7 @@ xdrawglyphfontspecs(const XftGlyphFontSpec *specs, Glyph base, int len, int x, i
                fg = &dc.col[base.fg];
        }
-        if(IS_TRUECOL(base.bg)) {
+        if (IS_TRUECOL(base.bg)) {
                colbg.alpha = 0xffff;
                colbg.green = TRUEGREEN(base.bg);
                colbg.red = TRUERED(base.bg);
@@ -3554,11 +3554,11 @@ xdrawglyphfontspecs(const XftGlyphFontSpec *specs, Glyph base, int len, int x, i
        }
        /* Change basic system colors [0-7] to bright system colors [8-15] */
-        if((base.mode & ATTR_BOLD_FAINT) == ATTR_BOLD && BETWEEN(base.fg, 0, 7))
+        if ((base.mode & ATTR_BOLD_FAINT) == ATTR_BOLD && BETWEEN(base.fg, 0, 7))
                fg = &dc.col[base.fg + 8];
-        if(IS_SET(MODE_REVERSE)) {
+        if (IS_SET(MODE_REVERSE)) {
-                if(fg == &dc.col[defaultfg]) {
+                if (fg == &dc.col[defaultfg]) {
                        fg = &dc.col[defaultbg];
                } else {
                        colfg.red = ~fg->color.red;
@@ -3570,7 +3570,7 @@ xdrawglyphfontspecs(const XftGlyphFontSpec *specs, Glyph base, int len, int x, i
                        fg = &revfg;
                }
-                if(bg == &dc.col[defaultbg]) {
+                if (bg == &dc.col[defaultbg]) {
                        bg = &dc.col[defaultfg];
                } else {
                        colbg.red = ~bg->color.red;
@@ -3583,13 +3583,13 @@ xdrawglyphfontspecs(const XftGlyphFontSpec *specs, Glyph base, int len, int x, i
                }
        }
-        if(base.mode & ATTR_REVERSE) {
+        if (base.mode & ATTR_REVERSE) {
                temp = fg;
                fg = bg;
                bg = temp;
        }
-        if((base.mode & ATTR_BOLD_FAINT) == ATTR_FAINT) {
+        if ((base.mode & ATTR_BOLD_FAINT) == ATTR_FAINT) {
                colfg.red = fg->color.red / 2;
                colfg.green = fg->color.green / 2;
                colfg.blue = fg->color.blue / 2;
@@ -3597,24 +3597,24 @@ xdrawglyphfontspecs(const XftGlyphFontSpec *specs, Glyph base, int len, int x, i
                fg = &revfg;
        }
-        if(base.mode & ATTR_BLINK && term.mode & MODE_BLINK)
+        if (base.mode & ATTR_BLINK && term.mode & MODE_BLINK)
                fg = bg;
-        if(base.mode & ATTR_INVISIBLE)
+        if (base.mode & ATTR_INVISIBLE)
                fg = bg;
        /* Intelligent cleaning up of the borders. */
-        if(x == 0) {
+        if (x == 0) {
                xclear(0, (y == 0)? 0 : winy, borderpx,
                        winy + xw.ch + ((y >= term.row-1)? xw.h : 0));
        }
-        if(x + charlen >= term.col) {
+        if (x + charlen >= term.col) {
                xclear(winx + width, (y == 0)? 0 : winy, xw.w,
                        ((y >= term.row-1)? xw.h : (winy + xw.ch)));
        }
-        if(y == 0)
+        if (y == 0)
                xclear(winx, 0, winx + width, borderpx);
-        if(y == term.row-1)
+        if (y == term.row-1)
                xclear(winx, winy + xw.ch, winx + width, xw.h);
        /* Clean up the region we want to draw to. */
@@ -3631,12 +3631,12 @@ xdrawglyphfontspecs(const XftGlyphFontSpec *specs, Glyph base, int len, int x, i
        XftDrawGlyphFontSpec(xw.draw, fg, specs, len);
        /* Render underline and strikethrough. */
-        if(base.mode & ATTR_UNDERLINE) {
+        if (base.mode & ATTR_UNDERLINE) {
                XftDrawRect(xw.draw, fg, winx, winy + dc.font.ascent + 1,
                                width, 1);
        }
-        if(base.mode & ATTR_STRUCK) {
+        if (base.mode & ATTR_STRUCK) {
                XftDrawRect(xw.draw, fg, winx, winy + 2 * dc.font.ascent / 3,
                                width, 1);
        }
@@ -3667,9 +3667,9 @@ xdrawcursor(void)
        curx = term.c.x;
        /* adjust position if in dummy */
-        if(term.line[oldy][oldx].mode & ATTR_WDUMMY)
+        if (term.line[oldy][oldx].mode & ATTR_WDUMMY)
                oldx--;
-        if(term.line[term.c.y][curx].mode & ATTR_WDUMMY)
+        if (term.line[term.c.y][curx].mode & ATTR_WDUMMY)
                curx--;
        g.u = term.line[term.c.y][term.c.x].u;
@@ -3677,16 +3677,16 @@ xdrawcursor(void)
        /* remove the old cursor */
        xdrawglyph(term.line[oldy][oldx], oldx, oldy);
-        if(IS_SET(MODE_HIDE))
+        if (IS_SET(MODE_HIDE))
                return;
        /* draw the new one */
-        if(xw.state & WIN_FOCUSED) {
+        if (xw.state & WIN_FOCUSED) {
                switch (xw.cursor) {
                        case 0: /* Blinking Block */
                        case 1: /* Blinking Block (Default) */
                        case 2: /* Steady Block */
-                                if(IS_SET(MODE_REVERSE)) {
+                                if (IS_SET(MODE_REVERSE)) {
                                                g.mode |= ATTR_REVERSE;
                                                g.fg = defaultcs;
                                                g.bg = defaultfg;
@@ -3776,11 +3776,11 @@ drawregion(int x1, int y1, int x2, int y2)
        XftGlyphFontSpec* specs;
        int ena_sel = sel.ob.x != -1 && sel.alt == IS_SET(MODE_ALTSCREEN);
-        if(!(xw.state & WIN_VISIBLE))
+        if (!(xw.state & WIN_VISIBLE))
                return;
-        for(y = y1; y < y2; y++) {
+        for (y = y1; y < y2; y++) {
-                if(!term.dirty[y])
+                if (!term.dirty[y])
                        continue;
                xtermclear(0, y, term.col, y);
@@ -3790,25 +3790,25 @@ drawregion(int x1, int y1, int x2, int y2)
                numspecs = xmakeglyphfontspecs(specs, &term.line[y][x1], x2 - x1, x1, y);
                i = ox = 0;
-                for(x = x1; x < x2 && i < numspecs; x++) {
+                for (x = x1; x < x2 && i < numspecs; x++) {
                        new = term.line[y][x];
-                        if(new.mode == ATTR_WDUMMY)
+                        if (new.mode == ATTR_WDUMMY)
                                continue;
-                        if(ena_sel && selected(x, y))
+                        if (ena_sel && selected(x, y))
                                new.mode ^= ATTR_REVERSE;
-                        if(i > 0 && ATTRCMP(base, new)) {
+                        if (i > 0 && ATTRCMP(base, new)) {
                                xdrawglyphfontspecs(specs, base, i, ox, y);
                                specs += i;
                                numspecs -= i;
                                i = 0;
                        }
-                        if(i == 0) {
+                        if (i == 0) {
                                ox = x;
                                base = new;
                        }
                        i++;
                }
-                if(i > 0)
+                if (i > 0)
                        xdrawglyphfontspecs(specs, base, i, ox, y);
        }
        xdrawcursor();
@@ -3856,19 +3856,19 @@ focus(XEvent *ev)
 {
        XFocusChangeEvent *e = &ev->xfocus;
-        if(e->mode == NotifyGrab)
+        if (e->mode == NotifyGrab)
                return;
-        if(ev->type == FocusIn) {
+        if (ev->type == FocusIn) {
                XSetICFocus(xw.xic);
                xw.state |= WIN_FOCUSED;
                xseturgency(0);
-                if(IS_SET(MODE_FOCUS))
+                if (IS_SET(MODE_FOCUS))
                        ttywrite("\033[I", 3);
        } else {
                XUnsetICFocus(xw.xic);
                xw.state &= ~WIN_FOCUSED;
-                if(IS_SET(MODE_FOCUS))
+                if (IS_SET(MODE_FOCUS))
                        ttywrite("\033[O", 3);
        }
 }
@@ -3892,31 +3892,31 @@ kmap(KeySym k, uint state)
        int i;
        /* Check for mapped keys out of X11 function keys. */
-        for(i = 0; i < LEN(mappedkeys); i++) {
+        for (i = 0; i < LEN(mappedkeys); i++) {
-                if(mappedkeys[i] == k)
+                if (mappedkeys[i] == k)
                        break;
        }
-        if(i == LEN(mappedkeys)) {
+        if (i == LEN(mappedkeys)) {
-                if((k & 0xFFFF) < 0xFD00)
+                if ((k & 0xFFFF) < 0xFD00)
                        return NULL;
        }
-        for(kp = key; kp < key + LEN(key); kp++) {
+        for (kp = key; kp < key + LEN(key); kp++) {
-                if(kp->k != k)
+                if (kp->k != k)
                        continue;
-                if(!match(kp->mask, state))
+                if (!match(kp->mask, state))
                        continue;
-                if(IS_SET(MODE_APPKEYPAD) ? kp->appkey < 0 : kp->appkey > 0)
+                if (IS_SET(MODE_APPKEYPAD) ? kp->appkey < 0 : kp->appkey > 0)
                        continue;
-                if(term.numlock && kp->appkey == 2)
+                if (term.numlock && kp->appkey == 2)
                        continue;
-                if(IS_SET(MODE_APPCURSOR) ? kp->appcursor < 0 : kp->appcursor > 0)
+                if (IS_SET(MODE_APPCURSOR) ? kp->appcursor < 0 : kp->appcursor > 0)
                        continue;
-                if(IS_SET(MODE_CRLF) ? kp->crlf < 0 : kp->crlf > 0)
+                if (IS_SET(MODE_CRLF) ? kp->crlf < 0 : kp->crlf > 0)
                        continue;
                return kp->s;
@@ -3936,30 +3936,30 @@ kpress(XEvent *ev)
        Status status;
        Shortcut *bp;
-        if(IS_SET(MODE_KBDLOCK))
+        if (IS_SET(MODE_KBDLOCK))
                return;
        len = XmbLookupString(xw.xic, e, buf, sizeof buf, &ksym, &status);
        /* 1. shortcuts */
-        for(bp = shortcuts; bp < shortcuts + LEN(shortcuts); bp++) {
+        for (bp = shortcuts; bp < shortcuts + LEN(shortcuts); bp++) {
-                if(ksym == bp->keysym && match(bp->mod, e->state)) {
+                if (ksym == bp->keysym && match(bp->mod, e->state)) {
                        bp->func(&(bp->arg));
                        return;
                }
        }
        /* 2. custom keys from config.h */
-        if((customkey = kmap(ksym, e->state))) {
+        if ((customkey = kmap(ksym, e->state))) {
                ttysend(customkey, strlen(customkey));
                return;
        }
        /* 3. composed string from input method */
-        if(len == 0)
+        if (len == 0)
                return;
-        if(len == 1 && e->state & Mod1Mask) {
+        if (len == 1 && e->state & Mod1Mask) {
-                if(IS_SET(MODE_8BIT)) {
+                if (IS_SET(MODE_8BIT)) {
-                        if(*buf < 0177) {
+                        if (*buf < 0177) {
                                c = *buf | 0x80;
                                len = utf8encode(c, buf);
                        }
@@ -3980,14 +3980,14 @@ cmessage(XEvent *e)
         * See xembed specs
         *  http://standards.freedesktop.org/xembed-spec/xembed-spec-latest.html
         */
-        if(e->xclient.message_type == xw.xembed && e->xclient.format == 32) {
+        if (e->xclient.message_type == xw.xembed && e->xclient.format == 32) {
-                if(e->xclient.data.l[1] == XEMBED_FOCUS_IN) {
+                if (e->xclient.data.l[1] == XEMBED_FOCUS_IN) {
                        xw.state |= WIN_FOCUSED;
                        xseturgency(0);
-                } else if(e->xclient.data.l[1] == XEMBED_FOCUS_OUT) {
+                } else if (e->xclient.data.l[1] == XEMBED_FOCUS_OUT) {
                        xw.state &= ~WIN_FOCUSED;
                }
-        } else if(e->xclient.data.l[0] == xw.wmdeletewin) {
+        } else if (e->xclient.data.l[0] == xw.wmdeletewin) {
                /* Send SIGHUP to shell */
                kill(pid, SIGHUP);
                exit(0);
@@ -3999,9 +3999,9 @@ cresize(int width, int height)
 {
        int col, row;
-        if(width != 0)
+        if (width != 0)
                xw.w = width;
-        if(height != 0)
+        if (height != 0)
                xw.h = height;
        col = (xw.w - 2 * borderpx) / xw.cw;
@@ -4015,7 +4015,7 @@ cresize(int width, int height)
 void
 resize(XEvent *e)
 {
-        if(e->xconfigure.width == xw.w && e->xconfigure.height == xw.h)
+        if (e->xconfigure.width == xw.w && e->xconfigure.height == xw.h)
                return;
        cresize(e->xconfigure.width, e->xconfigure.height);
@@ -4039,13 +4039,13 @@ run(void)
                 * this is not unnecessary.It does not only filter the key event,
                 * but some clientmessage for input method as well.
                 */
-                if(XFilterEvent(&ev, None))
+                if (XFilterEvent(&ev, None))
                        continue;
-                if(ev.type == ConfigureNotify) {
+                if (ev.type == ConfigureNotify) {
                        w = ev.xconfigure.width;
                        h = ev.xconfigure.height;
                }
-        } while(ev.type != MapNotify);
+        } while (ev.type != MapNotify);
        ttynew();
        cresize(w, h);
@@ -4053,26 +4053,26 @@ run(void)
        clock_gettime(CLOCK_MONOTONIC, &last);
        lastblink = last;
-        for(xev = actionfps;;) {
+        for (xev = actionfps;;) {
                FD_ZERO(&rfd);
                FD_SET(cmdfd, &rfd);
                FD_SET(xfd, &rfd);
-                if(pselect(MAX(xfd, cmdfd)+1, &rfd, NULL, NULL, tv, NULL) < 0) {
+                if (pselect(MAX(xfd, cmdfd)+1, &rfd, NULL, NULL, tv, NULL) < 0) {
-                        if(errno == EINTR)
+                        if (errno == EINTR)
                                continue;
                        die("select failed: %s\n", strerror(errno));
                }
-                if(FD_ISSET(cmdfd, &rfd)) {
+                if (FD_ISSET(cmdfd, &rfd)) {
                        ttyread();
-                        if(blinktimeout) {
+                        if (blinktimeout) {
                                blinkset = tattrset(ATTR_BLINK);
-                                if(!blinkset)
+                                if (!blinkset)
                                        MODBIT(term.mode, 0, MODE_BLINK);
                        }
                }
-                if(FD_ISSET(xfd, &rfd))
+                if (FD_ISSET(xfd, &rfd))
                        xev = actionfps;
                clock_gettime(CLOCK_MONOTONIC, &now);
@@ -4081,35 +4081,35 @@ run(void)
                tv = &drawtimeout;
                dodraw = 0;
-                if(blinktimeout && TIMEDIFF(now, lastblink) > blinktimeout) {
+                if (blinktimeout && TIMEDIFF(now, lastblink) > blinktimeout) {
                        tsetdirtattr(ATTR_BLINK);
                        term.mode ^= MODE_BLINK;
                        lastblink = now;
                        dodraw = 1;
                }
                deltatime = TIMEDIFF(now, last);
-                if(deltatime > 1000 / (xev ? xfps : actionfps)) {
+                if (deltatime > 1000 / (xev ? xfps : actionfps)) {
                        dodraw = 1;
                        last = now;
                }
-                if(dodraw) {
+                if (dodraw) {
-                        while(XPending(xw.dpy)) {
+                        while (XPending(xw.dpy)) {
                                XNextEvent(xw.dpy, &ev);
-                                if(XFilterEvent(&ev, None))
+                                if (XFilterEvent(&ev, None))
                                        continue;
-                                if(handler[ev.type])
+                                if (handler[ev.type])
                                        (handler[ev.type])(&ev);
                        }
                        draw();
                        XFlush(xw.dpy);
-                        if(xev && !FD_ISSET(xfd, &rfd))
+                        if (xev && !FD_ISSET(xfd, &rfd))
                                xev--;
-                        if(!FD_ISSET(cmdfd, &rfd) && !FD_ISSET(xfd, &rfd)) {
+                        if (!FD_ISSET(cmdfd, &rfd) && !FD_ISSET(xfd, &rfd)) {
-                                if(blinkset) {
+                                if (blinkset) {
-                                        if(TIMEDIFF(now, lastblink) \
+                                        if (TIMEDIFF(now, lastblink) \
                                                        > blinktimeout) {
                                                drawtimeout.tv_nsec = 1000;
                                        } else {
@@ -4157,7 +4157,7 @@ main(int argc, char *argv[])
                opt_class = EARGF(usage());
                break;
        case 'e':
-                if(argc > 0)
+                if (argc > 0)
                        --argc, ++argv;
                goto run;
        case 'f':
@@ -4188,10 +4188,10 @@ main(int argc, char *argv[])
        } ARGEND;
 run:
-        if(argc > 0) {
+        if (argc > 0) {
                /* eat all remaining arguments */
                opt_cmd = argv;
-                if(!opt_title && !opt_line)
+                if (!opt_title && !opt_line)
                        opt_title = basename(xstrdup(argv[0]));
        }
        setlocale(LC_CTYPE, "");
author	FRIGN <dev@frign.de>	2015-07-10 10:29:53 +0200
committer	Christoph Lohmann <20h@r-36.net>	2015-07-10 13:58:31 +0200
commit	f1307d91e2ec351a4a8b7352be8b5f6e4cb24294 (patch)
tree	4c6c0fbbb257532d5ffab49afb3c6a4f3df596b1 /st.c
parent	13233574ed1ead29bb7e99e71a0665e62c640617 (diff)
download	st-f1307d91e2ec351a4a8b7352be8b5f6e4cb24294.tar.gz st-f1307d91e2ec351a4a8b7352be8b5f6e4cb24294.zip