mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-18 15:51:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11025 from bfredl/doublescroll

Browse Source 
compositor: avoid transmitting invalid lines on double scroll
This commit is contained in:
Björn Linse
2019-09-15 16:53:43 +02:00
committed by GitHub
parent b9d035a39c a0f13095aa
commit 45f23ef9d6
1 changed files with 23 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/nvim/ui_compositor.c
View File

@@ -526,9 +526,7 @@ static void ui_comp_raw_line(UI *ui, Integer grid, Integer row,
endcol = MIN(endcol, clearcol); endcol = MIN(endcol, clearcol);
} }
bool above_msg = (kv_A(layers, kv_size(layers)-1) == &msg_grid bool covered = curgrid_covered_above((int)row);
&& row < msg_current_row-(msg_was_scrolled?1:0));
bool covered = kv_size(layers)-(above_msg?1:0) > curgrid->comp_index+1;
// TODO(bfredl): eventually should just fix compose_line to respect clearing // TODO(bfredl): eventually should just fix compose_line to respect clearing
// and optimize it for uncovered lines. // and optimize it for uncovered lines.
if (flags & kLineFlagInvalid || covered || curgrid->blending) { if (flags & kLineFlagInvalid || covered || curgrid->blending) {
@@ -588,6 +586,16 @@ static void ui_comp_msg_set_pos(UI *ui, Integer grid, Integer row,
msg_was_scrolled = scrolled; msg_was_scrolled = scrolled;
} }
/// check if curgrid is covered on row or above
///
/// TODO(bfredl): currently this only handles message row
static bool curgrid_covered_above(int row)
{
bool above_msg = (kv_A(layers, kv_size(layers)-1) == &msg_grid
&& row < msg_current_row-(msg_was_scrolled?1:0));
return kv_size(layers)-(above_msg?1:0) > curgrid->comp_index+1;
}
static void ui_comp_grid_scroll(UI *ui, Integer grid, Integer top, static void ui_comp_grid_scroll(UI *ui, Integer grid, Integer top,
Integer bot, Integer left, Integer right, Integer bot, Integer left, Integer right,
Integer rows, Integer cols) Integer rows, Integer cols)
@@ -599,18 +607,23 @@ static void ui_comp_grid_scroll(UI *ui, Integer grid, Integer top,
bot += curgrid->comp_row; bot += curgrid->comp_row;
left += curgrid->comp_col; left += curgrid->comp_col;
right += curgrid->comp_col; right += curgrid->comp_col;
bool covered = kv_size(layers) > curgrid->comp_index+1 || curgrid->blending; bool covered = curgrid_covered_above((int)(bot - MAX(rows, 0)));
if (covered) { if (covered || curgrid->blending) {
// TODO(bfredl): // TODO(bfredl):
// 1. check if rectangles actually overlap // 1. check if rectangles actually overlap
// 2. calulate subareas that can scroll. // 2. calulate subareas that can scroll.
if (rows > 0) { compose_debug(top, bot, left, right, dbghl_recompose, true);
bot -= rows; for (int r = (int)(top + MAX(-rows, 0)); r < bot - MAX(rows, 0); r++) {
} else { // TODO(bfredl): workaround for win_update() performing two scrolls in a
top += (-rows); // row, where the latter might scroll invalid space created by the first.
// ideally win_update() should keep track of this itself and not scroll
// the invalid space.
if (curgrid->attrs[curgrid->line_offset[r-curgrid->comp_row]
+left-curgrid->comp_col] >= 0) {
compose_line(r, left, right, 0);
}
} }
compose_area(top, bot, left, right);
} else { } else {
ui_composed_call_grid_scroll(1, top, bot, left, right, rows, cols); ui_composed_call_grid_scroll(1, top, bot, left, right, rows, cols);
if (rdb_flags & RDB_COMPOSITOR) { if (rdb_flags & RDB_COMPOSITOR) {