fix(input): do no reinterpret mouse keys with ALT modifiers

Remove check for MOD_MASK_META as it is for <T- which never appears in TUI.
Make small changes to docs.
This commit is contained in:
zeertzjq
2022-06-17 07:28:16 +08:00
parent 46e3e1c728
commit eb77122823
8 changed files with 57 additions and 23 deletions

View File

@@ -21,11 +21,9 @@ describe('statusline clicks', function()
command('set laststatus=2 mousemodel=extend')
exec([=[
function! MyClickFunc(minwid, clicks, button, mods)
let mods = trim(a:mods)
if mods ==# ''
let g:testvar = printf("%d %d %s", a:minwid, a:clicks, a:button)
else
let g:testvar = printf("%d %d %s %s", a:minwid, a:clicks, a:button, mods)
let g:testvar = printf("%d %d %s", a:minwid, a:clicks, a:button)
if a:mods !=# ' '
let g:testvar ..= '(' .. a:mods .. ')'
endif
endfunction
]=])
@@ -35,8 +33,20 @@ describe('statusline clicks', function()
meths.set_option('statusline', 'Not clicky stuff %0@MyClickFunc@Clicky stuff%T')
meths.input_mouse('left', 'press', '', 0, 6, 17)
eq('0 1 l', eval("g:testvar"))
meths.input_mouse('left', 'press', '', 0, 6, 17)
eq('0 2 l', eval("g:testvar"))
meths.input_mouse('left', 'press', '', 0, 6, 17)
eq('0 3 l', eval("g:testvar"))
meths.input_mouse('left', 'press', '', 0, 6, 17)
eq('0 4 l', eval("g:testvar"))
meths.input_mouse('right', 'press', '', 0, 6, 17)
eq('0 1 r', eval("g:testvar"))
meths.input_mouse('right', 'press', '', 0, 6, 17)
eq('0 2 r', eval("g:testvar"))
meths.input_mouse('right', 'press', '', 0, 6, 17)
eq('0 3 r', eval("g:testvar"))
meths.input_mouse('right', 'press', '', 0, 6, 17)
eq('0 4 r', eval("g:testvar"))
end)
it('works for winbar', function()
@@ -101,10 +111,30 @@ describe('statusline clicks', function()
it("works with modifiers #18994", function()
meths.set_option('statusline', 'Not clicky stuff %0@MyClickFunc@Clicky stuff%T')
meths.input_mouse('right', 'press', 's', 0, 6, 17)
eq('0 1 r s', eval("g:testvar"))
meths.input_mouse('left', 'press', 's', 0, 6, 17)
eq('0 1 l s', eval("g:testvar"))
-- Note: alternate between left and right mouse buttons to avoid triggering multiclicks
meths.input_mouse('left', 'press', 'S', 0, 6, 17)
eq('0 1 l(s )', eval("g:testvar"))
meths.input_mouse('right', 'press', 'S', 0, 6, 17)
eq('0 1 r(s )', eval("g:testvar"))
meths.input_mouse('left', 'press', 'A', 0, 6, 17)
eq('0 1 l( a )', eval("g:testvar"))
meths.input_mouse('right', 'press', 'A', 0, 6, 17)
eq('0 1 r( a )', eval("g:testvar"))
meths.input_mouse('left', 'press', 'AS', 0, 6, 17)
eq('0 1 l(s a )', eval("g:testvar"))
meths.input_mouse('right', 'press', 'AS', 0, 6, 17)
eq('0 1 r(s a )', eval("g:testvar"))
meths.input_mouse('left', 'press', 'T', 0, 6, 17)
eq('0 1 l( m)', eval("g:testvar"))
meths.input_mouse('right', 'press', 'T', 0, 6, 17)
eq('0 1 r( m)', eval("g:testvar"))
meths.input_mouse('left', 'press', 'TS', 0, 6, 17)
eq('0 1 l(s m)', eval("g:testvar"))
meths.input_mouse('right', 'press', 'TS', 0, 6, 17)
eq('0 1 r(s m)', eval("g:testvar"))
meths.input_mouse('left', 'press', 'C', 0, 6, 17)
eq('0 1 l( c )', eval("g:testvar"))
-- <C-RightMouse> is for tag jump
end)
it("works for global statusline with vertical splits #19186", function()