wip: not sure about updating the input_mode and tab switches for now

4 files changed, 26 insertions, 1 deletions

diff --git a/src/common/errors.rs b/src/common/errors.rs
index df741629..a2e05e30 100644
--- a/src/common/errors.rs
+++ b/src/common/errors.rs
@@ -199,6 +199,7 @@ pub enum ScreenContext {
     CloseTab,
     GoToTab,
     UpdateTabName,
+    ChangeInputMode
 }
 
 impl From<&ScreenInstruction> for ScreenContext {
@@ -238,6 +239,7 @@ impl From<&ScreenInstruction> for ScreenContext {
             ScreenInstruction::CloseTab => ScreenContext::CloseTab,
             ScreenInstruction::GoToTab(_) => ScreenContext::GoToTab,
             ScreenInstruction::UpdateTabName(_) => ScreenContext::UpdateTabName,
+            ScreenInstruction::ChangeInputMode(_) => ScreenContext::ChangeInputMode
         }
     }
 }
diff --git a/src/common/input/handler.rs b/src/common/input/handler.rs
index 57bb46fb..2d5e965f 100644
--- a/src/common/input/handler.rs
+++ b/src/common/input/handler.rs
@@ -134,6 +134,9 @@ impl InputHandler {
                     input_mode: self.mode,
                 });
                 self.send_screen_instructions
+                    .send(ScreenInstruction::ChangeInputMode(self.mode))
+                    .unwrap();
+                self.send_screen_instructions
                     .send(ScreenInstruction::Render)
                     .unwrap();
             }
diff --git a/src/common/mod.rs b/src/common/mod.rs
index 7b19bcef..87f56567 100644
--- a/src/common/mod.rs
+++ b/src/common/mod.rs
@@ -37,6 +37,7 @@ use utils::consts::{ZELLIJ_IPC_PIPE, ZELLIJ_ROOT_PLUGIN_DIR};
 use wasm_vm::{
     wasi_stdout, wasi_write_string, zellij_imports, EventType, PluginInputType, PluginInstruction,
 };
+use crate::common::utils::logging::debug_log_to_file;
 
 #[derive(Serialize, Deserialize, Debug)]
 pub enum ApiCommand {
@@ -290,6 +291,7 @@ pub fn start(mut os_input: Box<dyn OsApi>, opts: CliArgs) {
                     &full_screen_ws,
                     os_input,
                     max_panes,
+                    InputMode::Normal
                 );
                 loop {
                     let (event, mut err_ctx) = screen
@@ -424,6 +426,10 @@ pub fn start(mut os_input: Box<dyn OsApi>, opts: CliArgs) {
                         ScreenInstruction::UpdateTabName(c) => {
                             screen.update_active_tab_name(c);
                         }
+                        ScreenInstruction::ChangeInputMode(input_mode) => {
+                            debug_log_to_file(format!("{} {:?}", "switched mode to: ".to_string(), input_mode));
+                            screen.change_input_mode(input_mode);
+                        }
                         ScreenInstruction::Quit => {
                             break;
                         }
diff --git a/src/common/screen.rs b/src/common/screen.rs
index 57bb0e0f..a675ee07 100644
--- a/src/common/screen.rs
+++ b/src/common/screen.rs
@@ -5,7 +5,9 @@ use std::os::unix::io::RawFd;
 use std::str;
 use std::sync::mpsc::Receiver;
 
-use super::{AppInstruction, SenderWithContext};
+use wasmer::wasmparser::WasmFuncType;
+
+use super::{AppInstruction, SenderWithContext, input::handler::InputMode};
 use crate::os_input_output::OsApi;
 use crate::panes::PositionAndSize;
 use crate::pty_bus::{PtyInstruction, VteEvent};
@@ -48,6 +50,7 @@ pub enum ScreenInstruction {
     CloseTab,
     GoToTab(u32),
     UpdateTabName(Vec<u8>),
+    ChangeInputMode(InputMode)
 }
 
 /// A [`Screen`] holds multiple [`Tab`]s, each one holding multiple [`panes`](crate::client::panes).
@@ -72,6 +75,7 @@ pub struct Screen {
     /// The [`OsApi`] this [`Screen`] uses.
     os_api: Box<dyn OsApi>,
     tabname_buf: String,
+    input_mode: InputMode
 }
 
 impl Screen {
@@ -84,6 +88,7 @@ impl Screen {
         full_screen_ws: &PositionAndSize,
         os_api: Box<dyn OsApi>,
         max_panes: Option<usize>,
+        input_mode: InputMode
     ) -> Self {
         Screen {
             receiver: receive_screen_instructions,
@@ -96,6 +101,7 @@ impl Screen {
             tabs: BTreeMap::new(),
             os_api,
             tabname_buf: String::new(),
+            input_mode
         }
     }
 
@@ -115,6 +121,7 @@ impl Screen {
             self.send_app_instructions.clone(),
             self.max_panes,
             Some(PaneId::Terminal(pane_id)),
+            self.input_mode
         );
         self.active_tab_index = Some(tab_index);
         self.tabs.insert(tab_index, tab);
@@ -259,6 +266,7 @@ impl Screen {
             self.send_app_instructions.clone(),
             self.max_panes,
             None,
+            self.input_mode
         );
         tab.apply_layout(layout, new_pids);
         self.active_tab_index = Some(tab_index);
@@ -274,6 +282,7 @@ impl Screen {
                 position: tab.position,
                 name: tab.name.clone(),
                 active: active_tab_index == tab.index,
+                input_mode: self.input_mode
             });
         }
         self.send_plugin_instructions
@@ -303,4 +312,9 @@ impl Screen {
             }
         }
     }
+    pub fn change_input_mode(&mut self, input_mode: InputMode) {
+        self.input_mode = input_mode;
+        self.get_active_tab_mut().unwrap().input_mode = self.input_mode;
+        self.render();
+    }
 }