Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2024-12-31 23:28:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

Prevent queued-up flash() calls from blocking input

Browse source 
Closes #8610.
This commit is contained in:
Mahmoud Al-Qudsi 2022-01-31 16:25:42 -06:00
parent e575a63232
commit 05cdacc8d4
1 changed files with 17 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/reader.cpp
View file

@ -37,6 +37,7 @@
#include <algorithm> #include <algorithm>
#include <atomic> #include <atomic>
#include <chrono>
#include <csignal> #include <csignal>
#include <cwchar> #include <cwchar>
#include <functional> #include <functional>
@ -628,6 +629,9 @@ class reader_data_t : public std::enable_shared_from_this<reader_data_t> {
/// Whether this is the first prompt. /// Whether this is the first prompt.
bool first_prompt{true}; bool first_prompt{true};
/// The time when the last flash() completed
std::chrono::time_point<std::chrono::steady_clock> last_flash;
/// The representation of the current screen contents. /// The representation of the current screen contents.
screen_t screen; screen_t screen;
@ -1879,6 +1883,15 @@ void reader_data_t::select_completion_in_direction(selection_motion_t dir) {
/// Flash the screen. This function changes the color of the current line momentarily. /// Flash the screen. This function changes the color of the current line momentarily.
void reader_data_t::flash() { void reader_data_t::flash() {
// Multiple flashes may be enqueued by keypress repeat events and can pile up to cause a
// significant delay in processing future input while all the flash() calls complete, as we
// effectively sleep for 100ms each go. See #8610.
auto now = std::chrono::steady_clock::now();
if ((now - last_flash) < std::chrono::milliseconds{50}) {
last_flash = now;
return;
}
struct timespec pollint; struct timespec pollint;
editable_line_t *el = &command_line; editable_line_t *el = &command_line;
layout_data_t data = make_layout_data(); layout_data_t data = make_layout_data();
@ -1901,6 +1914,10 @@ void reader_data_t::flash() {
data.colors = std::move(saved_colors); data.colors = std::move(saved_colors);
this->rendered_layout = std::move(data); this->rendered_layout = std::move(data);
paint_layout(L"unflash"); paint_layout(L"unflash");
// Save the time we stopped flashing as the time of the most recent flash. We can't just
// increment the old `now` value because the sleep is non-deterministic.
last_flash = std::chrono::steady_clock::now();
} }
maybe_t<source_range_t> reader_data_t::get_selection() const { maybe_t<source_range_t> reader_data_t::get_selection() const {