Feat: comfort features

src/input.rs

@@ -754,6 +754,70 @@ fn handle_modal_input(ctx: &mut InputContext, key: KeyEvent) -> InputResult {
                 _ => {}
             }
         }
+        Modal::ConfirmResetPatterns {
+            bank,
+            patterns,
+            selected: _,
+        } => {
+            let (bank, patterns) = (*bank, patterns.clone());
+            match key.code {
+                KeyCode::Char('y') | KeyCode::Char('Y') => {
+                    ctx.dispatch(AppCommand::ResetPatterns { bank, patterns });
+                    ctx.dispatch(AppCommand::CloseModal);
+                }
+                KeyCode::Char('n') | KeyCode::Char('N') | KeyCode::Esc => {
+                    ctx.dispatch(AppCommand::CloseModal);
+                }
+                KeyCode::Left | KeyCode::Right => {
+                    if let Modal::ConfirmResetPatterns { selected, .. } = &mut ctx.app.ui.modal {
+                        *selected = !*selected;
+                    }
+                }
+                KeyCode::Enter => {
+                    let do_reset =
+                        if let Modal::ConfirmResetPatterns { selected, .. } = &ctx.app.ui.modal {
+                            *selected
+                        } else {
+                            false
+                        };
+                    if do_reset {
+                        ctx.dispatch(AppCommand::ResetPatterns { bank, patterns });
+                    }
+                    ctx.dispatch(AppCommand::CloseModal);
+                }
+                _ => {}
+            }
+        }
+        Modal::ConfirmResetBanks { banks, selected: _ } => {
+            let banks = banks.clone();
+            match key.code {
+                KeyCode::Char('y') | KeyCode::Char('Y') => {
+                    ctx.dispatch(AppCommand::ResetBanks { banks });
+                    ctx.dispatch(AppCommand::CloseModal);
+                }
+                KeyCode::Char('n') | KeyCode::Char('N') | KeyCode::Esc => {
+                    ctx.dispatch(AppCommand::CloseModal);
+                }
+                KeyCode::Left | KeyCode::Right => {
+                    if let Modal::ConfirmResetBanks { selected, .. } = &mut ctx.app.ui.modal {
+                        *selected = !*selected;
+                    }
+                }
+                KeyCode::Enter => {
+                    let do_reset =
+                        if let Modal::ConfirmResetBanks { selected, .. } = &ctx.app.ui.modal {
+                            *selected
+                        } else {
+                            false
+                        };
+                    if do_reset {
+                        ctx.dispatch(AppCommand::ResetBanks { banks });
+                    }
+                    ctx.dispatch(AppCommand::CloseModal);
+                }
+                _ => {}
+            }
+        }
         Modal::None => unreachable!(),
     }
     InputResult::Continue
@@ -1142,14 +1206,55 @@ fn handle_patterns_page(ctx: &mut InputContext, key: KeyEvent) -> InputResult {
     use crate::state::PatternsColumn;
 
     let ctrl = key.modifiers.contains(KeyModifiers::CONTROL);
+    let shift = key.modifiers.contains(KeyModifiers::SHIFT);
 
     match key.code {
+        KeyCode::Up if shift => {
+            match ctx.app.patterns_nav.column {
+                PatternsColumn::Banks => {
+                    if ctx.app.patterns_nav.bank_anchor.is_none() {
+                        ctx.app.patterns_nav.bank_anchor = Some(ctx.app.patterns_nav.bank_cursor);
+                    }
+                }
+                PatternsColumn::Patterns => {
+                    if ctx.app.patterns_nav.pattern_anchor.is_none() {
+                        ctx.app.patterns_nav.pattern_anchor =
+                            Some(ctx.app.patterns_nav.pattern_cursor);
+                    }
+                }
+            }
+            ctx.app.patterns_nav.move_up_clamped();
+        }
+        KeyCode::Down if shift => {
+            match ctx.app.patterns_nav.column {
+                PatternsColumn::Banks => {
+                    if ctx.app.patterns_nav.bank_anchor.is_none() {
+                        ctx.app.patterns_nav.bank_anchor = Some(ctx.app.patterns_nav.bank_cursor);
+                    }
+                }
+                PatternsColumn::Patterns => {
+                    if ctx.app.patterns_nav.pattern_anchor.is_none() {
+                        ctx.app.patterns_nav.pattern_anchor =
+                            Some(ctx.app.patterns_nav.pattern_cursor);
+                    }
+                }
+            }
+            ctx.app.patterns_nav.move_down_clamped();
+        }
+        KeyCode::Up => {
+            ctx.app.patterns_nav.clear_selection();
+            ctx.dispatch(AppCommand::PatternsCursorUp);
+        }
+        KeyCode::Down => {
+            ctx.app.patterns_nav.clear_selection();
+            ctx.dispatch(AppCommand::PatternsCursorDown);
+        }
         KeyCode::Left => ctx.dispatch(AppCommand::PatternsCursorLeft),
         KeyCode::Right => ctx.dispatch(AppCommand::PatternsCursorRight),
-        KeyCode::Up => ctx.dispatch(AppCommand::PatternsCursorUp),
-        KeyCode::Down => ctx.dispatch(AppCommand::PatternsCursorDown),
         KeyCode::Esc => {
-            if !ctx.app.playback.staged_changes.is_empty()
+            if ctx.app.patterns_nav.has_selection() {
+                ctx.app.patterns_nav.clear_selection();
+            } else if !ctx.app.playback.staged_changes.is_empty()
                 || !ctx.app.playback.staged_mute_changes.is_empty()
                 || !ctx.app.playback.staged_prop_changes.is_empty()
             {
@@ -1158,10 +1263,17 @@ fn handle_patterns_page(ctx: &mut InputContext, key: KeyEvent) -> InputResult {
                 ctx.dispatch(AppCommand::PatternsBack);
             }
         }
-        KeyCode::Enter => ctx.dispatch(AppCommand::PatternsEnter),
+        KeyCode::Enter => {
+            if !ctx.app.patterns_nav.has_selection() {
+                ctx.dispatch(AppCommand::PatternsEnter);
+            }
+        }
         KeyCode::Char('p') => {
             if ctx.app.patterns_nav.column == PatternsColumn::Patterns {
-                ctx.dispatch(AppCommand::PatternsTogglePlay);
+                let bank = ctx.app.patterns_nav.bank_cursor;
+                for pattern in ctx.app.patterns_nav.selected_patterns() {
+                    ctx.app.stage_pattern_toggle(bank, pattern, ctx.snapshot);
+                }
             }
         }
         KeyCode::Char(' ') => {
@@ -1184,11 +1296,21 @@ fn handle_patterns_page(ctx: &mut InputContext, key: KeyEvent) -> InputResult {
             let bank = ctx.app.patterns_nav.bank_cursor;
             match ctx.app.patterns_nav.column {
                 PatternsColumn::Banks => {
-                    ctx.dispatch(AppCommand::CopyBank { bank });
+                    let banks = ctx.app.patterns_nav.selected_banks();
+                    if banks.len() > 1 {
+                        ctx.dispatch(AppCommand::CopyBanks { banks });
+                    } else {
+                        ctx.dispatch(AppCommand::CopyBank { bank });
+                    }
                 }
                 PatternsColumn::Patterns => {
-                    let pattern = ctx.app.patterns_nav.pattern_cursor;
-                    ctx.dispatch(AppCommand::CopyPattern { bank, pattern });
+                    let patterns = ctx.app.patterns_nav.selected_patterns();
+                    if patterns.len() > 1 {
+                        ctx.dispatch(AppCommand::CopyPatterns { bank, patterns });
+                    } else {
+                        let pattern = ctx.app.patterns_nav.pattern_cursor;
+                        ctx.dispatch(AppCommand::CopyPattern { bank, pattern });
+                    }
                 }
             }
         }
@@ -1196,11 +1318,27 @@ fn handle_patterns_page(ctx: &mut InputContext, key: KeyEvent) -> InputResult {
             let bank = ctx.app.patterns_nav.bank_cursor;
             match ctx.app.patterns_nav.column {
                 PatternsColumn::Banks => {
-                    ctx.dispatch(AppCommand::PasteBank { bank });
+                    if ctx.app.copied_banks.as_ref().is_some_and(|v| v.len() > 1) {
+                        ctx.dispatch(AppCommand::PasteBanks { start: bank });
+                    } else {
+                        ctx.dispatch(AppCommand::PasteBank { bank });
+                    }
                 }
                 PatternsColumn::Patterns => {
                     let pattern = ctx.app.patterns_nav.pattern_cursor;
-                    ctx.dispatch(AppCommand::PastePattern { bank, pattern });
+                    if ctx
+                        .app
+                        .copied_patterns
+                        .as_ref()
+                        .is_some_and(|v| v.len() > 1)
+                    {
+                        ctx.dispatch(AppCommand::PastePatterns {
+                            bank,
+                            start: pattern,
+                        });
+                    } else {
+                        ctx.dispatch(AppCommand::PastePattern { bank, pattern });
+                    }
                 }
             }
         }
@@ -1208,50 +1346,72 @@ fn handle_patterns_page(ctx: &mut InputContext, key: KeyEvent) -> InputResult {
             let bank = ctx.app.patterns_nav.bank_cursor;
             match ctx.app.patterns_nav.column {
                 PatternsColumn::Banks => {
-                    ctx.dispatch(AppCommand::OpenModal(Modal::ConfirmResetBank {
-                        bank,
-                        selected: false,
-                    }));
+                    let banks = ctx.app.patterns_nav.selected_banks();
+                    if banks.len() > 1 {
+                        ctx.dispatch(AppCommand::OpenModal(Modal::ConfirmResetBanks {
+                            banks,
+                            selected: false,
+                        }));
+                    } else {
+                        ctx.dispatch(AppCommand::OpenModal(Modal::ConfirmResetBank {
+                            bank,
+                            selected: false,
+                        }));
+                    }
                 }
                 PatternsColumn::Patterns => {
-                    let pattern = ctx.app.patterns_nav.pattern_cursor;
-                    ctx.dispatch(AppCommand::OpenModal(Modal::ConfirmResetPattern {
-                        bank,
-                        pattern,
-                        selected: false,
-                    }));
+                    let patterns = ctx.app.patterns_nav.selected_patterns();
+                    if patterns.len() > 1 {
+                        ctx.dispatch(AppCommand::OpenModal(Modal::ConfirmResetPatterns {
+                            bank,
+                            patterns,
+                            selected: false,
+                        }));
+                    } else {
+                        let pattern = ctx.app.patterns_nav.pattern_cursor;
+                        ctx.dispatch(AppCommand::OpenModal(Modal::ConfirmResetPattern {
+                            bank,
+                            pattern,
+                            selected: false,
+                        }));
+                    }
                 }
             }
         }
         KeyCode::Char('r') => {
-            let bank = ctx.app.patterns_nav.bank_cursor;
-            match ctx.app.patterns_nav.column {
-                PatternsColumn::Banks => {
-                    let current_name = ctx.app.project_state.project.banks[bank]
-                        .name
-                        .clone()
-                        .unwrap_or_default();
-                    ctx.dispatch(AppCommand::OpenModal(Modal::RenameBank {
-                        bank,
-                        name: current_name,
-                    }));
-                }
-                PatternsColumn::Patterns => {
-                    let pattern = ctx.app.patterns_nav.pattern_cursor;
-                    let current_name = ctx.app.project_state.project.banks[bank].patterns[pattern]
-                        .name
-                        .clone()
-                        .unwrap_or_default();
-                    ctx.dispatch(AppCommand::OpenModal(Modal::RenamePattern {
-                        bank,
-                        pattern,
-                        name: current_name,
-                    }));
+            if !ctx.app.patterns_nav.has_selection() {
+                let bank = ctx.app.patterns_nav.bank_cursor;
+                match ctx.app.patterns_nav.column {
+                    PatternsColumn::Banks => {
+                        let current_name = ctx.app.project_state.project.banks[bank]
+                            .name
+                            .clone()
+                            .unwrap_or_default();
+                        ctx.dispatch(AppCommand::OpenModal(Modal::RenameBank {
+                            bank,
+                            name: current_name,
+                        }));
+                    }
+                    PatternsColumn::Patterns => {
+                        let pattern = ctx.app.patterns_nav.pattern_cursor;
+                        let current_name = ctx.app.project_state.project.banks[bank].patterns
+                            [pattern]
+                            .name
+                            .clone()
+                            .unwrap_or_default();
+                        ctx.dispatch(AppCommand::OpenModal(Modal::RenamePattern {
+                            bank,
+                            pattern,
+                            name: current_name,
+                        }));
+                    }
                 }
             }
         }
         KeyCode::Char('e') if !ctrl => {
-            if ctx.app.patterns_nav.column == PatternsColumn::Patterns {
+            if ctx.app.patterns_nav.column == PatternsColumn::Patterns
+                && !ctx.app.patterns_nav.has_selection()
+            {
                 let bank = ctx.app.patterns_nav.bank_cursor;
                 let pattern = ctx.app.patterns_nav.pattern_cursor;
                 ctx.dispatch(AppCommand::OpenPatternPropsModal { bank, pattern });
@@ -1259,13 +1419,15 @@ fn handle_patterns_page(ctx: &mut InputContext, key: KeyEvent) -> InputResult {
         }
         KeyCode::Char('m') => {
             let bank = ctx.app.patterns_nav.bank_cursor;
-            let pattern = ctx.app.patterns_nav.pattern_cursor;
-            ctx.dispatch(AppCommand::StageMute { bank, pattern });
+            for pattern in ctx.app.patterns_nav.selected_patterns() {
+                ctx.dispatch(AppCommand::StageMute { bank, pattern });
+            }
         }
         KeyCode::Char('x') => {
             let bank = ctx.app.patterns_nav.bank_cursor;
-            let pattern = ctx.app.patterns_nav.pattern_cursor;
-            ctx.dispatch(AppCommand::StageSolo { bank, pattern });
+            for pattern in ctx.app.patterns_nav.selected_patterns() {
+                ctx.dispatch(AppCommand::StageSolo { bank, pattern });
+            }
         }
         KeyCode::Char('M') => {
             ctx.dispatch(AppCommand::ClearMutes);