mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-08 12:28:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:8.1.1756: autocommand that splits window messes up window layout

Browse Source 
Problem:    Autocommand that splits window messes up window layout.
Solution:   Disallow splitting a window while closing one.  In ":all" give an
            error when moving a window will not work.
1417c766f5

Expected error number was changed to E242 in Vim in patch 8.2.1183, and
patch 8.2.2420 (which has already been ported) made the test no longer
throw E249 in Vim, so just use E242 in the test.
This commit is contained in:
zeertzjq
2022-04-20 10:26:33 +08:00
parent 5c4ec25478
commit 9b10b4cc64
4 changed files with 64 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
src/nvim/window.c
View File

@@ -74,6 +74,35 @@ typedef enum {
static char *m_onlyone = N_("Already only one window");
/// When non-zero splitting a window is forbidden. Used to avoid that nasty
/// autocommands mess up the window structure.
static int split_disallowed = 0;
// #define WIN_DEBUG
#ifdef WIN_DEBUG
/// Call this method to log the current window layout.
static void log_frame_layout(frame_T *frame)
{
DLOG("layout %s, wi: %d, he: %d, wwi: %d, whe: %d, id: %d",
frame->fr_layout == FR_LEAF ? "LEAF" : frame->fr_layout == FR_ROW ? "ROW" : "COL",
frame->fr_width,
frame->fr_height,
frame->fr_win == NULL ? -1 : frame->fr_win->w_width,
frame->fr_win == NULL ? -1 : frame->fr_win->w_height,
frame->fr_win == NULL ? -1 : frame->fr_win->w_id);
if (frame->fr_child != NULL) {
DLOG("children");
log_frame_layout(frame->fr_child);
if (frame->fr_next != NULL) {
DLOG("END of children");
}
}
if (frame->fr_next != NULL) {
log_frame_layout(frame->fr_next);
}
}
#endif
/// @return the current window, unless in the cmdline window and "prevwin" is
/// set, then return "prevwin".
win_T *prevwin_curwin(void)
@@ -909,6 +938,17 @@ void ui_ext_win_viewport(win_T *wp)
}
}
/// If "split_disallowed" is set given an error and return FAIL.
/// Otherwise return OK.
static int check_split_disallowed(void)
{
if (split_disallowed > 0) {
emsg(_("E242: Can't split a window while closing another"));
return FAIL;
}
return OK;
}
/*
* split the current window, implements CTRL-W s and :split
*
@@ -937,6 +977,9 @@ int win_split(int size, int flags)
emsg(_("E442: Can't split topleft and botright at the same time"));
return FAIL;
}
if (check_split_disallowed() == FAIL) {
return FAIL;
}
// When creating the help window make a snapshot of the window layout.
// Otherwise clear the snapshot, it's now invalid.
@@ -1886,6 +1929,9 @@ static void win_totop(int size, int flags)
if (curwin == aucmd_win) {
return;
}
if (check_split_disallowed() == FAIL) {
return;
}
if (curwin->w_floating) {
ui_comp_remove_grid(&curwin->w_grid_alloc);
@@ -1929,6 +1975,11 @@ void win_move_after(win_T *win1, win_T *win2)
// check if there is something to do
if (win2->w_next != win1) {
if (win1->w_frame->fr_parent != win2->w_frame->fr_parent) {
iemsg("INTERNAL: trying to move a window into another frame");
return;
}
// may need move the status line, horizontal or vertical separator of the last window
if (win1 == lastwin) {
height = win1->w_prev->w_status_height;
@@ -2742,6 +2793,10 @@ int win_close(win_T *win, bool free_buf, bool force)
return FAIL;
}
// Now we are really going to close the window. Disallow any autocommand
// to split a window to avoid trouble.
split_disallowed++;
// let terminal buffers know that this window dimensions may be ignored
win->w_closing = true;
@@ -2809,6 +2864,8 @@ int win_close(win_T *win, bool free_buf, bool force)
}
}
split_disallowed--;
/*
* If last window has a status line now and we don't want one,
* remove the status line.