nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-01-25 01:02:24 +00:00
Code Issues Projects Releases Wiki Activity

Fix applying combining characters to double-width characters.

Browse Source 
[originally from svn r4628]
This commit is contained in:
Simon Tatham 2004-10-15 09:28:46 +00:00
parent 8d7edeafd3
commit 845138a1e8
1 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
terminal.c
View File

@ -2717,8 +2717,26 @@ void term_out(Terminal *term)
break;
case 0:
add_cc(cline, term->curs.x - !term->wrapnext, c);
term->seen_disp_event = 1;
if (term->curs.x > 0) {
int x = term->curs.x - 1;
/* If we're in wrapnext state, the character
* to combine with is _here_, not to our left. */
if (term->wrapnext)
x++;
/*
* If the previous character is
* UCSWIDE, back up another one.
*/
if (cline->chars[x].chr == UCSWIDE) {
assert(x > 0);
x--;
}
add_cc(cline, x, c);
term->seen_disp_event = 1;
}
continue;
default:
continue;