X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fvt102.c;h=4778887fd6835fbfcefd66e9f7f5df69de409996;hb=3e2caf5802dc06dd38a2541d18d172995d0f276b;hp=d74437f25758299097efaa448b8adf6cff1cefa1;hpb=1774913685868a7ab501156a30f355a7372362ea;p=sympathy.git

diff --git a/src/vt102.c b/src/vt102.c
index d74437f..4778887 100644
--- a/src/vt102.c
+++ b/src/vt102.c
@@ -10,6 +10,30 @@ static char rcsid[] = "$Id$";
 
 /*
  * $Log$
+ * 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 ***
+ *
  * Revision 1.30  2008/02/22 14:51:54  james
  * *** empty log message ***
  *
@@ -261,12 +285,41 @@ ESC+B
 #include "project.h"
 #include "syslog.h"
 
+//static char terminal_reply[]={033,0133,077,066,0143};
+static char terminal_reply[] = { 'v', 't', '1', '0', '2' };
+
+#define TABLE_LENGTH 128
+
+/* 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
@@ -276,32 +329,16 @@ 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
@@ -416,11 +453,35 @@ vt102_cursor_advance_line (Context * c)
 
       vt102_history (c, v->top_margin, v->bottom_margin);
 
-      crt_scroll_up (&v->crt, v->top_margin, v->bottom_margin, 1);
+      crt_scroll_up (&v->crt, v->top_margin, v->bottom_margin, 1, v->color);
       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;
 }
 
@@ -473,14 +534,14 @@ vt102_cursor_advance (Context * c)
       return;
     }
   v->pending_wrap++;
-  if (c->v->xn_glitch)
-  	vt102_do_pending_wrap(c);
+  if (!c->v->xn_glitch)
+    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--;
@@ -515,7 +576,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;
@@ -878,7 +939,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);
@@ -901,17 +962,32 @@ vt102_scs (Context * c, int g, int s)
 }
 
 void
-vt102_parse_esc (Context * c, int ch)
+vt102_parse_esc (Context * c)
 {
   VT102 *v = c->v;
-  switch (ch)
-    {
+  VT102_parser *p=&v->parser;
+
+/*If you edit this switch don't forget to edit the length and termination tables*/
+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 '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);
+          crt_scroll_up (&v->crt, v->top_margin, v->bottom_margin, 1,
+                         v->color);
         }
       else
         {
@@ -921,16 +997,60 @@ vt102_parse_esc (Context * c, int ch)
     case 'H':
       v->tabs[v->pos.x]++;
       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 'M':
       if (v->pos.y == v->top_margin.y)
         {
-          crt_scroll_down (&v->crt, v->top_margin, v->bottom_margin, 1);
+          crt_scroll_down (&v->crt, v->top_margin, v->bottom_margin, 1,
+                           v->color);
         }
       else
         {
           vt102_cursor_relative (v, 0, -1);
         }
       break;
+
+    case 'Y': 
+      vt102_cursor_absolute (v, p->cmd_buf[2] - 040, p->cmd_buf[1] - 040);
+      break;
+    case 'Z':
+      if (c->t)
+        {
+          c->t->xmit (c->t, terminal_reply, sizeof (terminal_reply));
+        }
+      break;
+    case '#':
+	{
+	switch(p->cmd_buf[1]) {
+	case '8':/*DECALN*/
+	   {
+		int i;
+           crt_erase (&v->crt, v->screen_start, v->screen_end, 1, CRT_NORMAL_COLOR);
+			for (i=0;i<CRT_ADDR_POS(&v->screen_end);++i) 
+				v->crt.screen[i].chr='E';
+	   }
+	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;
@@ -943,8 +1063,22 @@ vt102_parse_esc (Context * c, int ch)
     case '>':
       v->application_keypad_mode = 0;
       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__,ch,safe_ch(ch));
+      log_f (c->l, "<%s:%d unhandled ESC: \\033 \\%03o (ESC %c)>", __FILE__,
+             __LINE__, p->cmd_buf[0], safe_ch (p->cmd_buf[0]));
 
       ;
     }
@@ -1030,18 +1164,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);
+              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);
+              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);
+              crt_erase (&v->crt, v->screen_start, v->screen_end, 1,
+                         v->color);
               break;
             }
           break;
@@ -1055,13 +1190,13 @@ vt102_parse_csi (Context * c, char *buf, int len)
             switch (narg)
               {
               case 0:
-                crt_erase (&v->crt, v->pos, le, 1);
+                crt_erase (&v->crt, v->pos, le, 1, v->color);
                 break;
               case 1:
-                crt_erase (&v->crt, ls, v->pos, 1);
+                crt_erase (&v->crt, ls, v->pos, 1, v->color);
                 break;
               case 2:
-                crt_erase (&v->crt, ls, le, 1);
+                crt_erase (&v->crt, ls, le, 1, v->color);
                 break;
               }
           }
@@ -1072,7 +1207,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);
+                crt_scroll_down (&v->crt, v->pos, v->bottom_margin, 1,
+                                 v->color);
             }
           break;
 
@@ -1083,7 +1219,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);
+                  crt_scroll_up (&v->crt, v->pos, v->bottom_margin, 1,
+                                 v->color);
                 }
             }
           break;
@@ -1098,28 +1235,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);
+              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);
+            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);
+            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);
@@ -1197,13 +1337,15 @@ vt102_parse_csi (Context * c, char *buf, int len)
           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);
       ;
     }
 
@@ -1230,6 +1372,62 @@ vt102_status_line (VT102 * v, char *str)
 }
 
 
+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->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_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)
 {
@@ -1237,43 +1435,72 @@ vt102_parse_char (Context * c, int ch)
   VT102_parser *p = &v->parser;
 
 #if 1
-  log_f (c->l, "char %3d %c pc %d %d     %2d %2d %d",ch,safe_ch(ch),
-           p->in_csi, p->in_escape, v->pos.x, v->pos.y,v->pending_wrap);
+  log_f (c->l, "char %3d %c   ie=%d ic=%d cmb=%d ct=%d    %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 (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))
+      ch = '?';
+    }
+#endif
+
+
+#if 0
+      if (p->dca_ptr == 2)
         {
-          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_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) {
+	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;
+	}
     }
   else if (p->in_escape)
     {
-      if (csi_starter (ch) || scs_starter (ch))
-        {
-          p->csi_ptr = 0;
-          p->csi_buf[p->csi_ptr++] = ch;
-          p->in_csi++;
-          p->in_escape = 0;
-        }
-      else
-        {
-          p->in_escape = 0;
-          vt102_parse_esc (c, ch);
-        }
+
+     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->cmd_ptr = 0;
+      p->cmd_buf[p->cmd_ptr++] = '[';
+
+      pre_parse_cmd(ch,p);
     }
   else
     {
@@ -1287,14 +1514,16 @@ vt102_parse_char (Context * c, int ch)
          /*EOT*/ case 4:
           break;
          /*ENQ*/ case 5:
-	  if (c->t)
-          c->t->xmit (c->t, "vt102", 5);
+          if (c->t)
+            {
+              c->t->xmit (c->t, "vt102", 5);
+            }
           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);
@@ -1356,22 +1585,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)
 {
@@ -1545,14 +1758,8 @@ 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;
 
@@ -1561,67 +1768,18 @@ vt102_reset (VT102 * v)
   v->screen_end.x = VT102_COLS - 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 = ' ';
-
-  v->xn_glitch=0;
-
-}
-
-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 *
@@ -1631,12 +1789,20 @@ vt102_new (void)
 
   v = (VT102 *) malloc (sizeof (VT102));
 
+  v->xn_glitch = 1;
+
   vt102_reset (v);
 
 
   return v;
 }
 
+void
+vt102_set_ansi (VT102 * v, int ansi)
+{
+  v->xn_glitch = ansi ? 0 : 1;
+}
+
 void
 vt102_free (VT102 * v)
 {