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

Cleanup before reworking collect_scroll.

Browse Source
This commit is contained in:
Michael Grant
2025-10-12 05:48:30 +01:00
parent ce03f1abea
commit 1b959d0eff
1 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
screen-write.c
View File

@@ -1773,9 +1773,6 @@ screen_write_collect_scroll(struct screen_write_ctx *ctx, u_int bg)
TAILQ_INIT(&cl_dst->items); TAILQ_INIT(&cl_dst->items);
if (cl_dst->data == NULL)
cl_dst->data = xmalloc(screen_size_x(s));
/* For each visible range, copy corresponding items from cl_src /* For each visible range, copy corresponding items from cl_src
to cl_dst. */ to cl_dst. */
for (r = 0; r < visible_ranges->n; r++) { for (r = 0; r < visible_ranges->n; r++) {
@@ -1799,11 +1796,11 @@ screen_write_collect_scroll(struct screen_write_ctx *ctx, u_int bg)
new_ci->wrapped = ci->wrapped; new_ci->wrapped = ci->wrapped;
new_ci->bg = bg; new_ci->bg = bg;
memcpy(&new_ci->gc, &ci->gc, sizeof(ci->gc)); memcpy(&new_ci->gc, &ci->gc, sizeof(ci->gc));
if (ci->type == TEXT) TAILQ_INSERT_TAIL(&cl_dst->items, new_ci, entry);
memcpy(cl_dst->data, cl_src->data, if (cl_dst->data == NULL)
screen_size_x(s)); cl_dst->data = xmalloc(screen_size_x(s));
TAILQ_INSERT_TAIL(&cl_dst->items, new_ci, memcpy(cl_dst->data, cl_src->data,
entry); screen_size_x(s));
} }
} }
} }
@@ -1873,9 +1870,10 @@ screen_write_collect_flush(struct screen_write_ctx *ctx, int scroll_only,
if (ci_end <= r_start || ci_start >= r_end) if (ci_end <= r_start || ci_start >= r_end)
continue; continue;
wr_start = (ci_start < r_start) ? r_start : wr_start = (ci_start < r_start) ?
ci_start; r_start : ci_start;
wr_end = (ci_end > r_end) ? r_end : ci_end; wr_end = (ci_end > r_end) ?
r_end : ci_end;
wr_length = wr_end - wr_start; wr_length = wr_end - wr_start;
if (wr_length == 0) if (wr_length == 0)
continue; continue;