ignore STX characters

Author: daanx

src/attr.c

@@ -164,16 +164,8 @@ ic_private attr_t attr_from_sgr( const char* s, ssize_t len) {
 }
 
 ic_private attr_t attr_from_esc_sgr( const char* s, ssize_t len) {
-  if (len <= 2 || s[0] != '\x1B' || s[1] != '[') {
-    return attr_none();
-  }
-  else if (s[len-1] == 'm') {
-    return attr_from_sgr(s+2, len-2);
-  }
-  else if (s[len-2] == 'm' && s[len-1] == '\x02') { // allow STX ending as well  
-    return attr_from_sgr(s+2, len-3);
-  }
-  else return attr_none();  
+  if (len <= 2 || s[0] != '\x1B' || s[1] != '[' || s[len-1] != 'm') return attr_none();
+  return attr_from_sgr(s+2, len-2);
 }
 
 

src/stringbuf.c

@@ -171,7 +171,6 @@ ic_private bool skip_esc( const char* s, ssize_t len, ssize_t* esclen ) {
           (!finalCSI && c == '\x07') ||   // bell
           (c == '\x02'))                  // STX terminates as well
       {
-        if (finalCSI && len > n && s[n] == '\x02') { n++; } // include extra STX terminator that some programs insert after CSI
         if (esclen != NULL) *esclen = n;
         return true;
       }

src/term.c

@@ -478,7 +478,7 @@ static void term_append_buf( term_t* term, const char* s, ssize_t len ) {
     ssize_t ascii = 0;
     ssize_t next;
     while ((next = str_next_ofs(s, len, pos+ascii, NULL)) > 0 && 
-            s[pos + ascii] != '\x1B' && (uint8_t)s[pos + ascii] <= 0x7F ) 
+            (uint8_t)s[pos + ascii] > '\x1B' && (uint8_t)s[pos + ascii] <= 0x7F ) 
     {
       if (s[pos+ascii] == '\n') { newline = true; }
       ascii += next;      
@@ -497,6 +497,9 @@ static void term_append_buf( term_t* term, const char* s, ssize_t len ) {
     else if (next > 1 && s[pos] == '\x1B') {
       term_append_esc(term, s+pos, next);
     }
+    else if (s[pos] == '\x02') {
+      // ignore STX
+    }
     else {
       sbuf_append_n(term->buf, s+pos, next);
     }
@@ -726,9 +729,7 @@ static void term_write_esc( term_t* term, const char* s, ssize_t len ) {
   ssize_t col;
 
   if (s[1] == '[') {
-    char last = s[len-1];
-    if (last == '\x02'){ last = s[len-2]; }
-    switch (last) {
+    switch (s[len-1]) {
     case 'A':
       term_move_cursor(term, -1, 0, esc_param(s+2, 1));
       break;