pogmommy/zellij
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(atomicity): allow async vte events sending to fail (#67)

Browse source 
* fix(atomicity): allow async vte events sending to fail

* style(format): make rustfmt happy
This commit is contained in:
Aram Drevekenin 2020-11-23 19:31:31 +01:00 • committed by GitHub
parent f88abe6ad8
commit ed590bceda
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/pty_bus.rs
View file

@ -86,14 +86,14 @@ impl VteEventSender {
impl vte::Perform for VteEventSender { impl vte::Perform for VteEventSender {
fn print(&mut self, c: char) { fn print(&mut self, c: char) {
self.sender let _ = self
.send(ScreenInstruction::Pty(self.id, VteEvent::Print(c))) .sender
.unwrap(); .send(ScreenInstruction::Pty(self.id, VteEvent::Print(c)));
} }
fn execute(&mut self, byte: u8) { fn execute(&mut self, byte: u8) {
self.sender let _ = self
.send(ScreenInstruction::Pty(self.id, VteEvent::Execute(byte))) .sender
.unwrap(); .send(ScreenInstruction::Pty(self.id, VteEvent::Execute(byte)));
} }
fn hook(&mut self, params: &[i64], intermediates: &[u8], ignore: bool, c: char) { fn hook(&mut self, params: &[i64], intermediates: &[u8], ignore: bool, c: char) {
@ -101,26 +101,26 @@ impl vte::Perform for VteEventSender {
let intermediates = intermediates.iter().copied().collect(); let intermediates = intermediates.iter().copied().collect();
let instruction = let instruction =
ScreenInstruction::Pty(self.id, VteEvent::Hook(params, intermediates, ignore, c)); ScreenInstruction::Pty(self.id, VteEvent::Hook(params, intermediates, ignore, c));
self.sender.send(instruction).unwrap(); let _ = self.sender.send(instruction);
} }
fn put(&mut self, byte: u8) { fn put(&mut self, byte: u8) {
self.sender let _ = self
.send(ScreenInstruction::Pty(self.id, VteEvent::Put(byte))) .sender
.unwrap(); .send(ScreenInstruction::Pty(self.id, VteEvent::Put(byte)));
} }
fn unhook(&mut self) { fn unhook(&mut self) {
self.sender let _ = self
.send(ScreenInstruction::Pty(self.id, VteEvent::Unhook)) .sender
.unwrap(); .send(ScreenInstruction::Pty(self.id, VteEvent::Unhook));
} }
fn osc_dispatch(&mut self, params: &[&[u8]], bell_terminated: bool) { fn osc_dispatch(&mut self, params: &[&[u8]], bell_terminated: bool) {
let params = params.iter().map(|p| p.to_vec()).collect(); let params = params.iter().map(|p| p.to_vec()).collect();
let instruction = let instruction =
ScreenInstruction::Pty(self.id, VteEvent::OscDispatch(params, bell_terminated)); ScreenInstruction::Pty(self.id, VteEvent::OscDispatch(params, bell_terminated));
self.sender.send(instruction).unwrap(); let _ = self.sender.send(instruction);
} }
fn csi_dispatch(&mut self, params: &[i64], intermediates: &[u8], ignore: bool, c: char) { fn csi_dispatch(&mut self, params: &[i64], intermediates: &[u8], ignore: bool, c: char) {
@ -130,14 +130,14 @@ impl vte::Perform for VteEventSender {
self.id, self.id,
VteEvent::CsiDispatch(params, intermediates, ignore, c), VteEvent::CsiDispatch(params, intermediates, ignore, c),
); );
self.sender.send(instruction).unwrap(); let _ = self.sender.send(instruction);
} }
fn esc_dispatch(&mut self, intermediates: &[u8], ignore: bool, byte: u8) { fn esc_dispatch(&mut self, intermediates: &[u8], ignore: bool, byte: u8) {
let intermediates = intermediates.iter().copied().collect(); let intermediates = intermediates.iter().copied().collect();
let instruction = let instruction =
ScreenInstruction::Pty(self.id, VteEvent::EscDispatch(intermediates, ignore, byte)); ScreenInstruction::Pty(self.id, VteEvent::EscDispatch(intermediates, ignore, byte));
self.sender.send(instruction).unwrap(); let _ = self.sender.send(instruction);
} }
} }