circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2026-10-17 00:44:54 +00:00
Code Issues Projects Releases Wiki Activity

Do not lose text after empty lists.

Browse Source
This commit is contained in:
nicm
2026-10-15 22:34:26 +00:00
committed by tmux update bot
parent 7447c5f9ae
commit b5d46cb60d
1 changed files with 38 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
format-draw.c
View File

@@ -1,4 +1,4 @@
/* $OpenBSD: format-draw.c,v 1.35 2026/10/15 22:27:24 nicm Exp $ */ /* $OpenBSD: format-draw.c,v 1.36 2026/10/15 22:34:26 nicm Exp $ */
/* /*
* Copyright (c) 2019 Nicholas Marriott <nicholas.marriott@gmail.com> * Copyright (c) 2019 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -223,6 +223,31 @@ format_draw_none(struct screen_write_ctx *octx, u_int available, u_int ocx,
width_abs_centre); width_abs_centre);
} }
/* Append the text after a list to its alignment screen. */
static void
format_draw_merge(struct screen *s, u_int width, struct screen *after,
u_int width_after, struct format_ranges *frs)
{
struct screen_write_ctx ctx;
struct format_range *fr;
format_update_ranges(frs, s, 0, 0, width);
format_update_ranges(frs, after, width, 0, width_after);
if (frs != NULL) {
TAILQ_FOREACH(fr, frs, entry) {
if (fr->s == after)
fr->s = s;
}
}
screen_write_start(&ctx, s);
screen_write_cursormove(&ctx, width, 0, 0);
screen_write_fast_copy(&ctx, after, 0, 0, width_after, 1);
screen_write_cursormove(&ctx, width + width_after, 0, 0);
screen_write_stop(&ctx);
}
/* Draw format with list on the left. */ /* Draw format with list on the left. */
static void static void
format_draw_left(struct screen_write_ctx *octx, u_int available, u_int ocx, format_draw_left(struct screen_write_ctx *octx, u_int available, u_int ocx,
@@ -233,7 +258,6 @@ format_draw_left(struct screen_write_ctx *octx, u_int available, u_int ocx,
{ {
u_int width_left, width_centre, width_right; u_int width_left, width_centre, width_right;
u_int width_list, width_after, width_abs_centre; u_int width_list, width_after, width_abs_centre;
struct screen_write_ctx ctx;
width_left = left->cx; width_left = left->cx;
width_centre = centre->cx; width_centre = centre->cx;
@@ -265,9 +289,8 @@ format_draw_left(struct screen_write_ctx *octx, u_int available, u_int ocx,
/* If there is no list left, pass off to the no list function. */ /* If there is no list left, pass off to the no list function. */
if (width_list == 0) { if (width_list == 0) {
screen_write_start(&ctx, left); format_update_ranges(frs, list, 0, 0, 0);
screen_write_fast_copy(&ctx, after, 0, 0, width_after, 1); format_draw_merge(left, width_left, after, width_after, frs);
screen_write_stop(&ctx);
format_draw_none(octx, available, ocx, ocy, left, centre, format_draw_none(octx, available, ocx, ocy, left, centre,
right, abs_centre, frs); right, abs_centre, frs);
@@ -336,7 +359,6 @@ format_draw_centre(struct screen_write_ctx *octx, u_int available, u_int ocx,
{ {
u_int width_left, width_centre, width_right, middle; u_int width_left, width_centre, width_right, middle;
u_int width_list, width_after, width_abs_centre; u_int width_list, width_after, width_abs_centre;
struct screen_write_ctx ctx;
width_left = left->cx; width_left = left->cx;
width_centre = centre->cx; width_centre = centre->cx;
@@ -368,9 +390,8 @@ format_draw_centre(struct screen_write_ctx *octx, u_int available, u_int ocx,
/* If there is no list left, pass off to the no list function. */ /* If there is no list left, pass off to the no list function. */
if (width_list == 0) { if (width_list == 0) {
screen_write_start(&ctx, centre); format_update_ranges(frs, list, 0, 0, 0);
screen_write_fast_copy(&ctx, after, 0, 0, width_after, 1); format_draw_merge(centre, width_centre, after, width_after, frs);
screen_write_stop(&ctx);
format_draw_none(octx, available, ocx, ocy, left, centre, format_draw_none(octx, available, ocx, ocy, left, centre,
right, abs_centre, frs); right, abs_centre, frs);
@@ -444,7 +465,6 @@ format_draw_right(struct screen_write_ctx *octx, u_int available, u_int ocx,
{ {
u_int width_left, width_centre, width_right; u_int width_left, width_centre, width_right;
u_int width_list, width_after, width_abs_centre; u_int width_list, width_after, width_abs_centre;
struct screen_write_ctx ctx;
width_left = left->cx; width_left = left->cx;
width_centre = centre->cx; width_centre = centre->cx;
@@ -476,9 +496,8 @@ format_draw_right(struct screen_write_ctx *octx, u_int available, u_int ocx,
/* If there is no list left, pass off to the no list function. */ /* If there is no list left, pass off to the no list function. */
if (width_list == 0) { if (width_list == 0) {
screen_write_start(&ctx, right); format_update_ranges(frs, list, 0, 0, 0);
screen_write_fast_copy(&ctx, after, 0, 0, width_after, 1); format_draw_merge(right, width_right, after, width_after, frs);
screen_write_stop(&ctx);
format_draw_none(octx, available, ocx, ocy, left, centre, format_draw_none(octx, available, ocx, ocy, left, centre,
right, abs_centre, frs); right, abs_centre, frs);