X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/putty/blobdiff_plain/fe50e8140a2dbb3ba357a0ab777f34e07d568c23..4facdf84a26380cb8856940bcfdbd036faed6c23:/terminal.c diff --git a/terminal.c b/terminal.c index 4cd003aa..37625104 100644 --- a/terminal.c +++ b/terminal.c @@ -1,16 +1,12 @@ #include -#ifndef AUTO_WINSOCK -#ifdef WINSOCK_TWO -#include -#else -#include -#endif -#endif #include #include +#include +#include #include "putty.h" +#include "tree234.h" #define CL_ANSIMIN 0x0001 /* Codes in all ANSI like terminals. */ #define CL_VT100 0x0002 /* VT100 */ @@ -49,27 +45,50 @@ static int compatibility_level = TM_PUTTY; +static tree234 *scrollback; /* lines scrolled off top of screen */ +static tree234 *screen; /* lines on primary screen */ +static tree234 *alt_screen; /* lines on alternate screen */ +static int disptop; /* distance scrolled back (0 or negative) */ -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 */ -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)) -#define fix_cpos do { cpos = scrtop + curs_y * (cols+1) + curs_x; } while(0) +#define TSIZE (sizeof(unsigned long)) +#define lineptr(x) ( (unsigned long *) \ + ((x) >= 0 ? index234(screen, x) : \ + index234(scrollback, (x)+count234(scrollback)) ) ) +#define fix_cpos do { cpos = lineptr(curs.y) + 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 */ +typedef struct { + int y, x; +} pos; +#define poslt(p1,p2) ( (p1).y < (p2).y || ( (p1).y == (p2).y && (p1).x < (p2).x ) ) +#define posle(p1,p2) ( (p1).y < (p2).y || ( (p1).y == (p2).y && (p1).x <= (p2).x ) ) +#define poseq(p1,p2) ( (p1).y == (p2).y && (p1).x == (p2).x ) +#define posdiff(p1,p2) ( ((p2).y - (p1).y) * (cols+1) + (p2).x - (p1).x ) +#define incpos(p) ( (p).x == cols ? ((p).x = 0, (p).y++, 1) : ((p).x++, 0) ) +#define decpos(p) ( (p).x == 0 ? ((p).x = cols, (p).y--, 1) : ((p).x--, 0) ) + +static pos curs; /* cursor */ +static pos savecurs; /* saved cursor position */ static int marg_t, marg_b; /* scroll margins */ static int dec_om; /* DEC origin mode flag */ static int wrap, wrapnext; /* wrap flags */ @@ -83,6 +102,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]; @@ -136,7 +157,7 @@ static enum { static enum { SM_CHAR, SM_WORD, SM_LINE } selmode; -static unsigned long *selstart, *selend, *selanchor; +static pos selstart, selend, selanchor; static short wordness[256] = { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 01 */ @@ -161,12 +182,15 @@ 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. */ static void power_on(void) { - curs_x = curs_y = alt_x = alt_y = save_x = save_y = 0; + curs.x = curs.y = alt_x = alt_y = savecurs.x = savecurs.y = 0; alt_t = marg_t = 0; if (rows != -1) alt_b = marg_b = rows - 1; @@ -183,8 +207,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; @@ -196,7 +223,7 @@ static void power_on(void) { for (i = 0; i < 256; i++) wordness[i] = cfg.wordness[i]; } - if (text) { + if (screen) { swap_screen (1); erase_lots (FALSE, TRUE, TRUE); swap_screen (0); @@ -212,13 +239,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)) ) { - disptop = scrtop; + (seen_disp_event && (cfg.scroll_on_disp)) ) { + disptop = 0; /* return to main screen */ seen_disp_event = seen_key_event = 0; update_sbar(); } do_paint (ctx, TRUE); - sys_cursor(curs_x, curs_y + (scrtop - disptop) / (cols+1)); + sys_cursor(curs.x, curs.y - disptop); free_ctx (ctx); } } @@ -229,7 +256,7 @@ void term_update(void) { void term_pwron(void) { power_on(); fix_cpos; - disptop = scrtop; + disptop = 0; deselect(); term_update(); } @@ -238,7 +265,11 @@ void term_pwron(void) { * Clear the scrollback. */ void term_clrsb(void) { - disptop = sbtop = scrtop; + unsigned long *line; + disptop = 0; + while ((line = delpos234(scrollback, 0)) != NULL) { + sfree(line); + } update_sbar(); } @@ -246,22 +277,28 @@ void term_clrsb(void) { * Initialise the terminal. */ void term_init(void) { - text = sbtop = sbbot = scrtop = disptop = cpos = NULL; + screen = alt_screen = scrollback = NULL; + disptop = 0; disptext = wanttext = NULL; tabs = NULL; selspace = NULL; deselect(); rows = cols = -1; power_on(); + beephead = beeptail = NULL; + nbeeps = 0; + lastbeep = FALSE; + beep_overloaded = FALSE; } /* * Set up the terminal for a given size. */ void term_size(int newrows, int newcols, int newsavelines) { - unsigned long *newtext, *newdisp, *newwant, *newalt; + tree234 *newsb, *newscreen, *newalt; + unsigned long *newdisp, *newwant, *oldline, *line; int i, j, crows, ccols; - + int posn, oldposn, furthest_back, oldsbsize; int save_alt_which = alt_which; if (newrows == rows && newcols == cols && newsavelines == savelines) @@ -273,36 +310,48 @@ void term_size(int newrows, int newcols, int newsavelines) { alt_t = marg_t = 0; alt_b = marg_b = newrows - 1; - newtext = smalloc ((newrows+newsavelines)*(newcols+1)*TSIZE); - sbbot = newtext + newsavelines*(newcols+1); - for (i=0; i<(newrows+newsavelines)*(newcols+1); i++) - 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 0) + furthest_back = 0; + if (furthest_back < -newsavelines) + furthest_back = -newsavelines; + for (posn = newrows; posn-- > furthest_back ;) { + oldposn = posn - newrows + rows; + if (rows == -1 || oldposn < -oldsbsize) { + line = smalloc(TSIZE * (newcols + 1)); + for (j = 0; j < newcols; j++) + line[j] = erase_char; + line[newcols] = 0; + } else { + oldline = (oldposn >= 0 ? + delpos234(screen, count234(screen)-1) : + delpos234(scrollback, count234(scrollback)-1)); + if (newcols != cols) { + line = smalloc(TSIZE * (newcols + 1)); + for (j = 0; j < ccols; j++) + line[j] = oldline[j]; + for (j = ccols; j < newcols; j++) + line[j] = erase_char; + line[newcols] = oldline[cols] & LATTR_MODE; + sfree(oldline); + } else { + line = oldline; + } } - sbtop = newtext; - } else { - sbtop = disptop = newtext; + if (posn >= 0) + addpos234(newscreen, line, 0); + else + addpos234(newsb, line, 0); } - scrtop = disptop; - sfree (text); - text = newtext; + disptop = 0; + if (scrollback) freetree234(scrollback); + if (screen) freetree234(screen); + scrollback = newsb; + screen = newscreen; newdisp = smalloc (newrows*(newcols+1)*TSIZE); for (i=0; i 0) - curs_y += newrows - rows; - if (curs_y < 0) - curs_y = 0; - if (curs_y >= newrows) - curs_y = newrows-1; - if (curs_x >= newcols) - curs_x = newcols-1; + curs.y += newrows - rows; + if (curs.y < 0) + curs.y = 0; + if (curs.y >= newrows) + curs.y = newrows-1; + if (curs.x >= newcols) + curs.x = newcols-1; alt_x = alt_y = 0; wrapnext = alt_wnext = FALSE; @@ -360,18 +417,16 @@ void term_size(int newrows, int newcols, int newsavelines) { static void swap_screen (int which) { int t; unsigned long tt; + tree234 *ttr; if (which == alt_which) return; alt_which = which; - for (t=0; t 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 && alt_which == 0 && sb) { - /* - * 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. - */ - 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= topline && selstart.y <= botline) { + selstart.y++; + if (selstart.y > botline) { + selstart.y = botline; + selstart.x = 0; } - - newscr = scrtop + lines * (cols+1); } - - if (newscr <= sbbot) { - if (scrtop_is_disptop) disptop = newscr; - scrtop = newscr; - - if (botline == rows-1 ) - for (i = 0; i < size; i++) - scrtop[i+scroll_size] = erase_char; - - update_sbar(); - fix_cpos; - - if (botline != rows-1) { - /* This fastscroll only works for full window scrolls. - * If the caller wanted a partial one we have to reverse - * scroll the bottom of the screen. - */ - scroll(botline-lines+1, rows-1, -lines, 0); + if (selend.y >= topline && selend.y <= botline) { + selend.y++; + if (selend.y > botline) { + selend.y = botline; + selend.x = 0; } - return ; } - /* If we can't scroll by memory remapping do it physically. - * But rather than expensivly doing the scroll buffer just - * scroll the screen. All it means is that sometimes we choose - * to not add lines from a scroll region to the scroll buffer. - */ - - if (savelines <= 400) { - sbtop -= lines * (cols+1); - if (sbtop < text) - sbtop = text; - scroll_size += scroll_top - sbtop; - scroll_top = sbtop; - - update_sbar(); - } - } else { - /* Ho hum, expensive scroll required. */ - - sbtop -= lines * (cols+1); - if (sbtop < text) - sbtop = text; - scroll_size += scroll_top - sbtop; - scroll_top = sbtop; - - update_sbar(); - } - } - - if (scroll_size < 0) { - size += scroll_size; - scroll_size = 0; - } - - if (lines > 0) { - if (scroll_size) - memmove (scroll_top, scroll_top + size, scroll_size*TSIZE); - for (i = 0; i < size; i++) - scroll_top[i+scroll_size] = erase_char; - if (selstart > scroll_top && - selstart < scroll_top + size + scroll_size) { - selstart -= size; - if (selstart < scroll_top) - selstart = scroll_top; - } - if (selend > scroll_top && - selend < scroll_top + size + scroll_size) { - selend -= size; - 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; + lines++; } } else { - if (scroll_size) - memmove (scroll_top + size, scroll_top, scroll_size*TSIZE); - for (i = 0; i < size; i++) - scroll_top[i] = erase_char; - if (selstart > scroll_top && - selstart < scroll_top + size + scroll_size) { - selstart += size; - if (selstart > scroll_top + size + scroll_size) - selstart = scroll_top + size + scroll_size; - } - if (selend > scroll_top && - selend < scroll_top + size + scroll_size) { - selend += size; - 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; + while (lines > 0) { + line = delpos234(screen, topline); + if (sb) { + int sblen = count234(scrollback); + /* + * We must add this line to the scrollback. We'll + * remove a line from the top of the scrollback to + * replace it, or allocate a new one if the + * scrollback isn't full. + */ + if (sblen == savelines) + sblen--, line2 = delpos234(scrollback, 0); + else + line2 = smalloc(TSIZE * (cols+1)); + addpos234(scrollback, line, sblen); + line = line2; + } + for (i = 0; i < cols; i++) + line[i] = erase_char; + line[cols] = 0; + addpos234(screen, line, botline); + + if (selstart.y >= topline && selstart.y <= botline) { + selstart.y--; + if (selstart.y < topline) { + selstart.y = topline; + selstart.x = 0; + } + } + if (selend.y >= topline && selend.y <= botline) { + selend.y--; + if (selend.y < topline) { + selend.y = topline; + selend.x = 0; + } + } + + lines--; } } } @@ -583,17 +550,17 @@ static void move (int x, int y, int marg_clip) { if (x >= cols) x = cols-1; if (marg_clip) { - if ((curs_y >= marg_t || marg_clip == 2) && y < marg_t) + if ((curs.y >= marg_t || marg_clip == 2) && y < marg_t) y = marg_t; - if ((curs_y <= marg_b || marg_clip == 2) && y > marg_b) + if ((curs.y <= marg_b || marg_clip == 2) && y > marg_b) y = marg_b; } if (y < 0) y = 0; if (y >= rows) y = rows-1; - curs_x = x; - curs_y = y; + curs.x = x; + curs.y = y; fix_cpos; wrapnext = FALSE; } @@ -603,17 +570,15 @@ static void move (int x, int y, int marg_clip) { */ static void save_cursor(int save) { if (save) { - save_x = curs_x; - save_y = curs_y; + savecurs = curs; save_attr = curr_attr; save_cset = cset; save_csattr = cset_attr[cset]; } else { - curs_x = save_x; - curs_y = save_y; + curs = savecurs; /* 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; + if (curs.x >= cols) curs.x = cols-1; + if (curs.y >= rows) curs.y = rows-1; curr_attr = save_attr; cset = save_cset; @@ -628,30 +593,44 @@ static void save_cursor(int save) { * whole line, or parts thereof. */ static void erase_lots (int line_only, int from_begin, int to_end) { - unsigned long *startpos, *endpos; + pos start, end, here; + int erase_lattr; + unsigned long *ldata; if (line_only) { - startpos = cpos - curs_x; - endpos = startpos + cols; - /* I've removed the +1 so that the Wide screen stuff is not - * removed when it shouldn't be. - */ + start.y = curs.y; + start.x = 0; + end.y = curs.y + 1; + end.x = 0; + erase_lattr = FALSE; } else { - startpos = scrtop; - endpos = startpos + rows * (cols+1); + start.y = 0; + start.x = 0; + end.y = rows; + end.x = 0; + erase_lattr = TRUE; + } + if (!from_begin) { + start = curs; + } + if (!to_end) { + end = curs; } - if (!from_begin) - startpos = cpos; - if (!to_end) - endpos = cpos+1; - check_selection (startpos, endpos); + check_selection (start, end); /* Clear screen also forces a full window redraw, just in case. */ - if (startpos == scrtop && endpos == scrtop + rows * (cols+1)) + if (start.y == 0 && start.x == 0 && end.y == rows) term_invalidate(); - while (startpos < endpos) - *startpos++ = erase_char; + ldata = lineptr(start.y); + while (poslt(start, end)) { + if (start.y == cols && !erase_lattr) + ldata[start.x] &= ~ATTR_WRAPPED; + else + ldata[start.x] = erase_char; + if (incpos(start)) + ldata = lineptr(start.y); + } } /* @@ -661,20 +640,25 @@ static void erase_lots (int line_only, int from_begin, int to_end) { static void insch (int n) { int dir = (n < 0 ? -1 : +1); int m; + pos cursplus; + unsigned long *ldata; n = (n < 0 ? -n : n); - if (n > cols - curs_x) - n = cols - curs_x; - m = cols - curs_x - n; - check_selection (cpos, cpos+n); + if (n > cols - curs.x) + n = cols - curs.x; + m = cols - curs.x - n; + cursplus.y = curs.y; + cursplus.x = curs.x + n; + check_selection (curs, cursplus); + ldata = lineptr(curs.y); if (dir < 0) { - memmove (cpos, cpos+n, m*TSIZE); + memmove (ldata + curs.x, ldata + curs.x + n, m*TSIZE); while (n--) - cpos[m++] = erase_char; + ldata[curs.x + m++] = erase_char; } else { - memmove (cpos+n, cpos, m*TSIZE); + memmove (ldata + curs.x + n, ldata + curs.x, m*TSIZE); while (n--) - cpos[n] = erase_char; + ldata[curs.x + n] = erase_char; } } @@ -709,6 +693,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; @@ -718,7 +706,7 @@ static void toggle_mode (int mode, int query, int state) { compatibility(OTHER); deselect(); swap_screen (state); - disptop = scrtop; + disptop = 0; break; } else switch (mode) { case 4: /* set insert mode */ @@ -726,16 +714,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; @@ -775,9 +755,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]; @@ -786,11 +763,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. @@ -808,23 +782,107 @@ 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 = 0; + } 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 (curs.x == 0 && curs.y > 0) + curs.x = cols-1, curs.y--; else if (wrapnext) wrapnext = FALSE; else - curs_x--; + curs.x--; fix_cpos; seen_disp_event = TRUE; break; @@ -857,56 +915,58 @@ static int beep_overload = 0; esc_args[0] = 0; break; case '\r': - curs_x = 0; + curs.x = 0; wrapnext = FALSE; fix_cpos; seen_disp_event = TRUE; paste_hold = 0; + logtraffic((unsigned char)c,LGTYP_ASCII); break; case '\013': case '\014': compatibility(VT100); case '\n': - if (curs_y == marg_b) + if (curs.y == marg_b) scroll (marg_t, marg_b, 1, TRUE); - else if (curs_y < rows-1) - curs_y++; + else if (curs.y < rows-1) + curs.y++; if (cfg.lfhascr) - curs_x = 0; + curs.x = 0; fix_cpos; wrapnext = FALSE; seen_disp_event = 1; paste_hold = 0; + logtraffic((unsigned char)c,LGTYP_ASCII); break; case '\t': { - unsigned long *old_cpos = cpos; - unsigned long *p = scrtop + curs_y * (cols+1) + cols; + pos old_curs = curs; + unsigned long *ldata = lineptr(curs.y); do { - curs_x++; - } while (curs_x < cols-1 && !tabs[curs_x]); + curs.x++; + } while (curs.x < cols-1 && !tabs[curs.x]); - if ((*p & LATTR_MODE) != LATTR_NORM) + if ((ldata[cols] & LATTR_MODE) != LATTR_NORM) { - if (curs_x >= cols/2) - curs_x = cols/2-1; + if (curs.x >= cols/2) + curs.x = cols/2-1; } else { - if (curs_x >= cols) - curs_x = cols-1; + if (curs.x >= cols) + curs.x = cols-1; } fix_cpos; - check_selection (old_cpos, cpos); + check_selection (old_curs, curs); } 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--; + if (curs.x && !wrapnext) curs.x--; wrapnext = FALSE; fix_cpos; *cpos = (' ' | curr_attr | ATTR_ASCII); @@ -915,32 +975,37 @@ static int beep_overload = 0; } else switch (termstate) { case TOPLEVEL: - /* Only graphic characters get this far, ctrls are stripped above */ - if (wrapnext) { + /* Only graphic characters get this far, ctrls are stripped above */ + if (wrapnext && wrap) { cpos[1] |= ATTR_WRAPPED; - if (curs_y == marg_b) + if (curs.y == marg_b) scroll (marg_t, marg_b, 1, TRUE); - else if (curs_y < rows-1) - curs_y++; - curs_x = 0; + 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); + if (selstate != NO_SELECTION) { + pos cursplus = curs; + incpos(cursplus); + check_selection (curs, cursplus); + } 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. + /* + * 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; + *cpos++ = ' ' | curr_attr | ATTR_ASCII; else *cpos++ = ((unsigned char)c) | curr_attr | ATTR_LINEDRW; break; @@ -952,15 +1017,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) { + curs.x++; + if (curs.x == cols) { cpos--; - curs_x--; - wrapnext = wrap; + curs.x--; + wrapnext = TRUE; } seen_disp_event = 1; break; @@ -1026,38 +1093,38 @@ static int beep_overload = 0; break; case 'D': /* exactly equivalent to LF */ compatibility(VT100); - if (curs_y == marg_b) + if (curs.y == marg_b) scroll (marg_t, marg_b, 1, TRUE); - else if (curs_y < rows-1) - curs_y++; + else if (curs.y < rows-1) + curs.y++; fix_cpos; wrapnext = FALSE; seen_disp_event = TRUE; break; case 'E': /* exactly equivalent to CR-LF */ compatibility(VT100); - curs_x = 0; - if (curs_y == marg_b) + curs.x = 0; + if (curs.y == marg_b) scroll (marg_t, marg_b, 1, TRUE); - else if (curs_y < rows-1) - curs_y++; + else if (curs.y < rows-1) + curs.y++; fix_cpos; wrapnext = FALSE; seen_disp_event = TRUE; break; case 'M': /* reverse index - backwards LF */ compatibility(VT100); - if (curs_y == marg_t) + if (curs.y == marg_t) scroll (marg_t, marg_b, -1, TRUE); - else if (curs_y > 0) - curs_y--; + else if (curs.y > 0) + curs.y--; fix_cpos; wrapnext = FALSE; seen_disp_event = TRUE; 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); @@ -1067,7 +1134,7 @@ static int beep_overload = 0; reset_132 = 0; } fix_cpos; - disptop = scrtop; + disptop = 0; seen_disp_event = TRUE; break; case '#': /* ESC # 8 fills screen with Es :-) */ @@ -1076,7 +1143,7 @@ static int beep_overload = 0; break; case 'H': /* set a tab */ compatibility(VT100); - tabs[curs_x] = TRUE; + tabs[curs.x] = TRUE; break; } break; @@ -1107,43 +1174,43 @@ static int beep_overload = 0; } else switch (ANSI(c,esc_query)) { case 'A': /* move up N lines */ - move (curs_x, curs_y - def(esc_args[0], 1), 1); + move (curs.x, curs.y - def(esc_args[0], 1), 1); seen_disp_event = TRUE; break; case 'e': /* move down N lines */ compatibility(ANSI); case 'B': - move (curs_x, curs_y + def(esc_args[0], 1), 1); + move (curs.x, curs.y + def(esc_args[0], 1), 1); seen_disp_event = TRUE; break; case 'a': /* move right N cols */ compatibility(ANSI); case 'C': - move (curs_x + def(esc_args[0], 1), curs_y, 1); + move (curs.x + def(esc_args[0], 1), curs.y, 1); seen_disp_event = TRUE; break; case 'D': /* move left N cols */ - move (curs_x - def(esc_args[0], 1), curs_y, 1); + move (curs.x - def(esc_args[0], 1), curs.y, 1); 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); + move (0, curs.y + def(esc_args[0], 1), 1); 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); + move (0, curs.y - def(esc_args[0], 1), 1); seen_disp_event = TRUE; break; case 'G': case '`': /* set horizontal posn */ compatibility(ANSI); - move (def(esc_args[0], 1) - 1, curs_y, 0); + move (def(esc_args[0], 1) - 1, curs.y, 0); 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, + move (curs.x, (dec_om ? marg_t : 0) + def(esc_args[0], 1) - 1, (dec_om ? 2 : 0)); seen_disp_event = TRUE; break; @@ -1162,7 +1229,7 @@ static int beep_overload = 0; i = 0; erase_lots(FALSE, !!(i & 2), !!(i & 1)); } - disptop = scrtop; + disptop = 0; seen_disp_event = TRUE; break; case 'K': /* erase line or parts of it */ @@ -1176,14 +1243,14 @@ static int beep_overload = 0; break; case 'L': /* insert lines */ compatibility(VT102); - if (curs_y <= marg_b) - scroll (curs_y, marg_b, -def(esc_args[0], 1), FALSE); + if (curs.y <= marg_b) + scroll (curs.y, marg_b, -def(esc_args[0], 1), FALSE); 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), TRUE); + if (curs.y <= marg_b) + scroll (curs.y, marg_b, def(esc_args[0], 1), TRUE); seen_disp_event = TRUE; break; case '@': /* insert chars */ @@ -1200,16 +1267,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)); + sprintf (buf, "\033[%d;%dR", curs.y + 1, curs.x + 1); + 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 */ @@ -1234,7 +1301,7 @@ static int beep_overload = 0; compatibility(VT100); if (esc_nargs == 1) { if (esc_args[0] == 0) { - tabs[curs_x] = FALSE; + tabs[curs.x] = FALSE; } else if (esc_args[0] == 3) { int i; for (i = 0; i < cols; i++) @@ -1257,7 +1324,7 @@ static int beep_overload = 0; if (bot-top > 0) { marg_t = top; marg_b = bot; - curs_x = 0; + curs.x = 0; /* * I used to think the cursor should be * placed at the top of the newly marginned @@ -1266,7 +1333,7 @@ static int beep_overload = 0; * * Well actually it should for Origin mode - RDB */ - curs_y = (dec_om ? marg_t : 0); + curs.y = (dec_om ? marg_t : 0); fix_cpos; seen_disp_event = TRUE; } @@ -1404,10 +1471,13 @@ static int beep_overload = 0; compatibility(ANSIMIN); { int n = def(esc_args[0], 1); + pos cursplus; unsigned long *p = cpos; - if (n > cols - curs_x) - n = cols - curs_x; - check_selection (cpos, cpos+n); + if (n > cols - curs.x) + n = cols - curs.x; + cursplus = curs; + cursplus.x += n; + check_selection (curs, cursplus); while (n--) *p++ = erase_char; seen_disp_event = TRUE; @@ -1421,7 +1491,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; @@ -1615,27 +1685,34 @@ static int beep_overload = 0; { unsigned long *p; unsigned long nlattr; - int n; + unsigned long *ldata; + int i, j; + pos scrtop, scrbot; switch (c) { case '8': - p = scrtop; - n = rows * (cols+1); - while (n--) - *p++ = ATTR_DEFAULT | 'E'; - disptop = scrtop; + for (i = 0; i < rows; i++) { + ldata = lineptr(i); + for (j = 0; j < cols; j++) + ldata[j] = ATTR_DEFAULT | 'E'; + ldata[cols] = 0; + } + disptop = 0; seen_disp_event = TRUE; - check_selection (scrtop, scrtop + rows * (cols+1)); + scrtop.x = scrtop.y = 0; + scrbot.x = 0; scrbot.y = rows; + check_selection (scrtop, scrbot); break; - case '3': nlattr = LATTR_TOP; if(0) { - case '4': nlattr = LATTR_BOT; } if(0) { - case '5': nlattr = LATTR_NORM; } if(0) { - case '6': nlattr = LATTR_WIDE; } + case '3': nlattr = LATTR_TOP; goto lattr_common; + case '4': nlattr = LATTR_BOT; goto lattr_common; + case '5': nlattr = LATTR_NORM; goto lattr_common; + case '6': nlattr = LATTR_WIDE; + lattr_common: - p = scrtop + curs_y * (cols+1) + cols; - *p &= ~LATTR_MODE; - *p |= nlattr; + ldata = lineptr(curs.y); + ldata[cols] &= ~LATTR_MODE; + ldata[cols] |= nlattr; } } termstate = TOPLEVEL; @@ -1645,16 +1722,16 @@ static int beep_overload = 0; seen_disp_event = TRUE; switch (c) { case 'A': - move (curs_x, curs_y - 1, 1); + move (curs.x, curs.y - 1, 1); break; case 'B': - move (curs_x, curs_y + 1, 1); + move (curs.x, curs.y + 1, 1); break; case 'C': - move (curs_x + 1, curs_y, 1); + move (curs.x + 1, curs.y, 1); break; case 'D': - move (curs_x - 1, curs_y, 1); + move (curs.x - 1, curs.y, 1); break; case 'F': cset_attr[cset=0] = ATTR_LINEDRW; @@ -1666,16 +1743,16 @@ static int beep_overload = 0; move (0, 0, 0); break; case 'I': - if (curs_y == 0) + if (curs.y == 0) scroll (0, rows-1, -1, TRUE); - else if (curs_y > 0) - curs_y--; + else if (curs.y > 0) + curs.y--; fix_cpos; wrapnext = FALSE; break; case 'J': erase_lots(FALSE, FALSE, TRUE); - disptop = scrtop; + disptop = 0; break; case 'K': erase_lots(TRUE, FALSE, TRUE); @@ -1693,7 +1770,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; @@ -1721,24 +1798,20 @@ static int beep_overload = 0; break; case VT52_Y1: termstate = VT52_Y2; - move(curs_x, c-' ', 0); + move(curs.x, c-' ', 0); break; case VT52_Y2: termstate = TOPLEVEL; - move(c-' ', curs_y, 0); + move(c-' ', curs.y, 0); break; } - if (selstate != NO_SELECTION) - check_selection (cpos, cpos+1); + if (selstate != NO_SELECTION) { + pos cursplus = curs; + incpos(cursplus); + check_selection (curs, cursplus); + } } 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); } /* @@ -1758,11 +1831,28 @@ 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; + pos scrpos; 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) @@ -1772,21 +1862,30 @@ 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); - our_curs_y = curs_y + (scrtop - disptop) / (cols+1); + else + cursor = 0; + rv = (!rvideo ^ !in_vbell ? ATTR_REVERSE : 0); + our_curs_y = curs.y - disptop; 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; @@ -1911,29 +2010,112 @@ void term_paint (Context ctx, int l, int t, int r, int b) { * relative to the current position. */ void term_scroll (int rel, int where) { - int n = where * (cols+1); + int sbtop = -count234(scrollback); - disptop = (rel < 0 ? scrtop : - rel > 0 ? sbtop : disptop) + n; + disptop = (rel < 0 ? 0 : + rel > 0 ? sbtop : disptop) + where; if (disptop < sbtop) disptop = sbtop; - if (disptop > scrtop) - disptop = scrtop; + if (disptop > 0) + disptop = 0; update_sbar(); term_update(); } +static void clipme(pos top, pos 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 (poslt(top, bottom)) { + int nl = FALSE; + unsigned long *ldata = lineptr(top.y); + pos lineend, nlpos; + + nlpos.y = top.y; + nlpos.x = cols; + + if (!(ldata[cols] & ATTR_WRAPPED)) { + while ((ldata[nlpos.x-1] & CHAR_MASK) == 0x20 && poslt(top, nlpos)) + decpos(nlpos); + if (poslt(nlpos, bottom)) + nl = TRUE; + } + while (poslt(top, bottom) && poslt(top, nlpos)) { + int ch = (ldata[top.x] & CHAR_MASK); + int set = (ldata[top.x] & 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.x++; + } + if (nl) { + int i; + for (i=0; i 0 ) /* indicates we allocated this buffer */ + sfree(workbuf); + +} +void term_copyall (void) { + pos top; + top.y = -count234(scrollback); + top.x = 0; + clipme(top, curs, NULL /* dynamic allocation */); +} + /* * Spread the selection outwards according to the selection mode. */ -static unsigned long *sel_spread_half (unsigned long *p, int dir) { - unsigned long *linestart, *lineend; +static pos sel_spread_half (pos p, int dir) { + unsigned long *ldata; int x; short wvalue; - x = (p - text) % (cols+1); - linestart = p - x; - lineend = linestart + cols; + ldata = lineptr(p.y); switch (selmode) { case SM_CHAR: @@ -1941,14 +2123,14 @@ static unsigned long *sel_spread_half (unsigned long *p, int dir) { * In this mode, every character is a separate unit, except * for runs of spaces at the end of a non-wrapping line. */ - if (!(linestart[cols] & ATTR_WRAPPED)) { - unsigned long *q = lineend; - while (q > linestart && (q[-1] & CHAR_MASK) == 0x20) + if (!(ldata[cols] & ATTR_WRAPPED)) { + unsigned long *q = ldata+cols; + while (q > ldata && (q[-1] & CHAR_MASK) == 0x20) q--; - if (q == lineend) + if (q == ldata+cols) q--; - if (p >= q) - p = (dir == -1 ? q : lineend - 1); + if (p.x >= q-ldata) + p.x = (dir == -1 ? q-ldata : cols - 1); } break; case SM_WORD: @@ -1956,20 +2138,20 @@ static unsigned long *sel_spread_half (unsigned long *p, int dir) { * In this mode, the units are maximal runs of characters * whose `wordness' has the same value. */ - wvalue = wordness[*p & CHAR_MASK]; + wvalue = wordness[ldata[p.x] & CHAR_MASK]; if (dir == +1) { - while (p < lineend && wordness[p[1] & CHAR_MASK] == wvalue) - p++; + while (p.x < cols && wordness[ldata[p.x+1] & CHAR_MASK] == wvalue) + p.x++; } else { - while (p > linestart && wordness[p[-1] & CHAR_MASK] == wvalue) - p--; + while (p.x > 0 && wordness[ldata[p.x-1] & CHAR_MASK] == wvalue) + p.x--; } break; case SM_LINE: /* * In this mode, every line is a unit. */ - p = (dir == -1 ? linestart : lineend - 1); + p.x = (dir == -1 ? 0 : cols - 1); break; } return p; @@ -1977,11 +2159,14 @@ static unsigned long *sel_spread_half (unsigned long *p, int dir) { static void sel_spread (void) { selstart = sel_spread_half (selstart, -1); - selend = sel_spread_half (selend - 1, +1) + 1; + decpos(selend); + selend = sel_spread_half (selend, +1); + incpos(selend); } void term_mouse (Mouse_Button b, Mouse_Action a, int x, int y) { - unsigned long *selpoint; + pos selpoint; + unsigned long *ldata; if (y<0) y = 0; if (y>=rows) y = rows-1; @@ -1994,11 +2179,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); - if ((selpoint[cols]&LATTR_MODE) != LATTR_NORM) - selpoint += x/2; - else - selpoint += x; + selpoint.y = y + disptop; + selpoint.x = x; + ldata = lineptr(selpoint.y); + if ((ldata[cols]&LATTR_MODE) != LATTR_NORM) + selpoint.x /= 2; if (b == MB_SELECT && a == MA_CLICK) { deselect(); @@ -2010,28 +2195,33 @@ void term_mouse (Mouse_Button b, Mouse_Action a, int x, int y) { selmode = (a == MA_2CLK ? SM_WORD : SM_LINE); selstate = DRAGGING; selstart = selanchor = selpoint; - selend = selstart + 1; + selend = selstart; + incpos(selend); sel_spread(); } else if ((b == MB_SELECT && a == MA_DRAG) || (b == MB_EXTEND && a != MA_RELEASE)) { - if (selstate == ABOUT_TO && selanchor == selpoint) + if (selstate == ABOUT_TO && poseq(selanchor, selpoint)) return; if (b == MB_EXTEND && a != MA_DRAG && selstate == SELECTED) { - if (selpoint-selstart < (selend-selstart)/2) - selanchor = selend - 1; - else + if (posdiff(selpoint,selstart) < posdiff(selend,selstart)/2) { + selanchor = selend; + decpos(selanchor); + } else { selanchor = selstart; + } selstate = DRAGGING; } if (selstate != ABOUT_TO && selstate != DRAGGING) selanchor = selpoint; selstate = DRAGGING; - if (selpoint < selanchor) { + if (poslt(selpoint, selanchor)) { selstart = selpoint; - selend = selanchor + 1; + selend = selanchor; + incpos(selend); } else { selstart = selanchor; - selend = selpoint + 1; + selend = selpoint; + incpos(selpoint); } sel_spread(); } else if ((b == MB_SELECT || b == MB_EXTEND) && a == MA_RELEASE) { @@ -2040,54 +2230,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 +2293,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 +2309,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; } @@ -2181,7 +2329,7 @@ static long last_paste = 0; static void deselect (void) { selstate = NO_SELECTION; - selstart = selend = scrtop; + selstart.x = selstart.y = selend.x = selend.y = 0; } void term_deselect (void) { @@ -2189,6 +2337,12 @@ void term_deselect (void) { 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. */ @@ -2199,3 +2353,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" : "") ); + /* 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; } +}