Avoid <SwipeLeft> etc. being inserted

Performing a gesture will not cause <SwipeLeft> etc. to be inserted into
the text while in insert mode/cmdline mode/etc.
This commit is contained in:
Bjorn Winckler
2010-09-02 18:54:52 +02:00
parent a5db9c5785
commit 65065e6c02
6 changed files with 65 additions and 2 deletions
+21 -1
View File
@@ -1123,6 +1123,19 @@ doESCkey:
case K_MOUSERIGHT: /* Scroll wheel right */
ins_mousescroll(MSCR_RIGHT);
break;
# ifdef FEAT_GUI_MACVIM
/* Gestures are ignored */
case K_SWIPELEFT:
case K_SWIPERIGHT:
case K_SWIPEUP:
case K_SWIPEDOWN:
case K_PINCHIN:
case K_PINCHOUT:
case K_ROTATECW:
case K_ROTATECCW:
break;
# endif
#endif
#ifdef FEAT_GUI_TABLINE
case K_TABLINE:
@@ -1134,6 +1147,7 @@ doESCkey:
case K_IGNORE: /* Something mapped to nothing */
break;
#ifdef FEAT_AUTOCMD
case K_CURSORHOLD: /* Didn't type something for a while. */
apply_autocmds(EVENT_CURSORHOLDI, NULL, NULL, FALSE, curbuf);
@@ -3509,7 +3523,13 @@ ins_compl_prep(c)
/* Ignore end of Select mode mapping and mouse scroll buttons. */
if (c == K_SELECT || c == K_MOUSEDOWN || c == K_MOUSEUP
|| c == K_MOUSELEFT || c == K_MOUSERIGHT)
|| c == K_MOUSELEFT || c == K_MOUSERIGHT
# ifdef FEAT_GUI_MACVIM
|| c == K_SWIPELEFT || c == K_SWIPERIGHT || c == K_SWIPEUP
|| c == K_SWIPEDOWN || c == K_PINCHIN || c == K_PINCHOUT
|| c == K_ROTATECW || c == K_ROTATECCW
# endif
)
return retval;
/* Set "compl_get_longest" when finding the first matches. */
+12 -1
View File
@@ -10951,7 +10951,18 @@ f_getchar(argvars, rettv)
|| n == K_MOUSELEFT
|| n == K_MOUSERIGHT
|| n == K_MOUSEDOWN
|| n == K_MOUSEUP)
|| n == K_MOUSEUP
# ifdef FEAT_GUI_MACVIM
|| n == K_SWIPELEFT
|| n == K_SWIPERIGHT
|| n == K_SWIPEUP
|| n == K_SWIPEDOWN
|| n == K_PINCHIN
|| n == K_PINCHOUT
|| n == K_ROTATECW
|| n == K_ROTATECCW
# endif
)
{
int row = mouse_row;
int col = mouse_col;
+12
View File
@@ -1340,6 +1340,18 @@ getcmdline(firstc, count, indent)
case K_X2RELEASE:
goto cmdline_not_changed;
# ifdef FEAT_GUI_MACVIM
/* Gestures are ignored */
case K_SWIPELEFT:
case K_SWIPERIGHT:
case K_SWIPEUP:
case K_SWIPEDOWN:
case K_PINCHIN:
case K_PINCHOUT:
case K_ROTATECW:
case K_ROTATECCW:
goto cmdline_not_changed;
# endif
#endif /* FEAT_MOUSE */
#ifdef FEAT_GUI
+6
View File
@@ -996,6 +996,12 @@ wait_return(redraw)
|| c == K_RIGHTMOUSE
|| c == K_X1MOUSE
|| c == K_X2MOUSE))
# ifdef FEAT_GUI_MACVIM
|| c == K_SWIPELEFT || c == K_SWIPERIGHT
|| c == K_SWIPEUP || c == K_SWIPEDOWN
|| c == K_PINCHIN || c == K_PINCHOUT
|| c == K_ROTATECW || c == K_ROTATECCW
# endif
#endif
);
ui_breakcheck();
+10
View File
@@ -3152,6 +3152,16 @@ get_keystroke()
|| n == K_VER_SCROLLBAR
|| n == K_HOR_SCROLLBAR
# endif
# ifdef FEAT_GUI_MACVIM
|| K_SWIPELEFT
|| K_SWIPERIGHT
|| K_SWIPEUP
|| K_SWIPEDOWN
|| K_PINCHIN
|| K_PINCHOUT
|| K_ROTATECW
|| K_ROTATECCW
# endif
#endif
)
{
+4
View File
@@ -3868,6 +3868,10 @@ add_to_showcmd(c)
K_MOUSEDOWN, K_MOUSEUP, K_MOUSELEFT, K_MOUSERIGHT,
K_X1MOUSE, K_X1DRAG, K_X1RELEASE, K_X2MOUSE, K_X2DRAG, K_X2RELEASE,
K_CURSORHOLD,
# ifdef FEAT_GUI_MACVIM
K_SWIPELEFT, K_SWIPERIGHT, K_SWIPEUP, K_SWIPEDOWN, K_PINCHIN,
K_PINCHOUT, K_ROTATECW, K_ROTATECCW,
# endif
0
};
#endif