X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/094ed2a65755b01fb3d8a29167033f551be962ef..fe50e8140a2dbb3ba357a0ab777f34e07d568c23:/terminal.c diff --git a/terminal.c b/terminal.c index 2c411453..4cd003aa 100644 --- a/terminal.c +++ b/terminal.c @@ -1,14 +1,60 @@ #include +#ifndef AUTO_WINSOCK +#ifdef WINSOCK_TWO +#include +#else +#include +#endif +#endif #include #include #include "putty.h" +#define CL_ANSIMIN 0x0001 /* Codes in all ANSI like terminals. */ +#define CL_VT100 0x0002 /* VT100 */ +#define CL_VT100AVO 0x0004 /* VT100 +AVO; 132x24 (not 132x14) & attrs */ +#define CL_VT102 0x0008 /* VT102 */ +#define CL_VT220 0x0010 /* VT220 */ +#define CL_VT320 0x0020 /* VT320 */ +#define CL_VT420 0x0040 /* VT420 */ +#define CL_VT510 0x0080 /* VT510, NB VT510 includes ANSI */ +#define CL_VT340TEXT 0x0100 /* VT340 extensions that appear in the VT420 */ +#define CL_SCOANSI 0x1000 /* SCOANSI not in ANSIMIN. */ +#define CL_ANSI 0x2000 /* ANSI ECMA-48 not in the VT100..VT420 */ +#define CL_OTHER 0x4000 /* Others, Xterm, linux, putty, dunno, etc */ + +#define TM_VT100 (CL_ANSIMIN|CL_VT100) +#define TM_VT100AVO (TM_VT100|CL_VT100AVO) +#define TM_VT102 (TM_VT100AVO|CL_VT102) +#define TM_VT220 (TM_VT102|CL_VT220) +#define TM_VTXXX (TM_VT220|CL_VT340TEXT|CL_VT510|CL_VT420|CL_VT320) +#define TM_SCOANSI (CL_ANSIMIN|CL_SCOANSI) + +#define TM_PUTTY (0xFFFF) + +#define compatibility(x) \ + if ( ((CL_##x)&compatibility_level) == 0 ) { \ + termstate=TOPLEVEL; \ + break; \ + } +#define compatibility2(x,y) \ + if ( ((CL_##x|CL_##y)&compatibility_level) == 0 ) { \ + termstate=TOPLEVEL; \ + break; \ + } + +#define has_compat(x) ( ((CL_##x)&compatibility_level) != 0 ) + +static int compatibility_level = TM_PUTTY; + + static unsigned long *text; /* buffer of text on terminal screen */ static unsigned long *scrtop; /* top of working screen */ static unsigned long *disptop; /* top of displayed screen */ static unsigned long *sbtop; /* top of scrollback */ +static unsigned long *sbbot; /* furthest extent of scrollback */ static unsigned long *cpos; /* cursor position (convenience) */ static unsigned long *disptext; /* buffer of text on real screen */ static unsigned long *wanttext; /* buffer of text we want on screen */ @@ -20,6 +66,7 @@ static unsigned char *selspace; /* buffer for building selections in */ #define fix_cpos do { cpos = scrtop + curs_y * (cols+1) + curs_x; } while(0) static unsigned long curr_attr, save_attr; +static unsigned long erase_char = ERASE_CHAR; static int curs_x, curs_y; /* cursor */ static int save_x, save_y; /* saved cursor position */ @@ -30,6 +77,12 @@ static int insert; /* insert-mode flag */ static int cset; /* 0 or 1: which char set */ static int save_cset, save_csattr; /* saved with cursor position */ static int rvideo; /* global reverse video flag */ +static int cursor_on; /* cursor enabled flag */ +static int reset_132; /* Flag ESC c resets to 80 cols */ +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 unsigned long cset_attr[2]; @@ -41,29 +94,40 @@ static int alt_t, alt_b; static int alt_which; #define ARGS_MAX 32 /* max # of esc sequence arguments */ -#define ARG_DEFAULT -1 /* if an arg isn't specified */ +#define ARG_DEFAULT 0 /* if an arg isn't specified */ #define def(a,d) ( (a) == ARG_DEFAULT ? (d) : (a) ) static int esc_args[ARGS_MAX]; static int esc_nargs; static int esc_query; +#define ANSI(x,y) ((x)+((y)<<8)) +#define ANSI_QUE(x) ANSI(x,TRUE) #define OSC_STR_MAX 2048 static int osc_strlen; static char osc_string[OSC_STR_MAX+1]; static int osc_w; -static unsigned char *tabs; - -#define MAXNL 5 -static int nl_count; +static char id_string[1024] = "\033[?6c"; -static int scroll_heuristic; +static unsigned char *tabs; static enum { - TOPLEVEL, IGNORE_NEXT, - SEEN_ESC, SEEN_CSI, SET_GL, SET_GR, - SEEN_OSC, SEEN_OSC_P, SEEN_OSC_W, OSC_STRING, OSC_MAYBE_ST, - SEEN_ESCHASH + TOPLEVEL, + SEEN_ESC, + SEEN_CSI, + SEEN_OSC, + SEEN_OSC_W, + + DO_CTRLS, + + IGNORE_NEXT, + SET_GL, SET_GR, + SEEN_OSC_P, + OSC_STRING, OSC_MAYBE_ST, + SEEN_ESCHASH, + VT52_ESC, + VT52_Y1, + VT52_Y2 } termstate; static enum { @@ -86,6 +150,8 @@ static short wordness[256] = { }; static unsigned char sel_nl[] = SEL_NL; +static char * paste_buffer = 0; +static int paste_len, paste_pos, paste_hold; /* * Internal prototypes. @@ -117,9 +183,13 @@ static void power_on(void) { alt_cset = cset = 0; cset_attr[0] = cset_attr[1] = ATTR_ASCII; rvideo = 0; + cursor_on = 1; save_attr = curr_attr = ATTR_DEFAULT; app_cursor_keys = cfg.app_cursor; app_keypad_keys = cfg.app_keypad; + use_bce = cfg.bce; + blink_is_real = cfg.blinktext; + erase_char = ERASE_CHAR; alt_which = 0; { int i; @@ -141,10 +211,15 @@ void term_update(void) { Context ctx; ctx = get_ctx(); if (ctx) { + if ( (seen_key_event && (cfg.scroll_on_key)) || + (seen_disp_event && (!cfg.scroll_on_key)) ) { + 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); - nl_count = 0; - scroll_heuristic = 0; } } @@ -171,13 +246,12 @@ void term_clrsb(void) { * Initialise the terminal. */ void term_init(void) { - text = sbtop = scrtop = disptop = cpos = NULL; + text = sbtop = sbbot = scrtop = disptop = cpos = NULL; disptext = wanttext = NULL; tabs = NULL; selspace = NULL; deselect(); rows = cols = -1; - nl_count = 0; power_on(); } @@ -188,34 +262,44 @@ void term_size(int newrows, int newcols, int newsavelines) { unsigned long *newtext, *newdisp, *newwant, *newalt; int i, j, crows, ccols; + int save_alt_which = alt_which; + if (newrows == rows && newcols == cols && newsavelines == savelines) return; /* nothing to do */ + deselect(); + swap_screen(0); + alt_t = marg_t = 0; alt_b = marg_b = newrows - 1; newtext = smalloc ((newrows+newsavelines)*(newcols+1)*TSIZE); - disptop = newtext + newsavelines*(newcols+1); + sbbot = newtext + newsavelines*(newcols+1); for (i=0; i<(newrows+newsavelines)*(newcols+1); i++) - newtext[i] = ERASE_CHAR; + newtext[i] = erase_char; if (rows != -1) { crows = rows + (scrtop - sbtop) / (cols+1); if (crows > newrows+newsavelines) crows = newrows+newsavelines; + if (newrows>crows) + disptop = newtext; + else + disptop = newtext + (crows-newrows)*(newcols+1); ccols = (cols < newcols ? cols : newcols); for (i=0; i disptop) - sbtop = disptop; - } else - sbtop = disptop; + sbtop = newtext; + } else { + sbtop = disptop = newtext; + } scrtop = disptop; sfree (text); text = newtext; @@ -234,7 +318,7 @@ void term_size(int newrows, int newcols, int newsavelines) { newalt = smalloc (newrows*(newcols+1)*TSIZE); for (i=0; i botline - topline + 1) + lines = botline - topline + 1; scroll_top = scrtop + topline*(cols+1); size = (lines < 0 ? -lines : lines) * (cols+1); scroll_size = (botline - topline + 1) * (cols+1) - size; - if (lines > 0 && topline == 0 && botline == (rows-1) && sb) { + if (lines > 0 && topline == 0 && alt_which == 0 && sb) { /* - * Since we're going to scroll the whole screen upwards, - * let's also affect the scrollback buffer. + * Since we're going to scroll the top line and we're on the + * scrolling screen let's also effect the scrollback buffer. + * + * This is normally done by moving the position the screen + * painter reads from to reduce the amount of memory copying + * required. */ - sbtop -= lines * (cols+1); - if (sbtop < text) - sbtop = text; - scroll_size += scroll_top - sbtop; - scroll_top = sbtop; - update_sbar(); + if (scroll_size >= 0 && !recursive) { + newscr = scrtop + lines * (cols+1); + + if (newscr > sbbot && botline == rows-1) { + /* We've hit the bottom of memory, so we have to do a + * physical scroll. But instead of just 1 line do it + * by 10% of the available memory. + * + * If the scroll region isn't the whole screen then we can't + * do this as it stands. We would need to recover the bottom + * of the screen from the scroll buffer after being sure that + * it doesn't get deleted. + */ + + i = (rows+savelines)/10; + + /* Make it simple and ensure safe recursion */ + if ( i scroll_top && selstart < scroll_top + size + scroll_size) { selstart -= size; @@ -380,11 +534,20 @@ static void scroll (int topline, int botline, int lines, int sb) { if (selend < scroll_top) selend = scroll_top; } + if (scrtop_is_disptop) + disptop = scrtop; + else + if (disptop > scroll_top && + disptop < scroll_top + size + scroll_size) { + disptop -= size; + if (disptop < scroll_top) + disptop = scroll_top; + } } else { if (scroll_size) memmove (scroll_top + size, scroll_top, scroll_size*TSIZE); for (i = 0; i < size; i++) - scroll_top[i] = ERASE_CHAR; + scroll_top[i] = erase_char; if (selstart > scroll_top && selstart < scroll_top + size + scroll_size) { selstart += size; @@ -397,9 +560,15 @@ static void scroll (int topline, int botline, int lines, int sb) { if (selend > scroll_top + size + scroll_size) selend = scroll_top + size + scroll_size; } + if (scrtop_is_disptop) + disptop = scrtop; + else if (disptop > scroll_top && + disptop < scroll_top + size + scroll_size) { + disptop += size; + if (disptop > scroll_top + size + scroll_size) + disptop = scroll_top + size + scroll_size; + } } - - scroll_heuristic += lines; } /* @@ -442,10 +611,15 @@ static void save_cursor(int save) { } else { curs_x = save_x; curs_y = save_y; + /* Make sure the window hasn't shrunk since the save */ + if (curs_x >= cols) curs_x = cols-1; + if (curs_y >= rows) curs_y = rows-1; + curr_attr = save_attr; cset = save_cset; cset_attr[cset] = save_csattr; fix_cpos; + if (use_bce) erase_char = (' ' |(curr_attr&(ATTR_FGMASK|ATTR_BGMASK))); } } @@ -458,7 +632,10 @@ static void erase_lots (int line_only, int from_begin, int to_end) { if (line_only) { startpos = cpos - curs_x; - endpos = startpos + cols+1; + endpos = startpos + cols; + /* I've removed the +1 so that the Wide screen stuff is not + * removed when it shouldn't be. + */ } else { startpos = scrtop; endpos = startpos + rows * (cols+1); @@ -466,10 +643,15 @@ static void erase_lots (int line_only, int from_begin, int to_end) { if (!from_begin) startpos = cpos; if (!to_end) - endpos = cpos; + endpos = cpos+1; check_selection (startpos, endpos); + + /* Clear screen also forces a full window redraw, just in case. */ + if (startpos == scrtop && endpos == scrtop + rows * (cols+1)) + term_invalidate(); + while (startpos < endpos) - *startpos++ = ERASE_CHAR; + *startpos++ = erase_char; } /* @@ -488,11 +670,11 @@ static void insch (int n) { if (dir < 0) { memmove (cpos, cpos+n, m*TSIZE); while (n--) - cpos[m++] = ERASE_CHAR; + cpos[m++] = erase_char; } else { memmove (cpos+n, cpos, m*TSIZE); while (n--) - cpos[n] = ERASE_CHAR; + cpos[n] = erase_char; } } @@ -505,13 +687,18 @@ static void toggle_mode (int mode, int query, int state) { case 1: /* application cursor keys */ app_cursor_keys = state; break; + case 2: /* VT52 mode */ + vt52_mode = !state; + break; case 3: /* 80/132 columns */ deselect(); - request_resize (state ? 132 : 80, rows); + request_resize (state ? 132 : 80, rows, 1); + reset_132 = state; break; case 5: /* reverse video */ rvideo = state; - disptop = scrtop; + seen_disp_event = TRUE; + if (state) term_update(); break; case 6: /* DEC origin mode */ dec_om = state; @@ -519,15 +706,40 @@ static void toggle_mode (int mode, int query, int state) { case 7: /* auto wrap */ wrap = state; break; + case 8: /* auto key repeat */ + repeat_off = !state; + break; + case 25: /* enable/disable cursor */ + compatibility2(OTHER,VT220); + cursor_on = state; + seen_disp_event = TRUE; + break; case 47: /* alternate screen */ + compatibility(OTHER); deselect(); swap_screen (state); disptop = scrtop; break; } else switch (mode) { case 4: /* set insert mode */ + compatibility(VT102); 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); + break; + case 20: /* Return sends ... */ + cr_lf_return = state; + break; } } @@ -561,56 +773,86 @@ static void do_osc(void) { * process escape sequences... */ void term_out(void) { - int c; - int must_update = FALSE; + int c, inbuf_reap; + +static int beep_overload = 0; + int beep_count = 0; - while ( (c = inbuf_getc()) != -1) { -#ifdef LOG - { + for(inbuf_reap = 0; inbuf_reap < inbuf_head; inbuf_reap++) + { + c = inbuf[inbuf_reap]; + + /* + * 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("putty.log", "wb"); + if (!fp) fp = fopen(logfile, "wb"); if (fp) fputc (c, fp); } -#endif - switch (termstate) { - case TOPLEVEL: - do_toplevel: + /* 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. + */ + if( ( (c&0x60) == 0 || c == '\177') && + termstate < DO_CTRLS && + ( (c&0x80) == 0 || has_compat(VT220))) { switch (c) { case '\005': /* terminal type query */ - back->send ("\033[?1;2c", 7); + /* Strictly speaking this is VT100 but a VT100 defaults to + * no response. Other terminals respond at their option. + * + * Don't put a CR in the default string as this tends to + * upset some weird software. + * + * An xterm returns "xterm" (5 characters) + */ + compatibility(OTHER); + ldisc->send ("PuTTY", 5); break; case '\007': - beep(); + beep_count++; + if(beep_count>6) beep_overload=1; disptop = scrtop; - must_update = TRUE; break; case '\b': - if (curs_x == 0 && curs_y > 0) + if (curs_x == 0 && curs_y == 0) + ; + else if (curs_x == 0 && curs_y > 0) curs_x = cols-1, curs_y--; else if (wrapnext) wrapnext = FALSE; else curs_x--; fix_cpos; - disptop = scrtop; - must_update = TRUE; + seen_disp_event = TRUE; break; case '\016': + compatibility(VT100); cset = 1; break; case '\017': + compatibility(VT100); cset = 0; break; case '\033': - termstate = SEEN_ESC; + if (vt52_mode) + termstate = VT52_ESC; + else { + compatibility(ANSIMIN); + termstate = SEEN_ESC; + } break; case 0233: + compatibility(VT220); termstate = SEEN_CSI; esc_nargs = 1; esc_args[0] = ARG_DEFAULT; esc_query = FALSE; break; case 0235: + compatibility(VT220); termstate = SEEN_OSC; esc_args[0] = 0; break; @@ -618,65 +860,111 @@ void term_out(void) { curs_x = 0; wrapnext = FALSE; fix_cpos; - disptop = scrtop; - must_update = TRUE; + seen_disp_event = TRUE; + paste_hold = 0; break; case '\013': case '\014': + compatibility(VT100); case '\n': if (curs_y == marg_b) scroll (marg_t, marg_b, 1, TRUE); else if (curs_y < rows-1) curs_y++; - if (cfg.lfhascr) - curs_x = 0; + if (cfg.lfhascr) + curs_x = 0; fix_cpos; wrapnext = FALSE; - disptop = scrtop; - nl_count++; + seen_disp_event = 1; + paste_hold = 0; break; case '\t': - do { - curs_x++; - } while (curs_x < cols-1 && !tabs[curs_x]); - if (curs_x >= cols) - curs_x = cols-1; { unsigned long *old_cpos = cpos; + unsigned long *p = scrtop + curs_y * (cols+1) + cols; + + do { + curs_x++; + } while (curs_x < cols-1 && !tabs[curs_x]); + + if ((*p & LATTR_MODE) != LATTR_NORM) + { + if (curs_x >= cols/2) + curs_x = cols/2-1; + } + else + { + if (curs_x >= cols) + curs_x = cols-1; + } + fix_cpos; check_selection (old_cpos, cpos); } - disptop = scrtop; - must_update = TRUE; + seen_disp_event = TRUE; break; - default: - if (c >= ' ' && c != 0234) { - if (wrapnext) { - cpos[1] = ATTR_WRAPPED; - if (curs_y == marg_b) - scroll (marg_t, marg_b, 1, TRUE); - else if (curs_y < rows-1) - curs_y++; - curs_x = 0; - fix_cpos; - wrapnext = FALSE; - nl_count++; - } - if (insert) - insch (1); - check_selection (cpos, cpos+1); - *cpos++ = c | curr_attr | - (c <= 0x7F ? cset_attr[cset] : ATTR_ASCII); - curs_x++; - if (curs_x == cols) { - cpos--; - curs_x--; - wrapnext = wrap; - } - disptop = scrtop; + 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) { + cpos[1] |= ATTR_WRAPPED; + if (curs_y == marg_b) + scroll (marg_t, marg_b, 1, TRUE); + else if (curs_y < rows-1) + curs_y++; + curs_x = 0; + fix_cpos; + wrapnext = FALSE; + } + if (insert) + insch (1); + if (selstate != NO_SELECTION) + check_selection (cpos, cpos+1); + switch (cset_attr[cset]) { + /* Linedraw characters are different from 'ESC ( B' only + * for a small range, for ones outside that range make sure + * we use the same font as well as the same encoding. + */ + case ATTR_LINEDRW: + 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 | + (c <= 0x7F ? cset_attr[cset] : ATTR_ASCII); + break; } + curs_x++; + if (curs_x == cols) { + cpos--; + curs_x--; + wrapnext = wrap; + } + seen_disp_event = 1; break; + case IGNORE_NEXT: termstate = TOPLEVEL; break; @@ -695,12 +983,8 @@ void term_out(void) { case SEEN_ESC: termstate = TOPLEVEL; switch (c) { - case '\005': case '\007': case '\b': case '\016': case '\017': - case '\033': case 0233: case 0234: case 0235: case '\r': - case '\013': case '\014': case '\n': case '\t': - termstate = TOPLEVEL; - goto do_toplevel; /* hack... */ case ' ': /* some weird sequence? */ + compatibility(VT220); termstate = IGNORE_NEXT; break; case '[': /* enter CSI mode */ @@ -710,88 +994,96 @@ void term_out(void) { esc_query = FALSE; break; case ']': /* xterm escape sequences */ + /* Compatibility is nasty here, xterm, linux, decterm yuk! */ + compatibility(OTHER); termstate = SEEN_OSC; esc_args[0] = 0; break; case '(': /* should set GL */ + compatibility(VT100); termstate = SET_GL; break; case ')': /* should set GR */ + compatibility(VT100); termstate = SET_GR; break; case '7': /* save cursor */ + compatibility(VT100); save_cursor (TRUE); break; case '8': /* restore cursor */ + compatibility(VT100); save_cursor (FALSE); - disptop = scrtop; - must_update = TRUE; + seen_disp_event = TRUE; break; case '=': + compatibility(VT100); app_keypad_keys = TRUE; break; case '>': + compatibility(VT100); app_keypad_keys = FALSE; break; case 'D': /* exactly equivalent to LF */ + compatibility(VT100); if (curs_y == marg_b) scroll (marg_t, marg_b, 1, TRUE); else if (curs_y < rows-1) curs_y++; fix_cpos; wrapnext = FALSE; - disptop = scrtop; - nl_count++; + seen_disp_event = TRUE; break; case 'E': /* exactly equivalent to CR-LF */ + compatibility(VT100); curs_x = 0; - wrapnext = FALSE; if (curs_y == marg_b) scroll (marg_t, marg_b, 1, TRUE); else if (curs_y < rows-1) curs_y++; fix_cpos; wrapnext = FALSE; - nl_count++; - disptop = scrtop; + seen_disp_event = TRUE; break; case 'M': /* reverse index - backwards LF */ + compatibility(VT100); if (curs_y == marg_t) scroll (marg_t, marg_b, -1, TRUE); else if (curs_y > 0) curs_y--; fix_cpos; wrapnext = FALSE; - disptop = scrtop; - must_update = TRUE; + seen_disp_event = TRUE; break; case 'Z': /* terminal type query */ - back->send ("\033[?6c", 5); + compatibility(VT100); + ldisc->send (id_string, strlen(id_string)); break; case 'c': /* restore power-on settings */ + compatibility(VT100); power_on(); + if (reset_132) { + request_resize (80, rows, 1); + reset_132 = 0; + } fix_cpos; disptop = scrtop; - must_update = TRUE; + seen_disp_event = TRUE; break; case '#': /* ESC # 8 fills screen with Es :-) */ + compatibility(VT100); termstate = SEEN_ESCHASH; break; case 'H': /* set a tab */ + compatibility(VT100); tabs[curs_x] = TRUE; break; } break; case SEEN_CSI: termstate = TOPLEVEL; /* default */ - switch (c) { - case '\005': case '\007': case '\b': case '\016': case '\017': - case '\033': case 0233: case 0234: case 0235: case '\r': - case '\013': case '\014': case '\n': case '\t': - termstate = TOPLEVEL; - goto do_toplevel; /* hack... */ - case '0': case '1': case '2': case '3': case '4': - case '5': case '6': case '7': case '8': case '9': + if( isdigit(c) ) + { if (esc_nargs <= ARGS_MAX) { if (esc_args[esc_nargs-1] == ARG_DEFAULT) esc_args[esc_nargs-1] = 0; @@ -799,56 +1091,61 @@ void term_out(void) { 10 * esc_args[esc_nargs-1] + c - '0'; } termstate = SEEN_CSI; - break; - case ';': + } + else if( c == ';' ) + { if (++esc_nargs <= ARGS_MAX) esc_args[esc_nargs-1] = ARG_DEFAULT; termstate = SEEN_CSI; - break; - case '?': - esc_query = TRUE; + } + else if( c < '@' ) + { + if( esc_query ) esc_query = -1; + else if( c == '?' ) esc_query = TRUE; + else esc_query = c; termstate = SEEN_CSI; - break; + } + else switch (ANSI(c,esc_query)) { case 'A': /* move up N lines */ move (curs_x, curs_y - def(esc_args[0], 1), 1); - disptop = scrtop; - must_update = TRUE; + seen_disp_event = TRUE; break; - case 'B': case 'e': /* move down N lines */ + case 'e': /* move down N lines */ + compatibility(ANSI); + case 'B': move (curs_x, curs_y + def(esc_args[0], 1), 1); - disptop = scrtop; - must_update = TRUE; + seen_disp_event = TRUE; break; - case 'C': case 'a': /* move right N cols */ + case 'a': /* move right N cols */ + compatibility(ANSI); + case 'C': move (curs_x + def(esc_args[0], 1), curs_y, 1); - disptop = scrtop; - must_update = TRUE; + seen_disp_event = TRUE; break; case 'D': /* move left N cols */ move (curs_x - def(esc_args[0], 1), curs_y, 1); - disptop = scrtop; - must_update = TRUE; + seen_disp_event = TRUE; break; case 'E': /* move down N lines and CR */ + compatibility(ANSI); move (0, curs_y + def(esc_args[0], 1), 1); - disptop = scrtop; - must_update = TRUE; + seen_disp_event = TRUE; break; case 'F': /* move up N lines and CR */ + compatibility(ANSI); move (0, curs_y - def(esc_args[0], 1), 1); - disptop = scrtop; - must_update = TRUE; + seen_disp_event = TRUE; break; case 'G': case '`': /* set horizontal posn */ + compatibility(ANSI); move (def(esc_args[0], 1) - 1, curs_y, 0); - disptop = scrtop; - must_update = TRUE; + seen_disp_event = TRUE; break; case 'd': /* set vertical posn */ + compatibility(ANSI); move (curs_x, (dec_om ? marg_t : 0) + def(esc_args[0], 1) - 1, (dec_om ? 2 : 0)); - disptop = scrtop; - must_update = TRUE; + seen_disp_event = TRUE; break; case 'H': case 'f': /* set horz and vert posns at once */ if (esc_nargs < 2) @@ -856,8 +1153,7 @@ void term_out(void) { move (def(esc_args[1], 1) - 1, (dec_om ? marg_t : 0) + def(esc_args[0], 1) - 1, (dec_om ? 2 : 0)); - disptop = scrtop; - must_update = TRUE; + seen_disp_event = TRUE; break; case 'J': /* erase screen or parts of it */ { @@ -867,7 +1163,7 @@ void term_out(void) { erase_lots(FALSE, !!(i & 2), !!(i & 1)); } disptop = scrtop; - must_update = TRUE; + seen_disp_event = TRUE; break; case 'K': /* erase line or parts of it */ { @@ -876,48 +1172,66 @@ void term_out(void) { i = 0; erase_lots(TRUE, !!(i & 2), !!(i & 1)); } - disptop = scrtop; - must_update = TRUE; + seen_disp_event = TRUE; break; case 'L': /* insert lines */ + compatibility(VT102); if (curs_y <= marg_b) scroll (curs_y, marg_b, -def(esc_args[0], 1), FALSE); - disptop = scrtop; - must_update = TRUE; + seen_disp_event = TRUE; break; case 'M': /* delete lines */ + compatibility(VT102); if (curs_y <= marg_b) - scroll (curs_y, marg_b, def(esc_args[0], 1), FALSE); - disptop = scrtop; - must_update = TRUE; + scroll (curs_y, marg_b, def(esc_args[0], 1), TRUE); + seen_disp_event = TRUE; break; case '@': /* insert chars */ + /* XXX VTTEST says this is vt220, vt510 manual says vt102 */ + compatibility(VT102); insch (def(esc_args[0], 1)); - disptop = scrtop; - must_update = TRUE; + seen_disp_event = TRUE; break; case 'P': /* delete chars */ + compatibility(VT102); insch (-def(esc_args[0], 1)); - disptop = scrtop; - must_update = TRUE; + seen_disp_event = TRUE; break; case 'c': /* terminal type query */ - back->send ("\033[?6c", 5); + compatibility(VT100); + /* This is the response for a VT102 */ + 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); - back->send (buf, strlen(buf)); + ldisc->send (buf, strlen(buf)); + } + else if (esc_args[0] == 5) { + ldisc->send ("\033[0n", 4); } break; - case 'h': /* toggle a mode to high */ - toggle_mode (esc_args[0], esc_query, TRUE); + case 'h': /* toggle modes to high */ + case ANSI_QUE('h'): + compatibility(VT100); + { + int i; + for (i=0; i= rows) bot = rows-1; - if (top <= bot) { + /* VTTEST Bug 9 - if region is less than 2 lines + * don't change region. + */ + if (bot-top > 0) { marg_t = top; marg_b = bot; curs_x = 0; @@ -947,33 +1263,69 @@ void term_out(void) { * placed at the top of the newly marginned * area. Apparently not: VMS TPU falls over * if so. + * + * Well actually it should for Origin mode - RDB */ - curs_y = 0; + curs_y = (dec_om ? marg_t : 0); fix_cpos; - disptop = scrtop; - must_update = TRUE; + seen_disp_event = TRUE; } } break; case 'm': /* set graphics rendition */ { + /* + * A VT100 without the AVO only had one attribute, either + * underline or reverse video depending on the cursor type, + * this was selected by CSI 7m. + * + * case 2: + * This is DIM on the VT100-AVO and VT102 + * case 5: + * This is BLINK on the VT100-AVO and VT102+ + * case 8: + * This is INVIS on the VT100-AVO and VT102 + * case 21: + * This like 22 disables BOLD, DIM and INVIS + * + * The ANSI colours appear on any terminal that has colour + * (obviously) but the interaction between sgr0 and the + * colours varies but is usually related to the background + * colour erase item. + * The interaction between colour attributes and the mono + * ones is also very implementation dependent. + * + * The 39 and 49 attributes are likely to be unimplemented. + */ int i; for (i=0; i=24)) { + request_resize (cols, def(esc_args[0], 24), 0); + deselect(); + } + break; + case ANSI('|', '*'): + /* VT420 sequence DECSNLS + * Set number of lines on screen + * VT420 uses VGA like hardware and can support any size in + * reasonable range (24..49 AIUI) with no default specified. + */ + compatibility(VT420); + if (esc_nargs==1 && esc_args[0]>0) { + request_resize (cols, def(esc_args[0], cfg.height), 0); + deselect(); + } + break; + case ANSI('|', '$'): + /* VT340/VT420 sequence DECSCPP + * Set number of columns per page + * Docs imply range is only 80 or 132, but I'll allow any. + */ + compatibility(VT340TEXT); + if (esc_nargs<=1) { + request_resize (def(esc_args[0], cfg.width), rows, 0); + deselect(); + } break; case 'X': /* write N spaces w/o moving cursor */ + /* XXX VTTEST says this is vt220, vt510 manual says vt100 */ + compatibility(ANSIMIN); { int n = def(esc_args[0], 1); unsigned long *p = cpos; @@ -1019,26 +1409,96 @@ void term_out(void) { n = cols - curs_x; check_selection (cpos, cpos+n); while (n--) - *p++ = ERASE_CHAR; - disptop = scrtop; - must_update = TRUE; + *p++ = erase_char; + seen_disp_event = TRUE; } break; case 'x': /* report terminal characteristics */ + compatibility(VT100); { char buf[32]; int i = def(esc_args[0], 0); if (i == 0 || i == 1) { strcpy (buf, "\033[2;1;1;112;112;1;0x"); buf[2] += i; - back->send (buf, 20); + ldisc->send (buf, 20); } } break; + case ANSI('L','='): + compatibility(OTHER); + use_bce = (esc_args[0]<=0); + erase_char = ERASE_CHAR; + if (use_bce) + erase_char = (' '|(curr_attr&(ATTR_FGMASK|ATTR_BGMASK))); + break; + case ANSI('E','='): + compatibility(OTHER); + blink_is_real = (esc_args[0]>=1); + break; + case ANSI('p','"'): + /* Allow the host to make this emulator a 'perfect' VT102. + * This first appeared in the VT220, but we do need to get + * back to PuTTY mode so I won't check it. + * + * 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. + * The VT220 does this, F11..F13 become ESC,BS,LF other Fkeys + * send nothing. + * + * Note ESC c will NOT change this! + */ + + 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; i 0) + curs_y--; + fix_cpos; + wrapnext = FALSE; + break; + case 'J': + erase_lots(FALSE, FALSE, TRUE); disptop = scrtop; - must_update = TRUE; - check_selection (scrtop, scrtop + rows * (cols+1)); + break; + case 'K': + erase_lots(TRUE, FALSE, TRUE); + break; + case 'V': + /* XXX Print cursor line */ + break; + case 'W': + /* XXX Start controller mode */ + break; + case 'X': + /* XXX Stop controller mode */ + break; + case 'Y': + termstate = VT52_Y1; + break; + case 'Z': + ldisc->send ("\033/Z", 3); + break; + case '=': + app_keypad_keys = TRUE; + break; + case '>': + app_keypad_keys = FALSE; + break; + case '<': + /* XXX This should switch to VT100 mode not current or default + * VT mode. But this will only have effect in a VT220+ + * emulation. + */ + vt52_mode = FALSE; + break; + case '^': + /* XXX Enter auto print mode */ + break; + case '_': + /* XXX Exit auto print mode */ + break; + case ']': + /* XXX Print screen */ + break; } + break; + case VT52_Y1: + termstate = VT52_Y2; + move(curs_x, c-' ', 0); + break; + case VT52_Y2: termstate = TOPLEVEL; + move(c-' ', curs_y, 0); break; } - check_selection (cpos, cpos+1); + if (selstate != NO_SELECTION) + check_selection (cpos, cpos+1); } - - if (must_update || nl_count > MAXNL) - term_update(); + 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); } /* @@ -1184,23 +1758,43 @@ 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]; - cursor = (has_focus ? ATTR_ACTCURS : ATTR_PASCURS); + if (cursor_on) { + if (has_focus) { + if (blinker || !cfg.blink_cur) + cursor = ATTR_ACTCURS; + else + cursor = 0; + } + else + cursor = ATTR_PASCURS; + } + else cursor = 0; rv = (rvideo ? ATTR_REVERSE : 0); our_curs_y = curs_y + (scrtop - disptop) / (cols+1); for (i=0; i450) + { + last_tblink = now; + tblinker = !tblinker; + } + + if (flg) { + blinker = 1; + last_blink = now; + return; + } + + blink_diff = now-last_blink; + + /* Make sure the cursor blinks no more than 2Hz */ + if (blink_diff>=0 && blink_diff<450) + return; + + last_blink = now; + blinker = !blinker; +} + +/* * Invalidate the whole screen so it will be repainted in full. */ void term_invalidate(void) { @@ -1257,10 +1887,20 @@ void term_paint (Context ctx, int l, int t, int r, int b) { top = t / font_height; bottom = (b - 1) / font_height; for (i = top; i <= bottom && i < rows ; i++) - for (j = left; j <= right && j < cols ; j++) - disptext[i*(cols+1)+j] = ATTR_INVALID; + { + if ( (disptext[i*(cols+1)+cols]&LATTR_MODE) == LATTR_NORM) + for (j = left; j <= right && j < cols ; j++) + disptext[i*(cols+1)+j] = ATTR_INVALID; + else + for (j = left/2; j <= right/2+1 && j < cols ; j++) + disptext[i*(cols+1)+j] = ATTR_INVALID; + } + /* This should happen soon enough, also for some reason it sometimes + * fails to actually do anything when re-sizing ... painting the wrong + * window perhaps ? do_paint (ctx, FALSE); + */ } /* @@ -1354,7 +1994,11 @@ void term_mouse (Mouse_Button b, Mouse_Action a, int x, int y) { } if (x>=cols) x = cols-1; - selpoint = disptop + y * (cols+1) + x; + selpoint = disptop + y * (cols+1); + if ((selpoint[cols]&LATTR_MODE) != LATTR_NORM) + selpoint += x/2; + else + selpoint += x; if (b == MB_SELECT && a == MA_CLICK) { deselect(); @@ -1411,7 +2055,31 @@ void term_mouse (Mouse_Button b, Mouse_Action a, int x, int y) { nl = TRUE; } while (q < nlpos && q < selend) - *p++ = (unsigned char) (*q++ & CHAR_MASK); + { +#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 (q, p-q); + + { + int i; + unsigned char c; + for(i=0;isend ("\r", 1); + paste_buffer[paste_len++] = '\r'; p += sizeof(sel_nl); } q = p; } + + /* Assume a small paste will be OK in one go. */ + if (paste_len<256) { + ldisc->send (paste_buffer, paste_len); + if (paste_buffer) sfree(paste_buffer); + paste_buffer = 0; + paste_pos = paste_hold = paste_len = 0; + } } get_clip(NULL, NULL); } @@ -1451,6 +2142,43 @@ void term_mouse (Mouse_Button b, Mouse_Action a, int x, int y) { term_update(); } +void term_nopaste() { + if(paste_len == 0) return; + sfree(paste_buffer); + paste_buffer = 0; + paste_len = 0; +} + +void term_paste() { +static long last_paste = 0; + long now, paste_diff; + + if(paste_len == 0) return; + + /* Don't wait forever to paste */ + if(paste_hold) { + now = GetTickCount(); + paste_diff = now-last_paste; + if (paste_diff>=0 && paste_diff<450) + return; + } + paste_hold = 0; + + while(paste_possend (&c, 1); + + if (c =='\r') { + paste_hold = 1; + return; + } + } + sfree(paste_buffer); + paste_buffer = 0; + paste_len = 0; +} + static void deselect (void) { selstate = NO_SELECTION; selstart = selend = scrtop; @@ -1460,3 +2188,14 @@ void term_deselect (void) { deselect(); term_update(); } + +/* + * 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++; + } +}