circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-11-04 00:56:10 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam
2025-07-22 10:01:08 +01:00
parent 720d1e831d 206f492401
commit a6588d6918
3 changed files with 161 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
screen-write.c
View File

@@ -2133,17 +2133,27 @@ screen_write_combine(struct screen_write_ctx *ctx, const struct grid_cell *gc)
return (zero_width);
/*
* Check if we need to combine characters. This could be zero width
* (set above), a modifier character (with an existing Unicode
* character) or a previous ZWJ.
* Check if we need to combine characters. This could be a Korean
* Hangul Jamo character, zero width (set above), a modifier character
* (with an existing Unicode character) or a previous ZWJ.
*/
if (!zero_width) {
if (utf8_is_modifier(ud)) {
if (last.data.size < 2)
return (0);
force_wide = 1;
} else if (!utf8_has_zwj(&last.data))
switch (hanguljamo_check_state(&last.data, ud)) {
case HANGULJAMO_STATE_NOT_COMPOSABLE:
return (1);
case HANGULJAMO_STATE_CHOSEONG:
return (0);
case HANGULJAMO_STATE_COMPOSABLE:
break;
case HANGULJAMO_STATE_NOT_HANGULJAMO:
if (utf8_is_modifier(ud)) {
if (last.data.size < 2)
return (0);
force_wide = 1;
} else if (!utf8_has_zwj(&last.data))
return (0);
break;
}
}
/* Check if this combined character would be too long. */