X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fvt102.c;h=b4fe38191ab41a67ca3ac3adf64d656b441176a4;hb=0d822ca97cdec8b451a088f22279857ab8806cef;hp=e136637afd7e9c6d653e8383b4c9c4a9ee5bba3a;hpb=cd3c335082e66f9a790a5bbb0f24a7ec49c9d3d5;p=sympathy.git

diff --git a/src/vt102.c b/src/vt102.c
index e136637..b4fe381 100644
--- a/src/vt102.c
+++ b/src/vt102.c
@@ -10,6 +10,30 @@ static char rcsid[] = "$Id$";
 
 /*
  * $Log$
+ * Revision 1.40  2008/02/26 19:00:59  james
+ * *** empty log message ***
+ *
+ * Revision 1.39  2008/02/26 16:54:06  james
+ * *** empty log message ***
+ *
+ * Revision 1.38  2008/02/26 16:53:24  james
+ * *** empty log message ***
+ *
+ * Revision 1.37  2008/02/24 12:22:53  james
+ * *** empty log message ***
+ *
+ * Revision 1.36  2008/02/24 12:22:42  james
+ * *** empty log message ***
+ *
+ * Revision 1.35  2008/02/24 00:42:53  james
+ * *** empty log message ***
+ *
+ * Revision 1.34  2008/02/23 11:48:37  james
+ * *** empty log message ***
+ *
+ * Revision 1.33  2008/02/22 23:39:27  james
+ * *** empty log message ***
+ *
  * Revision 1.32  2008/02/22 19:12:05  james
  * *** empty log message ***
  *
@@ -267,12 +291,42 @@ ESC+B
 #include "project.h"
 #include "syslog.h"
 
+//static char terminal_reply[]={033,0133,077,066,0143};
+
+#define TABLE_LENGTH 128
+
+static char terminal_id[]="vt102";
+
+/* number of aditional chars after \033 ... to complete the escape if it's fixed length*/
+int vt102_cmd_length[TABLE_LENGTH] = {
+  ['('] = 1,
+  [')'] = 1,
+  ['+'] = 1,
+  ['*'] = 1,
+  ['%'] = 1,
+  ['#'] = 1,
+  ['Y'] = 2,
+};
+
+/* method for determining end if if's not fixed length, -ve numbers from #defines, +ve are literals */
+#define CSI_ENDER -1
+int vt102_cmd_termination[TABLE_LENGTH] = {
+  [']'] = 7,
+  ['['] = CSI_ENDER,
+};
+
+
+
+
 
 static inline int
-safe_ch(int c) {
-if (c<32) return ' ';
-if (c>126) return ' ';
-return c;
+safe_ch (int c)
+{
+  if (c < 32)
+    return ' ';
+  if (c > 126)
+    return ' ';
+  return c;
 }
 
 static inline int
@@ -282,32 +336,17 @@ csi_ender (int c)
     return 1;
   if ((c >= 'A') && (c <= 'Z'))
     return 1;
+  if ((c == '@'))
+    return 1;
   return 0;
 }
 
-static inline int
-scs_starter (int c)
-{
-  switch (c)
-    {
-    case '(':
-    case ')':
-    case '+':
-    case '*':
-      return 1;
-    }
-  return 0;
-}
 
-static inline int
-csi_starter (int c)
+
+/*Stay or enter command acquision and exit after n more chars*/
+void
+redispatch_with_more (VT102_parser * p, int n)
 {
-  switch (c)
-    {
-    case '[':
-      return 1;
-    }
-  return 0;
 }
 
 static inline int
@@ -426,7 +465,31 @@ vt102_cursor_advance_line (Context * c)
       return;
     }
 
-  if (v->pos.y!=v->screen_end.y) v->pos.y++;
+  if (v->pos.y != v->screen_end.y)
+    v->pos.y++;
+  v->pending_wrap = 0;
+}
+
+
+void
+vt102_cursor_retreat_line (Context * c)
+{
+  VT102 *v = c->v;
+  int couldscroll = in_margins (v, v->pos);
+
+/*have wraped off end of last line in scrolling region */
+/* (|| not necessary, but shuts compiler up */
+  if (((v->pos.y == v->top_margin.y) || (v->pos.y == v->screen_start.y)) &&
+      (couldscroll))
+    {
+      vt102_log_line (c, v->pos.y);
+
+      crt_scroll_down (&v->crt, v->top_margin, v->bottom_margin, 1, v->color);
+      return;
+    }
+
+  if (v->pos.y != v->screen_start.y)
+    v->pos.y--;
   v->pending_wrap = 0;
 }
 
@@ -480,13 +543,13 @@ vt102_cursor_advance (Context * c)
     }
   v->pending_wrap++;
   if (!c->v->xn_glitch)
-  	vt102_do_pending_wrap(c);
+    vt102_do_pending_wrap (c);
 }
 
 
 
 void
-vt102_cursor_retard (VT102 * v)
+vt102_cursor_retreat (VT102 * v)
 {
   if (v->pos.x != v->top_margin.x)
     v->pos.x--;
@@ -521,7 +584,7 @@ vt102_cursor_advance_tab (VT102 * v)
 }
 
 void
-vt102_cursor_retard_tab (VT102 * v)
+vt102_cursor_retreat_tab (VT102 * v)
 {
   if (v->pos.x == v->top_margin.x)
     return;
@@ -645,6 +708,15 @@ vt102_change_mode (VT102 * v, int private, char *ns, int set)
         case VT102_PRIVATE_MODE_ORIGIN_MODE:
           vt102_cursor_home (v);
           break;
+	case VT102_PRIVATE_MODE_132COLS:
+  /* We don't implement 132 col mode - yet*/
+  v->top_margin = v->screen_start;
+  v->bottom_margin = v->screen_end;
+  vt102_cursor_home(v);
+  crt_cls (&v->crt);
+	
+
+	  break;
         }
 
     }
@@ -884,7 +956,7 @@ vt102_restore_state (VT102 * v)
 }
 
 void
-vt102_regular_char (Context * c, VT102 * v, char ch)
+vt102_regular_char (Context * c, VT102 * v, int ch)
 {
 
   vt102_do_pending_wrap (c);
@@ -900,61 +972,22 @@ vt102_regular_char (Context * c, VT102 * v, char ch)
   v->last_reg_char = ch;
 }
 
-void
-vt102_scs (Context * c, int g, int s)
+vt102_send_id(Context *c,char *buf)
 {
-/*Ignoring charsets*/
+	
+      if (c->t)
+        {
+	int l=strlen(buf);
+          c->t->xmit (c->t, buf,l);
+	}
 }
 
 void
-vt102_parse_esc (Context * c, int ch)
+vt102_scs (Context * c, int g, int s)
 {
-  VT102 *v = c->v;
-  switch (ch)
-    {
-    case 'E':
-      if (v->pos.y == v->bottom_margin.y)
-        {
-          vt102_log_line (c, v->pos.y);
-          vt102_history (c, v->top_margin, v->bottom_margin);
-          crt_scroll_up (&v->crt, v->top_margin, v->bottom_margin, 1,v->color);
-        }
-      else
-        {
-          vt102_cursor_relative (v, 0, 1);
-        }
-      break;
-    case 'H':
-      v->tabs[v->pos.x]++;
-      break;
-    case 'M':
-      if (v->pos.y == v->top_margin.y)
-        {
-          crt_scroll_down (&v->crt, v->top_margin, v->bottom_margin, 1,v->color);
-        }
-      else
-        {
-          vt102_cursor_relative (v, 0, -1);
-        }
-      break;
-    case '7':
-      vt102_save_state (v);
-      break;
-    case '8':
-      vt102_restore_state (v);
-      break;
-    case '=':
-      v->application_keypad_mode = 1;
-      break;
-    case '>':
-      v->application_keypad_mode = 0;
-      break;
-    default:
-      log_f (c->l, "<%s:%d unhandled ESC: \\033 \\%03o (ESC %c)>", __FILE__,__LINE__,ch,safe_ch(ch));
-
-      ;
-    }
+/*Ignoring charsets*/
 }
+
 void
 vt102_parse_csi (Context * c, char *buf, int len)
 {
@@ -1036,18 +1069,19 @@ vt102_parse_csi (Context * c, char *buf, int len)
             vt102_cursor_advance_tab (c->v);
           break;
         case 'J':
-            if (len == 2)
-              narg = 0;         /*Different default */
+          if (len == 2)
+            narg = 0;           /*Different default */
           switch (narg)
             {
             case 0:
-              crt_erase (&v->crt, v->pos, v->screen_end, 1,v->color);
+              crt_erase (&v->crt, v->pos, v->screen_end, 1, v->color);
               break;
             case 1:
-              crt_erase (&v->crt, v->screen_start, v->pos, 1,v->color);
+              crt_erase (&v->crt, v->screen_start, v->pos, 1, v->color);
               break;
             case 2:
-              crt_erase (&v->crt, v->screen_start, v->screen_end, 1,v->color);
+              crt_erase (&v->crt, v->screen_start, v->screen_end, 1,
+                         v->color);
               break;
             }
           break;
@@ -1061,13 +1095,13 @@ vt102_parse_csi (Context * c, char *buf, int len)
             switch (narg)
               {
               case 0:
-                crt_erase (&v->crt, v->pos, le, 1,v->color);
+                crt_erase (&v->crt, v->pos, le, 1, v->color);
                 break;
               case 1:
-                crt_erase (&v->crt, ls, v->pos, 1,v->color);
+                crt_erase (&v->crt, ls, v->pos, 1, v->color);
                 break;
               case 2:
-                crt_erase (&v->crt, ls, le, 1,v->color);
+                crt_erase (&v->crt, ls, le, 1, v->color);
                 break;
               }
           }
@@ -1078,7 +1112,8 @@ vt102_parse_csi (Context * c, char *buf, int len)
               && (v->pos.y <= v->bottom_margin.y))
             {
               while (narg--)
-                crt_scroll_down (&v->crt, v->pos, v->bottom_margin, 1,v->color);
+                crt_scroll_down (&v->crt, v->pos, v->bottom_margin, 1,
+                                 v->color);
             }
           break;
 
@@ -1089,7 +1124,8 @@ vt102_parse_csi (Context * c, char *buf, int len)
               while (narg--)
                 {
                   vt102_history (c, v->pos, v->bottom_margin);
-                  crt_scroll_up (&v->crt, v->pos, v->bottom_margin, 1,v->color);
+                  crt_scroll_up (&v->crt, v->pos, v->bottom_margin, 1,
+                                 v->color);
                 }
             }
           break;
@@ -1104,28 +1140,31 @@ vt102_parse_csi (Context * c, char *buf, int len)
           while (narg--)
             {
               vt102_history (c, v->top_margin, v->bottom_margin);
-              crt_scroll_up (&v->crt, v->top_margin, v->bottom_margin, 1,v->color);
+              crt_scroll_up (&v->crt, v->top_margin, v->bottom_margin, 1,
+                             v->color);
             }
           break;
         case 'T':
           while (narg--)
-            crt_scroll_down (&v->crt, v->top_margin, v->bottom_margin, 1,v->color);
+            crt_scroll_down (&v->crt, v->top_margin, v->bottom_margin, 1,
+                             v->color);
           break;
         case 'X':
           {
             CRT_Pos end = v->pos;
-	    if (!narg) narg++;
+            if (!narg)
+              narg++;
 
-            end.x += narg-1;
+            end.x += narg - 1;
             if (end.x > v->bottom_margin.x)
               end.x = v->bottom_margin.x;
 
-            crt_erase (&v->crt, v->pos, end, 1,v->color);
+            crt_erase (&v->crt, v->pos, end, 1, v->color);
           }
           break;
         case 'Z':
           while (narg--)
-            vt102_cursor_retard_tab (c->v);
+            vt102_cursor_retreat_tab (c->v);
           break;
         case '`':
           vt102_cursor_absolute (v, narg - 1, v->pos.y);
@@ -1135,7 +1174,7 @@ vt102_parse_csi (Context * c, char *buf, int len)
             vt102_regular_char (c, v, v->last_reg_char);
           break;
         case 'c':
-          //FIXME:
+	    vt102_send_id(c,terminal_id);
           break;
         case 'd':
           vt102_cursor_absolute (v, v->pos.x, narg - 1);
@@ -1156,7 +1195,7 @@ vt102_parse_csi (Context * c, char *buf, int len)
             }
           break;
 
-        case 'i':              //4,5 Turn printer on and off WTF?
+        case 'i':	//Printer commands
           //FIXME
           break;
         case 'h':
@@ -1168,9 +1207,13 @@ vt102_parse_csi (Context * c, char *buf, int len)
         case 'm':
           vt102_parse_attr_string (v, &buf[1], len - 1);
           break;
-        case 'n':              // 6 request cursor position
-          //FIXME 
+        case 'n':       //Device status report
+	//5 requestion status
+	// 6 request cursor position FIXME
+	//?15n printer status
           break;
+	case 'q': //Load LED on off 
+	break;
         case 'r':
           v->top_margin = v->screen_start;
           v->bottom_margin = v->screen_end;
@@ -1201,20 +1244,197 @@ vt102_parse_csi (Context * c, char *buf, int len)
           vt102_cursor_normalize (v);
           v->pending_wrap = 0;
           break;
+	case 'y': //Invoke confidence test
+	break;
 
         default:
-      log_f (c->l, "<%s:%d unhandled CSI: \\033%s>", __FILE__,__LINE__,buf);
+          log_f (c->l, "<%s:%d unhandled CSI: \\033%s>", __FILE__, __LINE__,
+                 buf);
 
           ;
         }
       break;
     default:
-      log_f (c->l, "<%s:%d unhandled sequence: \\033%s>", __FILE__,__LINE__,buf);
+      log_f (c->l, "<%s:%d unhandled sequence: \\033%s>", __FILE__,
+             __LINE__, buf);
       ;
     }
 
 
 
+}
+
+void
+vt102_parse_esc (Context * c)
+{
+  VT102 *v = c->v;
+  VT102_parser *p = &v->parser;
+
+#if 1
+p->cmd_buf[p->cmd_ptr]=0;
+log_f (c->l, "<cmd in  x=%d y=%d <ESC>%s >",v->pos.x,v->pos.y,p->cmd_buf);
+#endif
+
+#if 0 //VT52
+  switch (p->cmd_buf[0])
+    {
+    case 'A':
+      vt102_cursor_relative (v, 0, -1);
+      break;
+    case 'B':
+      vt102_cursor_relative (v, 0, 1);
+      break;
+    case 'C':
+      vt102_cursor_relative (v, 1, 0);
+      break;
+    case 'D':
+      vt102_cursor_relative (v, -1, 0);
+      break;
+    case 'F':
+	//Set graphics mode
+	break;
+	case 'G':
+	//Quit graphics mode
+	break;
+    case 'H':
+	vt102_cursor_absolute (v, 0, 0);
+	break;
+    case 'I':
+      vt102_cursor_retreat_line (c);
+      break;
+    case 'J':
+      crt_erase (&v->crt, v->pos, v->screen_end, 1, v->color);
+      break;
+    case 'K':
+      {
+        CRT_Pos le = { VT102_COLS - 1, v->pos.y };
+        crt_erase (&v->crt, v->pos, le, 1, v->color);
+      }
+      break;
+    case 'Y':
+      vt102_cursor_absolute (v, p->cmd_buf[2] - 040, p->cmd_buf[1] - 040);
+      break;
+case 'V': //Print current line
+	break;
+case 'W': //Printer on
+	break;
+case 'X': //printer off
+	break;
+case ']'://print screen
+	break;
+case 'Z'://ID
+	vt102_send_id(c,"\033/Z");
+	break;
+	}
+case '^': //Autoprint on
+	break;
+case '_'://Autoprint off
+	break;
+    case '=':
+      v->application_keypad_mode = 1;
+      break;
+    case '>':
+      v->application_keypad_mode = 0;
+      break;
+
+#endif
+
+/*If you edit this switch don't forget to edit the length and termination tables*/
+  switch (p->cmd_buf[0])
+    {
+	case 'D':
+	vt102_cursor_advance_line(c);
+	break;
+	
+    case 'E':
+	vt102_cursor_advance_line(c);
+	v->pos.x=v->top_margin.x;
+  	vt102_cursor_normalize (v);
+  	v->pending_wrap = 0;
+      break;
+    case 'H':
+      v->tabs[v->pos.x]++;
+      break;
+       case 'M':
+      vt102_cursor_retreat_line (c);
+      break;
+	case 'N': //select G2 for one char
+	break;
+	case 'O': //select G3 for one char
+	break;
+	case 'Z':
+	    vt102_send_id(c,terminal_id);
+	break;
+	case 'c':
+      vt102_reset(v);
+
+
+	break;
+    case '=':
+      v->application_keypad_mode = 1;
+      break;
+    case '>':
+      v->application_keypad_mode = 0;
+      break;
+
+    case '#':
+      switch (p->cmd_buf[1])
+        {
+	case '3': //top of double height line
+	case '4': //bottom of double height line
+	case '5': //single width line
+	case '6': //double width line
+	break;
+        case '8':
+           /*DECALN*/
+          {
+            int i;
+            crt_erase (&v->crt, v->screen_start, v->screen_end, 1,
+                       CRT_COLOR_NORMAL);
+            for (i = 0; i < CRT_ADDR_POS (&v->screen_end); ++i)
+              v->crt.screen[i].chr = 'E';
+          }
+	break;
+        default:
+
+          log_f (c->l,
+                 "<%s:%d unhandled ESC: \\033 \\043 \\%03o (ESC # %c)>",
+                 __FILE__, __LINE__, p->cmd_buf[1], safe_ch (p->cmd_buf[1]));
+
+        }
+      break;
+    case '<':
+      /*Set ansi mode - ignored */
+      break;
+
+    case '7':
+      vt102_save_state (v);
+      break;
+    case '8':
+      vt102_restore_state (v);
+      break;
+    case ']':                  /*Set various titles */
+      //FIXME:
+      break;
+    case '[':
+      vt102_parse_csi (c, p->cmd_buf, p->cmd_ptr);
+      break;
+    case '(':                  /*Charsets */
+    case ')':
+    case '+':
+    case '*':
+    case '%':
+      vt102_scs (c, p->cmd_buf[0], p->cmd_buf[1]);
+      break;
+    default:
+      log_f (c->l, "<%s:%d unhandled ESC: \\033 \\%03o (ESC %c)>", __FILE__,
+             __LINE__, p->cmd_buf[0], safe_ch (p->cmd_buf[0]));
+
+      ;
+    }
+
+p->cmd_buf[p->cmd_ptr]=0;
+log_f (c->l, "<cmd out x=%d y=%d>",v->pos.x,v->pos.y);
 }
 
 void
@@ -1239,15 +1459,17 @@ vt102_status_line (VT102 * v, char *str)
 void
 vt102_parser_reset (VT102_parser * p)
 {
-  p->in_csi = 0;
+  p->in_cmd = 0;
+  p->cmd_more_bytes = 0;
+  p->cmd_termination = 0;
   p->in_escape = 0;
 }
 
 
 void
-vt102_reset_state(VT102 *v)
+vt102_reset_state (VT102 * v)
 {
-  vt102_parser_reset(&v->parser);
+  vt102_parser_reset (&v->parser);
 
   v->attr = CRT_ATTR_NORMAL;
   v->color = CRT_COLOR_NORMAL;
@@ -1268,6 +1490,32 @@ vt102_reset_state(VT102 *v)
   vt102_reset_tabs (v);
 }
 
+static void
+pre_parse_cmd (int ch, VT102_parser * p)
+{
+  if (ch > TABLE_LENGTH)
+    return;
+  if (ch < 0)
+    return;
+
+  p->cmd_more_bytes = 0;
+  p->in_cmd = 0;
+
+  p->cmd_termination = vt102_cmd_termination[ch];
+  if (p->cmd_termination)
+    {
+      p->in_cmd++;
+      return;
+    }
+
+  p->cmd_more_bytes = vt102_cmd_length[ch];
+
+  if (p->cmd_more_bytes)
+    {
+      p->in_cmd++;
+      return;
+    }
+}
 
 void
 vt102_parse_char (Context * c, int ch)
@@ -1275,54 +1523,82 @@ vt102_parse_char (Context * c, int ch)
   VT102 *v = c->v;
   VT102_parser *p = &v->parser;
 
-#if 1
-  log_f (c->l, "char %3d %c pc %d %d %d     %2d %2d %d",ch,safe_ch(ch),
-           p->in_utf8,p->in_escape, p->in_csi, v->pos.x, v->pos.y,v->pending_wrap);
+#if 0
+  log_f (c->l, "char %3d %c   ie=%d ic=%d cmb=%d ct=%3d    %2d %2d %d", ch,
+         safe_ch (ch), p->in_escape, p->in_cmd, p->cmd_more_bytes,
+         p->cmd_termination, v->pos.x, v->pos.y, v->pending_wrap);
 #endif
 
-  if (ch==SYM_CHAR_RESET) {
-	vt102_reset_state(v);
-  } else if (p->in_csi)
+/* Turn anything non-ascii into '?' */
+#if 0
+  if ((ch != SYM_CHAR_RESET) && (ch != 0xb9) && (ch > 127))
     {
-      p->csi_buf[p->csi_ptr++] = ch;
-      if (csi_ender (ch) || (p->csi_ptr == VT102_CSI_LEN))
-        {
-          if (csi_starter (p->csi_buf[0]))
-            {
-              vt102_parse_csi (c, p->csi_buf, p->csi_ptr);
-            }
-          else if (scs_starter (p->csi_buf[0]))
-            {
-              vt102_scs (c, p->csi_buf[0], p->csi_buf[1]);
-            }
-          else
-            {
-      log_f (c->l, "<%s:%d no dispatcher for sequence starting \\033 \\%03o (ESC %c)>", __FILE__,__LINE__,p->csi_buf[0],safe_ch(p->csi_buf[0]));
-            }
-          p->in_csi = 0;
-        }
+      ch = '?';
     }
-  else if (p->in_escape)
+#endif
+
+
+#if 0
+  if (p->dca_ptr == 2)
+    {
+      p->in_dca = 0;
+    }
+#endif
+  if (ch == SYM_CHAR_RESET)
     {
-      if (csi_starter (ch) || scs_starter (ch))
+      vt102_reset_state (v);
+    }
+  else if (p->in_cmd)
+    {
+      p->cmd_buf[p->cmd_ptr++] = ch;
+      if (p->cmd_more_bytes) {
+        p->cmd_more_bytes--;
+
+
+      if (!p->cmd_more_bytes == 1)
+        p->in_cmd = 0;
+	}
+
+      switch (p->cmd_termination)
         {
-          p->csi_ptr = 0;
-          p->csi_buf[p->csi_ptr++] = ch;
-          p->in_csi++;
-          p->in_escape = 0;
+        case 0:
+          break;
+        default:
+          if (p->cmd_termination == ch)
+            p->in_cmd = 0;
+          break;
+        case CSI_ENDER:
+          if (csi_ender (ch))
+            p->in_cmd = 0;
+          break;
         }
-      else
+
+      if (!p->in_cmd)
         {
-          p->in_escape = 0;
-          vt102_parse_esc (c, ch);
+          vt102_parse_esc (c);
+          p->cmd_more_bytes = 0;
+          p->cmd_termination = 0;
         }
     }
-  else if (ch==0x9b) /*One byte CSI*/
+  else if (p->in_escape)
+    {
+
+      p->cmd_ptr = 0;
+      p->cmd_buf[p->cmd_ptr++] = ch;
+      p->in_escape = 0;
+
+      pre_parse_cmd (ch, p);
+
+      if (!p->in_cmd)
+        vt102_parse_esc (c);
+    }
+  else if (ch == 0x9b)          /*One byte CSI */
     {
-          p->csi_ptr = 0;
-	  p->csi_buf[p->csi_ptr++] = '[';
-          p->in_csi++;
-   }
+      p->cmd_ptr = 0;
+      p->cmd_buf[p->cmd_ptr++] = '[';
+
+      pre_parse_cmd (ch, p);
+    }
   else
     {
 
@@ -1335,14 +1611,13 @@ vt102_parse_char (Context * c, int ch)
          /*EOT*/ case 4:
           break;
          /*ENQ*/ case 5:
-	  if (c->t)
-          c->t->xmit (c->t, "vt102", 5);
+	    vt102_send_id(c,terminal_id);
           break;
          /*ACK*/ case 6:
          /*BEL*/ case 7:
           break;
          /*BS*/ case 8:
-          vt102_cursor_retard (c->v);
+          vt102_cursor_retreat (c->v);
           break;
          /*HT*/ case 9:
           vt102_cursor_advance_tab (c->v);
@@ -1386,6 +1661,11 @@ vt102_parse_char (Context * c, int ch)
          /*DEL*/ case 127:
           break;
         /*regular character */ default:
+#if 1
+  log_f (c->l, "char %3d %c   ie=%d ic=%d cmb=%d ct=%3d    %2d %2d %d", ch,
+         safe_ch (ch), p->in_escape, p->in_cmd, p->cmd_more_bytes,
+         p->cmd_termination, v->pos.x, v->pos.y, v->pending_wrap);
+#endif
           vt102_regular_char (c, v, ch);
         }
     }
@@ -1577,8 +1857,6 @@ vt102_reset (VT102 * v)
 {
   VT102_parser *p = &v->parser;
 
-  vt102_parser_reset (p);
-  vt102_reset_state(p);
 
   crt_cls (&v->crt);
   v->current_line = v->pos;
@@ -1595,10 +1873,14 @@ vt102_reset (VT102 * v)
   vt102_reset_tabs (v);
   v->current_line = v->pos;
 
+  vt102_parser_reset (p);
+  vt102_reset_state (v);
+
   vt102_save_state (v);
 
   v->last_reg_char = ' ';
 }
+
 VT102 *
 vt102_new (void)
 {
@@ -1606,7 +1888,7 @@ vt102_new (void)
 
   v = (VT102 *) malloc (sizeof (VT102));
 
-  v->xn_glitch=1;
+  v->xn_glitch = 1;
 
   vt102_reset (v);
 
@@ -1614,9 +1896,10 @@ vt102_new (void)
   return v;
 }
 
-void vt102_set_ansi(VT102 *v,int ansi)
+void
+vt102_set_ansi (VT102 * v, int ansi)
 {
-v->xn_glitch=ansi ? 0:1;
+  v->xn_glitch = ansi ? 0 : 1;
 }
 
 void