kevin/neovim
1
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2024-12-19 18:55:14 -07:00
Code Issues Packages Projects Releases Wiki Activity

fix(ui): fix edge case around flushing

Browse Source 
ui_flush_buf() doesn't know about `lenpos` so `remote_ui_raw_line`
needs to always handle it before flushing
This commit is contained in:
bfredl 2024-03-15 11:31:41 +01:00
parent f1c9228bba
commit e0707d3529
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/nvim/api/ui.c
View File

@ -533,7 +533,8 @@ static void ui_alloc_buf(RemoteUI *ui)
static void prepare_call(RemoteUI *ui, const char *name) static void prepare_call(RemoteUI *ui, const char *name)
{ {
if (ui->packer.startptr && BUF_POS(ui) > UI_BUF_SIZE - EVENT_BUF_SIZE) { if (ui->packer.startptr
&& (BUF_POS(ui) > UI_BUF_SIZE - EVENT_BUF_SIZE || ui->ncells_pending >= 500)) {
ui_flush_buf(ui); ui_flush_buf(ui);
} }
@ -781,11 +782,14 @@ void remote_ui_raw_line(RemoteUI *ui, Integer grid, Integer row, Integer startco
for (size_t i = 0; i < ncells; i++) { for (size_t i = 0; i < ncells; i++) {
repeat++; repeat++;
if (i == ncells - 1 || attrs[i] != attrs[i + 1] || chunk[i] != chunk[i + 1]) { if (i == ncells - 1 || attrs[i] != attrs[i + 1] || chunk[i] != chunk[i + 1]) {
if (UI_BUF_SIZE - BUF_POS(ui) < 2 * (1 + 2 + sizeof(schar_T) + 5 + 5) + 1) { if (UI_BUF_SIZE - BUF_POS(ui) < 2 * (1 + 2 + sizeof(schar_T) + 5 + 5) + 1
|| ui->ncells_pending >= 500) {
// close to overflowing the redraw buffer. finish this event, // close to overflowing the redraw buffer. finish this event,
// flush, and start a new "grid_line" event at the current position. // flush, and start a new "grid_line" event at the current position.
// For simplicity leave place for the final "clear" element // For simplicity leave place for the final "clear" element
// as well, hence the factor of 2 in the check. // as well, hence the factor of 2 in the check.
// Also if there is a lot of packed cells, pass them of to the UI to
// let it start processing them
mpack_w2(&lenpos, nelem); mpack_w2(&lenpos, nelem);
// We only ever set the wrap field on the final "grid_line" event for the line. // We only ever set the wrap field on the final "grid_line" event for the line.
@ -831,11 +835,6 @@ void remote_ui_raw_line(RemoteUI *ui, Integer grid, Integer row, Integer startco
} }
mpack_w2(&lenpos, nelem); mpack_w2(&lenpos, nelem);
mpack_bool(buf, flags & kLineFlagWrap); mpack_bool(buf, flags & kLineFlagWrap);
if (ui->ncells_pending > 500) {
// pass off cells to UI to let it start processing them
ui_flush_buf(ui);
}
} else { } else {
for (int i = 0; i < endcol - startcol; i++) { for (int i = 0; i < endcol - startcol; i++) {
remote_ui_cursor_goto(ui, row, startcol + i); remote_ui_cursor_goto(ui, row, startcol + i);