resolve conflit with main

default-plugins/status-bar/src/mode_info.rs

@@ -18,6 +18,7 @@ const fn compare_key(l: &Key, r: &Key) -> bool {
             | (Key::Insert, Key::Insert)
             | (Key::Esc, Key::Esc)
             | (Key::BackTab, Key::BackTab)
+            | (Key::Char(_), Key::Char(_))
     )
 }
 
@@ -29,6 +30,7 @@ const fn get_key_order(key: &Key) -> Option<i32> {
         (Key::Down, 1),
         (Key::PageUp, 2),
         (Key::PageDown, 2),
+        (Key::Char(' '), 3),
     ];
     let mut i = 0;
     while i < V.len() {
@@ -141,6 +143,10 @@ pub fn get_mode_info(
                 get_major_key_by_action(&key_config, &[Action::ToggleFocusFullscreen]).to_string(),
                 "Fullscreen".to_string(),
             ));
+            keybinds.push((
+                get_major_key_by_action(&key_config, &[Action::ToggleActiveSyncPanes]).to_string(),
+                "Sync".to_string(),
+            ));
         }
         InputMode::Tab => {
             let key_map = get_key_map_string(

src/common/input/keybinds.rs

@@ -1,6 +1,7 @@
 //! Mapping of inputs to sequences of actions.
 use std::collections::HashMap;
 
+use super::config;
 use serde::Deserialize;
 use strum::IntoEnumIterator;
 use zellij_tile::data::*;

zellij-tile/src/data.rs

@@ -4,7 +4,7 @@ use serde::{Deserialize, Serialize};
 use strum_macros::{EnumDiscriminants, EnumIter, EnumString, ToString};
 
 /// The four directions (left, right, up, down).
-#[derive(Clone, Debug, PartialEq, Deserialize, Serialize)]
+#[derive(Clone, Debug, Eq, PartialEq, Hash, Deserialize, Serialize)]
 pub enum Direction {
     Left,
     Right,
@@ -13,7 +13,7 @@ pub enum Direction {
 }
 
 /// Actions that can be bound to keys.
-#[derive(Clone, Debug, PartialEq, Deserialize, Serialize)]
+#[derive(Clone, Debug, Eq, PartialEq, Hash, Deserialize, Serialize)]
 pub enum Action {
     /// Quit Zellij.
     Quit,
@@ -39,6 +39,8 @@ pub enum Action {
     PageScrollDown,
     /// Toggle between fullscreen focus pane and normal layout.
     ToggleFocusFullscreen,
+    /// Toggle between sending text commands to all panes and normal mode.
+    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>),