X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/putty/blobdiff_plain/bc1235d46977981e2ce7a8684f123da84d07286b..3ac9cd9f913cd762475a710a2ae2163b74a55c46:/terminal.c

diff --git a/terminal.c b/terminal.c
index 116d6974..49c0ddf9 100644
--- a/terminal.c
+++ b/terminal.c
@@ -4,6 +4,7 @@
 #include <stdlib.h>
 #include <ctype.h>
 
+#include <time.h>
 #include "putty.h"
 
 #define CL_ANSIMIN	0x0001	/* Codes in all ANSI like terminals. */
@@ -155,6 +156,9 @@ static void erase_lots (int, int, int);
 static void swap_screen (int);
 static void update_sbar (void);
 static void deselect (void);
+/* log session to file stuff ... */
+static FILE *lgfp = NULL;
+static void logtraffic(unsigned char c, int logmode);
 
 /*
  * Set up power-on settings for the terminal.
@@ -780,11 +784,8 @@ static int beep_overload = 0;
          * Optionally log the session traffic to a file. Useful for
          * debugging and possibly also useful for actual logging.
          */
-	if (logfile) {
-	    static FILE *fp = NULL;
-	    if (!fp) fp = fopen(logfile, "wb");
-	    if (fp) fputc (c, fp);
-	}
+	logtraffic((unsigned char)c, LGTYP_DEBUG);
+
 	/* Note only VT220+ are 8-bit VT102 is seven bit, it shouldn't even
 	 * be able to display 8-bit characters, but I'll let that go 'cause
 	 * of i18n.
@@ -856,6 +857,7 @@ static int beep_overload = 0;
 		fix_cpos;
 		seen_disp_event = TRUE;
 		paste_hold = 0;
+		logtraffic((unsigned char)c,LGTYP_ASCII);
 		break;
 	      case '\013':
 	      case '\014':
@@ -871,6 +873,7 @@ static int beep_overload = 0;
 		wrapnext = FALSE;
 		seen_disp_event = 1;
 		paste_hold = 0;
+		logtraffic((unsigned char)c,LGTYP_ASCII);
 		break;
 	      case '\t':
 		{
@@ -897,7 +900,7 @@ static int beep_overload = 0;
 		}
 		seen_disp_event = TRUE;
 		break;
-	      case '\177': /* Destructive backspace 
+	      case '\177': /* Destructive backspace
 			      This does nothing on a real VT100 */
 	        compatibility(OTHER);
 		if (curs_x && !wrapnext) curs_x--;
@@ -910,7 +913,7 @@ static int beep_overload = 0;
 	else switch (termstate) {
 	  case TOPLEVEL:
 	  /* Only graphic characters get this far, ctrls are stripped above */
-	    if (wrapnext) {
+	    if (wrapnext && wrap) {
 		cpos[1] |= ATTR_WRAPPED;
 		if (curs_y == marg_b)
 		    scroll (marg_t, marg_b, 1, TRUE);
@@ -946,15 +949,17 @@ static int beep_overload = 0;
 		}
 		/*FALLTHROUGH*/
 	    default:
-	        *cpos++ = xlat_tty2scr((unsigned char)c) | curr_attr |
+		*cpos = xlat_tty2scr((unsigned char)c) | curr_attr |
 		    (c <= 0x7F ? cset_attr[cset] : ATTR_ASCII);
+		logtraffic((unsigned char)c, LGTYP_ASCII);
+		cpos++;
 		break;
 	    }
 	    curs_x++;
 	    if (curs_x == cols) {
 		cpos--;
 		curs_x--;
-		wrapnext = wrap;
+		wrapnext = TRUE;
 	    }
 	    seen_disp_event = 1;
 	    break;
@@ -1766,6 +1771,8 @@ static void do_paint (Context ctx, int may_optimise){
         }
         else
             cursor = ATTR_PASCURS;
+	if (wrapnext)
+	    cursor |= ATTR_RIGHTCURS;
     }
     else           cursor = 0;
     rv = (rvideo ? ATTR_REVERSE : 0);
@@ -1776,11 +1783,10 @@ static void do_paint (Context ctx, int may_optimise){
 	int lattr = (disptop[idx+cols] & LATTR_MODE);
 	for (j=0; j<=cols; j++,idx++) {
 	    unsigned long *d = disptop+idx;
-	    wanttext[idx] = lattr | ((*d ^ rv
+	    wanttext[idx] = lattr | (((*d &~ ATTR_WRAPPED) ^ rv
 			      ^ (selstart <= d && d < selend ?
 				 ATTR_REVERSE : 0)) |
 			     (i==our_curs_y && j==curs_x ? cursor : 0));
-
 	    if (blink_is_real) {
 		if (has_focus && tblinker && (wanttext[idx]&ATTR_BLINK) )
 		{
@@ -1917,7 +1923,7 @@ void term_scroll (int rel, int where) {
     term_update();
 }
 
-static void clipme(long *top, long *bottom, char *workbuf) {
+static void clipme(unsigned long *top, unsigned long *bottom, char *workbuf) {
     char *wbptr;		/* where next char goes within workbuf */
     int wblen = 0;		/* workbuf len */
     int buflen;			/* amount of memory allocated to workbuf */
@@ -2230,3 +2236,65 @@ void from_backend(int is_stderr, char *data, int len) {
 	inbuf[inbuf_head++] = *data++;
     }
 }
+
+/*
+ * Log session traffic.
+ */
+void logtraffic(unsigned char c, int logmode) {
+    if (cfg.logtype > 0) {
+	if (cfg.logtype == logmode) {
+	    /* deferred open file from pgm start? */
+	    if (!lgfp) logfopen();
+	    if (lgfp) fputc (c, lgfp);
+    	}
+    }
+}
+
+/* open log file append/overwrite mode */
+void logfopen(void) {
+    char buf[256];
+    time_t t;
+    struct tm *tm;
+    char writemod[4];
+
+    if (!cfg.logtype)
+	return;
+    sprintf (writemod, "wb");	       /* default to rewrite */
+    lgfp = fopen(cfg.logfilename, "r");  /* file already present? */
+    if (lgfp) {
+	int i;
+	fclose(lgfp);
+	i = askappend(cfg.logfilename);
+	if (i == 1)
+	    writemod[0] = 'a';	       /* set append mode */
+	else if (i == 0) {	       /* cancelled */
+	    lgfp = NULL;
+            cfg.logtype = 0;           /* disable logging */
+	    return;
+	}
+    }
+
+    lgfp = fopen(cfg.logfilename, writemod);
+    if (lgfp) { /* enter into event log */
+	sprintf(buf, "%s session log (%s mode) to file : ",
+		(writemod[0] == 'a') ? "Appending" : "Writing new",
+		(cfg.logtype == LGTYP_ASCII ? "ASCII" :
+		 cfg.logtype == LGTYP_DEBUG ? "raw" : "<ukwn>")  );
+	/* Make sure we do not exceed the output buffer size */
+	strncat (buf, cfg.logfilename, 128);
+	buf[strlen(buf)] = '\0';
+	logevent(buf);
+
+        /* --- write header line iinto log file */
+	fputs ("=~=~=~=~=~=~=~=~=~=~=~= PuTTY log ", lgfp);
+	time(&t);
+	tm = localtime(&t);
+	strftime(buf, 24, "%Y.%m.%d %H:%M:%S", tm);
+	fputs (buf, lgfp);
+	fputs (" =~=~=~=~=~=~=~=~=~=~=~=\r\n", lgfp);
+    }
+}
+
+void logfclose (void) {
+    if (lgfp) { fclose(lgfp); lgfp = NULL; }
+}