X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/a094ae434ec1d6a0f69af9b3ef6fbeb40fa96d92..c91409da0ac0d3fb4a225ab85e14370514e4094e:/putty.h diff --git a/putty.h b/putty.h index 7f14f3d9..34cf0696 100644 --- 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" @@ -22,6 +24,7 @@ #define ATTR_PASCURS 0x40000000UL /* passive cursor (box) */ #define ATTR_INVALID 0x20000000UL #define ATTR_WRAPPED 0x10000000UL +#define ATTR_RIGHTCURS 0x10000000UL /* doubles as cursor-on-RHS indicator */ #define LATTR_NORM 0x00000000UL #define LATTR_WIDE 0x01000000UL @@ -76,6 +79,9 @@ GLOBAL int seen_disp_event; GLOBAL int session_closed; +#define LGTYP_NONE 0 /* logmode: no logging */ +#define LGTYP_ASCII 1 /* logmode: pure ascii */ +#define LGTYP_DEBUG 2 /* logmode: all chars of taffic */ GLOBAL char *logfile; /* @@ -104,12 +110,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; @@ -132,13 +137,14 @@ typedef struct { /* Basic options */ char host[512]; int port; - enum { PROT_RAW, PROT_TELNET, PROT_SSH } protocol; + enum { PROT_RAW, PROT_TELNET, PROT_RLOGIN, PROT_SSH } protocol; int close_on_exit; int warn_on_close; - int ping_interval; + int ping_interval; /* in seconds */ /* SSH options */ char remote_cmd[512]; int nopty; + int compression; int agentfwd; enum { CIPHER_3DES, CIPHER_BLOWFISH, CIPHER_DES } cipher; char keyfile[FILENAME_MAX]; @@ -150,11 +156,14 @@ typedef struct { char termspeed[32]; char environmt[1024]; /* VAR\tvalue\0VAR\tvalue\0\0 */ char username[32]; + char localusername[32]; int rfc_environ; /* Keyboard options */ int bksp_is_delete; int rxvt_homeend; int funky_type; + int no_applic_c; /* totally disable app cursor keys */ + int no_applic_k; /* totally disable app keypad */ int app_cursor; int app_keypad; int nethack_keypad; @@ -162,6 +171,7 @@ typedef struct { int alt_space; /* is it special? */ int alt_only; /* is it special? */ int ldisc_term; + int alwaysontop; int scroll_on_key; int scroll_on_disp; int compose_key; @@ -171,6 +181,7 @@ typedef struct { int dec_om; int wrap_mode; int lfhascr; + int cursor_type; /* 0=block 1=underline 2=vertical */ int blink_cur; int beep; int scrollbar; @@ -183,6 +194,8 @@ typedef struct { int fontisbold; int fontheight; int fontcharset; + char logfilename[FILENAME_MAX]; + int logtype; /* Colour options */ int try_palette; int bold_colour; @@ -259,8 +272,9 @@ void sys_cursor(int x, int y); /* * Exports from noise.c. */ -void noise_get_heavy(void (*func) (void *, int)); -void noise_get_light(void (*func) (void *, int)); +void noise_get_heavy(void (*func)(void *, int)); +void noise_get_light(void (*func)(void *, int)); +void noise_regular(void); void noise_ultralight(DWORD data); void random_save_seed(void); void random_destroy_seed(void); @@ -277,7 +291,9 @@ void showeventlog (HWND); void showabout (HWND); void verify_ssh_host_key(char *host, int port, char *keytype, char *keystr, char *fingerprint); +int askappend(char *filename); void registry_cleanup(void); +void force_normal(HWND hwnd); GLOBAL int nsessions; GLOBAL char **sessions; @@ -308,6 +324,9 @@ void term_blink(int set_cursor); void term_paste(void); void term_nopaste(void); void from_backend(int is_stderr, char *data, int len); +void logfopen (void); +void logfclose (void); +void term_copyall(void); /* * Exports from raw.c. @@ -316,6 +335,12 @@ void from_backend(int is_stderr, char *data, int len); extern Backend raw_backend; /* + * Exports from rlogin.c. + */ + +extern Backend rlogin_backend; + +/* * Exports from telnet.c. */ @@ -347,21 +372,7 @@ void random_get_savedata(void **data, int *len); * Exports from misc.c. */ -/* #define MALLOC_LOG do this if you suspect putty of leaking memory */ -#ifdef MALLOC_LOG -#define smalloc(z) (mlog(__FILE__,__LINE__), safemalloc(z)) -#define srealloc(y,z) (mlog(__FILE__,__LINE__), saferealloc(y,z)) -#define sfree(z) (mlog(__FILE__,__LINE__), safefree(z)) -void mlog(char *, int); -#else -#define smalloc safemalloc -#define srealloc saferealloc -#define sfree safefree -#endif - -void *safemalloc(size_t); -void *saferealloc(void *, size_t); -void safefree(void *); +#include "puttymem.h" /* * Exports from version.c. @@ -395,28 +406,9 @@ void crypto_wrapup(); void agent_query(void *in, int inlen, void **out, int *outlen); int agent_exists(void); -/* - * A debug system. - */ #ifdef DEBUG -#include +void dprintf(char *fmt, ...); #define debug(x) (dprintf x) -static void dprintf(char *fmt, ...) { - char buf[2048]; - DWORD dw; - va_list ap; - static int gotconsole = 0; - - if (!gotconsole) { - AllocConsole(); - gotconsole = 1; - } - - va_start(ap, fmt); - vsprintf(buf, fmt, ap); - WriteFile (GetStdHandle(STD_OUTPUT_HANDLE), buf, strlen(buf), &dw, NULL); - va_end(ap); -} #else #define debug(x) #endif