diff options
| author | Kyle Sutherland-Cash <kyle.sutherlandcash@gmail.com> | 2021-05-08 05:07:41 -0700 |
|---|---|---|
| committer | Kyle Sutherland-Cash <kyle.sutherlandcash@gmail.com> | 2021-05-08 05:07:41 -0700 |
| commit | 4fb4faa28dcbae09d60389ba1d8b062cccce8332 (patch) | |
| tree | dfa43e33b962dfdd2328f5a65b92f0cbba620c98 /src/server | |
| parent | First round of merging against server-client and color stuff (diff) | |
| download | sl0ppij-4fb4faa28dcbae09d60389ba1d8b062cccce8332.tar.gz sl0ppij-4fb4faa28dcbae09d60389ba1d8b062cccce8332.tar.xz sl0ppij-4fb4faa28dcbae09d60389ba1d8b062cccce8332.zip | |
Markups from self-review
Diffstat (limited to 'src/server')
| -rw-r--r-- | src/server/mod.rs | 8 | ||||
| -rw-r--r-- | src/server/route.rs | 5 |
2 files changed, 7 insertions, 6 deletions
diff --git a/src/server/mod.rs b/src/server/mod.rs index 6c067e90..96638de8 100644 --- a/src/server/mod.rs +++ b/src/server/mod.rs @@ -69,7 +69,7 @@ pub fn start_server(os_input: Box<dyn ServerOsApi>) -> thread::JoinHandle<()> { let to_server = to_server.clone(); move || route_thread_main(sessions, os_input, to_server) - }); + }).unwrap(); #[cfg(not(test))] let _ = thread::Builder::new() .name("server_listener".to_string()) @@ -185,7 +185,7 @@ fn init_session( Some(&to_screen), None, Some(&to_plugin), - None, + Some(&to_server), Some(os_input.clone()), ), opts.debug, @@ -221,8 +221,8 @@ fn init_session( plugin_receiver, Some(&to_screen), Some(&to_pty), - Some(&to_plugin), - Some(&to_server), + None, + None, None, ); let store = Store::default(); diff --git a/src/server/route.rs b/src/server/route.rs index 264f62bb..753a1e12 100644 --- a/src/server/route.rs +++ b/src/server/route.rs @@ -3,8 +3,8 @@ use std::sync::{Arc, RwLock}; use zellij_tile::data::Event; use crate::common::errors::{ContextType, ServerContext}; -use crate::common::input::actions::Action; -use crate::common::input::{actions::Direction, handler::get_mode_info}; +use crate::common::input::actions::{Action, Direction}; +use crate::common::input::handler::get_mode_info; use crate::common::os_input_output::ServerOsApi; use crate::common::pty::PtyInstruction; use crate::common::screen::ScreenInstruction; @@ -168,6 +168,7 @@ fn route_action(action: Action, session: &SessionMetaData, os_input: &dyn Server Action::Quit => panic!("Received unexpected action"), } } + pub fn route_thread_main( sessions: Arc<RwLock<Option<SessionMetaData>>>, mut os_input: Box<dyn ServerOsApi>, |