aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

patch 8.2.3193: screenpos() is wrong when 'display' is "lastline"

Browse Source 
Problem:    screenpos() is wrong when the last line is partially visible and
            'display' is "lastline".
Solution:   Also compute the position for a partially visible line.
            (closes #8599)
This commit is contained in:
Bram Moolenaar 2021-07-21 18:04:56 +02:00
parent 11d7e62f1d
commit 189663bdac
3 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/move.c
View File

@ -1229,7 +1229,7 @@ textpos2screenpos(
int rowoff = 0;
colnr_T coloff = 0;
if (pos->lnum >= wp->w_topline && pos->lnum < wp->w_botline)
if (pos->lnum >= wp->w_topline && pos->lnum <= wp->w_botline)
{
colnr_T off;
colnr_T col;
@ -1256,11 +1256,11 @@ textpos2screenpos(
col -= wp->w_leftcol;
if (col >= wp->w_width)
col = -1;
if (col >= 0)
if (col >= 0 && row + rowoff <= wp->w_height)
coloff = col - scol + wp->w_wincol + 1;
else
// character is left or right of the window
row = scol = ccol = ecol = 0;
// character is left, right or below of the window
row = rowoff = scol = ccol = ecol = 0;
}
*rowp = W_WINROW(wp) + row + rowoff;
*scolp = scol + coloff;

16
src/testdir/test_cursor_func.vim
View File

@ -101,9 +101,25 @@ func Test_screenpos()
\ 'col': wincol + 9,
\ 'curscol': wincol + 9,
\ 'endcol': wincol + 9}, screenpos(winid, 2, 22))
let wininfo = getwininfo(winid)[0]
call setline(3, ['x']->repeat(wininfo.height))
call setline(line('$') + 1, 'x'->repeat(wininfo.width * 3))
setlocal nonumber display=lastline so=0
exe "normal G\<C-Y>\<C-Y>"
redraw
call assert_equal({'row': winrow + wininfo.height - 1,
\ 'col': wincol + 7,
\ 'curscol': wincol + 7,
\ 'endcol': wincol + 7}, winid->screenpos(line('$'), 8))
call assert_equal({'row': winrow - 1, 'col': 0, 'curscol': 0, 'endcol': 0},
\ winid->screenpos(line('$'), 22))
close
call assert_equal({}, screenpos(999, 1, 1))
bwipe!
set display&
call assert_equal({'col': 1, 'row': 1, 'endcol': 1, 'curscol': 1}, screenpos(win_getid(), 1, 1))
nmenu WinBar.TEST :

2
src/version.c
View File

@ -755,6 +755,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
3193,
/**/
3192,
/**/