diff options
| author | Aram Drevekenin <aram@poor.dev> | 2021-08-24 10:58:36 +0200 |
|---|---|---|
| committer | Aram Drevekenin <aram@poor.dev> | 2021-08-24 10:58:36 +0200 |
| commit | 618c2c376bb4edca8693ea4b871279bc04501559 (patch) | |
| tree | b4d4426b353955e8af1ed8ad6531f95860eda5f6 /zellij-client | |
| parent | 7a2f86db1b34b027ca03be73ec7bc4681f33fbdf (diff) | |
| parent | 88b4063879845cf53397f60201473ce386280cfe (diff) | |
Merge branch 'tab-layout' of https://github.com/a-kenji/zellij into a-kenji-tab-layout
Diffstat (limited to 'zellij-client')
| -rw-r--r-- | zellij-client/src/input_handler.rs | 2 | ||||
| -rw-r--r-- | zellij-client/src/lib.rs | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/zellij-client/src/input_handler.rs b/zellij-client/src/input_handler.rs index 03d223b2e..217b10f97 100644 --- a/zellij-client/src/input_handler.rs +++ b/zellij-client/src/input_handler.rs @@ -185,7 +185,7 @@ impl InputHandler { } Action::CloseFocus | Action::NewPane(_) - | Action::NewTab + | Action::NewTab(_) | Action::GoToNextTab | Action::GoToPreviousTab | Action::CloseTab diff --git a/zellij-client/src/lib.rs b/zellij-client/src/lib.rs index 5c832e860..f74a74ddf 100644 --- a/zellij-client/src/lib.rs +++ b/zellij-client/src/lib.rs @@ -19,7 +19,7 @@ use zellij_utils::{ channels::{self, ChannelWithContext, SenderWithContext}, consts::{SESSION_NAME, ZELLIJ_IPC_PIPE}, errors::{ClientContext, ContextType, ErrorInstruction}, - input::{actions::Action, config::Config, layout::Layout, options::Options}, + input::{actions::Action, config::Config, layout::LayoutTemplate, options::Options}, ipc::{ClientAttributes, ClientToServerMsg, ExitReason, ServerToClientMsg}, }; @@ -87,7 +87,7 @@ pub fn start_client( opts: CliArgs, config: Config, info: ClientInfo, - layout: Option<Layout>, + layout: Option<LayoutTemplate>, ) { info!("Starting Zellij client!"); let clear_client_terminal_attributes = "\u{1b}[?1l\u{1b}=\u{1b}[r\u{1b}12l\u{1b}[?1000l\u{1b}[?1002l\u{1b}[?1003l\u{1b}[?1005l\u{1b}[?1006l\u{1b}[?12l"; |