X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/ce2832135394f17cf34a9ca00db3c7394b591d46..fb29aeea86443990ad8971215636407f86625a4c:/putty.h diff --git a/putty.h b/putty.h index 3ff9e9d1..93fef20c 100644 --- a/putty.h +++ b/putty.h @@ -51,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 @@ -69,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 @@ -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; }; @@ -587,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);