1
1
mirror of https://github.com/wez/wezterm.git synced 2025-01-04 19:54:56 +03:00

move pty code into its own deeper module

This commit is contained in:
Wez Furlong 2019-02-19 20:43:28 -08:00
parent 3dcd001a5a
commit c04c3fdbac
4 changed files with 19 additions and 16 deletions

View File

@ -29,14 +29,8 @@ use crate::guiloop::{GuiEventLoop, TerminalWindow};
mod font;
use crate::font::FontConfiguration;
#[cfg(unix)]
mod pty;
#[cfg(unix)]
pub use crate::pty::{openpty, Child, Command, ExitStatus, MasterPty, SlavePty};
#[cfg(windows)]
mod winpty;
#[cfg(windows)]
pub use crate::winpty::{openpty, Child, Command, ExitStatus, MasterPty, SlavePty};
#[cfg(unix)]
mod sigchld;

View File

@ -1,16 +1,16 @@
use failure::Error;
use std::io::{self, Error as IoError, Result as IoResult};
extern crate winapi;
use crate::winpty::winapi::shared::minwindef::DWORD;
use crate::winpty::winapi::shared::winerror::{HRESULT, S_OK};
use crate::winpty::winapi::um::fileapi::{ReadFile, WriteFile};
use crate::winpty::winapi::um::handleapi::*;
use crate::winpty::winapi::um::minwinbase::STILL_ACTIVE;
use crate::winpty::winapi::um::namedpipeapi::CreatePipe;
use crate::winpty::winapi::um::processthreadsapi::*;
use crate::winpty::winapi::um::winbase::EXTENDED_STARTUPINFO_PRESENT;
use crate::winpty::winapi::um::winbase::STARTUPINFOEXW;
use crate::winpty::winapi::um::wincon::COORD;
use crate::pty::conpty::winapi::shared::minwindef::DWORD;
use crate::pty::conpty::winapi::shared::winerror::{HRESULT, S_OK};
use crate::pty::conpty::winapi::um::fileapi::{ReadFile, WriteFile};
use crate::pty::conpty::winapi::um::handleapi::*;
use crate::pty::conpty::winapi::um::minwinbase::STILL_ACTIVE;
use crate::pty::conpty::winapi::um::namedpipeapi::CreatePipe;
use crate::pty::conpty::winapi::um::processthreadsapi::*;
use crate::pty::conpty::winapi::um::winbase::EXTENDED_STARTUPINFO_PRESENT;
use crate::pty::conpty::winapi::um::winbase::STARTUPINFOEXW;
use crate::pty::conpty::winapi::um::wincon::COORD;
use std::env;
use std::ffi::{OsStr, OsString};
use std::mem;

9
src/pty/mod.rs Normal file
View File

@ -0,0 +1,9 @@
#[cfg(windows)]
pub mod conpty;
#[cfg(unix)]
pub mod unix;
#[cfg(windows)]
pub use self::conpty::{openpty, Child, Command, ExitStatus, MasterPty, SlavePty};
#[cfg(unix)]
pub use self::unix::{openpty, Child, Command, ExitStatus, MasterPty, SlavePty};