kevin/neovim
1
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2024-12-24 13:15:09 -07:00
Code Issues Packages Projects Releases Wiki Activity

test: add test for key following ignored mouse move (#31104)

Browse Source
This commit is contained in:
zeertzjq 2024-11-07 17:53:30 +08:00 committed by GitHub
parent 000129201c
commit 5a86360400
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/nvim/os/input.c
View File

@ -289,8 +289,8 @@ size_t input_enqueue(String keys)
unsigned new_size unsigned new_size
= trans_special(&ptr, (size_t)(end - ptr), (char *)buf, FSK_KEYCODE, true, NULL); = trans_special(&ptr, (size_t)(end - ptr), (char *)buf, FSK_KEYCODE, true, NULL);
if (new_size) { if (new_size > 0) {
if ((new_size = handle_mouse_event(&ptr, buf, new_size))) { if ((new_size = handle_mouse_event(&ptr, buf, new_size)) > 0) {
input_enqueue_raw((char *)buf, new_size); input_enqueue_raw((char *)buf, new_size);
} }
continue; continue;
@ -351,9 +351,9 @@ static uint8_t check_multiclick(int code, int grid, int row, int col, bool *skip
|| code == KE_X1MOUSE || code == KE_X2MOUSE) { || code == KE_X1MOUSE || code == KE_X2MOUSE) {
// For click events the number of clicks is updated. // For click events the number of clicks is updated.
uint64_t mouse_time = os_hrtime(); // time of current mouse click (ns) uint64_t mouse_time = os_hrtime(); // time of current mouse click (ns)
// compute the time elapsed since the previous mouse click and // Compute the time elapsed since the previous mouse click.
// convert p_mouse from ms to ns
uint64_t timediff = mouse_time - orig_mouse_time; uint64_t timediff = mouse_time - orig_mouse_time;
// Convert 'mousetime' from ms to ns.
uint64_t mouset = (uint64_t)p_mouset * 1000000; uint64_t mouset = (uint64_t)p_mouset * 1000000;
if (code == orig_mouse_code if (code == orig_mouse_code
&& no_move && no_move
@ -407,7 +407,7 @@ static unsigned handle_mouse_event(const char **ptr, uint8_t *buf, unsigned bufs
return bufsize; return bufsize;
} }
// a <[COL],[ROW]> sequence can follow and will set the mouse_row/mouse_col // A <[COL],[ROW]> sequence can follow and will set the mouse_row/mouse_col
// global variables. This is ugly but its how the rest of the code expects to // global variables. This is ugly but its how the rest of the code expects to
// find mouse coordinates, and it would be too expensive to refactor this // find mouse coordinates, and it would be too expensive to refactor this
// now. // now.

17
test/functional/ui/mouse_spec.lua
View File

@ -1922,17 +1922,24 @@ describe('ui/mouse/input', function()
end) end)
it('<MouseMove> to same location does not generate events #31103', function() it('<MouseMove> to same location does not generate events #31103', function()
api.nvim_input_mouse('move', '', '', 0, 0, 3)
api.nvim_set_var('mouse_move', 0) api.nvim_set_var('mouse_move', 0)
api.nvim_set_var('mouse_move2', 0) api.nvim_set_var('mouse_move2', 0)
command('nnoremap <MouseMove> <Cmd>let g:mouse_move += 1<CR>') command('nnoremap <MouseMove> <Cmd>let g:mouse_move += 1<CR>')
command('nnoremap <2-MouseMove> <Cmd>let g:mouse_move2 += 1<CR>') command('nnoremap <2-MouseMove> <Cmd>let g:mouse_move2 += 1<CR>')
feed('<MouseMove><3,0>')
feed('<MouseMove><3,0>')
api.nvim_input_mouse('move', '', '', 0, 0, 3) api.nvim_input_mouse('move', '', '', 0, 0, 3)
api.nvim_input_mouse('move', '', '', 0, 0, 3) eq(1, api.nvim_get_var('mouse_move'))
eq(0, api.nvim_get_var('mouse_move'))
eq(0, api.nvim_get_var('mouse_move2')) eq(0, api.nvim_get_var('mouse_move2'))
feed('<MouseMove><3,0>')
feed('<MouseMove><3,0>')
api.nvim_input_mouse('move', '', '', 0, 0, 3)
api.nvim_input_mouse('move', '', '', 0, 0, 3)
eq(1, api.nvim_get_var('mouse_move'))
eq(0, api.nvim_get_var('mouse_move2'))
eq({ mode = 'n', blocking = false }, api.nvim_get_mode())
feed('<MouseMove><3,0><Insert>')
eq(1, api.nvim_get_var('mouse_move'))
eq(0, api.nvim_get_var('mouse_move2'))
eq({ mode = 'i', blocking = false }, api.nvim_get_mode())
end) end)
it('feeding <MouseMove> in Normal mode does not use uninitialized memory #19480', function() it('feeding <MouseMove> in Normal mode does not use uninitialized memory #19480', function()