Merge remote-tracking branch 'upstream/master' into usermarks

1 files changed, 49 insertions, 47 deletions

diff --git a/src/nvim/move.c b/src/nvim/move.c
index 6d4eb8ef49..b3ec3a8e7a 100644
--- a/src/nvim/move.c
+++ b/src/nvim/move.c
@@ -21,16 +21,18 @@
 #include "nvim/charset.h"
 #include "nvim/cursor.h"
 #include "nvim/diff.h"
+#include "nvim/drawscreen.h"
 #include "nvim/edit.h"
 #include "nvim/fold.h"
 #include "nvim/getchar.h"
+#include "nvim/grid.h"
+#include "nvim/highlight.h"
 #include "nvim/mbyte.h"
 #include "nvim/memline.h"
 #include "nvim/move.h"
 #include "nvim/option.h"
 #include "nvim/plines.h"
-#include "nvim/popupmnu.h"
-#include "nvim/screen.h"
+#include "nvim/popupmenu.h"
 #include "nvim/search.h"
 #include "nvim/strings.h"
 #include "nvim/window.h"
@@ -103,7 +105,7 @@ void redraw_for_cursorline(win_T *wp)
   if ((wp->w_valid & VALID_CROW) == 0 && !pum_visible()
       && (wp->w_p_rnu || win_cursorline_standout(wp))) {
     // win_line() will redraw the number column and cursorline only.
-    redraw_later(wp, VALID);
+    redraw_later(wp, UPD_VALID);
   }
 }
 
@@ -114,13 +116,13 @@ static void redraw_for_cursorcolumn(win_T *wp)
   FUNC_ATTR_NONNULL_ALL
 {
   if ((wp->w_valid & VALID_VIRTCOL) == 0 && !pum_visible()) {
-    if (wp->w_p_cuc || ((HL_ATTR(HLF_LC) || wp->w_hl_ids[HLF_LC]) && using_hlsearch())) {
+    if (wp->w_p_cuc || ((HL_ATTR(HLF_LC) || win_hl_attr(wp, HLF_LC)) && using_hlsearch())) {
       // When 'cursorcolumn' is set or "CurSearch" is in use
-      // need to redraw with SOME_VALID.
-      redraw_later(wp, SOME_VALID);
+      // need to redraw with UPD_SOME_VALID.
+      redraw_later(wp, UPD_SOME_VALID);
     } else if (wp->w_p_cul && (wp->w_p_culopt_flags & CULOPT_SCRLINE)) {
-      // When 'cursorlineopt' contains "screenline" need to redraw with VALID.
-      redraw_later(wp, VALID);
+      // When 'cursorlineopt' contains "screenline" need to redraw with UPD_VALID.
+      redraw_later(wp, UPD_VALID);
     }
   }
   // If the cursor moves horizontally when 'concealcursor' is active, then the
@@ -182,7 +184,7 @@ void update_topline(win_T *wp)
   // If the buffer is empty, always set topline to 1.
   if (buf_is_empty(curbuf)) {             // special case - file is empty
     if (wp->w_topline != 1) {
-      redraw_later(wp, NOT_VALID);
+      redraw_later(wp, UPD_NOT_VALID);
     }
     wp->w_topline = 1;
     wp->w_botline = 2;
@@ -334,9 +336,9 @@ void update_topline(win_T *wp)
     dollar_vcol = -1;
     if (wp->w_skipcol != 0) {
       wp->w_skipcol = 0;
-      redraw_later(wp, NOT_VALID);
+      redraw_later(wp, UPD_NOT_VALID);
     } else {
-      redraw_later(wp, VALID);
+      redraw_later(wp, UPD_VALID);
     }
     // May need to set w_skipcol when cursor in w_topline.
     if (wp->w_cursor.lnum == wp->w_topline) {
@@ -448,7 +450,7 @@ void changed_window_setting_win(win_T *wp)
   wp->w_lines_valid = 0;
   changed_line_abv_curs_win(wp);
   wp->w_valid &= ~(VALID_BOTLINE|VALID_BOTLINE_AP|VALID_TOPLINE);
-  redraw_later(wp, NOT_VALID);
+  redraw_later(wp, UPD_NOT_VALID);
 }
 
 /*
@@ -470,7 +472,7 @@ void set_topline(win_T *wp, linenr_T lnum)
   }
   wp->w_valid &= ~(VALID_WROW|VALID_CROW|VALID_BOTLINE|VALID_TOPLINE);
   // Don't set VALID_TOPLINE here, 'scrolloff' needs to be checked.
-  redraw_later(wp, VALID);
+  redraw_later(wp, UPD_VALID);
 }
 
 /*
@@ -569,7 +571,7 @@ static void curs_rows(win_T *wp)
                      || wp->w_lines[0].wl_lnum > wp->w_topline);
   int i = 0;
   wp->w_cline_row = 0;
-  for (linenr_T lnum = wp->w_topline; lnum < wp->w_cursor.lnum; ++i) {
+  for (linenr_T lnum = wp->w_topline; lnum < wp->w_cursor.lnum; i++) {
     bool valid = false;
     if (!all_invalid && i < wp->w_lines_valid) {
       if (wp->w_lines[i].wl_lnum < lnum || !wp->w_lines[i].wl_valid) {
@@ -585,7 +587,7 @@ static void curs_rows(win_T *wp)
           valid = true;
         }
       } else if (wp->w_lines[i].wl_lnum > lnum) {
-        --i;                            // hold at inserted lines
+        i--;                            // hold at inserted lines
       }
     }
     if (valid && (lnum != wp->w_topline || !win_may_fill(wp))) {
@@ -845,7 +847,7 @@ void curs_columns(win_T *wp, int may_scroll)
         wp->w_leftcol = new_leftcol;
         win_check_anchored_floats(wp);
         // screen has to be redrawn with new wp->w_leftcol
-        redraw_later(wp, NOT_VALID);
+        redraw_later(wp, UPD_NOT_VALID);
       }
     }
     wp->w_wcol -= wp->w_leftcol;
@@ -952,7 +954,7 @@ void curs_columns(win_T *wp, int may_scroll)
     wp->w_skipcol = 0;
   }
   if (prev_skipcol != wp->w_skipcol) {
-    redraw_later(wp, NOT_VALID);
+    redraw_later(wp, UPD_NOT_VALID);
   }
 
   redraw_for_cursorcolumn(curwin);
@@ -1051,12 +1053,12 @@ bool scrolldown(long line_count, int byfold)
       if (curwin->w_topline == 1) {
         break;
       }
-      --curwin->w_topline;
+      curwin->w_topline--;
       curwin->w_topfill = 0;
       // A sequence of folded lines only counts for one logical line
       linenr_T first;
       if (hasFolding(curwin->w_topline, &first, NULL)) {
-        ++done;
+        done++;
         if (!byfold) {
           line_count -= curwin->w_topline - first - 1;
         }
@@ -1066,7 +1068,7 @@ bool scrolldown(long line_count, int byfold)
         done += plines_win_nofill(curwin, curwin->w_topline, true);
       }
     }
-    --curwin->w_botline;                // approximate w_botline
+    curwin->w_botline--;                // approximate w_botline
     invalidate_botline();
   }
   curwin->w_wrow += done;               // keep w_wrow updated
@@ -1092,7 +1094,7 @@ bool scrolldown(long line_count, int byfold)
   while (wrow >= curwin->w_height_inner && curwin->w_cursor.lnum > 1) {
     linenr_T first;
     if (hasFolding(curwin->w_cursor.lnum, &first, NULL)) {
-      --wrow;
+      wrow--;
       if (first == 1) {
         curwin->w_cursor.lnum = 1;
       } else {
@@ -1128,7 +1130,7 @@ bool scrollup(long line_count, int byfold)
     linenr_T lnum = curwin->w_topline;
     while (line_count--) {
       if (curwin->w_topfill > 0) {
-        --curwin->w_topfill;
+        curwin->w_topfill--;
       } else {
         if (byfold) {
           (void)hasFolding(lnum, NULL, &lnum);
@@ -1185,7 +1187,7 @@ void check_topfill(win_T *wp, bool down)
     int n = plines_win_nofill(wp, wp->w_topline, true);
     if (wp->w_topfill + n > wp->w_height_inner) {
       if (down && wp->w_topline > 1) {
-        --wp->w_topline;
+        wp->w_topline--;
         wp->w_topfill = 0;
       } else {
         wp->w_topfill = wp->w_height_inner - n;
@@ -1247,14 +1249,14 @@ void scrolldown_clamp(void)
   }
   if (end_row < curwin->w_height_inner - get_scrolloff_value(curwin)) {
     if (can_fill) {
-      ++curwin->w_topfill;
+      curwin->w_topfill++;
       check_topfill(curwin, true);
     } else {
-      --curwin->w_topline;
+      curwin->w_topline--;
       curwin->w_topfill = 0;
     }
     (void)hasFolding(curwin->w_topline, &curwin->w_topline, NULL);
-    --curwin->w_botline;            // approximate w_botline
+    curwin->w_botline--;            // approximate w_botline
     curwin->w_valid &= ~(VALID_WROW|VALID_CROW|VALID_BOTLINE);
   }
 }
@@ -1307,7 +1309,7 @@ static void topline_back(win_T *wp, lineoff_T *lp)
     lp->fill++;
     lp->height = 1;
   } else {
-    --lp->lnum;
+    lp->lnum--;
     lp->fill = 0;
     if (lp->lnum < 1) {
       lp->height = MAXCOL;
@@ -1333,7 +1335,7 @@ static void botline_forw(win_T *wp, lineoff_T *lp)
     lp->fill++;
     lp->height = 1;
   } else {
-    ++lp->lnum;
+    lp->lnum++;
     lp->fill = 0;
     assert(wp->w_buffer != 0);
     if (lp->lnum > wp->w_buffer->b_ml.ml_line_count) {
@@ -1406,8 +1408,8 @@ void scroll_cursor_top(int min_scroll, int always)
   }
 
   if (hasFolding(curwin->w_cursor.lnum, &top, &bot)) {
-    --top;
-    ++bot;
+    top--;
+    bot++;
   } else {
     top = curwin->w_cursor.lnum - 1;
     bot = curwin->w_cursor.lnum + 1;
@@ -1453,8 +1455,8 @@ void scroll_cursor_top(int min_scroll, int always)
 
     extra += i;
     new_topline = top;
-    --top;
-    ++bot;
+    top--;
+    bot++;
   }
 
   /*
@@ -1664,7 +1666,7 @@ void scroll_cursor_bot(int min_scroll, int set_topbot)
     for (i = 0; i < scrolled && boff.lnum < curwin->w_botline;) {
       botline_forw(curwin, &boff);
       i += boff.height;
-      ++line_count;
+      line_count++;
     }
     if (i < scrolled) {         // below curwin->w_botline, don't scroll
       line_count = 9999;
@@ -1724,9 +1726,9 @@ void scroll_cursor_halfway(int atend)
         }
         below += boff.height;
       } else {
-        ++below;                    // count a "~" line
+        below++;                    // count a "~" line
         if (atend) {
-          ++used;
+          used++;
         }
       }
     }
@@ -1835,7 +1837,7 @@ void cursor_correct(void)
       if (topline < botline) {
         above += win_get_fill(curwin, topline + 1);
       }
-      ++topline;
+      topline++;
     }
   }
   if (topline == botline || botline == 0) {
@@ -1897,7 +1899,7 @@ int onepage(Direction dir, long count)
       if (ONE_WINDOW && p_window > 0 && p_window < Rows - 1) {
         // Vi compatible scrolling
         if (p_window <= 2) {
-          ++curwin->w_topline;
+          curwin->w_topline++;
         } else {
           curwin->w_topline += (linenr_T)p_window - 2;
         }
@@ -1933,7 +1935,7 @@ int onepage(Direction dir, long count)
       if (ONE_WINDOW && p_window > 0 && p_window < Rows - 1) {
         // Vi compatible scrolling (sort of)
         if (p_window <= 2) {
-          --curwin->w_topline;
+          curwin->w_topline--;
         } else {
           curwin->w_topline -= (linenr_T)p_window - 2;
         }
@@ -1998,7 +2000,7 @@ int onepage(Direction dir, long count)
             max_topfill();
           }
           if (curwin->w_topfill == loff.fill) {
-            --curwin->w_topline;
+            curwin->w_topline--;
             curwin->w_topfill = 0;
           }
           comp_botline(curwin);
@@ -2038,7 +2040,7 @@ int onepage(Direction dir, long count)
     }
   }
 
-  redraw_later(curwin, VALID);
+  redraw_later(curwin, UPD_VALID);
   return retval;
 }
 
@@ -2142,7 +2144,7 @@ void halfpage(bool flag, linenr_T Prenum)
         curwin->w_topfill = win_get_fill(curwin, curwin->w_topline);
 
         if (curwin->w_cursor.lnum < curbuf->b_ml.ml_line_count) {
-          ++curwin->w_cursor.lnum;
+          curwin->w_cursor.lnum++;
           curwin->w_valid &=
             ~(VALID_VIRTCOL|VALID_CHEIGHT|VALID_WCOL);
         }
@@ -2175,7 +2177,7 @@ void halfpage(bool flag, linenr_T Prenum)
                && curwin->w_cursor.lnum < curbuf->b_ml.ml_line_count) {
           (void)hasFolding(curwin->w_cursor.lnum, NULL,
                            &curwin->w_cursor.lnum);
-          ++curwin->w_cursor.lnum;
+          curwin->w_cursor.lnum++;
         }
       } else {
         curwin->w_cursor.lnum += n;
@@ -2197,7 +2199,7 @@ void halfpage(bool flag, linenr_T Prenum)
         if (n < 0 && scrolled > 0) {
           break;
         }
-        --curwin->w_topline;
+        curwin->w_topline--;
         (void)hasFolding(curwin->w_topline, &curwin->w_topline, NULL);
         curwin->w_topfill = 0;
       }
@@ -2205,7 +2207,7 @@ void halfpage(bool flag, linenr_T Prenum)
                            VALID_BOTLINE|VALID_BOTLINE_AP);
       scrolled += i;
       if (curwin->w_cursor.lnum > 1) {
-        --curwin->w_cursor.lnum;
+        curwin->w_cursor.lnum--;
         curwin->w_valid &= ~(VALID_VIRTCOL|VALID_CHEIGHT|VALID_WCOL);
       }
     }
@@ -2216,7 +2218,7 @@ void halfpage(bool flag, linenr_T Prenum)
         curwin->w_cursor.lnum = 1;
       } else if (hasAnyFolding(curwin)) {
         while (--n >= 0 && curwin->w_cursor.lnum > 1) {
-          --curwin->w_cursor.lnum;
+          curwin->w_cursor.lnum--;
           (void)hasFolding(curwin->w_cursor.lnum,
                            &curwin->w_cursor.lnum, NULL);
         }
@@ -2230,7 +2232,7 @@ void halfpage(bool flag, linenr_T Prenum)
   check_topfill(curwin, !flag);
   cursor_correct();
   beginline(BL_SOL | BL_FIX);
-  redraw_later(curwin, VALID);
+  redraw_later(curwin, UPD_VALID);
 }
 
 void do_check_cursorbind(void)
@@ -2282,7 +2284,7 @@ void do_check_cursorbind(void)
       }
       // Correct cursor for multi-byte character.
       mb_adjust_cursor();
-      redraw_later(curwin, VALID);
+      redraw_later(curwin, UPD_VALID);
 
       // Only scroll when 'scrollbind' hasn't done this.
       if (!curwin->w_p_scb) {