Fixing the return and keypad enter sent characters. Terminals produce \r. And

[st.git] / st.c

diff --git a/st.c b/st.c
index b8b2bbf..ba93f2f 100644 (file)
--- a/st.c
+++ b/st.c
@@ -2100,11 +2100,19 @@ tputc(char *c, int len) {
                sel.bx = -1;
        if(IS_SET(MODE_WRAP) && term.c.state & CURSOR_WRAPNEXT)
                tnewline(1); /* always go to first col */
                sel.bx = -1;
        if(IS_SET(MODE_WRAP) && term.c.state & CURSOR_WRAPNEXT)
                tnewline(1); /* always go to first col */

+
+       if(IS_SET(MODE_INSERT) && term.c.x+1 < term.col) {
+               memmove(&term.line[term.c.y][term.c.x+1],
+                       &term.line[term.c.y][term.c.x],
+                       (term.col - term.c.x - 1) * sizeof(Glyph));
+       }
+

        tsetchar(c, &term.c.attr, term.c.x, term.c.y);
        tsetchar(c, &term.c.attr, term.c.x, term.c.y);

-       if(term.c.x+1 < term.col)
+       if(term.c.x+1 < term.col) {

                tmoveto(term.c.x+1, term.c.y);
                tmoveto(term.c.x+1, term.c.y);

-       else
+       } else {

                term.c.state |= CURSOR_WRAPNEXT;
                term.c.state |= CURSOR_WRAPNEXT;

+       }

 }
 
 int
 }
 
 int