diff --git a/src/tests/e2e/remote_runner.rs b/src/tests/e2e/remote_runner.rs index e5c7d2ef..2b6d8229 100644 --- a/src/tests/e2e/remote_runner.rs +++ b/src/tests/e2e/remote_runner.rs @@ -189,6 +189,7 @@ fn read_from_channel( width: 8, }))); let sixel_image_store = Rc::new(RefCell::new(SixelImageStore::default())); + let debug = false; let mut terminal_output = TerminalPane::new( 0, pane_geom, @@ -202,6 +203,7 @@ fn read_from_channel( Rc::new(RefCell::new(HashMap::new())), None, None, + debug, ); // 0 is the pane index loop { if !should_keep_running.load(Ordering::SeqCst) { diff --git a/zellij-server/src/lib.rs b/zellij-server/src/lib.rs index 9707e61e..53a08f65 100644 --- a/zellij-server/src/lib.rs +++ b/zellij-server/src/lib.rs @@ -749,12 +749,14 @@ fn init_session( let max_panes = opts.max_panes; let client_attributes_clone = client_attributes.clone(); + let debug = opts.debug; move || { screen_thread_main( screen_bus, max_panes, client_attributes_clone, config_options, + debug, ) .fatal(); } diff --git a/zellij-server/src/panes/grid.rs b/zellij-server/src/panes/grid.rs index 6f44f6eb..cf006d42 100644 --- a/zellij-server/src/panes/grid.rs +++ b/zellij-server/src/panes/grid.rs @@ -370,6 +370,7 @@ pub struct Grid { pub focus_event_tracking: bool, pub search_results: SearchResult, pub pending_clipboard_update: Option, + debug: bool, } #[derive(Clone, Debug)] @@ -457,6 +458,7 @@ impl Grid { link_handler: Rc>, character_cell_size: Rc>>, sixel_image_store: Rc>, + debug: bool, ) -> Self { let sixel_grid = SixelGrid::new(character_cell_size.clone(), sixel_image_store); Grid { @@ -505,6 +507,7 @@ impl Grid { search_results: Default::default(), sixel_grid, pending_clipboard_update: None, + debug, } } pub fn render_full_viewport(&mut self) { @@ -2157,7 +2160,9 @@ impl Perform for Grid { self.set_active_charset(CharsetIndex::G0); }, _ => { - log::warn!("Unhandled execute: {:?}", byte); + if self.debug { + log::warn!("Unhandled execute: {:?}", byte); + } }, } } @@ -2386,7 +2391,9 @@ impl Perform for Grid { }, _ => { - log::warn!("Unhandled osc: {:?}", params); + if self.debug { + log::warn!("Unhandled osc: {:?}", params); + } }, } } @@ -2912,7 +2919,9 @@ impl Perform for Grid { _ => {}, } } else { - log::warn!("Unhandled csi: {}->{:?}", c, params); + if self.debug { + log::warn!("Unhandled csi: {}->{:?}", c, params); + } } } @@ -2994,7 +3003,9 @@ impl Perform for Grid { self.fill_viewport(fill_character); }, _ => { - log::warn!("Unhandled esc_dispatch: {}->{:?}", byte, intermediates); + if self.debug { + log::warn!("Unhandled esc_dispatch: {}->{:?}", byte, intermediates); + } }, } } diff --git a/zellij-server/src/panes/plugin_pane.rs b/zellij-server/src/panes/plugin_pane.rs index 28fdb3d1..d1d595f2 100644 --- a/zellij-server/src/panes/plugin_pane.rs +++ b/zellij-server/src/panes/plugin_pane.rs @@ -39,6 +39,7 @@ macro_rules! get_or_create_grid { $self.link_handler.clone(), $self.character_cell_size.clone(), $self.sixel_image_store.clone(), + $self.debug, ); grid.hide_cursor(); grid @@ -72,6 +73,7 @@ pub(crate) struct PluginPane { pane_frame_color_override: Option<(PaletteColor, Option)>, invoked_with: Option, loading_indication: LoadingIndication, + debug: bool, } impl PluginPane { @@ -89,6 +91,7 @@ impl PluginPane { currently_connected_clients: Vec, style: Style, invoked_with: Option, + debug: bool, ) -> Self { let loading_indication = LoadingIndication::new(title.clone()).with_colors(style.colors); let initial_loading_message = loading_indication.to_string(); @@ -118,6 +121,7 @@ impl PluginPane { pane_frame_color_override: None, invoked_with, loading_indication, + debug, }; for client_id in currently_connected_clients { plugin.handle_plugin_bytes(client_id, initial_loading_message.as_bytes().to_vec()); diff --git a/zellij-server/src/panes/terminal_character.rs b/zellij-server/src/panes/terminal_character.rs index db0018c0..23ea1a52 100644 --- a/zellij-server/src/panes/terminal_character.rs +++ b/zellij-server/src/panes/terminal_character.rs @@ -398,7 +398,6 @@ impl CharacterStyles { *self = self.background(Some(AnsiCode::NamedColor(NamedColor::BrightWhite))) }, _ => { - log::warn!("unhandled csi m code {:?}", param); return; }, } diff --git a/zellij-server/src/panes/terminal_pane.rs b/zellij-server/src/panes/terminal_pane.rs index 0c1b5507..c9e125b8 100644 --- a/zellij-server/src/panes/terminal_pane.rs +++ b/zellij-server/src/panes/terminal_pane.rs @@ -737,6 +737,7 @@ impl TerminalPane { terminal_emulator_color_codes: Rc>>, initial_pane_title: Option, invoked_with: Option, + debug: bool, ) -> TerminalPane { let initial_pane_title = initial_pane_title.unwrap_or_else(|| format!("Pane #{}", pane_index)); @@ -748,6 +749,7 @@ impl TerminalPane { link_handler, character_cell_size, sixel_image_store, + debug, ); TerminalPane { frame: HashMap::new(), diff --git a/zellij-server/src/panes/unit/grid_tests.rs b/zellij-server/src/panes/unit/grid_tests.rs index 66f0773f..3b186474 100644 --- a/zellij-server/src/panes/unit/grid_tests.rs +++ b/zellij-server/src/panes/unit/grid_tests.rs @@ -24,6 +24,7 @@ fn vttest1_0() { let mut vte_parser = vte::Parser::new(); let sixel_image_store = Rc::new(RefCell::new(SixelImageStore::default())); let terminal_emulator_color_codes = Rc::new(RefCell::new(HashMap::new())); + let debug = false; let mut grid = Grid::new( 41, 110, @@ -32,6 +33,7 @@ fn vttest1_0() { Rc::new(RefCell::new(LinkHandler::new())), Rc::new(RefCell::new(None)), sixel_image_store, + debug, ); let fixture_name = "vttest1-0"; let content = read_fixture(fixture_name); @@ -46,6 +48,7 @@ fn vttest1_1() { let mut vte_parser = vte::Parser::new(); let sixel_image_store = Rc::new(RefCell::new(SixelImageStore::default())); let terminal_emulator_color_codes = Rc::new(RefCell::new(HashMap::new())); + let debug = false; let mut grid = Grid::new( 41, 110, @@ -54,6 +57,7 @@ fn vttest1_1() { Rc::new(RefCell::new(LinkHandler::new())), Rc::new(RefCell::new(None)), sixel_image_store, + debug, ); let fixture_name = "vttest1-1"; let content = read_fixture(fixture_name); @@ -68,6 +72,7 @@ fn vttest1_2() { let mut vte_parser = vte::Parser::new(); let sixel_image_store = Rc::new(RefCell::new(SixelImageStore::default())); let terminal_emulator_color_codes = Rc::new(RefCell::new(HashMap::new())); + let debug = false; let mut grid = Grid::new( 41, 110, @@ -76,6 +81,7 @@ fn vttest1_2() { Rc::new(RefCell::new(LinkHandler::new())), Rc::new(RefCell::new(None)), sixel_image_store, + debug, ); let fixture_name = "vttest1-2"; let content = read_fixture(fixture_name); @@ -90,6 +96,7 @@ fn vttest1_3() { let mut vte_parser = vte::Parser::new(); let sixel_image_store = Rc::new(RefCell::new(SixelImageStore::default())); let terminal_emulator_color_codes = Rc::new(RefCell::new(HashMap::new())); + let debug = false; let mut grid = Grid::new( 41, 110, @@ -98,6 +105,7 @@ fn vttest1_3() { Rc::new(RefCell::new(LinkHandler::new())), Rc::new(RefCell::new(None)), sixel_image_store, + debug, ); let fixture_name = "vttest1-3"; let content = read_fixture(fixture_name); @@ -112,6 +120,7 @@ fn vttest1_4() { let mut vte_parser = vte::Parser::new(); let sixel_image_store = Rc::new(RefCell::new(SixelImageStore::default())); let terminal_emulator_color_codes = Rc::new(RefCell::new(HashMap::new())); + let debug = false; let mut grid = Grid::new( 41, 110, @@ -120,6 +129,7 @@ fn vttest1_4() { Rc::new(RefCell::new(LinkHandler::new())), Rc::new(RefCell::new(None)), sixel_image_store, + debug, ); let fixture_name = "vttest1-4"; let content = read_fixture(fixture_name); @@ -134,6 +144,7 @@ fn vttest1_5() { let mut vte_parser = vte::Parser::new(); let sixel_image_store = Rc::new(RefCell::new(SixelImageStore::default())); let terminal_emulator_color_codes = Rc::new(RefCell::new(HashMap::new())); + let debug = false; let mut grid = Grid::new( 41, 110, @@ -142,6 +153,7 @@ fn vttest1_5() { Rc::new(RefCell::new(LinkHandler::new())), Rc::new(RefCell::new(None)), sixel_image_store, + debug, ); let fixture_name = "vttest1-5"; let content = read_fixture(fixture_name); @@ -156,6 +168,7 @@ fn vttest2_0() { let mut vte_parser = vte::Parser::new(); let sixel_image_store = Rc::new(RefCell::new(SixelImageStore::default())); let terminal_emulator_color_codes = Rc::new(RefCell::new(HashMap::new())); + let debug = false; let mut grid = Grid::new( 41, 110, @@ -164,6 +177,7 @@ fn vttest2_0() { Rc::new(RefCell::new(LinkHandler::new())), Rc::new(RefCell::new(None)), sixel_image_store, + debug, ); let fixture_name = "vttest2-0"; let content = read_fixture(fixture_name); @@ -178,6 +192,7 @@ fn vttest2_1() { let mut vte_parser = vte::Parser::new(); let sixel_image_store = Rc::new(RefCell::new(SixelImageStore::default())); let terminal_emulator_color_codes = Rc::new(RefCell::new(HashMap::new())); + let debug = false; let mut grid = Grid::new( 41, 110, @@ -186,6 +201,7 @@ fn vttest2_1() { Rc::new(RefCell::new(LinkHandler::new())), Rc::new(RefCell::new(None)), sixel_image_store, + debug, ); let fixture_name = "vttest2-1"; let content = read_fixture(fixture_name); @@ -200,6 +216,7 @@ fn vttest2_2() { let mut vte_parser = vte::Parser::new(); let sixel_image_store = Rc::new(RefCell::new(SixelImageStore::default())); let terminal_emulator_color_codes = Rc::new(RefCell::new(HashMap::new())); + let debug = false; let mut grid = Grid::new( 41, 110, @@ -208,6 +225,7 @@ fn vttest2_2() { Rc::new(RefCell::new(LinkHandler::new())), Rc::new(RefCell::new(None)), sixel_image_store, + debug, ); let fixture_name = "vttest2-2"; let content = read_fixture(fixture_name); @@ -222,6 +240,7 @@ fn vttest2_3() { let mut vte_parser = vte::Parser::new(); let sixel_image_store = Rc::new(RefCell::new(SixelImageStore::default())); let terminal_emulator_color_codes = Rc::new(RefCell::new(HashMap::new())); + let debug = false; let mut grid = Grid::new( 41, 110, @@ -230,6 +249,7 @@ fn vttest2_3() { Rc::new(RefCell::new(LinkHandler::new())), Rc::new(RefCell::new(None)), sixel_image_store, + debug, ); let fixture_name = "vttest2-3"; let content = read_fixture(fixture_name); @@ -244,6 +264,7 @@ fn vttest2_4() { let mut vte_parser = vte::Parser::new(); let sixel_image_store = Rc::new(RefCell::new(SixelImageStore::default())); let terminal_emulator_color_codes = Rc::new(RefCell::new(HashMap::new())); + let debug = false; let mut grid = Grid::new( 41, 110, @@ -252,6 +273,7 @@ fn vttest2_4() { Rc::new(RefCell::new(LinkHandler::new())), Rc::new(RefCell::new(None)), sixel_image_store, + debug, ); let fixture_name = "vttest2-4"; let content = read_fixture(fixture_name); @@ -266,6 +288,7 @@ fn vttest2_5() { let mut vte_parser = vte::Parser::new(); let sixel_image_store = Rc::new(RefCell::new(SixelImageStore::default())); let terminal_emulator_color_codes = Rc::new(RefCell::new(HashMap::new())); + let debug = false; let mut grid = Grid::new( 41, 110, @@ -274,6 +297,7 @@ fn vttest2_5() { Rc::new(RefCell::new(LinkHandler::new())), Rc::new(RefCell::new(None)), sixel_image_store, + debug, ); let fixture_name = "vttest2-5"; let content = read_fixture(fixture_name); @@ -288,6 +312,7 @@ fn vttest2_6() { let mut vte_parser = vte::Parser::new(); let sixel_image_store = Rc::new(RefCell::new(SixelImageStore::default())); let terminal_emulator_color_codes = Rc::new(RefCell::new(HashMap::new())); + let debug = false; let mut grid = Grid::new( 41, 110, @@ -296,6 +321,7 @@ fn vttest2_6() { Rc::new(RefCell::new(LinkHandler::new())), Rc::new(RefCell::new(None)), sixel_image_store, + debug, ); let fixture_name = "vttest2-6"; let content = read_fixture(fixture_name); @@ -310,6 +336,7 @@ fn vttest2_7() { let mut vte_parser = vte::Parser::new(); let sixel_image_store = Rc::new(RefCell::new(SixelImageStore::default())); let terminal_emulator_color_codes = Rc::new(RefCell::new(HashMap::new())); + let debug = false; let mut grid = Grid::new( 41, 110, @@ -318,6 +345,7 @@ fn vttest2_7() { Rc::new(RefCell::new(LinkHandler::new())), Rc::new(RefCell::new(None)), sixel_image_store, + debug, ); let fixture_name = "vttest2-7"; let content = read_fixture(fixture_name); @@ -332,6 +360,7 @@ fn vttest2_8() { let mut vte_parser = vte::Parser::new(); let sixel_image_store = Rc::new(RefCell::new(SixelImageStore::default())); let terminal_emulator_color_codes = Rc::new(RefCell::new(HashMap::new())); + let debug = false; let mut grid = Grid::new( 41, 110, @@ -340,6 +369,7 @@ fn vttest2_8() { Rc::new(RefCell::new(LinkHandler::new())), Rc::new(RefCell::new(None)), sixel_image_store, + debug, ); let fixture_name = "vttest2-8"; let content = read_fixture(fixture_name); @@ -354,6 +384,7 @@ fn vttest2_9() { let mut vte_parser = vte::Parser::new(); let sixel_image_store = Rc::new(RefCell::new(SixelImageStore::default())); let terminal_emulator_color_codes = Rc::new(RefCell::new(HashMap::new())); + let debug = false; let mut grid = Grid::new( 41, 110, @@ -362,6 +393,7 @@ fn vttest2_9() { Rc::new(RefCell::new(LinkHandler::new())), Rc::new(RefCell::new(None)), sixel_image_store, + debug, ); let fixture_name = "vttest2-9"; let content = read_fixture(fixture_name); @@ -376,6 +408,7 @@ fn vttest2_10() { let mut vte_parser = vte::Parser::new(); let sixel_image_store = Rc::new(RefCell::new(SixelImageStore::default())); let terminal_emulator_color_codes = Rc::new(RefCell::new(HashMap::new())); + let debug = false; let mut grid = Grid::new( 41, 110, @@ -384,6 +417,7 @@ fn vttest2_10() { Rc::new(RefCell::new(LinkHandler::new())), Rc::new(RefCell::new(None)), sixel_image_store, + debug, ); let fixture_name = "vttest2-10"; let content = read_fixture(fixture_name); @@ -398,6 +432,7 @@ fn vttest2_11() { let mut vte_parser = vte::Parser::new(); let sixel_image_store = Rc::new(RefCell::new(SixelImageStore::default())); let terminal_emulator_color_codes = Rc::new(RefCell::new(HashMap::new())); + let debug = false; let mut grid = Grid::new( 41, 110, @@ -406,6 +441,7 @@ fn vttest2_11() { Rc::new(RefCell::new(LinkHandler::new())), Rc::new(RefCell::new(None)), sixel_image_store, + debug, ); let fixture_name = "vttest2-11"; let content = read_fixture(fixture_name); @@ -420,6 +456,7 @@ fn vttest2_12() { let mut vte_parser = vte::Parser::new(); let sixel_image_store = Rc::new(RefCell::new(SixelImageStore::default())); let terminal_emulator_color_codes = Rc::new(RefCell::new(HashMap::new())); + let debug = false; let mut grid = Grid::new( 41, 110, @@ -428,6 +465,7 @@ fn vttest2_12() { Rc::new(RefCell::new(LinkHandler::new())), Rc::new(RefCell::new(None)), sixel_image_store, + debug, ); let fixture_name = "vttest2-12"; let content = read_fixture(fixture_name); @@ -442,6 +480,7 @@ fn vttest2_13() { let mut vte_parser = vte::Parser::new(); let sixel_image_store = Rc::new(RefCell::new(SixelImageStore::default())); let terminal_emulator_color_codes = Rc::new(RefCell::new(HashMap::new())); + let debug = false; let mut grid = Grid::new( 41, 110, @@ -450,6 +489,7 @@ fn vttest2_13() { Rc::new(RefCell::new(LinkHandler::new())), Rc::new(RefCell::new(None)), sixel_image_store, + debug, ); let fixture_name = "vttest2-13"; let content = read_fixture(fixture_name); @@ -464,6 +504,7 @@ fn vttest2_14() { let mut vte_parser = vte::Parser::new(); let sixel_image_store = Rc::new(RefCell::new(SixelImageStore::default())); let terminal_emulator_color_codes = Rc::new(RefCell::new(HashMap::new())); + let debug = false; let mut grid = Grid::new( 41, 110, @@ -472,6 +513,7 @@ fn vttest2_14() { Rc::new(RefCell::new(LinkHandler::new())), Rc::new(RefCell::new(None)), sixel_image_store, + debug, ); let fixture_name = "vttest2-14"; let content = read_fixture(fixture_name); @@ -486,6 +528,7 @@ fn vttest3_0() { let mut vte_parser = vte::Parser::new(); let sixel_image_store = Rc::new(RefCell::new(SixelImageStore::default())); let terminal_emulator_color_codes = Rc::new(RefCell::new(HashMap::new())); + let debug = false; let mut grid = Grid::new( 41, 110, @@ -494,6 +537,7 @@ fn vttest3_0() { Rc::new(RefCell::new(LinkHandler::new())), Rc::new(RefCell::new(None)), sixel_image_store, + debug, ); let fixture_name = "vttest3-0"; let content = read_fixture(fixture_name); @@ -508,6 +552,7 @@ fn vttest8_0() { let mut vte_parser = vte::Parser::new(); let sixel_image_store = Rc::new(RefCell::new(SixelImageStore::default())); let terminal_emulator_color_codes = Rc::new(RefCell::new(HashMap::new())); + let debug = false; let mut grid = Grid::new( 51, 97, @@ -516,6 +561,7 @@ fn vttest8_0() { Rc::new(RefCell::new(LinkHandler::new())), Rc::new(RefCell::new(None)), sixel_image_store, + debug, ); let fixture_name = "vttest8-0"; let content = read_fixture(fixture_name); @@ -530,6 +576,7 @@ fn vttest8_1() { let mut vte_parser = vte::Parser::new(); let sixel_image_store = Rc::new(RefCell::new(SixelImageStore::default())); let terminal_emulator_color_codes = Rc::new(RefCell::new(HashMap::new())); + let debug = false; let mut grid = Grid::new( 51, 97, @@ -538,6 +585,7 @@ fn vttest8_1() { Rc::new(RefCell::new(LinkHandler::new())), Rc::new(RefCell::new(None)), sixel_image_store, + debug, ); let fixture_name = "vttest8-1"; let content = read_fixture(fixture_name); @@ -552,6 +600,7 @@ fn vttest8_2() { let mut vte_parser = vte::Parser::new(); let sixel_image_store = Rc::new(RefCell::new(SixelImageStore::default())); let terminal_emulator_color_codes = Rc::new(RefCell::new(HashMap::new())); + let debug = false; let mut grid = Grid::new( 51, 97, @@ -560,6 +609,7 @@ fn vttest8_2() { Rc::new(RefCell::new(LinkHandler::new())), Rc::new(RefCell::new(None)), sixel_image_store, + debug, ); let fixture_name = "vttest8-2"; let content = read_fixture(fixture_name); @@ -574,6 +624,7 @@ fn vttest8_3() { let mut vte_parser = vte::Parser::new(); let sixel_image_store = Rc::new(RefCell::new(SixelImageStore::default())); let terminal_emulator_color_codes = Rc::new(RefCell::new(HashMap::new())); + let debug = false; let mut grid = Grid::new( 51, 97, @@ -582,6 +633,7 @@ fn vttest8_3() { Rc::new(RefCell::new(LinkHandler::new())), Rc::new(RefCell::new(None)), sixel_image_store, + debug, ); let fixture_name = "vttest8-3"; let content = read_fixture(fixture_name); @@ -596,6 +648,7 @@ fn vttest8_4() { let mut vte_parser = vte::Parser::new(); let sixel_image_store = Rc::new(RefCell::new(SixelImageStore::default())); let terminal_emulator_color_codes = Rc::new(RefCell::new(HashMap::new())); + let debug = false; let mut grid = Grid::new( 51, 97, @@ -604,6 +657,7 @@ fn vttest8_4() { Rc::new(RefCell::new(LinkHandler::new())), Rc::new(RefCell::new(None)), sixel_image_store, + debug, ); let fixture_name = "vttest8-4"; let content = read_fixture(fixture_name); @@ -618,6 +672,7 @@ fn vttest8_5() { let mut vte_parser = vte::Parser::new(); let sixel_image_store = Rc::new(RefCell::new(SixelImageStore::default())); let terminal_emulator_color_codes = Rc::new(RefCell::new(HashMap::new())); + let debug = false; let mut grid = Grid::new( 51, 97, @@ -626,6 +681,7 @@ fn vttest8_5() { Rc::new(RefCell::new(LinkHandler::new())), Rc::new(RefCell::new(None)), sixel_image_store, + debug, ); let fixture_name = "vttest8-5"; let content = read_fixture(fixture_name); @@ -640,6 +696,7 @@ fn csi_b() { let mut vte_parser = vte::Parser::new(); let sixel_image_store = Rc::new(RefCell::new(SixelImageStore::default())); let terminal_emulator_color_codes = Rc::new(RefCell::new(HashMap::new())); + let debug = false; let mut grid = Grid::new( 51, 97, @@ -648,6 +705,7 @@ fn csi_b() { Rc::new(RefCell::new(LinkHandler::new())), Rc::new(RefCell::new(None)), sixel_image_store, + debug, ); let fixture_name = "csi-b"; let content = read_fixture(fixture_name); @@ -662,6 +720,7 @@ fn csi_capital_i() { let mut vte_parser = vte::Parser::new(); let sixel_image_store = Rc::new(RefCell::new(SixelImageStore::default())); let terminal_emulator_color_codes = Rc::new(RefCell::new(HashMap::new())); + let debug = false; let mut grid = Grid::new( 51, 97, @@ -670,6 +729,7 @@ fn csi_capital_i() { Rc::new(RefCell::new(LinkHandler::new())), Rc::new(RefCell::new(None)), sixel_image_store, + debug, ); let fixture_name = "csi-capital-i"; let content = read_fixture(fixture_name); @@ -684,6 +744,7 @@ fn csi_capital_z() { let mut vte_parser = vte::Parser::new(); let sixel_image_store = Rc::new(RefCell::new(SixelImageStore::default())); let terminal_emulator_color_codes = Rc::new(RefCell::new(HashMap::new())); + let debug = false; let mut grid = Grid::new( 51, 97, @@ -692,6 +753,7 @@ fn csi_capital_z() { Rc::new(RefCell::new(LinkHandler::new())), Rc::new(RefCell::new(None)), sixel_image_store, + debug, ); let fixture_name = "csi-capital-z"; let content = read_fixture(fixture_name); @@ -706,6 +768,7 @@ fn terminal_reports() { let mut vte_parser = vte::Parser::new(); let sixel_image_store = Rc::new(RefCell::new(SixelImageStore::default())); let terminal_emulator_color_codes = Rc::new(RefCell::new(HashMap::new())); + let debug = false; let mut grid = Grid::new( 51, 97, @@ -714,6 +777,7 @@ fn terminal_reports() { Rc::new(RefCell::new(LinkHandler::new())), Rc::new(RefCell::new(None)), sixel_image_store, + debug, ); let fixture_name = "terminal_reports"; let content = read_fixture(fixture_name); @@ -728,6 +792,7 @@ fn wide_characters() { let mut vte_parser = vte::Parser::new(); let sixel_image_store = Rc::new(RefCell::new(SixelImageStore::default())); let terminal_emulator_color_codes = Rc::new(RefCell::new(HashMap::new())); + let debug = false; let mut grid = Grid::new( 21, 104, @@ -736,6 +801,7 @@ fn wide_characters() { Rc::new(RefCell::new(LinkHandler::new())), Rc::new(RefCell::new(None)), sixel_image_store, + debug, ); let fixture_name = "wide_characters"; let content = read_fixture(fixture_name); @@ -750,6 +816,7 @@ fn wide_characters_line_wrap() { let mut vte_parser = vte::Parser::new(); let sixel_image_store = Rc::new(RefCell::new(SixelImageStore::default())); let terminal_emulator_color_codes = Rc::new(RefCell::new(HashMap::new())); + let debug = false; let mut grid = Grid::new( 21, 104, @@ -758,6 +825,7 @@ fn wide_characters_line_wrap() { Rc::new(RefCell::new(LinkHandler::new())), Rc::new(RefCell::new(None)), sixel_image_store, + debug, ); let fixture_name = "wide_characters_line_wrap"; let content = read_fixture(fixture_name); @@ -772,6 +840,7 @@ fn insert_character_in_line_with_wide_character() { let mut vte_parser = vte::Parser::new(); let sixel_image_store = Rc::new(RefCell::new(SixelImageStore::default())); let terminal_emulator_color_codes = Rc::new(RefCell::new(HashMap::new())); + let debug = false; let mut grid = Grid::new( 21, 104, @@ -780,6 +849,7 @@ fn insert_character_in_line_with_wide_character() { Rc::new(RefCell::new(LinkHandler::new())), Rc::new(RefCell::new(None)), sixel_image_store, + debug, ); let fixture_name = "wide_characters_middle_line_insert"; let content = read_fixture(fixture_name); @@ -794,6 +864,7 @@ fn delete_char_in_middle_of_line_with_widechar() { let mut vte_parser = vte::Parser::new(); let sixel_image_store = Rc::new(RefCell::new(SixelImageStore::default())); let terminal_emulator_color_codes = Rc::new(RefCell::new(HashMap::new())); + let debug = false; let mut grid = Grid::new( 21, 104, @@ -802,6 +873,7 @@ fn delete_char_in_middle_of_line_with_widechar() { Rc::new(RefCell::new(LinkHandler::new())), Rc::new(RefCell::new(None)), sixel_image_store, + debug, ); let fixture_name = "wide-chars-delete-middle"; let content = read_fixture(fixture_name); @@ -816,6 +888,7 @@ fn delete_char_in_middle_of_line_with_multiple_widechars() { let mut vte_parser = vte::Parser::new(); let sixel_image_store = Rc::new(RefCell::new(SixelImageStore::default())); let terminal_emulator_color_codes = Rc::new(RefCell::new(HashMap::new())); + let debug = false; let mut grid = Grid::new( 21, 104, @@ -824,6 +897,7 @@ fn delete_char_in_middle_of_line_with_multiple_widechars() { Rc::new(RefCell::new(LinkHandler::new())), Rc::new(RefCell::new(None)), sixel_image_store, + debug, ); let fixture_name = "wide-chars-delete-middle-after-multi"; let content = read_fixture(fixture_name); @@ -838,6 +912,7 @@ fn fish_wide_characters_override_clock() { let mut vte_parser = vte::Parser::new(); let sixel_image_store = Rc::new(RefCell::new(SixelImageStore::default())); let terminal_emulator_color_codes = Rc::new(RefCell::new(HashMap::new())); + let debug = false; let mut grid = Grid::new( 21, 104, @@ -846,6 +921,7 @@ fn fish_wide_characters_override_clock() { Rc::new(RefCell::new(LinkHandler::new())), Rc::new(RefCell::new(None)), sixel_image_store, + debug, ); let fixture_name = "fish_wide_characters_override_clock"; let content = read_fixture(fixture_name); @@ -860,6 +936,7 @@ fn bash_delete_wide_characters() { let mut vte_parser = vte::Parser::new(); let sixel_image_store = Rc::new(RefCell::new(SixelImageStore::default())); let terminal_emulator_color_codes = Rc::new(RefCell::new(HashMap::new())); + let debug = false; let mut grid = Grid::new( 21, 104, @@ -868,6 +945,7 @@ fn bash_delete_wide_characters() { Rc::new(RefCell::new(LinkHandler::new())), Rc::new(RefCell::new(None)), sixel_image_store, + debug, ); let fixture_name = "bash_delete_wide_characters"; let content = read_fixture(fixture_name); @@ -882,6 +960,7 @@ fn delete_wide_characters_before_cursor() { let mut vte_parser = vte::Parser::new(); let sixel_image_store = Rc::new(RefCell::new(SixelImageStore::default())); let terminal_emulator_color_codes = Rc::new(RefCell::new(HashMap::new())); + let debug = false; let mut grid = Grid::new( 21, 104, @@ -890,6 +969,7 @@ fn delete_wide_characters_before_cursor() { Rc::new(RefCell::new(LinkHandler::new())), Rc::new(RefCell::new(None)), sixel_image_store, + debug, ); let fixture_name = "delete_wide_characters_before_cursor"; let content = read_fixture(fixture_name); @@ -904,6 +984,7 @@ fn delete_wide_characters_before_cursor_when_cursor_is_on_wide_character() { let mut vte_parser = vte::Parser::new(); let sixel_image_store = Rc::new(RefCell::new(SixelImageStore::default())); let terminal_emulator_color_codes = Rc::new(RefCell::new(HashMap::new())); + let debug = false; let mut grid = Grid::new( 21, 104, @@ -912,6 +993,7 @@ fn delete_wide_characters_before_cursor_when_cursor_is_on_wide_character() { Rc::new(RefCell::new(LinkHandler::new())), Rc::new(RefCell::new(None)), sixel_image_store, + debug, ); let fixture_name = "delete_wide_characters_before_cursor_when_cursor_is_on_wide_character"; let content = read_fixture(fixture_name); @@ -926,6 +1008,7 @@ fn delete_wide_character_under_cursor() { let mut vte_parser = vte::Parser::new(); let sixel_image_store = Rc::new(RefCell::new(SixelImageStore::default())); let terminal_emulator_color_codes = Rc::new(RefCell::new(HashMap::new())); + let debug = false; let mut grid = Grid::new( 21, 104, @@ -934,6 +1017,7 @@ fn delete_wide_character_under_cursor() { Rc::new(RefCell::new(LinkHandler::new())), Rc::new(RefCell::new(None)), sixel_image_store, + debug, ); let fixture_name = "delete_wide_character_under_cursor"; let content = read_fixture(fixture_name); @@ -948,6 +1032,7 @@ fn replace_wide_character_under_cursor() { let mut vte_parser = vte::Parser::new(); let sixel_image_store = Rc::new(RefCell::new(SixelImageStore::default())); let terminal_emulator_color_codes = Rc::new(RefCell::new(HashMap::new())); + let debug = false; let mut grid = Grid::new( 21, 104, @@ -956,6 +1041,7 @@ fn replace_wide_character_under_cursor() { Rc::new(RefCell::new(LinkHandler::new())), Rc::new(RefCell::new(None)), sixel_image_store, + debug, ); let fixture_name = "replace_wide_character_under_cursor"; let content = read_fixture(fixture_name); @@ -970,6 +1056,7 @@ fn wrap_wide_characters() { let mut vte_parser = vte::Parser::new(); let sixel_image_store = Rc::new(RefCell::new(SixelImageStore::default())); let terminal_emulator_color_codes = Rc::new(RefCell::new(HashMap::new())); + let debug = false; let mut grid = Grid::new( 21, 90, @@ -978,6 +1065,7 @@ fn wrap_wide_characters() { Rc::new(RefCell::new(LinkHandler::new())), Rc::new(RefCell::new(None)), sixel_image_store, + debug, ); let fixture_name = "wide_characters_full"; let content = read_fixture(fixture_name); @@ -992,6 +1080,7 @@ fn wrap_wide_characters_on_size_change() { let mut vte_parser = vte::Parser::new(); let sixel_image_store = Rc::new(RefCell::new(SixelImageStore::default())); let terminal_emulator_color_codes = Rc::new(RefCell::new(HashMap::new())); + let debug = false; let mut grid = Grid::new( 21, 93, @@ -1000,6 +1089,7 @@ fn wrap_wide_characters_on_size_change() { Rc::new(RefCell::new(LinkHandler::new())), Rc::new(RefCell::new(None)), sixel_image_store, + debug, ); let fixture_name = "wide_characters_full"; let content = read_fixture(fixture_name); @@ -1015,6 +1105,7 @@ fn unwrap_wide_characters_on_size_change() { let mut vte_parser = vte::Parser::new(); let sixel_image_store = Rc::new(RefCell::new(SixelImageStore::default())); let terminal_emulator_color_codes = Rc::new(RefCell::new(HashMap::new())); + let debug = false; let mut grid = Grid::new( 21, 93, @@ -1023,6 +1114,7 @@ fn unwrap_wide_characters_on_size_change() { Rc::new(RefCell::new(LinkHandler::new())), Rc::new(RefCell::new(None)), sixel_image_store, + debug, ); let fixture_name = "wide_characters_full"; let content = read_fixture(fixture_name); @@ -1039,6 +1131,7 @@ fn wrap_wide_characters_in_the_middle_of_the_line() { let mut vte_parser = vte::Parser::new(); let sixel_image_store = Rc::new(RefCell::new(SixelImageStore::default())); let terminal_emulator_color_codes = Rc::new(RefCell::new(HashMap::new())); + let debug = false; let mut grid = Grid::new( 21, 91, @@ -1047,6 +1140,7 @@ fn wrap_wide_characters_in_the_middle_of_the_line() { Rc::new(RefCell::new(LinkHandler::new())), Rc::new(RefCell::new(None)), sixel_image_store, + debug, ); let fixture_name = "wide_characters_line_middle"; let content = read_fixture(fixture_name); @@ -1061,6 +1155,7 @@ fn wrap_wide_characters_at_the_end_of_the_line() { let mut vte_parser = vte::Parser::new(); let sixel_image_store = Rc::new(RefCell::new(SixelImageStore::default())); let terminal_emulator_color_codes = Rc::new(RefCell::new(HashMap::new())); + let debug = false; let mut grid = Grid::new( 21, 90, @@ -1069,6 +1164,7 @@ fn wrap_wide_characters_at_the_end_of_the_line() { Rc::new(RefCell::new(LinkHandler::new())), Rc::new(RefCell::new(None)), sixel_image_store, + debug, ); let fixture_name = "wide_characters_line_end"; let content = read_fixture(fixture_name); @@ -1083,6 +1179,7 @@ fn copy_selected_text_from_viewport() { let mut vte_parser = vte::Parser::new(); let sixel_image_store = Rc::new(RefCell::new(SixelImageStore::default())); let terminal_emulator_color_codes = Rc::new(RefCell::new(HashMap::new())); + let debug = false; let mut grid = Grid::new( 27, 125, @@ -1091,6 +1188,7 @@ fn copy_selected_text_from_viewport() { Rc::new(RefCell::new(LinkHandler::new())), Rc::new(RefCell::new(None)), sixel_image_store, + debug, ); let fixture_name = "grid_copy"; let content = read_fixture(fixture_name); @@ -1113,6 +1211,7 @@ fn copy_wrapped_selected_text_from_viewport() { let mut vte_parser = vte::Parser::new(); let sixel_image_store = Rc::new(RefCell::new(SixelImageStore::default())); let terminal_emulator_color_codes = Rc::new(RefCell::new(HashMap::new())); + let debug = false; let mut grid = Grid::new( 22, 73, @@ -1121,6 +1220,7 @@ fn copy_wrapped_selected_text_from_viewport() { Rc::new(RefCell::new(LinkHandler::new())), Rc::new(RefCell::new(None)), sixel_image_store, + debug, ); let fixture_name = "grid_copy_wrapped"; let content = read_fixture(fixture_name); @@ -1142,6 +1242,7 @@ fn copy_selected_text_from_lines_above() { let mut vte_parser = vte::Parser::new(); let sixel_image_store = Rc::new(RefCell::new(SixelImageStore::default())); let terminal_emulator_color_codes = Rc::new(RefCell::new(HashMap::new())); + let debug = false; let mut grid = Grid::new( 27, 125, @@ -1150,6 +1251,7 @@ fn copy_selected_text_from_lines_above() { Rc::new(RefCell::new(LinkHandler::new())), Rc::new(RefCell::new(None)), sixel_image_store, + debug, ); let fixture_name = "grid_copy"; let content = read_fixture(fixture_name); @@ -1172,6 +1274,7 @@ fn copy_selected_text_from_lines_below() { let mut vte_parser = vte::Parser::new(); let sixel_image_store = Rc::new(RefCell::new(SixelImageStore::default())); let terminal_emulator_color_codes = Rc::new(RefCell::new(HashMap::new())); + let debug = false; let mut grid = Grid::new( 27, 125, @@ -1180,6 +1283,7 @@ fn copy_selected_text_from_lines_below() { Rc::new(RefCell::new(LinkHandler::new())), Rc::new(RefCell::new(None)), sixel_image_store, + debug, ); let fixture_name = "grid_copy"; let content = read_fixture(fixture_name); @@ -1210,6 +1314,7 @@ fn run_bandwhich_from_fish_shell() { let mut vte_parser = vte::Parser::new(); let sixel_image_store = Rc::new(RefCell::new(SixelImageStore::default())); let terminal_emulator_color_codes = Rc::new(RefCell::new(HashMap::new())); + let debug = false; let mut grid = Grid::new( 28, 116, @@ -1218,6 +1323,7 @@ fn run_bandwhich_from_fish_shell() { Rc::new(RefCell::new(LinkHandler::new())), Rc::new(RefCell::new(None)), sixel_image_store, + debug, ); let fixture_name = "fish_and_bandwhich"; let content = read_fixture(fixture_name); @@ -1232,6 +1338,7 @@ fn fish_tab_completion_options() { let mut vte_parser = vte::Parser::new(); let sixel_image_store = Rc::new(RefCell::new(SixelImageStore::default())); let terminal_emulator_color_codes = Rc::new(RefCell::new(HashMap::new())); + let debug = false; let mut grid = Grid::new( 28, 116, @@ -1240,6 +1347,7 @@ fn fish_tab_completion_options() { Rc::new(RefCell::new(LinkHandler::new())), Rc::new(RefCell::new(None)), sixel_image_store, + debug, ); let fixture_name = "fish_tab_completion_options"; let content = read_fixture(fixture_name); @@ -1260,6 +1368,7 @@ pub fn fish_select_tab_completion_options() { let mut vte_parser = vte::Parser::new(); let sixel_image_store = Rc::new(RefCell::new(SixelImageStore::default())); let terminal_emulator_color_codes = Rc::new(RefCell::new(HashMap::new())); + let debug = false; let mut grid = Grid::new( 28, 116, @@ -1268,6 +1377,7 @@ pub fn fish_select_tab_completion_options() { Rc::new(RefCell::new(LinkHandler::new())), Rc::new(RefCell::new(None)), sixel_image_store, + debug, ); let fixture_name = "fish_select_tab_completion_options"; let content = read_fixture(fixture_name); @@ -1292,6 +1402,7 @@ pub fn vim_scroll_region_down() { let mut vte_parser = vte::Parser::new(); let sixel_image_store = Rc::new(RefCell::new(SixelImageStore::default())); let terminal_emulator_color_codes = Rc::new(RefCell::new(HashMap::new())); + let debug = false; let mut grid = Grid::new( 28, 116, @@ -1300,6 +1411,7 @@ pub fn vim_scroll_region_down() { Rc::new(RefCell::new(LinkHandler::new())), Rc::new(RefCell::new(None)), sixel_image_store, + debug, ); let fixture_name = "vim_scroll_region_down"; let content = read_fixture(fixture_name); @@ -1321,6 +1433,7 @@ pub fn vim_ctrl_d() { let mut vte_parser = vte::Parser::new(); let sixel_image_store = Rc::new(RefCell::new(SixelImageStore::default())); let terminal_emulator_color_codes = Rc::new(RefCell::new(HashMap::new())); + let debug = false; let mut grid = Grid::new( 28, 116, @@ -1329,6 +1442,7 @@ pub fn vim_ctrl_d() { Rc::new(RefCell::new(LinkHandler::new())), Rc::new(RefCell::new(None)), sixel_image_store, + debug, ); let fixture_name = "vim_ctrl_d"; let content = read_fixture(fixture_name); @@ -1349,6 +1463,7 @@ pub fn vim_ctrl_u() { let mut vte_parser = vte::Parser::new(); let sixel_image_store = Rc::new(RefCell::new(SixelImageStore::default())); let terminal_emulator_color_codes = Rc::new(RefCell::new(HashMap::new())); + let debug = false; let mut grid = Grid::new( 28, 116, @@ -1357,6 +1472,7 @@ pub fn vim_ctrl_u() { Rc::new(RefCell::new(LinkHandler::new())), Rc::new(RefCell::new(None)), sixel_image_store, + debug, ); let fixture_name = "vim_ctrl_u"; let content = read_fixture(fixture_name); @@ -1371,6 +1487,7 @@ pub fn htop() { let mut vte_parser = vte::Parser::new(); let sixel_image_store = Rc::new(RefCell::new(SixelImageStore::default())); let terminal_emulator_color_codes = Rc::new(RefCell::new(HashMap::new())); + let debug = false; let mut grid = Grid::new( 28, 116, @@ -1379,6 +1496,7 @@ pub fn htop() { Rc::new(RefCell::new(LinkHandler::new())), Rc::new(RefCell::new(None)), sixel_image_store, + debug, ); let fixture_name = "htop"; let content = read_fixture(fixture_name); @@ -1393,6 +1511,7 @@ pub fn htop_scrolling() { let mut vte_parser = vte::Parser::new(); let sixel_image_store = Rc::new(RefCell::new(SixelImageStore::default())); let terminal_emulator_color_codes = Rc::new(RefCell::new(HashMap::new())); + let debug = false; let mut grid = Grid::new( 28, 116, @@ -1401,6 +1520,7 @@ pub fn htop_scrolling() { Rc::new(RefCell::new(LinkHandler::new())), Rc::new(RefCell::new(None)), sixel_image_store, + debug, ); let fixture_name = "htop_scrolling"; let content = read_fixture(fixture_name); @@ -1415,6 +1535,7 @@ pub fn htop_right_scrolling() { let mut vte_parser = vte::Parser::new(); let sixel_image_store = Rc::new(RefCell::new(SixelImageStore::default())); let terminal_emulator_color_codes = Rc::new(RefCell::new(HashMap::new())); + let debug = false; let mut grid = Grid::new( 28, 116, @@ -1423,6 +1544,7 @@ pub fn htop_right_scrolling() { Rc::new(RefCell::new(LinkHandler::new())), Rc::new(RefCell::new(None)), sixel_image_store, + debug, ); let fixture_name = "htop_right_scrolling"; let content = read_fixture(fixture_name); @@ -1447,6 +1569,7 @@ pub fn vim_overwrite() { let mut vte_parser = vte::Parser::new(); let sixel_image_store = Rc::new(RefCell::new(SixelImageStore::default())); let terminal_emulator_color_codes = Rc::new(RefCell::new(HashMap::new())); + let debug = false; let mut grid = Grid::new( 28, 116, @@ -1455,6 +1578,7 @@ pub fn vim_overwrite() { Rc::new(RefCell::new(LinkHandler::new())), Rc::new(RefCell::new(None)), sixel_image_store, + debug, ); let fixture_name = "vim_overwrite"; let content = read_fixture(fixture_name); @@ -1471,6 +1595,7 @@ pub fn clear_scroll_region() { let mut vte_parser = vte::Parser::new(); let sixel_image_store = Rc::new(RefCell::new(SixelImageStore::default())); let terminal_emulator_color_codes = Rc::new(RefCell::new(HashMap::new())); + let debug = false; let mut grid = Grid::new( 28, 116, @@ -1479,6 +1604,7 @@ pub fn clear_scroll_region() { Rc::new(RefCell::new(LinkHandler::new())), Rc::new(RefCell::new(None)), sixel_image_store, + debug, ); let fixture_name = "clear_scroll_region"; let content = read_fixture(fixture_name); @@ -1493,6 +1619,7 @@ pub fn display_tab_characters_properly() { let mut vte_parser = vte::Parser::new(); let sixel_image_store = Rc::new(RefCell::new(SixelImageStore::default())); let terminal_emulator_color_codes = Rc::new(RefCell::new(HashMap::new())); + let debug = false; let mut grid = Grid::new( 28, 116, @@ -1501,6 +1628,7 @@ pub fn display_tab_characters_properly() { Rc::new(RefCell::new(LinkHandler::new())), Rc::new(RefCell::new(None)), sixel_image_store, + debug, ); let fixture_name = "tab_characters"; let content = read_fixture(fixture_name); @@ -1515,6 +1643,7 @@ pub fn neovim_insert_mode() { let mut vte_parser = vte::Parser::new(); let sixel_image_store = Rc::new(RefCell::new(SixelImageStore::default())); let terminal_emulator_color_codes = Rc::new(RefCell::new(HashMap::new())); + let debug = false; let mut grid = Grid::new( 28, 116, @@ -1523,6 +1652,7 @@ pub fn neovim_insert_mode() { Rc::new(RefCell::new(LinkHandler::new())), Rc::new(RefCell::new(None)), sixel_image_store, + debug, ); let fixture_name = "nvim_insert"; let content = read_fixture(fixture_name); @@ -1537,6 +1667,7 @@ pub fn bash_cursor_linewrap() { let mut vte_parser = vte::Parser::new(); let sixel_image_store = Rc::new(RefCell::new(SixelImageStore::default())); let terminal_emulator_color_codes = Rc::new(RefCell::new(HashMap::new())); + let debug = false; let mut grid = Grid::new( 28, 116, @@ -1545,6 +1676,7 @@ pub fn bash_cursor_linewrap() { Rc::new(RefCell::new(LinkHandler::new())), Rc::new(RefCell::new(None)), sixel_image_store, + debug, ); let fixture_name = "bash_cursor_linewrap"; let content = read_fixture(fixture_name); @@ -1561,6 +1693,7 @@ pub fn fish_paste_multiline() { let mut vte_parser = vte::Parser::new(); let sixel_image_store = Rc::new(RefCell::new(SixelImageStore::default())); let terminal_emulator_color_codes = Rc::new(RefCell::new(HashMap::new())); + let debug = false; let mut grid = Grid::new( 28, 149, @@ -1569,6 +1702,7 @@ pub fn fish_paste_multiline() { Rc::new(RefCell::new(LinkHandler::new())), Rc::new(RefCell::new(None)), sixel_image_store, + debug, ); let fixture_name = "fish_paste_multiline"; let content = read_fixture(fixture_name); @@ -1583,6 +1717,7 @@ pub fn git_log() { let mut vte_parser = vte::Parser::new(); let sixel_image_store = Rc::new(RefCell::new(SixelImageStore::default())); let terminal_emulator_color_codes = Rc::new(RefCell::new(HashMap::new())); + let debug = false; let mut grid = Grid::new( 28, 149, @@ -1591,6 +1726,7 @@ pub fn git_log() { Rc::new(RefCell::new(LinkHandler::new())), Rc::new(RefCell::new(None)), sixel_image_store, + debug, ); let fixture_name = "git_log"; let content = read_fixture(fixture_name); @@ -1607,6 +1743,7 @@ pub fn git_diff_scrollup() { let mut vte_parser = vte::Parser::new(); let sixel_image_store = Rc::new(RefCell::new(SixelImageStore::default())); let terminal_emulator_color_codes = Rc::new(RefCell::new(HashMap::new())); + let debug = false; let mut grid = Grid::new( 28, 149, @@ -1615,6 +1752,7 @@ pub fn git_diff_scrollup() { Rc::new(RefCell::new(LinkHandler::new())), Rc::new(RefCell::new(None)), sixel_image_store, + debug, ); let fixture_name = "git_diff_scrollup"; let content = read_fixture(fixture_name); @@ -1629,6 +1767,7 @@ pub fn emacs_longbuf() { let mut vte_parser = vte::Parser::new(); let sixel_image_store = Rc::new(RefCell::new(SixelImageStore::default())); let terminal_emulator_color_codes = Rc::new(RefCell::new(HashMap::new())); + let debug = false; let mut grid = Grid::new( 60, 284, @@ -1637,6 +1776,7 @@ pub fn emacs_longbuf() { Rc::new(RefCell::new(LinkHandler::new())), Rc::new(RefCell::new(None)), sixel_image_store, + debug, ); let fixture_name = "emacs_longbuf_tutorial"; let content = read_fixture(fixture_name); @@ -1651,6 +1791,7 @@ pub fn top_and_quit() { let mut vte_parser = vte::Parser::new(); let sixel_image_store = Rc::new(RefCell::new(SixelImageStore::default())); let terminal_emulator_color_codes = Rc::new(RefCell::new(HashMap::new())); + let debug = false; let mut grid = Grid::new( 56, 235, @@ -1659,6 +1800,7 @@ pub fn top_and_quit() { Rc::new(RefCell::new(LinkHandler::new())), Rc::new(RefCell::new(None)), sixel_image_store, + debug, ); let fixture_name = "top_and_quit"; let content = read_fixture(fixture_name); @@ -1680,6 +1822,7 @@ pub fn exa_plus_omf_theme() { let mut vte_parser = vte::Parser::new(); let sixel_image_store = Rc::new(RefCell::new(SixelImageStore::default())); let terminal_emulator_color_codes = Rc::new(RefCell::new(HashMap::new())); + let debug = false; let mut grid = Grid::new( 56, 235, @@ -1688,6 +1831,7 @@ pub fn exa_plus_omf_theme() { Rc::new(RefCell::new(LinkHandler::new())), Rc::new(RefCell::new(None)), sixel_image_store, + debug, ); let fixture_name = "exa_plus_omf_theme"; let content = read_fixture(fixture_name); @@ -1702,6 +1846,7 @@ pub fn scroll_up() { let mut vte_parser = vte::Parser::new(); let sixel_image_store = Rc::new(RefCell::new(SixelImageStore::default())); let terminal_emulator_color_codes = Rc::new(RefCell::new(HashMap::new())); + let debug = false; let mut grid = Grid::new( 10, 50, @@ -1710,6 +1855,7 @@ pub fn scroll_up() { Rc::new(RefCell::new(LinkHandler::new())), Rc::new(RefCell::new(None)), sixel_image_store, + debug, ); let fixture_name = "scrolling"; let content = read_fixture(fixture_name); @@ -1725,6 +1871,7 @@ pub fn scroll_down() { let mut vte_parser = vte::Parser::new(); let sixel_image_store = Rc::new(RefCell::new(SixelImageStore::default())); let terminal_emulator_color_codes = Rc::new(RefCell::new(HashMap::new())); + let debug = false; let mut grid = Grid::new( 10, 50, @@ -1733,6 +1880,7 @@ pub fn scroll_down() { Rc::new(RefCell::new(LinkHandler::new())), Rc::new(RefCell::new(None)), sixel_image_store, + debug, ); let fixture_name = "scrolling"; let content = read_fixture(fixture_name); @@ -1749,6 +1897,7 @@ pub fn scroll_up_with_line_wraps() { let mut vte_parser = vte::Parser::new(); let sixel_image_store = Rc::new(RefCell::new(SixelImageStore::default())); let terminal_emulator_color_codes = Rc::new(RefCell::new(HashMap::new())); + let debug = false; let mut grid = Grid::new( 10, 25, @@ -1757,6 +1906,7 @@ pub fn scroll_up_with_line_wraps() { Rc::new(RefCell::new(LinkHandler::new())), Rc::new(RefCell::new(None)), sixel_image_store, + debug, ); let fixture_name = "scrolling"; let content = read_fixture(fixture_name); @@ -1772,6 +1922,7 @@ pub fn scroll_down_with_line_wraps() { let mut vte_parser = vte::Parser::new(); let sixel_image_store = Rc::new(RefCell::new(SixelImageStore::default())); let terminal_emulator_color_codes = Rc::new(RefCell::new(HashMap::new())); + let debug = false; let mut grid = Grid::new( 10, 25, @@ -1780,6 +1931,7 @@ pub fn scroll_down_with_line_wraps() { Rc::new(RefCell::new(LinkHandler::new())), Rc::new(RefCell::new(None)), sixel_image_store, + debug, ); let fixture_name = "scrolling"; let content = read_fixture(fixture_name); @@ -1796,6 +1948,7 @@ pub fn scroll_up_decrease_width_and_scroll_down() { let mut vte_parser = vte::Parser::new(); let sixel_image_store = Rc::new(RefCell::new(SixelImageStore::default())); let terminal_emulator_color_codes = Rc::new(RefCell::new(HashMap::new())); + let debug = false; let mut grid = Grid::new( 10, 50, @@ -1804,6 +1957,7 @@ pub fn scroll_up_decrease_width_and_scroll_down() { Rc::new(RefCell::new(LinkHandler::new())), Rc::new(RefCell::new(None)), sixel_image_store, + debug, ); let fixture_name = "scrolling"; let content = read_fixture(fixture_name); @@ -1825,6 +1979,7 @@ pub fn scroll_up_increase_width_and_scroll_down() { let mut vte_parser = vte::Parser::new(); let sixel_image_store = Rc::new(RefCell::new(SixelImageStore::default())); let terminal_emulator_color_codes = Rc::new(RefCell::new(HashMap::new())); + let debug = false; let mut grid = Grid::new( 10, 25, @@ -1833,6 +1988,7 @@ pub fn scroll_up_increase_width_and_scroll_down() { Rc::new(RefCell::new(LinkHandler::new())), Rc::new(RefCell::new(None)), sixel_image_store, + debug, ); let fixture_name = "scrolling"; let content = read_fixture(fixture_name); @@ -1854,6 +2010,7 @@ pub fn move_cursor_below_scroll_region() { let mut vte_parser = vte::Parser::new(); let sixel_image_store = Rc::new(RefCell::new(SixelImageStore::default())); let terminal_emulator_color_codes = Rc::new(RefCell::new(HashMap::new())); + let debug = false; let mut grid = Grid::new( 34, 114, @@ -1862,6 +2019,7 @@ pub fn move_cursor_below_scroll_region() { Rc::new(RefCell::new(LinkHandler::new())), Rc::new(RefCell::new(None)), sixel_image_store, + debug, ); let fixture_name = "move_cursor_below_scroll_region"; let content = read_fixture(fixture_name); @@ -1876,6 +2034,7 @@ pub fn insert_wide_characters_in_existing_line() { let mut vte_parser = vte::Parser::new(); let sixel_image_store = Rc::new(RefCell::new(SixelImageStore::default())); let terminal_emulator_color_codes = Rc::new(RefCell::new(HashMap::new())); + let debug = false; let mut grid = Grid::new( 21, 86, @@ -1884,6 +2043,7 @@ pub fn insert_wide_characters_in_existing_line() { Rc::new(RefCell::new(LinkHandler::new())), Rc::new(RefCell::new(None)), sixel_image_store, + debug, ); let fixture_name = "chinese_characters_line_middle"; let content = read_fixture(fixture_name); @@ -1904,6 +2064,7 @@ pub fn full_screen_scroll_region_and_scroll_up() { let mut vte_parser = vte::Parser::new(); let sixel_image_store = Rc::new(RefCell::new(SixelImageStore::default())); let terminal_emulator_color_codes = Rc::new(RefCell::new(HashMap::new())); + let debug = false; let mut grid = Grid::new( 54, 80, @@ -1912,6 +2073,7 @@ pub fn full_screen_scroll_region_and_scroll_up() { Rc::new(RefCell::new(LinkHandler::new())), Rc::new(RefCell::new(None)), sixel_image_store, + debug, ); let fixture_name = "scroll_region_full_screen"; let content = read_fixture(fixture_name); @@ -1929,6 +2091,7 @@ pub fn ring_bell() { let mut vte_parser = vte::Parser::new(); let sixel_image_store = Rc::new(RefCell::new(SixelImageStore::default())); let terminal_emulator_color_codes = Rc::new(RefCell::new(HashMap::new())); + let debug = false; let mut grid = Grid::new( 134, 64, @@ -1937,6 +2100,7 @@ pub fn ring_bell() { Rc::new(RefCell::new(LinkHandler::new())), Rc::new(RefCell::new(None)), sixel_image_store, + debug, ); let fixture_name = "ring_bell"; let content = read_fixture(fixture_name); @@ -1951,6 +2115,7 @@ pub fn alternate_screen_change_size() { let mut vte_parser = vte::Parser::new(); let sixel_image_store = Rc::new(RefCell::new(SixelImageStore::default())); let terminal_emulator_color_codes = Rc::new(RefCell::new(HashMap::new())); + let debug = false; let mut grid = Grid::new( 20, 20, @@ -1959,6 +2124,7 @@ pub fn alternate_screen_change_size() { Rc::new(RefCell::new(LinkHandler::new())), Rc::new(RefCell::new(None)), sixel_image_store, + debug, ); let fixture_name = "alternate_screen_change_size"; let content = read_fixture(fixture_name); @@ -1977,6 +2143,7 @@ pub fn fzf_fullscreen() { let mut vte_parser = vte::Parser::new(); let sixel_image_store = Rc::new(RefCell::new(SixelImageStore::default())); let terminal_emulator_color_codes = Rc::new(RefCell::new(HashMap::new())); + let debug = false; let mut grid = Grid::new( 51, 112, @@ -1985,6 +2152,7 @@ pub fn fzf_fullscreen() { Rc::new(RefCell::new(LinkHandler::new())), Rc::new(RefCell::new(None)), sixel_image_store, + debug, ); let fixture_name = "fzf_fullscreen"; let content = read_fixture(fixture_name); @@ -2003,6 +2171,7 @@ pub fn replace_multiple_wide_characters_under_cursor() { let mut vte_parser = vte::Parser::new(); let sixel_image_store = Rc::new(RefCell::new(SixelImageStore::default())); let terminal_emulator_color_codes = Rc::new(RefCell::new(HashMap::new())); + let debug = false; let mut grid = Grid::new( 51, 112, @@ -2011,6 +2180,7 @@ pub fn replace_multiple_wide_characters_under_cursor() { Rc::new(RefCell::new(LinkHandler::new())), Rc::new(RefCell::new(None)), sixel_image_store, + debug, ); let fixture_name = "replace_multiple_wide_characters"; let content = read_fixture(fixture_name); @@ -2029,6 +2199,7 @@ pub fn replace_non_wide_characters_with_wide_characters() { let mut vte_parser = vte::Parser::new(); let sixel_image_store = Rc::new(RefCell::new(SixelImageStore::default())); let terminal_emulator_color_codes = Rc::new(RefCell::new(HashMap::new())); + let debug = false; let mut grid = Grid::new( 51, 112, @@ -2037,6 +2208,7 @@ pub fn replace_non_wide_characters_with_wide_characters() { Rc::new(RefCell::new(LinkHandler::new())), Rc::new(RefCell::new(None)), sixel_image_store, + debug, ); let fixture_name = "replace_non_wide_characters_with_wide_characters"; let content = read_fixture(fixture_name); @@ -2051,6 +2223,7 @@ pub fn scroll_down_ansi() { let mut vte_parser = vte::Parser::new(); let sixel_image_store = Rc::new(RefCell::new(SixelImageStore::default())); let terminal_emulator_color_codes = Rc::new(RefCell::new(HashMap::new())); + let debug = false; let mut grid = Grid::new( 51, 112, @@ -2059,6 +2232,7 @@ pub fn scroll_down_ansi() { Rc::new(RefCell::new(LinkHandler::new())), Rc::new(RefCell::new(None)), sixel_image_store, + debug, ); let fixture_name = "scroll_down"; let content = read_fixture(fixture_name); @@ -2073,6 +2247,7 @@ pub fn ansi_capital_t() { let mut vte_parser = vte::Parser::new(); let sixel_image_store = Rc::new(RefCell::new(SixelImageStore::default())); let terminal_emulator_color_codes = Rc::new(RefCell::new(HashMap::new())); + let debug = false; let mut grid = Grid::new( 51, 112, @@ -2081,6 +2256,7 @@ pub fn ansi_capital_t() { Rc::new(RefCell::new(LinkHandler::new())), Rc::new(RefCell::new(None)), sixel_image_store, + debug, ); let content = "foo\u{1b}[14Tbar".as_bytes(); for byte in content { @@ -2094,6 +2270,7 @@ pub fn ansi_capital_s() { let mut vte_parser = vte::Parser::new(); let sixel_image_store = Rc::new(RefCell::new(SixelImageStore::default())); let terminal_emulator_color_codes = Rc::new(RefCell::new(HashMap::new())); + let debug = false; let mut grid = Grid::new( 51, 112, @@ -2102,6 +2279,7 @@ pub fn ansi_capital_s() { Rc::new(RefCell::new(LinkHandler::new())), Rc::new(RefCell::new(None)), sixel_image_store, + debug, ); let content = "\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\nfoo\u{1b}[14Sbar".as_bytes(); for byte in content { @@ -2115,6 +2293,7 @@ fn terminal_pixel_size_reports() { let mut vte_parser = vte::Parser::new(); let sixel_image_store = Rc::new(RefCell::new(SixelImageStore::default())); let terminal_emulator_color_codes = Rc::new(RefCell::new(HashMap::new())); + let debug = false; let mut grid = Grid::new( 51, 97, @@ -2126,6 +2305,7 @@ fn terminal_pixel_size_reports() { width: 8, }))), sixel_image_store, + debug, ); let fixture_name = "terminal_pixel_size_reports"; let content = read_fixture(fixture_name); @@ -2146,6 +2326,7 @@ fn terminal_pixel_size_reports_in_unsupported_terminals() { let mut vte_parser = vte::Parser::new(); let sixel_image_store = Rc::new(RefCell::new(SixelImageStore::default())); let terminal_emulator_color_codes = Rc::new(RefCell::new(HashMap::new())); + let debug = false; let mut grid = Grid::new( 51, 97, @@ -2154,6 +2335,7 @@ fn terminal_pixel_size_reports_in_unsupported_terminals() { Rc::new(RefCell::new(LinkHandler::new())), Rc::new(RefCell::new(None)), // in an unsupported terminal, we don't have this info sixel_image_store, + debug, ); let fixture_name = "terminal_pixel_size_reports"; let content = read_fixture(fixture_name); @@ -2175,6 +2357,7 @@ pub fn ansi_csi_at_sign() { let mut vte_parser = vte::Parser::new(); let sixel_image_store = Rc::new(RefCell::new(SixelImageStore::default())); let terminal_emulator_color_codes = Rc::new(RefCell::new(HashMap::new())); + let debug = false; let mut grid = Grid::new( 51, 112, @@ -2183,6 +2366,7 @@ pub fn ansi_csi_at_sign() { Rc::new(RefCell::new(LinkHandler::new())), Rc::new(RefCell::new(None)), sixel_image_store, + debug, ); let content = "foo\u{1b}[2D\u{1b}[2@".as_bytes(); for byte in content { @@ -2200,6 +2384,7 @@ pub fn sixel_images_are_reaped_when_scrolled_off() { width: 8, height: 21, }))); + let debug = false; let mut grid = Grid::new( 51, 112, @@ -2208,6 +2393,7 @@ pub fn sixel_images_are_reaped_when_scrolled_off() { Rc::new(RefCell::new(LinkHandler::new())), character_cell_size, sixel_image_store.clone(), + debug, ); let pane_content = read_fixture("sixel-image-500px.six"); for byte in pane_content { @@ -2234,6 +2420,7 @@ pub fn sixel_images_are_reaped_when_resetting() { width: 8, height: 21, }))); + let debug = false; let mut grid = Grid::new( 51, 112, @@ -2242,6 +2429,7 @@ pub fn sixel_images_are_reaped_when_resetting() { Rc::new(RefCell::new(LinkHandler::new())), character_cell_size, sixel_image_store.clone(), + debug, ); let pane_content = read_fixture("sixel-image-500px.six"); for byte in pane_content { @@ -2265,6 +2453,7 @@ pub fn sixel_image_in_alternate_buffer() { width: 8, height: 21, }))); + let debug = false; let mut grid = Grid::new( 30, 112, @@ -2273,6 +2462,7 @@ pub fn sixel_image_in_alternate_buffer() { Rc::new(RefCell::new(LinkHandler::new())), character_cell_size, sixel_image_store.clone(), + debug, ); let move_to_alternate_screen = "\u{1b}[?1049h"; @@ -2307,6 +2497,7 @@ pub fn sixel_with_image_scrolling_decsdm() { width: 8, height: 21, }))); + let debug = false; let mut grid = Grid::new( 30, 112, @@ -2315,6 +2506,7 @@ pub fn sixel_with_image_scrolling_decsdm() { Rc::new(RefCell::new(LinkHandler::new())), character_cell_size, sixel_image_store, + debug, ); // enter DECSDM @@ -2368,6 +2560,7 @@ pub fn osc_4_background_query() { let mut vte_parser = vte::Parser::new(); let sixel_image_store = Rc::new(RefCell::new(SixelImageStore::default())); let terminal_emulator_color_codes = Rc::new(RefCell::new(HashMap::new())); + let debug = false; let mut grid = Grid::new( 51, 97, @@ -2376,6 +2569,7 @@ pub fn osc_4_background_query() { Rc::new(RefCell::new(LinkHandler::new())), Rc::new(RefCell::new(None)), sixel_image_store, + debug, ); let content = "\u{1b}]10;?\u{1b}\\"; for byte in content.as_bytes() { @@ -2397,6 +2591,7 @@ pub fn osc_4_foreground_query() { let mut vte_parser = vte::Parser::new(); let sixel_image_store = Rc::new(RefCell::new(SixelImageStore::default())); let terminal_emulator_color_codes = Rc::new(RefCell::new(HashMap::new())); + let debug = false; let mut grid = Grid::new( 51, 97, @@ -2405,6 +2600,7 @@ pub fn osc_4_foreground_query() { Rc::new(RefCell::new(LinkHandler::new())), Rc::new(RefCell::new(None)), sixel_image_store, + debug, ); let content = "\u{1b}]11;?\u{1b}\\"; for byte in content.as_bytes() { @@ -2428,6 +2624,7 @@ pub fn osc_4_color_query() { let mut vte_parser = vte::Parser::new(); let sixel_image_store = Rc::new(RefCell::new(SixelImageStore::default())); let terminal_emulator_color_codes = Rc::new(RefCell::new(color_codes)); + let debug = false; let mut grid = Grid::new( 51, 97, @@ -2436,6 +2633,7 @@ pub fn osc_4_color_query() { Rc::new(RefCell::new(LinkHandler::new())), Rc::new(RefCell::new(None)), sixel_image_store, + debug, ); let content = "\u{1b}]4;222;?\u{1b}\\"; for byte in content.as_bytes() { @@ -2457,6 +2655,7 @@ pub fn xtsmgraphics_color_register_count() { let mut vte_parser = vte::Parser::new(); let sixel_image_store = Rc::new(RefCell::new(SixelImageStore::default())); let terminal_emulator_color_codes = Rc::new(RefCell::new(HashMap::new())); + let debug = false; let mut grid = Grid::new( 51, 97, @@ -2465,6 +2664,7 @@ pub fn xtsmgraphics_color_register_count() { Rc::new(RefCell::new(LinkHandler::new())), Rc::new(RefCell::new(None)), sixel_image_store, + debug, ); let content = "\u{1b}[?1;1;S\u{1b}\\"; for byte in content.as_bytes() { @@ -2490,6 +2690,7 @@ pub fn xtsmgraphics_pixel_graphics_geometry() { width: 8, height: 21, }))); + let debug = false; let mut grid = Grid::new( 51, 97, @@ -2498,6 +2699,7 @@ pub fn xtsmgraphics_pixel_graphics_geometry() { Rc::new(RefCell::new(LinkHandler::new())), character_cell_size, sixel_image_store, + debug, ); let content = "\u{1b}[?2;1;S\u{1b}\\"; for byte in content.as_bytes() { @@ -2523,6 +2725,7 @@ pub fn cursor_hide_persists_through_alternate_screen() { width: 8, height: 21, }))); + let debug = false; let mut grid = Grid::new( 30, 112, @@ -2531,6 +2734,7 @@ pub fn cursor_hide_persists_through_alternate_screen() { Rc::new(RefCell::new(LinkHandler::new())), character_cell_size, sixel_image_store, + debug, ); let hide_cursor = "\u{1b}[?25l"; diff --git a/zellij-server/src/panes/unit/search_in_pane_tests.rs b/zellij-server/src/panes/unit/search_in_pane_tests.rs index 7e10e5f9..346eb40b 100644 --- a/zellij-server/src/panes/unit/search_in_pane_tests.rs +++ b/zellij-server/src/panes/unit/search_in_pane_tests.rs @@ -28,6 +28,7 @@ fn create_pane() -> TerminalPane { let style = Style::default(); let sixel_image_store = Rc::new(RefCell::new(SixelImageStore::default())); let terminal_emulator_color_codes = Rc::new(RefCell::new(HashMap::new())); + let debug = false; let mut terminal_pane = TerminalPane::new( pid, fake_win_size, @@ -41,6 +42,7 @@ fn create_pane() -> TerminalPane { terminal_emulator_color_codes, None, None, + debug, ); // 0 is the pane index let content = read_fixture(); terminal_pane.handle_pty_bytes(content); diff --git a/zellij-server/src/panes/unit/terminal_pane_tests.rs b/zellij-server/src/panes/unit/terminal_pane_tests.rs index 291d65eb..8b0a6c41 100644 --- a/zellij-server/src/panes/unit/terminal_pane_tests.rs +++ b/zellij-server/src/panes/unit/terminal_pane_tests.rs @@ -36,6 +36,7 @@ pub fn scrolling_inside_a_pane() { let sixel_image_store = Rc::new(RefCell::new(SixelImageStore::default())); let terminal_emulator_colors = Rc::new(RefCell::new(Palette::default())); let terminal_emulator_color_codes = Rc::new(RefCell::new(HashMap::new())); + let debug = false; let mut terminal_pane = TerminalPane::new( pid, fake_win_size, @@ -49,6 +50,7 @@ pub fn scrolling_inside_a_pane() { terminal_emulator_color_codes, None, None, + debug, ); // 0 is the pane index let mut text_to_fill_pane = String::new(); for i in 0..30 { @@ -78,6 +80,7 @@ pub fn sixel_image_inside_terminal_pane() { width: 8, height: 21, }))); + let debug = false; let mut terminal_pane = TerminalPane::new( pid, fake_win_size, @@ -91,6 +94,7 @@ pub fn sixel_image_inside_terminal_pane() { terminal_emulator_color_codes, None, None, + debug, ); // 0 is the pane index let sixel_image_bytes = "\u{1b}Pq #0;2;0;0;0#1;2;100;100;0#2;2;0;100;0 @@ -120,6 +124,7 @@ pub fn partial_sixel_image_inside_terminal_pane() { width: 8, height: 21, }))); + let debug = false; let mut terminal_pane = TerminalPane::new( pid, fake_win_size, @@ -133,6 +138,7 @@ pub fn partial_sixel_image_inside_terminal_pane() { terminal_emulator_color_codes, None, None, + debug, ); // 0 is the pane index let pane_content = read_fixture("sixel-image-500px.six"); terminal_pane.handle_pty_bytes(pane_content); @@ -156,6 +162,7 @@ pub fn overflowing_sixel_image_inside_terminal_pane() { width: 8, height: 21, }))); + let debug = false; let mut terminal_pane = TerminalPane::new( pid, fake_win_size, @@ -169,6 +176,7 @@ pub fn overflowing_sixel_image_inside_terminal_pane() { terminal_emulator_color_codes, None, None, + debug, ); // 0 is the pane index let pane_content = read_fixture("sixel-image-500px.six"); terminal_pane.handle_pty_bytes(pane_content); @@ -191,6 +199,7 @@ pub fn scrolling_through_a_sixel_image() { width: 8, height: 21, }))); + let debug = false; let mut terminal_pane = TerminalPane::new( pid, fake_win_size, @@ -204,6 +213,7 @@ pub fn scrolling_through_a_sixel_image() { terminal_emulator_color_codes, None, None, + debug, ); // 0 is the pane index let mut text_to_fill_pane = String::new(); for i in 0..30 { @@ -237,6 +247,7 @@ pub fn multiple_sixel_images_in_pane() { width: 8, height: 21, }))); + let debug = false; let mut terminal_pane = TerminalPane::new( pid, fake_win_size, @@ -250,6 +261,7 @@ pub fn multiple_sixel_images_in_pane() { terminal_emulator_color_codes, None, None, + debug, ); // 0 is the pane index let mut text_to_fill_pane = String::new(); for i in 0..5 { @@ -281,6 +293,7 @@ pub fn resizing_pane_with_sixel_images() { width: 8, height: 21, }))); + let debug = false; let mut terminal_pane = TerminalPane::new( pid, fake_win_size, @@ -294,6 +307,7 @@ pub fn resizing_pane_with_sixel_images() { terminal_emulator_color_codes, None, None, + debug, ); // 0 is the pane index let mut text_to_fill_pane = String::new(); for i in 0..5 { @@ -328,6 +342,7 @@ pub fn changing_character_cell_size_with_sixel_images() { width: 8, height: 21, }))); + let debug = false; let mut terminal_pane = TerminalPane::new( pid, fake_win_size, @@ -341,6 +356,7 @@ pub fn changing_character_cell_size_with_sixel_images() { terminal_emulator_color_codes, None, None, + debug, ); // 0 is the pane index let mut text_to_fill_pane = String::new(); for i in 0..5 { @@ -380,6 +396,7 @@ pub fn keep_working_after_corrupted_sixel_image() { width: 8, height: 21, }))); + let debug = false; let mut terminal_pane = TerminalPane::new( pid, fake_win_size, @@ -393,6 +410,7 @@ pub fn keep_working_after_corrupted_sixel_image() { terminal_emulator_color_codes, None, None, + debug, ); // 0 is the pane index let sixel_image_bytes = "\u{1b}PI AM CORRUPTED BWAHAHAq @@ -430,6 +448,7 @@ pub fn pane_with_frame_position_is_on_frame() { width: 8, height: 21, }))); + let debug = false; let mut terminal_pane = TerminalPane::new( pid, fake_win_size, @@ -443,6 +462,7 @@ pub fn pane_with_frame_position_is_on_frame() { terminal_emulator_color_codes, None, None, + debug, ); // 0 is the pane index terminal_pane.set_content_offset(Offset::frame(1)); @@ -516,6 +536,7 @@ pub fn pane_with_bottom_and_right_borders_position_is_on_frame() { width: 8, height: 21, }))); + let debug = false; let mut terminal_pane = TerminalPane::new( pid, fake_win_size, @@ -529,6 +550,7 @@ pub fn pane_with_bottom_and_right_borders_position_is_on_frame() { terminal_emulator_color_codes, None, None, + debug, ); // 0 is the pane index terminal_pane.set_content_offset(Offset::shift(1, 1)); @@ -602,6 +624,7 @@ pub fn frameless_pane_position_is_on_frame() { width: 8, height: 21, }))); + let debug = false; let mut terminal_pane = TerminalPane::new( pid, fake_win_size, @@ -615,6 +638,7 @@ pub fn frameless_pane_position_is_on_frame() { terminal_emulator_color_codes, None, None, + debug, ); // 0 is the pane index terminal_pane.set_content_offset(Offset::default()); diff --git a/zellij-server/src/screen.rs b/zellij-server/src/screen.rs index 63a2b00f..7401d9d7 100644 --- a/zellij-server/src/screen.rs +++ b/zellij-server/src/screen.rs @@ -502,6 +502,7 @@ pub(crate) struct Screen { auto_layout: bool, session_is_mirrored: bool, copy_options: CopyOptions, + debug: bool, } impl Screen { @@ -515,6 +516,7 @@ impl Screen { auto_layout: bool, session_is_mirrored: bool, copy_options: CopyOptions, + debug: bool, ) -> Self { Screen { bus, @@ -537,6 +539,7 @@ impl Screen { auto_layout, session_is_mirrored, copy_options, + debug, } } @@ -1055,6 +1058,7 @@ impl Screen { self.terminal_emulator_colors.clone(), self.terminal_emulator_color_codes.clone(), swap_layouts, + self.debug, ); self.tabs.insert(tab_index, tab); Ok(()) @@ -1510,6 +1514,7 @@ pub(crate) fn screen_thread_main( max_panes: Option, client_attributes: ClientAttributes, config_options: Box, + debug: bool, ) -> Result<()> { let capabilities = config_options.simplified_ui; let draw_pane_frames = config_options.pane_frames.unwrap_or(true); @@ -1536,6 +1541,7 @@ pub(crate) fn screen_thread_main( auto_layout, session_is_mirrored, copy_options, + debug, ); let mut pending_tab_ids: HashSet = HashSet::new(); diff --git a/zellij-server/src/tab/layout_applier.rs b/zellij-server/src/tab/layout_applier.rs index a89a42dc..4797e8f3 100644 --- a/zellij-server/src/tab/layout_applier.rs +++ b/zellij-server/src/tab/layout_applier.rs @@ -38,6 +38,7 @@ pub struct LayoutApplier<'a> { draw_pane_frames: bool, focus_pane_id: &'a mut Option, os_api: Box, + debug: bool, } impl<'a> LayoutApplier<'a> { @@ -57,6 +58,7 @@ impl<'a> LayoutApplier<'a> { draw_pane_frames: bool, focus_pane_id: &'a mut Option, os_api: &Box, + debug: bool, ) -> Self { let viewport = viewport.clone(); let senders = senders.clone(); @@ -85,6 +87,7 @@ impl<'a> LayoutApplier<'a> { draw_pane_frames, focus_pane_id, os_api, + debug, } } pub fn apply_layout( @@ -233,6 +236,7 @@ impl<'a> LayoutApplier<'a> { self.connected_clients.borrow().iter().copied().collect(), self.style, layout.run.clone(), + self.debug, ); new_plugin.set_borderless(layout.borderless); if let Some(exclude_from_sync) = layout.exclude_from_sync { @@ -263,6 +267,7 @@ impl<'a> LayoutApplier<'a> { self.terminal_emulator_color_codes.clone(), initial_title, layout.run.clone(), + self.debug, ); new_pane.set_borderless(layout.borderless); if let Some(exclude_from_sync) = layout.exclude_from_sync { @@ -342,6 +347,7 @@ impl<'a> LayoutApplier<'a> { self.connected_clients.borrow().iter().copied().collect(), self.style, floating_pane_layout.run.clone(), + self.debug, ); new_pane.set_borderless(false); new_pane.set_content_offset(Offset::frame(1)); @@ -379,6 +385,7 @@ impl<'a> LayoutApplier<'a> { self.terminal_emulator_color_codes.clone(), initial_title, floating_pane_layout.run.clone(), + self.debug, ); new_pane.set_borderless(false); new_pane.set_content_offset(Offset::frame(1)); diff --git a/zellij-server/src/tab/mod.rs b/zellij-server/src/tab/mod.rs index 9b9784ce..5235a8a6 100644 --- a/zellij-server/src/tab/mod.rs +++ b/zellij-server/src/tab/mod.rs @@ -170,6 +170,7 @@ pub(crate) struct Tab { pending_instructions: Vec, // instructions that came while the tab was // pending and need to be re-applied swap_layouts: SwapLayouts, + debug: bool, } #[derive(Clone, Debug, Default, Serialize, Deserialize)] @@ -498,6 +499,7 @@ impl Tab { terminal_emulator_colors: Rc>, terminal_emulator_color_codes: Rc>>, swap_layouts: (Vec, Vec), + debug: bool, ) -> Self { let name = if name.is_empty() { format!("Tab #{}", index + 1) @@ -584,6 +586,7 @@ impl Tab { is_pending: true, // will be switched to false once the layout is applied pending_instructions: vec![], swap_layouts, + debug, } } @@ -614,6 +617,7 @@ impl Tab { self.draw_pane_frames, &mut self.focus_pane_id, &self.os_api, + self.debug, ) .apply_layout( layout, @@ -673,6 +677,7 @@ impl Tab { self.draw_pane_frames, &mut self.focus_pane_id, &self.os_api, + self.debug, ) .apply_floating_panes_layout_to_existing_panes( &layout_candidate, @@ -726,6 +731,7 @@ impl Tab { self.draw_pane_frames, &mut self.focus_pane_id, &self.os_api, + self.debug, ) .apply_tiled_panes_layout_to_existing_panes( &layout_candidate, @@ -1013,6 +1019,7 @@ impl Tab { self.terminal_emulator_color_codes.clone(), initial_pane_title, None, + self.debug, )) as Box }, PaneId::Plugin(plugin_pid) => { @@ -1034,6 +1041,7 @@ impl Tab { self.connected_clients.borrow().iter().copied().collect(), self.style, run_plugin, + self.debug, )) as Box }, }; @@ -1065,6 +1073,7 @@ impl Tab { self.terminal_emulator_color_codes.clone(), None, None, + self.debug, ); new_pane.update_name("EDITING SCROLLBACK"); // we do this here and not in the // constructor so it won't be overrided @@ -1140,6 +1149,7 @@ impl Tab { self.terminal_emulator_color_codes.clone(), initial_pane_title, None, + self.debug, ); self.tiled_panes .split_pane_horizontally(pid, Box::new(new_terminal), client_id); @@ -1196,6 +1206,7 @@ impl Tab { self.terminal_emulator_color_codes.clone(), initial_pane_title, None, + self.debug, ); self.tiled_panes .split_pane_vertically(pid, Box::new(new_terminal), client_id); diff --git a/zellij-server/src/tab/unit/tab_integration_tests.rs b/zellij-server/src/tab/unit/tab_integration_tests.rs index ac0bae71..c870c3a0 100644 --- a/zellij-server/src/tab/unit/tab_integration_tests.rs +++ b/zellij-server/src/tab/unit/tab_integration_tests.rs @@ -222,6 +222,7 @@ fn create_new_tab(size: Size, default_mode: ModeInfo) -> Tab { let copy_options = CopyOptions::default(); let terminal_emulator_color_codes = Rc::new(RefCell::new(HashMap::new())); let sixel_image_store = Rc::new(RefCell::new(SixelImageStore::default())); + let debug = false; let mut tab = Tab::new( index, position, @@ -243,6 +244,7 @@ fn create_new_tab(size: Size, default_mode: ModeInfo) -> Tab { terminal_emulator_colors, terminal_emulator_color_codes, (vec![], vec![]), + debug, ); tab.apply_layout( TiledPaneLayout::default(), @@ -292,6 +294,7 @@ fn create_new_tab_with_swap_layouts( let copy_options = CopyOptions::default(); let terminal_emulator_color_codes = Rc::new(RefCell::new(HashMap::new())); let sixel_image_store = Rc::new(RefCell::new(SixelImageStore::default())); + let debug = false; let mut tab = Tab::new( index, position, @@ -313,6 +316,7 @@ fn create_new_tab_with_swap_layouts( terminal_emulator_colors, terminal_emulator_color_codes, swap_layouts, + debug, ); let ( base_layout, @@ -364,6 +368,7 @@ fn create_new_tab_with_os_api( let copy_options = CopyOptions::default(); let terminal_emulator_color_codes = Rc::new(RefCell::new(HashMap::new())); let sixel_image_store = Rc::new(RefCell::new(SixelImageStore::default())); + let debug = false; let mut tab = Tab::new( index, position, @@ -385,6 +390,7 @@ fn create_new_tab_with_os_api( terminal_emulator_colors, terminal_emulator_color_codes, (vec![], vec![]), // swap layouts + debug, ); tab.apply_layout( TiledPaneLayout::default(), @@ -422,6 +428,7 @@ fn create_new_tab_with_layout(size: Size, default_mode: ModeInfo, layout: &str) let sixel_image_store = Rc::new(RefCell::new(SixelImageStore::default())); let layout = Layout::from_str(layout, "layout_file_name".into(), None, None).unwrap(); let (tab_layout, floating_panes_layout) = layout.new_tab(); + let debug = false; let mut tab = Tab::new( index, position, @@ -443,6 +450,7 @@ fn create_new_tab_with_layout(size: Size, default_mode: ModeInfo, layout: &str) terminal_emulator_colors, terminal_emulator_color_codes, (vec![], vec![]), // swap layouts + debug, ); let pane_ids = tab_layout .extract_run_instructions() @@ -494,6 +502,7 @@ fn create_new_tab_with_mock_pty_writer( let copy_options = CopyOptions::default(); let terminal_emulator_color_codes = Rc::new(RefCell::new(HashMap::new())); let sixel_image_store = Rc::new(RefCell::new(SixelImageStore::default())); + let debug = false; let mut tab = Tab::new( index, position, @@ -515,6 +524,7 @@ fn create_new_tab_with_mock_pty_writer( terminal_emulator_colors, terminal_emulator_color_codes, (vec![], vec![]), // swap layouts + debug, ); tab.apply_layout( TiledPaneLayout::default(), @@ -557,6 +567,7 @@ fn create_new_tab_with_sixel_support( let terminal_emulator_colors = Rc::new(RefCell::new(Palette::default())); let copy_options = CopyOptions::default(); let terminal_emulator_color_codes = Rc::new(RefCell::new(HashMap::new())); + let debug = false; let mut tab = Tab::new( index, position, @@ -578,6 +589,7 @@ fn create_new_tab_with_sixel_support( terminal_emulator_colors, terminal_emulator_color_codes, (vec![], vec![]), // swap layouts + debug, ); tab.apply_layout( TiledPaneLayout::default(), @@ -613,6 +625,7 @@ fn take_snapshot(ansi_instructions: &str, rows: usize, columns: usize, palette: width: 8, height: 21, }))); + let debug = false; let mut grid = Grid::new( rows, columns, @@ -621,6 +634,7 @@ fn take_snapshot(ansi_instructions: &str, rows: usize, columns: usize, palette: Rc::new(RefCell::new(LinkHandler::new())), character_cell_size, sixel_image_store, + debug, ); let mut vte_parser = vte::Parser::new(); for &byte in ansi_instructions.as_bytes() { @@ -641,6 +655,7 @@ fn take_snapshot_with_sixel( width: 8, height: 21, }))); + let debug = false; let mut grid = Grid::new( rows, columns, @@ -649,6 +664,7 @@ fn take_snapshot_with_sixel( Rc::new(RefCell::new(LinkHandler::new())), character_cell_size, sixel_image_store, + debug, ); let mut vte_parser = vte::Parser::new(); for &byte in ansi_instructions.as_bytes() { @@ -666,6 +682,7 @@ fn take_snapshot_and_cursor_position( // snapshot, x_coordinates, y_coordinates let sixel_image_store = Rc::new(RefCell::new(SixelImageStore::default())); let terminal_emulator_color_codes = Rc::new(RefCell::new(HashMap::new())); + let debug = false; let mut grid = Grid::new( rows, columns, @@ -674,6 +691,7 @@ fn take_snapshot_and_cursor_position( Rc::new(RefCell::new(LinkHandler::new())), Rc::new(RefCell::new(None)), sixel_image_store, + debug, ); let mut vte_parser = vte::Parser::new(); for &byte in ansi_instructions.as_bytes() { diff --git a/zellij-server/src/tab/unit/tab_tests.rs b/zellij-server/src/tab/unit/tab_tests.rs index 5374ed70..195dbb88 100644 --- a/zellij-server/src/tab/unit/tab_tests.rs +++ b/zellij-server/src/tab/unit/tab_tests.rs @@ -164,6 +164,7 @@ fn create_new_tab(size: Size) -> Tab { let copy_options = CopyOptions::default(); let sixel_image_store = Rc::new(RefCell::new(SixelImageStore::default())); let terminal_emulator_color_codes = Rc::new(RefCell::new(HashMap::new())); + let debug = false; let mut tab = Tab::new( index, position, @@ -185,6 +186,7 @@ fn create_new_tab(size: Size) -> Tab { terminal_emulator_colors, terminal_emulator_color_codes, (vec![], vec![]), // swap layouts + debug, ); tab.apply_layout( TiledPaneLayout::default(), @@ -219,6 +221,7 @@ fn create_new_tab_with_layout(size: Size, layout: TiledPaneLayout) -> Tab { let copy_options = CopyOptions::default(); let sixel_image_store = Rc::new(RefCell::new(SixelImageStore::default())); let terminal_emulator_color_codes = Rc::new(RefCell::new(HashMap::new())); + let debug = false; let mut tab = Tab::new( index, position, @@ -240,6 +243,7 @@ fn create_new_tab_with_layout(size: Size, layout: TiledPaneLayout) -> Tab { terminal_emulator_colors, terminal_emulator_color_codes, (vec![], vec![]), // swap layouts + debug, ); let mut new_terminal_ids = vec![]; for i in 0..layout.extract_run_instructions().len() { @@ -280,6 +284,7 @@ fn create_new_tab_with_cell_size( let copy_options = CopyOptions::default(); let sixel_image_store = Rc::new(RefCell::new(SixelImageStore::default())); let terminal_emulator_color_codes = Rc::new(RefCell::new(HashMap::new())); + let debug = false; let mut tab = Tab::new( index, position, @@ -301,6 +306,7 @@ fn create_new_tab_with_cell_size( terminal_emulator_colors, terminal_emulator_color_codes, (vec![], vec![]), // swap layouts + debug, ); tab.apply_layout( TiledPaneLayout::default(), diff --git a/zellij-server/src/unit/screen_tests.rs b/zellij-server/src/unit/screen_tests.rs index c8acdc63..51dfbfd3 100644 --- a/zellij-server/src/unit/screen_tests.rs +++ b/zellij-server/src/unit/screen_tests.rs @@ -66,6 +66,7 @@ fn take_snapshots_and_cursor_coordinates_from_render_events<'a>( width: 8, height: 21, }))); + let debug = false; let mut grid = Grid::new( screen_size.rows, screen_size.cols, @@ -74,6 +75,7 @@ fn take_snapshots_and_cursor_coordinates_from_render_events<'a>( Rc::new(RefCell::new(LinkHandler::new())), character_cell_size, sixel_image_store, + debug, ); let snapshots: Vec<(Option<(usize, usize)>, String)> = all_events .filter_map(|server_instruction| { @@ -232,6 +234,7 @@ fn create_new_screen(size: Size) -> Screen { let session_is_mirrored = true; let copy_options = CopyOptions::default(); + let debug = false; let screen = Screen::new( bus, &client_attributes, @@ -241,6 +244,7 @@ fn create_new_screen(size: Size) -> Screen { auto_layout, session_is_mirrored, copy_options, + debug, ); screen } @@ -281,6 +285,7 @@ impl MockScreen { Some(Box::new(self.os_input.clone())), ) .should_silently_fail(); + let debug = false; let screen_thread = std::thread::Builder::new() .name("screen_thread".to_string()) .spawn(move || { @@ -290,6 +295,7 @@ impl MockScreen { None, client_attributes, Box::new(config_options), + debug, ) .expect("TEST") })