summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2019-04-07 21:55:07 +0200
committerBram Moolenaar <Bram@vim.org>2019-04-07 21:55:07 +0200
commit049736fa8af211886848d4a847b45d5d991c9687 (patch)
treedf360e4eccdf4ef93292dd1afb0ae8025ccdc6f0
parent905dd905debfde403b2a18178ccc1f8e118f4f2b (diff)
patch 8.1.1137: xterm mouse wheel escape sequence is not testedv8.1.1137
Problem: Xterm mouse wheel escape sequence is not tested. Solution: Add a test using low-level input. (Dominique Pelle, closes #4221)
-rw-r--r--src/testdir/test_termcodes.vim66
-rw-r--r--src/version.c2
2 files changed, 68 insertions, 0 deletions
diff --git a/src/testdir/test_termcodes.vim b/src/testdir/test_termcodes.vim
index bd2729d3e3..0bee55abe1 100644
--- a/src/testdir/test_termcodes.vim
+++ b/src/testdir/test_termcodes.vim
@@ -45,3 +45,69 @@ func Test_xterm_mouse_click()
bwipe!
endfunc
+func Test_xterm_mouse_wheel()
+ new
+ let save_mouse = &mouse
+ let save_term = &term
+ let save_ttymouse = &ttymouse
+ set mouse=a
+ set term=xterm
+ call setline(1, range(1, 100))
+
+ " Test Xterm mouse wheel.
+ set ttymouse=xterm
+ let button = 0x41 " wheel down.
+ let row = 1 + 32 " cursor position for mouse wheel is not relevant.
+ let col = 1 + 32
+
+ call assert_equal(1, line('w0'))
+ call assert_equal([0, 1, 1, 0], getpos('.'))
+ call feedkeys("\<Esc>[M" .. list2str([button, col, row]), 'Lx!')
+ call assert_equal(4, line('w0'))
+ call assert_equal([0, 4, 1, 0], getpos('.'))
+ call feedkeys("\<Esc>[M" .. list2str([button, col, row]), 'Lx!')
+ call assert_equal(7, line('w0'))
+ call assert_equal([0, 7, 1, 0], getpos('.'))
+
+ let button = 0x40 " wheel up.
+
+ call feedkeys("\<Esc>[M" .. list2str([button, col, row]), 'Lx!')
+ call assert_equal(4, line('w0'))
+ call assert_equal([0, 7, 1, 0], getpos('.'))
+ call feedkeys("\<Esc>[M" .. list2str([button, col, row]), 'Lx!')
+ call assert_equal(1, line('w0'))
+ call assert_equal([0, 7, 1, 0], getpos('.'))
+
+ " Test SGR mouse wheel.
+ set ttymouse=sgr
+ go
+ let button = 0x41 " wheel down.
+ let row = 1 " cursor position for mouse wheel is not relevant.
+ let col = 1
+
+ call assert_equal(1, line('w0'))
+ call assert_equal([0, 1, 1, 0], getpos('.'))
+ call feedkeys(printf("\<Esc>[<%d;%d;%dM", button, col, row), 'Lx!')
+ call assert_equal(4, line('w0'))
+ call assert_equal([0, 4, 1, 0], getpos('.'))
+ call feedkeys(printf("\<Esc>[<%d;%d;%dM", button, col, row), 'Lx!')
+ call assert_equal(7, line('w0'))
+ call assert_equal([0, 7, 1, 0], getpos('.'))
+
+ let button = 0x40 " wheel up.
+
+ call feedkeys(printf("\<Esc>[<%d;%d;%dM", button, col, row), 'Lx!')
+ call assert_equal(4, line('w0'))
+ call assert_equal([0, 7, 1, 0], getpos('.'))
+ call feedkeys(printf("\<Esc>[<%d;%d;%dM", button, col, row), 'Lx!')
+ call assert_equal(1, line('w0'))
+ call assert_equal([0, 7, 1, 0], getpos('.'))
+ call feedkeys(printf("\<Esc>[<%d;%d;%dM", button, col, row), 'Lx!')
+ call assert_equal(1, line('w0'))
+ call assert_equal([0, 7, 1, 0], getpos('.'))
+
+ let &mouse = save_mouse
+ let &term = save_term
+ let &ttymouse = save_ttymouse
+ bwipe!
+endfunc
diff --git a/src/version.c b/src/version.c
index 6b428b48a2..d2da9fcca0 100644
--- a/src/version.c
+++ b/src/version.c
@@ -772,6 +772,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1137,
+/**/
1136,
/**/
1135,