pogmommy/zellij
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(cli-actions): do not query termios for the cli client (#1905)

Browse source
This commit is contained in:
Aram Drevekenin 2022-11-03 11:37:36 +01:00 • committed by GitHub
parent 98b66109a6
commit 582b2458fd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/commands.rs
View file

@ -237,7 +237,7 @@ pub(crate) fn convert_old_theme_file(old_theme_file: PathBuf) {
} }
fn attach_with_cli_client(cli_action: zellij_utils::cli::CliAction, session_name: &str) { fn attach_with_cli_client(cli_action: zellij_utils::cli::CliAction, session_name: &str) {
let os_input = get_os_input(zellij_client::os_input_output::get_client_os_input); let os_input = get_os_input(zellij_client::os_input_output::get_cli_client_os_input);
match Action::actions_from_cli(cli_action) { match Action::actions_from_cli(cli_action) {
Ok(actions) => { Ok(actions) => {
zellij_client::cli_client::start_cli_client(Box::new(os_input), session_name, actions); zellij_client::cli_client::start_cli_client(Box::new(os_input), session_name, actions);

25
zellij-client/src/os_input_output.rs
View file

@ -75,7 +75,7 @@ pub(crate) fn get_terminal_size_using_fd(fd: RawFd) -> Size {
#[derive(Clone)] #[derive(Clone)]
pub struct ClientOsInputOutput { pub struct ClientOsInputOutput {
orig_termios: Arc<Mutex<termios::Termios>>, orig_termios: Option<Arc<Mutex<termios::Termios>>>,
send_instructions_to_server: Arc<Mutex<Option<IpcSenderWithContext<ClientToServerMsg>>>>, send_instructions_to_server: Arc<Mutex<Option<IpcSenderWithContext<ClientToServerMsg>>>>,
receive_instructions_from_server: Arc<Mutex<Option<IpcReceiverWithContext<ServerToClientMsg>>>>, receive_instructions_from_server: Arc<Mutex<Option<IpcReceiverWithContext<ServerToClientMsg>>>>,
} }
@ -121,8 +121,16 @@ impl ClientOsApi for ClientOsInputOutput {
into_raw_mode(fd); into_raw_mode(fd);
} }
fn unset_raw_mode(&self, fd: RawFd) -> Result<(), nix::Error> { fn unset_raw_mode(&self, fd: RawFd) -> Result<(), nix::Error> {
let orig_termios = self.orig_termios.lock().unwrap(); match &self.orig_termios {
unset_raw_mode(fd, orig_termios.clone()) Some(orig_termios) => {
let orig_termios = orig_termios.lock().unwrap();
unset_raw_mode(fd, orig_termios.clone())
},
None => {
log::warn!("trying to unset raw mode for a non-terminal session");
Ok(())
},
}
} }
fn box_clone(&self) -> Box<dyn ClientOsApi> { fn box_clone(&self) -> Box<dyn ClientOsApi> {
Box::new((*self).clone()) Box::new((*self).clone())
@ -249,7 +257,16 @@ impl Clone for Box<dyn ClientOsApi> {
pub fn get_client_os_input() -> Result<ClientOsInputOutput, nix::Error> { pub fn get_client_os_input() -> Result<ClientOsInputOutput, nix::Error> {
let current_termios = termios::tcgetattr(0)?; let current_termios = termios::tcgetattr(0)?;
let orig_termios = Arc::new(Mutex::new(current_termios)); let orig_termios = Some(Arc::new(Mutex::new(current_termios)));
Ok(ClientOsInputOutput {
orig_termios,
send_instructions_to_server: Arc::new(Mutex::new(None)),
receive_instructions_from_server: Arc::new(Mutex::new(None)),
})
}
pub fn get_cli_client_os_input() -> Result<ClientOsInputOutput, nix::Error> {
let orig_termios = None; // not a terminal
Ok(ClientOsInputOutput { Ok(ClientOsInputOutput {
orig_termios, orig_termios,
send_instructions_to_server: Arc::new(Mutex::new(None)), send_instructions_to_server: Arc::new(Mutex::new(None)),