circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2026-03-07 00:05:33 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'tmux:master' into feature-floating-window-panes

Browse Source
This commit is contained in:
Michael Grant
2025-11-14 09:29:06 +00:00
committed by GitHub
parent 7194fdca38 2f3c71595b
commit 315202b007
32 changed files with 980 additions and 346 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
screen-write.c
View File

@@ -584,7 +584,8 @@ screen_write_fast_copy(struct screen_write_ctx *ctx, struct screen *src,
if (wp != NULL)
screen_write_initctx(ctx, &ttyctx, 0);
for (xx = px; xx < px + nx; xx++) {
if (xx >= grid_get_line(gd, yy)->cellsize)
if (xx >= grid_get_line(gd, yy)->cellsize &&
s->cx >= grid_get_line(ctx->s->grid, s->cy)->cellsize)
break;
grid_get_cell(gd, xx, yy, &gc);
if (xx + gc.data.width > px + nx)
@@ -2156,6 +2157,10 @@ screen_write_combine(struct screen_write_ctx *ctx, const struct grid_cell *gc)
struct tty_ctx ttyctx;
int force_wide = 0, zero_width = 0;
/* Ignore U+3164 HANGUL_FILLER entirely. */
if (utf8_is_hangul_filler(ud))
return (1);
/*
* Is this character which makes no sense without being combined? If
* this is true then flag it here and discard the character (return 1)
@@ -2200,11 +2205,9 @@ screen_write_combine(struct screen_write_ctx *ctx, const struct grid_cell *gc)
case HANGULJAMO_STATE_COMPOSABLE:
break;
case HANGULJAMO_STATE_NOT_HANGULJAMO:
if (utf8_is_modifier(ud)) {
if (last.data.size < 2)
return (0);
if (utf8_should_combine(&last.data, ud))
force_wide = 1;
} else if (!utf8_has_zwj(&last.data))
else if (!utf8_has_zwj(&last.data))
return (0);
break;
}