X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/8ac3e544024e4573a6eabc8f482e5b934fdf7f3a..0965bee0865fd8ea129b2de62a3c50e09c59a184:/terminal.c diff --git a/terminal.c b/terminal.c index 81603e5b..0f4504ac 100644 --- a/terminal.c +++ b/terminal.c @@ -1,15 +1,10 @@ #include -#ifndef AUTO_WINSOCK -#ifdef WINSOCK_TWO -#include -#else -#include -#endif -#endif #include #include +#include +#include #include "putty.h" #define CL_ANSIMIN 0x0001 /* Codes in all ANSI like terminals. */ @@ -83,6 +78,8 @@ static int use_bce; /* Use Background coloured erase */ 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]; @@ -161,6 +158,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. @@ -185,6 +185,8 @@ static void power_on(void) { 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; @@ -212,7 +214,7 @@ void term_update(void) { ctx = get_ctx(); if (ctx) { if ( (seen_key_event && (cfg.scroll_on_key)) || - (seen_disp_event && (!cfg.scroll_on_key)) ) { + (seen_disp_event && (cfg.scroll_on_disp)) ) { disptop = scrtop; seen_disp_event = seen_key_event = 0; update_sbar(); @@ -709,6 +711,10 @@ static void toggle_mode (int mode, int query, int state) { 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; @@ -726,16 +732,8 @@ static void toggle_mode (int mode, int query, int 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; @@ -786,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. @@ -809,7 +804,7 @@ static int beep_overload = 0; * An xterm returns "xterm" (5 characters) */ compatibility(OTHER); - ldisc->send ("PuTTY", 5); + ldisc_send ("PuTTY", 5); break; case '\007': beep_count++; @@ -862,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': @@ -877,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': { @@ -903,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--; @@ -916,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); @@ -952,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; @@ -1057,7 +1056,7 @@ static int beep_overload = 0; 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); @@ -1200,16 +1199,16 @@ static int beep_overload = 0; 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 */ @@ -1421,7 +1420,7 @@ static int beep_overload = 0; 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; @@ -1693,7 +1692,7 @@ static int beep_overload = 0; termstate = VT52_Y1; break; case 'Z': - ldisc->send ("\033/Z", 3); + ldisc_send ("\033/Z", 3); break; case '=': app_keypad_keys = TRUE; @@ -1772,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); @@ -1782,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) ) { @@ -1923,6 +1923,85 @@ void term_scroll (int rel, int where) { term_update(); } +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 */ + + if ( workbuf != NULL ) { /* user supplied buffer? */ + buflen = -1; /* assume buffer passed in is big enough */ + wbptr = workbuf; /* start filling here */ + } + else + buflen = 0; /* No data is available yet */ + + while (top < bottom) { + int nl = FALSE; + unsigned long *lineend = top - (top-text) % (cols+1) + cols; + unsigned long *nlpos = lineend; + + if (!(*nlpos & ATTR_WRAPPED)) { + while ((nlpos[-1] & CHAR_MASK) == 0x20 && nlpos > top) + nlpos--; + if (nlpos < bottom) + nl = TRUE; + } + while (top < nlpos && top < bottom) + { +#if 0 + /* VT Specials -> ISO8859-1 */ + static const char poorman2[] = +"* # HTFFCRLF\xB0 \xB1 NLVT+ + + + + - - - - - + + + + | <=>=PI!=\xA3 \xB7 "; +#endif + + int ch = (*top & CHAR_MASK); + +#if 0 + if ((*top & ATTR_LINEDRW) && ch >= 0x60 && ch < 0x7F) { + int x; + *wbptr++ = poorman2[2*(ch-0x60)]; + if ( (x = poorman2[2*(ch-0x60)+1]) != ' ') + *wbptr++ = x; + } else +#endif +#if 0 + if ((*top & ATTR_GBCHR) && ch == '#') + *wbptr++ = (unsigned char) 0xA3; + else +#endif + if ( wblen == buflen ) + { + workbuf = srealloc(workbuf, buflen += 100); + wbptr = workbuf + wblen; + } + wblen++; + *wbptr++ = (unsigned char) ch; + top++; + } + if (nl) { + int i; + for (i=0; i 0 ) /* indicates we allocated this buffer */ + sfree(workbuf); + +} +void term_copyall (void) { + clipme(sbtop, cpos, NULL /* dynamic allocation */); +} + /* * Spread the selection outwards according to the selection mode. */ @@ -2040,54 +2119,7 @@ void term_mouse (Mouse_Button b, Mouse_Action a, int x, int y) { * We've completed a selection. We now transfer the * data to the clipboard. */ - unsigned char *p = selspace; - unsigned long *q = selstart; - - while (q < selend) { - int nl = FALSE; - unsigned long *lineend = q - (q-text) % (cols+1) + cols; - unsigned long *nlpos = lineend; - - if (!(*nlpos & ATTR_WRAPPED)) { - while ((nlpos[-1] & CHAR_MASK) == 0x20 && nlpos > q) - nlpos--; - if (nlpos < selend) - nl = TRUE; - } - while (q < nlpos && q < selend) - { -#if 0 - /* VT Specials -> ISO8859-1 */ - static const char poorman2[] = - "* # HTFFCRLF\xB0 \xB1 NLVT+ + + + + - - - - - + + + + | <=>=PI!=\xA3 \xB7 "; -#endif - - int ch = (*q & CHAR_MASK); - -#if 0 - if ((*q & ATTR_LINEDRW) && ch >= 0x60 && ch < 0x7F) { - int x; - *p++ = poorman2[2*(ch-0x60)]; - if ( (x = poorman2[2*(ch-0x60)+1]) != ' ') - *p++ = x; - } else -#endif -#if 0 - if ((*q & ATTR_GBCHR) && ch == '#') - *p++ = (unsigned char) 0xA3; - else -#endif - *p++ = (unsigned char) ch; - q++; - } - if (nl) { - int i; - for (i=0; isend (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; @@ -2150,7 +2182,7 @@ void term_nopaste() { } void term_paste() { -static long last_paste = 0; + static long last_paste = 0; long now, paste_diff; if(paste_len == 0) return; @@ -2166,10 +2198,15 @@ static long last_paste = 0; while(paste_possend (&c, 1); + int n = 0; + while (n + paste_pos < paste_len) { + if (paste_buffer[paste_pos + n++] == '\r') + break; + } + ldisc_send (paste_buffer+paste_pos, n); + paste_pos += n; - if (c =='\r') { + if (paste_pos < paste_len) { paste_hold = 1; return; } @@ -2188,3 +2225,82 @@ void term_deselect (void) { deselect(); 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. + */ +void from_backend(int is_stderr, char *data, int len) { + while (len--) { + if (inbuf_head >= INBUF_SIZE) + term_out(); + 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" : "") ); + /* 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; } +}