vim: src/screen.c comparison

comparison src/screen.c @ 677:e649c78407e6 v7.0202

updated for version 7.0202

author	vimboss
date	Mon, 20 Feb 2006 21:37:40 +0000
parents	4b8583e82cb8
children	5b101ff9d4c4

comparison

equal deleted inserted replaced

-:9cdb8018cdf1
+:e649c78407e6
 #endif
 static int win_do_lines __ARGS((win_T *wp, int row, int line_count, int mayclear, int del));
 static void win_rest_invalid __ARGS((win_T *wp));
 static void msg_pos_mode __ARGS((void));
 #if defined(FEAT_WINDOWS)
-static void draw_tabpage __ARGS((void));
+static void draw_tabline __ARGS((void));
 #endif
 #if defined(FEAT_WINDOWS) || defined(FEAT_WILDMENU) || defined(FEAT_STL_OPT)
 static int fillchar_status __ARGS((int *attr, int is_curwin));
 #endif
 #ifdef FEAT_VERTSPLIT
 	check_for_delay(FALSE);
 #ifdef FEAT_LINEBREAK
 /* Force redraw when width of 'number' column changes. */
 if (curwin->w_redr_type < NOT_VALID
-				 && curwin->w_nrwidth != number_width(curwin))
+	   && curwin->w_nrwidth != (curwin->w_p_nu ? number_width(curwin) : 0))
 	curwin->w_redr_type = NOT_VALID;
 #endif
 /*
 * Only start redrawing if there is really something to do.
 #endif
 #ifdef FEAT_WINDOWS
 /* Redraw the tab pages line if needed. */
 if (redraw_tabline || type >= NOT_VALID)
-	draw_tabpage();
+	draw_tabline();
 #endif
 /*
 * Go from top to bottom through the windows, redrawing the ones that need
 * it.
 win_update(wp);
 #ifdef FEAT_WINDOWS
 /* When the screen was cleared redraw the tab pages line. */
 if (redraw_tabline)
-	draw_tabpage();
+	draw_tabline();
 if (wp->w_redr_status
 # ifdef FEAT_CMDL_INFO
 	    || p_ru
 # endif
 search_hl.first_lnum = 0;
 #endif
 #ifdef FEAT_LINEBREAK
 /* Force redraw when width of 'number' column changes. */
-i = number_width(curwin);
+i = wp->w_p_nu ? number_width(wp) : 0;
-if (curwin->w_nrwidth != i)
+if (wp->w_nrwidth != i)
 {
 	type = NOT_VALID;
-	curwin->w_nrwidth = i;
+	wp->w_nrwidth = i;
 }
 else
 #endif
 if (buf->b_mod_set && buf->b_mod_xlines != 0 && wp->w_redraw_top != 0)
 for (wp = firstwin; wp; wp = wp->w_next)
 	if (wp->w_redr_status)
 	    win_redr_status(wp);
 if (redraw_tabline)
-	draw_tabpage();
+	draw_tabline();
 }
 #endif
 #if (defined(FEAT_WILDMENU) && defined(FEAT_VERTSPLIT)) || defined(PROTO)
 /*
 }
 #endif
 #if defined(FEAT_STL_OPT) || defined(PROTO)
 /*
-* Redraw the status line or ruler of window wp.
+* Redraw the status line or ruler of window "wp".
+* When "wp" is NULL redraw the tab pages line from 'tabline'.
 */
 static void
 win_redr_custom(wp, draw_ruler)
 win_T	*wp;
 int		draw_ruler;	/* TRUE or FALSE */
 int		len;
 int		fillchar;
 char_u	buf[MAXPATHL];
 char_u	*p;
 struct	stl_hlrec hl[STL_MAX_ITEM];
+int		use_sandbox = FALSE;
 /* setup environment for the task at hand */
-row = W_WINROW(wp) + wp->w_height;
+if (wp == NULL)
-fillchar = fillchar_status(&attr, wp == curwin);
+{
-maxwidth = W_WIDTH(wp);
+	/* Use 'tabline'.  Always at the first line of the screen. */
-if (*wp->w_p_stl != NUL)
+	p = p_tal;
-	p = wp->w_p_stl;
+	row = 0;
+	fillchar = t_colors < 8 ? '_' : ' ';
+	attr = hl_attr(HLF_TPF);
+	maxwidth = Columns;
+# ifdef FEAT_EVAL
+	use_sandbox = was_set_insecurely((char_u *)"tabline");
+# endif
+}
 else
-	p = p_stl;
+{
-if (draw_ruler)
+	row = W_WINROW(wp) + wp->w_height;
-{
+	fillchar = fillchar_status(&attr, wp == curwin);
-	p = p_ruf;
+	maxwidth = W_WIDTH(wp);
-	/* advance past any leading group spec - implicit in ru_col */
-	if (*p == '%')
+	if (draw_ruler)
 	{
-	    if (*++p == '-')
+	    p = p_ruf;
-		p++;
+	    /* advance past any leading group spec - implicit in ru_col */
-	    if (atoi((char *) p))
+	    if (*p == '%')
-		while (VIM_ISDIGIT(*p))
+	    {
+		if (*++p == '-')
 		    p++;
-	    if (*p++ != '(')
+		if (atoi((char *) p))
-		p = p_ruf;
+		    while (VIM_ISDIGIT(*p))
-	}
+			p++;
+		if (*p++ != '(')
+		    p = p_ruf;
+	    }
 #ifdef FEAT_VERTSPLIT
-	col = ru_col - (Columns - W_WIDTH(wp));
+	    col = ru_col - (Columns - W_WIDTH(wp));
-	if (col < (W_WIDTH(wp) + 1) / 2)
+	    if (col < (W_WIDTH(wp) + 1) / 2)
-	    col = (W_WIDTH(wp) + 1) / 2;
+		col = (W_WIDTH(wp) + 1) / 2;
 #else
-	col = ru_col;
+	    col = ru_col;
-	if (col > (Columns + 1) / 2)
+	    if (col > (Columns + 1) / 2)
-	    col = (Columns + 1) / 2;
+		col = (Columns + 1) / 2;
 #endif
-	maxwidth = W_WIDTH(wp) - col;
+	    maxwidth = W_WIDTH(wp) - col;
 #ifdef FEAT_WINDOWS
-	if (!wp->w_status_height)
+	    if (!wp->w_status_height)
 #endif
-	{
+	    {
-	    row = Rows - 1;
+		row = Rows - 1;
-	    --maxwidth;	/* writing in last column may cause scrolling */
+		--maxwidth;	/* writing in last column may cause scrolling */
-	    fillchar = ' ';
+		fillchar = ' ';
-	    attr = 0;
+		attr = 0;
-	}
+	    }
-}
+# ifdef FEAT_EVAL
+	    use_sandbox = was_set_insecurely((char_u *)"rulerformat");
+# endif
+	}
+	else
+	{
+	    if (*wp->w_p_stl != NUL)
+		p = wp->w_p_stl;
+	    else
+		p = p_stl;
+# ifdef FEAT_EVAL
+	    use_sandbox = was_set_insecurely((char_u *)"statusline");
+# endif
+	}
+#ifdef FEAT_VERTSPLIT
+	col += W_WINCOL(wp);
+#endif
+}
 if (maxwidth <= 0)
 	return;
-#ifdef FEAT_VERTSPLIT
-col += W_WINCOL(wp);
+width = build_stl_str_hl(wp == NULL ? curwin : wp,
-#endif
+				buf, sizeof(buf),
+				p, use_sandbox,
-width = build_stl_str_hl(wp, buf, sizeof(buf), p, fillchar, maxwidth, hl);
+				fillchar, maxwidth, hl);
 len = STRLEN(buf);
 while (width < maxwidth && len < sizeof(buf) - 1)
 {
 #ifdef FEAT_MBYTE
 new_LineWraps = (char_u *)lalloc((long_u)(Rows * sizeof(char_u)), FALSE);
 #ifdef FEAT_WINDOWS
 new_TabPageIdxs = (char_u *)lalloc((long_u)(Columns * sizeof(char_u)), FALSE);
 #endif
-FOR_ALL_WINDOWS(wp)
+FOR_ALL_TAB_WINDOWS(tp, wp)
 {
 	if (win_alloc_lines(wp) == FAIL)
 	{
 	    outofmem = TRUE;
 #ifdef FEAT_WINDOWS
 #if defined(FEAT_WINDOWS)
 /*
 * Draw the tab pages line at the top of the Vim window.
 */
 static void
-draw_tabpage()
+draw_tabline()
 {
 int		tabcount = 0;
 tabpage_T	*tp;
 int		tabwidth;
 int		col = 0;
 int		scol = 0;
-int		had_current = FALSE;
 int		attr;
 win_T	*wp;
 win_T	*cwp;
 int		wincount;
 int		modified;
 int		len;
 int		attr_sel = hl_attr(HLF_TPS);
 int		attr_nosel = hl_attr(HLF_TP);
 int		attr_fill = hl_attr(HLF_TPF);
 char_u	*p;
+int		room;
+int		use_sep_chars = (t_colors < 8
+#ifdef FEAT_GUI
+					    && !gui.in_use
+#endif
+					    );
 redraw_tabline = FALSE;
 if (tabpageline_height() < 1)
 	return;
+#if defined(FEAT_STL_OPT)
+/* Use the 'tabline' option if it's set. */
+if (*p_tal != NUL)
+{
+	win_redr_custom(NULL, FALSE);
+	return;
+}
+#endif
 for (tp = first_tabpage; tp != NULL; tp = tp->tp_next)
 	++tabcount;
 tabwidth = (Columns - 1 + tabcount / 2) / tabcount;
 for (tp = first_tabpage; tp != NULL && col < Columns; tp = tp->tp_next)
 {
 	scol = col;
 	if (tp->tp_topframe == topframe)
-	{
-	    c = '/';
-	    had_current = TRUE;
 	    attr = attr_sel;
-	}
+	if (use_sep_chars && col > 0)
-	else if (!had_current)
+	    screen_putchar('|', 0, col++, attr);
-	    c = '/';
-	else
-	    c = '\\';
-	if (t_colors < 8)
-	    screen_putchar(c, 0, col++, attr);
 	if (tp->tp_topframe != topframe)
 	    attr = attr_nosel;
 	screen_putchar(' ', 0, col++, attr);
 		modified = TRUE;
 	if (modified || wincount > 1)
 	{
 	    if (wincount > 1)
 	    {
-		vim_snprintf((char *)NameBuff, MAXPATHL, "#%d", wincount);
+		vim_snprintf((char *)NameBuff, MAXPATHL, "%d", wincount);
 		len = STRLEN(NameBuff);
-		screen_puts_len(NameBuff, len, 0, col, attr);
+		screen_puts_len(NameBuff, len, 0, col,
+#if defined(FEAT_SYN_HL)
+				       hl_combine_attr(attr, hl_attr(HLF_T))
+#else
+				       attr
+#endif
+					   );
 		col += len;
 	    }
 	    if (modified)
-		screen_puts_len((char_u *)"+", 2, 0, col++, attr);
+		screen_puts_len((char_u *)"+", 1, 0, col++, attr);
 	    screen_putchar(' ', 0, col++, attr);
 	}
-	if (buf_spname(cwp->w_buffer) != NULL)
+	room = scol - col + tabwidth - 1;
-	    STRCPY(NameBuff, buf_spname(cwp->w_buffer));
+	if (room > 0)
-	else
+	{
-	    home_replace(cwp->w_buffer, cwp->w_buffer->b_fname, NameBuff,
+	    if (buf_spname(cwp->w_buffer) != NULL)
+		STRCPY(NameBuff, buf_spname(cwp->w_buffer));
+	    else
+		home_replace(cwp->w_buffer, cwp->w_buffer->b_fname, NameBuff,
 							      MAXPATHL, TRUE);
-	trans_characters(NameBuff, MAXPATHL);
+	    trans_characters(NameBuff, MAXPATHL);
-	len = STRLEN(NameBuff);
+	    len = vim_strsize(NameBuff);
-	p = NameBuff;
+	    p = NameBuff;
-	if (len > scol - col + tabwidth - 1) /* TODO: multi-byte chars */
+#ifdef FEAT_MBYTE
-	{
+	    if (has_mbyte)
-	    p += len - (scol - col + tabwidth - 1);
+		while (len > room)
-	    len = scol - col + tabwidth - 1;
+		{
-	}
+		    len -= ptr2cells(p);
-	if (len > 0)
+		    mb_ptr_adv(p);
-	{
+		}
-	    screen_puts_len(p, len, 0, col, attr);
+	    else
+#endif
+		if (len > room)
+	    {
+		p += len - room;
+		len = room;
+	    }
+	    screen_puts_len(p, STRLEN(p), 0, col, attr);
 	    col += len;
 	}
 	screen_putchar(' ', 0, col++, attr);
 	/* Store the tab page number in TabPageIdxs[], so that jump_to_mouse()
 	++tabcount;
 	while (scol < col)
 	    TabPageIdxs[scol++] = tabcount;
 }
-if (t_colors < 8)
+if (use_sep_chars)
-{
-	screen_putchar('\\', 0, col++, attr);
 	c = '_';
-}
 else
 	c = ' ';
 screen_fill(0, 1, col, (int)Columns, c, c, attr_fill);
 /* Put an "X" for closing the current tab if there are several. */
 #endif
 #if defined(FEAT_LINEBREAK) || defined(PROTO)
 /*
 * Return the width of the 'number' column.
-* Zero when 'number' isn't set.
+* Caller may need to check if 'number' is set.
 * Otherwise it depends on 'numberwidth' and the line count.
 */
 int
 number_width(wp)
 win_T	*wp;
 {
 int		n;
 linenr_T	lnum;
-if (!wp->w_p_nu)
-	return 0;
 lnum = wp->w_buffer->b_ml.ml_line_count;
 if (lnum == wp->w_nrwidth_line_count)
 	return wp->w_nrwidth_width;
 wp->w_nrwidth_line_count = lnum;

Mercurial > vim

comparison src/screen.c @ 677:e649c78407e6 v7.0202