projects
/
u
/
mdw
/
putty
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Introduce a sane interface function, from_backend(), for backends to
[u/mdw/putty]
/
putty.h
diff --git
a/putty.h
b/putty.h
index
bc9d689
..
6747b42
100644
(file)
--- a/
putty.h
+++ b/
putty.h
@@
-2,6
+2,10
@@
#define PUTTY_PUTTY_H
#define PUTTY_REG_POS "Software\\SimonTatham\\PuTTY"
#define PUTTY_PUTTY_H
#define PUTTY_REG_POS "Software\\SimonTatham\\PuTTY"
+#define PUTTY_REG_PARENT "Software\\SimonTatham"
+#define PUTTY_REG_PARENT_CHILD "PuTTY"
+#define PUTTY_REG_GPARENT "Software"
+#define PUTTY_REG_GPARENT_CHILD "SimonTatham"
/*
* Global variables. Most modules declare these `extern', but
/*
* Global variables. Most modules declare these `extern', but
@@
-14,8
+18,6
@@
#define GLOBAL extern
#endif
#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
#define ATTR_ACTCURS 0x80000000UL /* active cursor (block) */
#define ATTR_PASCURS 0x40000000UL /* passive cursor (box) */
#define ATTR_INVALID 0x20000000UL
@@
-55,8
+57,6
@@
GLOBAL int rows, cols, savelines;
GLOBAL int font_width, font_height;
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;
#define INBUF_SIZE 2048
GLOBAL unsigned char inbuf[INBUF_SIZE];
GLOBAL int inbuf_head;
@@
-88,7
+88,7
@@
GLOBAL char *logfile;
typedef enum {
TS_AYT, TS_BRK, TS_SYNCH, TS_EC, TS_EL, TS_GA, TS_NOP, TS_ABORT,
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 {
} Telnet_Special;
typedef enum {
@@
-111,6
+111,7
@@
typedef struct {
void (*special) (Telnet_Special code);
SOCKET (*socket) (void);
int (*sendok) (void);
void (*special) (Telnet_Special code);
SOCKET (*socket) (void);
int (*sendok) (void);
+ int default_port;
} Backend;
GLOBAL Backend *back;
} Backend;
GLOBAL Backend *back;
@@
-134,6
+135,7
@@
typedef struct {
enum { PROT_RAW, PROT_TELNET, PROT_SSH } protocol;
int close_on_exit;
int warn_on_close;
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;
/* SSH options */
char remote_cmd[512];
int nopty;
@@
-141,6
+143,7
@@
typedef struct {
enum { CIPHER_3DES, CIPHER_BLOWFISH, CIPHER_DES } cipher;
char keyfile[FILENAME_MAX];
int sshprot; /* use v1 or v2 when both available */
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];
int try_tis_auth;
/* Telnet options */
char termtype[32];
@@
-159,6
+162,7
@@
typedef struct {
int alt_space; /* is it special? */
int ldisc_term;
int scroll_on_key;
int alt_space; /* is it special? */
int ldisc_term;
int scroll_on_key;
+ char wintitle[256]; /* initial window title */
/* Terminal options */
int savelines;
int dec_om;
/* Terminal options */
int savelines;
int dec_om;
@@
-187,6
+191,7
@@
typedef struct {
VT_Mode vtmode;
int xlat_enablekoiwin;
int xlat_88592w1250;
VT_Mode vtmode;
int xlat_enablekoiwin;
int xlat_88592w1250;
+ int xlat_88592cp852;
int xlat_capslockcyr;
} Config;
int xlat_capslockcyr;
} Config;
@@
-238,11
+243,14
@@
Context get_ctx(void);
void free_ctx (Context);
void palette_set (int, int, int, int);
void palette_reset (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 get_clip (void **, int *);
void optimised_move (int, int, int);
+void connection_fatal(char *, ...);
void fatalbox (char *, ...);
void beep (int);
void fatalbox (char *, ...);
void beep (int);
+void begin_session(void);
+void sys_cursor(int x, int y);
#define OPTIMISE_IS_SCROLL 1
/*
#define OPTIMISE_IS_SCROLL 1
/*
@@
-252,23
+260,33
@@
void noise_get_heavy(void (*func) (void *, int));
void noise_get_light(void (*func) (void *, int));
void noise_ultralight(DWORD data);
void random_save_seed(void);
void noise_get_light(void (*func) (void *, int));
void noise_ultralight(DWORD data);
void random_save_seed(void);
+void random_destroy_seed(void);
/*
* Exports from windlg.c.
*/
/*
* Exports from windlg.c.
*/
+void defuse_showwindow(void);
int do_config (void);
int do_reconfig (HWND);
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 logevent (char *);
void showeventlog (HWND);
void showabout (HWND);
-void verify_ssh_host_key(char *host, char *keystr);
-void get_sesslist(int allocate);
+void verify_ssh_host_key(char *host, int port, char *keytype,
+ char *keystr, char *fingerprint);
+void registry_cleanup(void);
GLOBAL int nsessions;
GLOBAL char **sessions;
/*
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.
*/
* Exports from terminal.c.
*/
@@
-286,6
+304,7
@@
void term_invalidate(void);
void term_blink(int set_cursor);
void term_paste(void);
void term_nopaste(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.
/*
* Exports from raw.c.