Compare commits

...

2 Commits

Author SHA1 Message Date
Bram Moolenaar
bb160a188a patch 8.0.1324: some xterm sends different mouse move codes
Problem:    Some xterm sends different mouse move codes.
Solution:   Also accept 0x80 as a move event.
2017-11-20 21:52:24 +01:00
Bram Moolenaar
73675fbc48 patch 8.0.1323: mouse events in a terminal window may cause endless loop
Problem:    Mouse events in a terminal window may cause endless loop.
Solution:   Adjust position computation.  Don't stuff a mouse event when
            coming from normal_cmd().
2017-11-20 21:49:19 +01:00
4 changed files with 20 additions and 6 deletions

View File

@@ -4633,7 +4633,9 @@ nv_mousescroll(cmdarg_T *cap)
{ {
# ifdef FEAT_TERMINAL # ifdef FEAT_TERMINAL
if (term_use_loop()) if (term_use_loop())
send_keys_to_term(curbuf->b_term, cap->cmdchar, TRUE); /* This window is a terminal window, send the mouse event there.
* Set "typed" to FALSE to avoid an endless loop. */
send_keys_to_term(curbuf->b_term, cap->cmdchar, FALSE);
else else
# endif # endif
if (mod_mask & (MOD_MASK_SHIFT | MOD_MASK_CTRL)) if (mod_mask & (MOD_MASK_SHIFT | MOD_MASK_CTRL))

View File

@@ -4980,6 +4980,8 @@ check_termcode(
* add 0x08 for ALT * add 0x08 for ALT
* add 0x10 for CTRL * add 0x10 for CTRL
* add 0x20 for mouse drag (0x40 is drag with left button) * add 0x20 for mouse drag (0x40 is drag with left button)
* add 0x40 for mouse move (0x80 is move, 0x81 too)
* 0x43 (drag + release) is also move
* c == column + ' ' + 1 == column + 33 * c == column + ' ' + 1 == column + 33
* r == row + ' ' + 1 == row + 33 * r == row + ' ' + 1 == row + 33
* *
@@ -5121,9 +5123,15 @@ check_termcode(
# endif # endif
) )
{ {
/* Keep the mouse_code before it's changed, so that we # if defined(UNIX) && defined(FEAT_MOUSE_TTY)
* remember that it was a mouse wheel click. */ if (use_xterm_mouse() > 1 && mouse_code >= 0x80)
wheel_code = mouse_code; /* mouse-move event, using MOUSE_DRAG works */
mouse_code = MOUSE_DRAG;
else
# endif
/* Keep the mouse_code before it's changed, so that we
* remember that it was a mouse wheel click. */
wheel_code = mouse_code;
} }
# ifdef FEAT_MOUSE_XTERM # ifdef FEAT_MOUSE_XTERM
else if (held_button == MOUSE_RELEASE else if (held_button == MOUSE_RELEASE

View File

@@ -1302,9 +1302,9 @@ send_keys_to_term(term_T *term, int c, int typed)
case K_MOUSELEFT: case K_MOUSELEFT:
case K_MOUSERIGHT: case K_MOUSERIGHT:
if (mouse_row < W_WINROW(curwin) if (mouse_row < W_WINROW(curwin)
|| mouse_row >= (W_WINROW(curwin) + curwin->w_height) || mouse_row > (W_WINROW(curwin) + curwin->w_height)
|| mouse_col < curwin->w_wincol || mouse_col < curwin->w_wincol
|| mouse_col >= W_ENDCOL(curwin) || mouse_col > W_ENDCOL(curwin)
|| dragging_outside) || dragging_outside)
{ {
/* click or scroll outside the current window */ /* click or scroll outside the current window */

View File

@@ -771,6 +771,10 @@ 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 */
/**/
1324,
/**/
1323,
/**/ /**/
1322, 1322,
/**/ /**/