diff options
author | a-kenji <aks.kenji@protonmail.com> | 2021-05-29 18:18:30 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-05-29 18:18:30 +0200 |
commit | 4c079ca25d0d4ebbfbe48f30ff787ebd2864bdf7 (patch) | |
tree | 7cfde72edb544a450bae4afdc5d4485783f33366 /zellij-client/src | |
parent | ef7424d90661310c9d3a375b01bb1b7b573e4089 (diff) | |
parent | ec5476d3a593e20f11a898338a941fb90e0cab1b (diff) |
Merge pull request #513 from a-kenji/default-mode-368
Default mode 368
Diffstat (limited to 'zellij-client/src')
-rw-r--r-- | zellij-client/src/input_handler.rs | 5 | ||||
-rw-r--r-- | zellij-client/src/lib.rs | 10 |
2 files changed, 12 insertions, 3 deletions
diff --git a/zellij-client/src/input_handler.rs b/zellij-client/src/input_handler.rs index 70f6e9824..65181e512 100644 --- a/zellij-client/src/input_handler.rs +++ b/zellij-client/src/input_handler.rs @@ -33,9 +33,10 @@ impl InputHandler { command_is_executing: CommandIsExecuting, config: Config, send_client_instructions: SenderWithContext<ClientInstruction>, + mode: InputMode, ) -> Self { InputHandler { - mode: InputMode::Normal, + mode, os_input, config, command_is_executing, @@ -181,12 +182,14 @@ pub(crate) fn input_loop( config: Config, command_is_executing: CommandIsExecuting, send_client_instructions: SenderWithContext<ClientInstruction>, + default_mode: InputMode, ) { let _handler = InputHandler::new( os_input, command_is_executing, config, send_client_instructions, + default_mode, ) .handle_input(); } diff --git a/zellij-client/src/lib.rs b/zellij-client/src/lib.rs index 3817e7908..701047842 100644 --- a/zellij-client/src/lib.rs +++ b/zellij-client/src/lib.rs @@ -127,14 +127,18 @@ pub fn start_client( ClientToServerMsg::NewClient( client_attributes, Box::new(opts), - Box::new(config_options), + Box::new(config_options.clone()), ) } }; #[cfg(any(feature = "test", test))] let first_msg = { let _ = SESSION_NAME.set("".into()); - ClientToServerMsg::NewClient(client_attributes, Box::new(opts), Box::new(config_options)) + ClientToServerMsg::NewClient( + client_attributes, + Box::new(opts), + Box::new(config_options.clone()), + ) }; os_input.connect_to_server(&*ZELLIJ_IPC_PIPE); @@ -168,12 +172,14 @@ pub fn start_client( let send_client_instructions = send_client_instructions.clone(); let command_is_executing = command_is_executing.clone(); let os_input = os_input.clone(); + let default_mode = config_options.default_mode.unwrap_or_default(); move || { input_loop( os_input, config, command_is_executing, send_client_instructions, + default_mode, ) } }); |