Add some hard-coded textual literal-IP representations of localhost to

[u/mdw/putty] / terminal.h

diff --git a/terminal.h b/terminal.h
index d4eef39..aef47a5 100644 (file)
--- a/terminal.h
+++ b/terminal.h
@@ -33,17 +33,44 @@ typedef struct termchar termchar;
 typedef struct termline termline;
 
 struct termchar {
+    /*
+     * Any code in terminal.c which definitely needs to be changed
+     * when extra fields are added here is labelled with a comment
+     * saying FULL-TERMCHAR.
+     */
     unsigned long chr;
     unsigned long attr;
+
+    /*
+     * The cc_next field is used to link multiple termchars
+     * together into a list, so as to fit more than one character
+     * into a character cell (Unicode combining characters).
+     * 
+     * cc_next is a relative offset into the current array of
+     * termchars. I.e. to advance to the next character in a list,
+     * one does `tc += tc->next'.
+     * 
+     * Zero means end of list.
+     */
+    int cc_next;
 };
 
 struct termline {
     unsigned short lattr;
-    int cols;
+    int cols;                         /* number of real columns on the line */
+    int size;                         /* number of allocated termchars
+                                       * (cc-lists may make this > cols) */
     int temporary;                    /* TRUE if decompressed from scrollback */
+    int cc_free;                      /* offset to first cc in free list */
     struct termchar *chars;
 };
 
+struct bidi_cache_entry {
+    int width;
+    struct termchar *chars;
+    int *forward, *backward;          /* the permutations of line positions */
+};
+
 struct terminal_tag {
 
     int compatibility_level;
@@ -52,10 +79,9 @@ 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 */
-
-    termchar *cpos;                   /* cursor position (convenience) */
+    int tempsblines;                  /* number of lines of .scrollback that
+                                         can be retrieved onto the terminal
+                                         ("temporary scrollback") */
 
     termline **disptext;              /* buffer of text on real screen */
     int dispcursx, dispcursy;         /* location of cursor on real screen */
@@ -70,9 +96,6 @@ struct terminal_tag {
 
 #define TTYPE termchar
 #define TSIZE (sizeof(TTYPE))
-#define fix_cpos do { \
-    term->cpos = lineptr(term->curs.y)->chars + term->curs.x; \
-} while(0)
 
 #ifdef OPTIMISE_SCROLL
     struct scrollregion *scrollhead, *scrolltail;
@@ -96,7 +119,7 @@ struct terminal_tag {
     int cursor_on;                    /* cursor enabled flag */
     int reset_132;                    /* Flag ESC c resets to 80 cols */
     int use_bce;                      /* Use Background coloured erase */
-    int blinker;                      /* When blinking is the cursor on ? */
+    int cblinker;                     /* When blinking is the cursor on ? */
     int tblinker;                     /* When the blinking text is on */
     int blink_is_real;                /* Actually blink blinking text */
     int term_echoing;                 /* Does terminal want local echo? */
@@ -112,19 +135,23 @@ struct terminal_tag {
     bufchain printer_buf;             /* buffered data for printer */
     printer_job *print_job;
 
+    /* ESC 7 saved state for the alternate screen */
+    pos alt_savecurs;
+    int alt_save_attr;
+    int alt_save_cset, alt_save_csattr;
+    int alt_save_utf, alt_save_wnext;
+    int alt_save_sco_acs;
+
     int rows, cols, savelines;
     int has_focus;
     int in_vbell;
-    unsigned long vbell_startpoint;
+    long vbell_end;
     int app_cursor_keys, app_keypad_keys, vt52_mode;
     int repeat_off, cr_lf_return;
     int seen_disp_event;
     int big_cursor;
 
-    long last_blink;                  /* used for real blinking control */
-    long last_tblink;
-
-    int xterm_mouse;                  /* send mouse messages to app */
+    int xterm_mouse;                  /* send mouse messages to host */
     int mouse_is_down;                /* used while tracking mouse buttons */
 
     int cset_attr[2];
@@ -225,11 +252,26 @@ struct terminal_tag {
     int in_term_out;
 
     /*
+     * We schedule a window update shortly after receiving terminal
+     * data. This tracks whether one is currently pending.
+     */
+    int window_update_pending;
+    long next_update;
+
+    /*
+     * Track pending blinks and tblinks.
+     */
+    int tblink_pending, cblink_pending;
+    long next_tblink, next_cblink;
+
+    /*
      * These are buffers used by the bidi and Arabic shaping code.
      */
     termchar *ltemp;
+    int ltemp_size;
     bidi_char *wcFrom, *wcTo;
-    termchar **pre_bidi_cache, **post_bidi_cache;
+    int wcFromTo_size;
+    struct bidi_cache_entry *pre_bidi_cache, *post_bidi_cache;
     int bidi_cache_size;
 };