summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Duerr <contact@christianduerr.com>2020-11-06 17:33:02 +0000
committerGitHub <noreply@github.com>2020-11-06 17:33:02 +0000
commit3957a2555dbd81271d3e29a2f0b8f07258037e7b (patch)
treef0e5a71b5439e60eb1b20250d6ce289fc1c00bf0
parent812c8bc14a4214e9d0970e7a333be72e745137b2 (diff)
downloadalacritty-3957a2555dbd81271d3e29a2f0b8f07258037e7b.tar.gz
alacritty-3957a2555dbd81271d3e29a2f0b8f07258037e7b.zip
Deprecate the WinPTY backend
-rw-r--r--CHANGELOG.md1
-rw-r--r--alacritty/Cargo.toml2
-rw-r--r--alacritty/src/config/mod.rs9
-rw-r--r--alacritty_terminal/Cargo.toml2
-rw-r--r--alacritty_terminal/src/config/mod.rs10
5 files changed, 17 insertions, 7 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9b0b17a9..a350cff1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
- The snapcraft.yaml file has been removed
- Updated `setab`/`setaf` capabilities in `alacritty-direct` to use colons
- WinPTY is now enabled only when targeting MSVC
+- Deprecated the WinPTY backend feature, disabling it by default
### Added
diff --git a/alacritty/Cargo.toml b/alacritty/Cargo.toml
index 905003e5..873c3da6 100644
--- a/alacritty/Cargo.toml
+++ b/alacritty/Cargo.toml
@@ -56,7 +56,7 @@ winapi = { version = "0.3.7", features = ["impl-default", "wincon"]}
embed-resource = "1.3"
[features]
-default = ["wayland", "x11", "winpty"]
+default = ["wayland", "x11"]
x11 = ["copypasta/x11", "glutin/x11", "x11-dl"]
wayland = ["copypasta/wayland", "glutin/wayland", "wayland-client"]
winpty = ["alacritty_terminal/winpty"]
diff --git a/alacritty/src/config/mod.rs b/alacritty/src/config/mod.rs
index d268d921..9aa2a74c 100644
--- a/alacritty/src/config/mod.rs
+++ b/alacritty/src/config/mod.rs
@@ -312,6 +312,15 @@ fn print_deprecation_warnings(config: &Config) {
"Config dynamic_title is deprecated; please use window.dynamic_title instead",
)
}
+
+ #[cfg(all(windows, not(feature = "winpty")))]
+ if config.winpty_backend {
+ warn!(
+ target: LOG_TARGET_CONFIG,
+ "Config winpty_backend is deprecated and requires a compilation flag; it should be \
+ removed from the config",
+ )
+ }
}
#[cfg(test)]
diff --git a/alacritty_terminal/Cargo.toml b/alacritty_terminal/Cargo.toml
index 83c5b416..89da83bd 100644
--- a/alacritty_terminal/Cargo.toml
+++ b/alacritty_terminal/Cargo.toml
@@ -41,7 +41,7 @@ mio-anonymous-pipes = "0.1"
winpty = { version = "0.2.0", optional = true }
[features]
-default = ["winpty"]
+default = []
bench = []
[dev-dependencies]
diff --git a/alacritty_terminal/src/config/mod.rs b/alacritty_terminal/src/config/mod.rs
index add38c59..98849d90 100644
--- a/alacritty_terminal/src/config/mod.rs
+++ b/alacritty_terminal/src/config/mod.rs
@@ -55,11 +55,6 @@ pub struct Config<T> {
#[serde(default, deserialize_with = "failure_default")]
pub cursor: Cursor,
- /// Use WinPTY backend even if ConPTY is available.
- #[cfg(windows)]
- #[serde(default, deserialize_with = "failure_default")]
- pub winpty_backend: bool,
-
/// Shell startup directory.
#[serde(default, deserialize_with = "option_explicit_none")]
pub working_directory: Option<PathBuf>,
@@ -73,6 +68,11 @@ pub struct Config<T> {
pub hold: bool,
// TODO: DEPRECATED
+ #[cfg(windows)]
+ #[serde(default, deserialize_with = "failure_default")]
+ pub winpty_backend: bool,
+
+ // TODO: DEPRECATED
#[serde(default, deserialize_with = "failure_default")]
pub visual_bell: Option<BellConfig>,