vim: src/buffer.c comparison

comparison src/buffer.c @ 12477:68d7bc045dbe v8.0.1118

patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs commit https://github.com/vim/vim/commit/4033c55eca575777718c0701e26635a0cc47d907 Author: Bram Moolenaar <Bram@vim.org> Date: Sat Sep 16 20:54:51 2017 +0200 patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs Problem: FEAT_WINDOWS adds a lot of #ifdefs while it is nearly always enabled and only adds 7% to the binary size of the tiny build. Solution: Graduate FEAT_WINDOWS.

author	Christian Brabandt <cb@256bit.org>
date	Sat, 16 Sep 2017 21:00:06 +0200
parents	1ecdbc207c1e
children	65c7769ef6d1

comparison

equal deleted inserted replaced

-:2516383741e6
+:68d7bc045dbe
 #if defined(FEAT_SIGNS)
 static void insert_sign(buf_T *buf, signlist_T *prev, signlist_T *next, int id, linenr_T lnum, int typenr);
 #endif
-#if defined(FEAT_WINDOWS) && defined(FEAT_QUICKFIX)
+#if defined(FEAT_QUICKFIX)
 static char *msg_loclist = N_("[Location List]");
 static char *msg_qflist = N_("[Quickfix List]");
 #endif
 #ifdef FEAT_AUTOCMD
 static char *e_auabort = N_("E855: Autocommands caused command to abort");
 {
 #ifdef FEAT_AUTOCMD
 int		is_curbuf;
 int		nwindows;
 bufref_T	bufref;
-# ifdef FEAT_WINDOWS
 int		is_curwin = (curwin != NULL && curwin->w_buffer == buf);
 win_T	*the_curwin = curwin;
 tabpage_T	*the_curtab = curtab;
-# endif
 #endif
 int		unload_buf = (action != 0);
 int		del_buf = (action == DOBUF_DEL || action == DOBUF_WIPE);
 int		wipe_buf = (action == DOBUF_WIPE);
 	EMSG(_("E937: Attempt to delete a buffer that is in use"));
 	return;
 }
 #endif
-if (win != NULL
+/* check no autocommands closed the window */
-#ifdef FEAT_WINDOWS
+if (win != NULL && win_valid_any_tab(win))
-	&& win_valid_any_tab(win) /* in case autocommands closed the window */
-#endif
-	    )
 {
 	/* Set b_last_cursor when closing the last window for the buffer.
 	 * Remember the last cursor position and window options of the buffer.
 	 * This used to be only for the current window, but then options like
 	 * 'foldmethod' may be lost with a ":only" command. */
 	if (aborting())	    /* autocmds may abort script processing */
 	    return;
 # endif
 }
-# ifdef FEAT_WINDOWS
 /* If the buffer was in curwin and the window has changed, go back to that
 * window, if it still exists.  This avoids that ":edit x" triggering a
 * "tabnext" BufUnload autocmd leaves a window behind without a buffer. */
 if (is_curwin && curwin != the_curwin &&  win_valid_any_tab(the_curwin))
 {
 	block_autocmds();
 	goto_tabpage_win(the_curtab, the_curwin);
 	unblock_autocmds();
 }
-# endif
 nwindows = buf->b_nwindows;
 #endif
 /* decrease the link count from windows (unless not in any window) */
 * deleted buffer.
 */
 if (buf == curbuf && !is_curbuf)
 	return;
-if (
+if (win_valid_any_tab(win) && win->w_buffer == buf)
-#ifdef FEAT_WINDOWS
-	win_valid_any_tab(win) &&
-#else
-	win != NULL &&
-#endif
-			  win->w_buffer == buf)
 	win->w_buffer = NULL;  /* make sure we don't use the buffer now */
 /* Autocommands may have opened or closed windows for this buffer.
 * Decrement the count for the close we do here. */
 if (buf->b_nwindows > 0)
 buf_freeall(buf_T *buf, int flags)
 {
 #ifdef FEAT_AUTOCMD
 int		is_curbuf = (buf == curbuf);
 bufref_T	bufref;
-# ifdef FEAT_WINDOWS
 int		is_curwin = (curwin != NULL && curwin->w_buffer == buf);
 win_T	*the_curwin = curwin;
 tabpage_T	*the_curtab = curtab;
-# endif
 /* Make sure the buffer isn't closed by autocommands. */
 ++buf->b_locked;
 set_bufref(&bufref, buf);
 if (buf->b_ml.ml_mfp != NULL)
 	    /* autocommands deleted the buffer */
 	    return;
 }
 --buf->b_locked;
-# ifdef FEAT_WINDOWS
 /* If the buffer was in curwin and the window has changed, go back to that
 * window, if it still exists.  This avoids that ":edit x" triggering a
 * "tabnext" BufUnload autocmd leaves a window behind without a buffer. */
 if (is_curwin && curwin != the_curwin &&  win_valid_any_tab(the_curwin))
 {
 	block_autocmds();
 	goto_tabpage_win(the_curtab, the_curwin);
 	unblock_autocmds();
 }
-# endif
 # ifdef FEAT_EVAL
 if (aborting())	    /* autocmds may abort script processing */
 	return;
 # endif
 	reset_synblock(curwin);
 #endif
 #ifdef FEAT_FOLDING
 /* No folds in an empty buffer. */
-# ifdef FEAT_WINDOWS
 {
 	win_T		*win;
 	tabpage_T	*tp;
 	FOR_ALL_TAB_WINDOWS(tp, win)
 	    if (win->w_buffer == buf)
 		clearFolding(win);
 }
-# else
-if (curwin != NULL && curwin->w_buffer == buf)
-	clearFolding(curwin);
-# endif
 #endif
 #ifdef FEAT_TCL
 tcl_buffer_free(buf);
 #endif
 exarg_T	*eap,
 int		start,
 int		dir,
 int		count)
 {
-# if defined(FEAT_WINDOWS) && defined(HAS_SWAP_EXISTS_ACTION)
+# if defined(HAS_SWAP_EXISTS_ACTION)
 bufref_T	old_curbuf;
 set_bufref(&old_curbuf, curbuf);
 swap_exists_action = SEA_DIALOG;
 # endif
 (void)do_buffer(*eap->cmd == 's' ? DOBUF_SPLIT : DOBUF_GOTO,
 					     start, dir, count, eap->forceit);
-# if defined(FEAT_WINDOWS) && defined(HAS_SWAP_EXISTS_ACTION)
+# if defined(HAS_SWAP_EXISTS_ACTION)
 if (swap_exists_action == SEA_QUIT && *eap->cmd == 's')
 {
 #  if defined(FEAT_AUTOCMD) && defined(FEAT_EVAL)
 	cleanup_T   cs;
 	EMSG(_("E90: Cannot unload last buffer"));
 	return FAIL;
 }
 set_bufref(&bufref, buf);
-#ifdef FEAT_WINDOWS
 if (close_others)
 	/* Close any other windows on this buffer, then make it empty. */
 	close_windows(buf, TRUE);
-#endif
 setpcmark();
 retval = do_ecmd(0, NULL, NULL, NULL, ECMD_ONE,
 					  forceit ? ECMD_FORCEIT : 0, curwin);
 * delete buffer buf from memory and/or the list
 */
 if (unload)
 {
 	int	forward;
-# if defined(FEAT_AUTOCMD) || defined(FEAT_WINDOWS)
 	bufref_T bufref;
 	set_bufref(&bufref, buf);
-# endif
 	/* When unloading or deleting a buffer that's already unloaded and
 	 * unlisted: fail silently. */
 	if (action != DOBUF_WIPE && buf->b_ml.ml_mfp == NULL && !buf->b_p_bl)
 	    return FAIL;
 	    if (bp->b_p_bl && bp != buf)
 		break;
 	if (bp == NULL && buf == curbuf)
 	    return empty_curbuf(TRUE, forceit, action);
-#ifdef FEAT_WINDOWS
 	/*
 	 * If the deleted buffer is the current one, close the current window
 	 * (unless it's the only window).  Repeat this so long as we end up in
 	 * a window with this buffer.
 	 */
 	while (buf == curbuf
-# ifdef FEAT_AUTOCMD
+#ifdef FEAT_AUTOCMD
 		   && !(curwin->w_closing || curwin->w_buffer->b_locked > 0)
-# endif
+#endif
 		   && (!ONE_WINDOW || first_tabpage->tp_next != NULL))
 	{
 	    if (win_close(curwin, FALSE) == FAIL)
 		break;
 	}
-#endif
 	/*
 	 * If the buffer to be deleted is not the current one, delete it here.
 	 */
 	if (buf != curbuf)
 	{
-#ifdef FEAT_WINDOWS
 	    close_windows(buf, FALSE);
-	    if (buf != curbuf && bufref_valid(&bufref))
+	    if (buf != curbuf && bufref_valid(&bufref) && buf->b_nwindows <= 0)
-#endif
-		if (buf->b_nwindows <= 0)
 		    close_buffer(NULL, buf, action, FALSE);
 	    return OK;
 	}
 	/*
 /*
 * make buf current buffer
 */
 if (action == DOBUF_SPLIT)	    /* split window first */
 {
-# ifdef FEAT_WINDOWS
 	/* If 'switchbuf' contains "useopen": jump to first window containing
 	 * "buf" if one exists */
 	if ((swb_flags & SWB_USEOPEN) && buf_jump_open_win(buf))
 	    return OK;
 	/* If 'switchbuf' contains "usetab": jump to first window in any tab
 	 * page containing "buf" if one exists */
 	if ((swb_flags & SWB_USETAB) && buf_jump_open_tab(buf))
 	    return OK;
 	if (win_split(0, 0) == FAIL)
-# endif
 	    return FAIL;
 }
 #endif
 /* go to current buffer - nothing to do */
 {
 #ifdef FEAT_SYN_HL
 	if (prevbuf == curwin->w_buffer)
 	    reset_synblock(curwin);
 #endif
-#ifdef FEAT_WINDOWS
 	if (unload)
 	    close_windows(prevbuf, FALSE);
-#endif
 #if defined(FEAT_AUTOCMD) && defined(FEAT_EVAL)
 	if (bufref_valid(&bufref) && !aborting())
 #else
 	if (bufref_valid(&bufref))
 #endif
 	{
-#ifdef FEAT_WINDOWS
 	    win_T  *previouswin = curwin;
-#endif
 	    if (prevbuf == curbuf)
 		u_sync(FALSE);
 	    close_buffer(prevbuf == curwin->w_buffer ? curwin : NULL, prevbuf,
 		    unload ? action : (action == DOBUF_GOTO
 			&& !buf_hide(prevbuf)
 			&& !bufIsChanged(prevbuf)) ? DOBUF_UNLOAD : 0, FALSE);
-#ifdef FEAT_WINDOWS
 	    if (curwin != previouswin && win_valid(previouswin))
 	      /* autocommands changed curwin, Grr! */
 	      curwin = previouswin;
-#endif
 	}
 }
 #ifdef FEAT_AUTOCMD
 /* An autocommand may have deleted "buf", already entered it (e.g., when
 * it did ":bunload") or aborted the script processing.
 * If curwin->w_buffer is null, enter_buffer() will make it valid again */
 if ((buf_valid(buf) && buf != curbuf
 # ifdef FEAT_EVAL
-	    && !aborting()
+		&& !aborting()
 # endif
-# ifdef FEAT_WINDOWS
+	) || curwin->w_buffer == NULL)
-	 ) || curwin->w_buffer == NULL
-# endif
-)
 #endif
 {
 	enter_buffer(buf);
 #ifdef FEAT_SYN_HL
 	if (old_tw != curbuf->b_p_tw)
 linenr_T	lnum,
 int		options,
 int		forceit)
 {
 buf_T	*buf;
-#ifdef FEAT_WINDOWS
 win_T	*wp = NULL;
-#endif
 pos_T	*fpos;
 colnr_T	col;
 buf = buflist_findnr(n);
 if (buf == NULL)
 	col = fpos->col;
 }
 else
 	col = 0;
-#ifdef FEAT_WINDOWS
 if (options & GETF_SWITCH)
 {
 	/* If 'switchbuf' contains "useopen": jump to first window containing
 	 * "buf" if one exists */
 	if (swb_flags & SWB_USEOPEN)
 								      == FAIL)
 		return FAIL;
 	    RESET_BINDING(curwin);
 	}
 }
-#endif
 ++RedrawingDisabled;
 if (GETFILE_SUCCESS(getfile(buf->b_fnum, NULL, NULL,
 				     (options & GETF_SETMARK), lnum, forceit)))
 {
 		    {
 			if (curtab_only)
 			{
 			    /* Ignore the match if the buffer is not open in
 			     * the current tab. */
-#ifdef FEAT_WINDOWS
 			    win_T	*wp;
 			    FOR_ALL_WINDOWS(wp)
 				if (wp->w_buffer == buf)
 				    break;
 			    if (wp == NULL)
 				continue;
-#else
-			    if (curwin->w_buffer != buf)
-				continue;
-#endif
 			}
 			if (match >= 0)		/* already found a match */
 			{
 			    match = -2;
 			    break;
 	changed_char = (buf->b_flags & BF_READERR) ? 'x'
 					     : (bufIsChanged(buf) ? '+' : ' ');
 #ifdef FEAT_TERMINAL
 	if (term_job_running(buf->b_term))
 	{
-	    ro_char = 'R';
+	    if (term_none_open(buf->b_term))
+		ro_char = '?';
+	    else
+		ro_char = 'R';
 	    changed_char = ' ';  /* bufIsChanged() returns TRUE to avoid
 				  * closing, but it's not actually changed. */
 	}
 	else if (buf->b_term != NULL)
 	    ro_char = 'F';
 if (curwin->w_buffer == buf)
 	check_arg_idx(curwin);	/* check file name for arg list */
 #ifdef FEAT_TITLE
 maketitle();		/* set window title */
 #endif
-#ifdef FEAT_WINDOWS
 status_redraw_all();	/* status lines need to be redrawn */
-#endif
 fmarks_check_names(buf);	/* check named file marks */
 ml_timestamp(buf);		/* reset timestamp */
 }
 /*
 		str = tmp;
 	    }
 	    break;
 #endif
-#if defined(FEAT_WINDOWS) && defined(FEAT_QUICKFIX)
+#if defined(FEAT_QUICKFIX)
 	case STL_PREVIEWFLAG:
 	case STL_PREVIEWFLAG_ALT:
 	    itemisflag = TRUE;
 	    if (wp->w_p_pvw)
 		str = (char_u *)((opt == STL_PREVIEWFLAG_ALT) ? ",PRV"
 if (bp == NULL || bp->b_fname == NULL)
 	return aep->ae_fname;
 return bp->b_fname;
 }
-#if defined(FEAT_WINDOWS) || defined(PROTO)
 /*
 * do_arg_all(): Open up to 'count' windows, one for each argument.
 */
 void
 do_arg_all(
 			    wpnext = firstwin;	/* start all over... */
 			    continue;
 			}
 #endif
 		    }
-#ifdef FEAT_WINDOWS
 		    /* don't close last window */
 		    if (ONE_WINDOW
 			    && (first_tabpage->tp_next == NULL || !had_tab))
-#endif
 			use_firstwin = TRUE;
-#ifdef FEAT_WINDOWS
 		    else
 		    {
 			win_close(wp, !buf_hide(buf) && !bufIsChanged(buf));
-# ifdef FEAT_AUTOCMD
+#ifdef FEAT_AUTOCMD
 			/* check if autocommands removed the next window */
 			if (!win_valid(wpnext))
 			    wpnext = firstwin;	/* start all over... */
-# endif
+#endif
 		    }
-#endif
 		}
 	    }
 	}
 	/* Without the ":tab" modifier only do the current tab page. */
 ++autocmd_no_leave;
 #endif
 last_curwin = curwin;
 last_curtab = curtab;
 win_enter(lastwin, FALSE);
-#ifdef FEAT_WINDOWS
 /* ":drop all" should re-use an empty window to avoid "--remote-tab"
 * leaving an empty tab page when executed locally. */
 if (keep_tabs && BUFEMPTY() && curbuf->b_nwindows == 1
 			    && curbuf->b_ffname == NULL && !curbuf->b_changed)
 	use_firstwin = TRUE;
-#endif
 for (i = 0; i < count && i < opened_len && !got_int; ++i)
 {
 	if (alist == &global_alist && i == global_alist.al_ga.ga_len - 1)
 	    arg_had_last = TRUE;
 int		p_ea_save;
 int		open_wins = 0;
 int		r;
 int		count;		/* Maximum number of windows to open. */
 int		all;		/* When TRUE also load inactive buffers. */
-#ifdef FEAT_WINDOWS
 int		had_tab = cmdmod.tab;
 tabpage_T	*tpnext;
-#endif
 if (eap->addr_count == 0)	/* make as many windows as possible */
 	count = 9999;
 else
 	count = eap->line2;	/* make as many windows as specified */
 /*
 * Close superfluous windows (two windows for the same buffer).
 * Also close windows that are not full-width.
 */
-#ifdef FEAT_WINDOWS
 if (had_tab > 0)
 	goto_tabpage_tp(first_tabpage, TRUE, TRUE);
 for (;;)
 {
-#endif
 	tpnext = curtab->tp_next;
 	for (wp = firstwin; wp != NULL; wp = wpnext)
 	{
 	    wpnext = wp->w_next;
 	    if ((wp->w_buffer->b_nwindows > 1
-#ifdef FEAT_WINDOWS
 		    || ((cmdmod.split & WSP_VERT)
 			? wp->w_height + wp->w_status_height < Rows - p_ch
 							    - tabline_height()
 			: wp->w_width != Columns)
-		    || (had_tab > 0 && wp != firstwin)
+		    || (had_tab > 0 && wp != firstwin)) && !ONE_WINDOW
-#endif
-		    ) && !ONE_WINDOW
 #ifdef FEAT_AUTOCMD
 		    && !(wp->w_closing || wp->w_buffer->b_locked > 0)
 #endif
 		    )
 	    {
 	    }
 	    else
 		++open_wins;
 	}
-#ifdef FEAT_WINDOWS
 	/* Without the ":tab" modifier only do the current tab page. */
 	if (had_tab == 0 || tpnext == NULL)
 	    break;
 	goto_tabpage_tp(tpnext, TRUE, TRUE);
 }
-#endif
 /*
 * Go through the buffer list.  When a buffer doesn't have a window yet,
 * open one.  Otherwise move the window to the right position.
 * Watch out for autocommands that delete buffers or windows!
 {
 	/* Check if this buffer needs a window */
 	if ((!all && buf->b_ml.ml_mfp == NULL) || !buf->b_p_bl)
 	    continue;
-#ifdef FEAT_WINDOWS
 	if (had_tab != 0)
 	{
 	    /* With the ":tab" modifier don't move the window. */
 	    if (buf->b_nwindows > 0)
 		wp = lastwin;	    /* buffer has a window, skip it */
 	    else
 		wp = NULL;
 	}
 	else
-#endif
 	{
 	    /* Check if this buffer already has a window */
 	    FOR_ALL_WINDOWS(wp)
 		if (wp->w_buffer == buf)
 		    break;
 #ifdef FEAT_EVAL
 	/* Autocommands deleted the buffer or aborted script processing!!! */
 	if (aborting())
 	    break;
 #endif
-#ifdef FEAT_WINDOWS
 	/* When ":tab" was used open a new tab for a new window repeatedly. */
 	if (had_tab > 0 && tabpage_index(NULL) <= p_tpm)
 	    cmdmod.tab = 9999;
-#endif
 }
 #ifdef FEAT_AUTOCMD
 --autocmd_no_enter;
 #endif
 win_enter(firstwin, FALSE);		/* back to first window */
 	}
 }
 }
 # endif /* FEAT_LISTCMDS */
-#endif /* FEAT_WINDOWS */
 static int  chk_modeline(linenr_T, int);
 /*
 * do_modelines() - process mode lines for the current file
 void
 write_viminfo_bufferlist(FILE *fp)
 {
 buf_T	*buf;
-#ifdef FEAT_WINDOWS
 win_T	*win;
 tabpage_T	*tp;
-#endif
 char_u	*line;
 int		max_buffers;
 if (find_viminfo_parameter('%') == NULL)
 	return;
 #define LINE_BUF_LEN (MAXPATHL + 40)
 line = alloc(LINE_BUF_LEN);
 if (line == NULL)
 	return;
-#ifdef FEAT_WINDOWS
 FOR_ALL_TAB_WINDOWS(tp, win)
 	set_last_cursor(win);
-#else
-set_last_cursor(curwin);
-#endif
 fputs(_("\n# Buffer list:\n"), fp);
 FOR_ALL_BUFFERS(buf)
 {
 	if (buf->b_fname == NULL
 * Returns NULL when the buffer has a normal file name.
 */
 char_u *
 buf_spname(buf_T *buf)
 {
-#if defined(FEAT_QUICKFIX) && defined(FEAT_WINDOWS)
+#if defined(FEAT_QUICKFIX)
 if (bt_quickfix(buf))
 {
 	win_T	    *win;
 	tabpage_T   *tp;
 else
 	restore_buffer(save_curbuf);
 }
 #endif
-#if (defined(FEAT_QUICKFIX) && defined(FEAT_WINDOWS)) \
+#if defined(FEAT_QUICKFIX) || defined(SWITCH_TO_WIN) || defined(PROTO)
-	|| defined(SWITCH_TO_WIN) \
-	|| defined(PROTO)
 /*
 * Find a window for buffer "buf".
 * If found OK is returned and "wp" and "tp" are set to the window and tabpage.
 * If not found FAIL is returned.
 */

Mercurial > vim

comparison src/buffer.c @ 12477:68d7bc045dbe v8.0.1118