aboutsummaryrefslogtreecommitdiffstats
path: root/src/common/input
diff options
context:
space:
mode:
authorKyle Sutherland-Cash <kyle.sutherlandcash@gmail.com>2021-05-08 04:32:31 -0700
committerKyle Sutherland-Cash <kyle.sutherlandcash@gmail.com>2021-05-08 04:32:31 -0700
commit9a3e8bcb84caa0fd103b6d9c365fb97690c1c5ea (patch)
treeb866062e2880088fce6770553db564721876fc39 /src/common/input
parentREADME: shortening + add explanation (#470) (diff)
downloadsl0ppij-9a3e8bcb84caa0fd103b6d9c365fb97690c1c5ea.tar.gz
sl0ppij-9a3e8bcb84caa0fd103b6d9c365fb97690c1c5ea.tar.xz
sl0ppij-9a3e8bcb84caa0fd103b6d9c365fb97690c1c5ea.zip
First round of merging against server-client and color stuff
Diffstat (limited to 'src/common/input')
-rw-r--r--src/common/input/actions.rs2
-rw-r--r--src/common/input/handler.rs2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/common/input/actions.rs b/src/common/input/actions.rs
index 54cbbcdc..f07d7513 100644
--- a/src/common/input/actions.rs
+++ b/src/common/input/actions.rs
@@ -40,7 +40,7 @@ pub enum Action {
/// Toggle between fullscreen focus pane and normal layout.
ToggleFocusFullscreen,
/// Toggle between sending text commands to all panes on the current tab and normal mode.
- ToggleActiveSyncTab,
+ ToggleActiveSyncPanes,
/// Open a new pane in the specified direction (relative to focus).
/// If no direction is specified, will try to use the biggest available space.
NewPane(Option<Direction>),
diff --git a/src/common/input/handler.rs b/src/common/input/handler.rs
index a4293220..78635237 100644
--- a/src/common/input/handler.rs
+++ b/src/common/input/handler.rs
@@ -4,7 +4,7 @@ use super::actions::Action;
use super::keybinds::Keybinds;
use crate::client::ClientInstruction;
use crate::common::input::config::Config;
-use crate::common::{SenderWithContext, OPENCALLS};
+use crate::common::thread_bus::{SenderWithContext, OPENCALLS};
use crate::errors::ContextType;
use crate::os_input_output::ClientOsApi;
use crate::server::ServerInstruction;