diff options
| author | Christopher Plewright <chris@createng.com> | 2022-10-21 13:03:33 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2022-10-21 13:03:33 +0100 |
| commit | 7fa02bcb3b8011961995e617423a6f8f531b6e4d (patch) | |
| tree | 4584c9030b3d894e6dc2de57336029b2976c05e9 /src | |
| parent | 2435adf8eb13736e2b3d012bb70df9ef960ffd60 (diff) | |
| download | vim-git-7fa02bcb3b8011961995e617423a6f8f531b6e4d.tar.gz | |
patch 9.0.0812: GUI mouse scrollwheel mappings don't workv9.0.0812
Problem: GUI mouse scrollwheel mappings don't work.
Solution: Add check for "gui.in_use". (Christopher Plewright, closes #11418)
Diffstat (limited to 'src')
| -rw-r--r-- | src/getchar.c | 5 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/getchar.c b/src/getchar.c index da8132cbf..5d0c99438 100644 --- a/src/getchar.c +++ b/src/getchar.c @@ -2529,6 +2529,9 @@ handle_mapping( && (typebuf.tb_buf[typebuf.tb_off + 1] == KS_MODIFIER # if defined(MSWIN) || (typebuf.tb_len >= 3 +# ifdef FEAT_GUI + && !gui.in_use +# endif && typebuf.tb_buf[typebuf.tb_off + 1] == KS_EXTRA && (typebuf.tb_buf[typebuf.tb_off + 2] == KE_MOUSEUP || typebuf.tb_buf[typebuf.tb_off + 2] == KE_MOUSEDOWN @@ -2542,7 +2545,7 @@ handle_mapping( // The GUI code sends CSI KS_MODIFIER {flags}, but mappings expect // K_SPECIAL KS_MODIFIER {flags}. // MS-Windows sends mouse scroll events CSI KS_EXTRA {what}, but - // mappings expect K_SPECIAL KS_EXTRA {what}. + // non-GUI mappings expect K_SPECIAL KS_EXTRA {what}. tb_c1 = K_SPECIAL; } #endif diff --git a/src/version.c b/src/version.c index 662835ebf..f8f0c95ac 100644 --- a/src/version.c +++ b/src/version.c @@ -696,6 +696,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 812, +/**/ 811, /**/ 810, |