circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-09-02 05:21:10 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam
2025-07-19 00:01:08 +01:00
parent 32b7b3a6f7 9c07903ae9
commit 4a0eff1296
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
grid.c
View File

@ -267,6 +267,7 @@ grid_set_tab(struct grid_cell *gc, u_int width)
{ {
memset(gc->data.data, 0, sizeof gc->data.data); memset(gc->data.data, 0, sizeof gc->data.data);
gc->flags |= GRID_FLAG_TAB; gc->flags |= GRID_FLAG_TAB;
gc->flags &= ~GRID_FLAG_PADDING;
gc->data.width = gc->data.size = gc->data.have = width; gc->data.width = gc->data.size = gc->data.have = width;
memset(gc->data.data, ' ', gc->data.size); memset(gc->data.data, ' ', gc->data.size);
} }

4
screen-write.c
View File

@ -1872,11 +1872,15 @@ screen_write_collect_end(struct screen_write_ctx *ctx)
grid_view_set_cell(s->grid, xx, s->cy, grid_view_set_cell(s->grid, xx, s->cy,
&grid_default_cell); &grid_default_cell);
} }
if (xx != s->cx) {
if (xx == 0)
grid_view_get_cell(s->grid, 0, s->cy, &gc);
if (gc.data.width > 1) { if (gc.data.width > 1) {
grid_view_set_cell(s->grid, xx, s->cy, grid_view_set_cell(s->grid, xx, s->cy,
&grid_default_cell); &grid_default_cell);
} }
} }
}
#ifdef ENABLE_SIXEL #ifdef ENABLE_SIXEL
if (image_check_area(s, s->cx, s->cy, ci->used, 1) && ctx->wp != NULL) if (image_check_area(s, s->cx, s->cy, ci->used, 1) && ctx->wp != NULL)