aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsach1t <sach0010t@gmail.com>2016-07-09 13:32:21 -0400
committersach1t <sach0010t@gmail.com>2016-08-07 13:21:03 -0400
commit563628e617e803b6298d881e052b2e478d4dd2b2 (patch)
tree73f95aa45f159d7b8952dba0ec9499beb6232c1b
parent64013a5debe7ae92c8044dfd18faf8f8385dd66d (diff)
downloadrneovim-563628e617e803b6298d881e052b2e478d4dd2b2.tar.gz
rneovim-563628e617e803b6298d881e052b2e478d4dd2b2.tar.bz2
rneovim-563628e617e803b6298d881e052b2e478d4dd2b2.zip
input.c: restore double click
-rw-r--r--src/nvim/os/input.c47
1 files changed, 25 insertions, 22 deletions
diff --git a/src/nvim/os/input.c b/src/nvim/os/input.c
index 0c46dc96ee..3eace361c1 100644
--- a/src/nvim/os/input.c
+++ b/src/nvim/os/input.c
@@ -266,29 +266,32 @@ static unsigned int handle_mouse_event(char **ptr, uint8_t *buf,
}
static int orig_num_clicks = 0;
- static int orig_mouse_code = 0;
- static int orig_mouse_col = 0;
- static int orig_mouse_row = 0;
- static uint64_t orig_mouse_time = 0; // time of previous mouse click
- uint64_t mouse_time = os_hrtime(); // time of current mouse click
-
- // compute the time elapsed since the previous mouse click and
- // convert p_mouse from ms to ns
- uint64_t timediff = mouse_time - orig_mouse_time;
- uint64_t mouset = (uint64_t)p_mouset * 1000000;
- if (mouse_code == orig_mouse_code
- && timediff < mouset
- && orig_num_clicks != 4
- && orig_mouse_col == mouse_col
- && orig_mouse_row == mouse_row) {
- orig_num_clicks++;
- } else {
- orig_num_clicks = 1;
+ if (mouse_code != KE_LEFTRELEASE && mouse_code != KE_RIGHTRELEASE
+ && mouse_code != KE_MIDDLERELEASE) {
+ static int orig_mouse_code = 0;
+ static int orig_mouse_col = 0;
+ static int orig_mouse_row = 0;
+ static uint64_t orig_mouse_time = 0; // time of previous mouse click
+ uint64_t mouse_time = os_hrtime(); // time of current mouse click - nanosec
+
+ // compute the time elapsed since the previous mouse click and
+ // convert p_mouse from ms to ns
+ uint64_t timediff = mouse_time - orig_mouse_time;
+ uint64_t mouset = (uint64_t)p_mouset * 1000000;
+ if (mouse_code == orig_mouse_code
+ && timediff < mouset
+ && orig_num_clicks != 4
+ && orig_mouse_col == mouse_col
+ && orig_mouse_row == mouse_row) {
+ orig_num_clicks++;
+ } else {
+ orig_num_clicks = 1;
+ }
+ orig_mouse_code = mouse_code;
+ orig_mouse_col = mouse_col;
+ orig_mouse_row = mouse_row;
+ orig_mouse_time = mouse_time;
}
- orig_mouse_code = mouse_code;
- orig_mouse_col = mouse_col;
- orig_mouse_row = mouse_row;
- orig_mouse_time = mouse_time;
uint8_t modifiers = 0;
if (orig_num_clicks == 2) {