X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/e95edc0020e89be99457e8564040ef4039c4e42a..0965bee0865fd8ea129b2de62a3c50e09c59a184:/putty.h diff --git a/putty.h b/putty.h index bd867f36..5423ae91 100644 --- a/putty.h +++ b/putty.h @@ -24,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 @@ -78,9 +79,18 @@ 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; /* + * Window handles for the dialog boxes that can be running during a + * PuTTY session. + */ +GLOBAL HWND logbox; + +/* * I've just looked in the windows standard headr files for WM_USER, there * are hundreds of flags defined using the form WM_USER+123 so I've * renumbered this NETEVENT value and the two in window.c @@ -105,6 +115,21 @@ typedef enum { VT_XWINDOWS, VT_OEMANSI, VT_OEMONLY, VT_POORMAN } VT_Mode; +enum { + /* + * Line discipline option states: off, on, up to the backend. + */ + LD_YES, LD_NO, LD_BACKEND +}; + +enum { + /* + * Line discipline options which the backend might try to control. + */ + LD_EDIT, /* local line editing */ + LD_ECHO /* local echo */ +}; + typedef struct { char *(*init) (char *host, int port, char **realhost); void (*send) (char *buf, int len); @@ -112,6 +137,7 @@ typedef struct { void (*special) (Telnet_Special code); Socket (*socket) (void); int (*sendok) (void); + int (*ldisc) (int); int default_port; } Backend; @@ -124,22 +150,17 @@ extern struct backend_list { } backends[]; typedef struct { - void (*send) (char *buf, int len); -} Ldisc; - -GLOBAL Ldisc *ldisc; - -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]; @@ -151,6 +172,7 @@ 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; @@ -164,7 +186,8 @@ typedef struct { int alt_f4; /* is it special? */ int alt_space; /* is it special? */ int alt_only; /* is it special? */ - int ldisc_term; + int localecho; + int localedit; int alwaysontop; int scroll_on_key; int scroll_on_disp; @@ -175,6 +198,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; @@ -187,6 +211,9 @@ typedef struct { int fontisbold; int fontheight; int fontcharset; + char logfilename[FILENAME_MAX]; + int logtype; + int hide_mouseptr; /* Colour options */ int try_palette; int bold_colour; @@ -200,6 +227,9 @@ typedef struct { int xlat_88592w1250; int xlat_88592cp852; int xlat_capslockcyr; + /* X11 forwarding */ + int x11_forward; + char x11_display[128]; } Config; /* @@ -282,7 +312,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; @@ -312,7 +344,11 @@ void term_invalidate(void); void term_blink(int set_cursor); void term_paste(void); void term_nopaste(void); +int telnet_ldisc(int option); void from_backend(int is_stderr, char *data, int len); +void logfopen (void); +void logfclose (void); +void term_copyall(void); /* * Exports from raw.c. @@ -321,6 +357,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. */ @@ -337,7 +379,7 @@ extern Backend ssh_backend; * Exports from ldisc.c. */ -extern Ldisc ldisc_term, ldisc_simple; +extern void ldisc_send(char *buf, int len); /* * Exports from sshrand.c. @@ -352,21 +394,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. @@ -400,28 +428,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