mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2026-07-17 06:31:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(terminal): do not reflow altscreen on resize #39024

Browse Source 
Problem: reflow can break tui display
Solution: disable reflow on altscreen
(cherry picked from commit 7bb8231577)

Co-authored-by: phanium <91544758+phanen@users.noreply.github.com>
This commit is contained in:
neovim-backports[bot]
2026-04-13 18:31:24 -04:00
committed by GitHub
parent aac55faa2c
commit abcc5342ee
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/nvim/vterm/screen.c
View File

@@ -498,17 +498,19 @@ static void resize_buffer(VTermScreen *screen, int bufidx, int new_rows, int new
// scrolling into // scrolling into
int final_blank_row = new_rows; int final_blank_row = new_rows;
bool do_reflow = screen->reflow && (bufidx == BUFIDX_PRIMARY);
while (old_row >= 0) { while (old_row >= 0) {
int old_row_end = old_row; int old_row_end = old_row;
// TODO(vterm): Stop if dwl or dhl // TODO(vterm): Stop if dwl or dhl
while (screen->reflow && old_lineinfo && old_row > 0 && old_lineinfo[old_row].continuation) { while (do_reflow && old_lineinfo && old_row > 0 && old_lineinfo[old_row].continuation) {
old_row--; old_row--;
} }
int old_row_start = old_row; int old_row_start = old_row;
int width = 0; int width = 0;
for (int row = old_row_start; row <= old_row_end; row++) { for (int row = old_row_start; row <= old_row_end; row++) {
if (screen->reflow && row < (old_rows - 1) && old_lineinfo[row + 1].continuation) { if (do_reflow && row < (old_rows - 1) && old_lineinfo[row + 1].continuation) {
width += old_cols; width += old_cols;
} else { } else {
width += line_popcount(old_buffer, row, old_rows, old_cols); width += line_popcount(old_buffer, row, old_rows, old_cols);
@@ -519,7 +521,7 @@ static void resize_buffer(VTermScreen *screen, int bufidx, int new_rows, int new
final_blank_row = new_row; final_blank_row = new_row;
} }
int new_height = screen->reflow int new_height = do_reflow
? width ? (width + new_cols - 1) / new_cols : 1 ? width ? (width + new_cols - 1) / new_cols : 1
: 1; : 1;
@@ -595,7 +597,7 @@ static void resize_buffer(VTermScreen *screen, int bufidx, int new_rows, int new
if (old_col == old_cols) { if (old_col == old_cols) {
old_row++; old_row++;
if (!screen->reflow) { if (!do_reflow) {
new_col++; new_col++;
break; break;
} }