1 files changed, 12 insertions, 7 deletions

diff --git a/src/nvim/mouse.c b/src/nvim/mouse.c
index cf463fd40a..f02c000e82 100644
--- a/src/nvim/mouse.c
+++ b/src/nvim/mouse.c
@@ -236,6 +236,11 @@ retnomove:
       redraw_curbuf_later(INVERTED);            // delete the inversion
     }
 
+    if (grid == 0) {
+      row -= curwin->w_grid_alloc.comp_row+curwin->w_grid.row_offset;
+      col -= curwin->w_grid_alloc.comp_col+curwin->w_grid.col_offset;
+    }
+
     // When clicking beyond the end of the window, scroll the screen.
     // Scroll by however many rows outside the window we are.
     if (row < 0) {
@@ -476,7 +481,7 @@ win_T *mouse_find_win(int *gridp, int *rowp, int *colp)
 static win_T *mouse_find_grid_win(int *gridp, int *rowp, int *colp)
 {
   if (*gridp == msg_grid.handle) {
-    // rowp += msg_grid_pos;  // PVS: dead store #11612
+    *rowp += msg_grid_pos;
     *gridp = DEFAULT_GRID_HANDLE;
   } else if (*gridp > 1) {
     win_T *wp = get_win_by_grid_handle(*gridp);
@@ -677,8 +682,8 @@ static int mouse_adjust_click(win_T *wp, int row, int col)
 
   vcol = offset;
 
-#define incr() nudge++; ptr_end += utfc_ptr2len(ptr_end)
-#define decr() nudge--; ptr_end -= utfc_ptr2len(ptr_end)
+#define INCR() nudge++; ptr_end += utfc_ptr2len(ptr_end)
+#define DECR() nudge--; ptr_end -= utfc_ptr2len(ptr_end)
 
   while (ptr < ptr_end && *ptr != NUL) {
     cwidth = win_chartabsize(curwin, ptr, vcol);
@@ -687,7 +692,7 @@ static int mouse_adjust_click(win_T *wp, int row, int col)
       // A tab will "absorb" any previous adjustments.
       cwidth = MIN(cwidth, nudge);
       while (cwidth > 0) {
-        decr();
+        DECR();
         cwidth--;
       }
     }
@@ -695,20 +700,20 @@ static int mouse_adjust_click(win_T *wp, int row, int col)
     matchid = syn_get_concealed_id(wp, lnum, (colnr_T)(ptr - line));
     if (matchid != 0) {
       if (wp->w_p_cole == 3) {
-        incr();
+        INCR();
       } else {
         if (!(row > 0 && ptr == ptr_row_offset)
             && (wp->w_p_cole == 1 || (wp->w_p_cole == 2
                                       && (wp->w_p_lcs_chars.conceal != NUL
                                           || syn_get_sub_char() != NUL)))) {
           // At least one placeholder character will be displayed.
-          decr();
+          DECR();
         }
 
         prev_matchid = matchid;
 
         while (prev_matchid == matchid && *ptr != NUL) {
-          incr();
+          INCR();
           ptr += utfc_ptr2len(ptr);
           matchid = syn_get_concealed_id(wp, lnum, (colnr_T)(ptr - line));
         }