wez/wezterm
1
1
Fork 0
mirror of https://github.com/wez/wezterm.git synced 2024-11-10 06:34:17 +03:00
Code Issues Projects Releases Wiki Activity

ssh: allow setting SshDomain::use_multiplexer = false

Browse Source 
Currently has no effect.

refs: #1456
This commit is contained in:
Wez Furlong 2022-01-09 13:13:54 -07:00
parent 328aaaefd2
commit f69177b022
4 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
config/src/config.rs
View File

@ -17,8 +17,8 @@ use crate::unix::UnixDomain;
use crate::wsl::WslDomain;
use crate::{
de_number, default_config_with_overrides_applied, default_one_point_oh,
default_one_point_oh_f64, make_lua_context, LoadedConfig, CONFIG_DIR, CONFIG_FILE_OVERRIDE,
CONFIG_OVERRIDES, CONFIG_SKIP, HOME_DIR,
default_one_point_oh_f64, default_true, make_lua_context, LoadedConfig, CONFIG_DIR,
CONFIG_FILE_OVERRIDE, CONFIG_OVERRIDES, CONFIG_SKIP, HOME_DIR,
};
use anyhow::Context;
use luahelper::impl_lua_conversion;
@ -1050,10 +1050,6 @@ fn default_use_ime() -> bool {
}
}
fn default_true() -> bool {
true
}
fn default_cursor_blink_rate() -> u64 {
800
}

4
config/src/lib.rs
View File

@ -706,3 +706,7 @@ fn default_one_point_oh_f64() -> f64 {
fn default_one_point_oh() -> f32 {
1.0
}
fn default_true() -> bool {
true
}

7
config/src/ssh.rs
View File

@ -43,6 +43,13 @@ pub struct SshDomain {
pub ssh_backend: Option<SshBackend>,
/// If false, then don't use a multiplexer connection,
/// just connect directly using ssh. This doesn't require
/// that the remote host have wezterm installed, and is equivalent
/// to using `wezterm ssh` to connect.
#[serde(default = "default_true")]
pub use_multiplexer: bool,
/// ssh_config option values
#[serde(default)]
pub ssh_option: HashMap<String, String>,

4
wezterm-gui/src/main.rs
View File

@ -226,7 +226,9 @@ fn client_domains(config: &config::ConfigHandle) -> Vec<ClientDomainConfig> {
}
for ssh_dom in &config.ssh_domains {
domains.push(ClientDomainConfig::Ssh(ssh_dom.clone()));
if ssh_dom.use_multiplexer {
domains.push(ClientDomainConfig::Ssh(ssh_dom.clone()));
}
}
for tls_client in &config.tls_clients {