projects
/
u
/
mdw
/
putty
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Patch from Yoshida Masato to fill in the missing pieces of Windows
[u/mdw/putty]
/
terminal.c
diff --git
a/terminal.c
b/terminal.c
index
abb06e2
..
d23cbe9
100644
(file)
--- a/
terminal.c
+++ b/
terminal.c
@@
-3016,8
+3016,8
@@
static void term_out(Terminal *term)
width = 1;
if (!width)
width = (term->cjk_ambig_wide ?
width = 1;
if (!width)
width = (term->cjk_ambig_wide ?
- mk_wcwidth_cjk((
wchar_
t) c) :
- mk_wcwidth((
wchar_
t) c));
+ mk_wcwidth_cjk((
unsigned in
t) c) :
+ mk_wcwidth((
unsigned in
t) c));
if (term->wrapnext && term->wrap && width > 0) {
cline->lattr |= LATTR_WRAPPED;
if (term->wrapnext && term->wrap && width > 0) {
cline->lattr |= LATTR_WRAPPED;
@@
-4692,7
+4692,7
@@
static termchar *term_bidi_line(Terminal *term, struct termline *ldata,
}
term->wcFrom[it].origwc = term->wcFrom[it].wc =
}
term->wcFrom[it].origwc = term->wcFrom[it].wc =
- (
wchar_
t)uc;
+ (
unsigned in
t)uc;
term->wcFrom[it].index = it;
}
term->wcFrom[it].index = it;
}
@@
-5067,10
+5067,17
@@
static void do_paint(Terminal *term, Context ctx, int may_optimise)
dirty_run = TRUE;
}
dirty_run = TRUE;
}
- if (ccount
>=
chlen) {
+ if (ccount
+2 >
chlen) {
chlen = ccount + 256;
ch = sresize(ch, chlen, wchar_t);
}
chlen = ccount + 256;
ch = sresize(ch, chlen, wchar_t);
}
+
+#ifdef PLATFORM_IS_UTF16
+ if (tchar > 0x10000 && tchar < 0x110000) {
+ ch[ccount++] = (wchar_t) HIGH_SURROGATE_OF(tchar);
+ ch[ccount++] = (wchar_t) LOW_SURROGATE_OF(tchar);
+ } else
+#endif /* PLATFORM_IS_UTF16 */
ch[ccount++] = (wchar_t) tchar;
if (d->cc_next) {
ch[ccount++] = (wchar_t) tchar;
if (d->cc_next) {
@@
-5094,10
+5101,17
@@
static void do_paint(Terminal *term, Context ctx, int may_optimise)
break;
}
break;
}
- if (ccount
>=
chlen) {
+ if (ccount
+2 >
chlen) {
chlen = ccount + 256;
ch = sresize(ch, chlen, wchar_t);
}
chlen = ccount + 256;
ch = sresize(ch, chlen, wchar_t);
}
+
+#ifdef PLATFORM_IS_UTF16
+ if (schar > 0x10000 && schar < 0x110000) {
+ ch[ccount++] = (wchar_t) HIGH_SURROGATE_OF(schar);
+ ch[ccount++] = (wchar_t) LOW_SURROGATE_OF(schar);
+ } else
+#endif /* PLATFORM_IS_UTF16 */
ch[ccount++] = (wchar_t) schar;
}
ch[ccount++] = (wchar_t) schar;
}