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

fix(rendering): do not render cursor if there's nothign to render (#3439)

Browse source
This commit is contained in:
Aram Drevekenin 2024-06-21 13:33:39 +02:00 • committed by GitHub
parent 91cf593836
commit 3edc7cebf7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 36 additions and 77 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1817,7 +1817,6 @@ impl Tab {
for key in parse_keys(&adjusted_input) { for key in parse_keys(&adjusted_input) {
plugin_updates.push((Some(pid), client_id, Event::Key(key))); plugin_updates.push((Some(pid), client_id, Event::Key(key)));
} }
log::info!("plugin_updates: {:?}", plugin_updates);
self.senders self.senders
.send_to_plugin(PluginInstruction::Update(plugin_updates)) .send_to_plugin(PluginInstruction::Update(plugin_updates))
.with_context(err_context)?; .with_context(err_context)?;
@ -2001,8 +2000,8 @@ impl Tab {
.with_context(err_context)?; .with_context(err_context)?;
} }
self.render_cursor(output);
if output.has_rendered_assets() { if output.has_rendered_assets() {
self.render_cursor(output);
self.hide_cursor_and_clear_display_as_needed(output); self.hide_cursor_and_clear_display_as_needed(output);
} }

28
zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__screen_can_break_floating_plugin_pane_to_a_new_tab-2.snap
View file

@ -1,25 +1,25 @@
--- ---
source: zellij-server/src/./unit/screen_tests.rs source: zellij-server/src/./unit/screen_tests.rs
assertion_line: 3171 assertion_line: 3501
expression: "format!(\"{}\", snapshot)" expression: "format!(\"{}\", snapshot)"
--- ---
00 (C): ┌ tiled_pane ──────────────────────────────────────────────────────────────────┐ 00 (C): ┌ Pane #1 ─────────────────────────────────────────────────────────────────────┐
01 (C): │ │ 01 (C): │ │
02 (C): │ │ 02 (C): │ │
03 (C): │ │ 03 (C): │ │
04 (C): │ │ 04 (C): │ │
05 (C): │ ┌ file:/path/to/fake/plugin ───────────┐ │ 05 (C): │ │
06 (C): │ │Loading file:/path/to/fake/plugin │ │ 06 (C): │ │
07 (C): │ │ │ │ 07 (C): │ ┌ file:/path/to/fake/plugin ───────────┐ │
08 (C): │ │ │ │ 08 (C): │ │Loading file:/path/to/fake/plugin │ │
09 (C): │ │ │ │ 09 (C): │ │ │ │
10 (C): │ │ │ │ 10 (C): │ │ │ │
11 (C): │ │ │ │ 11 (C): │ │ │ │
12 (C): │ │ │ │ 12 (C): │ │ │ │
13 (C): │ │ │ │ 13 (C): │ │ │ │
14 (C): │ └──────────────────────────────────────┘ │ 14 (C): │ │ │ │
15 (C): │ │ 15 (C): │ │ │ │
16 (C): │ │ 16 (C): │ └──────────────────────────────────────┘ │
17 (C): │ │ 17 (C): │ │
18 (C): │ │ 18 (C): │ │
19 (C): └──────────────────────────────────────────────────────────────────────────────┘ 19 (C): └──────────────────────────────────────────────────────────────────────────────┘

24
zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__screen_can_break_floating_plugin_pane_to_a_new_tab-3.snap
View file

@ -1,25 +1,25 @@
--- ---
source: zellij-server/src/./unit/screen_tests.rs source: zellij-server/src/./unit/screen_tests.rs
assertion_line: 3171 assertion_line: 3501
expression: "format!(\"{}\", snapshot)" expression: "format!(\"{}\", snapshot)"
--- ---
00 (C): ┌ Pane #1 ─────────────────────────────────────────────────────────────────────┐ 00 (C): ┌ tiled_pane ──────────────────────────────────────────────────────────────────┐
01 (C): │ │ 01 (C): │ │
02 (C): │ │ 02 (C): │ │
03 (C): │ │ 03 (C): │ │
04 (C): │ │ 04 (C): │ │
05 (C): │ │ 05 (C): │ │
06 (C): │ │ 06 (C): │ │
07 (C): │ ┌ file:/path/to/fake/plugin ───────────┐ │ 07 (C): │ │
08 (C): │ │Loading file:/path/to/fake/plugin │ │ 08 (C): │ │
09 (C): │ │ │ │ 09 (C): │ │
10 (C): │ │ │ │ 10 (C): │ │
11 (C): │ │ │ │ 11 (C): │ │
12 (C): │ │ │ │ 12 (C): │ │
13 (C): │ │ │ │ 13 (C): │ │
14 (C): │ │ │ │ 14 (C): │ │
15 (C): │ │ │ │ 15 (C): │ │
16 (C): │ └──────────────────────────────────────┘ │ 16 (C): │ │
17 (C): │ │ 17 (C): │ │
18 (C): │ │ 18 (C): │ │
19 (C): └──────────────────────────────────────────────────────────────────────────────┘ 19 (C): └──────────────────────────────────────────────────────────────────────────────┘

26
zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__screen_can_break_floating_plugin_pane_to_a_new_tab-5.snap
View file

@ -1,26 +1,6 @@
--- ---
source: zellij-server/src/./unit/screen_tests.rs source: zellij-server/src/./unit/screen_tests.rs
assertion_line: 2986 assertion_line: 3503
expression: "format!(\"{}\", snapshot)" expression: "format!(\"{}\", snapshot_count)"
--- ---
00 (C): ┌ tiled_pane ──────────────────────────────────────────────────────────────────┐ 4
01 (C): │ │
02 (C): │ │
03 (C): │ │
04 (C): │ │
05 (C): │ │
06 (C): │ │
07 (C): │ │
08 (C): │ │
09 (C): │ │
10 (C): │ │
11 (C): │ │
12 (C): │ │
13 (C): │ │
14 (C): │ │
15 (C): │ │
16 (C): │ │
17 (C): │ │
18 (C): │ │
19 (C): └──────────────────────────────────────────────────────────────────────────────┘

6
zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__screen_can_break_plugin_pane_to_a_new_tab-4.snap
View file

@ -1,10 +1,10 @@
--- ---
source: zellij-server/src/./unit/screen_tests.rs source: zellij-server/src/./unit/screen_tests.rs
assertion_line: 3097 assertion_line: 3428
expression: "format!(\"{}\", snapshot)" expression: "format!(\"{}\", snapshot)"
--- ---
00 (C): ┌ plugin_pane_to_break_free ───────────────────────────────────────────────────┐ 00 (C): ┌ pane_to_stay ────────────────────────────────────────────────────────────────┐
01 (C): │Loading file:/path/to/fake/plugin │ 01 (C): │ │
02 (C): │ │ 02 (C): │ │
03 (C): │ │ 03 (C): │ │
04 (C): │ │ 04 (C): │ │

26
zellij-server/src/unit/snapshots/zellij_server__screen__screen_tests__screen_can_break_plugin_pane_to_a_new_tab-5.snap
View file

@ -1,26 +1,6 @@
--- ---
source: zellij-server/src/./unit/screen_tests.rs source: zellij-server/src/./unit/screen_tests.rs
assertion_line: 2914 assertion_line: 3430
expression: "format!(\"{}\", snapshot)" expression: "format!(\"{}\", snapshot_count)"
--- ---
00 (C): ┌ pane_to_stay ────────────────────────────────────────────────────────────────┐ 4
01 (C): │ │
02 (C): │ │
03 (C): │ │
04 (C): │ │
05 (C): │ │
06 (C): │ │
07 (C): │ │
08 (C): │ │
09 (C): │ │
10 (C): │ │
11 (C): │ │
12 (C): │ │
13 (C): │ │
14 (C): │ │
15 (C): │ │
16 (C): │ │
17 (C): │ │
18 (C): │ │
19 (C): └──────────────────────────────────────────────────────────────────────────────┘