wez/wezterm
1
1
Fork 0
mirror of https://github.com/wez/wezterm.git synced 2024-12-27 15:37:29 +03:00
Code Issues Projects Releases Wiki Activity

exec_domains: soft-bind to the config definition

Browse Source 
This allows config file changes to be reflected
This commit is contained in:
Wez Furlong 2022-07-08 20:36:40 -07:00
parent 93c5a9b3fb
commit 0899282ea6
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
mux/src/domain.rs
View File

@ -175,7 +175,6 @@ pub struct LocalDomain {
id: DomainId,
name: String,
wsl: Option<WslDomain>,
exec_domain: Option<ExecDomain>,
}
impl LocalDomain {
@ -183,6 +182,14 @@ impl LocalDomain {
Ok(Self::with_pty_system(name, native_pty_system()))
}
fn resolve_exec_domain(&self) -> Option<ExecDomain> {
config::configuration()
.exec_domains
.iter()
.find(|ed| ed.name == self.name)
.cloned()
}
pub fn with_pty_system(name: &str, pty_system: Box<dyn PtySystem>) -> Self {
let id = alloc_domain_id();
Self {
@ -190,7 +197,6 @@ impl LocalDomain {
id,
name: name.to_string(),
wsl: None,
exec_domain: None,
}
}
@ -201,9 +207,7 @@ impl LocalDomain {
}
pub fn new_exec_domain(exec_domain: ExecDomain) -> anyhow::Result<Self> {
let mut dom = Self::new(&exec_domain.name)?;
dom.exec_domain.replace(exec_domain);
Ok(dom)
Self::new(&exec_domain.name)
}
#[cfg(unix)]
@ -261,7 +265,7 @@ impl LocalDomain {
cmd.clear_cwd();
*cmd.get_argv_mut() = argv;
} else if let Some(ed) = &self.exec_domain {
} else if let Some(ed) = self.resolve_exec_domain() {
let mut args = vec![];
let mut set_environment_variables = HashMap::new();
for arg in cmd.get_argv() {
@ -439,7 +443,7 @@ impl Domain for LocalDomain {
}
async fn domain_label(&self) -> String {
if let Some(ed) = &self.exec_domain {
if let Some(ed) = self.resolve_exec_domain() {
match &ed.label {
Some(ValueOrFunc::Value(wezterm_dynamic::Value::String(s))) => s.to_string(),
Some(ValueOrFunc::Func(label_func)) => {