neovim

commit d4c2fc6ff6c579b2588f0e3ba02e5cbe58308c6a
parent c881092ffe9d6760d08efcd4dfb02efcb60cc706
Author: zeertzjq <zeertzjq@outlook.com>
Date:   Tue, 31 Oct 2023 15:23:20 +0800

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


Diffstat:
M
src/nvim/terminal.c
 | 
7
++++---
M
test/functional/terminal/mouse_spec.lua
 | 
4
++--

2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/nvim/terminal.c b/src/nvim/terminal.c
@@ -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;
diff --git a/test/functional/terminal/mouse_spec.lua b/test/functional/terminal/mouse_spec.lua
@@ -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')