pogmommy/zellij
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix early quit with plugins

Browse source
This commit is contained in:
Brooks J Rady 2021-01-06 17:06:15 +00:00
parent fc2205c415
commit b2720169fb
2 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/screen.rs
View file

@ -150,7 +150,7 @@ impl Screen {
} }
pub fn render(&mut self) { pub fn render(&mut self) {
if let Some(active_tab) = self.get_active_tab_mut() { if let Some(active_tab) = self.get_active_tab_mut() {
if active_tab.get_active_terminal().is_some() { if active_tab.get_active_pane().is_some() {
active_tab.render(); active_tab.render();
} else { } else {
self.close_tab(); self.close_tab();

20
src/tab.rs
View file

@ -440,9 +440,9 @@ impl Tab {
} }
} }
} }
pub fn get_active_terminal(&self) -> Option<&Box<dyn Pane>> { pub fn get_active_pane(&self) -> Option<&Box<dyn Pane>> {
match self.get_active_terminal_id() { match self.get_active_pane_id() {
Some(active_terminal) => self.panes.get(&PaneId::Terminal(active_terminal)), Some(active_pane) => self.panes.get(&active_pane),
None => None, None => None,
} }
} }
@ -469,7 +469,7 @@ impl Tab {
} }
pub fn write_to_active_terminal(&mut self, input_bytes: Vec<u8>) { pub fn write_to_active_terminal(&mut self, input_bytes: Vec<u8>) {
if let Some(active_terminal_id) = &self.get_active_terminal_id() { if let Some(active_terminal_id) = &self.get_active_terminal_id() {
let active_terminal = self.get_active_terminal().unwrap(); let active_terminal = self.get_active_pane().unwrap();
let mut adjusted_input = active_terminal.adjust_input_to_terminal(input_bytes); let mut adjusted_input = active_terminal.adjust_input_to_terminal(input_bytes);
self.os_api self.os_api
.write_to_tty_stdin(*active_terminal_id, &mut adjusted_input) .write_to_tty_stdin(*active_terminal_id, &mut adjusted_input)
@ -481,7 +481,7 @@ impl Tab {
} }
pub fn get_active_terminal_cursor_position(&self) -> Option<(usize, usize)> { pub fn get_active_terminal_cursor_position(&self) -> Option<(usize, usize)> {
// (x, y) // (x, y)
let active_terminal = &self.get_active_terminal()?; let active_terminal = &self.get_active_pane()?;
active_terminal active_terminal
.cursor_coordinates() .cursor_coordinates()
.map(|(x_in_terminal, y_in_terminal)| { .map(|(x_in_terminal, y_in_terminal)| {
@ -493,7 +493,7 @@ impl Tab {
pub fn toggle_active_pane_fullscreen(&mut self) { pub fn toggle_active_pane_fullscreen(&mut self) {
if let Some(active_pane_id) = self.get_active_pane_id() { if let Some(active_pane_id) = self.get_active_pane_id() {
if self if self
.get_active_terminal() .get_active_pane()
.unwrap() .unwrap()
.position_and_size_override() .position_and_size_override()
.is_some() .is_some()
@ -1415,7 +1415,7 @@ impl Tab {
if self.fullscreen_is_active { if self.fullscreen_is_active {
return; return;
} }
let active_terminal = self.get_active_terminal(); let active_terminal = self.get_active_pane();
if let Some(active) = active_terminal { if let Some(active) = active_terminal {
let terminals = self.get_panes(); let terminals = self.get_panes();
let next_index = terminals let next_index = terminals
@ -1445,7 +1445,7 @@ impl Tab {
if self.fullscreen_is_active { if self.fullscreen_is_active {
return; return;
} }
let active_terminal = self.get_active_terminal(); let active_terminal = self.get_active_pane();
if let Some(active) = active_terminal { if let Some(active) = active_terminal {
let terminals = self.get_panes(); let terminals = self.get_panes();
let next_index = terminals let next_index = terminals
@ -1475,7 +1475,7 @@ impl Tab {
if self.fullscreen_is_active { if self.fullscreen_is_active {
return; return;
} }
let active_terminal = self.get_active_terminal(); let active_terminal = self.get_active_pane();
if let Some(active) = active_terminal { if let Some(active) = active_terminal {
let terminals = self.get_panes(); let terminals = self.get_panes();
let next_index = terminals let next_index = terminals
@ -1505,7 +1505,7 @@ impl Tab {
if self.fullscreen_is_active { if self.fullscreen_is_active {
return; return;
} }
let active_terminal = self.get_active_terminal(); let active_terminal = self.get_active_pane();
if let Some(active) = active_terminal { if let Some(active) = active_terminal {
let terminals = self.get_panes(); let terminals = self.get_panes();
let next_index = terminals let next_index = terminals