diff options
| author | user <user@clank> | 2026-08-12 14:52:13 +0200 |
|---|---|---|
| committer | user <user@clank> | 2026-08-12 19:34:19 +0200 |
| commit | e349b110a83bf0f69771bf2a4d6dae18c194cf14 (patch) | |
| tree | 9e79fd73a869e812ff16e31654a5e42c33a84040 | |
| parent | sl0p: per-pane status bar via OSC 5577 (experimental) (diff) | |
| download | sl0ppi-e349b110a83bf0f69771bf2a4d6dae18c194cf14.tar.gz sl0ppi-e349b110a83bf0f69771bf2a4d6dae18c194cf14.tar.xz sl0ppi-e349b110a83bf0f69771bf2a4d6dae18c194cf14.zip | |
sl0p: serialise the pane status bar for resurrection
The status bar survived detach/reattach (it lives on Grid) but not a
serialise/restore cycle, so a resurrected pane came back blank.
It now travels the whole per-pane serialisation pipeline, mirroring the fork's
existing default_fg/default_bg: pane -> PaneLayoutMetadata ->
PaneLayoutManifest -> TiledPaneLayout -> a status_bar property in the serialised
KDL, then back through the normal layout parser and applied by LayoutApplier
when the pane is recreated.
The sanitiser moved from grid.rs into zellij-utils so both entry points share
one definition. That matters: a layout file on disk is no more trustworthy than
the escape sequence that wrote it -- it may have been hand-edited, or copied from
somewhere else -- so restored text is stripped and length-capped on the way in
just like the OSC payload was.
Verified end to end rather than by unit test alone: set the bar, waited for a
serialisation pass, confirmed status_bar="..." in session-layout.kdl, killed the
session until list-sessions reported EXITED, then attached and watched it come
back from disk. The earlier attempt only proved detach/reattach because Quit had
left the session alive.
60 files changed, 464 insertions, 29 deletions
diff --git a/sl0ppij/README.md b/sl0ppij/README.md index aaff7ab..d2e1f6a 100644 --- a/sl0ppij/README.md +++ b/sl0ppij/README.md @@ -338,7 +338,16 @@ The frame row is already a text surface and costs nothing. It outranks the frame's other hints (resize help, mouse shortcuts), since those are discoverable elsewhere and this was explicitly requested by the program. It lives on the pane's `Grid` like the window title, so it survives re-renders, -resizes and detach/reattach. It does **not** yet survive session resurrection. +resizes and detach/reattach — and it is serialised with the session, so a pane +resurrected from disk comes back showing what it showed before: + +```kdl +pane focus=true contents_file="initial_contents_2" status_bar="building 3/7" +``` + +The text is sanitised again when that layout is parsed back, because a layout file +on disk is no more trustworthy than the escape sequence that produced it and may +have been hand-edited since. One sanitiser serves both paths. The payload is versioned (`;1;`) and unknown versions or verbs are ignored, so adding verbs later cannot be misinterpreted by an older build. The text is the diff --git a/sl0ppij/zellij-server/src/panes/grid.rs b/sl0ppij/zellij-server/src/panes/grid.rs index da93745..b91fa2a 100644 --- a/sl0ppij/zellij-server/src/panes/grid.rs +++ b/sl0ppij/zellij-server/src/panes/grid.rs @@ -408,28 +408,6 @@ fn subtract_isize_from_usize(u: usize, i: isize) -> usize { } } -/// Longest status bar text we keep. A pane can only ever show one row of it, and -/// the string is held for the life of the pane, so there is no reason to retain -/// megabytes because a program looped. -const MAX_STATUS_BAR_TEXT: usize = 512; - -/// Make program-supplied status text safe to draw. -/// -/// The payload arrives in-band from whatever is running in the pane -- which -/// includes `cat` of a file someone else wrote -- so it is untrusted. Control -/// characters are dropped rather than escaped: a stray ESC would let the payload -/// break out of the frame row and repaint anything it liked, and a newline or -/// carriage return would corrupt the row. Truncation is by characters, not bytes, -/// so it cannot split a multi-byte one. -pub fn sanitize_status_bar_text(raw: &str) -> String { - raw.chars() - .filter(|c| !c.is_control()) - .take(MAX_STATUS_BAR_TEXT) - .collect::<String>() - .trim() - .to_owned() -} - pub fn parse_osc7_path(raw: &[u8]) -> Option<std::path::PathBuf> { let s = std::str::from_utf8(raw).ok()?; let rest = s.strip_prefix("file://")?; @@ -4152,7 +4130,7 @@ impl Perform for Grid { .flat_map(|p| str::from_utf8(p)) .collect::<Vec<&str>>() .join(";"); - let text = sanitize_status_bar_text(&text); + let text = zellij_utils::input::layout::sanitize_status_bar_text(&text); self.status_bar = if text.is_empty() { None } else { Some(text) }; }, Some(b"clear") => { diff --git a/sl0ppij/zellij-server/src/panes/terminal_pane.rs b/sl0ppij/zellij-server/src/panes/terminal_pane.rs index 7ce5f26..59cb87a 100644 --- a/sl0ppij/zellij-server/src/panes/terminal_pane.rs +++ b/sl0ppij/zellij-server/src/panes/terminal_pane.rs @@ -1241,6 +1241,9 @@ impl Pane for TerminalPane { fn status_bar_text(&self) -> Option<String> { self.grid.status_bar.clone() } + fn set_status_bar_text(&mut self, text: Option<String>) { + self.grid.status_bar = text; + } fn stack_list_entry_label(&self) -> String { // `hide_default_pane_names` does not reach current_title() any more, so // this gets the "Pane #N" placeholder rather than an empty string. Kept diff --git a/sl0ppij/zellij-server/src/screen.rs b/sl0ppij/zellij-server/src/screen.rs index 1edf5ed..81185f2 100644 --- a/sl0ppij/zellij-server/src/screen.rs +++ b/sl0ppij/zellij-server/src/screen.rs @@ -6944,6 +6944,7 @@ impl Screen { focused_clients, default_fg, default_bg, + p.status_bar_text(), ) }) .collect(); @@ -6985,6 +6986,7 @@ impl Screen { focused_clients, default_fg, default_bg, + p.status_bar_text(), ) }) .collect(); diff --git a/sl0ppij/zellij-server/src/session_layout_metadata.rs b/sl0ppij/zellij-server/src/session_layout_metadata.rs index 62efea9..20f557b 100644 --- a/sl0ppij/zellij-server/src/session_layout_metadata.rs +++ b/sl0ppij/zellij-server/src/session_layout_metadata.rs @@ -535,6 +535,7 @@ impl Into<PaneLayoutManifest> for PaneLayoutMetadata { pane_contents: self.pane_contents, default_fg: self.default_fg, default_bg: self.default_bg, + status_bar: self.status_bar, } } } @@ -561,6 +562,7 @@ pub struct PaneLayoutMetadata { focused_clients: Vec<ClientId>, default_fg: Option<String>, default_bg: Option<String>, + status_bar: Option<String>, } impl PaneLayoutMetadata { @@ -575,6 +577,7 @@ impl PaneLayoutMetadata { focused_clients: Vec<ClientId>, default_fg: Option<String>, default_bg: Option<String>, + status_bar: Option<String>, ) -> Self { PaneLayoutMetadata { id, @@ -588,6 +591,7 @@ impl PaneLayoutMetadata { focused_clients, default_fg, default_bg, + status_bar, } } fn to_pane_metadata(&self) -> PaneMetadata { @@ -701,6 +705,7 @@ mod tests { vec![], None, None, + None, ) } @@ -720,6 +725,7 @@ mod tests { vec![], None, None, + None, ) } diff --git a/sl0ppij/zellij-server/src/tab/layout_applier.rs b/sl0ppij/zellij-server/src/tab/layout_applier.rs index 44e100a..c796fa4 100644 --- a/sl0ppij/zellij-server/src/tab/layout_applier.rs +++ b/sl0ppij/zellij-server/src/tab/layout_applier.rs @@ -741,6 +741,9 @@ impl<'a> LayoutApplier<'a> { if layout.default_fg.is_some() || layout.default_bg.is_some() { new_pane.set_pane_default_colors(layout.default_fg.clone(), layout.default_bg.clone()); } + if layout.status_bar.is_some() { + new_pane.set_status_bar_text(layout.status_bar.clone()); + } if let Some(held_command) = hold_for_command { new_pane.hold(None, true, held_command.clone()); } diff --git a/sl0ppij/zellij-server/src/tab/mod.rs b/sl0ppij/zellij-server/src/tab/mod.rs index 8852822..3727b2e 100644 --- a/sl0ppij/zellij-server/src/tab/mod.rs +++ b/sl0ppij/zellij-server/src/tab/mod.rs @@ -890,6 +890,7 @@ pub trait Pane { fn status_bar_text(&self) -> Option<String> { None } + fn set_status_bar_text(&mut self, _text: Option<String>) {} fn stack_list_entry_label(&self) -> String { self.current_title() } diff --git a/sl0ppij/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__send_cli_new_tab_action_default_params.snap b/sl0ppij/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__send_cli_new_tab_action_default_params.snap index 1e51823..066be14 100644 --- a/sl0ppij/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__send_cli_new_tab_action_default_params.snap +++ b/sl0ppij/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__send_cli_new_tab_action_default_params.snap @@ -1,6 +1,6 @@ --- source: zellij-server/src/./unit/screen_tests.rs -assertion_line: 3870 +assertion_line: 3874 expression: "format!(\"{:#?}\", new_tab_action)" --- Some( @@ -29,6 +29,7 @@ Some( pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, TiledPaneLayout { @@ -48,6 +49,7 @@ Some( pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, ], @@ -64,6 +66,7 @@ Some( pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, ), diff --git a/sl0ppij/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__send_cli_new_tab_action_with_layout_string.snap b/sl0ppij/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__send_cli_new_tab_action_with_layout_string.snap index be88100..501d686 100644 --- a/sl0ppij/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__send_cli_new_tab_action_with_layout_string.snap +++ b/sl0ppij/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__send_cli_new_tab_action_with_layout_string.snap @@ -1,6 +1,6 @@ --- source: zellij-server/src/./unit/screen_tests.rs -assertion_line: 7982 +assertion_line: 7990 expression: output --- NewTab( @@ -32,6 +32,7 @@ NewTab( pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, TiledPaneLayout { @@ -55,6 +56,7 @@ NewTab( pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, TiledPaneLayout { @@ -78,6 +80,7 @@ NewTab( pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, ], @@ -98,6 +101,7 @@ NewTab( pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, ), diff --git a/sl0ppij/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__send_cli_new_tab_action_with_layout_string_and_name.snap b/sl0ppij/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__send_cli_new_tab_action_with_layout_string_and_name.snap index 673141d..7e209de 100644 --- a/sl0ppij/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__send_cli_new_tab_action_with_layout_string_and_name.snap +++ b/sl0ppij/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__send_cli_new_tab_action_with_layout_string_and_name.snap @@ -1,6 +1,6 @@ --- source: zellij-server/src/./unit/screen_tests.rs -assertion_line: 8037 +assertion_line: 8045 expression: output --- NewTab( @@ -32,6 +32,7 @@ NewTab( pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, TiledPaneLayout { @@ -55,6 +56,7 @@ NewTab( pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, TiledPaneLayout { @@ -78,6 +80,7 @@ NewTab( pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, ], @@ -98,6 +101,7 @@ NewTab( pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, ), diff --git a/sl0ppij/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__send_cli_new_tab_action_with_name_and_layout.snap b/sl0ppij/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__send_cli_new_tab_action_with_name_and_layout.snap index 9a2f6f3..33505e4 100644 --- a/sl0ppij/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__send_cli_new_tab_action_with_name_and_layout.snap +++ b/sl0ppij/zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__send_cli_new_tab_action_with_name_and_layout.snap @@ -1,6 +1,6 @@ --- source: zellij-server/src/./unit/screen_tests.rs -assertion_line: 3928 +assertion_line: 3932 expression: output --- NewTab( @@ -32,6 +32,7 @@ NewTab( pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, TiledPaneLayout { @@ -55,6 +56,7 @@ NewTab( pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, TiledPaneLayout { @@ -78,6 +80,7 @@ NewTab( pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, ], @@ -98,6 +101,7 @@ NewTab( pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, ), diff --git a/sl0ppij/zellij-utils/src/input/layout.rs b/sl0ppij/zellij-utils/src/input/layout.rs index df43a2e..2a461de 100644 --- a/sl0ppij/zellij-utils/src/input/layout.rs +++ b/sl0ppij/zellij-utils/src/input/layout.rs @@ -63,6 +63,28 @@ impl From<Direction> for SplitDirection { } } +/// Longest status bar text we keep. A pane can only ever show one row of it, and +/// the string is held for the life of the pane, so there is no reason to retain +/// megabytes because a program looped. +const MAX_STATUS_BAR_TEXT: usize = 512; + +/// Make program-supplied status text safe to draw. +/// +/// The payload arrives in-band from whatever is running in the pane -- which +/// includes `cat` of a file someone else wrote -- so it is untrusted. Control +/// characters are dropped rather than escaped: a stray ESC would let the payload +/// break out of the frame row and repaint anything it liked, and a newline or +/// carriage return would corrupt the row. Truncation is by characters, not bytes, +/// so it cannot split a multi-byte one. +pub fn sanitize_status_bar_text(raw: &str) -> String { + raw.chars() + .filter(|c| !c.is_control()) + .take(MAX_STATUS_BAR_TEXT) + .collect::<String>() + .trim() + .to_owned() +} + /// How a `children` placeholder arranges the panes that get inserted into it. /// /// Without one, every inserted pane becomes a flat sibling, which is why a @@ -950,6 +972,9 @@ pub struct TiledPaneLayout { pub pane_initial_contents: Option<String>, pub default_fg: Option<String>, pub default_bg: Option<String>, + /// Status bar text (OSC 5577) captured at serialisation, so a resurrected + /// pane comes back showing what it showed before. + pub status_bar: Option<String>, /// How panes inserted at this node's `children` placeholder are arranged. /// `None` keeps the historical behaviour: flat siblings. /// diff --git a/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__args_added_to_args_in_template.snap b/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__args_added_to_args_in_template.snap index ab9c17f..2e5ed9c 100644 --- a/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__args_added_to_args_in_template.snap +++ b/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__args_added_to_args_in_template.snap @@ -41,6 +41,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, TiledPaneLayout { @@ -75,6 +76,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, ], @@ -91,6 +93,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, [], diff --git a/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__args_override_args_in_template.snap b/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__args_override_args_in_template.snap index 515888b..cd3d88c 100644 --- a/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__args_override_args_in_template.snap +++ b/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__args_override_args_in_template.snap @@ -44,6 +44,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, TiledPaneLayout { @@ -78,6 +79,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, ], @@ -94,6 +96,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, [], diff --git a/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__can_define_a_stack_with_an_expanded_pane.snap b/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__can_define_a_stack_with_an_expanded_pane.snap index f94af9a..b665cfa 100644 --- a/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__can_define_a_stack_with_an_expanded_pane.snap +++ b/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__can_define_a_stack_with_an_expanded_pane.snap @@ -33,6 +33,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, TiledPaneLayout { @@ -52,6 +53,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, TiledPaneLayout { @@ -71,6 +73,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, ], @@ -87,6 +90,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, ], @@ -103,6 +107,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, [], diff --git a/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__can_define_stacked_children_for_pane_node.snap b/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__can_define_stacked_children_for_pane_node.snap index fbd5a48..2967310 100644 --- a/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__can_define_stacked_children_for_pane_node.snap +++ b/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__can_define_stacked_children_for_pane_node.snap @@ -33,6 +33,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, TiledPaneLayout { @@ -52,6 +53,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, ], @@ -68,6 +70,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, ], @@ -84,6 +87,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, [], diff --git a/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__can_define_stacked_children_for_pane_template.snap b/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__can_define_stacked_children_for_pane_template.snap index d46e115..7d0bfb9 100644 --- a/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__can_define_stacked_children_for_pane_template.snap +++ b/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__can_define_stacked_children_for_pane_template.snap @@ -37,6 +37,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, TiledPaneLayout { @@ -56,6 +57,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, ], @@ -72,6 +74,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, ], @@ -88,6 +91,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, ], @@ -104,6 +108,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, [], diff --git a/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__can_load_swap_layouts_from_a_different_file.snap b/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__can_load_swap_layouts_from_a_different_file.snap index 2052515..59f5430 100644 --- a/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__can_load_swap_layouts_from_a_different_file.snap +++ b/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__can_load_swap_layouts_from_a_different_file.snap @@ -29,6 +29,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, ], @@ -45,6 +46,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, [], @@ -100,6 +102,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, TiledPaneLayout { @@ -127,6 +130,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, TiledPaneLayout { @@ -148,6 +152,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, ], @@ -164,6 +169,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, ], @@ -180,6 +186,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, TiledPaneLayout { @@ -222,6 +229,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, ], @@ -238,6 +246,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, MaxPanes( @@ -286,6 +295,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, TiledPaneLayout { @@ -315,6 +325,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, TiledPaneLayout { @@ -338,6 +349,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, TiledPaneLayout { @@ -357,6 +369,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, TiledPaneLayout { @@ -376,6 +389,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, TiledPaneLayout { @@ -395,6 +409,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, ], @@ -411,6 +426,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, ], @@ -427,6 +443,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, ], @@ -443,6 +460,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, TiledPaneLayout { @@ -485,6 +503,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, ], @@ -501,6 +520,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, MaxPanes( @@ -549,6 +569,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, TiledPaneLayout { @@ -578,6 +599,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, TiledPaneLayout { @@ -601,6 +623,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, TiledPaneLayout { @@ -620,6 +643,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, TiledPaneLayout { @@ -639,6 +663,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, TiledPaneLayout { @@ -658,6 +683,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, ], @@ -674,6 +700,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, TiledPaneLayout { @@ -697,6 +724,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, TiledPaneLayout { @@ -716,6 +744,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, TiledPaneLayout { @@ -735,6 +764,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, TiledPaneLayout { @@ -754,6 +784,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, ], @@ -770,6 +801,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, ], @@ -786,6 +818,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, ], @@ -802,6 +835,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, TiledPaneLayout { @@ -844,6 +878,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, ], @@ -860,6 +895,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, }, diff --git a/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__children_not_as_first_child_of_pane_template.snap b/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__children_not_as_first_child_of_pane_template.snap index 918c753..44f06d4 100644 --- a/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__children_not_as_first_child_of_pane_template.snap +++ b/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__children_not_as_first_child_of_pane_template.snap @@ -39,6 +39,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, TiledPaneLayout { @@ -62,6 +63,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, TiledPaneLayout { @@ -81,6 +83,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, ], @@ -97,6 +100,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, ], @@ -113,6 +117,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, TiledPaneLayout { @@ -132,6 +137,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, ], @@ -148,6 +154,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, TiledPaneLayout { @@ -175,6 +182,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, ], @@ -193,6 +201,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, TiledPaneLayout { @@ -212,6 +221,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, ], @@ -228,6 +238,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, ], @@ -244,6 +255,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, [], diff --git a/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__children_not_as_first_child_of_tab_template.snap b/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__children_not_as_first_child_of_tab_template.snap index 53fd2a1..46e5f0a 100644 --- a/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__children_not_as_first_child_of_tab_template.snap +++ b/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__children_not_as_first_child_of_tab_template.snap @@ -34,6 +34,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, TiledPaneLayout { @@ -57,6 +58,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, TiledPaneLayout { @@ -76,6 +78,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, ], @@ -92,6 +95,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, ], @@ -108,6 +112,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, TiledPaneLayout { @@ -127,6 +132,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, ], @@ -143,6 +149,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, [], @@ -174,6 +181,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, ], @@ -192,6 +200,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, TiledPaneLayout { @@ -211,6 +220,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, ], @@ -227,6 +237,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, [], @@ -252,6 +263,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, [], diff --git a/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__close_on_exit_added_to_close_on_exit_in_template.snap b/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__close_on_exit_added_to_close_on_exit_in_template.snap index 3519de1..5fa239d 100644 --- a/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__close_on_exit_added_to_close_on_exit_in_template.snap +++ b/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__close_on_exit_added_to_close_on_exit_in_template.snap @@ -41,6 +41,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, TiledPaneLayout { @@ -72,6 +73,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, ], @@ -88,6 +90,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, [], diff --git a/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__close_on_exit_overrides_close_on_exit_in_template.snap b/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__close_on_exit_overrides_close_on_exit_in_template.snap index b633292..2fa63fb 100644 --- a/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__close_on_exit_overrides_close_on_exit_in_template.snap +++ b/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__close_on_exit_overrides_close_on_exit_in_template.snap @@ -41,6 +41,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, TiledPaneLayout { @@ -72,6 +73,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, ], @@ -88,6 +90,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, [], diff --git a/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__combined_tab_and_pane_template_both_with_children.snap b/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__combined_tab_and_pane_template_both_with_children.snap index fcb44b3..4fc7d42 100644 --- a/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__combined_tab_and_pane_template_both_with_children.snap +++ b/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__combined_tab_and_pane_template_both_with_children.snap @@ -34,6 +34,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, TiledPaneLayout { @@ -59,6 +60,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, ], @@ -75,6 +77,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, TiledPaneLayout { @@ -94,6 +97,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, ], @@ -110,6 +114,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, TiledPaneLayout { @@ -133,6 +138,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, TiledPaneLayout { @@ -152,6 +158,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, ], @@ -168,6 +175,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, ], @@ -184,6 +192,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, [], @@ -215,6 +224,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, TiledPaneLayout { @@ -240,6 +250,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, ], @@ -256,6 +267,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, TiledPaneLayout { @@ -275,6 +287,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, ], @@ -291,6 +304,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, TiledPaneLayout { @@ -310,6 +324,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, ], @@ -326,6 +341,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, [], @@ -351,6 +367,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, [], diff --git a/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__cwd_added_to_cwd_in_template.snap b/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__cwd_added_to_cwd_in_template.snap index e275d79..a8510eb 100644 --- a/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__cwd_added_to_cwd_in_template.snap +++ b/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__cwd_added_to_cwd_in_template.snap @@ -41,6 +41,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, TiledPaneLayout { @@ -74,6 +75,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, ], @@ -90,6 +92,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, [], diff --git a/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__cwd_override_cwd_in_template.snap b/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__cwd_override_cwd_in_template.snap index c7166e4..965a086 100644 --- a/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__cwd_override_cwd_in_template.snap +++ b/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__cwd_override_cwd_in_template.snap @@ -43,6 +43,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, TiledPaneLayout { @@ -76,6 +77,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, ], @@ -92,6 +94,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, [], diff --git a/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__env_var_expansion.snap b/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__env_var_expansion.snap index 0c9cc6e..62a937b 100644 --- a/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__env_var_expansion.snap +++ b/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__env_var_expansion.snap @@ -32,6 +32,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, TiledPaneLayout { @@ -55,6 +56,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, TiledPaneLayout { @@ -78,6 +80,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, TiledPaneLayout { @@ -101,6 +104,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, TiledPaneLayout { @@ -134,6 +138,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, TiledPaneLayout { @@ -161,6 +166,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, TiledPaneLayout { @@ -188,6 +194,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, TiledPaneLayout { @@ -221,6 +228,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, TiledPaneLayout { @@ -248,6 +256,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, ], @@ -268,6 +277,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, [], @@ -301,6 +311,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, TiledPaneLayout { @@ -324,6 +335,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, TiledPaneLayout { @@ -347,6 +359,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, TiledPaneLayout { @@ -370,6 +383,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, TiledPaneLayout { @@ -403,6 +417,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, TiledPaneLayout { @@ -430,6 +445,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, TiledPaneLayout { @@ -457,6 +473,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, TiledPaneLayout { @@ -490,6 +507,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, TiledPaneLayout { @@ -517,6 +535,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, ], @@ -537,6 +556,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, [], diff --git a/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__global_cwd_and_tab_cwd_prepended_to_panes_with_and_without_cwd.snap b/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__global_cwd_and_tab_cwd_prepended_to_panes_with_and_without_cwd.snap index 2484784..4cc5900 100644 --- a/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__global_cwd_and_tab_cwd_prepended_to_panes_with_and_without_cwd.snap +++ b/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__global_cwd_and_tab_cwd_prepended_to_panes_with_and_without_cwd.snap @@ -32,6 +32,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, TiledPaneLayout { @@ -65,6 +66,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, ], @@ -85,6 +87,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, [], @@ -110,6 +113,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, [], diff --git a/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__global_cwd_and_tab_cwd_prepended_to_panes_with_and_without_cwd_in_pane_templates.snap b/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__global_cwd_and_tab_cwd_prepended_to_panes_with_and_without_cwd_in_pane_templates.snap index bd34f60..28a4a86 100644 --- a/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__global_cwd_and_tab_cwd_prepended_to_panes_with_and_without_cwd_in_pane_templates.snap +++ b/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__global_cwd_and_tab_cwd_prepended_to_panes_with_and_without_cwd_in_pane_templates.snap @@ -36,6 +36,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, TiledPaneLayout { @@ -69,6 +70,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, TiledPaneLayout { @@ -96,6 +98,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, ], @@ -116,6 +119,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, ], @@ -136,6 +140,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, ], @@ -156,6 +161,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, [], @@ -181,6 +187,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, [], diff --git a/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__global_cwd_and_tab_cwd_prepended_to_panes_with_and_without_cwd_in_tab_templates.snap b/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__global_cwd_and_tab_cwd_prepended_to_panes_with_and_without_cwd_in_tab_templates.snap index 4a9b97d..7adc51a 100644 --- a/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__global_cwd_and_tab_cwd_prepended_to_panes_with_and_without_cwd_in_tab_templates.snap +++ b/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__global_cwd_and_tab_cwd_prepended_to_panes_with_and_without_cwd_in_tab_templates.snap @@ -32,6 +32,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, TiledPaneLayout { @@ -65,6 +66,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, TiledPaneLayout { @@ -92,6 +94,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, ], @@ -112,6 +115,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, ], @@ -132,6 +136,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, [], @@ -157,6 +162,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, [], diff --git a/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__global_cwd_given_to_panes_without_cwd.snap b/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__global_cwd_given_to_panes_without_cwd.snap index 1f83ec0..7cd1130 100644 --- a/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__global_cwd_given_to_panes_without_cwd.snap +++ b/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__global_cwd_given_to_panes_without_cwd.snap @@ -32,6 +32,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, TiledPaneLayout { @@ -65,6 +66,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, ], @@ -85,6 +87,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, [], @@ -118,6 +121,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, TiledPaneLayout { @@ -151,6 +155,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, ], @@ -171,6 +176,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, [], diff --git a/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__global_cwd_passed_from_layout_constructor.snap b/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__global_cwd_passed_from_layout_constructor.snap index 9fbb612..96f37cf 100644 --- a/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__global_cwd_passed_from_layout_constructor.snap +++ b/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__global_cwd_passed_from_layout_constructor.snap @@ -33,6 +33,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, TiledPaneLayout { @@ -66,6 +67,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, ], @@ -86,6 +88,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, [], diff --git a/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__global_cwd_passed_from_layout_constructor_overrides_global_cwd_in_layout_file.snap b/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__global_cwd_passed_from_layout_constructor_overrides_global_cwd_in_layout_file.snap index e0f04a8..c1b6325 100644 --- a/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__global_cwd_passed_from_layout_constructor_overrides_global_cwd_in_layout_file.snap +++ b/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__global_cwd_passed_from_layout_constructor_overrides_global_cwd_in_layout_file.snap @@ -32,6 +32,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, TiledPaneLayout { @@ -65,6 +66,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, ], @@ -85,6 +87,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, [], @@ -118,6 +121,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, TiledPaneLayout { @@ -151,6 +155,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, ], @@ -171,6 +176,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, [], diff --git a/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__global_cwd_prepended_to_panes_with_cwd.snap b/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__global_cwd_prepended_to_panes_with_cwd.snap index 480d865..788695f 100644 --- a/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__global_cwd_prepended_to_panes_with_cwd.snap +++ b/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__global_cwd_prepended_to_panes_with_cwd.snap @@ -32,6 +32,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, TiledPaneLayout { @@ -65,6 +66,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, ], @@ -85,6 +87,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, [], @@ -118,6 +121,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, TiledPaneLayout { @@ -151,6 +155,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, ], @@ -171,6 +176,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, [], diff --git a/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__global_cwd_with_tab_cwd_given_to_panes_without_cwd.snap b/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__global_cwd_with_tab_cwd_given_to_panes_without_cwd.snap index ed225c3..1f0425f 100644 --- a/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__global_cwd_with_tab_cwd_given_to_panes_without_cwd.snap +++ b/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__global_cwd_with_tab_cwd_given_to_panes_without_cwd.snap @@ -32,6 +32,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, TiledPaneLayout { @@ -65,6 +66,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, ], @@ -85,6 +87,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, [], @@ -110,6 +113,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, [], diff --git a/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__layout_with_command_panes_and_close_on_exit.snap b/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__layout_with_command_panes_and_close_on_exit.snap index 5ee19a7..a47af21 100644 --- a/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__layout_with_command_panes_and_close_on_exit.snap +++ b/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__layout_with_command_panes_and_close_on_exit.snap @@ -41,6 +41,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, ], @@ -57,6 +58,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, [], diff --git a/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__layout_with_command_panes_and_start_suspended.snap b/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__layout_with_command_panes_and_start_suspended.snap index cab76d8..a6bb767 100644 --- a/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__layout_with_command_panes_and_start_suspended.snap +++ b/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__layout_with_command_panes_and_start_suspended.snap @@ -41,6 +41,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, ], @@ -57,6 +58,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, [], diff --git a/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__layout_with_default_tab_template.snap b/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__layout_with_default_tab_template.snap index b798af4..cb3274b 100644 --- a/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__layout_with_default_tab_template.snap +++ b/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__layout_with_default_tab_template.snap @@ -30,6 +30,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, TiledPaneLayout { @@ -53,6 +54,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, TiledPaneLayout { @@ -72,6 +74,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, ], @@ -88,6 +91,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, TiledPaneLayout { @@ -107,6 +111,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, ], @@ -123,6 +128,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, [], @@ -152,6 +158,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, TiledPaneLayout { @@ -175,6 +182,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, TiledPaneLayout { @@ -194,6 +202,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, ], @@ -210,6 +219,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, TiledPaneLayout { @@ -229,6 +239,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, ], @@ -245,6 +256,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, [], @@ -272,6 +284,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, TiledPaneLayout { @@ -291,6 +304,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, TiledPaneLayout { @@ -310,6 +324,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, ], @@ -326,6 +341,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, [], @@ -355,6 +371,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, TiledPaneLayout { @@ -374,6 +391,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, TiledPaneLayout { @@ -393,6 +411,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, ], @@ -409,6 +428,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, [], diff --git a/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__layout_with_nested_branched_pane_templates.snap b/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__layout_with_nested_branched_pane_templates.snap index af501ef..9c7a4f5 100644 --- a/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__layout_with_nested_branched_pane_templates.snap +++ b/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__layout_with_nested_branched_pane_templates.snap @@ -33,6 +33,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, TiledPaneLayout { @@ -52,6 +53,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, TiledPaneLayout { @@ -75,6 +77,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, TiledPaneLayout { @@ -94,6 +97,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, ], @@ -110,6 +114,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, TiledPaneLayout { @@ -133,6 +138,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, TiledPaneLayout { @@ -152,6 +158,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, TiledPaneLayout { @@ -171,6 +178,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, ], @@ -187,6 +195,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, ], @@ -203,6 +212,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, ], @@ -219,6 +229,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, [], diff --git a/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__layout_with_nested_pane_templates.snap b/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__layout_with_nested_pane_templates.snap index d04877e..180386a 100644 --- a/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__layout_with_nested_pane_templates.snap +++ b/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__layout_with_nested_pane_templates.snap @@ -33,6 +33,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, TiledPaneLayout { @@ -52,6 +53,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, TiledPaneLayout { @@ -75,6 +77,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, TiledPaneLayout { @@ -94,6 +97,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, ], @@ -110,6 +114,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, TiledPaneLayout { @@ -129,6 +134,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, ], @@ -145,6 +151,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, ], @@ -161,6 +168,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, [], diff --git a/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__layout_with_new_tab_template.snap b/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__layout_with_new_tab_template.snap index 841d372..032b396 100644 --- a/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__layout_with_new_tab_template.snap +++ b/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__layout_with_new_tab_template.snap @@ -30,6 +30,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, TiledPaneLayout { @@ -49,6 +50,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, ], @@ -65,6 +67,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, [], @@ -94,6 +97,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, TiledPaneLayout { @@ -113,6 +117,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, ], @@ -129,6 +134,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, [], @@ -152,6 +158,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, [], @@ -185,6 +192,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, TiledPaneLayout { @@ -204,6 +212,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, ], @@ -220,6 +229,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, ], @@ -236,6 +246,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, [], diff --git a/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__layout_with_pane_excluded_from_sync.snap b/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__layout_with_pane_excluded_from_sync.snap index 2087e1b..8c9000a 100644 --- a/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__layout_with_pane_excluded_from_sync.snap +++ b/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__layout_with_pane_excluded_from_sync.snap @@ -31,6 +31,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, ], @@ -47,6 +48,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, [], diff --git a/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__layout_with_pane_templates.snap b/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__layout_with_pane_templates.snap index a3b308e..2ce37e0 100644 --- a/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__layout_with_pane_templates.snap +++ b/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__layout_with_pane_templates.snap @@ -33,6 +33,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, TiledPaneLayout { @@ -56,6 +57,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, ], @@ -72,6 +74,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, TiledPaneLayout { @@ -91,6 +94,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, ], @@ -107,6 +111,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, TiledPaneLayout { @@ -130,6 +135,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, TiledPaneLayout { @@ -153,6 +159,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, TiledPaneLayout { @@ -172,6 +179,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, ], @@ -188,6 +196,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, TiledPaneLayout { @@ -207,6 +216,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, ], @@ -223,6 +233,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, TiledPaneLayout { @@ -246,6 +257,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, TiledPaneLayout { @@ -269,6 +281,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, TiledPaneLayout { @@ -288,6 +301,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, ], @@ -304,6 +318,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, TiledPaneLayout { @@ -323,6 +338,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, ], @@ -339,6 +355,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, TiledPaneLayout { @@ -362,6 +379,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, TiledPaneLayout { @@ -381,6 +399,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, TiledPaneLayout { @@ -400,6 +419,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, ], @@ -416,6 +436,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, ], @@ -432,6 +453,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, [], diff --git a/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__layout_with_tab_and_pane_templates.snap b/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__layout_with_tab_and_pane_templates.snap index 5b197ba..65dbbfa 100644 --- a/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__layout_with_tab_and_pane_templates.snap +++ b/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__layout_with_tab_and_pane_templates.snap @@ -32,6 +32,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, TiledPaneLayout { @@ -67,6 +68,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, ], @@ -83,6 +85,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, TiledPaneLayout { @@ -102,6 +105,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, ], @@ -118,6 +122,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, ], @@ -134,6 +139,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, [], @@ -159,6 +165,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, [], diff --git a/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__layout_with_tabs_and_floating_panes.snap b/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__layout_with_tabs_and_floating_panes.snap index 1cf15cd..9d44267 100644 --- a/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__layout_with_tabs_and_floating_panes.snap +++ b/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__layout_with_tabs_and_floating_panes.snap @@ -28,6 +28,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, ], @@ -44,6 +45,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, [ @@ -88,6 +90,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, ], @@ -104,6 +107,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, [ @@ -162,6 +166,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, [], diff --git a/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__pane_template_command_with_cwd_is_overriden_by_its_consumers_bare_cwd.snap b/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__pane_template_command_with_cwd_is_overriden_by_its_consumers_bare_cwd.snap index 93552fa..1c1d622 100644 --- a/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__pane_template_command_with_cwd_is_overriden_by_its_consumers_bare_cwd.snap +++ b/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__pane_template_command_with_cwd_is_overriden_by_its_consumers_bare_cwd.snap @@ -42,6 +42,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, ], @@ -62,6 +63,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, [], @@ -105,6 +107,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, ], @@ -125,6 +128,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, [], diff --git a/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__pane_template_command_with_cwd_overriden_by_its_consumers_command_cwd.snap b/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__pane_template_command_with_cwd_overriden_by_its_consumers_command_cwd.snap index a3d109a..7716b9a 100644 --- a/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__pane_template_command_with_cwd_overriden_by_its_consumers_command_cwd.snap +++ b/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__pane_template_command_with_cwd_overriden_by_its_consumers_command_cwd.snap @@ -42,6 +42,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, ], @@ -62,6 +63,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, [], @@ -105,6 +107,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, ], @@ -125,6 +128,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, [], diff --git a/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__pane_template_command_with_cwd_remains_when_its_consumer_command_does_not_have_a_cwd.snap b/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__pane_template_command_with_cwd_remains_when_its_consumer_command_does_not_have_a_cwd.snap index 435ba24..2f291be 100644 --- a/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__pane_template_command_with_cwd_remains_when_its_consumer_command_does_not_have_a_cwd.snap +++ b/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__pane_template_command_with_cwd_remains_when_its_consumer_command_does_not_have_a_cwd.snap @@ -42,6 +42,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, ], @@ -62,6 +63,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, [], @@ -105,6 +107,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, ], @@ -125,6 +128,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, [], diff --git a/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__pane_template_command_without_cwd_is_overriden_by_its_consumers_cwd.snap b/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__pane_template_command_without_cwd_is_overriden_by_its_consumers_cwd.snap index 201b14d..9f13788 100644 --- a/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__pane_template_command_without_cwd_is_overriden_by_its_consumers_cwd.snap +++ b/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__pane_template_command_without_cwd_is_overriden_by_its_consumers_cwd.snap @@ -42,6 +42,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, ], @@ -62,6 +63,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, [], @@ -105,6 +107,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, ], @@ -125,6 +128,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, [], diff --git a/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__pane_template_command_without_cwd_receives_its_consumers_bare_cwd.snap b/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__pane_template_command_without_cwd_receives_its_consumers_bare_cwd.snap index a22a91f..d12e797 100644 --- a/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__pane_template_command_without_cwd_receives_its_consumers_bare_cwd.snap +++ b/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__pane_template_command_without_cwd_receives_its_consumers_bare_cwd.snap @@ -42,6 +42,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, ], @@ -62,6 +63,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, [], @@ -105,6 +107,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, ], @@ -125,6 +128,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, [], diff --git a/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__pane_template_with_bare_cwd_overriden_by_its_consumers_bare_cwd.snap b/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__pane_template_with_bare_cwd_overriden_by_its_consumers_bare_cwd.snap index c56bb26..33d7e38 100644 --- a/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__pane_template_with_bare_cwd_overriden_by_its_consumers_bare_cwd.snap +++ b/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__pane_template_with_bare_cwd_overriden_by_its_consumers_bare_cwd.snap @@ -32,6 +32,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, ], @@ -52,6 +53,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, [], @@ -85,6 +87,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, ], @@ -105,6 +108,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, [], diff --git a/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__pane_template_with_bare_propagated_to_its_consumer_command_with_cwd.snap b/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__pane_template_with_bare_propagated_to_its_consumer_command_with_cwd.snap index 9deba7e..60b1752 100644 --- a/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__pane_template_with_bare_propagated_to_its_consumer_command_with_cwd.snap +++ b/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__pane_template_with_bare_propagated_to_its_consumer_command_with_cwd.snap @@ -42,6 +42,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, ], @@ -62,6 +63,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, [], @@ -105,6 +107,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, ], @@ -125,6 +128,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, [], diff --git a/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__pane_template_with_bare_propagated_to_its_consumer_command_without_cwd.snap b/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__pane_template_with_bare_propagated_to_its_consumer_command_without_cwd.snap index c170126..85ab2c2 100644 --- a/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__pane_template_with_bare_propagated_to_its_consumer_command_without_cwd.snap +++ b/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__pane_template_with_bare_propagated_to_its_consumer_command_without_cwd.snap @@ -42,6 +42,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, ], @@ -62,6 +63,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, [], @@ -105,6 +107,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, ], @@ -125,6 +128,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, [], diff --git a/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__pane_template_with_bare_propagated_to_its_consumer_edit.snap b/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__pane_template_with_bare_propagated_to_its_consumer_edit.snap index e6aea2c..d17d552 100644 --- a/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__pane_template_with_bare_propagated_to_its_consumer_edit.snap +++ b/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__pane_template_with_bare_propagated_to_its_consumer_edit.snap @@ -36,6 +36,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, ], @@ -56,6 +57,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, [], @@ -93,6 +95,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, ], @@ -113,6 +116,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, [], diff --git a/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__pane_template_with_command_propagated_to_its_consumer_edit.snap b/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__pane_template_with_command_propagated_to_its_consumer_edit.snap index 6388aec..7a8ad8e 100644 --- a/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__pane_template_with_command_propagated_to_its_consumer_edit.snap +++ b/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__pane_template_with_command_propagated_to_its_consumer_edit.snap @@ -36,6 +36,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, ], @@ -56,6 +57,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, [], @@ -93,6 +95,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, ], @@ -113,6 +116,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, [], diff --git a/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__tab_cwd_given_to_panes_without_cwd.snap b/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__tab_cwd_given_to_panes_without_cwd.snap index 290ce3b..cef9310 100644 --- a/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__tab_cwd_given_to_panes_without_cwd.snap +++ b/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__tab_cwd_given_to_panes_without_cwd.snap @@ -32,6 +32,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, TiledPaneLayout { @@ -65,6 +66,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, ], @@ -85,6 +87,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, [], @@ -110,6 +113,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, [], diff --git a/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__tab_cwd_prepended_to_panes_with_cwd.snap b/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__tab_cwd_prepended_to_panes_with_cwd.snap index 92dd75c..103e37c 100644 --- a/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__tab_cwd_prepended_to_panes_with_cwd.snap +++ b/sl0ppij/zellij-utils/src/input/unit/snapshots/zellij_utils__input__layout__layout_test__tab_cwd_prepended_to_panes_with_cwd.snap @@ -32,6 +32,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, TiledPaneLayout { @@ -65,6 +66,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, ], @@ -85,6 +87,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, [], @@ -110,6 +113,7 @@ Layout { pane_initial_contents: None, default_fg: None, default_bg: None, + status_bar: None, children_arrangement: None, }, [], diff --git a/sl0ppij/zellij-utils/src/ipc/protobuf_conversion.rs b/sl0ppij/zellij-utils/src/ipc/protobuf_conversion.rs index 26c78f9..f8034ba 100644 --- a/sl0ppij/zellij-utils/src/ipc/protobuf_conversion.rs +++ b/sl0ppij/zellij-utils/src/ipc/protobuf_conversion.rs @@ -4519,6 +4519,8 @@ impl TryFrom<crate::client_server_contract::client_server_contract::TiledPaneLay default_fg: layout.default_fg, default_bg: layout.default_bg, // no protobuf representation, same as default_fg/default_bg + // no protobuf representation, same as children_arrangement + status_bar: None, children_arrangement: None, }) } diff --git a/sl0ppij/zellij-utils/src/kdl/kdl_layout_parser.rs b/sl0ppij/zellij-utils/src/kdl/kdl_layout_parser.rs index 21fdc74..1032ee3 100644 --- a/sl0ppij/zellij-utils/src/kdl/kdl_layout_parser.rs +++ b/sl0ppij/zellij-utils/src/kdl/kdl_layout_parser.rs @@ -109,6 +109,7 @@ impl<'a> KdlLayoutParser<'a> { || property_name == "default_fg" || property_name == "default_bg" || property_name == "arrangement" + || property_name == "status_bar" } fn is_a_valid_floating_pane_property(&self, property_name: &str) -> bool { property_name == "borderless" @@ -572,6 +573,12 @@ impl<'a> KdlLayoutParser<'a> { .map(|s| s.to_string()); let default_bg = kdl_get_string_property_or_child_value_with_error!(kdl_node, "default_bg") .map(|s| s.to_string()); + // Restored from a serialised session. Sanitised again on the way in: a + // layout file on disk is no more trustworthy than the escape sequence + // that produced it, and it may have been hand-edited since. + let status_bar = kdl_get_string_property_or_child_value_with_error!(kdl_node, "status_bar") + .map(|s| crate::input::layout::sanitize_status_bar_text(s)) + .filter(|s| !s.is_empty()); let children_arrangement = match kdl_get_string_property_or_child_value_with_error!(kdl_node, "arrangement") { Some(raw) => match PaneArrangement::from_str(raw) { @@ -630,6 +637,7 @@ impl<'a> KdlLayoutParser<'a> { pane_initial_contents, default_fg, default_bg, + status_bar, children_arrangement, ..Default::default() }) diff --git a/sl0ppij/zellij-utils/src/plugin_api/action.rs b/sl0ppij/zellij-utils/src/plugin_api/action.rs index 9766cc5..3ee610d 100644 --- a/sl0ppij/zellij-utils/src/plugin_api/action.rs +++ b/sl0ppij/zellij-utils/src/plugin_api/action.rs @@ -3114,6 +3114,8 @@ impl TryFrom<ProtobufTiledPaneLayout> for TiledPaneLayout { default_fg: None, default_bg: None, // no protobuf representation, same as default_fg/default_bg above + // no protobuf representation, same as children_arrangement + status_bar: None, children_arrangement: None, }) } diff --git a/sl0ppij/zellij-utils/src/session_serialization.rs b/sl0ppij/zellij-utils/src/session_serialization.rs index f79cdf3..279dfde 100644 --- a/sl0ppij/zellij-utils/src/session_serialization.rs +++ b/sl0ppij/zellij-utils/src/session_serialization.rs @@ -38,6 +38,7 @@ pub struct PaneLayoutManifest { pub pane_contents: Option<String>, pub default_fg: Option<String>, pub default_bg: Option<String>, + pub status_bar: Option<String>, } pub fn serialize_session_layout( @@ -194,6 +195,11 @@ fn serialize_tiled_pane( .entries_mut() .push(KdlEntry::new_prop("default_bg", bg.to_owned())); } + if let Some(ref status_bar) = layout.status_bar { + tiled_pane_node + .entries_mut() + .push(KdlEntry::new_prop("status_bar", status_bar.to_owned())); + } let has_child_attributes = !layout.children.is_empty() || layout.external_children_index.is_some() || !args.is_empty() @@ -741,6 +747,7 @@ fn tiled_pane_layout_from_manifest( pane_initial_contents, default_fg, default_bg, + status_bar, ) = manifest .map(|g| { let mut run = g.run.clone(); @@ -760,9 +767,10 @@ fn tiled_pane_layout_from_manifest( g.pane_contents.clone(), g.default_fg.clone(), g.default_bg.clone(), + g.status_bar.clone(), ) }) - .unwrap_or((None, None, false, None, None, None, None, None)); + .unwrap_or((None, None, false, None, None, None, None, None, None)); TiledPaneLayout { split_size, run, @@ -773,6 +781,7 @@ fn tiled_pane_layout_from_manifest( pane_initial_contents, default_fg, default_bg, + status_bar, ..Default::default() } } @@ -1178,6 +1187,69 @@ mod tests { ]; #[test] + fn sl0p_status_bar_survives_serialisation_and_parses_back() { + // The whole point of serialising it: a resurrected pane should come back + // showing what it showed when the session was last alive. + // a full geometry set, since the serialiser needs one that forms a valid + // layout tree + let panes: Vec<PaneLayoutManifest> = PANEGEOMS_JSON[0] + .iter() + .map(|pg| parse_panegeom_from_json(pg)) + .enumerate() + .map(|(i, geom)| PaneLayoutManifest { + geom, + status_bar: if i == 1 { + Some(String::from("building 3/7")) + } else { + None + }, + ..Default::default() + }) + .collect(); + let tab_layout_manifest = TabLayoutManifest { + tiled_panes: panes, + ..Default::default() + }; + let global = GlobalLayoutManifest { + tabs: vec![(String::from("Tab #1"), tab_layout_manifest)], + ..Default::default() + }; + let (kdl, _) = serialize_session_layout(global).expect("serialisation failed"); + assert!( + kdl.contains("status_bar=\"building 3/7\""), + "status_bar should be written into the serialised layout, got:\n{}", + kdl + ); + + // and it must come back out through the normal layout parser + let layout = + crate::input::layout::Layout::from_kdl(&kdl, Some("session.kdl".into()), None, None) + .expect("the serialised layout should parse"); + let found = layout + .tabs + .iter() + .flat_map(|(_name, tiled, _floating)| collect_status_bars(tiled)) + .collect::<Vec<String>>(); + assert_eq!( + found, + vec![String::from("building 3/7")], + "the parsed layout should carry the status bar back" + ); + } + + #[cfg(test)] + fn collect_status_bars(layout: &crate::input::layout::TiledPaneLayout) -> Vec<String> { + let mut found = vec![]; + if let Some(status_bar) = &layout.status_bar { + found.push(status_bar.clone()); + } + for child in &layout.children { + found.extend(collect_status_bars(child)); + } + found + } + + #[test] fn geoms() { let geoms = PANEGEOMS_JSON[0] .iter() |
