Skip to content

Commit

Permalink
patch 8.1.1141: terminal winpos test fails with very large terminal
Browse files Browse the repository at this point in the history
Problem:    Terminal winpos test fails with very large terminal. (Dominique
            Pelle)
Solution:   Compute the expected size more accurately. (closes #4228)
  • Loading branch information
brammool committed Apr 9, 2019
1 parent 46ad288 commit 1b55797
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 2 deletions.
10 changes: 8 additions & 2 deletions src/testdir/test_terminal.vim
Expand Up @@ -1912,9 +1912,15 @@ func Test_terminal_getwinpos()
let ypos = str2nr(substitute(line, '\[\d\+, \(\d\+\)\]', '\1', ''))

" Position must be bigger than the getwinpos() result of Vim itself.
" The calcuation in the console assumes a 10 x 7 character cell.
" In the GUI it can be more, let's assume a 20 x 14 cell.
" And then add 100 / 200 tolerance.
let [xroot, yroot] = getwinpos()
call assert_inrange(xroot + 2, xroot + 1000, xpos)
call assert_inrange(yroot + 2, yroot + 1000, ypos)
let [winrow, wincol] = win_screenpos('.')
let xoff = wincol * (has('gui_running') ? 14 : 7) + 100
let yoff = winrow * (has('gui_running') ? 20 : 10) + 200
call assert_inrange(xroot + 2, xroot + xoff, xpos)
call assert_inrange(yroot + 2, yroot + yoff, ypos)

call term_wait(buf)
call term_sendkeys(buf, ":q\<CR>")
Expand Down
2 changes: 2 additions & 0 deletions src/version.c
Expand Up @@ -771,6 +771,8 @@ static char *(features[]) =

static int included_patches[] =
{ /* Add new patch number below this line */
/**/
1141,
/**/
1140,
/**/
Expand Down

0 comments on commit 1b55797

Please sign in to comment.