aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-26 04:04:07 -04:00
Code Activity

patch 9.0.0802: MS-Windows: cannot map console mouse scroll events

Browse Source 
Problem:    MS-Windows: cannot map console mouse scroll events.
Solution:   Change CSI to K_SPECIAL when checking for a mapping. (Christopher
            Plewright, closes #11410)
This commit is contained in:
Christopher Plewright
2022-10-20 13:11:15 +01:00
committed by Bram Moolenaar
parent 7609c88eed
commit 4c36678ffd
3 changed files with 25 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/getchar.c
View File

@@ -2520,12 +2520,29 @@ handle_mapping(
&& State != MODE_CONFIRM && State != MODE_CONFIRM
&& !at_ins_compl_key()) && !at_ins_compl_key())
{ {
#ifdef FEAT_GUI #if defined(FEAT_GUI) || defined(MSWIN)
if (gui.in_use && tb_c1 == CSI && typebuf.tb_len >= 2 if (tb_c1 == CSI
&& typebuf.tb_buf[typebuf.tb_off + 1] == KS_MODIFIER) # if !defined(MSWIN)
&& gui.in_use
# endif
&& typebuf.tb_len >= 2
&& (typebuf.tb_buf[typebuf.tb_off + 1] == KS_MODIFIER
# if defined(MSWIN)
|| (typebuf.tb_len >= 3
&& 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
|| typebuf.tb_buf[typebuf.tb_off + 2] == KE_MOUSELEFT
|| typebuf.tb_buf[typebuf.tb_off + 2] == KE_MOUSERIGHT)
)
# endif
)
)
{ {
// The GUI code sends CSI KS_MODIFIER {flags}, but mappings expect // The GUI code sends CSI KS_MODIFIER {flags}, but mappings expect
// K_SPECIAL KS_MODIFIER {flags}. // K_SPECIAL KS_MODIFIER {flags}.
// MS-Windows sends mouse scroll events CSI KS_EXTRA {what}, but
// mappings expect K_SPECIAL KS_EXTRA {what}.
tb_c1 = K_SPECIAL; tb_c1 = K_SPECIAL;
} }
#endif #endif
@@ -2568,7 +2585,8 @@ handle_mapping(
&& (mp->m_mode & local_State) && (mp->m_mode & local_State)
&& !(mp->m_simplified && seenModifyOtherKeys && !(mp->m_simplified && seenModifyOtherKeys
&& typebuf.tb_maplen == 0) && typebuf.tb_maplen == 0)
&& ((mp->m_mode & MODE_LANGMAP) == 0 || typebuf.tb_maplen == 0)) && ((mp->m_mode & MODE_LANGMAP) == 0
|| typebuf.tb_maplen == 0))
{ {
#ifdef FEAT_LANGMAP #ifdef FEAT_LANGMAP
int nomap = nolmaplen; int nomap = nolmaplen;

2
src/os_win32.c
View File

@@ -1265,7 +1265,7 @@ decode_mouse_wheel(MOUSE_EVENT_RECORD *pmer)
#ifdef FEAT_PROP_POPUP #ifdef FEAT_PROP_POPUP
int lcol = g_xMouse; int lcol = g_xMouse;
int lrow = g_yMouse; int lrow = g_yMouse;
wp = mouse_find_win(&lrow, &lcol, FAIL_POPUP); wp = mouse_find_win(&lrow, &lcol, FIND_POPUP);
if (wp != NULL && popup_is_popup(wp)) if (wp != NULL && popup_is_popup(wp))
{ {
g_nMouseClick = -1; g_nMouseClick = -1;

2
src/version.c
View File

@@ -695,6 +695,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
802,
/**/ /**/
801, 801,
/**/ /**/