aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/drawscreen.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/nvim/drawscreen.c')
-rw-r--r--src/nvim/drawscreen.c434
1 files changed, 248 insertions, 186 deletions
diff --git a/src/nvim/drawscreen.c b/src/nvim/drawscreen.c
index 145229bacc..bda0ccc870 100644
--- a/src/nvim/drawscreen.c
+++ b/src/nvim/drawscreen.c
@@ -59,6 +59,7 @@
#include <stdlib.h>
#include <string.h>
+#include "klib/kvec.h"
#include "nvim/api/private/defs.h"
#include "nvim/ascii_defs.h"
#include "nvim/autocmd.h"
@@ -119,8 +120,6 @@
#include "nvim/vim_defs.h"
#include "nvim/window.h"
-#include "klib/kvec.h"
-
/// corner value flags for hsep_connected and vsep_connected
typedef enum {
WC_TOP_LEFT = 0,
@@ -180,8 +179,12 @@ bool default_grid_alloc(void)
// Allocation of the screen buffers is done only when the size changes and
// when Rows and Columns have been set and we have started doing full
// screen stuff.
- if ((default_grid.chars != NULL && Rows == default_grid.rows && Columns == default_grid.cols)
- || Rows == 0 || Columns == 0 || (!full_screen && default_grid.chars == NULL)) {
+ if ((default_grid.chars != NULL
+ && Rows == default_grid.rows
+ && Columns == default_grid.cols)
+ || Rows == 0
+ || Columns == 0
+ || (!full_screen && default_grid.chars == NULL)) {
resizing = false;
return false;
}
@@ -199,8 +202,8 @@ bool default_grid_alloc(void)
grid_alloc(&default_grid, Rows, Columns, true, true);
stl_clear_click_defs(tab_page_click_defs, tab_page_click_defs_size);
- tab_page_click_defs
- = stl_alloc_click_defs(tab_page_click_defs, Columns, &tab_page_click_defs_size);
+ tab_page_click_defs = stl_alloc_click_defs(tab_page_click_defs, Columns,
+ &tab_page_click_defs_size);
default_grid.comp_height = Rows;
default_grid.comp_width = Columns;
@@ -223,7 +226,8 @@ void screenclear(void)
// blank out the default grid
for (int i = 0; i < default_grid.rows; i++) {
- grid_clear_line(&default_grid, default_grid.line_offset[i], default_grid.cols, true);
+ grid_clear_line(&default_grid, default_grid.line_offset[i],
+ default_grid.cols, true);
}
ui_call_grid_clear(1); // clear the display
@@ -270,7 +274,7 @@ void screen_resize(int width, int height)
return;
}
- if (width < 0 || height < 0) { // just checking...
+ if (width < 0 || height < 0) { // just checking...
return;
}
@@ -311,9 +315,9 @@ void screen_resize(int width, int height)
RedrawingDisabled++;
- win_new_screensize(); // fit the windows in the new sized screen
+ win_new_screensize(); // fit the windows in the new sized screen
- comp_col(); // recompute columns for shown command and ruler
+ comp_col(); // recompute columns for shown command and ruler
RedrawingDisabled--;
@@ -407,7 +411,8 @@ void check_screensize(void)
/// Return true if redrawing should currently be done.
bool redrawing(void)
{
- return !RedrawingDisabled && !(p_lz && char_avail() && !KeyTyped && !do_redraw);
+ return !RedrawingDisabled
+ && !(p_lz && char_avail() && !KeyTyped && !do_redraw);
}
/// Redraw the parts of the screen that is marked for redraw.
@@ -416,7 +421,14 @@ bool redrawing(void)
/// and redraw_all_later() to mark parts of the screen as needing a redraw.
int update_screen(void)
{
- static bool did_intro = false;
+ static bool still_may_intro = true;
+ if (still_may_intro) {
+ if (!may_show_intro()) {
+ redraw_later(firstwin, UPD_NOT_VALID);
+ still_may_intro = false;
+ }
+ }
+
bool is_stl_global = global_stl_height() > 0;
// Don't do anything if the screen structures are (not yet) valid.
@@ -478,7 +490,8 @@ int update_screen(void)
if (msg_grid.chars) {
// non-displayed part of msg_grid is considered invalid.
for (int i = 0; i < MIN(msg_scrollsize(), msg_grid.rows); i++) {
- grid_clear_line(&msg_grid, msg_grid.line_offset[i], msg_grid.cols, i < p_ch);
+ grid_clear_line(&msg_grid, msg_grid.line_offset[i],
+ msg_grid.cols, i < p_ch);
}
}
msg_grid.throttled = false;
@@ -488,7 +501,8 @@ int update_screen(void)
if (type == UPD_NOT_VALID && !ui_has(kUIMultigrid) && msg_scrolled) {
was_invalidated = ui_comp_set_screen_valid(false);
for (int i = valid; i < Rows - p_ch; i++) {
- grid_clear_line(&default_grid, default_grid.line_offset[i], Columns, false);
+ grid_clear_line(&default_grid, default_grid.line_offset[i],
+ Columns, false);
}
FOR_ALL_WINDOWS_IN_TAB(wp, curtab) {
if (wp->w_floating) {
@@ -534,10 +548,10 @@ int update_screen(void)
hl_changed = true;
}
- if (type == UPD_CLEAR) { // first clear screen
- screenclear(); // will reset clear_cmdline
- // and set UPD_NOT_VALID for each window
- cmdline_screen_cleared(); // clear external cmdline state
+ if (type == UPD_CLEAR) { // first clear screen
+ screenclear(); // will reset clear_cmdline
+ // and set UPD_NOT_VALID for each window
+ cmdline_screen_cleared(); // clear external cmdline state
type = UPD_NOT_VALID;
// must_redraw may be set indirectly, avoid another redraw later
must_redraw = 0;
@@ -561,7 +575,7 @@ int update_screen(void)
redraw_tabline = true;
}
- if (clear_cmdline) { // going to clear cmdline (done below)
+ if (clear_cmdline) { // going to clear cmdline (done below)
msg_check_for_delay(false);
}
@@ -570,9 +584,8 @@ int update_screen(void)
// TODO(bfredl): special casing curwin here is SÅ JÄVLA BULL.
// Either this should be done for all windows or not at all.
if (curwin->w_redr_type < UPD_NOT_VALID
- && curwin->w_nrwidth
- != ((curwin->w_p_nu || curwin->w_p_rnu || *curwin->w_p_stc) ? number_width(curwin)
- : 0)) {
+ && curwin->w_nrwidth != ((curwin->w_p_nu || curwin->w_p_rnu || *curwin->w_p_stc)
+ ? number_width(curwin) : 0)) {
curwin->w_redr_type = UPD_NOT_VALID;
}
@@ -594,7 +607,8 @@ int update_screen(void)
buf_T *buf = wp->w_buffer;
if (buf->b_mod_set) {
- if (buf->b_mod_tick_syn < display_tick && syntax_present(wp)) {
+ if (buf->b_mod_tick_syn < display_tick
+ && syntax_present(wp)) {
syn_stack_apply_changes(buf);
buf->b_mod_tick_syn = display_tick;
}
@@ -666,10 +680,9 @@ int update_screen(void)
}
// May put up an introductory message when not editing a file
- if (!did_intro) {
- maybe_intro_message();
+ if (still_may_intro) {
+ intro_message(false);
}
- did_intro = true;
decor_providers_invoke_end();
@@ -758,8 +771,8 @@ static void win_redr_border(win_T *wp)
}
if (wp->w_config.title) {
- int title_col
- = win_get_bordertext_col(icol, wp->w_config.title_width, wp->w_config.title_pos);
+ int title_col = win_get_bordertext_col(icol, wp->w_config.title_width,
+ wp->w_config.title_pos);
win_redr_bordertext(wp, wp->w_config.title_chunks, title_col);
}
if (adj[1]) {
@@ -794,8 +807,8 @@ static void win_redr_border(win_T *wp)
}
if (wp->w_config.footer) {
- int footer_col
- = win_get_bordertext_col(icol, wp->w_config.footer_width, wp->w_config.footer_pos);
+ int footer_col = win_get_bordertext_col(icol, wp->w_config.footer_width,
+ wp->w_config.footer_pos);
win_redr_bordertext(wp, wp->w_config.footer_chunks, footer_col);
}
if (adj[1]) {
@@ -808,24 +821,25 @@ static void win_redr_border(win_T *wp)
/// Set cursor to its position in the current window.
void setcursor(void)
{
- setcursor_mayforce(false);
+ setcursor_mayforce(curwin, false);
}
/// Set cursor to its position in the current window.
/// @param force when true, also when not redrawing.
-void setcursor_mayforce(bool force)
+void setcursor_mayforce(win_T *wp, bool force)
{
if (force || redrawing()) {
- validate_cursor();
+ validate_cursor(wp);
- ScreenGrid *grid = &curwin->w_grid;
- int row = curwin->w_wrow;
- int col = curwin->w_wcol;
- if (curwin->w_p_rl) {
+ ScreenGrid *grid = &wp->w_grid;
+ int row = wp->w_wrow;
+ int col = wp->w_wcol;
+ if (wp->w_p_rl) {
// With 'rightleft' set and the cursor on a double-wide character,
// position it on the leftmost column.
- col = curwin->w_width_inner - curwin->w_wcol
- - ((utf_ptr2cells(get_cursor_pos_ptr()) == 2 && vim_isprintc(gchar_cursor())) ? 2 : 1);
+ char *cursor = ml_get_buf(wp->w_buffer, wp->w_cursor.lnum) + wp->w_cursor.col;
+ col = wp->w_width_inner - wp->w_wcol - ((utf_ptr2cells(cursor) == 2
+ && vim_isprintc(utf_ptr2char(cursor))) ? 2 : 1);
}
grid_adjust(&grid, &row, &col);
@@ -839,19 +853,22 @@ void setcursor_mayforce(bool force)
void show_cursor_info_later(bool force)
{
int state = get_real_state();
- int empty_line
- = (State & MODE_INSERT) == 0 && *ml_get_buf(curwin->w_buffer, curwin->w_cursor.lnum) == NUL;
+ int empty_line = (State & MODE_INSERT) == 0
+ && *ml_get_buf(curwin->w_buffer, curwin->w_cursor.lnum) == NUL;
// Only draw when something changed.
- validate_virtcol_win(curwin);
- if (force || curwin->w_cursor.lnum != curwin->w_stl_cursor.lnum
+ validate_virtcol(curwin);
+ if (force
+ || curwin->w_cursor.lnum != curwin->w_stl_cursor.lnum
|| curwin->w_cursor.col != curwin->w_stl_cursor.col
|| curwin->w_virtcol != curwin->w_stl_virtcol
|| curwin->w_cursor.coladd != curwin->w_stl_cursor.coladd
|| curwin->w_topline != curwin->w_stl_topline
|| curwin->w_buffer->b_ml.ml_line_count != curwin->w_stl_line_count
- || curwin->w_topfill != curwin->w_stl_topfill || empty_line != curwin->w_stl_empty
- || reg_recording != curwin->w_stl_recording || state != curwin->w_stl_state
+ || curwin->w_topfill != curwin->w_stl_topfill
+ || empty_line != curwin->w_stl_empty
+ || reg_recording != curwin->w_stl_recording
+ || state != curwin->w_stl_state
|| (VIsual_active && VIsual_mode != curwin->w_stl_visual_mode)) {
if (curwin->w_status_height || global_stl_height()) {
curwin->w_redr_status = true;
@@ -863,7 +880,8 @@ void show_cursor_info_later(bool force)
curwin->w_redr_status = true;
}
- if ((p_icon && (stl_syntax & STL_IN_ICON)) || (p_title && (stl_syntax & STL_IN_TITLE))) {
+ if ((p_icon && (stl_syntax & STL_IN_ICON))
+ || (p_title && (stl_syntax & STL_IN_TITLE))) {
need_maketitle = true;
}
}
@@ -909,13 +927,21 @@ int showmode(void)
msg_ext_clear(true);
}
- // don't make non-flushed message part of the showmode
+ // Don't make non-flushed message part of the showmode and reset global
+ // variables before flushing to to avoid recursiveness.
+ bool draw_mode = redraw_mode;
+ bool clear_cmd = clear_cmdline;
+ redraw_cmdline = false;
+ redraw_mode = false;
+ clear_cmdline = false;
msg_ext_ui_flush();
msg_grid_validate();
bool do_mode = ((p_smd && msg_silent == 0)
- && ((State & MODE_TERMINAL) || (State & MODE_INSERT) || restart_edit != NUL
+ && ((State & MODE_TERMINAL)
+ || (State & MODE_INSERT)
+ || restart_edit != NUL
|| VIsual_active));
bool can_show_mode = (p_ch != 0 || ui_has(kUIMessages));
@@ -930,14 +956,14 @@ int showmode(void)
msg_check_for_delay(false);
// if the cmdline is more than one line high, erase top lines
- bool need_clear = clear_cmdline;
- if (clear_cmdline && cmdline_row < Rows - 1) {
+ bool need_clear = clear_cmd;
+ if (clear_cmd && cmdline_row < Rows - 1) {
msg_clr_cmdline(); // will reset clear_cmdline
}
// Position on the last line in the window, column 0
msg_pos_mode();
- int attr = HL_ATTR(HLF_CM); // Highlight mode
+ int attr = HL_ATTR(HLF_CM); // Highlight mode
// When the screen is too narrow to show the entire mode message,
// avoid scrolling and truncate instead.
@@ -993,8 +1019,8 @@ int showmode(void)
msg_puts_attr(_(" REVERSE"), attr);
}
msg_puts_attr(_(" INSERT"), attr);
- } else if (restart_edit == 'I' || restart_edit == 'i' || restart_edit == 'a'
- || restart_edit == 'A') {
+ } else if (restart_edit == 'I' || restart_edit == 'i'
+ || restart_edit == 'a' || restart_edit == 'A') {
if (curbuf->terminal) {
msg_puts_attr(_(" (terminal)"), attr);
} else {
@@ -1008,7 +1034,8 @@ int showmode(void)
if (State & MODE_LANGMAP) {
if (curwin->w_p_arab) {
msg_puts_attr(_(" Arabic"), attr);
- } else if (get_keymap_str(curwin, " (%s)", NameBuff, MAXPATHL)) {
+ } else if (get_keymap_str(curwin, " (%s)",
+ NameBuff, MAXPATHL)) {
msg_puts_attr(NameBuff, attr);
}
}
@@ -1021,25 +1048,21 @@ int showmode(void)
// Don't concatenate separate words to avoid translation
// problems.
- switch ((VIsual_select ? 4 : 0) + (VIsual_mode == Ctrl_V) * 2 + (VIsual_mode == 'V')) {
+ switch ((VIsual_select ? 4 : 0)
+ + (VIsual_mode == Ctrl_V) * 2
+ + (VIsual_mode == 'V')) {
case 0:
- p = N_(" VISUAL");
- break;
+ p = N_(" VISUAL"); break;
case 1:
- p = N_(" VISUAL LINE");
- break;
+ p = N_(" VISUAL LINE"); break;
case 2:
- p = N_(" VISUAL BLOCK");
- break;
+ p = N_(" VISUAL BLOCK"); break;
case 4:
- p = N_(" SELECT");
- break;
+ p = N_(" SELECT"); break;
case 5:
- p = N_(" SELECT LINE");
- break;
+ p = N_(" SELECT LINE"); break;
default:
- p = N_(" SELECT BLOCK");
- break;
+ p = N_(" SELECT BLOCK"); break;
}
msg_puts_attr(_(p), attr);
}
@@ -1048,26 +1071,27 @@ int showmode(void)
need_clear = true;
}
- if (reg_recording != 0 && edit_submode == NULL // otherwise it gets too long
- ) {
+ if (reg_recording != 0
+ && edit_submode == NULL // otherwise it gets too long
+ ) {
recording_mode(attr);
need_clear = true;
}
mode_displayed = true;
- if (need_clear || clear_cmdline || redraw_mode) {
+ if (need_clear || clear_cmd || draw_mode) {
msg_clr_eos();
}
- msg_didout = false; // overwrite this message
+ msg_didout = false; // overwrite this message
length = msg_col;
msg_col = 0;
msg_no_more = false;
lines_left = save_lines_left;
- need_wait_return = nwr_save; // never ask for hit-return for this
- } else if (clear_cmdline && msg_silent == 0) {
+ need_wait_return = nwr_save; // never ask for hit-return for this
+ } else if (clear_cmd && msg_silent == 0) {
// Clear the whole command line. Will reset "clear_cmdline".
msg_clr_cmdline();
- } else if (redraw_mode) {
+ } else if (draw_mode) {
msg_pos_mode();
msg_clr_eos();
}
@@ -1090,10 +1114,6 @@ int showmode(void)
grid_line_flush();
}
- redraw_cmdline = false;
- redraw_mode = false;
- clear_cmdline = false;
-
return length;
}
@@ -1142,14 +1162,12 @@ static void recording_mode(int attr)
}
msg_puts_attr(_("recording"), attr);
- char reg_str[8];
- reg_str[utf_char2bytes(reg_recording, reg_str)] = 0;
- char s[16];
- snprintf(s, ARRAY_SIZE(s), " @%s", reg_str);
+ char s[4];
+ snprintf(s, ARRAY_SIZE(s), " @%c", reg_recording);
msg_puts_attr(s, attr);
}
-#define COL_RULER 17 // columns needed by standard ruler
+#define COL_RULER 17 // columns needed by standard ruler
/// Compute columns for ruler and shown command. 'sc_col' is also used to
/// decide what the maximum length of a message on the status line can be.
@@ -1170,15 +1188,17 @@ void comp_col(void)
}
if (p_sc && *p_sloc == 'l') {
sc_col += SHOWCMD_COLS;
- if (!p_ru || last_has_status) { // no need for separating space
+ if (!p_ru || last_has_status) { // no need for separating space
sc_col++;
}
}
- assert(sc_col >= 0 && INT_MIN + sc_col <= Columns);
+ assert(sc_col >= 0
+ && INT_MIN + sc_col <= Columns);
sc_col = Columns - sc_col;
- assert(ru_col >= 0 && INT_MIN + ru_col <= Columns);
+ assert(ru_col >= 0
+ && INT_MIN + ru_col <= Columns);
ru_col = Columns - ru_col;
- if (sc_col <= 0) { // screen too narrow, will become a mess
+ if (sc_col <= 0) { // screen too narrow, will become a mess
sc_col = 1;
}
if (ru_col <= 0) {
@@ -1223,7 +1243,8 @@ static bool win_redraw_signcols(win_T *wp)
static bool hsep_connected(win_T *wp, WindowCorner corner)
{
bool before = (corner == WC_TOP_LEFT || corner == WC_BOTTOM_LEFT);
- int sep_row = (corner == WC_TOP_LEFT || corner == WC_TOP_RIGHT) ? wp->w_winrow - 1 : W_ENDROW(wp);
+ int sep_row = (corner == WC_TOP_LEFT || corner == WC_TOP_RIGHT)
+ ? wp->w_winrow - 1 : W_ENDROW(wp);
frame_T *fr = wp->w_frame;
while (fr->fr_parent != NULL) {
@@ -1257,8 +1278,8 @@ static bool hsep_connected(win_T *wp, WindowCorner corner)
static bool vsep_connected(win_T *wp, WindowCorner corner)
{
bool before = (corner == WC_TOP_LEFT || corner == WC_TOP_RIGHT);
- int sep_col
- = (corner == WC_TOP_LEFT || corner == WC_BOTTOM_LEFT) ? wp->w_wincol - 1 : W_ENDCOL(wp);
+ int sep_col = (corner == WC_TOP_LEFT || corner == WC_BOTTOM_LEFT)
+ ? wp->w_wincol - 1 : W_ENDCOL(wp);
frame_T *fr = wp->w_frame;
while (fr->fr_parent != NULL) {
@@ -1423,19 +1444,19 @@ static void draw_sep_connectors_win(win_T *wp)
/// bot: from bot_start to last row (when scrolled up)
static void win_update(win_T *wp)
{
- int top_end = 0; // Below last row of the top area that needs
- // updating. 0 when no top area updating.
- int mid_start = 999; // first row of the mid area that needs
- // updating. 999 when no mid area updating.
- int mid_end = 0; // Below last row of the mid area that needs
- // updating. 0 when no mid area updating.
- int bot_start = 999; // first row of the bot area that needs
- // updating. 999 when no bot area updating
- bool scrolled_down = false; // true when scrolled down when w_topline got smaller a bit
- bool top_to_mod = false; // redraw above mod_top
-
- int bot_scroll_start = 999; // first line that needs to be redrawn due to
- // scrolling. only used for EOB
+ int top_end = 0; // Below last row of the top area that needs
+ // updating. 0 when no top area updating.
+ int mid_start = 999; // first row of the mid area that needs
+ // updating. 999 when no mid area updating.
+ int mid_end = 0; // Below last row of the mid area that needs
+ // updating. 0 when no mid area updating.
+ int bot_start = 999; // first row of the bot area that needs
+ // updating. 999 when no bot area updating
+ bool scrolled_down = false; // true when scrolled down when w_topline got smaller a bit
+ bool top_to_mod = false; // redraw above mod_top
+
+ int bot_scroll_start = 999; // first line that needs to be redrawn due to
+ // scrolling. only used for EOB
static bool recursive = false; // being called recursively
@@ -1444,10 +1465,9 @@ static void win_update(win_T *wp)
DID_NONE = 1, // didn't update a line
DID_LINE = 2, // updated a normal line
DID_FOLD = 3, // updated a folded line
- } did_update
- = DID_NONE;
+ } did_update = DID_NONE;
- linenr_T syntax_last_parsed = 0; // last parsed text line
+ linenr_T syntax_last_parsed = 0; // last parsed text line
linenr_T mod_top = 0;
linenr_T mod_bot = 0;
@@ -1501,7 +1521,7 @@ static void win_update(win_T *wp)
// Make sure skipcol is valid, it depends on various options and the window
// width.
- if (wp->w_skipcol > 0) {
+ if (wp->w_skipcol > 0 && wp->w_width_inner > win_col_off(wp)) {
int w = 0;
int width1 = wp->w_width_inner - win_col_off(wp);
int width2 = width1 + win_col_off2(wp);
@@ -1555,12 +1575,14 @@ static void win_update(win_T *wp)
// previous line invalid. Simple solution: redraw all visible
// lines above the change.
// Same for a match pattern.
- if (screen_search_hl.rm.regprog != NULL && re_multiline(screen_search_hl.rm.regprog)) {
+ if (screen_search_hl.rm.regprog != NULL
+ && re_multiline(screen_search_hl.rm.regprog)) {
top_to_mod = true;
} else {
const matchitem_T *cur = wp->w_match_head;
while (cur != NULL) {
- if (cur->mit_match.regprog != NULL && re_multiline(cur->mit_match.regprog)) {
+ if (cur->mit_match.regprog != NULL
+ && re_multiline(cur->mit_match.regprog)) {
top_to_mod = true;
break;
}
@@ -1597,14 +1619,14 @@ static void win_update(win_T *wp)
}
}
- hasFoldingWin(wp, mod_top, &mod_top, NULL, true, NULL);
+ hasFolding(wp, mod_top, &mod_top, NULL);
if (mod_top > lnumt) {
mod_top = lnumt;
}
// Now do the same for the bottom line (one above mod_bot).
mod_bot--;
- hasFoldingWin(wp, mod_bot, NULL, &mod_bot, true, NULL);
+ hasFolding(wp, mod_bot, NULL, &mod_bot);
mod_bot++;
if (mod_bot < lnumb) {
mod_bot = lnumb;
@@ -1653,11 +1675,13 @@ static void win_update(win_T *wp)
// 2: wp->w_topline is below wp->w_lines[0].wl_lnum: may scroll up
// 3: wp->w_topline is wp->w_lines[0].wl_lnum: find first entry in
// w_lines[] that needs updating.
- if ((type == UPD_VALID || type == UPD_SOME_VALID || type == UPD_INVERTED
- || type == UPD_INVERTED_ALL)
+ if ((type == UPD_VALID || type == UPD_SOME_VALID
+ || type == UPD_INVERTED || type == UPD_INVERTED_ALL)
&& !wp->w_botfill && !wp->w_old_botfill) {
- if (mod_top != 0 && wp->w_topline == mod_top
- && (!wp->w_lines[0].wl_valid || wp->w_topline == wp->w_lines[0].wl_lnum)) {
+ if (mod_top != 0
+ && wp->w_topline == mod_top
+ && (!wp->w_lines[0].wl_valid
+ || wp->w_topline == wp->w_lines[0].wl_lnum)) {
// w_topline is the first changed line and window is not scrolled,
// the scrolling from changed lines will be done further down.
} else if (wp->w_lines[0].wl_valid
@@ -1675,13 +1699,13 @@ static void win_update(win_T *wp)
if (j >= wp->w_grid.rows - 2) {
break;
}
- hasFoldingWin(wp, ln, NULL, &ln, true, NULL);
+ hasFolding(wp, ln, NULL, &ln);
}
} else {
j = wp->w_lines[0].wl_lnum - wp->w_topline;
}
- if (j < wp->w_grid.rows - 2) { // not too far off
- int i = plines_m_win(wp, wp->w_topline, wp->w_lines[0].wl_lnum - 1, true);
+ if (j < wp->w_grid.rows - 2) { // not too far off
+ int i = plines_m_win(wp, wp->w_topline, wp->w_lines[0].wl_lnum - 1, wp->w_height_inner);
// insert extra lines for previously invisible filler lines
if (wp->w_lines[0].wl_lnum != wp->w_topline) {
i += win_get_fill(wp, wp->w_lines[0].wl_lnum) - wp->w_old_topfill;
@@ -1726,7 +1750,8 @@ static void win_update(win_T *wp)
int j = -1;
int row = 0;
for (int i = 0; i < wp->w_lines_valid; i++) {
- if (wp->w_lines[i].wl_valid && wp->w_lines[i].wl_lnum == wp->w_topline) {
+ if (wp->w_lines[i].wl_valid
+ && wp->w_lines[i].wl_lnum == wp->w_topline) {
j = i;
break;
}
@@ -1765,7 +1790,8 @@ static void win_update(win_T *wp)
wp->w_lines[idx] = wp->w_lines[j];
// stop at line that didn't fit, unless it is still
// valid (no lines deleted)
- if (row > 0 && bot_start + row + (int)wp->w_lines[j].wl_size > wp->w_grid.rows) {
+ if (row > 0 && bot_start + row
+ + (int)wp->w_lines[j].wl_size > wp->w_grid.rows) {
wp->w_lines_valid = idx + 1;
break;
}
@@ -1781,8 +1807,8 @@ static void win_update(win_T *wp)
// Correct the first entry for filler lines at the top
// when it won't get updated below.
if (win_may_fill(wp) && bot_start > 0) {
- wp->w_lines[0].wl_size
- = (uint16_t)(plines_win_nofill(wp, wp->w_topline, true) + wp->w_topfill);
+ wp->w_lines[0].wl_size = (uint16_t)(plines_win_nofill(wp, wp->w_topline, true)
+ + wp->w_topfill);
}
}
}
@@ -1845,13 +1871,15 @@ static void win_update(win_T *wp)
} else {
from = wp->w_old_cursor_lnum;
to = curwin->w_cursor.lnum;
- if (from == 0) { // Visual mode just started
+ if (from == 0) { // Visual mode just started
from = to;
}
}
- if (VIsual.lnum != wp->w_old_visual_lnum || VIsual.col != wp->w_old_visual_col) {
- if (wp->w_old_visual_lnum < from && wp->w_old_visual_lnum != 0) {
+ if (VIsual.lnum != wp->w_old_visual_lnum
+ || VIsual.col != wp->w_old_visual_col) {
+ if (wp->w_old_visual_lnum < from
+ && wp->w_old_visual_lnum != 0) {
from = wp->w_old_visual_lnum;
}
if (wp->w_old_visual_lnum > to) {
@@ -1883,7 +1911,7 @@ static void win_update(win_T *wp)
// Highlight to the end of the line, unless 'virtualedit' has
// "block".
if (curwin->w_curswant == MAXCOL) {
- if (get_ve_flags() & VE_BLOCK) {
+ if (get_ve_flags(curwin) & VE_BLOCK) {
pos_T pos;
int cursor_above = curwin->w_cursor.lnum < VIsual.lnum;
@@ -1907,7 +1935,8 @@ static void win_update(win_T *wp)
}
}
- if (fromc != wp->w_old_cursor_fcol || toc != wp->w_old_cursor_lcol) {
+ if (fromc != wp->w_old_cursor_fcol
+ || toc != wp->w_old_cursor_lcol) {
if (from > VIsual.lnum) {
from = VIsual.lnum;
}
@@ -1961,7 +1990,7 @@ static void win_update(win_T *wp)
} else {
mid_start = 0;
}
- while (lnum < from && idx < wp->w_lines_valid) { // find start
+ while (lnum < from && idx < wp->w_lines_valid) { // find start
if (wp->w_lines[idx].wl_valid) {
mid_start += wp->w_lines[idx].wl_size;
} else if (!scrolled_down) {
@@ -1976,8 +2005,9 @@ static void win_update(win_T *wp)
}
srow += mid_start;
mid_end = wp->w_grid.rows;
- for (; idx < wp->w_lines_valid; idx++) { // find end
- if (wp->w_lines[idx].wl_valid && wp->w_lines[idx].wl_lnum >= to + 1) {
+ for (; idx < wp->w_lines_valid; idx++) { // find end
+ if (wp->w_lines[idx].wl_valid
+ && wp->w_lines[idx].wl_lnum >= to + 1) {
// Only update until first row of this line
mid_end = srow;
break;
@@ -2021,12 +2051,12 @@ static void win_update(win_T *wp)
}
// Update all the window rows.
- int idx = 0; // first entry in w_lines[].wl_size
- int row = 0; // current window row to display
- int srow = 0; // starting row of the current line
+ int idx = 0; // first entry in w_lines[].wl_size
+ int row = 0; // current window row to display
+ int srow = 0; // starting row of the current line
- bool eof = false; // if true, we hit the end of the file
- bool didline = false; // if true, we finished the last line
+ bool eof = false; // if true, we hit the end of the file
+ bool didline = false; // if true, we finished the last line
while (true) {
// stop updating when reached the end of the window (check for _past_
// the end of the window is at the end of the loop)
@@ -2052,19 +2082,27 @@ static void win_update(win_T *wp)
// When syntax folding is being used, the saved syntax states will
// already have been updated, we can't see where the syntax state is
// the same again, just update until the end of the window.
- if (row < top_end || (row >= mid_start && row < mid_end) || top_to_mod
- || idx >= wp->w_lines_valid || (row + wp->w_lines[idx].wl_size > bot_start)
+ if (row < top_end
+ || (row >= mid_start && row < mid_end)
+ || top_to_mod
+ || idx >= wp->w_lines_valid
+ || (row + wp->w_lines[idx].wl_size > bot_start)
|| (mod_top != 0
&& (lnum == mod_top
|| (lnum >= mod_top
- && (lnum < mod_bot || did_update == DID_FOLD
- || (did_update == DID_LINE && syntax_present(wp)
- && ((foldmethodIsSyntax(wp) && hasAnyFolding(wp))
+ && (lnum < mod_bot
+ || did_update == DID_FOLD
+ || (did_update == DID_LINE
+ && syntax_present(wp)
+ && ((foldmethodIsSyntax(wp)
+ && hasAnyFolding(wp))
|| syntax_check_changed(lnum)))
// match in fixed position might need redraw
// if lines were inserted or deleted
- || (wp->w_match_head != NULL && buf->b_mod_xlines != 0)))))
- || lnum == wp->w_cursorline || lnum == wp->w_last_cursorline) {
+ || (wp->w_match_head != NULL
+ && buf->b_mod_xlines != 0)))))
+ || lnum == wp->w_cursorline
+ || lnum == wp->w_last_cursorline) {
if (lnum == mod_top) {
top_to_mod = false;
}
@@ -2074,7 +2112,9 @@ static void win_update(win_T *wp)
// Don't do this when the change continues until the end.
// Don't scroll when dollar_vcol >= 0, keep the "$".
// Don't scroll when redrawing the top, scrolled already above.
- if (lnum == mod_top && mod_bot != MAXLNUM && !(dollar_vcol >= 0 && mod_bot == mod_top + 1)
+ if (lnum == mod_top
+ && mod_bot != MAXLNUM
+ && !(dollar_vcol >= 0 && mod_bot == mod_top + 1)
&& row >= top_end) {
int old_rows = 0;
linenr_T l;
@@ -2086,15 +2126,18 @@ static void win_update(win_T *wp)
for (i = idx; i < wp->w_lines_valid; i++) {
// Only valid lines have a meaningful wl_lnum. Invalid
// lines are part of the changed area.
- if (wp->w_lines[i].wl_valid && wp->w_lines[i].wl_lnum == mod_bot) {
+ if (wp->w_lines[i].wl_valid
+ && wp->w_lines[i].wl_lnum == mod_bot) {
break;
}
old_rows += wp->w_lines[i].wl_size;
- if (wp->w_lines[i].wl_valid && wp->w_lines[i].wl_lastlnum + 1 == mod_bot) {
+ if (wp->w_lines[i].wl_valid
+ && wp->w_lines[i].wl_lastlnum + 1 == mod_bot) {
// Must have found the last valid entry above mod_bot.
// Add following invalid entries.
i++;
- while (i < wp->w_lines_valid && !wp->w_lines[i].wl_valid) {
+ while (i < wp->w_lines_valid
+ && !wp->w_lines[i].wl_valid) {
old_rows += wp->w_lines[i++].wl_size;
}
break;
@@ -2113,7 +2156,7 @@ static void win_update(win_T *wp)
// rows, and may insert/delete lines
int j = idx;
for (l = lnum; l < mod_bot; l++) {
- if (hasFoldingWin(wp, l, NULL, &l, true, NULL)) {
+ if (hasFolding(wp, l, NULL, &l)) {
new_rows++;
} else if (l == wp->w_topline) {
int n = plines_win_nofill(wp, l, false) + wp->w_topfill;
@@ -2177,7 +2220,8 @@ static void win_update(win_T *wp)
}
wp->w_lines[j] = wp->w_lines[i];
// stop at a line that won't fit
- if (x + (int)wp->w_lines[j].wl_size > wp->w_grid.rows) {
+ if (x + (int)wp->w_lines[j].wl_size
+ > wp->w_grid.rows) {
wp->w_lines_valid = j + 1;
break;
}
@@ -2187,8 +2231,8 @@ static void win_update(win_T *wp)
if (bot_start > x) {
bot_start = x;
}
- } else { // j > i
- // move entries in w_lines[] downwards
+ } else { // j > i
+ // move entries in w_lines[] downwards
j -= i;
wp->w_lines_valid += (linenr_T)j;
if (wp->w_lines_valid > wp->w_grid.rows) {
@@ -2213,20 +2257,25 @@ static void win_update(win_T *wp)
// When lines are folded, display one line for all of them.
// Otherwise, display normally (can be several display lines when
// 'wrap' is on).
- foldinfo_T foldinfo
- = wp->w_p_cul && lnum == wp->w_cursor.lnum ? cursorline_fi : fold_info(wp, lnum);
-
- if (foldinfo.fi_lines == 0 && idx < wp->w_lines_valid && wp->w_lines[idx].wl_valid
- && wp->w_lines[idx].wl_lnum == lnum && lnum > wp->w_topline
+ foldinfo_T foldinfo = wp->w_p_cul && lnum == wp->w_cursor.lnum
+ ? cursorline_fi : fold_info(wp, lnum);
+
+ if (foldinfo.fi_lines == 0
+ && idx < wp->w_lines_valid
+ && wp->w_lines[idx].wl_valid
+ && wp->w_lines[idx].wl_lnum == lnum
+ && lnum > wp->w_topline
&& !(dy_flags & (DY_LASTLINE | DY_TRUNCATE))
- && srow + wp->w_lines[idx].wl_size > wp->w_grid.rows && win_get_fill(wp, lnum) == 0) {
+ && srow + wp->w_lines[idx].wl_size > wp->w_grid.rows
+ && win_get_fill(wp, lnum) == 0) {
// This line is not going to fit. Don't draw anything here,
// will draw "@ " lines below.
row = wp->w_grid.rows + 1;
} else {
prepare_search_hl(wp, &screen_search_hl, lnum);
// Let the syntax stuff know we skipped a few lines.
- if (syntax_last_parsed != 0 && syntax_last_parsed + 1 < lnum && syntax_present(wp)) {
+ if (syntax_last_parsed != 0 && syntax_last_parsed + 1 < lnum
+ && syntax_present(wp)) {
syntax_end_parsing(wp, syntax_last_parsed + 1);
}
@@ -2234,8 +2283,8 @@ static void win_update(win_T *wp)
// Display one line
spellvars_T zero_spv = { 0 };
- row = win_line(wp, lnum, srow, wp->w_grid.rows, 0, display_buf_line ? &spv : &zero_spv,
- foldinfo);
+ row = win_line(wp, lnum, srow, wp->w_grid.rows, 0,
+ display_buf_line ? &spv : &zero_spv, foldinfo);
if (display_buf_line) {
syntax_last_parsed = lnum;
@@ -2258,7 +2307,7 @@ static void win_update(win_T *wp)
wp->w_lines[idx].wl_lnum = lnum;
wp->w_lines[idx].wl_valid = true;
- if (row > wp->w_grid.rows) { // past end of grid
+ if (row > wp->w_grid.rows) { // past end of grid
// we may need the size of that too long line later on
if (dollar_vcol == -1) {
wp->w_lines[idx].wl_size = (uint16_t)plines_win(wp, lnum, true);
@@ -2278,8 +2327,8 @@ static void win_update(win_T *wp)
// the text doesn't need to be redrawn, but the number column does.
if ((wp->w_p_nu && mod_top != 0 && lnum >= mod_bot && buf->b_mod_xlines != 0)
|| (wp->w_p_rnu && wp->w_last_cursor_lnum_rnu != wp->w_cursor.lnum)) {
- foldinfo_T info
- = wp->w_p_cul && lnum == wp->w_cursor.lnum ? cursorline_fi : fold_info(wp, lnum);
+ foldinfo_T info = wp->w_p_cul && lnum == wp->w_cursor.lnum
+ ? cursorline_fi : fold_info(wp, lnum);
win_line(wp, lnum, srow, wp->w_grid.rows, wp->w_lines[idx].wl_size, &spv, info);
}
@@ -2295,7 +2344,7 @@ static void win_update(win_T *wp)
// 'statuscolumn' width has changed or errored, start from the top.
if (wp->w_redr_statuscol) {
- redr_statuscol:
+redr_statuscol:
wp->w_redr_statuscol = false;
idx = 0;
row = 0;
@@ -2345,7 +2394,7 @@ static void win_update(win_T *wp)
// Window ends in filler lines.
wp->w_botline = lnum;
wp->w_filler_rows = wp->w_grid.rows - srow;
- } else if (dy_flags & DY_TRUNCATE) { // 'display' has "truncate"
+ } else if (dy_flags & DY_TRUNCATE) { // 'display' has "truncate"
// Last line isn't finished: Display "@@@" in the last screen line.
grid_line_start(&wp->w_grid, wp->w_grid.rows - 1);
grid_line_fill(0, MIN(wp->w_grid.cols, 3), wp->w_p_fcs_chars.lastline, at_attr);
@@ -2353,18 +2402,19 @@ static void win_update(win_T *wp)
grid_line_flush();
set_empty_rows(wp, srow);
wp->w_botline = lnum;
- } else if (dy_flags & DY_LASTLINE) { // 'display' has "lastline"
+ } else if (dy_flags & DY_LASTLINE) { // 'display' has "lastline"
// Last line isn't finished: Display "@@@" at the end.
// If this would split a doublewidth char in two, we need to display "@@@@" instead
grid_line_start(&wp->w_grid, wp->w_grid.rows - 1);
int width = grid_line_getchar(MAX(wp->w_grid.cols - 3, 0), NULL) == NUL ? 4 : 3;
- grid_line_fill(MAX(wp->w_grid.cols - width, 0), wp->w_grid.cols, wp->w_p_fcs_chars.lastline,
- at_attr);
+ grid_line_fill(MAX(wp->w_grid.cols - width, 0), wp->w_grid.cols,
+ wp->w_p_fcs_chars.lastline, at_attr);
grid_line_flush();
set_empty_rows(wp, srow);
wp->w_botline = lnum;
} else {
- win_draw_end(wp, wp->w_p_fcs_chars.lastline, true, srow, wp->w_grid.rows, HLF_AT);
+ win_draw_end(wp, wp->w_p_fcs_chars.lastline, true, srow,
+ wp->w_grid.rows, HLF_AT);
set_empty_rows(wp, srow);
wp->w_botline = lnum;
}
@@ -2400,7 +2450,9 @@ static void win_update(win_T *wp)
lastline = 0;
}
- win_draw_end(wp, wp->w_p_fcs_chars.eob, false, MAX(lastline, row), wp->w_grid.rows, HLF_EOB);
+ win_draw_end(wp, wp->w_p_fcs_chars.eob, false, MAX(lastline, row),
+ wp->w_grid.rows,
+ HLF_EOB);
set_empty_rows(wp, row);
}
@@ -2418,9 +2470,9 @@ static void win_update(win_T *wp)
// Send win_extmarks if needed
for (size_t n = 0; n < kv_size(win_extmark_arr); n++) {
- ui_call_win_extmark(wp->w_grid_alloc.handle, wp->handle, kv_A(win_extmark_arr, n).ns_id,
- (Integer)kv_A(win_extmark_arr, n).mark_id, kv_A(win_extmark_arr, n).win_row,
- kv_A(win_extmark_arr, n).win_col);
+ ui_call_win_extmark(wp->w_grid_alloc.handle, wp->handle,
+ kv_A(win_extmark_arr, n).ns_id, (Integer)kv_A(win_extmark_arr, n).mark_id,
+ kv_A(win_extmark_arr, n).win_row, kv_A(win_extmark_arr, n).win_col);
}
if (dollar_vcol == -1) {
@@ -2478,9 +2530,11 @@ void win_scroll_lines(win_T *wp, int row, int line_count)
}
if (line_count < 0) {
- grid_del_lines(&wp->w_grid, row, -line_count, wp->w_grid.rows, 0, wp->w_grid.cols);
+ grid_del_lines(&wp->w_grid, row, -line_count,
+ wp->w_grid.rows, 0, wp->w_grid.cols);
} else {
- grid_ins_lines(&wp->w_grid, row, line_count, wp->w_grid.rows, 0, wp->w_grid.cols);
+ grid_ins_lines(&wp->w_grid, row, line_count,
+ wp->w_grid.rows, 0, wp->w_grid.cols);
}
}
@@ -2599,7 +2653,7 @@ void redraw_later(win_T *wp, int type)
if (type >= UPD_NOT_VALID) {
wp->w_lines_valid = 0;
}
- if (must_redraw < type) { // must_redraw is the maximum of all windows
+ if (must_redraw < type) { // must_redraw is the maximum of all windows
must_redraw = type;
}
}
@@ -2662,7 +2716,8 @@ void redraw_buf_line_later(buf_T *buf, linenr_T line, bool force)
void redraw_buf_range_later(buf_T *buf, linenr_T firstline, linenr_T lastline)
{
FOR_ALL_WINDOWS_IN_TAB(wp, curtab) {
- if (wp->w_buffer == buf && lastline >= wp->w_topline && firstline < wp->w_botline) {
+ if (wp->w_buffer == buf
+ && lastline >= wp->w_topline && firstline < wp->w_botline) {
if (wp->w_redraw_top == 0 || wp->w_redraw_top > firstline) {
wp->w_redraw_top = firstline;
}
@@ -2679,7 +2734,9 @@ void redraw_buf_status_later(buf_T *buf)
{
FOR_ALL_WINDOWS_IN_TAB(wp, curtab) {
if (wp->w_buffer == buf
- && (wp->w_status_height || (wp == curwin && global_stl_height()) || wp->w_winbar_height)) {
+ && (wp->w_status_height
+ || (wp == curwin && global_stl_height())
+ || wp->w_winbar_height)) {
wp->w_redr_status = true;
set_must_redraw(UPD_VALID);
}
@@ -2692,7 +2749,8 @@ void status_redraw_all(void)
bool is_stl_global = global_stl_height() != 0;
FOR_ALL_WINDOWS_IN_TAB(wp, curtab) {
- if ((!is_stl_global && wp->w_status_height) || wp == curwin || wp->w_winbar_height) {
+ if ((!is_stl_global && wp->w_status_height) || wp == curwin
+ || wp->w_winbar_height) {
wp->w_redr_status = true;
redraw_later(wp, UPD_VALID);
}
@@ -2711,9 +2769,8 @@ void status_redraw_buf(buf_T *buf)
bool is_stl_global = global_stl_height() != 0;
FOR_ALL_WINDOWS_IN_TAB(wp, curtab) {
- if (wp->w_buffer == buf
- && ((!is_stl_global && wp->w_status_height) || (is_stl_global && wp == curwin)
- || wp->w_winbar_height)) {
+ if (wp->w_buffer == buf && ((!is_stl_global && wp->w_status_height)
+ || (is_stl_global && wp == curwin) || wp->w_winbar_height)) {
wp->w_redr_status = true;
redraw_later(wp, UPD_VALID);
}
@@ -2743,7 +2800,8 @@ void redraw_statuslines(void)
}
/// Redraw all status lines at the bottom of frame "frp".
-void win_redraw_last_status(const frame_T *frp) FUNC_ATTR_NONNULL_ARG(1)
+void win_redraw_last_status(const frame_T *frp)
+ FUNC_ATTR_NONNULL_ARG(1)
{
if (frp->fr_layout == FR_LEAF) {
frp->fr_win->w_redr_status = true;
@@ -2767,9 +2825,11 @@ void win_redraw_last_status(const frame_T *frp) FUNC_ATTR_NONNULL_ARG(1)
/// Used to remove the "$" from a change command.
/// Note that when also inserting/deleting lines w_redraw_top and w_redraw_bot
/// may become invalid and the whole window will have to be redrawn.
-void redrawWinline(win_T *wp, linenr_T lnum) FUNC_ATTR_NONNULL_ALL
+void redrawWinline(win_T *wp, linenr_T lnum)
+ FUNC_ATTR_NONNULL_ALL
{
- if (lnum >= wp->w_topline && lnum < wp->w_botline) {
+ if (lnum >= wp->w_topline
+ && lnum < wp->w_botline) {
if (wp->w_redraw_top == 0 || wp->w_redraw_top > lnum) {
wp->w_redraw_top = lnum;
}
@@ -2782,7 +2842,8 @@ void redrawWinline(win_T *wp, linenr_T lnum) FUNC_ATTR_NONNULL_ALL
/// Return true if the cursor line in window "wp" may be concealed, according
/// to the 'concealcursor' option.
-bool conceal_cursor_line(const win_T *wp) FUNC_ATTR_NONNULL_ALL
+bool conceal_cursor_line(const win_T *wp)
+ FUNC_ATTR_NONNULL_ALL
{
int c;
@@ -2806,7 +2867,8 @@ bool conceal_cursor_line(const win_T *wp) FUNC_ATTR_NONNULL_ALL
/// Whether cursorline is drawn in a special way
///
/// If true, both old and new cursorline will need to be redrawn when moving cursor within windows.
-bool win_cursorline_standout(const win_T *wp) FUNC_ATTR_NONNULL_ALL
+bool win_cursorline_standout(const win_T *wp)
+ FUNC_ATTR_NONNULL_ALL
{
return wp->w_p_cul || (wp->w_p_cole > 0 && !conceal_cursor_line(wp));
}
generated by cgit (git 2.34.1) at 2025-04-29 08:05:37 +0000