X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/a832773496d46caa5e328d36a15b4918f24a804e..6f1e7b78af0f9c4c502609392f62771cf2528d8f:/putty.h diff --git a/putty.h b/putty.h index 116e2a3c..93fef20c 100644 --- a/putty.h +++ b/putty.h @@ -2,6 +2,7 @@ #define PUTTY_PUTTY_H #include /* for FILENAME_MAX */ +#include /* for wchar_t */ /* * Global variables. Most modules declare these `extern', but @@ -50,6 +51,7 @@ typedef struct terminal_tag Terminal; #define LATTR_BOT 0x03000000UL #define LATTR_MODE 0x03000000UL #define LATTR_WRAPPED 0x10000000UL +#define LATTR_WRAPPED2 0x20000000UL #define ATTR_INVALID 0x00FF0000UL @@ -68,7 +70,15 @@ typedef struct terminal_tag Terminal; #define DIRECT_FONT(c) ((c&0xFE00)==0xF000) #define UCSERR (ATTR_LINEDRW|'a') /* UCS Format error character. */ -#define UCSWIDE 0x303F +/* + * UCSWIDE is a special value used in the terminal data to signify + * the character cell containing the right-hand half of a CJK wide + * character. We use 0xDFFF because it's part of the surrogate + * range and hence won't be used for anything else (it's impossible + * to input it via UTF-8 because our UTF-8 decoder correctly + * rejects surrogates). + */ +#define UCSWIDE 0xDFFF #define ATTR_NARROW 0x20000000UL #define ATTR_WIDE 0x10000000UL @@ -92,17 +102,14 @@ typedef struct terminal_tag Terminal; #define ATTR_CUR_AND (~(ATTR_BOLD|ATTR_REVERSE|ATTR_BLINK|ATTR_COLOURS)) #define ATTR_CUR_XOR 0x00BA0000UL -GLOBAL int alt_pressed; - -GLOBAL int session_closed; - -GLOBAL int nsessions; -GLOBAL char **sessions; +struct sesslist { + int nsessions; + char **sessions; + char *buffer; /* so memory can be freed later */ +}; -GLOBAL int utf; GLOBAL int dbcs_screenfont; GLOBAL int font_codepage; -GLOBAL int kbd_codepage; GLOBAL int line_codepage; GLOBAL wchar_t unitab_scoacs[256]; GLOBAL wchar_t unitab_line[256]; @@ -216,6 +223,8 @@ struct config_tag { int tcp_nodelay; /* Proxy options */ char proxy_exclude_list[512]; + enum { PROXYDNS_NO, PROXYDNS_AUTO, PROXYDNS_YES } proxy_dns; + int even_proxy_localhost; enum { PROXY_NONE, PROXY_HTTP, PROXY_SOCKS, PROXY_TELNET } proxy_type; char proxy_host[512]; int proxy_port; @@ -305,7 +314,7 @@ struct config_tag { int blinktext; int win_name_always; int width, height; - char font[64]; + char font[256]; int fontisbold; int fontheight; int fontcharset; @@ -349,7 +358,9 @@ struct config_tag { int stamp_utmp; int login_shell; int scrollbar_on_left; - char boldfont[64]; + char boldfont[256]; + char widefont[256]; + char wideboldfont[256]; int shadowboldoffset; }; @@ -377,16 +388,27 @@ struct config_tag { * being run, _either_ because no remote command has been provided * _or_ because the application is GUI and can't run non- * interactively. + * + * These flags describe the type of _application_ - they wouldn't + * vary between individual sessions - and so it's OK to have this + * variable be GLOBAL. */ #define FLAG_VERBOSE 0x0001 #define FLAG_STDERR 0x0002 #define FLAG_INTERACTIVE 0x0004 GLOBAL int flags; -GLOBAL Config cfg; +/* + * Likewise, these two variables are set up when the application + * initialises, and inform all default-settings accesses after + * that. + */ GLOBAL int default_protocol; GLOBAL int default_port; +/* This variable, OTOH, needs to be made non-global ASAP. FIXME. */ +GLOBAL Config cfg; + struct RSAKey; /* be a little careful of scope */ /* @@ -395,7 +417,10 @@ struct RSAKey; /* be a little careful of scope */ 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); +int char_width(Context ctx, int uc); +#ifdef OPTIMISE_SCROLL +void do_scroll(void *, int, int, int); +#endif void set_title(void *frontend, char *); void set_icon(void *frontend, char *); void set_sbar(void *frontend, int, int, int); @@ -412,6 +437,10 @@ Mouse_Button translate_button(void *frontend, Mouse_Button b); void connection_fatal(void *frontend, char *, ...); void fatalbox(char *, ...); void modalfatalbox(char *, ...); +#ifdef macintosh +#pragma noreturn(fatalbox) +#pragma noreturn(modalfatalbox) +#endif void beep(void *frontend, int); void begin_session(void *frontend); void sys_cursor(void *frontend, int x, int y); @@ -447,7 +476,8 @@ void random_destroy_seed(void); */ 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 load_open_settings(void *sesskey, int do_host, Config *cfg); +void get_sesslist(struct sesslist *, int allocate); void do_defaults(char *, Config *); void registry_cleanup(void); @@ -455,10 +485,10 @@ void registry_cleanup(void); * Exports from terminal.c. */ -Terminal *term_init(void *frontend); +Terminal *term_init(Config *, void *); void term_size(Terminal *, int, int, int); void term_out(Terminal *); -void term_paint(Terminal *, Context, int, int, int, int); +void term_paint(Terminal *, Context, int, int, int, int, int); void term_scroll(Terminal *, int, int); void term_pwron(Terminal *); void term_clrsb(Terminal *); @@ -494,6 +524,13 @@ void log_packet(void *logctx, int direction, int type, char *texttype, void *data, int len); /* + * Exports from testback.c + */ + +extern Backend null_backend; +extern Backend loop_backend; + +/* * Exports from raw.c. */ @@ -525,7 +562,7 @@ extern Backend ssh_backend; /* * Exports from ldisc.c. */ -void *ldisc_create(Terminal *, Backend *, void *, void *); +void *ldisc_create(Config *, Terminal *, Backend *, void *, void *); void ldisc_send(void *handle, char *buf, int len, int interactive); /* @@ -561,7 +598,7 @@ extern char ver[]; #ifndef CP_UTF8 #define CP_UTF8 65001 #endif -void init_ucs(void); +/* void init_ucs(void); -- this is now in platform-specific headers */ 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); @@ -575,6 +612,12 @@ char *cp_name(int codepage); void get_unitab(int codepage, wchar_t * unitab, int ftype); /* + * Exports from wcwidth.c + */ +int wcwidth(wchar_t ucs); +int wcswidth(const wchar_t *pwcs, size_t n); + +/* * Exports from mscrypto.c */ #ifdef MSCRYPTOAPI