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

multigrid: Get rid of global ScreenLines and set_screengrid

Browse Source
This commit is contained in:
Utkarsh Maheshwari
2018-08-17 17:40:04 +05:30
committed by Björn Linse
parent 0432e1586e
commit 911b731378
8 changed files with 43 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/nvim/eval.c
View File

@@ -14023,11 +14023,11 @@ static void f_screenattr(typval_T *argvars, typval_T *rettv, FunPtr fptr)
const int row = (int)tv_get_number_chk(&argvars[0], NULL) - 1;
const int col = (int)tv_get_number_chk(&argvars[1], NULL) - 1;
if (row < 0 || row >= screen_Rows
|| col < 0 || col >= screen_Columns) {
if (row < 0 || row >= default_grid.Rows
|| col < 0 || col >= default_grid.Columns) {
c = -1;
} else {
c = ScreenAttrs[LineOffset[row] + col];
c = default_grid.ScreenAttrs[default_grid.LineOffset[row] + col];
}
rettv->vval.v_number = c;
}
@@ -14042,12 +14042,12 @@ static void f_screenchar(typval_T *argvars, typval_T *rettv, FunPtr fptr)
const int row = tv_get_number_chk(&argvars[0], NULL) - 1;
const int col = tv_get_number_chk(&argvars[1], NULL) - 1;
if (row < 0 || row >= screen_Rows
|| col < 0 || col >= screen_Columns) {
if (row < 0 || row >= default_grid.Rows
|| col < 0 || col >= default_grid.Columns) {
c = -1;
} else {
off = LineOffset[row] + col;
c = utf_ptr2char(ScreenLines[off]);
off = default_grid.LineOffset[row] + col;
c = utf_ptr2char(default_grid.ScreenLines[off]);
}
rettv->vval.v_number = c;
}