vim: src/fileio.c comparison

comparison src/fileio.c @ 661:e93a99ef31d0

updated for version 7.0195

author	vimboss
date	Thu, 09 Feb 2006 23:53:20 +0000
parents	8157079cea85
children	db58b9066b21

comparison

equal deleted inserted replaced

-:13296f8d1d3d
+:e93a99ef31d0
 static int msg_add_fileformat __ARGS((int eol_type));
 static void msg_add_eol __ARGS((void));
 static int check_mtime __ARGS((buf_T *buf, struct stat *s));
 static int time_differs __ARGS((long t1, long t2));
 #ifdef FEAT_AUTOCMD
-static int apply_autocmds_exarg __ARGS((EVENT_T event, char_u *fname, char_u *fname_io, int force, buf_T *buf, exarg_T *eap));
+static int apply_autocmds_exarg __ARGS((event_T event, char_u *fname, char_u *fname_io, int force, buf_T *buf, exarg_T *eap));
 #endif
 #if defined(FEAT_CRYPT) || defined(FEAT_MBYTE)
 # define HAS_BW_FLAGS
 # define FIO_LATIN1	0x01	/* convert Latin1 */
 } AutoPat;
 static struct event_name
 {
 char	*name;	/* event name */
-EVENT_T	event;	/* event number */
+event_T	event;	/* event number */
 } event_names[] =
 {
 {"BufAdd",		EVENT_BUFADD},
 {"BufCreate",	EVENT_BUFADD},
 {"BufDelete",	EVENT_BUFDELETE},
 {"BufWritePre",	EVENT_BUFWRITEPRE},
 {"BufWriteCmd",	EVENT_BUFWRITECMD},
 {"CmdwinEnter",	EVENT_CMDWINENTER},
 {"CmdwinLeave",	EVENT_CMDWINLEAVE},
 {"ColorScheme",	EVENT_COLORSCHEME},
+{"CursorHold",	EVENT_CURSORHOLD},
+{"CursorHoldI",	EVENT_CURSORHOLDI},
+{"CursorMoved",	EVENT_CURSORMOVED},
+{"CursorMovedI",	EVENT_CURSORMOVEDI},
 {"EncodingChanged",	EVENT_ENCODINGCHANGED},
 {"FileEncoding",	EVENT_ENCODINGCHANGED},
-{"CursorHold",	EVENT_CURSORHOLD},
 {"FileAppendPost",	EVENT_FILEAPPENDPOST},
 {"FileAppendPre",	EVENT_FILEAPPENDPRE},
 {"FileAppendCmd",	EVENT_FILEAPPENDCMD},
 {"FileChangedShell",EVENT_FILECHANGEDSHELL},
 {"FileChangedRO",	EVENT_FILECHANGEDRO},
 {"VimEnter",	EVENT_VIMENTER},
 {"VimLeave",	EVENT_VIMLEAVE},
 {"VimLeavePre",	EVENT_VIMLEAVEPRE},
 {"WinEnter",	EVENT_WINENTER},
 {"WinLeave",	EVENT_WINLEAVE},
-{NULL,		(EVENT_T)0}
+{NULL,		(event_T)0}
 };
 static AutoPat *first_autopat[NUM_EVENTS] =
 {
 NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
 AutoCmd	*nextcmd;	/* next AutoCmd to execute */
 int		group;		/* group being used */
 char_u	*fname;		/* fname to match with */
 char_u	*sfname;	/* sfname to match with */
 char_u	*tail;		/* tail of fname */
-EVENT_T	event;		/* current event */
+event_T	event;		/* current event */
 int		arg_bufnr;	/* initially equal to <abuf>, set to zero when
 				   buf is deleted */
 struct AutoPatCmd   *next;	/* chain of active apc-s for auto-invalidation*/
 } AutoPatCmd;
 #define AUGROUP_ALL	    -3	    /* all autocmd groups */
 static int current_augroup = AUGROUP_DEFAULT;
 static int au_need_clean = FALSE;   /* need to delete marked patterns */
-static void show_autocmd __ARGS((AutoPat *ap, EVENT_T event));
+static void show_autocmd __ARGS((AutoPat *ap, event_T event));
 static void au_remove_pat __ARGS((AutoPat *ap));
 static void au_remove_cmds __ARGS((AutoPat *ap));
 static void au_cleanup __ARGS((void));
 static int au_new_group __ARGS((char_u *name));
 static void au_del_group __ARGS((char_u *name));
 static int au_find_group __ARGS((char_u *name));
-static EVENT_T event_name2nr __ARGS((char_u *start, char_u **end));
+static event_T event_name2nr __ARGS((char_u *start, char_u **end));
-static char_u *event_nr2name __ARGS((EVENT_T event));
+static char_u *event_nr2name __ARGS((event_T event));
 static char_u *find_end_event __ARGS((char_u *arg, int have_group));
-static int event_ignored __ARGS((EVENT_T event));
+static int event_ignored __ARGS((event_T event));
 static int au_get_grouparg __ARGS((char_u **argp));
-static int do_autocmd_event __ARGS((EVENT_T event, char_u *pat, int nested, char_u *cmd, int forceit, int group));
+static int do_autocmd_event __ARGS((event_T event, char_u *pat, int nested, char_u *cmd, int forceit, int group));
 static char_u *getnextac __ARGS((int c, void *cookie, int indent));
-static int apply_autocmds_group __ARGS((EVENT_T event, char_u *fname, char_u *fname_io, int force, int group, buf_T *buf, exarg_T *eap));
+static int apply_autocmds_group __ARGS((event_T event, char_u *fname, char_u *fname_io, int force, int group, buf_T *buf, exarg_T *eap));
 static void auto_next_pat __ARGS((AutoPatCmd *apc, int stop_at_last));
-static EVENT_T	last_event;
+static event_T	last_event;
 static int	last_group;
 /*
 * Show the autocommands for one AutoPat.
 */
 static void
 show_autocmd(ap, event)
 AutoPat	*ap;
-EVENT_T	event;
+event_T	event;
 {
 AutoCmd *ac;
 /* Check for "got_int" (here and at various places below), which is set
 * when "q" has been hit for the "--more--" prompt */
 static void
 au_cleanup()
 {
 AutoPat	*ap, **prev_ap;
 AutoCmd	*ac, **prev_ac;
-EVENT_T	event;
+event_T	event;
 if (autocmd_busy || !au_need_clean)
 	return;
 /* loop over all events */
-for (event = (EVENT_T)0; (int)event < (int)NUM_EVENTS;
+for (event = (event_T)0; (int)event < (int)NUM_EVENTS;
-					    event = (EVENT_T)((int)event + 1))
+					    event = (event_T)((int)event + 1))
 {
 	/* loop over all autocommand patterns */
 	prev_ap = &(first_autopat[(int)event]);
 	for (ap = *prev_ap; ap != NULL; ap = *prev_ap)
 	{
 void
 aubuflocal_remove(buf)
 buf_T	*buf;
 {
 AutoPat	*ap;
-EVENT_T	event;
+event_T	event;
 AutoPatCmd	*apc;
 /* invalidate currently executing autocommands */
 for (apc = active_apc_list; apc; apc = apc->next)
 	if (buf->b_fnum == apc->arg_bufnr)
 	    apc->arg_bufnr = 0;
 /* invalidate buflocals looping through events */
-for (event = (EVENT_T)0; (int)event < (int)NUM_EVENTS;
+for (event = (event_T)0; (int)event < (int)NUM_EVENTS;
-					    event = (EVENT_T)((int)event + 1))
+					    event = (event_T)((int)event + 1))
 	/* loop over all autocommand patterns */
 	for (ap = first_autopat[(int)event]; ap != NULL; ap = ap->next)
 	    if (ap->buflocal_nr == buf->b_fnum)
 	    {
 		au_remove_pat(ap);
 /*
 * Return the event number for event name "start".
 * Return NUM_EVENTS if the event name was not found.
 * Return a pointer to the next event name in "end".
 */
-static EVENT_T
+static event_T
 event_name2nr(start, end)
 char_u  *start;
 char_u  **end;
 {
 char_u	*p;
 /*
 * Return the name for event "event".
 */
 static char_u *
 event_nr2name(event)
-EVENT_T	event;
+event_T	event;
 {
 int	    i;
 for (i = 0; event_names[i].name != NULL; ++i)
 	if (event_names[i].event == event)
 /*
 * Return TRUE if "event" is included in 'eventignore'.
 */
 static int
 event_ignored(event)
-EVENT_T	event;
+event_T	event;
 {
 char_u	*p = p_ei;
 if (STRICMP(p_ei, "all") == 0)
 	return TRUE;
 int	    forceit;
 {
 char_u	*pat;
 char_u	*envpat = NULL;
 char_u	*cmd;
-EVENT_T	event;
+event_T	event;
 int		need_free = FALSE;
 int		nested = FALSE;
 int		group;
 /*
 }
 /*
 * Loop over the events.
 */
-last_event = (EVENT_T)-1;		/* for listing the event name */
+last_event = (event_T)-1;		/* for listing the event name */
 last_group = AUGROUP_ERROR;		/* for listing the group name */
 if (*arg == '*' || *arg == NUL)
 {
-	for (event = (EVENT_T)0; (int)event < (int)NUM_EVENTS;
+	for (event = (event_T)0; (int)event < (int)NUM_EVENTS;
-					    event = (EVENT_T)((int)event + 1))
+					    event = (event_T)((int)event + 1))
 	    if (do_autocmd_event(event, pat,
 					 nested, cmd, forceit, group) == FAIL)
 		break;
 }
 else
 * If forceit == TRUE delete entries.
 * If group is not AUGROUP_ALL, only use this group.
 */
 static int
 do_autocmd_event(event, pat, nested, cmd, forceit, group)
-EVENT_T	event;
+event_T	event;
 char_u	*pat;
 int		nested;
 char_u	*cmd;
 int		forceit;
 int		group;
 * Execute autocommands for "event" and file name "fname".
 * Return TRUE if some commands were executed.
 */
 int
 apply_autocmds(event, fname, fname_io, force, buf)
-EVENT_T	event;
+event_T	event;
 char_u	*fname;	    /* NULL or empty means use actual file name */
 char_u	*fname_io;  /* fname to use for <afile> on cmdline */
 int		force;	    /* when TRUE, ignore autocmd_busy */
 buf_T	*buf;	    /* buffer for <abuf> */
 {
 * Like apply_autocmds(), but with extra "eap" argument.  This takes care of
 * setting v:filearg.
 */
 static int
 apply_autocmds_exarg(event, fname, fname_io, force, buf, eap)
-EVENT_T	event;
+event_T	event;
 char_u	*fname;
 char_u	*fname_io;
 int		force;
 buf_T	*buf;
 exarg_T	*eap;
 * conditional, no autocommands are executed.  If otherwise the autocommands
 * cause the script to be aborted, retval is set to FAIL.
 */
 int
 apply_autocmds_retval(event, fname, fname_io, force, buf, retval)
-EVENT_T	event;
+event_T	event;
 char_u	*fname;	    /* NULL or empty means use actual file name */
 char_u	*fname_io;  /* fname to use for <afile> on cmdline */
 int		force;	    /* when TRUE, ignore autocmd_busy */
 buf_T	*buf;	    /* buffer for <abuf> */
 int		*retval;    /* pointer to caller's retval */
 	    )
 	*retval = FAIL;
 return did_cmd;
 }
-#if defined(FEAT_AUTOCMD) || defined(PROTO)
 /*
 * Return TRUE when there is a CursorHold autocommand defined.
 */
 int
 has_cursorhold()
 {
-return (first_autopat[(int)EVENT_CURSORHOLD] != NULL);
+return (first_autopat[(int)(get_real_state() == NORMAL_BUSY
+			    ? EVENT_CURSORHOLD : EVENT_CURSORHOLDI)] != NULL);
 }
 /*
 * Return TRUE if the CursorHold event can be triggered.
 */
 int
 trigger_cursorhold()
 {
-return (!did_cursorhold
+int		state;
-	    && has_cursorhold()
-	    && !Recording
+if (!did_cursorhold && has_cursorhold() && !Recording)
-	    && get_real_state() == NORMAL_BUSY);
+{
+	state = get_real_state();
+	if (state == NORMAL_BUSY || (state & INSERT) != 0)
+	    return TRUE;
+}
+return FALSE;
 }
-#endif
+/*
+* Return TRUE when there is a CursorMoved autocommand defined.
+*/
+int
+has_cursormoved()
+{
+return (first_autopat[(int)EVENT_CURSORMOVED] != NULL);
+}
+/*
+* Return TRUE when there is a CursorMovedI autocommand defined.
+*/
+int
+has_cursormovedI()
+{
+return (first_autopat[(int)EVENT_CURSORMOVEDI] != NULL);
+}
 static int
 apply_autocmds_group(event, fname, fname_io, force, group, buf, eap)
-EVENT_T	event;
+event_T	event;
 char_u	*fname;	    /* NULL or empty means use actual file name */
 char_u	*fname_io;  /* fname to use for <afile> on cmdline, NULL means
 			       use fname */
 int		force;	    /* when TRUE, ignore autocmd_busy */
 int		group;	    /* group ID, or AUGROUP_ALL */
 * To account for buffer-local autocommands, function needs to know
 * in which buffer the file will be opened.
 */
 int
 has_autocmd(event, sfname, buf)
-EVENT_T	event;
+event_T	event;
 char_u	*sfname;
 buf_T       *buf;
 {
 AutoPat	*ap;
 char_u	*fname;
 {
 char_u	*arg_save;
 char_u	*pattern = NULL;
 char_u	*event_name;
 char_u	*p;
-EVENT_T	event;
+event_T	event;
 AutoPat	*ap;
 buf_T	*buflocal_buf = NULL;
 int		group;
 int		retval = FALSE;

Mercurial > vim

comparison src/fileio.c @ 661:e93a99ef31d0