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

fix(tui): do not emit resize screen sequence after host terminal is resized (#35335)

Browse Source 
Some terminals support the CSI 8 t sequence to resize their own window
area. Neovim will emit this sequence when the TUI is resized
programatically, but it should not be emitted when the TUI is resized
because the host terminal was resized, as that results in an infinite
resize loop.
This commit is contained in:
Gregory Anders
2025-08-14 18:14:26 -05:00
committed by GitHub
parent 649bb372f6
commit 218ff601c4
2 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/nvim/tui/input.c
View File

@@ -726,7 +726,6 @@ static void handle_unknown_csi(TermInput *input, const TermKeyKey *key)
int height_chars = args[1];
int width_chars = args[2];
tui_set_size(input->tui_data, width_chars, height_chars);
ui_client_set_size(width_chars, height_chars);
}
}
break;

15
src/nvim/tui/tui.c
View File

@@ -95,6 +95,7 @@ struct TUIData {
kvec_t(Rect) invalid_regions;
int row, col;
int out_fd;
int pending_resize_events;
bool can_change_scroll_region;
bool has_left_and_right_margin_mode;
bool can_set_lr_margin; // smglr
@@ -157,7 +158,6 @@ struct TUIData {
StringBuilder urlbuf; ///< Re-usable buffer for writing OSC 8 control sequences
};
static int got_winch = 0;
static bool cursor_style_enabled = false;
#include "tui/tui.c.generated.h"
@@ -706,7 +706,6 @@ void tui_free_all_mem(TUIData *tui)
static void sigwinch_cb(SignalWatcher *watcher, int signum, void *cbdata)
{
got_winch++;
TUIData *tui = cbdata;
if (tui_is_stopped(tui) || tui->resize_events_enabled) {
return;
@@ -1223,13 +1222,14 @@ void tui_grid_resize(TUIData *tui, Integer g, Integer width, Integer height)
r->right = MIN(r->right, grid->width);
}
if (!got_winch && !tui->is_starting) {
if (tui->pending_resize_events == 0 && !tui->is_starting) {
// Resize the _host_ terminal.
UNIBI_SET_NUM_VAR(tui->params[0], (int)height);
UNIBI_SET_NUM_VAR(tui->params[1], (int)width);
unibi_out_ext(tui, tui->unibi_ext.resize_screen);
} else { // Already handled the SIGWINCH signal; avoid double-resize.
got_winch = got_winch > 0 ? got_winch - 1 : 0;
} else { // Already handled the resize; avoid double-resize.
tui->pending_resize_events = tui->pending_resize_events >
0 ? tui->pending_resize_events - 1 : 0;
grid->row = -1;
}
}
@@ -1821,9 +1821,11 @@ static void ensure_space_buf_size(TUIData *tui, size_t len)
void tui_set_size(TUIData *tui, int width, int height)
FUNC_ATTR_NONNULL_ALL
{
tui->pending_resize_events++;
tui->width = width;
tui->height = height;
ensure_space_buf_size(tui, (size_t)tui->width);
ui_client_set_size(width, height);
}
/// Tries to get the user's wanted dimensions (columns and rows) for the entire
@@ -1864,9 +1866,6 @@ void tui_guess_size(TUIData *tui)
tui_set_size(tui, width, height);
// Redraw on SIGWINCH event if size didn't change. #23411
ui_client_set_size(width, height);
xfree(lines);
xfree(columns);
}