diff options
Diffstat (limited to 'zellij-server/src/panes')
-rw-r--r-- | zellij-server/src/panes/floating_panes/floating_pane_grid.rs | 4 | ||||
-rw-r--r-- | zellij-server/src/panes/floating_panes/mod.rs | 19 | ||||
-rw-r--r-- | zellij-server/src/panes/plugin_pane.rs | 6 | ||||
-rw-r--r-- | zellij-server/src/panes/terminal_pane.rs | 6 | ||||
-rw-r--r-- | zellij-server/src/panes/tiled_panes/mod.rs | 134 | ||||
-rw-r--r-- | zellij-server/src/panes/tiled_panes/pane_resizer.rs | 33 | ||||
-rw-r--r-- | zellij-server/src/panes/tiled_panes/stacked_panes.rs | 397 | ||||
-rw-r--r-- | zellij-server/src/panes/tiled_panes/tiled_pane_grid.rs | 114 |
8 files changed, 528 insertions, 185 deletions
diff --git a/zellij-server/src/panes/floating_panes/floating_pane_grid.rs b/zellij-server/src/panes/floating_panes/floating_pane_grid.rs index 9f034956d..afeecc8d2 100644 --- a/zellij-server/src/panes/floating_panes/floating_pane_grid.rs +++ b/zellij-server/src/panes/floating_panes/floating_pane_grid.rs @@ -743,9 +743,7 @@ impl<'a> FloatingPaneGrid<'a> { a_pane.y().cmp(&b_pane.y()) } }); - let active_pane_position = panes - .iter() - .position(|(id, _)| id == current_pane_id)?; + let active_pane_position = panes.iter().position(|(id, _)| id == current_pane_id)?; let last_pane = panes.last()?; let previous_active_pane_id = if active_pane_position == 0 { diff --git a/zellij-server/src/panes/floating_panes/mod.rs b/zellij-server/src/panes/floating_panes/mod.rs index a96b156a8..cb277729d 100644 --- a/zellij-server/src/panes/floating_panes/mod.rs +++ b/zellij-server/src/panes/floating_panes/mod.rs @@ -206,7 +206,9 @@ impl FloatingPanes { // returns the focused pane of any client_id - should be safe because the way things are // set up at the time of writing, all clients are focused on the same floating pane due to // z_index issues - client_id.and_then(|client_id| self.active_panes.get(&client_id).copied()).or_else(|| self.panes.keys().next().copied()) + client_id + .and_then(|client_id| self.active_panes.get(&client_id).copied()) + .or_else(|| self.panes.keys().next().copied()) } pub fn toggle_show_panes(&mut self, should_show_floating_panes: bool) { self.show_panes = should_show_floating_panes; @@ -224,7 +226,8 @@ impl FloatingPanes { } pub fn add_next_geom(&mut self, next_geom: PaneGeom) { // TODO: removeme - if true { // TODO: config flag to cancel this behaviour - classic_pane_algorithm? + if true { + // TODO: config flag to cancel this behaviour - classic_pane_algorithm? self.next_geoms.push_back(next_geom); } } @@ -241,7 +244,7 @@ impl FloatingPanes { viewport, ); floating_pane_grid.find_room_for_new_pane() - } + }, } } pub fn position_floating_pane_layout( @@ -592,7 +595,12 @@ impl FloatingPanes { self.set_force_render(); } } - pub fn move_active_pane(&mut self, search_backwards: bool, os_api: &mut Box<dyn ServerOsApi>, client_id: ClientId) { + pub fn move_active_pane( + &mut self, + search_backwards: bool, + os_api: &mut Box<dyn ServerOsApi>, + client_id: ClientId, + ) { let active_pane_id = self.get_active_pane_id(client_id).unwrap(); let new_position_id = { @@ -821,7 +829,8 @@ impl FloatingPanes { } } pub fn reapply_pane_focus(&mut self) { - if let Some(focused_pane) = self.first_active_floating_pane_id() { // floating pane focus is the same for all clients + if let Some(focused_pane) = self.first_active_floating_pane_id() { + // floating pane focus is the same for all clients self.focus_pane_for_all_clients(focused_pane); } } diff --git a/zellij-server/src/panes/plugin_pane.rs b/zellij-server/src/panes/plugin_pane.rs index 841104214..c6896f90d 100644 --- a/zellij-server/src/panes/plugin_pane.rs +++ b/zellij-server/src/panes/plugin_pane.rs @@ -13,10 +13,10 @@ use std::rc::Rc; use zellij_utils::pane_size::{Offset, SizeInPixels}; use zellij_utils::position::Position; use zellij_utils::{ - input::layout::Run, channels::SenderWithContext, data::{Event, InputMode, Mouse, Palette, PaletteColor, Style}, errors::prelude::*, + input::layout::Run, pane_size::PaneGeom, shared::make_terminal_title, vte, @@ -277,7 +277,9 @@ impl Pane for PluginPane { let mut frame_geom = self.current_geom(); if !frame_params.should_draw_pane_frames { // in this case the width of the frame needs not include the pane corners - frame_geom.cols.set_inner(frame_geom.cols.as_usize().saturating_sub(1)); + frame_geom + .cols + .set_inner(frame_geom.cols.as_usize().saturating_sub(1)); } let mut frame = PaneFrame::new( frame_geom.into(), diff --git a/zellij-server/src/panes/terminal_pane.rs b/zellij-server/src/panes/terminal_pane.rs index 960476d5e..1b9644aa7 100644 --- a/zellij-server/src/panes/terminal_pane.rs +++ b/zellij-server/src/panes/terminal_pane.rs @@ -16,9 +16,9 @@ use std::time::{self, Instant}; use zellij_utils::input::command::RunCommand; use zellij_utils::pane_size::Offset; use zellij_utils::{ - input::layout::Run, data::{InputMode, Palette, PaletteColor, Style}, errors::prelude::*, + input::layout::Run, pane_size::PaneGeom, pane_size::SizeInPixels, position::Position, @@ -362,7 +362,9 @@ impl Pane for TerminalPane { let mut frame_geom = self.current_geom(); if !frame_params.should_draw_pane_frames { // in this case the width of the frame needs not include the pane corners - frame_geom.cols.set_inner(frame_geom.cols.as_usize().saturating_sub(1)); + frame_geom + .cols + .set_inner(frame_geom.cols.as_usize().saturating_sub(1)); } let mut frame = PaneFrame::new( frame_geom.into(), diff --git a/zellij-server/src/panes/tiled_panes/mod.rs b/zellij-server/src/panes/tiled_panes/mod.rs index 6f7d714dd..bd6470c90 100644 --- a/zellij-server/src/panes/tiled_panes/mod.rs +++ b/zellij-server/src/panes/tiled_panes/mod.rs @@ -1,6 +1,6 @@ mod pane_resizer; -mod tiled_pane_grid; mod stacked_panes; +mod tiled_pane_grid; use crate::resize_pty; use tiled_pane_grid::{split, TiledPaneGrid, RESIZE_PERCENT}; @@ -298,7 +298,9 @@ impl TiledPanes { if let Some(active_pane_id) = &self.active_panes.get(&client_id) { if let Some(active_pane) = self.panes.get_mut(active_pane_id) { let full_pane_size = active_pane.position_and_size(); - if full_pane_size.rows.as_usize() < MIN_TERMINAL_HEIGHT * 2 || full_pane_size.is_stacked { + if full_pane_size.rows.as_usize() < MIN_TERMINAL_HEIGHT * 2 + || full_pane_size.is_stacked + { return false; } else { return split(SplitDirection::Horizontal, &full_pane_size).is_some(); @@ -311,7 +313,9 @@ impl TiledPanes { if let Some(active_pane_id) = &self.active_panes.get(&client_id) { if let Some(active_pane) = self.panes.get_mut(active_pane_id) { let full_pane_size = active_pane.position_and_size(); - if full_pane_size.cols.as_usize() < MIN_TERMINAL_WIDTH * 2 || full_pane_size.is_stacked { + if full_pane_size.cols.as_usize() < MIN_TERMINAL_WIDTH * 2 + || full_pane_size.is_stacked + { return false; } return split(SplitDirection::Vertical, &full_pane_size).is_some(); @@ -385,8 +389,14 @@ impl TiledPanes { let connected_clients: Vec<ClientId> = self.connected_clients.borrow().iter().copied().collect(); for client_id in connected_clients { - if self.panes.get(&pane_id).map(|p| p.current_geom().is_stacked).unwrap_or(false) { - let _ = StackedPanes::new_from_btreemap(&mut self.panes, &self.panes_to_hide).focus_pane(&pane_id); + if self + .panes + .get(&pane_id) + .map(|p| p.current_geom().is_stacked) + .unwrap_or(false) + { + let _ = StackedPanes::new_from_btreemap(&mut self.panes, &self.panes_to_hide) + .focus_pane(&pane_id); } self.active_panes .insert(client_id, pane_id, &mut self.panes); @@ -401,8 +411,15 @@ impl TiledPanes { for client_id in connected_clients { match &self.active_panes.get(&client_id).copied() { Some(pane_id) => { - if self.panes.get(&pane_id).map(|p| p.current_geom().is_stacked).unwrap_or(false) { - let _ = StackedPanes::new_from_btreemap(&mut self.panes, &self.panes_to_hide).focus_pane(&pane_id); + if self + .panes + .get(&pane_id) + .map(|p| p.current_geom().is_stacked) + .unwrap_or(false) + { + let _ = + StackedPanes::new_from_btreemap(&mut self.panes, &self.panes_to_hide) + .focus_pane(&pane_id); } self.active_panes .insert(client_id, *pane_id, &mut self.panes); @@ -411,23 +428,37 @@ impl TiledPanes { None => { if let Some(first_pane_id) = self.first_selectable_pane_id() { let pane_id = first_pane_id; // TODO: combine with above - if self.panes.get(&pane_id).map(|p| p.current_geom().is_stacked).unwrap_or(false) { - let _ = StackedPanes::new_from_btreemap(&mut self.panes, &self.panes_to_hide).focus_pane(&pane_id); + if self + .panes + .get(&pane_id) + .map(|p| p.current_geom().is_stacked) + .unwrap_or(false) + { + let _ = StackedPanes::new_from_btreemap( + &mut self.panes, + &self.panes_to_hide, + ) + .focus_pane(&pane_id); } self.active_panes .insert(client_id, pane_id, &mut self.panes); self.set_pane_active_at(pane_id); } - - } + }, } } self.set_force_render(); self.reapply_pane_frames(); } pub fn focus_pane(&mut self, pane_id: PaneId, client_id: ClientId) { - if self.panes.get(&pane_id).map(|p| p.current_geom().is_stacked).unwrap_or(false) { - let _ = StackedPanes::new_from_btreemap(&mut self.panes, &self.panes_to_hide).focus_pane(&pane_id); + if self + .panes + .get(&pane_id) + .map(|p| p.current_geom().is_stacked) + .unwrap_or(false) + { + let _ = StackedPanes::new_from_btreemap(&mut self.panes, &self.panes_to_hide) + .focus_pane(&pane_id); self.reapply_pane_frames(); } @@ -445,10 +476,17 @@ impl TiledPanes { self.reset_boundaries(); } pub fn focus_pane_at_position(&mut self, position_and_size: PaneGeom, client_id: ClientId) { - if let Some(pane_id) = self.panes.iter().find(|(_pid, pane)| pane.position_and_size() == position_and_size).map(|(pid, _p)| *pid) { + if let Some(pane_id) = self + .panes + .iter() + .find(|(_pid, pane)| pane.position_and_size() == position_and_size) + .map(|(pid, _p)| *pid) + { if let Some(currently_active_pane_id) = self.active_panes.get(&client_id) { let prev_geom = { - if let Some(currently_focused_pane) = self.panes.get_mut(currently_active_pane_id) { + if let Some(currently_focused_pane) = + self.panes.get_mut(currently_active_pane_id) + { let prev_geom = currently_focused_pane.position_and_size(); currently_focused_pane.set_geom(position_and_size); Some(prev_geom) @@ -531,12 +569,16 @@ impl TiledPanes { }; let (stacked_pane_ids_under_flexible_pane, stacked_pane_ids_over_flexible_pane) = { // TODO: do not recalculate this every time on render - StackedPanes::new_from_btreemap(&mut self.panes, &self.panes_to_hide).stacked_pane_ids_under_and_over_flexible_panes().unwrap() // TODO: no unwrap + StackedPanes::new_from_btreemap(&mut self.panes, &self.panes_to_hide) + .stacked_pane_ids_under_and_over_flexible_panes() + .unwrap() // TODO: no unwrap }; for (kind, pane) in self.panes.iter_mut() { if !self.panes_to_hide.contains(&pane.pid()) { - let pane_is_stacked_under = stacked_pane_ids_under_flexible_pane.contains(&pane.pid()); - let pane_is_stacked_over = stacked_pane_ids_over_flexible_pane.contains(&pane.pid()); + let pane_is_stacked_under = + stacked_pane_ids_under_flexible_pane.contains(&pane.pid()); + let pane_is_stacked_over = + stacked_pane_ids_over_flexible_pane.contains(&pane.pid()); let should_draw_pane_frames = self.draw_pane_frames; let pane_is_stacked = pane.current_geom().is_stacked; let mut pane_contents_and_ui = PaneContentsAndUi::new( @@ -750,8 +792,14 @@ impl TiledPanes { ); pane_grid.next_selectable_pane_id(&active_pane_id) }; - if self.panes.get(&next_active_pane_id).map(|p| p.current_geom().is_stacked).unwrap_or(false) { - let _ = StackedPanes::new_from_btreemap(&mut self.panes, &self.panes_to_hide).focus_pane(&next_active_pane_id); + if self + .panes + .get(&next_active_pane_id) + .map(|p| p.current_geom().is_stacked) + .unwrap_or(false) + { + let _ = StackedPanes::new_from_btreemap(&mut self.panes, &self.panes_to_hide) + .focus_pane(&next_active_pane_id); self.reapply_pane_frames(); } @@ -776,8 +824,14 @@ impl TiledPanes { pane_grid.previous_selectable_pane_id(&active_pane_id) }; - if self.panes.get(&next_active_pane_id).map(|p| p.current_geom().is_stacked).unwrap_or(false) { - let _ = StackedPanes::new_from_btreemap(&mut self.panes, &self.panes_to_hide).focus_pane(&next_active_pane_id); + if self + .panes + .get(&next_active_pane_id) + .map(|p| p.current_geom().is_stacked) + .unwrap_or(false) + { + let _ = StackedPanes::new_from_btreemap(&mut self.panes, &self.panes_to_hide) + .focus_pane(&next_active_pane_id); self.reapply_pane_frames(); } for client_id in connected_clients { @@ -860,14 +914,16 @@ impl TiledPanes { .get_mut(self.active_panes.get(&client_id).unwrap()) .unwrap(); - let previously_active_pane_is_stacked = previously_active_pane.current_geom().is_stacked; + let previously_active_pane_is_stacked = + previously_active_pane.current_geom().is_stacked; previously_active_pane.set_should_render(true); // we render the full viewport to remove any ui elements that might have been // there before (eg. another user's cursor) previously_active_pane.render_full_viewport(); let next_active_pane = self.panes.get_mut(&p).unwrap(); - let next_active_pane_is_stacked = next_active_pane.current_geom().is_stacked; + let next_active_pane_is_stacked = + next_active_pane.current_geom().is_stacked; next_active_pane.set_should_render(true); // we render the full viewport to remove any ui elements that might have been // there before (eg. another user's cursor) @@ -900,7 +956,8 @@ impl TiledPanes { *self.display_area.borrow(), *self.viewport.borrow(), ); - let next_index = pane_grid.next_selectable_pane_id_above(&active_pane_id) + let next_index = pane_grid + .next_selectable_pane_id_above(&active_pane_id) .or_else(|| pane_grid.progress_stack_up_if_in_stack(&active_pane_id)); match next_index { Some(p) => { @@ -911,14 +968,16 @@ impl TiledPanes { .get_mut(self.active_panes.get(&client_id).unwrap()) .unwrap(); - let previously_active_pane_is_stacked = previously_active_pane.current_geom().is_stacked; + let previously_active_pane_is_stacked = + previously_active_pane.current_geom().is_stacked; previously_active_pane.set_should_render(true); // we render the full viewport to remove any ui elements that might have been // there before (eg. another user's cursor) previously_active_pane.render_full_viewport(); let next_active_pane = self.panes.get_mut(&p).unwrap(); - let next_active_pane_is_stacked = next_active_pane.current_geom().is_stacked; + let next_active_pane_is_stacked = + next_active_pane.current_geom().is_stacked; next_active_pane.set_should_render(true); // we render the full viewport to remove any ui elements that might have been // there before (eg. another user's cursor) @@ -1032,8 +1091,14 @@ impl TiledPanes { pane_grid.next_selectable_pane_id(&active_pane_id) } }; - if self.panes.get(&new_position_id).map(|p| p.current_geom().is_stacked).unwrap_or(false) { - let _ = StackedPanes::new_from_btreemap(&mut self.panes, &self.panes_to_hide).focus_pane(&new_position_id); + if self + .panes + .get(&new_position_id) + .map(|p| p.current_geom().is_stacked) + .unwrap_or(false) + { + let _ = StackedPanes::new_from_btreemap(&mut self.panes, &self.panes_to_hide) + .focus_pane(&new_position_id); self.reapply_pane_frames(); } @@ -1228,11 +1293,16 @@ impl TiledPanes { .last() .map(|(pane_id, _pane)| **pane_id); - match next_active_pane_id { Some(next_active_pane_id) => { - if self.panes.get(&next_active_pane_id).map(|p| p.current_geom().is_stacked).unwrap_or(false) { - let _ = StackedPanes::new_from_btreemap(&mut self.panes, &self.panes_to_hide).focus_pane(&next_active_pane_id); + if self + .panes + .get(&next_active_pane_id) + .map(|p| p.current_geom().is_stacked) + .unwrap_or(false) + { + let _ = StackedPanes::new_from_btreemap(&mut self.panes, &self.panes_to_hide) + .focus_pane(&next_active_pane_id); self.reapply_pane_frames(); } for (client_id, active_pane_id) in active_panes { diff --git a/zellij-server/src/panes/tiled_panes/pane_resizer.rs b/zellij-server/src/panes/tiled_panes/pane_resizer.rs index cc5e70e19..2a2b5b6f9 100644 --- a/zellij-server/src/panes/tiled_panes/pane_resizer.rs +++ b/zellij-server/src/panes/tiled_panes/pane_resizer.rs @@ -132,9 +132,17 @@ impl<'a> PaneResizer<'a> { let err_context = || format!("Failed to apply spans"); let mut geoms_changed = false; for span in spans { - let pane_is_stacked = self.panes.borrow().get(&span.pid).unwrap().current_geom().is_stacked; + let pane_is_stacked = self + .panes + .borrow() + .get(&span.pid) + .unwrap() + .current_geom() + .is_stacked; if pane_is_stacked { - let current_geom = StackedPanes::new(self.panes.clone()).position_and_size_of_stack(&span.pid).unwrap(); + let current_geom = StackedPanes::new(self.panes.clone()) + .position_and_size_of_stack(&span.pid) + .unwrap(); let new_geom = match span.direction { SplitDirection::Horizontal => PaneGeom { x: span.pos, @@ -222,16 +230,14 @@ impl<'a> PaneResizer<'a> { .panes .borrow() .values() - .filter(|p| { - match self.get_span(!direction, p.as_ref()) { - Some(s) => { - let span_bounds = (s.pos, s.pos + s.size.as_usize()); - bwn(span_bounds.0, boundary) - || (bwn(boundary.0, span_bounds) - && (bwn(boundary.1, span_bounds) || boundary.1 == span_bounds.1)) - }, - None => false - } + .filter(|p| match self.get_span(!direction, p.as_ref()) { + Some(s) => { + let span_bounds = (s.pos, s.pos + s.size.as_usize()); + bwn(span_bounds.0, boundary) + || (bwn(boundary.0, span_bounds) + && (bwn(boundary.1, span_bounds) || boundary.1 == span_bounds.1)) + }, + None => false, }) .filter_map(|p| self.get_span(direction, p.as_ref())) .collect(); @@ -296,7 +302,8 @@ fn constrain_spans(space: usize, spans: &[Span]) -> HashSet<cassowary::Constrain for span in spans { match span.size.constraint { Constraint::Fixed(s) => constraints.insert(span.size_var | EQ(REQUIRED) | s as f64), - Constraint::Percent(p) => constraints.insert((span.size_var / new_flex_space as f64) | EQ(STRONG) | (p / 100.0)), + Constraint::Percent(p) => constraints + .insert((span.size_var / new_flex_space as f64) | EQ(STRONG) | (p / 100.0)), }; } diff --git a/zellij-server/src/panes/tiled_panes/stacked_panes.rs b/zellij-server/src/panes/tiled_panes/stacked_panes.rs index dfdba6099..00b193f69 100644 --- a/zellij-server/src/panes/tiled_panes/stacked_panes.rs +++ b/zellij-server/src/panes/tiled_panes/stacked_panes.rs @@ -1,21 +1,19 @@ use crate::{panes::PaneId, tab::Pane}; +use std::cell::RefCell; +use std::collections::{HashMap, HashSet}; +use std::rc::Rc; use zellij_utils::{ errors::prelude::*, pane_size::{Dimension, PaneGeom}, }; -use std::cell::RefCell; -use std::rc::Rc; -use std::collections::{HashMap, HashSet}; -pub struct StackedPanes <'a>{ +pub struct StackedPanes<'a> { panes: Rc<RefCell<HashMap<PaneId, &'a mut Box<dyn Pane>>>>, } -impl <'a>StackedPanes <'a>{ +impl<'a> StackedPanes<'a> { pub fn new(panes: Rc<RefCell<HashMap<PaneId, &'a mut Box<dyn Pane>>>>) -> Self { - StackedPanes { - panes - } + StackedPanes { panes } } pub fn new_from_btreemap( panes: impl IntoIterator<Item = (&'a PaneId, &'a mut Box<dyn Pane>)>, @@ -27,14 +25,28 @@ impl <'a>StackedPanes <'a>{ .map(|(p_id, p)| (*p_id, p)) .collect(); let panes = Rc::new(RefCell::new(panes)); - StackedPanes { - panes - } + StackedPanes { panes } } - pub fn move_down(&mut self, source_pane_id: &PaneId, destination_pane_id: &PaneId) -> Result<()> { + pub fn move_down( + &mut self, + source_pane_id: &PaneId, + destination_pane_id: &PaneId, + ) -> Result<()> { let err_context = || format!("Failed to move stacked pane focus down"); - let source_pane_is_stacked = self.panes.borrow().get(source_pane_id).with_context(err_context)?.position_and_size().is_stacked; - let destination_pane_is_stacked = self.panes.borrow().get(destination_pane_id).with_context(err_context)?.position_and_size().is_stacked; + let source_pane_is_stacked = self + .panes + .borrow() + .get(source_pane_id) + .with_context(err_context)? + .position_and_size() + .is_stacked; + let destination_pane_is_stacked = self + .panes + .borrow() + .get(destination_pane_id) + .with_context(err_context)? + .position_and_size() + .is_stacked; if source_pane_is_stacked && destination_pane_is_stacked { let mut panes = self.panes.borrow_mut(); let source_pane = panes.get_mut(source_pane_id).with_context(err_context)?; @@ -43,7 +55,9 @@ impl <'a>StackedPanes <'a>{ destination_pane_geom.y = source_pane_geom.y + 1; source_pane_geom.rows = Dimension::fixed(1); source_pane.set_geom(source_pane_geom); - let destination_pane = panes.get_mut(&destination_pane_id).with_context(err_context)?; + let destination_pane = panes + .get_mut(&destination_pane_id) + .with_context(err_context)?; destination_pane.set_geom(destination_pane_geom); } else if destination_pane_is_stacked { // we're moving down to the highest pane in the stack, we need to expand it and shrink the @@ -54,8 +68,20 @@ impl <'a>StackedPanes <'a>{ } pub fn move_up(&mut self, source_pane_id: &PaneId, destination_pane_id: &PaneId) -> Result<()> { let err_context = || format!("Failed to move stacked pane focus up"); - let source_pane_is_stacked = self.panes.borrow().get(source_pane_id).with_context(err_context)?.position_and_size().is_stacked; - let destination_pane_is_stacked = self.panes.borrow().get(destination_pane_id).with_context(err_context)?.position_and_size().is_stacked; + let source_pane_is_stacked = self + .panes + .borrow() + .get(source_pane_id) + .with_context(err_context)? + .position_and_size() + .is_stacked; + let destination_pane_is_stacked = self + .panes + .borrow() + .get(destination_pane_id) + .with_context(err_context)? + .position_and_size() + .is_stacked; if source_pane_is_stacked && destination_pane_ |