mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-24 03:58:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13592 from bfredl/setmouse

Browse Source 
ui: make 'mouse' handling in external UI more consistent
This commit is contained in:
Björn Linse
2021-01-01 20:04:09 +01:00
committed by GitHub
parent f3a8c930a4 6db86cb2d3
commit 90f619f140
10 changed files with 106 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/nvim/normal.c
View File

@@ -2375,10 +2375,10 @@ do_mouse (
* Also paste at the cursor if the current mode isn't in 'mouse' (only
* happens for the GUI).
*/
if ((State & INSERT) || !mouse_has(MOUSE_NORMAL)) {
if (regname == '.')
if ((State & INSERT)) {
if (regname == '.') {
insert_reg(regname, true);
else {
} else {
if (regname == 0 && eval_has_provider("clipboard")) {
regname = '*';
}
@@ -2558,8 +2558,9 @@ do_mouse (
* on a status line */
if (VIsual_active)
jump_flags |= MOUSE_MAY_STOP_VIS;
} else if (mouse_has(MOUSE_VISUAL))
} else {
jump_flags |= MOUSE_MAY_VIS;
}
} else if (which_button == MOUSE_RIGHT) {
if (is_click && VIsual_active) {
/*
@@ -2575,8 +2576,7 @@ do_mouse (
}
}
jump_flags |= MOUSE_FOCUS;
if (mouse_has(MOUSE_VISUAL))
jump_flags |= MOUSE_MAY_VIS;
jump_flags |= MOUSE_MAY_VIS;
}
}
@@ -2790,8 +2790,7 @@ do_mouse (
/* Handle double clicks, unless on status line */
else if (in_status_line) {
} else if (in_sep_line) {
} else if ((mod_mask & MOD_MASK_MULTI_CLICK) && (State & (NORMAL | INSERT))
&& mouse_has(MOUSE_VISUAL)) {
} else if ((mod_mask & MOD_MASK_MULTI_CLICK) && (State & (NORMAL | INSERT))) {
if (is_click || !VIsual_active) {
if (VIsual_active) {
orig_cursor = VIsual;