diff options
Diffstat (limited to 'src')
-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 |
5 files changed, 0 insertions, 52 deletions
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' */ |