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

Improve: more explicit detach instruction (#1161)

Browse source 
* feat: update detach and remove client

* chore: apply clippy warning

* fix(tests): update snapshot
This commit is contained in:
Jae-Heon Ji 2022-03-07 19:20:13 +09:00 • committed by GitHub
parent c5eea7bd91
commit 5a56aa0603
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/tests/e2e/snapshots/zellij__tests__e2e__cases__detach_and_attach_session.snap
View file

@ -5,7 +5,7 @@ expression: last_snapshot
--- ---
Zellij (e2e-test)  Tab #1  Zellij (e2e-test)  Tab #1 
┌ Pane #1 ─────────────────────────────────────────────────┐┌ Pane #2 ─────────────────────────────────────────────────┐ ┌ Pane #1 ─────────────────────────────────────────────────┐┌ Pane #2 ─────────────────────────────────────────────────┐
│$ █ ││$ I am some text │ │$ ││$ I am some text█ │
│ ││ │ │ ││ │
│ ││ │ │ ││ │
│ ││ │ │ ││ │

16
zellij-server/src/lib.rs
View file

@ -477,22 +477,6 @@ pub fn start_server(mut os_input: Box<dyn ServerOsApi>, socket_path: PathBuf) {
.send_to_screen(ScreenInstruction::TerminalResize(min_size)) .send_to_screen(ScreenInstruction::TerminalResize(min_size))
.unwrap(); .unwrap();
} }
session_data
.write()
.unwrap()
.as_ref()
.unwrap()
.senders
.send_to_screen(ScreenInstruction::RemoveClient(client_id))
.unwrap();
session_data
.write()
.unwrap()
.as_ref()
.unwrap()
.senders
.send_to_plugin(PluginInstruction::RemoveClient(client_id))
.unwrap();
} }
ServerInstruction::Render(serialized_output) => { ServerInstruction::Render(serialized_output) => {
let client_ids = session_state.read().unwrap().client_ids(); let client_ids = session_state.read().unwrap().client_ids();

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

@ -566,12 +566,14 @@ impl Screen {
.add_client(client_id, None); .add_client(client_id, None);
} }
pub fn remove_client(&mut self, client_id: ClientId) { pub fn remove_client(&mut self, client_id: ClientId) {
if let Some(client_tab) = self.get_active_tab_mut(client_id) { self.tabs.iter_mut().for_each(|(_, tab)| {
client_tab.remove_client(client_id); if tab.active_panes.get(&client_id).is_some() {
if client_tab.has_no_connected_clients() { tab.remove_client(client_id);
client_tab.visible(false); if tab.has_no_connected_clients() {
tab.visible(false);
}
} }
} });
if self.active_tab_indices.contains_key(&client_id) { if self.active_tab_indices.contains_key(&client_id) {
self.active_tab_indices.remove(&client_id); self.active_tab_indices.remove(&client_id);
} }

1
zellij-server/src/tab/mod.rs
View file

@ -578,6 +578,7 @@ impl Tab {
} }
pub fn remove_client(&mut self, client_id: ClientId) { pub fn remove_client(&mut self, client_id: ClientId) {
self.focus_pane_id = None; self.focus_pane_id = None;
self.active_panes.remove(&client_id);
self.connected_clients.remove(&client_id); self.connected_clients.remove(&client_id);
self.set_force_render(); self.set_force_render();
} }