Add trig nudging with B+D-PAD

2 files changed, 94 insertions, 25 deletions

diff --git a/src/main.c b/src/main.c
index 1fdaaa2..1562565 100644
--- a/src/main.c
+++ b/src/main.c
@@ -23,8 +23,8 @@ WITH REGARD TO THIS SOFTWARE.
 //  + Channel params (ALL) editing should only copy the value under the cursor.
 //  + Fix scale being active for noise channel (makes no sense)
 //  + Save scale on metadata
+//  + Allow using B + dpad to nudge trigs. This will potentially mean switching
 //  - Hold L/R retriggers at short intervals?
-//  - Allow using B + dpad to nudge trigs. This will potentially mean switching
 //    to key release to enable trigs.
 //  - Fix any bugs we currently have
 //  - Add an envelope to ch3, would need to work with a timer in order to make
@@ -36,10 +36,6 @@ WITH REGARD TO THIS SOFTWARE.
 //
 // Low priority:
 //
-// UI tweaks.
-//  - Add custom user themes
-//  - Animations for cursor movement/current step highlight. (A fade out maybe?)
-//
 // Quality of life improvements.
 //  - When not on play mode, adjusting a note or a parameter triggers the sound.
 //    This could get annoying, so maybe it should be a configuration option to
diff --git a/src/sequencer.c b/src/sequencer.c
index ee72389..a032481 100644
--- a/src/sequencer.c
+++ b/src/sequencer.c
@@ -1487,21 +1487,66 @@ handle_param_selection_noise() {
 }
 
 void
+nudge_trigs(int cur_loc, int next_loc) {
+    Pattern *pat = &patterns[pattern_selection_loc];
+    switch (channel_selection_loc) {
+        case 0: {
+            ChannelSquareParams cur_params = pat->ch1.params[cur_loc];
+            TriggerNote cur_trig = pat->ch1.notes[cur_loc];
+            pat->ch1.params[cur_loc] = pat->ch1.params[next_loc];
+            pat->ch1.notes[cur_loc] = pat->ch1.notes[next_loc];
+            pat->ch1.params[next_loc] = cur_params;
+            pat->ch1.notes[next_loc] = cur_trig;
+        } break;
+        case 1: {
+            ChannelSquareParams cur_params = pat->ch2.params[cur_loc];
+            TriggerNote cur_trig = pat->ch2.notes[cur_loc];
+            pat->ch2.params[cur_loc] = pat->ch2.params[next_loc];
+            pat->ch2.notes[cur_loc] = pat->ch2.notes[next_loc];
+            pat->ch2.params[next_loc] = cur_params;
+            pat->ch2.notes[next_loc] = cur_trig;
+        } break;
+        case 2: {
+            ChannelWaveParams cur_params = pat->ch3.params[cur_loc];
+            TriggerNote cur_trig = pat->ch3.notes[cur_loc];
+            pat->ch3.params[cur_loc] = pat->ch3.params[next_loc];
+            pat->ch3.notes[cur_loc] = pat->ch3.notes[next_loc];
+            pat->ch3.params[next_loc] = cur_params;
+            pat->ch3.notes[next_loc] = cur_trig;
+        } break;
+        case 3: {
+            ChannelNoiseParams cur_params = pat->ch4.params[cur_loc];
+            TriggerNote cur_trig = pat->ch4.notes[cur_loc];
+            pat->ch4.params[cur_loc] = pat->ch4.params[next_loc];
+            pat->ch4.notes[cur_loc] = pat->ch4.notes[next_loc];
+            pat->ch4.params[next_loc] = cur_params;
+            pat->ch4.notes[next_loc] = cur_trig;
+        } break;
+        default: break;
+    }
+}
+
+void
 handle_trigger_selection(void) {
     TriggerNote *trig = get_current_trig();
 
+    static bool nudge = false;
     bool empty = patterns[pattern_selection_loc].empty;
     if (key_hold(KEY_B)) {
     } else if (key_released(KEY_B)) {
-        if (key_hold(KEY_SELECT)) {
-            clipboard_copy();
+        if (nudge) {
+            nudge = false;
         } else {
-            if (empty) {
-                clear_pattern(pattern_selection_loc);
+            if (key_hold(KEY_SELECT)) {
+                clipboard_copy();
+            } else {
+                if (empty) {
+                    clear_pattern(pattern_selection_loc);
+                }
+                trig->active ^= 1;
             }
-            trig->active ^= 1;
-            redraw_trigs = true;
         }
+        redraw_trigs = true;
     } else if (key_tap(KEY_L)) {
         s32 inc = -1;
         if (key_hold(KEY_SELECT)) {
@@ -1540,27 +1585,55 @@ handle_trigger_selection(void) {
 
     // Move trigger cursor.
     if (key_tap(KEY_LEFT)) {
-        if (trig_selection_loc == 0 || trig_selection_loc == 8) {
-            // We are at the boundary, switch to channel selection.
-            input_handler = handle_channel_selection;
+        if (key_hold(KEY_B)) {
+            if (trig_selection_loc != 0 && trig_selection_loc != 8) {
+                int next_selection_loc = MAX(trig_selection_loc - 1, 0);
+                nudge_trigs(trig_selection_loc, next_selection_loc);
+                nudge = true;
+                trig_selection_loc = next_selection_loc;
+            }
+            redraw_trigs = true;
         } else {
-            trig_selection_loc = MAX(trig_selection_loc - 1, 0);
+            if (trig_selection_loc == 0 || trig_selection_loc == 8) {
+                // We are at the boundary, switch to channel selection.
+                input_handler = handle_channel_selection;
+            } else {
+                trig_selection_loc = MAX(trig_selection_loc - 1, 0);
+            }
         }
         redraw_params = true;
     } else if (key_tap(KEY_RIGHT)) {
-        if (trig_selection_loc != 7 && trig_selection_loc != 15) {
-            trig_selection_loc = MIN(trig_selection_loc + 1, 15);
-        } else if (trig_selection_loc == 7) {
-            input_handler = handle_right_col_selection;
-            right_col_selection_loc = R_COL_BPM;
-        } else if (trig_selection_loc == 15) {
-            right_col_selection_loc = R_COL_PLAY;
-            input_handler = handle_right_col_selection;
+        if (key_hold(KEY_B)) {
+            if (trig_selection_loc != 7 && trig_selection_loc != 15) {
+                int next_selection_loc = MIN(trig_selection_loc + 1, 15);
+                nudge_trigs(trig_selection_loc, next_selection_loc);
+                nudge = true;
+                trig_selection_loc = next_selection_loc;
+            }
+            redraw_trigs = true;
+        } else {
+            if (trig_selection_loc != 7 && trig_selection_loc != 15) {
+                trig_selection_loc = MIN(trig_selection_loc + 1, 15);
+            } else if (trig_selection_loc == 7) {
+                input_handler = handle_right_col_selection;
+                right_col_selection_loc = R_COL_BPM;
+            } else if (trig_selection_loc == 15) {
+                right_col_selection_loc = R_COL_PLAY;
+                input_handler = handle_right_col_selection;
+            }
         }
         redraw_params = true;
     } else if (key_tap(KEY_UP) || key_tap(KEY_DOWN)) {
-        trig_selection_loc = (trig_selection_loc + 8) % 16;
-        redraw_params = true;
+        if (key_hold(KEY_B)) {
+            int next_selection_loc = (trig_selection_loc + 8) % 16;
+            nudge_trigs(trig_selection_loc, next_selection_loc);
+            nudge = true;
+            trig_selection_loc = next_selection_loc;
+            redraw_trigs = true;
+        } else {
+            trig_selection_loc = (trig_selection_loc + 8) % 16;
+            redraw_params = true;
+        }
     } else if (key_tap(KEY_A)) {
         if (key_hold(KEY_SELECT)) {
             if (patterns[pattern_selection_loc].empty) {