X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fansi.c;h=4113a36b773aa8aeff72dccd8a3d9f023d970026;hb=3e72a1f6fc28777c26e4fb109867bd2a3c7b89b0;hp=3e4ace1c9ac0ed57c92f377411eed8ecdbe99ad9;hpb=475b8d78f7920a0b9d1e35aaefc89fa162ba226a;p=sympathy.git

diff --git a/src/ansi.c b/src/ansi.c
index 3e4ace1..4113a36 100644
--- a/src/ansi.c
+++ b/src/ansi.c
@@ -10,6 +10,18 @@ static char rcsid[] = "$Id$";
 
 /*
  * $Log$
+ * Revision 1.35  2008/02/28 16:57:51  james
+ * *** empty log message ***
+ *
+ * Revision 1.34  2008/02/27 09:42:53  james
+ * *** empty log message ***
+ *
+ * Revision 1.33  2008/02/27 09:42:21  james
+ * *** empty log message ***
+ *
+ * Revision 1.32  2008/02/26 23:56:12  james
+ * *** empty log message ***
+ *
  * Revision 1.31  2008/02/26 23:23:17  james
  * *** empty log message ***
  *
@@ -325,36 +337,40 @@ ansi_set_attr (ANSI * a, int attr)
 static void
 ascii_emit (TTY * t, uint32_t ch)
 {
-int i;
-	
+  int i;
+
 /*Some quick obvious subsititons for quotation marks*/
-switch(ch) {
-case 0x2018:
-	ch='`';
-	break;
-case 0x2019:
-	ch='\'';
-	break;
-case 0x201c:
-case 0x201d:
-	ch='"';
-	break;
-}
+  switch (ch)
+    {
+    case 0x2018:
+      ch = '`';
+      break;
+    case 0x2019:
+      ch = '\'';
+      break;
+    case 0x201c:
+    case 0x201d:
+      ch = '"';
+      break;
+    }
 
 /*Short cut the easy stuff*/
-if (ch<0x7f)  {
-  uint8_t c = ch ;
-  t->xmit (t, &c, 1);
-  return;
-}
+  if (ch < 0x7f)
+    {
+      uint8_t c = ch;
+      t->xmit (t, &c, 1);
+      return;
+    }
 
-for (i=0;i<VT102_CHARSET_SIZE;++i) {
-if (vt102_charset_gl[i]==ch) {
-  uint8_t c[3] ={016,i,017};
-  t->xmit (t, &c, 3);
-  return;
-}
-}	
+  for (i = 0; i < VT102_CHARSET_SIZE; ++i)
+    {
+      if (vt102_charset_gl[i] == ch)
+        {
+          uint8_t c[3] = { 016, i, 017 };
+          t->xmit (t, &c, 3);
+          return;
+        }
+    }
 
   t->xmit (t, "?", 1);
 
@@ -366,7 +382,7 @@ ansi_render (ANSI * a, CRT_CA ca)
   int dif;
 
   if ((ca.chr < VT102_CHARSET_SIZE) && (vt102_charset_c0[ca.chr]))
-	ca.chr=vt102_charset_c0[ca.chr];
+    ca.chr = vt102_charset_c0[ca.chr];
 
   if ((ca.chr >= 0x80) && (ca.chr < 0xa0))
     ca.chr = ' ';
@@ -377,7 +393,7 @@ ansi_render (ANSI * a, CRT_CA ca)
   if (a->utf8)
     utf8_emit (a->terminal, ca.chr);
   else
-    ascii_emit(a->terminal,ca.chr);
+    ascii_emit (a->terminal, ca.chr);
 
   a->pos.x++;
 
@@ -495,7 +511,7 @@ 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 < a->crt.width; ++p.x)
+  for (p.x = 0; p.x < a->crt.size.x; ++p.x)
     {
       if (p.x >= a->size.x)
         continue;
@@ -515,44 +531,48 @@ ansi_draw_line (ANSI * a, CRT_CA * cap, int y)
 }
 
 static void
-ansi_resize_check (ANSI * a,int new_width)
+ansi_resize_check (ANSI * a, CRT_Pos * size)
 {
 
-  if ((new_width && (new_width != a->crt.width)) || crt_pos_cmp (a->terminal->size, a->size)) {
+  if ((size && crt_pos_cmp (a->crt.size, *size))
+      || crt_pos_cmp (a->terminal->size, a->size))
+    {
 
-  terminal_getsize (a->terminal);
+      terminal_getsize (a->terminal);
 
-  a->size = a->terminal->size;
+      a->size = a->terminal->size;
 
-  a->pos.x = ANSI_INVAL;
-  a->hide_cursor = ANSI_INVAL;
+      a->pos.x = ANSI_INVAL;
+      a->hide_cursor = ANSI_INVAL;
 
-  crt_reset (&a->crt);
+      crt_reset (&a->crt);
 
- if (new_width) 
-	a->crt.width=new_width;
+      if (size)
+        a->crt.size = *size;
 
 // FIXME: -- echos back crap?
 //  a->terminal->xmit (a->terminal, "\033[c", 3);
 
 // maybe - issue 132 column command if we're 132?
 
-  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);
-  if (a->utf8) {
-  a->terminal->xmit (a->terminal,"\033%G",3);
-  } else {
-  a->terminal->xmit (a->terminal,"\033(B",3);
-  a->terminal->xmit (a->terminal,"\033)0",3);
-  a->terminal->xmit (a->terminal,"\017",1);
-  }
+      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);
+      if (a->utf8)
+        {
+          a->terminal->xmit (a->terminal, "\033%G", 3);
+        }
+      else
+        {
+          a->terminal->xmit (a->terminal, "\033(B", 3);
+          a->terminal->xmit (a->terminal, "\033)0", 3);
+          a->terminal->xmit (a->terminal, "\017", 1);
+        }
 
-}
+    }
 }
 
-#define HISTORY_GUESS_SCROLL 24 /*guess all 24 lines usually scroll */
 /*if they haven't then ansi_draw will patch it up*/
 
 static void
@@ -560,19 +580,23 @@ ansi_history (ANSI * a, History * h)
 {
   char buf[32];
   int i;
+  int guess_scroll;
 /*Do we need to catch up on history?*/
 
   if (a->history_ptr == h->wptr)
     return;
-  ansi_resize_check (a,0);
+  ansi_resize_check (a, NULL);
 
-  if ((a->size.x < a->crt.width) || (a->size.y < CRT_ROWS))
+  if ((a->size.x < a->crt.size.x) || (a->size.y < a->crt.size.y))
     return;
 
+  guess_scroll = a->crt.size.y - 1; /*Bototm line should be a status line */
+
+
   ansi_force_attr_normal (a);
   ansi_set_color (a, CRT_COLOR_NORMAL);
 
-  i = sprintf (buf, "\033[%d;%dr", 1, HISTORY_GUESS_SCROLL);
+  i = sprintf (buf, "\033[%d;%dr", 1, guess_scroll);
   a->terminal->xmit (a->terminal, buf, i);
 
 
@@ -590,14 +614,14 @@ ansi_history (ANSI * a, History * h)
       ansi_draw_line (a, e->line, 0);
 
 
-      /*Roll HISTORY_GUESS_SCROLL lines up putting the top line into the xterm's history */
+      /*Roll 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);
+      i = sprintf (buf, "\033[%d;%dH", guess_scroll, 1);
       a->terminal->xmit (a->terminal, buf, i);
       a->terminal->xmit (a->terminal, "\033D", 2);
       a->pos.x = ANSI_INVAL;
@@ -611,11 +635,11 @@ ansi_history (ANSI * a, History * h)
         0};
 
         /*scroll lines up */
-        for (s.y++; s.y < HISTORY_GUESS_SCROLL; s.y++, e.y++)
+        for (s.y++; s.y < guess_scroll; s.y++, e.y++)
           {
             memcpy (&a->crt.screen[CRT_ADDR_POS (&e)],
                     &a->crt.screen[CRT_ADDR_POS (&s)],
-                    sizeof (CRT_CA)*a->crt.width);
+                    sizeof (CRT_CA) * a->crt.size.x);
           }
 
         /* erase new line */
@@ -641,10 +665,10 @@ ansi_draw (ANSI * a, CRT * c)
   int o;
   int hidden_cursor = 0;
 
-  ansi_resize_check (a,c->width);
+  ansi_resize_check (a, &c->size);
 
 
-  for (p.y = 0; p.y < CRT_ROWS; ++p.y)
+  for (p.y = 0; p.y < a->crt.size.y; ++p.y)
     {
       if (p.y >= a->size.y)
         continue;
@@ -654,7 +678,7 @@ ansi_draw (ANSI * a, CRT * c)
     }
 
 
-  if ((c->width > a->size.x) || (CRT_ROWS > a->size.y))
+  if ((c->size.x > a->size.x) || (c->size.y > a->size.y))
     {
       char msg[1024];           // = "Window is too small";
       int i;
@@ -663,7 +687,7 @@ ansi_draw (ANSI * a, CRT * c)
 
       i =
         sprintf (msg, "Window too small (%dx%d need %dx%d)", a->size.x,
-                 a->size.y, c->width, CRT_ROWS);
+                 a->size.y, c->size.x, c->size.y);
 
       ansi_showhide_cursor (a, 1);
       ansi_set_attr (a, CRT_ATTR_REVERSE);
@@ -698,7 +722,7 @@ ansi_reset (ANSI * a, CRT * c)
 static void
 ansi_terminal_reset (ANSI * a)
 {
-  CRT_Pos p = { 0, CRT_ROWS };
+  CRT_Pos p = { 0, a->crt.size.y };
   ansi_force_attr_normal (a);
 
   ansi_move (a, p);
@@ -927,6 +951,7 @@ ansi_update (ANSI * a, Context * c)
 {
   ansi_history (a, c->h);
   ansi_draw (a, &c->v->crt);
+  tty_length(a->terminal,c->v->crt.size.y);
 }
 
 static void