vim: src/move.c comparison

comparison src/move.c @ 31577:3c21865e8068 v9.0.1121

patch 9.0.1121: cursor positioning and display problems with 'smoothscroll' Commit: https://github.com/vim/vim/commit/db4d88c2adfe8f8122341ac9d6cae27ef78451c8 Author: Bram Moolenaar <Bram@vim.org> Date: Sat Dec 31 15:13:22 2022 +0000 patch 9.0.1121: cursor positioning and display problems with 'smoothscroll' Problem: Cursor positioning and display problems with 'smoothscroll' and using "zt", "zb" or "zz". Solution: Adjust computations and conditions. (Yee Cheng Chin, closes #11764)

author	Bram Moolenaar <Bram@vim.org>
date	Sat, 31 Dec 2022 16:15:03 +0100
parents	0c0b78aa7ae3
children	238ca27dbfd2

comparison

equal deleted inserted replaced

-:1ae87829a0dc
+:3c21865e8068
 // account for it.  See wlv_screen_line().
 if (*get_showbreak_value(curwin) != NUL)
 	return 0;
 #endif
 return extra2 > 3 ? 0 : 3 - extra2;
+}
+/*
+* Calculates the skipcol offset for window "wp" given how many
+* physical lines we want to scroll down.
+*/
+static int
+skipcol_from_plines(win_T *wp, int plines_off)
+{
+int width1 = wp->w_width - win_col_off(wp);
+int skipcol = 0;
+if (plines_off > 0)
+	skipcol += width1;
+if (plines_off > 1)
+	skipcol += (width1 + win_col_off2(wp)) * (plines_off - 1);
+return skipcol;
 }
 /*
 * Set curwin->s_skipcol to zero and redraw later if needed.
 */
 * a (wrapped) text line.  Uses and sets "lp->fill".
 * Returns the height of the added line in "lp->height".
 * Lines above the first one are incredibly high: MAXCOL.
 */
 static void
-topline_back(lineoff_T *lp)
+topline_back_winheight(
+lineoff_T	*lp,
+int		winheight)	// when TRUE limit to window height
 {
 #ifdef FEAT_DIFF
 if (lp->fill < diff_check_fill(curwin, lp->lnum))
 {
 	// Add a filler line.
 	    if (hasFolding(lp->lnum, &lp->lnum, NULL))
 	    // Add a closed fold
 	    lp->height = 1;
 	else
 #endif
-	    lp->height = PLINES_NOFILL(lp->lnum);
+	    lp->height = PLINES_WIN_NOFILL(curwin, lp->lnum, winheight);
 }
 }
+static void
+topline_back(lineoff_T *lp)
+{
+topline_back_winheight(lp, TRUE);
+}
 /*
 * Add one line below "lp->lnum".  This can be a filler line, a closed fold or
 * a (wrapped) text line.  Uses and sets "lp->fill".
 * Returns the height of the added line in "lp->height".
 	    // count one logical line for a sequence of folded lines
 	    i = 1;
 	else
 #endif
 	    i = PLINES_NOFILL(top);
+	if (top < curwin->w_topline)
+	    scrolled += i;
+	// If scrolling is needed, scroll at least 'sj' lines.
+	if ((new_topline >= curwin->w_topline || scrolled > min_scroll)
+		&& extra >= off)
+	    break;
 	used += i;
 	if (extra + i <= off && bot < curbuf->b_ml.ml_line_count)
 	{
 #ifdef FEAT_FOLDING
 	    if (hasFolding(bot, NULL, &bot))
 	    else
 #endif
 		used += plines(bot);
 	}
 	if (used > curwin->w_height)
-	    break;
-	if (top < curwin->w_topline)
-	    scrolled += i;
-	/*
-	 * If scrolling is needed, scroll at least 'sj' lines.
-	 */
-	if ((new_topline >= curwin->w_topline || scrolled > min_scroll)
-		&& extra >= off)
 	    break;
 	extra += i;
 	new_topline = top;
 	--top;
 int		min_scrolled = 1;
 int		extra = 0;
 int		i;
 linenr_T	line_count;
 linenr_T	old_topline = curwin->w_topline;
+int		old_skipcol = curwin->w_skipcol;
 lineoff_T	loff;
 lineoff_T	boff;
 #ifdef FEAT_DIFF
 int		old_topfill = curwin->w_topfill;
 int		fill_below_window;
 long	so = get_scrolloff_value();
 cln = curwin->w_cursor.lnum;
 if (set_topbot)
 {
+	int set_skipcol = FALSE;
 	used = 0;
 	curwin->w_botline = cln + 1;
 #ifdef FEAT_DIFF
 	loff.fill = 0;
 #endif
 	for (curwin->w_topline = curwin->w_botline;
 		curwin->w_topline > 1;
 		curwin->w_topline = loff.lnum)
 	{
 	    loff.lnum = curwin->w_topline;
-	    topline_back(&loff);
+	    topline_back_winheight(&loff, FALSE);
-	    if (loff.height == MAXCOL || used + loff.height > curwin->w_height)
+	    if (loff.height == MAXCOL)
 		break;
+	    if (used + loff.height > curwin->w_height)
+	    {
+		if (curwin->w_p_sms && curwin->w_p_wrap)
+		{
+		    // 'smoothscroll' and 'wrap' are set.  The above line is
+		    // too long to show in its entirety, so we show just a part
+		    // of it.
+		    if (used < curwin->w_height)
+		    {
+			int plines_offset = used + loff.height
+							    - curwin->w_height;
+			used = curwin->w_height;
+#ifdef FEAT_DIFF
+			curwin->w_topfill = loff.fill;
+#endif
+			curwin->w_topline = loff.lnum;
+			curwin->w_skipcol = skipcol_from_plines(
+							curwin, plines_offset);
+			set_skipcol = TRUE;
+		    }
+		}
+		break;
+	    }
 	    used += loff.height;
 #ifdef FEAT_DIFF
 	    curwin->w_topfill = loff.fill;
 #endif
 	}
 	curwin->w_valid |= VALID_BOTLINE|VALID_BOTLINE_AP;
 	if (curwin->w_topline != old_topline
 #ifdef FEAT_DIFF
 		|| curwin->w_topfill != old_topfill
 #endif
-		)
+		|| set_skipcol
+		|| curwin->w_skipcol != 0)
+	{
 	    curwin->w_valid &= ~(VALID_WROW|VALID_CROW);
+	    if (set_skipcol)
+		redraw_later(UPD_NOT_VALID);
+	    else
+		reset_skipcol();
+	}
 }
 else
 	validate_botline();
 // The lines of the cursor line itself are always used.
 /*
 * If topline didn't change we need to restore w_botline and w_empty_rows
 * (we changed them).
 * If topline did change, update_screen() will set botline.
 */
-if (curwin->w_topline == old_topline && set_topbot)
+if (curwin->w_topline == old_topline
+	    && curwin->w_skipcol == old_skipcol
+	    && set_topbot)
 {
 	curwin->w_botline = old_botline;
 	curwin->w_empty_rows = old_empty_rows;
 	curwin->w_valid = old_valid;
 }
 void
 scroll_cursor_halfway(int atend)
 {
 int		above = 0;
 linenr_T	topline;
+colnr_T	skipcol = 0;
+int		set_skipcol = FALSE;
 #ifdef FEAT_DIFF
 int		topfill = 0;
 #endif
 int		below = 0;
 int		used;
 boff.fill = 0;
 #else
 used = plines(loff.lnum);
 #endif
 topline = loff.lnum;
+int half_height = 0;
+int smooth_scroll = FALSE;
+if (curwin->w_p_sms && curwin->w_p_wrap)
+{
+	// 'smoothscroll' and 'wrap' are set
+	smooth_scroll = TRUE;
+	half_height = (curwin->w_height - used) / 2;
+	used = 0;
+}
 while (topline > 1)
 {
+	// If using smoothscroll, we can precisely scroll to the
+	// exact point where the cursor is halfway down the screen.
+	if (smooth_scroll)
+	{
+	    topline_back_winheight(&loff, FALSE);
+	    if (loff.height == MAXCOL)
+		break;
+	    else
+		used += loff.height;
+	    if (used > half_height)
+	    {
+		if (used - loff.height < half_height)
+		{
+		    int plines_offset = used - half_height;
+		    loff.height -= plines_offset;
+		    used = half_height;
+		    topline = loff.lnum;
+#ifdef FEAT_DIFF
+		    topfill = loff.fill;
+#endif
+		    skipcol = skipcol_from_plines(curwin, plines_offset);
+		    set_skipcol = TRUE;
+		}
+		break;
+	    }
+	    topline = loff.lnum;
+#ifdef FEAT_DIFF
+	    topfill = loff.fill;
+#endif
+	    continue;
+	}
+	// If not using smoothscroll, we have to iteratively find how many
+	// lines to scroll down to roughly fit the cursor.
+	// This may not be right in the middle if the lines' physical height >
+	// 1 (e.g. 'wrap' is on).
 	if (below <= above)	    // add a line below the cursor first
 	{
 	    if (boff.lnum < curbuf->b_ml.ml_line_count)
 	    {
 		botline_forw(&boff);
 	}
 }
 #ifdef FEAT_FOLDING
 if (!hasFolding(topline, &curwin->w_topline, NULL))
 #endif
-	curwin->w_topline = topline;
+{
+	if (curwin->w_topline != topline
+		|| set_skipcol
+		|| curwin->w_skipcol != 0)
+	{
+	    curwin->w_topline = topline;
+	    if (set_skipcol)
+	    {
+		curwin->w_skipcol = skipcol;
+		redraw_later(UPD_NOT_VALID);
+	    }
+	    else
+		reset_skipcol();
+	}
+}
 #ifdef FEAT_DIFF
 curwin->w_topfill = topfill;
 if (old_topline > curwin->w_topline + curwin->w_height)
 	curwin->w_botfill = FALSE;
 check_topfill(curwin, FALSE);

Mercurial > vim

comparison src/move.c @ 31577:3c21865e8068 v9.0.1121