Merge 'upstream/main' into config-file

1 files changed, 132 insertions, 43 deletions

diff --git a/src/common/input/keybinds.rs b/src/common/input/keybinds.rs
index de75c38f..d7f64652 100644
--- a/src/common/input/keybinds.rs
+++ b/src/common/input/keybinds.rs
@@ -77,28 +77,52 @@ impl Keybinds {
             InputMode::Normal => {
                 defaults.insert(
                     Key::Ctrl('g'),
-                    vec![Action::SwitchToMode(InputMode::Command)],
+                    vec![Action::SwitchToMode(InputMode::Locked)],
                 );
-            }
-            InputMode::Command => {
+                defaults.insert(Key::Ctrl('p'), vec![Action::SwitchToMode(InputMode::Pane)]);
                 defaults.insert(
-                    Key::Char('r'),
+                    Key::Ctrl('r'),
                     vec![Action::SwitchToMode(InputMode::Resize)],
                 );
-                defaults.insert(Key::Char('p'), vec![Action::SwitchToMode(InputMode::Pane)]);
-                defaults.insert(Key::Char('t'), vec![Action::SwitchToMode(InputMode::Tab)]);
+                defaults.insert(Key::Ctrl('t'), vec![Action::SwitchToMode(InputMode::Tab)]);
                 defaults.insert(
-                    Key::Char('s'),
+                    Key::Ctrl('s'),
                     vec![Action::SwitchToMode(InputMode::Scroll)],
                 );
+                defaults.insert(Key::Ctrl('q'), vec![Action::Quit]);
+            }
+            InputMode::Locked => {
                 defaults.insert(
                     Key::Ctrl('g'),
                     vec![Action::SwitchToMode(InputMode::Normal)],
                 );
-                defaults.insert(Key::Esc, vec![Action::SwitchToMode(InputMode::Normal)]);
-                defaults.insert(Key::Char('q'), vec![Action::Quit]);
             }
             InputMode::Resize => {
+                defaults.insert(
+                    Key::Ctrl('g'),
+                    vec![Action::SwitchToMode(InputMode::Locked)],
+                );
+                defaults.insert(Key::Ctrl('p'), vec![Action::SwitchToMode(InputMode::Pane)]);
+                defaults.insert(
+                    Key::Ctrl('r'),
+                    vec![Action::SwitchToMode(InputMode::Normal)],
+                );
+                defaults.insert(Key::Ctrl('t'), vec![Action::SwitchToMode(InputMode::Tab)]);
+                defaults.insert(
+                    Key::Ctrl('s'),
+                    vec![Action::SwitchToMode(InputMode::Scroll)],
+                );
+                defaults.insert(Key::Ctrl('q'), vec![Action::Quit]);
+                defaults.insert(Key::Esc, vec![Action::SwitchToMode(InputMode::Normal)]);
+                defaults.insert(
+                    Key::Char('\n'),
+                    vec![Action::SwitchToMode(InputMode::Normal)],
+                );
+                defaults.insert(
+                    Key::Char(' '),
+                    vec![Action::SwitchToMode(InputMode::Normal)],
+                );
+
                 defaults.insert(Key::Char('h'), vec![Action::Resize(Direction::Left)]);
                 defaults.insert(Key::Char('j'), vec![Action::Resize(Direction::Down)]);
                 defaults.insert(Key::Char('k'), vec![Action::Resize(Direction::Up)]);
@@ -108,20 +132,36 @@ impl Keybinds {
                 defaults.insert(Key::Down, vec![Action::Resize(Direction::Down)]);
                 defaults.insert(Key::Up, vec![Action::Resize(Direction::Up)]);
                 defaults.insert(Key::Right, vec![Action::Resize(Direction::Right)]);
-
-                defaults.insert(Key::Ctrl('b'), vec![Action::Resize(Direction::Left)]);
-                defaults.insert(Key::Ctrl('n'), vec![Action::Resize(Direction::Down)]);
-                defaults.insert(Key::Ctrl('p'), vec![Action::Resize(Direction::Up)]);
-                defaults.insert(Key::Ctrl('f'), vec![Action::Resize(Direction::Right)]);
-
-                defaults.insert(Key::Char('q'), vec![Action::Quit]);
+            }
+            InputMode::Pane => {
                 defaults.insert(
                     Key::Ctrl('g'),
+                    vec![Action::SwitchToMode(InputMode::Locked)],
+                );
+                defaults.insert(
+                    Key::Ctrl('p'),
                     vec![Action::SwitchToMode(InputMode::Normal)],
                 );
-                defaults.insert(Key::Esc, vec![Action::SwitchToMode(InputMode::Command)]);
-            }
-            InputMode::Pane => {
+                defaults.insert(
+                    Key::Ctrl('r'),
+                    vec![Action::SwitchToMode(InputMode::Resize)],
+                );
+                defaults.insert(Key::Ctrl('t'), vec![Action::SwitchToMode(InputMode::Tab)]);
+                defaults.insert(
+                    Key::Ctrl('s'),
+                    vec![Action::SwitchToMode(InputMode::Scroll)],
+                );
+                defaults.insert(Key::Ctrl('q'), vec![Action::Quit]);
+                defaults.insert(Key::Esc, vec![Action::SwitchToMode(InputMode::Normal)]);
+                defaults.insert(
+                    Key::Char('\n'),
+                    vec![Action::SwitchToMode(InputMode::Normal)],
+                );
+                defaults.insert(
+                    Key::Char(' '),
+                    vec![Action::SwitchToMode(InputMode::Normal)],
+                );
+
                 defaults.insert(Key::Char('h'), vec![Action::MoveFocus(Direction::Left)]);
                 defaults.insert(Key::Char('j'), vec![Action::MoveFocus(Direction::Down)]);
                 defaults.insert(Key::Char('k'), vec![Action::MoveFocus(Direction::Up)]);
@@ -132,11 +172,6 @@ impl Keybinds {
                 defaults.insert(Key::Up, vec![Action::MoveFocus(Direction::Up)]);
                 defaults.insert(Key::Right, vec![Action::MoveFocus(Direction::Right)]);
 
-                defaults.insert(Key::Ctrl('b'), vec![Action::MoveFocus(Direction::Left)]);
-                defaults.insert(Key::Ctrl('n'), vec![Action::MoveFocus(Direction::Down)]);
-                defaults.insert(Key::Ctrl('p'), vec![Action::MoveFocus(Direction::Up)]);
-                defaults.insert(Key::Ctrl('f'), vec![Action::MoveFocus(Direction::Right)]);
-
                 defaults.insert(Key::Char('p'), vec![Action::SwitchFocus(Direction::Right)]);
                 defaults.insert(Key::Char('n'), vec![Action::NewPane(None)]);
                 defaults.insert(Key::Char('d'), vec![Action::NewPane(Some(Direction::Down))]);
@@ -145,17 +180,37 @@ impl Keybinds {
                     vec![Action::NewPane(Some(Direction::Right))],
                 );
                 defaults.insert(Key::Char('x'), vec![Action::CloseFocus]);
-
                 defaults.insert(Key::Char('f'), vec![Action::ToggleFocusFullscreen]);
-
-                defaults.insert(Key::Char('q'), vec![Action::Quit]);
+            }
+            InputMode::Tab => {
                 defaults.insert(
                     Key::Ctrl('g'),
+                    vec![Action::SwitchToMode(InputMode::Locked)],
+                );
+                defaults.insert(Key::Ctrl('p'), vec![Action::SwitchToMode(InputMode::Pane)]);
+                defaults.insert(
+                    Key::Ctrl('r'),
+                    vec![Action::SwitchToMode(InputMode::Resize)],
+                );
+                defaults.insert(
+                    Key::Ctrl('t'),
                     vec![Action::SwitchToMode(InputMode::Normal)],
                 );
-                defaults.insert(Key::Esc, vec![Action::SwitchToMode(InputMode::Command)]);
-            }
-            InputMode::Tab => {
+                defaults.insert(
+                    Key::Ctrl('s'),
+                    vec![Action::SwitchToMode(InputMode::Scroll)],
+                );
+                defaults.insert(Key::Ctrl('q'), vec![Action::Quit]);
+                defaults.insert(Key::Esc, vec![Action::SwitchToMode(InputMode::Normal)]);
+                defaults.insert(
+                    Key::Char('\n'),
+                    vec![Action::SwitchToMode(InputMode::Normal)],
+                );
+                defaults.insert(
+                    Key::Char(' '),
+                    vec![Action::SwitchToMode(InputMode::Normal)],
+                );
+
                 defaults.insert(Key::Char('h'), vec![Action::GoToPreviousTab]);
                 defaults.insert(Key::Char('j'), vec![Action::GoToNextTab]);
                 defaults.insert(Key::Char('k'), vec![Action::GoToPreviousTab]);
@@ -166,14 +221,16 @@ impl Keybinds {
                 defaults.insert(Key::Up, vec![Action::GoToPreviousTab]);
                 defaults.insert(Key::Right, vec![Action::GoToNextTab]);
 
-                defaults.insert(Key::Ctrl('b'), vec![Action::GoToPreviousTab]);
-                defaults.insert(Key::Ctrl('n'), vec![Action::GoToNextTab]);
-                defaults.insert(Key::Ctrl('p'), vec![Action::GoToPreviousTab]);
-                defaults.insert(Key::Ctrl('f'), vec![Action::GoToNextTab]);
-
                 defaults.insert(Key::Char('n'), vec![Action::NewTab]);
                 defaults.insert(Key::Char('x'), vec![Action::CloseTab]);
 
+                defaults.insert(
+                    Key::Char('r'),
+                    vec![
+                        Action::SwitchToMode(InputMode::RenameTab),
+                        Action::TabNameInput(vec![0]),
+                    ],
+                );
                 defaults.insert(Key::Char('q'), vec![Action::Quit]);
                 defaults.insert(
                     Key::Ctrl('g'),
@@ -182,24 +239,55 @@ impl Keybinds {
                 for i in '1'..='9' {
                     defaults.insert(Key::Char(i), vec![Action::GoToTab(i.to_digit(10).unwrap())]);
                 }
-                defaults.insert(Key::Esc, vec![Action::SwitchToMode(InputMode::Command)]);
             }
             InputMode::Scroll => {
+                defaults.insert(
+                    Key::Ctrl('g'),
+                    vec![Action::SwitchToMode(InputMode::Locked)],
+                );
+                defaults.insert(Key::Ctrl('p'), vec![Action::SwitchToMode(InputMode::Pane)]);
+                defaults.insert(
+                    Key::Ctrl('r'),
+                    vec![Action::SwitchToMode(InputMode::Resize)],
+                );
+                defaults.insert(Key::Ctrl('t'), vec![Action::SwitchToMode(InputMode::Tab)]);
+                defaults.insert(
+                    Key::Ctrl('s'),
+                    vec![Action::SwitchToMode(InputMode::Normal)],
+                );
+                defaults.insert(Key::Ctrl('q'), vec![Action::Quit]);
+                defaults.insert(Key::Esc, vec![Action::SwitchToMode(InputMode::Normal)]);
+                defaults.insert(
+                    Key::Char('\n'),
+                    vec![Action::SwitchToMode(InputMode::Normal)],
+                );
+                defaults.insert(
+                    Key::Char(' '),
+                    vec![Action::SwitchToMode(InputMode::Normal)],
+                );
+
                 defaults.insert(Key::Char('j'), vec![Action::ScrollDown]);
                 defaults.insert(Key::Char('k'), vec![Action::ScrollUp]);
 
                 defaults.insert(Key::Down, vec![Action::ScrollDown]);
                 defaults.insert(Key::Up, vec![Action::ScrollUp]);
-
-                defaults.insert(Key::Ctrl('n'), vec![Action::ScrollDown]);
-                defaults.insert(Key::Ctrl('p'), vec![Action::ScrollUp]);
-
-                defaults.insert(Key::Char('q'), vec![Action::Quit]);
+            }
+            InputMode::RenameTab => {
+                defaults.insert(
+                    Key::Char('\n'),
+                    vec![Action::SaveTabName, Action::SwitchToMode(InputMode::Tab)],
+                );
                 defaults.insert(
                     Key::Ctrl('g'),
                     vec![Action::SwitchToMode(InputMode::Normal)],
                 );
-                defaults.insert(Key::Esc, vec![Action::SwitchToMode(InputMode::Command)]);
+                defaults.insert(
+                    Key::Esc,
+                    vec![
+                        Action::TabNameInput(vec![0x1b]),
+                        Action::SwitchToMode(InputMode::Tab),
+                    ],
+                );
             }
         }
         ModeKeybinds(defaults)
@@ -224,7 +312,8 @@ impl Keybinds {
                 .unwrap_or_else(|| vec![action])
         };
         match *mode {
-            InputMode::Normal => mode_keybind_or_action(Action::Write(input)),
+            InputMode::Normal | InputMode::Locked => mode_keybind_or_action(Action::Write(input)),
+            InputMode::RenameTab => mode_keybind_or_action(Action::TabNameInput(input)),
             _ => mode_keybind_or_action(Action::NoOp),
         }
     }