IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:9.0.1742: wrong curswant when clicking on second cell of double-width char (#24789)

Browse Source 
Problem:  Wrong curswant when clicking and the second cell of a
          double-width char.
Solution: Don't copy virtcol of the first char to the second one.

closes: vim/vim#12842

9994160bfe
This commit is contained in:
zeertzjq 2023-08-19 19:40:26 +08:00 committed by GitHub
parent d9b0946609
commit c8e58bf09c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/nvim/grid.c
View File

@ -634,7 +634,7 @@ void grid_put_linebuf(ScreenGrid *grid, int row, int coloff, int endcol, int cle
grid->vcols[off_to] = linebuf_vcol[off_from]; grid->vcols[off_to] = linebuf_vcol[off_from];
if (char_cells == 2) { if (char_cells == 2) {
grid->vcols[off_to + 1] = linebuf_vcol[off_from]; grid->vcols[off_to + 1] = linebuf_vcol[off_from + 1];
} }
off_to += (size_t)char_cells; off_to += (size_t)char_cells;

25
test/old/testdir/test_normal.vim
View File

@ -4092,4 +4092,29 @@ func Test_normal_click_on_ctrl_char()
let &mouse = save_mouse let &mouse = save_mouse
endfunc endfunc
" Test clicking on a double-width character in Normal mode
func Test_normal_click_on_double_width_char()
let save_mouse = &mouse
set mouse=a
new
call setline(1, "口口")
redraw
call Ntest_setmouse(1, 1)
call feedkeys("\<LeftMouse>", 'xt')
call assert_equal([0, 1, 1, 0, 1], getcurpos())
call Ntest_setmouse(1, 2)
call feedkeys("\<LeftMouse>", 'xt')
call assert_equal([0, 1, 1, 0, 2], getcurpos())
call Ntest_setmouse(1, 3)
call feedkeys("\<LeftMouse>", 'xt')
call assert_equal([0, 1, 4, 0, 3], getcurpos())
call Ntest_setmouse(1, 4)
call feedkeys("\<LeftMouse>", 'xt')
call assert_equal([0, 1, 4, 0, 4], getcurpos())
bwipe!
let &mouse = save_mouse
endfunc
" vim: shiftwidth=2 sts=2 expandtab " vim: shiftwidth=2 sts=2 expandtab