Merge pull request #13117 from romgrk/add-scroll-events

Implement scroll autocommand

1 files changed, 20 insertions, 17 deletions

diff --git a/src/nvim/move.c b/src/nvim/move.c
index 98a7792a09..ccd19a81de 100644
--- a/src/nvim/move.c
+++ b/src/nvim/move.c
@@ -1020,16 +1020,13 @@ void textpos2screenpos(win_T *wp, pos_T *pos, int *rowp, int *scolp,
   *ecolp = ecol + coloff;
 }
 
-/*
- * Scroll the current window down by "line_count" logical lines.  "CTRL-Y"
- */
-void 
-scrolldown (
-    long line_count,
-    int byfold              /* true: count a closed fold as one line */
-)
+/// Scroll the current window down by "line_count" logical lines.  "CTRL-Y"
+///
+/// @param line_count number of lines to scroll
+/// @param byfold if true, count a closed fold as one line
+bool scrolldown(long line_count, int byfold)
 {
-  int done = 0;                /* total # of physical lines done */
+  int done = 0;                // total # of physical lines done
 
   /* Make sure w_topline is at the first of a sequence of folded lines. */
   (void)hasFolding(curwin->w_topline, &curwin->w_topline, NULL);
@@ -1098,17 +1095,18 @@ scrolldown (
     foldAdjustCursor();
     coladvance(curwin->w_curswant);
   }
+  return moved;
 }
 
-/*
- * Scroll the current window up by "line_count" logical lines.  "CTRL-E"
- */
-void 
-scrollup (
-    long line_count,
-    int byfold              /* true: count a closed fold as one line */
-)
+/// Scroll the current window up by "line_count" logical lines.  "CTRL-E"
+///
+/// @param line_count number of lines to scroll
+/// @param byfold if true, count a closed fold as one line
+bool scrollup(long line_count, int byfold)
 {
+  linenr_T topline = curwin->w_topline;
+  linenr_T botline = curwin->w_botline;
+
   if ((byfold && hasAnyFolding(curwin))
       || curwin->w_p_diff) {
     // count each sequence of folded lines as one logical line
@@ -1151,6 +1149,11 @@ scrollup (
       ~(VALID_WROW|VALID_WCOL|VALID_CHEIGHT|VALID_CROW|VALID_VIRTCOL);
     coladvance(curwin->w_curswant);
   }
+
+  bool moved = topline != curwin->w_topline
+            || botline != curwin->w_botline;
+
+  return moved;
 }
 
 /*