Created a shiny new abstraction for the socket handling. Has many

[u/mdw/putty] / putty.h

diff --git a/putty.h b/putty.h
index 791930a..ae936b0 100644 (file)
--- a/putty.h
+++ b/putty.h
@@ -1,6 +1,8 @@
 #ifndef PUTTY_PUTTY_H
 #define PUTTY_PUTTY_H
 
+#include "network.h"
+
 #define PUTTY_REG_POS "Software\\SimonTatham\\PuTTY"
 #define PUTTY_REG_PARENT "Software\\SimonTatham"
 #define PUTTY_REG_PARENT_CHILD "PuTTY"
@@ -18,8 +20,6 @@
 #define GLOBAL extern
 #endif
 
-GLOBAL HINSTANCE putty_inst;
-
 #define ATTR_ACTCURS 0x80000000UL      /* active cursor (block) */
 #define ATTR_PASCURS 0x40000000UL      /* passive cursor (box) */
 #define ATTR_INVALID 0x20000000UL
@@ -59,8 +59,6 @@ GLOBAL int rows, cols, savelines;
 
 GLOBAL int font_width, font_height;
 
-#define c_write1(_C) do { if (inbuf_head >= INBUF_SIZE) term_out(); \
-                         inbuf[inbuf_head++] = (_C) ; } while(0)
 #define INBUF_SIZE 2048
 GLOBAL unsigned char inbuf[INBUF_SIZE];
 GLOBAL int inbuf_head;
@@ -92,7 +90,7 @@ GLOBAL char *logfile;
 
 typedef enum {
     TS_AYT, TS_BRK, TS_SYNCH, TS_EC, TS_EL, TS_GA, TS_NOP, TS_ABORT,
-    TS_AO, TS_IP, TS_SUSP, TS_EOR, TS_EOF, TS_LECHO, TS_RECHO
+    TS_AO, TS_IP, TS_SUSP, TS_EOR, TS_EOF, TS_LECHO, TS_RECHO, TS_PING
 } Telnet_Special;
 
 typedef enum {
@@ -108,13 +106,13 @@ typedef enum {
 } VT_Mode;
 
 typedef struct {
-    char *(*init) (HWND hwnd, char *host, int port, char **realhost);
-    int (*msg) (WPARAM wParam, LPARAM lParam);
+    char *(*init) (char *host, int port, char **realhost);
     void (*send) (char *buf, int len);
     void (*size) (void);
     void (*special) (Telnet_Special code);
-    SOCKET (*socket) (void);
+    Socket (*socket) (void);
     int (*sendok) (void);
+    int default_port;
 } Backend;
 
 GLOBAL Backend *back;
@@ -138,6 +136,7 @@ typedef struct {
     enum { PROT_RAW, PROT_TELNET, PROT_SSH } protocol;
     int close_on_exit;
     int warn_on_close;
+    int ping_interval;
     /* SSH options */
     char remote_cmd[512];
     int nopty;
@@ -145,6 +144,7 @@ typedef struct {
     enum { CIPHER_3DES, CIPHER_BLOWFISH, CIPHER_DES } cipher;
     char keyfile[FILENAME_MAX];
     int sshprot;                       /* use v1 or v2 when both available */
+    int buggymac;                      /* MAC bug commmercial <=v2.3.x SSH2 */
     int try_tis_auth;
     /* Telnet options */
     char termtype[32];
@@ -161,8 +161,11 @@ typedef struct {
     int nethack_keypad;
     int alt_f4;                               /* is it special? */
     int alt_space;                    /* is it special? */
+    int alt_only;                     /* is it special? */
     int ldisc_term;
     int scroll_on_key;
+    int scroll_on_disp;
+    int compose_key;
     char wintitle[256];                /* initial window title */
     /* Terminal options */
     int savelines;
@@ -192,6 +195,7 @@ typedef struct {
     VT_Mode vtmode;
     int xlat_enablekoiwin;
     int xlat_88592w1250;
+    int xlat_88592cp852;
     int xlat_capslockcyr;
 } Config;
 
@@ -243,7 +247,7 @@ Context get_ctx(void);
 void free_ctx (Context);
 void palette_set (int, int, int, int);
 void palette_reset (void);
-void write_clip (void *, int);
+void write_clip (void *, int, int);
 void get_clip (void **, int *);
 void optimised_move (int, int, int);
 void connection_fatal(char *, ...);
@@ -265,21 +269,28 @@ void random_destroy_seed(void);
 /*
  * Exports from windlg.c.
  */
+void defuse_showwindow(void);
 int do_config (void);
 int do_reconfig (HWND);
-void do_defaults (char *);
+void do_defaults (char *, Config *);
 void logevent (char *);
 void showeventlog (HWND);
 void showabout (HWND);
 void verify_ssh_host_key(char *host, int port, char *keytype,
                          char *keystr, char *fingerprint);
-void get_sesslist(int allocate);
 void registry_cleanup(void);
 
 GLOBAL int nsessions;
 GLOBAL char **sessions;
 
 /*
+ * Exports from settings.c.
+ */
+void save_settings (char *section, int do_host, Config *cfg);
+void load_settings (char *section, int do_host, Config *cfg);
+void get_sesslist(int allocate);
+
+/*
  * Exports from terminal.c.
  */
 
@@ -297,6 +308,7 @@ void term_invalidate(void);
 void term_blink(int set_cursor);
 void term_paste(void);
 void term_nopaste(void);
+void from_backend(int is_stderr, char *data, int len);
 
 /*
  * Exports from raw.c.