diff --git a/src/edit.c b/src/edit.c index cb217fe284..eca29c23b6 100644 --- a/src/edit.c +++ b/src/edit.c @@ -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. */ diff --git a/src/eval.c b/src/eval.c index 767eb8d36b..bb279596b7 100644 --- a/src/eval.c +++ b/src/eval.c @@ -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; diff --git a/src/ex_getln.c b/src/ex_getln.c index 5260172836..7dcf0f8ca1 100644 --- a/src/ex_getln.c +++ b/src/ex_getln.c @@ -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 diff --git a/src/message.c b/src/message.c index c33b173b89..bd8568124a 100644 --- a/src/message.c +++ b/src/message.c @@ -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(); diff --git a/src/misc1.c b/src/misc1.c index b5517e5776..52023dba40 100644 --- a/src/misc1.c +++ b/src/misc1.c @@ -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 ) { diff --git a/src/normal.c b/src/normal.c index 2fc4609630..bb6a1fc52f 100644 --- a/src/normal.c +++ b/src/normal.c @@ -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