summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2022-08-03 15:48:33 +0100
committerBram Moolenaar <Bram@vim.org>2022-08-03 15:48:33 +0100
commitd6212b80d6d49d4d890c3141b7c6b83f899333b0 (patch)
tree603b5ef1d1489e4cfdaa049300c76cef1d71adf2
parent0b0ccbbfb014e1c9682b86a7a41ff2837b0b8047 (diff)
downloadvim-git-d6212b80d6d49d4d890c3141b7c6b83f899333b0.tar.gz
patch 9.0.0136: after CTRL-Left-mouse click a mouse scroll also has CTRLv9.0.0136
Problem: After CTRL-Left-mouse click a mouse scroll also has CTRL. Solution: Reset orig_mouse_code also for wheel events. (closes #10840)
-rw-r--r--src/mouse.c9
-rw-r--r--src/version.c2
2 files changed, 8 insertions, 3 deletions
diff --git a/src/mouse.c b/src/mouse.c
index e92a73c03..535e9a292 100644
--- a/src/mouse.c
+++ b/src/mouse.c
@@ -2403,7 +2403,7 @@ check_termcode_mouse(
// Apparently 0x23 and 0x24 are used by rxvt scroll wheel.
// And 0x40 and 0x41 are used by some xterm emulator.
wheel_code = mouse_code - (mouse_code >= 0x40 ? 0x40 : 0x23)
- + MOUSEWHEEL_LOW;
+ + MOUSEWHEEL_LOW;
}
# endif
@@ -2788,8 +2788,10 @@ check_termcode_mouse(
is_drag = TRUE;
current_button = held_button;
}
- else if (wheel_code == 0)
+ else
{
+ if (wheel_code == 0)
+ {
# ifdef CHECK_DOUBLE_CLICK
# ifdef FEAT_MOUSE_GPM
/*
@@ -2849,7 +2851,8 @@ check_termcode_mouse(
orig_num_clicks = NUM_MOUSE_CLICKS(mouse_code);
# endif
is_click = TRUE;
- orig_mouse_code = mouse_code;
+ }
+ orig_mouse_code = mouse_code;
}
if (!is_drag)
held_button = mouse_code & MOUSE_CLICK_MASK;
diff --git a/src/version.c b/src/version.c
index 33f61aadf..b44c2483e 100644
--- a/src/version.c
+++ b/src/version.c
@@ -736,6 +736,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 136,
+/**/
135,
/**/
134,