patch 8.0.1126: endless resize when terminal showing in two buffers
Problem: Endless resize when terminal showing in two buffers. (Hirohito
Higashi)
Solution: Set a flag to prevent resizing the window.
diff --git a/src/terminal.c b/src/terminal.c
index 7dc21d6..487989d 100644
--- a/src/terminal.c
+++ b/src/terminal.c
@@ -99,6 +99,9 @@
job_T *tl_job;
buf_T *tl_buffer;
+ /* Set when setting the size of a vterm, reset after redrawing. */
+ int tl_vterm_size_changed;
+
/* used when tl_job is NULL and only a pty was created */
int tl_tty_fd;
char_u *tl_tty_in;
@@ -2017,16 +2020,21 @@
term->tl_rows = rows;
term->tl_cols = cols;
- FOR_ALL_WINDOWS(wp)
+ if (term->tl_vterm_size_changed)
+ /* Size was set by vterm_set_size(), don't set the window size. */
+ term->tl_vterm_size_changed = FALSE;
+ else
{
- if (wp->w_buffer == term->tl_buffer)
+ FOR_ALL_WINDOWS(wp)
{
- win_setheight_win(rows, wp);
- win_setwidth_win(cols, wp);
+ if (wp->w_buffer == term->tl_buffer)
+ {
+ win_setheight_win(rows, wp);
+ win_setwidth_win(cols, wp);
+ }
}
+ redraw_buf_later(term->tl_buffer, NOT_VALID);
}
-
- redraw_buf_later(term->tl_buffer, NOT_VALID);
return 1;
}
@@ -2223,6 +2231,7 @@
}
}
+ term->tl_vterm_size_changed = TRUE;
vterm_set_size(vterm, rows, cols);
ch_log(term->tl_job->jv_channel, "Resizing terminal to %d lines",
rows);
diff --git a/src/version.c b/src/version.c
index d24c854..8cbabc3 100644
--- a/src/version.c
+++ b/src/version.c
@@ -762,6 +762,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1126,
+/**/
1125,
/**/
1124,