* 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
282 lines
9.4 KiB
Rust
282 lines
9.4 KiB
Rust
use std::sync::mpsc::channel;
|
|
use std::time::Instant;
|
|
use std::unimplemented;
|
|
|
|
use crate::panes::PaneId;
|
|
use crate::pty::VteBytes;
|
|
use crate::tab::Pane;
|
|
use crate::ui::pane_boundaries_frame::PaneFrame;
|
|
use crate::wasm_vm::PluginInstruction;
|
|
use zellij_utils::pane_size::Offset;
|
|
use zellij_utils::shared::ansi_len;
|
|
use zellij_utils::zellij_tile::prelude::PaletteColor;
|
|
use zellij_utils::{
|
|
channels::SenderWithContext,
|
|
pane_size::{Dimension, PaneGeom},
|
|
};
|
|
|
|
pub(crate) struct PluginPane {
|
|
pub pid: u32,
|
|
pub should_render: bool,
|
|
pub selectable: bool,
|
|
pub geom: PaneGeom,
|
|
pub geom_override: Option<PaneGeom>,
|
|
pub content_offset: Offset,
|
|
pub send_plugin_instructions: SenderWithContext<PluginInstruction>,
|
|
pub active_at: Instant,
|
|
pub pane_title: String,
|
|
frame: bool,
|
|
frame_color: Option<PaletteColor>,
|
|
}
|
|
|
|
impl PluginPane {
|
|
pub fn new(
|
|
pid: u32,
|
|
position_and_size: PaneGeom,
|
|
send_plugin_instructions: SenderWithContext<PluginInstruction>,
|
|
title: String,
|
|
) -> Self {
|
|
Self {
|
|
pid,
|
|
should_render: true,
|
|
selectable: true,
|
|
geom: position_and_size,
|
|
geom_override: None,
|
|
send_plugin_instructions,
|
|
active_at: Instant::now(),
|
|
frame: false,
|
|
frame_color: None,
|
|
content_offset: Offset::default(),
|
|
pane_title: title,
|
|
}
|
|
}
|
|
}
|
|
|
|
impl Pane for PluginPane {
|
|
// FIXME: These position and size things should all be moved to default trait implementations,
|
|
// with something like a get_pos_and_sz() method underpinning all of them. Alternatively and
|
|
// preferably, just use an enum and not a trait object
|
|
fn x(&self) -> usize {
|
|
self.geom_override.unwrap_or(self.geom).x
|
|
}
|
|
fn y(&self) -> usize {
|
|
self.geom_override.unwrap_or(self.geom).y
|
|
}
|
|
fn rows(&self) -> usize {
|
|
self.geom_override.unwrap_or(self.geom).rows.as_usize()
|
|
}
|
|
fn cols(&self) -> usize {
|
|
self.geom_override.unwrap_or(self.geom).cols.as_usize()
|
|
}
|
|
fn get_content_x(&self) -> usize {
|
|
self.x() + self.content_offset.left
|
|
}
|
|
fn get_content_y(&self) -> usize {
|
|
self.y() + self.content_offset.top
|
|
}
|
|
fn get_content_columns(&self) -> usize {
|
|
// content columns might differ from the pane's columns if the pane has a frame
|
|
// in that case they would be 2 less
|
|
self.cols()
|
|
.saturating_sub(self.content_offset.left + self.content_offset.right)
|
|
}
|
|
fn get_content_rows(&self) -> usize {
|
|
// content rows might differ from the pane's rows if the pane has a frame
|
|
// in that case they would be 2 less
|
|
self.rows()
|
|
.saturating_sub(self.content_offset.top + self.content_offset.bottom)
|
|
}
|
|
fn reset_size_and_position_override(&mut self) {
|
|
self.geom_override = None;
|
|
self.should_render = true;
|
|
}
|
|
fn set_geom(&mut self, position_and_size: PaneGeom) {
|
|
self.geom = position_and_size;
|
|
self.should_render = true;
|
|
}
|
|
fn get_geom_override(&mut self, pane_geom: PaneGeom) {
|
|
self.geom_override = Some(pane_geom);
|
|
self.should_render = true;
|
|
}
|
|
fn handle_pty_bytes(&mut self, _event: VteBytes) {
|
|
unimplemented!()
|
|
}
|
|
fn cursor_coordinates(&self) -> Option<(usize, usize)> {
|
|
None
|
|
}
|
|
fn adjust_input_to_terminal(&self, _input_bytes: Vec<u8>) -> Vec<u8> {
|
|
unimplemented!()
|
|
}
|
|
fn position_and_size(&self) -> PaneGeom {
|
|
self.geom
|
|
}
|
|
fn current_geom(&self) -> PaneGeom {
|
|
self.geom_override.unwrap_or(self.geom)
|
|
}
|
|
fn geom_override(&self) -> Option<PaneGeom> {
|
|
self.geom_override
|
|
}
|
|
fn should_render(&self) -> bool {
|
|
self.should_render
|
|
}
|
|
fn set_should_render(&mut self, should_render: bool) {
|
|
self.should_render = should_render;
|
|
}
|
|
fn selectable(&self) -> bool {
|
|
self.selectable
|
|
}
|
|
fn set_selectable(&mut self, selectable: bool) {
|
|
self.selectable = selectable;
|
|
}
|
|
fn render(&mut self) -> Option<String> {
|
|
// if self.should_render {
|
|
if true {
|
|
// while checking should_render rather than rendering each pane every time
|
|
// is more performant, it causes some problems when the pane to the left should be
|
|
// rendered and has wide characters (eg. Chinese characters or emoji)
|
|
// as a (hopefully) temporary hack, we render all panes until we find a better solution
|
|
let mut vte_output = String::new();
|
|
let (buf_tx, buf_rx) = channel();
|
|
|
|
self.send_plugin_instructions
|
|
.send(PluginInstruction::Render(
|
|
buf_tx,
|
|
self.pid,
|
|
self.get_content_rows(),
|
|
self.get_content_columns(),
|
|
))
|
|
.unwrap();
|
|
|
|
self.should_render = false;
|
|
let contents = buf_rx.recv().unwrap();
|
|
// FIXME: This is a hack that assumes all fixed-size panes are borderless. This
|
|
// will eventually need fixing!
|
|
if self.frame && !(self.geom.rows.is_fixed() || self.geom.cols.is_fixed()) {
|
|
let frame = PaneFrame {
|
|
geom: self.current_geom().into(),
|
|
title: self.pane_title.clone(),
|
|
color: self.frame_color,
|
|
..Default::default()
|
|
};
|
|
vte_output.push_str(&frame.render());
|
|
}
|
|
for (index, line) in contents.lines().enumerate() {
|
|
let actual_len = ansi_len(line);
|
|
let line_to_print = if actual_len > self.get_content_columns() {
|
|
let mut line = String::from(line);
|
|
line.truncate(self.get_content_columns());
|
|
line
|
|
} else {
|
|
[
|
|
line,
|
|
&str::repeat(" ", self.get_content_columns() - ansi_len(line)),
|
|
]
|
|
.concat()
|
|
};
|
|
|
|
vte_output.push_str(&format!(
|
|
"\u{1b}[{};{}H\u{1b}[m{}",
|
|
self.get_content_y() + 1 + index,
|
|
self.get_content_x() + 1,
|
|
line_to_print,
|
|
)); // goto row/col and reset styles
|
|
let line_len = line_to_print.len();
|
|
if line_len < self.get_content_columns() {
|
|
// pad line
|
|
for _ in line_len..self.get_content_columns() {
|
|
vte_output.push(' ');
|
|
}
|
|
}
|
|
}
|
|
let total_line_count = contents.lines().count();
|
|
if total_line_count < self.get_content_rows() {
|
|
// pad lines
|
|
for line_index in total_line_count..self.get_content_rows() {
|
|
let x = self.get_content_x();
|
|
let y = self.get_content_y();
|
|
vte_output.push_str(&format!(
|
|
"\u{1b}[{};{}H\u{1b}[m",
|
|
y + line_index + 1,
|
|
x + 1
|
|
)); // goto row/col and reset styles
|
|
for _col_index in 0..self.get_content_columns() {
|
|
vte_output.push(' ');
|
|
}
|
|
}
|
|
}
|
|
Some(vte_output)
|
|
} else {
|
|
None
|
|
}
|
|
}
|
|
fn pid(&self) -> PaneId {
|
|
PaneId::Plugin(self.pid)
|
|
}
|
|
fn reduce_height(&mut self, percent: f64) {
|
|
if let Some(p) = self.geom.rows.as_percent() {
|
|
self.geom.rows = Dimension::percent(p - percent);
|
|
self.should_render = true;
|
|
}
|
|
}
|
|
fn increase_height(&mut self, percent: f64) {
|
|
if let Some(p) = self.geom.rows.as_percent() {
|
|
self.geom.rows = Dimension::percent(p + percent);
|
|
self.should_render = true;
|
|
}
|
|
}
|
|
fn reduce_width(&mut self, percent: f64) {
|
|
if let Some(p) = self.geom.cols.as_percent() {
|
|
self.geom.cols = Dimension::percent(p - percent);
|
|
self.should_render = true;
|
|
}
|
|
}
|
|
fn increase_width(&mut self, percent: f64) {
|
|
if let Some(p) = self.geom.cols.as_percent() {
|
|
self.geom.cols = Dimension::percent(p + percent);
|
|
self.should_render = true;
|
|
}
|
|
}
|
|
fn push_down(&mut self, count: usize) {
|
|
self.geom.y += count;
|
|
self.should_render = true;
|
|
}
|
|
fn push_right(&mut self, count: usize) {
|
|
self.geom.x += count;
|
|
self.should_render = true;
|
|
}
|
|
fn pull_left(&mut self, count: usize) {
|
|
self.geom.x -= count;
|
|
self.should_render = true;
|
|
}
|
|
fn pull_up(&mut self, count: usize) {
|
|
self.geom.y -= count;
|
|
self.should_render = true;
|
|
}
|
|
fn scroll_up(&mut self, _count: usize) {
|
|
//unimplemented!()
|
|
}
|
|
fn scroll_down(&mut self, _count: usize) {
|
|
//unimplemented!()
|
|
}
|
|
fn clear_scroll(&mut self) {
|
|
//unimplemented!()
|
|
}
|
|
|
|
fn active_at(&self) -> Instant {
|
|
self.active_at
|
|
}
|
|
|
|
fn set_active_at(&mut self, time: Instant) {
|
|
self.active_at = time;
|
|
}
|
|
fn set_frame(&mut self, frame: bool) {
|
|
self.frame = frame;
|
|
}
|
|
fn set_content_offset(&mut self, offset: Offset) {
|
|
self.content_offset = offset;
|
|
}
|
|
fn set_boundary_color(&mut self, color: Option<PaletteColor>) {
|
|
self.frame_color = color;
|
|
self.set_should_render(true);
|
|
}
|
|
}
|