diff options
author | Michael Reed <m.reed@mykolab.com> | 2015-05-05 22:00:43 -0400 |
---|---|---|
committer | Michael Reed <m.reed@mykolab.com> | 2015-05-18 11:06:54 -0400 |
commit | c50c831b85c9ca44cbc2857beaf8978bdcf99a7d (patch) | |
tree | a83e81df0c2c6947bd2041ba861443534e3d0c22 | |
parent | 00cf632b2b0bfd5c3ced3ca15b34cae0b52cd06d (diff) | |
download | rneovim-c50c831b85c9ca44cbc2857beaf8978bdcf99a7d.tar.gz rneovim-c50c831b85c9ca44cbc2857beaf8978bdcf99a7d.tar.bz2 rneovim-c50c831b85c9ca44cbc2857beaf8978bdcf99a7d.zip |
Cleanup 'ttym[ouse]', FEAT_MOUSE, mouse_(dec|gpm|etc.)
Because of 3baba1e7bc6698e6bc9f1d37fce88b30d6274bc9, it's dead code.
Helped-by: Justin M. Keyes <justinkz@gmail.com>
-rw-r--r-- | config/config.h.in | 1 | ||||
-rw-r--r-- | runtime/doc/eval.txt | 7 | ||||
-rw-r--r-- | runtime/doc/options.txt | 71 | ||||
-rw-r--r-- | runtime/doc/os_unix.txt | 3 | ||||
-rw-r--r-- | runtime/doc/quickref.txt | 1 | ||||
-rw-r--r-- | runtime/doc/starting.txt | 8 | ||||
-rw-r--r-- | runtime/doc/term.txt | 19 | ||||
-rw-r--r-- | runtime/doc/todo.txt | 5 | ||||
-rw-r--r-- | runtime/doc/various.txt | 7 | ||||
-rw-r--r-- | runtime/doc/vim_diff.txt | 1 | ||||
-rw-r--r-- | runtime/optwin.vim | 2 | ||||
-rw-r--r-- | src/nvim/eval.c | 7 | ||||
-rw-r--r-- | src/nvim/keymap.c | 4 | ||||
-rw-r--r-- | src/nvim/keymap.h | 17 | ||||
-rw-r--r-- | src/nvim/option.c | 10 | ||||
-rw-r--r-- | src/nvim/option_defs.h | 14 |
16 files changed, 14 insertions, 163 deletions
diff --git a/config/config.h.in b/config/config.h.in index 0419451e26..d7f3913e27 100644 --- a/config/config.h.in +++ b/config/config.h.in @@ -65,7 +65,6 @@ #define FEAT_BROWSE #define FEAT_CSCOPE -#define FEAT_MOUSE #ifndef UNIT_TESTING #cmakedefine HAVE_JEMALLOC diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt index 5eb8f62d8b..4e825e123c 100644 --- a/runtime/doc/eval.txt +++ b/runtime/doc/eval.txt @@ -6771,13 +6771,6 @@ menu Compiled with support for |:menu|. mksession Compiled with support for |:mksession|. modify_fname Compiled with file name modifiers. |filename-modifiers| mouse Compiled with support mouse. -mouse_dec Compiled with support for Dec terminal mouse. -mouse_gpm Compiled with support for gpm (Linux console mouse) -mouse_netterm Compiled with support for netterm mouse. -mouse_sysmouse Compiled with support for sysmouse (*BSD console mouse) -mouse_sgr Compiled with support for sgr mouse. -mouse_urxvt Compiled with support for urxvt mouse. -mouse_xterm Compiled with support for xterm mouse. mouseshape Compiled with support for 'mouseshape'. multi_byte Compiled with support for 'encoding' multi_byte_encoding 'encoding' is set to a multi-byte encoding. diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt index ead5f7d50a..2727b8b5bc 100644 --- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -4552,10 +4552,10 @@ A jump table for the options with a short description can be found at |Q_op|. *'mouse'* *E538* 'mouse' string (default "", "a" for GUI, MS-DOS and Win32) global - Enable the use of the mouse. Only works for certain terminals - (xterm, Win32 |win32-mouse|, *BSD console with sysmouse and Linux - console with gpm). For using the mouse in the GUI, see |gui-mouse|. - The mouse can be enabled for different modes: + + Enable the use of the mouse. Only works for certain terminals. + For using the mouse in the GUI, see |gui-mouse|. The mouse can be + enabled for different modes: n Normal mode v Visual mode i Insert mode @@ -6777,67 +6777,8 @@ A jump table for the options with a short description can be found at |Q_op|. 'ttyfast' 'tf' Removed. |vim-differences| {Nvim} *'ttymouse'* *'ttym'* -'ttymouse' 'ttym' string (default depends on 'term') - global - {only in Unix, doesn't work in the GUI; not - available when compiled without |+mouse|} - Name of the terminal type for which mouse codes are to be recognized. - Currently these strings are valid: - *xterm-mouse* - xterm xterm-like mouse handling. The mouse generates - "<Esc>[Mscr", where "scr" is three bytes: - "s" = button state - "c" = column plus 33 - "r" = row plus 33 - This only works up to 223 columns! See "dec", - "urxvt", and "sgr" for solutions. - xterm2 Works like "xterm", but with the xterm reporting the - mouse position while the mouse is dragged. This works - much faster and more precise. Your xterm must at - least at patchlevel 88 / XFree 3.3.3 for this to - work. See below for how Vim detects this - automatically. - *netterm-mouse* - netterm NetTerm mouse handling. The mouse generates - "<Esc>}r,c<CR>", where "r,c" are two decimal numbers - for the row and column. - *dec-mouse* - dec DEC terminal mouse handling. The mouse generates a - rather complex sequence, starting with "<Esc>[". - This is also available for an Xterm, if it was - configured with "--enable-dec-locator". - *urxvt-mouse* - urxvt Mouse handling for the urxvt (rxvt-unicode) terminal. - The mouse works only if the terminal supports this - encoding style, but it does not have 223 columns limit - unlike "xterm" or "xterm2". - *sgr-mouse* - sgr Mouse handling for the terminal that emits SGR-styled - mouse reporting. The mouse works even in columns - beyond 223. This option is backward compatible with - "xterm2" because it can also decode "xterm2" style - mouse codes. - - The mouse handling must be enabled at compile time |+mouse_xterm| - |+mouse_dec| |+mouse_netterm| |+mouse_urxvt| |+mouse_sgr|. - Only "xterm"(2) is really recognized. NetTerm mouse codes are always - recognized, if enabled at compile time. DEC terminal mouse codes - are recognized if enabled at compile time, and 'ttymouse' is not - "xterm", "xterm2", "urxvt" or "sgr" (because dec mouse codes conflict - with them). - This option is automatically set to "xterm", when the 'term' option is - set to a name that starts with "xterm", "mlterm", or "screen", and - 'ttymouse' is not set already. - Additionally, if vim is compiled with the |+termresponse| feature and - |t_RV| is set to the escape sequence to request the xterm version - number, more intelligent detection process runs. - The "xterm2" value will be set if the xterm version is reported to be - from 95 to 276. The "sgr" value will be set if the xterm version is - 277 or highter. - If you do not want 'ttymouse' to be set to "xterm2" or "sgr" - automatically, set t_RV to an empty string: > - :set t_RV= -< +'ttymouse' 'ttym' Removed. |vim-differences| {Nvim} + *'ttyscroll'* *'tsl'* 'ttyscroll' 'tsl' number (default 999) global diff --git a/runtime/doc/os_unix.txt b/runtime/doc/os_unix.txt index 2955a532fe..604fa5827a 100644 --- a/runtime/doc/os_unix.txt +++ b/runtime/doc/os_unix.txt @@ -35,8 +35,7 @@ When using Vim in an xterm the mouse clicks can be used by Vim by setting 'mouse' to "a". If there is access to an X-server gui style copy/paste will be used and visual feedback will be provided while dragging with the mouse. If you then still want the xterm copy/paste with the mouse, press the shift -key when using the mouse. See |mouse-using|. Visual feedback while dragging -can also be achieved via the 'ttymouse' option if your xterm is new enough. +key when using the mouse. See |mouse-using|. *terminal-colors* To use colors in Vim you can use the following example (if your terminal diff --git a/runtime/doc/quickref.txt b/runtime/doc/quickref.txt index 5daeb15c00..cd9236138a 100644 --- a/runtime/doc/quickref.txt +++ b/runtime/doc/quickref.txt @@ -902,7 +902,6 @@ Short explanation of each option: *option-list* 'toolbariconsize' 'tbis' size of the toolbar icons (for GTK 2 only) 'ttimeout' time out on mappings 'ttimeoutlen' 'ttm' time out time for key codes in milliseconds -'ttymouse' 'ttym' type of mouse codes generated 'ttyscroll' 'tsl' maximum number of lines for a scroll 'ttytype' 'tty' alias for 'term' 'undodir' 'udir' where to store undo files diff --git a/runtime/doc/starting.txt b/runtime/doc/starting.txt index 017fba1824..dad4c9b78c 100644 --- a/runtime/doc/starting.txt +++ b/runtime/doc/starting.txt @@ -832,10 +832,10 @@ vimrc file. These commands will write ":map" and ":set" commands to a file, in such a way that when these commands are executed, the current key mappings and options will be set to the same values. The options 'columns', 'endofline', -'fileformat', 'lines', 'modified', 'scroll', 'term', and 'ttymouse' are not -included, because these are terminal or file dependent. Note that the options -'binary', 'paste' and 'readonly' are included, this might not always be what -you want. +'fileformat', 'lines', 'modified', 'scroll', and 'term' are not included, +because these are terminal or file dependent. +Note that the options 'binary', 'paste' and 'readonly' are included, this +might not always be what you want. When special keys are used in mappings, The 'cpoptions' option will be temporarily set to its Vim default, to avoid the mappings to be diff --git a/runtime/doc/term.txt b/runtime/doc/term.txt index e0e7f37948..3ec1b2f58d 100644 --- a/runtime/doc/term.txt +++ b/runtime/doc/term.txt @@ -243,7 +243,7 @@ Added by Vim (there are no standard codes for these): t_EI end insert mode (block cursor shape) *t_EI* *'t_EI'* |termcap-cursor-shape| t_RV request terminal version string (for xterm) *t_RV* *'t_RV'* - |xterm-8bit| |v:termresponse| |'ttymouse'| |xterm-codes| + |xterm-8bit| |v:termresponse| |xterm-codes| t_u7 request cursor position (for xterm) *t_u7* *'t_u7'* see |'ambiwidth'| @@ -533,11 +533,6 @@ Don't forget to enable the mouse with this command: > :set mouse=a Otherwise Vim won't recognize the mouse in all modes (See 'mouse'). -Currently the mouse is supported for Unix in an xterm window, in a *BSD -console with |sysmouse|, in a Linux console (with GPM |gpm-mouse|), for -MS-DOS and in a Windows console. -Mouse clicks can be used to position the cursor, select an area and paste. - These characters in the 'mouse' option tell in which situations the mouse will be used by Vim: n Normal mode @@ -600,7 +595,7 @@ When the X-server clipboard is available, the command server described in *xterm-copy-paste* NOTE: In some (older) xterms, it's not possible to move the cursor past column 95 or 223. This is an xterm problem, not Vim's. Get a newer xterm -|color-xterm|. Also see |'ttymouse'|. +|color-xterm|. Copy/paste in xterm with (current mode NOT included in 'mouse'): 1. Press left mouse button on first letter of text, move mouse pointer to last @@ -731,20 +726,10 @@ and then drag) will result in whole words to be selected. This continues until the button is released, at which point the selection is per character again. - *gpm-mouse* -The GPM mouse is only supported when the |+mouse_gpm| feature was enabled at -compile time. The GPM mouse driver (Linux console) does not support quadruple -clicks. - In Insert mode, when a selection is started, Vim goes into Normal mode temporarily. When Visual or Select mode ends, it returns to Insert mode. This is like using CTRL-O in Insert mode. Select mode is used when the 'selectmode' option contains "mouse". - *sysmouse* -The sysmouse is only supported when the |+mouse_sysmouse| feature was enabled -at compile time. The sysmouse driver (*BSD console) does not support keyboard -modifiers. - *drag-status-line* When working with several windows, the size of the windows can be changed by dragging the status line with the mouse. Point the mouse at a status line, diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt index 5078f5c7ce..849bf396c3 100644 --- a/runtime/doc/todo.txt +++ b/runtime/doc/todo.txt @@ -540,11 +540,6 @@ is confusing. Should say "the argument list is empty". xterm supports escape sequences to mark a paste operation. Need to be enabled. (Bruno Sutic, 2014 Jul 11) How to know the terminal supports this? -URXVT: -- will get stuck if byte sequence does not contain the expected semicolon. -- Use urxvt mouse support also in xterm. Explanations: - http://www.midnight-commander.org/ticket/2662 - Patch to have the fold and sign column and at the last line of the buffer. (Marco Hinz, 2014 Sep 25) Alternate suggestion: let all columns continue, also the number column. diff --git a/runtime/doc/various.txt b/runtime/doc/various.txt index 976a9f5e2b..ef5844b2d2 100644 --- a/runtime/doc/various.txt +++ b/runtime/doc/various.txt @@ -364,13 +364,6 @@ N *+mksession* |:mksession| N *+modify_fname* |filename-modifiers| N *+mouse* Mouse handling |mouse-using| N *+mouseshape* |'mouseshape'| -B *+mouse_dec* Unix only: Dec terminal mouse handling |dec-mouse| -N *+mouse_gpm* Unix only: Linux console mouse handling |gpm-mouse| -B *+mouse_netterm* Unix only: netterm mouse handling |netterm-mouse| -N *+mouse_sysmouse* Unix only: *BSD console mouse handling |sysmouse| -B *+mouse_sgr* Unix only: sgr mouse handling |sgr-mouse| -B *+mouse_urxvt* Unix only: urxvt mouse handling |urxvt-mouse| -N *+mouse_xterm* Unix only: xterm mouse handling |xterm-mouse| N *+multi_byte* 16 and 32 bit characters |multibyte| *+multi_byte_ime* Win32 input method for multibyte chars |multibyte-ime| N *+multi_lang* non-English language support |multi-lang| diff --git a/runtime/doc/vim_diff.txt b/runtime/doc/vim_diff.txt index 9247ebe983..3692bdc045 100644 --- a/runtime/doc/vim_diff.txt +++ b/runtime/doc/vim_diff.txt @@ -121,6 +121,7 @@ Other options: 'textauto' 'textmode' 'ttybuiltin' + 'ttymouse' Other commands: :fixdel diff --git a/runtime/optwin.vim b/runtime/optwin.vim index 986d445b30..a7e9b945f4 100644 --- a/runtime/optwin.vim +++ b/runtime/optwin.vim @@ -560,8 +560,6 @@ call append("$", "\tmouse button is used for") call <SID>OptionG("mousem", &mousem) call append("$", "mousetime\tmaximum time in msec to recognize a double-click") call append("$", " \tset mouset=" . &mouset) -call append("$", "ttymouse\t\"xterm\", \"xterm2\", \"dec\" or \"netterm\"; type of mouse") -call <SID>OptionG("ttym", &ttym) if has("mouseshape") call append("$", "mouseshape\twhat the mouse pointer looks like in different modes") call <SID>OptionG("mouses", &mouses) diff --git a/src/nvim/eval.c b/src/nvim/eval.c index d309b908f1..e7cb830e67 100644 --- a/src/nvim/eval.c +++ b/src/nvim/eval.c @@ -9965,13 +9965,6 @@ static void f_has(typval_T *argvars, typval_T *rettv) "mksession", "modify_fname", "mouse", -#if defined(UNIX) - "mouse_dec", - "mouse_netterm", - "mouse_sgr", - "mouse_urxvt", - "mouse_xterm", -#endif "multi_byte", "multi_lang", "path_extra", diff --git a/src/nvim/keymap.c b/src/nvim/keymap.c index 8def1bb2ad..0c5c24184e 100644 --- a/src/nvim/keymap.c +++ b/src/nvim/keymap.c @@ -256,10 +256,6 @@ static struct key_name_entry { {'<', (char_u *)"lt"}, {K_MOUSE, (char_u *)"Mouse"}, - {K_NETTERM_MOUSE, (char_u *)"NetMouse"}, - {K_DEC_MOUSE, (char_u *)"DecMouse"}, - {K_URXVT_MOUSE, (char_u *)"UrxvtMouse"}, - {K_SGR_MOUSE, (char_u *)"SgrMouse"}, {K_LEFTMOUSE, (char_u *)"LeftMouse"}, {K_LEFTMOUSE_NM, (char_u *)"LeftMouseNM"}, {K_LEFTDRAG, (char_u *)"LeftDrag"}, diff --git a/src/nvim/keymap.h b/src/nvim/keymap.h index e6fcb4d1d2..022d27fda1 100644 --- a/src/nvim/keymap.h +++ b/src/nvim/keymap.h @@ -78,12 +78,6 @@ #define KS_HOR_SCROLLBAR 248 /* - * These are used for DEC mouse - */ -#define KS_NETTERM_MOUSE 247 -#define KS_DEC_MOUSE 246 - -/* * Used for switching Select mode back on after a mapping or menu. */ #define KS_SELECT 245 @@ -103,12 +97,6 @@ /* Used for menu in a tab pages line. */ #define KS_TABMENU 239 -/* Used for the urxvt mouse. */ -#define KS_URXVT_MOUSE 238 - -/* Used for the sgr mouse. */ -#define KS_SGR_MOUSE 237 - /* * Filler used after KS_SPECIAL and others */ @@ -407,11 +395,6 @@ enum key_extra { #define K_VER_SCROLLBAR TERMCAP2KEY(KS_VER_SCROLLBAR, KE_FILLER) #define K_HOR_SCROLLBAR TERMCAP2KEY(KS_HOR_SCROLLBAR, KE_FILLER) -#define K_NETTERM_MOUSE TERMCAP2KEY(KS_NETTERM_MOUSE, KE_FILLER) -#define K_DEC_MOUSE TERMCAP2KEY(KS_DEC_MOUSE, KE_FILLER) -#define K_URXVT_MOUSE TERMCAP2KEY(KS_URXVT_MOUSE, KE_FILLER) -#define K_SGR_MOUSE TERMCAP2KEY(KS_SGR_MOUSE, KE_FILLER) - #define K_SELECT TERMCAP2KEY(KS_SELECT, KE_FILLER) #define K_TEAROFF TERMCAP2KEY(KS_TEAROFF, KE_FILLER) diff --git a/src/nvim/option.c b/src/nvim/option.c index 9357bb1947..bb6acc79dc 100644 --- a/src/nvim/option.c +++ b/src/nvim/option.c @@ -1545,13 +1545,6 @@ static vimoption_T {"ttyfast", "tf", P_BOOL|P_NO_MKRC|P_VI_DEF, (char_u *)&p_force_on, PV_NONE, {(char_u *)TRUE, (char_u *)0L} SCRIPTID_INIT}, - {"ttymouse", "ttym", P_STRING|P_NODEFAULT|P_NO_MKRC|P_VI_DEF, -#if defined(FEAT_MOUSE) && defined(UNIX) - (char_u *)&p_ttym, PV_NONE, -#else - (char_u *)NULL, PV_NONE, -#endif - {(char_u *)"", (char_u *)0L} SCRIPTID_INIT}, {"undodir", "udir", P_STRING|P_EXPAND|P_COMMA|P_NODUP|P_SECURE|P_VI_DEF, (char_u *)&p_udir, PV_NONE, {(char_u *)".", (char_u *)0L} @@ -3245,9 +3238,6 @@ static void didset_options(void) (void)opt_strings_flags(p_fdo, p_fdo_values, &fdo_flags, TRUE); (void)opt_strings_flags(p_dy, p_dy_values, &dy_flags, TRUE); (void)opt_strings_flags(p_ve, p_ve_values, &ve_flags, TRUE); -#if defined(FEAT_MOUSE) && defined(UNIX) - (void)opt_strings_flags(p_ttym, p_ttym_values, &ttym_flags, FALSE); -#endif (void)spell_check_msm(); (void)spell_check_sps(); (void)compile_cap_prog(curwin->w_s); diff --git a/src/nvim/option_defs.h b/src/nvim/option_defs.h index 96824fdccf..8776597cbb 100644 --- a/src/nvim/option_defs.h +++ b/src/nvim/option_defs.h @@ -565,20 +565,6 @@ EXTERN char_u *p_tsr; /* 'thesaurus' */ EXTERN int p_ttimeout; /* 'ttimeout' */ EXTERN long p_ttm; /* 'ttimeoutlen' */ EXTERN long p_ttyscroll; /* 'ttyscroll' */ -#if defined(FEAT_MOUSE) && defined(UNIX) -EXTERN char_u *p_ttym; /* 'ttymouse' */ -EXTERN unsigned ttym_flags; -# ifdef IN_OPTION_C -static char *(p_ttym_values[]) = -{"xterm", "xterm2", "dec", "netterm", "urxvt", "sgr", NULL}; -# endif -# define TTYM_XTERM 0x01 -# define TTYM_XTERM2 0x02 -# define TTYM_DEC 0x04 -# define TTYM_NETTERM 0x08 -# define TTYM_URXVT 0x20 -# define TTYM_SGR 0x40 -#endif EXTERN char_u *p_udir; /* 'undodir' */ EXTERN long p_ul; /* 'undolevels' */ EXTERN long p_ur; /* 'undoreload' */ |