Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 24 additions & 24 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions crates/term/src/grid_emulator.rs
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ struct GridListener {
impl EventListener for GridListener {
fn send_event(&self, event: RioEvent, _window_id: WindowId) {
match event {
RioEvent::Title(title) => {
RioEvent::Title(_, title) => {
*self.osc_title.lock_recover() = Some(title.clone());
let _ = self
.notifications
Expand All @@ -157,7 +157,7 @@ impl EventListener for GridListener {
.notifications
.try_send(GridEvent::CursorBlinkingChanged);
}
RioEvent::Bell => {
RioEvent::Bell(_) => {
let _ = self.notifications.try_send(GridEvent::Bell);
}
RioEvent::Render
Expand Down
8 changes: 1 addition & 7 deletions crates/term/src/pty.rs
Original file line number Diff line number Diff line change
Expand Up @@ -463,7 +463,7 @@ impl RawPtyEventLoop {
let _ = self.pty.set_winsize(WinsizeBuilder::from(size));
}
Ok(PtyCommand::Kill) => {
let _ = terminate_pty(&self.pty);
let _ = self.pty.child.terminate();
}
Ok(PtyCommand::Shutdown) | Err(mpsc::TryRecvError::Disconnected) => return false,
Err(mpsc::TryRecvError::Empty) => return true,
Expand Down Expand Up @@ -565,12 +565,6 @@ impl PendingWrite {
}
}

#[cfg(unix)]
fn terminate_pty(pty: &tty::Pty) -> io::Result<()> {
tty::kill_pid(*pty.child.pid);
Ok(())
}

fn refresh_process_info(
info: &pty_info::PtyInfo,
shared: &Mutex<Shared>,
Expand Down