Mercurial > vim
changeset 12761:2c502179c75d v8.0.1258
patch 8.0.1258: 'ttymouse' is set to "sgr" even though it's not supported
commit https://github.com/vim/vim/commit/52a2f0f1da4e554a81beb45211a9d09afffde595
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Nov 4 15:16:56 2017 +0100
patch 8.0.1258: 'ttymouse' is set to "sgr" even though it's not supported
Problem: 'ttymouse' is set to "sgr" even though it's not supported. (Gary
Johnson)
Solution: Adjust #ifdef
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Sat, 04 Nov 2017 15:30:05 +0100 |
parents | 12964eaed961 |
children | 50fd18c60c3d |
files | src/term.c src/version.c |
diffstat | 2 files changed, 24 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- a/src/term.c +++ b/src/term.c @@ -4547,22 +4547,6 @@ check_termcode( { int need_flush = FALSE; - /* Only set 'ttymouse' automatically if it was not set - * by the user already. */ - if (!option_was_set((char_u *)"ttym")) - { -# ifdef TTYM_SGR - if (version >= 277) - set_option_value((char_u *)"ttym", 0L, - (char_u *)"sgr", 0); - else -# endif - /* if xterm version >= 95 use mouse dragging */ - if (version >= 95) - set_option_value((char_u *)"ttym", 0L, - (char_u *)"xterm2", 0); - } - /* if xterm version >= 141 try to get termcap codes */ if (version >= 141) { @@ -4581,6 +4565,28 @@ check_termcode( * 256, libvterm supports even more. */ if (mch_getenv((char_u *)"COLORS") == NULL) may_adjust_color_count(256); +# ifdef FEAT_MOUSE_SGR + /* Libvterm can handle SGR mouse reporting. */ + if (!option_was_set((char_u *)"ttym")) + set_option_value((char_u *)"ttym", 0L, + (char_u *)"sgr", 0); +# endif + } + + /* Only set 'ttymouse' automatically if it was not set + * by the user already. */ + if (!option_was_set((char_u *)"ttym")) + { +# ifdef FEAT_MOUSE_SGR + if (version >= 277) + set_option_value((char_u *)"ttym", 0L, + (char_u *)"sgr", 0); + else +# endif + /* if xterm version >= 95 use mouse dragging */ + if (version >= 95) + set_option_value((char_u *)"ttym", 0L, + (char_u *)"xterm2", 0); } /* Detect terminals that set $TERM to something like