* refactor(panes): move to parametric pane sizes * Fixed the simpler errors by casting to usize * The least I can do is pass the formatting check... * Move to stable toolchain * Well, it compiles? * And now it doesn't! ;) * Baseline functionality with the new Dimension type * Working POC for percent-based resizing * REVERT THIS COMMIT – DELETES TESTS * Perfected the discrete resize algorithm * Fixed fixed-size panes * Basic bidirectional resize * feat(resize): finalised parametric resize algorithm * Reduce the logging level a bit * Fixed nested layouts using percents * Bug squishing for implicit sizing * Here is a funky (read: rubbish) rounding approach * And now it's gone again! * Improve discretisation algorithm to fix rounding errors * Fix the last layout bug (maybe?) * Mixed explicit and implied percents work now * Let's pretend that didn't happen... * Make things a bit less crashy * Crash slightly more for now (to find bugs) * Manaually splitting of panes works now * Start moving to percent-based resizes * Everything but fullscreen seems to be working * Fix compilatation errors * Culled a massive amount of border code * Why not pause to please rustfmt? * Turns out I was still missing a few tests... * Bringing back even more tests! * Fix tests and pane boarders * Fix the resize system without gaps * Fix content offset * Fixed a bug with pane closing * Add a hack to fix setting of the viewport * Fix toggling between shared borders and frames * fix(tests): make e2e properly use PaneGeom * style(fmt): make rustfmt happy * Revert unintentional rounding of borders * Purge some old borderless stuff * Fix busted tab-bar shrinking * Update E2E tests * Finish implementing fullscreen! * Don't crash anymore? * Fix (almost) all tests * Fix a lack of tab-stops * All tests passing * I really can't be bothered to debug a CI issue * Tie up loose ends * Knock out some lingering FIXMEs * Continue to clean things up * Change some naming and address FIXMEs * Cull more code + FIXMEs * Refactor of the resize system + polish * Only draw frames when absolutely necessary * Fix the tab-bar crash * Fix rendering of boarders on reattach * Fix resizing at small pane sizes * Deduplicate code in the layout system * Update tab-bar WASM * Fixed the pinching of panes during resize * Unexpose needlessly public type * Add back a lost test * Re-add tab tests and get them to compile * All tabs need layouts * Start fixing tests + bug in main * Stabilize the resize algorithm rounding * All tests from main are now passing * Cull more dead code
279 lines
9.4 KiB
Rust
279 lines
9.4 KiB
Rust
use zellij_utils::input::actions::Action;
|
|
use zellij_utils::pane_size::Size;
|
|
use zellij_utils::{interprocess, libc, nix, signal_hook, termion, zellij_tile};
|
|
|
|
use interprocess::local_socket::LocalSocketStream;
|
|
use mio::{unix::SourceFd, Events, Interest, Poll, Token};
|
|
use nix::pty::Winsize;
|
|
use nix::sys::termios;
|
|
use signal_hook::{consts::signal::*, iterator::Signals};
|
|
use std::io::prelude::*;
|
|
use std::os::unix::io::RawFd;
|
|
use std::path::Path;
|
|
use std::sync::{Arc, Mutex};
|
|
use std::{io, time};
|
|
use zellij_tile::data::Palette;
|
|
use zellij_utils::{
|
|
errors::ErrorContext,
|
|
ipc::{ClientToServerMsg, IpcReceiverWithContext, IpcSenderWithContext, ServerToClientMsg},
|
|
shared::default_palette,
|
|
};
|
|
|
|
fn into_raw_mode(pid: RawFd) {
|
|
let mut tio = termios::tcgetattr(pid).expect("could not get terminal attribute");
|
|
termios::cfmakeraw(&mut tio);
|
|
match termios::tcsetattr(pid, termios::SetArg::TCSANOW, &tio) {
|
|
Ok(_) => {}
|
|
Err(e) => panic!("error {:?}", e),
|
|
};
|
|
}
|
|
|
|
fn unset_raw_mode(pid: RawFd, orig_termios: termios::Termios) {
|
|
match termios::tcsetattr(pid, termios::SetArg::TCSANOW, &orig_termios) {
|
|
Ok(_) => {}
|
|
Err(e) => panic!("error {:?}", e),
|
|
};
|
|
}
|
|
|
|
pub(crate) fn get_terminal_size_using_fd(fd: RawFd) -> Size {
|
|
// TODO: do this with the nix ioctl
|
|
use libc::ioctl;
|
|
use libc::TIOCGWINSZ;
|
|
|
|
let mut winsize = Winsize {
|
|
ws_row: 0,
|
|
ws_col: 0,
|
|
ws_xpixel: 0,
|
|
ws_ypixel: 0,
|
|
};
|
|
|
|
// TIOCGWINSZ is an u32, but the second argument to ioctl is u64 on
|
|
// some platforms. When checked on Linux, clippy will complain about
|
|
// useless conversion.
|
|
#[allow(clippy::useless_conversion)]
|
|
unsafe {
|
|
ioctl(fd, TIOCGWINSZ.into(), &mut winsize)
|
|
};
|
|
Size {
|
|
rows: winsize.ws_row as usize,
|
|
cols: winsize.ws_col as usize,
|
|
}
|
|
}
|
|
|
|
#[derive(Clone)]
|
|
pub struct ClientOsInputOutput {
|
|
orig_termios: Arc<Mutex<termios::Termios>>,
|
|
send_instructions_to_server: Arc<Mutex<Option<IpcSenderWithContext<ClientToServerMsg>>>>,
|
|
receive_instructions_from_server: Arc<Mutex<Option<IpcReceiverWithContext<ServerToClientMsg>>>>,
|
|
mouse_term: Arc<Mutex<Option<termion::input::MouseTerminal<std::io::Stdout>>>>,
|
|
}
|
|
|
|
/// The `ClientOsApi` trait represents an abstract interface to the features of an operating system that
|
|
/// Zellij client requires.
|
|
pub trait ClientOsApi: Send + Sync {
|
|
/// Returns the size of the terminal associated to file descriptor `fd`.
|
|
fn get_terminal_size_using_fd(&self, fd: RawFd) -> Size;
|
|
/// Set the terminal associated to file descriptor `fd` to
|
|
/// [raw mode](https://en.wikipedia.org/wiki/Terminal_mode).
|
|
fn set_raw_mode(&mut self, fd: RawFd);
|
|
/// Set the terminal associated to file descriptor `fd` to
|
|
/// [cooked mode](https://en.wikipedia.org/wiki/Terminal_mode).
|
|
fn unset_raw_mode(&self, fd: RawFd);
|
|
/// Returns the writer that allows writing to standard output.
|
|
fn get_stdout_writer(&self) -> Box<dyn io::Write>;
|
|
/// Returns the raw contents of standard input.
|
|
fn read_from_stdin(&self) -> Vec<u8>;
|
|
/// Returns a [`Box`] pointer to this [`ClientOsApi`] struct.
|
|
fn box_clone(&self) -> Box<dyn ClientOsApi>;
|
|
/// Sends a message to the server.
|
|
fn send_to_server(&self, msg: ClientToServerMsg);
|
|
/// Receives a message on client-side IPC channel
|
|
// This should be called from the client-side router thread only.
|
|
fn recv_from_server(&self) -> (ServerToClientMsg, ErrorContext);
|
|
fn handle_signals(&self, sigwinch_cb: Box<dyn Fn()>, quit_cb: Box<dyn Fn()>);
|
|
/// Establish a connection with the server socket.
|
|
fn connect_to_server(&self, path: &Path);
|
|
fn load_palette(&self) -> Palette;
|
|
fn enable_mouse(&self);
|
|
fn disable_mouse(&self);
|
|
// Repeatedly send action, until stdin is readable again
|
|
fn start_action_repeater(&mut self, action: Action);
|
|
}
|
|
|
|
impl ClientOsApi for ClientOsInputOutput {
|
|
fn get_terminal_size_using_fd(&self, fd: RawFd) -> Size {
|
|
get_terminal_size_using_fd(fd)
|
|
}
|
|
fn set_raw_mode(&mut self, fd: RawFd) {
|
|
into_raw_mode(fd);
|
|
}
|
|
fn unset_raw_mode(&self, fd: RawFd) {
|
|
let orig_termios = self.orig_termios.lock().unwrap();
|
|
unset_raw_mode(fd, orig_termios.clone());
|
|
}
|
|
fn box_clone(&self) -> Box<dyn ClientOsApi> {
|
|
Box::new((*self).clone())
|
|
}
|
|
fn read_from_stdin(&self) -> Vec<u8> {
|
|
let stdin = std::io::stdin();
|
|
let mut stdin = stdin.lock();
|
|
let buffer = stdin.fill_buf().unwrap();
|
|
let length = buffer.len();
|
|
let read_bytes = Vec::from(buffer);
|
|
stdin.consume(length);
|
|
read_bytes
|
|
}
|
|
fn get_stdout_writer(&self) -> Box<dyn io::Write> {
|
|
let stdout = ::std::io::stdout();
|
|
Box::new(stdout)
|
|
}
|
|
fn send_to_server(&self, msg: ClientToServerMsg) {
|
|
self.send_instructions_to_server
|
|
.lock()
|
|
.unwrap()
|
|
.as_mut()
|
|
.unwrap()
|
|
.send(msg);
|
|
}
|
|
fn recv_from_server(&self) -> (ServerToClientMsg, ErrorContext) {
|
|
self.receive_instructions_from_server
|
|
.lock()
|
|
.unwrap()
|
|
.as_mut()
|
|
.unwrap()
|
|
.recv()
|
|
}
|
|
fn handle_signals(&self, sigwinch_cb: Box<dyn Fn()>, quit_cb: Box<dyn Fn()>) {
|
|
let mut signals = Signals::new(&[SIGWINCH, SIGTERM, SIGINT, SIGQUIT, SIGHUP]).unwrap();
|
|
for signal in signals.forever() {
|
|
match signal {
|
|
SIGWINCH => {
|
|
sigwinch_cb();
|
|
}
|
|
SIGTERM | SIGINT | SIGQUIT | SIGHUP => {
|
|
quit_cb();
|
|
break;
|
|
}
|
|
_ => unreachable!(),
|
|
}
|
|
}
|
|
}
|
|
fn connect_to_server(&self, path: &Path) {
|
|
let socket;
|
|
loop {
|
|
match LocalSocketStream::connect(path) {
|
|
Ok(sock) => {
|
|
socket = sock;
|
|
break;
|
|
}
|
|
Err(_) => {
|
|
std::thread::sleep(std::time::Duration::from_millis(50));
|
|
}
|
|
}
|
|
}
|
|
let sender = IpcSenderWithContext::new(socket);
|
|
let receiver = sender.get_receiver();
|
|
*self.send_instructions_to_server.lock().unwrap() = Some(sender);
|
|
*self.receive_instructions_from_server.lock().unwrap() = Some(receiver);
|
|
}
|
|
fn load_palette(&self) -> Palette {
|
|
// this was removed because termbg doesn't release stdin in certain scenarios (we know of
|
|
// windows terminal and FreeBSD): https://github.com/zellij-org/zellij/issues/538
|
|
//
|
|
// let palette = default_palette();
|
|
// let timeout = std::time::Duration::from_millis(100);
|
|
// if let Ok(rgb) = termbg::rgb(timeout) {
|
|
// palette.bg = PaletteColor::Rgb((rgb.r as u8, rgb.g as u8, rgb.b as u8));
|
|
// // TODO: also dynamically get all other colors from the user's terminal
|
|
// // this should be done in the same method (OSC ]11), but there might be other
|
|
// // considerations here, hence using the library
|
|
// };
|
|
default_palette()
|
|
}
|
|
fn enable_mouse(&self) {
|
|
let mut mouse_term = self.mouse_term.lock().unwrap();
|
|
if mouse_term.is_none() {
|
|
*mouse_term = Some(termion::input::MouseTerminal::from(std::io::stdout()));
|
|
}
|
|
}
|
|
|
|
fn disable_mouse(&self) {
|
|
let mut mouse_term = self.mouse_term.lock().unwrap();
|
|
if mouse_term.is_some() {
|
|
*mouse_term = None;
|
|
}
|
|
}
|
|
|
|
fn start_action_repeater(&mut self, action: Action) {
|
|
let mut poller = StdinPoller::default();
|
|
|
|
loop {
|
|
let ready = poller.ready();
|
|
if ready {
|
|
break;
|
|
}
|
|
self.send_to_server(ClientToServerMsg::Action(action.clone()));
|
|
}
|
|
}
|
|
}
|
|
|
|
impl Clone for Box<dyn ClientOsApi> {
|
|
fn clone(&self) -> Box<dyn ClientOsApi> {
|
|
self.box_clone()
|
|
}
|
|
}
|
|
|
|
pub fn get_client_os_input() -> Result<ClientOsInputOutput, nix::Error> {
|
|
let current_termios = termios::tcgetattr(0)?;
|
|
let orig_termios = Arc::new(Mutex::new(current_termios));
|
|
let mouse_term = Arc::new(Mutex::new(None));
|
|
Ok(ClientOsInputOutput {
|
|
orig_termios,
|
|
send_instructions_to_server: Arc::new(Mutex::new(None)),
|
|
receive_instructions_from_server: Arc::new(Mutex::new(None)),
|
|
mouse_term,
|
|
})
|
|
}
|
|
|
|
pub const DEFAULT_STDIN_POLL_TIMEOUT_MS: u64 = 10;
|
|
|
|
struct StdinPoller {
|
|
poll: Poll,
|
|
events: Events,
|
|
timeout: time::Duration,
|
|
}
|
|
|
|
impl StdinPoller {
|
|
// use mio poll to check if stdin is readable without blocking
|
|
fn ready(&mut self) -> bool {
|
|
self.poll
|
|
.poll(&mut self.events, Some(self.timeout))
|
|
.expect("could not poll stdin for readiness");
|
|
for event in &self.events {
|
|
if event.token() == Token(0) && event.is_readable() {
|
|
return true;
|
|
}
|
|
}
|
|
false
|
|
}
|
|
}
|
|
|
|
impl Default for StdinPoller {
|
|
fn default() -> Self {
|
|
let stdin = 0;
|
|
let mut stdin_fd = SourceFd(&stdin);
|
|
let events = Events::with_capacity(128);
|
|
let poll = Poll::new().unwrap();
|
|
poll.registry()
|
|
.register(&mut stdin_fd, Token(0), Interest::READABLE)
|
|
.expect("could not create stdin poll");
|
|
|
|
let timeout = time::Duration::from_millis(DEFAULT_STDIN_POLL_TIMEOUT_MS);
|
|
|
|
Self {
|
|
poll,
|
|
events,
|
|
timeout,
|
|
}
|
|
}
|
|
}
|