diff options
| author | Aram Drevekenin <aram@poor.dev> | 2024-12-06 17:32:26 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-12-06 17:32:26 +0100 |
| commit | 9332714e9d2e71dedf3398791699f01f40d55f77 (patch) | |
| tree | dd0f0c39a3e8cb35b55b30497ce6e94834ebbe5d | |
| parent | docs(changelog): layout tab focus fix (diff) | |
| download | sl0ppij-9332714e9d2e71dedf3398791699f01f40d55f77.tar.gz sl0ppij-9332714e9d2e71dedf3398791699f01f40d55f77.tar.xz sl0ppij-9332714e9d2e71dedf3398791699f01f40d55f77.zip | |
fix(multiuser): properly clear fake cursors (#3845)
| -rw-r--r-- | zellij-server/src/panes/terminal_pane.rs | 14 | ||||
| -rw-r--r-- | zellij-server/src/tab/mod.rs | 3 | ||||
| -rw-r--r-- | zellij-server/src/ui/pane_contents_and_ui.rs | 4 |
3 files changed, 21 insertions, 0 deletions
diff --git a/zellij-server/src/panes/terminal_pane.rs b/zellij-server/src/panes/terminal_pane.rs index c7e96eb6..ad9714a4 100644 --- a/zellij-server/src/panes/terminal_pane.rs +++ b/zellij-server/src/panes/terminal_pane.rs @@ -806,6 +806,20 @@ impl Pane for TerminalPane { self.style.rounded_corners = rounded_corners; self.frame.clear(); } + fn drain_fake_cursors(&mut self) -> Option<HashSet<(usize, usize)>> { + if !self.fake_cursor_locations.is_empty() { + for (y, _x) in &self.fake_cursor_locations { + // we do this because once these fake_cursor_locations + // have been drained, we have to make sure to render the line + // they appeared on so that whatever clears their location + // won't leave a hole + self.grid.update_line_for_rendering(*y); + } + Some(self.fake_cursor_locations.drain().collect()) + } else { + None + } + } } impl TerminalPane { diff --git a/zellij-server/src/tab/mod.rs b/zellij-server/src/tab/mod.rs index 3482cac6..dbce1527 100644 --- a/zellij-server/src/tab/mod.rs +++ b/zellij-server/src/tab/mod.rs @@ -500,6 +500,9 @@ pub trait Pane { fn query_should_be_suppressed(&self) -> bool { false } + fn drain_fake_cursors(&mut self) -> Option<HashSet<(usize, usize)>> { + None + } } #[derive(Clone, Debug)] diff --git a/zellij-server/src/ui/pane_contents_and_ui.rs b/zellij-server/src/ui/pane_contents_and_ui.rs index 72f0b804..6a4a7ab8 100644 --- a/zellij-server/src/ui/pane_contents_and_ui.rs +++ b/zellij-server/src/ui/pane_contents_and_ui.rs @@ -57,6 +57,10 @@ impl<'a> PaneContentsAndUi<'a> { ) -> Result<()> { let err_context = "failed to render pane contents to multiple clients"; + // here we drop the fake cursors so that their lines will be updated + // and we can clear them from the UI below + drop(self.pane.drain_fake_cursors()); + if let Some((character_chunks, raw_vte_output, sixel_image_chunks)) = self.pane.render(None).context(err_context)? { |
