X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fansi.c;h=66c70f1125580fc90daea059e877cec5d4011137;hb=0162da6f3043d60c28882b33f77c44afca226d46;hp=b6f30f9c45762df7c7ab22738a8f3063103ce629;hpb=89fa7c69158bf37823875c61345024308b156772;p=sympathy.git

diff --git a/src/ansi.c b/src/ansi.c
index b6f30f9..66c70f1 100644
--- a/src/ansi.c
+++ b/src/ansi.c
@@ -10,6 +10,39 @@ static char rcsid[] = "$Id$";
 
 /*
  * $Log$
+ * Revision 1.28  2008/02/22 17:07:00  james
+ * *** empty log message ***
+ *
+ * Revision 1.27  2008/02/20 22:54:22  staffcvs
+ * *** empty log message ***
+ *
+ * Revision 1.26  2008/02/20 20:16:07  james
+ * *** empty log message ***
+ *
+ * Revision 1.25  2008/02/20 19:44:37  james
+ * @@
+ *
+ * Revision 1.24  2008/02/20 19:36:06  james
+ * @@
+ *
+ * Revision 1.23  2008/02/20 19:25:09  james
+ * *** empty log message ***
+ *
+ * Revision 1.22  2008/02/15 03:32:07  james
+ * *** empty log message ***
+ *
+ * Revision 1.21  2008/02/14 02:46:44  james
+ * *** empty log message ***
+ *
+ * Revision 1.20  2008/02/14 01:55:57  james
+ * *** empty log message ***
+ *
+ * Revision 1.19  2008/02/13 16:57:29  james
+ * *** empty log message ***
+ *
+ * Revision 1.18  2008/02/13 09:12:21  james
+ * *** empty log message ***
+ *
  * Revision 1.17  2008/02/13 01:08:18  james
  * *** empty log message ***
  *
@@ -64,26 +97,8 @@ static char rcsid[] = "$Id$";
  */
 #include "project.h"
 
-static void
-set_nonblocking (int fd)
-{
-  long arg;
-  arg = fcntl (fd, F_GETFL, arg);
-  arg |= O_NONBLOCK;
-  fcntl (fd, F_SETFL, arg);
-}
 
 static void
-set_blocking (int fd)
-{
-  long arg;
-  arg = fcntl (fd, F_GETFL, arg);
-  arg &= ~O_NONBLOCK;
-  fcntl (fd, F_SETFL, arg);
-}
-
-
-void
 ansi_move (ANSI * a, CRT_Pos p)
 {
   char buf[16];
@@ -173,7 +188,7 @@ ansi_move (ANSI * a, CRT_Pos p)
 }
 
 
-void
+static void
 ansi_showhide_cursor (ANSI * a, int hide)
 {
   if (a->hide_cursor == hide)
@@ -192,7 +207,7 @@ ansi_showhide_cursor (ANSI * a, int hide)
 }
 
 
-void
+static void
 ansi_force_attr_normal (ANSI * a)
 {
   a->terminal->xmit (a->terminal, "\033[0m", 4);
@@ -200,7 +215,7 @@ ansi_force_attr_normal (ANSI * a)
   a->color = ANSI_INVAL;
 }
 
-void
+static void
 ansi_set_color (ANSI * a, int color)
 {
   int dif;
@@ -241,7 +256,7 @@ ansi_set_color (ANSI * a, int color)
     }
 }
 
-void
+static void
 ansi_set_attr (ANSI * a, int attr)
 {
   int dif;
@@ -299,7 +314,7 @@ ansi_set_attr (ANSI * a, int attr)
 }
 
 
-void
+static void
 ansi_render (ANSI * a, CRT_CA ca)
 {
   int dif;
@@ -324,14 +339,14 @@ ansi_render (ANSI * a, CRT_CA ca)
 
 }
 
-void
+static void
 ansi_cls (ANSI * a)
 {
   CRT_Pos p = { 0 };
 
   crt_cls (&a->crt);
 
-  ansi_force_attr_normal (a);
+  ansi_set_attr (a, CRT_ATTR_NORMAL);
   ansi_set_color (a, CRT_COLOR_NORMAL);
   ansi_move (a, p);
   a->terminal->xmit (a->terminal, "\033[2J", 4);
@@ -371,7 +386,7 @@ ansi_scroll_up (ANSI * a, CRT_Pos s, CRT_Pos e)
 }
 
 
-void
+static void
 ansi_spot_scroll_up (ANSI * a, CRT * c)
 {
   int l, n, p;
@@ -406,7 +421,7 @@ ansi_spot_scroll_up (ANSI * a, CRT * c)
 
 }
 
-void
+static void
 ansi_spot_scroll (ANSI * a, CRT * c)
 {
 
@@ -424,49 +439,177 @@ ansi_spot_scroll (ANSI * a, CRT * c)
 #endif
 
 
-void
+static void
+ansi_draw_line (ANSI * a, CRT_CA * cap, int y)
+{
+  CRT_Pos p = { 0, y };
+  CRT_CA *acap = &a->crt.screen[CRT_ADDR_POS (&p)];
+
+  for (p.x = 0; p.x < CRT_COLS; ++p.x)
+    {
+      if (p.x >= a->size.x)
+        continue;
+
+      if (crt_ca_cmp (*acap, *cap))
+        {
+          ansi_showhide_cursor (a, 1);
+          *acap = *cap;
+
+          ansi_move (a, p);
+          ansi_render (a, *acap);
+        }
+
+      acap++;
+      cap++;
+    }
+}
+
+static void
+ansi_resize_check (ANSI * a)
+{
+
+  if (!crt_pos_cmp (a->terminal->size, a->size))
+    return;
+
+  terminal_getsize (a->terminal);
+
+  a->size = a->terminal->size;
+
+  a->pos.x = ANSI_INVAL;
+  a->hide_cursor = ANSI_INVAL;
+
+  crt_reset (&a->crt);
+
+// FIXME: -- echos back crap?
+//  a->terminal->xmit (a->terminal, "\033[c", 3);
+
+  ansi_cls (a);
+  a->terminal->xmit (a->terminal, "\033=", 2);
+  a->terminal->xmit (a->terminal, "\033[?6l", 5);
+  a->terminal->xmit (a->terminal, "\033[r", 3);
+
+}
+
+#define HISTORY_GUESS_SCROLL 24 /*guess all 24 lines usually scroll */
+/*if they haven't then ansi_draw will patch it up*/
+
+static void
+ansi_history (ANSI * a, History * h)
+{
+  char buf[32];
+  int i;
+/*Do we need to catch up on history?*/
+
+  if (a->history_ptr == h->wptr)
+    return;
+  ansi_resize_check (a);
+
+  if ((a->size.x < CRT_COLS) || (a->size.y < CRT_ROWS))
+    return;
+
+  ansi_force_attr_normal (a);
+  ansi_set_color (a, CRT_COLOR_NORMAL);
+
+  i = sprintf (buf, "\033[%d;%dr", 1, HISTORY_GUESS_SCROLL);
+  a->terminal->xmit (a->terminal, buf, i);
+
+
+  while (a->history_ptr != h->wptr)
+    {
+
+      History_ent *e = &h->lines[a->history_ptr];
+
+      HISTORY_INC (h, a->history_ptr);
+
+      if (!e->valid)
+        continue;
+
+      /*If so write the line ot the top of the screen */
+      ansi_draw_line (a, e->line, 0);
+
+
+      /*Roll HISTORY_GUESS_SCROLL lines up putting the top line into the xterm's history */
+
+
+      /*Make extra lines a predictable colour*/
+      ansi_set_color (a, CRT_COLOR_NORMAL);
+
+      ansi_showhide_cursor (a, 1);
+      i = sprintf (buf, "\033[%d;%dH", HISTORY_GUESS_SCROLL, 1);
+      a->terminal->xmit (a->terminal, buf, i);
+      a->terminal->xmit (a->terminal, "\033D", 2);
+      a->pos.x = ANSI_INVAL;
+
+      /*now do the same in our image of the screen */
+
+      {
+        CRT_Pos s = { 0 }
+        , e =
+        {
+        0};
+
+        /*scroll lines up */
+        for (s.y++; s.y < HISTORY_GUESS_SCROLL; s.y++, e.y++)
+          {
+            memcpy (&a->crt.screen[CRT_ADDR_POS (&e)],
+                    &a->crt.screen[CRT_ADDR_POS (&s)],
+                    sizeof (CRT_CA) * CRT_COLS);
+          }
+
+        /* erase new line */
+        s.y = e.y;
+        e.x = CRT_COLS - 1;
+        crt_erase (&a->crt, s, e, 1,CRT_COLOR_NORMAL);
+      }
+
+    }
+/*reset margins*/
+  a->terminal->xmit (a->terminal, "\033[r", 3);
+  a->pos.x = ANSI_INVAL;
+
+}
+
+
+
+
+static void
 ansi_draw (ANSI * a, CRT * c)
 {
   CRT_Pos p;
   int o;
   int hidden_cursor = 0;
 
-  if (crt_pos_cmp(a->terminal.size,a->size)) {
+  ansi_resize_check (a);
+
 
 
   for (p.y = 0; p.y < CRT_ROWS; ++p.y)
     {
       if (p.y >= a->size.y)
         continue;
-      o = CRT_ADDR (p.y, 0);
-      for (p.x = 0; p.x < CRT_COLS; ++p.x, ++o)
-        {
-          if (p.x >= a->size.x)
-            continue;
-          if (crt_ca_cmp (a->crt.screen[o], c->screen[o]))
-            {
-              ansi_showhide_cursor (a, 1);
-              a->crt.screen[o] = c->screen[o];
 
-              ansi_move (a, p);
-              ansi_render (a, a->crt.screen[o]);
-            }
-        }
+      ansi_draw_line (a, &c->screen[CRT_ADDR (p.y, 0)], p.y);
+
     }
 
 
   if ((CRT_COLS > a->size.x) || (CRT_ROWS > a->size.y))
     {
-      char msg[] = "Window is too small";
+      char msg[1024];           // = "Window is too small";
+      int i;
       p.x = 0;
       p.y = 0;
 
+      i =
+        sprintf (msg, "Window too small (%dx%d need %dx%d)", a->size.x,
+                 a->size.y, CRT_COLS, CRT_ROWS);
+
       ansi_showhide_cursor (a, 1);
       ansi_set_attr (a, CRT_ATTR_REVERSE);
       ansi_set_color (a, CRT_MAKE_COLOR (CRT_COLOR_WHITE, CRT_COLOR_RED));
       ansi_move (a, p);
 
-      a->terminal->xmit (a->terminal, msg, sizeof (msg));
+      a->terminal->xmit (a->terminal, msg, i);
       a->pos.x = ANSI_INVAL;
     }
 
@@ -484,45 +627,39 @@ ansi_draw (ANSI * a, CRT * c)
   ansi_showhide_cursor (a, a->crt.hide_cursor);
 }
 
-void
-ansi_reset (ANSI * a)
+static void
+ansi_reset (ANSI * a, CRT * c)
 {
-// FIXME: -- echos back crap?
-//  a->terminal->xmit (a->terminal, "\033[c", 3);
-
-  terminal_getsize(a->terminal);
-
-  a->size=a->terminal->size;
-
-  a->pos.x = ANSI_INVAL;
-  a->hide_cursor = ANSI_INVAL;
+  a->size.x = -1;
+  ansi_draw (a, c ? c : &a->crt);
+}
 
-  crt_reset (&a->crt);
+static void
+ansi_terminal_reset (ANSI * a)
+{
+  CRT_Pos p = { 0, CRT_ROWS };
+  ansi_force_attr_normal (a);
 
-  ansi_cls (a);
-  a->terminal->xmit (a->terminal, "\033=", 2);
-  a->terminal->xmit (a->terminal, "\033[?6l", 5);
-  a->terminal->xmit (a->terminal, "\033[r", 3);
-  ansi_draw (a, &a->crt);
+  ansi_move (a, p);
 }
 
-void
-ansi_flush_escape (ANSI * a, Context *c)
+static void
+ansi_flush_escape (ANSI * a, Context * c)
 {
   ANSI_Parser *p = &a->parser;
   int i;
 
   for (i = 0; i < p->escape_ptr; ++i)
     {
-      vt102_send (c->v, p->escape_buf[i], c->t);
+      keydis_key (c->k, c, p->escape_buf[i]);
     }
 
   p->escape_ptr = 0;
   p->in_escape = 0;
 }
 
-void
-ansi_parse_deckey (ANSI * a, Context *c)
+static void
+ansi_parse_deckey (ANSI * a, Context * c)
 {
   ANSI_Parser *p = &a->parser;
   if ((p->escape_buf[1] != '[') && (p->escape_buf[1] != 'O'))
@@ -533,23 +670,23 @@ ansi_parse_deckey (ANSI * a, Context *c)
 
   if ((p->escape_buf[2] >= 'A') || (p->escape_buf[2] <= 'Z'))
     {
-      vt102_send (c->v, KEY_UP + (p->escape_buf[2] - 'A'), c->t);
+      keydis_key (c->k, c, KEY_UP + (p->escape_buf[2] - 'A'));
     }
   else if ((p->escape_buf[2] >= 'a') || (p->escape_buf[2] <= 'z'))
     {
-      vt102_send (c->v, KEY_154 + (p->escape_buf[2] - 'a'), c->t);
+      keydis_key (c->k, c, KEY_154 + (p->escape_buf[2] - 'a'));
     }
   else
     {
-      ansi_flush_escape (a,c);
+      ansi_flush_escape (a, c);
       return;
     }
   p->in_escape = 0;
   p->escape_ptr = 0;
 }
 
-void
-ansi_parse_ansikey (ANSI * a,Context *c)
+static void
+ansi_parse_ansikey (ANSI * a, Context * c)
 {
   ANSI_Parser *p = &a->parser;
 
@@ -560,11 +697,11 @@ ansi_parse_ansikey (ANSI * a,Context *c)
     }
   if ((p->escape_buf[2] >= '0') || (p->escape_buf[2] <= '9'))
     {
-      vt102_send (c->v, KEY_180 + (p->escape_buf[2] - '0'), c->t);
+      keydis_key (c->k, c, KEY_180 + (p->escape_buf[2] - '0'));
     }
   else
     {
-      ansi_flush_escape (a,c);
+      ansi_flush_escape (a, c);
       return;
     }
 
@@ -574,8 +711,8 @@ ansi_parse_ansikey (ANSI * a,Context *c)
 
 
 
-void
-ansi_parse_escape (ANSI * a,Context *c)
+static void
+ansi_parse_escape (ANSI * a, Context * c)
 {
   ANSI_Parser *p = &a->parser;
   switch (p->escape_ptr)
@@ -590,7 +727,7 @@ ansi_parse_escape (ANSI * a,Context *c)
         case 'O':
           break;
         default:
-          ansi_flush_escape (a,c);
+          ansi_flush_escape (a, c);
         }
       break;
     case 3:
@@ -601,10 +738,10 @@ ansi_parse_escape (ANSI * a,Context *c)
           break;
         case '[':
           if ((p->escape_buf[2] >= 'A') && (p->escape_buf[2] <= 'Z'))
-            ansi_parse_deckey (a,c);
+            ansi_parse_deckey (a, c);
           break;
         default:
-          ansi_flush_escape (a,c);
+          ansi_flush_escape (a, c);
         }
       break;
     case 4:
@@ -614,17 +751,17 @@ ansi_parse_escape (ANSI * a,Context *c)
           ansi_parse_ansikey (a, c);
           break;
         default:
-          ansi_flush_escape (a,c);
+          ansi_flush_escape (a, c);
         }
       break;
     case 5:
-      ansi_flush_escape (a,c);
+      ansi_flush_escape (a, c);
     }
 }
 
 
-void
-ansi_check_escape (ANSI * a, Context *c)
+static void
+ansi_check_escape (ANSI * a, Context * c)
 {
   ANSI_Parser *p = &a->parser;
   struct timeval now, diff;
@@ -642,13 +779,13 @@ ansi_check_escape (ANSI * a, Context *c)
 
   /*Time up? */
   if (diff.tv_sec || (diff.tv_usec > ANSI_ESCAPE_TIMEOUT))
-    ansi_flush_escape (a,c);
+    ansi_flush_escape (a, c);
 
 }
 
 
-void
-ansi_parse_char (ANSI * a,Context *c, int ch)
+static void
+ansi_parse_char (ANSI * a, Context * c, int ch)
 {
   ANSI_Parser *p = &a->parser;
 
@@ -659,7 +796,7 @@ ansi_parse_char (ANSI * a,Context *c, int ch)
   if (ch == 033)
     {
       if (p->in_escape)
-        ansi_flush_escape (a,c);
+        ansi_flush_escape (a, c);
 
       p->in_escape++;
       p->escape_ptr = 0;
@@ -669,24 +806,24 @@ ansi_parse_char (ANSI * a,Context *c, int ch)
   if (p->in_escape)
     {
       p->escape_buf[p->escape_ptr++] = ch;
-      ansi_parse_escape (a,c);
+      ansi_parse_escape (a, c);
     }
   else
     {
-      vt102_send (c->v, ch, c->t);
+      keydis_key (c->k, c, ch);
     }
 
 }
 
-void
-ansi_parse (ANSI * a,Context *c, char *buf, int len)
+static void
+ansi_parse (ANSI * a, Context * c, char *buf, int len)
 {
   while (len--)
-    ansi_parse_char (a,c, *(buf++));
+    ansi_parse_char (a, c, *(buf++));
 }
 
 int
-ansi_dispatch (ANSI * a, Context *c)
+ansi_dispatch (ANSI * a, Context * c)
 {
   char buf[1024];
   int red;
@@ -694,7 +831,10 @@ ansi_dispatch (ANSI * a, Context *c)
   ansi_check_escape (a, c);
 
 
-  red = a->terminal->recv(a->terminal,buf,sizeof(buf));
+  if (!a->terminal)
+    return 0;
+
+  red = a->terminal->recv (a->terminal, buf, sizeof (buf));
   if (red <= 0)
     return red;
 
@@ -704,12 +844,56 @@ ansi_dispatch (ANSI * a, Context *c)
 #endif
 
 #if 0
-  if (*buf == 1)
-    return 1;
+  if (*buf == 2)
+    {
+#if  0
+      a->history_ptr = c->h->wptr;
+      HISTORY_INC (c->h, a->history_ptr);
+#endif
+      return -1;
+    }
 #endif
 
 
-  ansi_parse (a,c, buf, red );
+  ansi_parse (a, c, buf, red);
 
   return 0;
 }
+
+
+static void
+ansi_update (ANSI * a, Context * c)
+{
+  ansi_history (a, c->h);
+  ansi_draw (a, &c->v->crt);
+}
+
+static void
+ansi_free (ANSI * a)
+{
+  a->terminal_reset (a);
+  if (a->terminal)
+    a->terminal->close (a->terminal);
+
+  free (a);
+
+}
+
+ANSI *
+ansi_new_from_terminal (TTY * t)
+{
+  ANSI *ret;
+
+  ret = malloc (sizeof (ANSI));
+  memset (ret, 0, sizeof (ANSI));
+
+  ret->terminal = t;
+
+  ret->update = ansi_update;
+  ret->reset = ansi_reset;
+  ret->terminal_reset = ansi_terminal_reset;
+  ret->close = ansi_free;
+  ret->dispatch = ansi_dispatch;
+
+  return ret;
+}