diff options
author | David Hewitt <1939362+davidhewitt@users.noreply.github.com> | 2019-12-21 21:23:18 +0000 |
---|---|---|
committer | Christian Duerr <contact@christianduerr.com> | 2019-12-21 21:23:18 +0000 |
commit | 7a957978e41b4737530bf83bed82b7c177004b30 (patch) | |
tree | f60ff89ce56e59622fa24e762c7eb37904c397e2 /alacritty_terminal | |
parent | 512461a2419d5794b0c472087640191bf17e25f2 (diff) |
Default to ConPTY instead of WinPTY
Diffstat (limited to 'alacritty_terminal')
-rw-r--r-- | alacritty_terminal/src/config/mod.rs | 5 | ||||
-rw-r--r-- | alacritty_terminal/src/tty/windows/conpty.rs | 2 | ||||
-rw-r--r-- | alacritty_terminal/src/tty/windows/mod.rs | 4 |
3 files changed, 5 insertions, 6 deletions
diff --git a/alacritty_terminal/src/config/mod.rs b/alacritty_terminal/src/config/mod.rs index 26432415..3c8a85a4 100644 --- a/alacritty_terminal/src/config/mod.rs +++ b/alacritty_terminal/src/config/mod.rs @@ -108,11 +108,10 @@ pub struct Config<T> { #[serde(default, deserialize_with = "failure_default")] pub cursor: Cursor, - /// Enable experimental conpty backend instead of using winpty. - /// Will only take effect on Windows 10 Oct 2018 and later. + /// Use WinPTY backend even if ConPTY is available #[cfg(windows)] #[serde(default, deserialize_with = "failure_default")] - pub enable_experimental_conpty_backend: bool, + pub winpty_backend: bool, /// Send escape sequences using the alt key. #[serde(default, deserialize_with = "failure_default")] diff --git a/alacritty_terminal/src/tty/windows/conpty.rs b/alacritty_terminal/src/tty/windows/conpty.rs index 5e5a0118..44b3662f 100644 --- a/alacritty_terminal/src/tty/windows/conpty.rs +++ b/alacritty_terminal/src/tty/windows/conpty.rs @@ -102,7 +102,7 @@ impl Drop for Conpty { unsafe impl Send for Conpty {} pub fn new<C>(config: &Config<C>, size: &SizeInfo, _window_id: Option<usize>) -> Option<Pty> { - if !config.enable_experimental_conpty_backend { + if config.winpty_backend { return None; } diff --git a/alacritty_terminal/src/tty/windows/mod.rs b/alacritty_terminal/src/tty/windows/mod.rs index 9e2f722b..f5e0e61f 100644 --- a/alacritty_terminal/src/tty/windows/mod.rs +++ b/alacritty_terminal/src/tty/windows/mod.rs @@ -61,11 +61,11 @@ pub struct Pty { pub fn new<C>(config: &Config<C>, size: &SizeInfo, window_id: Option<usize>) -> Pty { if let Some(pty) = conpty::new(config, size, window_id) { - info!("Using Conpty agent"); + info!("Using ConPTY backend"); IS_CONPTY.store(true, Ordering::Relaxed); pty } else { - info!("Using Winpty agent"); + info!("Using WinPTY backend"); winpty::new(config, size, window_id) } } |