aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-25 10:54:51 -04:00
Code

patch 9.0.0316: screen flickers when 'cmdheight' is zero

Browse Source 
Problem:    Screen flickers when 'cmdheight' is zero.
Solution:   Redraw over existing text instead of clearing.
This commit is contained in:
Bram Moolenaar 2022-08-29 12:41:06 +01:00
parent 309c4e0ed7
commit f73e5ba56f
3 changed files with 31 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
src/drawscreen.c
View File

@ -170,38 +170,41 @@ update_screen(int type_arg)
if (msg_scrolled) if (msg_scrolled)
{ {
clear_cmdline = TRUE; clear_cmdline = TRUE;
if (msg_scrolled > Rows - 5) // clearing is faster if (type != UPD_CLEAR)
type = UPD_CLEAR;
else if (type != UPD_CLEAR)
{ {
check_for_delay(FALSE); if (msg_scrolled > Rows - 5) // redrawing is faster
if (screen_ins_lines(0, 0, msg_scrolled, (int)Rows, 0, NULL) type = UPD_NOT_VALID;
== FAIL) else
type = UPD_CLEAR;
FOR_ALL_WINDOWS(wp)
{ {
if (wp->w_winrow < msg_scrolled) check_for_delay(FALSE);
if (screen_ins_lines(0, 0, msg_scrolled, (int)Rows, 0, NULL)
== FAIL)
type = UPD_NOT_VALID;
FOR_ALL_WINDOWS(wp)
{ {
if (W_WINROW(wp) + wp->w_height > msg_scrolled if (wp->w_winrow < msg_scrolled)
&& wp->w_redr_type < UPD_REDRAW_TOP
&& wp->w_lines_valid > 0
&& wp->w_topline == wp->w_lines[0].wl_lnum)
{ {
wp->w_upd_rows = msg_scrolled - W_WINROW(wp); if (W_WINROW(wp) + wp->w_height > msg_scrolled
wp->w_redr_type = UPD_REDRAW_TOP; && wp->w_redr_type < UPD_REDRAW_TOP
} && wp->w_lines_valid > 0
else && wp->w_topline == wp->w_lines[0].wl_lnum)
{ {
wp->w_redr_type = UPD_NOT_VALID; wp->w_upd_rows = msg_scrolled - W_WINROW(wp);
if (W_WINROW(wp) + wp->w_height + wp->w_status_height wp->w_redr_type = UPD_REDRAW_TOP;
<= msg_scrolled) }
wp->w_redr_status = TRUE; else
{
wp->w_redr_type = UPD_NOT_VALID;
if (W_WINROW(wp) + wp->w_height
+ wp->w_status_height <= msg_scrolled)
wp->w_redr_status = TRUE;
}
} }
} }
if (!no_update)
redraw_cmdline = TRUE;
redraw_tabline = TRUE;
} }
if (!no_update)
redraw_cmdline = TRUE;
redraw_tabline = TRUE;
} }
msg_scrolled = 0; msg_scrolled = 0;
need_wait_return = FALSE; need_wait_return = FALSE;

2
src/ex_getln.c
View File

@ -2582,7 +2582,7 @@ theend:
made_cmdheight_nonzero = TRUE; made_cmdheight_nonzero = TRUE;
set_option_value((char_u *)"ch", 0L, NULL, 0); set_option_value((char_u *)"ch", 0L, NULL, 0);
// Redraw is needed for command line completion // Redraw is needed for command line completion
redraw_all_later(UPD_CLEAR); redraw_all_later(UPD_NOT_VALID);
made_cmdheight_nonzero = FALSE; made_cmdheight_nonzero = FALSE;
} }

2
src/version.c
View File

@ -707,6 +707,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
316,
/**/ /**/
315, 315,
/**/ /**/