Mercurial > vim
changeset 30918:6a2a38b26caf v9.0.0793
patch 9.0.0793: MS-Windows: mouse scroll events only work with the dll
Commit: https://github.com/vim/vim/commit/605d02a9b73cb49ac5022a127db3eac7e16a5d83
Author: Christopher Plewright <chris@createng.com>
Date: Wed Oct 19 11:54:46 2022 +0100
patch 9.0.0793: MS-Windows: mouse scroll events only work with the dll
Problem: MS-Windows: mouse scroll events only work with the dll.
Solution: Accept CSI codes for MS-Windows without the GUI. (Christopher
Plewright, closes #11401)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Wed, 19 Oct 2022 13:00:10 +0200 |
| parents | 5e178844c9c3 |
| children | c26edfb0de48 |
| files | src/getchar.c src/os_win32.c src/version.c |
| diffstat | 3 files changed, 13 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/src/getchar.c +++ b/src/getchar.c @@ -1745,8 +1745,10 @@ vgetc(void) // Get two extra bytes for special keys if (c == K_SPECIAL -#ifdef FEAT_GUI - || (c == CSI) +#if defined(FEAT_GUI) || defined(MSWIN) + // GUI codes start with CSI; MS-Windows sends mouse scroll + // events with CSI. + || c == CSI #endif ) {
--- a/src/os_win32.c +++ b/src/os_win32.c @@ -1231,7 +1231,6 @@ mch_bevalterm_changed(void) } # endif -#ifdef VIMDLL /* * Win32 console mouse scroll event handler. * Loosely based on the _OnMouseWheel() function in gui_w32.c @@ -1264,10 +1263,8 @@ decode_mouse_wheel(MOUSE_EVENT_RECORD *p g_yMouse = pmer->dwMousePosition.Y; #ifdef FEAT_PROP_POPUP - int lcol; - int lrow; - lcol = g_xMouse; - lrow = g_yMouse; + int lcol = g_xMouse; + int lrow = g_yMouse; wp = mouse_find_win(&lrow, &lcol, FAIL_POPUP); if (wp != NULL && popup_is_popup(wp)) { @@ -1312,9 +1309,9 @@ decode_mouse_wheel(MOUSE_EVENT_RECORD *p // Decode the win32 console key modifers into Vim mouse modifers. if (pmer->dwControlKeyState & SHIFT_PRESSED) - modifiers |= MOD_MASK_SHIFT; //MOUSE_SHIFT; + modifiers |= MOD_MASK_SHIFT; // MOUSE_SHIFT; if (pmer->dwControlKeyState & (RIGHT_CTRL_PRESSED | LEFT_CTRL_PRESSED)) - modifiers |= MOD_MASK_CTRL; //MOUSE_CTRL; + modifiers |= MOD_MASK_CTRL; // MOUSE_CTRL; if (pmer->dwControlKeyState & (RIGHT_ALT_PRESSED | LEFT_ALT_PRESSED)) modifiers |= MOD_MASK_ALT; // MOUSE_ALT; @@ -1324,7 +1321,6 @@ decode_mouse_wheel(MOUSE_EVENT_RECORD *p return; } -#endif /* * Decode a MOUSE_EVENT. If it's a valid event, return MOUSE_LEFT, @@ -1395,17 +1391,17 @@ decode_mouse_event( return FALSE; } - // unprocessed mouse click? + // If there is an unprocessed mouse click drop this one. if (g_nMouseClick != -1) return TRUE; -#ifdef VIMDLL + if (pmer->dwEventFlags == MOUSE_WHEELED || pmer->dwEventFlags == MOUSE_HWHEELED) { decode_mouse_wheel(pmer); return TRUE; // we now should have a mouse scroll in g_nMouseClick } -#endif + nButton = -1; g_xMouse = pmer->dwMousePosition.X; g_yMouse = pmer->dwMousePosition.Y;