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

patch 8.0.1582: in the MS-Windows console mouse movement is not used

Browse Source 
Problem:    In the MS-Windows console mouse movement is not used.
Solution:   Pass mouse movement events when useful.
This commit is contained in:
Bram Moolenaar
2018-03-06 17:09:20 +01:00
parent 3b3a9a5609
commit 157d813be4
4 changed files with 28 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/feature.h
View File

@@ -1318,7 +1318,7 @@
/* /*
* +balloon_eval_term Allow balloon expression evaluation in the terminal. * +balloon_eval_term Allow balloon expression evaluation in the terminal.
*/ */
#if defined(FEAT_HUGE) && defined(UNIX) && defined(FEAT_TIMERS) #if defined(FEAT_HUGE) && (defined(UNIX) || defined(WIN32)) && defined(FEAT_TIMERS)
# define FEAT_BEVAL_TERM # define FEAT_BEVAL_TERM
#endif #endif

25
src/os_win32.c
View File

@@ -1164,6 +1164,18 @@ mch_setmouse(int on)
SetConsoleMode(g_hConIn, cmodein); SetConsoleMode(g_hConIn, cmodein);
} }
#if defined(FEAT_BEVAL_TERM) || defined(PROTO)
/*
* Called when 'balloonevalterm' changed.
*/
void
mch_bevalterm_changed(void)
{
mch_setmouse(g_fMouseActive);
}
#endif
/* /*
* Decode a MOUSE_EVENT. If it's a valid event, return MOUSE_LEFT, * Decode a MOUSE_EVENT. If it's a valid event, return MOUSE_LEFT,
* MOUSE_MIDDLE, or MOUSE_RIGHT for a click; MOUSE_DRAG for a mouse * MOUSE_MIDDLE, or MOUSE_RIGHT for a click; MOUSE_DRAG for a mouse
@@ -1243,7 +1255,7 @@ decode_mouse_event(
if (pmer->dwEventFlags == MOUSE_MOVED) if (pmer->dwEventFlags == MOUSE_MOVED)
{ {
/* ignore MOUSE_MOVED events if (x, y) hasn't changed. (We get these /* Ignore MOUSE_MOVED events if (x, y) hasn't changed. (We get these
* events even when the mouse moves only within a char cell.) */ * events even when the mouse moves only within a char cell.) */
if (s_xOldMouse == g_xMouse && s_yOldMouse == g_yMouse) if (s_xOldMouse == g_xMouse && s_yOldMouse == g_yMouse)
return FALSE; return FALSE;
@@ -1252,11 +1264,20 @@ decode_mouse_event(
/* If no buttons are pressed... */ /* If no buttons are pressed... */
if ((pmer->dwButtonState & ((1 << cButtons) - 1)) == 0) if ((pmer->dwButtonState & ((1 << cButtons) - 1)) == 0)
{ {
nButton = MOUSE_RELEASE;
/* If the last thing returned was MOUSE_RELEASE, ignore this */ /* If the last thing returned was MOUSE_RELEASE, ignore this */
if (s_fReleased) if (s_fReleased)
{
#ifdef FEAT_BEVAL_TERM
/* do return mouse move events when we want them */
if (p_bevalterm)
nButton = MOUSE_DRAG;
else
#endif
return FALSE; return FALSE;
}
nButton = MOUSE_RELEASE;
s_fReleased = TRUE; s_fReleased = TRUE;
} }
else /* one or more buttons pressed */ else /* one or more buttons pressed */

1
src/proto/os_win32.pro
View File

@@ -6,6 +6,7 @@ int dyn_libintl_init(void);
void dyn_libintl_end(void); void dyn_libintl_end(void);
void PlatformId(void); void PlatformId(void);
void mch_setmouse(int on); void mch_setmouse(int on);
void mch_bevalterm_changed(void);
void mch_update_cursor(void); void mch_update_cursor(void);
int mch_char_avail(void); int mch_char_avail(void);
int mch_check_messages(void); int mch_check_messages(void);

2
src/version.c
View File

@@ -766,6 +766,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 */
/**/
1582,
/**/ /**/
1581, 1581,
/**/ /**/