New improved bell handling. Choice between visual and audible bell;

[u/mdw/putty] / putty.h

diff --git a/putty.h b/putty.h
index 7bb97d9..b560688 100644 (file)
--- a/putty.h
+++ b/putty.h
@@ -52,6 +52,7 @@
 #define ERASE_CHAR   (ATTR_DEFAULT | ' ')
 #define ATTR_MASK    0xFFFFFF00UL
 #define CHAR_MASK    0x000000FFUL
+#define CSET_MASK    0x00F00000UL      /* mask for character set */
 
 typedef HDC Context;
 #define SEL_NL { 13, 10 }
@@ -71,6 +72,9 @@ GLOBAL int outbuf_head, outbuf_reap;
 
 GLOBAL int has_focus;
 
+GLOBAL int in_vbell;
+GLOBAL long vbell_timeout;
+
 GLOBAL int app_cursor_keys, app_keypad_keys, vt52_mode;
 GLOBAL int repeat_off, cr_lf_return;
 
@@ -168,10 +172,12 @@ typedef struct {
     int ping_interval;                 /* in seconds */
     /* SSH options */
     char remote_cmd[512];
+    char *remote_cmd_ptr;              /* might point to a larger command
+                                        * but never for loading/saving */
     int nopty;
     int compression;
     int agentfwd;
-    enum { CIPHER_3DES, CIPHER_BLOWFISH, CIPHER_DES } cipher;
+    enum { CIPHER_3DES, CIPHER_BLOWFISH, CIPHER_DES, CIPHER_AES } cipher;
     char keyfile[FILENAME_MAX];
     int sshprot;                       /* use v1 or v2 when both available */
     int buggymac;                      /* MAC bug commmercial <=v2.3.x SSH2 */
@@ -202,6 +208,7 @@ typedef struct {
     int scroll_on_key;
     int scroll_on_disp;
     int compose_key;
+    int ctrlaltkeys;
     char wintitle[256];                /* initial window title */
     /* Terminal options */
     int savelines;
@@ -210,7 +217,11 @@ typedef struct {
     int lfhascr;
     int cursor_type;                  /* 0=block 1=underline 2=vertical */
     int blink_cur;
-    int beep;
+    int beep;                         /* 0=none 1=defaultsound 2=visual */
+    int bellovl;                      /* bell overload protection active? */
+    int bellovl_n;                    /* number of bells to cause overload */
+    int bellovl_t;                    /* time interval for overload (seconds) */
+    int bellovl_s;                    /* period of silence to re-enable bell (s) */
     int scrollbar;
     int locksize;
     int bce;
@@ -224,12 +235,14 @@ typedef struct {
     char logfilename[FILENAME_MAX];
     int logtype;
     int hide_mouseptr;
+    char answerback[256];
     /* Colour options */
     int try_palette;
     int bold_colour;
     unsigned char colours[22][3];
     /* Selection options */
     int mouse_is_xterm;
+    int rawcnp;
     short wordness[256];
     /* translations */
     VT_Mode vtmode;
@@ -382,7 +395,8 @@ extern Backend telnet_backend;
  * Exports from ssh.c.
  */
 
-extern int (*ssh_get_password)(const char *prompt, char *str, int maxlen);
+extern int (*ssh_get_line)(const char *prompt, char *str, int maxlen,
+                           int is_pw);
 extern Backend ssh_backend;
 
 /*