Sebastian Kuschel reports that pfd_closing can be called for a socket

[u/mdw/putty] / terminal.h

diff --git a/terminal.h b/terminal.h
index 6630411..14e797b 100644 (file)
--- a/terminal.h
+++ b/terminal.h
@@ -68,6 +68,7 @@ struct termline {
 struct bidi_cache_entry {
     int width;
     struct termchar *chars;
+    int *forward, *backward;          /* the permutations of line positions */
 };
 
 struct terminal_tag {
@@ -78,8 +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 */
+    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 */
@@ -117,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? */
@@ -133,21 +135,29 @@ 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 xterm_extended_mouse;
+    int urxvt_extended_mouse;
     int mouse_is_down;                /* used while tracking mouse buttons */
 
+    int bracketed_paste;
+
     int cset_attr[2];
 
 /*
@@ -227,13 +237,13 @@ struct terminal_tag {
     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.
+     * We maintain a full copy of a Conf 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;
+    Conf *conf;
 
     /*
      * from_backend calls term_out, but it can also be called from
@@ -246,6 +256,19 @@ 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;
@@ -254,6 +277,52 @@ struct terminal_tag {
     int wcFromTo_size;
     struct bidi_cache_entry *pre_bidi_cache, *post_bidi_cache;
     int bidi_cache_size;
+
+    /*
+     * We copy a bunch of stuff out of the Conf structure into local
+     * fields in the Terminal structure, to avoid the repeated
+     * tree234 lookups which would be involved in fetching them from
+     * the former every time.
+     */
+    int ansi_colour;
+    char *answerback;
+    int answerbacklen;
+    int arabicshaping;
+    int beep;
+    int bellovl;
+    int bellovl_n;
+    int bellovl_s;
+    int bellovl_t;
+    int bidi;
+    int bksp_is_delete;
+    int blink_cur;
+    int blinktext;
+    int cjk_ambig_wide;
+    int conf_height;
+    int conf_width;
+    int crhaslf;
+    int erase_to_scrollback;
+    int funky_type;
+    int lfhascr;
+    int logflush;
+    int logtype;
+    int mouse_override;
+    int nethack_keypad;
+    int no_alt_screen;
+    int no_applic_c;
+    int no_applic_k;
+    int no_dbackspace;
+    int no_mouse_rep;
+    int no_remote_charset;
+    int no_remote_resize;
+    int no_remote_wintitle;
+    int rawcnp;
+    int rect_select;
+    int remote_qtitle_action;
+    int rxvt_homeend;
+    int scroll_on_disp;
+    int scroll_on_key;
+    int xterm_256_colour;
 };
 
 #define in_utf(term) ((term)->utf || (term)->ucsdata->line_codepage==CP_UTF8)