leyoda/cosmic-terminal
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use unbounded channel to prevent deadlock

Browse source
This commit is contained in:
Jeremy Soller 2024-10-29 18:19:23 -06:00
parent 5785ffdcbd
commit eba2eb38b7
No known key found for this signature in database
GPG key ID: D02FD439211AF56F
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/main.rs
View file

@ -352,7 +352,7 @@ pub enum Message {
TabNext, TabNext,
TabPrev, TabPrev,
TermEvent(pane_grid::Pane, segmented_button::Entity, TermEvent), TermEvent(pane_grid::Pane, segmented_button::Entity, TermEvent),
TermEventTx(mpsc::Sender<(pane_grid::Pane, segmented_button::Entity, TermEvent)>), TermEventTx(mpsc::UnboundedSender<(pane_grid::Pane, segmented_button::Entity, TermEvent)>),
ToggleContextPage(ContextPage), ToggleContextPage(ContextPage),
UpdateDefaultProfile((bool, ProfileId)), UpdateDefaultProfile((bool, ProfileId)),
UseBrightBold(bool), UseBrightBold(bool),
@ -411,7 +411,7 @@ pub struct App {
find: bool, find: bool,
find_search_id: widget::Id, find_search_id: widget::Id,
find_search_value: String, find_search_value: String,
term_event_tx_opt: Option<mpsc::Sender<(pane_grid::Pane, segmented_button::Entity, TermEvent)>>, term_event_tx_opt: Option<mpsc::UnboundedSender<(pane_grid::Pane, segmented_button::Entity, TermEvent)>>,
startup_options: Option<tty::Options>, startup_options: Option<tty::Options>,
term_config: term::Config, term_config: term::Config,
color_scheme_errors: Vec<String>, color_scheme_errors: Vec<String>,
@ -2791,7 +2791,7 @@ impl Application for App {
Subscription::run_with_id( Subscription::run_with_id(
TypeId::of::<TerminalEventSubscription>(), TypeId::of::<TerminalEventSubscription>(),
stream::channel(100, |mut output| async move { stream::channel(100, |mut output| async move {
let (event_tx, mut event_rx) = mpsc::channel(100); let (event_tx, mut event_rx) = mpsc::unbounded_channel();
output.send(Message::TermEventTx(event_tx)).await.unwrap(); output.send(Message::TermEventTx(event_tx)).await.unwrap();
while let Some((pane, entity, event)) = event_rx.recv().await { while let Some((pane, entity, event)) = event_rx.recv().await {

6
src/terminal.rs
View file

@ -85,13 +85,13 @@ impl From<Size> for WindowSize {
pub struct EventProxy( pub struct EventProxy(
pane_grid::Pane, pane_grid::Pane,
segmented_button::Entity, segmented_button::Entity,
mpsc::Sender<(pane_grid::Pane, segmented_button::Entity, Event)>, mpsc::UnboundedSender<(pane_grid::Pane, segmented_button::Entity, Event)>,
); );
impl EventListener for EventProxy { impl EventListener for EventProxy {
fn send_event(&self, event: Event) { fn send_event(&self, event: Event) {
//TODO: handle error //TODO: handle error
let _ = self.2.blocking_send((self.0, self.1, event)); let _ = self.2.send((self.0, self.1, event));
} }
} }
@ -221,7 +221,7 @@ impl Terminal {
pub fn new( pub fn new(
pane: pane_grid::Pane, pane: pane_grid::Pane,
entity: segmented_button::Entity, entity: segmented_button::Entity,
event_tx: mpsc::Sender<(pane_grid::Pane, segmented_button::Entity, Event)>, event_tx: mpsc::UnboundedSender<(pane_grid::Pane, segmented_button::Entity, Event)>,
config: Config, config: Config,
options: Options, options: Options,
app_config: &AppConfig, app_config: &AppConfig,