X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/1709795fee167cc2d2d423df0161e7963376b910..a832773496d46caa5e328d36a15b4918f24a804e:/putty.h diff --git a/putty.h b/putty.h index c4230c30..116e2a3c 100644 --- a/putty.h +++ b/putty.h @@ -16,23 +16,16 @@ #endif #endif +#ifndef DONE_TYPEDEFS +#define DONE_TYPEDEFS typedef struct config_tag Config; typedef struct backend_tag Backend; +typedef struct terminal_tag Terminal; +#endif #include "puttyps.h" #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. - */ -#ifdef PUTTY_DO_GLOBALS -#define GLOBAL -#else -#define GLOBAL extern -#endif - /* Three attribute types: * The ATTRs (normal attributes) are stored with the characters in the main * display arrays @@ -99,29 +92,10 @@ typedef struct backend_tag Backend; #define ATTR_CUR_AND (~(ATTR_BOLD|ATTR_REVERSE|ATTR_BLINK|ATTR_COLOURS)) #define ATTR_CUR_XOR 0x00BA0000UL -#define SEL_NL { 13, 10 } - -GLOBAL int rows, cols, savelines; - -GLOBAL int has_focus; - -GLOBAL int in_vbell; -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; -GLOBAL int big_cursor; - -GLOBAL char *help_path; -GLOBAL int help_has_contents; - GLOBAL int nsessions; GLOBAL char **sessions; @@ -136,7 +110,6 @@ 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) #define LGXF_OVR 1 /* existing logfile overwrite */ #define LGXF_APN 0 /* existing logfile append */ @@ -204,27 +177,28 @@ enum { }; struct backend_tag { - char *(*init) (char *host, int port, char **realhost, int nodelay); + char *(*init) (void *frontend_handle, void **backend_handle, + char *host, int port, char **realhost, int nodelay); /* back->send() returns the current amount of buffered data. */ - int (*send) (char *buf, int len); + int (*send) (void *handle, 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); - int (*exitcode) (void); - int (*sendok) (void); - int (*ldisc) (int); + int (*sendbuffer) (void *handle); + void (*size) (void *handle, int width, int height); + void (*special) (void *handle, Telnet_Special code); + Socket(*socket) (void *handle); + int (*exitcode) (void *handle); + int (*sendok) (void *handle); + int (*ldisc) (void *handle, int); + void (*provide_ldisc) (void *handle, void *ldisc); + void (*provide_logctx) (void *handle, void *logctx); /* * back->unthrottle() tells the back end that the front end * buffer is clearing. */ - void (*unthrottle) (int); + void (*unthrottle) (void *handle, int); int default_port; }; -GLOBAL Backend *back; - extern struct backend_list { int protocol; char *name; @@ -371,6 +345,12 @@ struct config_tag { } sshbug_ignore1, sshbug_plainpw1, sshbug_rsa1, 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]; + int shadowboldoffset; }; /* @@ -412,40 +392,43 @@ struct RSAKey; /* be a little careful of scope */ /* * Exports from window.c. */ -void request_resize(int, int); +void request_resize(void *frontend, 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); -Context get_ctx(void); +void set_title(void *frontend, char *); +void set_icon(void *frontend, char *); +void set_sbar(void *frontend, int, int, int); +Context get_ctx(void *frontend); void free_ctx(Context); -void palette_set(int, int, int, int); -void palette_reset(void); -void write_aclip(char *, int, int); -void write_clip(wchar_t *, int, int); -void get_clip(wchar_t **, int *); -void optimised_move(int, int, int); -void set_raw_mouse_mode(int); -Mouse_Button translate_button(Mouse_Button b); -void connection_fatal(char *, ...); +void palette_set(void *frontend, int, int, int, int); +void palette_reset(void *frontend); +void write_aclip(void *frontend, char *, int, int); +void write_clip(void *frontend, wchar_t *, int, int); +void get_clip(void *frontend, wchar_t **, int *); +void optimised_move(void *frontend, int, int, int); +void set_raw_mouse_mode(void *frontend, int); +Mouse_Button translate_button(void *frontend, Mouse_Button b); +void connection_fatal(void *frontend, char *, ...); void fatalbox(char *, ...); void modalfatalbox(char *, ...); -void beep(int); -void begin_session(void); -void sys_cursor(int x, int y); +void beep(void *frontend, int); +void begin_session(void *frontend); +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); #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); +void set_iconic(void *frontend, int iconic); +void move_window(void *frontend, int x, int y); +void set_zorder(void *frontend, int top); +void refresh_window(void *frontend); +void set_zoomed(void *frontend, int zoomed); +int is_iconic(void *frontend); +void get_window_pos(void *frontend, int *x, int *y); +void get_window_pixels(void *frontend, int *x, int *y); +char *get_window_title(void *frontend, int icon); void cleanup_exit(int); @@ -472,35 +455,43 @@ void registry_cleanup(void); * Exports from terminal.c. */ -void term_init(void); -void term_size(int, int, int); -void term_out(void); -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, int); -void term_deselect(void); -void term_update(void); -void term_invalidate(void); -void term_blink(int set_cursor); -void term_do_paste(void); -void term_paste(void); -void term_nopaste(void); -int term_ldisc(int option); -int from_backend(int is_stderr, char *data, int len); -void logfopen(void); -void logfclose(void); -void term_copyall(void); -void term_reconfig(void); +Terminal *term_init(void *frontend); +void term_size(Terminal *, int, int, int); +void term_out(Terminal *); +void term_paint(Terminal *, Context, int, int, int, int); +void term_scroll(Terminal *, int, int); +void term_pwron(Terminal *); +void term_clrsb(Terminal *); +void term_mouse(Terminal *, Mouse_Button, Mouse_Action, int,int,int,int,int); +void term_deselect(Terminal *); +void term_update(Terminal *); +void term_invalidate(Terminal *); +void term_blink(Terminal *, int set_cursor); +void term_do_paste(Terminal *); +int term_paste_pending(Terminal *); +void term_paste(Terminal *); +void term_nopaste(Terminal *); +int term_ldisc(Terminal *, int option); +void term_copyall(Terminal *); +void term_reconfig(Terminal *); +void term_seen_key_event(Terminal *); +int from_backend(void *, int is_stderr, char *data, int len); +void term_provide_resize_fn(Terminal *term, + void (*resize_fn)(void *, int, int), + void *resize_ctx); +void term_provide_logctx(Terminal *term, void *logctx); /* * Exports from logging.c. */ -void logtraffic(unsigned char c, int logmode); +void *log_init(void *frontend); +void logfopen(void *logctx); +void logfclose(void *logctx); +void logtraffic(void *logctx, unsigned char c, int logmode); +void log_eventlog(void *logctx, char *string); enum { PKT_INCOMING, PKT_OUTGOING }; -void log_eventlog(char *string); -void log_packet(int direction, int type, char *texttype, void *data, int len); +void log_packet(void *logctx, int direction, int type, + char *texttype, void *data, int len); /* * Exports from raw.c. @@ -534,8 +525,14 @@ extern Backend ssh_backend; /* * Exports from ldisc.c. */ +void *ldisc_create(Terminal *, Backend *, void *, void *); +void ldisc_send(void *handle, char *buf, int len, int interactive); -extern void ldisc_send(char *buf, int len, int interactive); +/* + * Exports from ldiscucs.c. + */ +void lpage_send(void *, int codepage, char *buf, int len, int interactive); +void luni_send(void *, wchar_t * widebuf, int len, int interactive); /* * Exports from sshrand.c. @@ -564,9 +561,12 @@ extern char ver[]; #ifndef CP_UTF8 #define CP_UTF8 65001 #endif -void init_ucs_tables(void); -void lpage_send(int codepage, char *buf, int len, int interactive); -void luni_send(wchar_t * widebuf, int len, int interactive); +void init_ucs(void); +int is_dbcs_leadbyte(int codepage, char byte); +int mb_to_wc(int codepage, int flags, char *mbstr, int mblen, + wchar_t *wcstr, int wclen); +int wc_to_mb(int codepage, int flags, wchar_t *wcstr, int wclen, + char *mbstr, int mblen, char *defchr, int *defused); wchar_t xlat_uskbd2cyrllic(int ch); int check_compose(int first, int second); int decode_codepage(char *cp_name); @@ -598,11 +598,11 @@ 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, +void logevent(void *frontend, char *); +void verify_ssh_host_key(void *frontend, char *host, int port, char *keytype, char *keystr, char *fingerprint); -void askcipher(char *ciphername, int cs); -int askappend(char *filename); +void askcipher(void *frontend, char *ciphername, int cs); +int askappend(void *frontend, char *filename); /* * Exports from console.c (that aren't equivalents to things in