patch 9.0.1923: curswant wrong on click with 've' and 'wrap' set
Problem: curswant wrong on click with 've' and 'wrap' set
Solution: Add w_leftcol to mouse click column.
closes: #13142
Signed-off-by: Christian Brabandt <cb@256bit.org>
Co-authored-by: zeertzjq <zeertzjq@outlook.com>
diff --git a/src/drawline.c b/src/drawline.c
index 6f90446..95ea3f0 100644
--- a/src/drawline.c
+++ b/src/drawline.c
@@ -3852,7 +3852,14 @@
else
ScreenAttrs[wlv.off] = wlv.char_attr;
- ScreenCols[wlv.off] = wlv.vcol;
+ if (wlv.draw_state > WL_NR
+#ifdef FEAT_DIFF
+ && wlv.filler_todo <= 0
+#endif
+ )
+ ScreenCols[wlv.off] = wlv.vcol;
+ else
+ ScreenCols[wlv.off] = -1;
if (has_mbyte && (*mb_char2cells)(mb_c) > 1)
{
@@ -3865,19 +3872,21 @@
else
// DBCS: Put second byte in the second screen char.
ScreenLines[wlv.off] = mb_c & 0xff;
+
if (wlv.draw_state > WL_NR
#ifdef FEAT_DIFF
&& wlv.filler_todo <= 0
#endif
)
- ++wlv.vcol;
+ ScreenCols[wlv.off] = ++wlv.vcol;
+ else
+ ScreenCols[wlv.off] = -1;
+
// When "wlv.tocol" is halfway a character, set it to the end
// of the character, otherwise highlighting won't stop.
if (wlv.tocol == wlv.vcol)
++wlv.tocol;
- ScreenCols[wlv.off] = wlv.vcol;
-
#ifdef FEAT_RIGHTLEFT
if (wp->w_p_rl)
{