#include <stdlib.h>
#include <ctype.h>
+#include <time.h>
#include "putty.h"
#define CL_ANSIMIN 0x0001 /* Codes in all ANSI like terminals. */
static int blinker; /* When blinking is the cursor on ? */
static int tblinker; /* When the blinking text is on */
static int blink_is_real; /* Actually blink blinking text */
+static int term_echoing; /* Does terminal want local echo? */
+static int term_editing; /* Does terminal want local edit? */
static unsigned long cset_attr[2];
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.
rvideo = 0;
cursor_on = 1;
save_attr = curr_attr = ATTR_DEFAULT;
+ term_editing = term_echoing = FALSE;
+ ldisc_send(NULL, 0); /* cause ldisc to notice changes */
app_cursor_keys = cfg.app_cursor;
app_keypad_keys = cfg.app_keypad;
use_bce = cfg.bce;
case 8: /* auto key repeat */
repeat_off = !state;
break;
+ case 10: /* set local edit mode */
+ term_editing = state;
+ ldisc_send(NULL, 0); /* cause ldisc to notice changes */
+ break;
case 25: /* enable/disable cursor */
compatibility2(OTHER,VT220);
cursor_on = state;
insert = state;
break;
case 12: /* set echo mode */
- /*
- * This may be very good in smcup and rmcup (or smkx & rmkx) if you
- * have a long RTT and the telnet client/daemon doesn't understand
- * linemode.
- *
- * DONT send TS_RECHO/TS_LECHO; the telnet daemon tries to fix the
- * tty and _really_ confuses some programs.
- */
- compatibility2(OTHER,VT220);
- ldisc = (state? &ldisc_simple : &ldisc_term);
+ term_echoing = !state;
+ ldisc_send(NULL, 0); /* cause ldisc to notice changes */
break;
case 20: /* Return sends ... */
cr_lf_return = state;
* 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.
* An xterm returns "xterm" (5 characters)
*/
compatibility(OTHER);
- ldisc->send ("PuTTY", 5);
+ ldisc_send ("PuTTY", 5);
break;
case '\007':
beep_count++;
fix_cpos;
seen_disp_event = TRUE;
paste_hold = 0;
+ logtraffic((unsigned char)c,LGTYP_ASCII);
break;
case '\013':
case '\014':
wrapnext = FALSE;
seen_disp_event = 1;
paste_hold = 0;
+ logtraffic((unsigned char)c,LGTYP_ASCII);
break;
case '\t':
{
}
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--;
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);
}
/*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;
break;
case 'Z': /* terminal type query */
compatibility(VT100);
- ldisc->send (id_string, strlen(id_string));
+ ldisc_send (id_string, strlen(id_string));
break;
case 'c': /* restore power-on settings */
compatibility(VT100);
case 'c': /* terminal type query */
compatibility(VT100);
/* This is the response for a VT102 */
- ldisc->send (id_string, strlen(id_string));
+ ldisc_send (id_string, strlen(id_string));
break;
case 'n': /* cursor position query */
if (esc_args[0] == 6) {
char buf[32];
sprintf (buf, "\033[%d;%dR", curs_y + 1, curs_x + 1);
- ldisc->send (buf, strlen(buf));
+ ldisc_send (buf, strlen(buf));
}
else if (esc_args[0] == 5) {
- ldisc->send ("\033[0n", 4);
+ ldisc_send ("\033[0n", 4);
}
break;
case 'h': /* toggle modes to high */
if (i == 0 || i == 1) {
strcpy (buf, "\033[2;1;1;112;112;1;0x");
buf[2] += i;
- ldisc->send (buf, 20);
+ ldisc_send (buf, 20);
}
}
break;
termstate = VT52_Y1;
break;
case 'Z':
- ldisc->send ("\033/Z", 3);
+ ldisc_send ("\033/Z", 3);
break;
case '=':
app_keypad_keys = TRUE;
}
else
cursor = ATTR_PASCURS;
+ if (wrapnext)
+ cursor |= ATTR_RIGHTCURS;
}
else cursor = 0;
rv = (rvideo ? ATTR_REVERSE : 0);
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) )
{
/* Assume a small paste will be OK in one go. */
if (paste_len<256) {
- ldisc->send (paste_buffer, paste_len);
+ ldisc_send (paste_buffer, paste_len);
if (paste_buffer) sfree(paste_buffer);
paste_buffer = 0;
paste_pos = paste_hold = paste_len = 0;
if (paste_buffer[paste_pos + n++] == '\r')
break;
}
- ldisc->send (paste_buffer+paste_pos, n);
+ ldisc_send (paste_buffer+paste_pos, n);
paste_pos += n;
if (paste_pos < paste_len) {
term_update();
}
+int term_ldisc(int option) {
+ if (option == LD_ECHO) return term_echoing;
+ if (option == LD_EDIT) return term_editing;
+ return FALSE;
+}
+
/*
* from_backend(), to get data from the backend for the terminal.
*/
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; }
+}
projects / u / mdw / putty / blobdiff