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

diff --git a/src/vt102.c b/src/vt102.c
index 9b316ce..4778887 100644
--- a/src/vt102.c
+++ b/src/vt102.c
@@ -10,6 +10,18 @@ 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 ***
  *
@@ -273,6 +285,32 @@ 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)
@@ -291,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
@@ -441,6 +463,29 @@ vt102_cursor_advance_line (Context * c)
 }
 
 
+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;
+}
+
+
 void
 vt102_do_pending_wrap (Context * c)
 {
@@ -496,7 +541,7 @@ vt102_cursor_advance (Context * c)
 
 
 void
-vt102_cursor_retard (VT102 * v)
+vt102_cursor_retreat (VT102 * v)
 {
   if (v->pos.x != v->top_margin.x)
     v->pos.x--;
@@ -531,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;
@@ -894,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);
@@ -917,11 +962,25 @@ 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)
         {
@@ -938,6 +997,18 @@ 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)
         {
@@ -949,6 +1020,37 @@ vt102_parse_esc (Context * c, int ch)
           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;
@@ -961,12 +1063,22 @@ vt102_parse_esc (Context * c, int ch)
     case '>':
       v->application_keypad_mode = 0;
       break;
-    case ']':
-      v->parser.ignore_until_bell++;
+    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));
+             __LINE__, p->cmd_buf[0], safe_ch (p->cmd_buf[0]));
 
       ;
     }
@@ -1147,7 +1259,7 @@ vt102_parse_csi (Context * c, char *buf, int len)
           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);
@@ -1263,9 +1375,10 @@ 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;
-  p->ignore_until_bell = 0;
 }
 
 
@@ -1293,6 +1406,27 @@ 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)
@@ -1300,71 +1434,73 @@ vt102_parse_char (Context * c, int ch)
   VT102 *v = c->v;
   VT102_parser *p = &v->parser;
 
-#if 0
-  log_f (c->l, "char %3d %c pc %d %d %d     %2d %2d %d", ch, safe_ch (ch),
-         p->ignore_until_bell, p->in_escape, p->in_csi, v->pos.x, v->pos.y,
+#if 1
+  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
 
 /* Turn anything non-ascii into '?' */
+#if 0
   if ((ch != SYM_CHAR_RESET) && (ch != 0xb9) && (ch > 127))
     {
       ch = '?';
     }
+#endif
 
 
+#if 0
+      if (p->dca_ptr == 2)
+        {
+          p->in_dca = 0;
+        }
+#endif
   if (ch == SYM_CHAR_RESET)
     {
       vt102_reset_state (v);
     }
-  if (p->ignore_until_bell)
-    {
-      if (ch == 7)
-        p->ignore_until_bell = 0;
-    }
-  else if (p->in_csi)
+  else if (p->in_cmd)
     {
-      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->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->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
     {
@@ -1379,13 +1515,15 @@ vt102_parse_char (Context * c, int ch)
           break;
          /*ENQ*/ case 5:
           if (c->t)
-            c->t->xmit (c->t, "vt102", 5);
+            {
+              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);