X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/7e394092f59f29980ec5eef77776f37dda288ea4..c404e5b3bdd2c7e16cdab6c3bc722425085bb83f:/terminal.c diff --git a/terminal.c b/terminal.c index d62c8cd5..70010bd4 100644 --- a/terminal.c +++ b/terminal.c @@ -2,7 +2,9 @@ #include #include +#include +#include #include "putty.h" #define CL_ANSIMIN 0x0001 /* Codes in all ANSI like terminals. */ @@ -18,7 +20,6 @@ #define CL_ANSI 0x2000 /* ANSI ECMA-48 not in the VT100..VT420 */ #define CL_OTHER 0x4000 /* Others, Xterm, linux, putty, dunno, etc */ -#define TM_ANSIMIN (CL_ANSIMIN) #define TM_VT100 (CL_ANSIMIN|CL_VT100) #define TM_VT100AVO (TM_VT100|CL_VT100AVO) #define TM_VT102 (TM_VT100AVO|CL_VT102) @@ -54,6 +55,17 @@ static unsigned long *disptext; /* buffer of text on real screen */ static unsigned long *wanttext; /* buffer of text we want on screen */ static unsigned long *alttext; /* buffer of text on alt. screen */ +#define VBELL_TIMEOUT 100 /* millisecond duration of visual bell */ + +struct beeptime { + struct beeptime *next; + long ticks; +}; +static struct beeptime *beephead, *beeptail; +int nbeeps; +int beep_overloaded; +long lastbeep; + static unsigned char *selspace; /* buffer for building selections in */ #define TSIZE (sizeof(*text)) @@ -77,6 +89,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]; @@ -155,6 +169,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. @@ -177,8 +194,11 @@ static void power_on(void) { alt_cset = cset = 0; cset_attr[0] = cset_attr[1] = ATTR_ASCII; rvideo = 0; + in_vbell = FALSE; 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; @@ -206,11 +226,13 @@ 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(); } do_paint (ctx, TRUE); + sys_cursor(curs_x, curs_y + (scrtop - disptop) / (cols+1)); free_ctx (ctx); } } @@ -245,6 +267,10 @@ void term_init(void) { deselect(); rows = cols = -1; power_on(); + beephead = beeptail = NULL; + nbeeps = 0; + lastbeep = FALSE; + beep_overloaded = FALSE; } /* @@ -701,8 +727,12 @@ 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 */ - compatibility(VT220); + compatibility2(OTHER,VT220); cursor_on = state; seen_disp_event = TRUE; break; @@ -718,16 +748,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. - */ - compatibility(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; @@ -767,9 +789,6 @@ static void do_osc(void) { void term_out(void) { int c, inbuf_reap; -static int beep_overload = 0; - int beep_count = 0; - for(inbuf_reap = 0; inbuf_reap < inbuf_head; inbuf_reap++) { c = inbuf[inbuf_reap]; @@ -778,11 +797,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. @@ -800,13 +816,97 @@ static int beep_overload = 0; * * An xterm returns "xterm" (5 characters) */ - compatibility(OTHER); - ldisc->send ("PuTTY", 5); + compatibility(ANSIMIN); + { + char abuf[256], *s, *d; + int state=0; + for(s=cfg.answerback, d=abuf; *s; s++) { + if (state) + { + if (*s >= 'a' && *s <= 'z') + *d++ = (*s - ('a'-1)); + else if ((*s >='@' && *s<='_') || + *s == '?' || (*s&0x80)) + *d++ = ('@'^*s); + else if (*s == '~') + *d++ = '^'; + state = 0; + } + else if (*s == '^') { + state = 1; + } + else + *d++ = xlat_kbd2tty((unsigned char)*s); + } + ldisc_send (abuf, d-abuf); + } break; case '\007': - beep_count++; - if(beep_count>6) beep_overload=1; - disptop = scrtop; + { + struct beeptime *newbeep; + long ticks; + + ticks = GetTickCount(); + + if (!beep_overloaded) { + newbeep = smalloc(sizeof(struct beeptime)); + newbeep->ticks = ticks; + newbeep->next = NULL; + if (!beephead) + beephead = newbeep; + else + beeptail->next = newbeep; + beeptail = newbeep; + nbeeps++; + } + + /* + * Throw out any beeps that happened more than + * t seconds ago. + */ + while (beephead && + beephead->ticks < ticks - cfg.bellovl_t*1000) { + struct beeptime *tmp = beephead; + beephead = tmp->next; + sfree(tmp); + if (!beephead) + beeptail = NULL; + nbeeps--; + } + + if (cfg.bellovl && beep_overloaded && + ticks-lastbeep >= cfg.bellovl_s * 1000) { + /* + * If we're currently overloaded and the + * last beep was more than s seconds ago, + * leave overload mode. + */ + beep_overloaded = FALSE; + } else if (cfg.bellovl && !beep_overloaded && + nbeeps >= cfg.bellovl_n) { + /* + * Now, if we have n or more beeps + * remaining in the queue, go into overload + * mode. + */ + beep_overloaded = TRUE; + } + lastbeep = ticks; + + /* + * Perform an actual beep if we're not overloaded. + */ + if ((!cfg.bellovl || !beep_overloaded) && cfg.beep != 0) { + if (cfg.beep != 2) + beep(cfg.beep); + else if(cfg.beep == 2) { + in_vbell = TRUE; + vbell_timeout = ticks + VBELL_TIMEOUT; + term_update(); + } + } + disptop = scrtop; + } break; case '\b': if (curs_x == 0 && curs_y == 0) @@ -854,6 +954,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': @@ -869,6 +970,7 @@ static int beep_overload = 0; wrapnext = FALSE; seen_disp_event = 1; paste_hold = 0; + logtraffic((unsigned char)c,LGTYP_ASCII); break; case '\t': { @@ -895,12 +997,20 @@ static int beep_overload = 0; } seen_disp_event = TRUE; break; + case '\177': /* Destructive backspace + This does nothing on a real VT100 */ + compatibility(OTHER); + if (curs_x && !wrapnext) curs_x--; + wrapnext = FALSE; + fix_cpos; + *cpos = (' ' | curr_attr | ATTR_ASCII); + break; } } 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); @@ -920,22 +1030,33 @@ static int beep_overload = 0; * we use the same font as well as the same encoding. */ case ATTR_LINEDRW: - if (c<0x60 || c>0x7F) + if (c<0x5f || c>0x7F) *cpos++ = xlat_tty2scr((unsigned char)c) | curr_attr | ATTR_ASCII; + else if (c==0x5F) + *cpos++ = ' ' | curr_attr | ATTR_ASCII; else *cpos++ = ((unsigned char)c) | curr_attr | ATTR_LINEDRW; break; + case ATTR_GBCHR: + /* If UK-ASCII, make the '#' a LineDraw Pound */ + if (c == '#') { + *cpos++ = '}' | curr_attr | ATTR_LINEDRW; + break; + } + /*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; @@ -1032,7 +1153,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); @@ -1175,16 +1296,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 */ @@ -1229,7 +1350,7 @@ static int beep_overload = 0; /* VTTEST Bug 9 - if region is less than 2 lines * don't change region. */ - if (bot-top > 1) { + if (bot-top > 0) { marg_t = top; marg_b = bot; curs_x = 0; @@ -1291,16 +1412,16 @@ static int beep_overload = 0; case 7: /* enable reverse video */ curr_attr |= ATTR_REVERSE; break; case 22: /* disable bold */ - compatibility(VT220); + compatibility2(OTHER,VT220); curr_attr &= ~ATTR_BOLD; break; case 24: /* disable underline */ - compatibility(VT220); + compatibility2(OTHER,VT220); curr_attr &= ~ATTR_UNDER; break; case 25: /* disable blink */ - compatibility(VT220); + compatibility2(OTHER,VT220); curr_attr &= ~ATTR_BLINK; break; case 27: /* disable reverse video */ - compatibility(VT220); + compatibility2(OTHER,VT220); curr_attr &= ~ATTR_REVERSE; break; case 30: case 31: case 32: case 33: case 34: case 35: case 36: case 37: @@ -1396,7 +1517,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; @@ -1416,8 +1537,8 @@ static int beep_overload = 0; * This first appeared in the VT220, but we do need to get * back to PuTTY mode so I won't check it. * - * The arg == 60 is a PuTTY extension. - * The 2nd arg, 8bit vs 7bit is not obeyed. + * The arg in 40..42 are a PuTTY extension. + * The 2nd arg, 8bit vs 7bit is not checked. * * Setting VT102 mode should also change the Fkeys to * generate PF* codes as a real VT102 has no Fkeys. @@ -1427,9 +1548,47 @@ static int beep_overload = 0; * Note ESC c will NOT change this! */ - if (esc_args[0] == 61) compatibility_level = TM_VT102; - else if (esc_args[0] == 60) compatibility_level = TM_ANSIMIN; - else compatibility_level = TM_PUTTY; + switch (esc_args[0]) { + case 61: compatibility_level &= ~TM_VTXXX; + compatibility_level |= TM_VT102; break; + case 62: compatibility_level &= ~TM_VTXXX; + compatibility_level |= TM_VT220; break; + + default: if( esc_args[0] > 60 && esc_args[0] < 70 ) + compatibility_level |= TM_VTXXX; + break; + + case 40: compatibility_level &= TM_VTXXX; break; + case 41: compatibility_level = TM_PUTTY; break; + case 42: compatibility_level = TM_SCOANSI; break; + + case ARG_DEFAULT: + compatibility_level = TM_PUTTY; break; + case 50: break; + } + + /* Change the response to CSI c */ + if (esc_args[0] == 50) { + int i; + char lbuf[64]; + strcpy(id_string, "\033[?"); + for (i=1; isend ("\033/Z", 3); + ldisc_send ("\033/Z", 3); break; case '=': - app_cursor_keys = TRUE; + app_keypad_keys = TRUE; break; case '>': - app_cursor_keys = FALSE; + app_keypad_keys = FALSE; break; case '<': /* XXX This should switch to VT100 mode not current or default @@ -1669,13 +1828,6 @@ static int beep_overload = 0; check_selection (cpos, cpos+1); } inbuf_head = 0; - - if (beep_overload) - { - if(!beep_count) beep_overload=0; - } - else if(beep_count && beep_count<5 && cfg.beep) - beep(beep_count/3); } /* @@ -1695,11 +1847,27 @@ static int linecmp (unsigned long *a, unsigned long *b) { * Given a context, update the window. Out of paranoia, we don't * allow WM_PAINT responses to do scrolling optimisations. */ -static void do_paint (Context ctx, int may_optimise){ +static void do_paint (Context ctx, int may_optimise){ int i, j, start, our_curs_y; unsigned long attr, rv, cursor; char ch[1024]; + long ticks; + + /* + * Check the visual bell state. + */ + if (in_vbell) { + ticks = GetTickCount(); + if (ticks - vbell_timeout >= 0) + in_vbell = FALSE; + } + /* Depends on: + * screen array, disptop, scrtop, + * selection, rv, + * cfg.blinkpc, blink_is_real, tblinker, + * curs_y, curs_x, blinker, cfg.blink_cur, cursor_on, has_focus + */ if (cursor_on) { if (has_focus) { if (blinker || !cfg.blink_cur) @@ -1709,9 +1877,12 @@ 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); + else + cursor = 0; + rv = (!rvideo ^ !in_vbell ? ATTR_REVERSE : 0); our_curs_y = curs_y + (scrtop - disptop) / (cols+1); for (i=0; i=0 && blink_diff<450) + /* Make sure the cursor blinks no faster than GetCaretBlinkTime() */ + if (blink_diff>=0 && blink_diff<(long)GetCaretBlinkTime()) return; last_blink = now; @@ -1860,6 +2030,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) + { + int ch = (*top & CHAR_MASK); + int set = (*top & CSET_MASK); + + /* VT Specials -> ISO8859-1 for Cut&Paste */ + static const unsigned char poorman2[] = +"* # HTFFCRLF\xB0 \xB1 NLVT+ + + + + - - - - - + + + + | <=>=PI!=\xA3 \xB7 "; + + if (set && !cfg.rawcnp) { + if (set == ATTR_LINEDRW && ch >= 0x60 && ch < 0x7F) { + int x; + if ((x = poorman2[2*(ch-0x60)+1]) == ' ') + x = 0; + ch = (x<<8) + poorman2[2*(ch-0x60)]; + } + } + + while(ch != 0) { + if (cfg.rawcnp || !!(ch&0xE0)) { + if ( wblen == buflen ) + { + workbuf = srealloc(workbuf, buflen += 100); + wbptr = workbuf + wblen; + } + wblen++; + *wbptr++ = (unsigned char) ch; + } + ch>>=8; + } + 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. */ @@ -1977,30 +2226,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) - *p++ = (unsigned char) (*q++ & CHAR_MASK); - 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; @@ -2063,7 +2289,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; @@ -2079,10 +2305,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; } @@ -2101,3 +2332,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; } +}