Mercurial > vim
view src/libvterm/t/15state_mode.test @ 34441:84a5cafeb34c v9.1.0140
patch 9.1.0140: cursor on wrong row after 1 char 'below' virtual text when EOL is shown
Commit: https://github.com/vim/vim/commit/da0c9137d1ec96f4d79b818502d2f921a21f710e
Author: Dylan Thacker-Smith <dylan.ah.smith@gmail.com>
Date: Tue Feb 27 20:25:10 2024 +0100
patch 9.1.0140: cursor on wrong row after 1 char 'below' virtual text when EOL is shown
Problem: The cursor screen row was incorrectly being calculated when the
cursor follows a 1 character text_align 'below' virtual text line,
resulting in the cursor being shown on the wrong line.
This was caused by a cell size of 2 instead of 1 being used for the EOL
character, which propagated to the calculation of space for putting the
'below' virtual text on its own line. (rickhowe)
Solution: Fix the size used for the EOL character in calculating the
cursor's screen position (Dylan Thacker-Smith)
fixes: #11959
related: #12028
closes: #14096
Signed-off-by: Dylan Thacker-Smith <dylan.ah.smith@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Tue, 27 Feb 2024 20:30:03 +0100 |
parents | b8299e742f41 |
children |
line wrap: on
line source
INIT UTF8 1 WANTSTATE gme !Insert/Replace Mode RESET erase 0..25,0..80 ?cursor = 0,0 PUSH "AC\e[DB" putglyph 0x41 1 0,0 putglyph 0x43 1 0,1 putglyph 0x42 1 0,1 PUSH "\e[4h" PUSH "\e[G" PUSH "AC\e[DB" moverect 0..1,0..79 -> 0..1,1..80 erase 0..1,0..1 putglyph 0x41 1 0,0 moverect 0..1,1..79 -> 0..1,2..80 erase 0..1,1..2 putglyph 0x43 1 0,1 moverect 0..1,1..79 -> 0..1,2..80 erase 0..1,1..2 putglyph 0x42 1 0,1 !Insert mode only happens once for UTF-8 combining PUSH "e" moverect 0..1,2..79 -> 0..1,3..80 erase 0..1,2..3 putglyph 0x65 1 0,2 PUSH "\xCC\x81" putglyph 0x65,0x301 1 0,2 !Newline/Linefeed mode RESET erase 0..25,0..80 ?cursor = 0,0 PUSH "\e[5G\n" ?cursor = 1,4 PUSH "\e[20h" PUSH "\e[5G\n" ?cursor = 2,0 !DEC origin mode RESET erase 0..25,0..80 ?cursor = 0,0 PUSH "\e[5;15r" PUSH "\e[H" ?cursor = 0,0 PUSH "\e[3;3H" ?cursor = 2,2 PUSH "\e[?6h" PUSH "\e[H" ?cursor = 4,0 PUSH "\e[3;3H" ?cursor = 6,2 !DECRQM on DECOM PUSH "\e[?6h" PUSH "\e[?6\$p" output "\e[?6;1\$y" PUSH "\e[?6l" PUSH "\e[?6\$p" output "\e[?6;2\$y" !Origin mode with DECSLRM PUSH "\e[?6h" PUSH "\e[?69h" PUSH "\e[20;60s" PUSH "\e[H" ?cursor = 4,19 PUSH "\e[?69l" !Origin mode bounds cursor to scrolling region PUSH "\e[H" PUSH "\e[10A" ?cursor = 4,0 PUSH "\e[20B" ?cursor = 14,0 !Origin mode without scroll region PUSH "\e[?6l" PUSH "\e[r\e[?6h" ?cursor = 0,0