h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-06-29 14:21:24 -03:00
Code Issues Packages Projects Releases Wiki Activity

Remove redraw coalescing logic

Browse Source 
Prior to this change, if we saw more than one repaint readline command in
a row, we would try to ignore the second one. However this was never the
right thing to do since sometimes we really do need to repaint twice in a
row (e.g. the user hits Ctrl+L twice). Previously we were saved by the
buginess of this mechanism but with the repainting refactoring we see
missing redraws.

Remove the coalescing logic and add a test. Fixes #7280.
This commit is contained in:
ridiculousfish
2020-08-24 13:19:57 -07:00
parent ac053c02f3
commit 47480b2dbd
3 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/reader.cpp
View File

@@ -2645,9 +2645,6 @@ struct readline_loop_state_t {
/// Maximum number of characters to read.
size_t nchars{std::numeric_limits<size_t>::max()};
/// \return whether the last readline command was a repaint.
bool last_was_repaint() const { return last_cmd && *last_cmd == readline_cmd_t::repaint; }
};
/// Read normal characters, inserting them into the command line.
@@ -2767,12 +2764,10 @@ void reader_data_t::handle_readline_command(readline_cmd_t c, readline_loop_stat
}
case rl::force_repaint:
case rl::repaint: {
if (force_exec_prompt_and_repaint || !rls.last_was_repaint()) {
exec_prompt();
s_reset_line(&screen, true /* redraw prompt */);
this->layout_and_repaint(L"readline");
force_exec_prompt_and_repaint = false;
}
exec_prompt();
s_reset_line(&screen, true /* redraw prompt */);
this->layout_and_repaint(L"readline");
force_exec_prompt_and_repaint = false;
break;
}
case rl::complete: