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

Merge pull request #8771 from bfredl/glitches

Browse Source 
Fix redraw glitches with newgrid refactor

Fixes #8768 #8775
This commit is contained in:
Björn Linse
2018-07-24 17:45:42 +02:00
committed by GitHub
parent c8e7a447c5 dcac926ced
commit 72ddbb675f
6 changed files with 134 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/nvim/api/ui.c
View File

@@ -302,6 +302,15 @@ static void remote_ui_grid_scroll(UI *ui, Integer grid, Integer top,
args = (Array)ARRAY_DICT_INIT; args = (Array)ARRAY_DICT_INIT;
ADD(args, INTEGER_OBJ(rows)); ADD(args, INTEGER_OBJ(rows));
push_call(ui, "scroll", args); push_call(ui, "scroll", args);
// some clients have "clear" being affected by scroll region,
// so reset it.
args = (Array)ARRAY_DICT_INIT;
ADD(args, INTEGER_OBJ(0));
ADD(args, INTEGER_OBJ(ui->height-1));
ADD(args, INTEGER_OBJ(0));
ADD(args, INTEGER_OBJ(ui->width-1));
push_call(ui, "set_scroll_region", args);
} }
} }

8
src/nvim/screen.c
View File

@@ -283,8 +283,11 @@ void update_screen(int type)
if (msg_scrolled) { if (msg_scrolled) {
clear_cmdline = true; clear_cmdline = true;
if (dy_flags & DY_MSGSEP) { if (dy_flags & DY_MSGSEP) {
int valid = MAX(Rows - msg_scrollsize(), 0);
if (valid == 0) {
redraw_tabline = true;
}
FOR_ALL_WINDOWS_IN_TAB(wp, curtab) { FOR_ALL_WINDOWS_IN_TAB(wp, curtab) {
int valid = Rows - msg_scrollsize();
if (wp->w_winrow + wp->w_height > valid) { if (wp->w_winrow + wp->w_height > valid) {
wp->w_redr_type = NOT_VALID; wp->w_redr_type = NOT_VALID;
wp->w_lines_valid = 0; wp->w_lines_valid = 0;
@@ -292,9 +295,6 @@ void update_screen(int type)
if (wp->w_winrow + wp->w_height + wp->w_status_height > valid) { if (wp->w_winrow + wp->w_height + wp->w_status_height > valid) {
wp->w_redr_status = true; wp->w_redr_status = true;
} }
if (valid == 0) {
redraw_tabline = true;
}
} }
} else if (msg_scrolled > Rows - 5) { // clearing is faster } else if (msg_scrolled > Rows - 5) { // clearing is faster
type = CLEAR; type = CLEAR;

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

@@ -823,7 +823,7 @@ static void tui_grid_clear(UI *ui, Integer g)
UGrid *grid = &data->grid; UGrid *grid = &data->grid;
ugrid_clear(grid); ugrid_clear(grid);
kv_size(data->invalid_regions) = 0; kv_size(data->invalid_regions) = 0;
clear_region(ui, grid->top, grid->bot, grid->left, grid->right, clear_region(ui, 0, grid->height-1, 0, grid->width-1,
data->clear_attrs); data->clear_attrs);
} }

2
src/nvim/ugrid.c
View File

@@ -44,7 +44,7 @@ void ugrid_resize(UGrid *grid, int width, int height)
void ugrid_clear(UGrid *grid) void ugrid_clear(UGrid *grid)
{ {
clear_region(grid, grid->top, grid->bot, grid->left, grid->right, clear_region(grid, 0, grid->height-1, 0, grid->width-1,
HLATTRS_INIT); HLATTRS_INIT);
} }

38
test/functional/ui/screen.lua
View File

@@ -73,6 +73,7 @@
local helpers = require('test.functional.helpers')(nil) local helpers = require('test.functional.helpers')(nil)
local request, run, uimeths = helpers.request, helpers.run, helpers.uimeths local request, run, uimeths = helpers.request, helpers.run, helpers.uimeths
local eq = helpers.eq
local dedent = helpers.dedent local dedent = helpers.dedent
local Screen = {} local Screen = {}
@@ -389,12 +390,21 @@ function Screen:_handle_mode_info_set(cursor_style_enabled, mode_info)
end end
function Screen:_handle_clear() function Screen:_handle_clear()
-- the first implemented UI protocol clients (python-gui and builitin TUI)
-- allowed the cleared region to be restricted by setting the scroll region.
-- this was never used by nvim tough, and not documented and implemented by
-- newer clients, to check we remain compatible with both kind of clients,
-- ensure the scroll region is in a reset state.
local expected_region = {
top = 1, bot = self._height, left = 1, right = self._width
}
eq(expected_region, self._scroll_region)
self:_clear_block(1, self._height, 1, self._width) self:_clear_block(1, self._height, 1, self._width)
end end
function Screen:_handle_grid_clear(grid) function Screen:_handle_grid_clear(grid)
assert(grid == 1) assert(grid == 1)
self:_handle_clear() self:_clear_block(1, self._height, 1, self._width)
end end
function Screen:_handle_eol_clear() function Screen:_handle_eol_clear()
@@ -446,22 +456,30 @@ function Screen:_handle_scroll(count)
local bot = self._scroll_region.bot local bot = self._scroll_region.bot
local left = self._scroll_region.left local left = self._scroll_region.left
local right = self._scroll_region.right local right = self._scroll_region.right
self:_handle_grid_scroll(1, top-1, bot, left-1, right, count, 0)
end
function Screen:_handle_grid_scroll(grid, top, bot, left, right, rows, cols)
top = top+1
left = left+1
assert(grid == 1)
assert(cols == 0)
local start, stop, step local start, stop, step
if count > 0 then if rows > 0 then
start = top start = top
stop = bot - count stop = bot - rows
step = 1 step = 1
else else
start = bot start = bot
stop = top - count stop = top - rows
step = -1 step = -1
end end
-- shift scroll region -- shift scroll region
for i = start, stop, step do for i = start, stop, step do
local target = self._rows[i] local target = self._rows[i]
local source = self._rows[i + count] local source = self._rows[i + rows]
for j = left, right do for j = left, right do
target[j].text = source[j].text target[j].text = source[j].text
target[j].attrs = source[j].attrs target[j].attrs = source[j].attrs
@@ -470,19 +488,11 @@ function Screen:_handle_scroll(count)
end end
-- clear invalid rows -- clear invalid rows
for i = stop + step, stop + count, step do for i = stop + step, stop + rows, step do
self:_clear_row_section(i, left, right) self:_clear_row_section(i, left, right)
end end
end end
function Screen:_handle_grid_scroll(grid, top, bot, left, right, rows, cols)
assert(grid == 1)
assert(cols == 0)
-- TODO: if we truly believe we should translate the other way
self:_handle_set_scroll_region(top,bot-1,left,right-1)
self:_handle_scroll(rows)
end
function Screen:_handle_hl_attr_define(id, rgb_attrs, cterm_attrs, info) function Screen:_handle_hl_attr_define(id, rgb_attrs, cterm_attrs, info)
self._attr_table[id] = {rgb_attrs, cterm_attrs} self._attr_table[id] = {rgb_attrs, cterm_attrs}
self._hl_info[id] = info self._hl_info[id] = info

95
test/functional/ui/screen_basic_spec.lua
View File

@@ -354,6 +354,101 @@ local function screen_tests(newgrid)
{0:~ }| {0:~ }|
| |
]]) ]])
feed(':echo "'..string.rep('x\\n', 12)..'"<cr>')
screen:expect([[
x |
x |
x |
x |
x |
x |
x |
x |
x |
x |
x |
x |
|
{7:Press ENTER or type command to continue}^ |
]])
feed('<cr>')
screen:expect([[
{4: [No Name] }{2: [No Name] }{3: }{4:X}|
^ |
{0:~ }|
{0:~ }|
{0:~ }|
{0:~ }|
{0:~ }|
{0:~ }|
{0:~ }|
{0:~ }|
{0:~ }|
{0:~ }|
{0:~ }|
|
]])
end)
it('redraws properly with :tab split right after scroll', function()
feed('30Ofoo<esc>gg')
command('vsplit')
screen:expect([[
^foo {3:│}foo |
foo {3:│}foo |
foo {3:│}foo |
foo {3:│}foo |
foo {3:│}foo |
foo {3:│}foo |
foo {3:│}foo |
foo {3:│}foo |
foo {3:│}foo |
foo {3:│}foo |
foo {3:│}foo |
foo {3:│}foo |
{1:[No Name] [+] }{3:[No Name] [+] }|
|
]])
feed('<PageDown>')
screen:expect([[
^foo {3:│}foo |
foo {3:│}foo |
foo {3:│}foo |
foo {3:│}foo |
foo {3:│}foo |
foo {3:│}foo |
foo {3:│}foo |
foo {3:│}foo |
foo {3:│}foo |
foo {3:│}foo |
foo {3:│}foo |
foo {3:│}foo |
{1:[No Name] [+] }{3:[No Name] [+] }|
|
]])
command('tab split')
screen:expect([[
{4: }{5:2}{4:+ [No Name] }{2: + [No Name] }{3: }{4:X}|
^foo |
foo |
foo |
foo |
foo |
foo |
foo |
foo |
foo |
foo |
foo |
foo |
|
]])
end) end)
end) end)