Introduced wrapper macros snew(), snewn() and sresize() for the

[u/mdw/putty] / terminal.h

diff --git a/terminal.h b/terminal.h
index 727f842..647b55d 100644 (file)
--- 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 */
@@ -155,6 +172,9 @@ struct terminal_tag {
 
     short wordness[256];
 
+    /* Mask of attributes to pay attention to when painting. */
+    unsigned long attr_mask;
+
     wchar_t *paste_buffer;
     int paste_len, paste_pos, paste_hold;
     long last_paste;
@@ -168,9 +188,18 @@ struct terminal_tag {
 
     void *logctx;
 
-    Config *cfg;
+    struct unicode_data *ucsdata;
+
+    /*
+     * We maintain a full _copy_ of a Config structure here, not
+     * merely a pointer to it. That way, when we're passed a new
+     * one for reconfiguration, we can check the differences and
+     * adjust the _current_ setting of (e.g.) auto wrap mode rather
+     * than only the default.
+     */
+    Config cfg;
 };
 
-#define in_utf(term) ((term)->utf || line_codepage==CP_UTF8)
+#define in_utf(term) ((term)->utf || (term)->ucsdata->line_codepage==CP_UTF8)
 
 #endif