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

store tab history in a stack-like data structure

Browse source
This commit is contained in:
Sagittarius-a 2021-08-03 00:17:17 +02:00
parent aff9973616
commit 4f482f3b63
2 changed files with 105 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
zellij-server/src/screen.rs
View file

@ -152,7 +152,7 @@ pub(crate) struct Screen {
position_and_size: PositionAndSize, position_and_size: PositionAndSize,
/// The index of this [`Screen`]'s active [`Tab`]. /// The index of this [`Screen`]'s active [`Tab`].
active_tab_index: Option<usize>, active_tab_index: Option<usize>,
previous_active_tab_index: Option<usize>, tab_history: Vec<Option<usize>>,
mode_info: ModeInfo, mode_info: ModeInfo,
colors: Palette, colors: Palette,
session_state: Arc<RwLock<SessionState>>, session_state: Arc<RwLock<SessionState>>,
@ -173,8 +173,8 @@ impl Screen {
position_and_size: client_attributes.position_and_size, position_and_size: client_attributes.position_and_size,
colors: client_attributes.palette, colors: client_attributes.palette,
active_tab_index: None, active_tab_index: None,
previous_active_tab_index: None,
tabs: BTreeMap::new(), tabs: BTreeMap::new(),
tab_history: Vec::with_capacity(32),
mode_info, mode_info,
session_state, session_state,
} }
@ -198,7 +198,7 @@ impl Screen {
self.colors, self.colors,
self.session_state.clone(), self.session_state.clone(),
); );
self.previous_active_tab_index = self.active_tab_index; self.tab_history.push(self.active_tab_index);
self.active_tab_index = Some(tab_index); self.active_tab_index = Some(tab_index);
self.tabs.insert(tab_index, tab); self.tabs.insert(tab_index, tab);
self.update_tabs(); self.update_tabs();
@ -224,7 +224,8 @@ impl Screen {
for tab in self.tabs.values_mut() { for tab in self.tabs.values_mut() {
if tab.position == new_tab_pos { if tab.position == new_tab_pos {
tab.set_force_render(); tab.set_force_render();
self.previous_active_tab_index = self.active_tab_index; self.tab_history.retain(|&e| e != Some(tab.index));
self.tab_history.push(self.active_tab_index);
self.active_tab_index = Some(tab.index); self.active_tab_index = Some(tab.index);
break; break;
} }
@ -244,7 +245,8 @@ impl Screen {
for tab in self.tabs.values_mut() { for tab in self.tabs.values_mut() {
if tab.position == new_tab_pos { if tab.position == new_tab_pos {
tab.set_force_render(); tab.set_force_render();
self.previous_active_tab_index = self.active_tab_index; self.tab_history.retain(|&e| e != Some(tab.index));
self.tab_history.push(self.active_tab_index);
self.active_tab_index = Some(tab.index); self.active_tab_index = Some(tab.index);
break; break;
} }
@ -259,7 +261,8 @@ impl Screen {
if let Some(t) = self.tabs.values_mut().find(|t| t.position == tab_index) { if let Some(t) = self.tabs.values_mut().find(|t| t.position == tab_index) {
if t.index != active_tab_index { if t.index != active_tab_index {
t.set_force_render(); t.set_force_render();
self.previous_active_tab_index = self.active_tab_index; self.tab_history.retain(|&e| e != Some(t.index));
self.tab_history.push(self.active_tab_index);
self.active_tab_index = Some(t.index); self.active_tab_index = Some(t.index);
self.update_tabs(); self.update_tabs();
self.render(); self.render();
@ -270,11 +273,7 @@ impl Screen {
/// Closes this [`Screen`]'s active [`Tab`], exiting the application if it happens /// Closes this [`Screen`]'s active [`Tab`], exiting the application if it happens
/// to be the last tab. /// to be the last tab.
pub fn close_tab(&mut self) { pub fn close_tab(&mut self) {
let future_previous = self.previous_active_tab_index;
let active_tab_index = self.active_tab_index.unwrap(); let active_tab_index = self.active_tab_index.unwrap();
if self.tabs.len() > 1 {
self.switch_tab_prev();
}
let active_tab = self.tabs.remove(&active_tab_index).unwrap(); let active_tab = self.tabs.remove(&active_tab_index).unwrap();
let pane_ids = active_tab.get_pane_ids(); let pane_ids = active_tab.get_pane_ids();
// below we don't check the result of sending the CloseTab instruction to the pty thread // below we don't check the result of sending the CloseTab instruction to the pty thread
@ -286,7 +285,6 @@ impl Screen {
.unwrap(); .unwrap();
if self.tabs.is_empty() { if self.tabs.is_empty() {
self.active_tab_index = None; self.active_tab_index = None;
self.previous_active_tab_index = None;
if *self.session_state.read().unwrap() == SessionState::Attached { if *self.session_state.read().unwrap() == SessionState::Attached {
self.bus self.bus
.senders .senders
@ -294,6 +292,7 @@ impl Screen {
.unwrap(); .unwrap();
} }
} else { } else {
self.active_tab_index = self.tab_history.pop().unwrap();
for t in self.tabs.values_mut() { for t in self.tabs.values_mut() {
if t.position > active_tab.position { if t.position > active_tab.position {
t.position -= 1; t.position -= 1;
@ -301,7 +300,6 @@ impl Screen {
} }
self.update_tabs(); self.update_tabs();
} }
self.previous_active_tab_index = future_previous;
} }
pub fn resize_to_screen(&mut self, new_screen_size: PositionAndSize) { pub fn resize_to_screen(&mut self, new_screen_size: PositionAndSize) {
@ -341,8 +339,13 @@ impl Screen {
} }
/// Returns an immutable reference to this [`Screen`]'s previous active [`Tab`]. /// Returns an immutable reference to this [`Screen`]'s previous active [`Tab`].
pub fn get_previous_tab(&self) -> Option<&Tab> { /// Consumes the last entry in tab history.
match self.previous_active_tab_index { pub fn get_previous_tab(&mut self) -> Option<&Tab> {
let last = self.tab_history.pop();
if last.is_none() {
return None;
}
match last.unwrap() {
Some(tab) => self.tabs.get(&tab), Some(tab) => self.tabs.get(&tab),
None => None, None => None,
} }
@ -380,7 +383,7 @@ impl Screen {
self.session_state.clone(), self.session_state.clone(),
); );
tab.apply_layout(layout, new_pids, tab_index); tab.apply_layout(layout, new_pids, tab_index);
self.previous_active_tab_index = self.active_tab_index; self.tab_history.push(self.active_tab_index);
self.active_tab_index = Some(tab_index); self.active_tab_index = Some(tab_index);
self.tabs.insert(tab_index, tab); self.tabs.insert(tab_index, tab);
self.update_tabs(); self.update_tabs();
@ -438,12 +441,12 @@ impl Screen {
} }
} }
pub fn toggle_tab(&mut self) { pub fn toggle_tab(&mut self) {
let active_tab_index = self.active_tab_index.unwrap(); let tab = self.get_previous_tab();
if self.previous_active_tab_index.is_some() { if let Some(t) = tab {
let position = self.get_previous_tab().unwrap().position; let position = t.position;
self.go_to_tab(position + 1); self.go_to_tab(position + 1);
} };
self.previous_active_tab_index = Some(active_tab_index);
self.update_tabs(); self.update_tabs();
self.render(); self.render();
} }

106
zellij-server/src/unit/screen_tests.rs
View file

@ -195,7 +195,7 @@ pub fn close_the_middle_tab() {
assert_eq!(screen.tabs.len(), 2, "Two tabs left"); assert_eq!(screen.tabs.len(), 2, "Two tabs left");
assert_eq!( assert_eq!(
screen.get_active_tab().unwrap().position, screen.get_active_tab().unwrap().position,
0, 1,
"Active tab switched to previous tab" "Active tab switched to previous tab"
); );
} }
@ -294,12 +294,23 @@ pub fn toggle_to_previous_tab_create_tabs_only() {
screen.new_tab(2); screen.new_tab(2);
screen.new_tab(3); screen.new_tab(3);
assert_eq!(
screen.tab_history,
vec![None, Some(0), Some(1)],
"Tab history is invalid"
);
screen.toggle_tab(); screen.toggle_tab();
assert_eq!( assert_eq!(
screen.get_active_tab().unwrap().position, screen.get_active_tab().unwrap().position,
1, 1,
"Active tab toggler to previous tab" "Active tab toggler to previous tab"
); );
assert_eq!(
screen.tab_history,
vec![None, Some(0), Some(2)],
"Tab history is invalid"
);
screen.toggle_tab(); screen.toggle_tab();
assert_eq!( assert_eq!(
@ -307,6 +318,11 @@ pub fn toggle_to_previous_tab_create_tabs_only() {
2, 2,
"Active tab toggler to previous tab" "Active tab toggler to previous tab"
); );
assert_eq!(
screen.tab_history,
vec![None, Some(0), Some(1)],
"Tab history is invalid"
);
screen.toggle_tab(); screen.toggle_tab();
assert_eq!( assert_eq!(
@ -327,48 +343,90 @@ pub fn toggle_to_previous_tab_delete() {
}; };
let mut screen = create_new_screen(position_and_size); let mut screen = create_new_screen(position_and_size);
screen.new_tab(1); screen.new_tab(1); // 0
screen.new_tab(2); screen.new_tab(2); // 1
screen.new_tab(3); screen.new_tab(3); // 2
screen.new_tab(4); // 3
assert_eq!(
screen.tab_history,
vec![None, Some(0), Some(1), Some(2)],
"Tab history is invalid"
);
assert_eq!(
screen.get_active_tab().unwrap().position,
3,
"Active tab toggler to previous tab"
);
screen.toggle_tab(); screen.toggle_tab();
assert_eq!(
screen.tab_history,
vec![None, Some(0), Some(1), Some(3)],
"Tab history is invalid"
);
assert_eq!(
screen.get_active_tab().unwrap().position,
2,
"Active tab toggler to previous tab"
);
screen.toggle_tab();
assert_eq!(
screen.tab_history,
vec![None, Some(0), Some(1), Some(2)],
"Tab history is invalid"
);
assert_eq!(
screen.get_active_tab().unwrap().position,
3,
"Active tab toggler to previous tab"
);
screen.switch_tab_prev();
assert_eq!(
screen.tab_history,
vec![None, Some(0), Some(1), Some(3)],
"Tab history is invalid"
);
assert_eq!(
screen.get_active_tab().unwrap().position,
2,
"Active tab toggler to previous tab"
);
screen.switch_tab_prev();
assert_eq!(
screen.tab_history,
vec![None, Some(0), Some(3), Some(2)],
"Tab history is invalid"
);
assert_eq!( assert_eq!(
screen.get_active_tab().unwrap().position, screen.get_active_tab().unwrap().position,
1, 1,
"Active tab toggler to previous tab" "Active tab toggler to previous tab"
); );
assert_eq!(
screen.get_previous_tab().unwrap().position,
2,
"Previous active tab invalid"
);
screen.close_tab(); screen.close_tab();
assert_eq!(
screen.tab_history,
vec![None, Some(0), Some(3)],
"Tab history is invalid"
);
assert_eq!( assert_eq!(
screen.get_active_tab().unwrap().position, screen.get_active_tab().unwrap().position,
0,
"Active tab toggler to previous tab"
);
assert_eq!(
screen.get_previous_tab().unwrap().position,
1, 1,
"Previous active tab invalid" "Active tab toggler to previous tab"
);
assert_eq!(
screen.get_previous_tab().unwrap().index,
2,
"Previous active tab invalid"
); );
screen.toggle_tab(); screen.toggle_tab();
assert_eq!( assert_eq!(
screen.get_active_tab().unwrap().position, screen.get_active_tab().unwrap().position,
1, 2,
"Active tab toggler to previous tab" "Active tab toggler to previous tab"
); );
assert_eq!( assert_eq!(
screen.get_previous_tab().unwrap().position, screen.tab_history,
0, vec![None, Some(0), Some(2)],
"Previous active tab invalid" "Tab history is invalid"
); );
} }