vim: src/window.c comparison

comparison src/window.c @ 13380:69517d67421f v8.0.1564

patch 8.0.1564: too many #ifdefs commit https://github.com/vim/vim/commit/f2bd8ef2b4507d02c6043affff8f7e85e3414d5f Author: Bram Moolenaar <Bram@vim.org> Date: Sun Mar 4 18:08:14 2018 +0100 patch 8.0.1564: too many #ifdefs Problem: Too many #ifdefs. Solution: Graduate the +autocmd feature. Takes away 450 #ifdefs and increases code size of tiny Vim by only 40 Kbyte.

author	Christian Brabandt <cb@256bit.org>
date	Sun, 04 Mar 2018 18:15:08 +0100
parents	ae312df8d0ab
children	6740c499de13

comparison

equal deleted inserted replaced

-:0f9dd1b43244
+:69517d67421f
 * add status line now, otherwise first window will be too big
 */
 if (count > 1)
 	last_status(TRUE);
-#ifdef FEAT_AUTOCMD
 /*
 * Don't execute autocommands while creating the windows.  Must do that
 * when putting the buffers in the windows.
 */
 block_autocmds();
-#endif
 /* todo is number of windows left to create */
 for (todo = count - 1; todo > 0; --todo)
 	if (vertical)
 	{
 			    * STATUS_HEIGHT) / (todo + 1)
 			- STATUS_HEIGHT, WSP_ABOVE) == FAIL)
 		break;
 	}
-#ifdef FEAT_AUTOCMD
 unblock_autocmds();
-#endif
 /* return actual number of windows */
 return (count - todo);
 }
 int		keep_curwin)	    /* don't close "curwin" */
 {
 win_T	*wp;
 tabpage_T   *tp, *nexttp;
 int		h = tabline_height();
-#ifdef FEAT_AUTOCMD
 int		count = tabpage_index(NULL);
-#endif
 ++RedrawingDisabled;
 for (wp = firstwin; wp != NULL && !ONE_WINDOW; )
 {
 	if (wp->w_buffer == buf && (!keep_curwin || wp != curwin)
-#ifdef FEAT_AUTOCMD
+		&& !(wp->w_closing || wp->w_buffer->b_locked > 0))
-		&& !(wp->w_closing || wp->w_buffer->b_locked > 0)
-#endif
-		)
 	{
 	    if (win_close(wp, FALSE) == FAIL)
 		/* If closing the window fails give up, to avoid looping
 		 * forever. */
 		break;
 {
 	nexttp = tp->tp_next;
 	if (tp != curtab)
 	    for (wp = tp->tp_firstwin; wp != NULL; wp = wp->w_next)
 		if (wp->w_buffer == buf
-#ifdef FEAT_AUTOCMD
+		    && !(wp->w_closing || wp->w_buffer->b_locked > 0))
-		    && !(wp->w_closing || wp->w_buffer->b_locked > 0)
-#endif
-		    )
 		{
 		    win_close_othertab(wp, FALSE, tp);
 		    /* Start all over, the tab page may be closed and
 		     * autocommands may change the window layout. */
 		}
 }
 --RedrawingDisabled;
-#ifdef FEAT_AUTOCMD
 if (count != tabpage_index(NULL))
 	apply_autocmds(EVENT_TABCLOSED, NULL, NULL, FALSE, curbuf);
-#endif
 redraw_tabline = TRUE;
 if (h != tabline_height())
 	shell_new_rows();
 }
 * current tab page.
 */
 int
 one_window(void)
 {
-#ifdef FEAT_AUTOCMD
 win_T	*wp;
 int		seen_one = FALSE;
 FOR_ALL_WINDOWS(wp)
 {
 		return FALSE;
 	    seen_one = TRUE;
 	}
 }
 return TRUE;
-#else
-return ONE_WINDOW;
-#endif
 }
 /*
 * Close the possibly last window in a tab page.
 * Returns TRUE when the window was closed already.
 int		free_buf,
 tabpage_T   *prev_curtab)
 {
 if (ONE_WINDOW)
 {
-#ifdef FEAT_AUTOCMD
 	buf_T	*old_curbuf = curbuf;
-#endif
 	/*
 	 * Closing the last window in a tab page.  First go to another tab
 	 * page and then close the window and the tab page.  This avoids that
 	 * curwin and curtab are invalid while we are freeing memory, they may
 	    if (h != tabline_height())
 		shell_new_rows();
 	}
 	/* Since goto_tabpage_tp above did not trigger *Enter autocommands, do
 	 * that now. */
-#ifdef FEAT_AUTOCMD
 	apply_autocmds(EVENT_TABCLOSED, NULL, NULL, FALSE, curbuf);
 	apply_autocmds(EVENT_WINENTER, NULL, NULL, FALSE, curbuf);
 	apply_autocmds(EVENT_TABENTER, NULL, NULL, FALSE, curbuf);
 	if (old_curbuf != curbuf)
 	    apply_autocmds(EVENT_BUFENTER, NULL, NULL, FALSE, curbuf);
-#endif
 	return TRUE;
 }
 return FALSE;
 }
 */
 int
 win_close(win_T *win, int free_buf)
 {
 win_T	*wp;
-#ifdef FEAT_AUTOCMD
 int		other_buffer = FALSE;
-#endif
 int		close_curwin = FALSE;
 int		dir;
 int		help_window = FALSE;
 tabpage_T   *prev_curtab = curtab;
 frame_T	*win_frame = win->w_frame->fr_parent;
 {
 	EMSG(_("E444: Cannot close last window"));
 	return FAIL;
 }
-#ifdef FEAT_AUTOCMD
 if (win->w_closing || (win->w_buffer != NULL
 					       && win->w_buffer->b_locked > 0))
 	return FAIL; /* window is already being closed */
 if (win == aucmd_win)
 {
 if ((firstwin == aucmd_win || lastwin == aucmd_win) && one_window())
 {
 	EMSG(_("E814: Cannot close window, only autocmd window would remain"));
 	return FAIL;
 }
-#endif
 /* When closing the last window in a tab page first go to another tab page
 * and then close the window and the tab page to avoid that curwin and
 * curtab are invalid while we are freeing memory. */
 if (close_last_window_tabpage(win, free_buf, prev_curtab))
 if (bt_help(win->w_buffer))
 	help_window = TRUE;
 else
 	clear_snapshot(curtab, SNAP_HELP_IDX);
-#ifdef FEAT_AUTOCMD
 if (win == curwin)
 {
 	/*
 	 * Guess which window is going to be the new current window.
 	 * This may change because of the autocommands (sigh).
 	if (!win_valid(win))
 	    return FAIL;
 	win->w_closing = FALSE;
 	if (last_window())
 	    return FAIL;
-# ifdef FEAT_EVAL
+#ifdef FEAT_EVAL
 	/* autocmds may abort script processing */
 	if (aborting())
 	    return FAIL;
-# endif
+#endif
 }
-#endif
 #ifdef FEAT_GUI
 /* Avoid trouble with scrollbars that are going to be deleted in
 * win_free(). */
 if (gui.in_use)
 if (win->w_buffer != NULL)
 {
 	bufref_T    bufref;
 	set_bufref(&bufref, curbuf);
-#ifdef FEAT_AUTOCMD
 	win->w_closing = TRUE;
-#endif
 	close_buffer(win, win->w_buffer, free_buf ? DOBUF_UNLOAD : 0, TRUE);
-#ifdef FEAT_AUTOCMD
 	if (win_valid_any_tab(win))
 	    win->w_closing = FALSE;
-#endif
 	/* Make sure curbuf is valid. It can become invalid if 'bufhidden' is
 	 * "wipe". */
 	if (!bufref_valid(&bufref))
 	    curbuf = firstbuf;
 }
 else
 	win_comp_pos();
 if (close_curwin)
 {
 	win_enter_ext(wp, FALSE, TRUE, FALSE, TRUE, TRUE);
-#ifdef FEAT_AUTOCMD
 	if (other_buffer)
 	    /* careful: after this wp and win may be invalid! */
 	    apply_autocmds(EVENT_BUFENTER, NULL, NULL, FALSE, curbuf);
-#endif
 }
 /*
 * If last window has a status line now and we don't want one,
 * remove the status line.
 win_T	*wp;
 int		dir;
 tabpage_T   *ptp = NULL;
 int		free_tp = FALSE;
-#ifdef FEAT_AUTOCMD
 /* Get here with win->w_buffer == NULL when win_close() detects the tab
 * page changed. */
 if (win->w_closing || (win->w_buffer != NULL
 					       && win->w_buffer->b_locked > 0))
 	return; /* window is already being closed */
-#endif
 if (win->w_buffer != NULL)
 	/* Close the link to the buffer. */
 	close_buffer(win, win->w_buffer, free_buf ? DOBUF_UNLOAD : 0, FALSE);
 int		dummy;
 while (first_tabpage->tp_next != NULL)
 	tabpage_close(TRUE);
-# ifdef FEAT_AUTOCMD
 if (aucmd_win != NULL)
 {
 	(void)win_free_mem(aucmd_win, &dummy, NULL);
 	aucmd_win = NULL;
 }
-# endif
 while (firstwin != NULL)
 	(void)win_free_mem(firstwin, &dummy, NULL);
 /* No window should be used after this. Set curwin to NULL to crash
 win_T	*nextwp;
 int		r;
 if (one_window())
 {
-	if (message
+	if (message && !autocmd_busy)
-#ifdef FEAT_AUTOCMD
-		    && !autocmd_busy
-#endif
-				    )
 	    MSG(_(m_onlyone));
 	return;
 }
 /* Be very careful here: autocommands may change the window layout. */
 	if (wp != curwin)		/* don't close current window */
 	{
 	    /* Check if it's allowed to abandon this window */
 	    r = can_abandon(wp->w_buffer, forceit);
-#ifdef FEAT_AUTOCMD
 	    if (!win_valid(wp))		/* autocommands messed wp up */
 	    {
 		nextwp = firstwin;
 		continue;
 	    }
-#endif
 	    if (!r)
 	    {
 #if defined(FEAT_GUI_DIALOG) || defined(FEAT_CON_DIALOG)
 		if (message && (p_confirm || cmdmod.confirm) && p_write)
 		{
 		    dialog_changed(wp->w_buffer, FALSE);
-# ifdef FEAT_AUTOCMD
 		    if (!win_valid(wp))		/* autocommands messed wp up */
 		    {
 			nextwp = firstwin;
 			continue;
 		    }
-# endif
 		}
 		if (bufIsChanged(wp->w_buffer))
 #endif
 		    continue;
 	    }
 curtab = first_tabpage;
 return OK;
 }
-#if defined(FEAT_AUTOCMD) || defined(PROTO)
 /*
 * Init "aucmd_win".  This can only be done after the first
 * window is fully initialized, thus it can't be in win_alloc_first().
 */
 void
 	win_init_some(aucmd_win, curwin);
 	RESET_BINDING(aucmd_win);
 	new_frame(aucmd_win);
 }
 }
-#endif
 /*
 * Allocate the first window or the first window in a new tab page.
 * When "oldwin" is NULL create an empty buffer for it.
 * When "oldwin" is not NULL copy info from it to the new window.
 	 * scrollbars.  Have to update them anyway. */
 	gui_may_update_scrollbars();
 #endif
 	redraw_all_later(CLEAR);
-#ifdef FEAT_AUTOCMD
 	apply_autocmds(EVENT_WINNEW, NULL, NULL, FALSE, curbuf);
 	apply_autocmds(EVENT_WINENTER, NULL, NULL, FALSE, curbuf);
 	apply_autocmds(EVENT_TABNEW, NULL, NULL, FALSE, curbuf);
 	apply_autocmds(EVENT_TABENTER, NULL, NULL, FALSE, curbuf);
-#endif
 	return OK;
 }
 /* Failed, get back the previous Tab page */
 enter_tabpage(curtab, curbuf, TRUE, TRUE);
 /* Limit to 'tabpagemax' tabs. */
 if (count > p_tpm)
 	count = p_tpm;
-#ifdef FEAT_AUTOCMD
 /*
 * Don't execute autocommands while creating the tab pages.  Must do that
 * when putting the buffers in the windows.
 */
 block_autocmds();
-#endif
 for (todo = count - 1; todo > 0; --todo)
 	if (win_new_tabpage(0) == FAIL)
 	    break;
-#ifdef FEAT_AUTOCMD
 unblock_autocmds();
-#endif
 /* return actual number of tab pages */
 return (count - todo);
 }
 int		trigger_leave_autocmds UNUSED)
 {
 tabpage_T	*tp = curtab;
 reset_VIsual_and_resel();	/* stop Visual mode */
-#ifdef FEAT_AUTOCMD
 if (trigger_leave_autocmds)
 {
 	if (new_curbuf != curbuf)
 	{
 	    apply_autocmds(EVENT_BUFLEAVE, NULL, NULL, FALSE, curbuf);
 	    return FAIL;
 	apply_autocmds(EVENT_TABLEAVE, NULL, NULL, FALSE, curbuf);
 	if (curtab != tp)
 	    return FAIL;
 }
-#endif
 #if defined(FEAT_GUI)
 /* Remove the scrollbars.  They may be added back later. */
 if (gui.in_use)
 	gui_remove_scrollbars();
 #endif
 /* When 'guioptions' includes 'L' or 'R' may have to remove or add
 * scrollbars.  Have to update them anyway. */
 gui_may_update_scrollbars();
 #endif
-#ifdef FEAT_AUTOCMD
 /* Apply autocommands after updating the display, when 'rows' and
 * 'columns' have been set correctly. */
 if (trigger_enter_autocmds)
 {
 	apply_autocmds(EVENT_TABENTER, NULL, NULL, FALSE, curbuf);
 	if (old_curbuf != curbuf)
 	    apply_autocmds(EVENT_BUFENTER, NULL, NULL, FALSE, curbuf);
 }
-#endif
 redraw_all_later(CLEAR);
 }
 /*
 {
 	beep_flush();
 	text_locked_msg();
 	return;
 }
-#ifdef FEAT_AUTOCMD
 if (curbuf_locked())
 	return;
-#endif
 if (wp->w_buffer != curbuf)
 	reset_VIsual_and_resel();
 else if (VIsual_active)
 	wp->w_cursor = curwin->w_cursor;
 int		curwin_invalid,
 int		trigger_new_autocmds UNUSED,
 int		trigger_enter_autocmds UNUSED,
 int		trigger_leave_autocmds UNUSED)
 {
-#ifdef FEAT_AUTOCMD
 int		other_buffer = FALSE;
-#endif
 if (wp == curwin && !curwin_invalid)	/* nothing to do */
 	return;
-#ifdef FEAT_AUTOCMD
 if (!curwin_invalid && trigger_leave_autocmds)
 {
 	/*
 	 * Be careful: If autocommands delete the window, return now.
 	 */
 		return;
 	}
 	apply_autocmds(EVENT_WINLEAVE, NULL, NULL, FALSE, curbuf);
 	if (!win_valid(wp))
 	    return;
-# ifdef FEAT_EVAL
+#ifdef FEAT_EVAL
 	/* autocmds may abort script processing */
 	if (aborting())
 	    return;
-# endif
+#endif
 }
-#endif
 /* sync undo before leaving the current buffer */
 if (undo_sync && curbuf != wp->w_buffer)
 	u_sync(FALSE);
 	ignored = mch_chdir((char *)globaldir);
 	VIM_CLEAR(globaldir);
 	shorten_fnames(TRUE);
 }
-#ifdef FEAT_AUTOCMD
 if (trigger_new_autocmds)
 	apply_autocmds(EVENT_WINNEW, NULL, NULL, FALSE, curbuf);
 if (trigger_enter_autocmds)
 {
 	apply_autocmds(EVENT_WINENTER, NULL, NULL, FALSE, curbuf);
 	if (other_buffer)
 	    apply_autocmds(EVENT_BUFENTER, NULL, NULL, FALSE, curbuf);
 }
-#endif
 #ifdef FEAT_TITLE
 maketitle();
 #endif
 curwin->w_redr_status = TRUE;
 	return NULL;
 }
 init_var_dict(new_wp->w_vars, &new_wp->w_winvar, VAR_SCOPE);
 #endif
-#ifdef FEAT_AUTOCMD
 /* Don't execute autocommands while the window is not properly
 * initialized yet.  gui_create_scrollbar() may trigger a FocusGained
 * event. */
 block_autocmds();
-#endif
 /*
 * link the window in the window list
 */
 if (!hidden)
 	win_append(after, new_wp);
 }
 #endif
 #ifdef FEAT_FOLDING
 foldInitWin(new_wp);
 #endif
-#ifdef FEAT_AUTOCMD
 unblock_autocmds();
-#endif
 #ifdef FEAT_SEARCH_EXTRA
 new_wp->w_match_head = NULL;
 new_wp->w_next_match_id = 4;
 #endif
 return new_wp;
 #endif
 /* reduce the reference count to the argument list. */
 alist_unlink(wp->w_alist);
-#ifdef FEAT_AUTOCMD
 /* Don't execute autocommands while the window is halfway being deleted.
 * gui_mch_destroy_scrollbar() may trigger a FocusGained event. */
 block_autocmds();
-#endif
 #ifdef FEAT_LUA
 lua_window_free(wp);
 #endif
 #ifdef FEAT_SYN_HL
 vim_free(wp->w_p_cc_cols);
 #endif
-#ifdef FEAT_AUTOCMD
 if (wp != aucmd_win)
-#endif
 	win_remove(wp, tp);
-#ifdef FEAT_AUTOCMD
 if (autocmd_busy)
 {
 	wp->w_next = au_pending_free_win;
 	au_pending_free_win = wp;
 }
 else
-#endif
 	vim_free(wp);
-#ifdef FEAT_AUTOCMD
 unblock_autocmds();
-#endif
 }
 /*
 * Append window "wp" in the window list after window "after".
 */
 	if (wp->w_buffer != NULL
 		&& (!((bt_help(wp->w_buffer) && !bt_help(curbuf))
 # ifdef FEAT_QUICKFIX
 		    || wp->w_p_pvw
 # endif
-	     ) || wp == curwin)
+	     ) || wp == curwin) && wp != aucmd_win)
-# ifdef FEAT_AUTOCMD
-		&& wp != aucmd_win
-# endif
-	   )
 	    ++count;
 return (count <= 1);
 }
 /*
 tabpage_T	**save_curtab,
 win_T	*win,
 tabpage_T	*tp,
 int		no_display)
 {
-# ifdef FEAT_AUTOCMD
 block_autocmds();
-# endif
 *save_curwin = curwin;
 if (tp != NULL)
 {
 	*save_curtab = curtab;
 	if (no_display)
 if (win_valid(save_curwin))
 {
 	curwin = save_curwin;
 	curbuf = curwin->w_buffer;
 }
-# ifdef FEAT_AUTOCMD
 unblock_autocmds();
-# endif
 }
 /*
 * Make "buf" the current buffer.  restore_buffer() MUST be called to undo.
 * No autocommands will be executed.  Use aucmd_prepbuf() if there are any.
 */
 void
 switch_buffer(bufref_T *save_curbuf, buf_T *buf)
 {
-# ifdef FEAT_AUTOCMD
 block_autocmds();
-# endif
 set_bufref(save_curbuf, curbuf);
 --curbuf->b_nwindows;
 curbuf = buf;
 curwin->w_buffer = buf;
 ++curbuf->b_nwindows;
 * Restore the current buffer after using switch_buffer().
 */
 void
 restore_buffer(bufref_T *save_curbuf)
 {
-# ifdef FEAT_AUTOCMD
 unblock_autocmds();
-# endif
 /* Check for valid buffer, just in case. */
 if (bufref_valid(save_curbuf))
 {
 	--curbuf->b_nwindows;
 	curwin->w_buffer = save_curbuf->br_buf;

Mercurial > vim

comparison src/window.c @ 13380:69517d67421f v8.0.1564