*** empty log message ***

1 files changed, 81 insertions, 8 deletions

diff --git a/src/vt102.c b/src/vt102.c
index 5a2ab37..598e4a3 100644
--- a/src/vt102.c
+++ b/src/vt102.c
@@ -10,6 +10,9 @@ static char rcsid[] = "$Id$";
 
 /*
  * $Log$
+ * Revision 1.36  2008/02/24 12:22:42  james
+ * *** empty log message ***
+ *
  * Revision 1.35  2008/02/24 00:42:53  james
  * *** empty log message ***
  *
@@ -276,6 +279,8 @@ ESC+B
 #include "project.h"
 #include "syslog.h"
 
+//static char terminal_reply[]={033,0133,077,066,0143};
+static char terminal_reply[]={'v','t','1','0','2'};
 
 static inline int
 safe_ch (int c)
@@ -294,6 +299,8 @@ csi_ender (int c)
     return 1;
   if ((c >= 'A') && (c <= 'Z'))
     return 1;
+  if ((c == '@'))
+    return 1;
   return 0;
 }
 
@@ -306,6 +313,7 @@ scs_starter (int c)
     case ')':
     case '+':
     case '*':
+    case '%':
       return 1;
     }
   return 0;
@@ -445,6 +453,29 @@ vt102_cursor_advance_line (Context * c)
 
 
 void
+vt102_cursor_retreat_line (Context * c)
+{
+  VT102 *v = c->v;
+  int couldscroll = in_margins (v, v->pos);
+
+/*have wraped off end of last line in scrolling region */
+/* (|| not necessary, but shuts compiler up */
+  if (((v->pos.y == v->top_margin.y) || (v->pos.y == v->screen_start.y)) &&
+      (couldscroll))
+    {
+      vt102_log_line (c, v->pos.y);
+
+      crt_scroll_down (&v->crt, v->top_margin, v->bottom_margin, 1, v->color);
+      return;
+    }
+
+  if (v->pos.y != v->screen_start.y)
+    v->pos.y--;
+  v->pending_wrap = 0;
+}
+
+
+void
 vt102_do_pending_wrap (Context * c)
 {
   VT102 *v = c->v;
@@ -499,7 +530,7 @@ vt102_cursor_advance (Context * c)
 
 
 void
-vt102_cursor_retard (VT102 * v)
+vt102_cursor_retreat (VT102 * v)
 {
   if (v->pos.x != v->top_margin.x)
     v->pos.x--;
@@ -534,7 +565,7 @@ vt102_cursor_advance_tab (VT102 * v)
 }
 
 void
-vt102_cursor_retard_tab (VT102 * v)
+vt102_cursor_retreat_tab (VT102 * v)
 {
   if (v->pos.x == v->top_margin.x)
     return;
@@ -925,6 +956,18 @@ vt102_parse_esc (Context * c, int ch)
   VT102 *v = c->v;
   switch (ch)
     {
+    case 'A':
+          vt102_cursor_relative (v, 0, -1);
+	break;
+    case 'B':
+          vt102_cursor_relative (v, 0, 1);
+	break;
+    case 'C':
+          vt102_cursor_relative (v, 1, 0);
+	break;
+    case 'D':
+          vt102_cursor_relative (v, -1, 0);
+	break;
     case 'E':
       if (v->pos.y == v->bottom_margin.y)
         {
@@ -941,6 +984,18 @@ vt102_parse_esc (Context * c, int ch)
     case 'H':
       v->tabs[v->pos.x]++;
       break;
+	case 'I':
+          vt102_cursor_retreat_line (c);
+	break;
+   case 'J':
+              crt_erase (&v->crt, v->pos, v->screen_end, 1, v->color);
+	break;
+    case 'K':
+	{
+            CRT_Pos le = { VT102_COLS - 1, v->pos.y };
+                crt_erase (&v->crt, v->pos, le, 1, v->color);
+	}
+	break;
     case 'M':
       if (v->pos.y == v->top_margin.y)
         {
@@ -952,6 +1007,19 @@ vt102_parse_esc (Context * c, int ch)
           vt102_cursor_relative (v, 0, -1);
         }
       break;
+	case 'Y':
+		v->parser.in_dca++;
+		v->parser.dca_ptr=0;
+	break;
+	case 'Z':
+          if (c->t) {
+            c->t->xmit (c->t, terminal_reply,sizeof(terminal_reply));
+	}
+	break;
+	case '<': 
+	  /*Set ansi mode - ignored*/
+	break;
+
     case '7':
       vt102_save_state (v);
       break;
@@ -1150,7 +1218,7 @@ vt102_parse_csi (Context * c, char *buf, int len)
           break;
         case 'Z':
           while (narg--)
-            vt102_cursor_retard_tab (c->v);
+            vt102_cursor_retreat_tab (c->v);
           break;
         case '`':
           vt102_cursor_absolute (v, narg - 1, v->pos.y);
@@ -1321,9 +1389,13 @@ vt102_parse_char (Context * c, int ch)
   if (ch == SYM_CHAR_RESET)
     {
       vt102_reset_state (v);
-    }
-  if (p->ignore_until_bell)
-    {
+    } else if (p->in_dca) {
+	p->dca_buf[p->dca_ptr++]=ch;
+	if (p->dca_ptr==2) {
+          vt102_cursor_absolute (v, p->dca_buf[0] - 040, p->dca_buf[1]-040);
+	p->in_dca=0;
+	}
+    }else if (p->ignore_until_bell) {
       if (ch == 7)
         p->ignore_until_bell = 0;
     }
@@ -1383,14 +1455,15 @@ vt102_parse_char (Context * c, int ch)
          /*EOT*/ case 4:
           break;
          /*ENQ*/ case 5:
-          if (c->t)
+          if (c->t) { 
             c->t->xmit (c->t, "vt102", 5);
+	  }
           break;
          /*ACK*/ case 6:
          /*BEL*/ case 7:
           break;
          /*BS*/ case 8:
-          vt102_cursor_retard (c->v);
+          vt102_cursor_retreat (c->v);
           break;
          /*HT*/ case 9:
           vt102_cursor_advance_tab (c->v);