diff options
34 files changed, 743 insertions, 718 deletions
diff --git a/src/nvim/buffer.h b/src/nvim/buffer.h index e62db843c7..9690d58e0b 100644 --- a/src/nvim/buffer.h +++ b/src/nvim/buffer.h @@ -1,6 +1,34 @@ #ifndef NVIM_BUFFER_H #define NVIM_BUFFER_H +/* Values for buflist_getfile() */ +#define GETF_SETMARK 0x01 /* set pcmark before jumping */ +#define GETF_ALT 0x02 /* jumping to alternate file (not buf num) */ +#define GETF_SWITCH 0x04 /* respect 'switchbuf' settings when jumping */ + +/* Values for buflist_new() flags */ +#define BLN_CURBUF 1 /* May re-use curbuf for new buffer */ +#define BLN_LISTED 2 /* Put new buffer in buffer list */ +#define BLN_DUMMY 4 /* Allocating dummy buffer */ + +/* Values for action argument for do_buffer() */ +#define DOBUF_GOTO 0 /* go to specified buffer */ +#define DOBUF_SPLIT 1 /* split window and go to specified buffer */ +#define DOBUF_UNLOAD 2 /* unload specified buffer(s) */ +#define DOBUF_DEL 3 /* delete specified buffer(s) from buflist */ +#define DOBUF_WIPE 4 /* delete specified buffer(s) really */ + +/* Values for start argument for do_buffer() */ +#define DOBUF_CURRENT 0 /* "count" buffer from current buffer */ +#define DOBUF_FIRST 1 /* "count" buffer from first buffer */ +#define DOBUF_LAST 2 /* "count" buffer from last buffer */ +#define DOBUF_MOD 3 /* "count" mod. buffer from current buffer */ + +/* flags for buf_freeall() */ +#define BFA_DEL 1 /* buffer is going to be deleted */ +#define BFA_WIPE 2 /* buffer is going to be wiped out */ +#define BFA_KEEP_UNDO 4 /* do not free undo information */ + #ifdef INCLUDE_GENERATED_DECLARATIONS # include "buffer.h.generated.h" #endif diff --git a/src/nvim/charset.h b/src/nvim/charset.h index 78d6f2a76c..995ad123ae 100644 --- a/src/nvim/charset.h +++ b/src/nvim/charset.h @@ -1,6 +1,14 @@ #ifndef NVIM_CHARSET_H #define NVIM_CHARSET_H +/* + * Flags for chartab[]. + */ +#define CT_CELL_MASK 0x07 /* mask: nr of display cells (1, 2 or 4) */ +#define CT_PRINT_CHAR 0x10 /* flag: set for printable chars */ +#define CT_ID_CHAR 0x20 /* flag: set for ID chars */ +#define CT_FNAME_CHAR 0x40 /* flag: set for file name chars */ + #ifdef INCLUDE_GENERATED_DECLARATIONS # include "charset.h.generated.h" #endif diff --git a/src/nvim/edit.h b/src/nvim/edit.h index 52b8ae923b..0289b2c3a6 100644 --- a/src/nvim/edit.h +++ b/src/nvim/edit.h @@ -14,6 +14,34 @@ typedef int (*IndentGetter)(void); +/* Values for in_cinkeys() */ +#define KEY_OPEN_FORW 0x101 +#define KEY_OPEN_BACK 0x102 +#define KEY_COMPLETE 0x103 /* end of completion */ + +/* Values for change_indent() */ +#define INDENT_SET 1 /* set indent */ +#define INDENT_INC 2 /* increase indent */ +#define INDENT_DEC 3 /* decrease indent */ + +/* flags for beginline() */ +#define BL_WHITE 1 /* cursor on first non-white in the line */ +#define BL_SOL 2 /* use 'sol' option */ +#define BL_FIX 4 /* don't leave cursor on a NUL */ + +/* flags for insertchar() */ +#define INSCHAR_FORMAT 1 /* force formatting */ +#define INSCHAR_DO_COM 2 /* format comments */ +#define INSCHAR_CTRLV 4 /* char typed just after CTRL-V */ +#define INSCHAR_NO_FEX 8 /* don't use 'formatexpr' */ +#define INSCHAR_COM_LIST 16 /* format comments with list/2nd line indent */ + +/* direction for nv_mousescroll() and ins_mousescroll() */ +#define MSCR_DOWN 0 /* DOWN must be FALSE */ +#define MSCR_UP 1 +#define MSCR_LEFT -1 +#define MSCR_RIGHT -2 + #ifdef INCLUDE_GENERATED_DECLARATIONS # include "edit.h.generated.h" #endif diff --git a/src/nvim/eval.c b/src/nvim/eval.c index 8db50d6517..5216c7fb28 100644 --- a/src/nvim/eval.c +++ b/src/nvim/eval.c @@ -88,6 +88,9 @@ #define DO_NOT_FREE_CNT 99999 /* refcount for dict or list that should not be freed. */ +#define AUTOLOAD_CHAR '#' /* Character used as separator in autoload + function/variable names. */ + /* * In a hashtab item "hi_key" points to "di_key" in a dictitem. * This avoids adding a pointer to the hashtab item. diff --git a/src/nvim/eval.h b/src/nvim/eval.h index 7daea8fc71..66953faeb7 100644 --- a/src/nvim/eval.h +++ b/src/nvim/eval.h @@ -1,6 +1,70 @@ #ifndef NVIM_EVAL_H #define NVIM_EVAL_H +/* Defines for Vim variables. These must match vimvars[] in eval.c! */ +enum { + VV_COUNT, + VV_COUNT1, + VV_PREVCOUNT, + VV_ERRMSG, + VV_WARNINGMSG, + VV_STATUSMSG, + VV_SHELL_ERROR, + VV_THIS_SESSION, + VV_VERSION, + VV_LNUM, + VV_TERMRESPONSE, + VV_FNAME, + VV_LANG, + VV_LC_TIME, + VV_CTYPE, + VV_CC_FROM, + VV_CC_TO, + VV_FNAME_IN, + VV_FNAME_OUT, + VV_FNAME_NEW, + VV_FNAME_DIFF, + VV_CMDARG, + VV_FOLDSTART, + VV_FOLDEND, + VV_FOLDDASHES, + VV_FOLDLEVEL, + VV_PROGNAME, + VV_SEND_SERVER, + VV_DYING, + VV_EXCEPTION, + VV_THROWPOINT, + VV_REG, + VV_CMDBANG, + VV_INSERTMODE, + VV_VAL, + VV_KEY, + VV_PROFILING, + VV_FCS_REASON, + VV_FCS_CHOICE, + VV_BEVAL_BUFNR, + VV_BEVAL_WINNR, + VV_BEVAL_LNUM, + VV_BEVAL_COL, + VV_BEVAL_TEXT, + VV_SCROLLSTART, + VV_SWAPNAME, + VV_SWAPCHOICE, + VV_SWAPCOMMAND, + VV_CHAR, + VV_MOUSE_WIN, + VV_MOUSE_LNUM, + VV_MOUSE_COL, + VV_OP, + VV_SEARCHFORWARD, + VV_HLSEARCH, + VV_OLDFILES, + VV_WINDOWID, + VV_PROGPATH, + VV_JOB_DATA, + VV_LEN, /* number of v: vars */ +}; + #ifdef INCLUDE_GENERATED_DECLARATIONS # include "eval.h.generated.h" #endif diff --git a/src/nvim/ex_cmds.h b/src/nvim/ex_cmds.h index 1e7c85b2ba..eabbbd15ac 100644 --- a/src/nvim/ex_cmds.h +++ b/src/nvim/ex_cmds.h @@ -3,6 +3,25 @@ #include <stdbool.h> +/* flags for do_ecmd() */ +#define ECMD_HIDE 0x01 /* don't free the current buffer */ +#define ECMD_SET_HELP 0x02 /* set b_help flag of (new) buffer before + opening file */ +#define ECMD_OLDBUF 0x04 /* use existing buffer if it exists */ +#define ECMD_FORCEIT 0x08 /* ! used in Ex command */ +#define ECMD_ADDBUF 0x10 /* don't edit, just add to buffer list */ + +/* for lnum argument in do_ecmd() */ +#define ECMD_LASTL (linenr_T)0 /* use last position in loaded file */ +#define ECMD_LAST (linenr_T)-1 /* use last position in all files */ +#define ECMD_ONE (linenr_T)1 /* use first line */ + +/* flags for read_viminfo() and children */ +#define VIF_WANT_INFO 1 /* load non-mark info */ +#define VIF_WANT_MARKS 2 /* load file marks */ +#define VIF_FORCEIT 4 /* overwrite info already read */ +#define VIF_GET_OLDFILES 8 /* load v:oldfiles */ + #ifdef INCLUDE_GENERATED_DECLARATIONS # include "ex_cmds.h.generated.h" #endif diff --git a/src/nvim/ex_cmds2.h b/src/nvim/ex_cmds2.h index 7022591501..0a164cdeb8 100644 --- a/src/nvim/ex_cmds2.h +++ b/src/nvim/ex_cmds2.h @@ -7,6 +7,20 @@ typedef void (*DoInRuntimepathCB)(char_u *, void *); +/* + * flags for check_changed() + */ +#define CCGD_AW 1 /* do autowrite if buffer was changed */ +#define CCGD_MULTWIN 2 /* check also when several wins for the buf */ +#define CCGD_FORCEIT 4 /* ! used */ +#define CCGD_ALLBUF 8 /* may write all buffers */ +#define CCGD_EXCMD 16 /* may suggest using ! */ + +/* last argument for do_source() */ +#define DOSO_NONE 0 +#define DOSO_VIMRC 1 /* loading vimrc file */ +#define DOSO_GVIMRC 2 /* loading gvimrc file */ + #ifdef INCLUDE_GENERATED_DECLARATIONS # include "ex_cmds2.h.generated.h" #endif diff --git a/src/nvim/ex_cmds_defs.h b/src/nvim/ex_cmds_defs.h index 55476cd90d..1edc1bb8c6 100644 --- a/src/nvim/ex_cmds_defs.h +++ b/src/nvim/ex_cmds_defs.h @@ -70,6 +70,11 @@ typedef struct exarg exarg_T; #endif +/* behavior for bad character, "++bad=" argument */ +#define BAD_REPLACE '?' /* replace it with '?' (default) */ +#define BAD_KEEP -1 /* leave it */ +#define BAD_DROP -2 /* erase it */ + /* * This array maps ex command names to command codes. * The order in which command names are listed below is significant -- diff --git a/src/nvim/ex_docmd.h b/src/nvim/ex_docmd.h index 7825fcd4fb..cd3ef2738d 100644 --- a/src/nvim/ex_docmd.h +++ b/src/nvim/ex_docmd.h @@ -1,6 +1,22 @@ #ifndef NVIM_EX_DOCMD_H #define NVIM_EX_DOCMD_H +/* flags for do_cmdline() */ +#define DOCMD_VERBOSE 0x01 /* included command in error message */ +#define DOCMD_NOWAIT 0x02 /* don't call wait_return() and friends */ +#define DOCMD_REPEAT 0x04 /* repeat exec. until getline() returns NULL */ +#define DOCMD_KEYTYPED 0x08 /* don't reset KeyTyped */ +#define DOCMD_EXCRESET 0x10 /* reset exception environment (for debugging)*/ +#define DOCMD_KEEPLINE 0x20 /* keep typed line for repeating with "." */ + +/* defines for eval_vars() */ +#define VALID_PATH 1 +#define VALID_HEAD 2 + +/* Values for exmode_active (0 is no exmode) */ +#define EXMODE_NORMAL 1 +#define EXMODE_VIM 2 + typedef char_u *(*LineGetter)(int, void *, int); #ifdef INCLUDE_GENERATED_DECLARATIONS diff --git a/src/nvim/ex_getln.c b/src/nvim/ex_getln.c index 80faecf481..ad0bcdc150 100644 --- a/src/nvim/ex_getln.c +++ b/src/nvim/ex_getln.c @@ -3002,6 +3002,7 @@ char_u *vim_strsave_fnameescape(char_u *fname, int shell) FUNC_ATTR_NONNULL_RET { char_u *p; #ifdef BACKSLASH_IN_FILENAME +#define PATH_ESC_CHARS ((char_u *)" \t\n*?[{`%#'\"|!<") char_u buf[20]; int j = 0; @@ -3012,6 +3013,8 @@ char_u *vim_strsave_fnameescape(char_u *fname, int shell) FUNC_ATTR_NONNULL_RET buf[j] = NUL; p = vim_strsave_escaped(fname, buf); #else +#define PATH_ESC_CHARS ((char_u *)" \t\n*?[{`$\\%#'\"|!<") +#define SHELL_ESC_CHARS ((char_u *)" \t\n*?[{`$\\%#'\"|!<>();&") p = vim_strsave_escaped(fname, shell ? SHELL_ESC_CHARS : PATH_ESC_CHARS); if (shell && csh_like_shell()) { /* For csh and similar shells need to put two backslashes before '!'. diff --git a/src/nvim/ex_getln.h b/src/nvim/ex_getln.h index 6175c30924..2b82f934d5 100644 --- a/src/nvim/ex_getln.h +++ b/src/nvim/ex_getln.h @@ -23,6 +23,16 @@ #define WILD_ESCAPE 128 #define WILD_ICASE 256 +/* + * There are four history tables: + */ +#define HIST_CMD 0 /* colon commands */ +#define HIST_SEARCH 1 /* search commands */ +#define HIST_EXPR 2 /* expressions (from entering = register) */ +#define HIST_INPUT 3 /* input() lines */ +#define HIST_DEBUG 4 /* debug commands */ +#define HIST_COUNT 5 /* number of history tables */ + typedef char_u *(*CompleteListItemGetter)(expand_T *, int); #ifdef INCLUDE_GENERATED_DECLARATIONS diff --git a/src/nvim/fileio.h b/src/nvim/fileio.h index 399d93d77c..7e4ced554d 100644 --- a/src/nvim/fileio.h +++ b/src/nvim/fileio.h @@ -4,6 +4,104 @@ #include "nvim/buffer_defs.h" #include "nvim/os/os.h" +/* Values for readfile() flags */ +#define READ_NEW 0x01 /* read a file into a new buffer */ +#define READ_FILTER 0x02 /* read filter output */ +#define READ_STDIN 0x04 /* read from stdin */ +#define READ_BUFFER 0x08 /* read from curbuf (converting stdin) */ +#define READ_DUMMY 0x10 /* reading into a dummy buffer */ +#define READ_KEEP_UNDO 0x20 /* keep undo info*/ + +/* + * Events for autocommands. + */ +typedef enum auto_event { + EVENT_BUFADD = 0, /* after adding a buffer to the buffer list */ + EVENT_BUFNEW, /* after creating any buffer */ + EVENT_BUFDELETE, /* deleting a buffer from the buffer list */ + EVENT_BUFWIPEOUT, /* just before really deleting a buffer */ + EVENT_BUFENTER, /* after entering a buffer */ + EVENT_BUFFILEPOST, /* after renaming a buffer */ + EVENT_BUFFILEPRE, /* before renaming a buffer */ + EVENT_BUFLEAVE, /* before leaving a buffer */ + EVENT_BUFNEWFILE, /* when creating a buffer for a new file */ + EVENT_BUFREADPOST, /* after reading a buffer */ + EVENT_BUFREADPRE, /* before reading a buffer */ + EVENT_BUFREADCMD, /* read buffer using command */ + EVENT_BUFUNLOAD, /* just before unloading a buffer */ + EVENT_BUFHIDDEN, /* just after buffer becomes hidden */ + EVENT_BUFWINENTER, /* after showing a buffer in a window */ + EVENT_BUFWINLEAVE, /* just after buffer removed from window */ + EVENT_BUFWRITEPOST, /* after writing a buffer */ + EVENT_BUFWRITEPRE, /* before writing a buffer */ + EVENT_BUFWRITECMD, /* write buffer using command */ + EVENT_CMDWINENTER, /* after entering the cmdline window */ + EVENT_CMDWINLEAVE, /* before leaving the cmdline window */ + EVENT_COLORSCHEME, /* after loading a colorscheme */ + EVENT_COMPLETEDONE, /* after finishing insert complete */ + EVENT_FILEAPPENDPOST, /* after appending to a file */ + EVENT_FILEAPPENDPRE, /* before appending to a file */ + EVENT_FILEAPPENDCMD, /* append to a file using command */ + EVENT_FILECHANGEDSHELL, /* after shell command that changed file */ + EVENT_FILECHANGEDSHELLPOST, /* after (not) reloading changed file */ + EVENT_FILECHANGEDRO, /* before first change to read-only file */ + EVENT_FILEREADPOST, /* after reading a file */ + EVENT_FILEREADPRE, /* before reading a file */ + EVENT_FILEREADCMD, /* read from a file using command */ + EVENT_FILETYPE, /* new file type detected (user defined) */ + EVENT_FILEWRITEPOST, /* after writing a file */ + EVENT_FILEWRITEPRE, /* before writing a file */ + EVENT_FILEWRITECMD, /* write to a file using command */ + EVENT_FILTERREADPOST, /* after reading from a filter */ + EVENT_FILTERREADPRE, /* before reading from a filter */ + EVENT_FILTERWRITEPOST, /* after writing to a filter */ + EVENT_FILTERWRITEPRE, /* before writing to a filter */ + EVENT_FOCUSGAINED, /* got the focus */ + EVENT_FOCUSLOST, /* lost the focus to another app */ + EVENT_GUIENTER, /* after starting the GUI */ + EVENT_GUIFAILED, /* after starting the GUI failed */ + EVENT_INSERTCHANGE, /* when changing Insert/Replace mode */ + EVENT_INSERTENTER, /* when entering Insert mode */ + EVENT_INSERTLEAVE, /* when leaving Insert mode */ + EVENT_JOBACTIVITY, /* when job sent some data */ + EVENT_MENUPOPUP, /* just before popup menu is displayed */ + EVENT_QUICKFIXCMDPOST, /* after :make, :grep etc. */ + EVENT_QUICKFIXCMDPRE, /* before :make, :grep etc. */ + EVENT_QUITPRE, /* before :quit */ + EVENT_SESSIONLOADPOST, /* after loading a session file */ + EVENT_STDINREADPOST, /* after reading from stdin */ + EVENT_STDINREADPRE, /* before reading from stdin */ + EVENT_SYNTAX, /* syntax selected */ + EVENT_TERMCHANGED, /* after changing 'term' */ + EVENT_TERMRESPONSE, /* after setting "v:termresponse" */ + EVENT_USER, /* user defined autocommand */ + EVENT_VIMENTER, /* after starting Vim */ + EVENT_VIMLEAVE, /* before exiting Vim */ + EVENT_VIMLEAVEPRE, /* before exiting Vim and writing .viminfo */ + EVENT_VIMRESIZED, /* after Vim window was resized */ + EVENT_WINENTER, /* after entering a window */ + EVENT_WINLEAVE, /* before leaving a window */ + EVENT_ENCODINGCHANGED, /* after changing the 'encoding' option */ + EVENT_INSERTCHARPRE, /* before inserting a char */ + EVENT_CURSORHOLD, /* cursor in same position for a while */ + EVENT_CURSORHOLDI, /* idem, in Insert mode */ + EVENT_FUNCUNDEFINED, /* if calling a function which doesn't exist */ + EVENT_REMOTEREPLY, /* upon string reception from a remote vim */ + EVENT_SWAPEXISTS, /* found existing swap file */ + EVENT_SOURCEPRE, /* before sourcing a Vim script */ + EVENT_SOURCECMD, /* sourcing a Vim script using command */ + EVENT_SPELLFILEMISSING, /* spell file missing */ + EVENT_CURSORMOVED, /* cursor was moved */ + EVENT_CURSORMOVEDI, /* cursor was moved in Insert mode */ + EVENT_TABLEAVE, /* before leaving a tab page */ + EVENT_TABENTER, /* after entering a tab page */ + EVENT_SHELLCMDPOST, /* after ":!cmd" */ + EVENT_SHELLFILTERPOST, /* after ":1,2!cmd", ":w !cmd", ":r !cmd". */ + EVENT_TEXTCHANGED, /* text was modified */ + EVENT_TEXTCHANGEDI, /* text was modified in Insert mode*/ + NUM_EVENTS /* MUST be the last one */ +} event_T; + /* * Struct to save values in before executing autocommands for a buffer that is * not the current buffer. diff --git a/src/nvim/getchar.h b/src/nvim/getchar.h index 802201c4e1..bdf65909b6 100644 --- a/src/nvim/getchar.h +++ b/src/nvim/getchar.h @@ -1,6 +1,17 @@ #ifndef NVIM_GETCHAR_H #define NVIM_GETCHAR_H +/* Values for "noremap" argument of ins_typebuf(). Also used for + * map->m_noremap and menu->noremap[]. */ +#define REMAP_YES 0 /* allow remapping */ +#define REMAP_NONE -1 /* no remapping */ +#define REMAP_SCRIPT -2 /* remap script-local mappings only */ +#define REMAP_SKIP -3 /* no remapping for first char */ + +#define KEYLEN_PART_KEY -1 /* keylen value for incomplete key-code */ +#define KEYLEN_PART_MAP -2 /* keylen value for incomplete mapping */ +#define KEYLEN_REMOVED 9999 /* keylen value for removed sequence */ + #ifdef INCLUDE_GENERATED_DECLARATIONS # include "getchar.h.generated.h" #endif diff --git a/src/nvim/globals.h b/src/nvim/globals.h index ceb0953d14..871674907b 100644 --- a/src/nvim/globals.h +++ b/src/nvim/globals.h @@ -18,6 +18,11 @@ * definition of global variables */ +/* Values for "starting" */ +#define NO_SCREEN 2 /* no screen updating yet */ +#define NO_BUFFERS 1 /* not all buffers loaded yet */ +/* 0 not starting anymore */ + /* * Number of Rows and Columns in the screen. * Must be long to be able to use them as options in option.c. @@ -33,6 +38,12 @@ EXTERN long Rows /* nr of rows in the screen */ EXTERN long Columns INIT(= 80); /* nr of columns in the screen */ /* + * The characters and attributes cached for the screen. + */ +typedef char_u schar_T; +typedef unsigned short sattr_T; + +/* * The characters that are currently on the screen are kept in ScreenLines[]. * It is a single block of characters, the size of the screen plus one line. * The attributes for those characters are kept in ScreenAttrs[]. @@ -212,6 +223,11 @@ EXTERN int ex_nesting_level INIT(= 0); /* nesting level */ EXTERN int debug_break_level INIT(= -1); /* break below this level */ EXTERN int debug_did_msg INIT(= FALSE); /* did "debug mode" message */ EXTERN int debug_tick INIT(= 0); /* breakpoint change count */ + +/* Values for "do_profiling". */ +#define PROF_NONE 0 /* profiling not started */ +#define PROF_YES 1 /* profiling busy */ +#define PROF_PAUSED 2 /* profiling paused */ EXTERN int do_profiling INIT(= PROF_NONE); /* PROF_ values */ /* @@ -297,6 +313,14 @@ EXTERN int may_garbage_collect INIT(= FALSE); EXTERN int want_garbage_collect INIT(= FALSE); EXTERN int garbage_collect_at_exit INIT(= FALSE); +/* Special values for current_SID. */ +#define SID_MODELINE -1 /* when using a modeline */ +#define SID_CMDARG -2 /* for "--cmd" argument */ +#define SID_CARG -3 /* for "-c" argument */ +#define SID_ENV -4 /* for sourcing environment variable */ +#define SID_ERROR -5 /* option was reset because of an error */ +#define SID_NONE -6 /* don't set scriptID */ + /* ID of script being sourced or was sourced to define the current function. */ EXTERN scid_T current_SID INIT(= 0); @@ -326,6 +350,65 @@ EXTERN int did_check_timestamps INIT(= FALSE); /* did check timestamps recently */ EXTERN int no_check_timestamps INIT(= 0); /* Don't check timestamps */ +/* + * Values for index in highlight_attr[]. + * When making changes, also update HL_FLAGS below! And update the default + * value of 'highlight' in option.c. + */ +typedef enum { + HLF_8 = 0 /* Meta & special keys listed with ":map", text that is + displayed different from what it is */ + , HLF_AT /* @ and ~ characters at end of screen, characters that + don't really exist in the text */ + , HLF_D /* directories in CTRL-D listing */ + , HLF_E /* error messages */ + , HLF_I /* incremental search */ + , HLF_L /* last search string */ + , HLF_M /* "--More--" message */ + , HLF_CM /* Mode (e.g., "-- INSERT --") */ + , HLF_N /* line number for ":number" and ":#" commands */ + , HLF_CLN /* current line number */ + , HLF_R /* return to continue message and yes/no questions */ + , HLF_S /* status lines */ + , HLF_SNC /* status lines of not-current windows */ + , HLF_C /* column to separate vertically split windows */ + , HLF_T /* Titles for output from ":set all", ":autocmd" etc. */ + , HLF_V /* Visual mode */ + , HLF_VNC /* Visual mode, autoselecting and not clipboard owner */ + , HLF_W /* warning messages */ + , HLF_WM /* Wildmenu highlight */ + , HLF_FL /* Folded line */ + , HLF_FC /* Fold column */ + , HLF_ADD /* Added diff line */ + , HLF_CHD /* Changed diff line */ + , HLF_DED /* Deleted diff line */ + , HLF_TXD /* Text Changed in diff line */ + , HLF_CONCEAL /* Concealed text */ + , HLF_SC /* Sign column */ + , HLF_SPB /* SpellBad */ + , HLF_SPC /* SpellCap */ + , HLF_SPR /* SpellRare */ + , HLF_SPL /* SpellLocal */ + , HLF_PNI /* popup menu normal item */ + , HLF_PSI /* popup menu selected item */ + , HLF_PSB /* popup menu scrollbar */ + , HLF_PST /* popup menu scrollbar thumb */ + , HLF_TP /* tabpage line */ + , HLF_TPS /* tabpage line selected */ + , HLF_TPF /* tabpage line filler */ + , HLF_CUC /* 'cursurcolumn' */ + , HLF_CUL /* 'cursurline' */ + , HLF_MC /* 'colorcolumn' */ + , HLF_COUNT /* MUST be the last one */ +} hlf_T; + +/* The HL_FLAGS must be in the same order as the HLF_ enums! + * When changing this also adjust the default for 'highlight'. */ +#define HL_FLAGS {'8', '@', 'd', 'e', 'i', 'l', 'm', 'M', 'n', 'N', 'r', 's', \ + 'S', 'c', 't', 'v', 'V', 'w', 'W', 'f', 'F', 'A', 'C', 'D', \ + 'T', '-', '>', 'B', 'P', 'R', 'L', '+', '=', 'x', 'X', '*', \ + '#', '_', '!', '.', 'o'} + EXTERN int highlight_attr[HLF_COUNT]; /* Highl. attr for each context. */ # define USER_HIGHLIGHT #ifdef USER_HIGHLIGHT @@ -728,6 +811,12 @@ EXTERN int msg_silent INIT(= 0); /* don't print messages */ EXTERN int emsg_silent INIT(= 0); /* don't print error messages */ EXTERN int cmd_silent INIT(= FALSE); /* don't echo the command line */ +/* Values for swap_exists_action: what to do when swap file already exists */ +#define SEA_NONE 0 /* don't use dialog */ +#define SEA_DIALOG 1 /* use dialog when possible */ +#define SEA_QUIT 2 /* quit editing the file */ +#define SEA_RECOVER 3 /* recover the file */ + #define HAS_SWAP_EXISTS_ACTION EXTERN int swap_exists_action INIT(= SEA_NONE); /* For dialog when swap file already diff --git a/src/nvim/indent.h b/src/nvim/indent.h index 26773a62d8..6552157d20 100644 --- a/src/nvim/indent.h +++ b/src/nvim/indent.h @@ -3,6 +3,11 @@ #include "nvim/vim.h" +/* flags for set_indent() */ +#define SIN_CHANGED 1 /* call changed_bytes() when line changed */ +#define SIN_INSERT 2 /* insert indent before existing text */ +#define SIN_UNDO 4 /* save line for undo before changing it */ + #ifdef INCLUDE_GENERATED_DECLARATIONS # include "indent.h.generated.h" #endif diff --git a/src/nvim/macros.h b/src/nvim/macros.h index 93ae72987c..fab4f548c8 100644 --- a/src/nvim/macros.h +++ b/src/nvim/macros.h @@ -97,6 +97,16 @@ */ #define vim_isbreak(c) (breakat_flags[(char_u)(c)]) +#ifdef BINARY_FILE_IO +# define WRITEBIN "wb" /* no CR-LF translation */ +# define READBIN "rb" +# define APPENDBIN "ab" +#else +# define WRITEBIN "w" +# define READBIN "r" +# define APPENDBIN "a" +#endif + # define mch_fopen(n, p) fopen((n), (p)) # define mch_open(n, m, p) open((n), (m), (p)) diff --git a/src/nvim/mbyte.h b/src/nvim/mbyte.h index d52f174152..0cfe2c4bab 100644 --- a/src/nvim/mbyte.h +++ b/src/nvim/mbyte.h @@ -3,6 +3,31 @@ #include <stdbool.h> +/* + * Return byte length of character that starts with byte "b". + * Returns 1 for a single-byte character. + * MB_BYTE2LEN_CHECK() can be used to count a special key as one byte. + * Don't call MB_BYTE2LEN(b) with b < 0 or b > 255! + */ +#define MB_BYTE2LEN(b) mb_bytelen_tab[b] +#define MB_BYTE2LEN_CHECK(b) (((b) < 0 || (b) > 255) ? 1 : mb_bytelen_tab[b]) + +/* properties used in enc_canon_table[] (first three mutually exclusive) */ +#define ENC_8BIT 0x01 +#define ENC_DBCS 0x02 +#define ENC_UNICODE 0x04 + +#define ENC_ENDIAN_B 0x10 /* Unicode: Big endian */ +#define ENC_ENDIAN_L 0x20 /* Unicode: Little endian */ + +#define ENC_2BYTE 0x40 /* Unicode: UCS-2 */ +#define ENC_4BYTE 0x80 /* Unicode: UCS-4 */ +#define ENC_2WORD 0x100 /* Unicode: UTF-16 */ + +#define ENC_LATIN1 0x200 /* Latin1 */ +#define ENC_LATIN9 0x400 /* Latin9 */ +#define ENC_MACROMAN 0x800 /* Mac Roman (not Macro Man! :-) */ + #ifdef INCLUDE_GENERATED_DECLARATIONS # include "mbyte.h.generated.h" #endif diff --git a/src/nvim/memfile.h b/src/nvim/memfile.h index 94722171d7..3e71853326 100644 --- a/src/nvim/memfile.h +++ b/src/nvim/memfile.h @@ -4,6 +4,12 @@ #include "nvim/buffer_defs.h" #include "nvim/memfile_defs.h" +/* flags for mf_sync() */ +#define MFS_ALL 1 /* also sync blocks with negative numbers */ +#define MFS_STOP 2 /* stop syncing when a character is available */ +#define MFS_FLUSH 4 /* flushed file to disk */ +#define MFS_ZERO 8 /* only write block 0 */ + #ifdef INCLUDE_GENERATED_DECLARATIONS # include "memfile.h.generated.h" #endif diff --git a/src/nvim/message.c b/src/nvim/message.c index b026976626..dea02e21fa 100644 --- a/src/nvim/message.c +++ b/src/nvim/message.c @@ -25,6 +25,7 @@ #include "nvim/charset.h" #include "nvim/eval.h" #include "nvim/ex_eval.h" +#include "nvim/ex_docmd.h" #include "nvim/fileio.h" #include "nvim/func_attr.h" #include "nvim/getchar.h" @@ -58,6 +59,10 @@ struct msgchunk_S { char_u sb_text[1]; /* text to be displayed, actually longer */ }; +/* Magic chars used in confirm dialog strings */ +#define DLG_BUTTON_SEP '\n' +#define DLG_HOTKEY_CHAR '&' + static int confirm_msg_used = FALSE; /* displaying confirm_msg */ #ifdef INCLUDE_GENERATED_DECLARATIONS # include "message.c.generated.h" diff --git a/src/nvim/message.h b/src/nvim/message.h index 6e6b57d12e..f04005a7ad 100644 --- a/src/nvim/message.h +++ b/src/nvim/message.h @@ -3,6 +3,25 @@ #include <stdbool.h> +/* + * Types of dialogs passed to do_dialog(). + */ +#define VIM_GENERIC 0 +#define VIM_ERROR 1 +#define VIM_WARNING 2 +#define VIM_INFO 3 +#define VIM_QUESTION 4 +#define VIM_LAST_TYPE 4 /* sentinel value */ + +/* + * Return values for functions like vim_dialogyesno() + */ +#define VIM_YES 2 +#define VIM_NO 3 +#define VIM_CANCEL 4 +#define VIM_ALL 5 +#define VIM_DISCARDALL 6 + #ifdef INCLUDE_GENERATED_DECLARATIONS # include "message.h.generated.h" #endif diff --git a/src/nvim/misc1.h b/src/nvim/misc1.h index ecf378afa4..11891d6f7e 100644 --- a/src/nvim/misc1.h +++ b/src/nvim/misc1.h @@ -3,6 +3,13 @@ #include "nvim/vim.h" +/* flags for open_line() */ +#define OPENLINE_DELSPACES 1 /* delete spaces after cursor */ +#define OPENLINE_DO_COM 2 /* format comments */ +#define OPENLINE_KEEPTRAIL 4 /* keep trailing spaces */ +#define OPENLINE_MARKFIX 8 /* fix mark positions */ +#define OPENLINE_COM_LIST 16 /* format comments with list/2nd line indent */ + #ifdef INCLUDE_GENERATED_DECLARATIONS # include "misc1.h.generated.h" #endif diff --git a/src/nvim/normal.h b/src/nvim/normal.h index e51ce97db3..341da6d473 100644 --- a/src/nvim/normal.h +++ b/src/nvim/normal.h @@ -3,6 +3,11 @@ #include "nvim/pos.h" +/* Values for find_ident_under_cursor() */ +#define FIND_IDENT 1 /* find identifier (word) */ +#define FIND_STRING 2 /* find any string (WORD) */ +#define FIND_EVAL 4 /* include "->", "[]" and "." */ + /* * Arguments for operators. */ diff --git a/src/nvim/ops.h b/src/nvim/ops.h index eecf2075aa..ca70684ab8 100644 --- a/src/nvim/ops.h +++ b/src/nvim/ops.h @@ -7,6 +7,46 @@ typedef int (*Indenter)(void); +/* flags for do_put() */ +#define PUT_FIXINDENT 1 /* make indent look nice */ +#define PUT_CURSEND 2 /* leave cursor after end of new text */ +#define PUT_CURSLINE 4 /* leave cursor on last line of new text */ +#define PUT_LINE 8 /* put register as lines */ +#define PUT_LINE_SPLIT 16 /* split line for linewise register */ +#define PUT_LINE_FORWARD 32 /* put linewise register below Visual sel. */ + +/* + * Operator IDs; The order must correspond to opchars[] in ops.c! + */ +#define OP_NOP 0 /* no pending operation */ +#define OP_DELETE 1 /* "d" delete operator */ +#define OP_YANK 2 /* "y" yank operator */ +#define OP_CHANGE 3 /* "c" change operator */ +#define OP_LSHIFT 4 /* "<" left shift operator */ +#define OP_RSHIFT 5 /* ">" right shift operator */ +#define OP_FILTER 6 /* "!" filter operator */ +#define OP_TILDE 7 /* "g~" switch case operator */ +#define OP_INDENT 8 /* "=" indent operator */ +#define OP_FORMAT 9 /* "gq" format operator */ +#define OP_COLON 10 /* ":" colon operator */ +#define OP_UPPER 11 /* "gU" make upper case operator */ +#define OP_LOWER 12 /* "gu" make lower case operator */ +#define OP_JOIN 13 /* "J" join operator, only for Visual mode */ +#define OP_JOIN_NS 14 /* "gJ" join operator, only for Visual mode */ +#define OP_ROT13 15 /* "g?" rot-13 encoding */ +#define OP_REPLACE 16 /* "r" replace chars, only for Visual mode */ +#define OP_INSERT 17 /* "I" Insert column, only for Visual mode */ +#define OP_APPEND 18 /* "A" Append column, only for Visual mode */ +#define OP_FOLD 19 /* "zf" define a fold */ +#define OP_FOLDOPEN 20 /* "zo" open folds */ +#define OP_FOLDOPENREC 21 /* "zO" open folds recursively */ +#define OP_FOLDCLOSE 22 /* "zc" close folds */ +#define OP_FOLDCLOSEREC 23 /* "zC" close folds recursively */ +#define OP_FOLDDEL 24 /* "zd" delete folds */ +#define OP_FOLDDELREC 25 /* "zD" delete folds recursively */ +#define OP_FORMAT2 26 /* "gw" format operator, keeps cursor pos */ +#define OP_FUNCTION 27 /* "g@" call 'operatorfunc' */ + #ifdef INCLUDE_GENERATED_DECLARATIONS # include "ops.h.generated.h" #endif diff --git a/src/nvim/option.h b/src/nvim/option.h index fd1f7f8d42..5c2b2662b5 100644 --- a/src/nvim/option.h +++ b/src/nvim/option.h @@ -1,6 +1,23 @@ #ifndef NVIM_OPTION_H #define NVIM_OPTION_H +/* flags for buf_copy_options() */ +#define BCO_ENTER 1 /* going to enter the buffer */ +#define BCO_ALWAYS 2 /* always copy the options */ +#define BCO_NOHELP 4 /* don't touch the help related options */ + +/* + * "flags" values for option-setting functions. + * When OPT_GLOBAL and OPT_LOCAL are both missing, set both local and global + * values, get local value. + */ +#define OPT_FREE 1 /* free old value if it was allocated */ +#define OPT_GLOBAL 2 /* use global value */ +#define OPT_LOCAL 4 /* use local value */ +#define OPT_MODELINE 8 /* option in modeline */ +#define OPT_WINONLY 16 /* only set window-local options */ +#define OPT_NOWIN 32 /* don't set window-local options */ + #ifdef INCLUDE_GENERATED_DECLARATIONS # include "option.h.generated.h" #endif diff --git a/src/nvim/os_unix.h b/src/nvim/os_unix.h index 3c2f1603b3..5610fe68eb 100644 --- a/src/nvim/os_unix.h +++ b/src/nvim/os_unix.h @@ -3,6 +3,12 @@ #include "nvim/os/shell.h" +/* Values returned by mch_nodetype() */ +#define NODE_NORMAL 0 /* file or directory, check with os_isdir()*/ +#define NODE_WRITABLE 1 /* something we can write to (character + device, fifo, socket, ..) */ +#define NODE_OTHER 2 /* non-writable thing (e.g., block device) */ + #ifdef INCLUDE_GENERATED_DECLARATIONS # include "os_unix.h.generated.h" #endif diff --git a/src/nvim/quickfix.h b/src/nvim/quickfix.h index c3b7d714c7..bb9c2c3193 100644 --- a/src/nvim/quickfix.h +++ b/src/nvim/quickfix.h @@ -1,6 +1,10 @@ #ifndef NVIM_QUICKFIX_H #define NVIM_QUICKFIX_H +/* flags for skip_vimgrep_pat() */ +#define VGR_GLOBAL 1 +#define VGR_NOJUMP 2 + #ifdef INCLUDE_GENERATED_DECLARATIONS # include "quickfix.h.generated.h" #endif diff --git a/src/nvim/regexp.h b/src/nvim/regexp.h index 9be0e562c7..1af01fe411 100644 --- a/src/nvim/regexp.h +++ b/src/nvim/regexp.h @@ -1,5 +1,15 @@ #ifndef NVIM_REGEXP_H #define NVIM_REGEXP_H + +/* Second argument for vim_regcomp(). */ +#define RE_MAGIC 1 /* 'magic' option */ +#define RE_STRING 2 /* match in string instead of buffer text */ +#define RE_STRICT 4 /* don't allow [abc] without ] */ + +/* values for reg_do_extmatch */ +#define REX_SET 1 /* to allow \z\(...\), */ +#define REX_USE 2 /* to allow \z\1 et al. */ + /* regexp.c */ #ifdef INCLUDE_GENERATED_DECLARATIONS # include "regexp.h.generated.h" diff --git a/src/nvim/search.h b/src/nvim/search.h index c608aa4a4c..1bcde2c7ab 100644 --- a/src/nvim/search.h +++ b/src/nvim/search.h @@ -12,6 +12,33 @@ #define ACTION_SHOW_ALL 4 #define ACTION_EXPAND 5 +/* Values for 'options' argument in do_search() and searchit() */ +#define SEARCH_REV 0x01 /* go in reverse of previous dir. */ +#define SEARCH_ECHO 0x02 /* echo the search command and handle options */ +#define SEARCH_MSG 0x0c /* give messages (yes, it's not 0x04) */ +#define SEARCH_NFMSG 0x08 /* give all messages except not found */ +#define SEARCH_OPT 0x10 /* interpret optional flags */ +#define SEARCH_HIS 0x20 /* put search pattern in history */ +#define SEARCH_END 0x40 /* put cursor at end of match */ +#define SEARCH_NOOF 0x80 /* don't add offset to position */ +#define SEARCH_START 0x100 /* start search without col offset */ +#define SEARCH_MARK 0x200 /* set previous context mark */ +#define SEARCH_KEEP 0x400 /* keep previous search pattern */ +#define SEARCH_PEEK 0x800 /* peek for typed char, cancel search */ + +/* Values for flags argument for findmatchlimit() */ +#define FM_BACKWARD 0x01 /* search backwards */ +#define FM_FORWARD 0x02 /* search forwards */ +#define FM_BLOCKSTOP 0x04 /* stop at start/end of block */ +#define FM_SKIPCOMM 0x08 /* skip comments */ + +/* Values for sub_cmd and which_pat argument for search_regcomp() */ +/* Also used for which_pat argument for searchit() */ +#define RE_SEARCH 0 /* save/use pat in/from search_pattern */ +#define RE_SUBST 1 /* save/use pat in/from subst_pattern */ +#define RE_BOTH 2 /* save pat in both patterns */ +#define RE_LAST 2 /* use last used pattern if "pat" is NULL */ + #ifdef INCLUDE_GENERATED_DECLARATIONS # include "search.h.generated.h" #endif diff --git a/src/nvim/syntax.h b/src/nvim/syntax.h index d9301267a8..a03bd1e604 100644 --- a/src/nvim/syntax.h +++ b/src/nvim/syntax.h @@ -11,14 +11,34 @@ typedef int guicolor_T; * Terminal highlighting attribute bits. * Attributes above HL_ALL are used for syntax highlighting. */ -#define HL_NORMAL 0x00 -#define HL_INVERSE 0x01 -#define HL_BOLD 0x02 -#define HL_ITALIC 0x04 -#define HL_UNDERLINE 0x08 -#define HL_UNDERCURL 0x10 -#define HL_STANDOUT 0x20 -#define HL_ALL 0x3f +#define HL_NORMAL 0x00 +#define HL_INVERSE 0x01 +#define HL_BOLD 0x02 +#define HL_ITALIC 0x04 +#define HL_UNDERLINE 0x08 +#define HL_UNDERCURL 0x10 +#define HL_STANDOUT 0x20 +#define HL_ALL 0x3f + +#define HL_CONTAINED 0x01 /* not used on toplevel */ +#define HL_TRANSP 0x02 /* has no highlighting */ +#define HL_ONELINE 0x04 /* match within one line only */ +#define HL_HAS_EOL 0x08 /* end pattern that matches with $ */ +#define HL_SYNC_HERE 0x10 /* sync point after this item (syncing only) */ +#define HL_SYNC_THERE 0x20 /* sync point at current line (syncing only) */ +#define HL_MATCH 0x40 /* use match ID instead of item ID */ +#define HL_SKIPNL 0x80 /* nextgroup can skip newlines */ +#define HL_SKIPWHITE 0x100 /* nextgroup can skip white space */ +#define HL_SKIPEMPTY 0x200 /* nextgroup can skip empty lines */ +#define HL_KEEPEND 0x400 /* end match always kept */ +#define HL_EXCLUDENL 0x800 /* exclude NL from match */ +#define HL_DISPLAY 0x1000 /* only used for displaying, not syncing */ +#define HL_FOLD 0x2000 /* define fold */ +#define HL_EXTEND 0x4000 /* ignore a keepend */ +#define HL_MATCHCONT 0x8000 /* match continued from previous line */ +#define HL_TRANS_CONT 0x10000 /* transparent item without contains arg */ +#define HL_CONCEAL 0x20000 /* can be concealed */ +#define HL_CONCEALENDS 0x40000 /* can be concealed */ #ifdef INCLUDE_GENERATED_DECLARATIONS # include "syntax.h.generated.h" diff --git a/src/nvim/tag.h b/src/nvim/tag.h index c26f6b3388..5d4bcddf94 100644 --- a/src/nvim/tag.h +++ b/src/nvim/tag.h @@ -2,6 +2,37 @@ #define NVIM_TAG_H /* + * Values for do_tag(). + */ +#define DT_TAG 1 /* jump to newer position or same tag again */ +#define DT_POP 2 /* jump to older position */ +#define DT_NEXT 3 /* jump to next match of same tag */ +#define DT_PREV 4 /* jump to previous match of same tag */ +#define DT_FIRST 5 /* jump to first match of same tag */ +#define DT_LAST 6 /* jump to first match of same tag */ +#define DT_SELECT 7 /* jump to selection from list */ +#define DT_HELP 8 /* like DT_TAG, but no wildcards */ +#define DT_JUMP 9 /* jump to new tag or selection from list */ +#define DT_CSCOPE 10 /* cscope find command (like tjump) */ +#define DT_LTAG 11 /* tag using location list */ +#define DT_FREE 99 /* free cached matches */ + +/* + * flags for find_tags(). + */ +#define TAG_HELP 1 /* only search for help tags */ +#define TAG_NAMES 2 /* only return name of tag */ +#define TAG_REGEXP 4 /* use tag pattern as regexp */ +#define TAG_NOIC 8 /* don't always ignore case */ +#define TAG_CSCOPE 16 /* cscope tag */ +#define TAG_VERBOSE 32 /* message verbosity */ +#define TAG_INS_COMP 64 /* Currently doing insert completion */ +#define TAG_KEEP_LANG 128 /* keep current language */ + +#define TAG_MANY 300 /* When finding many tags (for completion), + find up to this many tags */ + +/* * Structure used for get_tagfname(). */ typedef struct { diff --git a/src/nvim/term.h b/src/nvim/term.h index a96a2fd6a6..52c3efcac5 100644 --- a/src/nvim/term.h +++ b/src/nvim/term.h @@ -1,6 +1,61 @@ #ifndef NVIM_TERM_H #define NVIM_TERM_H +/* Size of the buffer used for tgetent(). Unfortunately this is largely + * undocumented, some systems use 1024. Using a buffer that is too small + * causes a buffer overrun and a crash. Use the maximum known value to stay + * on the safe side. */ +#define TBUFSZ 2048 /* buffer size for termcap entry */ + +/* Codes for mouse button events in lower three bits: */ +#define MOUSE_LEFT 0x00 +#define MOUSE_MIDDLE 0x01 +#define MOUSE_RIGHT 0x02 +#define MOUSE_RELEASE 0x03 + +/* bit masks for modifiers: */ +#define MOUSE_SHIFT 0x04 +#define MOUSE_ALT 0x08 +#define MOUSE_CTRL 0x10 + +/* mouse buttons that are handled like a key press (GUI only) */ +/* Note that the scroll wheel keys are inverted: MOUSE_5 scrolls lines up but + * the result of this is that the window moves down, similarly MOUSE_6 scrolls + * columns left but the window moves right. */ +#define MOUSE_4 0x100 /* scroll wheel down */ +#define MOUSE_5 0x200 /* scroll wheel up */ + +#define MOUSE_X1 0x300 /* Mouse-button X1 (6th) */ +#define MOUSE_X2 0x400 /* Mouse-button X2 */ + +#define MOUSE_6 0x500 /* scroll wheel left */ +#define MOUSE_7 0x600 /* scroll wheel right */ + +/* 0x20 is reserved by xterm */ +#define MOUSE_DRAG_XTERM 0x40 + +#define MOUSE_DRAG (0x40 | MOUSE_RELEASE) + +/* Lowest button code for using the mouse wheel (xterm only) */ +#define MOUSEWHEEL_LOW 0x60 + +#define MOUSE_CLICK_MASK 0x03 + +#define NUM_MOUSE_CLICKS(code) \ + (((unsigned)((code) & 0xC0) >> 6) + 1) + +#define SET_NUM_MOUSE_CLICKS(code, num) \ + (code) = ((code) & 0x3f) | ((((num) - 1) & 3) << 6) + +/* Added to mouse column for GUI when 'mousefocus' wants to give focus to a + * window by simulating a click on its status line. We could use up to 128 * + * 128 = 16384 columns, now it's reduced to 10000. */ +#define MOUSE_COLOFF 10000 + +#if defined(UNIX) && defined(HAVE_GETTIMEOFDAY) && defined(HAVE_SYS_TIME_H) +# define CHECK_DOUBLE_CLICK 1 /* Checking for double clicks ourselves. */ +#endif + #ifdef INCLUDE_GENERATED_DECLARATIONS # include "term.h.generated.h" #endif diff --git a/src/nvim/ui.h b/src/nvim/ui.h index b174af9abe..2b1543a918 100644 --- a/src/nvim/ui.h +++ b/src/nvim/ui.h @@ -3,6 +3,27 @@ #include <stdbool.h> +/* + * jump_to_mouse() returns one of first four these values, possibly with + * some of the other three added. + */ +#define IN_UNKNOWN 0 +#define IN_BUFFER 1 +#define IN_STATUS_LINE 2 /* on status or command line */ +#define IN_SEP_LINE 4 /* on vertical separator line */ +#define IN_OTHER_WIN 8 /* in other window but can't go there */ +#define CURSOR_MOVED 0x100 +#define MOUSE_FOLD_CLOSE 0x200 /* clicked on '-' in fold column */ +#define MOUSE_FOLD_OPEN 0x400 /* clicked on '+' in fold column */ + +/* flags for jump_to_mouse() */ +#define MOUSE_FOCUS 0x01 /* need to stay in this window */ +#define MOUSE_MAY_VIS 0x02 /* may start Visual mode */ +#define MOUSE_DID_MOVE 0x04 /* only act when mouse has moved */ +#define MOUSE_SETPOS 0x08 /* only set current mouse position */ +#define MOUSE_MAY_STOP_VIS 0x10 /* may stop Visual mode */ +#define MOUSE_RELEASED 0x20 /* button was released */ + #ifdef INCLUDE_GENERATED_DECLARATIONS # include "ui.h.generated.h" #endif diff --git a/src/nvim/vim.h b/src/nvim/vim.h index edae04812b..583e3384de 100644 --- a/src/nvim/vim.h +++ b/src/nvim/vim.h @@ -55,12 +55,6 @@ Error: configure did not run properly.Check auto/config.log. # define MAXPATHL 256 # endif #endif -#ifdef BACKSLASH_IN_FILENAME -# define PATH_ESC_CHARS ((char_u *)" \t\n*?[{`%#'\"|!<") -#else -# define PATH_ESC_CHARS ((char_u *)" \t\n*?[{`$\\%#'\"|!<") -# define SHELL_ESC_CHARS ((char_u *)" \t\n*?[{`$\\%#'\"|!<>();&") -#endif #define NUMBUFLEN 30 /* length of a buffer to store a number in ASCII */ @@ -69,11 +63,6 @@ Error: configure did not run properly.Check auto/config.log. // For printf() and scanf(), we need to take care of long_u specifically. typedef unsigned long long_u; -/* - * The characters and attributes cached for the screen. - */ -typedef char_u schar_T; -typedef unsigned short sattr_T; # define MAX_TYPENR 65535 /* @@ -220,317 +209,16 @@ enum { EXPAND_SYNTIME, }; -/* Values for exmode_active (0 is no exmode) */ -#define EXMODE_NORMAL 1 -#define EXMODE_VIM 2 #ifdef NO_EXPANDPATH # define gen_expand_wildcards mch_expand_wildcards #endif -# define HL_CONTAINED 0x01 /* not used on toplevel */ -# define HL_TRANSP 0x02 /* has no highlighting */ -# define HL_ONELINE 0x04 /* match within one line only */ -# define HL_HAS_EOL 0x08 /* end pattern that matches with $ */ -# define HL_SYNC_HERE 0x10 /* sync point after this item (syncing only) */ -# define HL_SYNC_THERE 0x20 /* sync point at current line (syncing only) */ -# define HL_MATCH 0x40 /* use match ID instead of item ID */ -# define HL_SKIPNL 0x80 /* nextgroup can skip newlines */ -# define HL_SKIPWHITE 0x100 /* nextgroup can skip white space */ -# define HL_SKIPEMPTY 0x200 /* nextgroup can skip empty lines */ -# define HL_KEEPEND 0x400 /* end match always kept */ -# define HL_EXCLUDENL 0x800 /* exclude NL from match */ -# define HL_DISPLAY 0x1000 /* only used for displaying, not syncing */ -# define HL_FOLD 0x2000 /* define fold */ -# define HL_EXTEND 0x4000 /* ignore a keepend */ -# define HL_MATCHCONT 0x8000 /* match continued from previous line */ -# define HL_TRANS_CONT 0x10000 /* transparent item without contains arg */ -# define HL_CONCEAL 0x20000 /* can be concealed */ -# define HL_CONCEALENDS 0x40000 /* can be concealed */ - -/* Values for 'options' argument in do_search() and searchit() */ -#define SEARCH_REV 0x01 /* go in reverse of previous dir. */ -#define SEARCH_ECHO 0x02 /* echo the search command and handle options */ -#define SEARCH_MSG 0x0c /* give messages (yes, it's not 0x04) */ -#define SEARCH_NFMSG 0x08 /* give all messages except not found */ -#define SEARCH_OPT 0x10 /* interpret optional flags */ -#define SEARCH_HIS 0x20 /* put search pattern in history */ -#define SEARCH_END 0x40 /* put cursor at end of match */ -#define SEARCH_NOOF 0x80 /* don't add offset to position */ -#define SEARCH_START 0x100 /* start search without col offset */ -#define SEARCH_MARK 0x200 /* set previous context mark */ -#define SEARCH_KEEP 0x400 /* keep previous search pattern */ -#define SEARCH_PEEK 0x800 /* peek for typed char, cancel search */ - -/* Values for find_ident_under_cursor() */ -#define FIND_IDENT 1 /* find identifier (word) */ -#define FIND_STRING 2 /* find any string (WORD) */ -#define FIND_EVAL 4 /* include "->", "[]" and "." */ - -/* Values for file_name_in_line() */ -#define FNAME_MESS 1 /* give error message */ -#define FNAME_EXP 2 /* expand to path */ -#define FNAME_HYP 4 /* check for hypertext link */ -#define FNAME_INCL 8 /* apply 'includeexpr' */ -#define FNAME_REL 16 /* ".." and "./" are relative to the (current) - file instead of the current directory */ - -/* Values for buflist_getfile() */ -#define GETF_SETMARK 0x01 /* set pcmark before jumping */ -#define GETF_ALT 0x02 /* jumping to alternate file (not buf num) */ -#define GETF_SWITCH 0x04 /* respect 'switchbuf' settings when jumping */ - -/* Values for buflist_new() flags */ -#define BLN_CURBUF 1 /* May re-use curbuf for new buffer */ -#define BLN_LISTED 2 /* Put new buffer in buffer list */ -#define BLN_DUMMY 4 /* Allocating dummy buffer */ - -/* Values for in_cinkeys() */ -#define KEY_OPEN_FORW 0x101 -#define KEY_OPEN_BACK 0x102 -#define KEY_COMPLETE 0x103 /* end of completion */ - -/* Values for "noremap" argument of ins_typebuf(). Also used for - * map->m_noremap and menu->noremap[]. */ -#define REMAP_YES 0 /* allow remapping */ -#define REMAP_NONE -1 /* no remapping */ -#define REMAP_SCRIPT -2 /* remap script-local mappings only */ -#define REMAP_SKIP -3 /* no remapping for first char */ - -/* Values returned by mch_nodetype() */ -#define NODE_NORMAL 0 /* file or directory, check with os_isdir()*/ -#define NODE_WRITABLE 1 /* something we can write to (character - device, fifo, socket, ..) */ -#define NODE_OTHER 2 /* non-writable thing (e.g., block device) */ - -/* Values for readfile() flags */ -#define READ_NEW 0x01 /* read a file into a new buffer */ -#define READ_FILTER 0x02 /* read filter output */ -#define READ_STDIN 0x04 /* read from stdin */ -#define READ_BUFFER 0x08 /* read from curbuf (converting stdin) */ -#define READ_DUMMY 0x10 /* reading into a dummy buffer */ -#define READ_KEEP_UNDO 0x20 /* keep undo info*/ - -/* Values for change_indent() */ -#define INDENT_SET 1 /* set indent */ -#define INDENT_INC 2 /* increase indent */ -#define INDENT_DEC 3 /* decrease indent */ - -/* Values for flags argument for findmatchlimit() */ -#define FM_BACKWARD 0x01 /* search backwards */ -#define FM_FORWARD 0x02 /* search forwards */ -#define FM_BLOCKSTOP 0x04 /* stop at start/end of block */ -#define FM_SKIPCOMM 0x08 /* skip comments */ - -/* Values for action argument for do_buffer() */ -#define DOBUF_GOTO 0 /* go to specified buffer */ -#define DOBUF_SPLIT 1 /* split window and go to specified buffer */ -#define DOBUF_UNLOAD 2 /* unload specified buffer(s) */ -#define DOBUF_DEL 3 /* delete specified buffer(s) from buflist */ -#define DOBUF_WIPE 4 /* delete specified buffer(s) really */ - -/* Values for start argument for do_buffer() */ -#define DOBUF_CURRENT 0 /* "count" buffer from current buffer */ -#define DOBUF_FIRST 1 /* "count" buffer from first buffer */ -#define DOBUF_LAST 2 /* "count" buffer from last buffer */ -#define DOBUF_MOD 3 /* "count" mod. buffer from current buffer */ - -/* Values for sub_cmd and which_pat argument for search_regcomp() */ -/* Also used for which_pat argument for searchit() */ -#define RE_SEARCH 0 /* save/use pat in/from search_pattern */ -#define RE_SUBST 1 /* save/use pat in/from subst_pattern */ -#define RE_BOTH 2 /* save pat in both patterns */ -#define RE_LAST 2 /* use last used pattern if "pat" is NULL */ - -/* Second argument for vim_regcomp(). */ -#define RE_MAGIC 1 /* 'magic' option */ -#define RE_STRING 2 /* match in string instead of buffer text */ -#define RE_STRICT 4 /* don't allow [abc] without ] */ - -/* values for reg_do_extmatch */ -# define REX_SET 1 /* to allow \z\(...\), */ -# define REX_USE 2 /* to allow \z\1 et al. */ - -/* flags for do_ecmd() */ -#define ECMD_HIDE 0x01 /* don't free the current buffer */ -#define ECMD_SET_HELP 0x02 /* set b_help flag of (new) buffer before - opening file */ -#define ECMD_OLDBUF 0x04 /* use existing buffer if it exists */ -#define ECMD_FORCEIT 0x08 /* ! used in Ex command */ -#define ECMD_ADDBUF 0x10 /* don't edit, just add to buffer list */ - -/* for lnum argument in do_ecmd() */ -#define ECMD_LASTL (linenr_T)0 /* use last position in loaded file */ -#define ECMD_LAST (linenr_T)-1 /* use last position in all files */ -#define ECMD_ONE (linenr_T)1 /* use first line */ - -/* flags for do_cmdline() */ -#define DOCMD_VERBOSE 0x01 /* included command in error message */ -#define DOCMD_NOWAIT 0x02 /* don't call wait_return() and friends */ -#define DOCMD_REPEAT 0x04 /* repeat exec. until getline() returns NULL */ -#define DOCMD_KEYTYPED 0x08 /* don't reset KeyTyped */ -#define DOCMD_EXCRESET 0x10 /* reset exception environment (for debugging)*/ -#define DOCMD_KEEPLINE 0x20 /* keep typed line for repeating with "." */ - -/* flags for beginline() */ -#define BL_WHITE 1 /* cursor on first non-white in the line */ -#define BL_SOL 2 /* use 'sol' option */ -#define BL_FIX 4 /* don't leave cursor on a NUL */ - -/* flags for mf_sync() */ -#define MFS_ALL 1 /* also sync blocks with negative numbers */ -#define MFS_STOP 2 /* stop syncing when a character is available */ -#define MFS_FLUSH 4 /* flushed file to disk */ -#define MFS_ZERO 8 /* only write block 0 */ - -/* flags for buf_copy_options() */ -#define BCO_ENTER 1 /* going to enter the buffer */ -#define BCO_ALWAYS 2 /* always copy the options */ -#define BCO_NOHELP 4 /* don't touch the help related options */ - -/* flags for do_put() */ -#define PUT_FIXINDENT 1 /* make indent look nice */ -#define PUT_CURSEND 2 /* leave cursor after end of new text */ -#define PUT_CURSLINE 4 /* leave cursor on last line of new text */ -#define PUT_LINE 8 /* put register as lines */ -#define PUT_LINE_SPLIT 16 /* split line for linewise register */ -#define PUT_LINE_FORWARD 32 /* put linewise register below Visual sel. */ - -/* flags for set_indent() */ -#define SIN_CHANGED 1 /* call changed_bytes() when line changed */ -#define SIN_INSERT 2 /* insert indent before existing text */ -#define SIN_UNDO 4 /* save line for undo before changing it */ - -/* flags for insertchar() */ -#define INSCHAR_FORMAT 1 /* force formatting */ -#define INSCHAR_DO_COM 2 /* format comments */ -#define INSCHAR_CTRLV 4 /* char typed just after CTRL-V */ -#define INSCHAR_NO_FEX 8 /* don't use 'formatexpr' */ -#define INSCHAR_COM_LIST 16 /* format comments with list/2nd line indent */ - -/* flags for open_line() */ -#define OPENLINE_DELSPACES 1 /* delete spaces after cursor */ -#define OPENLINE_DO_COM 2 /* format comments */ -#define OPENLINE_KEEPTRAIL 4 /* keep trailing spaces */ -#define OPENLINE_MARKFIX 8 /* fix mark positions */ -#define OPENLINE_COM_LIST 16 /* format comments with list/2nd line indent */ -/* - * There are four history tables: - */ -#define HIST_CMD 0 /* colon commands */ -#define HIST_SEARCH 1 /* search commands */ -#define HIST_EXPR 2 /* expressions (from entering = register) */ -#define HIST_INPUT 3 /* input() lines */ -#define HIST_DEBUG 4 /* debug commands */ -#define HIST_COUNT 5 /* number of history tables */ -/* - * Flags for chartab[]. - */ -#define CT_CELL_MASK 0x07 /* mask: nr of display cells (1, 2 or 4) */ -#define CT_PRINT_CHAR 0x10 /* flag: set for printable chars */ -#define CT_ID_CHAR 0x20 /* flag: set for ID chars */ -#define CT_FNAME_CHAR 0x40 /* flag: set for file name chars */ -/* - * Values for do_tag(). - */ -#define DT_TAG 1 /* jump to newer position or same tag again */ -#define DT_POP 2 /* jump to older position */ -#define DT_NEXT 3 /* jump to next match of same tag */ -#define DT_PREV 4 /* jump to previous match of same tag */ -#define DT_FIRST 5 /* jump to first match of same tag */ -#define DT_LAST 6 /* jump to first match of same tag */ -#define DT_SELECT 7 /* jump to selection from list */ -#define DT_HELP 8 /* like DT_TAG, but no wildcards */ -#define DT_JUMP 9 /* jump to new tag or selection from list */ -#define DT_CSCOPE 10 /* cscope find command (like tjump) */ -#define DT_LTAG 11 /* tag using location list */ -#define DT_FREE 99 /* free cached matches */ - -/* - * flags for find_tags(). - */ -#define TAG_HELP 1 /* only search for help tags */ -#define TAG_NAMES 2 /* only return name of tag */ -#define TAG_REGEXP 4 /* use tag pattern as regexp */ -#define TAG_NOIC 8 /* don't always ignore case */ -# define TAG_CSCOPE 16 /* cscope tag */ -#define TAG_VERBOSE 32 /* message verbosity */ -#define TAG_INS_COMP 64 /* Currently doing insert completion */ -#define TAG_KEEP_LANG 128 /* keep current language */ - -#define TAG_MANY 300 /* When finding many tags (for completion), - find up to this many tags */ -/* - * Types of dialogs passed to do_vim_dialog(). - */ -#define VIM_GENERIC 0 -#define VIM_ERROR 1 -#define VIM_WARNING 2 -#define VIM_INFO 3 -#define VIM_QUESTION 4 -#define VIM_LAST_TYPE 4 /* sentinel value */ -/* - * Return values for functions like gui_yesnocancel() - */ -#define VIM_YES 2 -#define VIM_NO 3 -#define VIM_CANCEL 4 -#define VIM_ALL 5 -#define VIM_DISCARDALL 6 - -/* - * arguments for win_split() - */ -#define WSP_ROOM 1 /* require enough room */ -#define WSP_VERT 2 /* split vertically */ -#define WSP_TOP 4 /* window at top-left of shell */ -#define WSP_BOT 8 /* window at bottom-right of shell */ -#define WSP_HELP 16 /* creating the help window */ -#define WSP_BELOW 32 /* put new window below/right */ -#define WSP_ABOVE 64 /* put new window above/left */ -#define WSP_NEWLOC 128 /* don't copy location list */ - - -/* - * flags for check_changed() - */ -#define CCGD_AW 1 /* do autowrite if buffer was changed */ -#define CCGD_MULTWIN 2 /* check also when several wins for the buf */ -#define CCGD_FORCEIT 4 /* ! used */ -#define CCGD_ALLBUF 8 /* may write all buffers */ -#define CCGD_EXCMD 16 /* may suggest using ! */ - -/* - * "flags" values for option-setting functions. - * When OPT_GLOBAL and OPT_LOCAL are both missing, set both local and global - * values, get local value. - */ -#define OPT_FREE 1 /* free old value if it was allocated */ -#define OPT_GLOBAL 2 /* use global value */ -#define OPT_LOCAL 4 /* use local value */ -#define OPT_MODELINE 8 /* option in modeline */ -#define OPT_WINONLY 16 /* only set window-local options */ -#define OPT_NOWIN 32 /* don't set window-local options */ - -/* Magic chars used in confirm dialog strings */ -#define DLG_BUTTON_SEP '\n' -#define DLG_HOTKEY_CHAR '&' - -/* Values for "starting" */ -#define NO_SCREEN 2 /* no screen updating yet */ -#define NO_BUFFERS 1 /* not all buffers loaded yet */ -/* 0 not starting anymore */ - -/* Values for swap_exists_action: what to do when swap file already exists */ -#define SEA_NONE 0 /* don't use dialog */ -#define SEA_DIALOG 1 /* use dialog when possible */ -#define SEA_QUIT 2 /* quit editing the file */ -#define SEA_RECOVER 3 /* recover the file */ /* * Minimal size for block 0 of a swap file. @@ -541,164 +229,7 @@ enum { #define MIN_SWAP_PAGE_SIZE 1048 #define MAX_SWAP_PAGE_SIZE 50000 -/* Special values for current_SID. */ -#define SID_MODELINE -1 /* when using a modeline */ -#define SID_CMDARG -2 /* for "--cmd" argument */ -#define SID_CARG -3 /* for "-c" argument */ -#define SID_ENV -4 /* for sourcing environment variable */ -#define SID_ERROR -5 /* option was reset because of an error */ -#define SID_NONE -6 /* don't set scriptID */ - -/* - * Events for autocommands. - */ -enum auto_event { - EVENT_BUFADD = 0, /* after adding a buffer to the buffer list */ - EVENT_BUFNEW, /* after creating any buffer */ - EVENT_BUFDELETE, /* deleting a buffer from the buffer list */ - EVENT_BUFWIPEOUT, /* just before really deleting a buffer */ - EVENT_BUFENTER, /* after entering a buffer */ - EVENT_BUFFILEPOST, /* after renaming a buffer */ - EVENT_BUFFILEPRE, /* before renaming a buffer */ - EVENT_BUFLEAVE, /* before leaving a buffer */ - EVENT_BUFNEWFILE, /* when creating a buffer for a new file */ - EVENT_BUFREADPOST, /* after reading a buffer */ - EVENT_BUFREADPRE, /* before reading a buffer */ - EVENT_BUFREADCMD, /* read buffer using command */ - EVENT_BUFUNLOAD, /* just before unloading a buffer */ - EVENT_BUFHIDDEN, /* just after buffer becomes hidden */ - EVENT_BUFWINENTER, /* after showing a buffer in a window */ - EVENT_BUFWINLEAVE, /* just after buffer removed from window */ - EVENT_BUFWRITEPOST, /* after writing a buffer */ - EVENT_BUFWRITEPRE, /* before writing a buffer */ - EVENT_BUFWRITECMD, /* write buffer using command */ - EVENT_CMDWINENTER, /* after entering the cmdline window */ - EVENT_CMDWINLEAVE, /* before leaving the cmdline window */ - EVENT_COLORSCHEME, /* after loading a colorscheme */ - EVENT_COMPLETEDONE, /* after finishing insert complete */ - EVENT_FILEAPPENDPOST, /* after appending to a file */ - EVENT_FILEAPPENDPRE, /* before appending to a file */ - EVENT_FILEAPPENDCMD, /* append to a file using command */ - EVENT_FILECHANGEDSHELL, /* after shell command that changed file */ - EVENT_FILECHANGEDSHELLPOST, /* after (not) reloading changed file */ - EVENT_FILECHANGEDRO, /* before first change to read-only file */ - EVENT_FILEREADPOST, /* after reading a file */ - EVENT_FILEREADPRE, /* before reading a file */ - EVENT_FILEREADCMD, /* read from a file using command */ - EVENT_FILETYPE, /* new file type detected (user defined) */ - EVENT_FILEWRITEPOST, /* after writing a file */ - EVENT_FILEWRITEPRE, /* before writing a file */ - EVENT_FILEWRITECMD, /* write to a file using command */ - EVENT_FILTERREADPOST, /* after reading from a filter */ - EVENT_FILTERREADPRE, /* before reading from a filter */ - EVENT_FILTERWRITEPOST, /* after writing to a filter */ - EVENT_FILTERWRITEPRE, /* before writing to a filter */ - EVENT_FOCUSGAINED, /* got the focus */ - EVENT_FOCUSLOST, /* lost the focus to another app */ - EVENT_GUIENTER, /* after starting the GUI */ - EVENT_GUIFAILED, /* after starting the GUI failed */ - EVENT_INSERTCHANGE, /* when changing Insert/Replace mode */ - EVENT_INSERTENTER, /* when entering Insert mode */ - EVENT_INSERTLEAVE, /* when leaving Insert mode */ - EVENT_JOBACTIVITY, /* when job sent some data */ - EVENT_MENUPOPUP, /* just before popup menu is displayed */ - EVENT_QUICKFIXCMDPOST, /* after :make, :grep etc. */ - EVENT_QUICKFIXCMDPRE, /* before :make, :grep etc. */ - EVENT_QUITPRE, /* before :quit */ - EVENT_SESSIONLOADPOST, /* after loading a session file */ - EVENT_STDINREADPOST, /* after reading from stdin */ - EVENT_STDINREADPRE, /* before reading from stdin */ - EVENT_SYNTAX, /* syntax selected */ - EVENT_TERMCHANGED, /* after changing 'term' */ - EVENT_TERMRESPONSE, /* after setting "v:termresponse" */ - EVENT_USER, /* user defined autocommand */ - EVENT_VIMENTER, /* after starting Vim */ - EVENT_VIMLEAVE, /* before exiting Vim */ - EVENT_VIMLEAVEPRE, /* before exiting Vim and writing .viminfo */ - EVENT_VIMRESIZED, /* after Vim window was resized */ - EVENT_WINENTER, /* after entering a window */ - EVENT_WINLEAVE, /* before leaving a window */ - EVENT_ENCODINGCHANGED, /* after changing the 'encoding' option */ - EVENT_INSERTCHARPRE, /* before inserting a char */ - EVENT_CURSORHOLD, /* cursor in same position for a while */ - EVENT_CURSORHOLDI, /* idem, in Insert mode */ - EVENT_FUNCUNDEFINED, /* if calling a function which doesn't exist */ - EVENT_REMOTEREPLY, /* upon string reception from a remote vim */ - EVENT_SWAPEXISTS, /* found existing swap file */ - EVENT_SOURCEPRE, /* before sourcing a Vim script */ - EVENT_SOURCECMD, /* sourcing a Vim script using command */ - EVENT_SPELLFILEMISSING, /* spell file missing */ - EVENT_CURSORMOVED, /* cursor was moved */ - EVENT_CURSORMOVEDI, /* cursor was moved in Insert mode */ - EVENT_TABLEAVE, /* before leaving a tab page */ - EVENT_TABENTER, /* after entering a tab page */ - EVENT_SHELLCMDPOST, /* after ":!cmd" */ - EVENT_SHELLFILTERPOST, /* after ":1,2!cmd", ":w !cmd", ":r !cmd". */ - EVENT_TEXTCHANGED, /* text was modified */ - EVENT_TEXTCHANGEDI, /* text was modified in Insert mode*/ - NUM_EVENTS /* MUST be the last one */ -}; - -typedef enum auto_event event_T; -/* - * Values for index in highlight_attr[]. - * When making changes, also update HL_FLAGS below! And update the default - * value of 'highlight' in option.c. - */ -typedef enum { - HLF_8 = 0 /* Meta & special keys listed with ":map", text that is - displayed different from what it is */ - , HLF_AT /* @ and ~ characters at end of screen, characters that - don't really exist in the text */ - , HLF_D /* directories in CTRL-D listing */ - , HLF_E /* error messages */ - , HLF_I /* incremental search */ - , HLF_L /* last search string */ - , HLF_M /* "--More--" message */ - , HLF_CM /* Mode (e.g., "-- INSERT --") */ - , HLF_N /* line number for ":number" and ":#" commands */ - , HLF_CLN /* current line number */ - , HLF_R /* return to continue message and yes/no questions */ - , HLF_S /* status lines */ - , HLF_SNC /* status lines of not-current windows */ - , HLF_C /* column to separate vertically split windows */ - , HLF_T /* Titles for output from ":set all", ":autocmd" etc. */ - , HLF_V /* Visual mode */ - , HLF_VNC /* Visual mode, autoselecting and not clipboard owner */ - , HLF_W /* warning messages */ - , HLF_WM /* Wildmenu highlight */ - , HLF_FL /* Folded line */ - , HLF_FC /* Fold column */ - , HLF_ADD /* Added diff line */ - , HLF_CHD /* Changed diff line */ - , HLF_DED /* Deleted diff line */ - , HLF_TXD /* Text Changed in diff line */ - , HLF_CONCEAL /* Concealed text */ - , HLF_SC /* Sign column */ - , HLF_SPB /* SpellBad */ - , HLF_SPC /* SpellCap */ - , HLF_SPR /* SpellRare */ - , HLF_SPL /* SpellLocal */ - , HLF_PNI /* popup menu normal item */ - , HLF_PSI /* popup menu selected item */ - , HLF_PSB /* popup menu scrollbar */ - , HLF_PST /* popup menu scrollbar thumb */ - , HLF_TP /* tabpage line */ - , HLF_TPS /* tabpage line selected */ - , HLF_TPF /* tabpage line filler */ - , HLF_CUC /* 'cursurcolumn' */ - , HLF_CUL /* 'cursurline' */ - , HLF_MC /* 'colorcolumn' */ - , HLF_COUNT /* MUST be the last one */ -} hlf_T; - -/* The HL_FLAGS must be in the same order as the HLF_ enums! - * When changing this also adjust the default for 'highlight'. */ -#define HL_FLAGS {'8', '@', 'd', 'e', 'i', 'l', 'm', 'M', 'n', 'N', 'r', 's', \ - 'S', 'c', 't', 'v', 'V', 'w', 'W', 'f', 'F', 'A', 'C', 'D', \ - 'T', '-', '>', 'B', 'P', 'R', 'L', '+', '=', 'x', 'X', '*', \ - '#', '_', '!', '.', 'o'} /* * Boolean constants @@ -711,38 +242,6 @@ typedef enum { #define MAYBE 2 /* sometimes used for a variant on TRUE */ /* - * Operator IDs; The order must correspond to opchars[] in ops.c! - */ -#define OP_NOP 0 /* no pending operation */ -#define OP_DELETE 1 /* "d" delete operator */ -#define OP_YANK 2 /* "y" yank operator */ -#define OP_CHANGE 3 /* "c" change operator */ -#define OP_LSHIFT 4 /* "<" left shift operator */ -#define OP_RSHIFT 5 /* ">" right shift operator */ -#define OP_FILTER 6 /* "!" filter operator */ -#define OP_TILDE 7 /* "g~" switch case operator */ -#define OP_INDENT 8 /* "=" indent operator */ -#define OP_FORMAT 9 /* "gq" format operator */ -#define OP_COLON 10 /* ":" colon operator */ -#define OP_UPPER 11 /* "gU" make upper case operator */ -#define OP_LOWER 12 /* "gu" make lower case operator */ -#define OP_JOIN 13 /* "J" join operator, only for Visual mode */ -#define OP_JOIN_NS 14 /* "gJ" join operator, only for Visual mode */ -#define OP_ROT13 15 /* "g?" rot-13 encoding */ -#define OP_REPLACE 16 /* "r" replace chars, only for Visual mode */ -#define OP_INSERT 17 /* "I" Insert column, only for Visual mode */ -#define OP_APPEND 18 /* "A" Append column, only for Visual mode */ -#define OP_FOLD 19 /* "zf" define a fold */ -#define OP_FOLDOPEN 20 /* "zo" open folds */ -#define OP_FOLDOPENREC 21 /* "zO" open folds recursively */ -#define OP_FOLDCLOSE 22 /* "zc" close folds */ -#define OP_FOLDCLOSEREC 23 /* "zC" close folds recursively */ -#define OP_FOLDDEL 24 /* "zd" delete folds */ -#define OP_FOLDDELREC 25 /* "zD" delete folds recursively */ -#define OP_FORMAT2 26 /* "gw" format operator, keeps cursor pos */ -#define OP_FUNCTION 27 /* "g@" call 'operatorfunc' */ - -/* * Motion types, used for operators and for yank/delete registers. */ #define MCHAR 0 /* character-wise movement/register */ @@ -751,11 +250,6 @@ typedef enum { #define MAUTO 0xff /* Decide between MLINE/MCHAR */ -/* - * Minimum screen size - */ -#define MIN_COLUMNS 12 /* minimal columns for screen */ -#define MIN_LINES 2 /* minimal lines for screen */ #define STATUS_HEIGHT 1 /* height of a status line under a window */ #define QF_WINHEIGHT 10 /* default height for quickfix window */ @@ -776,11 +270,6 @@ typedef enum { # define MSG_BUF_CLEN (MSG_BUF_LEN / 6) /* cell length (worst case: utf-8 takes 6 bytes for one cell) */ -/* Size of the buffer used for tgetent(). Unfortunately this is largely - * undocumented, some systems use 1024. Using a buffer that is too small - * causes a buffer overrun and a crash. Use the maximum known value to stay - * on the safe side. */ -#define TBUFSZ 2048 /* buffer size for termcap entry */ /* * Maximum length of key sequence to be mapped. @@ -795,15 +284,6 @@ typedef enum { # include <fcntl.h> #endif -#ifdef BINARY_FILE_IO -# define WRITEBIN "wb" /* no CR-LF translation */ -# define READBIN "rb" -# define APPENDBIN "ab" -#else -# define WRITEBIN "w" -# define READBIN "r" -# define APPENDBIN "a" -#endif #ifndef O_NOFOLLOW # define O_NOFOLLOW 0 @@ -948,145 +428,11 @@ typedef void *vim_acl_T; /* dummy to pass an ACL to a function */ typedef struct timeval proftime_T; -/* Values for "do_profiling". */ -#define PROF_NONE 0 /* profiling not started */ -#define PROF_YES 1 /* profiling busy */ -#define PROF_PAUSED 2 /* profiling paused */ - -/* Codes for mouse button events in lower three bits: */ -# define MOUSE_LEFT 0x00 -# define MOUSE_MIDDLE 0x01 -# define MOUSE_RIGHT 0x02 -# define MOUSE_RELEASE 0x03 -/* bit masks for modifiers: */ -# define MOUSE_SHIFT 0x04 -# define MOUSE_ALT 0x08 -# define MOUSE_CTRL 0x10 -/* mouse buttons that are handled like a key press (GUI only) */ -/* Note that the scroll wheel keys are inverted: MOUSE_5 scrolls lines up but - * the result of this is that the window moves down, similarly MOUSE_6 scrolls - * columns left but the window moves right. */ -# define MOUSE_4 0x100 /* scroll wheel down */ -# define MOUSE_5 0x200 /* scroll wheel up */ -# define MOUSE_X1 0x300 /* Mouse-button X1 (6th) */ -# define MOUSE_X2 0x400 /* Mouse-button X2 */ -# define MOUSE_6 0x500 /* scroll wheel left */ -# define MOUSE_7 0x600 /* scroll wheel right */ - -/* 0x20 is reserved by xterm */ -# define MOUSE_DRAG_XTERM 0x40 - -# define MOUSE_DRAG (0x40 | MOUSE_RELEASE) - -/* Lowest button code for using the mouse wheel (xterm only) */ -# define MOUSEWHEEL_LOW 0x60 - -# define MOUSE_CLICK_MASK 0x03 - -# define NUM_MOUSE_CLICKS(code) \ - (((unsigned)((code) & 0xC0) >> 6) + 1) - - -/* - * jump_to_mouse() returns one of first four these values, possibly with - * some of the other three added. - */ -# define IN_UNKNOWN 0 -# define IN_BUFFER 1 -# define IN_STATUS_LINE 2 /* on status or command line */ -# define IN_SEP_LINE 4 /* on vertical separator line */ -# define IN_OTHER_WIN 8 /* in other window but can't go there */ -# define CURSOR_MOVED 0x100 -# define MOUSE_FOLD_CLOSE 0x200 /* clicked on '-' in fold column */ -# define MOUSE_FOLD_OPEN 0x400 /* clicked on '+' in fold column */ - -/* flags for jump_to_mouse() */ -# define MOUSE_FOCUS 0x01 /* need to stay in this window */ -# define MOUSE_MAY_VIS 0x02 /* may start Visual mode */ -# define MOUSE_DID_MOVE 0x04 /* only act when mouse has moved */ -# define MOUSE_SETPOS 0x08 /* only set current mouse position */ -# define MOUSE_MAY_STOP_VIS 0x10 /* may stop Visual mode */ -# define MOUSE_RELEASED 0x20 /* button was released */ - -# if defined(UNIX) && defined(HAVE_GETTIMEOFDAY) && defined(HAVE_SYS_TIME_H) -# define CHECK_DOUBLE_CLICK 1 /* Checking for double clicks ourselves. */ -# endif - - -/* defines for eval_vars() */ -#define VALID_PATH 1 -#define VALID_HEAD 2 - -/* Defines for Vim variables. These must match vimvars[] in eval.c! */ -enum { - VV_COUNT, - VV_COUNT1, - VV_PREVCOUNT, - VV_ERRMSG, - VV_WARNINGMSG, - VV_STATUSMSG, - VV_SHELL_ERROR, - VV_THIS_SESSION, - VV_VERSION, - VV_LNUM, - VV_TERMRESPONSE, - VV_FNAME, - VV_LANG, - VV_LC_TIME, - VV_CTYPE, - VV_CC_FROM, - VV_CC_TO, - VV_FNAME_IN, - VV_FNAME_OUT, - VV_FNAME_NEW, - VV_FNAME_DIFF, - VV_CMDARG, - VV_FOLDSTART, - VV_FOLDEND, - VV_FOLDDASHES, - VV_FOLDLEVEL, - VV_PROGNAME, - VV_SEND_SERVER, - VV_DYING, - VV_EXCEPTION, - VV_THROWPOINT, - VV_REG, - VV_CMDBANG, - VV_INSERTMODE, - VV_VAL, - VV_KEY, - VV_PROFILING, - VV_FCS_REASON, - VV_FCS_CHOICE, - VV_BEVAL_BUFNR, - VV_BEVAL_WINNR, - VV_BEVAL_LNUM, - VV_BEVAL_COL, - VV_BEVAL_TEXT, - VV_SCROLLSTART, - VV_SWAPNAME, - VV_SWAPCHOICE, - VV_SWAPCOMMAND, - VV_CHAR, - VV_MOUSE_WIN, - VV_MOUSE_LNUM, - VV_MOUSE_COL, - VV_OP, - VV_SEARCHFORWARD, - VV_HLSEARCH, - VV_OLDFILES, - VV_WINDOWID, - VV_PROGPATH, - VV_JOB_DATA, - VV_LEN, /* number of v: vars */ -}; - -typedef int VimClipboard; /* This is required for the prototypes. */ #include "nvim/buffer_defs.h" /* buffer and windows */ @@ -1110,30 +456,6 @@ typedef int VimClipboard; /* This is required for the prototypes. */ #include "nvim/globals.h" /* global variables and messages */ -/* - * Return byte length of character that starts with byte "b". - * Returns 1 for a single-byte character. - * MB_BYTE2LEN_CHECK() can be used to count a special key as one byte. - * Don't call MB_BYTE2LEN(b) with b < 0 or b > 255! - */ -# define MB_BYTE2LEN(b) mb_bytelen_tab[b] -# define MB_BYTE2LEN_CHECK(b) (((b) < 0 || (b) > 255) ? 1 : mb_bytelen_tab[b]) - -/* properties used in enc_canon_table[] (first three mutually exclusive) */ -# define ENC_8BIT 0x01 -# define ENC_DBCS 0x02 -# define ENC_UNICODE 0x04 - -# define ENC_ENDIAN_B 0x10 /* Unicode: Big endian */ -# define ENC_ENDIAN_L 0x20 /* Unicode: Little endian */ - -# define ENC_2BYTE 0x40 /* Unicode: UCS-2 */ -# define ENC_4BYTE 0x80 /* Unicode: UCS-4 */ -# define ENC_2WORD 0x100 /* Unicode: UTF-16 */ - -# define ENC_LATIN1 0x200 /* Latin1 */ -# define ENC_LATIN9 0x400 /* Latin9 */ -# define ENC_MACROMAN 0x800 /* Mac Roman (not Macro Man! :-) */ # ifdef USE_ICONV # ifndef EILSEQ @@ -1160,44 +482,12 @@ typedef int VimClipboard; /* This is required for the prototypes. */ -/* flags for skip_vimgrep_pat() */ -#define VGR_GLOBAL 1 -#define VGR_NOJUMP 2 - -/* behavior for bad character, "++bad=" argument */ -#define BAD_REPLACE '?' /* replace it with '?' (default) */ -#define BAD_KEEP -1 /* leave it */ -#define BAD_DROP -2 /* erase it */ - -/* last argument for do_source() */ -#define DOSO_NONE 0 -#define DOSO_VIMRC 1 /* loading vimrc file */ -#define DOSO_GVIMRC 2 /* loading gvimrc file */ -/* flags for read_viminfo() and children */ -#define VIF_WANT_INFO 1 /* load non-mark info */ -#define VIF_WANT_MARKS 2 /* load file marks */ -#define VIF_FORCEIT 4 /* overwrite info already read */ -#define VIF_GET_OLDFILES 8 /* load v:oldfiles */ -/* flags for buf_freeall() */ -#define BFA_DEL 1 /* buffer is going to be deleted */ -#define BFA_WIPE 2 /* buffer is going to be wiped out */ -#define BFA_KEEP_UNDO 4 /* do not free undo information */ -/* direction for nv_mousescroll() and ins_mousescroll() */ -#define MSCR_DOWN 0 /* DOWN must be FALSE */ -#define MSCR_UP 1 -#define MSCR_LEFT -1 -#define MSCR_RIGHT -2 -#define KEYLEN_PART_KEY -1 /* keylen value for incomplete key-code */ -#define KEYLEN_PART_MAP -2 /* keylen value for incomplete mapping */ -#define KEYLEN_REMOVED 9999 /* keylen value for removed sequence */ -/* Character used as separated in autoload function/variable names. */ -#define AUTOLOAD_CHAR '#' # define SET_NO_HLSEARCH(flag) no_hlsearch = (flag); set_vim_var_nr( \ VV_HLSEARCH, !no_hlsearch) diff --git a/src/nvim/window.h b/src/nvim/window.h index 7960fa25dd..eccc7835a8 100644 --- a/src/nvim/window.h +++ b/src/nvim/window.h @@ -3,6 +3,32 @@ #include <stdbool.h> +/* Values for file_name_in_line() */ +#define FNAME_MESS 1 /* give error message */ +#define FNAME_EXP 2 /* expand to path */ +#define FNAME_HYP 4 /* check for hypertext link */ +#define FNAME_INCL 8 /* apply 'includeexpr' */ +#define FNAME_REL 16 /* ".." and "./" are relative to the (current) + file instead of the current directory */ + +/* + * arguments for win_split() + */ +#define WSP_ROOM 1 /* require enough room */ +#define WSP_VERT 2 /* split vertically */ +#define WSP_TOP 4 /* window at top-left of shell */ +#define WSP_BOT 8 /* window at bottom-right of shell */ +#define WSP_HELP 16 /* creating the help window */ +#define WSP_BELOW 32 /* put new window below/right */ +#define WSP_ABOVE 64 /* put new window above/left */ +#define WSP_NEWLOC 128 /* don't copy location list */ + +/* + * Minimum screen size + */ +#define MIN_COLUMNS 12 /* minimal columns for screen */ +#define MIN_LINES 2 /* minimal lines for screen */ + #ifdef INCLUDE_GENERATED_DECLARATIONS # include "window.h.generated.h" #endif |