chore: Release lemur version 0.1.2

Reviewed-on: PVB/shrooms-vb-native#2

.gitattributes

@@ -4,6 +4,7 @@
 *.html  text eol=lf diff=html
 *.java  text eol=lf diff=java
 *.js    text eol=lf diff=js
+*.sh    text eol=lf
 *.txt   text eol=lf
 
 *.class binary

.gitignore

@@ -1,5 +1,5 @@
-/shrooms-vb
+/lemur
-/shrooms-vb.exe
+/lemur.exe
 .vscode
 output
 /target

Cargo.toml

@@ -1,35 +1,52 @@
 [package]
-name = "shrooms-vb"
+name = "lemur"
-version = "0.1.0"
+description = "An emulator for the Virtual Boy."
+repository = "https://git.virtual-boy.com/PVB/lemur"
+publish = false
+license = "MIT"
+version = "0.1.2"
 edition = "2021"
 
 [dependencies]
 anyhow = "1"
-bitflags = "2"
+bitflags = { version = "2", features = ["serde"] }
 bytemuck = { version = "1", features = ["derive"] }
 clap = { version = "4", features = ["derive"] }
 cpal = { git = "https://github.com/sidit77/cpal.git", rev = "66ed6be" }
-egui = "0.29"
+directories = "5"
-egui_extras = "0.29"
+egui = { version = "0.29", features = ["serde"] }
+egui_extras = { version = "0.29", features = ["image"] }
+egui-toast = "0.15"
 egui-winit = "0.29"
 egui-wgpu = { version = "0.29", features = ["winit"] }
-gilrs = "0.11"
+gilrs = { version = "0.11", features = ["serde-serialize"] }
+image = { version = "0.25", default-features = false, features = ["png"] }
 itertools = "0.13"
 num-derive = "0.4"
 num-traits = "0.2"
+oneshot = "0.1"
 pollster = "0.4"
 rfd = "0.15"
 rtrb = "0.3"
 rubato = "0.16"
+serde = { version = "1", features = ["derive"] }
+serde_json = "1"
 thread-priority = "1"
 wgpu = "22.1"
-winit = "0.30"
+winit = { version = "0.30", features = ["serde"] }
 
 [target.'cfg(windows)'.dependencies]
 windows = { version = "0.58", features = ["Win32_System_Threading"] }
 
 [build-dependencies]
 cc = "1"
+winresource = "0.1"
 
 [profile.release]
 lto = true
+
+[package.metadata.bundle]
+name = "Lemur"
+identifier = "com.virtual-boy.Lemur"
+icon = ["assets/lemur-256x256.png"]
+category = "games"

README.md

@@ -1,6 +1,6 @@
-# Shrooms VB (native)
+# Lemur
 
-A native implementation of shrooms-vb. Written in Rust, using winit, wgpu, and Dear ImGui. Should run on any major OS.
+A Virtual Boy emulator built around the shrooms-vb core. Written in Rust, using winit, wgpu, and egui. Should run on any major OS.
 
 ## Setup
 
@@ -12,4 +12,14 @@ Run
 cargo build --release
 ```
 
-The executable will be in `target/release/shrooms-vb[.exe]`
+The executable will be in `target/release/lemur[.exe]`
+
+## Release
+
+Bump the version number in `Cargo.toml`, then run this script:
+
+```sh
+./scripts/release.sh
+```
+
+It uses docker to cross compile for Windows, MacOS, and Linux. All binaries are left in the `output` directory.

build.Dockerfile

@@ -0,0 +1,34 @@
+# This Dockerfile produces a base image for builds.
+# It includes all dependencies necessary to cross-compile for Windows/MacOS/Linux.
+
+FROM crazymax/osxcross:latest-ubuntu AS osxcross
+
+FROM rust:latest
+RUN rustup target add x86_64-pc-windows-msvc && \
+    rustup target add x86_64-apple-darwin && \
+    rustup target add aarch64-apple-darwin && \
+    apt-get update && \
+    apt-get install -y clang-19 lld-19 libc6-dev libasound2-dev libudev-dev genisoimage mingw-w64 && \
+    cargo install cargo-bundle xwin && \
+    xwin --accept-license splat --output xwin && \
+    rm -rf .xwin-cache && \
+    ln -s $(which clang-19) /usr/bin/clang && \
+    ln -s $(which clang++-19) /usr/bin/clang++
+COPY --from=osxcross /osxcross /osxcross
+
+ENV PATH="/osxcross/bin:$PATH" \
+    LD_LIBRARY_PATH="/osxcross/lib" \
+    CC="clang-19" CXX="clang++-19" AR="llvm-ar-19" \
+    CC_x86_64-apple-darwin="o64-clang" \
+    CXX_x86_64-apple-darwin="o64-clang++" \
+    CC_aarch64-apple-darwin="oa64-clang" \
+    CXX_aarch64-apple-darwin="o6a4-clang++" \
+    CARGO_TARGET_X86_64_PC_WINDOWS_MSVC_LINKER="lld-link-19" \
+    CARGO_TARGET_X86_64_APPLE_DARWIN_LINKER="o64-clang" \
+    CARGO_TARGET_X86_64_APPLE_DARWIN_AR="llvm-ar-19" \
+    CARGO_TARGET_AARCH64_APPLE_DARWIN_LINKER="oa64-clang" \
+    CARGO_TARGET_AARCH64_APPLE_DARWIN_AR="llvm-ar-19" \
+    CROSS_COMPILE="setting-this-to-silence-a-warning-" \
+    RC_PATH="llvm-rc-19" \
+    RUSTFLAGS="-Lnative=/xwin/crt/lib/x86_64 -Lnative=/xwin/sdk/lib/um/x86_64 -Lnative=/xwin/sdk/lib/ucrt/x86_64" \
+    MACOSX_DEPLOYMENT_TARGET="14.5"

build.rs

@@ -1,6 +1,12 @@
-use std::path::Path;
+use std::{error::Error, path::Path};
+
+fn main() -> Result<(), Box<dyn Error>> {
+    if std::env::var("CARGO_CFG_TARGET_OS")? == "windows" {
+        let mut res = winresource::WindowsResource::new();
+        res.set_icon("assets/lemur.ico");
+        res.compile()?;
+    }
 
-fn main() {
     println!("cargo::rerun-if-changed=shrooms-vb-core");
     cc::Build::new()
         .include(Path::new("shrooms-vb-core/core"))
@@ -11,4 +17,6 @@ fn main() {
         .define("VB_DIV_GENERIC", None)
         .file(Path::new("shrooms-vb-core/core/vb.c"))
         .compile("vb");
+
+    Ok(())
 }

scripts/do-bundle.sh

@@ -0,0 +1,35 @@
+# Set everything up
+rm -rf output
+mkdir -p output
+cargo clean
+
+# Build for linux
+cargo build --release
+cp target/release/lemur output/lemur-linux
+
+# Bundle for Linux
+cargo bundle --release --format deb
+cp target/release/bundle/deb/*.deb output
+
+# Build for Windows
+cargo build --release --target x86_64-pc-windows-msvc
+cp target/x86_64-pc-windows-msvc/release/lemur.exe output
+
+# Build for MacOS Intel
+cargo build --release --target x86_64-apple-darwin
+cp target/x86_64-apple-darwin/release/lemur output/lemur-osx-intel
+
+# Bundle for MacOS Intel
+cargo bundle --release --target x86_64-apple-darwin --format osx
+genisoimage -V lemur -D -R -apple -no-pad -o output/Lemur-Intel.dmg target/x86_64-apple-darwin/release/bundle/osx
+
+# Build for MacOS Apple Silicon
+cargo build --release --target aarch64-apple-darwin
+cp target/aarch64-apple-darwin/release/lemur output/lemur-osx-apple-silicon
+
+# Bundle for MacOS Apple Silicon
+cargo bundle --release --target aarch64-apple-darwin --format osx
+genisoimage -V lemur -D -R -apple -no-pad -o output/Lemur-Apple-Silicon.dmg target/aarch64-apple-darwin/release/bundle/osx
+
+# Clean up after ourselves
+cargo clean

scripts/release.sh

@@ -0,0 +1,65 @@
+version=$(cat Cargo.toml | sed -n -e '/version/ {s/.* = *//p;q}' | tr -d '"')
+
+read -p "You wanted to release $version, right? [Y/n] " -n 1 -r
+echo
+case "$REPLY" in
+    n|N ) exit 1;;
+esac
+
+if [ -z "${RELEASE_TOKEN}" ]; then
+    echo "Please set the RELEASE_TOKEN env var."
+    exit 1
+fi
+if ! command -v curl 2>&1 >/dev/null; then
+    echo "Please install curl."
+    exit 1
+fi
+if ! command -v jq 2>&1 >/dev/null; then
+    echo "Please install jq."
+    exit 1
+fi
+
+docker build -f build.Dockerfile -t lemur-build .
+MSYS_NO_PATHCONV=1 docker run -it --rm -v .:/app -w /app --entrypoint bash lemur-build /app/scripts/do-bundle.sh
+
+read -r -d EOF 'body' <<EOF
+## How to install
+
+The emulator can be found in the "Downloads" section of this release.
+
+### Windows users
+
+Download \`lemur.exe\`.
+
+### MacOS users
+
+If your Mac uses an Intel processor, download and install \`Lemur-Intel.dmg\`.
+
+If it uses Apple Silicon, download and install \`Lemur-Apple-Silicon.dmg\`.
+
+If you're not sure which to choose, use [this guide](https://support.apple.com/en-us/116943) to find out.
+
+### Linux users
+
+You can either download and run \`lemur-linux\`, or download and install the attached .deb file.
+EOF
+
+read -r -d EOF 'payload' <<EOF
+{
+  "body": $(echo "$body" | jq -Rsa .),
+  "draft": false,
+  "name": "v${version}",
+  "prerelease": false,
+  "tag_name": "v${version}"
+}
+EOF
+
+echo "Creating release..."
+response=$(curl -s --json "$payload" "https://git.virtual-boy.com/api/v1/repos/PVB/lemur/releases?token=$RELEASE_TOKEN")
+echo "$response"
+upload_url=$(echo "$response" | jq -r '.upload_url')
+for file in output/*; do
+    echo "Uploading $(basename "$file")..."
+    upload_res=$(curl -s -F "attachment=@$file" "$upload_url?name=$(basename "$file")&token=$RELEASE_TOKEN")
+    echo "$upload_res"
+done

src/app.rs

@@ -1,9 +1,9 @@
-use std::{collections::HashSet, num::NonZero, sync::Arc, thread};
+use std::{collections::HashSet, num::NonZero, sync::Arc, thread, time::Duration};
 
 use egui::{
     ahash::{HashMap, HashMapExt},
-    Context, FontData, FontDefinitions, FontFamily, TextWrapMode, ViewportBuilder, ViewportCommand,
+    Context, FontData, FontDefinitions, FontFamily, IconData, TextWrapMode, ViewportBuilder,
-    ViewportId, ViewportInfo,
+    ViewportCommand, ViewportId, ViewportInfo,
 };
 use gilrs::{EventType, Gilrs};
 use winit::{
@@ -15,23 +15,39 @@ use winit::{
 
 use crate::{
     controller::ControllerManager,
-    emulator::{EmulatorClient, SimId},
+    emulator::{EmulatorClient, EmulatorCommand, SimId},
     input::MappingProvider,
-    window::{AppWindow, GameWindow, InputWindow},
+    persistence::Persistence,
+    window::{AboutWindow, AppWindow, GameWindow, InputWindow},
 };
 
+fn load_icon() -> anyhow::Result<IconData> {
+    let bytes = include_bytes!("../assets/lemur-256x256.png");
+    let img = image::load_from_memory_with_format(bytes, image::ImageFormat::Png)?;
+    let rgba = img.into_rgba8();
+    Ok(IconData {
+        width: rgba.width(),
+        height: rgba.height(),
+        rgba: rgba.into_vec(),
+    })
+}
+
 pub struct Application {
+    icon: Option<Arc<IconData>>,
     client: EmulatorClient,
     proxy: EventLoopProxy<UserEvent>,
     mappings: MappingProvider,
     controllers: ControllerManager,
+    persistence: Persistence,
     viewports: HashMap<ViewportId, Viewport>,
     focused: Option<ViewportId>,
 }
 
 impl Application {
     pub fn new(client: EmulatorClient, proxy: EventLoopProxy<UserEvent>) -> Self {
-        let mappings = MappingProvider::new();
+        let icon = load_icon().ok().map(Arc::new);
+        let persistence = Persistence::new();
+        let mappings = MappingProvider::new(persistence.clone());
         let controllers = ControllerManager::new(client.clone(), &mappings);
         {
             let mappings = mappings.clone();
@@ -39,10 +55,12 @@ impl Application {
             thread::spawn(|| process_gamepad_input(mappings, proxy));
         }
         Self {
+            icon,
             client,
             proxy,
             mappings,
             controllers,
+            persistence,
             viewports: HashMap::new(),
             focused: None,
         }
@@ -53,15 +71,22 @@ impl Application {
         if self.viewports.contains_key(&viewport_id) {
             return;
         }
-        self.viewports
+        self.viewports.insert(
-            .insert(viewport_id, Viewport::new(event_loop, window));
+            viewport_id,
+            Viewport::new(event_loop, self.icon.clone(), window),
+        );
     }
 }
 
 impl ApplicationHandler<UserEvent> for Application {
     fn resumed(&mut self, event_loop: &ActiveEventLoop) {
-        let app = GameWindow::new(self.client.clone(), self.proxy.clone(), SimId::Player1);
+        let app = GameWindow::new(
-        let wrapper = Viewport::new(event_loop, Box::new(app));
+            self.client.clone(),
+            self.proxy.clone(),
+            self.persistence.clone(),
+            SimId::Player1,
+        );
+        let wrapper = Viewport::new(event_loop, self.icon.clone(), Box::new(app));
         self.focused = Some(wrapper.id());
         self.viewports.insert(wrapper.id(), wrapper);
     }
@@ -154,12 +179,21 @@ impl ApplicationHandler<UserEvent> for Application {
                 };
                 viewport.app.handle_gamepad_event(&event);
             }
+            UserEvent::OpenAbout => {
+                let about = AboutWindow;
+                self.open(event_loop, Box::new(about));
+            }
             UserEvent::OpenInput => {
                 let input = InputWindow::new(self.mappings.clone());
                 self.open(event_loop, Box::new(input));
             }
             UserEvent::OpenPlayer2 => {
-                let p2 = GameWindow::new(self.client.clone(), self.proxy.clone(), SimId::Player2);
+                let p2 = GameWindow::new(
+                    self.client.clone(),
+                    self.proxy.clone(),
+                    self.persistence.clone(),
+                    SimId::Player2,
+                );
                 self.open(event_loop, Box::new(p2));
             }
         }
@@ -170,6 +204,15 @@ impl ApplicationHandler<UserEvent> for Application {
             viewport.window.request_redraw();
         }
     }
+
+    fn exiting(&mut self, _event_loop: &ActiveEventLoop) {
+        let (sender, receiver) = oneshot::channel();
+        if self.client.send_command(EmulatorCommand::Exit(sender)) {
+            if let Err(err) = receiver.recv_timeout(Duration::from_secs(5)) {
+                eprintln!("could not gracefully exit: {}", err);
+            }
+        }
+    }
 }
 
 struct Viewport {
@@ -183,9 +226,16 @@ struct Viewport {
     app: Box<dyn AppWindow>,
 }
 impl Viewport {
-    pub fn new(event_loop: &ActiveEventLoop, mut app: Box<dyn AppWindow>) -> Self {
+    pub fn new(
+        event_loop: &ActiveEventLoop,
+        icon: Option<Arc<IconData>>,
+        mut app: Box<dyn AppWindow>,
+    ) -> Self {
         let mut painter = egui_wgpu::winit::Painter::new(
-            egui_wgpu::WgpuConfiguration::default(),
+            egui_wgpu::WgpuConfiguration {
+                present_mode: wgpu::PresentMode::AutoNoVsync,
+                ..egui_wgpu::WgpuConfiguration::default()
+            },
             1,
             None,
             false,
@@ -193,7 +243,7 @@ impl Viewport {
         );
 
         let ctx = Context::default();
-        let mut fonts = FontDefinitions::empty();
+        let mut fonts = FontDefinitions::default();
         fonts.font_data.insert(
             "Selawik".into(),
             FontData::from_static(include_bytes!("../assets/selawik.ttf")),
@@ -208,9 +258,13 @@ impl Viewport {
             s.wrap_mode = Some(TextWrapMode::Extend);
             s.visuals.menu_rounding = Default::default();
         });
+        egui_extras::install_image_loaders(&ctx);
 
         let mut info = ViewportInfo::default();
-        let builder = app.initial_viewport();
+        let mut builder = app.initial_viewport();
+        if let Some(icon) = icon {
+            builder = builder.with_icon(icon);
+        }
         let (window, state) = create_window_and_state(&ctx, event_loop, &builder, &mut painter);
         egui_winit::update_viewport_info(&mut info, &ctx, &window, true);
 
@@ -316,6 +370,7 @@ impl Drop for Viewport {
 #[derive(Debug)]
 pub enum UserEvent {
     GamepadEvent(gilrs::Event),
+    OpenAbout,
     OpenInput,
     OpenPlayer2,
 }

src/emulator.rs

@@ -1,6 +1,7 @@
 use std::{
     collections::HashMap,
-    fs,
+    fs::{self, File},
+    io::{Read, Seek, SeekFrom, Write},
     path::{Path, PathBuf},
     sync::{
         atomic::{AtomicBool, AtomicUsize, Ordering},
@@ -10,6 +11,7 @@ use std::{
 };
 
 use anyhow::Result;
+use egui_toast::{Toast, ToastKind, ToastOptions};
 
 use crate::{audio::Audio, graphics::TextureSink};
 pub use shrooms_vb_core::VBKey;
@@ -44,6 +46,43 @@ impl SimId {
     }
 }
 
+struct Cart {
+    rom_path: PathBuf,
+    rom: Vec<u8>,
+    sram_file: File,
+    sram: Vec<u8>,
+}
+
+impl Cart {
+    fn load(rom_path: &Path, sim_id: SimId) -> Result<Self> {
+        let rom = fs::read(rom_path)?;
+
+        let mut sram_file = File::options()
+            .read(true)
+            .write(true)
+            .create(true)
+            .truncate(false)
+            .open(sram_path(rom_path, sim_id))?;
+        sram_file.set_len(8 * 1024)?;
+
+        let mut sram = vec![];
+        sram_file.read_to_end(&mut sram)?;
+        Ok(Cart {
+            rom_path: rom_path.to_path_buf(),
+            rom,
+            sram_file,
+            sram,
+        })
+    }
+}
+
+fn sram_path(rom_path: &Path, sim_id: SimId) -> PathBuf {
+    match sim_id {
+        SimId::Player1 => rom_path.with_extension("p1.sram"),
+        SimId::Player2 => rom_path.with_extension("p2.sram"),
+    }
+}
+
 impl EmulatorBuilder {
     pub fn new() -> (Self, EmulatorClient) {
         let (queue, commands) = mpsc::channel();
@@ -84,7 +123,7 @@ impl EmulatorBuilder {
             self.linked,
         )?;
         if let Some(path) = self.rom {
-            emulator.load_rom(SimId::Player1, &path)?;
+            emulator.load_cart(SimId::Player1, &path)?;
         }
         Ok(emulator)
     }
@@ -92,6 +131,7 @@ impl EmulatorBuilder {
 
 pub struct Emulator {
     sims: Vec<Sim>,
+    carts: [Option<Cart>; 2],
     audio: Audio,
     commands: mpsc::Receiver<EmulatorCommand>,
     sim_count: Arc<AtomicUsize>,
@@ -100,6 +140,7 @@ pub struct Emulator {
     audio_on: Arc<[AtomicBool; 2]>,
     linked: Arc<AtomicBool>,
     renderers: HashMap<SimId, TextureSink>,
+    messages: HashMap<SimId, mpsc::Sender<Toast>>,
 }
 
 impl Emulator {
@@ -113,6 +154,7 @@ impl Emulator {
     ) -> Result<Self> {
         Ok(Self {
             sims: vec![],
+            carts: [None, None],
             audio: Audio::init()?,
             commands,
             sim_count,
@@ -121,27 +163,34 @@ impl Emulator {
             audio_on,
             linked,
             renderers: HashMap::new(),
+            messages: HashMap::new(),
         })
     }
 
-    pub fn load_rom(&mut self, sim_id: SimId, path: &Path) -> Result<()> {
+    pub fn load_cart(&mut self, sim_id: SimId, path: &Path) -> Result<()> {
-        let bytes = fs::read(path)?;
+        let cart = Cart::load(path, sim_id)?;
-        self.reset_sim(sim_id, Some(bytes))?;
+        self.reset_sim(sim_id, Some(cart))?;
         Ok(())
     }
 
     pub fn start_second_sim(&mut self, rom: Option<PathBuf>) -> Result<()> {
-        let bytes = if let Some(path) = rom {
+        let rom_path = if let Some(path) = rom {
-            Some(fs::read(path)?)
+            Some(path)
         } else {
-            self.sims.first().and_then(|s| s.clone_rom())
+            self.carts[0].as_ref().map(|c| c.rom_path.clone())
         };
-        self.reset_sim(SimId::Player2, bytes)?;
+        let cart = match rom_path {
+            Some(rom_path) => Some(Cart::load(&rom_path, SimId::Player2)?),
+            None => None,
+        };
+        self.reset_sim(SimId::Player2, cart)?;
         self.link_sims();
         Ok(())
     }
 
-    fn reset_sim(&mut self, sim_id: SimId, new_rom: Option<Vec<u8>>) -> Result<()> {
+    fn reset_sim(&mut self, sim_id: SimId, new_cart: Option<Cart>) -> Result<()> {
+        self.save_sram(sim_id)?;
+
         let index = sim_id.to_index();
         while self.sims.len() <= index {
             self.sims.push(Sim::new());
@@ -149,8 +198,9 @@ impl Emulator {
         self.sim_count.store(self.sims.len(), Ordering::Relaxed);
         let sim = &mut self.sims[index];
         sim.reset();
-        if let Some(bytes) = new_rom {
+        if let Some(cart) = new_cart {
-            sim.load_rom(bytes)?;
+            sim.load_cart(cart.rom.clone(), cart.sram.clone())?;
+            self.carts[index] = Some(cart);
             self.has_game[index].store(true, Ordering::Release);
         }
         if self.has_game[index].load(Ordering::Acquire) {
@@ -179,13 +229,31 @@ impl Emulator {
         self.linked.store(false, Ordering::Release);
     }
 
-    pub fn stop_second_sim(&mut self) {
+    pub fn pause_sim(&mut self, sim_id: SimId) -> Result<()> {
+        self.running[sim_id.to_index()].store(false, Ordering::Release);
+        self.save_sram(sim_id)
+    }
+
+    fn save_sram(&mut self, sim_id: SimId) -> Result<()> {
+        let sim = self.sims.get_mut(sim_id.to_index());
+        let cart = self.carts[sim_id.to_index()].as_mut();
+        if let (Some(sim), Some(cart)) = (sim, cart) {
+            sim.read_sram(&mut cart.sram);
+            cart.sram_file.seek(SeekFrom::Start(0))?;
+            cart.sram_file.write_all(&cart.sram)?;
+        }
+        Ok(())
+    }
+
+    pub fn stop_second_sim(&mut self) -> Result<()> {
+        self.save_sram(SimId::Player2)?;
         self.renderers.remove(&SimId::Player2);
         self.sims.truncate(1);
         self.sim_count.store(self.sims.len(), Ordering::Relaxed);
         self.running[SimId::Player2.to_index()].store(false, Ordering::Release);
         self.has_game[SimId::Player2.to_index()].store(false, Ordering::Release);
         self.linked.store(false, Ordering::Release);
+        Ok(())
     }
 
     pub fn run(&mut self) {
@@ -265,25 +333,36 @@ impl Emulator {
 
     fn handle_command(&mut self, command: EmulatorCommand) {
         match command {
-            EmulatorCommand::SetRenderer(sim_id, renderer) => {
+            EmulatorCommand::ConnectToSim(sim_id, renderer, messages) => {
                 self.renderers.insert(sim_id, renderer);
+                self.messages.insert(sim_id, messages);
             }
             EmulatorCommand::LoadGame(sim_id, path) => {
-                if let Err(error) = self.load_rom(sim_id, &path) {
+                if let Err(error) = self.load_cart(sim_id, &path) {
-                    eprintln!("error loading rom: {}", error);
+                    self.report_error(sim_id, format!("Error loading rom: {error}"));
                 }
             }
             EmulatorCommand::StartSecondSim(path) => {
                 if let Err(error) = self.start_second_sim(path) {
-                    eprintln!("error starting second sim: {}", error);
+                    self.report_error(
+                        SimId::Player2,
+                        format!("Error starting second sim: {error}"),
+                    );
                 }
             }
             EmulatorCommand::StopSecondSim => {
-                self.stop_second_sim();
+                if let Err(error) = self.stop_second_sim() {
+                    self.report_error(
+                        SimId::Player2,
+                        format!("Error stopping second sim: {error}"),
+                    );
+                }
             }
             EmulatorCommand::Pause => {
-                for sim in SimId::values() {
+                for sim_id in SimId::values() {
-                    self.running[sim.to_index()].store(false, Ordering::Release);
+                    if let Err(error) = self.pause_sim(sim_id) {
+                        self.report_error(sim_id, format!("Error pausing: {error}"));
+                    }
                 }
             }
             EmulatorCommand::Resume => {
@@ -306,7 +385,7 @@ impl Emulator {
             }
             EmulatorCommand::Reset(sim_id) => {
                 if let Err(error) = self.reset_sim(sim_id, None) {
-                    eprintln!("error resetting sim: {}", error);
+                    self.report_error(sim_id, format!("Error resetting sim: {error}"));
                 }
             }
             EmulatorCommand::SetKeys(sim_id, keys) => {
@@ -314,13 +393,38 @@ impl Emulator {
                     sim.set_keys(keys);
                 }
             }
+            EmulatorCommand::Exit(done) => {
+                for sim_id in SimId::values() {
+                    if let Err(error) = self.save_sram(sim_id) {
+                        self.report_error(sim_id, format!("Error saving sram on exit: {error}"));
                     }
                 }
+                let _ = done.send(());
+            }
+        }
+    }
+
+    fn report_error(&self, sim_id: SimId, message: String) {
+        let messages = self
+            .messages
+            .get(&sim_id)
+            .or_else(|| self.messages.get(&SimId::Player1));
+        if let Some(msg) = messages {
+            let toast = Toast::new()
+                .kind(ToastKind::Error)
+                .options(ToastOptions::default().duration_in_seconds(5.0))
+                .text(&message);
+            if msg.send(toast).is_ok() {
+                return;
+            }
+        }
+        eprintln!("{}", message);
+    }
 }
 
 #[derive(Debug)]
 pub enum EmulatorCommand {
-    SetRenderer(SimId, TextureSink),
+    ConnectToSim(SimId, TextureSink, mpsc::Sender<Toast>),
     LoadGame(SimId, PathBuf),
     StartSecondSim(Option<PathBuf>),
     StopSecondSim,
@@ -331,6 +435,7 @@ pub enum EmulatorCommand {
     Unlink,
     Reset(SimId),
     SetKeys(SimId, VBKey),
+    Exit(oneshot::Sender<()>),
 }
 
 #[derive(Clone)]
@@ -359,12 +464,16 @@ impl EmulatorClient {
     pub fn is_audio_enabled(&self, sim_id: SimId) -> bool {
         self.audio_on[sim_id.to_index()].load(Ordering::Acquire)
     }
-    pub fn send_command(&self, command: EmulatorCommand) {
+    pub fn send_command(&self, command: EmulatorCommand) -> bool {
-        if let Err(err) = self.queue.send(command) {
+        match self.queue.send(command) {
+            Ok(()) => true,
+            Err(err) => {
                 eprintln!(
                     "could not send command {:?} as emulator is shut down",
                     err.0
                 );
+                false
+            }
         }
     }
 }

src/emulator/shrooms_vb_core.rs

@@ -3,6 +3,7 @@ use std::{ffi::c_void, ptr, slice};
 use anyhow::{anyhow, Result};
 use bitflags::bitflags;
 use num_derive::{FromPrimitive, ToPrimitive};
+use serde::{Deserialize, Serialize};
 
 #[repr(C)]
 struct VB {
@@ -33,7 +34,7 @@ enum VBOption {
 
 bitflags! {
     #[repr(transparent)]
-    #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)]
+    #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
     pub struct VBKey: u16 {
         const PWR = 0x0001;
         const SGN = 0x0002;
@@ -62,6 +63,8 @@ extern "C" {
     fn vb_emulate(sim: *mut VB, cycles: *mut u32) -> c_int;
     #[link_name = "vbEmulateEx"]
     fn vb_emulate_ex(sims: *mut *mut VB, count: c_uint, cycles: *mut u32) -> c_int;
+    #[link_name = "vbGetCartRAM"]
+    fn vb_get_cart_ram(sim: *mut VB, size: *mut u32) -> *mut c_void;
     #[link_name = "vbGetCartROM"]
     fn vb_get_cart_rom(sim: *mut VB, size: *mut u32) -> *mut c_void;
     #[link_name = "vbGetPixels"]
@@ -87,6 +90,8 @@ extern "C" {
     fn vb_init(sim: *mut VB) -> *mut VB;
     #[link_name = "vbReset"]
     fn vb_reset(sim: *mut VB);
+    #[link_name = "vbSetCartRAM"]
+    fn vb_set_cart_ram(sim: *mut VB, sram: *mut c_void, size: u32) -> c_int;
     #[link_name = "vbSetCartROM"]
     fn vb_set_cart_rom(sim: *mut VB, rom: *mut c_void, size: u32) -> c_int;
     #[link_name = "vbSetFrameCallback"]
@@ -162,41 +167,58 @@ impl Sim {
         unsafe { vb_reset(self.sim) };
     }
 
-    pub fn load_rom(&mut self, rom: Vec<u8>) -> Result<()> {
+    pub fn load_cart(&mut self, mut rom: Vec<u8>, mut sram: Vec<u8>) -> Result<()> {
-        self.unload_rom();
+        self.unload_cart();
+
+        rom.shrink_to_fit();
+        sram.shrink_to_fit();
 
         let size = rom.len() as u32;
         let rom = Box::into_raw(rom.into_boxed_slice()).cast();
         let status = unsafe { vb_set_cart_rom(self.sim, rom, size) };
-        if status == 0 {
+        if status != 0 {
-            Ok(())
-        } else {
             let _: Vec<u8> =
                 unsafe { Vec::from_raw_parts(rom.cast(), size as usize, size as usize) };
-            Err(anyhow!("Invalid ROM size of {} bytes", size))
+            return Err(anyhow!("Invalid ROM size of {} bytes", size));
-        }
         }
 
-    pub fn clone_rom(&self) -> Option<Vec<u8>> {
+        let size = sram.len() as u32;
-        let mut size = 0;
+        let sram = Box::into_raw(sram.into_boxed_slice()).cast();
-        let rom = unsafe { vb_get_cart_rom(self.sim, &mut size) };
+        let status = unsafe { vb_set_cart_ram(self.sim, sram, size) };
-        if rom.is_null() {
+        if status != 0 {
-            return None;
+            let _: Vec<u8> =
-        }
+                unsafe { Vec::from_raw_parts(sram.cast(), size as usize, size as usize) };
-        // SAFETY: rom definitely points to a valid array of `size` bytes
+            return Err(anyhow!("Invalid SRAM size of {} bytes", size));
-        let slice: &[u8] = unsafe { slice::from_raw_parts(rom.cast(), size as usize) };
-        Some(slice.to_vec())
         }
 
-    fn unload_rom(&mut self) -> Option<Vec<u8>> {
+        Ok(())
+    }
+
+    fn unload_cart(&mut self) {
         let mut size = 0;
         let rom = unsafe { vb_get_cart_rom(self.sim, &mut size) };
-        if rom.is_null() {
-            return None;
-        }
         unsafe { vb_set_cart_rom(self.sim, ptr::null_mut(), 0) };
-        let vec = unsafe { Vec::from_raw_parts(rom.cast(), size as usize, size as usize) };
+        if !rom.is_null() {
-        Some(vec)
+            let _: Vec<u8> =
+                unsafe { Vec::from_raw_parts(rom.cast(), size as usize, size as usize) };
+        }
+
+        let sram = unsafe { vb_get_cart_ram(self.sim, &mut size) };
+        unsafe { vb_set_cart_ram(self.sim, ptr::null_mut(), 0) };
+        if !sram.is_null() {
+            let _: Vec<u8> =
+                unsafe { Vec::from_raw_parts(sram.cast(), size as usize, size as usize) };
+        }
+    }
+
+    pub fn read_sram(&mut self, buffer: &mut [u8]) {
+        let mut size = 0;
+        let sram = unsafe { vb_get_cart_ram(self.sim, &mut size) };
+        if sram.is_null() {
+            return;
+        }
+        let bytes = unsafe { slice::from_raw_parts(sram.cast(), size as usize) };
+        buffer.copy_from_slice(bytes);
     }
 
     pub fn link(&mut self, peer: &mut Sim) {

src/game.wgsl

@@ -49,7 +49,31 @@ struct Colors {
 var<uniform> colors: Colors;
 
 @fragment
-fn fs_main(in: VertexOutput) -> @location(0) vec4<f32> {
+fn fs_lefteye(in: VertexOutput) -> @location(0) vec4<f32> {
+    let brt = textureSample(u_texture, u_sampler, in.tex_coords);
+    return colors.left * brt[0];
+}
+
+@fragment
+fn fs_righteye(in: VertexOutput) -> @location(0) vec4<f32> {
+    let brt = textureSample(u_texture, u_sampler, in.tex_coords);
+    return colors.left * brt[1];
+}
+
+@fragment
+fn fs_anaglyph(in: VertexOutput) -> @location(0) vec4<f32> {
     let brt = textureSample(u_texture, u_sampler, in.tex_coords);
     return colors.left * brt[0] + colors.right * brt[1];
 }
+
+@fragment
+fn fs_sidebyside(in: VertexOutput) -> @location(0) vec4<f32> {
+    var point = in.tex_coords;
+    point.x = (point.x * 2.0) % 1.0;
+    let brt = textureSample(u_texture, u_sampler, point);
+    if in.tex_coords.x < 0.5 {
+        return colors.left * brt[0];
+    } else {
+        return colors.left * brt[1];
+    };
+}

src/input.rs

@@ -1,16 +1,40 @@
 use std::{
     collections::{hash_map::Entry, HashMap},
+    fmt::Display,
+    str::FromStr,
     sync::{Arc, RwLock},
 };
 
+use anyhow::anyhow;
 use gilrs::{ev::Code, Axis, Button, Gamepad, GamepadId};
+use serde::{Deserialize, Serialize};
 use winit::keyboard::{KeyCode, PhysicalKey};
 
-use crate::emulator::{SimId, VBKey};
+use crate::{
+    emulator::{SimId, VBKey},
+    persistence::Persistence,
+};
 
-#[derive(Clone, Copy, PartialEq, Eq, Hash)]
+#[derive(Clone, PartialEq, Eq, Hash)]
 struct DeviceId(u16, u16);
 
+impl FromStr for DeviceId {
+    type Err = anyhow::Error;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        let mut ids = s.split("-");
+        let vendor_id: u16 = ids.next().ok_or(anyhow!("missing vendor id"))?.parse()?;
+        let product_id: u16 = ids.next().ok_or(anyhow!("missing product id"))?.parse()?;
+        Ok(Self(vendor_id, product_id))
+    }
+}
+
+impl Display for DeviceId {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        f.write_fmt(format_args!("{}-{}", self.0, self.1))
+    }
+}
+
 #[derive(Clone)]
 pub struct GamepadInfo {
     pub id: GamepadId,
@@ -26,6 +50,7 @@ pub trait Mappings {
     fn use_default_mappings(&mut self);
 }
 
+#[derive(Serialize, Deserialize)]
 pub struct GamepadMapping {
     buttons: HashMap<Code, VBKey>,
     axes: HashMap<Code, (VBKey, VBKey)>,
@@ -89,6 +114,30 @@ impl GamepadMapping {
             .or_insert((VBKey::empty(), VBKey::empty()));
         entry.1 = entry.1.union(key);
     }
+
+    fn save_mappings(&self) -> PersistedGamepadMapping {
+        fn flatten<V: Copy>(values: &HashMap<Code, V>) -> Vec<(Code, V)> {
+            values.iter().map(|(k, v)| (*k, *v)).collect()
+        }
+        PersistedGamepadMapping {
+            buttons: flatten(&self.buttons),
+            axes: flatten(&self.axes),
+            default_buttons: flatten(&self.default_buttons),
+            default_axes: flatten(&self.default_axes),
+        }
+    }
+
+    fn from_mappings(mappings: &PersistedGamepadMapping) -> Self {
+        fn unflatten<V: Copy>(values: &[(Code, V)]) -> HashMap<Code, V> {
+            values.iter().map(|(k, v)| (*k, *v)).collect()
+        }
+        Self {
+            buttons: unflatten(&mappings.buttons),
+            axes: unflatten(&mappings.axes),
+            default_buttons: unflatten(&mappings.default_buttons),
+            default_axes: unflatten(&mappings.default_axes),
+        }
+    }
 }
 
 impl Mappings for GamepadMapping {
@@ -158,6 +207,16 @@ impl InputMapping {
         let entry = self.keys.entry(keyboard_key).or_insert(VBKey::empty());
         *entry = entry.union(key);
     }
+
+    fn save_mappings(&self) -> PersistedKeyboardMapping {
+        PersistedKeyboardMapping {
+            keys: self.keys.iter().map(|(k, v)| (*k, *v)).collect(),
+        }
+    }
+
+    fn restore_mappings(&mut self, persisted: &PersistedKeyboardMapping) {
+        self.keys = persisted.keys.iter().map(|(k, v)| (*k, *v)).collect();
+    }
 }
 
 impl Mappings for InputMapping {
@@ -210,25 +269,42 @@ impl Mappings for InputMapping {
 
 #[derive(Clone)]
 pub struct MappingProvider {
+    persistence: Persistence,
     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() -> Self {
+    pub fn new(persistence: Persistence) -> Self {
-        let mut mappings = HashMap::new();
+        let mut sim_mappings = HashMap::new();
+        let mut device_mappings = HashMap::new();
 
         let mut p1_mappings = InputMapping::default();
-        p1_mappings.use_default_mappings();
+        let mut p2_mappings = InputMapping::default();
-        let p2_mappings = InputMapping::default();
 
-        mappings.insert(SimId::Player1, Arc::new(RwLock::new(p1_mappings)));
+        if let Ok(persisted) = persistence.load_config::<PersistedInputMappings>("mappings") {
-        mappings.insert(SimId::Player2, Arc::new(RwLock::new(p2_mappings)));
+            p1_mappings.restore_mappings(&persisted.p1_keyboard);
+            p2_mappings.restore_mappings(&persisted.p2_keyboard);
+
+            for (device_id, mappings) in persisted.gamepads {
+                let Ok(device_id) = device_id.parse::<DeviceId>() else {
+                    continue;
+                };
+                let gamepad = GamepadMapping::from_mappings(&mappings);
+                device_mappings.insert(device_id, Arc::new(RwLock::new(gamepad)));
+            }
+        } else {
+            p1_mappings.use_default_mappings();
+        }
+
+        sim_mappings.insert(SimId::Player1, Arc::new(RwLock::new(p1_mappings)));
+        sim_mappings.insert(SimId::Player2, Arc::new(RwLock::new(p2_mappings)));
         Self {
-            device_mappings: Arc::new(RwLock::new(HashMap::new())),
+            persistence,
+            device_mappings: Arc::new(RwLock::new(device_mappings)),
             gamepad_info: Arc::new(RwLock::new(HashMap::new())),
-            sim_mappings: mappings,
+            sim_mappings,
         }
     }
 
@@ -238,7 +314,7 @@ impl MappingProvider {
 
     pub fn for_gamepad(&self, gamepad_id: GamepadId) -> Option<Arc<RwLock<GamepadMapping>>> {
         let lock = self.gamepad_info.read().unwrap();
-        let device_id = lock.get(&gamepad_id)?.device_id;
+        let device_id = lock.get(&gamepad_id)?.device_id.clone();
         drop(lock);
         let lock = self.device_mappings.read().unwrap();
         lock.get(&device_id).cloned()
@@ -250,7 +326,7 @@ impl MappingProvider {
             gamepad.product_id().unwrap_or_default(),
         );
         let mut lock = self.device_mappings.write().unwrap();
-        let mappings = match lock.entry(device_id) {
+        let mappings = match lock.entry(device_id.clone()) {
             Entry::Vacant(entry) => {
                 let mappings = GamepadMapping::for_gamepad(gamepad);
                 entry.insert(Arc::new(RwLock::new(mappings)))
@@ -303,7 +379,7 @@ impl MappingProvider {
             return;
         };
         info.bound_to = Some(sim_id);
-        let device_id = info.device_id;
+        let device_id = info.device_id.clone();
         drop(lock);
         let Some(device_mappings) = self
             .device_mappings
@@ -341,4 +417,40 @@ impl MappingProvider {
             .cloned()
             .collect()
     }
+
+    pub fn save(&self) {
+        let p1_keyboard = self.for_sim(SimId::Player1).read().unwrap().save_mappings();
+        let p2_keyboard = self.for_sim(SimId::Player2).read().unwrap().save_mappings();
+        let mut gamepads = HashMap::new();
+        for (device_id, gamepad) in self.device_mappings.read().unwrap().iter() {
+            let mapping = gamepad.read().unwrap().save_mappings();
+            gamepads.insert(device_id.to_string(), mapping);
+        }
+        let persisted = PersistedInputMappings {
+            p1_keyboard,
+            p2_keyboard,
+            gamepads,
+        };
+        let _ = self.persistence.save_config("mappings", &persisted);
+    }
+}
+
+#[derive(Serialize, Deserialize)]
+struct PersistedInputMappings {
+    p1_keyboard: PersistedKeyboardMapping,
+    p2_keyboard: PersistedKeyboardMapping,
+    gamepads: HashMap<String, PersistedGamepadMapping>,
+}
+
+#[derive(Serialize, Deserialize)]
+struct PersistedKeyboardMapping {
+    keys: Vec<(PhysicalKey, VBKey)>,
+}
+
+#[derive(Serialize, Deserialize)]
+struct PersistedGamepadMapping {
+    buttons: Vec<(Code, VBKey)>,
+    axes: Vec<(Code, (VBKey, VBKey))>,
+    default_buttons: Vec<(Code, VBKey)>,
+    default_axes: Vec<(Code, (VBKey, VBKey))>,
 }

src/main.rs

@@ -1,4 +1,7 @@
-use std::{path::PathBuf, process};
+// hide console in release mode
+#![cfg_attr(not(debug_assertions), windows_subsystem = "windows")]
+
+use std::{path::PathBuf, process, time::SystemTime};
 
 use anyhow::Result;
 use app::Application;
@@ -13,6 +16,7 @@ mod controller;
 mod emulator;
 mod graphics;
 mod input;
+mod persistence;
 mod window;
 
 #[derive(Parser)]
@@ -20,6 +24,43 @@ struct Args {
     rom: Option<PathBuf>,
 }
 
+fn set_panic_handler() {
+    std::panic::set_hook(Box::new(|info| {
+        let mut message = String::new();
+        if let Some(msg) = info.payload().downcast_ref::<&str>() {
+            message += &format!("{}\n", msg);
+        } else if let Some(msg) = info.payload().downcast_ref::<String>() {
+            message += &format!("{}\n", msg);
+        }
+        if let Some(location) = info.location() {
+            message += &format!(
+                "    in file '{}' at line {}\n",
+                location.file(),
+                location.line()
+            );
+        }
+        let backtrace = std::backtrace::Backtrace::force_capture();
+        message += &format!("stack trace:\n{:#}\n", backtrace);
+
+        eprint!("{}", message);
+
+        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()
+            .as_millis();
+        let logfile_name = format!("crash-{}.txt", timestamp);
+        let _ = std::fs::write(data_dir.join(logfile_name), message);
+    }));
+}
+
 #[cfg(windows)]
 fn set_process_priority_to_high() -> Result<()> {
     use windows::Win32::{Foundation, System::Threading};
@@ -30,6 +71,8 @@ fn set_process_priority_to_high() -> Result<()> {
 }
 
 fn main() -> Result<()> {
+    set_panic_handler();
+
     #[cfg(windows)]
     set_process_priority_to_high()?;
 

src/persistence.rs

@@ -0,0 +1,46 @@
+use std::{fs, path::PathBuf};
+
+use anyhow::{bail, Result};
+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,8 +1,10 @@
+pub use about::AboutWindow;
 use egui::{Context, ViewportBuilder, ViewportId};
 pub use game::GameWindow;
 pub use input::InputWindow;
 use winit::event::KeyEvent;
 
+mod about;
 mod game;
 mod game_screen;
 mod input;

src/window/about.rs

@@ -0,0 +1,31 @@
+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, ctx: &Context) {
+        CentralPanel::default().show(ctx, |ui| {
+            ui.vertical_centered(|ui| {
+                ui.label("Lemur Virtual Boy Emulator");
+                ui.label(format!("Version {}", env!("CARGO_PKG_VERSION")));
+                ui.hyperlink("https://git.virtual-boy.com/PVB/lemur");
+                let logo = Image::new(egui::include_image!("../../assets/lemur-256x256.png"))
+                    .max_width(256.0)
+                    .maintain_aspect_ratio(true);
+                ui.add(logo);
+            });
+        });
+    }
+}

src/window/game.rs

@@ -1,29 +1,67 @@
+use std::sync::mpsc;
+
 use crate::{
     app::UserEvent,
     emulator::{EmulatorClient, EmulatorCommand, SimId},
+    persistence::Persistence,
 };
 use egui::{
-    menu, Button, CentralPanel, Color32, Context, Frame, Response, TopBottomPanel, Ui,
+    ecolor::HexColor, menu, Align2, Button, CentralPanel, Color32, Context, Direction, Frame,
-    ViewportBuilder, ViewportCommand, ViewportId, WidgetText,
+    Layout, Response, Sense, TopBottomPanel, Ui, Vec2, ViewportBuilder, ViewportCommand,
+    ViewportId, WidgetText, Window,
 };
+use egui_toast::{Toast, Toasts};
+use serde::{Deserialize, Serialize};
 use winit::event_loop::EventLoopProxy;
 
-use super::{game_screen::GameScreen, AppWindow};
+use super::{
+    game_screen::{DisplayMode, GameScreen},
+    AppWindow,
+};
+
+const COLOR_PRESETS: [[Color32; 2]; 3] = [
+    [
+        Color32::from_rgb(0xff, 0x00, 0x00),
+        Color32::from_rgb(0x00, 0xc6, 0xf0),
+    ],
+    [
+        Color32::from_rgb(0x00, 0xb4, 0x00),
+        Color32::from_rgb(0xc8, 0x00, 0xff),
+    ],
+    [
+        Color32::from_rgb(0xb4, 0x9b, 0x00),
+        Color32::from_rgb(0x00, 0x00, 0xff),
+    ],
+];
 
 pub struct GameWindow {
     client: EmulatorClient,
     proxy: EventLoopProxy<UserEvent>,
+    persistence: Persistence,
     sim_id: SimId,
+    config: GameConfig,
     screen: Option<GameScreen>,
+    messages: Option<mpsc::Receiver<Toast>>,
+    color_picker: Option<ColorPickerState>,
 }
 
 impl GameWindow {
-    pub fn new(client: EmulatorClient, proxy: EventLoopProxy<UserEvent>, sim_id: SimId) -> Self {
+    pub fn new(
+        client: EmulatorClient,
+        proxy: EventLoopProxy<UserEvent>,
+        persistence: Persistence,
+        sim_id: SimId,
+    ) -> Self {
+        let config = load_config(&persistence, sim_id);
         Self {
             client,
             proxy,
+            persistence,
             sim_id,
+            config,
             screen: None,
+            messages: None,
+            color_picker: None,
         }
     }
 
@@ -60,43 +98,7 @@ impl GameWindow {
                 ui.close_menu();
             }
         });
-        ui.menu_button("Video", |ui| {
+        ui.menu_button("Options", |ui| self.show_options_menu(ctx, ui));
-            let current_dims = ctx.input(|i| i.viewport().inner_rect.unwrap());
-            let current_dims = current_dims.max - current_dims.min;
-
-            for scale in 1..=4 {
-                let label = format!("x{scale}");
-                let scale = scale as f32;
-                let dims = (384.0 * scale, 224.0 * scale + 22.0).into();
-                if ui
-                    .selectable_button((current_dims - dims).length() < 1.0, label)
-                    .clicked()
-                {
-                    ctx.send_viewport_cmd(ViewportCommand::InnerSize(dims));
-                    ui.close_menu();
-                }
-            }
-        });
-        ui.menu_button("Audio", |ui| {
-            let p1_enabled = self.client.is_audio_enabled(SimId::Player1);
-            let p2_enabled = self.client.is_audio_enabled(SimId::Player2);
-            if ui.selectable_button(p1_enabled, "Player 1").clicked() {
-                self.client
-                    .send_command(EmulatorCommand::SetAudioEnabled(!p1_enabled, p2_enabled));
-                ui.close_menu();
-            }
-            if ui.selectable_button(p2_enabled, "Player 2").clicked() {
-                self.client
-                    .send_command(EmulatorCommand::SetAudioEnabled(p1_enabled, !p2_enabled));
-                ui.close_menu();
-            }
-        });
-        ui.menu_button("Input", |ui| {
-            if ui.button("Bind Inputs").clicked() {
-                self.proxy.send_event(UserEvent::OpenInput).unwrap();
-                ui.close_menu();
-            }
-        });
         ui.menu_button("Multiplayer", |ui| {
             if self.sim_id == SimId::Player1
                 && !self.client.has_player_2()
@@ -119,6 +121,180 @@ impl GameWindow {
                 }
             }
         });
+        ui.menu_button("About", |ui| {
+            self.proxy.send_event(UserEvent::OpenAbout).unwrap();
+            ui.close_menu();
+        });
+    }
+
+    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 = ctx.input(|i| i.viewport().inner_rect.unwrap());
+                let current_dims = current_dims.max - current_dims.min;
+
+                for scale in 1..=4 {
+                    let label = format!("x{scale}");
+                    let scale = scale as f32;
+                    let dims = {
+                        let Vec2 { x, y } = self.config.display_mode.proportions();
+                        Vec2::new(x * scale, y * scale + 22.0)
+                    };
+                    if ui
+                        .selectable_button((current_dims - dims).length() < 1.0, label)
+                        .clicked()
+                    {
+                        ctx.send_viewport_cmd(ViewportCommand::InnerSize(dims));
+                        ui.close_menu();
+                    }
+                }
+            });
+
+            ui.menu_button("Display Mode", |ui| {
+                let old_proportions = self.config.display_mode.proportions();
+                let mut changed = false;
+                let mut display_mode = self.config.display_mode;
+                changed |= ui
+                    .selectable_option(&mut display_mode, DisplayMode::Anaglyph, "Anaglyph")
+                    .clicked();
+                changed |= ui
+                    .selectable_option(&mut display_mode, DisplayMode::LeftEye, "Left Eye")
+                    .clicked();
+                changed |= ui
+                    .selectable_option(&mut display_mode, DisplayMode::RightEye, "Right Eye")
+                    .clicked();
+                changed |= ui
+                    .selectable_option(&mut display_mode, DisplayMode::SideBySide, "Side by Side")
+                    .clicked();
+
+                if !changed {
+                    return;
+                }
+
+                let current_dims = {
+                    let viewport = ctx.input(|i| i.viewport().inner_rect.unwrap());
+                    viewport.max - viewport.min
+                };
+                let new_proportions = display_mode.proportions();
+                let scale = new_proportions / old_proportions;
+                if scale != Vec2::new(1.0, 1.0) {
+                    ctx.send_viewport_cmd(ViewportCommand::InnerSize(current_dims * scale));
+                }
+
+                self.update_config(|c| {
+                    c.display_mode = display_mode;
+                    c.dimensions = current_dims * scale;
+                });
+                ui.close_menu();
+            });
+            ui.menu_button("Colors", |ui| {
+                for preset in COLOR_PRESETS {
+                    if ui.color_pair_button(preset[0], preset[1]).clicked() {
+                        self.update_config(|c| c.colors = preset);
+                        ui.close_menu();
+                    }
+                }
+                ui.with_layout(ui.layout().with_cross_align(egui::Align::Center), |ui| {
+                    if ui.button("Custom").clicked() {
+                        let color_str = |color: Color32| {
+                            format!("{:02x}{:02x}{:02x}", color.r(), color.g(), color.b())
+                        };
+                        let is_running = self.client.is_running(self.sim_id);
+                        if is_running {
+                            self.client.send_command(EmulatorCommand::Pause);
+                        }
+                        let color_codes = [
+                            color_str(self.config.colors[0]),
+                            color_str(self.config.colors[1]),
+                        ];
+                        self.color_picker = Some(ColorPickerState {
+                            color_codes,
+                            just_opened: true,
+                            unpause_on_close: is_running,
+                        });
+                        ui.close_menu();
+                    }
+                });
+            });
+        });
+        ui.menu_button("Audio", |ui| {
+            let p1_enabled = self.client.is_audio_enabled(SimId::Player1);
+            let p2_enabled = self.client.is_audio_enabled(SimId::Player2);
+            if ui.selectable_button(p1_enabled, "Player 1").clicked() {
+                self.client
+                    .send_command(EmulatorCommand::SetAudioEnabled(!p1_enabled, p2_enabled));
+                ui.close_menu();
+            }
+            if ui.selectable_button(p2_enabled, "Player 2").clicked() {
+                self.client
+                    .send_command(EmulatorCommand::SetAudioEnabled(p1_enabled, !p2_enabled));
+                ui.close_menu();
+            }
+        });
+        ui.menu_button("Input", |ui| {
+            if ui.button("Bind Inputs").clicked() {
+                self.proxy.send_event(UserEvent::OpenInput).unwrap();
+                ui.close_menu();
+            }
+        });
+    }
+
+    fn show_color_picker(&mut self, ui: &mut Ui) {
+        let mut colors = self.config.colors;
+        let Some(state) = self.color_picker.as_mut() else {
+            return;
+        };
+        let (open, updated) = ui
+            .horizontal(|ui| {
+                let left_color = ui.color_picker(&mut colors[0], &mut state.color_codes[0]);
+                if state.just_opened {
+                    left_color.request_focus();
+                    state.just_opened = false;
+                }
+                let right_color = ui.color_picker(&mut colors[1], &mut state.color_codes[1]);
+                let open = left_color.has_focus() || right_color.has_focus();
+                let updated = left_color.changed() || right_color.changed();
+                (open, updated)
+            })
+            .inner;
+        if !open {
+            if state.unpause_on_close {
+                self.client.send_command(EmulatorCommand::Resume);
+            }
+            self.color_picker = None;
+        }
+        if updated {
+            self.update_config(|c| c.colors = colors);
+        }
+    }
+
+    fn update_config(&mut self, update: impl FnOnce(&mut GameConfig)) {
+        let mut new_config = self.config.clone();
+        update(&mut new_config);
+        if self.config != new_config {
+            let _ = self
+                .persistence
+                .save_config(config_filename(self.sim_id), &new_config);
+        }
+        self.config = new_config;
+    }
+}
+
+fn config_filename(sim_id: SimId) -> &'static str {
+    match sim_id {
+        SimId::Player1 => "config_p1",
+        SimId::Player2 => "config_p2",
+    }
+}
+
+fn load_config(persistence: &Persistence, sim_id: SimId) -> GameConfig {
+    if let Ok(config) = persistence.load_config(config_filename(sim_id)) {
+        return config;
+    }
+    GameConfig {
+        display_mode: DisplayMode::Anaglyph,
+        colors: COLOR_PRESETS[0],
+        dimensions: DisplayMode::Anaglyph.proportions() + Vec2::new(0.0, 22.0),
     }
 }
 
@@ -132,11 +308,25 @@ impl AppWindow for GameWindow {
 
     fn initial_viewport(&self) -> ViewportBuilder {
         ViewportBuilder::default()
-            .with_title("Shrooms VB")
+            .with_title("Lemur")
-            .with_inner_size((384.0, 246.0))
+            .with_inner_size(self.config.dimensions)
     }
 
     fn show(&mut self, ctx: &Context) {
+        let dimensions = {
+            let bounds = ctx.input(|i| i.viewport().inner_rect.unwrap());
+            bounds.max - bounds.min
+        };
+        self.update_config(|c| c.dimensions = dimensions);
+
+        let mut toasts = Toasts::new()
+            .anchor(Align2::LEFT_BOTTOM, (10.0, 10.0))
+            .direction(Direction::BottomUp);
+        if let Some(messages) = self.messages.as_mut() {
+            while let Ok(toast) = messages.try_recv() {
+                toasts.add(toast);
+            }
+        }
         TopBottomPanel::top("menubar")
             .exact_height(22.0)
             .show(ctx, |ui| {
@@ -144,19 +334,35 @@ impl AppWindow for GameWindow {
                     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(ctx, |ui| {
+                    self.show_color_picker(ui);
+                });
+        }
         let frame = Frame::central_panel(&ctx.style()).fill(Color32::BLACK);
         CentralPanel::default().frame(frame).show(ctx, |ui| {
-            if let Some(screen) = self.screen.as_ref() {
+            if let Some(screen) = self.screen.as_mut() {
+                screen.update(self.config.display_mode, self.config.colors);
                 ui.add(screen);
             }
         });
+        toasts.show(ctx);
     }
 
     fn on_init(&mut self, render_state: &egui_wgpu::RenderState) {
         let (screen, sink) = GameScreen::init(render_state);
-        self.client
+        let (message_sink, message_source) = mpsc::channel();
-            .send_command(EmulatorCommand::SetRenderer(self.sim_id, sink));
+        self.client.send_command(EmulatorCommand::ConnectToSim(
-        self.screen = Some(screen)
+            self.sim_id,
+            sink,
+            message_sink,
+        ));
+        self.screen = Some(screen);
+        self.messages = Some(message_source);
     }
 
     fn on_destroy(&mut self) {
@@ -168,6 +374,22 @@ impl AppWindow for GameWindow {
 
 trait UiExt {
     fn selectable_button(&mut self, selected: bool, text: impl Into<WidgetText>) -> Response;
+    fn selectable_option<T: Eq>(
+        &mut self,
+        current_value: &mut T,
+        selected_value: T,
+        text: impl Into<WidgetText>,
+    ) -> Response {
+        let response = self.selectable_button(*current_value == selected_value, text);
+        if response.clicked() {
+            *current_value = selected_value;
+        }
+        response
+    }
+
+    fn color_pair_button(&mut self, left: Color32, right: Color32) -> Response;
+
+    fn color_picker(&mut self, color: &mut Color32, hex: &mut String) -> Response;
 }
 
 impl UiExt for Ui {
@@ -178,4 +400,50 @@ impl UiExt for Ui {
         let mut selected = selected;
         self.checkbox(&mut selected, text)
     }
+
+    fn color_pair_button(&mut self, left: Color32, right: Color32) -> Response {
+        let button_size = Vec2::new(60.0, 20.0);
+        let (rect, response) = self.allocate_at_least(button_size, Sense::click());
+        let center_x = rect.center().x;
+        let left_rect = rect.with_max_x(center_x);
+        self.painter().rect_filled(left_rect, 0.0, left);
+        let right_rect = rect.with_min_x(center_x);
+        self.painter().rect_filled(right_rect, 0.0, right);
+
+        let style = self.style().interact(&response);
+        self.painter().rect_stroke(rect, 0.0, style.fg_stroke);
+        response
+    }
+
+    fn color_picker(&mut self, color: &mut Color32, hex: &mut String) -> Response {
+        self.allocate_ui_with_layout(
+            Vec2::new(100.0, 130.0),
+            Layout::top_down_justified(egui::Align::Center),
+            |ui| {
+                let (rect, _) = ui.allocate_at_least(Vec2::new(100.0, 100.0), Sense::hover());
+                ui.painter().rect_filled(rect, 0.0, *color);
+                let resp = ui.text_edit_singleline(hex);
+                if resp.changed() {
+                    if let Ok(new_color) = HexColor::from_str_without_hash(hex) {
+                        *color = new_color.color();
+                    }
+                }
+                resp
+            },
+        )
+        .inner
+    }
+}
+
+struct ColorPickerState {
+    color_codes: [String; 2],
+    just_opened: bool,
+    unpause_on_close: bool,
+}
+
+#[derive(Serialize, Deserialize, Clone, PartialEq, Eq)]
+struct GameConfig {
+    display_mode: DisplayMode,
+    colors: [Color32; 2],
+    dimensions: Vec2,
 }

src/window/game_screen.rs

@@ -1,12 +1,16 @@
-use std::sync::Arc;
+use std::{collections::HashMap, sync::Arc};
 
-use egui::Widget;
+use egui::{Color32, Rgba, Vec2, Widget};
-use wgpu::{util::DeviceExt as _, BindGroup, BindGroupLayout, RenderPipeline};
+use serde::{Deserialize, Serialize};
+use wgpu::{util::DeviceExt as _, BindGroup, BindGroupLayout, Buffer, RenderPipeline};
 
 use crate::graphics::TextureSink;
 
 pub struct GameScreen {
     bind_group: Arc<BindGroup>,
+    color_buffer: Arc<Buffer>,
+    display_mode: DisplayMode,
+    colors: Colors,
 }
 
 impl GameScreen {
@@ -45,14 +49,16 @@ impl GameScreen {
             ],
         });
 
-        let shader = device.create_shader_module(wgpu::include_wgsl!("../anaglyph.wgsl"));
+        let shader = device.create_shader_module(wgpu::include_wgsl!("../game.wgsl"));
         let render_pipeline_layout =
             device.create_pipeline_layout(&wgpu::PipelineLayoutDescriptor {
                 label: Some("render pipeline layout"),
                 bind_group_layouts: &[&bind_group_layout],
                 push_constant_ranges: &[],
             });
-        let render_pipeline = device.create_render_pipeline(&wgpu::RenderPipelineDescriptor {
+
+        let create_render_pipeline = |entry_point: &str| {
+            device.create_render_pipeline(&wgpu::RenderPipelineDescriptor {
                 label: Some("render pipeline"),
                 layout: Some(&render_pipeline_layout),
                 vertex: wgpu::VertexState {
@@ -63,7 +69,7 @@ impl GameScreen {
                 },
                 fragment: Some(wgpu::FragmentState {
                     module: &shader,
-                entry_point: "fs_main",
+                    entry_point,
                     targets: &[Some(wgpu::ColorTargetState {
                         format: wgpu::TextureFormat::Bgra8Unorm,
                         blend: Some(wgpu::BlendState::REPLACE),
@@ -88,14 +94,24 @@ impl GameScreen {
                 },
                 multiview: None,
                 cache: None,
-        });
+            })
+        };
+
+        let mut render_pipelines = HashMap::new();
+        render_pipelines.insert(DisplayMode::Anaglyph, create_render_pipeline("fs_anaglyph"));
+        render_pipelines.insert(DisplayMode::LeftEye, create_render_pipeline("fs_lefteye"));
+        render_pipelines.insert(DisplayMode::RightEye, create_render_pipeline("fs_righteye"));
+        render_pipelines.insert(
+            DisplayMode::SideBySide,
+            create_render_pipeline("fs_sidebyside"),
+        );
 
         render_state
             .renderer
             .write()
             .callback_resources
             .insert(SharedGameScreenResources {
-                pipeline: render_pipeline,
+                render_pipelines,
                 bind_group_layout,
             });
     }
@@ -108,12 +124,12 @@ impl GameScreen {
 
         let (sink, texture_view) = TextureSink::new(device, queue.clone());
         let sampler = device.create_sampler(&wgpu::SamplerDescriptor::default());
-        let colors = Colors {
+        let colors = Colors::new(
-            left: [1.0, 0.0, 0.0, 1.0],
+            Color32::from_rgb(0xff, 0x00, 0x00),
-            right: [0.0, 0.7734375, 0.9375, 1.0],
+            Color32::from_rgb(0x00, 0xc6, 0xf0),
-        };
+        );
 
-        let color_buf = device.create_buffer_init(&wgpu::util::BufferInitDescriptor {
+        let color_buffer = device.create_buffer_init(&wgpu::util::BufferInitDescriptor {
             label: Some("colors"),
             contents: bytemuck::bytes_of(&colors),
             usage: wgpu::BufferUsages::UNIFORM | wgpu::BufferUsages::COPY_DST,
@@ -136,7 +152,7 @@ impl GameScreen {
                 },
                 wgpu::BindGroupEntry {
                     binding: 2,
-                    resource: color_buf.as_entire_binding(),
+                    resource: color_buffer.as_entire_binding(),
                 },
             ],
         });
@@ -144,19 +160,30 @@ impl GameScreen {
         (
             Self {
                 bind_group: Arc::new(bind_group),
+                color_buffer: Arc::new(color_buffer),
+                display_mode: DisplayMode::Anaglyph,
+                colors,
             },
             sink,
         )
     }
+
+    pub fn update(&mut self, display_mode: DisplayMode, colors: [Color32; 2]) {
+        self.display_mode = display_mode;
+        self.colors = Colors::new(colors[0], colors[1]);
+    }
 }
 
-impl Widget for &GameScreen {
+impl Widget for &mut GameScreen {
     fn ui(self, ui: &mut egui::Ui) -> egui::Response {
         let response = ui.allocate_rect(ui.clip_rect(), egui::Sense::hover());
         let callback = egui_wgpu::Callback::new_paint_callback(
             response.rect,
             GameScreenCallback {
                 bind_group: self.bind_group.clone(),
+                color_buffer: self.color_buffer.clone(),
+                display_mode: self.display_mode,
+                colors: self.colors,
             },
         );
         ui.painter().add(callback);
@@ -166,9 +193,23 @@ impl Widget for &GameScreen {
 
 struct GameScreenCallback {
     bind_group: Arc<BindGroup>,
+    color_buffer: Arc<Buffer>,
+    display_mode: DisplayMode,
+    colors: Colors,
 }
 
 impl egui_wgpu::CallbackTrait for GameScreenCallback {
+    fn prepare(
+        &self,
+        _device: &wgpu::Device,
+        queue: &wgpu::Queue,
+        _screen_descriptor: &egui_wgpu::ScreenDescriptor,
+        _egui_encoder: &mut wgpu::CommandEncoder,
+        _callback_resources: &mut egui_wgpu::CallbackResources,
+    ) -> Vec<wgpu::CommandBuffer> {
+        queue.write_buffer(&self.color_buffer, 0, bytemuck::bytes_of(&self.colors));
+        vec![]
+    }
     fn paint(
         &self,
         info: egui::PaintCallbackInfo,
@@ -181,12 +222,19 @@ impl egui_wgpu::CallbackTrait for GameScreenCallback {
         let top = viewport.top_px as f32;
         let width = viewport.width_px as f32;
         let height = viewport.height_px as f32;
-        let aspect_ratio = 384.0 / 224.0;
+        let aspect_ratio = {
+            let proportions = self.display_mode.proportions();
+            proportions.x / proportions.y
+        };
         let w = width.min(height * aspect_ratio);
         let h = height.min(width / aspect_ratio);
         let x = left + (width - w) / 2.0;
         let y = top + (height - h) / 2.0;
-        render_pass.set_pipeline(&resources.pipeline);
+        let pipeline = resources
+            .render_pipelines
+            .get(&self.display_mode)
+            .unwrap_or_else(|| panic!("Unrecognized display mode {:?}", self.display_mode));
+        render_pass.set_pipeline(pipeline);
         render_pass.set_bind_group(0, &self.bind_group, &[]);
         render_pass.set_viewport(x, y, w, h, 0.0, 1.0);
         render_pass.draw(0..6, 0..1);
@@ -194,13 +242,38 @@ impl egui_wgpu::CallbackTrait for GameScreenCallback {
 }
 
 struct SharedGameScreenResources {
-    pipeline: RenderPipeline,
+    render_pipelines: HashMap<DisplayMode, RenderPipeline>,
     bind_group_layout: BindGroupLayout,
 }
 
 #[derive(Clone, Copy, bytemuck::Pod, bytemuck::Zeroable)]
 #[repr(C)]
 struct Colors {
-    left: [f32; 4],
+    left: Rgba,
-    right: [f32; 4],
+    right: Rgba,
+}
+impl Colors {
+    fn new(left: Color32, right: Color32) -> Self {
+        Self {
+            left: left.into(),
+            right: right.into(),
+        }
+    }
+}
+
+#[derive(Clone, Copy, PartialEq, Eq, Hash, Debug, Serialize, Deserialize)]
+pub enum DisplayMode {
+    Anaglyph,
+    LeftEye,
+    RightEye,
+    SideBySide,
+}
+
+impl DisplayMode {
+    pub fn proportions(self) -> Vec2 {
+        match self {
+            Self::SideBySide => Vec2::new(768.0, 224.0),
+            _ => Vec2::new(384.0, 224.0),
+        }
+    }
 }

src/window/input.rs

@@ -53,10 +53,12 @@ impl InputWindow {
         ui.horizontal(|ui| {
             if ui.button("Use defaults").clicked() {
                 mappings.write().unwrap().use_default_mappings();
+                self.mappings.save();
                 self.now_binding = None;
             }
             if ui.button("Clear all").clicked() {
                 mappings.write().unwrap().clear_all_mappings();
+                self.mappings.save();
                 self.now_binding = None;
             }
         });
@@ -99,6 +101,8 @@ impl InputWindow {
                                 {
                                     let mut mapping = mappings.write().unwrap();
                                     mapping.clear_mappings(*key);
+                                    drop(mapping);
+                                    self.mappings.save();
                                     self.now_binding = None;
                                 }
                             });
@@ -210,6 +214,8 @@ impl AppWindow for InputWindow {
         };
         let mut mappings = self.mappings.for_sim(sim_id).write().unwrap();
         mappings.add_keyboard_mapping(vb, event.physical_key);
+        drop(mappings);
+        self.mappings.save();
     }
 
     fn handle_gamepad_event(&mut self, event: &gilrs::Event) {