chore: Release lemur version 0.7.3

Reviewed-on: #6

Cargo.toml

@@ -4,8 +4,8 @@ description = "An emulator for the Virtual Boy."
 repository = "https://git.virtual-boy.com/PVB/lemur"
 publish = false
 license = "MIT"
-version = "0.3.2"
-edition = "2021"
+version = "0.7.3"
+edition = "2024"
 
 [dependencies]
 anyhow = "1"
@@ -15,12 +15,12 @@ bitflags = { version = "2", features = ["serde"] }
 bytemuck = { version = "1", features = ["derive"] }
 clap = { version = "4", features = ["derive"] }
 cpal = { git = "https://github.com/sidit77/cpal.git", rev = "66ed6be" }
-directories = "5"
-egui = { version = "0.30", features = ["serde"] }
-egui_extras = { version = "0.30", features = ["image"] }
-egui-toast = { git = "https://github.com/urholaukkarinen/egui-toast.git", rev = "d0bcf97" }
-egui-winit = "0.30"
-egui-wgpu = { version = "0.30", features = ["winit"] }
+directories = "6"
+egui = { version = "0.32", features = ["serde"] }
+egui_extras = { version = "0.32", features = ["image"] }
+egui-notify = "0.20"
+egui-winit = "0.32"
+egui-wgpu = { version = "0.32", features = ["winit"] }
 fixed = { version = "1.28", features = ["num-traits"] }
 gilrs = { version = "0.11", features = ["serde-serialize"] }
 hex = "0.4"
@@ -30,20 +30,21 @@ num-derive = "0.4"
 num-traits = "0.2"
 oneshot = "0.1"
 pollster = "0.4"
-rfd = "0.15"
+rand = "0.9"
+rfd = { version = "0.15", default-features = false, features = ["xdg-portal", "async-std"]}
 rtrb = "0.3"
 rubato = "0.16"
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
-thread-priority = "1"
+thread-priority = "2"
 tokio = { version = "1", features = ["io-util", "macros", "net", "rt", "sync", "time"] }
 tracing = { version = "0.1", features = ["release_max_level_info"] }
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
-wgpu = "23"
+wgpu = "25"
 winit = { version = "0.30", features = ["serde"] }
 
 [target.'cfg(windows)'.dependencies]
-windows = { version = "0.58", features = ["Win32_System_Threading"] }
+windows = { version = "0.61", features = ["Win32_System_Threading"] }
 
 [build-dependencies]
 cc = "1"

README.md

@@ -6,6 +6,8 @@ A Virtual Boy emulator built around the shrooms-vb core. Written in Rust, using
 
 Install the following dependencies:
  - `cargo` (via [rustup](https://rustup.rs/), the version from your package manager is too old)
+ - a C compiler (any will do, [the build script](https://docs.rs/cc/latest/cc/#compile-time-requirements) will find it automatically)
+ - (on linux) `libasound2-dev` and `libudev-dev`
 
 Run
 ```sh

build.Dockerfile

@@ -1,24 +1,39 @@
 # This Dockerfile produces a base image for builds.
 # It includes all dependencies necessary to cross-compile for Windows/MacOS/Linux.
 
-FROM crazymax/osxcross:latest-ubuntu AS osxcross
+FROM debian:bookworm AS osxcross
+ADD --chmod=644 "https://apt.llvm.org/llvm-snapshot.gpg.key" /etc/apt/trusted.gpg.d/apt.llvm.org.asc
+WORKDIR /build/osxcross
+ADD "https://github.com/tpoechtrager/osxcross.git#47936a512273bb3b414b5a2e83043c92eabc7ae7" .
+ADD "https://github.com/joseluisq/macosx-sdks/releases/download/14.5/MacOSX14.5.sdk.tar.xz" ./tarballs/MacOSX14.5.sdk.tar.xz
+RUN apt-get update && \
+    apt-get install -y ca-certificates
+COPY llvm.sources /etc/apt/sources.list.d/llvm.sources
+RUN apt-get update && \
+    apt-get install -y bash bzip2 clang-20 git lld-20 llvm-20 make patch xz-utils && \
+    ln -s $(which clang-20) /usr/bin/clang && \
+    ln -s $(which clang++-20) /usr/bin/clang++ && \
+    ln -s $(which ld64.lld-20) /usr/bin/ld64.lld && \
+    SDK_VERSION=14.5 UNATTENDED=1 ENABLE_COMPILER_RT_INSTALL=1 TARGET_DIR=/osxcross ./build.sh
 
-FROM rust:latest
+FROM rust:1.89-bookworm
+ADD --chmod=644 "https://apt.llvm.org/llvm-snapshot.gpg.key" /etc/apt/trusted.gpg.d/apt.llvm.org.asc
+COPY llvm.sources /etc/apt/sources.list.d/llvm.sources
 RUN rustup target add x86_64-pc-windows-msvc && \
     rustup target add x86_64-apple-darwin && \
     rustup target add aarch64-apple-darwin && \
     apt-get update && \
-    apt-get install -y clang-19 lld-19 libc6-dev libasound2-dev libudev-dev genisoimage mingw-w64 && \
+    apt-get install -y clang-20 lld-20 libc6-dev libasound2-dev libudev-dev genisoimage mingw-w64 && \
     cargo install cargo-bundle xwin && \
     xwin --accept-license splat --output xwin && \
     rm -rf .xwin-cache && \
-    ln -s $(which clang-19) /usr/bin/clang && \
-    ln -s $(which clang++-19) /usr/bin/clang++
+    ln -s $(which clang-20) /usr/bin/clang && \
+    ln -s $(which clang++-20) /usr/bin/clang++
 COPY --from=osxcross /osxcross /osxcross
 
 ENV PATH="/osxcross/bin:$PATH" \
     LD_LIBRARY_PATH="/osxcross/lib" \
-    CC="clang-19" CXX="clang++-19" AR="llvm-ar-19" \
+    CC="clang-20" CXX="clang++-20" AR="llvm-ar-20" \
     CC_x86_64-apple-darwin="o64-clang" \
     CXX_x86_64-apple-darwin="o64-clang++" \
     CC_aarch64-apple-darwin="oa64-clang" \
@@ -27,11 +42,11 @@ ENV PATH="/osxcross/bin:$PATH" \
     CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_RUSTFLAGS="-Clinker-plugin-lto -Clinker=clang -Clink-arg=-fuse-ld=lld" \
     SHROOMS_CFLAGS_x86_64-pc-windows-msvc="-flto" \
     CARGO_TARGET_X86_64_PC_WINDOWS_MSVC_RUSTFLAGS="-Lnative=/xwin/crt/lib/x86_64 -Lnative=/xwin/sdk/lib/um/x86_64 -Lnative=/xwin/sdk/lib/ucrt/x86_64 -Clinker-plugin-lto -Clink-arg=-fuse-ld=lld" \
-    CARGO_TARGET_X86_64_PC_WINDOWS_MSVC_LINKER="lld-link-19" \
+    CARGO_TARGET_X86_64_PC_WINDOWS_MSVC_LINKER="lld-link-20" \
     CARGO_TARGET_X86_64_APPLE_DARWIN_LINKER="o64-clang" \
-    CARGO_TARGET_X86_64_APPLE_DARWIN_AR="llvm-ar-19" \
+    CARGO_TARGET_X86_64_APPLE_DARWIN_AR="llvm-ar-20" \
     CARGO_TARGET_AARCH64_APPLE_DARWIN_LINKER="oa64-clang" \
-    CARGO_TARGET_AARCH64_APPLE_DARWIN_AR="llvm-ar-19" \
-    CROSS_COMPILE="setting-this-to-silence-a-warning-" \
-    RC_PATH="llvm-rc-19" \
+    CARGO_TARGET_AARCH64_APPLE_DARWIN_AR="llvm-ar-20" \
+    RC_PATH="llvm-rc-20" \
     MACOSX_DEPLOYMENT_TARGET="14.5"
+ENTRYPOINT ["bash"]

llvm.sources

@@ -0,0 +1,4 @@
+Types: deb deb-src
+URIs: http://apt.llvm.org/bookworm/
+Suites: llvm-toolchain-bookworm-20
+Components: main

scripts/bundle.sh

@@ -0,0 +1,4 @@
+set -e
+
+docker build --pull -f build.Dockerfile -t lemur-build .
+MSYS_NO_PATHCONV=1 docker run -it --rm -v .:/app -w /app lemur-build /app/scripts/do-bundle.sh

scripts/release.sh

@@ -24,8 +24,7 @@ if ! command -v docker 2>&1 >/dev/null; then
     exit 1
 fi
 
-docker build -f build.Dockerfile -t lemur-build .
-MSYS_NO_PATHCONV=1 docker run -it --rm -v .:/app -w /app --entrypoint bash lemur-build /app/scripts/do-bundle.sh
+./scripts/bundle.sh
 
 body=$(cat <<EOF
 ## How to install

src/app.rs

@@ -1,9 +1,10 @@
 use std::{collections::HashSet, num::NonZero, sync::Arc, thread, time::Duration};
 
 use egui::{
-    ahash::{HashMap, HashMapExt},
     Context, FontData, FontDefinitions, FontFamily, IconData, TextWrapMode, ViewportBuilder,
     ViewportCommand, ViewportId, ViewportInfo,
+    ahash::{HashMap, HashMapExt},
+    style::ScrollStyle,
 };
 use gilrs::{EventType, Gilrs};
 use tracing::{error, warn};
@@ -18,12 +19,13 @@ use crate::{
     controller::ControllerManager,
     emulator::{EmulatorClient, EmulatorCommand, SimId},
     images::ImageProcessor,
-    input::MappingProvider,
+    input::{MappingProvider, ShortcutProvider},
     memory::MemoryClient,
     persistence::Persistence,
     window::{
         AboutWindow, AppWindow, BgMapWindow, CharacterDataWindow, FrameBufferWindow, GameWindow,
-        GdbServerWindow, InputWindow, ObjectWindow, RegisterWindow, WorldWindow,
+        GdbServerWindow, HotkeysWindow, InputWindow, ObjectWindow, RegisterWindow, TerminalWindow,
+        WorldWindow,
     },
 };
 
@@ -44,6 +46,7 @@ pub struct Application {
     client: EmulatorClient,
     proxy: EventLoopProxy<UserEvent>,
     mappings: MappingProvider,
+    shortcuts: ShortcutProvider,
     controllers: ControllerManager,
     memory: Arc<MemoryClient>,
     images: ImageProcessor,
@@ -63,6 +66,7 @@ impl Application {
         let icon = load_icon().ok().map(Arc::new);
         let persistence = Persistence::new();
         let mappings = MappingProvider::new(persistence.clone());
+        let shortcuts = ShortcutProvider::new(persistence.clone());
         let controllers = ControllerManager::new(client.clone(), &mappings);
         let memory = Arc::new(MemoryClient::new(client.clone()));
         let images = ImageProcessor::new();
@@ -77,6 +81,7 @@ impl Application {
             client,
             proxy,
             mappings,
+            shortcuts,
             memory,
             images,
             controllers,
@@ -89,7 +94,8 @@ impl Application {
 
     fn open(&mut self, event_loop: &ActiveEventLoop, window: Box<dyn AppWindow>) {
         let viewport_id = window.viewport_id();
-        if self.viewports.contains_key(&viewport_id) {
+        if let Some(viewport) = self.viewports.get(&viewport_id) {
+            viewport.window.focus_window();
             return;
         }
         self.viewports.insert(
@@ -111,6 +117,7 @@ impl ApplicationHandler<UserEvent> for Application {
             self.client.clone(),
             self.proxy.clone(),
             self.persistence.clone(),
+            self.shortcuts.clone(),
             SimId::Player1,
         );
         self.open(event_loop, Box::new(app));
@@ -202,11 +209,10 @@ impl ApplicationHandler<UserEvent> for Application {
                     .focused
                     .as_ref()
                     .and_then(|id| self.viewports.get_mut(id))
+                    && viewport.app.handle_gamepad_event(&event)
                 {
-                    if viewport.app.handle_gamepad_event(&event) {
                     return;
                 }
-                }
                 self.controllers.handle_gamepad_event(&event);
             }
             UserEvent::OpenAbout => {
@@ -237,6 +243,10 @@ impl ApplicationHandler<UserEvent> for Application {
                 let registers = RegisterWindow::new(sim_id, &self.memory);
                 self.open(event_loop, Box::new(registers));
             }
+            UserEvent::OpenTerminal(sim_id) => {
+                let terminal = TerminalWindow::new(sim_id, &self.client);
+                self.open(event_loop, Box::new(terminal));
+            }
             UserEvent::OpenDebugger(sim_id) => {
                 let debugger =
                     GdbServerWindow::new(sim_id, self.client.clone(), self.proxy.clone());
@@ -246,11 +256,16 @@ impl ApplicationHandler<UserEvent> for Application {
                 let input = InputWindow::new(self.mappings.clone());
                 self.open(event_loop, Box::new(input));
             }
+            UserEvent::OpenHotkeys => {
+                let hotkeys = HotkeysWindow::new(self.shortcuts.clone());
+                self.open(event_loop, Box::new(hotkeys));
+            }
             UserEvent::OpenPlayer2 => {
                 let p2 = GameWindow::new(
                     self.client.clone(),
                     self.proxy.clone(),
                     self.persistence.clone(),
+                    self.shortcuts.clone(),
                     SimId::Player2,
                 );
                 self.open(event_loop, Box::new(p2));
@@ -273,19 +288,19 @@ impl ApplicationHandler<UserEvent> for Application {
 
     fn exiting(&mut self, _event_loop: &ActiveEventLoop) {
         let (sender, receiver) = oneshot::channel();
-        if self.client.send_command(EmulatorCommand::Exit(sender)) {
-            if let Err(error) = receiver.recv_timeout(Duration::from_secs(5)) {
+        if self.client.send_command(EmulatorCommand::Exit(sender))
+            && let Err(error) = receiver.recv_timeout(Duration::from_secs(5))
+        {
             error!(%error, "could not gracefully exit.");
         }
     }
-    }
 }
 
 struct WgpuState {
-    instance: Arc<wgpu::Instance>,
-    adapter: Arc<wgpu::Adapter>,
-    device: Arc<wgpu::Device>,
-    queue: Arc<wgpu::Queue>,
+    instance: wgpu::Instance,
+    adapter: wgpu::Adapter,
+    device: wgpu::Device,
+    queue: wgpu::Queue,
 }
 
 impl WgpuState {
@@ -293,21 +308,21 @@ impl WgpuState {
         #[allow(unused_variables)]
         let egui_wgpu::WgpuConfiguration {
             wgpu_setup:
-                egui_wgpu::WgpuSetup::CreateNew {
-                    supported_backends,
+                egui_wgpu::WgpuSetup::CreateNew(egui_wgpu::WgpuSetupCreateNew {
+                    instance_descriptor: wgpu::InstanceDescriptor { backends, .. },
                     device_descriptor,
                     ..
-                },
+                }),
             ..
         } = egui_wgpu::WgpuConfiguration::default()
         else {
             panic!("required fields not found")
         };
         #[cfg(windows)]
-        let supported_backends = wgpu::util::backend_bits_from_env()
+        let backends = wgpu::Backends::from_env()
             .unwrap_or((wgpu::Backends::PRIMARY | wgpu::Backends::GL) - wgpu::Backends::VULKAN);
-        let instance = wgpu::Instance::new(wgpu::InstanceDescriptor {
-            backends: supported_backends,
+        let instance = wgpu::Instance::new(&wgpu::InstanceDescriptor {
+            backends,
             ..wgpu::InstanceDescriptor::default()
         });
 
@@ -318,17 +333,14 @@ impl WgpuState {
         }))
         .expect("could not create adapter");
 
-        let trace_path = std::env::var("WGPU_TRACE");
-        let (device, queue) = pollster::block_on(adapter.request_device(
-            &(*device_descriptor)(&adapter),
-            trace_path.ok().as_ref().map(std::path::Path::new),
-        ))
+        let (device, queue) =
+            pollster::block_on(adapter.request_device(&(*device_descriptor)(&adapter)))
                 .expect("could not request device");
         Self {
-            instance: Arc::new(instance),
-            adapter: Arc::new(adapter),
-            device: Arc::new(device),
-            queue: Arc::new(queue),
+            instance,
+            adapter,
+            device,
+            queue,
         }
     }
 }
@@ -366,23 +378,30 @@ impl Viewport {
         ctx.set_fonts(fonts);
         ctx.style_mut(|s| {
             s.wrap_mode = Some(TextWrapMode::Extend);
-            s.visuals.menu_rounding = Default::default();
+            s.visuals.menu_corner_radius = Default::default();
+            s.spacing.scroll = ScrollStyle::thin();
         });
         egui_extras::install_image_loaders(&ctx);
 
         let wgpu_config = egui_wgpu::WgpuConfiguration {
             present_mode: wgpu::PresentMode::AutoNoVsync,
-            wgpu_setup: egui_wgpu::WgpuSetup::Existing {
+            wgpu_setup: egui_wgpu::WgpuSetup::Existing(egui_wgpu::WgpuSetupExisting {
                 instance: wgpu.instance.clone(),
                 adapter: wgpu.adapter.clone(),
                 device: wgpu.device.clone(),
                 queue: wgpu.queue.clone(),
-            },
+            }),
             ..egui_wgpu::WgpuConfiguration::default()
         };
 
-        let mut painter =
-            egui_wgpu::winit::Painter::new(ctx.clone(), wgpu_config, 1, None, false, true);
+        let mut painter = pollster::block_on(egui_wgpu::winit::Painter::new(
+            ctx.clone(),
+            wgpu_config,
+            1,
+            None,
+            false,
+            true,
+        ));
 
         let mut info = ViewportInfo::default();
         let mut builder = app.initial_viewport();
@@ -501,8 +520,10 @@ pub enum UserEvent {
     OpenWorlds(SimId),
     OpenFrameBuffers(SimId),
     OpenRegisters(SimId),
+    OpenTerminal(SimId),
     OpenDebugger(SimId),
     OpenInput,
+    OpenHotkeys,
     OpenPlayer2,
     Quit(SimId),
 }

src/audio.rs

@@ -1,20 +1,22 @@
 use std::time::Duration;
 
-use anyhow::{bail, Result};
+use anyhow::{Result, bail};
 use cpal::traits::{DeviceTrait, HostTrait, StreamTrait};
 use itertools::Itertools;
-use rubato::{FftFixedInOut, Resampler};
+use rubato::{FastFixedOut, Resampler};
 use tracing::error;
 
 pub struct Audio {
     #[allow(unused)]
     stream: cpal::Stream,
-    sampler: FftFixedInOut<f32>,
+    sampler: FastFixedOut<f32>,
     input_buffer: Vec<Vec<f32>>,
     output_buffer: Vec<Vec<f32>>,
     sample_sink: rtrb::Producer<f32>,
 }
 
+const VB_FREQUENCY: usize = 41700;
+
 impl Audio {
     pub fn init() -> Result<Self> {
         let host = cpal::default_host();
@@ -28,7 +30,15 @@ impl Audio {
             bail!("No suitable output config available");
         };
         let mut config = config.with_max_sample_rate().config();
-        let sampler = FftFixedInOut::new(41700, config.sample_rate.0 as usize, 834, 2)?;
+        let resample_ratio = config.sample_rate.0 as f64 / VB_FREQUENCY as f64;
+        let chunk_size = (834.0 * resample_ratio) as usize;
+        let sampler = FastFixedOut::new(
+            resample_ratio,
+            64.0,
+            rubato::PolynomialDegree::Cubic,
+            chunk_size,
+            2,
+        )?;
         config.buffer_size = cpal::BufferSize::Fixed(sampler.output_frames_max() as u32);
 
         let input_buffer = sampler.input_buffer_allocate(true);
@@ -101,4 +111,10 @@ impl Audio {
             std::thread::sleep(Duration::from_micros(500));
         }
     }
+
+    pub fn set_speed(&mut self, speed: f64) -> Result<()> {
+        self.sampler
+            .set_resample_ratio_relative(1.0 / speed, false)?;
+        Ok(())
+    }
 }

src/controller.rs

@@ -1,6 +1,6 @@
 use std::sync::{Arc, RwLock};
 
-use gilrs::{ev::Code, Event as GamepadEvent, EventType, GamepadId};
+use gilrs::{Event as GamepadEvent, EventType, GamepadId, ev::Code};
 use winit::{
     event::{ElementState, KeyEvent},
     keyboard::PhysicalKey,

src/emulator.rs

@@ -1,31 +1,32 @@
 use std::{
     collections::HashMap,
     fmt::Display,
-    fs::{self, File},
-    io::{Read, Seek, SeekFrom, Write},
     path::{Path, PathBuf},
     sync::{
+        Arc, Weak,
         atomic::{AtomicBool, Ordering},
         mpsc::{self, RecvError, TryRecvError},
-        Arc, Weak,
     },
+    time::Duration,
 };
 
 use anyhow::Result;
 use atomic::Atomic;
 use bytemuck::NoUninit;
-use egui_toast::{Toast, ToastKind, ToastOptions};
+use egui_notify::Toast;
 use tracing::{error, warn};
 
 use crate::{
     audio::Audio,
+    emulator::cart::Cart,
     graphics::TextureSink,
     memory::{MemoryRange, MemoryRegion},
 };
-use shrooms_vb_core::{Sim, StopReason, EXPECTED_FRAME_SIZE};
+use shrooms_vb_core::{EXPECTED_FRAME_SIZE, Sim, StopReason};
 pub use shrooms_vb_core::{VBKey, VBRegister, VBWatchpointType};
 
 mod address_set;
+mod cart;
 mod shrooms_vb_core;
 
 #[derive(PartialEq, Eq, Hash, Clone, Copy, Debug)]
@@ -43,6 +44,13 @@ impl SimId {
             Self::Player2 => 1,
         }
     }
+    pub const fn from_index(index: usize) -> Option<Self> {
+        match index {
+            0 => Some(Self::Player1),
+            1 => Some(Self::Player2),
+            _ => None,
+        }
+    }
 }
 impl Display for SimId {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
@@ -53,43 +61,6 @@ impl Display for SimId {
     }
 }
 
-struct Cart {
-    rom_path: PathBuf,
-    rom: Vec<u8>,
-    sram_file: File,
-    sram: Vec<u8>,
-}
-
-impl Cart {
-    fn load(rom_path: &Path, sim_id: SimId) -> Result<Self> {
-        let rom = fs::read(rom_path)?;
-
-        let mut sram_file = File::options()
-            .read(true)
-            .write(true)
-            .create(true)
-            .truncate(false)
-            .open(sram_path(rom_path, sim_id))?;
-        sram_file.set_len(8 * 1024)?;
-
-        let mut sram = vec![];
-        sram_file.read_to_end(&mut sram)?;
-        Ok(Cart {
-            rom_path: rom_path.to_path_buf(),
-            rom,
-            sram_file,
-            sram,
-        })
-    }
-}
-
-fn sram_path(rom_path: &Path, sim_id: SimId) -> PathBuf {
-    match sim_id {
-        SimId::Player1 => rom_path.with_extension("p1.sram"),
-        SimId::Player2 => rom_path.with_extension("p2.sram"),
-    }
-}
-
 pub struct EmulatorBuilder {
     rom: Option<PathBuf>,
     commands: mpsc::Receiver<EmulatorCommand>,
@@ -169,8 +140,9 @@ pub struct Emulator {
     renderers: HashMap<SimId, TextureSink>,
     messages: HashMap<SimId, mpsc::Sender<Toast>>,
     debuggers: HashMap<SimId, DebugInfo>,
+    stdouts: HashMap<SimId, mpsc::Sender<String>>,
     watched_regions: HashMap<MemoryRange, Weak<MemoryRegion>>,
-    eye_contents: Vec<u8>,
+    eye_contents: [Vec<u8>; 2],
     audio_samples: Vec<f32>,
     buffer: Vec<u8>,
 }
@@ -195,8 +167,9 @@ impl Emulator {
             renderers: HashMap::new(),
             messages: HashMap::new(),
             debuggers: HashMap::new(),
+            stdouts: HashMap::new(),
             watched_regions: HashMap::new(),
-            eye_contents: vec![0u8; 384 * 224 * 2],
+            eye_contents: [vec![0u8; 384 * 224 * 2], vec![0u8; 384 * 224 * 2]],
             audio_samples: Vec::with_capacity(EXPECTED_FRAME_SIZE),
             buffer: vec![],
         })
@@ -209,12 +182,12 @@ impl Emulator {
     }
 
     pub fn start_second_sim(&mut self, rom: Option<PathBuf>) -> Result<()> {
-        let rom_path = if let Some(path) = rom {
+        let file_path = if let Some(path) = rom {
             Some(path)
         } else {
-            self.carts[0].as_ref().map(|c| c.rom_path.clone())
+            self.carts[0].as_ref().map(|c| c.file_path.clone())
         };
-        let cart = match rom_path {
+        let cart = match file_path {
             Some(rom_path) => Some(Cart::load(&rom_path, SimId::Player2)?),
             None => None,
         };
@@ -228,8 +201,15 @@ impl Emulator {
 
         let index = sim_id.to_index();
         while self.sims.len() <= index {
+            let new_index = self.sims.len();
             self.sims.push(Sim::new());
-            self.sim_state[index].store(SimState::NoGame, Ordering::Release);
+            if self
+                .stdouts
+                .contains_key(&SimId::from_index(new_index).unwrap())
+            {
+                self.sims[new_index].watch_stdout(true);
+            }
+            self.sim_state[new_index].store(SimState::NoGame, Ordering::Release);
         }
         let sim = &mut self.sims[index];
         sim.reset();
@@ -291,13 +271,36 @@ impl Emulator {
         );
     }
 
+    fn frame_advance(&mut self) {
+        if self
+            .state
+            .compare_exchange(
+                EmulatorState::Paused,
+                EmulatorState::Stepping,
+                Ordering::AcqRel,
+                Ordering::Acquire,
+            )
+            .is_err_and(|s| s == EmulatorState::Running)
+        {
+            let _ = self.state.compare_exchange(
+                EmulatorState::Running,
+                EmulatorState::Stepping,
+                Ordering::AcqRel,
+                Ordering::Relaxed,
+            );
+        }
+    }
+
+    fn set_speed(&mut self, speed: f64) -> Result<()> {
+        self.audio.set_speed(speed)
+    }
+
     fn save_sram(&mut self, sim_id: SimId) -> Result<()> {
         let sim = self.sims.get_mut(sim_id.to_index());
         let cart = self.carts[sim_id.to_index()].as_mut();
         if let (Some(sim), Some(cart)) = (sim, cart) {
             sim.read_sram(&mut cart.sram);
-            cart.sram_file.seek(SeekFrom::Start(0))?;
-            cart.sram_file.write_all(&cart.sram)?;
+            cart.save_sram()?;
         }
         Ok(())
     }
@@ -366,6 +369,7 @@ impl Emulator {
         debugger.stop_reason = None;
         true
     }
+
     fn debug_step(&mut self, sim_id: SimId) {
         if self.debug_continue(sim_id) {
             let Some(sim) = self.sims.get_mut(sim_id.to_index()) else {
@@ -428,7 +432,7 @@ impl Emulator {
         // Don't emulate if the state is "paused", or if any sim is paused in the debugger
         let running = match state {
             EmulatorState::Paused => false,
-            EmulatorState::Running => true,
+            EmulatorState::Running | EmulatorState::Stepping => true,
             EmulatorState::Debugging => self.debuggers.values().all(|d| d.stop_reason.is_none()),
         };
         let p1_running = running && p1_state == SimState::Ready;
@@ -442,6 +446,24 @@ impl Emulator {
             self.sims[SimId::Player2.to_index()].emulate();
         }
 
+        if state == EmulatorState::Stepping {
+            self.state.store(EmulatorState::Paused, Ordering::Release);
+        }
+
+        // stdout
+        self.stdouts.retain(|sim_id, stdout| {
+            let Some(sim) = self.sims.get_mut(sim_id.to_index()) else {
+                return true;
+            };
+            if let Some(text) = sim.take_stdout()
+                && stdout.send(text).is_err()
+            {
+                sim.watch_stdout(false);
+                return false;
+            }
+            true
+        });
+
         // Debug state
         if state == EmulatorState::Debugging {
             for sim_id in SimId::values() {
@@ -469,9 +491,12 @@ impl Emulator {
             let Some(sim) = self.sims.get_mut(sim_id.to_index()) else {
                 continue;
             };
-            if sim.read_pixels(&mut self.eye_contents) {
+            if sim.read_pixels(&mut self.eye_contents[sim_id.to_index()]) {
                 idle = false;
-                if renderer.queue_render(&self.eye_contents).is_err() {
+                if renderer
+                    .queue_render(&self.eye_contents[sim_id.to_index()])
+                    .is_err()
+                {
                     self.renderers.remove(&sim_id);
                 }
             }
@@ -539,6 +564,14 @@ impl Emulator {
             EmulatorCommand::Resume => {
                 self.resume_sims();
             }
+            EmulatorCommand::FrameAdvance => {
+                self.frame_advance();
+            }
+            EmulatorCommand::SetSpeed(speed) => {
+                if let Err(error) = self.set_speed(speed) {
+                    self.report_error(SimId::Player1, format!("Error setting speed: {error}"));
+                }
+            }
             EmulatorCommand::StartDebugging(sim_id, debugger) => {
                 self.start_debugging(sim_id, debugger);
             }
@@ -608,6 +641,13 @@ impl Emulator {
                 };
                 sim.remove_watchpoint(address, length, watch);
             }
+            EmulatorCommand::WatchStdout(sim_id, stdout_sink) => {
+                self.stdouts.insert(sim_id, stdout_sink);
+                let Some(sim) = self.sims.get_mut(sim_id.to_index()) else {
+                    return;
+                };
+                sim.watch_stdout(true);
+            }
             EmulatorCommand::SetAudioEnabled(p1, p2) => {
                 self.audio_on[SimId::Player1.to_index()].store(p1, Ordering::Release);
                 self.audio_on[SimId::Player2.to_index()].store(p2, Ordering::Release);
@@ -628,6 +668,10 @@ impl Emulator {
                     sim.set_keys(keys);
                 }
             }
+            EmulatorCommand::Screenshot(sim_id, sender) => {
+                let contents = self.eye_contents[sim_id.to_index()].clone();
+                let _ = sender.send(contents);
+            }
             EmulatorCommand::Exit(done) => {
                 for sim_id in SimId::values() {
                     if let Err(error) = self.save_sram(sim_id) {
@@ -645,10 +689,8 @@ impl Emulator {
             .get(&sim_id)
             .or_else(|| self.messages.get(&SimId::Player1));
         if let Some(msg) = messages {
-            let toast = Toast::new()
-                .kind(ToastKind::Error)
-                .options(ToastOptions::default().duration_in_seconds(5.0))
-                .text(&message);
+            let mut toast = Toast::error(&message);
+            toast.duration(Some(Duration::from_secs(5)));
             if msg.send(toast).is_ok() {
                 return;
             }
@@ -665,6 +707,8 @@ pub enum EmulatorCommand {
     StopSecondSim,
     Pause,
     Resume,
+    FrameAdvance,
+    SetSpeed(f64),
     StartDebugging(SimId, DebugSender),
     StopDebugging(SimId),
     DebugInterrupt(SimId),
@@ -679,11 +723,13 @@ pub enum EmulatorCommand {
     RemoveBreakpoint(SimId, u32),
     AddWatchpoint(SimId, u32, usize, VBWatchpointType),
     RemoveWatchpoint(SimId, u32, usize, VBWatchpointType),
+    WatchStdout(SimId, mpsc::Sender<String>),
     SetAudioEnabled(bool, bool),
     Link,
     Unlink,
     Reset(SimId),
     SetKeys(SimId, VBKey),
+    Screenshot(SimId, oneshot::Sender<Vec<u8>>),
     Exit(oneshot::Sender<()>),
 }
 
@@ -700,6 +746,7 @@ pub enum SimState {
 pub enum EmulatorState {
     Paused,
     Running,
+    Stepping,
     Debugging,
 }
 

src/emulator/cart.rs

@@ -0,0 +1,63 @@
+use anyhow::Result;
+use rand::Rng;
+use std::{
+    fs::{self, File},
+    io::{Read, Seek as _, SeekFrom, Write as _},
+    path::{Path, PathBuf},
+};
+
+use crate::emulator::SimId;
+
+pub struct Cart {
+    pub file_path: PathBuf,
+    pub rom: Vec<u8>,
+    sram_file: File,
+    pub sram: Vec<u8>,
+}
+
+impl Cart {
+    pub fn load(file_path: &Path, sim_id: SimId) -> Result<Self> {
+        let rom = fs::read(file_path)?;
+
+        let mut sram_file = File::options()
+            .read(true)
+            .write(true)
+            .create(true)
+            .truncate(false)
+            .open(sram_path(file_path, sim_id))?;
+
+        let sram = if sram_file.metadata()?.len() == 0 {
+            // new SRAM file, randomize the contents
+            let mut sram = vec![0; 16 * 1024];
+            let mut rng = rand::rng();
+            for dst in sram.iter_mut().step_by(2) {
+                *dst = rng.random();
+            }
+            sram
+        } else {
+            let mut sram = Vec::with_capacity(16 * 1024);
+            sram_file.read_to_end(&mut sram)?;
+            sram
+        };
+
+        Ok(Cart {
+            file_path: file_path.to_path_buf(),
+            rom,
+            sram_file,
+            sram,
+        })
+    }
+
+    pub fn save_sram(&mut self) -> Result<()> {
+        self.sram_file.seek(SeekFrom::Start(0))?;
+        self.sram_file.write_all(&self.sram)?;
+        Ok(())
+    }
+}
+
+fn sram_path(file_path: &Path, sim_id: SimId) -> PathBuf {
+    match sim_id {
+        SimId::Player1 => file_path.with_extension("p1.sram"),
+        SimId::Player2 => file_path.with_extension("p2.sram"),
+    }
+}

src/emulator/shrooms_vb_core.rs

@@ -1,6 +1,6 @@
 use std::{ffi::c_void, ptr, slice};
 
-use anyhow::{anyhow, Result};
+use anyhow::{Result, anyhow};
 use bitflags::bitflags;
 use num_derive::{FromPrimitive, ToPrimitive};
 use serde::{Deserialize, Serialize};
@@ -91,7 +91,7 @@ type OnWrite = extern "C" fn(
 ) -> c_int;
 
 #[link(name = "vb")]
-extern "C" {
+unsafe extern "C" {
     #[link_name = "vbEmulate"]
     fn vb_emulate(sim: *mut VB, cycles: *mut u32) -> c_int;
     #[link_name = "vbEmulateEx"]
@@ -170,7 +170,7 @@ extern "C" {
     fn vb_write(sim: *mut VB, address: u32, _type: VBDataType, value: i32) -> i32;
 }
 
-#[no_mangle]
+#[unsafe(no_mangle)]
 extern "C" fn on_frame(sim: *mut VB) -> c_int {
     // SAFETY: the *mut VB owns its userdata.
     // There is no way for the userdata to be null or otherwise invalid.
@@ -179,7 +179,7 @@ extern "C" fn on_frame(sim: *mut VB) -> c_int {
     1
 }
 
-#[no_mangle]
+#[unsafe(no_mangle)]
 extern "C" fn on_execute(sim: *mut VB, address: u32, _code: *const u16, _length: c_int) -> c_int {
     // SAFETY: the *mut VB owns its userdata.
     // There is no way for the userdata to be null or otherwise invalid.
@@ -196,14 +196,10 @@ extern "C" fn on_execute(sim: *mut VB, address: u32, _code: *const u16, _length:
         stopped = true;
     }
 
-    if stopped {
-        1
-    } else {
-        0
-    }
+    if stopped { 1 } else { 0 }
 }
 
-#[no_mangle]
+#[unsafe(no_mangle)]
 extern "C" fn on_read(
     sim: *mut VB,
     address: u32,
@@ -229,12 +225,12 @@ extern "C" fn on_read(
     0
 }
 
-#[no_mangle]
+#[unsafe(no_mangle)]
 extern "C" fn on_write(
     sim: *mut VB,
     address: u32,
     _type: VBDataType,
-    _value: *mut i32,
+    value: *mut i32,
     _cycles: *mut u32,
     _cancel: *mut c_int,
 ) -> c_int {
@@ -242,6 +238,14 @@ extern "C" fn on_write(
     // There is no way for the userdata to be null or otherwise invalid.
     let data: &mut VBState = unsafe { &mut *vb_get_user_data(sim).cast() };
 
+    // If we're monitoring stdout, track this write
+    if let Some(stdout) = data.stdout.as_mut() {
+        let normalized_hw_address = address & 0x0700003f;
+        if normalized_hw_address == 0x02000030 {
+            stdout.push(unsafe { *value } as u8);
+        }
+    }
+
     if let Some(start) = data.write_watchpoints.start_of_range_containing(address) {
         let watch = if data.read_watchpoints.contains(address) {
             VBWatchpointType::Access
@@ -267,6 +271,7 @@ struct VBState {
     breakpoints: Vec<u32>,
     read_watchpoints: AddressSet,
     write_watchpoints: AddressSet,
+    stdout: Option<Vec<u8>>,
 }
 
 impl VBState {
@@ -310,6 +315,7 @@ impl Sim {
             breakpoints: vec![],
             read_watchpoints: AddressSet::new(),
             write_watchpoints: AddressSet::new(),
+            stdout: None,
         };
         unsafe { vb_set_user_data(sim, Box::into_raw(Box::new(state)).cast()) };
         unsafe { vb_set_frame_callback(sim, Some(on_frame)) };
@@ -568,7 +574,9 @@ impl Sim {
         state.write_watchpoints.remove(address, length);
         let needs_execute = state.needs_execute_callback();
         if state.write_watchpoints.is_empty() {
+            if state.stdout.is_none() {
                 unsafe { vb_set_write_callback(self.sim, None) };
+            }
             if !needs_execute {
                 unsafe { vb_set_execute_callback(self.sim, None) };
             }
@@ -590,11 +598,40 @@ impl Sim {
         data.breakpoints.clear();
         data.read_watchpoints.clear();
         data.write_watchpoints.clear();
+        let needs_write = data.stdout.is_some();
         unsafe { vb_set_read_callback(self.sim, None) };
+        if !needs_write {
             unsafe { vb_set_write_callback(self.sim, None) };
+        }
         unsafe { vb_set_execute_callback(self.sim, None) };
     }
 
+    pub fn watch_stdout(&mut self, watch: bool) {
+        let data = self.get_state();
+        if watch {
+            if data.stdout.is_none() {
+                data.stdout = Some(vec![]);
+                unsafe { vb_set_write_callback(self.sim, Some(on_write)) };
+            }
+        } else {
+            data.stdout.take();
+            if data.write_watchpoints.is_empty() {
+                unsafe { vb_set_write_callback(self.sim, None) };
+            }
+        }
+    }
+
+    pub fn take_stdout(&mut self) -> Option<String> {
+        let data = self.get_state();
+        let stdout = data.stdout.take()?;
+        let string = match String::from_utf8(stdout) {
+            Ok(str) => str,
+            Err(err) => String::from_utf8_lossy(err.as_bytes()).into_owned(),
+        };
+        data.stdout = Some(vec![]);
+        Some(string)
+    }
+
     pub fn stop_reason(&mut self) -> Option<StopReason> {
         let data = self.get_state();
         let reason = data.stop_reason.take();

src/gdbserver.rs

@@ -1,4 +1,4 @@
-use anyhow::{bail, Result};
+use anyhow::{Result, bail};
 use registers::REGISTERS;
 use request::{Request, RequestKind, RequestSource};
 use response::Response;
@@ -12,7 +12,7 @@ use tokio::{
     pin, select,
     sync::{mpsc, oneshot},
 };
-use tracing::{debug, enabled, error, info, Level};
+use tracing::{Level, debug, enabled, error, info};
 
 use crate::emulator::{
     DebugEvent, DebugStopReason, EmulatorClient, EmulatorCommand, SimId, VBWatchpointType,

src/gdbserver/registers.rs

@@ -12,7 +12,7 @@ impl RegisterInfo {
     pub fn to_description(&self) -> String {
         let mut string = format!("name:{}", self.name);
         if let Some(alt) = self.alt_name {
-            string.push_str(&format!(";alt-name:{}", alt));
+            string.push_str(&format!(";alt-name:{alt}"));
         }
         string.push_str(&format!(
             ";bitsize:32;offset:{};encoding:uint;format:hex;set:{};dwarf:{}",
@@ -21,7 +21,7 @@ impl RegisterInfo {
             self.dwarf
         ));
         if let Some(generic) = self.generic {
-            string.push_str(&format!(";generic:{}", generic));
+            string.push_str(&format!(";generic:{generic}"));
         }
         string
     }

src/gdbserver/request.rs

@@ -1,4 +1,4 @@
-use anyhow::{bail, Result};
+use anyhow::{Result, bail};
 use atoi::FromRadix16;
 use tokio::io::{AsyncRead, AsyncReadExt as _};
 

src/graphics.rs

@@ -1,15 +1,16 @@
 use std::{
     sync::{
+        Arc, Mutex, MutexGuard,
         atomic::{AtomicU64, Ordering},
-        mpsc, Arc, Mutex, MutexGuard,
+        mpsc,
     },
     thread,
 };
 
-use anyhow::{bail, Result};
+use anyhow::{Result, bail};
 use itertools::Itertools as _;
 use wgpu::{
-    Device, Extent3d, ImageCopyTexture, ImageDataLayout, Origin3d, Queue, Texture,
+    Device, Extent3d, Origin3d, Queue, TexelCopyBufferLayout, TexelCopyTextureInfo, Texture,
     TextureDescriptor, TextureFormat, TextureUsages, TextureView, TextureViewDescriptor,
 };
 
@@ -20,7 +21,7 @@ pub struct TextureSink {
 }
 
 impl TextureSink {
-    pub fn new(device: &Device, queue: Arc<Queue>) -> (Self, TextureView) {
+    pub fn new(device: &Device, queue: Queue) -> (Self, TextureView) {
         let texture = Self::create_texture(device);
         let view = texture.create_view(&TextureViewDescriptor::default());
         let buffers = Arc::new(BufferPool::new());
@@ -71,7 +72,7 @@ impl TextureSink {
     }
 
     fn write_texture(queue: &Queue, texture: &Texture, bytes: &[u8]) {
-        let texture = ImageCopyTexture {
+        let texture = TexelCopyTextureInfo {
             texture,
             mip_level: 0,
             origin: Origin3d::ZERO,
@@ -82,7 +83,7 @@ impl TextureSink {
             height: 224,
             depth_or_array_layers: 1,
         };
-        let data_layout = ImageDataLayout {
+        let data_layout = TexelCopyBufferLayout {
             offset: 0,
             bytes_per_row: Some(384 * 2),
             rows_per_image: Some(224),

src/images.rs

@@ -7,9 +7,9 @@ use std::{
 };
 
 use egui::{
+    Color32, ColorImage, TextureHandle, TextureOptions,
     epaint::ImageDelta,
     load::{LoadError, SizedTexture, TextureLoader, TexturePoll},
-    Color32, ColorImage, TextureHandle, TextureOptions,
 };
 use tokio::{sync::mpsc, time::timeout};
 
@@ -193,8 +193,8 @@ struct ImageState {
 impl ImageState {
     fn new(size: [usize; 2]) -> Self {
         let buffers = [
-            Arc::new(ColorImage::new(size, Color32::BLACK)),
-            Arc::new(ColorImage::new(size, Color32::BLACK)),
+            Arc::new(ColorImage::filled(size, Color32::BLACK)),
+            Arc::new(ColorImage::filled(size, Color32::BLACK)),
         ];
         let sink = buffers[0].clone();
         Self {

src/input.rs

@@ -1,12 +1,14 @@
 use std::{
-    collections::{hash_map::Entry, HashMap},
+    cmp::Ordering,
+    collections::{HashMap, hash_map::Entry},
     fmt::Display,
     str::FromStr,
-    sync::{Arc, RwLock},
+    sync::{Arc, Mutex, RwLock},
 };
 
 use anyhow::anyhow;
-use gilrs::{ev::Code, Axis, Button, Gamepad, GamepadId};
+use egui::{Event, Key, KeyboardShortcut, Modifiers};
+use gilrs::{Axis, Button, Gamepad, GamepadId, ev::Code};
 use serde::{Deserialize, Serialize};
 use winit::keyboard::{KeyCode, PhysicalKey};
 
@@ -225,7 +227,7 @@ impl Mappings for InputMapping {
         for (keyboard_key, keys) in &self.keys {
             let name = match keyboard_key {
                 PhysicalKey::Code(code) => format!("{code:?}"),
-                k => format!("{:?}", k),
+                k => format!("{k:?}"),
             };
             for key in keys.iter() {
                 results.entry(key).or_default().push(name.clone());
@@ -454,3 +456,315 @@ struct PersistedGamepadMapping {
     default_buttons: Vec<(Code, VBKey)>,
     default_axes: Vec<(Code, (VBKey, VBKey))>,
 }
+
+#[derive(Serialize, Deserialize)]
+pub struct Shortcut {
+    pub shortcut: KeyboardShortcut,
+    pub command: Command,
+}
+
+#[derive(Clone, Copy, Serialize, Deserialize, PartialEq, Eq, Hash)]
+pub enum Command {
+    OpenRom,
+    Quit,
+    FrameAdvance,
+    FastForward(u32),
+    Reset,
+    PauseResume,
+    Screenshot,
+    // if you update this, update Command::all and add a default
+}
+
+impl Command {
+    pub fn all() -> [Self; 7] {
+        [
+            Self::OpenRom,
+            Self::Quit,
+            Self::PauseResume,
+            Self::Reset,
+            Self::FrameAdvance,
+            Self::FastForward(0),
+            Self::Screenshot,
+        ]
+    }
+
+    pub fn name(self) -> &'static str {
+        match self {
+            Self::OpenRom => "Open ROM",
+            Self::Quit => "Exit",
+            Self::PauseResume => "Pause/Resume",
+            Self::Reset => "Reset",
+            Self::FrameAdvance => "Frame Advance",
+            Self::FastForward(_) => "Fast Forward",
+            Self::Screenshot => "Screenshot",
+        }
+    }
+}
+
+impl Display for Command {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        f.write_str(self.name())
+    }
+}
+
+struct Shortcuts {
+    all: Vec<(Command, KeyboardShortcut)>,
+    by_command: HashMap<Command, KeyboardShortcut>,
+}
+
+impl Default for Shortcuts {
+    fn default() -> Self {
+        let mut shortcuts = Shortcuts {
+            all: vec![],
+            by_command: HashMap::new(),
+        };
+        shortcuts.set(
+            Command::OpenRom,
+            KeyboardShortcut::new(Modifiers::COMMAND, Key::O),
+        );
+        shortcuts.set(
+            Command::Quit,
+            KeyboardShortcut::new(Modifiers::COMMAND, Key::Q),
+        );
+        shortcuts.set(
+            Command::PauseResume,
+            KeyboardShortcut::new(Modifiers::NONE, Key::F5),
+        );
+        shortcuts.set(
+            Command::Reset,
+            KeyboardShortcut::new(Modifiers::SHIFT, Key::F5),
+        );
+        shortcuts.set(
+            Command::FrameAdvance,
+            KeyboardShortcut::new(Modifiers::NONE, Key::F6),
+        );
+        shortcuts.set(
+            Command::FastForward(0),
+            KeyboardShortcut::new(Modifiers::NONE, Key::Space),
+        );
+        shortcuts.set(
+            Command::Screenshot,
+            KeyboardShortcut::new(Modifiers::NONE, Key::F12),
+        );
+        shortcuts
+    }
+}
+
+impl Shortcuts {
+    fn set(&mut self, command: Command, shortcut: KeyboardShortcut) {
+        if self.by_command.insert(command, shortcut).is_some() {
+            for (cmd, sht) in &mut self.all {
+                if *cmd == command {
+                    *sht = shortcut;
+                    break;
+                }
+            }
+        } else {
+            self.all.push((command, shortcut));
+        }
+        self.all.sort_by(|l, r| order_shortcut(l.1, r.1));
+    }
+
+    fn unset(&mut self, command: Command) {
+        if self.by_command.remove(&command).is_some() {
+            self.all.retain(|(c, _)| *c != command);
+        }
+    }
+
+    fn save(&self, saved: &mut PersistedSettings) {
+        for command in Command::all() {
+            let shortcut = self.by_command.get(&command).copied();
+            saved.shortcuts.push((command, shortcut));
+        }
+    }
+}
+
+fn order_shortcut(left: KeyboardShortcut, right: KeyboardShortcut) -> Ordering {
+    left.logical_key.cmp(&right.logical_key).then_with(|| {
+        specificity(left.modifiers)
+            .cmp(&specificity(right.modifiers))
+            .reverse()
+    })
+}
+
+fn specificity(modifiers: egui::Modifiers) -> usize {
+    let mut mods = 0;
+    if modifiers.alt {
+        mods += 1;
+    }
+    if modifiers.command || modifiers.ctrl {
+        mods += 1;
+    }
+    if modifiers.shift {
+        mods += 1;
+    }
+    mods
+}
+
+#[derive(Serialize, Deserialize, Default)]
+struct PersistedSettings {
+    shortcuts: Vec<(Command, Option<KeyboardShortcut>)>,
+    #[serde(default)]
+    ff_settings: FastForwardSettings,
+}
+
+#[derive(Default, Clone)]
+struct ShortcutState {
+    ff_toggled: bool,
+}
+
+#[derive(Default)]
+struct Settings {
+    shortcuts: Shortcuts,
+    ff_settings: FastForwardSettings,
+    state: ShortcutState,
+}
+
+impl Settings {
+    fn save(&self) -> PersistedSettings {
+        let mut saved = PersistedSettings {
+            shortcuts: vec![],
+            ff_settings: self.ff_settings.clone(),
+        };
+        self.shortcuts.save(&mut saved);
+        saved
+    }
+}
+
+#[derive(Clone)]
+pub struct ShortcutProvider {
+    persistence: Persistence,
+    settings: Arc<Mutex<Settings>>,
+}
+
+impl ShortcutProvider {
+    pub fn new(persistence: Persistence) -> Self {
+        let mut settings = Settings::default();
+        if let Ok(saved) = persistence.load_config::<PersistedSettings>("shortcuts") {
+            for (command, shortcut) in saved.shortcuts {
+                if let Some(shortcut) = shortcut {
+                    settings.shortcuts.set(command, shortcut);
+                } else {
+                    settings.shortcuts.unset(command);
+                }
+            }
+            settings.ff_settings = saved.ff_settings;
+        };
+        Self {
+            persistence,
+            settings: Arc::new(Mutex::new(settings)),
+        }
+    }
+
+    pub fn shortcut_for(&self, command: Command) -> Option<KeyboardShortcut> {
+        let lock = self.settings.lock().unwrap();
+        lock.shortcuts.by_command.get(&command).copied()
+    }
+
+    pub fn ff_settings(&self) -> FastForwardSettings {
+        let lock = self.settings.lock().unwrap();
+        lock.ff_settings.clone()
+    }
+
+    pub fn consume_all(&self, input: &mut egui::InputState) -> Vec<Command> {
+        let mut lock = self.settings.lock().unwrap();
+        let mut state = lock.state.clone();
+        let mut consumed = vec![];
+        for (command, shortcut) in &lock.shortcuts.all {
+            input.events.retain(|event| {
+                let Event::Key {
+                    key,
+                    pressed,
+                    repeat,
+                    modifiers,
+                    ..
+                } = event
+                else {
+                    return true;
+                };
+                if shortcut.logical_key != *key || !shortcut.modifiers.contains(*modifiers) {
+                    return true;
+                }
+                if matches!(command, Command::FastForward(_)) {
+                    if *repeat {
+                        return true;
+                    }
+                    let sped_up = if lock.ff_settings.toggle {
+                        if !*pressed {
+                            return true;
+                        }
+                        state.ff_toggled = !state.ff_toggled;
+                        state.ff_toggled
+                    } else {
+                        *pressed
+                    };
+                    let speed = if sped_up { lock.ff_settings.speed } else { 1 };
+                    consumed.push(Command::FastForward(speed));
+                    false
+                } else {
+                    if !*pressed {
+                        return true;
+                    }
+                    consumed.push(*command);
+                    false
+                }
+            });
+        }
+        lock.state = state;
+        consumed
+    }
+
+    pub fn set(&self, command: Command, shortcut: KeyboardShortcut) {
+        let updated = {
+            let mut lock = self.settings.lock().unwrap();
+            lock.shortcuts.set(command, shortcut);
+            lock.save()
+        };
+        let _ = self.persistence.save_config("shortcuts", &updated);
+    }
+
+    pub fn unset(&self, command: Command) {
+        let updated = {
+            let mut lock = self.settings.lock().unwrap();
+            lock.shortcuts.unset(command);
+            lock.save()
+        };
+        let _ = self.persistence.save_config("shortcuts", &updated);
+    }
+
+    pub fn update_ff_settings(&self, ff_settings: FastForwardSettings) {
+        let updated = {
+            let mut lock = self.settings.lock().unwrap();
+            lock.ff_settings = ff_settings;
+            if !lock.ff_settings.toggle {
+                lock.state.ff_toggled = false;
+            }
+            lock.save()
+        };
+        let _ = self.persistence.save_config("shortcuts", &updated);
+    }
+
+    pub fn reset(&self) {
+        let updated = {
+            let mut lock = self.settings.lock().unwrap();
+            *lock = Settings::default();
+            lock.save()
+        };
+        let _ = self.persistence.save_config("shortcuts", &updated);
+    }
+}
+
+#[derive(Serialize, Deserialize, Clone)]
+pub struct FastForwardSettings {
+    pub toggle: bool,
+    pub speed: u32,
+}
+
+impl Default for FastForwardSettings {
+    fn default() -> Self {
+        Self {
+            toggle: false,
+            speed: 10,
+        }
+    }
+}

src/main.rs

@@ -3,13 +3,13 @@
 
 use std::{path::PathBuf, process, time::SystemTime};
 
-use anyhow::{bail, Result};
+use anyhow::{Result, bail};
 use app::Application;
 use clap::Parser;
 use emulator::EmulatorBuilder;
 use thread_priority::{ThreadBuilder, ThreadPriority};
 use tracing::error;
-use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt, EnvFilter, Layer};
+use tracing_subscriber::{EnvFilter, Layer, layer::SubscriberExt, util::SubscriberInitExt};
 use winit::event_loop::{ControlFlow, EventLoop};
 
 mod app;
@@ -44,9 +44,9 @@ fn set_panic_handler() {
     std::panic::set_hook(Box::new(|info| {
         let mut message = String::new();
         if let Some(msg) = info.payload().downcast_ref::<&str>() {
-            message += &format!("{}\n", msg);
+            message += &format!("{msg}\n");
         } else if let Some(msg) = info.payload().downcast_ref::<String>() {
-            message += &format!("{}\n", msg);
+            message += &format!("{msg}\n");
         }
         if let Some(location) = info.location() {
             message += &format!(
@@ -56,9 +56,9 @@ fn set_panic_handler() {
             );
         }
         let backtrace = std::backtrace::Backtrace::force_capture();
-        message += &format!("stack trace:\n{:#}\n", backtrace);
+        message += &format!("stack trace:\n{backtrace:#}\n");
 
-        eprint!("{}", message);
+        eprint!("{message}");
 
         let Some(project_dirs) = directories::ProjectDirs::from("com", "virtual-boy", "Lemur")
         else {
@@ -72,7 +72,7 @@ fn set_panic_handler() {
             .duration_since(SystemTime::UNIX_EPOCH)
             .unwrap()
             .as_millis();
-        let logfile_name = format!("crash-{}.txt", timestamp);
+        let logfile_name = format!("crash-{timestamp}.txt");
         let _ = std::fs::write(data_dir.join(logfile_name), message);
     }));
 }

src/memory.rs

@@ -2,7 +2,7 @@ use std::{
     collections::HashMap,
     fmt::Debug,
     iter::FusedIterator,
-    sync::{atomic::AtomicU64, Arc, Mutex, RwLock, RwLockReadGuard, TryLockError, Weak},
+    sync::{Arc, Mutex, RwLock, RwLockReadGuard, TryLockError, Weak, atomic::AtomicU64},
 };
 
 use bytemuck::BoxBytes;
@@ -169,7 +169,7 @@ impl MemoryRef<'_> {
         T::from_bytes(&self.inner[from..to])
     }
 
-    pub fn range<T: MemoryValue>(&self, start: usize, count: usize) -> MemoryIter<T> {
+    pub fn range<T: MemoryValue>(&self, start: usize, count: usize) -> MemoryIter<'_, T> {
         let from = start * size_of::<T>();
         let to = from + (count * size_of::<T>());
         MemoryIter::new(&self.inner[from..to])
@@ -223,7 +223,7 @@ impl MemoryRegion {
                 .iter()
                 .map(|i| i.load(std::sync::atomic::Ordering::Acquire))
                 .enumerate()
-                .max_by_key(|(_, gen)| *gen)
+                .max_by_key(|(_, g)| *g)
                 .map(|(i, _)| i)
                 .unwrap();
             let inner = match self.bufs[newest_index].try_read() {

src/persistence.rs

@@ -1,6 +1,6 @@
 use std::{fs, path::PathBuf};
 
-use anyhow::{bail, Result};
+use anyhow::{Result, bail};
 use directories::ProjectDirs;
 use serde::{Deserialize, Serialize};
 

src/window.rs

@@ -2,7 +2,9 @@ pub use about::AboutWindow;
 use egui::{Context, ViewportBuilder, ViewportId};
 pub use game::GameWindow;
 pub use gdb::GdbServerWindow;
+pub use hotkeys::HotkeysWindow;
 pub use input::InputWindow;
+pub use terminal::TerminalWindow;
 pub use vip::{
     BgMapWindow, CharacterDataWindow, FrameBufferWindow, ObjectWindow, RegisterWindow, WorldWindow,
 };
@@ -14,7 +16,9 @@ mod about;
 mod game;
 mod game_screen;
 mod gdb;
+mod hotkeys;
 mod input;
+mod terminal;
 mod utils;
 mod vip;
 

src/window/game.rs

@@ -1,22 +1,24 @@
-use std::sync::mpsc;
+use std::{sync::mpsc, time::Duration};
 
 use crate::{
     app::UserEvent,
     emulator::{EmulatorClient, EmulatorCommand, EmulatorState, SimId, SimState},
+    input::{Command, ShortcutProvider},
     persistence::Persistence,
 };
+use anyhow::Context as _;
 use egui::{
-    menu, Align2, Button, CentralPanel, Color32, Context, Direction, Frame, TopBottomPanel, Ui,
-    Vec2, ViewportBuilder, ViewportCommand, ViewportId, Window,
+    Align2, Button, CentralPanel, Color32, Context, Frame, MenuBar, TopBottomPanel, Ui, Vec2,
+    ViewportBuilder, ViewportCommand, ViewportId, Window,
 };
-use egui_toast::{Toast, Toasts};
+use egui_notify::{Anchor, Toast, Toasts};
 use serde::{Deserialize, Serialize};
 use winit::event_loop::EventLoopProxy;
 
 use super::{
+    AppWindow,
     game_screen::{DisplayMode, GameScreen},
     utils::UiExt as _,
-    AppWindow,
 };
 
 const COLOR_PRESETS: [[Color32; 2]; 3] = [
@@ -38,8 +40,10 @@ pub struct GameWindow {
     client: EmulatorClient,
     proxy: EventLoopProxy<UserEvent>,
     persistence: Persistence,
+    shortcuts: ShortcutProvider,
     sim_id: SimId,
     config: GameConfig,
+    toasts: Toasts,
     screen: Option<GameScreen>,
     messages: Option<mpsc::Receiver<Toast>>,
     color_picker: Option<ColorPickerState>,
@@ -50,15 +54,22 @@ impl GameWindow {
         client: EmulatorClient,
         proxy: EventLoopProxy<UserEvent>,
         persistence: Persistence,
+        shortcuts: ShortcutProvider,
         sim_id: SimId,
     ) -> Self {
         let config = load_config(&persistence, sim_id);
+        let toasts = Toasts::new()
+            .with_anchor(Anchor::BottomLeft)
+            .with_margin((10.0, 10.0).into())
+            .reverse(true);
         Self {
             client,
             proxy,
             persistence,
+            shortcuts,
             sim_id,
             config,
+            toasts,
             screen: None,
             messages: None,
             color_picker: None,
@@ -66,8 +77,15 @@ impl GameWindow {
     }
 
     fn show_menu(&mut self, ctx: &Context, ui: &mut Ui) {
-        ui.menu_button("ROM", |ui| {
-            if ui.button("Open ROM").clicked() {
+        let state = self.client.emulator_state();
+        let is_ready = self.client.sim_state(self.sim_id) == SimState::Ready;
+        let can_pause = is_ready && state == EmulatorState::Running;
+        let can_resume = is_ready && state == EmulatorState::Paused;
+        let can_frame_advance = is_ready && state != EmulatorState::Debugging;
+
+        for command in ui.input_mut(|input| self.shortcuts.consume_all(input)) {
+            match command {
+                Command::OpenRom => {
                     let rom = rfd::FileDialog::new()
                         .add_filter("Virtual Boy ROMs", &["vb", "vbrom"])
                         .pick_file();
@@ -75,30 +93,112 @@ impl GameWindow {
                         self.client
                             .send_command(EmulatorCommand::LoadGame(self.sim_id, path));
                     }
-                ui.close_menu();
                 }
-            if ui.button("Quit").clicked() {
+                Command::Quit => {
+                    let _ = self.proxy.send_event(UserEvent::Quit(self.sim_id));
+                }
+                Command::PauseResume => {
+                    if state == EmulatorState::Paused && can_resume {
+                        self.client.send_command(EmulatorCommand::Resume);
+                    }
+                    if state == EmulatorState::Running && can_pause {
+                        self.client.send_command(EmulatorCommand::Pause);
+                    }
+                }
+                Command::Reset => {
+                    if is_ready {
+                        self.client
+                            .send_command(EmulatorCommand::Reset(self.sim_id));
+                    }
+                }
+                Command::FrameAdvance => {
+                    if can_frame_advance {
+                        self.client.send_command(EmulatorCommand::FrameAdvance);
+                    }
+                }
+                Command::FastForward(speed) => {
+                    self.client
+                        .send_command(EmulatorCommand::SetSpeed(speed as f64));
+                }
+                Command::Screenshot => {
+                    let autopause = state == EmulatorState::Running && can_pause;
+                    if autopause {
+                        self.client.send_command(EmulatorCommand::Pause);
+                    }
+                    pollster::block_on(self.take_screenshot());
+                    if autopause {
+                        self.client.send_command(EmulatorCommand::Resume);
+                    }
+                }
+            }
+        }
+
+        ui.menu_button("ROM", |ui| {
+            if ui
+                .add(self.button_for(ui.ctx(), "Open ROM", Command::OpenRom))
+                .clicked()
+            {
+                let rom = rfd::FileDialog::new()
+                    .add_filter("Virtual Boy ROMs", &["vb", "vbrom"])
+                    .pick_file();
+                if let Some(path) = rom {
+                    self.client
+                        .send_command(EmulatorCommand::LoadGame(self.sim_id, path));
+                }
+            }
+            if ui
+                .add(self.button_for(ui.ctx(), "Quit", Command::Quit))
+                .clicked()
+            {
                 let _ = self.proxy.send_event(UserEvent::Quit(self.sim_id));
             }
         });
         ui.menu_button("Emulation", |ui| {
-            let state = self.client.emulator_state();
-            let is_ready = self.client.sim_state(self.sim_id) == SimState::Ready;
-            let can_pause = is_ready && state == EmulatorState::Running;
-            let can_resume = is_ready && state == EmulatorState::Paused;
             if state == EmulatorState::Running {
-                if ui.add_enabled(can_pause, Button::new("Pause")).clicked() {
+                if ui
+                    .add_enabled(
+                        can_pause,
+                        self.button_for(ui.ctx(), "Pause", Command::PauseResume),
+                    )
+                    .clicked()
+                {
                     self.client.send_command(EmulatorCommand::Pause);
-                    ui.close_menu();
                 }
-            } else if ui.add_enabled(can_resume, Button::new("Resume")).clicked() {
+            } else if ui
+                .add_enabled(
+                    can_resume,
+                    self.button_for(ui.ctx(), "Resume", Command::PauseResume),
+                )
+                .clicked()
+            {
                 self.client.send_command(EmulatorCommand::Resume);
-                ui.close_menu();
             }
-            if ui.add_enabled(is_ready, Button::new("Reset")).clicked() {
+            if ui
+                .add_enabled(is_ready, self.button_for(ui.ctx(), "Reset", Command::Reset))
+                .clicked()
+            {
                 self.client
                     .send_command(EmulatorCommand::Reset(self.sim_id));
-                ui.close_menu();
+            }
+            ui.separator();
+            if ui
+                .add_enabled(
+                    can_frame_advance,
+                    self.button_for(ui.ctx(), "Frame Advance", Command::FrameAdvance),
+                )
+                .clicked()
+            {
+                self.client.send_command(EmulatorCommand::FrameAdvance);
+            }
+            ui.separator();
+            if ui
+                .add_enabled(
+                    is_ready,
+                    self.button_for(ui.ctx(), "Screenshot", Command::Screenshot),
+                )
+                .clicked()
+            {
+                pollster::block_on(self.take_screenshot());
             }
         });
         ui.menu_button("Options", |ui| self.show_options_menu(ctx, ui));
@@ -111,73 +211,108 @@ impl GameWindow {
                 self.client
                     .send_command(EmulatorCommand::StartSecondSim(None));
                 self.proxy.send_event(UserEvent::OpenPlayer2).unwrap();
-                ui.close_menu();
             }
             if has_player_2 {
                 let linked = self.client.are_sims_linked();
                 if linked && ui.button("Unlink").clicked() {
                     self.client.send_command(EmulatorCommand::Unlink);
-                    ui.close_menu();
                 }
                 if !linked && ui.button("Link").clicked() {
                     self.client.send_command(EmulatorCommand::Link);
-                    ui.close_menu();
                 }
             }
         });
         ui.menu_button("Tools", |ui| {
+            if ui.button("Terminal").clicked() {
+                self.proxy
+                    .send_event(UserEvent::OpenTerminal(self.sim_id))
+                    .unwrap();
+            }
             if ui.button("GDB Server").clicked() {
                 self.proxy
                     .send_event(UserEvent::OpenDebugger(self.sim_id))
                     .unwrap();
-                ui.close_menu();
             }
             ui.separator();
             if ui.button("Character Data").clicked() {
                 self.proxy
                     .send_event(UserEvent::OpenCharacterData(self.sim_id))
                     .unwrap();
-                ui.close_menu();
             }
             if ui.button("Background Maps").clicked() {
                 self.proxy
                     .send_event(UserEvent::OpenBgMap(self.sim_id))
                     .unwrap();
-                ui.close_menu();
             }
             if ui.button("Objects").clicked() {
                 self.proxy
                     .send_event(UserEvent::OpenObjects(self.sim_id))
                     .unwrap();
-                ui.close_menu();
             }
             if ui.button("Worlds").clicked() {
                 self.proxy
                     .send_event(UserEvent::OpenWorlds(self.sim_id))
                     .unwrap();
-                ui.close_menu();
             }
             if ui.button("Frame Buffers").clicked() {
                 self.proxy
                     .send_event(UserEvent::OpenFrameBuffers(self.sim_id))
                     .unwrap();
-                ui.close_menu();
             }
             if ui.button("Registers").clicked() {
                 self.proxy
                     .send_event(UserEvent::OpenRegisters(self.sim_id))
                     .unwrap();
-                ui.close_menu();
             }
         });
         ui.menu_button("Help", |ui| {
             if ui.button("About").clicked() {
                 self.proxy.send_event(UserEvent::OpenAbout).unwrap();
-                ui.close_menu();
             }
         });
     }
 
+    async fn take_screenshot(&mut self) {
+        match self.try_take_screenshot().await {
+            Ok(Some(path)) => {
+                let mut toast = Toast::info(format!("Saved to {path}"));
+                toast.duration(Some(Duration::from_secs(5)));
+                self.toasts.add(toast);
+            }
+            Ok(None) => {}
+            Err(error) => {
+                let mut toast = Toast::error(format!("{error:#}"));
+                toast.duration(Some(Duration::from_secs(5)));
+                self.toasts.add(toast);
+            }
+        }
+    }
+
+    async fn try_take_screenshot(&self) -> anyhow::Result<Option<String>> {
+        let (tx, rx) = oneshot::channel();
+        self.client
+            .send_command(EmulatorCommand::Screenshot(self.sim_id, tx));
+        let bytes = rx.await.context("Could not take screenshot")?;
+        let file = rfd::FileDialog::new()
+            .add_filter("PNG images", &["png"])
+            .set_file_name("screenshot.png")
+            .save_file();
+        let Some(path) = file else {
+            return Ok(None);
+        };
+        if bytes.len() != 384 * 224 * 2 {
+            anyhow::bail!("Unexpected screenshot size");
+        }
+        let mut screencap = image::GrayImage::new(384 * 2, 224);
+        for (index, pixel) in bytes.into_iter().enumerate() {
+            let x = (index / 2) % 384 + ((index % 2) * 384);
+            let y = (index / 2) / 384;
+            screencap.put_pixel(x as u32, y as u32, image::Luma([pixel]));
+        }
+        screencap.save(&path).context("Could not save screenshot")?;
+        Ok(Some(path.display().to_string()))
+    }
+
     fn show_options_menu(&mut self, ctx: &Context, ui: &mut Ui) {
         ui.menu_button("Video", |ui| {
             ui.menu_button("Screen Size", |ui| {
@@ -195,7 +330,6 @@ impl GameWindow {
                         .clicked()
                     {
                         ctx.send_viewport_cmd(ViewportCommand::InnerSize(dims));
-                        ui.close_menu();
                     }
                 }
             });
@@ -232,13 +366,11 @@ impl GameWindow {
                     c.display_mode = display_mode;
                     c.dimensions = current_dims * scale;
                 });
-                ui.close_menu();
             });
             ui.menu_button("Colors", |ui| {
                 for preset in COLOR_PRESETS {
                     if ui.color_pair_button(preset[0], preset[1]).clicked() {
                         self.update_config(|c| c.colors = preset);
-                        ui.close_menu();
                     }
                 }
                 ui.with_layout(ui.layout().with_cross_align(egui::Align::Center), |ui| {
@@ -259,7 +391,6 @@ impl GameWindow {
                             just_opened: true,
                             unpause_on_close: is_running,
                         });
-                        ui.close_menu();
                     }
                 });
             });
@@ -270,20 +401,20 @@ impl GameWindow {
             if ui.selectable_button(p1_enabled, "Player 1").clicked() {
                 self.client
                     .send_command(EmulatorCommand::SetAudioEnabled(!p1_enabled, p2_enabled));
-                ui.close_menu();
             }
             if ui.selectable_button(p2_enabled, "Player 2").clicked() {
                 self.client
                     .send_command(EmulatorCommand::SetAudioEnabled(p1_enabled, !p2_enabled));
-                ui.close_menu();
             }
         });
         ui.menu_button("Input", |ui| {
             if ui.button("Bind Inputs").clicked() {
                 self.proxy.send_event(UserEvent::OpenInput).unwrap();
-                ui.close_menu();
             }
         });
+        if ui.button("Hotkeys").clicked() {
+            self.proxy.send_event(UserEvent::OpenHotkeys).unwrap();
+        }
     }
 
     fn show_color_picker(&mut self, ui: &mut Ui) {
@@ -325,6 +456,14 @@ impl GameWindow {
         }
         self.config = new_config;
     }
+
+    fn button_for(&self, ctx: &Context, text: &str, command: Command) -> Button<'_> {
+        let button = Button::new(text);
+        match self.shortcuts.shortcut_for(command) {
+            Some(shortcut) => button.shortcut_text(ctx.format_shortcut(&shortcut)),
+            None => button,
+        }
+    }
 }
 
 fn config_filename(sim_id: SimId) -> &'static str {
@@ -370,18 +509,15 @@ impl AppWindow for GameWindow {
         };
         self.update_config(|c| c.dimensions = dimensions);
 
-        let mut toasts = Toasts::new()
-            .anchor(Align2::LEFT_BOTTOM, (10.0, 10.0))
-            .direction(Direction::BottomUp);
         if let Some(messages) = self.messages.as_mut() {
             while let Ok(toast) = messages.try_recv() {
-                toasts.add(toast);
+                self.toasts.add(toast);
             }
         }
         TopBottomPanel::top("menubar")
             .exact_height(22.0)
             .show(ctx, |ui| {
-                menu::bar(ui, |ui| {
+                MenuBar::new().ui(ui, |ui| {
                     self.show_menu(ctx, ui);
                 });
             });
@@ -401,7 +537,7 @@ impl AppWindow for GameWindow {
                 ui.add(screen);
             }
         });
-        toasts.show(ctx);
+        self.toasts.show(ctx);
     }
 
     fn on_init(&mut self, _ctx: &Context, render_state: &egui_wgpu::RenderState) {

src/window/game_screen.rs

@@ -2,7 +2,7 @@ use std::{collections::HashMap, sync::Arc};
 
 use egui::{Color32, Rgba, Vec2, Widget};
 use serde::{Deserialize, Serialize};
-use wgpu::{util::DeviceExt as _, BindGroup, BindGroupLayout, Buffer, RenderPipeline};
+use wgpu::{BindGroup, BindGroupLayout, Buffer, RenderPipeline, util::DeviceExt as _};
 
 use crate::graphics::TextureSink;
 
@@ -71,7 +71,7 @@ impl GameScreen {
                     module: &shader,
                     entry_point: Some(entry_point),
                     targets: &[Some(wgpu::ColorTargetState {
-                        format: wgpu::TextureFormat::Bgra8Unorm,
+                        format: render_state.target_format,
                         blend: Some(wgpu::BlendState::REPLACE),
                         write_mask: wgpu::ColorWrites::ALL,
                     })],

src/window/hotkeys.rs

@@ -0,0 +1,150 @@
+use egui::{
+    Button, CentralPanel, Context, Event, KeyboardShortcut, Label, Layout, Slider, Ui,
+    ViewportBuilder, ViewportId,
+};
+use egui_extras::{Column, TableBuilder};
+
+use crate::input::{Command, ShortcutProvider};
+
+use super::{AppWindow, utils::UiExt};
+
+pub struct HotkeysWindow {
+    shortcuts: ShortcutProvider,
+    now_binding: Option<Command>,
+}
+
+impl HotkeysWindow {
+    pub fn new(shortcuts: ShortcutProvider) -> Self {
+        Self {
+            shortcuts,
+            now_binding: None,
+        }
+    }
+
+    fn show_shortcuts(&mut self, ui: &mut Ui) {
+        let row_height = ui.spacing().interact_size.y;
+        ui.section("Shortcuts", |ui| {
+            let width = ui.available_width() - 16.0;
+            TableBuilder::new(ui)
+                .column(Column::exact(width * 0.3))
+                .column(Column::exact(width * 0.5))
+                .column(Column::exact(width * 0.2))
+                .cell_layout(Layout::left_to_right(egui::Align::Center))
+                .body(|mut body| {
+                    for command in Command::all() {
+                        body.row(row_height, |mut row| {
+                            row.col(|ui| {
+                                ui.add_sized(ui.available_size(), Label::new(command.name()));
+                            });
+                            row.col(|ui| {
+                                let button = if self.now_binding == Some(command) {
+                                    Button::new("Binding...")
+                                } else if let Some(shortcut) = self.shortcuts.shortcut_for(command)
+                                {
+                                    Button::new(ui.ctx().format_shortcut(&shortcut))
+                                } else {
+                                    Button::new("")
+                                };
+                                if ui.add_sized(ui.available_size(), button).clicked() {
+                                    self.now_binding = Some(command);
+                                }
+                            });
+                            row.col(|ui| {
+                                if ui
+                                    .add_sized(ui.available_size(), Button::new("Clear"))
+                                    .clicked()
+                                {
+                                    self.shortcuts.unset(command);
+                                    self.now_binding = None;
+                                }
+                            });
+                        });
+                    }
+                });
+        });
+        if let Some(command) = self.now_binding
+            && let Some(shortcut) = ui.input_mut(|i| {
+                i.events.iter().find_map(|event| match event {
+                    Event::Key {
+                        key,
+                        pressed: true,
+                        modifiers,
+                        ..
+                    } => Some(KeyboardShortcut::new(*modifiers, *key)),
+                    _ => None,
+                })
+            })
+        {
+            self.shortcuts.set(command, shortcut);
+            self.now_binding = None;
+        }
+    }
+
+    fn show_ff_settings(&mut self, ui: &mut Ui) {
+        let row_height = ui.spacing().interact_size.y;
+        ui.section("Fast Forward", |ui| {
+            let width = ui.available_width() - 8.0;
+            let mut ff_settings = self.shortcuts.ff_settings();
+            let mut updated = false;
+            TableBuilder::new(ui)
+                .column(Column::exact(width * 0.5))
+                .column(Column::exact(width * 0.5))
+                .body(|mut body| {
+                    body.row(row_height, |mut row| {
+                        row.col(|ui| {
+                            ui.label("Treat button as toggle");
+                        });
+                        row.col(|ui| {
+                            if ui.checkbox(&mut ff_settings.toggle, "").changed() {
+                                updated = true;
+                            }
+                        });
+                    });
+                    body.row(row_height, |mut row| {
+                        row.col(|ui| {
+                            ui.label("Speed multiplier");
+                        });
+                        row.col(|ui| {
+                            if ui
+                                .add_sized(
+                                    ui.available_size(),
+                                    Slider::new(&mut ff_settings.speed, 1..=15),
+                                )
+                                .changed()
+                            {
+                                updated = true;
+                            }
+                        });
+                    });
+                });
+            if updated {
+                self.shortcuts.update_ff_settings(ff_settings);
+            }
+        });
+    }
+}
+
+impl AppWindow for HotkeysWindow {
+    fn viewport_id(&self) -> ViewportId {
+        ViewportId::from_hash_of("shortcuts")
+    }
+
+    fn initial_viewport(&self) -> ViewportBuilder {
+        ViewportBuilder::default()
+            .with_title("Keyboard Shortcuts")
+            .with_inner_size((400.0, 400.0))
+    }
+
+    fn show(&mut self, ctx: &Context) {
+        CentralPanel::default().show(ctx, |ui| {
+            ui.horizontal(|ui| {
+                if ui.button("Use defaults").clicked() {
+                    self.shortcuts.reset();
+                }
+            });
+            ui.separator();
+            self.show_shortcuts(ui);
+            self.show_ff_settings(ui);
+        });
+    }
+}

src/window/terminal.rs

@@ -0,0 +1,79 @@
+use std::{collections::VecDeque, sync::mpsc};
+
+use egui::{
+    Align, CentralPanel, Context, FontFamily, Label, RichText, ScrollArea, ViewportBuilder,
+    ViewportId,
+};
+
+use crate::emulator::{EmulatorClient, EmulatorCommand, SimId};
+
+use super::AppWindow;
+
+const SCROLLBACK: usize = 1000;
+
+pub struct TerminalWindow {
+    sim_id: SimId,
+    receiver: mpsc::Receiver<String>,
+    lines: VecDeque<String>,
+}
+
+impl TerminalWindow {
+    pub fn new(sim_id: SimId, client: &EmulatorClient) -> Self {
+        let (sender, receiver) = mpsc::channel();
+        client.send_command(EmulatorCommand::WatchStdout(sim_id, sender));
+        let mut lines = VecDeque::new();
+        lines.push_back(String::new());
+        Self {
+            sim_id,
+            receiver,
+            lines,
+        }
+    }
+}
+
+impl AppWindow for TerminalWindow {
+    fn viewport_id(&self) -> ViewportId {
+        ViewportId::from_hash_of(format!("terminal-{}", self.sim_id))
+    }
+
+    fn sim_id(&self) -> SimId {
+        self.sim_id
+    }
+
+    fn initial_viewport(&self) -> ViewportBuilder {
+        ViewportBuilder::default()
+            .with_title(format!("Terminal ({})", self.sim_id))
+            .with_inner_size((640.0, 480.0))
+    }
+
+    fn show(&mut self, ctx: &Context) {
+        if let Ok(text) = self.receiver.try_recv() {
+            let mut rest = text.as_str();
+            while let Some(index) = rest.find('\n') {
+                let (line, lines) = rest.split_at(index);
+                let current = self.lines.back_mut().unwrap();
+                current.push_str(line);
+                self.lines.push_back(String::new());
+                if self.lines.len() > SCROLLBACK {
+                    self.lines.pop_front();
+                }
+                rest = &lines[1..];
+            }
+            self.lines.back_mut().unwrap().push_str(rest);
+        }
+        CentralPanel::default().show(ctx, |ui| {
+            ScrollArea::vertical()
+                .stick_to_bottom(true)
+                .auto_shrink([false, false])
+                .animated(false)
+                .show(ui, |ui| {
+                    for line in &self.lines {
+                        let label = Label::new(RichText::new(line).family(FontFamily::Monospace))
+                            .halign(Align::LEFT)
+                            .wrap();
+                        ui.add(label);
+                    }
+                });
+        });
+    }
+}

src/window/utils.rs

@@ -6,9 +6,9 @@ use std::{
 
 use atoi::FromRadix16;
 use egui::{
-    ecolor::HexColor, Align, Color32, CursorIcon, Event, Frame, Key, Layout, Margin, Rect,
-    Response, RichText, Rounding, Sense, Shape, Stroke, TextEdit, Ui, UiBuilder, Vec2, Widget,
-    WidgetText,
+    Align, Color32, CornerRadius, CursorIcon, Event, Frame, Key, Layout, Margin, Rect, Response,
+    RichText, Sense, Shape, Stroke, StrokeKind, TextEdit, Ui, UiBuilder, Vec2, Widget, WidgetText,
+    ecolor::HexColor,
 };
 use num_traits::{CheckedAdd, CheckedSub, One};
 
@@ -37,8 +37,8 @@ impl UiExt for Ui {
     fn section(&mut self, title: impl Into<String>, add_contents: impl FnOnce(&mut Ui)) {
         let title: String = title.into();
         let mut frame = Frame::group(self.style());
-        frame.outer_margin.top += 10.0;
-        frame.inner_margin.top += 2.0;
+        frame.outer_margin.top += 10;
+        frame.inner_margin.top += 2;
         let res = self.push_id(&title, |ui| {
             frame.show(ui, |ui| {
                 ui.set_max_width(ui.available_width());
@@ -49,7 +49,7 @@ impl UiExt for Ui {
         let old_rect = res.response.rect;
         let mut text_rect = old_rect;
         text_rect.min.x += 6.0;
-        self.allocate_new_ui(UiBuilder::new().max_rect(text_rect), |ui| ui.label(text));
+        self.scope_builder(UiBuilder::new().max_rect(text_rect), |ui| ui.label(text));
         if old_rect.width() > 0.0 {
             self.advance_cursor_after_rect(old_rect);
         }
@@ -73,7 +73,8 @@ impl UiExt for Ui {
         self.painter().rect_filled(right_rect, 0.0, right);
 
         let style = self.style().interact(&response);
-        self.painter().rect_stroke(rect, 0.0, style.fg_stroke);
+        self.painter()
+            .rect_stroke(rect, 0.0, style.fg_stroke, StrokeKind::Inside);
         response
     }
 
@@ -85,11 +86,11 @@ impl UiExt for Ui {
                 let (rect, _) = ui.allocate_at_least(Vec2::new(100.0, 100.0), Sense::hover());
                 ui.painter().rect_filled(rect, 0.0, *color);
                 let resp = ui.text_edit_singleline(hex);
-                if resp.changed() {
-                    if let Ok(new_color) = HexColor::from_str_without_hash(hex) {
+                if resp.changed()
+                    && let Ok(new_color) = HexColor::from_str_without_hash(hex)
+                {
                     *color = new_color.color();
                 }
-                }
                 resp
             },
         )
@@ -132,7 +133,7 @@ impl<
         + Send
         + Sync
         + 'static,
-    > Number for T
+> Number for T
 {
 }
 
@@ -265,10 +266,10 @@ impl<T: Number> Widget for NumberEdit<'_, T> {
             .id(id)
             .desired_width(desired_width)
             .margin(Margin {
-                left: 4.0,
-                right: if self.arrows { 20.0 } else { 4.0 },
-                top: 2.0,
-                bottom: 2.0,
+                left: 4,
+                right: if self.arrows { 20 } else { 4 },
+                top: 2,
+                bottom: 2,
             });
         let mut res = if valid {
             ui.add(text)
@@ -300,11 +301,11 @@ impl<T: Number> Widget for NumberEdit<'_, T> {
 
         let mut delta = None;
         if self.arrows {
-            let arrow_left = res.rect.max.x + 4.0;
-            let arrow_right = res.rect.max.x + 20.0;
-            let arrow_top = res.rect.min.y - 2.0;
+            let arrow_left = res.rect.max.x - 16.0;
+            let arrow_right = res.rect.max.x;
+            let arrow_top = res.rect.min.y;
             let arrow_middle = (res.rect.min.y + res.rect.max.y) / 2.0;
-            let arrow_bottom = res.rect.max.y + 2.0;
+            let arrow_bottom = res.rect.max.y;
 
             let top_arrow_rect = Rect {
                 min: (arrow_left, arrow_top).into(),
@@ -337,7 +338,7 @@ impl<T: Number> Widget for NumberEdit<'_, T> {
             }
             str = to_string(self.value);
             stale = true;
-        } else if res.changed {
+        } else if res.changed() {
             if let Some(new_value) = from_string(&str).filter(in_range) {
                 if *self.value != new_value {
                     res.mark_changed();
@@ -355,27 +356,20 @@ impl<T: Number> Widget for NumberEdit<'_, T> {
 
 fn draw_arrow(ui: &mut Ui, rect: Rect, up: bool) -> Response {
     let arrow_res = ui
-        .allocate_rect(
-            rect,
-            Sense {
-                click: true,
-                drag: true,
-                focusable: false,
-            },
-        )
+        .allocate_rect(rect, Sense::all())
         .on_hover_cursor(CursorIcon::Default);
     let visuals = ui.style().visuals.widgets.style(&arrow_res);
     let painter = ui.painter_at(arrow_res.rect);
 
     let rounding = if up {
-        Rounding {
-            ne: 2.0,
-            ..Rounding::ZERO
+        CornerRadius {
+            ne: 2,
+            ..CornerRadius::ZERO
         }
     } else {
-        Rounding {
-            se: 2.0,
-            ..Rounding::ZERO
+        CornerRadius {
+            se: 2,
+            ..CornerRadius::ZERO
         }
     };
     painter.rect_filled(arrow_res.rect, rounding, visuals.bg_fill);

src/window/vip/bgmap.rs

@@ -11,8 +11,8 @@ use crate::{
     images::{ImageBuffer, ImageParams, ImageProcessor, ImageRenderer, ImageTextureLoader},
     memory::{MemoryClient, MemoryView},
     window::{
-        utils::{NumberEdit, UiExt},
         AppWindow,
+        utils::{NumberEdit, UiExt},
     },
 };
 

src/window/vip/chardata.rs

@@ -12,8 +12,8 @@ use crate::{
     images::{ImageBuffer, ImageParams, ImageProcessor, ImageRenderer, ImageTextureLoader},
     memory::{MemoryClient, MemoryView},
     window::{
-        utils::{NumberEdit, UiExt as _},
         AppWindow,
+        utils::{NumberEdit, UiExt as _},
     },
 };
 

src/window/vip/framebuffer.rs

@@ -11,8 +11,8 @@ use crate::{
     images::{ImageBuffer, ImageParams, ImageProcessor, ImageRenderer, ImageTextureLoader},
     memory::{MemoryClient, MemoryView},
     window::{
-        utils::{NumberEdit, UiExt as _},
         AppWindow,
+        utils::{NumberEdit, UiExt as _},
     },
 };
 
@@ -215,8 +215,8 @@ impl ImageRenderer<1> for FrameBufferRenderer {
     fn render(&mut self, params: &Self::Params, images: &mut [ImageBuffer; 1]) {
         let image = &mut images[0];
 
-        let left_buffer = self.buffers[params.index * 2].borrow();
-        let right_buffer = self.buffers[params.index * 2 + 1].borrow();
+        let left_buffer = self.buffers[params.index].borrow();
+        let right_buffer = self.buffers[2 + params.index].borrow();
 
         let colors = if params.generic_palette {
             [

src/window/vip/object.rs

@@ -11,8 +11,8 @@ use crate::{
     images::{ImageBuffer, ImageParams, ImageProcessor, ImageRenderer, ImageTextureLoader},
     memory::{MemoryClient, MemoryView},
     window::{
-        utils::{NumberEdit, UiExt as _},
         AppWindow,
+        utils::{NumberEdit, UiExt as _},
     },
 };
 

src/window/vip/registers.rs

@@ -10,8 +10,8 @@ use crate::{
     emulator::SimId,
     memory::{MemoryClient, MemoryRef, MemoryValue, MemoryView},
     window::{
-        utils::{NumberEdit, UiExt},
         AppWindow,
+        utils::{NumberEdit, UiExt},
     },
 };
 

src/window/vip/utils.rs

@@ -3,12 +3,12 @@ use egui::{Color32, Image, ImageSource, Response, Sense, TextureOptions, Ui, Wid
 pub const GENERIC_PALETTE: [u8; 4] = [0, 32, 64, 128];
 
 pub fn shade(brt: u8, color: Color32) -> Color32 {
-    let corrected = if brt & 0x80 != 0 {
-        255
+    let corrected = if brt > 132 {
+        255.0
     } else {
-        (brt << 1) | (brt >> 6)
+        (brt as f32 * 255.0 / 133.0).round()
     };
-    color.gamma_multiply(corrected as f32 / 255.0)
+    color.gamma_multiply(corrected / 255.0)
 }
 
 pub fn generic_palette(color: Color32) -> [Color32; 4] {
@@ -124,7 +124,7 @@ impl CellData {
     }
 
     pub fn update(&self, source: &mut u16) -> bool {
-        let new_value = (self.palette_index as u16) << 14
+        let new_value = ((self.palette_index as u16) << 14)
             | if self.hflip { 0x2000 } else { 0x0000 }
             | if self.vflip { 0x1000 } else { 0x0000 }
             | (self.char_index as u16 & 0x07ff)
@@ -222,12 +222,12 @@ impl Widget for CharacterGrid<'_> {
             for x in (1..grid_width_cells).map(|i| (i as f32) * cell_size) {
                 let p1 = (res.rect.min.x + x, res.rect.min.y).into();
                 let p2 = (res.rect.min.x + x, res.rect.max.y).into();
-                painter.line(vec![p1, p2], stroke);
+                painter.line_segment([p1, p2], stroke);
             }
             for y in (1..grid_height_cells).map(|i| (i as f32) * cell_size) {
                 let p1 = (res.rect.min.x, res.rect.min.y + y).into();
                 let p2 = (res.rect.max.x, res.rect.min.y + y).into();
-                painter.line(vec![p1, p2], stroke);
+                painter.line_segment([p1, p2], stroke);
             }
         }
         if let Some(selected) = self.selected {

src/window/vip/world.rs

@@ -6,8 +6,8 @@ use egui::{
 };
 use egui_extras::{Column, Size, StripBuilder, TableBuilder};
 use fixed::{
-    types::extra::{U3, U9},
     FixedI32,
+    types::extra::{U3, U9},
 };
 use num_derive::{FromPrimitive, ToPrimitive};
 use num_traits::{FromPrimitive, ToPrimitive};
@@ -17,12 +17,12 @@ use crate::{
     images::{ImageBuffer, ImageParams, ImageProcessor, ImageRenderer, ImageTextureLoader},
     memory::{MemoryClient, MemoryRef, MemoryView},
     window::{
-        utils::{NumberEdit, UiExt as _},
         AppWindow,
+        utils::{NumberEdit, UiExt as _},
     },
 };
 
-use super::utils::{self, shade, CellData, Object};
+use super::utils::{self, CellData, Object, shade};
 
 pub struct WorldWindow {
     sim_id: SimId,
@@ -33,6 +33,7 @@ pub struct WorldWindow {
     index: usize,
     param_index: usize,
     generic_palette: bool,
+    show_extents: bool,
     params: ImageParams<WorldParams>,
     scale: f32,
 }
@@ -57,6 +58,7 @@ impl WorldWindow {
             index: params.index,
             param_index: 0,
             generic_palette: params.generic_palette,
+            show_extents: false,
             params,
             scale: 1.0,
         }
@@ -413,6 +415,7 @@ impl WorldWindow {
                     ui.add(slider);
                 });
                 ui.checkbox(&mut self.generic_palette, "Generic palette");
+                ui.checkbox(&mut self.show_extents, "Show extents");
             });
         });
         self.params.write(WorldParams {
@@ -426,7 +429,82 @@ impl WorldWindow {
         let image = Image::new("vip://world")
             .fit_to_original_size(self.scale)
             .texture_options(TextureOptions::NEAREST);
-        ui.add(image);
+        let res = ui.add(image);
+        if self.show_extents {
+            let world = {
+                let worlds = self.worlds.borrow();
+                let data = worlds.read(self.index);
+                World::parse(&data)
+            };
+            if world.header.mode == WorldMode::Object {
+                return;
+            }
+
+            let lx1 = (world.dst_x - world.dst_parallax) as f32 * self.scale;
+            let lx2 = lx1 + world.width as f32 * self.scale;
+            let rx1 = (world.dst_x + world.dst_parallax) as f32 * self.scale;
+            let rx2 = rx1 + world.width as f32 * self.scale;
+            let y1 = world.dst_y as f32 * self.scale;
+            let y2 = y1 + world.height as f32 * self.scale;
+
+            let left_color = self.params.left_color;
+            let right_color = self.params.right_color;
+            let both_color = Color32::from_rgb(
+                left_color.r() + right_color.r(),
+                left_color.g() + right_color.g(),
+                left_color.b() + right_color.b(),
+            );
+
+            let painter = ui.painter();
+            let draw_rect = |x1: f32, x2: f32, color: Color32| {
+                painter.line(
+                    vec![
+                        res.rect.min + (x1, y1).into(),
+                        res.rect.min + (x2, y1).into(),
+                        res.rect.min + (x2, y2).into(),
+                        res.rect.min + (x1, y2).into(),
+                        res.rect.min + (x1, y1).into(),
+                    ],
+                    (2.0, color),
+                )
+            };
+
+            match (world.header.lon, world.header.ron) {
+                (false, false) => {}
+                (true, false) => {
+                    draw_rect(lx1, lx2, left_color);
+                }
+                (false, true) => {
+                    draw_rect(rx1, rx2, right_color);
+                }
+                (true, true) if world.dst_parallax == 0 => {
+                    draw_rect(lx1, lx2, both_color);
+                }
+                (true, true) => {
+                    draw_rect(lx1, lx2, left_color);
+                    draw_rect(rx1, rx2, right_color);
+                    let (x1, x2) = if world.dst_parallax < 0 {
+                        (lx1, rx2)
+                    } else {
+                        (rx1, lx2)
+                    };
+                    painter.line_segment(
+                        [
+                            res.rect.min + (x1, y1).into(),
+                            res.rect.min + (x2 + 1.0, y1).into(),
+                        ],
+                        (2.0, both_color),
+                    );
+                    painter.line_segment(
+                        [
+                            res.rect.min + (x1, y2).into(),
+                            res.rect.min + (x2 + 1.0, y2).into(),
+                        ],
+                        (2.0, both_color),
+                    );
+                }
+            }
+        }
     }
 }
 
@@ -442,7 +520,7 @@ impl AppWindow for WorldWindow {
     fn initial_viewport(&self) -> ViewportBuilder {
         ViewportBuilder::default()
             .with_title(format!("Worlds ({})", self.sim_id))
-            .with_inner_size((640.0, 500.0))
+            .with_inner_size((640.0, 520.0))
     }
 
     fn on_init(&mut self, ctx: &Context, _render_state: &egui_wgpu::RenderState) {
@@ -643,6 +721,15 @@ impl WorldRenderer {
                 shades.map(|s| shade(s, params.right_color)),
             ]
         };
+        let palettes = {
+            let palettes = self.palettes.borrow().read::<[u8; 8]>(0);
+            [
+                utils::parse_palette(palettes[0]),
+                utils::parse_palette(palettes[2]),
+                utils::parse_palette(palettes[4]),
+                utils::parse_palette(palettes[6]),
+            ]
+        };
 
         let chardata = self.chardata.borrow();
         let bgmaps = self.bgmaps.borrow();
@@ -667,7 +754,8 @@ impl WorldRenderer {
                     let row = (sy & 0x7) as usize;
                     let col = (sx & 0x7) as usize;
                     let pixel = utils::read_char_pixel(char, cell.hflip, cell.vflip, row, col);
-                    image.add((dx as usize, dy as usize), colors[0][pixel as usize]);
+                    let shade = palettes[cell.palette_index][pixel as usize];
+                    image.add((dx as usize, dy as usize), colors[0][shade as usize]);
                 }
 
                 let dx = x + world.dst_x + world.dst_parallax;
@@ -680,7 +768,8 @@ impl WorldRenderer {
                     let row = (sy & 0x7) as usize;
                     let col = (sx & 0x7) as usize;
                     let pixel = utils::read_char_pixel(char, cell.hflip, cell.vflip, row, col);
-                    image.add((dx as usize, dy as usize), colors[1][pixel as usize]);
+                    let shade = palettes[cell.palette_index][pixel as usize];
+                    image.add((dx as usize, dy as usize), colors[1][shade as usize]);
                 }
             }
         }
@@ -859,7 +948,7 @@ impl WorldHeader {
         let new_value = (*source & 0x0030)
             | if self.lon { 0x8000 } else { 0x0000 }
             | if self.ron { 0x4000 } else { 0x0000 }
-            | self.mode.to_u16().unwrap() << 12
+            | (self.mode.to_u16().unwrap() << 12)
             | ((self.scx as u16) << 10)
             | ((self.scy as u16) << 8)
             | if self.over { 0x0080 } else { 0x0000 }
@@ -976,8 +1065,8 @@ impl<'a> SourceCoordCalculator<'a> {
                 (sx, sy)
             }
             SourceParam::Affine(affine) => {
-                let sx = affine_coord(affine.src_x, x, affine.dx, affine.src_parallax.min(0).abs());
-                let sy = affine_coord(affine.src_y, x, affine.dy, affine.src_parallax.min(0).abs());
+                let sx = affine_coord(affine.src_x, x, affine.dx, affine.src_parallax.min(0));
+                let sy = affine_coord(affine.src_y, x, affine.dy, affine.src_parallax.min(0));
                 (sx, sy)
             }
         }
@@ -997,8 +1086,8 @@ impl<'a> SourceCoordCalculator<'a> {
                 (sx, sy)
             }
             SourceParam::Affine(affine) => {
-                let sx = affine_coord(affine.src_x, x, affine.dx, -affine.src_parallax.max(0));
-                let sy = affine_coord(affine.src_y, x, affine.dy, -affine.src_parallax.max(0));
+                let sx = affine_coord(affine.src_x, x, affine.dx, affine.src_parallax.max(0));
+                let sy = affine_coord(affine.src_y, x, affine.dy, affine.src_parallax.max(0));
                 (sx, sy)
             }
         }