PolytreeDE
/
alacritty
mirror of https://github.com/alacritty/alacritty.git
1
0
Fork 0
Code Releases Activity

Fix bug where event loop could get stuck reading 

One symptom of this bug was being unable to send C-c during `cat
/dev/urandom`.

cc #271
This commit is contained in:
Joe Wilm 2017-01-10 10:27:25 -08:00 committed by Joe Wilm
parent dfb1b3bb5c
commit a7fc46afce
1 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/event_loop.rs
View File

@ -163,9 +163,13 @@ impl<Io> EventLoop<Io>
self.tx.clone()
}
#[inline]
fn channel_event(&mut self, state: &mut State) {
// Drain the channel
//
// Returns true if items were received
fn drain_recv_channel(&self, state: &mut State) -> bool {
let mut received_item = false;
while let Ok(msg) = self.rx.try_recv() {
received_item = true;
match msg {
Msg::Input(input) => {
state.write_list.push_back(input);
@ -173,6 +177,13 @@ impl<Io> EventLoop<Io>
}
}
received_item
}
#[inline]
fn channel_event(&mut self, state: &mut State) {
self.drain_recv_channel(state);
self.poll.reregister(
&self.rx, CHANNEL,
Ready::readable(),
@ -218,6 +229,20 @@ impl<Io> EventLoop<Io>
if !terminal.dirty {
self.display.notify();
terminal.dirty = true;
// Break for writing
//
// Want to prevent case where reading always returns
// data and sequences like `C-c` cannot be sent.
//
// Doing this check in !terminal.dirty will prevent the
// condition from being checked overzealously.
if state.writing.is_some()
|| !state.write_list.is_empty()
|| self.drain_recv_channel(state)
{
break;
}
}
},
Err(err) => {