circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2026-01-11 16:30:22 +00:00
Code Issues Projects Releases Wiki Activity

Removing padding needs to go through screen_write_collect_trim or there

Browse Source 
may end up multiple items covering the same region.
This commit is contained in:
nicm
2026-01-09 15:04:00 +00:00
parent 6234d79852
commit 65b3a95be8
1 changed files with 56 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

103
screen-write.c
View File

@@ -25,6 +25,8 @@
static struct screen_write_citem *screen_write_collect_trim( static struct screen_write_citem *screen_write_collect_trim(
struct screen_write_ctx *, u_int, u_int, u_int, int *); struct screen_write_ctx *, u_int, u_int, u_int, int *);
static void screen_write_collect_insert(struct screen_write_ctx *,
struct screen_write_citem *);
static void screen_write_collect_clear(struct screen_write_ctx *, u_int, static void screen_write_collect_clear(struct screen_write_ctx *, u_int,
u_int); u_int);
static void screen_write_collect_scroll(struct screen_write_ctx *, u_int); static void screen_write_collect_scroll(struct screen_write_ctx *, u_int);
@@ -1295,7 +1297,7 @@ screen_write_clearendofline(struct screen_write_ctx *ctx, u_int bg)
struct screen *s = ctx->s; struct screen *s = ctx->s;
struct grid_line *gl; struct grid_line *gl;
u_int sx = screen_size_x(s); u_int sx = screen_size_x(s);
struct screen_write_citem *ci = ctx->item, *before; struct screen_write_citem *ci = ctx->item;
if (s->cx == 0) { if (s->cx == 0) {
screen_write_clearline(ctx, bg); screen_write_clearline(ctx, bg);
@@ -1308,16 +1310,11 @@ screen_write_clearendofline(struct screen_write_ctx *ctx, u_int bg)
grid_view_clear(s->grid, s->cx, s->cy, sx - s->cx, 1, bg); grid_view_clear(s->grid, s->cx, s->cy, sx - s->cx, 1, bg);
before = screen_write_collect_trim(ctx, s->cy, s->cx, sx - s->cx, NULL);
ci->x = s->cx; ci->x = s->cx;
ci->used = sx - s->cx; ci->used = sx - s->cx;
ci->type = CLEAR; ci->type = CLEAR;
ci->bg = bg; ci->bg = bg;
if (before == NULL) screen_write_collect_insert(ctx, ci);
TAILQ_INSERT_TAIL(&ctx->s->write_list[s->cy].items, ci, entry);
else
TAILQ_INSERT_BEFORE(before, ci, entry);
ctx->item = screen_write_get_citem();
} }
/* Clear to start of line from cursor. */ /* Clear to start of line from cursor. */
@@ -1326,7 +1323,7 @@ screen_write_clearstartofline(struct screen_write_ctx *ctx, u_int bg)
{ {
struct screen *s = ctx->s; struct screen *s = ctx->s;
u_int sx = screen_size_x(s); u_int sx = screen_size_x(s);
struct screen_write_citem *ci = ctx->item, *before; struct screen_write_citem *ci = ctx->item;
if (s->cx >= sx - 1) { if (s->cx >= sx - 1) {
screen_write_clearline(ctx, bg); screen_write_clearline(ctx, bg);
@@ -1338,16 +1335,11 @@ screen_write_clearstartofline(struct screen_write_ctx *ctx, u_int bg)
else else
grid_view_clear(s->grid, 0, s->cy, s->cx + 1, 1, bg); grid_view_clear(s->grid, 0, s->cy, s->cx + 1, 1, bg);
before = screen_write_collect_trim(ctx, s->cy, 0, s->cx + 1, NULL);
ci->x = 0; ci->x = 0;
ci->used = s->cx + 1; ci->used = s->cx + 1;
ci->type = CLEAR; ci->type = CLEAR;
ci->bg = bg; ci->bg = bg;
if (before == NULL) screen_write_collect_insert(ctx, ci);
TAILQ_INSERT_TAIL(&ctx->s->write_list[s->cy].items, ci, entry);
else
TAILQ_INSERT_BEFORE(before, ci, entry);
ctx->item = screen_write_get_citem();
} }
/* Move cursor to px,py. */ /* Move cursor to px,py. */
@@ -1774,6 +1766,8 @@ screen_write_collect_flush(struct screen_write_ctx *ctx, int scroll_only,
cl = &ctx->s->write_list[y]; cl = &ctx->s->write_list[y];
last = UINT_MAX; last = UINT_MAX;
TAILQ_FOREACH_SAFE(ci, &cl->items, entry, tmp) { TAILQ_FOREACH_SAFE(ci, &cl->items, entry, tmp) {
log_debug("collect list: x=%u (last %u), y=%u, used=%u",
ci->x, last, y, ci->used);
if (last != UINT_MAX && ci->x <= last) { if (last != UINT_MAX && ci->x <= last) {
fatalx("collect list not in order: %u <= %u", fatalx("collect list not in order: %u <= %u",
ci->x, last); ci->x, last);
@@ -1804,29 +1798,39 @@ screen_write_collect_flush(struct screen_write_ctx *ctx, int scroll_only,
log_debug("%s: flushed %u items (%s)", __func__, items, from); log_debug("%s: flushed %u items (%s)", __func__, items, from);
} }
/* Finish and store collected cells. */ /* Insert an item on current line. */
void void
screen_write_collect_end(struct screen_write_ctx *ctx) screen_write_collect_insert(struct screen_write_ctx *ctx,
struct screen_write_citem *ci)
{ {
struct screen *s = ctx->s; struct screen *s = ctx->s;
struct screen_write_citem *ci = ctx->item, *nci, *before;
struct screen_write_cline *cl = &s->write_list[s->cy]; struct screen_write_cline *cl = &s->write_list[s->cy];
struct grid_cell gc; struct screen_write_citem *before;
u_int xx;
int wrapped = ci->wrapped;
if (ci->used == 0) before = screen_write_collect_trim(ctx, s->cy, ci->x, ci->used,
return; &ci->wrapped);
before = screen_write_collect_trim(ctx, s->cy, s->cx, ci->used,
&wrapped);
ci->x = s->cx;
ci->wrapped = wrapped;
if (before == NULL) if (before == NULL)
TAILQ_INSERT_TAIL(&cl->items, ci, entry); TAILQ_INSERT_TAIL(&cl->items, ci, entry);
else else
TAILQ_INSERT_BEFORE(before, ci, entry); TAILQ_INSERT_BEFORE(before, ci, entry);
ctx->item = screen_write_get_citem(); ctx->item = screen_write_get_citem();
}
/* Finish and store collected cells. */
void
screen_write_collect_end(struct screen_write_ctx *ctx)
{
struct screen *s = ctx->s;
struct screen_write_citem *ci = ctx->item, *bci = NULL, *aci;
struct screen_write_cline *cl = &s->write_list[s->cy];
struct grid_cell gc;
u_int xx;
if (ci->used == 0)
return;
ci->x = s->cx;
screen_write_collect_insert(ctx, ci);
log_debug("%s: %u %.*s (at %u,%u)", __func__, ci->used, log_debug("%s: %u %.*s (at %u,%u)", __func__, ci->used,
(int)ci->used, cl->data + ci->x, s->cx, s->cy); (int)ci->used, cl->data + ci->x, s->cx, s->cy);
@@ -1838,32 +1842,35 @@ screen_write_collect_end(struct screen_write_ctx *ctx)
break; break;
grid_view_set_cell(s->grid, xx, s->cy, grid_view_set_cell(s->grid, xx, s->cy,
&grid_default_cell); &grid_default_cell);
log_debug("%s: padding erased (before) at %u", log_debug("%s: padding erased (before) at %u (cx %u)",
__func__, xx); __func__, xx, s->cx);
} }
if (xx != s->cx) { if (xx != s->cx) {
if (xx == 0) if (xx == 0)
grid_view_get_cell(s->grid, 0, s->cy, &gc); grid_view_get_cell(s->grid, 0, s->cy, &gc);
if (gc.data.width > 1) { if (gc.data.width > 1 ||
(gc.flags & GRID_FLAG_PADDING)) {
grid_view_set_cell(s->grid, xx, s->cy, grid_view_set_cell(s->grid, xx, s->cy,
&grid_default_cell); &grid_default_cell);
log_debug("%s: padding erased (before) at %u", log_debug("%s: padding erased (before) at %u "
__func__, xx); "(cx %u)", __func__, xx, s->cx);
} }
} }
if (xx != s->cx) { if (xx != s->cx) {
nci = ctx->item; bci = ctx->item;
nci->type = CLEAR; bci->type = CLEAR;
nci->x = xx; bci->x = xx;
nci->bg = 8; bci->bg = 8;
nci->used = s->cx - xx; bci->used = s->cx - xx;
TAILQ_INSERT_BEFORE(ci, nci, entry); log_debug("%s: padding erased (before): from %u, "
ctx->item = screen_write_get_citem(); "size %u", __func__, bci->x, bci->used);
} }
} }
grid_view_set_cells(s->grid, s->cx, s->cy, &ci->gc, cl->data + ci->x, grid_view_set_cells(s->grid, s->cx, s->cy, &ci->gc, cl->data + ci->x,
ci->used); ci->used);
if (bci != NULL)
screen_write_collect_insert(ctx, bci);
screen_write_set_cursor(ctx, s->cx + ci->used, -1); screen_write_set_cursor(ctx, s->cx + ci->used, -1);
for (xx = s->cx; xx < screen_size_x(s); xx++) { for (xx = s->cx; xx < screen_size_x(s); xx++) {
@@ -1871,16 +1878,18 @@ screen_write_collect_end(struct screen_write_ctx *ctx)
if (~gc.flags & GRID_FLAG_PADDING) if (~gc.flags & GRID_FLAG_PADDING)
break; break;
grid_view_set_cell(s->grid, xx, s->cy, &grid_default_cell); grid_view_set_cell(s->grid, xx, s->cy, &grid_default_cell);
log_debug("%s: padding erased (after) at %u", __func__, xx); log_debug("%s: padding erased (after) at %u (cx %u)",
__func__, xx, s->cx);
} }
if (xx != s->cx) { if (xx != s->cx) {
nci = ctx->item; aci = ctx->item;
nci->type = CLEAR; aci->type = CLEAR;
nci->x = s->cx; aci->x = s->cx;
nci->bg = 8; aci->bg = 8;
nci->used = xx - s->cx; aci->used = xx - s->cx;
TAILQ_INSERT_AFTER(&cl->items, ci, nci, entry); log_debug("%s: padding erased (after): from %u, size %u",
ctx->item = screen_write_get_citem(); __func__, aci->x, aci->used);
screen_write_collect_insert(ctx, aci);
} }
} }