*** empty log message ***

1 files changed, 92 insertions, 80 deletions

diff --git a/src/vt102.c b/src/vt102.c
index f3101bb..a8d4388 100644
--- a/src/vt102.c
+++ b/src/vt102.c
@@ -10,6 +10,9 @@ static char rcsid[] = "$Id$";
 
 /*
  * $Log$
+ * Revision 1.24  2008/02/13 09:12:21  james
+ * *** empty log message ***
+ *
  * Revision 1.23  2008/02/07 13:26:35  james
  * *** empty log message ***
  *
@@ -231,35 +234,34 @@ in_margins (VT102 * v, CRT_Pos p)
 }
 
 void
-vt102_log_line (VT102 * v, int line)
+vt102_log_line (Context * c, int line)
 {
-  static FILE *log;
   CRT_Pos e = { VT102_COLS - 1, line };
   CRT_Pos p = { 0, line };
+  char logbuf[VT102_COLS + 1];
 
-  if (!log)
-    log = fopen ("log", "a+");
-
-  if (!log)
+  if (!c->l)
     return;
 
 
   for (; e.x > 0; --e.x)
     {
-      if (v->crt.screen[CRT_ADDR_POS (&e)].chr != ' ')
+      if (c->v->crt.screen[CRT_ADDR_POS (&e)].chr != ' ')
         break;
     }
 
   for (; p.x <= e.x; ++p.x)
     {
-      int c = v->crt.screen[CRT_ADDR_POS (&p)].chr;
-      if (c < 32)
-        c = ' ';
-      if (c > 126)
-        c = ' ';
-      fputc (c, log);
+      int ch = c->v->crt.screen[CRT_ADDR_POS (&p)].chr;
+      if (ch < 32)
+        ch = ' ';
+      if (ch > 126)
+        ch = ' ';
+      logbuf[p.x] = ch;
     }
-  fputc ('\n', log);
+  logbuf[p.x] = 0;
+
+  c->l->log (c->l, logbuf);
 }
 
 void
@@ -301,8 +303,9 @@ vt102_cursor_carriage_return (VT102 * v)
 }
 
 void
-vt102_cursor_advance_line (VT102 * v)
+vt102_cursor_advance_line (Context * c)
 {
+  VT102 *v = c->v;
   int couldscroll = in_margins (v, v->pos);
 
 /*have wraped off end of last line in scrolling region */
@@ -310,7 +313,8 @@ vt102_cursor_advance_line (VT102 * v)
   if (((v->pos.y == v->bottom_margin.y) || (v->pos.y == v->screen_end.y)) &&
       (couldscroll))
     {
-      vt102_log_line (v, v->pos.y);
+      vt102_log_line (c, v->pos.y);
+      //FIXME call out to history
       crt_scroll_up (&v->crt, v->top_margin, v->bottom_margin, 1);
       return;
     }
@@ -321,8 +325,9 @@ vt102_cursor_advance_line (VT102 * v)
 
 
 void
-vt102_cursor_advance (VT102 * v)
+vt102_cursor_advance (Context * c)
 {
+  VT102 *v = c->v;
 
   if (v->pos.x < v->bottom_margin.x)
     {
@@ -336,8 +341,9 @@ vt102_cursor_advance (VT102 * v)
 
 
 void
-vt102_do_pending_wrap (VT102 * v)
+vt102_do_pending_wrap (Context * c)
 {
+  VT102 *v = c->v;
   int couldscroll = in_margins (v, v->pos);
   int autowrap = v->private_modes[VT102_PRIVATE_MODE_AUTO_WRAP];
 
@@ -366,7 +372,7 @@ vt102_do_pending_wrap (VT102 * v)
       v->pos.x = 0;
     }
 
-  vt102_cursor_advance_line (v);
+  vt102_cursor_advance_line (c);
 }
 
 
@@ -755,20 +761,21 @@ vt102_restore_state (VT102 * v)
 }
 
 void
-vt102_scs (VT102 * c, int g, int s)
+vt102_scs (Context * c, int g, int s)
 {
 /*Ignoring charsets*/
 }
 
 void
-vt102_parse_esc (VT102 * v, int c)
+vt102_parse_esc (Context * c, int ch)
 {
-  switch (c)
+  VT102 *v = c->v;
+  switch (ch)
     {
     case 'E':
       if (v->pos.y == v->bottom_margin.y)
         {
-          vt102_log_line (v, v->pos.y);
+          vt102_log_line (c, v->pos.y);
           crt_scroll_up (&v->crt, v->top_margin, v->bottom_margin, 1);
         }
       else
@@ -803,20 +810,22 @@ vt102_parse_esc (VT102 * v, int c)
       break;
     default:
 #if 0
-      fprintf (stderr, "unhandled ESC \\033 \\%03o (ESC %c)\n", c,
-               (c < 32) ? '?' : c);
+      fprintf (stderr, "unhandled ESC \\033 \\%03o (ESC %c)\n", ch,
+               (ch < 32) ? '?' : ch);
 #endif
       ;
     }
 }
 void
-vt102_parse_csi (VT102 * v, char *buf, int len)
+vt102_parse_csi (Context * c, char *buf, int len)
 {
   char last;
   char *ptr;
   char *arg = buf + 1;
   int narg;
 
+  VT102 *v = c->v;
+
   buf[len] = 0;
 
   last = buf[len - 1];
@@ -928,7 +937,10 @@ vt102_parse_csi (VT102 * v, char *buf, int len)
               && (v->pos.y <= v->bottom_margin.y))
             {
               while (narg--)
-                crt_scroll_up (&v->crt, v->pos, v->bottom_margin, 0);
+                {
+                  //FIXME call out to history
+                  crt_scroll_up (&v->crt, v->pos, v->bottom_margin, 0);
+                }
             }
           break;
 
@@ -1024,53 +1036,53 @@ vt102_status_line (VT102 * v, char *str)
 
 
 void
-vt102_parse_char (VT102 * v, int c, TTY * tty)
+vt102_parse_char (Context * c, int ch)
 {
+  VT102 *v = c->v;
   VT102_parser *p = &v->parser;
 
-
 #if 0
   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)
     {
-      p->csi_buf[p->csi_ptr++] = c;
-      if (csi_ender (c) || (p->csi_ptr == VT102_CSI_LEN))
+      p->csi_buf[p->csi_ptr++] = ch;
+      if (csi_ender (ch) || (p->csi_ptr == VT102_CSI_LEN))
         {
-          vt102_parse_csi (v, p->csi_buf, p->csi_ptr);
+          vt102_parse_csi (c, p->csi_buf, p->csi_ptr);
           p->in_csi = 0;
         }
     }
   else if (p->in_escape)
     {
-      if (csi_starter (c))
+      if (csi_starter (ch))
         {
           p->csi_ptr = 0;
-          p->csi_buf[p->csi_ptr++] = c;
+          p->csi_buf[p->csi_ptr++] = ch;
           p->in_csi++;
           p->in_escape = 0;
         }
-      else if (scs_starter (c))
+      else if (scs_starter (ch))
         {
-          p->in_scs = c;
+          p->in_scs = ch;
           p->in_escape = 0;
         }
       else
         {
           p->in_escape = 0;
-          vt102_parse_esc (v, c);
+          vt102_parse_esc (c, ch);
         }
     }
   else if (p->in_scs)
     {
-      vt102_scs (v, p->in_scs, c);
+      vt102_scs (c, p->in_scs, ch);
       p->in_scs = 0;
     }
   else
     {
 
-      switch (c)
+      switch (ch)
         {
          /*NUL*/ case 0:
          /*SOH*/ case 1:
@@ -1079,21 +1091,21 @@ vt102_parse_char (VT102 * v, int c, TTY * tty)
          /*EOT*/ case 4:
           break;
          /*ENQ*/ case 5:
-          tty_write (tty, "vt102", 5);
+          c->t->xmit (c->t, "vt102", 5);
           break;
          /*ACK*/ case 6:
          /*BEL*/ case 7:
           break;
          /*BS*/ case 8:
-          vt102_cursor_retard (v);
+          vt102_cursor_retard (c->v);
           break;
          /*HT*/ case 9:
-          vt102_cursor_advance_tab (v);
+          vt102_cursor_advance_tab (c->v);
           break;
          /*LF*/ case 10:
          /*VT*/ case 11:
          /*FF*/ case 12:
-          vt102_cursor_advance_line (v);
+          vt102_cursor_advance_line (c);
           if (!v->modes[VT102_MODE_NEWLINE_MODE])
             break;
          /*CR*/ case 13:
@@ -1129,15 +1141,15 @@ vt102_parse_char (VT102 * v, int c, TTY * tty)
          /*DEL*/ case 127:
           break;
         /*regular character */ default:
-          vt102_do_pending_wrap (v);
+          vt102_do_pending_wrap (c);
 
           if (v->modes[VT102_MODE_INSERT])
             vt102_insert_into_line (v, v->pos);
 
-          v->crt.screen[CRT_ADDR_POS (&v->pos)].chr = c;
+          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 (v);
+          vt102_cursor_advance (c);
         }
     }
 
@@ -1147,17 +1159,17 @@ vt102_parse_char (VT102 * v, int c, TTY * tty)
 
   if (v->current_line.y != v->pos.y)
     {
-      vt102_log_line (v, v->current_line.y);
+      vt102_log_line (c, v->current_line.y);
       v->current_line = v->pos;
     }
 
   vt102_status_line (v, "VT102 foo bar baz I'm the urban spaceman baby");
 }
 
-vt102_parse (VT102 * v, char *buf, int len, TTY * t)
+vt102_parse (Context * c, char *buf, int len)
 {
   while (len--)
-    vt102_parse_char (v, *(buf++), t);
+    vt102_parse_char (c, *(buf++));
 }
 
 
@@ -1172,15 +1184,15 @@ vt102_parser_reset (VT102_parser * p)
 
 
 void
-vt102_send (VT102 * v, uint8_t key, TTY * tty)
+vt102_send (Context * c, uint8_t key)
 {
-  uint8_t c;
+  uint8_t ch;
 #if 0
   fprintf (stderr, "vts: %d(%c)\n", key, (key > 31) ? key : ' ');
 #endif
   if ((key > 31) && (key < 127))
     {
-      tty_write (tty, &key, 1);
+      c->t->xmit (c->t, &key, 1);
       return;
     }
 
@@ -1199,14 +1211,14 @@ vt102_send (VT102 * v, uint8_t key, TTY * tty)
      /*LF*/ case 10:
      /*VT*/ case 11:
      /*FF*/ case 12:
-      tty_write (tty, &key, 1);
+      c->t->xmit (c->t, &key, 1);
       break;
      /*CR*/ case 13:
-      tty_write (tty, &key, 1);
-      if (v->modes[VT102_MODE_NEWLINE_MODE])
+      c->t->xmit (c->t, &key, 1);
+      if (c->v->modes[VT102_MODE_NEWLINE_MODE])
         {
-          c = 10;
-          tty_write (tty, &c, 1);
+          ch = 10;
+          c->t->xmit (c->t, &ch, 1);
         }
       break;
      /*SO*/ case 14:
@@ -1222,7 +1234,7 @@ vt102_send (VT102 * v, uint8_t key, TTY * tty)
      /*CAN*/ case 24:
      /*EM*/ case 25:
      /*SUB*/ case 26:
-      tty_write (tty, &key, 1);
+      c->t->xmit (c->t, &key, 1);
       break;
      /*ESC*/ case 27:
      /*FS*/ case 28:
@@ -1230,7 +1242,7 @@ vt102_send (VT102 * v, uint8_t key, TTY * tty)
      /*RS*/ case 30:
      /*US*/ case 31:
      /*DEL*/ case 127:
-      tty_write (tty, &key, 1);
+      c->t->xmit (c->t, &key, 1);
       break;
 
     case KEY_UP:
@@ -1241,15 +1253,15 @@ vt102_send (VT102 * v, uint8_t key, TTY * tty)
     case KEY_MIDDLE:
     case KEY_END:
 
-      if (v->private_modes[VT102_PRIVATE_MODE_CURSOR_MODE])
+      if (c->v->private_modes[VT102_PRIVATE_MODE_CURSOR_MODE])
         {
           uint8_t buf[] = { 033, 'O', 'A' + (key - KEY_UP) };
-          tty_write (tty, &buf, sizeof (buf));
+          c->t->xmit (c->t, &buf, sizeof (buf));
         }
       else
         {
           uint8_t buf[] = { 033, '[', 'A' + (key - KEY_UP) };
-          tty_write (tty, &buf, sizeof (buf));
+          c->t->xmit (c->t, &buf, sizeof (buf));
         }
       break;
     case KEY_STAR:
@@ -1267,10 +1279,10 @@ vt102_send (VT102 * v, uint8_t key, TTY * tty)
     case KEY_7:
     case KEY_8:
     case KEY_9:
-      if (v->application_keypad_mode)
+      if (c->v->application_keypad_mode)
         {
           uint8_t buf[] = { 033, 'O', 'a' + (key - KEY_154) };
-          tty_write (tty, &buf, sizeof (buf));
+          c->t->xmit (c->t, &buf, sizeof (buf));
         }
       else
         {
@@ -1293,23 +1305,23 @@ vt102_send (VT102 * v, uint8_t key, TTY * tty)
             [KEY_9] = '9'
           };
 
-          tty_write (tty, &kpoff[key], 1);
+          c->t->xmit (c->t, &kpoff[key], 1);
         }
       break;
     case KEY_ENTER:
-      if (v->application_keypad_mode)
+      if (c->v->application_keypad_mode)
         {
           uint8_t buf[] = { 033, 'O', 'M' };
-          tty_write (tty, &buf, sizeof (buf));
+          c->t->xmit (c->t, &buf, sizeof (buf));
         }
       else
         {
-          c = 13;
-          tty_write (tty, &c, 1);
-          if (v->modes[VT102_MODE_NEWLINE_MODE])
+          ch = 13;
+          c->t->xmit (c->t, &ch, 1);
+          if (c->v->modes[VT102_MODE_NEWLINE_MODE])
             {
-              c = 10;
-              tty_write (tty, &c, 1);
+              ch = 10;
+              c->t->xmit (c->t, &ch, 1);
             }
         }
       break;
@@ -1319,7 +1331,7 @@ vt102_send (VT102 * v, uint8_t key, TTY * tty)
     case KEY_PF4:
       {
         uint8_t buf[] = { 033, 'O', 'P' + (key - KEY_PF1) };
-        tty_write (tty, &buf, sizeof (buf));
+        c->t->xmit (c->t, &buf, sizeof (buf));
       }
       break;
     case KEY_INSERT:
@@ -1328,7 +1340,7 @@ vt102_send (VT102 * v, uint8_t key, TTY * tty)
     case KEY_PGDN:
       {
         uint8_t buf[] = { 033, '[', '0' + (key - KEY_180), '~' };
-        tty_write (tty, &buf, sizeof (buf));
+        c->t->xmit (c->t, &buf, sizeof (buf));
       }
       break;
     }
@@ -1378,12 +1390,12 @@ vt102_reset (VT102 * v)
 }
 
 int
-vt102_dispatch (VT102 * v, TTY * tty)
+vt102_dispatch (Context * c)
 {
   char buf[1024];
   int red;
 
-  red = tty_read (tty, buf, sizeof (buf));
+  red = c->t->recv (c->t, buf, sizeof (buf));
 
   if (red < 0)
     return -1;
@@ -1391,26 +1403,26 @@ vt102_dispatch (VT102 * v, TTY * tty)
     return 0;
 
 
-  vt102_parse (v, buf, red, tty);
+  vt102_parse (c, buf, red);
 
   return 0;
 }
 
 
 int
-vt102_dispatch_one (VT102 * v, TTY * tty)
+vt102_dispatch_one (Context * c)
 {
   char buf;
   int red;
 
-  red = tty_read (tty, &buf, sizeof (buf));
+  red = c->t->recv (c->t, &buf, sizeof (buf));
 
   if (red < 0)
     return -1;
   if (!red)
     return 0;
 
-  vt102_parse_char (v, buf, tty);
+  vt102_parse_char (c, buf);
 
   return 0;
 }