feat: shift pc keys along config.piano_range()

Author: kasimeka

flake.lock

@@ -0,0 +1,76 @@
+{
+  inputs = {
+    nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
+    systems.url = "github:nix-systems/default";
+
+    naersk = {
+      url = "github:nix-community/naersk";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+    rust-overlay = {
+      url = "github:oxalica/rust-overlay";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
+    gitignore = {
+      url = "github:hercules-ci/gitignore.nix";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+  };
+
+  outputs = inputs @ {self, ...}: let
+    forAllSystems = f:
+      inputs.nixpkgs.lib.genAttrs
+      (import inputs.systems)
+      (system: let
+        pkgs = import inputs.nixpkgs {
+          inherit system;
+          overlays = [inputs.rust-overlay.overlays.default];
+        };
+      in
+        f system pkgs);
+
+    meta = (inputs.nixpkgs.lib.importTOML ./neothesia/Cargo.toml).package;
+  in {
+    packages = forAllSystems (_system: pkgs: let
+      rustToolchain =
+        pkgs.rust-bin.nightly.latest.default.override
+        {extensions = ["rust-src" "rust-analyzer"];};
+
+      naersk = pkgs.callPackage inputs.naersk {
+        rustc = rustToolchain;
+        cargo = rustToolchain;
+        clippy = rustToolchain;
+      };
+    in {
+      default = naersk.buildPackage {
+        meta.mainProgram = "neothesia";
+        src = pkgs.lib.cleanSourceWith {
+          name = "${meta.name}-${meta.version}-src";
+          src = ./.;
+          filter = inputs.gitignore.lib.gitignoreFilterWith {
+            basePath = ./.;
+            extraRules =
+              # gitignore
+              ''
+                flake.*
+                LICENSE.md
+                README.md
+                .github
+                makefile
+                *.sf2
+                *.mid
+                docs
+              '';
+          };
+        };
+      };
+    });
+
+    devShells = forAllSystems (system: pkgs: {
+      default =
+        pkgs.mkShell
+        {inputsFrom = [self.packages.${system}.default];};
+    });
+  };
+}

flake.nix

@@ -11,7 +11,7 @@ use crate::{
     NeothesiaEvent,
     context::Context,
     scene::{
-        MouseToMidiEventState, NuonRenderer, Scene,
+        MouseToMidiEventState, NuonRenderer, Scene, pc_keyboard::PcKeyboard,
         freeplay::recorder::{FreeplayRecorder, Preview, RecorderStatus},
         playing_scene::Keyboard,
     },
@@ -51,6 +51,7 @@ pub struct FreeplayScene {
     nuon_renderer: NuonRenderer,
     nuon: nuon::Ui,
     mouse_to_midi_state: MouseToMidiEventState,
+    pc_keyboard: PcKeyboard,
     deduced_chord_name: String,
 
     recorder: FreeplayRecorder,
@@ -98,6 +99,7 @@ impl FreeplayScene {
             nuon_renderer: NuonRenderer::new(ctx),
             nuon: nuon::Ui::new(),
             mouse_to_midi_state: MouseToMidiEventState::default(),
+            pc_keyboard: PcKeyboard::default(),
             deduced_chord_name: String::new(),
             recorder: FreeplayRecorder::default(),
             recorder_status: RecorderStatus::default(),
@@ -247,7 +249,7 @@ impl Scene for FreeplayScene {
         }
 
         super::handle_nuon_window_event(&mut self.nuon, event, ctx);
-        super::handle_pc_keyboard_to_midi_event(ctx, event);
+        super::handle_pc_keyboard_to_midi_event(ctx, &mut self.pc_keyboard, event);
         super::handle_mouse_to_midi_event(
             &mut self.keyboard,
             &mut self.mouse_to_midi_state,

neothesia/src/scene/freeplay/mod.rs

@@ -1,5 +1,6 @@
 pub mod freeplay;
 pub mod menu_scene;
+pub mod pc_keyboard;
 pub mod playing_scene;
 
 use crate::{
@@ -21,7 +22,11 @@ pub trait Scene {
     fn midi_event(&mut self, _ctx: &mut Context, _channel: u8, _message: &MidiMessage) {}
 }
 
-pub fn handle_pc_keyboard_to_midi_event(ctx: &mut Context, event: &WindowEvent) {
+pub fn handle_pc_keyboard_to_midi_event(
+    ctx: &mut Context,
+    pc_keyboard: &mut pc_keyboard::PcKeyboard,
+    event: &WindowEvent,
+) {
     let WindowEvent::KeyboardInput {
         event:
             KeyEvent {
@@ -36,31 +41,24 @@ pub fn handle_pc_keyboard_to_midi_event(ctx: &mut Context, event: &WindowEvent)
         return;
     };
 
-    let mut note: u8 = match ch.as_str() {
-        "a" => 0,
-        "w" => 1,
-        "s" => 2,
-        "e" => 3,
-        "d" => 4,
-        "f" => 5,
-        "t" => 6,
-        "g" => 7,
-        "y" => 8,
-        "h" => 9,
-        "u" => 10,
-        "j" => 11,
-        "k" => 12,
-        "o" => 13,
-        "l" => 14,
-        "p" => 15,
-        ";" => 16,
-        "'" => 17,
-        _ => return,
+    if let Some(delta) = match ch.as_str() {
+        "z" => Some(-1),
+        "x" => Some(1),
+        _ => None,
+    } {
+        if *state == ElementState::Pressed {
+            pc_keyboard.shift_octave(delta);
+        }
+        return;
+    }
+
+    let Some(index) = pc_keyboard::key_index(ch.as_str()) else {
+        return;
     };
 
-    note += 21; // Start of 88 keyboard
-    note += 3; // Offset to C
-    note += 12 * 3; // Move 3oct up
+    let Some(note) = pc_keyboard.note_for(index, &ctx.config.piano_range()) else {
+        return;
+    };
 
     let message = match state {
         ElementState::Pressed => MidiMessage::NoteOn {