X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fvt102.c;h=35719cadc3e582540945776423b106658485c265;hb=9df8b9cc93fa29a848634af76e71fce6ddda67f0;hp=84b544af0e5ebd428e00d0a587311f365dfab859;hpb=44d6921df2f77ffedfe383f3819b4c0165197c4f;p=sympathy.git

diff --git a/src/vt102.c b/src/vt102.c
index 84b544a..35719ca 100644
--- a/src/vt102.c
+++ b/src/vt102.c
@@ -10,6 +10,33 @@ static char rcsid[] = "$Id$";
 
 /*
  * $Log$
+ * Revision 1.18  2008/02/07 01:59:25  james
+ * *** empty log message ***
+ *
+ * Revision 1.17  2008/02/07 01:58:28  james
+ * *** empty log message ***
+ *
+ * Revision 1.16  2008/02/07 01:57:46  james
+ * *** empty log message ***
+ *
+ * Revision 1.15  2008/02/07 00:43:27  james
+ * *** empty log message ***
+ *
+ * Revision 1.14  2008/02/07 00:40:23  james
+ * *** empty log message ***
+ *
+ * Revision 1.13  2008/02/07 00:39:59  james
+ * *** empty log message ***
+ *
+ * Revision 1.12  2008/02/07 00:39:13  james
+ * *** empty log message ***
+ *
+ * Revision 1.11  2008/02/06 20:26:58  james
+ * *** empty log message ***
+ *
+ * Revision 1.10  2008/02/06 17:53:28  james
+ * *** empty log message ***
+ *
  * Revision 1.9  2008/02/06 15:53:22  james
  * *** empty log message ***
  *
@@ -132,11 +159,6 @@ ESC)0
 
 CTRL-O
 
-ESC7
-ESC8
-ESCH
-ESCM
-ESC> 
 
 */
 
@@ -155,11 +177,10 @@ csi_ender (int c)
 }
 
 static inline int
-csi_starter (int c)
+scs_starter (int c)
 {
   switch (c)
     {
-    case '[':
     case '(':
     case ')':
       return 1;
@@ -167,6 +188,17 @@ csi_starter (int c)
   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)
 {
@@ -186,9 +218,17 @@ in_margins (VT102 * v, CRT_Pos p)
 void
 vt102_log_line (VT102 * v, int line)
 {
+  static FILE *log;
   CRT_Pos e = { VT102_COLS - 1, line };
   CRT_Pos p = { 0, line };
 
+  if (!log)
+    log = fopen ("log", "a+");
+
+  if (!log)
+    return;
+
+
   for (; e.x > 0; --e.x)
     {
       if (v->crt.screen[CRT_ADDR_POS (&e)].chr != ' ')
@@ -202,9 +242,9 @@ vt102_log_line (VT102 * v, int line)
         c = ' ';
       if (c > 126)
         c = ' ';
-      fputc (c, stderr);
+      fputc (c, log);
     }
-  fputc ('\n', stderr);
+  fputc ('\n', log);
 }
 
 void
@@ -355,6 +395,7 @@ vt102_cursor_home (VT102 * v)
   v->pos = v->top_margin;
   vt102_cursor_normalize (v);
   v->pending_wrap = 0;
+
 }
 
 vt102_cursor_absolute (VT102 * v, int x, int y)
@@ -448,6 +489,14 @@ vt102_change_mode (VT102 * v, int private, char *ns, int set)
       v->private_modes[m] = set;
       switch (m)
         {
+        case VT102_PRIVATE_MODE_CURSOR_MODE:
+          if (v->application_keypad_mode)
+            v->private_modes[m] = 0;
+#if 0
+          fprintf (stderr, "APPLICATION CURSOR MODE %d wanted %d\n",
+                   v->private_modes[m],set);
+#endif
+          break;
         case VT102_PRIVATE_MODE_ORIGIN_MODE:
           vt102_cursor_home (v);
           break;
@@ -534,6 +583,7 @@ vt102_change_attr (VT102 * v, char *na)
     case 1:
       v->attr |= CRT_ATTR_BOLD;
       break;
+    case 21:
     case 22:
       v->attr &= ~CRT_ATTR_BOLD;
       break;
@@ -556,7 +606,10 @@ vt102_change_attr (VT102 * v, char *na)
       v->attr &= ~CRT_ATTR_REVERSE;
       break;
     default:
+      ;
+#if 0
       fprintf (stderr, "unhandled SGR %d\n", a);
+#endif
     }
 
 }
@@ -602,24 +655,75 @@ vt102_parse_attr_string (VT102 * v, char *buf, int len)
 }
 
 void
-vt102_parse_esc (VT102 * v, int c)
+vt102_save_state (VT102 * v)
+{
+  v->saved.pos = v->pos;
+  v->saved.attr = v->attr;
+  v->saved.origin_mode = v->private_modes[VT102_PRIVATE_MODE_ORIGIN_MODE];
+}
+
+void
+vt102_restore_state (VT102 * v)
+{
+  v->pos = v->saved.pos;
+  v->attr = v->saved.attr;
+  v->private_modes[VT102_PRIVATE_MODE_ORIGIN_MODE] = v->saved.origin_mode;
+  vt102_cursor_normalize (v);
+  v->pending_wrap = 0;
+}
+
+void vt102_scs(VT102 *c,int g,int s)
 {
+/*Ignoring charsets*/
+}
 
+void
+vt102_parse_esc (VT102 * v, int c)
+{
   switch (c)
     {
-#if 0
+    case 'E':
+      if (v->pos.y == v->bottom_margin.y)
+        {
+          vt102_log_line (v, v->pos.y);
+          crt_scroll_up (&v->crt, v->top_margin, v->bottom_margin, 1);
+        }
+      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);
+        }
+      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 '>':
-      {
-        char s[] = { 033, c };
-/*Horrid hack for the moment in testing change the key mode of the upstream te*/
-        write (1, s, 2);
-      }
+      v->application_keypad_mode = 0;
       break;
-#endif
     default:
+#if 0
       fprintf (stderr, "unhandled ESC \\033 \\%03o (ESC %c)\n", c,
                (c < 32) ? '?' : c);
+#endif
+      ;
     }
 }
 void
@@ -663,7 +767,19 @@ vt102_parse_csi (VT102 * v, char *buf, int len)
         case 'D':
           vt102_cursor_relative (v, -narg, 0);
           break;
+        case 'E':
+          vt102_cursor_relative (v, 0, narg);
+          vt102_cursor_carriage_return (v);
+          break;
+        case 'F':
+          vt102_cursor_relative (v, 0, -narg);
+          vt102_cursor_carriage_return (v);
+          break;
+        case 'G':
+          vt102_cursor_absolute (v, narg - 1, v->pos.y);
+          break;
         case 'H':
+        case 'f':
           {
             int x, y;
 
@@ -778,13 +894,27 @@ vt102_parse_csi (VT102 * v, char *buf, int len)
 
           vt102_cursor_home (v);
           break;
+        case 's':
+          v->saved.pos = v->pos;
+          break;
+        case 'u':
+          v->pos = v->saved.pos;
+          vt102_cursor_normalize (v);
+          v->pending_wrap = 0;
+          break;
 
         default:
+#if 0
           fprintf (stderr, "unhandled CSI  \\033%s\n", buf, buf[0]);
+#endif
+          ;
         }
       break;
     default:
+#if 0
       fprintf (stderr, "unhandled CSI  \\033%s\n", buf, buf[0]);
+#endif
+      ;
     }
 
 
@@ -814,8 +944,9 @@ vt102_parse_char (VT102 * v, int c)
 {
   VT102_parser *p = &v->parser;
 
+
 #if 0
-  fprintf (stderr, "%c pc %d %d %d   %d %d\n", (c < 32) ? 32 : c, c,
+  fprintf (stderr, "char %c pc %d %d %d   %d %d\n", (c < 32) ? 32 : c, c,
            p->in_csi, p->in_escape, v->pos.x, v->pos.y);
 #endif
   if (p->in_csi)
@@ -836,12 +967,20 @@ vt102_parse_char (VT102 * v, int c)
           p->in_csi++;
           p->in_escape = 0;
         }
+      else if (scs_starter(c)) {
+	p->in_scs=c;
+        p->in_escape = 0;
+	}
       else
         {
           p->in_escape = 0;
           vt102_parse_esc (v, c);
         }
     }
+  else if (p->in_scs) {
+	vt102_scs(v,p->in_scs,c);
+	p->in_scs=0;
+  }
   else
     {
 
@@ -852,7 +991,10 @@ vt102_parse_char (VT102 * v, int c)
          /*STX*/ case 2:
          /*ETX*/ case 3:
          /*EOT*/ case 4:
+          break;
          /*ENQ*/ case 5:
+          tty_write (v->tty, "vt102", 5);
+          break;
          /*ACK*/ case 6:
          /*BEL*/ case 7:
           break;
@@ -872,7 +1014,13 @@ vt102_parse_char (VT102 * v, int c)
           vt102_cursor_carriage_return (v);
           break;
          /*SO*/ case 14:
+		/*select G1*/
+		/*Ignoring charsets*/
+		break;
          /*SI*/ case 15:
+		/*select G0*/
+		/*Ignoring charsets*/
+		break;
          /*DLE*/ case 16:
         /*DC1 */ case 17:
         /*DC2 */ case 18:
@@ -907,6 +1055,8 @@ vt102_parse_char (VT102 * v, int c)
     }
 
   v->crt.pos = v->pos;
+  v->crt.hide_cursor =
+    v->private_modes[VT102_PRIVATE_MODE_SHOW_CURSOR] ? 0 : 1;
 
   if (v->current_line.y != v->pos.y)
     {
@@ -917,12 +1067,185 @@ vt102_parse_char (VT102 * v, int c)
   vt102_status_line (v, "VT102 foo bar baz I'm the urban spaceman baby");
 }
 
+vt102_parse (VT102 * v, char *buf, int len)
+{
+  while (len--)
+    vt102_parse_char (v, *(buf++));
+}
+
+
 void
 vt102_parser_reset (VT102_parser * p)
 {
   p->in_csi = 0;
   p->in_escape = 0;
   p->csi_ptr = 0;
+ p->in_scs=0;
+}
+
+
+void
+vt102_send (VT102 * v, uint8_t key)
+{
+  uint8_t c;
+#if 0
+  fprintf (stderr, "vts: %d(%c)\n", key, (key > 31) ? key : ' ');
+#endif
+  if ((key > 31) && (key < 127))
+    {
+      tty_write (v->tty, &key, 1);
+      return;
+    }
+
+  switch (key)
+    {
+     /*NUL*/ case 0:
+     /*SOH*/ case 1:
+     /*STX*/ case 2:
+     /*ETX*/ case 3:
+     /*EOT*/ case 4:
+     /*ENQ*/ case 5:
+     /*ACK*/ case 6:
+     /*BEL*/ case 7:
+     /*BS*/ case 8:
+     /*HT*/ case 9:
+     /*LF*/ case 10:
+     /*VT*/ case 11:
+     /*FF*/ case 12:
+      tty_write (v->tty, &key, 1);
+      break;
+     /*CR*/ case 13:
+      tty_write (v->tty, &key, 1);
+      if (v->modes[VT102_MODE_NEWLINE_MODE])
+        {
+          c = 10;
+          tty_write (v->tty, &c, 1);
+        }
+      break;
+     /*SO*/ case 14:
+     /*SI*/ case 15:
+     /*DLE*/ case 16:
+    /*DC1 */ case 17:
+    /*DC2 */ case 18:
+    /*DC3 */ case 19:
+    /*DC4 */ case 20:
+     /*NAK*/ case 21:
+     /*SYN*/ case 22:
+     /*ETB*/ case 23:
+     /*CAN*/ case 24:
+     /*EM*/ case 25:
+     /*SUB*/ case 26:
+      tty_write (v->tty, &key, 1);
+      break;
+     /*ESC*/ case 27:
+     /*FS*/ case 28:
+     /*GS*/ case 29:
+     /*RS*/ case 30:
+     /*US*/ case 31:
+     /*DEL*/ case 127:
+      tty_write (v->tty, &key, 1);
+      break;
+
+    case KEY_UP:
+    case KEY_DOWN:
+    case KEY_RIGHT:
+    case KEY_LEFT:
+    case KEY_HOME:
+    case KEY_MIDDLE:
+    case KEY_END:
+
+      if (v->private_modes[VT102_PRIVATE_MODE_CURSOR_MODE])
+        {
+          uint8_t buf[] = { 033, 'O', 'A' + (key - KEY_UP) };
+          tty_write (v->tty, &buf, sizeof (buf));
+        }
+      else
+        {
+          uint8_t buf[] = { 033, '[', 'A' + (key - KEY_UP) };
+          tty_write (v->tty, &buf, sizeof (buf));
+        }
+      break;
+    case KEY_STAR:
+    case KEY_PLUS:
+    case KEY_COMMA:
+    case KEY_PERIOD:
+    case KEY_DIVIDE:
+    case KEY_0:
+    case KEY_1:
+    case KEY_2:
+    case KEY_3:
+    case KEY_4:
+    case KEY_5:
+    case KEY_6:
+    case KEY_7:
+    case KEY_8:
+    case KEY_9:
+      if (v->application_keypad_mode)
+        {
+          uint8_t buf[] = { 033, 'O', 'a' + (key - KEY_154) };
+          tty_write (v->tty, &buf, sizeof (buf));
+        }
+      else
+        {
+          static char kpoff[KEY_NUM] = {
+            [KEY_STAR] = '*',
+            [KEY_PLUS] = '+',
+            [KEY_COMMA] = ',',
+            [KEY_MINUS] = '-',
+            [KEY_PERIOD] = '.',
+            [KEY_DIVIDE] = '/',
+            [KEY_0] = '0',
+            [KEY_1] = '1',
+            [KEY_2] = '2',
+            [KEY_3] = '3',
+            [KEY_4] = '4',
+            [KEY_5] = '5',
+            [KEY_6] = '6',
+            [KEY_7] = '7',
+            [KEY_8] = '8',
+            [KEY_9] = '9'
+          };
+
+          tty_write (v->tty, &kpoff[key], 1);
+        }
+      break;
+    case KEY_ENTER:
+      if (v->application_keypad_mode)
+        {
+          uint8_t buf[] = { 033, 'O', 'M' };
+          tty_write (v->tty, &buf, sizeof (buf));
+        }
+      else
+        {
+          c = 13;
+          tty_write (v->tty, &c, 1);
+          if (v->modes[VT102_MODE_NEWLINE_MODE])
+            {
+              c = 10;
+              tty_write (v->tty, &c, 1);
+            }
+        }
+      break;
+    case KEY_PF1:
+    case KEY_PF2:
+    case KEY_PF3:
+    case KEY_PF4:
+      {
+        uint8_t buf[] = { 033, 'O', 'P' + (key - KEY_PF1) };
+        tty_write (v->tty, &buf, sizeof (buf));
+      }
+      break;
+    case KEY_INSERT:
+    case KEY_DELETE:
+    case KEY_PGUP:
+    case KEY_PGDN:
+      {
+        uint8_t buf[] = { 033, '[', '0' + (key - KEY_180), '~' };
+        tty_write (v->tty, &buf, sizeof (buf));
+      }
+      break;
+    }
+
 }
 
 void
@@ -934,6 +1257,7 @@ vt102_reset (VT102 * v)
   crt_cls (&v->crt);
 
 
+  v->application_keypad_mode = 0;
 
   v->current_line = v->pos;
   v->pending_wrap = 0;
@@ -951,9 +1275,54 @@ vt102_reset (VT102 * v)
 
   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_reset_tabs (v);
   v->current_line = v->pos;
 
+  vt102_save_state (v);
+
+  vt102_status_line (v, "VT102 foo bar baz I'm the urban spaceman baby");
+
+}
+
+int
+vt102_dispatch (VT102 * v)
+{
+  char buf[1024];
+  int red;
+
+  red = tty_read (v->tty, buf, sizeof (buf));
+
+  if (red < 0)
+    return -1;
+  if (!red)
+    return 0;
+
+
+  vt102_parse (v, buf, red);
+
+  return 0;
+}
+
+VT102 *
+vt102_new (TTY * t)
+{
+  VT102 *v;
+
+  v = (VT102 *) malloc (sizeof (VT102));
+
+  vt102_reset (v);
+
+  v->tty = t;
+
+  return v;
+}
+
+void
+vt102_free (VT102 * v)
+{
+  free (v);
 }