From: james <james>
Date: Fri, 22 Feb 2008 14:51:54 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=sympathy.git;a=commitdiff_plain;h=1774913685868a7ab501156a30f355a7372362ea

*** empty log message ***
---

diff --git a/src/log.c b/src/log.c
index c5760d2..65860f3 100644
--- a/src/log.c
+++ b/src/log.c
@@ -10,6 +10,9 @@ static char rcsid[] = "$Id$";
 
 /*
  * $Log$
+ * Revision 1.2  2008/02/22 14:51:54  james
+ * *** empty log message ***
+ *
  * Revision 1.1  2008/02/14 12:14:50  james
  * *** empty log message ***
  *
@@ -20,6 +23,7 @@ static char rcsid[] = "$Id$";
 typedef struct
 {
   LOG_SIGNATURE;
+  int do_close;
   FILE *fp;
 } File_Log;
 
@@ -53,11 +57,14 @@ flog_log (Log * _l, char *buf)
   fflush (l->fp);
 }
 
+
+
+
 static void
 flog_close (Log * _l)
 {
   File_Log *l = (File_Log *) _l;
-  if (l->fp)
+  if (l->fp && l->do_close)
     fclose (l->fp);
   free (l);
 }
@@ -67,16 +74,64 @@ file_log_new (char *fn)
 {
   File_Log *l;
   FILE *f;
+  int dc=1;
 
+  if (fn && strcmp(fn,"-")) {
   f = fopen (fn, "a+");
   if (!f)
     return NULL;
+  } else {
+	f=stderr;
+	dc=0;
+  }
 
   l = malloc (sizeof (File_Log));
 
   l->log = flog_log;
   l->close = flog_close;
   l->fp = f;
+  l->do_close=dc;
 
   return (Log *) l;
 }
+void 
+log_f (Log *log,char *fmt, ...)
+{
+
+  int n;
+  static char *buf;
+  va_list ap;
+  static int size;
+
+  if (!log) return;
+
+  if (!size) {
+  size = 128;
+  buf = malloc (size);
+  }
+
+  if (!buf)
+    return;
+
+  while (1)
+    {
+      va_start (ap, fmt);
+      n = vsnprintf (buf , size, fmt, ap);
+      va_end (ap);
+
+      if (n > -1 && n < size) {
+	log->log(log,buf);
+	return; 
+      }
+
+      if (n > -1)               /* glibc 2.1 */
+        size = n + 1;
+      else                      /* glibc 2.0 */
+        size *= 2;              /* twice the old size */
+
+      buf = realloc (buf, size);
+
+      if (!buf)
+	return;
+    }
+}
diff --git a/src/project.h b/src/project.h
index 1f46906..8d5def2 100644
--- a/src/project.h
+++ b/src/project.h
@@ -12,6 +12,9 @@
 
 /*
  * $Log$
+ * Revision 1.10  2008/02/22 14:51:54  james
+ * *** empty log message ***
+ *
  * Revision 1.9  2008/02/13 18:05:06  james
  * *** empty log message ***
  *
@@ -94,6 +97,8 @@
 #include <utmp.h>
 #include <pty.h>
 
+#include <stdarg.h>
+
 #include "sympathy.h"
 
 #endif /* __PROJECT_H__ */
diff --git a/src/prototypes.h b/src/prototypes.h
index 0f71766..89ada5d 100644
--- a/src/prototypes.h
+++ b/src/prototypes.h
@@ -25,6 +25,7 @@ extern void vt102_do_pending_wrap(Context *c);
 extern void vt102_cursor_retard(VT102 *v);
 extern void vt102_reset_tabs(VT102 *v);
 extern void vt102_cursor_advance_tab(VT102 *v);
+extern void vt102_cursor_retard_tab(VT102 *v);
 extern int vt102_cursor_home(VT102 *v);
 extern int vt102_cursor_absolute(VT102 *v, int x, int y);
 extern int vt102_cursor_relative(VT102 *v, int x, int y);
@@ -36,6 +37,7 @@ extern void vt102_change_attr(VT102 *v, char *na);
 extern void vt102_parse_attr_string(VT102 *v, char *buf, int len);
 extern void vt102_save_state(VT102 *v);
 extern void vt102_restore_state(VT102 *v);
+extern void vt102_regular_char(Context *c, VT102 *v, char ch);
 extern void vt102_scs(Context *c, int g, int s);
 extern void vt102_parse_esc(Context *c, int ch);
 extern void vt102_parse_csi(Context *c, char *buf, int len);
@@ -88,6 +90,7 @@ extern void raw_termios(struct termios *termios);
 extern void default_termios(struct termios *termios);
 /* log.c */
 extern Log *file_log_new(char *fn);
+extern void log_f(Log *log, char *fmt, ...);
 /* ipc.c */
 extern IPC_Msg *ipc_check_for_message_in_slide(Slide *s);
 extern void ipc_consume_message_in_slide(Slide *s);
diff --git a/src/ptty.c b/src/ptty.c
index 1e3ce36..0c69a2b 100644
--- a/src/ptty.c
+++ b/src/ptty.c
@@ -10,6 +10,9 @@ static char rcsid[] = "$Id$";
 
 /*
  * $Log$
+ * Revision 1.6  2008/02/22 14:51:54  james
+ * *** empty log message ***
+ *
  * Revision 1.5  2008/02/15 23:52:12  james
  * *** empty log message ***
  *
@@ -142,7 +145,7 @@ ptty_open (char *path, char *argv[])
     case -1:                   /*boo hiss */
       return NULL;
     case 0:                    /*waaah */
-      setenv ("TERM", "vt102", 1);
+      setenv ("TERM", "ansi", 1);
       setenv ("LANG", "C", 1);
       if (!path)
         path = "/bin/sh";
diff --git a/src/vt102.c b/src/vt102.c
index 586b7d9..d74437f 100644
--- a/src/vt102.c
+++ b/src/vt102.c
@@ -10,6 +10,9 @@ static char rcsid[] = "$Id$";
 
 /*
  * $Log$
+ * Revision 1.30  2008/02/22 14:51:54  james
+ * *** empty log message ***
+ *
  * Revision 1.29  2008/02/15 03:32:07  james
  * *** empty log message ***
  *
@@ -102,6 +105,8 @@ static char rcsid[] = "$Id$";
 
 /* Termcap he say:
 
+VT102:
+
 vt102|dec vt102:\
         :mi:\
         :al=\E[L:dc=\E[P:dl=\E[M:ei=\E[4l:im=\E[4h:tc=vt100:
@@ -192,12 +197,77 @@ ESC)0
 
 CTRL-O
 
+ANSI:
+
+
+
+ansi|ansi/pc-term compatible with color:\
+        :u6=\E[%i%d;%dR:u7=\E[6n:u9=\E[c:tc=ecma+color:\
+        :tc=klone+sgr:tc=ansi-m:
+ansi-m|ansi-mono|ANSI X3.64-1979 terminal with ANSI.SYS compatible attributes:\
+        :5i:\
+        :AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:IC=\E[%d@:\
+        :LE=\E[%dD:RI=\E[%dC:SF=\E[%dS:SR=\E[%dT:UP=\E[%dA:\
+        :cb=\E[1K:ch=\E[%i%dG:ct=\E[2g:cv=\E[%i%dd:ec=\E[%dX:ei=:\
+        :im=:kB=\E[Z:kI=\E[L:kb=^H:kd=\E[B:kl=\E[D:kr=\E[C:ku=\E[A:\
+        :nw=\r\E[S:pf=\E[4i:po=\E[5i:s0=\E(B:s1=\E)B:s2=\E*B:\
+        :s3=\E+B:ta=\E[I:tc=pcansi-m:
+pcansi-m|pcansi-mono|ibm-pc terminal programs claiming to be ansi (mono mode):\
+        :am:bs:mi:ms:\
+        :co#80:it#8:li#24:\
+        :al=\E[L:bl=^G:bt=\E[Z:cd=\E[J:ce=\E[K:cl=\E[H\E[J:\
+        :cm=\E[%i%d;%dH:cr=^M:ct=\E[2g:dc=\E[P:dl=\E[M:do=\E[B:\
+        :ho=\E[H:kb=^H:kd=\E[B:kh=\E[H:kl=\E[D:kr=\E[C:ku=\E[A:\
+        :le=\E[D:nd=\E[C:sf=^J:st=\EH:ta=^I:up=\E[A:\
+        :tc=klone+sgr-dumb:
+klone+sgr-dumb|attribute control for ansi.sys displays (no ESC [ 11 m):\
+        :as=\E[12m:mb=\E[5m:md=\E[1m:me=\E[0;10m:mk=\E[8m:\
+        :mr=\E[7m:se=\E[m:so=\E[7m:ue=\E[m:us=\E[4m:tc=klone+acs:
+klone+acs|alternate character set for ansi.sys displays:\
+        :ac=+\020,\021-\030.^Y0\333`\004a\261f\370g\361h\260j\331k\277l\332m\300n\305o~p\304q\304r\304s_t\303u\264v\301w\302x\263y\363z\362{\343|\330}\234~\376:\
+        :ae=\E[10m:as=\E[11m:
+ecma+color|color control for ECMA-48-compatible terminals:\
+        :Co#8:NC#3:pa#64:\
+        :AB=\E[4%dm:AF=\E[3%dm:op=\E[39;49m:
+
+
+Ignoreing ones in the VT102 spec
+
+ESC[%d@
+ESC[I
+ESC[....R
+ESC[%dS
+ESC[%dT
+ESC[X
+ESC[Z
+
+ESC[c
+*ESC[%db
+ESC[....d
+ESC[....f
+ESC[2g
+ESC[4i
+ESC[5i
+ESC[6n
+
+ESC(B
+ESC)B
+ESC*B
+ESC+B
+
 
 */
 
 #include "project.h"
+#include "syslog.h"
 
 
+static inline int
+safe_ch(int c) {
+if (c<32) return ' ';
+if (c>126) return ' ';
+return c;
+}
 
 static inline int
 csi_ender (int c)
@@ -216,6 +286,8 @@ scs_starter (int c)
     {
     case '(':
     case ')':
+    case '+':
+    case '*':
       return 1;
     }
   return 0;
@@ -348,27 +420,11 @@ vt102_cursor_advance_line (Context * c)
       return;
     }
 
-  v->pos.y++;
+  if (v->pos.y!=v->screen_end.y) v->pos.y++;
   v->pending_wrap = 0;
 }
 
 
-void
-vt102_cursor_advance (Context * c)
-{
-  VT102 *v = c->v;
-
-  if (v->pos.x < v->bottom_margin.x)
-    {
-/*Normal advance*/
-      v->pos.x++;
-      v->pending_wrap = 0;
-      return;
-    }
-  v->pending_wrap++;
-}
-
-
 void
 vt102_do_pending_wrap (Context * c)
 {
@@ -404,6 +460,24 @@ vt102_do_pending_wrap (Context * c)
   vt102_cursor_advance_line (c);
 }
 
+void
+vt102_cursor_advance (Context * c)
+{
+  VT102 *v = c->v;
+
+  if (v->pos.x < v->bottom_margin.x)
+    {
+/*Normal advance*/
+      v->pos.x++;
+      v->pending_wrap = 0;
+      return;
+    }
+  v->pending_wrap++;
+  if (c->v->xn_glitch)
+  	vt102_do_pending_wrap(c);
+}
+
+
 
 void
 vt102_cursor_retard (VT102 * v)
@@ -440,6 +514,20 @@ vt102_cursor_advance_tab (VT102 * v)
   v->pending_wrap = 0;
 }
 
+void
+vt102_cursor_retard_tab (VT102 * v)
+{
+  if (v->pos.x == v->top_margin.x)
+    return;
+  while (v->pos.x > v->top_margin.x)
+    {
+      v->pos.x--;
+      if (v->tabs[v->pos.x])
+        break;
+    }
+  v->pending_wrap = 0;
+}
+
 vt102_cursor_home (VT102 * v)
 {
   v->pos = v->top_margin;
@@ -789,6 +877,23 @@ vt102_restore_state (VT102 * v)
   v->pending_wrap = 0;
 }
 
+void
+vt102_regular_char (Context * c, VT102 * v, char ch)
+{
+
+  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 = 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 (c);
+
+  v->last_reg_char = ch;
+}
+
 void
 vt102_scs (Context * c, int g, int s)
 {
@@ -839,10 +944,8 @@ vt102_parse_esc (Context * c, int ch)
       v->application_keypad_mode = 0;
       break;
     default:
-#if 0
-      fprintf (stderr, "unhandled ESC \\033 \\%03o (ESC %c)\n", ch,
-               (ch < 32) ? '?' : ch);
-#endif
+      log_f (c->l, "<%s:%d unhandled ESC: \\033 \\%03o (ESC %c)>", __FILE__,__LINE__,ch,safe_ch(ch));
+
       ;
     }
 }
@@ -877,12 +980,18 @@ vt102_parse_csi (Context * c, char *buf, int len)
     case '[':
       switch (last)
         {
+        case '@':
+          while (narg--)
+            vt102_insert_into_line (v, v->pos);
+          break;
         case 'A':
           vt102_cursor_relative (v, 0, -narg);
           break;
+        case 'e':
         case 'B':
           vt102_cursor_relative (v, 0, narg);
           break;
+        case 'a':
         case 'C':
           vt102_cursor_relative (v, narg, 0);
           break;
@@ -916,12 +1025,21 @@ vt102_parse_csi (Context * c, char *buf, int len)
             vt102_cursor_absolute (v, x, y);
           }
           break;
+        case 'I':
+          while (narg--)
+            vt102_cursor_advance_tab (c->v);
+          break;
         case 'J':
+            if (len == 2)
+              narg = 0;         /*Different default */
           switch (narg)
             {
-            case 1:
+            case 0:
               crt_erase (&v->crt, v->pos, v->screen_end, 1);
               break;
+            case 1:
+              crt_erase (&v->crt, v->screen_start, v->pos, 1);
+              break;
             case 2:
               crt_erase (&v->crt, v->screen_start, v->screen_end, 1);
               break;
@@ -949,10 +1067,6 @@ vt102_parse_csi (Context * c, char *buf, int len)
           }
           break;
 
-        case 'P':
-          while (narg--)
-            vt102_delete_from_line (v, v->pos);
-          break;
         case 'L':
           if ((v->pos.y >= v->top_margin.y)
               && (v->pos.y <= v->bottom_margin.y))
@@ -973,7 +1087,53 @@ vt102_parse_csi (Context * c, char *buf, int len)
                 }
             }
           break;
+        case 'P':
+          while (narg--)
+            vt102_delete_from_line (v, v->pos);
+          break;
+        case 'R':
+          //FIXME: cursor position report - does anything use that?
+          break;
+        case 'S':
+          while (narg--)
+            {
+              vt102_history (c, v->top_margin, v->bottom_margin);
+              crt_scroll_up (&v->crt, v->top_margin, v->bottom_margin, 1);
+            }
+          break;
+        case 'T':
+          while (narg--)
+            crt_scroll_down (&v->crt, v->top_margin, v->bottom_margin, 1);
+          break;
+        case 'X':
+          {
+            CRT_Pos end = v->pos;
+	    if (!narg) narg++;
 
+            end.x += narg-1;
+            if (end.x > v->bottom_margin.x)
+              end.x = v->bottom_margin.x;
+
+            crt_erase (&v->crt, v->pos, end, 1);
+          }
+          break;
+        case 'Z':
+          while (narg--)
+            vt102_cursor_retard_tab (c->v);
+          break;
+        case '`':
+          vt102_cursor_absolute (v, narg - 1, v->pos.y);
+          break;
+        case 'b':
+          while (narg--)
+            vt102_regular_char (c, v, v->last_reg_char);
+          break;
+        case 'c':
+          //FIXME:
+          break;
+        case 'd':
+          vt102_cursor_absolute (v, v->pos.x, narg - 1);
+          break;
         case 'g':
           if (len == 2)
             narg = 0;           /*Different default */
@@ -983,20 +1143,28 @@ vt102_parse_csi (Context * c, char *buf, int len)
             case 0:
               v->tabs[v->pos.x] = 0;
               break;
+            case 2:            //FIXME: - LA120 says current line only WTF?
             case 3:
               memset (v->tabs, 0, sizeof (v->tabs));
               break;
             }
           break;
 
+        case 'i':              //4,5 Turn printer on and off WTF?
+          //FIXME
+          break;
         case 'h':
         case 'l':
           vt102_parse_mode_string (v, &buf[1], len - 1);
           break;
 
+
         case 'm':
           vt102_parse_attr_string (v, &buf[1], len - 1);
           break;
+        case 'n':              // 6 request cursor position
+          //FIXME 
+          break;
         case 'r':
           v->top_margin = v->screen_start;
           v->bottom_margin = v->screen_end;
@@ -1029,16 +1197,13 @@ vt102_parse_csi (Context * c, char *buf, int len)
           break;
 
         default:
-#if 0
-          fprintf (stderr, "unhandled CSI  \\033%s\n", buf, buf[0]);
-#endif
+      log_f (c->l, "<%s:%d unhandled CSI: \\033%s>", __FILE__,__LINE__,buf);
+
           ;
         }
       break;
     default:
-#if 0
-      fprintf (stderr, "unhandled CSI  \\033%s\n", buf, buf[0]);
-#endif
+      log_f (c->l, "<%s:%d unhandled sequence: \\033%s>", __FILE__,__LINE__,buf);
       ;
     }
 
@@ -1071,44 +1236,45 @@ 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);
+#if 1
+  log_f (c->l, "char %3d %c pc %d %d     %2d %2d %d",ch,safe_ch(ch),
+           p->in_csi, p->in_escape, v->pos.x, v->pos.y,v->pending_wrap);
 #endif
   if (p->in_csi)
     {
       p->csi_buf[p->csi_ptr++] = ch;
       if (csi_ender (ch) || (p->csi_ptr == VT102_CSI_LEN))
         {
-          vt102_parse_csi (c, p->csi_buf, p->csi_ptr);
+          if (csi_starter (p->csi_buf[0]))
+            {
+              vt102_parse_csi (c, p->csi_buf, p->csi_ptr);
+            }
+          else if (scs_starter (p->csi_buf[0]))
+            {
+              vt102_scs (c, p->csi_buf[0], p->csi_buf[1]);
+            }
+          else
+            {
+      log_f (c->l, "<%s:%d no dispatcher for sequence starting \\033 \\%03o (ESC %c)>", __FILE__,__LINE__,p->csi_buf[0],safe_ch(p->csi_buf[0]));
+            }
           p->in_csi = 0;
         }
     }
   else if (p->in_escape)
     {
-      if (csi_starter (ch))
+      if (csi_starter (ch) || scs_starter (ch))
         {
           p->csi_ptr = 0;
           p->csi_buf[p->csi_ptr++] = ch;
           p->in_csi++;
           p->in_escape = 0;
         }
-      else if (scs_starter (ch))
-        {
-          p->in_scs = ch;
-          p->in_escape = 0;
-        }
       else
         {
           p->in_escape = 0;
           vt102_parse_esc (c, ch);
         }
     }
-  else if (p->in_scs)
-    {
-      vt102_scs (c, p->in_scs, ch);
-      p->in_scs = 0;
-    }
   else
     {
 
@@ -1121,6 +1287,7 @@ vt102_parse_char (Context * c, int ch)
          /*EOT*/ case 4:
           break;
          /*ENQ*/ case 5:
+	  if (c->t)
           c->t->xmit (c->t, "vt102", 5);
           break;
          /*ACK*/ case 6:
@@ -1171,15 +1338,7 @@ vt102_parse_char (Context * c, int ch)
          /*DEL*/ case 127:
           break;
         /*regular character */ default:
-          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 = 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 (c);
+          vt102_regular_char (c, v, ch);
         }
     }
 
@@ -1210,7 +1369,6 @@ vt102_parser_reset (VT102_parser * p)
   p->in_csi = 0;
   p->in_escape = 0;
   p->csi_ptr = 0;
-  p->in_scs = 0;
 }
 
 
@@ -1422,6 +1580,10 @@ vt102_reset (VT102 * v)
 
   vt102_status_line (v, "");
 
+  v->last_reg_char = ' ';
+
+  v->xn_glitch=0;
+
 }
 
 int
diff --git a/src/vt102.h b/src/vt102.h
index 4f5ff05..7537969 100644
--- a/src/vt102.h
+++ b/src/vt102.h
@@ -12,6 +12,9 @@
 
 /*
  * $Log$
+ * Revision 1.12  2008/02/22 14:51:54  james
+ * *** empty log message ***
+ *
  * Revision 1.11  2008/02/08 15:06:42  james
  * *** empty log message ***
  *
@@ -64,7 +67,6 @@ typedef struct
   int in_csi;
   int csi_ptr;
   char csi_buf[VT102_CSI_LEN];
-  int in_scs;
 } VT102_parser;
 
 typedef struct
@@ -97,6 +99,9 @@ typedef struct
 
   int application_keypad_mode;
 
+  char last_reg_char;
+
+  int xn_glitch;
 
 } VT102;