Update all deps

Cargo.toml

@@ -4,49 +4,48 @@ description = "An emulator for the Virtual Boy."
 repository = "https://git.virtual-boy.com/PVB/lemur"
 publish = false
 license = "MIT"
-version = "0.15.2"
+version = "0.9.2"
 edition = "2024"
 
 [dependencies]
 anyhow = "1"
-atoi = "3"
+atoi = "2"
-audioadapter-buffers = "5"
 atomic = "0.6"
 bitflags = { version = "2", features = ["serde"] }
 bytemuck = { version = "1", features = ["derive"] }
 clap = { version = "4", features = ["derive"] }
-cpal = "0.18"
+cpal = { git = "https://github.com/sidit77/cpal.git", rev = "66ed6be" }
 directories = "6"
-egui = { version = "0.36", features = ["persistence", "serde"] }
+egui = { version = "0.33", features = ["serde"] }
-egui_extras = { version = "0.36", features = ["image"] }
+egui_extras = { version = "0.33", features = ["image"] }
-egui-notify = "0.23"
+egui-notify = "0.21"
-egui-winit = "0.36"
+egui-winit = "0.33"
-egui-wgpu = { version = "0.36", features = ["winit"] }
+egui-wgpu = { version = "0.33", features = ["winit"] }
 fxprof-processed-profile = "0.8"
 fixed = { version = "1.28", features = ["num-traits"] }
 gilrs = { version = "0.11", features = ["serde-serialize"] }
-gimli = "0.34"
+gimli = "0.32"
 hex = "0.4"
 image = { version = "0.25", default-features = false, features = ["png"] }
-itertools = "0.15"
+itertools = "0.14"
 normpath = "1"
 notify = "8"
-num-derive = "0.5"
+num-derive = "0.4"
 num-traits = "0.2"
-object = "0.40"
+object = "0.38"
-oneshot = { version = "0.2", features = ["async", "std"] }
+oneshot = "0.1"
-pollster = "1"
+pollster = "0.4"
-rand = "0.10"
+rand = "0.9"
-rfd = "0.17"
+rfd = { version = "0.15", default-features = false, features = ["xdg-portal", "async-std"]}
-rtrb = "0.4"
+rtrb = "0.3"
-rubato = "5"
+rubato = "0.16"
 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_debug"] }
+tracing = { version = "0.1", features = ["release_max_level_info"] }
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
-wgpu = { version = "30", features = ["serde"] }
+wgpu = "27"
 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:trixie 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" .
@@ -10,30 +10,30 @@ 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-23 git lld-23 llvm-23 make patch xz-utils && \
+    apt-get install -y bash bzip2 clang-20 git lld-20 llvm-20 make patch xz-utils && \
-    ln -s $(which clang-23) /usr/bin/clang && \
+    ln -s $(which clang-20) /usr/bin/clang && \
-    ln -s $(which clang++-23) /usr/bin/clang++ && \
+    ln -s $(which clang++-20) /usr/bin/clang++ && \
-    ln -s $(which ld64.lld-23) /usr/bin/ld64.lld && \
+    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:1.99-trixie
+FROM rust:1.91-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-23 lld-23 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-23) /usr/bin/clang && \
+    ln -s $(which clang-20) /usr/bin/clang && \
-    ln -s $(which clang++-23) /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-23" CXX="clang++-23" AR="llvm-ar-23" \
+    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" \
@@ -43,11 +43,11 @@ ENV PATH="/osxcross/bin:$PATH" \
     SHROOMS_CFLAGS_x86_64-pc-windows-msvc="-flto" \
     CFLAGS_x86_64-pc-windows-msvc="-I/xwin/crt/include -I/xwin/sdk/include/ucrt -I/xwin/sdk/include/um -I/xwin/sdk/include/shared" \
     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-23" \
+    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-23" \
+    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-23" \
+    CARGO_TARGET_AARCH64_APPLE_DARWIN_AR="llvm-ar-20" \
-    RC_PATH="llvm-rc-23" \
+    RC_PATH="llvm-rc-20" \
     MACOSX_DEPLOYMENT_TARGET="14.5"
 ENTRYPOINT ["bash"]

build.rs

@@ -31,7 +31,7 @@ fn main() -> Result<(), Box<dyn Error>> {
         .define("VB_DIRECT_FRAME", "on_frame")
         .define("VB_DIRECT_READ", "on_read")
         .define("VB_DIRECT_WRITE", "on_write")
-        .define("VBU_MEMMGR", "VBU_MEMMGR")
+        .define("VBU_REALLOC", "vbu_realloc_shim")
         .file(Path::new("shrooms-vb-core/core/vb.c"))
         .file(Path::new("shrooms-vb-core/util/isx.c"))
         .file(Path::new("shrooms-vb-core/util/vbu.c"))

llvm.sources

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

src/audio.rs

@@ -1,87 +1,53 @@
 use std::time::Duration;
 
-use anyhow::{Context, Result, bail};
+use anyhow::{Result, bail};
-use audioadapter_buffers::direct::InterleavedSlice;
+use cpal::traits::{DeviceTrait, HostTrait, StreamTrait};
-use cpal::{
-    Device, FromSample, Sample, SampleFormat, SizedSample, StreamConfig,
-    traits::{DeviceTrait, HostTrait, StreamTrait},
-};
 use itertools::Itertools;
-use rubato::{Adjustable as _, Resampler};
+use rubato::{FastFixedOut, Resampler};
-use tracing::warn;
+use tracing::error;
 
-struct CpalAudio {
+pub struct Audio {
     #[allow(unused)]
     stream: cpal::Stream,
-    sampler: rubato::Async<f32>,
+    sampler: FastFixedOut<f32>,
-    input_buffer: Vec<f32>,
+    input_buffer: Vec<Vec<f32>>,
-    output_buffer: Vec<f32>,
+    output_buffer: Vec<Vec<f32>>,
     sample_sink: rtrb::Producer<f32>,
 }
 
 const VB_FREQUENCY: usize = 41700;
 
-impl CpalAudio {
+impl Audio {
-    fn init() -> Result<Self> {
+    pub fn init() -> Result<Self> {
         let host = cpal::default_host();
-        let device = host
+        let Some(device) = host.default_output_device() else {
-            .default_output_device()
+            bail!("No output device available");
-            .context("no output device available")?;
+        };
-        let default_rate = device.default_output_config()?.sample_rate();
+        let Some(config) = device
-
-        let supported_config = device
             .supported_output_configs()?
-            .filter(|c| {
+            .find(|c| c.channels() == 2 && c.sample_format().is_float())
-                c.contains_rate(default_rate)
+        else {
-                    && matches!(
+            bail!("No suitable output config available");
-                        c.sample_format(),
+        };
-                        SampleFormat::F32
+        let mut config = config.with_max_sample_rate().config();
-                            | SampleFormat::F64
+        let resample_ratio = config.sample_rate.0 as f64 / VB_FREQUENCY as f64;
-                            | SampleFormat::I32
-                            | SampleFormat::I16
-                    )
-            })
-            .max_by(|a, b| a.cmp_default_heuristics(b))
-            .context("no suitable output config available")?
-            .with_sample_rate(default_rate);
-        let mut config = supported_config.config();
-
-        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(
+        let sampler = FastFixedOut::new(
             resample_ratio,
             64.0,
             rubato::PolynomialDegree::Cubic,
             chunk_size,
             2,
-            rubato::FixedAsync::Output,
         )?;
         config.buffer_size = cpal::BufferSize::Fixed(sampler.output_frames_max() as u32);
 
-        match supported_config.sample_format() {
+        let input_buffer = sampler.input_buffer_allocate(true);
-            SampleFormat::F32 if config.channels == 2 => {
+        let output_buffer = sampler.output_buffer_allocate(true);
-                Self::new_f32_stereo(device, config, sampler)
-            }
-            SampleFormat::F32 => Self::new::<f32>(device, config, sampler),
-            SampleFormat::F64 => Self::new::<f64>(device, config, sampler),
-            SampleFormat::I32 => Self::new::<i32>(device, config, sampler),
-            SampleFormat::I16 => Self::new::<i16>(device, config, sampler),
-            _ => bail!("unsupported sample format"),
-        }
-    }
-
-    fn new_f32_stereo(
-        device: Device,
-        config: StreamConfig,
-        sampler: rubato::Async<f32>,
-    ) -> Result<Self> {
-        let input_buffer = Vec::with_capacity(sampler.nbr_channels() * sampler.input_frames_max());
-        let output_buffer = vec![0.0; sampler.nbr_channels() * sampler.output_frames_max()];
         let (sample_sink, mut sample_source) =
             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()) {
@@ -99,7 +65,7 @@ impl CpalAudio {
                 }
                 chunk.commit_all();
             },
-            move |error| warn!(%error, "stream error"),
+            move |error| error!(%error, "stream error"),
             None,
         )?;
         stream.play()?;
@@ -112,155 +78,43 @@ impl CpalAudio {
         })
     }
 
-    fn new<S: SizedSample + FromSample<f32>>(
+    pub fn update(&mut self, samples: &[f32]) {
-        device: Device,
+        for sample in samples.chunks_exact(2) {
-        config: StreamConfig,
+            for (channel, value) in self.input_buffer.iter_mut().zip(sample) {
-        sampler: rubato::Async<f32>,
+                channel.push(*value);
-    ) -> Result<Self> {
+            }
-        let input_buffer = Vec::with_capacity(sampler.nbr_channels() * sampler.input_frames_max());
+            if self.input_buffer[0].len() >= self.sampler.input_frames_next() {
-        let output_buffer = vec![0.0; sampler.nbr_channels() * sampler.output_frames_max()];
+                let (_, output_samples) = self
-        let (sample_sink, mut sample_source) =
+                    .sampler
-            rtrb::RingBuffer::new(sampler.output_frames_max() * 4);
+                    .process_into_buffer(&self.input_buffer, &mut self.output_buffer, None)
+                    .unwrap();
 
-        let channels = config.channels as usize;
+                let chunk = match self.sample_sink.write_chunk_uninit(output_samples * 2) {
-
-        let stream = device.build_output_stream(
-            config,
-            move |data: &mut [S], _| {
-                let requested = data.len() * 2 / channels;
-                let chunk = match sample_source.read_chunk(requested) {
                     Ok(c) => c,
                     Err(rtrb::chunks::ChunkError::TooFewSlots(n)) => {
-                        sample_source.read_chunk(n).unwrap()
+                        self.sample_sink.write_chunk_uninit(n).unwrap()
                     }
                 };
-                let (first, second) = chunk.as_slices();
+                let interleaved = self.output_buffer[0]
-
-                let new_samples = first
                     .iter()
-                    .chain(second)
+                    .interleave(self.output_buffer[1].iter())
-                    .map(|s: &f32| (*s).to_sample())
+                    .cloned();
-                    .chunks(2);
+                chunk.fill_from_iter(interleaved);
-                let buffer = data.iter_mut().chunks(channels);
+
-                for (dst, samples) in buffer.into_iter().zip(&new_samples) {
+                for channel in &mut self.input_buffer {
-                    // channels beyond the first two are zeroed
+                    channel.clear();
-                    let src = samples.chain(std::iter::repeat(S::EQUILIBRIUM));
-                    for (d, s) in dst.zip(src) {
-                        *d = s;
-                    }
                 }
-
+            }
-                chunk.commit_all();
-            },
-            move |error| warn!(%error, "stream error"),
-            None,
-        )?;
-        stream.play()?;
-        Ok(Self {
-            stream,
-            sampler,
-            input_buffer,
-            output_buffer,
-            sample_sink,
-        })
-    }
-
-    fn update(&mut self, mut samples: &[f32]) {
-        while self.input_buffer.len() + samples.len() >= self.sampler.input_frames_next() * 2 {
-            let samples_needed =
-                (self.sampler.input_frames_next() * 2).saturating_sub(self.input_buffer.len());
-            let (current_samples, future_samples) = samples.split_at(samples_needed);
-            self.input_buffer.extend_from_slice(current_samples);
-            samples = future_samples;
-
-            let buffer_in =
-                InterleavedSlice::new(&self.input_buffer, 2, self.sampler.input_frames_next())
-                    .unwrap();
-            let mut buffer_out = InterleavedSlice::new_mut(
-                &mut self.output_buffer,
-                2,
-                self.sampler.output_frames_next(),
-            )
-            .unwrap();
-            let (_, output_samples) = self
-                .sampler
-                .process_into_buffer(&buffer_in, &mut buffer_out, None)
-                .unwrap();
-            let chunk = match self.sample_sink.write_chunk_uninit(output_samples * 2) {
-                Ok(c) => c,
-                Err(rtrb::chunks::ChunkError::TooFewSlots(n)) => {
-                    self.sample_sink.write_chunk_uninit(n).unwrap()
-                }
-            };
-            chunk.fill_from_iter(self.output_buffer[..output_samples * 2].iter().copied());
-
-            self.input_buffer.clear();
         }
-        self.input_buffer.extend_from_slice(samples);
 
         while self.sample_sink.slots() < self.sampler.output_frames_max() * 2 {
             std::thread::sleep(Duration::from_micros(500));
         }
     }
 
-    fn set_speed(&mut self, speed: f64) -> Result<()> {
+    pub fn set_speed(&mut self, speed: f64) -> Result<()> {
         self.sampler
             .set_resample_ratio_relative(1.0 / speed, false)?;
         Ok(())
     }
 }
-
-struct NoAudio {
-    speed: f64,
-}
-
-impl NoAudio {
-    fn new() -> Self {
-        Self { speed: 1.0 }
-    }
-
-    fn update(&mut self, samples: &[f32]) {
-        let samples = (samples.len() / 2) as f64;
-        let elapsed = Duration::from_secs_f64(samples / (VB_FREQUENCY as f64 * self.speed));
-        std::thread::sleep(elapsed);
-    }
-
-    fn set_speed(&mut self, speed: f64) -> Result<()> {
-        self.speed = speed;
-        Ok(())
-    }
-}
-
-#[allow(clippy::large_enum_variant)]
-enum AudioInner {
-    Cpal(CpalAudio),
-    None(NoAudio),
-}
-
-pub struct Audio(AudioInner);
-
-impl Audio {
-    pub fn init() -> Self {
-        match CpalAudio::init() {
-            Ok(a) => Self(AudioInner::Cpal(a)),
-            Err(e) => {
-                warn!("could not play audio: {e}");
-                Self(AudioInner::None(NoAudio::new()))
-            }
-        }
-    }
-
-    pub fn update(&mut self, samples: &[f32]) {
-        match &mut self.0 {
-            AudioInner::Cpal(a) => a.update(samples),
-            AudioInner::None(a) => a.update(samples),
-        }
-    }
-
-    pub fn set_speed(&mut self, speed: f64) -> Result<()> {
-        match &mut self.0 {
-            AudioInner::Cpal(a) => a.set_speed(speed),
-            AudioInner::None(a) => a.set_speed(speed),
-        }
-    }
-}

src/config.rs

@@ -1,14 +1,12 @@
-use bytemuck::NoUninit;
+use anyhow::Result;
-use clap::{Parser, ValueEnum};
+use clap::Parser;
-use egui::{Color32, Pos2, Vec2};
+use egui::{Color32, Vec2};
 use serde::{Deserialize, Serialize};
 
-pub use crate::filesystem::Config;
+use crate::{emulator::SimId, persistence::Persistence, window::DisplayMode};
-use crate::{emulator::SimId, filesystem::Persistence, window::DisplayMode};
 use std::path::PathBuf;
 
 #[derive(Parser)]
-#[command(version, long_version = env!("CARGO_PKG_VERSION"))]
 pub struct CliArgs {
     /// The path to a virtual boy ROM to run.
     pub rom: Option<PathBuf>,
@@ -42,37 +40,6 @@ pub struct CliArgs {
     /// Watch ROM files for changes, automatically reload
     #[arg(short, long)]
     pub watch: bool,
-    /// Automatically open Player 2 for multiplayer
-    #[arg(long)]
-    pub player2: bool,
-    /// 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>,
-    /// Choose whether save files are kept in the rom or the data directory
-    #[arg(long)]
-    pub save_data_location: Option<SaveDataLocation>,
-}
-
-#[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] = [
@@ -90,62 +57,6 @@ pub const COLOR_PRESETS: [[Color32; 2]; 3] = [
     ],
 ];
 
-const fn default_power_preference() -> wgpu::PowerPreference {
-    wgpu::PowerPreference::LowPower
-}
-
-#[derive(Serialize, Deserialize, Clone, Copy, PartialEq, Eq, ValueEnum, Debug, NoUninit)]
-#[repr(usize)]
-pub enum SaveDataLocation {
-    /// The same directory as the ROM
-    RomDirectory,
-    /// This application's data directory
-    DataDirectory,
-}
-
-const fn default_save_data_location() -> SaveDataLocation {
-    SaveDataLocation::RomDirectory
-}
-
-#[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,
-    #[serde(default = "default_save_data_location")]
-    pub save_data_location: SaveDataLocation,
-}
-impl Default for AppConfig {
-    fn default() -> Self {
-        Self {
-            power_preference: default_power_preference(),
-            force_fallback: false,
-            save_data_location: default_save_data_location(),
-        }
-    }
-}
-
-impl AppConfig {
-    pub fn load(persistence: &Persistence) -> Config<Self> {
-        persistence.config(APP_CONFIG_FILENAME)
-    }
-
-    pub fn apply_updates(&mut self, args: &CliArgs) {
-        if let Some(pref) = args.wgpu_power_preference {
-            self.power_preference = pref.into();
-        }
-        if let Some(force_fallback) = args.wgpu_force_fallback {
-            self.force_fallback = force_fallback;
-        }
-        if let Some(save_data_location) = args.save_data_location {
-            self.save_data_location = save_data_location;
-        }
-    }
-}
-
-const APP_CONFIG_FILENAME: &str = "config";
-
 const fn default_audio_enabled() -> bool {
     true
 }
@@ -157,34 +68,27 @@ pub struct SimConfig {
     pub dimensions: Vec2,
     #[serde(default = "default_audio_enabled")]
     pub audio_enabled: bool,
-    #[serde(default)]
-    pub low_battery: bool,
-    #[serde(default)]
-    pub watch_rom: bool,
-    #[serde(default)]
-    pub position: Option<Pos2>,
 }
-impl Default for SimConfig {
+
-    fn default() -> Self {
+impl SimConfig {
+    pub fn load(persistence: &Persistence, sim_id: SimId) -> Self {
+        if let Ok(config) = persistence.load_config(config_filename(sim_id)) {
+            return config;
+        }
         Self {
             display_mode: DisplayMode::Anaglyph,
             colors: COLOR_PRESETS[0],
             dimensions: DisplayMode::Anaglyph.proportions() + Vec2::new(0.0, 22.0),
             audio_enabled: true,
-            low_battery: false,
-            watch_rom: false,
-            position: None,
         }
     }
-}
 
-impl SimConfig {
+    pub fn save(&self, persistence: &Persistence, sim_id: SimId) -> Result<()> {
-    pub fn load(persistence: &Persistence, sim_id: SimId) -> Config<Self> {
+        persistence.save_config(config_filename(sim_id), self)
-        persistence.config(sim_config_filename(sim_id))
     }
 }
 
-fn sim_config_filename(sim_id: SimId) -> &'static str {
+fn config_filename(sim_id: SimId) -> &'static str {
     match sim_id {
         SimId::Player1 => "config_p1",
         SimId::Player2 => "config_p2",

src/controller.rs

@@ -1,7 +1,4 @@
-use std::{
+use std::sync::{Arc, RwLock};
-    collections::HashMap,
-    sync::{Arc, RwLock},
-};
 
 use gilrs::{Event as GamepadEvent, EventType, GamepadId, ev::Code};
 use winit::{
@@ -11,13 +8,12 @@ use winit::{
 
 use crate::{
     emulator::{EmulatorClient, EmulatorCommand, SimId, VBKey},
-    input::{AxisMapping, InputMapping, MappingProvider},
+    input::{InputMapping, MappingProvider},
 };
 
 pub struct Controller {
     pub sim_id: SimId,
     state: VBKey,
-    axis_values: HashMap<(GamepadId, Code), f32>,
     mapping: Arc<RwLock<InputMapping>>,
 }
 
@@ -26,7 +22,6 @@ impl Controller {
         Self {
             sim_id,
             state: VBKey::SGN,
-            axis_values: HashMap::new(),
             mapping: mappings.for_sim(sim_id).clone(),
         }
     }
@@ -50,23 +45,20 @@ impl Controller {
                 (VBKey::empty(), mappings)
             }
             EventType::AxisChanged(_, value, code) => {
-                let mapping = self.map_axis(&event.id, &code)?;
+                let (neg, pos) = self.map_axis(&event.id, &code)?;
-                self.axis_values.insert((event.id, code), value);
+                let mut pressed = VBKey::empty();
-
+                let mut released = VBKey::empty();
-                let pair_value = mapping
+                if value < -0.75 {
-                    .pair
+                    pressed = pressed.union(neg);
-                    .and_then(|p| self.axis_values.get(&(event.id, p)))
+                }
-                    .copied()
+                if value > 0.75 {
-                    .unwrap_or_default();
+                    pressed = pressed.union(pos);
-                let neg = mapping.neg;
+                }
-                let pos = mapping.pos;
+                if value > -0.65 {
-
+                    released = released.union(neg);
-                let (mut pressed, mut released) = axis_presses(value, pair_value, neg, pos);
+                }
-                if let Some(other) = mapping.pair.and_then(|p| self.map_axis(&event.id, &p)) {
+                if value < 0.65 {
-                    let (other_pressed, other_released) =
+                    released = released.union(pos);
-                        axis_presses(pair_value, value, other.neg, other.pos);
-                    pressed = pressed.union(other_pressed);
-                    released = released.union(other_released);
                 }
                 (pressed, released)
             }
@@ -77,15 +69,6 @@ impl Controller {
         self.update_state(pressed, released)
     }
 
-    pub fn low_battery(&mut self, pwr: bool) -> Option<VBKey> {
-        let (pressed, released) = if pwr {
-            (VBKey::PWR, VBKey::empty())
-        } else {
-            (VBKey::empty(), VBKey::PWR)
-        };
-        self.update_state(pressed, released)
-    }
-
     fn update_state(&mut self, pressed: VBKey, released: VBKey) -> Option<VBKey> {
         let old_state = self.state;
         self.state = self.state.union(pressed).difference(released);
@@ -104,7 +87,7 @@ impl Controller {
         self.mapping.read().unwrap().map_button(id, code)
     }
 
-    fn map_axis(&self, id: &GamepadId, code: &Code) -> Option<AxisMapping> {
+    fn map_axis(&self, id: &GamepadId, code: &Code) -> Option<(VBKey, VBKey)> {
         self.mapping.read().unwrap().map_axis(id, code)
     }
 }
@@ -142,104 +125,4 @@ impl ControllerManager {
             }
         }
     }
-
-    pub fn handle_low_battery(&mut self, sim_id: SimId, pwr: bool) {
-        let controller = &mut self.controllers[sim_id.to_index()];
-        if let Some(pressed) = controller.low_battery(pwr) {
-            self.client
-                .send_command(EmulatorCommand::SetKeys(controller.sim_id, pressed));
-        }
-    }
-}
-
-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

@@ -18,7 +18,6 @@ use tracing::{error, warn};
 
 use crate::{
     audio::Audio,
-    config::SaveDataLocation,
     graphics::TextureSink,
     memory::{MemoryRange, MemoryRegion},
 };
@@ -75,13 +74,12 @@ pub struct EmulatorBuilder {
     state: Arc<Atomic<EmulatorState>>,
     audio_on: Arc<[AtomicBool; 2]>,
     linked: Arc<AtomicBool>,
-    save_data_location: Arc<Atomic<SaveDataLocation>>,
     start_paused: bool,
     watch_rom: Arc<[AtomicBool; 2]>,
 }
 
 impl EmulatorBuilder {
-    pub fn new(save_data_location: SaveDataLocation) -> (Self, EmulatorClient) {
+    pub fn new() -> (Self, EmulatorClient) {
         let (queue, commands) = mpsc::channel();
         let builder = Self {
             rom: None,
@@ -93,7 +91,6 @@ impl EmulatorBuilder {
             state: Arc::new(Atomic::new(EmulatorState::Paused)),
             audio_on: Arc::new([AtomicBool::new(true), AtomicBool::new(true)]),
             linked: Arc::new(AtomicBool::new(false)),
-            save_data_location: Arc::new(Atomic::new(save_data_location)),
             start_paused: false,
             watch_rom: Arc::new([AtomicBool::new(false), AtomicBool::new(false)]),
         };
@@ -101,9 +98,8 @@ impl EmulatorBuilder {
             queue,
             sim_state: builder.sim_state.clone(),
             state: builder.state.clone(),
-            linked: builder.linked.clone(),
-            save_data_location: builder.save_data_location.clone(),
             watch_rom: builder.watch_rom.clone(),
+            linked: builder.linked.clone(),
         };
         (builder, client)
     }
@@ -135,42 +131,18 @@ impl EmulatorBuilder {
     }
 
     pub fn build(self) -> Result<Emulator> {
-        let Self {
+        let mut emulator = Emulator::new(
-            rom,
+            self.commands,
-            commands,
+            self.sim_state,
-            sim_state,
+            self.state,
-            state,
+            self.audio_on,
-            audio_on,
+            self.watch_rom,
-            watch_rom,
+            self.linked,
-            linked,
+        )?;
-            save_data_location,
+        if let Some(path) = self.rom {
-            start_paused,
-        } = self;
-        let mut emulator = Emulator {
-            sims: vec![],
-            carts: [None, None],
-            audio: Audio::init(),
-            commands,
-            sim_state,
-            state,
-            audio_on,
-            watch_rom,
-            linked,
-            save_data_location,
-            profilers: [None, None],
-            renderers: HashMap::new(),
-            messages: HashMap::new(),
-            debuggers: HashMap::new(),
-            stdouts: HashMap::new(),
-            watched_regions: HashMap::new(),
-            eye_contents: [vec![0u8; 384 * 224 * 2], vec![0u8; 384 * 224 * 2]],
-            audio_samples: Vec::with_capacity(EXPECTED_FRAME_SIZE),
-            buffer: vec![],
-        };
-        if let Some(path) = rom {
             emulator.load_cart(SimId::Player1, &path)?;
         }
-        if start_paused {
+        if self.start_paused {
             emulator.pause_sims()?;
         }
         Ok(emulator)
@@ -187,7 +159,6 @@ pub struct Emulator {
     audio_on: Arc<[AtomicBool; 2]>,
     watch_rom: Arc<[AtomicBool; 2]>,
     linked: Arc<AtomicBool>,
-    save_data_location: Arc<Atomic<SaveDataLocation>>,
     profilers: [Option<ProfileSender>; 2],
     renderers: HashMap<SimId, TextureSink>,
     messages: HashMap<SimId, mpsc::Sender<Toast>>,
@@ -200,6 +171,36 @@ pub struct Emulator {
 }
 
 impl Emulator {
+    fn new(
+        commands: mpsc::Receiver<EmulatorCommand>,
+        sim_state: Arc<[Atomic<SimState>; 2]>,
+        state: Arc<Atomic<EmulatorState>>,
+        audio_on: Arc<[AtomicBool; 2]>,
+        watch_rom: Arc<[AtomicBool; 2]>,
+        linked: Arc<AtomicBool>,
+    ) -> Result<Self> {
+        Ok(Self {
+            sims: vec![],
+            carts: [None, None],
+            audio: Audio::init()?,
+            commands,
+            sim_state,
+            state,
+            audio_on,
+            watch_rom,
+            linked,
+            profilers: [None, None],
+            renderers: HashMap::new(),
+            messages: HashMap::new(),
+            debuggers: HashMap::new(),
+            stdouts: HashMap::new(),
+            watched_regions: HashMap::new(),
+            eye_contents: [vec![0u8; 384 * 224 * 2], vec![0u8; 384 * 224 * 2]],
+            audio_samples: Vec::with_capacity(EXPECTED_FRAME_SIZE),
+            buffer: vec![],
+        })
+    }
+
     pub fn reload_cart(&mut self, sim_id: SimId) -> Result<()> {
         let Some(cart) = &self.carts[sim_id.to_index()] else {
             return Ok(());
@@ -210,12 +211,7 @@ impl Emulator {
 
     pub fn load_cart(&mut self, sim_id: SimId, path: &Path) -> Result<()> {
         let watch = self.watch_rom[sim_id.to_index()].load(Ordering::Acquire);
-        let cart = Cart::load(
+        let cart = Cart::load(path, sim_id, watch)?;
-            path,
-            sim_id,
-            self.save_data_location.load(Ordering::Acquire),
-            watch,
-        )?;
         self.try_reset_sim(sim_id, Some(cart))?;
         Ok(())
     }
@@ -228,12 +224,7 @@ impl Emulator {
         };
         let watch = self.watch_rom[SimId::Player2.to_index()].load(Ordering::Acquire);
         let cart = match file_path {
-            Some(rom_path) => Some(Cart::load(
+            Some(rom_path) => Some(Cart::load(&rom_path, SimId::Player2, watch)?),
-                &rom_path,
-                SimId::Player2,
-                self.save_data_location.load(Ordering::Acquire),
-                watch,
-            )?),
             None => None,
         };
         self.try_reset_sim(SimId::Player2, cart)?;
@@ -274,8 +265,7 @@ impl Emulator {
         } else if let Some(cart) = self.carts[index].as_mut()
             && cart.is_watching()
         {
-            cart.reload()?;
+            cart.restart_watching();
-            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()
@@ -696,20 +686,6 @@ impl Emulator {
                     cart.stop_watching();
                 }
             }
-            EmulatorCommand::SetSaveDataLocation(save_data_location) => {
-                self.save_data_location
-                    .store(save_data_location, Ordering::Release);
-                for sim_id in SimId::values() {
-                    if let Some(cart) = self.carts[sim_id.to_index()].as_mut()
-                        && let Err(error) = cart.change_save_data_location(save_data_location)
-                    {
-                        self.report_error(
-                            sim_id,
-                            format!("Error changing save data location: {error}"),
-                        );
-                    }
-                }
-            }
             EmulatorCommand::StartSecondSim(path) => {
                 if let Err(error) = self.start_second_sim(path) {
                     self.report_error(
@@ -877,7 +853,6 @@ pub enum EmulatorCommand {
     LoadGame(SimId, PathBuf),
     ReloadRom(SimId),
     WatchRom(SimId, bool),
-    SetSaveDataLocation(SaveDataLocation),
     StartSecondSim(Option<PathBuf>),
     StopSecondSim,
     Pause,
@@ -967,14 +942,10 @@ pub struct EmulatorClient {
     sim_state: Arc<[Atomic<SimState>; 2]>,
     state: Arc<Atomic<EmulatorState>>,
     linked: Arc<AtomicBool>,
-    save_data_location: Arc<Atomic<SaveDataLocation>>,
     watch_rom: Arc<[AtomicBool; 2]>,
 }
 
 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)
     }
@@ -984,9 +955,6 @@ impl EmulatorClient {
     pub fn are_sims_linked(&self) -> bool {
         self.linked.load(Ordering::Acquire)
     }
-    pub fn save_data_location(&self) -> SaveDataLocation {
-        self.save_data_location.load(Ordering::Acquire)
-    }
     pub fn is_rom_watched(&self, sim_id: SimId) -> bool {
         self.watch_rom[sim_id.to_index()].load(Ordering::Acquire)
     }

src/emulator/cart.rs

@@ -1,6 +1,6 @@
 use anyhow::Result;
 use notify::Watcher;
-use rand::RngExt;
+use rand::Rng;
 use std::{
     fs::{self, File},
     io::{Read, Seek as _, SeekFrom, Write as _},
@@ -8,15 +8,10 @@ use std::{
     sync::{Arc, atomic::AtomicBool},
 };
 
-use crate::{
+use crate::emulator::{SimId, game_info::GameInfo, shrooms_vb_util::rom_from_isx};
-    config::SaveDataLocation,
-    emulator::{SimId, game_info::GameInfo, shrooms_vb_util::rom_from_isx},
-    filesystem,
-};
 
 pub struct Cart {
     pub file_path: PathBuf,
-    sim_id: SimId,
     pub rom: Vec<u8>,
     sram_file: File,
     pub sram: Vec<u8>,
@@ -26,20 +21,18 @@ pub struct Cart {
 }
 
 impl Cart {
-    pub fn load(
+    pub fn load(file_path: &Path, sim_id: SimId, watch: bool) -> Result<Self> {
-        file_path: &Path,
+        let rom = fs::read(file_path)?;
-        sim_id: SimId,
+        let (rom, info) = try_parse_isx(file_path, &rom)
-        save_data_location: SaveDataLocation,
+            .or_else(|| try_parse_elf(file_path, &rom))
-        watch: bool,
+            .unwrap_or_else(|| (rom, GameInfo::empty(file_path)));
-    ) -> Result<Self> {
-        let (rom, info) = Self::read_rom(file_path)?;
 
         let mut sram_file = File::options()
             .read(true)
             .write(true)
             .create(true)
             .truncate(false)
-            .open(sram_path(file_path, sim_id, save_data_location))?;
+            .open(sram_path(file_path, sim_id))?;
 
         let sram = if sram_file.metadata()?.len() == 0 {
             // new SRAM file, randomize the contents
@@ -64,7 +57,6 @@ impl Cart {
 
         Ok(Cart {
             file_path: file_path.to_path_buf(),
-            sim_id,
             rom,
             sram_file,
             sram,
@@ -74,29 +66,6 @@ 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 change_save_data_location(
-        &mut self,
-        save_data_location: SaveDataLocation,
-    ) -> Result<()> {
-        self.sram_file = File::options()
-            .read(true)
-            .write(true)
-            .create(true)
-            .truncate(false)
-            .open(sram_path(&self.file_path, self.sim_id, save_data_location))?;
-        self.save_sram()
-    }
-
     pub fn save_sram(&mut self) -> Result<()> {
         self.sram_file.seek(SeekFrom::Start(0))?;
         self.sram_file.write_all(&self.sram)?;
@@ -123,14 +92,6 @@ 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> {
@@ -201,17 +162,9 @@ fn parse_elf_program<Elf: object::read::elf::FileHeader<Endian = object::Endiann
     Some(bytes)
 }
 
-fn sram_path(file_path: &Path, sim_id: SimId, save_data_location: SaveDataLocation) -> PathBuf {
+fn sram_path(file_path: &Path, sim_id: SimId) -> PathBuf {
-    let extension = match sim_id {
+    match sim_id {
-        SimId::Player1 => "p1.sram",
+        SimId::Player1 => file_path.with_extension("p1.sram"),
-        SimId::Player2 => "p2.sram",
+        SimId::Player2 => file_path.with_extension("p2.sram"),
-    };
-    if let SaveDataLocation::DataDirectory = save_data_location
-        && let Some(data_dir) = filesystem::init_data_dir()
-        && let Some(rom_name) = file_path.file_name()
-    {
-        data_dir.join(rom_name).with_extension(extension)
-    } else {
-        file_path.with_extension(extension)
     }
 }

src/emulator/game_info.rs

@@ -245,12 +245,9 @@ impl ParseContext<'_> {
     }
 }
 
-fn parse_inline<'a>(
+fn parse_inline(ctx: &mut ParseContext, node: gimli::EntriesTreeNode<Reader>) -> Result<()> {
-    ctx: &mut ParseContext<'a>,
-    node: gimli::EntriesTreeNode<'a, '_, Reader<'a>>,
-) -> Result<()> {
     if node.entry().tag() == gimli::DW_TAG_inlined_subroutine
-        && let Some(attr) = node.entry().attr_value(gimli::DW_AT_abstract_origin)
+        && let Some(attr) = node.entry().attr_value(gimli::DW_AT_abstract_origin)?
         && let Some(name) = ctx.name_attr(attr)?
     {
         let name = Arc::new(name);

src/emulator/shrooms_vb_util.rs

@@ -1,104 +1,13 @@
-use std::{
+use std::ffi::c_void;
-    ffi::c_void,
-    sync::{LazyLock, Mutex},
-};
-
-#[derive(Default)]
-struct Reallocator {
-    allocations: Vec<Allocation>,
-}
-
-unsafe impl Send for Reallocator {}
-
-struct Allocation {
-    ptr: *mut u8,
-    size: usize,
-}
-impl Allocation {
-    fn new(size: usize) -> Self {
-        let layout = Self::layout(size);
-        // SAFETY: our layout is not zero, not too big, and properly aligned
-        let ptr = unsafe { std::alloc::alloc_zeroed(layout) };
-        if ptr.is_null() {
-            std::alloc::handle_alloc_error(layout);
-        }
-        Self { ptr, size }
-    }
-
-    fn layout(size: usize) -> std::alloc::Layout {
-        assert!(size != 0);
-        std::alloc::Layout::from_size_align(size, 8).expect("far too large an allocation")
-    }
-
-    fn as_slice(&self) -> &[u8] {
-        // SAFETY: we allocated this ourselves, it's safe
-        unsafe { std::slice::from_raw_parts(self.ptr, self.size) }
-    }
-
-    fn as_mut_slice(&mut self) -> &mut [u8] {
-        // SAFETY: we allocated this ourselves, it's safe
-        unsafe { std::slice::from_raw_parts_mut(self.ptr, self.size) }
-    }
-}
-
-impl Drop for Allocation {
-    fn drop(&mut self) {
-        // SAFETY: we allocated this ourselves with this layout, and it hasn't been freed
-        unsafe { std::alloc::dealloc(self.ptr, Self::layout(self.size)) };
-    }
-}
-
-impl Reallocator {
-    fn realloc(&mut self, ptr: *mut c_void, new_size: usize) -> *mut c_void {
-        if let Some(old_data) = self.load_allocation(ptr) {
-            if new_size == 0 {
-                // free
-                std::ptr::null_mut()
-            } else {
-                // actually reallocate and copy the data over
-                let mut new_data = Allocation::new(new_size);
-                let bytes_to_copy = old_data.size.min(new_size);
-                new_data.as_mut_slice()[..bytes_to_copy]
-                    .copy_from_slice(&old_data.as_slice()[..bytes_to_copy]);
-                self.store_allocation(new_data)
-            }
-        } else if new_size > 0 {
-            // fresh allocation
-            let allocation = Allocation::new(new_size);
-            self.store_allocation(allocation)
-        } else {
-            std::ptr::null_mut()
-        }
-    }
-
-    fn load_allocation(&mut self, ptr: *mut c_void) -> Option<Allocation> {
-        if ptr.is_null() {
-            return None;
-        }
-        let index = self
-            .allocations
-            .iter()
-            .enumerate()
-            .find_map(|(i, alloc)| std::ptr::addr_eq(alloc.ptr, ptr).then_some(i))?;
-        let allocation = self.allocations.remove(index);
-        Some(allocation)
-    }
-
-    fn store_allocation(&mut self, allocation: Allocation) -> *mut c_void {
-        let ptr = allocation.ptr;
-        self.allocations.push(allocation);
-        ptr.cast()
-    }
-}
-
-static VBU_ALLOC: LazyLock<Mutex<Reallocator>> =
-    LazyLock::new(|| Mutex::new(Reallocator::default()));
 
 #[unsafe(no_mangle)]
-#[allow(nonstandard_style)]
+unsafe fn vbu_realloc_shim(ptr: *mut c_void, new_size: usize) -> *mut c_void {
-unsafe fn VBU_MEMMGR(ptr: *mut c_void, new_size: usize) -> *mut c_void {
+    if !ptr.is_null() {
-    let mut allocator = VBU_ALLOC.lock().unwrap();
+        // not supporting proper realloc because it needs bookkeeping and it's unnecessary
-    allocator.realloc(ptr, new_size)
+        return std::ptr::null_mut();
+    }
+    let allocation = vec![0u8; new_size].into_boxed_slice();
+    Box::into_raw(allocation).cast()
 }
 
 #[link(name = "vb")]
@@ -116,7 +25,7 @@ pub fn rom_from_isx(bytes: &[u8]) -> Option<Vec<u8>> {
     if raw_rom.is_null() {
         return None;
     }
-    let bytes = VBU_ALLOC.lock().unwrap().load_allocation(raw_rom)?;
+    // SAFETY: the rom was allocated by vbu_realloc_shim, which created it from a Vec<u8>.
-    assert_eq!(bytes.size, rom_length);
+    let rom = unsafe { Vec::from_raw_parts(raw_rom.cast(), rom_length, rom_length) };
-    Some(bytes.as_slice().to_vec())
+    Some(rom)
 }

src/filepicker.rs

@@ -1,103 +0,0 @@
-#[cfg(target_os = "linux")]
-use std::fmt::Write as _;
-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 {
-        #[cfg(target_os = "linux")]
-        let exts = extensions
-            .iter()
-            .map(|ext| {
-                let mut normalized = String::new();
-                for char in ext.to_string().chars() {
-                    if char.is_ascii_lowercase() {
-                        let _ = write!(&mut normalized, "[{char}{}]", char.to_ascii_uppercase());
-                    } else {
-                        normalized.push(char);
-                    }
-                }
-                normalized
-            })
-            .collect::<Vec<_>>();
-        #[cfg(target_os = "linux")]
-        let extensions = &exts;
-        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/filesystem.rs

@@ -1,143 +0,0 @@
-use std::{
-    collections::HashMap,
-    fs,
-    ops::Deref,
-    path::PathBuf,
-    sync::{
-        Arc, Mutex,
-        atomic::{AtomicU64, Ordering},
-    },
-};
-
-use anyhow::{Result, bail};
-use directories::ProjectDirs;
-use serde::{Deserialize, Serialize};
-
-#[derive(Clone)]
-pub struct Persistence {
-    config_dir: Option<PathBuf>,
-    versions: Arc<Mutex<HashMap<String, Arc<AtomicU64>>>>,
-}
-
-impl Persistence {
-    pub fn new() -> Self {
-        Self {
-            config_dir: init_config_dir(),
-            versions: Arc::new(Mutex::new(HashMap::new())),
-        }
-    }
-
-    pub fn config<T: ConfigCompatible>(&self, file: &str) -> Config<T> {
-        let latest_version = self
-            .versions
-            .lock()
-            .unwrap()
-            .entry(file.to_string())
-            .or_default()
-            .clone();
-        let path = self
-            .config_dir
-            .as_ref()
-            .map(|p| p.join(file).with_extension("json"));
-        let value = if let Some(p) = path.as_ref()
-            && let Ok(bytes) = fs::read(p)
-            && let Ok(v) = serde_json::from_slice(&bytes)
-        {
-            v
-        } else {
-            T::default()
-        };
-        Config {
-            value,
-            version: latest_version.load(Ordering::Relaxed),
-            latest_version,
-            path,
-        }
-    }
-
-    pub fn save_config<T: Serialize>(&self, file: &str, data: &T) -> Result<()> {
-        if let Some(config_dir) = self.config_dir.as_ref() {
-            let bytes = serde_json::to_vec_pretty(data)?;
-            let filename = config_dir.join(file).with_extension("json");
-            fs::write(&filename, bytes)?;
-        }
-        Ok(())
-    }
-
-    pub fn load_config<T: for<'a> Deserialize<'a>>(&self, file: &str) -> Result<T> {
-        let Some(config_dir) = self.config_dir.as_ref() else {
-            bail!("config directory not found");
-        };
-        let filename = config_dir.join(file).with_extension("json");
-        let bytes = fs::read(filename)?;
-        Ok(serde_json::from_slice(&bytes)?)
-    }
-}
-
-fn init_config_dir() -> Option<PathBuf> {
-    let config_dir = project_dirs()?.config_dir().to_path_buf();
-    fs::create_dir_all(&config_dir).ok()?;
-    Some(config_dir)
-}
-
-pub fn init_data_dir() -> Option<PathBuf> {
-    let data_dir = project_dirs()?.data_dir().to_path_buf();
-    fs::create_dir_all(&data_dir).ok()?;
-    Some(data_dir)
-}
-
-fn project_dirs() -> Option<ProjectDirs> {
-    ProjectDirs::from("com", "virtual-boy", "Lemur")
-}
-
-pub trait ConfigCompatible: Clone + Default + Eq + Serialize + for<'a> Deserialize<'a> {}
-impl<T: Clone + Default + Eq + Serialize + for<'a> Deserialize<'a>> ConfigCompatible for T {}
-
-// A wrapper for a T (probably) stored on the filesystem.
-// Cheap to dereference, easy to sync changes to all copies.
-pub struct Config<T> {
-    value: T,
-    version: u64,
-    latest_version: Arc<AtomicU64>,
-    path: Option<PathBuf>,
-}
-
-impl<T> Deref for Config<T> {
-    type Target = T;
-
-    fn deref(&self) -> &Self::Target {
-        &self.value
-    }
-}
-
-impl<T: ConfigCompatible> Config<T> {
-    pub fn refresh(&mut self) {
-        let version = self.latest_version.load(Ordering::Relaxed);
-        if self.version == version {
-            return;
-        }
-        if let Some(path) = &self.path
-            && let Ok(bytes) = fs::read(path)
-            && let Ok(latest) = serde_json::from_slice(&bytes)
-        {
-            self.value = latest;
-        }
-        self.version = version;
-    }
-
-    pub fn update(&mut self, update: impl FnOnce(&mut T)) {
-        let mut new_value = self.value.clone();
-        update(&mut new_value);
-        if self.value == new_value {
-            return;
-        }
-        if let Some(path) = &self.path
-            && let Ok(bytes) = serde_json::to_vec(&new_value)
-        {
-            let _ = fs::write(path, bytes);
-        }
-        let version = self.latest_version.fetch_add(1, Ordering::Relaxed) + 1;
-        self.value = new_value.clone();
-        self.version = version;
-    }
-}

src/images.rs

@@ -1,5 +1,5 @@
 use std::{
-    collections::{HashMap, hash_map::Entry},
+    collections::HashMap,
     ops::Deref,
     sync::{Arc, Mutex, Weak},
     thread,
@@ -7,21 +7,17 @@ use std::{
 };
 
 use egui::{
-    Color32, ColorImage, TextureHandle,
+    Color32, ColorImage, TextureHandle, TextureOptions,
     epaint::ImageDelta,
-    generate_loader_id,
     load::{LoadError, SizedTexture, TextureLoader, TexturePoll},
 };
 use tokio::{sync::mpsc, time::timeout};
 
-use crate::emulator::SimId;
+pub struct ImageProcessor {
-
-pub struct ImageTextureLoader {
-    cache: Mutex<HashMap<String, ImageEntry>>,
     sender: mpsc::UnboundedSender<Box<dyn ImageRendererImpl>>,
 }
 
-impl ImageTextureLoader {
+impl ImageProcessor {
     pub fn new() -> Self {
         let (sender, receiver) = mpsc::unbounded_channel();
         thread::spawn(move || {
@@ -30,52 +26,29 @@ impl ImageTextureLoader {
                 .build()
                 .unwrap()
                 .block_on(async move {
-                    let mut worker = ImageTextureLoaderWorker {
+                    let mut worker = ImageProcessorWorker {
                         receiver,
                         renderers: vec![],
                     };
                     worker.run().await
                 })
         });
-        Self {
+        Self { sender }
-            cache: Mutex::new(HashMap::new()),
-            sender,
-        }
     }
 
     pub fn add<const N: usize, R: ImageRenderer<N> + 'static>(
         &self,
-        sim_id: SimId,
         renderer: R,
         params: R::Params,
-    ) -> ImageParams<R::Params> {
+    ) -> ([ImageHandle; N], ImageParams<R::Params>) {
         let states = renderer.sizes().map(ImageState::new);
+        let handles = states.clone().map(|state| ImageHandle {
+            size: state.size.map(|i| i as f32),
+            data: state.sink,
+        });
         let images = renderer
             .sizes()
             .map(|[width, height]| ImageBuffer::new(width, height));
-        {
-            let mut cache = self.cache.lock().unwrap();
-            for (name, state) in renderer.names().into_iter().zip(&states) {
-                let url = format!("vip://{sim_id}/{name}");
-                let entry = ImageEntry {
-                    size: state.size.map(|i| i as f32),
-                    data: Arc::downgrade(&state.sink),
-                    texture: None,
-                };
-                match cache.entry(url) {
-                    Entry::Vacant(e) => {
-                        e.insert(entry);
-                    }
-                    Entry::Occupied(mut e) => {
-                        // Only overwrite an old entry if that entry is dead.
-                        // Otherwise, we clear out the reference to a texture actually in use.
-                        if e.get().data.strong_count() == 0 {
-                            e.insert(entry);
-                        }
-                    }
-                }
-            }
-        }
         let sink = Arc::new(Mutex::new(params.clone()));
         let _ = self.sender.send(Box::new(ImageRendererWrapper {
             renderer,
@@ -83,87 +56,20 @@ impl ImageTextureLoader {
             images,
             states,
         }));
-        ImageParams {
+        let params = ImageParams {
             value: params,
             sink,
-        }
+        };
+        (handles, params)
     }
 }
 
-impl TextureLoader for ImageTextureLoader {
+struct ImageProcessorWorker {
-    fn id(&self) -> &str {
-        generate_loader_id!(ImageTextureLoader2)
-    }
-
-    fn load(
-        &self,
-        ctx: &egui::Context,
-        uri: &str,
-        texture_options: egui::TextureOptions,
-        _size_hint: egui::SizeHint,
-    ) -> Result<TexturePoll, LoadError> {
-        let mut cache = self.cache.lock().unwrap();
-        let Some(entry) = cache.get_mut(uri) else {
-            return Err(LoadError::NotSupported);
-        };
-        if texture_options != egui::TextureOptions::NEAREST {
-            return Err(LoadError::Loading(
-                "Only TextureOptions::NEAREST are supported".into(),
-            ));
-        }
-        let Some(data) = entry.data.upgrade() else {
-            cache.remove(uri);
-            return Err(LoadError::Loading("Backing loader no longer exists".into()));
-        };
-        match (data.lock().unwrap().take(), entry.texture.as_ref()) {
-            (Some(update), Some(handle)) => {
-                let delta = ImageDelta::full(update, texture_options);
-                ctx.tex_manager().write().set(handle.id(), delta);
-                let texture = SizedTexture::new(handle, entry.size);
-                Ok(TexturePoll::Ready { texture })
-            }
-            (Some(update), None) => {
-                let handle = ctx.load_texture(uri, update, texture_options);
-                let texture = SizedTexture::new(&handle, entry.size);
-                entry.texture.replace(handle);
-                Ok(TexturePoll::Ready { texture })
-            }
-            (None, Some(handle)) => {
-                let texture = SizedTexture::new(handle, entry.size);
-                Ok(TexturePoll::Ready { texture })
-            }
-            (None, None) => {
-                let size = entry.size.into();
-                Ok(TexturePoll::Pending { size: Some(size) })
-            }
-        }
-    }
-
-    fn forget(&self, uri: &str) {
-        let _ = uri;
-    }
-
-    fn forget_all(&self) {}
-
-    fn byte_size(&self) -> usize {
-        self.cache
-            .lock()
-            .unwrap()
-            .values()
-            .map(|entry| {
-                let [width, height] = entry.size;
-                width as usize * height as usize * 4
-            })
-            .sum()
-    }
-}
-
-struct ImageTextureLoaderWorker {
     receiver: mpsc::UnboundedReceiver<Box<dyn ImageRendererImpl>>,
     renderers: Vec<Box<dyn ImageRendererImpl>>,
 }
 
-impl ImageTextureLoaderWorker {
+impl ImageProcessorWorker {
     async fn run(&mut self) {
         loop {
             if self.renderers.is_empty() {
@@ -236,10 +142,16 @@ impl ImageBuffer {
     }
 }
 
-struct ImageEntry {
+#[derive(Clone)]
+pub struct ImageHandle {
     size: [f32; 2],
-    data: Weak<Mutex<Option<Arc<ColorImage>>>>,
+    data: Arc<Mutex<Option<Arc<ColorImage>>>>,
-    texture: Option<TextureHandle>,
+}
+
+impl ImageHandle {
+    fn pull(&mut self) -> Option<Arc<ColorImage>> {
+        self.data.lock().unwrap().take()
+    }
 }
 
 pub struct ImageParams<T> {
@@ -266,7 +178,6 @@ impl<T: Clone + Eq> ImageParams<T> {
 
 pub trait ImageRenderer<const N: usize>: Send {
     type Params: Clone + Send;
-    fn names(&self) -> [&str; N];
     fn sizes(&self) -> [[usize; 2]; N];
     fn render(&mut self, params: &Self::Params, images: &mut [ImageBuffer; N]);
 }
@@ -335,3 +246,83 @@ impl<const N: usize, R: ImageRenderer<N> + Send> ImageRendererImpl for ImageRend
         Ok(())
     }
 }
+
+pub struct ImageTextureLoader {
+    cache: Mutex<HashMap<String, (ImageHandle, Option<TextureHandle>)>>,
+}
+
+impl ImageTextureLoader {
+    pub fn new(renderers: impl IntoIterator<Item = (String, ImageHandle)>) -> Self {
+        let mut cache = HashMap::new();
+        for (key, image) in renderers {
+            cache.insert(key, (image, None));
+        }
+        Self {
+            cache: Mutex::new(cache),
+        }
+    }
+}
+
+impl TextureLoader for ImageTextureLoader {
+    fn id(&self) -> &str {
+        concat!(module_path!(), "ImageTextureLoader")
+    }
+
+    fn load(
+        &self,
+        ctx: &egui::Context,
+        uri: &str,
+        texture_options: TextureOptions,
+        _size_hint: egui::SizeHint,
+    ) -> Result<TexturePoll, LoadError> {
+        let mut cache = self.cache.lock().unwrap();
+        let Some((image, maybe_handle)) = cache.get_mut(uri) else {
+            return Err(LoadError::NotSupported);
+        };
+        if texture_options != TextureOptions::NEAREST {
+            return Err(LoadError::Loading(
+                "Only TextureOptions::NEAREST are supported".into(),
+            ));
+        }
+        match (image.pull(), maybe_handle.as_ref()) {
+            (Some(update), Some(handle)) => {
+                let delta = ImageDelta::full(update, texture_options);
+                ctx.tex_manager().write().set(handle.id(), delta);
+                let texture = SizedTexture::new(handle, image.size);
+                Ok(TexturePoll::Ready { texture })
+            }
+            (Some(update), None) => {
+                let handle = ctx.load_texture(uri, update, texture_options);
+                let texture = SizedTexture::new(&handle, image.size);
+                maybe_handle.replace(handle);
+                Ok(TexturePoll::Ready { texture })
+            }
+            (None, Some(handle)) => {
+                let texture = SizedTexture::new(handle, image.size);
+                Ok(TexturePoll::Ready { texture })
+            }
+            (None, None) => {
+                let size = image.size.into();
+                Ok(TexturePoll::Pending { size: Some(size) })
+            }
+        }
+    }
+
+    fn forget(&self, uri: &str) {
+        let _ = uri;
+    }
+
+    fn forget_all(&self) {}
+
+    fn byte_size(&self) -> usize {
+        self.cache
+            .lock()
+            .unwrap()
+            .values()
+            .map(|(image, _)| {
+                let [width, height] = image.size;
+                width as usize * height as usize * 4
+            })
+            .sum()
+    }
+}

src/input.rs

@@ -14,7 +14,7 @@ use winit::keyboard::{KeyCode, PhysicalKey};
 
 use crate::{
     emulator::{SimId, VBKey},
-    filesystem::Persistence,
+    persistence::Persistence,
 };
 
 #[derive(Clone, PartialEq, Eq, Hash)]
@@ -52,28 +52,12 @@ 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, AxisMapping>,
+    axes: HashMap<Code, (VBKey, VBKey)>,
     default_buttons: HashMap<Code, VBKey>,
-    default_axes: HashMap<Code, AxisMapping>,
+    default_axes: HashMap<Code, (VBKey, VBKey)>,
 }
 
 impl GamepadMapping {
@@ -94,8 +78,7 @@ 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) {
-                let pair = axis.second_axis().and_then(|a| gamepad.axis_code(a));
+                default_axes.insert(code, (neg, pos));
-                default_axes.insert(code, AxisMapping { neg, pos, pair });
             }
         };
         default_axis(Axis::LeftStickX, VBKey::LL, VBKey::LR);
@@ -119,13 +102,19 @@ impl GamepadMapping {
     }
 
     pub fn add_axis_neg_mapping(&mut self, key: VBKey, code: Code) {
-        let entry = self.axes.entry(code).or_default();
+        let entry = self
-        entry.neg = entry.neg.union(key);
+            .axes
+            .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.axes.entry(code).or_default();
+        let entry = self
-        entry.pos = entry.pos.union(key);
+            .axes
+            .entry(code)
+            .or_insert((VBKey::empty(), VBKey::empty()));
+        entry.1 = entry.1.union(key);
     }
 
     fn save_mappings(&self) -> PersistedGamepadMapping {
@@ -156,11 +145,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, mapping) in &self.axes {
+        for (axis, (left_keys, right_keys)) in &self.axes {
-            for key in mapping.neg.iter() {
+            for key in left_keys.iter() {
                 results.entry(key).or_default().push(format!("-{axis}"));
             }
-            for key in mapping.pos.iter() {
+            for key in right_keys.iter() {
                 results.entry(key).or_default().push(format!("+{axis}"));
             }
         }
@@ -173,10 +162,10 @@ impl Mappings for GamepadMapping {
     }
 
     fn clear_mappings(&mut self, key: VBKey) {
-        self.axes.retain(|_, mapping| {
+        self.axes.retain(|_, (left, right)| {
-            mapping.neg = mapping.neg.difference(key);
+            *left = left.difference(key);
-            mapping.pos = mapping.pos.difference(key);
+            *right = right.difference(key);
-            !(mapping.neg.is_empty() && mapping.pos.is_empty())
+            !(left.is_empty() && right.is_empty())
         });
         self.buttons.retain(|_, keys| {
             *keys = keys.difference(key);
@@ -211,7 +200,7 @@ impl InputMapping {
         mappings.buttons.get(code).copied()
     }
 
-    pub fn map_axis(&self, id: &GamepadId, code: &Code) -> Option<AxisMapping> {
+    pub fn map_axis(&self, id: &GamepadId, code: &Code) -> Option<(VBKey, VBKey)> {
         let mappings = self.gamepads.get(id)?.read().unwrap();
         mappings.axes.get(code).copied()
     }
@@ -283,14 +272,13 @@ impl Mappings for InputMapping {
 #[derive(Clone)]
 pub struct MappingProvider {
     persistence: Persistence,
-    first_gamepad_is_p2: bool,
     device_mappings: Arc<RwLock<HashMap<DeviceId, Arc<RwLock<GamepadMapping>>>>>,
     sim_mappings: HashMap<SimId, Arc<RwLock<InputMapping>>>,
     gamepad_info: Arc<RwLock<HashMap<GamepadId, GamepadInfo>>>,
 }
 
 impl MappingProvider {
-    pub fn new(persistence: Persistence, first_gamepad_is_p2: bool) -> Self {
+    pub fn new(persistence: Persistence) -> Self {
         let mut sim_mappings = HashMap::new();
         let mut device_mappings = HashMap::new();
 
@@ -319,7 +307,6 @@ impl MappingProvider {
             device_mappings: Arc::new(RwLock::new(device_mappings)),
             gamepad_info: Arc::new(RwLock::new(HashMap::new())),
             sim_mappings,
-            first_gamepad_is_p2,
         }
     }
 
@@ -351,12 +338,7 @@ impl MappingProvider {
         .clone();
         drop(lock);
         let mut lock = self.gamepad_info.write().unwrap();
-        let players = if self.first_gamepad_is_p2 {
+        let bound_to = SimId::values()
-            vec![SimId::Player2, SimId::Player1]
-        } else {
-            vec![SimId::Player1, SimId::Player2]
-        };
-        let bound_to = players
             .into_iter()
             .find(|sim_id| lock.values().all(|info| info.bound_to != Some(*sim_id)));
         if let Entry::Vacant(entry) = lock.entry(gamepad.id()) {
@@ -470,9 +452,9 @@ struct PersistedKeyboardMapping {
 #[derive(Serialize, Deserialize)]
 struct PersistedGamepadMapping {
     buttons: Vec<(Code, VBKey)>,
-    axes: Vec<(Code, AxisMapping)>,
+    axes: Vec<(Code, (VBKey, VBKey))>,
     default_buttons: Vec<(Code, VBKey)>,
-    default_axes: Vec<(Code, AxisMapping)>,
+    default_axes: Vec<(Code, (VBKey, VBKey))>,
 }
 
 #[derive(Clone, Copy, Serialize, Deserialize, PartialEq, Eq, Hash)]
@@ -701,7 +683,7 @@ impl ShortcutProvider {
                 else {
                     return true;
                 };
-                if *key != shortcut.logical_key || !modifiers.contains(shortcut.modifiers) {
+                if shortcut.logical_key != *key || !shortcut.modifiers.contains(*modifiers) {
                     return true;
                 }
                 if matches!(command, Command::FastForward(_)) {

src/main.rs

@@ -13,9 +13,9 @@ use tracing_subscriber::{EnvFilter, Layer, layer::SubscriberExt, util::Subscribe
 use winit::event_loop::{ControlFlow, EventLoop};
 
 use crate::{
-    config::{AppConfig, CliArgs, SimConfig},
+    config::{CliArgs, SimConfig},
     emulator::SimId,
-    filesystem::Persistence,
+    persistence::Persistence,
 };
 
 mod app;
@@ -23,13 +23,12 @@ mod audio;
 mod config;
 mod controller;
 mod emulator;
-mod filepicker;
-mod filesystem;
 mod gdbserver;
 mod graphics;
 mod images;
 mod input;
 mod memory;
+mod persistence;
 mod profiler;
 mod window;
 
@@ -60,9 +59,14 @@ fn set_panic_handler() {
 
         eprint!("{message}");
 
-        let Some(data_dir) = filesystem::init_data_dir() else {
+        let Some(project_dirs) = directories::ProjectDirs::from("com", "virtual-boy", "Lemur")
+        else {
             return;
         };
+        let data_dir = project_dirs.data_dir();
+        if std::fs::create_dir_all(data_dir).is_err() {
+            return;
+        }
         let timestamp = SystemTime::now()
             .duration_since(SystemTime::UNIX_EPOCH)
             .unwrap()
@@ -93,13 +97,7 @@ fn main() -> Result<()> {
 
     let persistence = Persistence::new();
 
-    let mut config = AppConfig::load(&persistence);
+    let (mut builder, client) = EmulatorBuilder::new();
-    config.update(|c| c.apply_updates(&args));
-
-    let p1 = SimConfig::load(&persistence, SimId::Player1);
-    let p2 = SimConfig::load(&persistence, SimId::Player2);
-
-    let (mut builder, client) = EmulatorBuilder::new(config.save_data_location);
     if let Some(path) = &args.rom {
         builder = builder.with_rom(path);
     }
@@ -112,6 +110,8 @@ fn main() -> Result<()> {
     if args.profile {
         builder = builder.start_paused(true)
     }
+    let p1 = SimConfig::load(&persistence, SimId::Player1);
+    let p2 = SimConfig::load(&persistence, SimId::Player2);
 
     let watch = args.watch;
 
@@ -136,14 +136,6 @@ 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();
-    let handle = event_loop.owned_display_handle();
+    event_loop.run_app(&mut Application::new(client, proxy, persistence, args))?;
-    event_loop.run_app(&mut Application::new(
-        client,
-        proxy,
-        handle,
-        persistence,
-        args,
-        config,
-    ))?;
     Ok(())
 }

src/persistence.rs

@@ -0,0 +1,46 @@
+use std::{fs, path::PathBuf};
+
+use anyhow::{Result, bail};
+use directories::ProjectDirs;
+use serde::{Deserialize, Serialize};
+
+#[derive(Clone)]
+pub struct Persistence {
+    dirs: Option<Dirs>,
+}
+
+impl Persistence {
+    pub fn new() -> Self {
+        Self { dirs: init_dirs() }
+    }
+
+    pub fn save_config<T: Serialize>(&self, file: &str, data: &T) -> Result<()> {
+        if let Some(dirs) = self.dirs.as_ref() {
+            let bytes = serde_json::to_vec_pretty(data)?;
+            let filename = dirs.config_dir.join(file).with_extension("json");
+            fs::write(&filename, bytes)?;
+        }
+        Ok(())
+    }
+
+    pub fn load_config<T: for<'a> Deserialize<'a>>(&self, file: &str) -> Result<T> {
+        let Some(dirs) = self.dirs.as_ref() else {
+            bail!("config directory not found");
+        };
+        let filename = dirs.config_dir.join(file).with_extension("json");
+        let bytes = fs::read(filename)?;
+        Ok(serde_json::from_slice(&bytes)?)
+    }
+}
+
+#[derive(Clone)]
+struct Dirs {
+    config_dir: PathBuf,
+}
+
+fn init_dirs() -> Option<Dirs> {
+    let dirs = ProjectDirs::from("com", "virtual-boy", "Lemur")?;
+    let config_dir = dirs.config_dir().to_path_buf();
+    fs::create_dir_all(&config_dir).ok()?;
+    Some(Dirs { config_dir })
+}

src/window.rs

@@ -1,9 +1,9 @@
-use std::{path::PathBuf, sync::Arc};
+use std::sync::Arc;
 
 pub use about::AboutWindow;
-use egui::{Ui, ViewportBuilder};
+use egui::{Context, ViewportBuilder, ViewportId};
-pub use game::{ChildWindow, GameWindow};
+pub use game::GameWindow;
-pub use game_screen::{DisplayMode, GameScreen};
+pub use game_screen::DisplayMode;
 pub use gdb::GdbServerWindow;
 pub use hotkeys::HotkeysWindow;
 pub use input::InputWindow;
@@ -28,17 +28,16 @@ mod utils;
 mod vip;
 
 pub trait AppWindow {
-    fn sim_id(&self) -> Option<SimId> {
+    fn viewport_id(&self) -> ViewportId;
-        None
+    fn sim_id(&self) -> SimId {
-    }
+        SimId::Player1
-    fn image_url(&self, name: &str) -> String {
-        format!("vip://{}/{name}", self.sim_id().unwrap_or(SimId::Player1))
     }
     fn initial_viewport(&self) -> ViewportBuilder;
-    fn show(&mut self, ui: &mut Ui);
+    fn show(&mut self, ctx: &Context);
     fn on_init(&mut self, args: InitArgs) {
         let _ = args;
     }
+    fn on_destroy(&mut self) {}
     fn handle_key_event(&mut self, event: &KeyEvent) -> bool {
         let _ = event;
         false
@@ -47,13 +46,10 @@ pub trait AppWindow {
         let _ = event;
         false
     }
-    fn handle_dropped_file(&mut self, path: PathBuf) -> bool {
-        let _ = path;
-        false
-    }
 }
 
 pub struct InitArgs<'a> {
+    pub ctx: &'a Context,
     pub window: &'a Arc<Window>,
     pub render_state: &'a egui_wgpu::RenderState,
 }

src/window/about.rs

@@ -1,18 +1,22 @@
-use egui::{CentralPanel, Image, Ui, ViewportBuilder};
+use egui::{CentralPanel, Context, Image, ViewportBuilder, ViewportId};
 
 use super::AppWindow;
 
 pub struct AboutWindow;
 
 impl AppWindow for AboutWindow {
+    fn viewport_id(&self) -> ViewportId {
+        ViewportId::from_hash_of("About")
+    }
+
     fn initial_viewport(&self) -> ViewportBuilder {
         ViewportBuilder::default()
             .with_title("About Lemur")
             .with_inner_size((300.0, 200.0))
     }
 
-    fn show(&mut self, ui: &mut Ui) {
+    fn show(&mut self, ctx: &Context) {
-        CentralPanel::default().show(ui, |ui| {
+        CentralPanel::default().show(ctx, |ui| {
             ui.vertical_centered(|ui| {
                 ui.label("Lemur Virtual Boy Emulator");
                 ui.label(format!("Version {}", env!("CARGO_PKG_VERSION")));

src/window/game.rs

@@ -1,33 +1,23 @@
 use std::{
-    ops::{Deref, DerefMut},
+    sync::{Arc, mpsc},
-    path::PathBuf,
-    sync::{Arc, Mutex, atomic::AtomicBool, mpsc},
     time::Duration,
 };
 
 use crate::{
     app::UserEvent,
-    config::{AppConfig, COLOR_PRESETS, Config, SaveDataLocation, SimConfig},
+    config::{COLOR_PRESETS, SimConfig},
     emulator::{EmulatorClient, EmulatorCommand, EmulatorState, SimId, SimState},
-    filepicker::FilePicker,
+    input::{Command, ShortcutProvider},
-    filesystem::Persistence,
+    persistence::Persistence,
-    images::ImageTextureLoader,
+    window::InitArgs,
-    input::{Command, MappingProvider, ShortcutProvider},
-    memory::MemoryClient,
-    window::{
-        AboutWindow, BgMapWindow, CharacterDataWindow, FrameBufferWindow, GdbServerWindow,
-        HotkeysWindow, InitArgs, InputWindow, ObjectWindow, ProfileWindow, RegisterWindow,
-        TerminalWindow, WorldWindow, utils::UiData,
-    },
 };
 use anyhow::Context as _;
 use egui::{
-    Align2, Button, CentralPanel, Color32, Context, Frame, MenuBar, Panel, Pos2, Ui, Vec2,
+    Align2, Button, CentralPanel, Color32, Context, Frame, MenuBar, TopBottomPanel, Ui, Vec2,
-    ViewportBuilder, ViewportCommand, ViewportId, ViewportIdMap, Window,
+    ViewportBuilder, ViewportCommand, ViewportId, Window,
 };
 use egui_notify::{Anchor, Toast, Toasts};
-use serde::{Deserialize, Serialize};
+use winit::event_loop::EventLoopProxy;
-use winit::{event::KeyEvent, event_loop::EventLoopProxy};
 
 use super::{
     AppWindow,
@@ -36,51 +26,33 @@ use super::{
 };
 
 pub struct GameWindow {
-    viewport_id: ViewportId,
     client: EmulatorClient,
     proxy: EventLoopProxy<UserEvent>,
     persistence: Persistence,
     shortcuts: ShortcutProvider,
     sim_id: SimId,
-    config: Config<SimConfig>,
+    config: SimConfig,
     toasts: Toasts,
     screen: Option<GameScreen>,
-    messages: mpsc::Receiver<Toast>,
+    messages: Option<mpsc::Receiver<Toast>>,
-    message_sink: mpsc::Sender<Toast>,
     color_picker: Option<ColorPickerState>,
-    file_picker: FilePicker,
+    window: Option<Arc<winit::window::Window>>,
-    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 {
-    #[expect(clippy::too_many_arguments)]
     pub fn new(
-        viewport_id: ViewportId,
         client: EmulatorClient,
         proxy: EventLoopProxy<UserEvent>,
         persistence: Persistence,
         shortcuts: ShortcutProvider,
-        memory: &Arc<MemoryClient>,
-        images: &Arc<ImageTextureLoader>,
-        mappings: MappingProvider,
         sim_id: SimId,
     ) -> Self {
         let config = SimConfig::load(&persistence, sim_id);
-        let _ = proxy.send_event(UserEvent::LowBattery(sim_id, config.low_battery));
-        client.send_command(EmulatorCommand::WatchRom(sim_id, config.watch_rom));
         let toasts = Toasts::new()
             .with_anchor(Anchor::BottomLeft)
             .with_margin((10.0, 10.0).into())
             .reverse(true);
-        let (message_sink, messages) = mpsc::channel();
         Self {
-            viewport_id,
             client,
             proxy,
             persistence,
@@ -89,178 +61,13 @@ impl GameWindow {
             config,
             toasts,
             screen: None,
-            messages,
+            messages: None,
-            message_sink,
             color_picker: None,
-            file_picker: FilePicker::new(),
+            window: None,
-            memory: memory.clone(),
-            images: images.clone(),
-            mappings: mappings.clone(),
-            children: ViewportIdMap::default(),
-            child_states: UiData::new(),
-            queued_children: vec![],
-            show_player_name: false,
         }
     }
 
-    pub fn open(&mut self, window: ChildWindow) {
+    fn show_menu(&mut self, ctx: &Context, ui: &mut Ui) {
-        // queue opening this child until our next render call,
-        // so that we get a chance to look up its size
-        self.queued_children.push(window);
-    }
-
-    pub fn close(&mut self, window: ChildWindow) {
-        let id = window.viewport_id(self.sim_id);
-        self.children.remove(&id);
-    }
-
-    fn do_open(&mut self, window: ChildWindow) {
-        let viewport_id = window.viewport_id(self.sim_id);
-        if self.children.contains_key(&viewport_id) {
-            return;
-        }
-        let child = match window {
-            ChildWindow::About => AppWrapper::of_dyn(AboutWindow),
-            ChildWindow::CharacterData => AppWrapper::of_dyn(CharacterDataWindow::new(
-                self.sim_id,
-                &self.memory,
-                &self.persistence,
-                &self.images,
-            )),
-            ChildWindow::BgMap => AppWrapper::of_dyn(BgMapWindow::new(
-                self.sim_id,
-                &self.memory,
-                &self.persistence,
-                &self.images,
-            )),
-            ChildWindow::Objects => AppWrapper::of_dyn(ObjectWindow::new(
-                self.sim_id,
-                &self.memory,
-                &self.persistence,
-                &self.images,
-            )),
-            ChildWindow::Worlds => AppWrapper::of_dyn(WorldWindow::new(
-                self.sim_id,
-                &self.memory,
-                &self.persistence,
-                &self.images,
-            )),
-            ChildWindow::FrameBuffers => AppWrapper::of_dyn(FrameBufferWindow::new(
-                self.sim_id,
-                &self.memory,
-                &self.persistence,
-                &self.images,
-            )),
-            ChildWindow::Registers => AppWrapper::of_dyn(RegisterWindow::new(
-                self.sim_id,
-                &self.memory,
-                &self.persistence,
-            )),
-            ChildWindow::Terminal => {
-                AppWrapper::of_dyn(TerminalWindow::new(self.sim_id, &self.client))
-            }
-            ChildWindow::Profiler { launch } => {
-                let mut profile = ProfileWindow::new(self.sim_id, self.client.clone());
-                if launch {
-                    profile.launch();
-                }
-                AppWrapper::of_dyn(profile)
-            }
-            ChildWindow::Debugger { port } => {
-                let mut debugger =
-                    GdbServerWindow::new(self.sim_id, self.client.clone(), self.proxy.clone());
-                if let Some(port) = port {
-                    debugger.launch(port);
-                }
-                AppWrapper::of_dyn(debugger)
-            }
-            ChildWindow::Input => AppWrapper::of_dyn(InputWindow::new(self.mappings.clone())),
-            ChildWindow::Hotkeys => AppWrapper::of_dyn(HotkeysWindow::new(self.shortcuts.clone())),
-            ChildWindow::Player2 => {
-                if self.sim_id == SimId::Player2 {
-                    return;
-                }
-                AppWrapper::of_game(GameWindow::new(
-                    viewport_id,
-                    self.client.clone(),
-                    self.proxy.clone(),
-                    self.persistence.clone(),
-                    self.shortcuts.clone(),
-                    &self.memory,
-                    &self.images,
-                    self.mappings.clone(),
-                    SimId::Player2,
-                ))
-            }
-        };
-
-        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);
-        }
-        self.children.insert(
-            viewport_id,
-            ChildWindowWrapper {
-                app: Arc::new(Mutex::new(child)),
-                title,
-                sim_id,
-                updates: Some(viewport),
-                close_requested: Arc::new(AtomicBool::new(false)),
-            },
-        );
-    }
-
-    pub fn handle_init(&mut self, viewport_id: ViewportId, args: InitArgs) {
-        self.handle_event(viewport_id, |window| window.on_init(args))
-    }
-
-    pub fn handle_key_event(&mut self, viewport_id: ViewportId, event: &KeyEvent) -> bool {
-        self.handle_event(viewport_id, |window| window.handle_key_event(event))
-    }
-
-    pub fn handle_gamepad_event(&mut self, viewport_id: ViewportId, event: &gilrs::Event) -> bool {
-        self.handle_event(viewport_id, |window| window.handle_gamepad_event(event))
-    }
-
-    pub fn handle_dropped_file(&mut self, viewport_id: ViewportId, path: PathBuf) -> bool {
-        self.handle_event(viewport_id, |window| window.handle_dropped_file(path))
-    }
-
-    fn handle_event<F, R>(&mut self, viewport_id: ViewportId, cb: F) -> R
-    where
-        F: FnOnce(&mut dyn AppWindow) -> R,
-        R: Default,
-    {
-        let p2_viewport_id = ChildWindow::Player2.viewport_id(SimId::Player1);
-
-        if self.viewport_id == viewport_id {
-            cb(self)
-        } else if let Some(child) = self.children.get_mut(&viewport_id) {
-            cb(child.app.lock().unwrap().deref_mut().deref_mut())
-        } else if let Some(mut p2) = self
-            .children
-            .get_mut(&p2_viewport_id)
-            .map(|w| w.app.lock().unwrap())
-        {
-            if let AppWrapper::Game(g) = p2.deref_mut() {
-                g.handle_event(viewport_id, cb)
-            } else {
-                R::default()
-            }
-        } else {
-            R::default()
-        }
-    }
-
-    fn show_menu(&mut self, ui: &mut 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;
@@ -270,11 +77,9 @@ impl GameWindow {
         for command in ui.input_mut(|input| self.shortcuts.consume_all(input)) {
             match command {
                 Command::OpenRom => {
-                    let rom = self
+                    let rom = rfd::FileDialog::new()
-                        .file_picker
-                        .pick_file_dialog()
                         .add_filter("Virtual Boy ROMs", &["vb", "vbrom", "elf", "isx"])
-                        .open();
+                        .pick_file();
                     if let Some(path) = rom {
                         self.client
                             .send_command(EmulatorCommand::LoadGame(self.sim_id, path));
@@ -328,11 +133,9 @@ impl GameWindow {
                 .add(self.button_for(ui.ctx(), "Open ROM", Command::OpenRom))
                 .clicked()
             {
-                let rom = self
+                let rom = rfd::FileDialog::new()
-                    .file_picker
-                    .pick_file_dialog()
                     .add_filter("Virtual Boy ROMs", &["vb", "vbrom", "elf", "isx"])
-                    .open();
+                    .pick_file();
                 if let Some(path) = rom {
                     self.client
                         .send_command(EmulatorCommand::LoadGame(self.sim_id, path));
@@ -347,7 +150,6 @@ impl GameWindow {
             }
             let watch_rom = self.client.is_rom_watched(self.sim_id);
             if ui.selectable_button(watch_rom, "Watch ROM").clicked() {
-                self.config.update(|c| c.watch_rom = !watch_rom);
                 self.client
                     .send_command(EmulatorCommand::WatchRom(self.sim_id, !watch_rom));
             }
@@ -405,25 +207,17 @@ impl GameWindow {
             {
                 pollster::block_on(self.take_screenshot());
             }
-            ui.separator();
-            let low_battery = self.config.low_battery;
-            if ui.selectable_button(low_battery, "Low Battery").clicked() {
-                self.config.update(|c| c.low_battery = !low_battery);
-                let _ = self
-                    .proxy
-                    .send_event(UserEvent::LowBattery(self.sim_id, !low_battery));
-            }
         });
-        ui.menu_button("Options", |ui| self.show_options_menu(ui));
+        ui.menu_button("Options", |ui| self.show_options_menu(ctx, ui));
         ui.menu_button("Multiplayer", |ui| {
-            let has_player_2 = self.client.has_player_2();
+            let has_player_2 = self.client.sim_state(SimId::Player2) != SimState::Uninitialized;
             if self.sim_id == SimId::Player1
                 && !has_player_2
                 && ui.button("Open Player 2").clicked()
             {
                 self.client
                     .send_command(EmulatorCommand::StartSecondSim(None));
-                self.open(ChildWindow::Player2);
+                self.proxy.send_event(UserEvent::OpenPlayer2).unwrap();
             }
             if has_player_2 {
                 let linked = self.client.are_sims_linked();
@@ -437,37 +231,55 @@ impl GameWindow {
         });
         ui.menu_button("Tools", |ui| {
             if ui.button("Terminal").clicked() {
-                self.open(ChildWindow::Terminal);
+                self.proxy
+                    .send_event(UserEvent::OpenTerminal(self.sim_id))
+                    .unwrap();
             }
             if ui.button("Profiler").clicked() {
-                self.open(ChildWindow::Profiler { launch: false });
+                self.proxy
+                    .send_event(UserEvent::OpenProfiler(self.sim_id))
+                    .unwrap();
             }
             if ui.button("GDB Server").clicked() {
-                self.open(ChildWindow::Debugger { port: None });
+                self.proxy
+                    .send_event(UserEvent::OpenDebugger(self.sim_id))
+                    .unwrap();
             }
             ui.separator();
             if ui.button("Character Data").clicked() {
-                self.open(ChildWindow::CharacterData);
+                self.proxy
+                    .send_event(UserEvent::OpenCharacterData(self.sim_id))
+                    .unwrap();
             }
             if ui.button("Background Maps").clicked() {
-                self.open(ChildWindow::BgMap);
+                self.proxy
+                    .send_event(UserEvent::OpenBgMap(self.sim_id))
+                    .unwrap();
             }
             if ui.button("Objects").clicked() {
-                self.open(ChildWindow::Objects);
+                self.proxy
+                    .send_event(UserEvent::OpenObjects(self.sim_id))
+                    .unwrap();
             }
             if ui.button("Worlds").clicked() {
-                self.open(ChildWindow::Worlds);
+                self.proxy
+                    .send_event(UserEvent::OpenWorlds(self.sim_id))
+                    .unwrap();
             }
             if ui.button("Frame Buffers").clicked() {
-                self.open(ChildWindow::FrameBuffers);
+                self.proxy
+                    .send_event(UserEvent::OpenFrameBuffers(self.sim_id))
+                    .unwrap();
             }
             if ui.button("Registers").clicked() {
-                self.open(ChildWindow::Registers);
+                self.proxy
+                    .send_event(UserEvent::OpenRegisters(self.sim_id))
+                    .unwrap();
             }
         });
         ui.menu_button("Help", |ui| {
             if ui.button("About").clicked() {
-                self.open(ChildWindow::About);
+                self.proxy.send_event(UserEvent::OpenAbout).unwrap();
             }
         });
     }
@@ -493,12 +305,13 @@ impl GameWindow {
         self.client
             .send_command(EmulatorCommand::Screenshot(self.sim_id, tx));
         let bytes = rx.await.context("Could not take screenshot")?;
-        let file = self
+        let mut file_dialog = rfd::FileDialog::new()
-            .file_picker
-            .save_file_dialog()
             .add_filter("PNG images", &["png"])
-            .set_file_name("screenshot.png")
+            .set_file_name("screenshot.png");
-            .open();
+        if let Some(window) = self.window.as_ref() {
+            file_dialog = file_dialog.set_parent(window);
+        }
+        let file = file_dialog.save_file();
         let Some(path) = file else {
             return Ok(None);
         };
@@ -515,7 +328,7 @@ impl GameWindow {
         Ok(Some(path.display().to_string()))
     }
 
-    fn show_options_menu(&mut self, ui: &mut Ui) {
+    fn show_options_menu(&mut self, ctx: &Context, ui: &mut Ui) {
         ui.menu_button("Video", |ui| {
             ui.menu_button("Screen Size", |ui| {
                 let current_dims = self.config.dimensions;
@@ -531,7 +344,7 @@ impl GameWindow {
                         .selectable_button((current_dims - dims).length() < 1.0, label)
                         .clicked()
                     {
-                        ui.send_viewport_cmd(ViewportCommand::InnerSize(dims));
+                        ctx.send_viewport_cmd(ViewportCommand::InnerSize(dims));
                     }
                 }
             });
@@ -561,10 +374,10 @@ impl GameWindow {
                 let new_proportions = display_mode.proportions();
                 let scale = new_proportions / old_proportions;
                 if scale != Vec2::new(1.0, 1.0) {
-                    ui.send_viewport_cmd(ViewportCommand::InnerSize(current_dims * scale));
+                    ctx.send_viewport_cmd(ViewportCommand::InnerSize(current_dims * scale));
                 }
 
-                self.config.update(|c| {
+                self.update_config(|c| {
                     c.display_mode = display_mode;
                     c.dimensions = current_dims * scale;
                 });
@@ -572,7 +385,7 @@ impl GameWindow {
             ui.menu_button("Colors", |ui| {
                 for preset in COLOR_PRESETS {
                     if ui.color_pair_button(preset[0], preset[1]).clicked() {
-                        self.config.update(|c| c.colors = preset);
+                        self.update_config(|c| c.colors = preset);
                     }
                 }
                 ui.with_layout(ui.layout().with_cross_align(egui::Align::Center), |ui| {
@@ -602,7 +415,7 @@ impl GameWindow {
                 .selectable_button(self.config.audio_enabled, "Enabled")
                 .clicked()
             {
-                self.config.update(|c| c.audio_enabled = !c.audio_enabled);
+                self.update_config(|c| c.audio_enabled = !c.audio_enabled);
                 self.client.send_command(EmulatorCommand::SetAudioEnabled(
                     self.sim_id,
                     self.config.audio_enabled,
@@ -611,42 +424,12 @@ impl GameWindow {
         });
         ui.menu_button("Input", |ui| {
             if ui.button("Bind Inputs").clicked() {
-                self.open(ChildWindow::Input);
+                self.proxy.send_event(UserEvent::OpenInput).unwrap();
             }
         });
         if ui.button("Hotkeys").clicked() {
-            self.open(ChildWindow::Hotkeys);
+            self.proxy.send_event(UserEvent::OpenHotkeys).unwrap();
         }
-        ui.menu_button("Save Data Location", |ui| {
-            let save_data_location = self.client.save_data_location();
-            let update_save_data_location = |new_location: SaveDataLocation| {
-                if new_location == save_data_location {
-                    return;
-                };
-                let mut app_config = AppConfig::load(&self.persistence);
-                app_config.update(|c| c.save_data_location = new_location);
-                self.client
-                    .send_command(EmulatorCommand::SetSaveDataLocation(new_location));
-            };
-            if ui
-                .selectable_button(
-                    save_data_location == SaveDataLocation::RomDirectory,
-                    "Same Directory as ROM",
-                )
-                .clicked()
-            {
-                update_save_data_location(SaveDataLocation::RomDirectory);
-            }
-            if ui
-                .selectable_button(
-                    save_data_location == SaveDataLocation::DataDirectory,
-                    "App Data Directory",
-                )
-                .clicked()
-            {
-                update_save_data_location(SaveDataLocation::DataDirectory);
-            }
-        });
     }
 
     fn show_color_picker(&mut self, ui: &mut Ui) {
@@ -674,10 +457,19 @@ impl GameWindow {
             self.color_picker = None;
         }
         if updated {
-            self.config.update(|c| c.colors = colors);
+            self.update_config(|c| c.colors = colors);
         }
     }
 
+    fn update_config(&mut self, update: impl FnOnce(&mut SimConfig)) {
+        let mut new_config = self.config.clone();
+        update(&mut new_config);
+        if self.config != new_config {
+            let _ = new_config.save(&self.persistence, self.sim_id);
+        }
+        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) {
@@ -688,142 +480,75 @@ impl GameWindow {
 }
 
 impl AppWindow for GameWindow {
-    fn sim_id(&self) -> Option<SimId> {
+    fn viewport_id(&self) -> ViewportId {
-        Some(self.sim_id)
+        match self.sim_id {
+            SimId::Player1 => ViewportId::ROOT,
+            SimId::Player2 => ViewportId::from_hash_of("Player2"),
+        }
+    }
+
+    fn sim_id(&self) -> SimId {
+        self.sim_id
     }
 
     fn initial_viewport(&self) -> ViewportBuilder {
-        let builder = ViewportBuilder::default()
+        ViewportBuilder::default()
             .with_title("Lemur")
-            .with_inner_size(self.config.dimensions);
+            .with_inner_size(self.config.dimensions)
-        if let Some(position) = self.config.position {
-            builder.with_position(position)
-        } else {
-            builder
-        }
     }
 
-    fn show(&mut self, ui: &mut Ui) {
+    fn show(&mut self, ctx: &Context) {
-        self.config.refresh();
-        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();
+            let bounds = ctx.available_rect();
             bounds.max - bounds.min
         };
-        let position = ui.input(|i| i.viewport().outer_rect.map(|r| r.min));
+        self.update_config(|c| c.dimensions = dimensions);
-        self.config.update(|c| {
-            c.dimensions = dimensions;
-            c.position = position;
-        });
 
-        while let Ok(toast) = self.messages.try_recv() {
+        if let Some(messages) = self.messages.as_mut() {
-            self.toasts.add(toast);
+            while let Ok(toast) = messages.try_recv() {
+                self.toasts.add(toast);
+            }
         }
-        Panel::top("menubar").exact_size(22.0).show(ui, |ui| {
+        TopBottomPanel::top("menubar")
-            MenuBar::new().ui(ui, |ui| {
+            .exact_height(22.0)
-                self.show_menu(ui);
+            .show(ctx, |ui| {
+                MenuBar::new().ui(ui, |ui| {
+                    self.show_menu(ctx, ui);
+                });
             });
-        });
         if self.color_picker.is_some() {
             Window::new("Color Picker")
                 .title_bar(false)
                 .resizable(false)
                 .anchor(Align2::CENTER_CENTER, Vec2::ZERO)
-                .show(ui, |ui| {
+                .show(ctx, |ui| {
                     self.show_color_picker(ui);
                 });
         }
-        let frame = Frame::central_panel(ui.style()).fill(Color32::BLACK);
+        let frame = Frame::central_panel(&ctx.style()).fill(Color32::BLACK);
-        CentralPanel::default().frame(frame).show(ui, |ui| {
+        CentralPanel::default().frame(frame).show(ctx, |ui| {
             if let Some(screen) = self.screen.as_mut() {
                 screen.update(self.config.display_mode, self.config.colors);
                 ui.add(screen);
             }
         });
-        self.toasts.show(ui);
+        self.toasts.show(ctx);
-        for window in std::mem::take(&mut self.queued_children) {
-            self.do_open(window);
-        }
-        self.children.retain(|id, child| {
-            if child
-                .close_requested
-                .load(std::sync::atomic::Ordering::Relaxed)
-            {
-                return false;
-            }
-            let app = child.app.clone();
-            let viewport_builder = child.updates.take().unwrap_or_default();
-            let close_requested = child.close_requested.clone();
-            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: outer.min,
-                        size: inner.size(),
-                    },
-                );
-            }
-            ui.show_viewport_deferred(*id, viewport_builder, move |ui, _| {
-                app.lock().unwrap().show(ui);
-                if ui.input(|s| s.viewport().close_requested()) {
-                    close_requested.store(true, std::sync::atomic::Ordering::Relaxed);
-                }
-            });
-            true
-        });
-        self.child_states.save(ui);
-        ui.request_repaint_after(Duration::from_millis(10));
     }
 
     fn on_init(&mut self, args: InitArgs) {
-        if self.screen.is_none() {
+        let (screen, sink) = GameScreen::init(args.render_state);
-            let (screen, sink) = GameScreen::init(args.render_state);
+        let (message_sink, message_source) = mpsc::channel();
-            self.client.send_command(EmulatorCommand::ConnectToSim(
+        self.client.send_command(EmulatorCommand::ConnectToSim(
-                self.sim_id,
+            self.sim_id,
-                sink,
+            sink,
-                self.message_sink.clone(),
+            message_sink,
-            ));
+        ));
-            self.screen = Some(screen);
+        self.screen = Some(screen);
-        }
+        self.messages = Some(message_source);
-        self.file_picker.set_window(args.window);
+        self.window = Some(args.window.clone());
     }
 
-    fn handle_dropped_file(&mut self, path: PathBuf) -> bool {
+    fn on_destroy(&mut self) {
-        self.client
-            .send_command(EmulatorCommand::LoadGame(self.sim_id, path));
-        true
-    }
-}
-
-impl Drop for GameWindow {
-    fn drop(&mut self) {
         if self.sim_id == SimId::Player2 {
             self.client.send_command(EmulatorCommand::StopSecondSim);
         }
@@ -836,85 +561,3 @@ struct ColorPickerState {
     just_opened: bool,
     unpause_on_close: bool,
 }
-
-struct ChildWindowWrapper {
-    app: Arc<Mutex<AppWrapper>>,
-    title: String,
-    sim_id: Option<SimId>,
-    updates: Option<ViewportBuilder>,
-    close_requested: Arc<AtomicBool>,
-}
-enum AppWrapper {
-    Game(Box<GameWindow>),
-    Dyn(Box<dyn AppWindow + Send + 'static>),
-}
-impl AppWrapper {
-    fn of_game(game: GameWindow) -> Self {
-        Self::Game(Box::new(game))
-    }
-    fn of_dyn<T: AppWindow + Send + 'static>(inner: T) -> Self {
-        Self::Dyn(Box::new(inner))
-    }
-}
-impl Deref for AppWrapper {
-    type Target = dyn AppWindow + Send + 'static;
-    fn deref(&self) -> &Self::Target {
-        match self {
-            Self::Dyn(inner) => inner.as_ref(),
-            Self::Game(inner) => inner.as_ref(),
-        }
-    }
-}
-impl DerefMut for AppWrapper {
-    fn deref_mut(&mut self) -> &mut Self::Target {
-        match self {
-            Self::Dyn(inner) => inner.as_mut(),
-            Self::Game(inner) => inner.as_mut(),
-        }
-    }
-}
-
-#[derive(Debug)]
-pub enum ChildWindow {
-    About,
-    CharacterData,
-    BgMap,
-    Objects,
-    Worlds,
-    FrameBuffers,
-    Registers,
-    Terminal,
-    Profiler { launch: bool },
-    Debugger { port: Option<u16> },
-    Input,
-    Hotkeys,
-    Player2,
-}
-impl ChildWindow {
-    fn viewport_id(&self, sim_id: SimId) -> ViewportId {
-        ViewportId::from_hash_of(format!("{sim_id:?}{}", self.name()))
-    }
-    fn name(&self) -> &'static str {
-        match self {
-            Self::About => "About",
-            Self::CharacterData => "CharacterData",
-            Self::BgMap => "BgMap",
-            Self::Objects => "Objects",
-            Self::Worlds => "Worlds",
-            Self::FrameBuffers => "FrameBuffers",
-            Self::Registers => "Registers",
-            Self::Terminal => "Terminal",
-            Self::Profiler { .. } => "Profiler",
-            Self::Debugger { .. } => "Debugger",
-            Self::Input => "Input",
-            Self::Hotkeys => "Hotkeys",
-            Self::Player2 => "Player2",
-        }
-    }
-}
-
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)]
-struct ChildState {
-    position: Pos2,
-    size: Vec2,
-}

src/window/game_screen.rs

@@ -14,7 +14,7 @@ pub struct GameScreen {
 }
 
 impl GameScreen {
-    pub fn init_pipeline(render_state: &egui_wgpu::RenderState) {
+    fn init_pipeline(render_state: &egui_wgpu::RenderState) {
         let device = &render_state.device;
 
         let bind_group_layout = device.create_bind_group_layout(&wgpu::BindGroupLayoutDescriptor {
@@ -53,8 +53,8 @@ impl GameScreen {
         let render_pipeline_layout =
             device.create_pipeline_layout(&wgpu::PipelineLayoutDescriptor {
                 label: Some("render pipeline layout"),
-                bind_group_layouts: &[Some(&bind_group_layout)],
+                bind_group_layouts: &[&bind_group_layout],
-                immediate_size: 0,
+                push_constant_ranges: &[],
             });
 
         let create_render_pipeline = |entry_point: &str| {
@@ -92,7 +92,7 @@ impl GameScreen {
                     mask: !0,
                     alpha_to_coverage_enabled: false,
                 },
-                multiview_mask: None,
+                multiview: None,
                 cache: None,
             })
         };
@@ -117,6 +117,8 @@ impl GameScreen {
     }
 
     pub fn init(render_state: &egui_wgpu::RenderState) -> (Self, TextureSink) {
+        Self::init_pipeline(render_state);
+
         let device = &render_state.device;
         let queue = &render_state.queue;
 

src/window/gdb.rs

@@ -1,4 +1,4 @@
-use egui::{Button, CentralPanel, TextEdit, ViewportBuilder};
+use egui::{Button, CentralPanel, TextEdit, ViewportBuilder, ViewportId};
 use winit::event_loop::EventLoopProxy;
 
 use crate::{
@@ -42,20 +42,24 @@ impl GdbServerWindow {
 }
 
 impl AppWindow for GdbServerWindow {
-    fn sim_id(&self) -> Option<SimId> {
+    fn viewport_id(&self) -> ViewportId {
-        Some(self.sim_id)
+        ViewportId::from_hash_of(format!("Debugger-{}", self.sim_id))
+    }
+
+    fn sim_id(&self) -> SimId {
+        self.sim_id
     }
 
     fn initial_viewport(&self) -> ViewportBuilder {
         ViewportBuilder::default()
-            .with_title("GDB Server")
+            .with_title(format!("GDB Server ({})", self.sim_id))
             .with_inner_size((300.0, 200.0))
     }
 
-    fn show(&mut self, ui: &mut egui::Ui) {
+    fn show(&mut self, ctx: &egui::Context) {
         let port_num: Option<u16> = self.port_str.parse().ok();
         let status = self.server.status();
-        CentralPanel::default().show(ui, |ui| {
+        CentralPanel::default().show(ctx, |ui| {
             ui.horizontal(|ui| {
                 if port_num.is_none() {
                     let style = ui.style_mut();

src/window/hotkeys.rs

@@ -1,5 +1,6 @@
 use egui::{
-    Button, CentralPanel, Event, KeyboardShortcut, Label, Layout, Slider, Ui, ViewportBuilder,
+    Button, CentralPanel, Context, Event, KeyboardShortcut, Label, Layout, Slider, Ui,
+    ViewportBuilder, ViewportId,
 };
 use egui_extras::{Column, TableBuilder};
 
@@ -124,14 +125,18 @@ impl HotkeysWindow {
 }
 
 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, ui: &mut Ui) {
+    fn show(&mut self, ctx: &Context) {
-        CentralPanel::default().show(ui, |ui| {
+        CentralPanel::default().show(ctx, |ui| {
             ui.horizontal(|ui| {
                 if ui.button("Use defaults").clicked() {
                     self.shortcuts.reset();

src/window/input.rs

@@ -1,4 +1,6 @@
-use egui::{Button, CentralPanel, Label, Layout, Panel, Ui, ViewportBuilder};
+use egui::{
+    Button, CentralPanel, Context, Label, Layout, TopBottomPanel, Ui, ViewportBuilder, ViewportId,
+};
 use egui_extras::{Column, TableBuilder};
 use gilrs::{EventType, GamepadId};
 use std::sync::RwLock;
@@ -70,7 +72,7 @@ impl InputWindow {
             .column(Column::remainder())
             .cell_layout(Layout::left_to_right(egui::Align::Center))
             .body(|mut body| {
-                for keys in KEY_NAMES.as_chunks::<2>().0 {
+                for keys in KEY_NAMES.chunks_exact(2) {
                     body.row(20.0, |mut row| {
                         for (key, name) in keys {
                             let binding = names.remove(key).map(|mut s| {
@@ -160,14 +162,18 @@ impl InputWindow {
 }
 
 impl AppWindow for InputWindow {
+    fn viewport_id(&self) -> ViewportId {
+        ViewportId::from_hash_of("input")
+    }
+
     fn initial_viewport(&self) -> ViewportBuilder {
         ViewportBuilder::default()
             .with_title("Bind Inputs")
             .with_inner_size((600.0, 400.0))
     }
 
-    fn show(&mut self, ui: &mut Ui) {
+    fn show(&mut self, ctx: &Context) {
-        Panel::top("options").show(ui, |ui| {
+        TopBottomPanel::top("options").show(ctx, |ui| {
             ui.horizontal(|ui| {
                 let old_active_tab = self.active_tab;
                 ui.selectable_value(&mut self.active_tab, InputTab::Player1, "Player 1");
@@ -182,7 +188,7 @@ impl AppWindow for InputWindow {
                 }
             });
         });
-        CentralPanel::default().show(ui, |ui| {
+        CentralPanel::default().show(ctx, |ui| {
             match self.active_tab {
                 InputTab::Player1 => self.show_key_bindings(ui, SimId::Player1),
                 InputTab::Player2 => self.show_key_bindings(ui, SimId::Player2),

src/window/profile.rs

@@ -1,12 +1,12 @@
-use std::{fs, time::Duration};
+use std::{fs, sync::Arc, time::Duration};
 
 use anyhow::Result;
-use egui::{Button, CentralPanel, Checkbox, Label, ViewportBuilder};
+use egui::{Button, CentralPanel, Checkbox, Label, ViewportBuilder, ViewportId};
 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,
-    file_picker: FilePicker,
+    window: Option<Arc<Window>>,
 }
 
 impl ProfileWindow {
@@ -29,7 +29,7 @@ impl ProfileWindow {
                 .with_anchor(Anchor::BottomLeft)
                 .with_margin((10.0, 10.0).into())
                 .reverse(true),
-            file_picker: FilePicker::new(),
+            window: None,
         }
     }
 
@@ -62,12 +62,13 @@ impl ProfileWindow {
 
     fn try_finish_recording(&mut self) -> Result<Option<String>> {
         let bytes_receiver = self.profiler.finish_recording();
-        let file = self
+        let mut file_dialog = rfd::FileDialog::new()
-            .file_picker
-            .save_file_dialog()
             .add_filter("Profiler files", &["json"])
-            .set_file_name("profile.json")
+            .set_file_name("profile.json");
-            .open();
+        if let Some(window) = self.window.as_ref() {
+            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);
@@ -81,20 +82,24 @@ impl ProfileWindow {
 }
 
 impl AppWindow for ProfileWindow {
-    fn sim_id(&self) -> Option<SimId> {
+    fn viewport_id(&self) -> ViewportId {
-        Some(self.sim_id)
+        ViewportId::from_hash_of(format!("Profile-{}", self.sim_id))
+    }
+
+    fn sim_id(&self) -> SimId {
+        self.sim_id
     }
 
     fn initial_viewport(&self) -> ViewportBuilder {
         ViewportBuilder::default()
-            .with_title("Profiler")
+            .with_title(format!("Profiler ({})", self.sim_id))
             .with_inner_size((300.0, 200.0))
     }
 
-    fn show(&mut self, ui: &mut egui::Ui) {
+    fn show(&mut self, ctx: &egui::Context) {
         let status = self.profiler.status();
         let recording = matches!(status, ProfilerStatus::Recording);
-        CentralPanel::default().show(ui, |ui| {
+        CentralPanel::default().show(ctx, |ui| {
             ui.horizontal_wrapped(|ui| {
                 ui.spacing_mut().item_spacing.x = 0.0;
                 ui.add(
@@ -159,10 +164,10 @@ impl AppWindow for ProfileWindow {
                 _ => {}
             }
         });
-        self.toasts.show(ui);
+        self.toasts.show(ctx);
     }
 
     fn on_init(&mut self, args: InitArgs) {
-        self.file_picker.set_window(args.window);
+        self.window = Some(args.window.clone());
     }
 }

src/window/terminal.rs

@@ -1,6 +1,9 @@
 use std::{collections::VecDeque, sync::mpsc};
 
-use egui::{Align, CentralPanel, FontFamily, Label, RichText, ScrollArea, Ui, ViewportBuilder};
+use egui::{
+    Align, CentralPanel, Context, FontFamily, Label, RichText, ScrollArea, ViewportBuilder,
+    ViewportId,
+};
 
 use crate::emulator::{EmulatorClient, EmulatorCommand, SimId};
 
@@ -29,17 +32,21 @@ impl TerminalWindow {
 }
 
 impl AppWindow for TerminalWindow {
-    fn sim_id(&self) -> Option<SimId> {
+    fn viewport_id(&self) -> ViewportId {
-        Some(self.sim_id)
+        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("Terminal")
+            .with_title(format!("Terminal ({})", self.sim_id))
             .with_inner_size((640.0, 480.0))
     }
 
-    fn show(&mut self, ui: &mut Ui) {
+    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') {
@@ -54,7 +61,7 @@ impl AppWindow for TerminalWindow {
             }
             self.lines.back_mut().unwrap().push_str(rest);
         }
-        CentralPanel::default().show(ui, |ui| {
+        CentralPanel::default().show(ctx, |ui| {
             ScrollArea::vertical()
                 .stick_to_bottom(true)
                 .auto_shrink([false, false])

src/window/utils.rs

@@ -1,6 +1,6 @@
 use std::{
     fmt::{Display, UpperHex},
-    ops::{AddAssign, Bound, Deref, DerefMut, MulAssign, RangeBounds},
+    ops::{Bound, RangeBounds},
     str::FromStr,
 };
 
@@ -8,9 +8,9 @@ use atoi::FromRadix16;
 use egui::{
     Align, Color32, CornerRadius, CursorIcon, Event, Frame, Key, Layout, Margin, Rect, Response,
     RichText, Sense, Shape, Stroke, StrokeKind, TextEdit, Ui, UiBuilder, Vec2, Widget, WidgetText,
-    ecolor::HexColor, util::id_type_map::SerializableAny,
+    ecolor::HexColor,
 };
-use num_traits::{CheckedAdd, CheckedSub, One, Zero};
+use num_traits::{CheckedAdd, CheckedSub, One};
 
 pub trait UiExt {
     fn section(&mut self, title: impl Into<String>, add_contents: impl FnOnce(&mut Ui));
@@ -105,16 +105,14 @@ enum Direction {
 
 pub trait Number:
     Copy
-    + Zero
     + One
-    + AddAssign
-    + MulAssign
     + CheckedAdd
     + CheckedSub
     + Eq
     + Ord
     + Display
     + FromStr
+    + FromRadix16
     + UpperHex
     + Send
     + Sync
@@ -123,16 +121,14 @@ pub trait Number:
 }
 impl<
     T: Copy
-        + Zero
         + One
-        + AddAssign
-        + MulAssign
         + CheckedAdd
         + CheckedSub
         + Eq
         + Ord
         + Display
         + FromStr
+        + FromRadix16
         + UpperHex
         + Send
         + Sync
@@ -213,8 +209,8 @@ impl<T: Number> Widget for NumberEdit<'_, T> {
         let from_string = |val: &str| {
             if self.hex {
                 let bytes = val.as_bytes();
-                let (result, consumed) = atoi::Integer::<T>::from_radix_16(bytes);
+                let (result, consumed) = T::from_radix_16(bytes);
-                (consumed == bytes.len()).then_some(result.0)
+                (consumed == bytes.len()).then_some(result)
             } else {
                 val.parse::<T>().ok()
             }
@@ -413,51 +409,3 @@ impl ResponseExt for Response {
         self.clicked() || self.dragged()
     }
 }
-
-pub struct UiData<T> {
-    current: T,
-    prev: T,
-    loaded: bool,
-}
-
-impl<T> UiData<T>
-where
-    T: Default + PartialEq + SerializableAny,
-{
-    pub fn new() -> Self {
-        Self {
-            current: T::default(),
-            prev: T::default(),
-            loaded: false,
-        }
-    }
-
-    pub fn load(&mut self, ui: &Ui) {
-        if !self.loaded {
-            self.current = ui
-                .data_mut(|d| d.get_persisted(ui.id()))
-                .unwrap_or_default();
-            self.loaded = true;
-        }
-    }
-
-    pub fn save(&mut self, ui: &Ui) {
-        if self.current != self.prev {
-            ui.data_mut(|d| d.insert_persisted(ui.id(), self.current.clone()));
-            self.prev = self.current.clone();
-        }
-    }
-}
-
-impl<T> Deref for UiData<T> {
-    type Target = T;
-    fn deref(&self) -> &Self::Target {
-        &self.current
-    }
-}
-
-impl<T> DerefMut for UiData<T> {
-    fn deref_mut(&mut self) -> &mut Self::Target {
-        &mut self.current
-    }
-}

src/window/vip/bgmap.rs

@@ -1,75 +1,51 @@
 use std::sync::Arc;
 
 use egui::{
-    Align, CentralPanel, Checkbox, ComboBox, Image, ScrollArea, Slider, TextEdit, TextureOptions,
+    Align, CentralPanel, Checkbox, Color32, ComboBox, Context, Image, ScrollArea, Slider, TextEdit,
-    Ui, ViewportBuilder,
+    TextureOptions, Ui, ViewportBuilder, ViewportId,
 };
 use egui_extras::{Column, Size, StripBuilder, TableBuilder};
-use serde::{Deserialize, Serialize};
 
 use crate::{
-    config::{Config, SimConfig},
     emulator::SimId,
-    filesystem::Persistence,
+    images::{ImageBuffer, ImageParams, ImageProcessor, ImageRenderer, ImageTextureLoader},
-    images::{ImageBuffer, ImageParams, ImageRenderer, ImageTextureLoader},
     memory::{MemoryClient, MemoryView},
     window::{
-        AppWindow,
+        AppWindow, InitArgs,
-        utils::{NumberEdit, UiData, UiExt},
+        utils::{NumberEdit, UiExt},
     },
 };
 
 use super::utils::{self, CellData, CharacterGrid};
 
-#[derive(Clone, PartialEq, Serialize, Deserialize)]
+pub struct BgMapWindow {
-struct State {
+    sim_id: SimId,
+    loader: Arc<ImageTextureLoader>,
+    memory: Arc<MemoryClient>,
+    bgmaps: MemoryView,
     cell_index: usize,
     generic_palette: bool,
+    params: ImageParams<BgMapParams>,
     scale: f32,
     show_grid: bool,
 }
-impl Default for State {
-    fn default() -> Self {
-        Self {
-            cell_index: 0,
-            generic_palette: false,
-            scale: 1.0,
-            show_grid: false,
-        }
-    }
-}
-
-pub struct BgMapWindow {
-    sim_id: SimId,
-    memory: Arc<MemoryClient>,
-    bgmaps: MemoryView,
-    params: ImageParams<BgMapParams>,
-    state: UiData<State>,
-}
 
 impl BgMapWindow {
-    pub fn new(
+    pub fn new(sim_id: SimId, memory: &Arc<MemoryClient>, images: &mut ImageProcessor) -> Self {
-        sim_id: SimId,
+        let renderer = BgMapRenderer::new(sim_id, memory);
-        memory: &Arc<MemoryClient>,
+        let ([cell, bgmap], params) = images.add(renderer, BgMapParams::default());
-        persistence: &Persistence,
+        let loader =
-        images: &ImageTextureLoader,
+            ImageTextureLoader::new([("vip://cell".into(), cell), ("vip://bgmap".into(), bgmap)]);
-    ) -> Self {
-        let state: UiData<State> = UiData::new();
-        let renderer = BgMapRenderer::new(sim_id, persistence, memory);
-        let params = images.add(
-            sim_id,
-            renderer,
-            BgMapParams {
-                cell_index: state.cell_index,
-                generic_palette: state.generic_palette,
-            },
-        );
         Self {
             sim_id,
+            loader: Arc::new(loader),
             memory: memory.clone(),
             bgmaps: memory.watch(sim_id, 0x00020000, 0x20000),
+            cell_index: params.cell_index,
+            generic_palette: params.generic_palette,
             params,
-            state,
+            scale: 1.0,
+            show_grid: false,
         }
     }
 
@@ -85,11 +61,10 @@ impl BgMapWindow {
                             ui.label("Map");
                         });
                         row.col(|ui| {
-                            let mut bgmap_index = self.state.cell_index / 4096;
+                            let mut bgmap_index = self.cell_index / 4096;
                             ui.add(NumberEdit::new(&mut bgmap_index).range(0..16));
-                            if bgmap_index != self.state.cell_index / 4096 {
+                            if bgmap_index != self.cell_index / 4096 {
-                                self.state.cell_index =
+                                self.cell_index = (bgmap_index * 4096) + (self.cell_index % 4096);
-                                    (bgmap_index * 4096) + (self.state.cell_index % 4096);
                             }
                         });
                     });
@@ -98,7 +73,7 @@ impl BgMapWindow {
                             ui.label("Cell");
                         });
                         row.col(|ui| {
-                            ui.add(NumberEdit::new(&mut self.state.cell_index).range(0..16 * 4096));
+                            ui.add(NumberEdit::new(&mut self.cell_index).range(0..16 * 4096));
                         });
                     });
                     body.row(row_height, |mut row| {
@@ -106,7 +81,7 @@ impl BgMapWindow {
                             ui.label("Address");
                         });
                         row.col(|ui| {
-                            let address = 0x00020000 + (self.state.cell_index * 2);
+                            let address = 0x00020000 + (self.cell_index * 2);
                             let mut address_str = format!("{address:08x}");
                             ui.add_enabled(
                                 false,
@@ -115,12 +90,12 @@ impl BgMapWindow {
                         });
                     });
                 });
-            let image = Image::new(self.image_url("bgmap-cell"))
+            let image = Image::new("vip://cell")
                 .maintain_aspect_ratio(true)
                 .texture_options(TextureOptions::NEAREST);
             ui.add(image);
             ui.section("Cell", |ui| {
-                let mut data = self.bgmaps.borrow().read::<u16>(self.state.cell_index);
+                let mut data = self.bgmaps.borrow().read::<u16>(self.cell_index);
                 let mut cell = CellData::parse(data);
                 TableBuilder::new(ui)
                     .column(Column::remainder())
@@ -163,7 +138,7 @@ impl BgMapWindow {
                         });
                     });
                 if cell.update(&mut data) {
-                    let address = 0x00020000 + (self.state.cell_index * 2);
+                    let address = 0x00020000 + (self.cell_index * 2);
                     self.memory.write(self.sim_id, address as u32, &data);
                 }
             });
@@ -171,46 +146,53 @@ impl BgMapWindow {
                 ui.horizontal(|ui| {
                     ui.label("Scale");
                     ui.spacing_mut().slider_width = ui.available_width();
-                    let slider = Slider::new(&mut self.state.scale, 1.0..=10.0)
+                    let slider = Slider::new(&mut self.scale, 1.0..=10.0)
                         .step_by(1.0)
                         .show_value(false);
                     ui.add(slider);
                 });
-                ui.checkbox(&mut self.state.show_grid, "Show grid");
+                ui.checkbox(&mut self.show_grid, "Show grid");
-                ui.checkbox(&mut self.state.generic_palette, "Generic palette");
+                ui.checkbox(&mut self.generic_palette, "Generic palette");
             });
         });
         self.params.write(BgMapParams {
-            cell_index: self.state.cell_index,
+            cell_index: self.cell_index,
-            generic_palette: self.state.generic_palette,
+            generic_palette: self.generic_palette,
         });
     }
 
     fn show_bgmap(&mut self, ui: &mut Ui) {
-        let grid = CharacterGrid::new(self.image_url("bgmap"))
+        let grid = CharacterGrid::new("vip://bgmap")
-            .with_scale(self.state.scale)
+            .with_scale(self.scale)
-            .with_grid(self.state.show_grid)
+            .with_grid(self.show_grid)
-            .with_selected(self.state.cell_index % 4096);
+            .with_selected(self.cell_index % 4096);
         if let Some(selected) = grid.show(ui) {
-            self.state.cell_index = (self.state.cell_index / 4096 * 4096) + selected;
+            self.cell_index = (self.cell_index / 4096 * 4096) + selected;
         }
     }
 }
 
 impl AppWindow for BgMapWindow {
-    fn sim_id(&self) -> Option<SimId> {
+    fn viewport_id(&self) -> ViewportId {
-        Some(self.sim_id)
+        ViewportId::from_hash_of(format!("bgmap-{}", self.sim_id))
+    }
+
+    fn sim_id(&self) -> SimId {
+        self.sim_id
     }
 
     fn initial_viewport(&self) -> ViewportBuilder {
         ViewportBuilder::default()
-            .with_title("BG Map Data")
+            .with_title(format!("BG Map Data ({})", self.sim_id))
             .with_inner_size((640.0, 480.0))
     }
 
-    fn show(&mut self, ui: &mut Ui) {
+    fn on_init(&mut self, args: InitArgs) {
-        self.state.load(ui);
+        args.ctx.add_texture_loader(self.loader.clone());
-        CentralPanel::default().show(ui, |ui| {
+    }
+
+    fn show(&mut self, ctx: &Context) {
+        CentralPanel::default().show(ctx, |ui| {
             ui.horizontal_top(|ui| {
                 StripBuilder::new(ui)
                     .size(Size::relative(0.3).at_most(200.0))
@@ -225,7 +207,6 @@ impl AppWindow for BgMapWindow {
                     })
             });
         });
-        self.state.save(ui);
     }
 }
 
@@ -236,7 +217,6 @@ struct BgMapParams {
 }
 
 struct BgMapRenderer {
-    config: Config<SimConfig>,
     chardata: MemoryView,
     bgmaps: MemoryView,
     brightness: MemoryView,
@@ -244,9 +224,8 @@ struct BgMapRenderer {
 }
 
 impl BgMapRenderer {
-    pub fn new(sim_id: SimId, persistence: &Persistence, memory: &MemoryClient) -> Self {
+    pub fn new(sim_id: SimId, memory: &MemoryClient) -> Self {
         Self {
-            config: SimConfig::load(persistence, sim_id),
             chardata: memory.watch(sim_id, 0x00078000, 0x8000),
             bgmaps: memory.watch(sim_id, 0x00020000, 0x20000),
             brightness: memory.watch(sim_id, 0x0005f824, 8),
@@ -255,8 +234,6 @@ impl BgMapRenderer {
     }
 
     fn render_bgmap(&self, image: &mut ImageBuffer, bgmap_index: usize, generic_palette: bool) {
-        let color = self.config.colors[0];
-
         let chardata = self.chardata.borrow();
         let bgmaps = self.bgmaps.borrow();
         let brightness = self.brightness.borrow();
@@ -264,9 +241,9 @@ impl BgMapRenderer {
 
         let brts = brightness.read::<[u8; 8]>(0);
         let colors = if generic_palette {
-            [utils::generic_palette(color); 4]
+            [utils::generic_palette(Color32::RED); 4]
         } else {
-            [0, 2, 4, 6].map(|i| utils::palette_colors(palettes.read(i), &brts, color))
+            [0, 2, 4, 6].map(|i| utils::palette_colors(palettes.read(i), &brts, Color32::RED))
         };
 
         for (i, cell) in bgmaps.range::<u16>(bgmap_index * 4096, 4096).enumerate() {
@@ -290,8 +267,6 @@ impl BgMapRenderer {
     }
 
     fn render_bgmap_cell(&self, image: &mut ImageBuffer, index: usize, generic_palette: bool) {
-        let color = self.config.colors[0];
-
         let chardata = self.chardata.borrow();
         let bgmaps = self.bgmaps.borrow();
         let brightness = self.brightness.borrow();
@@ -309,9 +284,9 @@ impl BgMapRenderer {
         } = CellData::parse(cell);
         let char = chardata.read::<[u16; 8]>(char_index);
         let palette = if generic_palette {
-            utils::generic_palette(color)
+            utils::generic_palette(Color32::RED)
         } else {
-            utils::palette_colors(palettes.read(palette_index * 2), &brts, color)
+            utils::palette_colors(palettes.read(palette_index * 2), &brts, Color32::RED)
         };
 
         for row in 0..8 {
@@ -325,16 +300,11 @@ impl BgMapRenderer {
 impl ImageRenderer<2> for BgMapRenderer {
     type Params = BgMapParams;
 
-    fn names(&self) -> [&str; 2] {
-        ["bgmap-cell", "bgmap"]
-    }
-
     fn sizes(&self) -> [[usize; 2]; 2] {
         [[8, 8], [8 * 64, 8 * 64]]
     }
 
     fn render(&mut self, params: &Self::Params, images: &mut [ImageBuffer; 2]) {
-        self.config.refresh();
         self.render_bgmap_cell(&mut images[0], params.cell_index, params.generic_palette);
         self.render_bgmap(
             &mut images[1],

src/window/vip/chardata.rs

@@ -1,21 +1,19 @@
-use std::fmt::Display;
+use std::{fmt::Display, sync::Arc};
 
 use egui::{
-    Align, CentralPanel, Color32, ComboBox, Image, ScrollArea, Slider, TextEdit, TextureOptions,
+    Align, CentralPanel, Color32, ComboBox, Context, Image, ScrollArea, Slider, TextEdit,
-    Ui, Vec2, ViewportBuilder,
+    TextureOptions, Ui, Vec2, ViewportBuilder, ViewportId,
 };
 use egui_extras::{Column, Size, StripBuilder, TableBuilder};
 use serde::{Deserialize, Serialize};
 
 use crate::{
-    config::{Config, SimConfig},
     emulator::SimId,
-    filesystem::Persistence,
+    images::{ImageBuffer, ImageParams, ImageProcessor, ImageRenderer, ImageTextureLoader},
-    images::{ImageBuffer, ImageParams, ImageRenderer, ImageTextureLoader},
     memory::{MemoryClient, MemoryView},
     window::{
-        AppWindow,
+        AppWindow, InitArgs,
-        utils::{NumberEdit, UiData, UiExt as _},
+        utils::{NumberEdit, UiExt as _},
     },
 };
 
@@ -81,59 +79,36 @@ impl Display for Palette {
     }
 }
 
-#[derive(Clone, PartialEq, Serialize, Deserialize)]
+pub struct CharacterDataWindow {
-struct State {
+    sim_id: SimId,
+    loader: Arc<ImageTextureLoader>,
+    brightness: MemoryView,
+    palettes: MemoryView,
     palette: Palette,
     index: usize,
+    params: ImageParams<CharDataParams>,
     scale: f32,
     show_grid: bool,
 }
-impl Default for State {
-    fn default() -> Self {
-        Self {
-            palette: Palette::default(),
-            index: 0,
-            scale: 4.0,
-            show_grid: true,
-        }
-    }
-}
-
-pub struct CharacterDataWindow {
-    sim_id: SimId,
-    config: Config<SimConfig>,
-    brightness: MemoryView,
-    palettes: MemoryView,
-    params: ImageParams<CharDataParams>,
-    state: UiData<State>,
-}
 
 impl CharacterDataWindow {
-    pub fn new(
+    pub fn new(sim_id: SimId, memory: &MemoryClient, images: &mut ImageProcessor) -> Self {
-        sim_id: SimId,
-        memory: &MemoryClient,
-        persistence: &Persistence,
-        images: &ImageTextureLoader,
-    ) -> Self {
-        let config = SimConfig::load(persistence, sim_id);
-        let state: UiData<State> = UiData::new();
         let renderer = CharDataRenderer::new(sim_id, memory);
-        let params = images.add(
+        let ([char, chardata], params) = images.add(renderer, CharDataParams::default());
-            sim_id,
+        let loader = ImageTextureLoader::new([
-            renderer,
+            ("vip://char".into(), char),
-            CharDataParams {
+            ("vip://chardata".into(), chardata),
-                palette: state.palette,
+        ]);
-                index: state.index,
-                color: config.colors[0],
-            },
-        );
         Self {
             sim_id,
-            config,
+            loader: Arc::new(loader),
             brightness: memory.watch(sim_id, 0x0005f824, 8),
             palettes: memory.watch(sim_id, 0x0005f860, 16),
+            palette: params.palette,
+            index: params.index,
             params,
-            state,
+            scale: 4.0,
+            show_grid: true,
         }
     }
 
@@ -149,7 +124,7 @@ impl CharacterDataWindow {
                             ui.label("Index");
                         });
                         row.col(|ui| {
-                            ui.add(NumberEdit::new(&mut self.state.index).range(0..2048));
+                            ui.add(NumberEdit::new(&mut self.index).range(0..2048));
                         });
                     });
                     body.row(row_height, |mut row| {
@@ -157,11 +132,11 @@ impl CharacterDataWindow {
                             ui.label("Address");
                         });
                         row.col(|ui| {
-                            let address = match self.state.index {
+                            let address = match self.index {
-                                0x000..0x200 => 0x00060000 + self.state.index * 16,
+                                0x000..0x200 => 0x00060000 + self.index * 16,
-                                0x200..0x400 => 0x000e0000 + (self.state.index - 0x200) * 16,
+                                0x200..0x400 => 0x000e0000 + (self.index - 0x200) * 16,
-                                0x400..0x600 => 0x00160000 + (self.state.index - 0x400) * 16,
+                                0x400..0x600 => 0x00160000 + (self.index - 0x400) * 16,
-                                0x600..0x800 => 0x001e0000 + (self.state.index - 0x600) * 16,
+                                0x600..0x800 => 0x001e0000 + (self.index - 0x600) * 16,
                                 _ => unreachable!("can't happen"),
                             };
                             let mut address_str = format!("{address:08x}");
@@ -176,7 +151,7 @@ impl CharacterDataWindow {
                             ui.label("Mirror");
                         });
                         row.col(|ui| {
-                            let mirror = 0x00078000 + (self.state.index * 16);
+                            let mirror = 0x00078000 + (self.index * 16);
                             let mut mirror_str = format!("{mirror:08x}");
                             ui.add_enabled(
                                 false,
@@ -185,7 +160,7 @@ impl CharacterDataWindow {
                         });
                     });
                 });
-            let image = Image::new(self.image_url("chardata-char"))
+            let image = Image::new("vip://char")
                 .maintain_aspect_ratio(true)
                 .texture_options(TextureOptions::NEAREST);
             ui.add(image);
@@ -193,12 +168,12 @@ impl CharacterDataWindow {
                 ui.horizontal(|ui| {
                     ui.label("Palette");
                     ComboBox::from_id_salt("palette")
-                        .selected_text(self.state.palette.to_string())
+                        .selected_text(self.palette.to_string())
                         .width(ui.available_width())
                         .show_ui(ui, |ui| {
                             for palette in Palette::values() {
                                 ui.selectable_value(
-                                    &mut self.state.palette,
+                                    &mut self.palette,
                                     palette,
                                     palette.to_string(),
                                 );
@@ -225,59 +200,63 @@ impl CharacterDataWindow {
                 ui.horizontal(|ui| {
                     ui.label("Scale");
                     ui.spacing_mut().slider_width = ui.available_width();
-                    let slider = Slider::new(&mut self.state.scale, 1.0..=10.0)
+                    let slider = Slider::new(&mut self.scale, 1.0..=10.0)
                         .step_by(1.0)
                         .show_value(false);
                     ui.add(slider);
                 });
-                ui.checkbox(&mut self.state.show_grid, "Show grid");
+                ui.checkbox(&mut self.show_grid, "Show grid");
             });
         });
 
         self.params.write(CharDataParams {
-            palette: self.state.palette,
+            palette: self.palette,
-            index: self.state.index,
+            index: self.index,
-            color: self.config.colors[0],
         });
     }
 
     fn load_palette_colors(&self) -> [Color32; 4] {
-        let color = self.config.colors[0];
+        let Some(offset) = self.palette.offset() else {
-        let Some(offset) = self.state.palette.offset() else {
+            return utils::generic_palette(Color32::RED);
-            return utils::generic_palette(color);
         };
         let palette = self.palettes.borrow().read(offset);
         let brightnesses = self.brightness.borrow();
         let brts = brightnesses.read(0);
-        utils::palette_colors(palette, &brts, color)
+        utils::palette_colors(palette, &brts, Color32::RED)
     }
 
     fn show_chardata(&mut self, ui: &mut Ui) {
-        let grid = CharacterGrid::new(self.image_url("chardata"))
+        let grid = CharacterGrid::new("vip://chardata")
-            .with_scale(self.state.scale)
+            .with_scale(self.scale)
-            .with_grid(self.state.show_grid)
+            .with_grid(self.show_grid)
-            .with_selected(self.state.index);
+            .with_selected(self.index);
         if let Some(selected) = grid.show(ui) {
-            self.state.index = selected;
+            self.index = selected;
         }
     }
 }
 
 impl AppWindow for CharacterDataWindow {
-    fn sim_id(&self) -> Option<SimId> {
+    fn viewport_id(&self) -> ViewportId {
-        Some(self.sim_id)
+        ViewportId::from_hash_of(format!("chardata-{}", self.sim_id))
+    }
+
+    fn sim_id(&self) -> SimId {
+        self.sim_id
     }
 
     fn initial_viewport(&self) -> ViewportBuilder {
         ViewportBuilder::default()
-            .with_title("Character Data")
+            .with_title(format!("Character Data ({})", self.sim_id))
             .with_inner_size((640.0, 480.0))
     }
 
-    fn show(&mut self, ui: &mut Ui) {
+    fn on_init(&mut self, args: InitArgs) {
-        self.config.refresh();
+        args.ctx.add_texture_loader(self.loader.clone());
-        self.state.load(ui);
+    }
-        CentralPanel::default().show(ui, |ui| {
+
+    fn show(&mut self, ctx: &Context) {
+        CentralPanel::default().show(ctx, |ui| {
             ui.horizontal_top(|ui| {
                 StripBuilder::new(ui)
                     .size(Size::relative(0.3).at_most(200.0))
@@ -292,16 +271,15 @@ impl AppWindow for CharacterDataWindow {
                     });
             });
         });
-        self.state.save(ui);
     }
 }
 
-#[derive(Clone, PartialEq, Eq)]
+#[derive(Clone, Default, PartialEq, Eq)]
 struct CharDataParams {
     palette: Palette,
     index: usize,
-    color: Color32,
 }
+
 struct CharDataRenderer {
     chardata: MemoryView,
     brightness: MemoryView,
@@ -311,17 +289,13 @@ struct CharDataRenderer {
 impl ImageRenderer<2> for CharDataRenderer {
     type Params = CharDataParams;
 
-    fn names(&self) -> [&str; 2] {
-        ["chardata-char", "chardata"]
-    }
-
     fn sizes(&self) -> [[usize; 2]; 2] {
         [[8, 8], [16 * 8, 128 * 8]]
     }
 
     fn render(&mut self, params: &Self::Params, image: &mut [ImageBuffer; 2]) {
-        self.render_character(&mut image[0], params.palette, params.index, params.color);
+        self.render_character(&mut image[0], params.palette, params.index);
-        self.render_character_data(&mut image[1], params.palette, params.color);
+        self.render_character_data(&mut image[1], params.palette);
     }
 }
 
@@ -334,17 +308,11 @@ impl CharDataRenderer {
         }
     }
 
-    fn render_character(
+    fn render_character(&self, image: &mut ImageBuffer, palette: Palette, index: usize) {
-        &self,
-        image: &mut ImageBuffer,
-        palette: Palette,
-        index: usize,
-        color: Color32,
-    ) {
         if index >= 2048 {
             return;
         }
-        let palette = self.load_palette(palette, color);
+        let palette = self.load_palette(palette);
         let chardata = self.chardata.borrow();
         let character = chardata.range::<u16>(index * 8, 8);
         for (row, pixels) in character.enumerate() {
@@ -355,8 +323,8 @@ impl CharDataRenderer {
         }
     }
 
-    fn render_character_data(&self, image: &mut ImageBuffer, palette: Palette, color: Color32) {
+    fn render_character_data(&self, image: &mut ImageBuffer, palette: Palette) {
-        let palette = self.load_palette(palette, color);
+        let palette = self.load_palette(palette);
         let chardata = self.chardata.borrow();
         for (row, pixels) in chardata.range::<u16>(0, 8 * 2048).enumerate() {
             let char_index = row / 8;
@@ -370,13 +338,13 @@ impl CharDataRenderer {
         }
     }
 
-    fn load_palette(&self, palette: Palette, color: Color32) -> [Color32; 4] {
+    fn load_palette(&self, palette: Palette) -> [Color32; 4] {
         let Some(offset) = palette.offset() else {
-            return utils::GENERIC_PALETTE.map(|p| utils::shade(p, color));
+            return utils::GENERIC_PALETTE.map(|p| utils::shade(p, Color32::RED));
         };
         let palette = self.palettes.borrow().read(offset);
         let brightnesses = self.brightness.borrow();
         let brts = brightnesses.read(0);
-        utils::palette_colors(palette, &brts, color)
+        utils::palette_colors(palette, &brts, Color32::RED)
     }
 }

src/window/vip/framebuffer.rs

@@ -1,73 +1,56 @@
+use std::sync::Arc;
+
 use egui::{
-    Align, CentralPanel, Color32, Image, ScrollArea, Slider, TextEdit, TextureOptions, Ui,
+    Align, CentralPanel, Color32, Context, Image, ScrollArea, Slider, TextEdit, TextureOptions, Ui,
-    ViewportBuilder,
+    ViewportBuilder, ViewportId,
 };
 use egui_extras::{Column, Size, StripBuilder, TableBuilder};
-use serde::{Deserialize, Serialize};
 
 use crate::{
-    config::{Config, SimConfig},
     emulator::SimId,
-    filesystem::Persistence,
+    images::{ImageBuffer, ImageParams, ImageProcessor, ImageRenderer, ImageTextureLoader},
-    images::{ImageBuffer, ImageParams, ImageRenderer, ImageTextureLoader},
     memory::{MemoryClient, MemoryView},
     window::{
-        AppWindow,
+        AppWindow, InitArgs,
-        utils::{NumberEdit, UiData, UiExt as _},
+        utils::{NumberEdit, UiExt as _},
     },
 };
 
 use super::utils;
 
-#[derive(Clone, PartialEq, Serialize, Deserialize)]
+pub struct FrameBufferWindow {
-struct State {
+    sim_id: SimId,
+    loader: Arc<ImageTextureLoader>,
     index: usize,
     left: bool,
     right: bool,
     generic_palette: bool,
+    params: ImageParams<FrameBufferParams>,
     scale: f32,
 }
-impl Default for State {
+
-    fn default() -> Self {
+impl FrameBufferWindow {
-        Self {
+    pub fn new(sim_id: SimId, memory: &MemoryClient, images: &mut ImageProcessor) -> Self {
+        let initial_params = FrameBufferParams {
             index: 0,
             left: true,
             right: true,
             generic_palette: false,
-            scale: 2.0,
+            left_color: Color32::from_rgb(0xff, 0x00, 0x00),
-        }
+            right_color: Color32::from_rgb(0x00, 0xc6, 0xf0),
-    }
+        };
-}
+        let renderer = FrameBufferRenderer::new(sim_id, memory);
-
+        let ([buffer], params) = images.add(renderer, initial_params);
-pub struct FrameBufferWindow {
+        let loader = ImageTextureLoader::new([("vip://buffer".into(), buffer)]);
-    sim_id: SimId,
-    params: ImageParams<FrameBufferParams>,
-    state: UiData<State>,
-}
-
-impl FrameBufferWindow {
-    pub fn new(
-        sim_id: SimId,
-        memory: &MemoryClient,
-        persistence: &Persistence,
-        images: &ImageTextureLoader,
-    ) -> Self {
-        let state: UiData<State> = UiData::new();
-        let renderer = FrameBufferRenderer::new(sim_id, memory, persistence);
-        let params = images.add(
-            sim_id,
-            renderer,
-            FrameBufferParams {
-                index: state.index,
-                left: state.left,
-                right: state.right,
-                generic_palette: state.generic_palette,
-            },
-        );
         Self {
             sim_id,
+            loader: Arc::new(loader),
+            index: params.index,
+            left: params.left,
+            right: params.right,
+            generic_palette: params.generic_palette,
             params,
-            state,
+            scale: 2.0,
         }
     }
 
@@ -83,7 +66,7 @@ impl FrameBufferWindow {
                             ui.label("Index");
                         });
                         row.col(|ui| {
-                            ui.add(NumberEdit::new(&mut self.state.index).range(0..2));
+                            ui.add(NumberEdit::new(&mut self.index).range(0..2));
                         });
                     });
                     body.row(row_height, |mut row| {
@@ -91,7 +74,7 @@ impl FrameBufferWindow {
                             ui.label("Left");
                         });
                         row.col(|ui| {
-                            let address = self.state.index * 0x00008000;
+                            let address = self.index * 0x00008000;
                             let mut address_str = format!("{address:08x}");
                             ui.add_enabled(
                                 false,
@@ -104,7 +87,7 @@ impl FrameBufferWindow {
                             ui.label("Right");
                         });
                         row.col(|ui| {
-                            let address = self.state.index * 0x00008000 + 0x00010000;
+                            let address = self.index * 0x00008000 + 0x00010000;
                             let mut address_str = format!("{address:08x}");
                             ui.add_enabled(
                                 false,
@@ -117,7 +100,7 @@ impl FrameBufferWindow {
                 ui.horizontal(|ui| {
                     ui.label("Scale");
                     ui.spacing_mut().slider_width = ui.available_width();
-                    let slider = Slider::new(&mut self.state.scale, 1.0..=10.0)
+                    let slider = Slider::new(&mut self.scale, 1.0..=10.0)
                         .step_by(1.0)
                         .show_value(false);
                     ui.add(slider);
@@ -127,47 +110,55 @@ impl FrameBufferWindow {
                     .body(|mut body| {
                         body.row(row_height, |mut row| {
                             row.col(|ui| {
-                                ui.checkbox(&mut self.state.left, "Left");
+                                ui.checkbox(&mut self.left, "Left");
                             });
                             row.col(|ui| {
-                                ui.checkbox(&mut self.state.right, "Right");
+                                ui.checkbox(&mut self.right, "Right");
                             });
                         });
                     });
-                ui.checkbox(&mut self.state.generic_palette, "Generic colors");
+                ui.checkbox(&mut self.generic_palette, "Generic colors");
             });
         });
 
         self.params.write(FrameBufferParams {
-            index: self.state.index,
+            index: self.index,
-            left: self.state.left,
+            left: self.left,
-            right: self.state.right,
+            right: self.right,
-            generic_palette: self.state.generic_palette,
+            generic_palette: self.generic_palette,
+            ..*self.params
         });
     }
 
     fn show_buffers(&mut self, ui: &mut Ui) {
-        let image = Image::new(self.image_url("buffer"))
+        let image = Image::new("vip://buffer")
-            .fit_to_original_size(self.state.scale)
+            .fit_to_original_size(self.scale)
             .texture_options(TextureOptions::NEAREST);
         ui.add(image);
     }
 }
 
 impl AppWindow for FrameBufferWindow {
-    fn sim_id(&self) -> Option<SimId> {
+    fn viewport_id(&self) -> ViewportId {
-        Some(self.sim_id)
+        ViewportId::from_hash_of(format!("framebuffer-{}", self.sim_id))
+    }
+
+    fn sim_id(&self) -> SimId {
+        self.sim_id
     }
 
     fn initial_viewport(&self) -> ViewportBuilder {
         ViewportBuilder::default()
-            .with_title("Frame Buffers")
+            .with_title(format!("Frame Buffers ({})", self.sim_id))
             .with_inner_size((640.0, 480.0))
     }
 
-    fn show(&mut self, ui: &mut Ui) {
+    fn on_init(&mut self, args: InitArgs) {
-        self.state.load(ui);
+        args.ctx.add_texture_loader(self.loader.clone());
-        CentralPanel::default().show(ui, |ui| {
+    }
+
+    fn show(&mut self, ctx: &Context) {
+        CentralPanel::default().show(ctx, |ui| {
             ui.horizontal_top(|ui| {
                 StripBuilder::new(ui)
                     .size(Size::relative(0.3).at_most(200.0))
@@ -182,7 +173,6 @@ impl AppWindow for FrameBufferWindow {
                     });
             });
         });
-        self.state.save(ui);
     }
 }
 
@@ -192,18 +182,18 @@ struct FrameBufferParams {
     left: bool,
     right: bool,
     generic_palette: bool,
+    left_color: Color32,
+    right_color: Color32,
 }
 
 struct FrameBufferRenderer {
-    config: Config<SimConfig>,
     buffers: [MemoryView; 4],
     brightness: MemoryView,
 }
 
 impl FrameBufferRenderer {
-    fn new(sim_id: SimId, memory: &MemoryClient, persistence: &Persistence) -> Self {
+    fn new(sim_id: SimId, memory: &MemoryClient) -> Self {
         Self {
-            config: SimConfig::load(persistence, sim_id),
             buffers: [
                 memory.watch(sim_id, 0x00000000, 0x6000),
                 memory.watch(sim_id, 0x00008000, 0x6000),
@@ -218,16 +208,11 @@ impl FrameBufferRenderer {
 impl ImageRenderer<1> for FrameBufferRenderer {
     type Params = FrameBufferParams;
 
-    fn names(&self) -> [&str; 1] {
-        ["buffer"]
-    }
-
     fn sizes(&self) -> [[usize; 2]; 1] {
         [[384, 224]]
     }
 
     fn render(&mut self, params: &Self::Params, images: &mut [ImageBuffer; 1]) {
-        self.config.refresh();
         let image = &mut images[0];
 
         let left_buffer = self.buffers[params.index].borrow();
@@ -235,15 +220,15 @@ impl ImageRenderer<1> for FrameBufferRenderer {
 
         let colors = if params.generic_palette {
             [
-                utils::generic_palette(self.config.colors[0]),
+                utils::generic_palette(params.left_color),
-                utils::generic_palette(self.config.colors[1]),
+                utils::generic_palette(params.right_color),
             ]
         } else {
             let brts = self.brightness.borrow().read::<[u8; 8]>(0);
             let shades = utils::parse_shades(&brts);
             [
-                shades.map(|s| utils::shade(s, self.config.colors[0])),
+                shades.map(|s| utils::shade(s, params.left_color)),
-                shades.map(|s| utils::shade(s, self.config.colors[1])),
+                shades.map(|s| utils::shade(s, params.right_color)),
             ]
         };
 

src/window/vip/object.rs

@@ -1,73 +1,55 @@
 use std::sync::Arc;
 
 use egui::{
-    Align, CentralPanel, Checkbox, ComboBox, Image, ScrollArea, Slider, TextEdit, TextureOptions,
+    Align, CentralPanel, Checkbox, Color32, ComboBox, Context, Image, ScrollArea, Slider, TextEdit,
-    Ui, ViewportBuilder,
+    TextureOptions, Ui, ViewportBuilder, ViewportId,
 };
 use egui_extras::{Column, Size, StripBuilder, TableBuilder};
-use serde::{Deserialize, Serialize};
 
 use crate::{
-    config::{Config, SimConfig},
     emulator::SimId,
-    filesystem::Persistence,
+    images::{ImageBuffer, ImageParams, ImageProcessor, ImageRenderer, ImageTextureLoader},
-    images::{ImageBuffer, ImageParams, ImageRenderer, ImageTextureLoader},
     memory::{MemoryClient, MemoryView},
     window::{
-        AppWindow,
+        AppWindow, InitArgs,
-        utils::{NumberEdit, UiData, UiExt as _},
+        utils::{NumberEdit, UiExt as _},
     },
 };
 
 use super::utils::{self, Object};
 
-#[derive(Clone, PartialEq, Serialize, Deserialize)]
-struct State {
-    index: usize,
-    generic_palette: bool,
-    scale: f32,
-}
-impl Default for State {
-    fn default() -> Self {
-        Self {
-            index: 0,
-            generic_palette: false,
-            scale: 1.0,
-        }
-    }
-}
-
 pub struct ObjectWindow {
     sim_id: SimId,
+    loader: Arc<ImageTextureLoader>,
     memory: Arc<MemoryClient>,
     objects: MemoryView,
+    index: usize,
+    generic_palette: bool,
     params: ImageParams<ObjectParams>,
-    state: UiData<State>,
+    scale: f32,
 }
 
 impl ObjectWindow {
-    pub fn new(
+    pub fn new(sim_id: SimId, memory: &Arc<MemoryClient>, images: &mut ImageProcessor) -> Self {
-        sim_id: SimId,
+        let initial_params = ObjectParams {
-        memory: &Arc<MemoryClient>,
+            index: 0,
-        persistence: &Persistence,
+            generic_palette: false,
-        images: &ImageTextureLoader,
+            left_color: Color32::from_rgb(0xff, 0x00, 0x00),
-    ) -> Self {
+            right_color: Color32::from_rgb(0x00, 0xc6, 0xf0),
-        let state: UiData<State> = UiData::new();
+        };
-        let renderer = ObjectRenderer::new(sim_id, memory, persistence);
+        let renderer = ObjectRenderer::new(sim_id, memory);
-        let params = images.add(
+        let ([zoom, full], params) = images.add(renderer, initial_params);
-            sim_id,
+        let loader =
-            renderer,
+            ImageTextureLoader::new([("vip://zoom".into(), zoom), ("vip://full".into(), full)]);
-            ObjectParams {
-                index: state.index,
-                generic_palette: state.generic_palette,
-            },
-        );
         Self {
             sim_id,
+            loader: Arc::new(loader),
             memory: memory.clone(),
             objects: memory.watch(sim_id, 0x0003e000, 0x2000),
+            index: params.index,
+            generic_palette: params.generic_palette,
             params,
-            state,
+            scale: 1.0,
         }
     }
 
@@ -83,7 +65,7 @@ impl ObjectWindow {
                             ui.label("Index");
                         });
                         row.col(|ui| {
-                            ui.add(NumberEdit::new(&mut self.state.index).range(0..1024));
+                            ui.add(NumberEdit::new(&mut self.index).range(0..1024));
                         });
                     });
                     body.row(row_height, |mut row| {
@@ -91,7 +73,7 @@ impl ObjectWindow {
                             ui.label("Address");
                         });
                         row.col(|ui| {
-                            let address = 0x3e000 + self.state.index * 8;
+                            let address = 0x3e000 + self.index * 8;
                             let mut address_str = format!("{address:08x}");
                             ui.add_enabled(
                                 false,
@@ -100,12 +82,12 @@ impl ObjectWindow {
                         });
                     });
                 });
-            let image = Image::new(self.image_url("object-zoom"))
+            let image = Image::new("vip://zoom")
                 .maintain_aspect_ratio(true)
                 .texture_options(TextureOptions::NEAREST);
             ui.add(image);
             ui.section("Properties", |ui| {
-                let mut object = self.objects.borrow().read::<[u16; 4]>(self.state.index);
+                let mut object = self.objects.borrow().read::<[u16; 4]>(self.index);
                 let mut obj = Object::parse(object);
                 TableBuilder::new(ui)
                     .column(Column::remainder())
@@ -180,7 +162,7 @@ impl ObjectWindow {
                         });
                     });
                 if obj.update(&mut object) {
-                    let address = 0x3e000 + self.state.index * 8;
+                    let address = 0x3e000 + self.index * 8;
                     self.memory.write(self.sim_id, address as u32, &object);
                 }
             });
@@ -188,42 +170,50 @@ impl ObjectWindow {
                 ui.horizontal(|ui| {
                     ui.label("Scale");
                     ui.spacing_mut().slider_width = ui.available_width();
-                    let slider = Slider::new(&mut self.state.scale, 1.0..=10.0)
+                    let slider = Slider::new(&mut self.scale, 1.0..=10.0)
                         .step_by(1.0)
                         .show_value(false);
                     ui.add(slider);
                 });
-                ui.checkbox(&mut self.state.generic_palette, "Generic palette");
+                ui.checkbox(&mut self.generic_palette, "Generic palette");
             });
         });
         self.params.write(ObjectParams {
-            index: self.state.index,
+            index: self.index,
-            generic_palette: self.state.generic_palette,
+            generic_palette: self.generic_palette,
+            ..*self.params
         });
     }
 
     fn show_object(&mut self, ui: &mut Ui) {
-        let image = Image::new(self.image_url("object-full"))
+        let image = Image::new("vip://full")
-            .fit_to_original_size(self.state.scale)
+            .fit_to_original_size(self.scale)
             .texture_options(TextureOptions::NEAREST);
         ui.add(image);
     }
 }
 
 impl AppWindow for ObjectWindow {
-    fn sim_id(&self) -> Option<SimId> {
+    fn viewport_id(&self) -> egui::ViewportId {
-        Some(self.sim_id)
+        ViewportId::from_hash_of(format!("object-{}", self.sim_id))
+    }
+
+    fn sim_id(&self) -> SimId {
+        self.sim_id
     }
 
     fn initial_viewport(&self) -> ViewportBuilder {
         ViewportBuilder::default()
-            .with_title("Object Data")
+            .with_title(format!("Object Data ({})", self.sim_id))
             .with_inner_size((640.0, 500.0))
     }
 
-    fn show(&mut self, ui: &mut Ui) {
+    fn on_init(&mut self, args: InitArgs) {
-        self.state.load(ui);
+        args.ctx.add_texture_loader(self.loader.clone());
-        CentralPanel::default().show(ui, |ui| {
+    }
+
+    fn show(&mut self, ctx: &Context) {
+        CentralPanel::default().show(ctx, |ui| {
             ui.horizontal_top(|ui| {
                 StripBuilder::new(ui)
                     .size(Size::relative(0.3).at_most(200.0))
@@ -238,7 +228,6 @@ impl AppWindow for ObjectWindow {
                     });
             });
         });
-        self.state.save(ui);
     }
 }
 
@@ -246,6 +235,8 @@ impl AppWindow for ObjectWindow {
 struct ObjectParams {
     index: usize,
     generic_palette: bool,
+    left_color: Color32,
+    right_color: Color32,
 }
 
 enum Eye {
@@ -254,7 +245,6 @@ enum Eye {
 }
 
 struct ObjectRenderer {
-    config: Config<SimConfig>,
     chardata: MemoryView,
     objects: MemoryView,
     brightness: MemoryView,
@@ -262,9 +252,8 @@ struct ObjectRenderer {
 }
 
 impl ObjectRenderer {
-    pub fn new(sim_id: SimId, memory: &MemoryClient, persistence: &Persistence) -> Self {
+    pub fn new(sim_id: SimId, memory: &MemoryClient) -> Self {
         Self {
-            config: SimConfig::load(persistence, sim_id),
             chardata: memory.watch(sim_id, 0x00078000, 0x8000),
             objects: memory.watch(sim_id, 0x0003e000, 0x2000),
             brightness: memory.watch(sim_id, 0x0005f824, 8),
@@ -306,8 +295,8 @@ impl ObjectRenderer {
         };
 
         let color = match eye {
-            Eye::Left => self.config.colors[0],
+            Eye::Left => params.left_color,
-            Eye::Right => self.config.colors[1],
+            Eye::Right => params.right_color,
         };
 
         let char = chardata.read::<[u16; 8]>(obj.data.char_index);
@@ -338,16 +327,11 @@ impl ObjectRenderer {
 impl ImageRenderer<2> for ObjectRenderer {
     type Params = ObjectParams;
 
-    fn names(&self) -> [&str; 2] {
-        ["object-zoom", "object-full"]
-    }
-
     fn sizes(&self) -> [[usize; 2]; 2] {
         [[8, 8], [384, 224]]
     }
 
     fn render(&mut self, params: &Self::Params, images: &mut [ImageBuffer; 2]) {
-        self.config.refresh();
         images[0].clear();
         self.render_object(&mut images[0], params, false, Eye::Left);
         self.render_object(&mut images[0], params, false, Eye::Right);

src/window/vip/registers.rs

@@ -1,15 +1,13 @@
 use std::sync::Arc;
 
 use egui::{
-    Align, Button, CentralPanel, Checkbox, Direction, Label, Layout, ScrollArea, TextEdit, Ui,
+    Align, Button, CentralPanel, Checkbox, Color32, Context, Direction, Label, Layout, ScrollArea,
-    ViewportBuilder,
+    TextEdit, Ui, ViewportBuilder, ViewportId,
 };
 use egui_extras::{Column, Size, StripBuilder, TableBuilder};
 
 use crate::{
-    config::{Config, SimConfig},
     emulator::SimId,
-    filesystem::Persistence,
     memory::{MemoryClient, MemoryRef, MemoryValue, MemoryView},
     window::{
         AppWindow,
@@ -21,16 +19,14 @@ use super::utils;
 
 pub struct RegisterWindow {
     sim_id: SimId,
-    config: Config<SimConfig>,
     memory: Arc<MemoryClient>,
     registers: MemoryView,
 }
 
 impl RegisterWindow {
-    pub fn new(sim_id: SimId, memory: &Arc<MemoryClient>, persistence: &Persistence) -> Self {
+    pub fn new(sim_id: SimId, memory: &Arc<MemoryClient>) -> Self {
         Self {
             sim_id,
-            config: SimConfig::load(persistence, sim_id),
             memory: memory.clone(),
             registers: memory.watch(sim_id, 0x0005f800, 0x72),
         }
@@ -370,7 +366,7 @@ impl RegisterWindow {
                     });
                     body.row(row_height, |mut row| {
                         row.col(|_ui| {});
-                        for shade in utils::parse_brts(&brts, self.config.colors[0]) {
+                        for shade in utils::parse_brts(&brts, Color32::RED) {
                             row.col(|ui| {
                                 ui.painter().rect_filled(
                                     ui.available_rect_before_wrap(),
@@ -634,19 +630,22 @@ fn read_address<T: MemoryValue>(registers: &MemoryRef, address: usize) -> T {
 }
 
 impl AppWindow for RegisterWindow {
-    fn sim_id(&self) -> Option<SimId> {
+    fn viewport_id(&self) -> ViewportId {
-        Some(self.sim_id)
+        ViewportId::from_hash_of(format!("registers-{}", self.sim_id))
+    }
+
+    fn sim_id(&self) -> SimId {
+        self.sim_id
     }
 
     fn initial_viewport(&self) -> ViewportBuilder {
         ViewportBuilder::default()
-            .with_title("Registers")
+            .with_title(format!("Registers ({})", self.sim_id))
             .with_inner_size((800.0, 480.0))
     }
 
-    fn show(&mut self, ui: &mut Ui) {
+    fn show(&mut self, ctx: &Context) {
-        self.config.refresh();
+        CentralPanel::default().show(ctx, |ui| {
-        CentralPanel::default().show(ui, |ui| {
             ScrollArea::vertical().show(ui, |ui| {
                 ui.horizontal_top(|ui| {
                     let width = ui.available_width();

src/window/vip/utils.rs

@@ -1,7 +1,6 @@
 use egui::{Color32, Image, ImageSource, Response, Sense, TextureOptions, Ui, Widget};
 
 pub const GENERIC_PALETTE: [u8; 4] = [0, 32, 64, 128];
-const COLOR_TRANSPARENT: Color32 = Color32::from_rgb(0x25, 0x25, 0x25);
 
 pub fn shade(brt: u8, color: Color32) -> Color32 {
     let corrected = if brt > 132 {
@@ -45,9 +44,7 @@ pub fn parse_brts(brts: &[u16; 3], color: Color32) -> [Color32; 4] {
 
 pub fn palette_colors(palette: u8, brts: &[u8; 8], color: Color32) -> [Color32; 4] {
     let colors = parse_shades(brts).map(|s| shade(s, color));
-    let mut palette_colors = parse_palette(palette).map(|p| colors[p as usize]);
+    parse_palette(palette).map(|p| colors[p as usize])
-    palette_colors[0] = COLOR_TRANSPARENT;
-    palette_colors
 }
 
 pub struct Object {

src/window/vip/world.rs

@@ -1,8 +1,8 @@
 use std::{fmt::Display, sync::Arc};
 
 use egui::{
-    Align, CentralPanel, Checkbox, Color32, ComboBox, Image, ScrollArea, Slider, TextEdit,
+    Align, CentralPanel, Checkbox, Color32, ComboBox, Context, Image, ScrollArea, Slider, TextEdit,
-    TextureOptions, Ui, ViewportBuilder,
+    TextureOptions, Ui, ViewportBuilder, ViewportId,
 };
 use egui_extras::{Column, Size, StripBuilder, TableBuilder};
 use fixed::{
@@ -11,80 +11,56 @@ use fixed::{
 };
 use num_derive::{FromPrimitive, ToPrimitive};
 use num_traits::{FromPrimitive, ToPrimitive};
-use serde::{Deserialize, Serialize};
 
 use crate::{
-    config::{Config, SimConfig},
     emulator::SimId,
-    filesystem::Persistence,
+    images::{ImageBuffer, ImageParams, ImageProcessor, ImageRenderer, ImageTextureLoader},
-    images::{ImageBuffer, ImageParams, ImageRenderer, ImageTextureLoader},
     memory::{MemoryClient, MemoryRef, MemoryView},
     window::{
-        AppWindow,
+        AppWindow, InitArgs,
-        utils::{NumberEdit, UiData, UiExt as _},
+        utils::{NumberEdit, UiExt as _},
     },
 };
 
 use super::utils::{self, CellData, Object, shade};
 
-#[derive(Clone, PartialEq, Serialize, Deserialize)]
+pub struct WorldWindow {
-struct State {
+    sim_id: SimId,
+    loader: Arc<ImageTextureLoader>,
+    memory: Arc<MemoryClient>,
+    worlds: MemoryView,
+    bgmaps: MemoryView,
     index: usize,
     param_index: usize,
     generic_palette: bool,
     show_extents: bool,
-    scale: f32,
-}
-impl Default for State {
-    fn default() -> Self {
-        Self {
-            index: 31,
-            param_index: 0,
-            generic_palette: false,
-            show_extents: false,
-            scale: 1.0,
-        }
-    }
-}
-
-pub struct WorldWindow {
-    sim_id: SimId,
-    config: Config<SimConfig>,
-    memory: Arc<MemoryClient>,
-    worlds: MemoryView,
-    bgmaps: MemoryView,
     params: ImageParams<WorldParams>,
-    state: UiData<State>,
+    scale: f32,
 }
 
 impl WorldWindow {
-    pub fn new(
+    pub fn new(sim_id: SimId, memory: &Arc<MemoryClient>, images: &mut ImageProcessor) -> Self {
-        sim_id: SimId,
+        let initial_params = WorldParams {
-        memory: &Arc<MemoryClient>,
+            index: 31,
-        persistence: &Persistence,
+            generic_palette: false,
-        images: &ImageTextureLoader,
+            left_color: Color32::from_rgb(0xff, 0x00, 0x00),
-    ) -> Self {
+            right_color: Color32::from_rgb(0x00, 0xc6, 0xf0),
-        let config = SimConfig::load(persistence, sim_id);
+        };
-        let state: UiData<State> = UiData::new();
         let renderer = WorldRenderer::new(sim_id, memory);
-        let params = images.add(
+        let ([world], params) = images.add(renderer, initial_params);
-            sim_id,
+        let loader = ImageTextureLoader::new([("vip://world".into(), world)]);
-            renderer,
-            WorldParams {
-                index: state.index,
-                generic_palette: state.generic_palette,
-                left_color: config.colors[0],
-                right_color: config.colors[1],
-            },
-        );
         Self {
             sim_id,
-            config,
+            loader: Arc::new(loader),
             memory: memory.clone(),
             worlds: memory.watch(sim_id, 0x0003d800, 0x400),
             bgmaps: memory.watch(sim_id, 0x00020000, 0x20000),
+            index: params.index,
+            param_index: 0,
+            generic_palette: params.generic_palette,
+            show_extents: false,
             params,
-            state,
+            scale: 1.0,
         }
     }
 
@@ -100,7 +76,7 @@ impl WorldWindow {
                             ui.label("Index");
                         });
                         row.col(|ui| {
-                            ui.add(NumberEdit::new(&mut self.state.index).range(0..32));
+                            ui.add(NumberEdit::new(&mut self.index).range(0..32));
                         });
                     });
                     body.row(row_height, |mut row| {
@@ -108,7 +84,7 @@ impl WorldWindow {
                             ui.label("Address");
                         });
                         row.col(|ui| {
-                            let address = 0x0003d800 + self.state.index * 32;
+                            let address = 0x0003d800 + self.index * 32;
                             let mut address_str = format!("{address:08x}");
                             ui.add_enabled(
                                 false,
@@ -119,7 +95,7 @@ impl WorldWindow {
                 });
             let mut data = {
                 let worlds = self.worlds.borrow();
-                worlds.read(self.state.index)
+                worlds.read(self.index)
             };
             let mut world = World::parse(&data);
             ui.section("Properties", |ui| {
@@ -299,7 +275,7 @@ impl WorldWindow {
                     });
             });
             if world.update(&mut data) {
-                let address = 0x0003d800 + self.state.index * 32;
+                let address = 0x0003d800 + self.index * 32;
                 self.memory.write(self.sim_id, address as u32, &data);
             }
             if world.header.mode == WorldMode::HBias {
@@ -314,12 +290,10 @@ impl WorldWindow {
                                 });
                                 row.col(|ui| {
                                     let max = world.height.max(8) as usize;
-                                    ui.add(
+                                    ui.add(NumberEdit::new(&mut self.param_index).range(0..max));
-                                        NumberEdit::new(&mut self.state.param_index).range(0..max),
-                                    );
                                 });
                             });
-                            let base = (world.param_base + self.state.param_index * 2) & 0x1ffff;
+                            let base = (world.param_base + self.param_index * 2) & 0x1ffff;
                             let mut param = HBiasParam::load(&self.bgmaps.borrow(), base);
                             body.row(row_height, |mut row| {
                                 row.col(|ui| {
@@ -366,12 +340,10 @@ impl WorldWindow {
                                 });
                                 row.col(|ui| {
                                     let max = world.height.max(1) as usize;
-                                    ui.add(
+                                    ui.add(NumberEdit::new(&mut self.param_index).range(0..max));
-                                        NumberEdit::new(&mut self.state.param_index).range(0..max),
-                                    );
                                 });
                             });
-                            let base = (world.param_base + self.state.param_index * 8) & 0x1ffff;
+                            let base = (world.param_base + self.param_index * 8) & 0x1ffff;
                             let mut param = AffineParam::load(&self.bgmaps.borrow(), base);
                             body.row(row_height, |mut row| {
                                 row.col(|ui| {
@@ -431,49 +403,49 @@ impl WorldWindow {
                         });
                 });
             } else {
-                self.state.param_index = 0;
+                self.param_index = 0;
             }
             ui.section("Display", |ui| {
                 ui.horizontal(|ui| {
                     ui.label("Scale");
                     ui.spacing_mut().slider_width = ui.available_width();
-                    let slider = Slider::new(&mut self.state.scale, 1.0..=10.0)
+                    let slider = Slider::new(&mut self.scale, 1.0..=10.0)
                         .step_by(1.0)
                         .show_value(false);
                     ui.add(slider);
                 });
-                ui.checkbox(&mut self.state.generic_palette, "Generic palette");
+                ui.checkbox(&mut self.generic_palette, "Generic palette");
-                ui.checkbox(&mut self.state.show_extents, "Show extents");
+                ui.checkbox(&mut self.show_extents, "Show extents");
             });
         });
         self.params.write(WorldParams {
-            index: self.state.index,
+            index: self.index,
-            generic_palette: self.state.generic_palette,
+            generic_palette: self.generic_palette,
             ..*self.params
         });
     }
 
     fn show_world(&mut self, ui: &mut Ui) {
-        let image = Image::new(self.image_url("world"))
+        let image = Image::new("vip://world")
-            .fit_to_original_size(self.state.scale)
+            .fit_to_original_size(self.scale)
             .texture_options(TextureOptions::NEAREST);
         let res = ui.add(image);
-        if self.state.show_extents {
+        if self.show_extents {
             let world = {
                 let worlds = self.worlds.borrow();
-                let data = worlds.read(self.state.index);
+                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.state.scale;
+            let lx1 = (world.dst_x - world.dst_parallax) as f32 * self.scale;
-            let lx2 = lx1 + world.width as f32 * self.state.scale;
+            let lx2 = lx1 + world.width as f32 * self.scale;
-            let rx1 = (world.dst_x + world.dst_parallax) as f32 * self.state.scale;
+            let rx1 = (world.dst_x + world.dst_parallax) as f32 * self.scale;
-            let rx2 = rx1 + world.width as f32 * self.state.scale;
+            let rx2 = rx1 + world.width as f32 * self.scale;
-            let y1 = world.dst_y as f32 * self.state.scale;
+            let y1 = world.dst_y as f32 * self.scale;
-            let y2 = y1 + world.height as f32 * self.state.scale;
+            let y2 = y1 + world.height as f32 * self.scale;
 
             let left_color = self.params.left_color;
             let right_color = self.params.right_color;
@@ -537,25 +509,26 @@ impl WorldWindow {
 }
 
 impl AppWindow for WorldWindow {
-    fn sim_id(&self) -> Option<SimId> {
+    fn viewport_id(&self) -> ViewportId {
-        Some(self.sim_id)
+        ViewportId::from_hash_of(format!("world-{}", self.sim_id))
+    }
+
+    fn sim_id(&self) -> SimId {
+        self.sim_id
     }
 
     fn initial_viewport(&self) -> ViewportBuilder {
         ViewportBuilder::default()
-            .with_title("Worlds")
+            .with_title(format!("Worlds ({})", self.sim_id))
             .with_inner_size((640.0, 520.0))
     }
 
-    fn show(&mut self, ui: &mut Ui) {
+    fn on_init(&mut self, args: InitArgs) {
-        self.config.refresh();
+        args.ctx.add_texture_loader(self.loader.clone());
-        self.params.write(WorldParams {
+    }
-            left_color: self.config.colors[0],
+
-            right_color: self.config.colors[1],
+    fn show(&mut self, ctx: &Context) {
-            ..*self.params
+        CentralPanel::default().show(ctx, |ui| {
-        });
-        self.state.load(ui);
-        CentralPanel::default().show(ui, |ui| {
             ui.horizontal_top(|ui| {
                 StripBuilder::new(ui)
                     .size(Size::relative(0.3).at_most(200.0))
@@ -570,7 +543,6 @@ impl AppWindow for WorldWindow {
                     });
             });
         });
-        self.state.save(ui);
     }
 }
 
@@ -807,10 +779,6 @@ impl WorldRenderer {
 impl ImageRenderer<1> for WorldRenderer {
     type Params = WorldParams;
 
-    fn names(&self) -> [&str; 1] {
-        ["world"]
-    }
-
     fn sizes(&self) -> [[usize; 2]; 1] {
         [[384, 224]]
     }
@@ -960,7 +928,7 @@ impl WorldHeader {
         let ron = data & 0x4000 != 0;
         let mode = WorldMode::from_u16((data >> 12) & 0x3).unwrap();
         let scx = (data >> 10) as u32 & 0x03;
-        let scy = (data >> 8) as u32 & 0x03;
+        let scy = (data >> 10) as u32 & 0x03;
         let over = data & 0x0080 != 0;
         let end = data & 0x0040 != 0;
         let base = (data & 0x000f) as usize;
@@ -1097,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)));
+                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)
             }
         }