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

Fix scrolling generating invalid buffer coordinates

Browse Source
This commit is contained in:
Maxime Coste 2016-12-07 00:08:41 +00:00
parent a320dcec28
commit d9679db9b6
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/input_handler.cc
View File

@ -1515,14 +1515,15 @@ void scroll_window(Context& context, LineCount offset)
SelectionList& selections = context.selections(); SelectionList& selections = context.selections();
const BufferCoord cursor = selections.main().cursor(); const BufferCoord cursor = selections.main().cursor();
auto clamp_line = [&](LineCount line) { return clamp(line, 0_line, line_count-1); }; using std::min; using std::max;
auto min_line = clamp_line(win_pos.line + scrolloff.line); auto line = clamp(cursor.line, max(0_line, win_pos.line + scrolloff.line),
auto max_line = clamp_line(win_pos.line + win_dim.line - 1 - scrolloff.line); min(line_count-1, win_pos.line + win_dim.line - 1 - scrolloff.line));
BufferCoord min_coord{min_line, buffer[min_line].byte_count_to(win_pos.column)}; // This is not exactly a clamp, and must be done in this order as
BufferCoord max_coord{max_line, buffer[max_line].byte_count_to(win_pos.column)}; // byte_count_to could return line length
auto col = min(max(cursor.column, buffer[line].byte_count_to(win_pos.column)),
selections = SelectionList{buffer, clamp(cursor, min_coord, max_coord)}; buffer[line].length()-1);
selections = SelectionList{buffer, BufferCoord{line, col}};
window.set_position(win_pos); window.set_position(win_pos);
} }