chore: Release lemur version 0.14.0

- Support WGPU_FORCE_FALLBACK to run on CPU
 - Pass display when creating wgpu instance
 - Pass compatible surface when constructing adapter
 - Log some settings (at debug level)

Cargo.toml

@@ -4,18 +4,18 @@ description = "An emulator for the Virtual Boy."
 repository = "https://git.virtual-boy.com/PVB/lemur"
 publish = false
 license = "MIT"
-version = "0.12.3"
+version = "0.14.0"
 edition = "2024"
 
 [dependencies]
 anyhow = "1"
-atoi = "2"
+atoi = "3"
-audioadapter-buffers = "3"
+audioadapter-buffers = "4"
 atomic = "0.6"
 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" }
+cpal = "0.18"
 directories = "6"
 egui = { version = "0.34", features = ["persistence", "serde"] }
 egui_extras = { version = "0.34", features = ["image"] }
@@ -25,28 +25,28 @@ egui-wgpu = { version = "0.34", features = ["winit"] }
 fxprof-processed-profile = "0.8"
 fixed = { version = "1.28", features = ["num-traits"] }
 gilrs = { version = "0.11", features = ["serde-serialize"] }
-gimli = "0.33"
+gimli = "0.34"
 hex = "0.4"
 image = { version = "0.25", default-features = false, features = ["png"] }
-itertools = "0.14"
+itertools = "0.15"
 normpath = "1"
 notify = "8"
 num-derive = "0.4"
 num-traits = "0.2"
 object = "0.39"
 oneshot = { version = "0.2", features = ["async", "std"] }
-pollster = "0.4"
+pollster = "1"
 rand = "0.10"
 rfd = "0.17"
 rtrb = "0.3"
-rubato = "2"
+rubato = "4"
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
 thread-priority = "3"
 tokio = { version = "1", features = ["io-util", "macros", "net", "rt", "sync", "time"] }
-tracing = { version = "0.1", features = ["release_max_level_info"] }
+tracing = { version = "0.1", features = ["release_max_level_debug"] }
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
-wgpu = "29"
+wgpu = { version = "29", features = ["serde"] }
 wholesym = "0.8"
 winit = { version = "0.30", features = ["serde"] }
 

build.Dockerfile

@@ -1,7 +1,7 @@
 # This Dockerfile produces a base image for builds.
 # It includes all dependencies necessary to cross-compile for Windows/MacOS/Linux.
 
-FROM debian:bookworm AS osxcross
+FROM debian:trixie 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" .
@@ -9,25 +9,21 @@ ADD "https://github.com/joseluisq/macosx-sdks/releases/download/14.5/MacOSX14.5.
 RUN apt-get update && \
     apt-get install -y ca-certificates
 COPY llvm.sources /etc/apt/sources.list.d/llvm.sources
-COPY install-llvm.sh .
 RUN apt-get update && \
-    ./install-llvm.sh && \
+    apt-get install -y bash bzip2 clang-22 git lld-22 llvm-22 make patch xz-utils && \
-    apt-get install -y bash bzip2 git make patch xz-utils && \
     ln -s $(which clang-22) /usr/bin/clang && \
     ln -s $(which clang++-22) /usr/bin/clang++ && \
     ln -s $(which ld64.lld-22) /usr/bin/ld64.lld && \
     SDK_VERSION=14.5 UNATTENDED=1 ENABLE_COMPILER_RT_INSTALL=1 TARGET_DIR=/osxcross ./build.sh
 
-FROM rust:1.95-bookworm
+FROM rust:1.97-trixie
 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
-COPY install-llvm.sh .
 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 && \
-    ./install-llvm.sh && \
+    apt-get install -y clang-22 lld-22 libc6-dev libasound2-dev libudev-dev genisoimage mingw-w64 && \
-    apt-get install -y libc6-dev libasound2-dev libudev-dev genisoimage mingw-w64 && \
     cargo install cargo-bundle xwin && \
     xwin --accept-license splat --output xwin && \
     rm -rf .xwin-cache && \

install-llvm.sh

@@ -1,19 +0,0 @@
-#!/usr/bin/env bash
-
-# Hopefully temporary script to manually install working llvm packages.
-# The apt index for these is broken in bookworm, and upgrading to trixie
-# would make them depend on too new of a libc version.
-
-# https://apt.llvm.org/bookworm/pool/main/l/llvm-toolchain-22/clang-22_22.1.0~%2B%2B20260223093050%2Bcd5897175d0d-1~exp1~20260223093246.28_amd64.deb
-PACKAGES=('clang-22' 'clang-tools-22' 'libclang-common-22-dev' 'libclang-cpp22' 'libclang-rt-22-dev' 'libclang1-22' 'libllvm22' 'lld-22' 'llvm-22' 'llvm-22-dev' 'llvm-22-linker-tools' 'llvm-22-runtime' 'llvm-22-tools')
-FILES=()
-URL='https://apt.llvm.org/bookworm/pool/main/l/llvm-toolchain-22'
-VERSION='22.1.0~%2B%2B20260223093050%2Bcd5897175d0d-1~exp1~20260223093246.28_amd64.deb'
-
-apt-get install -y curl python3
-for package in "${PACKAGES[@]}"; do
-    curl -O -L "$URL/${package}_$VERSION"
-    FILES+=("./${package}_$VERSION")
-done
-
-apt-get install -y "${FILES[@]}"

llvm.sources

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

src/app.rs

@@ -14,16 +14,16 @@ use egui::{
 use egui_wgpu::winit::Painter;
 use egui_winit::EventResponse;
 use gilrs::{EventType, Gilrs};
-use tracing::{error, warn};
+use tracing::{debug, error, warn};
 use winit::{
     application::ApplicationHandler,
     event::WindowEvent,
-    event_loop::{ActiveEventLoop, ControlFlow, EventLoopProxy},
+    event_loop::{ActiveEventLoop, ControlFlow, EventLoopProxy, OwnedDisplayHandle},
     window::{Window, WindowId},
 };
 
 use crate::{
-    config::CliArgs,
+    config::{AppConfig, CliArgs},
     controller::ControllerManager,
     emulator::{EmulatorClient, EmulatorCommand, SimId},
     images::ImageTextureLoader,
@@ -48,9 +48,30 @@ fn load_icon() -> anyhow::Result<IconData> {
 
 struct SharedViewportState {
     viewport_info: ViewportIdMap<ViewportInfo>,
-    painter: Painter,
+    wgpu: WgpuState,
+    painter: Option<Painter>,
     resized_viewport: Option<ViewportId>,
 }
+impl SharedViewportState {
+    fn init_painter(&mut self, ctx: &Context, window: &Window) -> &mut Painter {
+        if self.painter.is_none() {
+            let wgpu_config = egui_wgpu::WgpuConfiguration {
+                present_mode: wgpu::PresentMode::AutoVsync,
+                wgpu_setup: egui_wgpu::WgpuSetup::Existing(self.wgpu.init(window)),
+                ..egui_wgpu::WgpuConfiguration::default()
+            };
+
+            let options = egui_wgpu::RendererOptions::default();
+            let painter =
+                pollster::block_on(Painter::new(ctx.clone(), wgpu_config, false, options));
+            self.painter = Some(painter);
+        }
+        self.painter.as_mut().unwrap()
+    }
+    fn get_painter(&mut self) -> &mut Painter {
+        self.painter.as_mut().unwrap()
+    }
+}
 
 pub struct Application {
     client: EmulatorClient,
@@ -70,10 +91,12 @@ impl Application {
     pub fn new(
         client: EmulatorClient,
         proxy: EventLoopProxy<UserEvent>,
+        handle: OwnedDisplayHandle,
         persistence: Persistence,
         args: CliArgs,
+        config: AppConfig,
     ) -> Self {
-        let wgpu = WgpuState::new();
+        let wgpu = WgpuState::new(handle, config);
         let icon = load_icon().ok().map(Arc::new);
         let mappings = MappingProvider::new(persistence.clone(), args.player2_controller);
         let shortcuts = ShortcutProvider::new(persistence.clone());
@@ -131,20 +154,6 @@ impl Application {
             });
         }
 
-        let wgpu_config = egui_wgpu::WgpuConfiguration {
-            present_mode: wgpu::PresentMode::AutoVsync,
-            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 options = egui_wgpu::RendererOptions::default();
-        let painter = pollster::block_on(Painter::new(ctx.clone(), wgpu_config, false, options));
-
         let mut initial_windows = vec![];
         if let Some(port) = args.debug_port {
             initial_windows.push(ChildWindow::Debugger { port: Some(port) });
@@ -184,7 +193,8 @@ impl Application {
             ctx,
             shared: SharedViewportState {
                 viewport_info: ViewportIdMap::default(),
-                painter,
+                wgpu,
+                painter: None,
                 resized_viewport: None,
             },
             icon,
@@ -289,7 +299,7 @@ impl Application {
             }
             let clipped_primitives = self.ctx.tessellate(output.shapes, output.pixels_per_point);
             viewport.window.pre_present_notify();
-            self.shared.painter.paint_and_update_textures(
+            self.shared.get_painter().paint_and_update_textures(
                 viewport.id,
                 output.pixels_per_point,
                 [0.0, 0.0, 0.0, 0.0],
@@ -325,7 +335,11 @@ impl Application {
                                 id,
                                 InitArgs {
                                     window: &manager.window,
-                                    render_state: &self.shared.painter.render_state().unwrap(),
+                                    render_state: &self
+                                        .shared
+                                        .get_painter()
+                                        .render_state()
+                                        .unwrap(),
                                 },
                             );
                             manager
@@ -341,7 +355,9 @@ impl Application {
         if !active_viewports.contains(&ViewportId::ROOT) {
             event_loop.exit();
         }
-        self.shared.painter.gc_viewports(&active_viewports);
+        if let Some(painter) = self.shared.painter.as_mut() {
+            painter.gc_viewports(&active_viewports);
+        }
     }
 }
 
@@ -359,7 +375,7 @@ impl ApplicationHandler<UserEvent> for Application {
             viewport_builder,
             &mut self.shared,
         );
-        let render_state = self.shared.painter.render_state().unwrap();
+        let render_state = self.shared.get_painter().render_state().unwrap();
         GameScreen::init_pipeline(&render_state);
         self.app.handle_init(
             ViewportId::ROOT,
@@ -480,47 +496,66 @@ impl ApplicationHandler<UserEvent> for Application {
 
 struct WgpuState {
     instance: wgpu::Instance,
-    adapter: wgpu::Adapter,
+    device_descriptor: Arc<dyn Fn(&wgpu::Adapter) -> wgpu::DeviceDescriptor<'static> + Send + Sync>,
-    device: wgpu::Device,
+    config: AppConfig,
-    queue: wgpu::Queue,
 }
 
 impl WgpuState {
-    fn new() -> Self {
+    fn new(handle: OwnedDisplayHandle, config: AppConfig) -> Self {
         #[allow(unused_variables)]
-        let egui_wgpu::WgpuConfiguration {
+        let egui_wgpu::WgpuSetupCreateNew {
-            wgpu_setup:
+            instance_descriptor: wgpu::InstanceDescriptor { backends, .. },
-                egui_wgpu::WgpuSetup::CreateNew(egui_wgpu::WgpuSetupCreateNew {
+            device_descriptor,
-                    instance_descriptor: wgpu::InstanceDescriptor { backends, .. },
-                    device_descriptor,
-                    ..
-                }),
             ..
-        } = egui_wgpu::WgpuConfiguration::default()
+        } = egui_wgpu::WgpuSetupCreateNew::without_display_handle();
-        else {
-            panic!("required fields not found")
-        };
         #[cfg(windows)]
         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,
-            ..wgpu::InstanceDescriptor::new_without_display_handle_from_env()
+            ..wgpu::InstanceDescriptor::new_with_display_handle_from_env(Box::new(handle))
         });
 
-        let adapter = pollster::block_on(instance.request_adapter(&wgpu::RequestAdapterOptions {
-            power_preference:
-                wgpu::PowerPreference::from_env().unwrap_or(wgpu::PowerPreference::LowPower),
-            compatible_surface: None,
-            force_fallback_adapter: false,
-        }))
-        .expect("could not create adapter");
-
-        let (device, queue) =
-            pollster::block_on(adapter.request_device(&(*device_descriptor)(&adapter)))
-                .expect("could not request device");
         Self {
             instance,
+            device_descriptor,
+            config,
+        }
+    }
+
+    fn init(&mut self, window: &Window) -> egui_wgpu::WgpuSetupExisting {
+        let power_preference =
+            wgpu::PowerPreference::from_env().unwrap_or(self.config.power_preference);
+        debug!("power preference: {power_preference:?}");
+
+        let force_fallback_adapter = std::env::var("WGPU_FORCE_FALLBACK")
+            .map_or(self.config.force_fallback, |f| {
+                f.eq_ignore_ascii_case("true") || f.eq_ignore_ascii_case("1")
+            });
+        debug!("force fallback: {force_fallback_adapter}");
+
+        let surface = self
+            .instance
+            .create_surface(window)
+            .expect("could not create surface");
+
+        let adapter =
+            pollster::block_on(self.instance.request_adapter(&wgpu::RequestAdapterOptions {
+                power_preference,
+                compatible_surface: Some(&surface),
+                force_fallback_adapter,
+            }))
+            .expect("could not create adapter");
+        debug!("selected adapter: {:?}", adapter.get_info());
+
+        drop(surface);
+
+        let (device, queue) =
+            pollster::block_on(adapter.request_device(&(*self.device_descriptor)(&adapter)))
+                .expect("could not request device");
+
+        egui_wgpu::WgpuSetupExisting {
+            instance: self.instance.clone(),
             adapter,
             device,
             queue,
@@ -544,14 +579,15 @@ impl ViewportManager {
         shared: &mut SharedViewportState,
     ) -> Self {
         let window = Arc::new(egui_winit::create_window(ctx, event_loop, &builder).unwrap());
-        pollster::block_on(shared.painter.set_window(viewport_id, Some(window.clone()))).unwrap();
+        let painter = shared.init_painter(ctx, &window);
+        pollster::block_on(painter.set_window(viewport_id, Some(window.clone()))).unwrap();
         let state = egui_winit::State::new(
             ctx.clone(),
             viewport_id,
             event_loop,
             Some(window.scale_factor() as f32),
             event_loop.system_theme(),
-            shared.painter.max_texture_side(),
+            painter.max_texture_side(),
         );
 
         let mut info = ViewportInfo {
@@ -588,9 +624,13 @@ impl ViewportManager {
         {
             if shared.resized_viewport != Some(self.id) {
                 shared.resized_viewport = Some(self.id);
-                shared.painter.on_window_resize_state_change(self.id, true);
+                shared
+                    .get_painter()
+                    .on_window_resize_state_change(self.id, true);
             }
-            shared.painter.on_window_resized(self.id, width, height);
+            shared
+                .get_painter()
+                .on_window_resized(self.id, width, height);
         }
         let response = self.state.on_window_event(&self.window, event);
         let info = shared.viewport_info.get_mut(&self.id).unwrap();

src/audio.rs

@@ -3,8 +3,8 @@ use std::time::Duration;
 use anyhow::{Result, bail};
 use audioadapter_buffers::direct::InterleavedSlice;
 use cpal::traits::{DeviceTrait, HostTrait, StreamTrait};
-use rubato::Resampler;
+use rubato::{Adjustable as _, Resampler};
-use tracing::error;
+use tracing::warn;
 
 pub struct Audio {
     #[allow(unused)]
@@ -23,14 +23,14 @@ impl Audio {
         let Some(device) = host.default_output_device() else {
             bail!("No output device available");
         };
-        let Some(config) = device
+        let default_rate = device.default_output_config()?.sample_rate();
-            .supported_output_configs()?
+        let Some(config) = device.supported_output_configs()?.find(|c| {
-            .find(|c| c.channels() == 2 && c.sample_format().is_float())
+            c.channels() == 2 && c.sample_format().is_float() && c.contains_rate(default_rate)
-        else {
+        }) else {
             bail!("No suitable output config available");
         };
-        let mut config = config.with_max_sample_rate().config();
+        let mut config = config.with_sample_rate(default_rate).config();
-        let resample_ratio = config.sample_rate.0 as f64 / VB_FREQUENCY as f64;
+        let resample_ratio = config.sample_rate as f64 / VB_FREQUENCY as f64;
         let chunk_size = (834.0 * resample_ratio) as usize;
         let sampler = rubato::Async::new_poly(
             resample_ratio,
@@ -48,7 +48,7 @@ impl Audio {
             rtrb::RingBuffer::new(sampler.output_frames_max() * 4);
 
         let stream = device.build_output_stream(
-            &config,
+            config,
             move |data: &mut [f32], _| {
                 let requested = data.len();
                 let chunk = match sample_source.read_chunk(data.len()) {
@@ -66,7 +66,7 @@ impl Audio {
                 }
                 chunk.commit_all();
             },
-            move |error| error!(%error, "stream error"),
+            move |error| warn!(%error, "stream error"),
             None,
         )?;
         stream.play()?;

src/config.rs

@@ -1,5 +1,5 @@
 use anyhow::Result;
-use clap::Parser;
+use clap::{Parser, ValueEnum};
 use egui::{Color32, Pos2, Vec2};
 use serde::{Deserialize, Serialize};
 
@@ -47,6 +47,28 @@ pub struct CliArgs {
     /// Map the first connected controller to Player 2
     #[arg(long)]
     pub player2_controller: bool,
+    /// Force the application to render with CPU, rather than GPU.
+    #[arg(long)]
+    pub wgpu_force_fallback: Option<bool>,
+    /// Set a preference for whether to use a low-power or high-performance GPU adapter
+    #[arg(long)]
+    pub wgpu_power_preference: Option<PowerPreferenceWrapper>,
+}
+
+#[derive(ValueEnum, Clone, Copy)]
+pub enum PowerPreferenceWrapper {
+    Low,
+    High,
+    None,
+}
+impl From<PowerPreferenceWrapper> for wgpu::PowerPreference {
+    fn from(value: PowerPreferenceWrapper) -> Self {
+        match value {
+            PowerPreferenceWrapper::Low => wgpu::PowerPreference::LowPower,
+            PowerPreferenceWrapper::High => wgpu::PowerPreference::HighPerformance,
+            PowerPreferenceWrapper::None => wgpu::PowerPreference::None,
+        }
+    }
 }
 
 pub const COLOR_PRESETS: [[Color32; 2]; 3] = [
@@ -64,6 +86,49 @@ pub const COLOR_PRESETS: [[Color32; 2]; 3] = [
     ],
 ];
 
+const fn default_power_preference() -> wgpu::PowerPreference {
+    wgpu::PowerPreference::LowPower
+}
+
+#[derive(Serialize, Deserialize, Clone, PartialEq, Eq)]
+pub struct AppConfig {
+    #[serde(default = "default_power_preference")]
+    pub power_preference: wgpu::PowerPreference,
+    #[serde(default)]
+    pub force_fallback: bool,
+}
+
+impl AppConfig {
+    pub fn load(persistence: &Persistence) -> Self {
+        if let Ok(config) = persistence.load_config(APP_CONFIG_FILENAME) {
+            return config;
+        }
+        Self {
+            power_preference: default_power_preference(),
+            force_fallback: false,
+        }
+    }
+
+    pub fn save(&self, persistence: &Persistence) -> Result<()> {
+        persistence.save_config(APP_CONFIG_FILENAME, &self)
+    }
+
+    pub fn update(&mut self, args: &CliArgs) -> bool {
+        let mut updated = false;
+        if let Some(pref) = args.wgpu_power_preference {
+            self.power_preference = pref.into();
+            updated = true;
+        }
+        if let Some(force_fallback) = args.wgpu_force_fallback {
+            self.force_fallback = force_fallback;
+            updated = true;
+        }
+        updated
+    }
+}
+
+const APP_CONFIG_FILENAME: &str = "config";
+
 const fn default_audio_enabled() -> bool {
     true
 }
@@ -81,7 +146,7 @@ pub struct SimConfig {
 
 impl SimConfig {
     pub fn load(persistence: &Persistence, sim_id: SimId) -> Self {
-        if let Ok(config) = persistence.load_config(config_filename(sim_id)) {
+        if let Ok(config) = persistence.load_config(sim_config_filename(sim_id)) {
             return config;
         }
         Self {
@@ -94,11 +159,11 @@ impl SimConfig {
     }
 
     pub fn save(&self, persistence: &Persistence, sim_id: SimId) -> Result<()> {
-        persistence.save_config(config_filename(sim_id), self)
+        persistence.save_config(sim_config_filename(sim_id), self)
     }
 }
 
-fn config_filename(sim_id: SimId) -> &'static str {
+fn sim_config_filename(sim_id: SimId) -> &'static str {
     match sim_id {
         SimId::Player1 => "config_p1",
         SimId::Player2 => "config_p2",

src/controller.rs

@@ -1,4 +1,7 @@
-use std::sync::{Arc, RwLock};
+use std::{
+    collections::HashMap,
+    sync::{Arc, RwLock},
+};
 
 use gilrs::{Event as GamepadEvent, EventType, GamepadId, ev::Code};
 use winit::{
@@ -8,12 +11,13 @@ use winit::{
 
 use crate::{
     emulator::{EmulatorClient, EmulatorCommand, SimId, VBKey},
-    input::{InputMapping, MappingProvider},
+    input::{AxisMapping, InputMapping, MappingProvider},
 };
 
 pub struct Controller {
     pub sim_id: SimId,
     state: VBKey,
+    axis_values: HashMap<(GamepadId, Code), f32>,
     mapping: Arc<RwLock<InputMapping>>,
 }
 
@@ -22,6 +26,7 @@ impl Controller {
         Self {
             sim_id,
             state: VBKey::SGN,
+            axis_values: HashMap::new(),
             mapping: mappings.for_sim(sim_id).clone(),
         }
     }
@@ -45,20 +50,23 @@ impl Controller {
                 (VBKey::empty(), mappings)
             }
             EventType::AxisChanged(_, value, code) => {
-                let (neg, pos) = self.map_axis(&event.id, &code)?;
+                let mapping = self.map_axis(&event.id, &code)?;
-                let mut pressed = VBKey::empty();
+                self.axis_values.insert((event.id, code), value);
-                let mut released = VBKey::empty();
+
-                if value < -0.75 {
+                let pair_value = mapping
-                    pressed = pressed.union(neg);
+                    .pair
-                }
+                    .and_then(|p| self.axis_values.get(&(event.id, p)))
-                if value > 0.75 {
+                    .copied()
-                    pressed = pressed.union(pos);
+                    .unwrap_or_default();
-                }
+                let neg = mapping.neg;
-                if value > -0.65 {
+                let pos = mapping.pos;
-                    released = released.union(neg);
+
-                }
+                let (mut pressed, mut released) = axis_presses(value, pair_value, neg, pos);
-                if value < 0.65 {
+                if let Some(other) = mapping.pair.and_then(|p| self.map_axis(&event.id, &p)) {
-                    released = released.union(pos);
+                    let (other_pressed, other_released) =
+                        axis_presses(pair_value, value, other.neg, other.pos);
+                    pressed = pressed.union(other_pressed);
+                    released = released.union(other_released);
                 }
                 (pressed, released)
             }
@@ -87,7 +95,7 @@ impl Controller {
         self.mapping.read().unwrap().map_button(id, code)
     }
 
-    fn map_axis(&self, id: &GamepadId, code: &Code) -> Option<(VBKey, VBKey)> {
+    fn map_axis(&self, id: &GamepadId, code: &Code) -> Option<AxisMapping> {
         self.mapping.read().unwrap().map_axis(id, code)
     }
 }
@@ -126,3 +134,95 @@ impl ControllerManager {
         }
     }
 }
+
+fn axis_presses(value: f32, pair_value: f32, neg: VBKey, pos: VBKey) -> (VBKey, VBKey) {
+    use std::f32::consts::FRAC_PI_3;
+
+    let mut pressed = VBKey::empty();
+    let mut released = VBKey::empty();
+
+    let magnitude = value.hypot(pair_value);
+    let abs_angle = pair_value.atan2(value).abs();
+
+    if magnitude < 0.65 {
+        released = released.union(neg).union(pos);
+    } else if abs_angle <= FRAC_PI_3 {
+        // stick tilted towards positive
+        released = released.union(neg);
+
+        if magnitude >= 0.75 {
+            pressed = pressed.union(pos);
+        }
+    } else if abs_angle >= 2.0 * FRAC_PI_3 {
+        // stick tilted towards negative
+        released = released.union(pos);
+
+        if magnitude >= 0.75 {
+            pressed = pressed.union(neg);
+        }
+    } else {
+        released = released.union(neg).union(pos);
+    }
+
+    (pressed, released)
+}
+
+#[cfg(test)]
+mod tests {
+    use super::{VBKey, axis_presses};
+
+    const NEG: VBKey = VBKey::LL;
+    const POS: VBKey = VBKey::LR;
+
+    const NONE: VBKey = VBKey::empty();
+    const BOTH: VBKey = NEG.union(POS);
+
+    #[test]
+    fn detects_no_input() {
+        let (pressed, released) = axis_presses(0.0, 0.0, NEG, POS);
+        assert_eq!(pressed, NONE);
+        assert_eq!(released, BOTH);
+    }
+
+    #[test]
+    fn detects_pos_input() {
+        let (pressed, released) = axis_presses(1.0, 0.0, NEG, POS);
+        assert_eq!(pressed, POS);
+        assert_eq!(released, NEG);
+    }
+
+    #[test]
+    fn detects_neg_input() {
+        let (pressed, released) = axis_presses(-1.0, 0.0, NEG, POS);
+        assert_eq!(pressed, NEG);
+        assert_eq!(released, POS);
+    }
+
+    #[test]
+    fn respects_dead_zone() {
+        let (pressed, released) = axis_presses(0.70, 0.0, NEG, POS);
+        assert_eq!(pressed, NONE);
+        assert_eq!(released, NEG);
+    }
+
+    #[test]
+    fn handles_diagonals_ok() {
+        let (pressed, released) = axis_presses(0.6, 0.6, NEG, POS);
+        assert_eq!(pressed, POS);
+        assert_eq!(released, NEG);
+    }
+
+    #[test]
+    fn ignores_diagonal_noise() {
+        let (pressed, released) = axis_presses(-1.0, -0.1484245, NEG, POS);
+        assert_eq!(pressed, NEG);
+        assert_eq!(released, POS);
+    }
+
+    #[test]
+    fn ignores_small_values() {
+        let (pressed, released) = axis_presses(-0.1484245, -1.0, NEG, POS);
+        assert_eq!(pressed, NONE);
+        assert_eq!(released, BOTH);
+    }
+}

src/emulator.rs

@@ -265,7 +265,8 @@ impl Emulator {
         } else if let Some(cart) = self.carts[index].as_mut()
             && cart.is_watching()
         {
-            cart.restart_watching();
+            cart.reload()?;
+            sim.load_cart(cart.rom.clone(), cart.sram.clone())?;
         }
         let mut profiling = false;
         if let Some(profiler) = self.profilers[sim_id.to_index()].as_ref()
@@ -946,6 +947,9 @@ pub struct EmulatorClient {
 }
 
 impl EmulatorClient {
+    pub fn has_player_2(&self) -> bool {
+        self.sim_state(SimId::Player2) != SimState::Uninitialized
+    }
     pub fn sim_state(&self, sim_id: SimId) -> SimState {
         self.sim_state[sim_id.to_index()].load(Ordering::Acquire)
     }

src/emulator/cart.rs

@@ -22,10 +22,7 @@ pub struct Cart {
 
 impl Cart {
     pub fn load(file_path: &Path, sim_id: SimId, watch: bool) -> Result<Self> {
-        let rom = fs::read(file_path)?;
+        let (rom, info) = Self::read_rom(file_path)?;
-        let (rom, info) = try_parse_isx(file_path, &rom)
-            .or_else(|| try_parse_elf(file_path, &rom))
-            .unwrap_or_else(|| (rom, GameInfo::empty(file_path)));
 
         let mut sram_file = File::options()
             .read(true)
@@ -66,6 +63,16 @@ impl Cart {
         })
     }
 
+    pub fn reload(&mut self) -> Result<()> {
+        let (rom, info) = Self::read_rom(&self.file_path)?;
+        self.rom = rom;
+        self.info = Arc::new(info);
+        if self.is_watching() {
+            self.restart_watching();
+        }
+        Ok(())
+    }
+
     pub fn save_sram(&mut self) -> Result<()> {
         self.sram_file.seek(SeekFrom::Start(0))?;
         self.sram_file.write_all(&self.sram)?;
@@ -92,6 +99,14 @@ impl Cart {
         self.changed = Arc::new(AtomicBool::new(false));
         self.watcher = None;
     }
+
+    fn read_rom(file_path: &Path) -> Result<(Vec<u8>, GameInfo)> {
+        let rom = fs::read(file_path)?;
+        let (rom, info) = try_parse_isx(file_path, &rom)
+            .or_else(|| try_parse_elf(file_path, &rom))
+            .unwrap_or_else(|| (rom, GameInfo::empty(file_path)));
+        Ok((rom, info))
+    }
 }
 
 fn build_watcher(file_path: &Path, changed: Arc<AtomicBool>) -> Option<notify::RecommendedWatcher> {

src/filepicker.rs

@@ -0,0 +1,84 @@
+use std::{
+    path::PathBuf,
+    sync::{Arc, Weak},
+};
+
+use winit::window::Window;
+
+pub struct FilePicker {
+    window: Option<Weak<Window>>,
+}
+
+impl FilePicker {
+    pub fn new() -> Self {
+        Self { window: None }
+    }
+
+    pub fn set_window(&mut self, window: &Arc<Window>) {
+        self.window = Some(Arc::downgrade(window));
+    }
+
+    pub fn pick_file_dialog(&self) -> FileDialogBuilder {
+        self.new_dialog(FileDialogAction::PickFile, false)
+    }
+
+    pub fn save_file_dialog(&self) -> FileDialogBuilder {
+        self.new_dialog(FileDialogAction::SaveFile, cfg!(not(target_os = "windows")))
+    }
+
+    fn new_dialog(&self, action: FileDialogAction, attach_window: bool) -> FileDialogBuilder {
+        #[cfg(not(target_os = "macos"))]
+        let mut dialog = rfd::AsyncFileDialog::new();
+        #[cfg(target_os = "macos")]
+        let mut dialog = rfd::FileDialog::new();
+
+        if attach_window && let Some(window) = self.window.as_ref().and_then(|w| w.upgrade()) {
+            dialog = dialog.set_parent(&window);
+        }
+        FileDialogBuilder { dialog, action }
+    }
+}
+
+pub struct FileDialogBuilder {
+    #[cfg(not(target_os = "macos"))]
+    dialog: rfd::AsyncFileDialog,
+    #[cfg(target_os = "macos")]
+    dialog: rfd::FileDialog,
+    action: FileDialogAction,
+}
+
+impl FileDialogBuilder {
+    pub fn add_filter(self, name: impl Into<String>, extensions: &[impl ToString]) -> Self {
+        Self {
+            dialog: self.dialog.add_filter(name, extensions),
+            ..self
+        }
+    }
+
+    pub fn set_file_name(self, file_name: impl Into<String>) -> Self {
+        Self {
+            dialog: self.dialog.set_file_name(file_name),
+            ..self
+        }
+    }
+
+    pub fn open(self) -> Option<PathBuf> {
+        #[cfg(not(target_os = "macos"))]
+        fn resolve(action: impl Future<Output = Option<rfd::FileHandle>>) -> Option<PathBuf> {
+            pollster::block_on(action).map(Into::into)
+        }
+        #[cfg(target_os = "macos")]
+        fn resolve(action: Option<PathBuf>) -> Option<PathBuf> {
+            action
+        }
+        match self.action {
+            FileDialogAction::PickFile => resolve(self.dialog.pick_file()),
+            FileDialogAction::SaveFile => resolve(self.dialog.save_file()),
+        }
+    }
+}
+
+enum FileDialogAction {
+    PickFile,
+    SaveFile,
+}

src/input.rs

@@ -52,12 +52,28 @@ pub trait Mappings {
     fn use_default_mappings(&mut self);
 }
 
+#[derive(Clone, Copy, Serialize, Deserialize)]
+pub struct AxisMapping {
+    pub neg: VBKey,
+    pub pos: VBKey,
+    pub pair: Option<Code>,
+}
+impl Default for AxisMapping {
+    fn default() -> Self {
+        Self {
+            neg: VBKey::empty(),
+            pos: VBKey::empty(),
+            pair: None,
+        }
+    }
+}
+
 #[derive(Serialize, Deserialize)]
 pub struct GamepadMapping {
     buttons: HashMap<Code, VBKey>,
-    axes: HashMap<Code, (VBKey, VBKey)>,
+    axes: HashMap<Code, AxisMapping>,
     default_buttons: HashMap<Code, VBKey>,
-    default_axes: HashMap<Code, (VBKey, VBKey)>,
+    default_axes: HashMap<Code, AxisMapping>,
 }
 
 impl GamepadMapping {
@@ -78,7 +94,8 @@ impl GamepadMapping {
         let mut default_axes = HashMap::new();
         let mut default_axis = |axis: Axis, neg: VBKey, pos: VBKey| {
             if let Some(code) = gamepad.axis_code(axis) {
-                default_axes.insert(code, (neg, pos));
+                let pair = axis.second_axis().and_then(|a| gamepad.axis_code(a));
+                default_axes.insert(code, AxisMapping { neg, pos, pair });
             }
         };
         default_axis(Axis::LeftStickX, VBKey::LL, VBKey::LR);
@@ -102,19 +119,13 @@ impl GamepadMapping {
     }
 
     pub fn add_axis_neg_mapping(&mut self, key: VBKey, code: Code) {
-        let entry = self
+        let entry = self.axes.entry(code).or_default();
-            .axes
+        entry.neg = entry.neg.union(key);
-            .entry(code)
-            .or_insert((VBKey::empty(), VBKey::empty()));
-        entry.0 = entry.0.union(key);
     }
 
     pub fn add_axis_pos_mapping(&mut self, key: VBKey, code: Code) {
-        let entry = self
+        let entry = self.axes.entry(code).or_default();
-            .axes
+        entry.pos = entry.pos.union(key);
-            .entry(code)
-            .or_insert((VBKey::empty(), VBKey::empty()));
-        entry.1 = entry.1.union(key);
     }
 
     fn save_mappings(&self) -> PersistedGamepadMapping {
@@ -145,11 +156,11 @@ impl GamepadMapping {
 impl Mappings for GamepadMapping {
     fn mapping_names(&self) -> HashMap<VBKey, Vec<String>> {
         let mut results: HashMap<VBKey, Vec<String>> = HashMap::new();
-        for (axis, (left_keys, right_keys)) in &self.axes {
+        for (axis, mapping) in &self.axes {
-            for key in left_keys.iter() {
+            for key in mapping.neg.iter() {
                 results.entry(key).or_default().push(format!("-{axis}"));
             }
-            for key in right_keys.iter() {
+            for key in mapping.pos.iter() {
                 results.entry(key).or_default().push(format!("+{axis}"));
             }
         }
@@ -162,10 +173,10 @@ impl Mappings for GamepadMapping {
     }
 
     fn clear_mappings(&mut self, key: VBKey) {
-        self.axes.retain(|_, (left, right)| {
+        self.axes.retain(|_, mapping| {
-            *left = left.difference(key);
+            mapping.neg = mapping.neg.difference(key);
-            *right = right.difference(key);
+            mapping.pos = mapping.pos.difference(key);
-            !(left.is_empty() && right.is_empty())
+            !(mapping.neg.is_empty() && mapping.pos.is_empty())
         });
         self.buttons.retain(|_, keys| {
             *keys = keys.difference(key);
@@ -200,7 +211,7 @@ impl InputMapping {
         mappings.buttons.get(code).copied()
     }
 
-    pub fn map_axis(&self, id: &GamepadId, code: &Code) -> Option<(VBKey, VBKey)> {
+    pub fn map_axis(&self, id: &GamepadId, code: &Code) -> Option<AxisMapping> {
         let mappings = self.gamepads.get(id)?.read().unwrap();
         mappings.axes.get(code).copied()
     }
@@ -459,9 +470,9 @@ struct PersistedKeyboardMapping {
 #[derive(Serialize, Deserialize)]
 struct PersistedGamepadMapping {
     buttons: Vec<(Code, VBKey)>,
-    axes: Vec<(Code, (VBKey, VBKey))>,
+    axes: Vec<(Code, AxisMapping)>,
     default_buttons: Vec<(Code, VBKey)>,
-    default_axes: Vec<(Code, (VBKey, VBKey))>,
+    default_axes: Vec<(Code, AxisMapping)>,
 }
 
 #[derive(Clone, Copy, Serialize, Deserialize, PartialEq, Eq, Hash)]

src/main.rs

@@ -13,7 +13,7 @@ use tracing_subscriber::{EnvFilter, Layer, layer::SubscriberExt, util::Subscribe
 use winit::event_loop::{ControlFlow, EventLoop};
 
 use crate::{
-    config::{CliArgs, SimConfig},
+    config::{AppConfig, CliArgs, SimConfig},
     emulator::SimId,
     persistence::Persistence,
 };
@@ -23,6 +23,7 @@ mod audio;
 mod config;
 mod controller;
 mod emulator;
+mod filepicker;
 mod gdbserver;
 mod graphics;
 mod images;
@@ -110,6 +111,10 @@ fn main() -> Result<()> {
     if args.profile {
         builder = builder.start_paused(true)
     }
+    let mut config = AppConfig::load(&persistence);
+    if config.update(&args) {
+        let _ = config.save(&persistence);
+    }
     let p1 = SimConfig::load(&persistence, SimId::Player1);
     let p2 = SimConfig::load(&persistence, SimId::Player2);
 
@@ -136,6 +141,14 @@ fn main() -> Result<()> {
     let event_loop = EventLoop::with_user_event().build().unwrap();
     event_loop.set_control_flow(ControlFlow::Poll);
     let proxy = event_loop.create_proxy();
-    event_loop.run_app(&mut Application::new(client, proxy, persistence, args))?;
+    let handle = event_loop.owned_display_handle();
+    event_loop.run_app(&mut Application::new(
+        client,
+        proxy,
+        handle,
+        persistence,
+        args,
+        config,
+    ))?;
     Ok(())
 }

src/window.rs

@@ -28,11 +28,11 @@ mod utils;
 mod vip;
 
 pub trait AppWindow {
-    fn sim_id(&self) -> SimId {
+    fn sim_id(&self) -> Option<SimId> {
-        SimId::Player1
+        None
     }
     fn image_url(&self, name: &str) -> String {
-        format!("vip://{}/{name}", self.sim_id())
+        format!("vip://{}/{name}", self.sim_id().unwrap_or(SimId::Player1))
     }
     fn initial_viewport(&self) -> ViewportBuilder;
     fn show(&mut self, ui: &mut Ui);

src/window/game.rs

@@ -8,6 +8,7 @@ use crate::{
     app::UserEvent,
     config::{COLOR_PRESETS, SimConfig},
     emulator::{EmulatorClient, EmulatorCommand, EmulatorState, SimId, SimState},
+    filepicker::FilePicker,
     images::ImageTextureLoader,
     input::{Command, MappingProvider, ShortcutProvider},
     memory::MemoryClient,
@@ -46,13 +47,14 @@ pub struct GameWindow {
     messages: mpsc::Receiver<Toast>,
     message_sink: mpsc::Sender<Toast>,
     color_picker: Option<ColorPickerState>,
-    window: Option<Arc<winit::window::Window>>,
+    file_picker: FilePicker,
     memory: Arc<MemoryClient>,
     images: Arc<ImageTextureLoader>,
     mappings: MappingProvider,
     children: ViewportIdMap<ChildWindowWrapper>,
     child_states: UiData<ViewportIdMap<ChildState>>,
     queued_children: Vec<ChildWindow>,
+    show_player_name: bool,
 }
 
 impl GameWindow {
@@ -87,13 +89,14 @@ impl GameWindow {
             messages,
             message_sink,
             color_picker: None,
-            window: None,
+            file_picker: FilePicker::new(),
             memory: memory.clone(),
             images: images.clone(),
             mappings: mappings.clone(),
             children: ViewportIdMap::default(),
             child_states: UiData::new(),
             queued_children: vec![],
+            show_player_name: false,
         }
     }
 
@@ -176,6 +179,13 @@ impl GameWindow {
         };
 
         let mut viewport = child.initial_viewport();
+        let title = viewport.title.clone().unwrap();
+        let sim_id = child.sim_id();
+        if let Some(sim_id) = sim_id
+            && self.show_player_name
+        {
+            viewport.title = Some(format!("{title} ({sim_id})"));
+        }
         if let Some(state) = self.child_states.get(&viewport_id) {
             viewport.position = Some(state.position);
             viewport.inner_size = Some(state.size);
@@ -184,6 +194,8 @@ impl GameWindow {
             viewport_id,
             ChildWindowWrapper {
                 app: Arc::new(Mutex::new(child)),
+                title,
+                sim_id,
                 updates: Some(viewport),
                 close_requested: Arc::new(AtomicBool::new(false)),
             },
@@ -238,9 +250,11 @@ impl GameWindow {
         for command in ui.input_mut(|input| self.shortcuts.consume_all(input)) {
             match command {
                 Command::OpenRom => {
-                    let rom = rfd::FileDialog::new()
+                    let rom = self
+                        .file_picker
+                        .pick_file_dialog()
                         .add_filter("Virtual Boy ROMs", &["vb", "vbrom", "elf", "isx"])
-                        .pick_file();
+                        .open();
                     if let Some(path) = rom {
                         self.client
                             .send_command(EmulatorCommand::LoadGame(self.sim_id, path));
@@ -294,9 +308,11 @@ impl GameWindow {
                 .add(self.button_for(ui.ctx(), "Open ROM", Command::OpenRom))
                 .clicked()
             {
-                let rom = rfd::FileDialog::new()
+                let rom = self
+                    .file_picker
+                    .pick_file_dialog()
                     .add_filter("Virtual Boy ROMs", &["vb", "vbrom", "elf", "isx"])
-                    .pick_file();
+                    .open();
                 if let Some(path) = rom {
                     self.client
                         .send_command(EmulatorCommand::LoadGame(self.sim_id, path));
@@ -371,7 +387,7 @@ impl GameWindow {
         });
         ui.menu_button("Options", |ui| self.show_options_menu(ui));
         ui.menu_button("Multiplayer", |ui| {
-            let has_player_2 = self.client.sim_state(SimId::Player2) != SimState::Uninitialized;
+            let has_player_2 = self.client.has_player_2();
             if self.sim_id == SimId::Player1
                 && !has_player_2
                 && ui.button("Open Player 2").clicked()
@@ -448,13 +464,12 @@ impl GameWindow {
         self.client
             .send_command(EmulatorCommand::Screenshot(self.sim_id, tx));
         let bytes = rx.await.context("Could not take screenshot")?;
-        let mut file_dialog = rfd::FileDialog::new()
+        let file = self
+            .file_picker
+            .save_file_dialog()
             .add_filter("PNG images", &["png"])
-            .set_file_name("screenshot.png");
+            .set_file_name("screenshot.png")
-        if let Some(window) = self.window.as_ref() {
+            .open();
-            file_dialog = file_dialog.set_parent(window);
-        }
-        let file = file_dialog.save_file();
         let Some(path) = file else {
             return Ok(None);
         };
@@ -623,8 +638,8 @@ impl GameWindow {
 }
 
 impl AppWindow for GameWindow {
-    fn sim_id(&self) -> SimId {
+    fn sim_id(&self) -> Option<SimId> {
-        self.sim_id
+        Some(self.sim_id)
     }
 
     fn initial_viewport(&self) -> ViewportBuilder {
@@ -639,6 +654,30 @@ impl AppWindow for GameWindow {
     }
 
     fn show(&mut self, ui: &mut Ui) {
+        let has_player_2 = self.client.has_player_2();
+        if !self.show_player_name && has_player_2 {
+            ui.send_viewport_cmd(ViewportCommand::Title(format!("Lemur ({})", self.sim_id)));
+            for (viewport_id, child) in &self.children {
+                if let Some(sim_id) = child.sim_id {
+                    ui.send_viewport_cmd_to(
+                        *viewport_id,
+                        ViewportCommand::Title(format!("{} ({sim_id})", child.title)),
+                    );
+                }
+            }
+            self.show_player_name = true;
+        } else if self.show_player_name && !has_player_2 {
+            ui.send_viewport_cmd(ViewportCommand::Title("Lemur".to_string()));
+            for (viewport_id, child) in &self.children {
+                if child.sim_id.is_some() {
+                    ui.send_viewport_cmd_to(
+                        *viewport_id,
+                        ViewportCommand::Title(child.title.clone()),
+                    );
+                }
+            }
+            self.show_player_name = false;
+        }
         self.child_states.load(ui);
         let dimensions = {
             let bounds = ui.content_rect();
@@ -690,12 +729,15 @@ impl AppWindow for GameWindow {
             let app = child.app.clone();
             let viewport_builder = child.updates.take().unwrap_or_default();
             let close_requested = child.close_requested.clone();
-            if let Some(rect) = ui.input_for(*id, |inp| inp.viewport().outer_rect) {
+            if let (Some(outer), Some(inner)) = ui.input_for(*id, |inp| {
+                let viewport = inp.viewport();
+                (viewport.outer_rect, viewport.inner_rect)
+            }) {
                 self.child_states.insert(
                     *id,
                     ChildState {
-                        position: rect.min,
+                        position: outer.min,
-                        size: rect.size(),
+                        size: inner.size(),
                     },
                 );
             }
@@ -721,7 +763,7 @@ impl AppWindow for GameWindow {
             ));
             self.screen = Some(screen);
         }
-        self.window = Some(args.window.clone());
+        self.file_picker.set_window(args.window);
     }
 }
 
@@ -742,6 +784,8 @@ struct ColorPickerState {
 
 struct ChildWindowWrapper {
     app: Arc<Mutex<AppWrapper>>,
+    title: String,
+    sim_id: Option<SimId>,
     updates: Option<ViewportBuilder>,
     close_requested: Arc<AtomicBool>,
 }

src/window/gdb.rs

@@ -42,13 +42,13 @@ impl GdbServerWindow {
 }
 
 impl AppWindow for GdbServerWindow {
-    fn sim_id(&self) -> SimId {
+    fn sim_id(&self) -> Option<SimId> {
-        self.sim_id
+        Some(self.sim_id)
     }
 
     fn initial_viewport(&self) -> ViewportBuilder {
         ViewportBuilder::default()
-            .with_title(format!("GDB Server ({})", self.sim_id))
+            .with_title("GDB Server")
             .with_inner_size((300.0, 200.0))
     }
 

src/window/profile.rs

@@ -1,12 +1,12 @@
-use std::{fs, sync::Arc, time::Duration};
+use std::{fs, time::Duration};
 
 use anyhow::Result;
 use egui::{Button, CentralPanel, Checkbox, Label, ViewportBuilder};
 use egui_notify::{Anchor, Toast, Toasts};
-use winit::window::Window;
 
 use crate::{
     emulator::{EmulatorClient, EmulatorCommand, EmulatorState, SimId},
+    filepicker::FilePicker,
     profiler::{Profiler, ProfilerStatus},
     window::{AppWindow, InitArgs},
 };
@@ -16,7 +16,7 @@ pub struct ProfileWindow {
     client: EmulatorClient,
     profiler: Profiler,
     toasts: Toasts,
-    window: Option<Arc<Window>>,
+    file_picker: FilePicker,
 }
 
 impl ProfileWindow {
@@ -29,7 +29,7 @@ impl ProfileWindow {
                 .with_anchor(Anchor::BottomLeft)
                 .with_margin((10.0, 10.0).into())
                 .reverse(true),
-            window: None,
+            file_picker: FilePicker::new(),
         }
     }
 
@@ -62,13 +62,12 @@ impl ProfileWindow {
 
     fn try_finish_recording(&mut self) -> Result<Option<String>> {
         let bytes_receiver = self.profiler.finish_recording();
-        let mut file_dialog = rfd::FileDialog::new()
+        let file = self
+            .file_picker
+            .save_file_dialog()
             .add_filter("Profiler files", &["json"])
-            .set_file_name("profile.json");
+            .set_file_name("profile.json")
-        if let Some(window) = self.window.as_ref() {
+            .open();
-            file_dialog = file_dialog.set_parent(window);
-        }
-        let file = file_dialog.save_file();
         if let Some(path) = file {
             let bytes = pollster::block_on(bytes_receiver)?;
             let _ = fs::remove_file(&path);
@@ -82,13 +81,13 @@ impl ProfileWindow {
 }
 
 impl AppWindow for ProfileWindow {
-    fn sim_id(&self) -> SimId {
+    fn sim_id(&self) -> Option<SimId> {
-        self.sim_id
+        Some(self.sim_id)
     }
 
     fn initial_viewport(&self) -> ViewportBuilder {
         ViewportBuilder::default()
-            .with_title(format!("Profiler ({})", self.sim_id))
+            .with_title("Profiler")
             .with_inner_size((300.0, 200.0))
     }
 
@@ -164,6 +163,6 @@ impl AppWindow for ProfileWindow {
     }
 
     fn on_init(&mut self, args: InitArgs) {
-        self.window = Some(args.window.clone());
+        self.file_picker.set_window(args.window);
     }
 }

src/window/terminal.rs

@@ -29,13 +29,13 @@ impl TerminalWindow {
 }
 
 impl AppWindow for TerminalWindow {
-    fn sim_id(&self) -> SimId {
+    fn sim_id(&self) -> Option<SimId> {
-        self.sim_id
+        Some(self.sim_id)
     }
 
     fn initial_viewport(&self) -> ViewportBuilder {
         ViewportBuilder::default()
-            .with_title(format!("Terminal ({})", self.sim_id))
+            .with_title("Terminal")
             .with_inner_size((640.0, 480.0))
     }
 

src/window/utils.rs

@@ -1,6 +1,6 @@
 use std::{
     fmt::{Display, UpperHex},
-    ops::{Bound, Deref, DerefMut, RangeBounds},
+    ops::{AddAssign, Bound, Deref, DerefMut, MulAssign, RangeBounds},
     str::FromStr,
 };
 
@@ -10,7 +10,7 @@ use egui::{
     RichText, Sense, Shape, Stroke, StrokeKind, TextEdit, Ui, UiBuilder, Vec2, Widget, WidgetText,
     ecolor::HexColor, util::id_type_map::SerializableAny,
 };
-use num_traits::{CheckedAdd, CheckedSub, One};
+use num_traits::{CheckedAdd, CheckedSub, One, Zero};
 
 pub trait UiExt {
     fn section(&mut self, title: impl Into<String>, add_contents: impl FnOnce(&mut Ui));
@@ -105,14 +105,16 @@ enum Direction {
 
 pub trait Number:
     Copy
+    + Zero
     + One
+    + AddAssign
+    + MulAssign
     + CheckedAdd
     + CheckedSub
     + Eq
     + Ord
     + Display
     + FromStr
-    + FromRadix16
     + UpperHex
     + Send
     + Sync
@@ -121,14 +123,16 @@ pub trait Number:
 }
 impl<
     T: Copy
+        + Zero
         + One
+        + AddAssign
+        + MulAssign
         + CheckedAdd
         + CheckedSub
         + Eq
         + Ord
         + Display
         + FromStr
-        + FromRadix16
         + UpperHex
         + Send
         + Sync
@@ -209,8 +213,8 @@ impl<T: Number> Widget for NumberEdit<'_, T> {
         let from_string = |val: &str| {
             if self.hex {
                 let bytes = val.as_bytes();
-                let (result, consumed) = T::from_radix_16(bytes);
+                let (result, consumed) = atoi::Integer::<T>::from_radix_16(bytes);
-                (consumed == bytes.len()).then_some(result)
+                (consumed == bytes.len()).then_some(result.0)
             } else {
                 val.parse::<T>().ok()
             }

src/window/vip/bgmap.rs

@@ -191,13 +191,13 @@ impl BgMapWindow {
 }
 
 impl AppWindow for BgMapWindow {
-    fn sim_id(&self) -> SimId {
+    fn sim_id(&self) -> Option<SimId> {
-        self.sim_id
+        Some(self.sim_id)
     }
 
     fn initial_viewport(&self) -> ViewportBuilder {
         ViewportBuilder::default()
-            .with_title(format!("BG Map Data ({})", self.sim_id))
+            .with_title("BG Map Data")
             .with_inner_size((640.0, 480.0))
     }
 

src/window/vip/chardata.rs

@@ -251,13 +251,13 @@ impl CharacterDataWindow {
 }
 
 impl AppWindow for CharacterDataWindow {
-    fn sim_id(&self) -> SimId {
+    fn sim_id(&self) -> Option<SimId> {
-        self.sim_id
+        Some(self.sim_id)
     }
 
     fn initial_viewport(&self) -> ViewportBuilder {
         ViewportBuilder::default()
-            .with_title(format!("Character Data ({})", self.sim_id))
+            .with_title("Character Data")
             .with_inner_size((640.0, 480.0))
     }
 

src/window/vip/framebuffer.rs

@@ -151,13 +151,13 @@ impl FrameBufferWindow {
 }
 
 impl AppWindow for FrameBufferWindow {
-    fn sim_id(&self) -> SimId {
+    fn sim_id(&self) -> Option<SimId> {
-        self.sim_id
+        Some(self.sim_id)
     }
 
     fn initial_viewport(&self) -> ViewportBuilder {
         ViewportBuilder::default()
-            .with_title(format!("Frame Buffers ({})", self.sim_id))
+            .with_title("Frame Buffers")
             .with_inner_size((640.0, 480.0))
     }
 

src/window/vip/object.rs

@@ -207,13 +207,13 @@ impl ObjectWindow {
 }
 
 impl AppWindow for ObjectWindow {
-    fn sim_id(&self) -> SimId {
+    fn sim_id(&self) -> Option<SimId> {
-        self.sim_id
+        Some(self.sim_id)
     }
 
     fn initial_viewport(&self) -> ViewportBuilder {
         ViewportBuilder::default()
-            .with_title(format!("Object Data ({})", self.sim_id))
+            .with_title("Object Data")
             .with_inner_size((640.0, 500.0))
     }
 

src/window/vip/registers.rs

@@ -630,13 +630,13 @@ fn read_address<T: MemoryValue>(registers: &MemoryRef, address: usize) -> T {
 }
 
 impl AppWindow for RegisterWindow {
-    fn sim_id(&self) -> SimId {
+    fn sim_id(&self) -> Option<SimId> {
-        self.sim_id
+        Some(self.sim_id)
     }
 
     fn initial_viewport(&self) -> ViewportBuilder {
         ViewportBuilder::default()
-            .with_title(format!("Registers ({})", self.sim_id))
+            .with_title("Registers")
             .with_inner_size((800.0, 480.0))
     }
 

src/window/vip/world.rs

@@ -527,13 +527,13 @@ impl WorldWindow {
 }
 
 impl AppWindow for WorldWindow {
-    fn sim_id(&self) -> SimId {
+    fn sim_id(&self) -> Option<SimId> {
-        self.sim_id
+        Some(self.sim_id)
     }
 
     fn initial_viewport(&self) -> ViewportBuilder {
         ViewportBuilder::default()
-            .with_title(format!("Worlds ({})", self.sim_id))
+            .with_title("Worlds")
             .with_inner_size((640.0, 520.0))
     }
 
@@ -1081,8 +1081,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));
+                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));
+                let sy = affine_coord(affine.src_y, x, affine.dy, -(affine.src_parallax.min(0)));
                 (sx, sy)
             }
         }