xenia/kakoune
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix scroll_window not ensuring cursor lies on a codepoint start

Browse Source 
Fixes #4839
This commit is contained in:
Maxime Coste 2023-02-14 22:00:12 +11:00
parent 458e3ef20a
commit 0630b4f4f6
4 changed files with 29 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/input_handler.cc
View File

@ -1820,21 +1820,15 @@ void scroll_window(Context& context, LineCount offset, bool mouse_dragging)
SelectionList& selections = context.selections();
Selection& main_selection = selections.main();
const BufferCoord anchor = main_selection.anchor();
const BufferCoord cursor = main_selection.cursor();
const BufferCoordAndTarget cursor = main_selection.cursor();
auto cursor_off = mouse_dragging ? win_pos.line - window.position().line : 0;
auto line = clamp(cursor.line + cursor_off, win_pos.line + scrolloff.line,
win_pos.line + win_dim.line - 1 - scrolloff.line);
line = clamp(line, 0_line, buffer.line_count() - 1);
using std::min; using std::max;
// This is not exactly a clamp, and must be done in this order as
// byte_count_to could return line length
auto col = min(max(cursor.column, buffer[line].byte_count_to(win_pos.column)),
buffer[line].length()-1);
BufferCoord new_cursor = { line, col };
const ColumnCount tabstop = context.options()["tabstop"].get<int>();
auto new_cursor = buffer.offset_coord(cursor, line - cursor.line, tabstop);
BufferCoord new_anchor = (mouse_dragging or new_cursor == cursor) ? anchor : new_cursor;
window.set_position(win_pos);

1
test/regression/4839-scroll-invalid-cursor/cmd Normal file
View File

@ -0,0 +1 @@
l<pagedown>

23
test/regression/4839-scroll-invalid-cursor/in Normal file
View File

@ -0,0 +1,23 @@
ab
😃
😃
😃
😃
😃
😃
😃
😃
😃
😃
😃
😃
😃
😃
😃
😃
😃
😃
😃
😃
😃
😃

2
test/regression/4839-scroll-invalid-cursor/script Normal file
View File

@ -0,0 +1,2 @@
ui_out -ignore 1
ui_out '{ "jsonrpc": "2.0", "method": "draw", "params": [[[{ "face": { "fg": "black", "bg": "white", "underline": "default", "attributes": [] }, "contents": "😃" }, { "face": { "fg": "default", "bg": "default", "underline": "default", "attributes": [] }, "contents": "\u000a" }]], { "fg": "default", "bg": "default", "underline": "default", "attributes": [] }, { "fg": "blue", "bg": "default", "underline": "default", "attributes": [] }] }'