X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=sympathy.git;a=blobdiff_plain;f=src%2Fvt102.c;h=a879999359a729720987ca7921296d094df93929;hp=292e15cf1ebfb51252ae51b692cb9e1964fa26f7;hb=95d068f1b4e8100d6501944eda3bd9ff73460514;hpb=0162da6f3043d60c28882b33f77c44afca226d46

diff --git a/src/vt102.c b/src/vt102.c
index 292e15c..a879999 100644
--- a/src/vt102.c
+++ b/src/vt102.c
@@ -10,6 +10,48 @@ static char rcsid[] = "$Id$";
 
 /*
  * $Log$
+ * Revision 1.45  2008/02/27 01:31:14  james
+ * *** empty log message ***
+ *
+ * Revision 1.44  2008/02/27 00:54:16  james
+ * *** empty log message ***
+ *
+ * Revision 1.43  2008/02/27 00:27:22  james
+ * *** empty log message ***
+ *
+ * Revision 1.42  2008/02/26 23:56:12  james
+ * *** empty log message ***
+ *
+ * Revision 1.41  2008/02/26 23:23:17  james
+ * *** empty log message ***
+ *
+ * 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 ***
+ *
  * Revision 1.31  2008/02/22 17:07:00  james
  * *** empty log message ***
  *
@@ -264,12 +306,42 @@ ESC+B
 #include "project.h"
 #include "syslog.h"
 
+#define TABLE_LENGTH 128
+#undef DEBUG
+
+
+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
@@ -279,33 +351,23 @@ 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)
+ctrl_chr (int ch, int term)
 {
-  switch (c)
-    {
-    case '(':
-    case ')':
-    case '+':
-    case '*':
-      return 1;
-    }
+  if ((term > 0) && (ch == term))
+    return 0;
+  if (ch == 033)
+    return 0;
+  if ((ch > 0) && (ch < 040))
+    return 1;
   return 0;
 }
 
-static inline int
-csi_starter (int c)
-{
-  switch (c)
-    {
-    case '[':
-      return 1;
-    }
-  return 0;
-}
 
 static inline int
 in_margins (VT102 * v, CRT_Pos p)
@@ -326,9 +388,9 @@ in_margins (VT102 * v, CRT_Pos p)
 void
 vt102_log_line (Context * c, int line)
 {
-  CRT_Pos e = { VT102_COLS - 1, line };
+  CRT_Pos e = { c->v->current_width - 1, line };
   CRT_Pos p = { 0, line };
-  char logbuf[VT102_COLS + 1];
+  char logbuf[4 * (VT102_MAX_COLS + 1)], *logptr = logbuf;
 
   if (!c->l)
     return;
@@ -345,11 +407,9 @@ vt102_log_line (Context * c, int line)
       int ch = c->v->crt.screen[CRT_ADDR_POS (&p)].chr;
       if (ch < 32)
         ch = ' ';
-      if (ch > 126)
-        ch = ' ';
-      logbuf[p.x] = ch;
+      logptr += utf8_encode (logptr, ch);
     }
-  logbuf[p.x] = 0;
+  *logptr = 0;
 
   c->l->log (c->l, logbuf);
 }
@@ -423,7 +483,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;
 }
 
@@ -477,16 +561,18 @@ 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--;
+    {
+      v->pos.x--;
+    }
 
   v->pending_wrap = 0;
 }
@@ -498,7 +584,7 @@ vt102_reset_tabs (VT102 * v)
 
   memset (v->tabs, 0, sizeof (v->tabs));
 
-  for (i = 0; i < VT102_COLS; i += 8)
+  for (i = 0; i < VT102_MAX_COLS; i += 8)
     {
       v->tabs[i]++;
     }
@@ -518,7 +604,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;
@@ -544,7 +630,7 @@ vt102_cursor_absolute (VT102 * v, int x, int y)
   if (v->private_modes[VT102_PRIVATE_MODE_ORIGIN_MODE])
     {
       v->pos.x = x + v->top_margin.x;
-      v->pos.y = y + v->top_margin.x;
+      v->pos.y = y + v->top_margin.y;
     }
   else
     {
@@ -599,9 +685,9 @@ vt102_insert_into_line (VT102 * v, CRT_Pos p)
                &v->crt.screen[CRT_ADDR_POS (&p)], sizeof (CRT_CA) * n);
     }
 
-  v->crt.screen[CRT_ADDR (p.y, v->bottom_margin.x)].chr = ' ';
-  v->crt.screen[CRT_ADDR (p.y, v->bottom_margin.x)].attr = CRT_ATTR_NORMAL;
-  v->crt.screen[CRT_ADDR (p.y, v->bottom_margin.x)].color = CRT_COLOR_NORMAL;
+  v->crt.screen[CRT_ADDR_POS (&p)].chr = ' ';
+  v->crt.screen[CRT_ADDR_POS (&p)].attr = CRT_ATTR_NORMAL;
+  v->crt.screen[CRT_ADDR_POS (&p)].color = CRT_COLOR_NORMAL;
 }
 
 
@@ -641,6 +727,23 @@ vt102_change_mode (VT102 * v, int private, char *ns, int set)
           break;
         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->current_width =
+            v->
+            private_modes[VT102_PRIVATE_MODE_132COLS] ? VT102_COLS_132 :
+            VT102_COLS_80;
+
+          v->crt.width = v->current_width;
+          v->screen_end.x = v->current_width - 1;
+          v->top_margin = v->screen_start;
+          v->bottom_margin = v->screen_end;
+          vt102_cursor_home (v);
+          crt_cls (&v->crt);
+
+
           break;
         }
 
@@ -881,77 +984,82 @@ vt102_restore_state (VT102 * v)
 }
 
 void
-vt102_regular_char (Context * c, VT102 * v, char ch)
+vt102_regular_char (Context * c, VT102 * v, uint32_t ch)
 {
 
+
   vt102_do_pending_wrap (c);
 
+
   if (v->modes[VT102_MODE_INSERT])
     vt102_insert_into_line (v, v->pos);
 
+  v->last_reg_char = ch;
+
+
+  if (ch < VT102_CHARSET_SIZE)
+    {
+      int cs;
+      if ((cs = vt102_charset_c0[ch]))
+        {
+          ch = cs;
+        }
+      else if ((cs = charset_from_csid[v->g[v->cs]][ch]))
+        {
+          ch = cs;
+        }
+    }
   v->crt.screen[CRT_ADDR_POS (&v->pos)].chr = ch;
   v->crt.screen[CRT_ADDR_POS (&v->pos)].attr = v->attr;
   v->crt.screen[CRT_ADDR_POS (&v->pos)].color = v->color;
   vt102_cursor_advance (c);
 
-  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)
+  int cs = VT102_CSID_US;
+
+
+  switch (s)
     {
-    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);
-        }
+    case 'A':
+      cs = VT102_CSID_UK;
       break;
-    case 'H':
-      v->tabs[v->pos.x]++;
+    case '1':
+    case '2':
+    case 'B':
+      cs = VT102_CSID_US;
       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);
-        }
+    case '0':
+      cs = VT102_CSID_GL;
       break;
-    case '7':
-      vt102_save_state (v);
-      break;
-    case '8':
-      vt102_restore_state (v);
-      break;
-    case '=':
-      v->application_keypad_mode = 1;
+    }
+
+  switch (g)
+    {
+    case '(':
+      v->g[0] = cs;
       break;
-    case '>':
-      v->application_keypad_mode = 0;
+    case ')':
+      v->g[1] = cs;
       break;
-    default:
-      log_f (c->l, "<%s:%d unhandled ESC: \\033 \\%03o (ESC %c)>", __FILE__,__LINE__,ch,safe_ch(ch));
-
-      ;
     }
+
 }
+
 void
 vt102_parse_csi (Context * c, char *buf, int len)
 {
@@ -1033,38 +1141,39 @@ 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;
         case 'K':
           {
             CRT_Pos ls = { 0, v->pos.y };
-            CRT_Pos le = { VT102_COLS - 1, v->pos.y };
+            CRT_Pos le = { v->current_width - 1, v->pos.y };
             if (len == 2)
               narg = 0;         /*Different default */
 
             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;
               }
           }
@@ -1075,7 +1184,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;
 
@@ -1086,7 +1196,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;
@@ -1094,35 +1205,35 @@ vt102_parse_csi (Context * c, char *buf, int len)
           while (narg--)
             vt102_delete_from_line (v, v->pos);
           break;
-        case 'R':
-          //FIXME: cursor position report - does anything use that?
-          break;
         case 'S':
           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);
@@ -1132,7 +1243,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, "\033[?2c");
           break;
         case 'd':
           vt102_cursor_absolute (v, v->pos.x, narg - 1);
@@ -1153,7 +1264,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':
@@ -1165,8 +1276,29 @@ 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
+          switch (buf[1])
+            {
+            case '5':
+              vt102_send_id (c, "\033[0n");
+              break;
+            case '6':
+              if (c->t)
+                {
+                  char buf[16];
+                  int i;
+                  i =
+                    sprintf (buf, "\033[%d;%dR", v->pos.y + 1, v->pos.x + 1);
+                  c->t->xmit (c->t, buf, i);
+                }
+              break;
+            default:
+              //?15n printer status
+              log_f (c->l, "<%s:%d unhandled DSR: \\033%s>", __FILE__,
+                     __LINE__, buf);
+            }
+          break;
+        case 'q':              //Load LED on off 
           break;
         case 'r':
           v->top_margin = v->screen_start;
@@ -1198,130 +1330,427 @@ vt102_parse_csi (Context * c, char *buf, int len)
           vt102_cursor_normalize (v);
           v->pending_wrap = 0;
           break;
+        case 'y':              //Invoke confidence test
+          break;
+        case 'z':              //request terminal parameters
+          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;
+
+#ifdef DEBUG
+  p->cmd_buf[p->cmd_ptr] = 0;
+  log_f (c->l, "<cmd in  x=%3d y=%2d aw=%d vt=%d <ESC>%s >", v->pos.x,
+         v->pos.y, v->pending_wrap,
+         !v->private_modes[VT102_PRIVATE_MODE_VT52], p->cmd_buf);
+#endif
+
+  if (!v->private_modes[VT102_PRIVATE_MODE_VT52])
+    {
+      int ate = 1;
+
+      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':
+          v->cs = 1;
+          v->g[1] = VT102_CSID_VT52;
+          break;
+        case 'G':
+          v->cs = 0;
+          v->g[0] = VT102_CSID_US;
+          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 = { v->current_width - 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/K");
+          break;
+        case '^':              //Autoprint on
+          break;
+        case '_':              //Autoprint off
+          break;
+        case '=':
+          v->application_keypad_mode = 1;
+          break;
+        case '>':
+          v->application_keypad_mode = 0;
+          break;
+        default:
+          ate = 0;
+        }
+      if (ate)
+        return;
+    }
+
+
+/*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;
+#ifdef DEBUG
+  log_f (c->l, "<cmd out x=%3d y=%2d aw=%d>", v->pos.x, v->pos.y,
+         v->pending_wrap);
+#endif
 }
 
 void
 vt102_status_line (VT102 * v, char *str)
 {
-  int i = VT102_COLS;
+  int i = v->current_width - 1;
   CRT_CA *ca = &v->crt.screen[CRT_ADDR (VT102_STATUS_ROW, 0)];
 
-  while (i--)
+  for (i = 0; i < v->current_width; ++i)
     {
       ca->attr = CRT_ATTR_REVERSE;
       ca->color = CRT_COLOR_NORMAL;
-      ca->chr = *str;
+      ca->chr = *str ? *str : ' ';
       if (*str)
         str++;
       ca++;
     }
 
+  for (; i < VT102_MAX_COLS; ++i)
+    {
+      ca->attr = CRT_ATTR_NORMAL;
+      ca->color = CRT_COLOR_NORMAL;
+      ca->chr = ' ';
+      ca++;
+    }
+
 }
 
 
+void
+vt102_parser_reset (VT102_parser * p)
+{
+  p->in_cmd = 0;
+  p->cmd_more_bytes = 0;
+  p->cmd_termination = 0;
+  p->in_escape = 0;
+}
+
+
+void
+vt102_reset_state (VT102 * v)
+{
+  vt102_parser_reset (&v->parser);
+
+  v->attr = CRT_ATTR_NORMAL;
+  v->color = CRT_COLOR_NORMAL;
+
+  v->application_keypad_mode = 0;
+
+  v->current_width = VT102_COLS_80;
+  v->crt.width = v->current_width;
+  v->screen_end.x = v->current_width - 1;
+
+  v->top_margin = v->screen_start;
+  v->bottom_margin = v->screen_end;
+
+  memset (v->modes, 0, VT102_NMODES);
+  memset (v->private_modes, 0, VT102_NMODES);
+
+  v->private_modes[VT102_PRIVATE_MODE_AUTO_WRAP] = 1;
+  v->private_modes[VT102_PRIVATE_MODE_AUTO_REPEAT] = 1;
+  v->private_modes[VT102_PRIVATE_MODE_SHOW_CURSOR] = 1;
+  v->private_modes[VT102_PRIVATE_MODE_VT52] = 1;
+  v->modes[VT102_MODE_LOCAL_ECHO_OFF] = 1;
+
+  vt102_reset_tabs (v);
+
+  v->g[0] = v->g[1] = VT102_CSID_US;
+  v->cs = 0;
+}
+
+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)
 {
   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>=0xc0) && (ch<0xe0)) /*Start of two byte unicode sequence*/
-  {
-	p->in_utf8=2;
-  } else if ((ch>=0xe0) && (ch<0xf0)) /*Start of three byte unicode sequence*/
-  {
-	p->in_utf8=3;
-  } else if ((ch>=0xf0) && (ch<0xf7)) /*Start of four byte unicode sequence*/
-	p->in_utf8=4;
-  }
+/* Turn anything non-ascii into '?' */
+#if 0
+  if ((ch != SYM_CHAR_RESET) && (ch != 0xb9) && (ch > 127))
+    {
+      ch = '?';
+    }
+#endif
 
-  if (p->utf_8) {
-	p->in_utf8--;
-	ch='?';
-  }  
 
-  if (p->utf_8) {
-	/*Not first or last byte in sequence*/
-  }else if (p->in_csi)
+#if 0
+  if (p->dca_ptr == 2)
     {
-      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;
-        }
+      p->in_dca = 0;
+    }
+#endif
+  if (ch == SYM_CHAR_RESET)
+    {
+      vt102_reset_state (v);
     }
-  else if (p->in_escape)
+  else if (p->in_cmd && !ctrl_chr (ch, p->cmd_termination))
     {
-      if (csi_starter (ch) || scs_starter (ch))
+      p->cmd_buf[p->cmd_ptr++] = ch;
+      if (p->cmd_ptr == VT102_CMD_LEN)
+        p->in_cmd = 0;
+      if (p->cmd_more_bytes)
         {
-          p->csi_ptr = 0;
-          p->csi_buf[p->csi_ptr++] = ch;
-          p->in_csi++;
-          p->in_escape = 0;
+          p->cmd_more_bytes--;
+
+
+          if (!p->cmd_more_bytes == 1)
+            p->in_cmd = 0;
         }
-      else
+
+      switch (p->cmd_termination)
         {
-          p->in_escape = 0;
-          vt102_parse_esc (c, ch);
+        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;
         }
+
+      if (!p->in_cmd)
+        {
+          vt102_parse_esc (c);
+          p->cmd_more_bytes = 0;
+          p->cmd_termination = 0;
+        }
+    }
+  else if (p->in_escape && !ctrl_chr (ch, 0))
+    {
+      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*/
+  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
     {
+#ifdef DEBUG
+      if (ch != 27)
+        log_f (c->l,
+               "<chr in  x=%3d y=%2d aw=%d  \\%03o %3d %c",
+               v->pos.x, v->pos.y, v->pending_wrap, ch, ch, safe_ch (ch));
+
+#endif
 
       switch (ch)
         {
+#if 0
          /*NUL*/ case 0:
          /*SOH*/ case 1:
          /*STX*/ case 2:
          /*ETX*/ case 3:
          /*EOT*/ case 4:
           break;
+#endif
          /*ENQ*/ case 5:
-	  if (c->t)
-          c->t->xmit (c->t, "vt102", 5);
+          vt102_send_id (c, terminal_id);
           break;
+#if 0
          /*ACK*/ case 6:
+          break;
+#endif
          /*BEL*/ case 7:
+          //FIXME beep
           break;
          /*BS*/ case 8:
-          vt102_cursor_retard (c->v);
+          vt102_cursor_retreat (c->v);
           break;
          /*HT*/ case 9:
           vt102_cursor_advance_tab (c->v);
@@ -1337,12 +1766,13 @@ vt102_parse_char (Context * c, int ch)
           break;
          /*SO*/ case 14:
           /*select G1 */
-          /*Ignoring charsets */
+          v->cs = 1;
           break;
          /*SI*/ case 15:
           /*select G0 */
-          /*Ignoring charsets */
+          v->cs = 0;
           break;
+#if 0
          /*DLE*/ case 16:
         /*DC1 */ case 17:
         /*DC2 */ case 18:
@@ -1355,18 +1785,27 @@ vt102_parse_char (Context * c, int ch)
          /*EM*/ case 25:
          /*SUB*/ case 26:
           break;
+#endif
          /*ESC*/ case 27:
           p->in_escape++;
           return;
+#if 0
          /*FS*/ case 28:
          /*GS*/ case 29:
          /*RS*/ case 30:
          /*US*/ case 31:
          /*DEL*/ case 127:
           break;
+#endif
         /*regular character */ default:
           vt102_regular_char (c, v, ch);
         }
+
+#ifdef DEBUG
+      if (ch != 27)
+        log_f (c->l, "<chr out x=%3d y=%2d aw=%d>", v->pos.x, v->pos.y,
+               v->pending_wrap);
+#endif
     }
 
   v->crt.pos = v->pos;
@@ -1383,22 +1822,6 @@ vt102_parse_char (Context * c, int ch)
     cmd_show_status (c->d, c);
 }
 
-vt102_parse (Context * c, char *buf, int len)
-{
-  while (len--)
-    vt102_parse_char (c, *(buf++));
-}
-
-
-void
-vt102_parser_reset (VT102_parser * p)
-{
-  p->in_csi = 0;
-  p->in_escape = 0;
-  p->csi_ptr = 0;
-}
-
-
 void
 vt102_send (Context * c, uint8_t key)
 {
@@ -1572,101 +1995,59 @@ vt102_reset (VT102 * v)
 {
   VT102_parser *p = &v->parser;
 
-  vt102_parser_reset (p);
-  crt_cls (&v->crt);
-
-  v->attr = CRT_ATTR_NORMAL;
-  v->color = CRT_COLOR_NORMAL;
-
-  v->application_keypad_mode = 0;
 
+  crt_cls (&v->crt);
   v->current_line = v->pos;
   v->pending_wrap = 0;
 
   v->screen_start.x = 0;
   v->screen_start.y = 0;
-  v->screen_end.x = VT102_COLS - 1;
+  v->current_width = VT102_COLS_80;
+  v->crt.width = v->current_width;
+  v->screen_end.x = v->current_width - 1;
   v->screen_end.y = VT102_ROWS - 1;
 
-  v->top_margin = v->screen_start;
-  v->bottom_margin = v->screen_end;
-
-  memset (v->modes, 0, VT102_NMODES);
-  memset (v->private_modes, 0, VT102_NMODES);
-
-  v->private_modes[VT102_PRIVATE_MODE_AUTO_WRAP] = 1;
-  v->private_modes[VT102_PRIVATE_MODE_AUTO_REPEAT] = 1;
-  v->private_modes[VT102_PRIVATE_MODE_SHOW_CURSOR] = 1;
-  v->modes[VT102_MODE_LOCAL_ECHO_OFF] = 1;
-
   vt102_cursor_home (v);
+  vt102_status_line (v, "");
+
   vt102_reset_tabs (v);
   v->current_line = v->pos;
 
-  vt102_save_state (v);
+  vt102_parser_reset (p);
+  vt102_reset_state (v);
 
-  vt102_status_line (v, "");
+  vt102_save_state (v);
 
   v->last_reg_char = ' ';
-
-
-}
-
-int
-vt102_dispatch (Context * c)
-{
-  char buf[1024];
-  int red;
-
-  red = c->t->recv (c->t, buf, sizeof (buf));
-
-  if (red < 0)
-    return -1;
-  if (!red)
-    return 0;
-
-
-  vt102_parse (c, buf, red);
-
-  return 0;
-}
-
-
-int
-vt102_dispatch_one (Context * c)
-{
-  char buf;
-  int red;
-
-  red = c->t->recv (c->t, &buf, sizeof (buf));
-
-  if (red < 0)
-    return -1;
-  if (!red)
-    return 0;
-
-  vt102_parse_char (c, buf);
-
-  return 0;
 }
 
 VT102 *
-vt102_new (void)
+vt102_new (int width)
 {
   VT102 *v;
 
   v = (VT102 *) malloc (sizeof (VT102));
-  v->xn_glitch=1;
+
+  v->xn_glitch = 1;
 
   vt102_reset (v);
 
+  if (width) {
+          v->current_width =width;
+          v->crt.width = v->current_width;
+          v->screen_end.x = v->current_width - 1;
+          v->top_margin = v->screen_start;
+          v->bottom_margin = v->screen_end;
+          vt102_cursor_home (v);
+  }
 
   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