Permalink
Browse files

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.
  • Loading branch information...
brammool committed Sep 18, 2017
1 parent d326ad6 commit 71b29640669872b0209985fc5a3b447de62a4cf0
Showing with 17 additions and 6 deletions.
  1. +15 −6 src/terminal.c
  2. +2 −0 src/version.c
View
@@ -99,6 +99,9 @@ struct terminal_S {
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 @@ handle_resize(int rows, int cols, void *user)
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_update_window(win_T *wp)
}
}
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);
View
@@ -761,6 +761,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
1126,
/**/
1125,
/**/

0 comments on commit 71b2964

Please sign in to comment.