Avoid recursive call to ttywrite from ttyread

[st.git] / st.c

diff --git a/st.c b/st.c
index 01d44102513c4a68c81ba76f667f98c500699eea..c5d62c1599dc55fd27e235fc30bd06a165fa912e 100644 (file)
--- a/st.c
+++ b/st.c
@@ -275,7 +275,7 @@ typedef struct {
        uint b;
        uint mask;
        char *s;
-} Mousekey;
+} MouseShortcut;
 
 typedef struct {
        KeySym k;
@@ -415,7 +415,7 @@ static int32_t tdefcolor(int *, int *, int);
 static void tdeftran(char);
 static inline int match(uint, uint);
 static void ttynew(void);
-static void ttyread(void);
+static size_t ttyread(void);
 static void ttyresize(void);
 static void ttysend(char *, size_t);
 static void ttywrite(const char *, size_t);
@@ -695,9 +695,10 @@ utf8validate(Rune *u, size_t i)
 void
 selinit(void)
 {
-       memset(&sel.tclick1, 0, sizeof(sel.tclick1));
-       memset(&sel.tclick2, 0, sizeof(sel.tclick2));
+       clock_gettime(CLOCK_MONOTONIC, &sel.tclick1);
+       clock_gettime(CLOCK_MONOTONIC, &sel.tclick2);
        sel.mode = SEL_IDLE;
+       sel.snap = 0;
        sel.ob.x = -1;
        sel.primary = NULL;
        sel.clipboard = NULL;
@@ -943,17 +944,17 @@ void
 bpress(XEvent *e)
 {
        struct timespec now;
-       Mousekey *mk;
+       MouseShortcut *ms;
 
        if (IS_SET(MODE_MOUSE) && !(e->xbutton.state & forceselmod)) {
                mousereport(e);
                return;
        }
 
-       for (mk = mshortcuts; mk < mshortcuts + LEN(mshortcuts); mk++) {
-               if (e->xbutton.button == mk->b
-                               && match(mk->mask, e->xbutton.state)) {
-                       ttysend(mk->s, strlen(mk->s));
+       for (ms = mshortcuts; ms < mshortcuts + LEN(mshortcuts); ms++) {
+               if (e->xbutton.button == ms->b
+                               && match(ms->mask, e->xbutton.state)) {
+                       ttysend(ms->s, strlen(ms->s));
                        return;
                }
        }
@@ -1463,7 +1464,7 @@ ttynew(void)
        }
 }
 
-void
+size_t
 ttyread(void)
 {
        static char buf[BUFSIZ];
@@ -1488,14 +1489,16 @@ ttyread(void)
 
        /* keep any uncomplete utf8 char for the next call */
        memmove(buf, ptr, buflen);
+
+       return ret;
 }
 
 void
 ttywrite(const char *s, size_t n)
 {
-       fd_set wfd;
-       struct timespec tv;
+       fd_set wfd, rfd;
        ssize_t r;
+       size_t lim = 256;
 
        /*
         * Remember that we are using a pty, which might be a modem line.
@@ -1505,38 +1508,32 @@ ttywrite(const char *s, size_t n)
         */
        while (n > 0) {
                FD_ZERO(&wfd);
+               FD_ZERO(&rfd);
                FD_SET(cmdfd, &wfd);
-               tv.tv_sec = 0;
-               tv.tv_nsec = 0;
+               FD_SET(cmdfd, &rfd);
 
                /* Check if we can write. */
-               if (pselect(cmdfd+1, NULL, &wfd, NULL, &tv, NULL) < 0) {
+               if (pselect(cmdfd+1, &rfd, &wfd, NULL, NULL, NULL) < 0) {
                        if (errno == EINTR)
                                continue;
                        die("select failed: %s\n", strerror(errno));
                }
-               if(!FD_ISSET(cmdfd, &wfd)) {
-                       /* No, then free some buffer space. */
-                       ttyread();
-               } else {
+               if (FD_ISSET(cmdfd, &wfd)) {
                        /*
-                        * Only write 256 bytes at maximum. This seems to be a
-                        * reasonable value for a serial line. Bigger values
-                        * might clog the I/O.
+                        * Only write the bytes written by ttywrite() or the
+                        * default of 256. This seems to be a reasonable value
+                        * for a serial line. Bigger values might clog the I/O.
                         */
-                       r = write(cmdfd, s, (n < 256)? n : 256);
-                       if (r < 0) {
-                               die("write error on tty: %s\n",
-                                               strerror(errno));
-                       }
+                       if ((r = write(cmdfd, s, (n < lim)? n : lim)) < 0)
+                               goto write_error;
                        if (r < n) {
                                /*
                                 * We weren't able to write out everything.
                                 * This means the buffer is getting full
                                 * again. Empty it.
                                 */
-                               if (n < 256)
-                                       ttyread();
+                               if (n < lim)
+                                       lim = ttyread();
                                n -= r;
                                s += r;
                        } else {
@@ -1544,7 +1541,13 @@ ttywrite(const char *s, size_t n)
                                break;
                        }
                }
+               if (FD_ISSET(cmdfd, &rfd))
+                       lim = ttyread();
        }
+       return;
+
+write_error:
+       die("write error on tty: %s\n", strerror(errno));
 }
 
 void