From 2c4b947e2d676691c0309e71034167e428b9b8f7 Mon Sep 17 00:00:00 2001 From: Erik Kundt Date: Wed, 3 Jan 2024 15:40:33 +0100 Subject: [PATCH] lib: Make global quit event clause configurable --- bin/commands/issue/suite.rs | 3 ++- bin/commands/issue/suite/page.rs | 8 ++++++-- bin/commands/patch/list.rs | 6 +++++- bin/commands/patch/suite.rs | 6 +++++- src/ui/subscription.rs | 4 ++-- 5 files changed, 20 insertions(+), 7 deletions(-) diff --git a/bin/commands/issue/suite.rs b/bin/commands/issue/suite.rs index ae4e975e..8ea2d915 100644 --- a/bin/commands/issue/suite.rs +++ b/bin/commands/issue/suite.rs @@ -10,6 +10,7 @@ use anyhow::Result; use radicle::cob::issue::IssueId; use tuirealm::application::PollStrategy; +use tuirealm::event::Key; use tuirealm::{Application, Frame, NoUserEvent, Sub, SubClause}; use radicle_tui as tui; @@ -309,7 +310,7 @@ impl Tui for App { app.mount( Cid::GlobalListener, global, - vec![Sub::new(subscription::global_clause(), SubClause::Always)], + vec![Sub::new(subscription::quit_clause(Key::Char('q')), SubClause::Always)], )?; Ok(()) diff --git a/bin/commands/issue/suite/page.rs b/bin/commands/issue/suite/page.rs index 924add86..a3a8f27a 100644 --- a/bin/commands/issue/suite/page.rs +++ b/bin/commands/issue/suite/page.rs @@ -4,6 +4,7 @@ use anyhow::Result; use radicle::cob::issue::{Issue, IssueId}; +use tuirealm::event::Key; use tuirealm::{AttrValue, Attribute, Frame, NoUserEvent, State, StateValue, Sub, SubClause}; use radicle_tui as tui; @@ -435,7 +436,10 @@ impl ViewPage for IssuePage { app.remount(Cid::Issue(IssueCid::Form), new_form, vec![])?; app.active(&Cid::Issue(IssueCid::Form))?; - app.unsubscribe(&Cid::GlobalListener, subscription::global_clause())?; + app.unsubscribe( + &Cid::GlobalListener, + subscription::quit_clause(Key::Char('q')), + )?; return Ok(Some(Message::Issue(IssueMessage::Focus(IssueCid::Form)))); } @@ -447,7 +451,7 @@ impl ViewPage for IssuePage { app.subscribe( &Cid::GlobalListener, - Sub::new(subscription::global_clause(), SubClause::Always), + Sub::new(subscription::quit_clause(Key::Char('q')), SubClause::Always), )?; if self.issue.is_none() { diff --git a/bin/commands/patch/list.rs b/bin/commands/patch/list.rs index 1691e7c3..567f5909 100644 --- a/bin/commands/patch/list.rs +++ b/bin/commands/patch/list.rs @@ -12,6 +12,7 @@ use anyhow::Result; use radicle::cob::patch::PatchId; use tuirealm::application::PollStrategy; +use tuirealm::event::Key; use tuirealm::{Application, Frame, NoUserEvent, Sub, SubClause}; use radicle_tui as tui; @@ -194,7 +195,10 @@ impl Tui for App { app.mount( Cid::GlobalListener, global, - vec![Sub::new(subscription::global_clause(), SubClause::Always)], + vec![Sub::new( + subscription::quit_clause(Key::Char('q')), + SubClause::Always, + )], )?; Ok(()) diff --git a/bin/commands/patch/suite.rs b/bin/commands/patch/suite.rs index 4b9773c0..a94eb5d6 100644 --- a/bin/commands/patch/suite.rs +++ b/bin/commands/patch/suite.rs @@ -12,6 +12,7 @@ use anyhow::Result; use radicle::cob::patch::PatchId; use tuirealm::application::PollStrategy; +use tuirealm::event::Key; use tuirealm::{Application, Frame, NoUserEvent, Sub, SubClause}; use radicle_tui as tui; @@ -240,7 +241,10 @@ impl Tui for App { app.mount( Cid::GlobalListener, global, - vec![Sub::new(subscription::global_clause(), SubClause::Always)], + vec![Sub::new( + subscription::quit_clause(Key::Char('q')), + SubClause::Always, + )], )?; Ok(()) diff --git a/src/ui/subscription.rs b/src/ui/subscription.rs index e8a5ef45..cab15d74 100644 --- a/src/ui/subscription.rs +++ b/src/ui/subscription.rs @@ -11,12 +11,12 @@ where }) } -pub fn global_clause() -> SubEventClause +pub fn quit_clause(key: Key) -> SubEventClause where UserEvent: Clone + Eq + PartialEq + PartialOrd, { SubEventClause::Keyboard(KeyEvent { - code: Key::Char('q'), + code: key, modifiers: KeyModifiers::NONE, }) }