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

Merge pull request #34015 from bfredl/tui_scroll_state

Browse Source 
refactor(tui): remove scroll_region_is_full_screen global state
This commit is contained in:
bfredl
2025-05-14 10:54:19 +02:00
committed by GitHub
parent 570e62d0f9 2bfb12ef46
commit b0bb3cccf9
1 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -95,7 +95,6 @@ struct TUIData {
kvec_t(Rect) invalid_regions; kvec_t(Rect) invalid_regions;
int row, col; int row, col;
int out_fd; int out_fd;
bool scroll_region_is_full_screen;
bool can_change_scroll_region; bool can_change_scroll_region;
bool can_set_lr_margin; // smglr bool can_set_lr_margin; // smglr
bool can_set_left_right_margin; bool can_set_left_right_margin;
@@ -349,7 +348,6 @@ void tui_query_bg_color(TUIData *tui)
/// from terminfo just in case the controlling terminal has changed (#27177). /// from terminfo just in case the controlling terminal has changed (#27177).
static void terminfo_start(TUIData *tui) static void terminfo_start(TUIData *tui)
{ {
tui->scroll_region_is_full_screen = true;
tui->bufpos = 0; tui->bufpos = 0;
tui->default_attr = false; tui->default_attr = false;
tui->can_clear_attr = false; tui->can_clear_attr = false;
@@ -1227,10 +1225,6 @@ void tui_grid_resize(TUIData *tui, Integer g, Integer width, Integer height)
UNIBI_SET_NUM_VAR(tui->params[0], (int)height); UNIBI_SET_NUM_VAR(tui->params[0], (int)height);
UNIBI_SET_NUM_VAR(tui->params[1], (int)width); UNIBI_SET_NUM_VAR(tui->params[1], (int)width);
unibi_out_ext(tui, tui->unibi_ext.resize_screen); unibi_out_ext(tui, tui->unibi_ext.resize_screen);
// DECSLPP does not reset the scroll region.
if (tui->scroll_region_is_full_screen) {
reset_scroll_region(tui, tui->width == grid->width);
}
} else { // Already handled the SIGWINCH signal; avoid double-resize. } else { // Already handled the SIGWINCH signal; avoid double-resize.
got_winch = got_winch > 0 ? got_winch - 1 : 0; got_winch = got_winch > 0 ? got_winch - 1 : 0;
grid->row = -1; grid->row = -1;
@@ -1431,13 +1425,12 @@ void tui_grid_scroll(TUIData *tui, Integer g, Integer startrow, Integer endrow,
int right = (int)endcol - 1; int right = (int)endcol - 1;
bool fullwidth = left == 0 && right == tui->width - 1; bool fullwidth = left == 0 && right == tui->width - 1;
tui->scroll_region_is_full_screen = fullwidth bool full_screen_scroll = fullwidth && top == 0 && bot == tui->height - 1;
&& top == 0 && bot == tui->height - 1;
ugrid_scroll(grid, top, bot, left, right, (int)rows); ugrid_scroll(grid, top, bot, left, right, (int)rows);
bool can_scroll = tui->can_scroll bool can_scroll = tui->can_scroll
&& (tui->scroll_region_is_full_screen && (full_screen_scroll
|| (tui->can_change_scroll_region || (tui->can_change_scroll_region
&& ((left == 0 && right == tui->width - 1) && ((left == 0 && right == tui->width - 1)
|| tui->can_set_lr_margin || tui->can_set_lr_margin
@@ -1445,7 +1438,7 @@ void tui_grid_scroll(TUIData *tui, Integer g, Integer startrow, Integer endrow,
if (can_scroll) { if (can_scroll) {
// Change terminal scroll region and move cursor to the top // Change terminal scroll region and move cursor to the top
if (!tui->scroll_region_is_full_screen) { if (!full_screen_scroll) {
set_scroll_region(tui, top, bot, left, right); set_scroll_region(tui, top, bot, left, right);
} }
cursor_goto(tui, top, left); cursor_goto(tui, top, left);
@@ -1468,7 +1461,7 @@ void tui_grid_scroll(TUIData *tui, Integer g, Integer startrow, Integer endrow,
} }
// Restore terminal scroll region and cursor // Restore terminal scroll region and cursor
if (!tui->scroll_region_is_full_screen) { if (!full_screen_scroll) {
reset_scroll_region(tui, fullwidth); reset_scroll_region(tui, fullwidth);
} }
} else { } else {