A reset should reset the line drawing too.

[st.git] / st.c

diff --git a/st.c b/st.c
index d432ee7..009ccb4 100644 (file)
--- a/st.c
+++ b/st.c
@@ -278,7 +278,7 @@ static void tmoveto(int, int);
 static void tnew(int, int);
 static void tnewline(int);
 static void tputtab(bool);
-static void tputc(char*);
+static void tputc(char*, int);
 static void treset(void);
 static int tresize(int, int);
 static void tscrollup(int, int);
@@ -884,7 +884,7 @@ ttyread(void) {
        while(buflen >= UTF_SIZ || isfullutf8(ptr,buflen)) {
                charsize = utf8decode(ptr, &utf8c);
                utf8encode(&utf8c, s);
-               tputc(s);
+               tputc(s, charsize);
                ptr    += charsize;
                buflen -= charsize;
        }
@@ -953,7 +953,7 @@ treset(void) {
                term.tabs[i] = 1;
        term.top = 0, term.bot = term.row - 1;
        term.mode = MODE_WRAP;
-       xclear(0, 0, xw.w, xw.h);
+
        tclearregion(0, 0, term.col-1, term.row-1);
 }
 
@@ -1177,7 +1177,7 @@ tsetattr(int *attr, int l) {
                switch(attr[i]) {
                case 0:
                        term.c.attr.mode &= ~(ATTR_REVERSE | ATTR_UNDERLINE | ATTR_BOLD \
-                                       | ATTR_ITALIC | ATTR_BLINK);
+                                       | ATTR_ITALIC | ATTR_BLINK | ATTR_GFX);
                        term.c.attr.fg = DefaultFG;
                        term.c.attr.bg = DefaultBG;
                        break;
@@ -1280,7 +1280,8 @@ tsetmode(bool priv, bool set, int *args, int narg) {
        for(lim = args + narg; args < lim; ++args) {
                if(priv) {
                        switch(*args) {
-                       case 1:
+                               break;
+                       case 1: /* DECCKM -- Cursor key */
                                MODBIT(term.mode, set, MODE_APPKEYPAD);
                                break;
                        case 5: /* DECSCNM -- Reverve video */
@@ -1289,9 +1290,14 @@ tsetmode(bool priv, bool set, int *args, int narg) {
                                if(mode != term.mode)
                                        redraw();
                                break;
-                       case 7:
+                       case 6: /* XXX: DECOM -- Origin */
+                               break;
+                       case 7: /* DECAWM -- Auto wrap */
                                MODBIT(term.mode, set, MODE_WRAP);
                                break;
+                       case 8: /* XXX: DECARM -- Auto repeat */
+                               break;
+                       case 0:  /* Error (IGNORED) */
                        case 12: /* att610 -- Start blinking cursor (IGNORED) */
                                break;
                        case 25:
@@ -1319,6 +1325,12 @@ tsetmode(bool priv, bool set, int *args, int narg) {
                                tcursor((set) ? CURSOR_SAVE : CURSOR_LOAD);
                                break;
                        default:
+                       /* case 2:  DECANM -- ANSI/VT52 (NOT SUPPOURTED) */
+                       /* case 3:  DECCOLM -- Column  (NOT SUPPORTED) */
+                       /* case 4:  DECSCLM -- Scroll (NOT SUPPORTED) */
+                       /* case 18: DECPFF -- Printer feed (NOT SUPPORTED) */
+                       /* case 19: DECPEX -- Printer extent (NOT SUPPORTED) */
+                       /* case 42: DECNRCM -- National characters (NOT SUPPORTED) */
                                fprintf(stderr,
                                        "erresc: unknown private set/reset mode %d\n",
                                        *args);
@@ -1326,13 +1338,17 @@ tsetmode(bool priv, bool set, int *args, int narg) {
                        }
                } else {
                        switch(*args) {
-                       case 2:
+                       case 0:  /* Error (IGNORED) */
+                               break;
+                       case 2:  /* KAM -- keyboard action */
                                MODBIT(term.mode, set, MODE_KBDLOCK);
                                break;
-                       case 4:
+                       case 4:  /* IRM -- Insertion-replacement */
                                MODBIT(term.mode, set, MODE_INSERT);
                                break;
-                       case 20:
+                       case 12: /* XXX: SRM -- Send/Receive */
+                               break;
+                       case 20: /* LNM -- Linefeed/new line */
                                MODBIT(term.mode, set, MODE_CRLF);
                                break;
                        default:
@@ -1625,11 +1641,11 @@ tputtab(bool forward) {
 }
 
 void
-tputc(char *c) {
+tputc(char *c, int len) {
        char ascii = *c;
 
        if(iofd != -1)
-               write(iofd, c, 1);
+               write(iofd, c, len);
 
        if(term.esc & ESC_START) {
                if(term.esc & ESC_CSI) {
@@ -1684,6 +1700,7 @@ tputc(char *c) {
                                strescseq.type = ascii;
                                term.esc |= ESC_STR;
                                break;
+                       case ')':
                        case '(':
                                term.esc |= ESC_ALTCHARSET;
                                break;
@@ -1712,6 +1729,7 @@ tputc(char *c) {
                        case 'c': /* RIS -- Reset to inital state */
                                treset();
                                term.esc = 0;
+                               xclear(0, 0, xw.w, xw.h);
                                xresettitle();
                                break;
                        case '=': /* DECPAM -- Application keypad */
@@ -2440,9 +2458,9 @@ main(int argc, char *argv[]) {
 
  run:
        setlocale(LC_CTYPE, "");
-       xinit();
        tnew(80, 24);
        ttynew();
+       xinit();
        selinit();
        run();
        return 0;