From: james <james>
Date: Thu, 7 Feb 2008 11:27:02 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=sympathy.git;a=commitdiff_plain;h=2f406c1ccbb3c26864d293f17769a89de6a9f20d

*** empty log message ***
---

diff --git a/src/prototypes.h b/src/prototypes.h
index c75ddbc..f69feb8 100644
--- a/src/prototypes.h
+++ b/src/prototypes.h
@@ -10,14 +10,14 @@ void ansi_render(ANSI *a, CRT_CA ca);
 void ansi_cls(ANSI *a);
 void ansi_draw(ANSI *a, CRT *c);
 void ansi_reset(ANSI *a);
-void ansi_flush_escape(ANSI *a, VT102 *v);
-void ansi_parse_deckey(ANSI *a, VT102 *v);
-void ansi_parse_ansikey(ANSI *a, VT102 *v);
-void ansi_parse_escape(ANSI *a, VT102 *v);
-void ansi_check_escape(ANSI *a, VT102 *v);
-void ansi_parse_char(ANSI *a, int c, VT102 *v);
-void ansi_parse(ANSI *a, char *buf, int len, VT102 *v);
-int ansi_dispatch(ANSI *a, VT102 *v);
+void ansi_flush_escape(ANSI *a, VT102 *v, TTY *t);
+void ansi_parse_deckey(ANSI *a, VT102 *v, TTY *t);
+void ansi_parse_ansikey(ANSI *a, VT102 *v, TTY *t);
+void ansi_parse_escape(ANSI *a, VT102 *v, TTY *t);
+void ansi_check_escape(ANSI *a, VT102 *v, TTY *t);
+void ansi_parse_char(ANSI *a, int c, VT102 *v, TTY *t);
+void ansi_parse(ANSI *a, char *buf, int len, VT102 *v, TTY *t);
+int ansi_dispatch(ANSI *a, VT102 *v, TTY *t);
 /* crt.c */
 void crt_erase(CRT *c, CRT_Pos s, CRT_Pos e, int ea);
 void crt_cls(CRT *c);
@@ -56,16 +56,17 @@ void vt102_change_attr(VT102 *v, char *na);
 void vt102_parse_attr_string(VT102 *v, char *buf, int len);
 void vt102_save_state(VT102 *v);
 void vt102_restore_state(VT102 *v);
+void vt102_scs(VT102 *c, int g, int s);
 void vt102_parse_esc(VT102 *v, int c);
 void vt102_parse_csi(VT102 *v, char *buf, int len);
 void vt102_status_line(VT102 *v, char *str);
-void vt102_parse_char(VT102 *v, int c);
-int vt102_parse(VT102 *v, char *buf, int len);
+void vt102_parse_char(VT102 *v, int c, TTY *tty);
+int vt102_parse(VT102 *v, char *buf, int len, TTY *t);
 void vt102_parser_reset(VT102_parser *p);
-void vt102_send(VT102 *v, uint8_t key);
+void vt102_send(VT102 *v, uint8_t key, TTY *tty);
 void vt102_reset(VT102 *v);
-int vt102_dispatch(VT102 *v);
-VT102 *vt102_new(TTY *t);
+int vt102_dispatch(VT102 *v, TTY *tty);
+VT102 *vt102_new(void);
 void vt102_free(VT102 *v);
 /* tty.c */
 TTY *tty_new_test(void);
diff --git a/src/vt102.c b/src/vt102.c
index 35719ca..399952a 100644
--- a/src/vt102.c
+++ b/src/vt102.c
@@ -10,6 +10,9 @@ static char rcsid[] = "$Id$";
 
 /*
  * $Log$
+ * Revision 1.19  2008/02/07 11:27:02  james
+ * *** empty log message ***
+ *
  * Revision 1.18  2008/02/07 01:59:25  james
  * *** empty log message ***
  *
@@ -940,7 +943,7 @@ vt102_status_line (VT102 * v, char *str)
 
 
 void
-vt102_parse_char (VT102 * v, int c)
+vt102_parse_char (VT102 * v, int c,TTY *tty)
 {
   VT102_parser *p = &v->parser;
 
@@ -993,7 +996,7 @@ vt102_parse_char (VT102 * v, int c)
          /*EOT*/ case 4:
           break;
          /*ENQ*/ case 5:
-          tty_write (v->tty, "vt102", 5);
+          tty_write (tty, "vt102", 5);
           break;
          /*ACK*/ case 6:
          /*BEL*/ case 7:
@@ -1067,10 +1070,10 @@ 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)
+vt102_parse (VT102 * v, char *buf, int len,TTY *t)
 {
   while (len--)
-    vt102_parse_char (v, *(buf++));
+    vt102_parse_char (v, *(buf++),t);
 }
 
 
@@ -1085,7 +1088,7 @@ vt102_parser_reset (VT102_parser * p)
 
 
 void
-vt102_send (VT102 * v, uint8_t key)
+vt102_send (VT102 * v, uint8_t key,TTY *tty)
 {
   uint8_t c;
 #if 0
@@ -1093,7 +1096,7 @@ vt102_send (VT102 * v, uint8_t key)
 #endif
   if ((key > 31) && (key < 127))
     {
-      tty_write (v->tty, &key, 1);
+      tty_write (tty, &key, 1);
       return;
     }
 
@@ -1112,14 +1115,14 @@ vt102_send (VT102 * v, uint8_t key)
      /*LF*/ case 10:
      /*VT*/ case 11:
      /*FF*/ case 12:
-      tty_write (v->tty, &key, 1);
+      tty_write (tty, &key, 1);
       break;
      /*CR*/ case 13:
-      tty_write (v->tty, &key, 1);
+      tty_write (tty, &key, 1);
       if (v->modes[VT102_MODE_NEWLINE_MODE])
         {
           c = 10;
-          tty_write (v->tty, &c, 1);
+          tty_write (tty, &c, 1);
         }
       break;
      /*SO*/ case 14:
@@ -1135,7 +1138,7 @@ vt102_send (VT102 * v, uint8_t key)
      /*CAN*/ case 24:
      /*EM*/ case 25:
      /*SUB*/ case 26:
-      tty_write (v->tty, &key, 1);
+      tty_write (tty, &key, 1);
       break;
      /*ESC*/ case 27:
      /*FS*/ case 28:
@@ -1143,7 +1146,7 @@ vt102_send (VT102 * v, uint8_t key)
      /*RS*/ case 30:
      /*US*/ case 31:
      /*DEL*/ case 127:
-      tty_write (v->tty, &key, 1);
+      tty_write (tty, &key, 1);
       break;
 
     case KEY_UP:
@@ -1157,12 +1160,12 @@ vt102_send (VT102 * v, uint8_t key)
       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));
+          tty_write (tty, &buf, sizeof (buf));
         }
       else
         {
           uint8_t buf[] = { 033, '[', 'A' + (key - KEY_UP) };
-          tty_write (v->tty, &buf, sizeof (buf));
+          tty_write (tty, &buf, sizeof (buf));
         }
       break;
     case KEY_STAR:
@@ -1183,7 +1186,7 @@ vt102_send (VT102 * v, uint8_t key)
       if (v->application_keypad_mode)
         {
           uint8_t buf[] = { 033, 'O', 'a' + (key - KEY_154) };
-          tty_write (v->tty, &buf, sizeof (buf));
+          tty_write (tty, &buf, sizeof (buf));
         }
       else
         {
@@ -1206,23 +1209,23 @@ vt102_send (VT102 * v, uint8_t key)
             [KEY_9] = '9'
           };
 
-          tty_write (v->tty, &kpoff[key], 1);
+          tty_write (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));
+          tty_write (tty, &buf, sizeof (buf));
         }
       else
         {
           c = 13;
-          tty_write (v->tty, &c, 1);
+          tty_write (tty, &c, 1);
           if (v->modes[VT102_MODE_NEWLINE_MODE])
             {
               c = 10;
-              tty_write (v->tty, &c, 1);
+              tty_write (tty, &c, 1);
             }
         }
       break;
@@ -1232,7 +1235,7 @@ vt102_send (VT102 * v, uint8_t key)
     case KEY_PF4:
       {
         uint8_t buf[] = { 033, 'O', 'P' + (key - KEY_PF1) };
-        tty_write (v->tty, &buf, sizeof (buf));
+        tty_write (tty, &buf, sizeof (buf));
       }
       break;
     case KEY_INSERT:
@@ -1241,7 +1244,7 @@ vt102_send (VT102 * v, uint8_t key)
     case KEY_PGDN:
       {
         uint8_t buf[] = { 033, '[', '0' + (key - KEY_180), '~' };
-        tty_write (v->tty, &buf, sizeof (buf));
+        tty_write (tty, &buf, sizeof (buf));
       }
       break;
     }
@@ -1289,12 +1292,12 @@ vt102_reset (VT102 * v)
 }
 
 int
-vt102_dispatch (VT102 * v)
+vt102_dispatch (VT102 * v,TTY *tty)
 {
   char buf[1024];
   int red;
 
-  red = tty_read (v->tty, buf, sizeof (buf));
+  red = tty_read (tty, buf, sizeof (buf));
 
   if (red < 0)
     return -1;
@@ -1302,13 +1305,13 @@ vt102_dispatch (VT102 * v)
     return 0;
 
 
-  vt102_parse (v, buf, red);
+  vt102_parse (v, buf, red,tty);
 
   return 0;
 }
 
 VT102 *
-vt102_new (TTY * t)
+vt102_new (void)
 {
   VT102 *v;
 
@@ -1316,7 +1319,6 @@ vt102_new (TTY * t)
 
   vt102_reset (v);
 
-  v->tty = t;
 
   return v;
 }