mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-07 10:26:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

tui: eliminate scrolling region data structure

Browse Source 
The scrolling region is always local to a single grid_scroll event, use
local variables and parameters instead.

The invocation of reset_scroll_region in grid_resize is cargo-culted to use
margin reset under exactly the same circumstances, not sure if it is necessary
though.
This commit is contained in:
Björn Linse
2018-09-26 13:06:20 +02:00
parent 1b8939d233
commit edb26f2c65
3 changed files with 42 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/nvim/ugrid.c
View File

@@ -32,10 +32,6 @@ void ugrid_resize(UGrid *grid, int width, int height)
grid->cells[i] = xcalloc((size_t)width, sizeof(UCell));
}
grid->top = 0;
grid->bot = height - 1;
grid->left = 0;
grid->right = width - 1;
grid->row = grid->col = 0;
grid->width = width;
grid->height = height;
@@ -57,25 +53,18 @@ void ugrid_goto(UGrid *grid, int row, int col)
grid->col = col;
}
void ugrid_set_scroll_region(UGrid *grid, int top, int bot, int left, int right)
{
grid->top = top;
grid->bot = bot;
grid->left = left;
grid->right = right;
}
void ugrid_scroll(UGrid *grid, int count, int *clear_top, int *clear_bot)
void ugrid_scroll(UGrid *grid, int top, int bot, int left, int right,
int count, int *clear_top, int *clear_bot)
{
// Compute start/stop/step for the loop below
int start, stop, step;
if (count > 0) {
start = grid->top;
stop = grid->bot - count + 1;
start = top;
stop = bot - count + 1;
step = 1;
} else {
start = grid->bot;
stop = grid->top - count - 1;
start = bot;
stop = top - count - 1;
step = -1;
}
@@ -83,10 +72,10 @@ void ugrid_scroll(UGrid *grid, int count, int *clear_top, int *clear_bot)
// Copy cell data
for (i = start; i != stop; i += step) {
UCell *target_row = grid->cells[i] + grid->left;
UCell *source_row = grid->cells[i + count] + grid->left;
UCell *target_row = grid->cells[i] + left;
UCell *source_row = grid->cells[i + count] + left;
memcpy(target_row, source_row,
sizeof(UCell) * (size_t)(grid->right - grid->left + 1));
sizeof(UCell) * (size_t)(right - left + 1));
}
// clear cells in the emptied region,
@@ -97,7 +86,7 @@ void ugrid_scroll(UGrid *grid, int count, int *clear_top, int *clear_bot)
*clear_bot = stop;
*clear_top = stop + count + 1;
}
clear_region(grid, *clear_top, *clear_bot, grid->left, grid->right, 0);
clear_region(grid, *clear_top, *clear_bot, left, right, 0);
}
static void clear_region(UGrid *grid, int top, int bot, int left, int right,