X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=sympathy.git;a=blobdiff_plain;f=src%2Fansi.c;h=8d4d640e9b07460d4c76da33f62c70001b96cec2;hp=3504750aa708eced4fad6862283d4dc28a845a7b;hb=ece1299582523fd5a339398bdddb77f525e2a2fc;hpb=8a1addb4968e2aca9b801b09e5c8c640233dfa6e

diff --git a/src/ansi.c b/src/ansi.c
index 3504750..8d4d640 100644
--- a/src/ansi.c
+++ b/src/ansi.c
@@ -10,6 +10,15 @@ static char rcsid[] = "$Id$";
 
 /*
  * $Log$
+ * 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 ***
  *
@@ -80,7 +89,7 @@ static char rcsid[] = "$Id$";
 #include "project.h"
 
 
-void
+static void
 ansi_move (ANSI * a, CRT_Pos p)
 {
   char buf[16];
@@ -170,7 +179,7 @@ ansi_move (ANSI * a, CRT_Pos p)
 }
 
 
-void
+static void
 ansi_showhide_cursor (ANSI * a, int hide)
 {
   if (a->hide_cursor == hide)
@@ -189,7 +198,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);
@@ -197,7 +206,7 @@ ansi_force_attr_normal (ANSI * a)
   a->color = ANSI_INVAL;
 }
 
-void
+static void
 ansi_set_color (ANSI * a, int color)
 {
   int dif;
@@ -238,7 +247,7 @@ ansi_set_color (ANSI * a, int color)
     }
 }
 
-void
+static void
 ansi_set_attr (ANSI * a, int attr)
 {
   int dif;
@@ -296,7 +305,7 @@ ansi_set_attr (ANSI * a, int attr)
 }
 
 
-void
+static void
 ansi_render (ANSI * a, CRT_CA ca)
 {
   int dif;
@@ -321,7 +330,7 @@ ansi_render (ANSI * a, CRT_CA ca)
 
 }
 
-void
+static void
 ansi_cls (ANSI * a)
 {
   CRT_Pos p = { 0 };
@@ -368,7 +377,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;
@@ -403,7 +412,7 @@ ansi_spot_scroll_up (ANSI * a, CRT * c)
 
 }
 
-void
+static void
 ansi_spot_scroll (ANSI * a, CRT * c)
 {
 
@@ -421,7 +430,7 @@ 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 };
@@ -446,7 +455,7 @@ ansi_draw_line (ANSI * a, CRT_CA * cap, int y)
     }
 }
 
-void
+static void
 ansi_resize_check (ANSI * a)
 {
 
@@ -475,7 +484,7 @@ ansi_resize_check (ANSI * a)
 #define HISTORY_GUESS_SCROLL 24 /*guess all 24 lines usually scroll */
 /*if they haven't then ansi_draw will patch it up*/
 
-void
+static void
 ansi_history (ANSI * a, History * h)
 {
   char buf[32];
@@ -551,7 +560,7 @@ ansi_history (ANSI * a, History * h)
 
 
 
-void
+static void
 ansi_draw (ANSI * a, CRT * c)
 {
   CRT_Pos p;
@@ -606,14 +615,14 @@ ansi_draw (ANSI * a, CRT * c)
   ansi_showhide_cursor (a, a->crt.hide_cursor);
 }
 
-void
+static void
 ansi_reset (ANSI * a, CRT * c)
 {
   a->size.x = -1;
   ansi_draw (a, c ? c : &a->crt);
 }
 
-void
+static void
 ansi_terminal_reset (ANSI * a)
 {
   CRT_Pos p = { 0, CRT_ROWS };
@@ -622,7 +631,7 @@ ansi_terminal_reset (ANSI * a)
   ansi_move (a, p);
 }
 
-void
+static void
 ansi_flush_escape (ANSI * a, Context * c)
 {
   ANSI_Parser *p = &a->parser;
@@ -637,7 +646,7 @@ ansi_flush_escape (ANSI * a, Context * c)
   p->in_escape = 0;
 }
 
-void
+static void
 ansi_parse_deckey (ANSI * a, Context * c)
 {
   ANSI_Parser *p = &a->parser;
@@ -664,7 +673,7 @@ ansi_parse_deckey (ANSI * a, Context * c)
   p->escape_ptr = 0;
 }
 
-void
+static void
 ansi_parse_ansikey (ANSI * a, Context * c)
 {
   ANSI_Parser *p = &a->parser;
@@ -690,7 +699,7 @@ ansi_parse_ansikey (ANSI * a, Context * c)
 
 
 
-void
+static void
 ansi_parse_escape (ANSI * a, Context * c)
 {
   ANSI_Parser *p = &a->parser;
@@ -739,7 +748,7 @@ ansi_parse_escape (ANSI * a, Context * c)
 }
 
 
-void
+static void
 ansi_check_escape (ANSI * a, Context * c)
 {
   ANSI_Parser *p = &a->parser;
@@ -763,7 +772,7 @@ ansi_check_escape (ANSI * a, Context * c)
 }
 
 
-void
+static void
 ansi_parse_char (ANSI * a, Context * c, int ch)
 {
   ANSI_Parser *p = &a->parser;
@@ -794,7 +803,7 @@ ansi_parse_char (ANSI * a, Context * c, int ch)
 
 }
 
-void
+static void
 ansi_parse (ANSI * a, Context * c, char *buf, int len)
 {
   while (len--)
@@ -811,7 +820,7 @@ ansi_dispatch (ANSI * a, Context * c)
 
 
   if (!a->terminal)
-    return;
+    return 0;
 
   red = a->terminal->recv (a->terminal, buf, sizeof (buf));
   if (red <= 0)
@@ -840,9 +849,35 @@ ansi_dispatch (ANSI * a, Context * c)
 }
 
 
-void
+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(ANSI *a,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;
+
+}