summaryrefslogtreecommitdiffstats
path: root/zellij-server/src/panes
diff options
context:
space:
mode:
authorAram Drevekenin <aram@poor.dev>2022-12-06 15:34:43 +0100
committerGitHub <noreply@github.com>2022-12-06 15:34:43 +0100
commitb7adfcc581d40952ec5d1f5a853669322e895bd7 (patch)
treeba245468ddc56834782604d1829163f8121bd087 /zellij-server/src/panes
parentc2a6156a6b4ae8cadb1e48cfb8763c0d9233d9f9 (diff)
refactor(plugins): fix plugin loading data flow (#1995)
Diffstat (limited to 'zellij-server/src/panes')
-rw-r--r--zellij-server/src/panes/floating_panes/mod.rs2
-rw-r--r--zellij-server/src/panes/plugin_pane.rs2
-rw-r--r--zellij-server/src/panes/tiled_panes/mod.rs4
3 files changed, 3 insertions, 5 deletions
diff --git a/zellij-server/src/panes/floating_panes/mod.rs b/zellij-server/src/panes/floating_panes/mod.rs
index 3ca7f5726..bb446e8dc 100644
--- a/zellij-server/src/panes/floating_panes/mod.rs
+++ b/zellij-server/src/panes/floating_panes/mod.rs
@@ -9,9 +9,9 @@ use crate::{
os_input_output::ServerOsApi,
output::{FloatingPanesStack, Output},
panes::{ActivePanes, PaneId},
+ plugins::PluginInstruction,
thread_bus::ThreadSenders,
ui::pane_contents_and_ui::PaneContentsAndUi,
- wasm_vm::PluginInstruction,
ClientId,
};
use std::cell::RefCell;
diff --git a/zellij-server/src/panes/plugin_pane.rs b/zellij-server/src/panes/plugin_pane.rs
index 9353b5114..30624d053 100644
--- a/zellij-server/src/panes/plugin_pane.rs
+++ b/zellij-server/src/panes/plugin_pane.rs
@@ -3,10 +3,10 @@ use std::time::Instant;
use crate::output::{CharacterChunk, SixelImageChunk};
use crate::panes::{grid::Grid, sixel::SixelImageStore, LinkHandler, PaneId};
+use crate::plugins::PluginInstruction;
use crate::pty::VteBytes;
use crate::tab::Pane;
use crate::ui::pane_boundaries_frame::{FrameParams, PaneFrame};
-use crate::wasm_vm::PluginInstruction;
use crate::ClientId;
use std::cell::RefCell;
use std::rc::Rc;
diff --git a/zellij-server/src/panes/tiled_panes/mod.rs b/zellij-server/src/panes/tiled_panes/mod.rs
index b1665cc97..e49c86543 100644
--- a/zellij-server/src/panes/tiled_panes/mod.rs
+++ b/zellij-server/src/panes/tiled_panes/mod.rs
@@ -8,11 +8,11 @@ use crate::{
os_input_output::ServerOsApi,
output::Output,
panes::{ActivePanes, PaneId},
+ plugins::PluginInstruction,
tab::{Pane, MIN_TERMINAL_HEIGHT, MIN_TERMINAL_WIDTH},
thread_bus::ThreadSenders,
ui::boundaries::Boundaries,
ui::pane_contents_and_ui::PaneContentsAndUi,
- wasm_vm::PluginInstruction,
ClientId,
};
use zellij_utils::{
@@ -346,9 +346,7 @@ impl TiledPanes {
self.reset_boundaries();
}
pub fn focus_pane_if_client_not_focused(&mut self, pane_id: PaneId, client_id: ClientId) {
- log::info!("inside focus_pane_if_client_not_focused");
if self.active_panes.get(&client_id).is_none() {
- log::info!("is none");
self.focus_pane(pane_id, client_id)
}
}