Fix selection: selclear in tputc

[st.git] / st.c

diff --git a/st.c b/st.c
index 0ce6ac2..8c42a9c 100644 (file)
--- a/st.c
+++ b/st.c
@@ -38,7 +38,7 @@
 
 /* macros */
 #define IS_SET(flag)           ((term.mode & (flag)) != 0)
 
 /* 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))
 #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));
                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
 }
 
 void


@@ -2023,7 +2023,7 @@ tdumpline(int n)
        bp = &term.line[n][0];
        end = &bp[MIN(tlinelen(n), term.col) - 1];
        if (bp != end || bp->u != ' ') {
        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);
                        tprinter(buf, utf8encode(bp->u, buf));
        }
        tprinter("\n", 1);


@@ -2153,6 +2153,7 @@ tcontrolcode(uchar ascii)
                return;
        case '\032': /* SUB */
                tsetchar('?', &term.c.attr, term.c.x, term.c.y);
                return;
        case '\032': /* SUB */
                tsetchar('?', &term.c.attr, term.c.x, term.c.y);

+               /* FALLTHROUGH */

        case '\030': /* CAN */
                csireset();
                break;
        case '\030': /* CAN */
                csireset();
                break;


@@ -2307,15 +2308,13 @@ tputc(Rune u)
        Glyph *gp;
 
        control = ISCONTROL(u);
        Glyph *gp;
 
        control = ISCONTROL(u);

-       if (!IS_SET(MODE_UTF8) && !IS_SET(MODE_SIXEL)) {
+       if (u < 127 || !IS_SET(MODE_UTF8 | MODE_SIXEL)) {

                c[0] = u;
                width = len = 1;
        } else {
                len = utf8encode(u, c);
                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;
                        width = 1;

-               }

        }
 
        if (IS_SET(MODE_PRINT))
        }
 
        if (IS_SET(MODE_PRINT))


@@ -2413,7 +2412,7 @@ check_control_code:
                 */
                return;
        }
                 */
                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];
                selclear();
 
        gp = &term.line[term.c.y][term.c.x];