vim: src/window.c comparison

comparison src/window.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	bc0fee081e1e
children	3f16cf18386c

comparison

equal deleted inserted replaced

-:2516383741e6
+:68d7bc045dbe
 */
 #include "vim.h"
 static int path_is_url(char_u *p);
-#if defined(FEAT_WINDOWS) || defined(PROTO)
 static void cmd_with_count(char *cmd, char_u *bufp, size_t bufsize, long Prenum);
 static void win_init(win_T *newp, win_T *oldp, int flags);
 static void win_init_some(win_T *newp, win_T *oldp);
 static void frame_comp_pos(frame_T *topfrp, int *row, int *col);
 static void frame_setheight(frame_T *curfrp, int height);
 static void frame_add_statusline(frame_T *frp);
 static void frame_new_width(frame_T *topfrp, int width, int leftfirst, int wfw);
 static void frame_add_vsep(frame_T *frp);
 static int frame_minwidth(frame_T *topfrp, win_T *next_curwin);
 static void frame_fix_width(win_T *wp);
-#endif
 static int win_alloc_firstwin(win_T *oldwin);
 static void new_frame(win_T *wp);
-#if defined(FEAT_WINDOWS) || defined(PROTO)
 static tabpage_T *alloc_tabpage(void);
 static int leave_tabpage(buf_T *new_curbuf, int trigger_leave_autocmds);
 static void enter_tabpage(tabpage_T *tp, buf_T *old_curbuf, int trigger_enter_autocmds, int trigger_leave_autocmds);
 static void frame_fix_height(win_T *wp);
 static int frame_minheight(frame_T *topfrp, win_T *next_curwin);
 static win_T *restore_snapshot_rec(frame_T *sn, frame_T *fr);
 static int frame_check_height(frame_T *topfrp, int height);
 static int frame_check_width(frame_T *topfrp, int width);
-#endif /* FEAT_WINDOWS */
 static win_T *win_alloc(win_T *after, int hidden);
 #define URL_SLASH	1		/* path_is_url() has found "://" */
 #define URL_BACKSLASH	2		/* path_is_url() has found ":\\" */
 #define NOWIN		(win_T *)-1	/* non-existing window */
-#ifdef FEAT_WINDOWS
+#define ROWS_AVAIL (Rows - p_ch - tabline_height())
-# define ROWS_AVAIL (Rows - p_ch - tabline_height())
-#else
-# define ROWS_AVAIL (Rows - p_ch)
-#endif
-#if defined(FEAT_WINDOWS) || defined(PROTO)
 static char *m_onlyone = N_("Already only one window");
 /*
 * all CTRL-W window commands are handled here, called from normal_cmd().
 		reset_VIsual_and_resel();	/* stop Visual mode */
 		cmd_with_count("close", cbuf, sizeof(cbuf), Prenum);
 		do_cmdline_cmd(cbuf);
 		break;
-#if defined(FEAT_WINDOWS) && defined(FEAT_QUICKFIX)
+#if defined(FEAT_QUICKFIX)
 /* close preview window */
 case Ctrl_Z:
 case 'z':
 		CHECK_CMDWIN
 		reset_VIsual_and_resel();	/* stop Visual mode */
 /* copy options from existing window */
 win_copy_options(oldp, newp);
 }
-#endif /* FEAT_WINDOWS */
-#if defined(FEAT_WINDOWS) || defined(PROTO)
 /*
 * Check if "win" is a pointer to an existing window in the current tab page.
 */
 int
 win_valid(win_T *win)
 void
 win_free_all(void)
 {
 int		dummy;
-# ifdef FEAT_WINDOWS
 while (first_tabpage->tp_next != NULL)
 	tabpage_close(TRUE);
-# endif
 # ifdef FEAT_AUTOCMD
 if (aucmd_win != NULL)
 {
 	(void)win_free_mem(aucmd_win, &dummy, NULL);
 if (message && !ONE_WINDOW)
 	EMSG(_("E445: Other window contains changes"));
 }
-#endif /* FEAT_WINDOWS */
 /*
 * Init the current window "curwin".
 * Called when a new file is being edited.
 */
 void
 win_alloc_first(void)
 {
 if (win_alloc_firstwin(NULL) == FAIL)
 	return FAIL;
-#ifdef FEAT_WINDOWS
 first_tabpage = alloc_tabpage();
 if (first_tabpage == NULL)
 	return FAIL;
 first_tabpage->tp_topframe = topframe;
 curtab = first_tabpage;
-#endif
 return OK;
 }
 #if defined(FEAT_AUTOCMD) || defined(PROTO)
 #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 (only with
+* When "oldwin" is not NULL copy info from it to the new window.
-* FEAT_WINDOWS).
 * Return FAIL when something goes wrong (out of memory).
 */
 static int
 win_alloc_firstwin(win_T *oldwin)
 {
 	curwin->w_buffer = curbuf;
 #ifdef FEAT_SYN_HL
 	curwin->w_s = &(curbuf->b_s);
 #endif
 	curbuf->b_nwindows = 1;	/* there is one window */
-#ifdef FEAT_WINDOWS
 	curwin->w_alist = &global_alist;
-#endif
 	curwin_init();		/* init current window */
 }
-#ifdef FEAT_WINDOWS
 else
 {
 	/* First window in new tab page, initialize it from "oldwin". */
 	win_init(curwin, oldwin, 0);
 	/* We don't want cursor- and scroll-binding in the first window. */
 	RESET_BINDING(curwin);
 }
-#endif
 new_frame(curwin);
 if (curwin->w_frame == NULL)
 	return FAIL;
 topframe = curwin->w_frame;
-#ifdef FEAT_WINDOWS
 topframe->fr_width = Columns;
-#endif
 topframe->fr_height = Rows - p_ch;
 topframe->fr_win = curwin;
 return OK;
 }
 void
 win_init_size(void)
 {
 firstwin->w_height = ROWS_AVAIL;
 topframe->fr_height = ROWS_AVAIL;
-#ifdef FEAT_WINDOWS
 firstwin->w_width = Columns;
 topframe->fr_width = Columns;
-#endif
+}
-}
-#if defined(FEAT_WINDOWS) || defined(PROTO)
 /*
 * Allocate a new tabpage_T and init the values.
 * Returns NULL when out of memory.
 */
 win_T *
 win_find_nr(int winnr)
 {
 win_T	*wp;
-# ifdef FEAT_WINDOWS
 FOR_ALL_WINDOWS(wp)
 	if (--winnr == 0)
 	    break;
 return wp;
-# else
+}
-return curwin;
+#endif
-# endif
-}
+#if ((defined(FEAT_PYTHON) || defined(FEAT_PYTHON3))) || defined(PROTO)
-#endif
-#if (defined(FEAT_WINDOWS) && (defined(FEAT_PYTHON) || defined(FEAT_PYTHON3))) \
-	|| defined(PROTO)
 /*
 * Find the tabpage for window "win".
 */
 tabpage_T *
 win_find_tabpage(win_T *win)
 /* Change directories when the 'acd' option is set. */
 DO_AUTOCHDIR
 }
-#endif /* FEAT_WINDOWS */
-#if defined(FEAT_WINDOWS) || defined(FEAT_SIGNS) || defined(PROTO)
 /*
 * Jump to the first open window that contains buffer "buf", if one exists.
 * Returns a pointer to the window found, otherwise NULL.
 */
 win_T *
 {
 win_T	*wp = NULL;
 if (curwin->w_buffer == buf)
 	wp = curwin;
-# ifdef FEAT_WINDOWS
 else
 	FOR_ALL_WINDOWS(wp)
 	    if (wp->w_buffer == buf)
 		break;
 if (wp != NULL)
 	win_enter(wp, FALSE);
-# endif
 return wp;
 }
 /*
 * Jump to the first open window in any tab page that contains buffer "buf",
 */
 win_T *
 buf_jump_open_tab(buf_T *buf)
 {
 win_T	*wp = buf_jump_open_win(buf);
-# ifdef FEAT_WINDOWS
 tabpage_T	*tp;
 if (wp != NULL)
 	return wp;
 		if (curwin != wp)
 		    wp = NULL;	/* something went wrong */
 		break;
 	    }
 	}
-# endif
 return wp;
 }
-#endif
 static int last_win_id = LOWEST_WIN_ID - 1;
 /*
 * Allocate a window structure and link it in the window list when "hidden" is
 block_autocmds();
 #endif
 /*
 * link the window in the window list
 */
-#ifdef FEAT_WINDOWS
 if (!hidden)
 	win_append(after, new_wp);
 new_wp->w_wincol = 0;
 new_wp->w_width = Columns;
-#endif
 /* position the display and the cursor at the top of the file. */
 new_wp->w_topline = 1;
 #ifdef FEAT_DIFF
 new_wp->w_topfill = 0;
 new_wp->w_match_head = NULL;
 new_wp->w_next_match_id = 4;
 #endif
 return new_wp;
 }
-#if defined(FEAT_WINDOWS) || defined(PROTO)
 /*
 * Remove window 'wp' from the window list and free the structure.
 */
 static void
 	frp->fr_parent->fr_child = frp->fr_next;
 if (frp->fr_next != NULL)
 	frp->fr_next->fr_prev = frp->fr_prev;
 }
-#endif /* FEAT_WINDOWS */
 /*
 * Allocate w_lines[] for window "wp".
 * Return FAIL for failure, OK for success.
 */
 int
 {
 int		h = (int)ROWS_AVAIL;
 if (firstwin == NULL)	/* not initialized yet */
 	return;
-#ifdef FEAT_WINDOWS
 if (h < frame_minheight(topframe, NULL))
 	h = frame_minheight(topframe, NULL);
 /* First try setting the heights of windows with 'winfixheight'.  If
 * that doesn't result in the right height, forget about that option. */
 frame_new_height(topframe, h, FALSE, TRUE);
 if (!frame_check_height(topframe, h))
 	frame_new_height(topframe, h, FALSE, FALSE);
 (void)win_comp_pos();		/* recompute w_winrow and w_wincol */
-#else
-if (h < 1)
-	h = 1;
-win_new_height(firstwin, h);
-#endif
 compute_cmdrow();
-#ifdef FEAT_WINDOWS
 curtab->tp_ch_used = p_ch;
-#endif
 #if 0
 /* Disabled: don't want making the screen smaller make a window larger. */
 if (p_ea)
 	win_equal(curwin, FALSE, 'v');
 #endif
 }
-#if defined(FEAT_WINDOWS) || defined(PROTO)
 /*
 * Called from win_new_shellsize() after Columns changed.
 */
 void
 shell_new_columns(void)
 /* Disabled: don't want making the screen smaller make a window larger. */
 if (p_ea)
 	win_equal(curwin, FALSE, 'h');
 #endif
 }
-#endif
 #if defined(FEAT_CMDWIN) || defined(PROTO)
 /*
 * Save the size of all windows in "gap".
 */
 	(void)win_comp_pos();
 }
 }
 #endif /* FEAT_CMDWIN */
-#if defined(FEAT_WINDOWS) || defined(PROTO)
 /*
 * Update the position for all windows, using the width and height of the
 * frames.
 * Returns the row just after the last window.
 */
 	    frame_comp_pos(frp, row, col);
 	}
 }
 }
-#endif /* FEAT_WINDOWS */
 /*
 * Set current window height and take care of repositioning other windows to
 * fit around it.
 */
 void
 if (win == curwin)
 {
 	/* Always keep current window at least one line high, even when
 	 * 'winminheight' is zero. */
-#ifdef FEAT_WINDOWS
 	if (height < p_wmh)
 	    height = p_wmh;
-#endif
 	if (height == 0)
 	    height = 1;
 }
-#ifdef FEAT_WINDOWS
 frame_setheight(win->w_frame, height + win->w_status_height);
 /* recompute the window positions */
 row = win_comp_pos();
-#else
-if (height > topframe->fr_height)
-	height = topframe->fr_height;
-win->w_height = height;
-row = height;
-#endif
 /*
 * If there is extra space created between the last window and the command
 * line, clear it.
 */
 msg_row = row;
 msg_col = 0;
 redraw_all_later(NOT_VALID);
 }
-#if defined(FEAT_WINDOWS) || defined(PROTO)
 /*
 * Set the height of a frame to "height" and take care that all frames and
 * windows inside it are resized.  Also resize frames on the left and right if
 * the are in the same FR_ROW frame.
 (void)win_comp_pos();
 redraw_all_later(NOT_VALID);
 }
 #endif /* FEAT_MOUSE */
-#endif /* FEAT_WINDOWS */
 #define FRACTION_MULT	16384L
 /*
 * Set wp->w_fraction for the current w_wrow and w_height.
 */
 if (prev_height > 0)
 	wp->w_prev_fraction_row = wp->w_wrow;
 win_comp_scroll(wp);
 redraw_win_later(wp, SOME_VALID);
-#ifdef FEAT_WINDOWS
 wp->w_redr_status = TRUE;
-#endif
 invalidate_botline_win(wp);
 }
-#ifdef FEAT_WINDOWS
 /*
 * Set the width of a window.
 */
 void
 win_new_width(win_T *wp, int width)
 	curs_columns(TRUE);	/* validate w_wrow */
 }
 redraw_win_later(wp, NOT_VALID);
 wp->w_redr_status = TRUE;
 }
-#endif
 void
 win_comp_scroll(win_T *wp)
 {
 wp->w_p_scr = ((unsigned)wp->w_height >> 1);
 * command_height: called whenever p_ch has been changed
 */
 void
 command_height(void)
 {
-#ifdef FEAT_WINDOWS
 int		h;
 frame_T	*frp;
 int		old_p_ch = curtab->tp_ch_used;
 /* Use the value of p_ch that we remembered.  This is needed for when the
 frame_add_height(frp, (int)(old_p_ch - p_ch));
 /* Recompute window positions. */
 if (frp != lastwin->w_frame)
 	(void)win_comp_pos();
-#else
+}
-cmdline_row = Rows - p_ch;
-win_setheight(cmdline_row);
-#endif
-}
-#if defined(FEAT_WINDOWS) || defined(PROTO)
 /*
 * Resize frame "frp" to be "n" lines higher (negative for less high).
 * Also resize the frames it is contained in.
 */
 static void
 	case 1: return (first_tabpage->tp_next == NULL) ? 0 : 1;
 }
 return 1;
 }
-#endif /* FEAT_WINDOWS */
 #if defined(FEAT_SEARCHPATH) || defined(PROTO)
 /*
 * Get the file name at the cursor.
 * If Visual mode is active, use the selected text if it's in one line.
 * Returns the name in allocated memory, NULL for failure.
 */
 int
 min_rows(void)
 {
 int		total;
-#ifdef FEAT_WINDOWS
 tabpage_T	*tp;
 int		n;
-#endif
 if (firstwin == NULL)	/* not initialized yet */
 	return MIN_LINES;
-#ifdef FEAT_WINDOWS
 total = 0;
 FOR_ALL_TABPAGES(tp)
 {
 	n = frame_minheight(tp->tp_topframe, NULL);
 	if (total < n)
 	    total = n;
 }
 total += tabline_height();
-#else
-total = 1;		/* at least one window should have a line! */
-#endif
 total += 1;		/* count the room for the command line */
 return total;
 }
 /*
 * Does not count "aucmd_win".
 */
 int
 only_one_window(void)
 {
-#ifdef FEAT_WINDOWS
 int		count = 0;
 win_T	*wp;
 /* If there is another tab page there always is another window. */
 if (first_tabpage->tp_next != NULL)
 		&& wp != aucmd_win
 # endif
 	   )
 	    ++count;
 return (count <= 1);
-#else
+}
-return TRUE;
-#endif
-}
-#if defined(FEAT_WINDOWS) || defined(FEAT_AUTOCMD) || defined(PROTO)
 /*
 * Correct the cursor line number in other windows.  Used after changing the
 * current buffer, and before applying autocommands.
 * When "do_curwin" is TRUE, also check current window.
 */
 void
 check_lnums(int do_curwin)
 {
 win_T	*wp;
-#ifdef FEAT_WINDOWS
 tabpage_T	*tp;
 FOR_ALL_TAB_WINDOWS(tp, wp)
 	if ((do_curwin || wp != curwin) && wp->w_buffer == curbuf)
-#else
-wp = curwin;
-if (do_curwin)
-#endif
 	{
 	    if (wp->w_cursor.lnum > curbuf->b_ml.ml_line_count)
 		wp->w_cursor.lnum = curbuf->b_ml.ml_line_count;
 	    if (wp->w_topline > curbuf->b_ml.ml_line_count)
 		wp->w_topline = curbuf->b_ml.ml_line_count;
 	}
 }
-#endif
-#if defined(FEAT_WINDOWS) || defined(PROTO)
 /*
 * A snapshot of the window sizes, to restore them after closing the help
 * window.
 * Only these fields are used:
 	    wp = wp2;
 }
 return wp;
 }
-#endif
 #if defined(FEAT_EVAL) || defined(FEAT_PYTHON) || defined(FEAT_PYTHON3) \
 	|| defined(PROTO)
 /*
 * Set "win" to be the curwin and "tp" to be the current tab page.
 * restore_win() MUST be called to undo, also when FAIL is returned.
 int		no_display UNUSED)
 {
 # ifdef FEAT_AUTOCMD
 block_autocmds();
 # endif
-# ifdef FEAT_WINDOWS
 *save_curwin = curwin;
 if (tp != NULL)
 {
 	*save_curtab = curtab;
 	if (no_display)
 }
 if (!win_valid(win))
 	return FAIL;
 curwin = win;
 curbuf = curwin->w_buffer;
-# endif
 return OK;
 }
 /*
 * Restore current tabpage and window saved by switch_win(), if still valid.
 restore_win(
 win_T	*save_curwin UNUSED,
 tabpage_T	*save_curtab UNUSED,
 int		no_display UNUSED)
 {
-# ifdef FEAT_WINDOWS
 if (save_curtab != NULL && valid_tabpage(save_curtab))
 {
 	if (no_display)
 	{
 	    curtab->tp_firstwin = firstwin;
 if (win_valid(save_curwin))
 {
 	curwin = save_curwin;
 	curbuf = curwin->w_buffer;
 }
-# endif
 # ifdef FEAT_AUTOCMD
 unblock_autocmds();
 # endif
 }
 	++curbuf->b_nwindows;
 }
 }
 #endif
-#if (defined(FEAT_GUI) && defined(FEAT_WINDOWS)) || defined(PROTO)
+#if defined(FEAT_GUI) || defined(PROTO)
 /*
 * Return TRUE if there is any vertically split window.
 */
 int
 win_hasvertsplit(void)
 int
 get_tab_number(tabpage_T *tp UNUSED)
 {
 int		i = 1;
-# ifdef FEAT_WINDOWS
 tabpage_T	*t;
 for (t = first_tabpage; t != NULL && t != tp; t = t->tp_next)
 	++i;
 if (t == NULL)
 	return 0;
 else
-# endif
 	return i;
 }
 #endif
-#if defined(FEAT_WINDOWS) || defined(PROTO)
 /*
 * Return TRUE if "topfrp" and its children are at the right height.
 */
 static int
 frame_check_height(frame_T *topfrp, int height)
 	    if (frp->fr_height != height)
 		return FALSE;
 return TRUE;
 }
-#endif
-#if defined(FEAT_WINDOWS) || defined(PROTO)
 /*
 * Return TRUE if "topfrp" and its children are at the right width.
 */
 static int
 frame_check_width(frame_T *topfrp, int width)
 	    if (frp->fr_width != width)
 		return FALSE;
 return TRUE;
 }
-#endif
 #if defined(FEAT_EVAL) || defined(PROTO)
 int
 win_getid(typval_T *argvars)
 {

Mercurial > vim

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