X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/fb89f7ffb1d51a743bc2820dde96e0a798dc40c9..239b3b3629cc9e149dbc375ae2c42dc6d4f35c49:/putty.h diff --git a/putty.h b/putty.h index d69339a8..9d001542 100644 --- a/putty.h +++ b/putty.h @@ -3,13 +3,24 @@ #include /* for FILENAME_MAX */ -#include "network.h" +/* + * Global variables. Most modules declare these `extern', but + * window.c will do `#define PUTTY_DO_GLOBALS' before including this + * module, and so will get them properly defined. + */ +#ifndef GLOBAL +#ifdef PUTTY_DO_GLOBALS +#define GLOBAL +#else +#define GLOBAL extern +#endif +#endif + +typedef struct config_tag Config; +typedef struct backend_tag Backend; -#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" +#include "puttyps.h" +#include "network.h" /* * Global variables. Most modules declare these `extern', but @@ -88,9 +99,6 @@ #define ATTR_CUR_AND (~(ATTR_BOLD|ATTR_REVERSE|ATTR_BLINK|ATTR_COLOURS)) #define ATTR_CUR_XOR 0x00BA0000UL -typedef HDC Context; -#define SEL_NL { 13, 10 } - GLOBAL int rows, cols, savelines; GLOBAL int has_focus; @@ -112,16 +120,19 @@ GLOBAL int big_cursor; GLOBAL char *help_path; GLOBAL int help_has_contents; +GLOBAL int nsessions; +GLOBAL char **sessions; + GLOBAL int utf; GLOBAL int dbcs_screenfont; GLOBAL int font_codepage; GLOBAL int kbd_codepage; GLOBAL int line_codepage; -GLOBAL WCHAR unitab_scoacs[256]; -GLOBAL WCHAR unitab_line[256]; -GLOBAL WCHAR unitab_font[256]; -GLOBAL WCHAR unitab_xterm[256]; -GLOBAL WCHAR unitab_oemcp[256]; +GLOBAL wchar_t unitab_scoacs[256]; +GLOBAL wchar_t unitab_line[256]; +GLOBAL wchar_t unitab_font[256]; +GLOBAL wchar_t unitab_xterm[256]; +GLOBAL wchar_t unitab_oemcp[256]; GLOBAL unsigned char unitab_ctrl[256]; #define in_utf (utf || line_codepage==CP_UTF8) @@ -132,21 +143,6 @@ GLOBAL unsigned char unitab_ctrl[256]; #define LGTYP_ASCII 1 /* logmode: pure ascii */ #define LGTYP_DEBUG 2 /* logmode: all chars of traffic */ #define LGTYP_PACKETS 3 /* logmode: SSH data packets */ -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 - */ -#define WM_XUSER (WM_USER + 0x2000) -#define WM_NETEVENT (WM_XUSER + 5) typedef enum { TS_AYT, TS_BRK, TS_SYNCH, TS_EC, TS_EL, TS_GA, TS_NOP, TS_ABORT, @@ -205,7 +201,7 @@ enum { COE_ALWAYS /* Always close the window */ }; -typedef struct { +struct backend_tag { char *(*init) (char *host, int port, char **realhost, int nodelay); /* back->send() returns the current amount of buffered data. */ int (*send) (char *buf, int len); @@ -223,7 +219,7 @@ typedef struct { */ void (*unthrottle) (int); int default_port; -} Backend; +}; GLOBAL Backend *back; @@ -233,7 +229,7 @@ extern struct backend_list { Backend *backend; } backends[]; -typedef struct { +struct config_tag { /* Basic options */ char host[512]; int port; @@ -266,7 +262,6 @@ typedef struct { int ssh_cipherlist[CIPHER_MAX]; char keyfile[FILENAME_MAX]; int sshprot; /* use v1 or v2 when both available */ - int buggymac; /* MAC bug commmercial <=v2.3.x SSH2 */ int ssh2_des_cbc; /* "des-cbc" nonstandard SSH2 cipher */ int try_tis_auth; int try_ki_auth; @@ -372,8 +367,14 @@ typedef struct { enum { BUG_AUTO, BUG_OFF, BUG_ON } sshbug_ignore1, sshbug_plainpw1, sshbug_rsa1, - sshbug_hmac2, sshbug_derivekey2, sshbug_rsapad2; -} Config; + sshbug_hmac2, sshbug_derivekey2, sshbug_rsapad2, + sshbug_dhgex2; + /* Options for pterm. Should split out into platform-dependent part. */ + int stamp_utmp; + int login_shell; + int scrollbar_on_left; + char boldfont[64]; +}; /* * You can compile with -DSSH_DEFAULT to have ssh by default. @@ -433,9 +434,11 @@ void set_raw_mouse_mode(int); Mouse_Button translate_button(Mouse_Button b); void connection_fatal(char *, ...); void fatalbox(char *, ...); +void modalfatalbox(char *, ...); void beep(int); void begin_session(void); void sys_cursor(int x, int y); +void request_paste(void); #define OPTIMISE_IS_SCROLL 1 void set_iconic(int iconic); @@ -456,36 +459,18 @@ void cleanup_exit(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 noise_ultralight(unsigned long data); void random_save_seed(void); 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 *); -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 askcipher(char *ciphername, int cs); -int askappend(char *filename); -void registry_cleanup(void); -void force_normal(HWND hwnd); - -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); +void do_defaults(char *, Config *); +void registry_cleanup(void); /* * Exports from terminal.c. @@ -504,6 +489,7 @@ void term_update(void); void term_invalidate(void); void term_blink(int set_cursor); void term_do_paste(void); +int term_paste_pending(void); void term_paste(void); void term_nopaste(void); int term_ldisc(int option); @@ -578,12 +564,6 @@ extern int random_active; extern char ver[]; /* - * Exports from sizetip.c. - */ -void UpdateSizeTip(HWND src, int cx, int cy); -void EnableSizeTip(int bEnable); - -/* * Exports from unicode.c. */ #ifndef CP_UTF8 @@ -621,6 +601,15 @@ int wc_match(const char *wildcard, const char *target); int wc_unescape(char *output, const char *wildcard); /* + * Exports from windlg.c + */ +void logevent(char *); +void verify_ssh_host_key(char *host, int port, char *keytype, + char *keystr, char *fingerprint); +void askcipher(char *ciphername, int cs); +int askappend(char *filename); + +/* * Exports from console.c (that aren't equivalents to things in * windlg.c). */