comparison src/os_unix.c @ 6039:182c7b987283 v7.4.359

updated for version 7.4.359 Problem: When 'ttymouse' is set to 'uxterm' the xterm version is not requested. (Tomas Janousek) Solution: Do not mark uxterm as a conflict mouse and add resume_get_esc_sequence().
author Bram Moolenaar <bram@vim.org>
date Wed, 09 Jul 2014 19:13:49 +0200
parents 06c10522d321
children 3d206df5c828
comparison
equal deleted inserted replaced
6038:d8d7de0a150b 6039:182c7b987283
3778 del_mouse_termcode(KS_PTERM_MOUSE); 3778 del_mouse_termcode(KS_PTERM_MOUSE);
3779 # endif 3779 # endif
3780 # ifdef FEAT_MOUSE_URXVT 3780 # ifdef FEAT_MOUSE_URXVT
3781 /* same as the dec mouse */ 3781 /* same as the dec mouse */
3782 if (use_xterm_mouse() == 3 3782 if (use_xterm_mouse() == 3
3783 # ifdef FEAT_TERMRESPONSE
3784 && !did_request_esc_sequence()
3785 # endif
3786 # ifdef FEAT_GUI 3783 # ifdef FEAT_GUI
3787 && !gui.in_use 3784 && !gui.in_use
3788 # endif 3785 # endif
3789 ) 3786 )
3790 { 3787 {
3795 if (*p_mouse != NUL) 3792 if (*p_mouse != NUL)
3796 { 3793 {
3797 mch_setmouse(FALSE); 3794 mch_setmouse(FALSE);
3798 setmouse(); 3795 setmouse();
3799 } 3796 }
3800 xterm_conflict_mouse = TRUE; 3797 /* It's OK to request the xterm version for uxterm. */
3798 resume_get_esc_sequence();
3801 } 3799 }
3802 else 3800 else
3803 del_mouse_termcode(KS_URXVT_MOUSE); 3801 del_mouse_termcode(KS_URXVT_MOUSE);
3804 # endif 3802 # endif
3805 # ifdef FEAT_MOUSE_SGR 3803 # ifdef FEAT_MOUSE_SGR