PolytreeDE/alacritty
1
0
Fork 0
mirror of https://github.com/alacritty/alacritty.git synced 2025-04-14 17:53:03 -04:00
Code Releases Activity

Disable WinPTY with windows-gnu toolchain

Browse source 
Co-authored-by: Christian Duerr <contact@christianduerr.com>
This commit is contained in:
Mateusz Mikuła 2020-09-01 00:30:45 +02:00 • committed by GitHub
parent b39c791649
commit 5ee7ae8a27
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -12,6 +12,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
- Minimum Rust version has been bumped to 1.43.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
### Added

5
alacritty_terminal/Cargo.toml
View file

@ -28,7 +28,6 @@ nix = "0.17.0"
signal-hook = { version = "0.1", features = ["mio-support"] }
[target.'cfg(windows)'.dependencies]
winpty = { version = "0.2.0", optional = true }
mio-named-pipes = "0.1"
miow = "0.3"
winapi = { version = "0.3.7", features = [
@ -37,6 +36,10 @@ winapi = { version = "0.3.7", features = [
]}
mio-anonymous-pipes = "0.1"
# Winpty crate supports only MSVC.
[target.'cfg(all(target_os="windows", target_env="msvc"))'.dependencies]
winpty = { version = "0.2.0", optional = true }
[features]
default = ["winpty"]
bench = []

14
alacritty_terminal/src/tty/windows/mod.rs
View file

@ -10,19 +10,19 @@ use crate::term::SizeInfo;
use crate::tty::windows::child::ChildExitWatcher;
use crate::tty::{ChildEvent, EventedPty, EventedReadWrite};
#[cfg(feature = "winpty")]
#[cfg(all(feature = "winpty", target_env = "msvc"))]
mod automatic_backend;
mod child;
mod conpty;
#[cfg(feature = "winpty")]
#[cfg(all(feature = "winpty", target_env = "msvc"))]
mod winpty;
#[cfg(not(feature = "winpty"))]
#[cfg(not(all(feature = "winpty", target_env = "msvc")))]
use conpty::Conpty as Backend;
#[cfg(not(feature = "winpty"))]
#[cfg(not(all(feature = "winpty", target_env = "msvc")))]
use mio_anonymous_pipes::{EventedAnonRead as ReadPipe, EventedAnonWrite as WritePipe};
#[cfg(feature = "winpty")]
#[cfg(all(feature = "winpty", target_env = "msvc"))]
use automatic_backend::{
EventedReadablePipe as ReadPipe, EventedWritablePipe as WritePipe, PtyBackend as Backend,
};
@ -39,12 +39,12 @@ pub struct Pty {
child_watcher: ChildExitWatcher,
}
#[cfg(not(feature = "winpty"))]
#[cfg(not(all(feature = "winpty", target_env = "msvc")))]
pub fn new<C>(config: &Config<C>, size: &SizeInfo, window_id: Option<usize>) -> Pty {
conpty::new(config, size, window_id).expect("Failed to create ConPTY backend")
}
#[cfg(feature = "winpty")]
#[cfg(all(feature = "winpty", target_env = "msvc"))]
pub fn new<C>(config: &Config<C>, size: &SizeInfo, window_id: Option<usize>) -> Pty {
automatic_backend::new(config, size, window_id)
}