X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/875b193f2f7c9b4168d63a274861c4a1d980c286..2184a5d91ffbcf2de2f730c83dda2d9443035f50:/putty.h diff --git a/putty.h b/putty.h index e305c2b0..352a4ef3 100644 --- a/putty.h +++ b/putty.h @@ -1,6 +1,8 @@ #ifndef PUTTY_PUTTY_H #define PUTTY_PUTTY_H +#include /* for FILENAME_MAX */ + #include "network.h" #define PUTTY_REG_POS "Software\\SimonTatham\\PuTTY" @@ -64,6 +66,7 @@ #define UCSERR (ATTR_LINEDRW|'a') /* UCS Format error character. */ #define UCSWIDE 0x303F +#define ATTR_NARROW 0x20000000UL #define ATTR_WIDE 0x10000000UL #define ATTR_BOLD 0x01000000UL #define ATTR_UNDER 0x02000000UL @@ -90,27 +93,17 @@ typedef HDC Context; GLOBAL int rows, cols, savelines; -GLOBAL int font_width, font_height; - -#define INBUF_SIZE 2048 -GLOBAL unsigned char inbuf[INBUF_SIZE]; -GLOBAL int inbuf_head; - -#define OUTBUF_SIZE 2048 -#define OUTBUF_MASK (OUTBUF_SIZE-1) -GLOBAL unsigned char outbuf[OUTBUF_SIZE]; -GLOBAL int outbuf_head, outbuf_reap; - GLOBAL int has_focus; GLOBAL int in_vbell; -GLOBAL long vbell_timeout; +GLOBAL unsigned long vbell_startpoint; GLOBAL int app_cursor_keys, app_keypad_keys, vt52_mode; GLOBAL int repeat_off, cr_lf_return; GLOBAL int seen_key_event; GLOBAL int seen_disp_event; +GLOBAL int alt_pressed; GLOBAL int session_closed; @@ -174,6 +167,18 @@ typedef enum { enum { /* + * SSH ciphers (both SSH1 and SSH2) + */ + CIPHER_WARN, /* pseudo 'cipher' */ + CIPHER_3DES, + CIPHER_BLOWFISH, + CIPHER_AES, /* (SSH 2 only) */ + CIPHER_DES, + CIPHER_MAX /* no. ciphers (inc warn) */ +}; + +enum { + /* * Line discipline option states: off, on, up to the backend. */ LD_YES, LD_NO, LD_BACKEND @@ -197,13 +202,21 @@ enum { }; typedef struct { - char *(*init) (char *host, int port, char **realhost); - void (*send) (char *buf, int len); + 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); + /* back->sendbuffer() does the same thing but without attempting a send */ + int (*sendbuffer) (void); void (*size) (void); void (*special) (Telnet_Special code); - Socket(*socket) (void); + Socket(*socket) (void); int (*sendok) (void); int (*ldisc) (int); + /* + * back->unthrottle() tells the back end that the front end + * buffer is clearing. + */ + void (*unthrottle) (int); int default_port; } Backend; @@ -223,19 +236,26 @@ typedef struct { int close_on_exit; int warn_on_close; int ping_interval; /* in seconds */ + int tcp_nodelay; /* SSH options */ char remote_cmd[512]; + char remote_cmd2[512]; /* fallback if the first fails + * (used internally for scp) */ char *remote_cmd_ptr; /* might point to a larger command * but never for loading/saving */ + char *remote_cmd_ptr2; /* might point to a larger command + * but never for loading/saving */ int nopty; int compression; int agentfwd; - enum { CIPHER_3DES, CIPHER_BLOWFISH, CIPHER_DES, CIPHER_AES } cipher; + 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 try_tis_auth; + int try_ki_auth; int ssh_subsys; /* run a subsystem rather than a command */ + int ssh_subsys2; /* fallback to go with remote_cmd2 */ /* Telnet options */ char termtype[32]; char termspeed[32]; @@ -260,6 +280,7 @@ typedef struct { int localecho; int localedit; int alwaysontop; + int fullscreenonaltenter; int scroll_on_key; int scroll_on_disp; int compose_key; @@ -284,7 +305,8 @@ typedef struct { int bellovl_s; /* period of silence to re-enable bell (s) */ char bell_wavefile[FILENAME_MAX]; int scrollbar; - int locksize; + int scrollbar_in_fullscreen; + enum { RESIZE_TERM, RESIZE_DISABLED, RESIZE_FONT, RESIZE_EITHER } resize_action; int bce; int blinktext; int win_name_always; @@ -298,6 +320,7 @@ typedef struct { int logxfovr; int hide_mouseptr; int sunken_edge; + int window_border; char answerback[256]; /* Colour options */ int try_palette; @@ -305,11 +328,15 @@ typedef struct { unsigned char colours[22][3]; /* Selection options */ int mouse_is_xterm; + int rect_select; int rawcnp; + int rtf_paste; + int mouse_override; short wordness[256]; /* translations */ VT_Mode vtmode; - char line_codepage[32]; + char line_codepage[128]; + int xlat_capslockcyr; /* X11 forwarding */ int x11_forward; char x11_display[128]; @@ -357,9 +384,10 @@ struct RSAKey; /* be a little careful of scope */ /* * Exports from window.c. */ -void request_resize(int, int, int); +void request_resize(int, int); void do_text(Context, int, int, char *, int, unsigned long, int); void do_cursor(Context, int, int, char *, int, unsigned long, int); +int CharWidth(Context ctx, int uc); void set_title(char *); void set_icon(char *); void set_sbar(int, int, int); @@ -380,6 +408,16 @@ void begin_session(void); void sys_cursor(int x, int y); #define OPTIMISE_IS_SCROLL 1 +void set_iconic(int iconic); +void move_window(int x, int y); +void set_zorder(int top); +void refresh_window(void); +void set_zoomed(int zoomed); +int is_iconic(void); +void get_window_pos(int *x, int *y); +void get_window_pixels(int *x, int *y); +char *get_window_title(int icon); + /* * Exports from noise.c. */ @@ -402,6 +440,7 @@ 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); @@ -427,7 +466,7 @@ void term_paint(Context, int, int, int, int); void term_scroll(int, int); void term_pwron(void); void term_clrsb(void); -void term_mouse(Mouse_Button, Mouse_Action, int, int, int, int); +void term_mouse(Mouse_Button, Mouse_Action, int, int, int, int, int); void term_deselect(void); void term_update(void); void term_invalidate(void); @@ -436,7 +475,7 @@ void term_do_paste(void); void term_paste(void); void term_nopaste(void); int term_ldisc(int option); -void from_backend(int is_stderr, char *data, int len); +int from_backend(int is_stderr, char *data, int len); void logfopen(void); void logfclose(void); void term_copyall(void); @@ -471,7 +510,7 @@ extern Backend ssh_backend; * Exports from ldisc.c. */ -extern void ldisc_send(char *buf, int len); +extern void ldisc_send(char *buf, int len, int interactive); /* * Exports from sshrand.c. @@ -506,12 +545,14 @@ void EnableSizeTip(int bEnable); #define CP_UTF8 65001 #endif void init_ucs_tables(void); -void lpage_send(int codepage, char *buf, int len); -void luni_send(wchar_t * widebuf, int len); +void lpage_send(int codepage, char *buf, int len, int interactive); +void luni_send(wchar_t * widebuf, int len, int interactive); +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); +void get_unitab(int codepage, wchar_t * unitab, int ftype); /* * Exports from mscrypto.c @@ -527,5 +568,11 @@ void crypto_wrapup(); void agent_query(void *in, int inlen, void **out, int *outlen); int agent_exists(void); +/* + * Exports from wildcard.c + */ +const char *wc_error(int value); +int wc_match(const char *wildcard, const char *target); +int wc_unescape(char *output, const char *wildcard); #endif