Xinqi Bao's Git

projects / st.git / blobdiff
summary | log | commit | diff | tree
raw | inline | side by side
Fix Identification sequences
[st.git] / st.c
diff --git a/st.c b/st.c
index aa5f085..8c8efaf 100644 (file)
--- a/st.c
+++ b/st.c
@@ -72,6 +72,8 @@
 #define X2COL(x) (((x) - BORDER)/xw.cw)
 #define Y2ROW(y) (((y) - BORDER)/xw.ch)
 
 #define X2COL(x) (((x) - BORDER)/xw.cw)
 #define Y2ROW(y) (((y) - BORDER)/xw.ch)
 
+#define VT102ID "\033[?6c"
+
 enum glyph_attribute {
        ATTR_NULL      = 0,
        ATTR_REVERSE   = 1,
 enum glyph_attribute {
        ATTR_NULL      = 0,
        ATTR_REVERSE   = 1,
@@ -1510,6 +1512,10 @@ csihandle(void) {
                DEFAULT(csiescseq.arg[0], 1);
                tmoveto(term.c.x, term.c.y+csiescseq.arg[0]);
                break;
                DEFAULT(csiescseq.arg[0], 1);
                tmoveto(term.c.x, term.c.y+csiescseq.arg[0]);
                break;
+       case 'c': /* DA -- Device Attributes */
+               if(csiescseq.arg[0] == 0)
+                       ttywrite(VT102ID, sizeof(VT102ID) - 1);
+               break;
        case 'C': /* CUF -- Cursor <n> Forward */
        case 'a':
                DEFAULT(csiescseq.arg[0], 1);
        case 'C': /* CUF -- Cursor <n> Forward */
        case 'a':
                DEFAULT(csiescseq.arg[0], 1);
@@ -1784,50 +1790,80 @@ tputtab(bool forward) {
 void
 tputc(char *c, int len) {
        uchar ascii = *c;
 void
 tputc(char *c, int len) {
        uchar ascii = *c;
+       bool control = ascii < '\x20' || ascii == 0177;
 
        if(iofd != -1)
                write(iofd, c, len);
 
        if(iofd != -1)
                write(iofd, c, len);
-
-       switch(ascii) {
-       case '\t':      /* HT */
-               tputtab(1);
-               return;
-       case '\b':      /* BS */
-               tmoveto(term.c.x-1, term.c.y);
-               return;
-       case '\r':      /* CR */
-               tmoveto(0, term.c.y);
-               return;
-       case '\f':      /* LF */
-       case '\v':      /* VT */
-       case '\n':      /* LF */
-               /* go to first col if the mode is set */
-               tnewline(IS_SET(MODE_CRLF));
-               return;
-       case '\a':      /* BEL */
-               if(term.esc & ESC_STR)
+       /*
+        * STR sequences must be checked before of anything
+        * because it can use some control codes as part of the sequence
+        */
+       if(term.esc & ESC_STR) {
+               switch(ascii) {
+               case '\033':
+                       term.esc = ESC_START | ESC_STR_END;
                        break;
                        break;
-               if(!(xw.state & WIN_FOCUSED))
-                       xseturgency(1);
-               return;
-       case '\033':    /* ESC */
-               csireset();
-               term.esc = ESC_START;
+               case '\a': /* backwards compatibility to xterm */
+                       term.esc = 0;
+                       strhandle();
+                       break;
+               default:
+                       strescseq.buf[strescseq.len++] = ascii;
+                       if(strescseq.len+1 >= STR_BUF_SIZ) {
+                               term.esc = 0;
+                               strhandle();
+                       }
+               }
                return;
                return;
-       case '\016':    /* XXX: SO */
-       case '\017':    /* XXX: SI */
-       case '\032':    /* XXX: SUB */
-       case '\030':    /* XXX: CAN */
-       default:
-       /* case '\005': ENQ (IGNORED) */
-       /* case '\000': NUL (IGNORED) */
-       /* case '\021': XON (IGNORED) */
-       /* case '\023': XOFF (IGNORED) */
-       /* case 0177:   DEL (IGNORED) */
-               break;
        }
        }
-
-       if(term.esc & ESC_START) {
+       /*
+        * Actions of control codes must be performed as soon they arrive
+        * because they can be embedded inside a control sequence, and
+        * they must not cause conflicts with sequences.
+        */
+       if(control) {
+               switch(ascii) {
+               case '\t':      /* HT */
+                       tputtab(1);
+                       return;
+               case '\b':      /* BS */
+                       tmoveto(term.c.x-1, term.c.y);
+                       return;
+               case '\r':      /* CR */
+                       tmoveto(0, term.c.y);
+                       return;
+               case '\f':      /* LF */
+               case '\v':      /* VT */
+               case '\n':      /* LF */
+                       /* go to first col if the mode is set */
+                       tnewline(IS_SET(MODE_CRLF));
+                       return;
+               case '\a':      /* BEL */
+                       if(!(xw.state & WIN_FOCUSED))
+                               xseturgency(1);
+                       return;
+               case '\033':    /* ESC */
+                       csireset();
+                       term.esc = ESC_START;
+                       return;
+               case '\016':    /* SO */
+                       term.c.attr.mode |= ATTR_GFX;
+                       return;
+               case '\017':    /* SI */
+                       term.c.attr.mode &= ~ATTR_GFX;
+                       return;
+               case '\032':    /* SUB */
+               case '\030':    /* CAN */
+                       csireset();
+                       return;
+                case '\005':   /* ENQ (IGNORED) */
+                case '\000':   /* NUL (IGNORED) */
+                case '\021':   /* XON (IGNORED) */
+                case '\023':   /* XOFF (IGNORED) */
+                case 0177:     /* DEL (IGNORED) */
+                       return;
+               }
+       } else if(term.esc & ESC_START) {
                if(term.esc & ESC_CSI) {
                        csiescseq.buf[csiescseq.len++] = ascii;
                        if(BETWEEN(ascii, 0x40, 0x7E)
                if(term.esc & ESC_CSI) {
                        csiescseq.buf[csiescseq.len++] = ascii;
                        if(BETWEEN(ascii, 0x40, 0x7E)
@@ -1835,22 +1871,6 @@ tputc(char *c, int len) {
                                term.esc = 0;
                                csiparse(), csihandle();
                        }
                                term.esc = 0;
                                csiparse(), csihandle();
                        }
-               } else if(term.esc & ESC_STR) {
-                       switch(ascii) {
-                       case '\033':
-                               term.esc = ESC_START | ESC_STR_END;
-                               break;
-                       case '\a': /* backwards compatibility to xterm */
-                               term.esc = 0;
-                               strhandle();
-                               break;
-                       default:
-                               strescseq.buf[strescseq.len++] = ascii;
-                               if(strescseq.len+1 >= STR_BUF_SIZ) {
-                                       term.esc = 0;
-                                       strhandle();
-                               }
-                       }
                } else if(term.esc & ESC_STR_END) {
                        term.esc = 0;
                        if(ascii == '\\')
                } else if(term.esc & ESC_STR_END) {
                        term.esc = 0;
                        if(ascii == '\\')
@@ -1919,6 +1939,10 @@ tputc(char *c, int len) {
                                }
                                term.esc = 0;
                                break;
                                }
                                term.esc = 0;
                                break;
+                       case 'Z': /* DECID -- Identify Terminal */
+                               ttywrite(VT102ID, sizeof(VT102ID) - 1);
+                               term.esc = 0;
+                               break;
                        case 'c': /* RIS -- Reset to inital state */
                                treset();
                                term.esc = 0;
                        case 'c': /* RIS -- Reset to inital state */
                                treset();
                                term.esc = 0;
@@ -1949,20 +1973,26 @@ tputc(char *c, int len) {
                                term.esc = 0;
                        }
                }
                                term.esc = 0;
                        }
                }
-       } else {
-               if(sel.bx != -1 && BETWEEN(term.c.y, sel.by, sel.ey))
-                       sel.bx = -1;
-               if(ascii >= '\020' || term.c.attr.mode & ATTR_GFX) {
-                       if(IS_SET(MODE_WRAP) && term.c.state & CURSOR_WRAPNEXT)
-                               tnewline(1); /* always go to first col */
-                       tsetchar(c);
-                       if(term.c.x+1 < term.col) {
-                               tmoveto(term.c.x+1, term.c.y);
-                       } else {
-                               term.c.state |= CURSOR_WRAPNEXT;
-                       }
-               }
+               /*
+                * All characters which forms part of a sequence are not
+                * printed
+                */
+               return;
        }
        }
+       /*
+        * Display control codes only if we are in graphic mode
+        */
+       if(control && !(term.c.attr.mode & ATTR_GFX))
+               return;
+       if(sel.bx != -1 && BETWEEN(term.c.y, sel.by, sel.ey))
+               sel.bx = -1;
+       if(IS_SET(MODE_WRAP) && term.c.state & CURSOR_WRAPNEXT)
+               tnewline(1); /* always go to first col */
+       tsetchar(c);
+       if(term.c.x+1 < term.col)
+               tmoveto(term.c.x+1, term.c.y);
+       else
+               term.c.state |= CURSOR_WRAPNEXT;
 }
 
 int
 }
 
 int
@@ -2290,7 +2320,7 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
                 * Those ranges will not be brightened:
                 *      8 - 15 – bright system colors
                 *      196 - 231 – highest 256 color cube
                 * Those ranges will not be brightened:
                 *      8 - 15 – bright system colors
                 *      196 - 231 – highest 256 color cube
-                *      252 - 255 – brightest colors in grescale
+                *      252 - 255 – brightest colors in greyscale
                 */
                font = &dc.bfont;
        }
                 */
                font = &dc.bfont;
        }
@@ -2335,7 +2365,7 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
        }
        if(x + charlen >= term.col-1) {
                xclear(winx + width, (y == 0)? 0 : winy, xw.w,
        }
        if(x + charlen >= term.col-1) {
                xclear(winx + width, (y == 0)? 0 : winy, xw.w,
-                       winy + xw.ch + (y == term.row-1)? xw.h : 0);
+                       (y == term.row-1)? xw.h : (winy + xw.ch));
        }
        if(y == 0)
                xclear(winx, 0, winx + width, BORDER);
        }
        if(y == 0)
                xclear(winx, 0, winx + width, BORDER);