Update XIM cursor position only if changed

[st.git] / st.c

diff --git a/st.c b/st.c
index 59db14483a01f4b153ad1d5ddb85253c9ea785bc..0ce6ac24591968723c7b70e5cb0af992df8e67b5 100644 (file)
--- a/st.c
+++ b/st.c
@@ -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;
@@ -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