vim: src/screen.c comparison

comparison src/screen.c @ 30608:c3398c601bfa v9.0.0639

patch 9.0.0639: checking for popup in screen_char() is too late Commit: https://github.com/vim/vim/commit/ff85d4a1076dc7d6fc3102f6560df3ad1af696ae Author: Bram Moolenaar <Bram@vim.org> Date: Sun Oct 2 15:21:04 2022 +0100 patch 9.0.0639: checking for popup in screen_char() is too late Problem: Checking for popup in screen_char() is too late, the attribute has already been changed. Solution: Move check for popup to where screen_char() is called.

author	Bram Moolenaar <Bram@vim.org>
date	Sun, 02 Oct 2022 16:30:04 +0200
parents	c5356021a938
children	dfb02f9dcbe8

comparison

equal deleted inserted replaced

-:d3a64e0e7374
+:c3398c601bfa
 	off_to += char_cells;
 	off_from += char_cells;
 	col += char_cells;
 }
-if (clear_next)
+if (clear_next && !skip_for_popup(row, col + coloff))
 {
 	// Clear the second half of a double-wide character of which the left
 	// half was overwritten with a single-wide character.
 	ScreenLines[off_to] = ' ';
 	if (enc_utf8)
 			    prev_cells = (*mb_off2cells)(off, max_off);
 			    off += prev_cells;
 			}
 		    }
-		    if (enc_dbcs != 0 && prev_cells > 1)
+		    if (!skip_for_popup(row, col + coloff - prev_cells))
-			screen_char_2(off_to - prev_cells, row,
+		    {
+			if (enc_dbcs != 0 && prev_cells > 1)
+			    screen_char_2(off_to - prev_cells, row,
 						   col + coloff - prev_cells);
-		    else
+			else
-			screen_char(off_to - prev_cells, row,
+			    screen_char(off_to - prev_cells, row,
 						   col + coloff - prev_cells);
+		    }
 		}
 	    }
 #endif
 	    screen_fill(row, row + 1, col + coloff, clear_width + coloff,
 								 ' ', ' ', 0);
 {
 	// For a window that has a right neighbor, draw the separator char
 	// right of the window contents.  But not on top of a popup window.
 	if (coloff + col < Columns)
 	{
-#ifdef FEAT_PROP_POPUP
+	    if (!skip_for_popup(row, col + coloff))
-	    if (!blocked_by_popup(row, col + coloff))
-#endif
 	    {
 		int c;
 		c = fillchar_vsep(&hl, wp);
 		if (ScreenLines[off_to] != (schar_T)c
 #ifdef FEAT_GUI
 	    && !gui.in_use
 #endif
 	    && mb_fix_col(col, row) != col)
 {
-	ScreenLines[off - 1] = ' ';
+	if (!skip_for_popup(row, col - 1))
-	ScreenAttrs[off - 1] = 0;
+	{
-	if (enc_utf8)
+	    ScreenLines[off - 1] = ' ';
-	{
+	    ScreenAttrs[off - 1] = 0;
-	    ScreenLinesUC[off - 1] = 0;
+	    if (enc_utf8)
-	    ScreenLinesC[0][off - 1] = 0;
+	    {
-	}
+		ScreenLinesUC[off - 1] = 0;
-	// redraw the previous cell, make it empty
+		ScreenLinesC[0][off - 1] = 0;
-	screen_char(off - 1, row, col - 1);
+	    }
+	    // redraw the previous cell, make it empty
+	    screen_char(off - 1, row, col - 1);
+	}
 	// force the cell at "col" to be redrawn
 	force_redraw_next = TRUE;
 }
 max_off = LineOffset[row] + screen_Columns;
 			|| (ScreenLinesUC[off] != 0
 					  && screen_comp_differs(off, u8cc))))
 		|| ScreenAttrs[off] != attr
 		|| exmode_active;
-	if ((need_redraw || force_redraw_this)
+	if ((need_redraw || force_redraw_this) && !skip_for_popup(row, col))
-#ifdef FEAT_PROP_POPUP
-		&& !blocked_by_popup(row, col)
-#endif
-	   )
 	{
 #if defined(FEAT_GUI) || defined(UNIX)
 	    // The bold trick makes 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 own GUI
 	}
 }
 // If we detected the next character needs to be redrawn, but the text
 // doesn't extend up to there, update the character here.
-if (force_redraw_next && col < screen_Columns)
+if (force_redraw_next && col < screen_Columns && !skip_for_popup(row, col))
 {
 	if (enc_dbcs != 0 && dbcs_off2cells(off, max_off) > 1)
 	    screen_char_2(off, row, col);
 	else
 	    screen_char(off, row, col);
 // Check for illegal values, just in case (could happen just after
 // resizing).
 if (row >= screen_Rows || col >= screen_Columns)
 	return;
-// Skip if under the popup menu.
-if (skip_for_popup(row, col))
-	return;
 // 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
 	max_off = off + screen_Columns;
 	for (c = col; c < col + width; ++c)
 	{
 	    if (enc_dbcs != 0 && dbcs_off2cells(off + c, max_off) > 1)
 	    {
-		screen_char_2(off + c, r, c);
+		if (!skip_for_popup(r, c))
+		    screen_char_2(off + c, r, c);
 		++c;
 	    }
 	    else
 	    {
-		screen_char(off + c, r, c);
+		if (!skip_for_popup(r, c))
+		    screen_char(off + c, r, c);
 		if (utf_off2cells(off + c, max_off) > 1)
 		    ++c;
 	    }
 	}
 }
 		    || must_redraw == UPD_CLEAR  // screen clear pending
 #if defined(FEAT_GUI) || defined(UNIX)
 		    || force_next
 #endif
 		    )
-#ifdef FEAT_PROP_POPUP
 		    // Skip if under a(nother) popup.
-		    && !blocked_by_popup(row, col)
+		    && !skip_for_popup(row, col))
-#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

Mercurial > vim

comparison src/screen.c @ 30608:c3398c601bfa v9.0.0639