vim: src/screen.c comparison

comparison src/screen.c @ 16986:03f3a9ca2770 v8.1.1493

patch 8.1.1493: redrawing with popups is slow and causes flicker commit https://github.com/vim/vim/commit/33796b39b9f00b42ca57fa00dbbb52316d9d38ff Author: Bram Moolenaar <Bram@vim.org> Date: Sat Jun 8 16:01:13 2019 +0200 patch 8.1.1493: redrawing with popups is slow and causes flicker Problem: Redrawing with popups is slow and causes flicker. Solution: Avoid clearing and redrawing using a zindex mask.

author	Bram Moolenaar <Bram@vim.org>
date	Sat, 08 Jun 2019 16:15:04 +0200
parents	21cddcc6fbe8
children	f824831e2805

comparison

equal deleted inserted replaced

-:914898e347fe
+:03f3a9ca2770
 	must_redraw = type;
 	if (type > INVERTED_ALL)
 	    curwin->w_lines_valid = 0;	/* don't use w_lines[].wl_size now */
 	return FAIL;
 }
 #ifdef FEAT_TEXT_PROP
-// TODO: avoid redrawing everything when there is a popup window.
+// Update popup_mask if needed.
-if (popup_any_visible())
+type = may_update_popup_mask(type);
-{
-	if (type < NOT_VALID)
-	    type = NOT_VALID;
-	FOR_ALL_WINDOWS(wp)
-	    wp->w_redr_type = NOT_VALID;
-}
 #endif
 updating_screen = TRUE;
 #ifdef FEAT_SYN_HL
 ++display_tick;	    /* let syntax code know we're in a next round of
 	gui_undraw_cursor();
 #endif
 #ifdef FEAT_SEARCH_EXTRA
 start_search_hl();
 #endif
+#ifdef FEAT_TEXT_PROP
+// Update popup_mask if needed.
+may_update_popup_mask(0);
+#endif
 }
 /*
 * Finish updating one or more windows.
 */
 	    win_update(wp);
 	if (wp->w_redr_status)
 	    win_redr_status(wp, FALSE);
 }
-#ifdef FEAT_TEXT_PROP
-// Display popup windows on top of the others.
-update_popups();
-#endif
 update_finish();
 }
 #endif
 /*
 #endif
 return wcr_attr;
 }
 #ifdef FEAT_TEXT_PROP
+/*
+* Update "popup_mask" if needed.
+* Also recomputes the popup size and positions.
+* Also updates "popup_visible".
+* If more redrawing is needed than "type_arg" a higher value is returned.
+*/
+int
+may_update_popup_mask(int type_arg)
+{
+int		type = type_arg;
+win_T	*wp;
+if (popup_mask_tab != curtab)
+	popup_mask_refresh = TRUE;
+if (!popup_mask_refresh)
+{
+	// Check if any buffer has changed.
+	for (wp = first_popupwin; wp != NULL; wp = wp->w_next)
+	    if (wp->w_popup_last_changedtick != CHANGEDTICK(wp->w_buffer))
+		popup_mask_refresh = TRUE;
+	for (wp = curtab->tp_first_popupwin; wp != NULL; wp = wp->w_next)
+	    if (wp->w_popup_last_changedtick != CHANGEDTICK(wp->w_buffer))
+		popup_mask_refresh = TRUE;
+	if (!popup_mask_refresh)
+	    return type;
+}
+popup_mask_refresh = FALSE;
+popup_mask_tab = curtab;
+popup_visible = FALSE;
+vim_memset(popup_mask, 0, screen_Rows * screen_Columns * sizeof(short));
+// Find the window with the lowest zindex that hasn't been handled yet,
+// so that the window with a higher zindex overwrites the value in
+// popup_mask.
+popup_reset_handled();
+while ((wp = find_next_popup(TRUE)) != NULL)
+{
+	int	    top_off, bot_off;
+	int	    left_off, right_off;
+	short	    *p;
+	int	    line, col;
+	popup_visible = TRUE;
+	// Recompute the position if the text changed.
+	if (wp->w_popup_last_changedtick != CHANGEDTICK(wp->w_buffer))
+	    popup_adjust_position(wp);
+	// the position and size are for the inside, add the padding and
+	// border
+	top_off = wp->w_popup_padding[0] + wp->w_popup_border[0];
+	bot_off = wp->w_popup_padding[2] + wp->w_popup_border[2];
+	left_off = wp->w_popup_padding[3] + wp->w_popup_border[3];
+	right_off = wp->w_popup_padding[1] + wp->w_popup_border[1];
+	for (line = wp->w_winrow + top_off;
+		line < wp->w_winrow + wp->w_height + bot_off
+						 && line < screen_Rows; ++line)
+	    for (col = wp->w_wincol + left_off;
+		 col < wp->w_wincol + wp->w_width + right_off
+						&& col < screen_Columns; ++col)
+	    {
+		p = popup_mask + line * screen_Columns + col;
+		if (*p != wp->w_zindex)
+		{
+		    *p = wp->w_zindex;
+		    type = NOT_VALID;
+		}
+	    }
+}
+return type;
+}
 /*
 * Return a string of "len" spaces in IObuff.
 */
 static char_u *
 get_spaces(int len)
 int	    i;
 // Find the window with the lowest zindex that hasn't been updated yet,
 // so that the window with a higher zindex is drawn later, thus goes on
 // top.
-// TODO: don't redraw every popup every time.
-popup_visible = FALSE;
 popup_reset_handled();
 while ((wp = find_next_popup(TRUE)) != NULL)
 {
-	// Recompute the position if the text changed.
+	// This drawing uses the zindex of the popup window, so that it's on
-	if (wp->w_popup_last_changedtick != CHANGEDTICK(wp->w_buffer))
+	// top of the text but doesn't draw when another popup with higher
-	    popup_adjust_position(wp);
+	// zindex is on top of the character.
+	screen_zindex = wp->w_zindex;
 	// adjust w_winrow and w_wincol for border and padding, since
 	// win_update() doesn't handle them.
 	top_off = wp->w_popup_padding[0] + wp->w_popup_border[0];
 	left_off = wp->w_popup_padding[3] + wp->w_popup_border[3];
 	wp->w_winrow += top_off;
 	wp->w_wincol += left_off;
 	// Draw the popup text.
 	win_update(wp);
-	popup_visible = TRUE;
 	wp->w_winrow -= top_off;
 	wp->w_wincol -= left_off;
 	total_width = wp->w_popup_border[3] + wp->w_popup_padding[3]
 		buf[mb_char2bytes(border_char[6], buf)] = NUL;
 		screen_puts(buf, row,
 			       wp->w_wincol + total_width - 1, border_attr[2]);
 	    }
 	}
+	// Back to the normal zindex.
+	screen_zindex = 0;
 }
 }
 #endif
 #if defined(FEAT_GUI) || defined(PROTO)
 		hl = syn_attr2attr(hl);
 	    if (hl & HL_BOLD)
 		redraw_this = TRUE;
 	}
 #endif
+#ifdef FEAT_TEXT_PROP
+	// Skip if under a(nother) popup.
+	if (popup_mask[row * screen_Columns + col + coloff] > screen_zindex)
+	    redraw_this = FALSE;
+#endif
 	if (redraw_this)
 	{
 	    /*
 	     * Special handling when 'xs' termcap flag set (hpterm):
 }
 if (clear_width > 0
 #ifdef FEAT_TEXT_PROP
 	    && !(flags & SLF_POPUP)  // no separator for popup window
+	    && popup_mask[row * screen_Columns + col + coloff] <= screen_zindex
 #endif
 	    )
 {
 	// For a window that has a right neighbor, draw the separator char
 	// right of the window contents.
 FOR_ALL_WINDOWS(wp)
 	if (wp->w_redr_status)
 	    win_redr_status(wp, FALSE);
 if (redraw_tabline)
 	draw_tabline();
-#ifdef FEAT_TEXT_PROP
-// Display popup windows on top of the status lines.
-update_popups();
-#endif
 }
 #if defined(FEAT_WILDMENU) || defined(PROTO)
 /*
 * Redraw all status lines at the bottom of frame "frp".
 * resizing). */
 if (row >= screen_Rows || col >= screen_Columns)
 	return;
 #ifdef FEAT_INS_EXPAND
-if (pum_under_menu(row, col))
+// Skip if under the popup menu.
+// Popup windows with zindex higher than POPUPMENU_ZINDEX go on top.
+if (pum_under_menu(row, col)
+# ifdef FEAT_TEXT_PROP
+	    && screen_zindex <= POPUPMENU_ZINDEX
+# endif
+	    )
 	return;
 #endif
+#ifdef FEAT_TEXT_PROP
+// Skip if under a(nother) popup.
+if (popup_mask[row * screen_Columns + col] > screen_zindex)
+	return;
+#endif
 /* Outputting a character in the last cell on the screen may scroll the
 * screen up.  Only do it when the "xn" termcap property is set, otherwise
 * mark the character invalid (update it when scrolled up). */
 if (*T_XN == NUL
 	    && row == screen_Rows - 1 && col == screen_Columns - 1
 	off = LineOffset[row] + start_col;
 	c = c1;
 	for (col = start_col; col < end_col; ++col)
 	{
-	    if (ScreenLines[off] != c
+	    if ((ScreenLines[off] != c
 		    || (enc_utf8 && (int)ScreenLinesUC[off]
 						       != (c >= 0x80 ? c : 0))
 		    || ScreenAttrs[off] != attr
 #if defined(FEAT_GUI) || defined(UNIX)
 		    || force_next
 #endif
 		    )
+#ifdef FEAT_TEXT_PROP
+		    // Skip if under a(nother) popup.
+		    && popup_mask[row * screen_Columns + col] <= screen_zindex
+#endif
+	       )
 	    {
 #if defined(FEAT_GUI) || defined(UNIX)
 		/* The bold trick may make a single row of pixels appear in
 		 * the next character.  When a bold character is removed, the
 		 * next character should be redrawn too.  This happens for our
 int		    i;
 sattr_T	    *new_ScreenAttrs;
 unsigned	    *new_LineOffset;
 char_u	    *new_LineWraps;
 short	    *new_TabPageIdxs;
+#ifdef FEAT_TEXT_PROP
+short	    *new_popup_mask;
+#endif
 tabpage_T	    *tp;
 static int	    entered = FALSE;		/* avoid recursiveness */
 static int	    done_outofmem_msg = FALSE;	/* did outofmem message */
 int		    retry_count = 0;
 	new_ScreenLines2 = LALLOC_MULT(schar_T, (Rows + 1) * Columns);
 new_ScreenAttrs = LALLOC_MULT(sattr_T, (Rows + 1) * Columns);
 new_LineOffset = LALLOC_MULT(unsigned, Rows);
 new_LineWraps = LALLOC_MULT(char_u, Rows);
 new_TabPageIdxs = LALLOC_MULT(short, Columns);
+#ifdef FEAT_TEXT_PROP
+new_popup_mask = LALLOC_MULT(short, Rows * Columns);
+#endif
 FOR_ALL_TAB_WINDOWS(tp, wp)
 {
 	if (win_alloc_lines(wp) == FAIL)
 	{
 	    || (enc_dbcs == DBCS_JPNU && new_ScreenLines2 == NULL)
 	    || new_ScreenAttrs == NULL
 	    || new_LineOffset == NULL
 	    || new_LineWraps == NULL
 	    || new_TabPageIdxs == NULL
+#ifdef FEAT_TEXT_PROP
+	    || new_popup_mask == NULL
+#endif
 	    || outofmem)
 {
 	if (ScreenLines != NULL || !done_outofmem_msg)
 	{
 	    /* guess the size */
 	VIM_CLEAR(new_ScreenLines2);
 	VIM_CLEAR(new_ScreenAttrs);
 	VIM_CLEAR(new_LineOffset);
 	VIM_CLEAR(new_LineWraps);
 	VIM_CLEAR(new_TabPageIdxs);
+#ifdef FEAT_TEXT_PROP
+	VIM_CLEAR(new_popup_mask);
+#endif
 }
 else
 {
 	done_outofmem_msg = FALSE;
 ScreenLines2 = new_ScreenLines2;
 ScreenAttrs = new_ScreenAttrs;
 LineOffset = new_LineOffset;
 LineWraps = new_LineWraps;
 TabPageIdxs = new_TabPageIdxs;
+#ifdef FEAT_TEXT_PROP
+popup_mask = new_popup_mask;
+vim_memset(popup_mask, 0, screen_Rows * screen_Columns * sizeof(short));
+popup_mask_refresh = TRUE;
+#endif
 /* It's important that screen_Rows and screen_Columns reflect the actual
 * size of ScreenLines[].  Set them before calling anything. */
 #ifdef FEAT_GUI
 old_Rows = screen_Rows;
 void
 free_screenlines(void)
 {
 int		i;
-vim_free(ScreenLinesUC);
+VIM_CLEAR(ScreenLinesUC);
 for (i = 0; i < Screen_mco; ++i)
-	vim_free(ScreenLinesC[i]);
+	VIM_CLEAR(ScreenLinesC[i]);
-vim_free(ScreenLines2);
+VIM_CLEAR(ScreenLines2);
-vim_free(ScreenLines);
+VIM_CLEAR(ScreenLines);
-vim_free(ScreenAttrs);
+VIM_CLEAR(ScreenAttrs);
-vim_free(LineOffset);
+VIM_CLEAR(LineOffset);
-vim_free(LineWraps);
+VIM_CLEAR(LineWraps);
-vim_free(TabPageIdxs);
+VIM_CLEAR(TabPageIdxs);
+#ifdef FEAT_TEXT_PROP
+VIM_CLEAR(popup_mask);
+#endif
 }
 void
 screenclear(void)
 {
 }
 /*
 * Return TRUE if clearing with term string "p" would work.
 * It can't work when the string is empty or it won't set the right background.
+* Don't clear to end-of-line when there are popups, it may cause flicker.
 */
 int
 can_clear(char_u *p)
 {
 return (*p != NUL && (t_colors <= 1
 		|| (p_tgc && cterm_normal_bg_gui_color == INVALCOLOR)
 		|| (!p_tgc && cterm_normal_bg_color == 0)
 #else
 		|| cterm_normal_bg_color == 0
 #endif
-		|| *T_UT != NUL));
+		|| *T_UT != NUL)
+#ifdef FEAT_TEXT_PROP
+	    && !(p == T_CE && popup_visible)
+#endif
+	    );
 }
 /*
 * Reset cursor position. Use whenever cursor was moved because of outputting
 * something directly to the screen (shell commands) or a terminal control
 int		retval;
 if (!redrawing() || line_count <= 0)
 	return FAIL;
-/* When inserting lines would result in loss of command output, just redraw
+// When inserting lines would result in loss of command output, just redraw
-* the lines. */
+// the lines.
 if (no_win_do_lines_ins && !del)
 	return FAIL;
-/* only a few lines left: redraw is faster */
+// only a few lines left: redraw is faster
 if (mayclear && Rows - line_count < 5 && wp->w_width == Columns)
 {
 	if (!no_win_do_lines_ins)
-	    screenclear();	    /* will set wp->w_lines_valid to 0 */
+	    screenclear();	    // will set wp->w_lines_valid to 0
 	return FAIL;
 }
-/*
+#ifdef FEAT_TEXT_PROP
-* Delete all remaining lines
+// this doesn't work when tere are popups visible
-*/
+if (popup_visible)
+	return FAIL;
+#endif
+// Delete all remaining lines
 if (row + line_count >= wp->w_height)
 {
 	screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + wp->w_height,
 		wp->w_wincol, (int)W_ENDCOL(wp),
 		' ', ' ', 0);
 * - there is no valid screen
 * - the screen has to be redrawn completely
 * - the line count is less than one
 * - the line count is more than 'ttyscroll'
 * - redrawing for a callback and there is a modeless selection
+* - there is a popup window
 */
-if (!screen_valid(TRUE) || line_count <= 0 || line_count > p_ttyscroll
+if (!screen_valid(TRUE)
+	     || line_count <= 0 || line_count > p_ttyscroll
 #ifdef FEAT_CLIPBOARD
 	     || (clip_star.state != SELECT_CLEARED
 						 && redrawing_for_callback > 0)
+#endif
+#ifdef FEAT_TEXT_PROP
+	     || popup_visible
 #endif
 	     )
 	return FAIL;
 /*
 	maketitle();
 #endif
 /* Redraw the tab pages line if needed. */
 if (redraw_tabline)
 	draw_tabline();
-#ifdef FEAT_TEXT_PROP
-// Display popup windows on top of everything.
-update_popups();
-#endif
 }
 #ifdef FEAT_CMDL_INFO
 static void
 win_redr_ruler(win_T *wp, int always, int ignore_pum)

Mercurial > vim

comparison src/screen.c @ 16986:03f3a9ca2770 v8.1.1493