auto-sync: draw on idle to avoid flicker/tearing

[st.git] / st.c

diff --git a/st.c b/st.c
index a51d19c..2bf133f 100644 (file)
--- a/st.c
+++ b/st.c
@@ -41,7 +41,7 @@
 #define ISCONTROLC0(c)         (BETWEEN(c, 0, 0x1f) || (c) == '\177')
 #define ISCONTROLC1(c)         (BETWEEN(c, 0x80, 0x9f))
 #define ISCONTROL(c)           (ISCONTROLC0(c) || ISCONTROLC1(c))
 #define ISCONTROLC0(c)         (BETWEEN(c, 0, 0x1f) || (c) == '\177')
 #define ISCONTROLC1(c)         (BETWEEN(c, 0x80, 0x9f))
 #define ISCONTROL(c)           (ISCONTROLC0(c) || ISCONTROLC1(c))

-#define ISDELIM(u)             (utf8strchr(worddelimiters, u) != NULL)
+#define ISDELIM(u)             (u && wcschr(worddelimiters, u))

 
 enum term_mode {
        MODE_WRAP        = 1 << 0,
 
 enum term_mode {
        MODE_WRAP        = 1 << 0,


@@ -135,7 +135,7 @@ typedef struct {
 /* ESC '[' [[ [<priv>] <arg> [;]] <mode> [<mode>]] */
 typedef struct {
        char buf[ESC_BUF_SIZ]; /* raw string */
 /* ESC '[' [[ [<priv>] <arg> [;]] <mode> [<mode>]] */
 typedef struct {
        char buf[ESC_BUF_SIZ]; /* raw string */

-       int len;               /* raw string length */
+       size_t len;            /* raw string length */

        char priv;
        int arg[ESC_ARG_SIZ];
        int narg;              /* nb of args */
        char priv;
        int arg[ESC_ARG_SIZ];
        int narg;              /* nb of args */


@@ -146,8 +146,9 @@ typedef struct {
 /* ESC type [[ [<priv>] <arg> [;]] <mode>] ESC '\' */
 typedef struct {
        char type;             /* ESC type ... */
 /* ESC type [[ [<priv>] <arg> [;]] <mode>] ESC '\' */
 typedef struct {
        char type;             /* ESC type ... */

-       char buf[STR_BUF_SIZ]; /* raw string */
-       int len;               /* raw string length */
+       char *buf;             /* allocated raw string */
+       size_t siz;            /* allocation size */
+       size_t len;            /* raw string length */

        char *args[STR_ARG_SIZ];
        int narg;              /* nb of args */
 } STREscape;
        char *args[STR_ARG_SIZ];
        int narg;              /* nb of args */
 } STREscape;


@@ -210,7 +211,6 @@ static void selsnap(int *, int *, int);
 static size_t utf8decode(const char *, Rune *, size_t);
 static Rune utf8decodebyte(char, size_t *);
 static char utf8encodebyte(Rune, size_t);
 static size_t utf8decode(const char *, Rune *, size_t);
 static Rune utf8decodebyte(char, size_t *);
 static char utf8encodebyte(Rune, size_t);

-static char *utf8strchr(char *, Rune);

 static size_t utf8validate(Rune *, size_t);
 
 static char *base64dec(const char *);
 static size_t utf8validate(Rune *, size_t);
 
 static char *base64dec(const char *);


@@ -337,23 +337,6 @@ utf8encodebyte(Rune u, size_t i)
        return utfbyte[i] | (u & ~utfmask[i]);
 }
 
        return utfbyte[i] | (u & ~utfmask[i]);
 }
 

-char *
-utf8strchr(char *s, Rune u)
-{
-       Rune r;
-       size_t i, j, len;
-
-       len = strlen(s);
-       for (i = 0, j = 0; i < len; i += j) {
-               if (!(j = utf8decode(&s[i], &r, len - i)))
-                       break;
-               if (r == u)
-                       return &(s[i]);
-       }
-
-       return NULL;
-}
-

 size_t
 utf8validate(Rune *u, size_t i)
 {
 size_t
 utf8validate(Rune *u, size_t i)
 {


@@ -383,8 +366,9 @@ static const char base64_digits[] = {
 char
 base64dec_getc(const char **src)
 {
 char
 base64dec_getc(const char **src)
 {

-       while (**src && !isprint(**src)) (*src)++;
-       return *((*src)++);
+       while (**src && !isprint(**src))
+               (*src)++;
+       return **src ? *((*src)++) : '=';  /* emulate padding if string ends */

 }
 
 char *
 }
 
 char *


@@ -402,6 +386,10 @@ base64dec(const char *src)
                int c = base64_digits[(unsigned char) base64dec_getc(&src)];
                int d = base64_digits[(unsigned char) base64dec_getc(&src)];
 
                int c = base64_digits[(unsigned char) base64dec_getc(&src)];
                int d = base64_digits[(unsigned char) base64dec_getc(&src)];
 

+               /* invalid input. 'a' can be -1, e.g. if src is "\n" (c-str) */
+               if (a == -1 || b == -1)
+                       break;
+

                *dst++ = (a << 2) | ((b & 0x30) >> 4);
                if (c == -1)
                        break;
                *dst++ = (a << 2) | ((b & 0x30) >> 4);
                if (c == -1)
                        break;


@@ -476,7 +464,7 @@ selextend(int col, int row, int type, int done)
        selnormalize();
        sel.type = type;
 
        selnormalize();
        sel.type = type;
 

-       if (oldey != sel.oe.y || oldex != sel.oe.x || oldtype != sel.type)
+       if (oldey != sel.oe.y || oldex != sel.oe.x || oldtype != sel.type || sel.mode == SEL_EMPTY)

                tsetdirt(MIN(sel.nb.y, oldsby), MAX(sel.ne.y, oldsey));
 
        sel.mode = done ? SEL_IDLE : SEL_READY;
                tsetdirt(MIN(sel.nb.y, oldsby), MAX(sel.ne.y, oldsey));
 
        sel.mode = done ? SEL_IDLE : SEL_READY;


@@ -677,7 +665,7 @@ die(const char *errstr, ...)
 void
 execsh(char *cmd, char **args)
 {
 void
 execsh(char *cmd, char **args)
 {

-       char *sh, *prog;
+       char *sh, *prog, *arg;

        const struct passwd *pw;
 
        errno = 0;
        const struct passwd *pw;
 
        errno = 0;


@@ -691,13 +679,20 @@ execsh(char *cmd, char **args)
        if ((sh = getenv("SHELL")) == NULL)
                sh = (pw->pw_shell[0]) ? pw->pw_shell : cmd;
 
        if ((sh = getenv("SHELL")) == NULL)
                sh = (pw->pw_shell[0]) ? pw->pw_shell : cmd;
 

-       if (args)
+       if (args) {

                prog = args[0];
                prog = args[0];

-       else if (utmp)
+               arg = NULL;
+       } else if (scroll) {
+               prog = scroll;
+               arg = utmp ? utmp : sh;
+       } else if (utmp) {

                prog = utmp;
                prog = utmp;

-       else
+               arg = NULL;
+       } else {

                prog = sh;
                prog = sh;

-       DEFAULT(args, ((char *[]) {prog, NULL}));
+               arg = NULL;
+       }
+       DEFAULT(args, ((char *[]) {prog, arg, NULL}));

 
        unsetenv("COLUMNS");
        unsetenv("LINES");
 
        unsetenv("COLUMNS");
        unsetenv("LINES");


@@ -731,9 +726,11 @@ sigchld(int a)
        if (pid != p)
                return;
 
        if (pid != p)
                return;
 

-       if (!WIFEXITED(stat) || WEXITSTATUS(stat))
-               die("child finished with error '%d'\n", stat);
-       exit(0);
+       if (WIFEXITED(stat) && WEXITSTATUS(stat))
+               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);

 }
 
 void
 }
 
 void


@@ -826,21 +823,26 @@ ttyread(void)
 {
        static char buf[BUFSIZ];
        static int buflen = 0;
 {
        static char buf[BUFSIZ];
        static int buflen = 0;

-       int written;
-       int ret;
+       int ret, written;

 
        /* append read bytes to unprocessed bytes */
 
        /* append read bytes to unprocessed bytes */

-       if ((ret = read(cmdfd, buf+buflen, LEN(buf)-buflen)) < 0)
-               die("couldn't read from shell: %s\n", strerror(errno));
-       buflen += ret;
+       ret = read(cmdfd, buf+buflen, LEN(buf)-buflen);

 
 

-       written = twrite(buf, buflen, 0);
-       buflen -= written;
-       /* keep any uncomplete utf8 char for the next call */
-       if (buflen > 0)
-               memmove(buf, buf + written, buflen);
+       switch (ret) {
+       case 0:
+               exit(0);
+       case -1:
+               die("couldn't read from shell: %s\n", strerror(errno));
+       default:
+               buflen += ret;
+               written = twrite(buf, buflen, 0);
+               buflen -= written;
+               /* keep any incomplete UTF-8 byte sequence for the next call */
+               if (buflen > 0)
+                       memmove(buf, buf + written, buflen);
+               return ret;

 
 

-       return ret;
+       }

 }
 
 void
 }
 
 void


@@ -1573,6 +1575,7 @@ tsetmode(int priv, int set, int *args, int narg)
                        case 1015: /* urxvt mangled mouse mode; incompatible
                                      and can be mistaken for other control
                                      codes. */
                        case 1015: /* urxvt mangled mouse mode; incompatible
                                      and can be mistaken for other control
                                      codes. */

+                               break;

                        default:
                                fprintf(stderr,
                                        "erresc: unknown private set/reset mode %d\n",
                        default:
                                fprintf(stderr,
                                        "erresc: unknown private set/reset mode %d\n",


@@ -1814,7 +1817,7 @@ csihandle(void)
 void
 csidump(void)
 {
 void
 csidump(void)
 {

-       int i;
+       size_t i;

        uint c;
 
        fprintf(stderr, "ESC[");
        uint c;
 
        fprintf(stderr, "ESC[");


@@ -1844,7 +1847,7 @@ csireset(void)
 void
 strhandle(void)
 {
 void
 strhandle(void)
 {

-       char *p = NULL;
+       char *p = NULL, *dec;

        int j, narg, par;
 
        term.esc &= ~(ESC_STR_END|ESC_STR);
        int j, narg, par;
 
        term.esc &= ~(ESC_STR_END|ESC_STR);


@@ -1862,8 +1865,6 @@ strhandle(void)
                        return;
                case 52:
                        if (narg > 2) {
                        return;
                case 52:
                        if (narg > 2) {

-                               char *dec;
-

                                dec = base64dec(strescseq.args[2]);
                                if (dec) {
                                        xsetsel(dec);
                                dec = base64dec(strescseq.args[2]);
                                if (dec) {
                                        xsetsel(dec);


@@ -1881,7 +1882,10 @@ strhandle(void)
                case 104: /* color reset, here p = NULL */
                        j = (narg > 1) ? atoi(strescseq.args[1]) : -1;
                        if (xsetcolorname(j, p)) {
                case 104: /* color reset, here p = NULL */
                        j = (narg > 1) ? atoi(strescseq.args[1]) : -1;
                        if (xsetcolorname(j, p)) {

-                               fprintf(stderr, "erresc: invalid color %s\n", p);
+                               if (par == 104 && narg <= 1)
+                                       return; /* color reset without parameter */
+                               fprintf(stderr, "erresc: invalid color j=%d, p=%s\n",
+                                       j, p ? p : "(null)");

                        } else {
                                /*
                                 * TODO if defaultbg color is changed, borders
                        } else {
                                /*
                                 * TODO if defaultbg color is changed, borders


@@ -1931,7 +1935,7 @@ strparse(void)
 void
 strdump(void)
 {
 void
 strdump(void)
 {

-       int i;
+       size_t i;

        uint c;
 
        fprintf(stderr, "ESC%c", strescseq.type);
        uint c;
 
        fprintf(stderr, "ESC%c", strescseq.type);


@@ -1958,7 +1962,10 @@ strdump(void)
 void
 strreset(void)
 {
 void
 strreset(void)
 {

-       memset(&strescseq, 0, sizeof(strescseq));
+       strescseq = (STREscape){
+               .buf = xrealloc(strescseq.buf, STR_BUF_SIZ),
+               .siz = STR_BUF_SIZ,
+       };

 }
 
 void
 }
 
 void


@@ -2333,7 +2340,6 @@ tputc(Rune u)
                        goto check_control_code;
                }
 
                        goto check_control_code;
                }
 

-

                if (IS_SET(MODE_SIXEL)) {
                        /* TODO: implement sixel mode */
                        return;
                if (IS_SET(MODE_SIXEL)) {
                        /* TODO: implement sixel mode */
                        return;


@@ -2341,7 +2347,7 @@ tputc(Rune u)
                if (term.esc&ESC_DCS && strescseq.len == 0 && u == 'q')
                        term.mode |= MODE_SIXEL;
 
                if (term.esc&ESC_DCS && strescseq.len == 0 && u == 'q')
                        term.mode |= MODE_SIXEL;
 

-               if (strescseq.len+len >= sizeof(strescseq.buf)-1) {
+               if (strescseq.len+len >= strescseq.siz) {

                        /*
                         * Here is a bug in terminals. If the user never sends
                         * some code to stop the str or esc command, then st
                        /*
                         * Here is a bug in terminals. If the user never sends
                         * some code to stop the str or esc command, then st


@@ -2355,7 +2361,10 @@ tputc(Rune u)
                         * term.esc = 0;
                         * strhandle();
                         */
                         * term.esc = 0;
                         * strhandle();
                         */

-                       return;
+                       if (strescseq.siz > (SIZE_MAX - UTF_SIZ) / 2)
+                               return;
+                       strescseq.siz *= 2;
+                       strescseq.buf = xrealloc(strescseq.buf, strescseq.siz);

                }
 
                memmove(&strescseq.buf[strescseq.len], c, len);
                }
 
                memmove(&strescseq.buf[strescseq.len], c, len);


@@ -2562,6 +2571,7 @@ void
 drawregion(int x1, int y1, int x2, int y2)
 {
        int y;
 drawregion(int x1, int y1, int x2, int y2)
 {
        int y;

+

        for (y = y1; y < y2; y++) {
                if (!term.dirty[y])
                        continue;
        for (y = y1; y < y2; y++) {
                if (!term.dirty[y])
                        continue;


@@ -2574,7 +2584,7 @@ drawregion(int x1, int y1, int x2, int y2)
 void
 draw(void)
 {
 void
 draw(void)
 {

-       int cx = term.c.x;
+       int cx = term.c.x, ocx = term.ocx, ocy = term.ocy;

 
        if (!xstartdraw())
                return;
 
        if (!xstartdraw())
                return;


@@ -2590,8 +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]);
        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();
        xfinishdraw();

+       if (ocx != term.ocx || ocy != term.ocy)
+               xximspot(term.ocx, term.ocy);

 }
 
 void
 }
 
 void