forked from aniani/vim
patch 7.4.1433
Problem: The Sniff interface is no longer useful, the tool has not been
available for may years.
Solution: Delete the Sniff interface and related code.
This commit is contained in:
Bram Moolenaar
parent
4d1961783f
commit
85b11769ab
@ -1,95 +1,11 @@
|
||||
*if_sniff.txt* For Vim version 7.4. Last change: 2005 Mar 29
|
||||
*if_sniff.txt* For Vim version 7.4. Last change: 2016 Feb 27
|
||||
|
||||
|
||||
VIM REFERENCE MANUAL
|
||||
by Anton Leherbauer (toni@takefive.co.at)
|
||||
|
||||
|
||||
SNiFF+ and Vim *sniff*
|
||||
|
||||
1. Introduction |sniff-intro|
|
||||
2. Commands |sniff-commands|
|
||||
3. Compiling Vim with SNiFF+ interface |sniff-compiling|
|
||||
|
||||
{Vi does not have any of these commands} *E275* *E274* *E276* *E278* *E279*
|
||||
|
||||
The SNiFF+ interface only works, when Vim was compiled with the |+sniff|
|
||||
feature.
|
||||
|
||||
==============================================================================
|
||||
1. Introduction *sniff-intro*
|
||||
|
||||
The following features for the use with SNiFF+ are available:
|
||||
|
||||
* Vim can be used for all editing requests
|
||||
* SNiFF+ recognizes and updates all browsers when a file is saved in Vim
|
||||
* SNiFF+ commands can be issued directly from Vim
|
||||
|
||||
How to use Vim with SNiFF+
|
||||
1. Make sure SNiFF+ is running.
|
||||
2. In the Editor view of the Preferences dialog set the Field named
|
||||
'External Editor' to 'Emacs/Vim'.
|
||||
4. Start Vim
|
||||
5. Connect to SNiFF+ (:sniff connect)
|
||||
|
||||
Once a connection is established, SNiFF+ uses Vim for all requests to show or
|
||||
edit source code. On the other hand, you can send queries to SNiFF+ with the
|
||||
:sniff command.
|
||||
|
||||
==============================================================================
|
||||
2. Commands *sniff-commands*
|
||||
|
||||
*:sniff* *:sni*
|
||||
:sni[ff] request [symbol] Send request to sniff with optional symbol.
|
||||
{not in Vi}
|
||||
:sni[ff] Display all possible requests and the connection
|
||||
status
|
||||
|
||||
Most requests require a symbol (identifier) as parameter. If it is omitted,
|
||||
Vim will use the current word under the cursor.
|
||||
The available requests are listed below:
|
||||
|
||||
request mapping description
|
||||
-------------------------------------------------------------------------------
|
||||
connect sc Establish connection with SNiFF+.
|
||||
Make sure SNiFF+ is prepared for this in the
|
||||
Preferences
|
||||
disconnect sq Disconnect from SNiFF+. You can reconnect any
|
||||
time with :sniff connect (or 'sc')
|
||||
toggle st Toggle between implementation
|
||||
and definition file
|
||||
find-symbol sf Load the symbol into a Symbol Browser
|
||||
browse-class sb Loads the class into a Class Browser
|
||||
superclass ss Edit superclass of symbol
|
||||
overridden so Edit overridden method of symbol
|
||||
retrieve-file srf Retrieve symbol in current file
|
||||
retrieve-project srp Retrieve symbol in current project
|
||||
retrieve-all-projects srP Retrieve symbol in all projects
|
||||
retrieve-next sR Retrieve symbol using current Retriever
|
||||
settings
|
||||
goto-symbol sg Goto definition or implementation of symbol
|
||||
hierarchy sh Load symbol into the Hierarchy Browser
|
||||
restr-hier sH same as above but show only related classes
|
||||
xref-to sxt Start a refers-to query on symbol and
|
||||
load the results into the Cross Referencer
|
||||
xref-by sxb Start a referred-by query on symbol
|
||||
xref-has sxh Start a refers-to components query on symbol
|
||||
xref-used-by sxu Start a referred-by as component query on
|
||||
symbol
|
||||
show-docu sd Show documentation of symbol
|
||||
gen-docu sD Generate documentation of symbol
|
||||
|
||||
The mappings are defined in a file 'sniff.vim', which is part of every SNiFF+
|
||||
product ($SNIFF_DIR/config/sniff.vim). This file is sourced whenever Vim
|
||||
connects to SNiFF+.
|
||||
|
||||
==============================================================================
|
||||
3. Compiling Vim with SNiFF+ interface *sniff-compiling*
|
||||
|
||||
To compile Vim with SNiFF+ support, you need two source files of the extra
|
||||
archive: if_sniff.c and if_sniff.h.
|
||||
On Unix: Edit the Makefile and uncomment the line "--enable-sniff". Or run
|
||||
configure manually with this argument.
|
||||
On NT: Specify SNIFF=yes with your make command.
|
||||
The SNiFF+ support was removed at patch 7.4.1433. If you want to check it out
|
||||
sync to before that.
|
||||
|
||||
vim:tw=78:ts=8:ft=help:norl:
|
||||
|
||||
@ -82,8 +82,6 @@
|
||||
# TCL_VER_LONG=[Tcl version, eg 8.3] (default is 8.3)
|
||||
# You must set TCL_VER_LONG when you set TCL_VER.
|
||||
#
|
||||
# SNiFF+ interface: SNIFF=yes
|
||||
#
|
||||
# Cscope support: CSCOPE=yes
|
||||
#
|
||||
# Iconv library support (always dynamically loaded):
|
||||
@ -269,16 +267,6 @@ WP64CHECK = /Wp64
|
||||
CTAGS = ctags
|
||||
!endif
|
||||
|
||||
!if "$(SNIFF)" == "yes"
|
||||
# SNIFF - Include support for SNiFF+.
|
||||
SNIFF_INCL = if_sniff.h
|
||||
SNIFF_OBJ = $(OBJDIR)/if_sniff.obj
|
||||
SNIFF_LIB = shell32.lib
|
||||
SNIFF_DEFS = -DFEAT_SNIFF
|
||||
# The SNiFF integration needs multithreaded libraries!
|
||||
MULTITHREADED = yes
|
||||
!endif
|
||||
|
||||
!ifndef CSCOPE
|
||||
CSCOPE = yes
|
||||
!endif
|
||||
@ -380,7 +368,7 @@ WINVER = 0x0501
|
||||
#VIMRUNTIMEDIR = somewhere
|
||||
|
||||
CFLAGS = -c /W3 /nologo $(CVARS) -I. -Iproto -DHAVE_PATHDEF -DWIN32 \
|
||||
$(SNIFF_DEFS) $(CSCOPE_DEFS) $(NETBEANS_DEFS) $(CHANNEL_DEFS) \
|
||||
$(CSCOPE_DEFS) $(NETBEANS_DEFS) $(CHANNEL_DEFS) \
|
||||
$(NBDEBUG_DEFS) $(XPM_DEFS) \
|
||||
$(DEFINES) -DWINVER=$(WINVER) -D_WIN32_WINNT=$(WINVER) \
|
||||
/Fo$(OUTDIR)/
|
||||
@ -528,7 +516,7 @@ CFLAGS = $(CFLAGS) /Zl /MTd
|
||||
!endif # DEBUG
|
||||
|
||||
INCL = vim.h os_win32.h ascii.h feature.h globals.h keymap.h macros.h \
|
||||
proto.h option.h structs.h term.h $(SNIFF_INCL) $(CSCOPE_INCL) \
|
||||
proto.h option.h structs.h term.h $(CSCOPE_INCL) \
|
||||
$(NBDEBUG_INCL)
|
||||
|
||||
OBJ = \
|
||||
@ -997,7 +985,7 @@ conflags = $(conflags) /map /mapinfo:lines
|
||||
!ENDIF
|
||||
|
||||
LINKARGS1 = $(linkdebug) $(conflags)
|
||||
LINKARGS2 = $(CON_LIB) $(GUI_LIB) $(NODEFAULTLIB) $(LIBC) $(OLE_LIB) user32.lib $(SNIFF_LIB) \
|
||||
LINKARGS2 = $(CON_LIB) $(GUI_LIB) $(NODEFAULTLIB) $(LIBC) $(OLE_LIB) user32.lib \
|
||||
$(LUA_LIB) $(MZSCHEME_LIB) $(PERL_LIB) $(PYTHON_LIB) $(PYTHON3_LIB) $(RUBY_LIB) \
|
||||
$(TCL_LIB) $(NETBEANS_LIB) $(XPM_LIB) $(LINK_PDB)
|
||||
|
||||
@ -1020,12 +1008,12 @@ all: $(VIM).exe \
|
||||
|
||||
$(VIM).exe: $(OUTDIR) $(OBJ) $(GUI_OBJ) $(OLE_OBJ) $(OLE_IDL) $(MZSCHEME_OBJ) \
|
||||
$(LUA_OBJ) $(PERL_OBJ) $(PYTHON_OBJ) $(PYTHON3_OBJ) $(RUBY_OBJ) $(TCL_OBJ) \
|
||||
$(SNIFF_OBJ) $(CSCOPE_OBJ) $(NETBEANS_OBJ) $(CHANNEL_OBJ) $(XPM_OBJ) \
|
||||
$(CSCOPE_OBJ) $(NETBEANS_OBJ) $(CHANNEL_OBJ) $(XPM_OBJ) \
|
||||
version.c version.h
|
||||
$(CC) $(CFLAGS) version.c
|
||||
$(link) $(LINKARGS1) -out:$(VIM).exe $(OBJ) $(GUI_OBJ) $(OLE_OBJ) \
|
||||
$(LUA_OBJ) $(MZSCHEME_OBJ) $(PERL_OBJ) $(PYTHON_OBJ) $(PYTHON3_OBJ) $(RUBY_OBJ) \
|
||||
$(TCL_OBJ) $(SNIFF_OBJ) $(CSCOPE_OBJ) $(NETBEANS_OBJ) $(CHANNEL_OBJ) \
|
||||
$(TCL_OBJ) $(CSCOPE_OBJ) $(NETBEANS_OBJ) $(CHANNEL_OBJ) \
|
||||
$(XPM_OBJ) $(OUTDIR)\version.obj $(LINKARGS2)
|
||||
if exist $(VIM).exe.manifest mt.exe -nologo -manifest $(VIM).exe.manifest -updateresource:$(VIM).exe;1
|
||||
|
||||
@ -1212,9 +1200,6 @@ $(OUTDIR)/if_ole.obj: $(OUTDIR) if_ole.cpp $(INCL) if_ole.h
|
||||
$(OUTDIR)/if_ruby.obj: $(OUTDIR) if_ruby.c $(INCL)
|
||||
$(CC) $(CFLAGS) $(RUBY_INC) if_ruby.c
|
||||
|
||||
$(OUTDIR)/if_sniff.obj: $(OUTDIR) if_sniff.c $(INCL)
|
||||
$(CC) $(CFLAGS) if_sniff.c
|
||||
|
||||
$(OUTDIR)/if_tcl.obj: $(OUTDIR) if_tcl.c $(INCL)
|
||||
$(CC) $(CFLAGS) $(TCL_INC) if_tcl.c
|
||||
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
# Makefile for Vim on OpenVMS
|
||||
#
|
||||
# Maintainer: Zoltan Arpadffy <arpadffy@polarhome.com>
|
||||
# Last change: 2016 Jan 22
|
||||
# Last change: 2016 Feb 27
|
||||
#
|
||||
# This has script been tested on VMS 6.2 to 8.2 on DEC Alpha, VAX and IA64
|
||||
# with MMS and MMK
|
||||
@ -66,7 +66,6 @@ CCVER = YES
|
||||
# VIM_PERL = YES
|
||||
# VIM_PYTHON = YES
|
||||
# VIM_RUBY = YES
|
||||
# VIM_SNIFF = YES
|
||||
|
||||
# X Input Method. For entering special languages like chinese and
|
||||
# Japanese. Please define just one: VIM_XIM or VIM_HANGULIN
|
||||
@ -228,15 +227,6 @@ TCL_LIB = ,OS_VMS_TCL.OPT/OPT
|
||||
TCL_INC = ,dka0:[tcl80.generic]
|
||||
.ENDIF
|
||||
|
||||
.IFDEF VIM_SNIFF
|
||||
# SNIFF related setup.
|
||||
SNIFF_DEF = ,"FEAT_SNIFF"
|
||||
SNIFF_SRC = if_sniff.c
|
||||
SNIFF_OBJ = if_sniff.obj
|
||||
SNIFF_LIB =
|
||||
SNIFF_INC =
|
||||
.ENDIF
|
||||
|
||||
.IFDEF VIM_RUBY
|
||||
# RUBY related setup.
|
||||
RUBY_DEF = ,"FEAT_RUBY"
|
||||
@ -293,7 +283,7 @@ VIMHOST = "''F$TRNLNM("SYS$NODE")'''F$TRNLNM("UCX$INET_HOST")'.''F$TRNLNM("UCX$I
|
||||
.SUFFIXES : .obj .c
|
||||
|
||||
ALL_CFLAGS = /def=($(MODEL_DEF)$(DEFS)$(DEBUG_DEF)$(PERL_DEF)$(PYTHON_DEF) -
|
||||
$(TCL_DEF)$(SNIFF_DEF)$(RUBY_DEF)$(XIM_DEF)$(HANGULIN_DEF)$(TAG_DEF)$(MZSCH_DEF)$(ICONV_DEF)) -
|
||||
$(TCL_DEF)$(RUBY_DEF)$(XIM_DEF)$(HANGULIN_DEF)$(TAG_DEF)$(MZSCH_DEF)$(ICONV_DEF)) -
|
||||
$(CFLAGS)$(GUI_FLAG) -
|
||||
/include=($(C_INC)$(GUI_INC_DIR)$(GUI_INC)$(PERL_INC)$(PYTHON_INC)$(TCL_INC))
|
||||
|
||||
@ -302,12 +292,12 @@ ALL_CFLAGS = /def=($(MODEL_DEF)$(DEFS)$(DEBUG_DEF)$(PERL_DEF)$(PYTHON_DEF) -
|
||||
# as $(GUI_INC) - replaced with $(GUI_INC_VER)
|
||||
# Otherwise should not be any other difference.
|
||||
ALL_CFLAGS_VER = /def=($(MODEL_DEF)$(DEFS)$(DEBUG_DEF)$(PERL_DEF)$(PYTHON_DEF) -
|
||||
$(TCL_DEF)$(SNIFF_DEF)$(RUBY_DEF)$(XIM_DEF)$(HANGULIN_DEF)$(TAG_DEF)$(MZSCH_DEF)$(ICONV_DEF)) -
|
||||
$(TCL_DEF)$(RUBY_DEF)$(XIM_DEF)$(HANGULIN_DEF)$(TAG_DEF)$(MZSCH_DEF)$(ICONV_DEF)) -
|
||||
$(CFLAGS)$(GUI_FLAG) -
|
||||
/include=($(C_INC)$(GUI_INC_DIR)$(GUI_INC_VER)$(PERL_INC)$(PYTHON_INC)$(TCL_INC))
|
||||
|
||||
ALL_LIBS = $(LIBS) $(GUI_LIB_DIR) $(GUI_LIB) \
|
||||
$(PERL_LIB) $(PYTHON_LIB) $(TCL_LIB) $(SNIFF_LIB) $(RUBY_LIB)
|
||||
$(PERL_LIB) $(PYTHON_LIB) $(TCL_LIB) $(RUBY_LIB)
|
||||
|
||||
SRC = blowfish.c buffer.c charset.c crypt.c, crypt_zip.c diff.c digraph.c edit.c eval.c ex_cmds.c ex_cmds2.c \
|
||||
ex_docmd.c ex_eval.c ex_getln.c if_xcmdsrv.c fileio.c fold.c getchar.c \
|
||||
@ -315,7 +305,7 @@ SRC = blowfish.c buffer.c charset.c crypt.c, crypt_zip.c diff.c digraph.c edit.c
|
||||
misc2.c move.c normal.c ops.c option.c popupmnu.c quickfix.c regexp.c search.c sha256.c\
|
||||
spell.c syntax.c tag.c term.c termlib.c ui.c undo.c version.c screen.c \
|
||||
window.c os_unix.c os_vms.c pathdef.c \
|
||||
$(GUI_SRC) $(PERL_SRC) $(PYTHON_SRC) $(TCL_SRC) $(SNIFF_SRC) \
|
||||
$(GUI_SRC) $(PERL_SRC) $(PYTHON_SRC) $(TCL_SRC) \
|
||||
$(RUBY_SRC) $(HANGULIN_SRC) $(MZSCH_SRC)
|
||||
|
||||
OBJ = blowfish.obj buffer.obj charset.obj crypt.obj, crypt_zip.obj diff.obj digraph.obj edit.obj eval.obj \
|
||||
@ -326,7 +316,7 @@ OBJ = blowfish.obj buffer.obj charset.obj crypt.obj, crypt_zip.obj diff.obj digr
|
||||
regexp.obj search.obj sha256.obj spell.obj syntax.obj tag.obj term.obj termlib.obj \
|
||||
ui.obj undo.obj screen.obj version.obj window.obj os_unix.obj \
|
||||
os_vms.obj pathdef.obj if_mzsch.obj\
|
||||
$(GUI_OBJ) $(PERL_OBJ) $(PYTHON_OBJ) $(TCL_OBJ) $(SNIFF_OBJ) \
|
||||
$(GUI_OBJ) $(PERL_OBJ) $(PYTHON_OBJ) $(TCL_OBJ) \
|
||||
$(RUBY_OBJ) $(HANGULIN_OBJ) $(MZSCH_OBJ)
|
||||
|
||||
# Default target is making the executable
|
||||
@ -778,10 +768,6 @@ if_ruby.obj : if_ruby.c vim.h [.auto]config.h feature.h os_unix.h \
|
||||
ascii.h keymap.h term.h macros.h structs.h regexp.h \
|
||||
gui.h gui_beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \
|
||||
globals.h farsi.h arabic.h version.h
|
||||
if_sniff.obj : if_sniff.c vim.h [.auto]config.h feature.h os_unix.h \
|
||||
ascii.h keymap.h term.h macros.h structs.h regexp.h \
|
||||
gui.h gui_beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \
|
||||
globals.h farsi.h arabic.h os_unixx.h
|
||||
gui_beval.obj : gui_beval.c vim.h [.auto]config.h feature.h os_unix.h \
|
||||
ascii.h keymap.h term.h macros.h structs.h regexp.h \
|
||||
gui.h gui_beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \
|
||||
|
||||
20
src/Makefile
20
src/Makefile
@ -466,9 +466,6 @@ CClink = $(CC)
|
||||
# Uncomment this when you do not want inter process communication.
|
||||
#CONF_OPT_CHANNEL = --disable-channel
|
||||
|
||||
# SNIFF - Include support for SNiFF+.
|
||||
#CONF_OPT_SNIFF = --enable-sniff
|
||||
|
||||
# MULTIBYTE - To edit multi-byte characters.
|
||||
# Uncomment this when you want to edit a multibyte language.
|
||||
# It's automatically enabled with normal features, GTK or IME support.
|
||||
@ -1391,7 +1388,7 @@ OSDEF_CFLAGS = $(PRE_DEFS) $(POST_DEFS)
|
||||
|
||||
LINT_CFLAGS = -DLINT -I. $(PRE_DEFS) $(POST_DEFS) $(RUBY_CFLAGS) $(LUA_CFLAGS) $(PERL_CFLAGS) $(PYTHON_CFLAGS) $(PYTHON3_CFLAGS) $(TCL_CFLAGS) -Dinline= -D__extension__= -Dalloca=alloca
|
||||
|
||||
LINT_EXTRA = -DUSE_SNIFF -DHANGUL_INPUT -D"__attribute__(x)="
|
||||
LINT_EXTRA = -DHANGUL_INPUT -D"__attribute__(x)="
|
||||
|
||||
DEPEND_CFLAGS = -DPROTO -DDEPEND -DFEAT_GUI $(LINT_CFLAGS)
|
||||
|
||||
@ -1532,14 +1529,13 @@ SRC = $(BASIC_SRC) \
|
||||
$(PYTHON_SRC) $(PYTHON3_SRC) \
|
||||
$(TCL_SRC) \
|
||||
$(RUBY_SRC) \
|
||||
$(SNIFF_SRC) \
|
||||
$(WORKSHOP_SRC) \
|
||||
$(WSDEBUG_SRC)
|
||||
|
||||
TAGS_SRC = *.c *.cpp if_perl.xs
|
||||
|
||||
EXTRA_SRC = hangulin.c if_lua.c if_mzsch.c auto/if_perl.c if_perlsfio.c \
|
||||
if_python.c if_python3.c if_tcl.c if_ruby.c if_sniff.c \
|
||||
if_python.c if_python3.c if_tcl.c if_ruby.c \
|
||||
gui_beval.c workshop.c wsdebug.c integration.c \
|
||||
netbeans.c channel.c \
|
||||
$(GRESOURCE_SRC)
|
||||
@ -1561,7 +1557,7 @@ ALL_SRC = $(BASIC_SRC) $(ALL_GUI_SRC) $(UNITTEST_SRC) $(EXTRA_SRC)
|
||||
# The perl sources also don't work well with lint.
|
||||
LINT_SRC = $(BASIC_SRC) $(GUI_SRC) $(HANGULIN_SRC) \
|
||||
$(PYTHON_SRC) $(PYTHON3_SRC) $(TCL_SRC) \
|
||||
$(SNIFF_SRC) $(WORKSHOP_SRC) $(WSDEBUG_SRC) \
|
||||
$(WORKSHOP_SRC) $(WSDEBUG_SRC) \
|
||||
$(NETBEANS_SRC) $(CHANNEL_SRC)
|
||||
#LINT_SRC = $(SRC)
|
||||
#LINT_SRC = $(ALL_SRC)
|
||||
@ -1611,7 +1607,6 @@ OBJ_COMMON = \
|
||||
objects/sha256.o \
|
||||
objects/spell.o \
|
||||
objects/syntax.o \
|
||||
$(SNIFF_OBJ) \
|
||||
objects/tag.o \
|
||||
objects/term.o \
|
||||
objects/ui.o \
|
||||
@ -1750,7 +1745,7 @@ config auto/config.mk: auto/configure config.mk.in config.h.in
|
||||
$(CONF_OPT_TCL) $(CONF_OPT_RUBY) $(CONF_OPT_NLS) \
|
||||
$(CONF_OPT_CSCOPE) $(CONF_OPT_MULTIBYTE) $(CONF_OPT_INPUT) \
|
||||
$(CONF_OPT_OUTPUT) $(CONF_OPT_GPM) $(CONF_OPT_WORKSHOP) \
|
||||
$(CONF_OPT_SNIFF) $(CONF_OPT_FEAT) $(CONF_TERM_LIB) \
|
||||
$(CONF_OPT_FEAT) $(CONF_TERM_LIB) \
|
||||
$(CONF_OPT_COMPBY) $(CONF_OPT_ACL) $(CONF_OPT_NETBEANS) \
|
||||
$(CONF_OPT_CHANNEL) \
|
||||
$(CONF_ARGS) $(CONF_OPT_MZSCHEME) $(CONF_OPT_PLTHOME) \
|
||||
@ -2815,9 +2810,6 @@ objects/if_python3.o: if_python3.c if_py_both.h
|
||||
objects/if_ruby.o: if_ruby.c
|
||||
$(CCC) $(RUBY_CFLAGS) -o $@ if_ruby.c
|
||||
|
||||
objects/if_sniff.o: if_sniff.c
|
||||
$(CCC) -o $@ if_sniff.c
|
||||
|
||||
objects/if_tcl.o: if_tcl.c
|
||||
$(CCC) $(TCL_CFLAGS) -o $@ if_tcl.c
|
||||
|
||||
@ -3364,10 +3356,6 @@ objects/if_ruby.o: if_ruby.c auto/config.h vim.h feature.h os_unix.h auto/osdef.
|
||||
ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \
|
||||
gui_beval.h proto/gui_beval.pro alloc.h ex_cmds.h proto.h globals.h \
|
||||
farsi.h arabic.h version.h
|
||||
objects/if_sniff.o: if_sniff.c vim.h auto/config.h feature.h os_unix.h \
|
||||
auto/osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \
|
||||
regexp.h gui.h gui_beval.h proto/gui_beval.pro alloc.h ex_cmds.h proto.h \
|
||||
globals.h farsi.h arabic.h os_unixx.h
|
||||
objects/gui_beval.o: gui_beval.c vim.h auto/config.h feature.h os_unix.h \
|
||||
auto/osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \
|
||||
regexp.h gui.h gui_beval.h proto/gui_beval.pro alloc.h ex_cmds.h proto.h \
|
||||
|
||||
24
src/auto/configure
vendored
24
src/auto/configure
vendored
@ -653,8 +653,6 @@ X_PRE_LIBS
|
||||
X_CFLAGS
|
||||
XMKMF
|
||||
xmkmfpath
|
||||
SNIFF_OBJ
|
||||
SNIFF_SRC
|
||||
CHANNEL_OBJ
|
||||
CHANNEL_SRC
|
||||
NETBEANS_OBJ
|
||||
@ -812,7 +810,6 @@ enable_cscope
|
||||
enable_workshop
|
||||
enable_netbeans
|
||||
enable_channel
|
||||
enable_sniff
|
||||
enable_multibyte
|
||||
enable_hangulinput
|
||||
enable_xim
|
||||
@ -1477,7 +1474,6 @@ Optional Features:
|
||||
--enable-workshop Include Sun Visual Workshop support.
|
||||
--disable-netbeans Disable NetBeans integration support.
|
||||
--disable-channel Disable process communication support.
|
||||
--enable-sniff Include Sniff interface.
|
||||
--enable-multibyte Include multibyte editing support.
|
||||
--enable-hangulinput Include Hangul input support.
|
||||
--enable-xim Include XIM input support.
|
||||
@ -7439,26 +7435,6 @@ if test "$enable_channel" = "yes"; then
|
||||
|
||||
fi
|
||||
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking --enable-sniff argument" >&5
|
||||
$as_echo_n "checking --enable-sniff argument... " >&6; }
|
||||
# Check whether --enable-sniff was given.
|
||||
if test "${enable_sniff+set}" = set; then :
|
||||
enableval=$enable_sniff;
|
||||
else
|
||||
enable_sniff="no"
|
||||
fi
|
||||
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_sniff" >&5
|
||||
$as_echo "$enable_sniff" >&6; }
|
||||
if test "$enable_sniff" = "yes"; then
|
||||
$as_echo "#define FEAT_SNIFF 1" >>confdefs.h
|
||||
|
||||
SNIFF_SRC="if_sniff.c"
|
||||
|
||||
SNIFF_OBJ="objects/if_sniff.o"
|
||||
|
||||
fi
|
||||
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking --enable-multibyte argument" >&5
|
||||
$as_echo_n "checking --enable-multibyte argument... " >&6; }
|
||||
# Check whether --enable-multibyte was given.
|
||||
|
||||
@ -1761,8 +1761,7 @@ skiptowhite(char_u *p)
|
||||
return p;
|
||||
}
|
||||
|
||||
#if defined(FEAT_LISTCMDS) || defined(FEAT_SIGNS) || defined(FEAT_SNIFF) \
|
||||
|| defined(PROTO)
|
||||
#if defined(FEAT_LISTCMDS) || defined(FEAT_SIGNS) || defined(PROTO)
|
||||
/*
|
||||
* skiptowhite_esc: Like skiptowhite(), but also skip escaped chars
|
||||
*/
|
||||
|
||||
@ -362,9 +362,6 @@
|
||||
/* Define for linking via dlopen() or LoadLibrary() */
|
||||
#undef DYNAMIC_TCL
|
||||
|
||||
/* Define if you want to include the Sniff interface. */
|
||||
#undef FEAT_SNIFF
|
||||
|
||||
/* Define if you want to add support for ACL */
|
||||
#undef HAVE_POSIX_ACL
|
||||
#undef HAVE_SOLARIS_ZFS_ACL
|
||||
|
||||
@ -99,9 +99,6 @@ RUBY_PRO = @RUBY_PRO@
|
||||
RUBY_CFLAGS = @RUBY_CFLAGS@
|
||||
RUBY_LIBS = @RUBY_LIBS@
|
||||
|
||||
SNIFF_SRC = @SNIFF_SRC@
|
||||
SNIFF_OBJ = @SNIFF_OBJ@
|
||||
|
||||
AWK = @AWK@
|
||||
|
||||
STRIP = @STRIP@
|
||||
|
||||
@ -2021,19 +2021,6 @@ if test "$enable_channel" = "yes"; then
|
||||
AC_SUBST(CHANNEL_OBJ)
|
||||
fi
|
||||
|
||||
AC_MSG_CHECKING(--enable-sniff argument)
|
||||
AC_ARG_ENABLE(sniff,
|
||||
[ --enable-sniff Include Sniff interface.], ,
|
||||
[enable_sniff="no"])
|
||||
AC_MSG_RESULT($enable_sniff)
|
||||
if test "$enable_sniff" = "yes"; then
|
||||
AC_DEFINE(FEAT_SNIFF)
|
||||
SNIFF_SRC="if_sniff.c"
|
||||
AC_SUBST(SNIFF_SRC)
|
||||
SNIFF_OBJ="objects/if_sniff.o"
|
||||
AC_SUBST(SNIFF_OBJ)
|
||||
fi
|
||||
|
||||
AC_MSG_CHECKING(--enable-multibyte argument)
|
||||
AC_ARG_ENABLE(multibyte,
|
||||
[ --enable-multibyte Include multibyte editing support.], ,
|
||||
|
||||
@ -1052,12 +1052,6 @@ doESCkey:
|
||||
case K_SELECT: /* end of Select mode mapping - ignore */
|
||||
break;
|
||||
|
||||
#ifdef FEAT_SNIFF
|
||||
case K_SNIFF: /* Sniff command received */
|
||||
stuffcharReadbuff(K_SNIFF);
|
||||
goto doESCkey;
|
||||
#endif
|
||||
|
||||
case K_HELP: /* Help key works like <ESC> <Help> */
|
||||
case K_F1:
|
||||
case K_XF1:
|
||||
|
||||
@ -13930,9 +13930,6 @@ f_has(typval_T *argvars, typval_T *rettv)
|
||||
#ifdef FEAT_SMARTINDENT
|
||||
"smartindent",
|
||||
#endif
|
||||
#ifdef FEAT_SNIFF
|
||||
"sniff",
|
||||
#endif
|
||||
#ifdef STARTUPTIME
|
||||
"startuptime",
|
||||
#endif
|
||||
|
||||
@ -1281,9 +1281,6 @@ EX(CMD_smenu, "smenu", ex_menu,
|
||||
EX(CMD_snext, "snext", ex_next,
|
||||
RANGE|NOTADR|BANG|FILES|EDITCMD|ARGOPT|TRLBAR,
|
||||
ADDR_LINES),
|
||||
EX(CMD_sniff, "sniff", ex_sniff,
|
||||
EXTRA|TRLBAR,
|
||||
ADDR_LINES),
|
||||
EX(CMD_snomagic, "snomagic", ex_submagic,
|
||||
RANGE|WHOLEFOLD|EXTRA|CMDWIN,
|
||||
ADDR_LINES),
|
||||
|
||||
@ -131,9 +131,6 @@ do_debug(char_u *cmd)
|
||||
redir_off = TRUE; /* don't redirect debug commands */
|
||||
|
||||
State = NORMAL;
|
||||
#ifdef FEAT_SNIFF
|
||||
want_sniff_request = 0; /* No K_SNIFF wanted */
|
||||
#endif
|
||||
|
||||
if (!debug_did_msg)
|
||||
MSG(_("Entering Debug mode. Type \"cont\" to continue."));
|
||||
@ -151,9 +148,7 @@ do_debug(char_u *cmd)
|
||||
{
|
||||
msg_scroll = TRUE;
|
||||
need_wait_return = FALSE;
|
||||
#ifdef FEAT_SNIFF
|
||||
ProcessSniffRequests();
|
||||
#endif
|
||||
|
||||
/* Save the current typeahead buffer and replace it with an empty one.
|
||||
* This makes sure we get input from the user here and don't interfere
|
||||
* with the commands being executed. Reset "ex_normal_busy" to avoid
|
||||
|
||||
@ -296,9 +296,6 @@ static void ex_popup(exarg_T *eap);
|
||||
# define ex_rubydo ex_ni
|
||||
# define ex_rubyfile ex_ni
|
||||
#endif
|
||||
#ifndef FEAT_SNIFF
|
||||
# define ex_sniff ex_ni
|
||||
#endif
|
||||
#ifndef FEAT_KEYMAP
|
||||
# define ex_loadkeymap ex_ni
|
||||
#endif
|
||||
@ -641,9 +638,6 @@ do_exmode(
|
||||
/* Ignore scrollbar and mouse events in Ex mode */
|
||||
++hold_gui_events;
|
||||
#endif
|
||||
#ifdef FEAT_SNIFF
|
||||
want_sniff_request = 0; /* No K_SNIFF wanted */
|
||||
#endif
|
||||
|
||||
MSG(_("Entering Ex mode. Type \"visual\" to go to Normal mode."));
|
||||
while (exmode_active)
|
||||
@ -661,9 +655,6 @@ do_exmode(
|
||||
changedtick = curbuf->b_changedtick;
|
||||
prev_msg_row = msg_row;
|
||||
prev_line = curwin->w_cursor.lnum;
|
||||
#ifdef FEAT_SNIFF
|
||||
ProcessSniffRequests();
|
||||
#endif
|
||||
if (improved)
|
||||
{
|
||||
cmdline_row = msg_row;
|
||||
|
||||
@ -206,9 +206,6 @@ getcmdline(
|
||||
struct cmdline_info save_ccline;
|
||||
#endif
|
||||
|
||||
#ifdef FEAT_SNIFF
|
||||
want_sniff_request = 0;
|
||||
#endif
|
||||
#ifdef FEAT_EVAL
|
||||
if (firstc == -1)
|
||||
{
|
||||
|
||||
@ -1221,7 +1221,6 @@
|
||||
* +perl Perl interface: "--enable-perlinterp"
|
||||
* +python Python interface: "--enable-pythoninterp"
|
||||
* +tcl TCL interface: "--enable-tclinterp"
|
||||
* +sniff Sniff interface: "--enable-sniff"
|
||||
* +sun_workshop Sun Workshop integration
|
||||
* +netbeans_intg Netbeans integration
|
||||
* +channel Inter process communication
|
||||
|
||||
@ -6460,22 +6460,6 @@ input_timer_cb(gpointer data)
|
||||
return FALSE; /* don't happen again */
|
||||
}
|
||||
|
||||
#ifdef FEAT_SNIFF
|
||||
/*
|
||||
* Callback function, used when data is available on the SNiFF connection.
|
||||
*/
|
||||
static void
|
||||
sniff_request_cb(
|
||||
gpointer data UNUSED,
|
||||
gint source_fd UNUSED,
|
||||
GdkInputCondition condition UNUSED)
|
||||
{
|
||||
static char_u bytes[3] = {CSI, (int)KS_EXTRA, (int)KE_SNIFF};
|
||||
|
||||
add_to_input_buf(bytes, 3);
|
||||
}
|
||||
#endif
|
||||
|
||||
/*
|
||||
* GUI input routine called by gui_wait_for_chars(). Waits for a character
|
||||
* from the keyboard.
|
||||
@ -6491,26 +6475,6 @@ gui_mch_wait_for_chars(long wtime)
|
||||
int focus;
|
||||
guint timer;
|
||||
static int timed_out;
|
||||
#ifdef FEAT_SNIFF
|
||||
static int sniff_on = 0;
|
||||
static gint sniff_input_id = 0;
|
||||
#endif
|
||||
|
||||
#ifdef FEAT_SNIFF
|
||||
if (sniff_on && !want_sniff_request)
|
||||
{
|
||||
if (sniff_input_id)
|
||||
gdk_input_remove(sniff_input_id);
|
||||
sniff_on = 0;
|
||||
}
|
||||
else if (!sniff_on && want_sniff_request)
|
||||
{
|
||||
/* Add fd_from_sniff to watch for available data in main loop. */
|
||||
sniff_input_id = gdk_input_add(fd_from_sniff,
|
||||
GDK_INPUT_READ, sniff_request_cb, NULL);
|
||||
sniff_on = 1;
|
||||
}
|
||||
#endif
|
||||
|
||||
timed_out = FALSE;
|
||||
|
||||
|
||||
@ -326,7 +326,7 @@ static int s_findrep_is_find; /* TRUE for find dialog, FALSE
|
||||
#endif
|
||||
|
||||
static HINSTANCE s_hinst = NULL;
|
||||
#if !defined(FEAT_SNIFF) && !defined(FEAT_GUI)
|
||||
#if !defined(FEAT_GUI)
|
||||
static
|
||||
#endif
|
||||
HWND s_hwnd = NULL;
|
||||
@ -1927,23 +1927,6 @@ process_message(void)
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifdef FEAT_SNIFF
|
||||
if (sniff_request_waiting && want_sniff_request)
|
||||
{
|
||||
static char_u bytes[3] = {CSI, (char_u)KS_EXTRA, (char_u)KE_SNIFF};
|
||||
add_to_input_buf(bytes, 3); /* K_SNIFF */
|
||||
sniff_request_waiting = 0;
|
||||
want_sniff_request = 0;
|
||||
/* request is handled in normal.c */
|
||||
}
|
||||
if (msg.message == WM_USER)
|
||||
{
|
||||
MyTranslateMessage(&msg);
|
||||
pDispatchMessage(&msg);
|
||||
return;
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifdef MSWIN_FIND_REPLACE
|
||||
/* Don't process messages used by the dialog */
|
||||
if (s_findrep_hwnd != NULL && pIsDialogMessage(s_findrep_hwnd, &msg))
|
||||
|
||||
@ -145,9 +145,6 @@ static void gui_x11_focus_change_cb(Widget w, XtPointer data, XEvent *event, Boo
|
||||
static void gui_x11_enter_cb(Widget w, XtPointer data, XEvent *event, Boolean *dum);
|
||||
static void gui_x11_leave_cb(Widget w, XtPointer data, XEvent *event, Boolean *dum);
|
||||
static void gui_x11_mouse_cb(Widget w, XtPointer data, XEvent *event, Boolean *dum);
|
||||
#ifdef FEAT_SNIFF
|
||||
static void gui_x11_sniff_request_cb(XtPointer closure, int *source, XtInputId *id);
|
||||
#endif
|
||||
static void gui_x11_check_copy_area(void);
|
||||
#ifdef FEAT_CLIENTSERVER
|
||||
static void gui_x11_send_event_handler(Widget, XtPointer, XEvent *, Boolean *);
|
||||
@ -1163,20 +1160,6 @@ gui_x11_mouse_cb(
|
||||
gui_send_mouse_event(button, x, y, repeated_click, vim_modifiers);
|
||||
}
|
||||
|
||||
#ifdef FEAT_SNIFF
|
||||
/* ARGSUSED */
|
||||
static void
|
||||
gui_x11_sniff_request_cb(
|
||||
XtPointer closure UNUSED,
|
||||
int *source UNUSED,
|
||||
XtInputId *id UNUSED)
|
||||
{
|
||||
static char_u bytes[3] = {CSI, (int)KS_EXTRA, (int)KE_SNIFF};
|
||||
|
||||
add_to_input_buf(bytes, 3);
|
||||
}
|
||||
#endif
|
||||
|
||||
/*
|
||||
* End of call-back routines
|
||||
*/
|
||||
@ -2818,28 +2801,9 @@ gui_mch_wait_for_chars(long wtime)
|
||||
static int timed_out;
|
||||
XtIntervalId timer = (XtIntervalId)0;
|
||||
XtInputMask desired;
|
||||
#ifdef FEAT_SNIFF
|
||||
static int sniff_on = 0;
|
||||
static XtInputId sniff_input_id = 0;
|
||||
#endif
|
||||
|
||||
timed_out = FALSE;
|
||||
|
||||
#ifdef FEAT_SNIFF
|
||||
if (sniff_on && !want_sniff_request)
|
||||
{
|
||||
if (sniff_input_id)
|
||||
XtRemoveInput(sniff_input_id);
|
||||
sniff_on = 0;
|
||||
}
|
||||
else if (!sniff_on && want_sniff_request)
|
||||
{
|
||||
sniff_input_id = XtAppAddInput(app_context, fd_from_sniff,
|
||||
(XtPointer)XtInputReadMask, gui_x11_sniff_request_cb, 0);
|
||||
sniff_on = 1;
|
||||
}
|
||||
#endif
|
||||
|
||||
if (wtime > 0)
|
||||
timer = XtAppAddTimeOut(app_context, (long_u)wtime, gui_x11_timer_cb,
|
||||
&timed_out);
|
||||
|
||||
1201
src/if_sniff.c
1201
src/if_sniff.c
File diff suppressed because it is too large
Load Diff
@ -1,16 +0,0 @@
|
||||
/*
|
||||
* if_sniff.h Interface between Vim and SNiFF+
|
||||
*/
|
||||
|
||||
#ifndef __if_sniff_h__
|
||||
#define __if_sniff_h__
|
||||
|
||||
extern int want_sniff_request;
|
||||
extern int sniff_request_waiting;
|
||||
extern int sniff_connected;
|
||||
extern int fd_from_sniff;
|
||||
extern void sniff_disconnect(int immediately);
|
||||
extern void ProcessSniffRequests(void);
|
||||
extern void ex_sniff(exarg_T *eap);
|
||||
|
||||
#endif
|
||||
@ -211,8 +211,6 @@ enum key_extra
|
||||
, KE_TAB /* unshifted TAB key */
|
||||
, KE_S_TAB_OLD /* shifted TAB key (no longer used) */
|
||||
|
||||
, KE_SNIFF /* SNiFF+ input waiting */
|
||||
|
||||
, KE_XF1 /* extra vt100 function keys for xterm */
|
||||
, KE_XF2
|
||||
, KE_XF3
|
||||
@ -449,8 +447,6 @@ enum key_extra
|
||||
#define K_IGNORE TERMCAP2KEY(KS_EXTRA, KE_IGNORE)
|
||||
#define K_NOP TERMCAP2KEY(KS_EXTRA, KE_NOP)
|
||||
|
||||
#define K_SNIFF TERMCAP2KEY(KS_EXTRA, KE_SNIFF)
|
||||
|
||||
#define K_MOUSEDOWN TERMCAP2KEY(KS_EXTRA, KE_MOUSEDOWN)
|
||||
#define K_MOUSEUP TERMCAP2KEY(KS_EXTRA, KE_MOUSEUP)
|
||||
#define K_MOUSELEFT TERMCAP2KEY(KS_EXTRA, KE_MOUSELEFT)
|
||||
|
||||
18
src/normal.c
18
src/normal.c
@ -163,9 +163,6 @@ static void nv_halfpage(cmdarg_T *cap);
|
||||
static void nv_join(cmdarg_T *cap);
|
||||
static void nv_put(cmdarg_T *cap);
|
||||
static void nv_open(cmdarg_T *cap);
|
||||
#ifdef FEAT_SNIFF
|
||||
static void nv_sniff(cmdarg_T *cap);
|
||||
#endif
|
||||
#ifdef FEAT_NETBEANS_INTG
|
||||
static void nv_nbcmd(cmdarg_T *cap);
|
||||
#endif
|
||||
@ -420,9 +417,6 @@ static const struct nv_cmd
|
||||
{K_F8, farsi_fkey, 0, 0},
|
||||
{K_F9, farsi_fkey, 0, 0},
|
||||
#endif
|
||||
#ifdef FEAT_SNIFF
|
||||
{K_SNIFF, nv_sniff, 0, 0},
|
||||
#endif
|
||||
#ifdef FEAT_NETBEANS_INTG
|
||||
{K_F21, nv_nbcmd, NV_NCH_ALW, 0},
|
||||
#endif
|
||||
@ -570,10 +564,6 @@ normal_cmd(
|
||||
* remembered in "opcount". */
|
||||
ca.opcount = opcount;
|
||||
|
||||
#ifdef FEAT_SNIFF
|
||||
want_sniff_request = sniff_connected;
|
||||
#endif
|
||||
|
||||
/*
|
||||
* If there is an operator pending, then the command we take this time
|
||||
* will terminate it. Finish_op tells us to finish the operation before
|
||||
@ -9388,14 +9378,6 @@ nv_open(cmdarg_T *cap)
|
||||
n_opencmd(cap);
|
||||
}
|
||||
|
||||
#ifdef FEAT_SNIFF
|
||||
static void
|
||||
nv_sniff(cmdarg_T *cap UNUSED)
|
||||
{
|
||||
ProcessSniffRequests();
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifdef FEAT_NETBEANS_INTG
|
||||
static void
|
||||
nv_nbcmd(cmdarg_T *cap)
|
||||
|
||||
@ -5340,7 +5340,6 @@ WaitForChar(long msec)
|
||||
* "msec" == 0 will check for characters once.
|
||||
* "msec" == -1 will block until a character is available.
|
||||
* When a GUI is being used, this will not be used for input -- webb
|
||||
* Returns also, when a request from Sniff is waiting -- toni.
|
||||
* Or when a Linux GPM mouse event is waiting.
|
||||
* Or when a clientserver message is on the queue.
|
||||
*/
|
||||
@ -5427,15 +5426,6 @@ RealWaitForChar(int fd, long msec, int *check_for_gpm UNUSED)
|
||||
fds[0].events = POLLIN;
|
||||
nfd = 1;
|
||||
|
||||
# ifdef FEAT_SNIFF
|
||||
# define SNIFF_IDX 1
|
||||
if (want_sniff_request)
|
||||
{
|
||||
fds[SNIFF_IDX].fd = fd_from_sniff;
|
||||
fds[SNIFF_IDX].events = POLLIN;
|
||||
nfd++;
|
||||
}
|
||||
# endif
|
||||
# ifdef FEAT_XCLIPBOARD
|
||||
may_restore_clipboard();
|
||||
if (xterm_Shell != (Widget)0)
|
||||
@ -5478,17 +5468,6 @@ RealWaitForChar(int fd, long msec, int *check_for_gpm UNUSED)
|
||||
finished = FALSE;
|
||||
# endif
|
||||
|
||||
# ifdef FEAT_SNIFF
|
||||
if (ret < 0)
|
||||
sniff_disconnect(1);
|
||||
else if (want_sniff_request)
|
||||
{
|
||||
if (fds[SNIFF_IDX].revents & POLLHUP)
|
||||
sniff_disconnect(1);
|
||||
if (fds[SNIFF_IDX].revents & POLLIN)
|
||||
sniff_request_waiting = 1;
|
||||
}
|
||||
# endif
|
||||
# ifdef FEAT_XCLIPBOARD
|
||||
if (xterm_Shell != (Widget)0 && (fds[xterm_idx].revents & POLLIN))
|
||||
{
|
||||
@ -5574,15 +5553,6 @@ select_eintr:
|
||||
# endif
|
||||
maxfd = fd;
|
||||
|
||||
# ifdef FEAT_SNIFF
|
||||
if (want_sniff_request)
|
||||
{
|
||||
FD_SET(fd_from_sniff, &rfds);
|
||||
FD_SET(fd_from_sniff, &efds);
|
||||
if (maxfd < fd_from_sniff)
|
||||
maxfd = fd_from_sniff;
|
||||
}
|
||||
# endif
|
||||
# ifdef FEAT_XCLIPBOARD
|
||||
may_restore_clipboard();
|
||||
if (xterm_Shell != (Widget)0)
|
||||
@ -5652,17 +5622,6 @@ select_eintr:
|
||||
finished = FALSE;
|
||||
# endif
|
||||
|
||||
# ifdef FEAT_SNIFF
|
||||
if (ret < 0 )
|
||||
sniff_disconnect(1);
|
||||
else if (ret > 0 && want_sniff_request)
|
||||
{
|
||||
if (FD_ISSET(fd_from_sniff, &efds))
|
||||
sniff_disconnect(1);
|
||||
if (FD_ISSET(fd_from_sniff, &rfds))
|
||||
sniff_request_waiting = 1;
|
||||
}
|
||||
# endif
|
||||
# ifdef FEAT_XCLIPBOARD
|
||||
if (ret > 0 && xterm_Shell != (Widget)0
|
||||
&& FD_ISSET(ConnectionNumber(xterm_dpy), &rfds))
|
||||
|
||||
@ -1683,27 +1683,6 @@ mch_inchar(
|
||||
if (typeaheadlen > 0)
|
||||
goto theend;
|
||||
|
||||
#ifdef FEAT_SNIFF
|
||||
if (want_sniff_request)
|
||||
{
|
||||
if (sniff_request_waiting)
|
||||
{
|
||||
/* return K_SNIFF */
|
||||
typeahead[typeaheadlen++] = CSI;
|
||||
typeahead[typeaheadlen++] = (char_u)KS_EXTRA;
|
||||
typeahead[typeaheadlen++] = (char_u)KE_SNIFF;
|
||||
sniff_request_waiting = 0;
|
||||
want_sniff_request = 0;
|
||||
goto theend;
|
||||
}
|
||||
else if (time < 0 || time > 250)
|
||||
{
|
||||
/* don't wait too long, a request might be pending */
|
||||
time = 250;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
if (time >= 0)
|
||||
{
|
||||
if (!WaitForChar(time)) /* no character available */
|
||||
|
||||
@ -1639,10 +1639,6 @@ struct file_buffer
|
||||
char b_fab_rat; /* Record attribute */
|
||||
unsigned int b_fab_mrs; /* Max record size */
|
||||
#endif
|
||||
#ifdef FEAT_SNIFF
|
||||
int b_sniff; /* file was loaded through Sniff */
|
||||
#endif
|
||||
|
||||
int b_fnum; /* buffer number for this file. */
|
||||
|
||||
int b_changed; /* 'modified': Set to TRUE if something in the
|
||||
|
||||
10
src/term.c
10
src/term.c
@ -1796,16 +1796,6 @@ set_termname(char_u *term)
|
||||
# endif
|
||||
#endif /* FEAT_MOUSE */
|
||||
|
||||
#ifdef FEAT_SNIFF
|
||||
{
|
||||
char_u name[2];
|
||||
|
||||
name[0] = (int)KS_EXTRA;
|
||||
name[1] = (int)KE_SNIFF;
|
||||
add_termcode(name, (char_u *)"\233sniff", FALSE);
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifdef USE_TERM_CONSOLE
|
||||
/* DEFAULT_TERM indicates that it is the machine console. */
|
||||
if (STRCMP(term, DEFAULT_TERM) != 0)
|
||||
|
||||
16
src/ui.c
16
src/ui.c
@ -1627,7 +1627,7 @@ set_input_buf(char_u *p)
|
||||
#if defined(FEAT_GUI) \
|
||||
|| defined(FEAT_MOUSE_GPM) || defined(FEAT_SYSMOUSE) \
|
||||
|| defined(FEAT_XCLIPBOARD) || defined(VMS) \
|
||||
|| defined(FEAT_SNIFF) || defined(FEAT_CLIENTSERVER) \
|
||||
|| defined(FEAT_CLIENTSERVER) \
|
||||
|| defined(PROTO)
|
||||
/*
|
||||
* Add the given bytes to the input buffer
|
||||
@ -1772,17 +1772,7 @@ fill_input_buf(int exit_on_error UNUSED)
|
||||
inbufcount = 0;
|
||||
# else
|
||||
|
||||
# ifdef FEAT_SNIFF
|
||||
if (sniff_request_waiting)
|
||||
{
|
||||
add_to_input_buf((char_u *)"\233sniff",6); /* results in K_SNIFF */
|
||||
sniff_request_waiting = 0;
|
||||
want_sniff_request = 0;
|
||||
return;
|
||||
}
|
||||
# endif
|
||||
|
||||
# ifdef FEAT_MBYTE
|
||||
# ifdef FEAT_MBYTE
|
||||
if (rest != NULL)
|
||||
{
|
||||
/* Use remainder of previous call, starts with an invalid character
|
||||
@ -1806,7 +1796,7 @@ fill_input_buf(int exit_on_error UNUSED)
|
||||
}
|
||||
else
|
||||
unconverted = 0;
|
||||
#endif
|
||||
# endif
|
||||
|
||||
len = 0; /* to avoid gcc warning */
|
||||
for (try = 0; try < 100; ++try)
|
||||
|
||||
@ -554,11 +554,6 @@ static char *(features[]) =
|
||||
#else
|
||||
"-smartindent",
|
||||
#endif
|
||||
#ifdef FEAT_SNIFF
|
||||
"+sniff",
|
||||
#else
|
||||
"-sniff",
|
||||
#endif
|
||||
#ifdef STARTUPTIME
|
||||
"+startuptime",
|
||||
#else
|
||||
@ -748,6 +743,8 @@ static char *(features[]) =
|
||||
|
||||
static int included_patches[] =
|
||||
{ /* Add new patch number below this line */
|
||||
/**/
|
||||
1433,
|
||||
/**/
|
||||
1432,
|
||||
/**/
|
||||
|
||||
@ -1972,10 +1972,6 @@ typedef int VimClipboard; /* This is required for the prototypes. */
|
||||
|
||||
#include "globals.h" /* global variables and messages */
|
||||
|
||||
#ifdef FEAT_SNIFF
|
||||
# include "if_sniff.h"
|
||||
#endif
|
||||
|
||||
#ifndef FEAT_VIRTUALEDIT
|
||||
# define getvvcol(w, p, s, c, e) getvcol(w, p, s, c, e)
|
||||
# define virtual_active() FALSE
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user