wyj/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2024-09-17 20:58:20 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix(terminal): keep focus when scrolling number column of another window (#25848)

Browse Source
This commit is contained in:
zeertzjq 2023-10-31 15:23:20 +08:00 committed by GitHub
parent c881092ffe
commit d4c2fc6ff6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/nvim/terminal.c
View File

@ -1417,13 +1417,14 @@ static void mouse_action(Terminal *term, int button, int row, int col, bool pres
static bool send_mouse_event(Terminal *term, int c)
{
int row = mouse_row, col = mouse_col, grid = mouse_grid;
int offset;
win_T *mouse_win = mouse_find_win(&grid, &row, &col);
if (mouse_win == NULL || (offset = win_col_off(mouse_win)) > col) {
if (mouse_win == NULL) {
goto end;
}
if (term->forward_mouse && mouse_win->w_buffer->terminal == term) {
int offset;
if (term->forward_mouse && mouse_win->w_buffer->terminal == term
&& col >= (offset = win_col_off(mouse_win))) {
// event in the terminal window and mouse events was enabled by the
// program. translate and forward the event
int button;

4
test/functional/terminal/mouse_spec.lua
View File

@ -324,7 +324,7 @@ describe(':terminal mouse', function()
{3:-- TERMINAL --} |
]])
command('set mousescroll=ver:10')
feed('<ScrollWheelUp><4,0>')
feed('<ScrollWheelUp><0,0>')
screen:expect([[
{7: 16 }line │line30 |
{7: 17 }line │rows: 5, cols: 25 |
@ -335,7 +335,7 @@ describe(':terminal mouse', function()
{3:-- TERMINAL --} |
]])
command('set mousescroll=ver:0')
feed('<ScrollWheelUp><4,0>')
feed('<ScrollWheelUp><0,0>')
screen:expect_unchanged()
feed([[<C-\><C-N><C-W>w]])
command('setlocal nowrap')