X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/21d2b241875c072a8700e838ae0da677a7b9d428..9ec95c23db58dac88a48fae594ea978c148d1c61:/terminal.h diff --git a/terminal.h b/terminal.h index daadd708..0050c0e2 100644 --- a/terminal.h +++ b/terminal.h @@ -20,6 +20,15 @@ typedef struct { int y, x; } pos; +#ifdef OPTIMISE_SCROLL +struct scrollregion { + struct scrollregion *next; + int topline; /* Top line of scroll region. */ + int botline; /* Bottom line of scroll region. */ + int lines; /* Number of lines to scroll by - +ve is forwards. */ +}; +#endif /* OPTIMISE_SCROLL */ + struct terminal_tag { int compatibility_level; @@ -28,6 +37,8 @@ struct terminal_tag { tree234 *screen; /* lines on primary screen */ tree234 *alt_screen; /* lines on alternate screen */ int disptop; /* distance scrolled back (0 or -ve) */ + int tempsblines; /* number of lines in temporary + scrollback */ unsigned long *cpos; /* cursor position (convenience) */ @@ -42,11 +53,16 @@ struct terminal_tag { int beep_overloaded; long lastbeep; -#define TSIZE (sizeof(unsigned long)) +#define TTYPE unsigned long +#define TSIZE (sizeof(TTYPE)) #define fix_cpos do { \ term->cpos = lineptr(term->curs.y) + term->curs.x; \ } while(0) +#ifdef OPTIMISE_SCROLL + struct scrollregion *scrollhead, *scrolltail; +#endif /* OPTIMISE_SCROLL */ + unsigned long curr_attr, save_attr; unsigned long erase_char; @@ -105,6 +121,7 @@ struct terminal_tag { int alt_cset, alt_sco_acs, alt_utf; int alt_t, alt_b; int alt_which; + int alt_sblines; /* # of lines on alternate screen that should be used for scrollback. */ #define ARGS_MAX 32 /* max # of esc sequence arguments */ #define ARG_DEFAULT 0 /* if an arg isn't specified */ @@ -181,6 +198,16 @@ struct terminal_tag { * than only the default. */ Config cfg; + + /* + * from_backend calls term_out, but it can also be called from + * the ldisc if the ldisc is called _within_ term_out. So we + * have to guard against re-entrancy - if from_backend is + * called recursively like this, it will simply add data to the + * end of the buffer term_out is in the process of working + * through. + */ + int in_term_out; }; #define in_utf(term) ((term)->utf || (term)->ucsdata->line_codepage==CP_UTF8)