tiny code-style and typo-fix in comment

[st.git] / st.c

diff --git a/st.c b/st.c
index 59db144..c161497 100644 (file)
--- a/st.c
+++ b/st.c
@@ -38,7 +38,7 @@
 
 /* macros */
 #define IS_SET(flag)           ((term.mode & (flag)) != 0)
-#define ISCONTROLC0(c)         (BETWEEN(c, 0, 0x1f) || (c) == '\177')
+#define ISCONTROLC0(c)         (BETWEEN(c, 0, 0x1f) || (c) == 0x7f)
 #define ISCONTROLC1(c)         (BETWEEN(c, 0x80, 0x9f))
 #define ISCONTROL(c)           (ISCONTROLC0(c) || ISCONTROLC1(c))
 #define ISDELIM(u)             (u && wcschr(worddelimiters, u))
@@ -730,7 +730,7 @@ sigchld(int a)
                die("child exited with status %d\n", WEXITSTATUS(stat));
        else if (WIFSIGNALED(stat))
                die("child terminated due to signal %d\n", WTERMSIG(stat));
-       exit(0);
+       _exit(0);
 }
 
 void
@@ -823,15 +823,13 @@ ttyread(void)
 {
        static char buf[BUFSIZ];
        static int buflen = 0;
-       int written;
-       int ret;
+       int ret, written;
 
        /* append read bytes to unprocessed bytes */
        ret = read(cmdfd, buf+buflen, LEN(buf)-buflen);
 
        switch (ret) {
        case 0:
-               fputs("Found EOF in input\n", stderr);
                exit(0);
        case -1:
                die("couldn't read from shell: %s\n", strerror(errno));
@@ -839,7 +837,7 @@ ttyread(void)
                buflen += ret;
                written = twrite(buf, buflen, 0);
                buflen -= written;
-               /* keep any uncomplete utf8 char for the next call */
+               /* keep any incomplete UTF-8 byte sequence for the next call */
                if (buflen > 0)
                        memmove(buf, buf + written, buflen);
                return ret;
@@ -2025,7 +2023,7 @@ tdumpline(int n)
        bp = &term.line[n][0];
        end = &bp[MIN(tlinelen(n), term.col) - 1];
        if (bp != end || bp->u != ' ') {
-               for ( ;bp <= end; ++bp)
+               for ( ; bp <= end; ++bp)
                        tprinter(buf, utf8encode(bp->u, buf));
        }
        tprinter("\n", 1);
@@ -2309,7 +2307,7 @@ tputc(Rune u)
        Glyph *gp;
 
        control = ISCONTROL(u);
-       if (!IS_SET(MODE_UTF8) && !IS_SET(MODE_SIXEL)) {
+       if (!IS_SET(MODE_UTF8 | MODE_SIXEL)) {
                c[0] = u;
                width = len = 1;
        } else {
@@ -2573,6 +2571,7 @@ void
 drawregion(int x1, int y1, int x2, int y2)
 {
        int y;
+
        for (y = y1; y < y2; y++) {
                if (!term.dirty[y])
                        continue;
@@ -2585,7 +2584,7 @@ drawregion(int x1, int y1, int x2, int y2)
 void
 draw(void)
 {
-       int cx = term.c.x;
+       int cx = term.c.x, ocx = term.ocx, ocy = term.ocy;
 
        if (!xstartdraw())
                return;
@@ -2601,9 +2600,11 @@ draw(void)
        drawregion(0, 0, term.col, term.row);
        xdrawcursor(cx, term.c.y, term.line[term.c.y][cx],
                        term.ocx, term.ocy, term.line[term.ocy][term.ocx]);
-       term.ocx = cx, term.ocy = term.c.y;
+       term.ocx = cx;
+       term.ocy = term.c.y;
        xfinishdraw();
-       xximspot(term.ocx, term.ocy);
+       if (ocx != term.ocx || ocy != term.ocy)
+               xximspot(term.ocx, term.ocy);
 }
 
 void