X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/50c1be3f91b0754ba7c6a49fbceb70286dd4d99c..f5dd8adbec0c362f609e2f115ff5859ce4969d09:/putty.h diff --git a/putty.h b/putty.h index afdb12e1..96447bc2 100644 --- a/putty.h +++ b/putty.h @@ -1,7 +1,6 @@ #ifndef PUTTY_PUTTY_H #define PUTTY_PUTTY_H -#include /* for FILENAME_MAX */ #include /* for wchar_t */ /* @@ -26,6 +25,7 @@ typedef struct terminal_tag Terminal; #include "puttyps.h" #include "network.h" +#include "misc.h" /* Three attribute types: * The ATTRs (normal attributes) are stored with the characters in @@ -134,6 +134,11 @@ typedef enum { TS_EOL } Telnet_Special; +struct telnet_special { + const char *name; /* NULL==end, ""==separator */ + int code; +}; + typedef enum { MBT_NOTHING, MBT_LEFT, MBT_MIDDLE, MBT_RIGHT, /* `raw' button designations */ @@ -272,6 +277,7 @@ struct backend_tag { int (*sendbuffer) (void *handle); void (*size) (void *handle, int width, int height); void (*special) (void *handle, Telnet_Special code); + const struct telnet_special *(*get_specials) (void *handle); Socket(*socket) (void *handle); int (*exitcode) (void *handle); int (*sendok) (void *handle); @@ -299,6 +305,12 @@ extern struct backend_list { extern const int be_default_protocol; /* + * Name of this particular application, for use in the config box + * and other pieces of text. + */ +extern const char *const appname; + +/* * IMPORTANT POLICY POINT: everything in this structure which wants * to be treated like an integer must be an actual, honest-to- * goodness `int'. No enum-typed variables. This is because parts @@ -339,7 +351,7 @@ struct config_tag { int agentfwd; int change_username; /* allow username switching in SSH2 */ int ssh_cipherlist[CIPHER_MAX]; - char keyfile[FILENAME_MAX]; + Filename keyfile; int sshprot; /* use v1 or v2 when both available */ int ssh2_des_cbc; /* "des-cbc" nonstandard SSH2 cipher */ int try_tis_auth; @@ -366,6 +378,7 @@ struct config_tag { int no_remote_wintitle; /* disable remote retitling */ int no_dbackspace; /* disable destructive backspace */ int no_remote_charset; /* disable remote charset config */ + int no_remote_qtitle; /* disable remote win title query */ int app_cursor; int app_keypad; int nethack_keypad; @@ -380,6 +393,7 @@ struct config_tag { int fullscreenonaltenter; int scroll_on_key; int scroll_on_disp; + int erase_to_scrollback; int compose_key; int ctrlaltkeys; char wintitle[256]; /* initial window title */ @@ -396,7 +410,7 @@ struct config_tag { int bellovl_n; /* number of bells to cause overload */ int bellovl_t; /* time interval for overload (seconds) */ int bellovl_s; /* period of silence to re-enable bell (s) */ - char bell_wavefile[FILENAME_MAX]; + Filename bell_wavefile; int scrollbar; int scrollbar_in_fullscreen; int resize_action; @@ -404,11 +418,8 @@ struct config_tag { int blinktext; int win_name_always; int width, height; - char font[256]; - int fontisbold; - int fontheight; - int fontcharset; - char logfilename[FILENAME_MAX]; + FontSpec font; + Filename logfilename; int logtype; int logxfovr; int hide_mouseptr; @@ -438,18 +449,29 @@ struct config_tag { /* port forwarding */ int lport_acceptall; /* accept conns from hosts other than localhost */ int rport_acceptall; /* same for remote forwarded ports (SSH2 only) */ - char portfwd[1024]; /* [LR]localport\thost:port\000[LR]localport\thost:port\000\000 */ + /* + * The port forwarding string contains a number of + * NUL-terminated substrings, terminated in turn by an empty + * string (i.e. a second NUL immediately after the previous + * one). Each string can be of one of the following forms: + * + * [LR]localport\thost:port + * [LR]localaddr:localport\thost:port + * Dlocalport + * Dlocaladdr:localport + */ + char portfwd[1024]; /* SSH bug compatibility modes */ int sshbug_ignore1, sshbug_plainpw1, sshbug_rsa1, sshbug_hmac2, sshbug_derivekey2, sshbug_rsapad2, - sshbug_dhgex2; + sshbug_dhgex2, sshbug_pksessid2; /* Options for pterm. Should split out into platform-dependent part. */ int stamp_utmp; int login_shell; int scrollbar_on_left; - char boldfont[256]; - char widefont[256]; - char wideboldfont[256]; + FontSpec boldfont; + FontSpec widefont; + FontSpec wideboldfont; int shadowboldoffset; }; @@ -494,7 +516,7 @@ void do_text(Context, int, int, char *, int, unsigned long, int); void do_cursor(Context, int, int, char *, int, unsigned long, int); int char_width(Context ctx, int uc); #ifdef OPTIMISE_SCROLL -void do_scroll(void *, int, int, int); +void do_scroll(Context, int, int, int); #endif void set_title(void *frontend, char *); void set_icon(void *frontend, char *); @@ -521,6 +543,8 @@ void sys_cursor(void *frontend, int x, int y); void request_paste(void *frontend); void frontend_keypress(void *frontend); void ldisc_update(void *frontend, int echo, int edit); +void update_specials_menu(void *frontend); +int from_backend(void *frontend, int is_stderr, const char *data, int len); #define OPTIMISE_IS_SCROLL 1 void set_iconic(void *frontend, int iconic); @@ -548,7 +572,7 @@ void random_destroy_seed(void); /* * Exports from settings.c. */ -void save_settings(char *section, int do_host, Config * cfg); +char *save_settings(char *section, int do_host, Config * cfg); void save_open_settings(void *sesskey, int do_host, Config *cfg); void load_settings(char *section, int do_host, Config * cfg); void load_open_settings(void *sesskey, int do_host, Config *cfg); @@ -563,10 +587,14 @@ void registry_cleanup(void); * (The integer one is expected to return `def' if it has no clear * opinion of its own. This is because there's no integer value * which I can reliably set aside to indicate `nil'. The string - * function is perfectly all right returning NULL, of course.) + * function is perfectly all right returning NULL, of course. The + * Filename and FontSpec functions are _not allowed_ to fail to + * return, since these defaults _must_ be per-platform.) */ char *platform_default_s(const char *name); int platform_default_i(const char *name, int def); +Filename platform_default_filename(const char *name); +FontSpec platform_default_fontspec(const char *name); /* * Exports from terminal.c. @@ -596,7 +624,7 @@ int term_ldisc(Terminal *, int option); void term_copyall(Terminal *); void term_reconfig(Terminal *, Config *); void term_seen_key_event(Terminal *); -int from_backend(void *, int is_stderr, char *data, int len); +int term_data(Terminal *, int is_stderr, const char *data, int len); void term_provide_resize_fn(Terminal *term, void (*resize_fn)(void *, int, int), void *resize_ctx); @@ -702,8 +730,8 @@ int wc_to_mb(int codepage, int flags, wchar_t *wcstr, int wclen, wchar_t xlat_uskbd2cyrllic(int ch); int check_compose(int first, int second); int decode_codepage(char *cp_name); -char *cp_enumerate (int index); -char *cp_name(int codepage); +const char *cp_enumerate (int index); +const char *cp_name(int codepage); void get_unitab(int codepage, wchar_t * unitab, int ftype); /* @@ -740,7 +768,7 @@ void logevent(void *frontend, char *); void verify_ssh_host_key(void *frontend, char *host, int port, char *keytype, char *keystr, char *fingerprint); void askcipher(void *frontend, char *ciphername, int cs); -int askappend(void *frontend, char *filename); +int askappend(void *frontend, Filename filename); /* * Exports from console.c (that aren't equivalents to things in @@ -771,11 +799,19 @@ int cmdline_process_param(char *, char *, int, Config *); void cmdline_run_saved(Config *); extern char *cmdline_password; #define TOOLTYPE_FILETRANSFER 1 +#define TOOLTYPE_NONNETWORK 2 extern int cmdline_tooltype; void cmdline_error(char *, ...); /* + * Exports from config.c. + */ +struct controlbox; +void setup_config_box(struct controlbox *b, struct sesslist *sesslist, + int midsession, int protocol); + +/* * X11 auth mechanisms we know about. */ enum { @@ -786,4 +822,12 @@ enum { }; extern const char *const x11_authnames[]; /* declared in x11fwd.c */ +/* + * Miscellaneous exports from the platform-specific code. + */ +Filename filename_from_str(const char *string); +const char *filename_to_str(const Filename *fn); +int filename_equal(Filename f1, Filename f2); +int filename_is_null(Filename fn); + #endif