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 4f9151b..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;
@@ -108,12 +106,11 @@ 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;
@@ -147,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];
@@ -163,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;
@@ -268,6 +269,7 @@ 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 *, Config *);
@@ -306,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.