summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2017-12-05 13:06:16 +0100
committerBram Moolenaar <Bram@vim.org>2017-12-05 13:06:16 +0100
commitce6179c799468e471c3b7fc71c9924f57a2253c5 (patch)
tree7ac3d91b97fc9182f28172358bf3e82b179650c0 /src
parent461fe50fea245b2b199d92ebce4d9875d856bd27 (diff)
downloadvim-git-ce6179c799468e471c3b7fc71c9924f57a2253c5.tar.gz
patch 8.0.1368: cannot drag status or separator of new terminal windowv8.0.1368
Problem: Cannot drag status line or vertical separator of new terminal window. (UncleBill) Solution: Adjust mouse row and column computation. (Yasuhiro Matsumoto, closes #2410)
Diffstat (limited to 'src')
-rw-r--r--src/terminal.c7
-rw-r--r--src/version.c2
2 files changed, 6 insertions, 3 deletions
diff --git a/src/terminal.c b/src/terminal.c
index 61630d5cc..5a2ebf865 100644
--- a/src/terminal.c
+++ b/src/terminal.c
@@ -1308,12 +1308,13 @@ send_keys_to_term(term_T *term, int c, int typed)
case K_MOUSELEFT:
case K_MOUSERIGHT:
if (mouse_row < W_WINROW(curwin)
- || mouse_row > (W_WINROW(curwin) + curwin->w_height)
+ || mouse_row >= (W_WINROW(curwin) + curwin->w_height)
|| mouse_col < curwin->w_wincol
- || mouse_col > W_ENDCOL(curwin)
+ || mouse_col >= W_ENDCOL(curwin)
|| dragging_outside)
{
- /* click or scroll outside the current window */
+ /* click or scroll outside the current window or on status line
+ * or vertical separator */
if (typed)
{
stuffcharReadbuff(c);
diff --git a/src/version.c b/src/version.c
index c2445cef1..76f4a5cfb 100644
--- a/src/version.c
+++ b/src/version.c
@@ -772,6 +772,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1368,
+/**/
1367,
/**/
1366,