aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-27 04:14:06 -04:00
Code Activity

patch 8.0.1126: endless resize when terminal showing in two buffers

Browse Source 
Problem:    Endless resize when terminal showing in two buffers. (Hirohito
            Higashi)
Solution:   Set a flag to prevent resizing the window.
This commit is contained in:
Bram Moolenaar
2017-09-18 21:24:56 +02:00
parent d326ad6e93
commit 71b2964066
2 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/terminal.c
View File

@@ -99,6 +99,9 @@ struct terminal_S {
job_T *tl_job; job_T *tl_job;
buf_T *tl_buffer; 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 */ /* used when tl_job is NULL and only a pty was created */
int tl_tty_fd; int tl_tty_fd;
char_u *tl_tty_in; char_u *tl_tty_in;
@@ -2017,16 +2020,21 @@ handle_resize(int rows, int cols, void *user)
term->tl_rows = rows; term->tl_rows = rows;
term->tl_cols = cols; 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); if (wp->w_buffer == term->tl_buffer)
win_setwidth_win(cols, wp); {
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; return 1;
} }
@@ -2223,6 +2231,7 @@ term_update_window(win_T *wp)
} }
} }
term->tl_vterm_size_changed = TRUE;
vterm_set_size(vterm, rows, cols); vterm_set_size(vterm, rows, cols);
ch_log(term->tl_job->jv_channel, "Resizing terminal to %d lines", ch_log(term->tl_job->jv_channel, "Resizing terminal to %d lines",
rows); rows);

2
src/version.c
View File

@@ -761,6 +761,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1126,
/**/ /**/
1125, 1125,
/**/ /**/