From 62be9f39ef9cd8592ac0048ba2840aa65cbc1849 Mon Sep 17 00:00:00 2001 From: Utkarsh Maheshwari Date: Tue, 4 Sep 2018 02:45:29 +0530 Subject: multigrid: Fix sending window grid handle in ext_newline mode --- src/nvim/ui.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'src/nvim/ui.c') diff --git a/src/nvim/ui.c b/src/nvim/ui.c index 74814bf0ae..89c0069e58 100644 --- a/src/nvim/ui.c +++ b/src/nvim/ui.c @@ -347,15 +347,17 @@ void ui_cursor_goto(int new_row, int new_col) void ui_grid_cursor_goto(ScreenGrid *grid, int new_row, int new_col) { - int off_row = (ui_is_external(kUIMultigrid) ? 0 : grid->OffsetRow); - int off_col = (ui_is_external(kUIMultigrid) ? 0 : grid->OffsetColumn); + new_row += ui_is_external(kUIMultigrid) ? 0 : grid->OffsetRow; + new_col += ui_is_external(kUIMultigrid) ? 0 : grid->OffsetColumn; + int handle = ui_is_external(kUIMultigrid) ? grid->handle : DEFAULT_GRID_HANDLE; - if (new_row + off_row == row && new_col + off_col == col) { + if (new_row == row && new_col == col && handle == cursor_grid_handle) { return; } - row = new_row + off_row; - col = new_col + off_col; - cursor_grid_handle = grid->handle; + + row = new_row; + col = new_col; + cursor_grid_handle = handle; pending_cursor_update = true; } -- cgit