applied blinking cursor

[st.git] / st.c

diff --git a/st.c b/st.c
index a545724..76b7e0d 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))
@@ -51,7 +51,6 @@ enum term_mode {
        MODE_ECHO        = 1 << 4,
        MODE_PRINT       = 1 << 5,
        MODE_UTF8        = 1 << 6,
-       MODE_SIXEL       = 1 << 7,
 };
 
 enum cursor_movement {
@@ -78,12 +77,11 @@ enum charset {
 enum escape_state {
        ESC_START      = 1,
        ESC_CSI        = 2,
-       ESC_STR        = 4,  /* OSC, PM, APC */
+       ESC_STR        = 4,  /* DCS, OSC, PM, APC */
        ESC_ALTCHARSET = 8,
        ESC_STR_END    = 16, /* a final string was encountered */
        ESC_TEST       = 32, /* Enter in test mode */
        ESC_UTF8       = 64,
-       ESC_DCS        =128,
 };
 
 typedef struct {
@@ -129,6 +127,7 @@ typedef struct {
        int charset;  /* current charset */
        int icharset; /* selected charset for sequence */
        int *tabs;
+       Rune lastc;   /* last printed char outside of sequence, 0 if control */
 } Term;
 
 /* CSI Escape sequence structs */
@@ -634,7 +633,8 @@ 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) || sel.type == SEL_RECTANGULAR))
                        *ptr++ = '\n';
        }
        *ptr = 0;
@@ -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
@@ -830,7 +830,6 @@ ttyread(void)
 
        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));
@@ -842,7 +841,6 @@ ttyread(void)
                if (buflen > 0)
                        memmove(buf, buf + written, buflen);
                return ret;
-
        }
 }
 
@@ -1106,27 +1104,17 @@ selscroll(int orig, int n)
        if (sel.ob.x == -1)
                return;
 
-       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 (BETWEEN(sel.nb.y, orig, term.bot) != BETWEEN(sel.ne.y, orig, term.bot)) {
+               selclear();
+       } else if (BETWEEN(sel.nb.y, orig, term.bot)) {
+               sel.ob.y += n;
+               sel.oe.y += n;
+               if (sel.ob.y < term.top || sel.ob.y > term.bot ||
+                   sel.oe.y < term.top || sel.oe.y > term.bot) {
                        selclear();
-                       return;
-               }
-               if (sel.type == SEL_RECTANGULAR) {
-                       if (sel.ob.y < term.top)
-                               sel.ob.y = term.top;
-                       if (sel.oe.y > term.bot)
-                               sel.oe.y = term.bot;
                } else {
-                       if (sel.ob.y < term.top) {
-                               sel.ob.y = term.top;
-                               sel.ob.x = 0;
-                       }
-                       if (sel.oe.y > term.bot) {
-                               sel.oe.y = term.bot;
-                               sel.oe.x = term.col;
-                       }
+                       selnormalize();
                }
-               selnormalize();
        }
 }
 
@@ -1658,6 +1646,12 @@ csihandle(void)
                if (csiescseq.arg[0] == 0)
                        ttywrite(vtiden, strlen(vtiden), 0);
                break;
+       case 'b': /* REP -- if last char is printable print it <n> more times */
+               DEFAULT(csiescseq.arg[0], 1);
+               if (term.lastc)
+                       while (csiescseq.arg[0]-- > 0)
+                               tputc(term.lastc);
+               break;
        case 'C': /* CUF -- Cursor <n> Forward */
        case 'a': /* HPR -- Cursor <n> Forward */
                DEFAULT(csiescseq.arg[0], 1);
@@ -1781,7 +1775,7 @@ csihandle(void)
                break;
        case 'n': /* DSR – Device Status Report (cursor position) */
                if (csiescseq.arg[0] == 6) {
-                       len = snprintf(buf, sizeof(buf),"\033[%i;%iR",
+                       len = snprintf(buf, sizeof(buf), "\033[%i;%iR",
                                        term.c.y+1, term.c.x+1);
                        ttywrite(buf, len, 0);
                }
@@ -1865,7 +1859,7 @@ strhandle(void)
                                xsettitle(strescseq.args[1]);
                        return;
                case 52:
-                       if (narg > 2) {
+                       if (narg > 2 && allowwindowops) {
                                dec = base64dec(strescseq.args[2]);
                                if (dec) {
                                        xsetsel(dec);
@@ -1901,7 +1895,6 @@ strhandle(void)
                xsettitle(strescseq.args[0]);
                return;
        case 'P': /* DCS -- Device Control String */
-               term.mode |= ESC_DCS;
        case '_': /* APC -- Application Program Command */
        case '^': /* PM -- Privacy Message */
                return;
@@ -2024,7 +2017,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);
@@ -2095,12 +2088,9 @@ tdectest(char c)
 void
 tstrsequence(uchar c)
 {
-       strreset();
-
        switch (c) {
        case 0x90:   /* DCS -- Device Control String */
                c = 'P';
-               term.esc |= ESC_DCS;
                break;
        case 0x9f:   /* APC -- Application Program Command */
                c = '_';
@@ -2112,6 +2102,7 @@ tstrsequence(uchar c)
                c = ']';
                break;
        }
+       strreset();
        strescseq.type = c;
        term.esc |= ESC_STR;
 }
@@ -2154,6 +2145,7 @@ tcontrolcode(uchar ascii)
                return;
        case '\032': /* SUB */
                tsetchar('?', &term.c.attr, term.c.x, term.c.y);
+               /* FALLTHROUGH */
        case '\030': /* CAN */
                csireset();
                break;
@@ -2308,15 +2300,13 @@ tputc(Rune u)
        Glyph *gp;
 
        control = ISCONTROL(u);
-       if (!IS_SET(MODE_UTF8) && !IS_SET(MODE_SIXEL)) {
+       if (u < 127 || !IS_SET(MODE_UTF8)) {
                c[0] = u;
                width = len = 1;
        } else {
                len = utf8encode(u, c);
-               if (!control && (width = wcwidth(u)) == -1) {
-                       memcpy(c, "\357\277\275", 4); /* UTF_INVALID */
+               if (!control && (width = wcwidth(u)) == -1)
                        width = 1;
-               }
        }
 
        if (IS_SET(MODE_PRINT))
@@ -2331,23 +2321,11 @@ tputc(Rune u)
        if (term.esc & ESC_STR) {
                if (u == '\a' || u == 030 || u == 032 || u == 033 ||
                   ISCONTROLC1(u)) {
-                       term.esc &= ~(ESC_START|ESC_STR|ESC_DCS);
-                       if (IS_SET(MODE_SIXEL)) {
-                               /* TODO: render sixel */;
-                               term.mode &= ~MODE_SIXEL;
-                               return;
-                       }
+                       term.esc &= ~(ESC_START|ESC_STR);
                        term.esc |= ESC_STR_END;
                        goto check_control_code;
                }
 
-               if (IS_SET(MODE_SIXEL)) {
-                       /* TODO: implement sixel mode */
-                       return;
-               }
-               if (term.esc&ESC_DCS && strescseq.len == 0 && u == 'q')
-                       term.mode |= MODE_SIXEL;
-
                if (strescseq.len+len >= strescseq.siz) {
                        /*
                         * Here is a bug in terminals. If the user never sends
@@ -2384,6 +2362,8 @@ check_control_code:
                /*
                 * control codes are not shown ever
                 */
+               if (!term.esc)
+                       term.lastc = 0;
                return;
        } else if (term.esc & ESC_START) {
                if (term.esc & ESC_CSI) {
@@ -2414,7 +2394,7 @@ check_control_code:
                 */
                return;
        }
-       if (sel.ob.x != -1 && BETWEEN(term.c.y, sel.ob.y, sel.oe.y))
+       if (selected(term.c.x, term.c.y))
                selclear();
 
        gp = &term.line[term.c.y][term.c.x];
@@ -2433,6 +2413,7 @@ check_control_code:
        }
 
        tsetchar(u, &term.c.attr, term.c.x, term.c.y);
+       term.lastc = u;
 
        if (width == 2) {
                gp->mode |= ATTR_WIDE;
@@ -2456,7 +2437,7 @@ twrite(const char *buf, int buflen, int show_ctrl)
        int n;
 
        for (n = 0; n < buflen; n += charsize) {
-               if (IS_SET(MODE_UTF8) && !IS_SET(MODE_SIXEL)) {
+               if (IS_SET(MODE_UTF8)) {
                        /* process a complete utf8 char */
                        charsize = utf8decode(buf + n, &u, buflen - n);
                        if (charsize == 0)
@@ -2572,6 +2553,7 @@ void
 drawregion(int x1, int y1, int x2, int y2)
 {
        int y;
+
        for (y = y1; y < y2; y++) {
                if (!term.dirty[y])
                        continue;
@@ -2584,7 +2566,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;
@@ -2600,9 +2582,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