~mdw
/
sgt
/
putty
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Support for double-width (CJK) characters, using the xterm-like
[sgt/putty]
/
putty.h
diff --git
a/putty.h
b/putty.h
index
144ed06
..
113d355
100644
(file)
--- a/
putty.h
+++ b/
putty.h
@@
-214,6
+214,7
@@
struct config_tag {
int tcp_nodelay;
/* Proxy options */
char proxy_exclude_list[512];
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 even_proxy_localhost;
enum { PROXY_NONE, PROXY_HTTP, PROXY_SOCKS, PROXY_TELNET } proxy_type;
char proxy_host[512];
@@
-348,7
+349,9
@@
struct config_tag {
int stamp_utmp;
int login_shell;
int scrollbar_on_left;
int stamp_utmp;
int login_shell;
int scrollbar_on_left;
- char boldfont[64];
+ char boldfont[256];
+ char widefont[256];
+ char wideboldfont[256];
int shadowboldoffset;
};
int shadowboldoffset;
};
@@
-425,6
+428,10
@@
Mouse_Button translate_button(void *frontend, Mouse_Button b);
void connection_fatal(void *frontend, char *, ...);
void fatalbox(char *, ...);
void modalfatalbox(char *, ...);
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);
void beep(void *frontend, int);
void begin_session(void *frontend);
void sys_cursor(void *frontend, int x, int y);
@@
-460,6
+467,7
@@
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 save_settings(char *section, 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);
void get_sesslist(struct sesslist *, int allocate);
void do_defaults(char *, Config *);
void registry_cleanup(void);
void get_sesslist(struct sesslist *, int allocate);
void do_defaults(char *, Config *);
void registry_cleanup(void);
@@
-595,6
+603,12
@@
char *cp_name(int codepage);
void get_unitab(int codepage, wchar_t * unitab, int ftype);
/*
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
* Exports from mscrypto.c
*/
#ifdef MSCRYPTOAPI