X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/2cb502506f9a85b821564075645daf778188d2f4..b9d7bcadee831e9b59fb785f2464a5fc1897bd1a:/putty.h diff --git a/putty.h b/putty.h index 4b151def..3bc4a4b5 100644 --- a/putty.h +++ b/putty.h @@ -18,6 +18,7 @@ typedef struct config_tag Config; typedef struct backend_tag Backend; +typedef struct terminal_tag Terminal; #include "puttyps.h" #include "network.h" @@ -99,23 +100,10 @@ typedef struct backend_tag Backend; #define ATTR_CUR_AND (~(ATTR_BOLD|ATTR_REVERSE|ATTR_BLINK|ATTR_COLOURS)) #define ATTR_CUR_XOR 0x00BA0000UL -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_disp_event; GLOBAL int alt_pressed; GLOBAL int session_closed; -GLOBAL int big_cursor; - GLOBAL char *help_path; GLOBAL int help_has_contents; @@ -133,7 +121,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 */ @@ -201,26 +188,29 @@ 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); /* * 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; +GLOBAL void *backhandle; extern struct backend_list { int protocol; @@ -410,6 +400,8 @@ GLOBAL Config cfg; GLOBAL int default_protocol; GLOBAL int default_port; +GLOBAL Terminal *term; /* temporary while changes are made */ + struct RSAKey; /* be a little careful of scope */ /* @@ -439,6 +431,8 @@ void beep(int); void begin_session(void); void sys_cursor(int x, int y); void request_paste(void); +void frontend_keypress(void *frontend); +void ldisc_update(void *frontend, int echo, int edit); #define OPTIMISE_IS_SCROLL 1 void set_iconic(int iconic); @@ -476,33 +470,36 @@ 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); -int term_paste_pending(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); -void term_seen_key_event(void); +Terminal *term_init(void); +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); /* * Exports from logging.c. */ +void logfopen(); +void logfclose(); void logtraffic(unsigned char c, int logmode); enum { PKT_INCOMING, PKT_OUTGOING }; void log_eventlog(char *string); @@ -541,7 +538,8 @@ extern Backend ssh_backend; * Exports from ldisc.c. */ -extern void ldisc_send(char *buf, int len, int interactive); +void *ldisc_create(Terminal *, Backend *, void *, void *); +void ldisc_send(void *handle, char *buf, int len, int interactive); /* * Exports from sshrand.c. @@ -571,8 +569,8 @@ extern char ver[]; #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 lpage_send(void *, int codepage, char *buf, int len, int interactive); +void luni_send(void *, 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);