chore: Release lemur version 0.4.7

Reviewed-on: #4

Cargo.toml

@@ -4,8 +4,8 @@ description = "An emulator for the Virtual Boy."
 repository = "https://git.virtual-boy.com/PVB/lemur"
 publish = false
 license = "MIT"
-version = "0.3.0"
+version = "0.4.7"
-edition = "2021"
+edition = "2024"
 
 [dependencies]
 anyhow = "1"
@@ -15,21 +15,22 @@ bitflags = { version = "2", features = ["serde"] }
 bytemuck = { version = "1", features = ["derive"] }
 clap = { version = "4", features = ["derive"] }
 cpal = { git = "https://github.com/sidit77/cpal.git", rev = "66ed6be" }
-directories = "5"
+directories = "6"
 egui = { version = "0.30", features = ["serde"] }
 egui_extras = { version = "0.30", features = ["image"] }
 egui-toast = { git = "https://github.com/urholaukkarinen/egui-toast.git", rev = "d0bcf97" }
 egui-winit = "0.30"
 egui-wgpu = { version = "0.30", features = ["winit"] }
+fixed = { version = "1.28", features = ["num-traits"] }
 gilrs = { version = "0.11", features = ["serde-serialize"] }
 hex = "0.4"
 image = { version = "0.25", default-features = false, features = ["png"] }
-itertools = "0.13"
+itertools = "0.14"
 num-derive = "0.4"
 num-traits = "0.2"
 oneshot = "0.1"
 pollster = "0.4"
-rfd = "0.15"
+rfd = { version = "0.15", default-features = false, features = ["xdg-portal", "async-std"]}
 rtrb = "0.3"
 rubato = "0.16"
 serde = { version = "1", features = ["derive"] }
@@ -42,7 +43,7 @@ wgpu = "23"
 winit = { version = "0.30", features = ["serde"] }
 
 [target.'cfg(windows)'.dependencies]
-windows = { version = "0.58", features = ["Win32_System_Threading"] }
+windows = { version = "0.59", features = ["Win32_System_Threading"] }
 
 [build-dependencies]
 cc = "1"

README.md

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

src/app.rs

@@ -1,9 +1,10 @@
 use std::{collections::HashSet, num::NonZero, sync::Arc, thread, time::Duration};
 
 use egui::{
-    ahash::{HashMap, HashMapExt},
     Context, FontData, FontDefinitions, FontFamily, IconData, TextWrapMode, ViewportBuilder,
     ViewportCommand, ViewportId, ViewportInfo,
+    ahash::{HashMap, HashMapExt},
+    style::ScrollStyle,
 };
 use gilrs::{EventType, Gilrs};
 use tracing::{error, warn};
@@ -17,13 +18,13 @@ use winit::{
 use crate::{
     controller::ControllerManager,
     emulator::{EmulatorClient, EmulatorCommand, SimId},
-    input::MappingProvider,
+    images::ImageProcessor,
-    memory::MemoryMonitor,
+    input::{MappingProvider, ShortcutProvider},
+    memory::MemoryClient,
     persistence::Persistence,
-    vram::VramProcessor,
     window::{
-        AboutWindow, AppWindow, BgMapWindow, CharacterDataWindow, GameWindow, GdbServerWindow,
+        AboutWindow, AppWindow, BgMapWindow, CharacterDataWindow, FrameBufferWindow, GameWindow,
-        InputWindow,
+        GdbServerWindow, InputWindow, ObjectWindow, RegisterWindow, ShortcutsWindow, WorldWindow,
     },
 };
 
@@ -40,12 +41,14 @@ fn load_icon() -> anyhow::Result<IconData> {
 
 pub struct Application {
     icon: Option<Arc<IconData>>,
+    wgpu: WgpuState,
     client: EmulatorClient,
     proxy: EventLoopProxy<UserEvent>,
     mappings: MappingProvider,
+    shortcuts: ShortcutProvider,
     controllers: ControllerManager,
-    memory: MemoryMonitor,
+    memory: Arc<MemoryClient>,
-    vram: VramProcessor,
+    images: ImageProcessor,
     persistence: Persistence,
     viewports: HashMap<ViewportId, Viewport>,
     focused: Option<ViewportId>,
@@ -58,12 +61,14 @@ impl Application {
         proxy: EventLoopProxy<UserEvent>,
         debug_port: Option<u16>,
     ) -> Self {
+        let wgpu = WgpuState::new();
         let icon = load_icon().ok().map(Arc::new);
         let persistence = Persistence::new();
         let mappings = MappingProvider::new(persistence.clone());
+        let shortcuts = ShortcutProvider::new(persistence.clone());
         let controllers = ControllerManager::new(client.clone(), &mappings);
-        let memory = MemoryMonitor::new(client.clone());
+        let memory = Arc::new(MemoryClient::new(client.clone()));
-        let vram = VramProcessor::new();
+        let images = ImageProcessor::new();
         {
             let mappings = mappings.clone();
             let proxy = proxy.clone();
@@ -71,11 +76,13 @@ impl Application {
         }
         Self {
             icon,
+            wgpu,
             client,
             proxy,
             mappings,
+            shortcuts,
             memory,
-            vram,
+            images,
             controllers,
             persistence,
             viewports: HashMap::new(),
@@ -86,12 +93,13 @@ impl Application {
 
     fn open(&mut self, event_loop: &ActiveEventLoop, window: Box<dyn AppWindow>) {
         let viewport_id = window.viewport_id();
-        if self.viewports.contains_key(&viewport_id) {
+        if let Some(viewport) = self.viewports.get(&viewport_id) {
+            viewport.window.focus_window();
             return;
         }
         self.viewports.insert(
             viewport_id,
-            Viewport::new(event_loop, self.icon.clone(), window),
+            Viewport::new(event_loop, &self.wgpu, self.icon.clone(), window),
         );
     }
 }
@@ -108,6 +116,7 @@ impl ApplicationHandler<UserEvent> for Application {
             self.client.clone(),
             self.proxy.clone(),
             self.persistence.clone(),
+            self.shortcuts.clone(),
             SimId::Player1,
         );
         self.open(event_loop, Box::new(app));
@@ -127,19 +136,23 @@ impl ApplicationHandler<UserEvent> for Application {
             return;
         };
         let viewport_id = viewport.id();
-        match &event {
-            WindowEvent::KeyboardInput { event, .. } => {
-                self.controllers.handle_key_event(event);
-                viewport.app.handle_key_event(event);
-            }
-            WindowEvent::Focused(new_focused) => {
-                self.focused = new_focused.then_some(viewport_id);
-            }
-            _ => {}
-        }
         let mut queue_redraw = false;
         let mut inactive_viewports = HashSet::new();
-        match viewport.on_window_event(event) {
+        let (consumed, action) = viewport.on_window_event(&event);
+        if !consumed {
+            match event {
+                WindowEvent::KeyboardInput { event, .. } => {
+                    if !viewport.app.handle_key_event(&event) {
+                        self.controllers.handle_key_event(&event);
+                    }
+                }
+                WindowEvent::Focused(new_focused) => {
+                    self.focused = new_focused.then_some(viewport_id);
+                }
+                _ => {}
+            }
+        }
+        match action {
             Some(Action::Redraw) => {
                 for viewport in self.viewports.values_mut() {
                     match viewport.redraw(event_loop) {
@@ -191,28 +204,45 @@ impl ApplicationHandler<UserEvent> for Application {
     fn user_event(&mut self, event_loop: &ActiveEventLoop, event: UserEvent) {
         match event {
             UserEvent::GamepadEvent(event) => {
-                self.controllers.handle_gamepad_event(&event);
+                if let Some(viewport) = self
-                let Some(viewport) = self
                     .focused
                     .as_ref()
                     .and_then(|id| self.viewports.get_mut(id))
-                else {
+                {
-                    return;
+                    if viewport.app.handle_gamepad_event(&event) {
-                };
+                        return;
-                viewport.app.handle_gamepad_event(&event);
+                    }
+                }
+                self.controllers.handle_gamepad_event(&event);
             }
             UserEvent::OpenAbout => {
                 let about = AboutWindow;
                 self.open(event_loop, Box::new(about));
             }
             UserEvent::OpenCharacterData(sim_id) => {
-                let vram = CharacterDataWindow::new(sim_id, &mut self.memory, &mut self.vram);
+                let chardata = CharacterDataWindow::new(sim_id, &self.memory, &mut self.images);
-                self.open(event_loop, Box::new(vram));
+                self.open(event_loop, Box::new(chardata));
             }
             UserEvent::OpenBgMap(sim_id) => {
-                let bgmap = BgMapWindow::new(sim_id, &mut self.memory, &mut self.vram);
+                let bgmap = BgMapWindow::new(sim_id, &self.memory, &mut self.images);
                 self.open(event_loop, Box::new(bgmap));
             }
+            UserEvent::OpenObjects(sim_id) => {
+                let objects = ObjectWindow::new(sim_id, &self.memory, &mut self.images);
+                self.open(event_loop, Box::new(objects));
+            }
+            UserEvent::OpenWorlds(sim_id) => {
+                let world = WorldWindow::new(sim_id, &self.memory, &mut self.images);
+                self.open(event_loop, Box::new(world));
+            }
+            UserEvent::OpenFrameBuffers(sim_id) => {
+                let world = FrameBufferWindow::new(sim_id, &self.memory, &mut self.images);
+                self.open(event_loop, Box::new(world));
+            }
+            UserEvent::OpenRegisters(sim_id) => {
+                let registers = RegisterWindow::new(sim_id, &self.memory);
+                self.open(event_loop, Box::new(registers));
+            }
             UserEvent::OpenDebugger(sim_id) => {
                 let debugger =
                     GdbServerWindow::new(sim_id, self.client.clone(), self.proxy.clone());
@@ -222,11 +252,16 @@ impl ApplicationHandler<UserEvent> for Application {
                 let input = InputWindow::new(self.mappings.clone());
                 self.open(event_loop, Box::new(input));
             }
+            UserEvent::OpenShortcuts => {
+                let shortcuts = ShortcutsWindow::new(self.shortcuts.clone());
+                self.open(event_loop, Box::new(shortcuts));
+            }
             UserEvent::OpenPlayer2 => {
                 let p2 = GameWindow::new(
                     self.client.clone(),
                     self.proxy.clone(),
                     self.persistence.clone(),
+                    self.shortcuts.clone(),
                     SimId::Player2,
                 );
                 self.open(event_loop, Box::new(p2));
@@ -257,6 +292,58 @@ impl ApplicationHandler<UserEvent> for Application {
     }
 }
 
+struct WgpuState {
+    instance: Arc<wgpu::Instance>,
+    adapter: Arc<wgpu::Adapter>,
+    device: Arc<wgpu::Device>,
+    queue: Arc<wgpu::Queue>,
+}
+
+impl WgpuState {
+    fn new() -> Self {
+        #[allow(unused_variables)]
+        let egui_wgpu::WgpuConfiguration {
+            wgpu_setup:
+                egui_wgpu::WgpuSetup::CreateNew {
+                    supported_backends,
+                    device_descriptor,
+                    ..
+                },
+            ..
+        } = egui_wgpu::WgpuConfiguration::default()
+        else {
+            panic!("required fields not found")
+        };
+        #[cfg(windows)]
+        let supported_backends = wgpu::util::backend_bits_from_env()
+            .unwrap_or((wgpu::Backends::PRIMARY | wgpu::Backends::GL) - wgpu::Backends::VULKAN);
+        let instance = wgpu::Instance::new(wgpu::InstanceDescriptor {
+            backends: supported_backends,
+            ..wgpu::InstanceDescriptor::default()
+        });
+
+        let adapter = pollster::block_on(instance.request_adapter(&wgpu::RequestAdapterOptions {
+            power_preference: wgpu::PowerPreference::HighPerformance,
+            compatible_surface: None,
+            force_fallback_adapter: false,
+        }))
+        .expect("could not create adapter");
+
+        let trace_path = std::env::var("WGPU_TRACE");
+        let (device, queue) = pollster::block_on(adapter.request_device(
+            &(*device_descriptor)(&adapter),
+            trace_path.ok().as_ref().map(std::path::Path::new),
+        ))
+        .expect("could not request device");
+        Self {
+            instance: Arc::new(instance),
+            adapter: Arc::new(adapter),
+            device: Arc::new(device),
+            queue: Arc::new(queue),
+        }
+    }
+}
+
 struct Viewport {
     painter: egui_wgpu::winit::Painter,
     ctx: Context,
@@ -270,6 +357,7 @@ struct Viewport {
 impl Viewport {
     pub fn new(
         event_loop: &ActiveEventLoop,
+        wgpu: &WgpuState,
         icon: Option<Arc<IconData>>,
         mut app: Box<dyn AppWindow>,
     ) -> Self {
@@ -290,23 +378,20 @@ impl Viewport {
         ctx.style_mut(|s| {
             s.wrap_mode = Some(TextWrapMode::Extend);
             s.visuals.menu_rounding = Default::default();
+            s.spacing.scroll = ScrollStyle::thin();
         });
         egui_extras::install_image_loaders(&ctx);
 
-        #[allow(unused_mut)]
+        let wgpu_config = egui_wgpu::WgpuConfiguration {
-        let mut wgpu_config = egui_wgpu::WgpuConfiguration {
             present_mode: wgpu::PresentMode::AutoNoVsync,
+            wgpu_setup: egui_wgpu::WgpuSetup::Existing {
+                instance: wgpu.instance.clone(),
+                adapter: wgpu.adapter.clone(),
+                device: wgpu.device.clone(),
+                queue: wgpu.queue.clone(),
+            },
             ..egui_wgpu::WgpuConfiguration::default()
         };
-        #[cfg(windows)]
-        {
-            if let egui_wgpu::WgpuSetup::CreateNew {
-                supported_backends, ..
-            } = &mut wgpu_config.wgpu_setup
-            {
-                *supported_backends -= wgpu::Backends::VULKAN;
-            }
-        }
 
         let mut painter =
             egui_wgpu::winit::Painter::new(ctx.clone(), wgpu_config, 1, None, false, true);
@@ -336,8 +421,8 @@ impl Viewport {
         self.app.viewport_id()
     }
 
-    pub fn on_window_event(&mut self, event: WindowEvent) -> Option<Action> {
+    pub fn on_window_event(&mut self, event: &WindowEvent) -> (bool, Option<Action>) {
-        let response = self.state.on_window_event(&self.window, &event);
+        let response = self.state.on_window_event(&self.window, event);
         egui_winit::update_viewport_info(
             &mut self.info,
             self.state.egui_ctx(),
@@ -345,22 +430,22 @@ impl Viewport {
             false,
         );
 
-        match event {
+        let action = match event {
             WindowEvent::RedrawRequested => Some(Action::Redraw),
             WindowEvent::CloseRequested => Some(Action::Close),
             WindowEvent::Resized(size) => {
-                let (Some(width), Some(height)) =
+                if let (Some(width), Some(height)) =
                     (NonZero::new(size.width), NonZero::new(size.height))
-                else {
+                {
-                    return None;
+                    self.painter
-                };
+                        .on_window_resized(ViewportId::ROOT, width, height);
-                self.painter
+                }
-                    .on_window_resized(ViewportId::ROOT, width, height);
                 None
             }
             _ if response.repaint => Some(Action::Redraw),
             _ => None,
-        }
+        };
+        (response.consumed, action)
     }
 
     fn redraw(&mut self, event_loop: &ActiveEventLoop) -> Option<Action> {
@@ -424,8 +509,13 @@ pub enum UserEvent {
     OpenAbout,
     OpenCharacterData(SimId),
     OpenBgMap(SimId),
+    OpenObjects(SimId),
+    OpenWorlds(SimId),
+    OpenFrameBuffers(SimId),
+    OpenRegisters(SimId),
     OpenDebugger(SimId),
     OpenInput,
+    OpenShortcuts,
     OpenPlayer2,
     Quit(SimId),
 }

src/audio.rs

@@ -1,6 +1,6 @@
 use std::time::Duration;
 
-use anyhow::{bail, Result};
+use anyhow::{Result, bail};
 use cpal::traits::{DeviceTrait, HostTrait, StreamTrait};
 use itertools::Itertools;
 use rubato::{FftFixedInOut, Resampler};

src/controller.rs

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

src/emulator.rs

@@ -5,9 +5,9 @@ use std::{
     io::{Read, Seek, SeekFrom, Write},
     path::{Path, PathBuf},
     sync::{
+        Arc, Weak,
         atomic::{AtomicBool, Ordering},
         mpsc::{self, RecvError, TryRecvError},
-        Arc,
     },
 };
 
@@ -17,8 +17,12 @@ use bytemuck::NoUninit;
 use egui_toast::{Toast, ToastKind, ToastOptions};
 use tracing::{error, warn};
 
-use crate::{audio::Audio, graphics::TextureSink};
+use crate::{
-use shrooms_vb_core::{Sim, StopReason, EXPECTED_FRAME_SIZE};
+    audio::Audio,
+    graphics::TextureSink,
+    memory::{MemoryRange, MemoryRegion},
+};
+use shrooms_vb_core::{EXPECTED_FRAME_SIZE, Sim, StopReason};
 pub use shrooms_vb_core::{VBKey, VBRegister, VBWatchpointType};
 
 mod address_set;
@@ -165,8 +169,10 @@ pub struct Emulator {
     renderers: HashMap<SimId, TextureSink>,
     messages: HashMap<SimId, mpsc::Sender<Toast>>,
     debuggers: HashMap<SimId, DebugInfo>,
+    watched_regions: HashMap<MemoryRange, Weak<MemoryRegion>>,
     eye_contents: Vec<u8>,
     audio_samples: Vec<f32>,
+    buffer: Vec<u8>,
 }
 
 impl Emulator {
@@ -189,8 +195,10 @@ impl Emulator {
             renderers: HashMap::new(),
             messages: HashMap::new(),
             debuggers: HashMap::new(),
+            watched_regions: HashMap::new(),
             eye_contents: vec![0u8; 384 * 224 * 2],
             audio_samples: Vec::with_capacity(EXPECTED_FRAME_SIZE),
+            buffer: vec![],
         })
     }
 
@@ -283,6 +291,26 @@ impl Emulator {
         );
     }
 
+    fn frame_advance(&mut self) {
+        if self
+            .state
+            .compare_exchange(
+                EmulatorState::Paused,
+                EmulatorState::Stepping,
+                Ordering::AcqRel,
+                Ordering::Acquire,
+            )
+            .is_err_and(|s| s == EmulatorState::Running)
+        {
+            let _ = self.state.compare_exchange(
+                EmulatorState::Running,
+                EmulatorState::Stepping,
+                Ordering::AcqRel,
+                Ordering::Relaxed,
+            );
+        }
+    }
+
     fn 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();
@@ -358,6 +386,7 @@ impl Emulator {
         debugger.stop_reason = None;
         true
     }
+
     fn debug_step(&mut self, sim_id: SimId) {
         if self.debug_continue(sim_id) {
             let Some(sim) = self.sims.get_mut(sim_id.to_index()) else {
@@ -367,6 +396,10 @@ impl Emulator {
         }
     }
 
+    fn watch_memory(&mut self, range: MemoryRange, region: Weak<MemoryRegion>) {
+        self.watched_regions.insert(range, region);
+    }
+
     pub fn run(&mut self) {
         loop {
             let idle = self.tick();
@@ -391,6 +424,18 @@ impl Emulator {
                     }
                 }
             }
+            self.watched_regions.retain(|range, region| {
+                let Some(region) = region.upgrade() else {
+                    return false;
+                };
+                let Some(sim) = self.sims.get_mut(range.sim.to_index()) else {
+                    return false;
+                };
+                self.buffer.clear();
+                sim.read_memory(range.start, range.length, &mut self.buffer);
+                region.update(&self.buffer);
+                true
+            });
         }
     }
 
@@ -404,7 +449,7 @@ impl Emulator {
         // Don't emulate if the state is "paused", or if any sim is paused in the debugger
         let running = match state {
             EmulatorState::Paused => false,
-            EmulatorState::Running => true,
+            EmulatorState::Running | EmulatorState::Stepping => true,
             EmulatorState::Debugging => self.debuggers.values().all(|d| d.stop_reason.is_none()),
         };
         let p1_running = running && p1_state == SimState::Ready;
@@ -418,6 +463,10 @@ impl Emulator {
             self.sims[SimId::Player2.to_index()].emulate();
         }
 
+        if state == EmulatorState::Stepping {
+            self.state.store(EmulatorState::Paused, Ordering::Release);
+        }
+
         // Debug state
         if state == EmulatorState::Debugging {
             for sim_id in SimId::values() {
@@ -515,6 +564,9 @@ impl Emulator {
             EmulatorCommand::Resume => {
                 self.resume_sims();
             }
+            EmulatorCommand::FrameAdvance => {
+                self.frame_advance();
+            }
             EmulatorCommand::StartDebugging(sim_id, debugger) => {
                 self.start_debugging(sim_id, debugger);
             }
@@ -557,6 +609,9 @@ impl Emulator {
                 sim.write_memory(start, &buffer);
                 let _ = done.send(buffer);
             }
+            EmulatorCommand::WatchMemory(range, region) => {
+                self.watch_memory(range, region);
+            }
             EmulatorCommand::AddBreakpoint(sim_id, address) => {
                 let Some(sim) = self.sims.get_mut(sim_id.to_index()) else {
                     return;
@@ -638,6 +693,7 @@ pub enum EmulatorCommand {
     StopSecondSim,
     Pause,
     Resume,
+    FrameAdvance,
     StartDebugging(SimId, DebugSender),
     StopDebugging(SimId),
     DebugInterrupt(SimId),
@@ -647,6 +703,7 @@ pub enum EmulatorCommand {
     WriteRegister(SimId, VBRegister, u32),
     ReadMemory(SimId, u32, usize, Vec<u8>, oneshot::Sender<Vec<u8>>),
     WriteMemory(SimId, u32, Vec<u8>, oneshot::Sender<Vec<u8>>),
+    WatchMemory(MemoryRange, Weak<MemoryRegion>),
     AddBreakpoint(SimId, u32),
     RemoveBreakpoint(SimId, u32),
     AddWatchpoint(SimId, u32, usize, VBWatchpointType),
@@ -672,6 +729,7 @@ pub enum SimState {
 pub enum EmulatorState {
     Paused,
     Running,
+    Stepping,
     Debugging,
 }
 

src/emulator/shrooms_vb_core.rs

@@ -1,6 +1,6 @@
 use std::{ffi::c_void, ptr, slice};
 
-use anyhow::{anyhow, Result};
+use anyhow::{Result, anyhow};
 use bitflags::bitflags;
 use num_derive::{FromPrimitive, ToPrimitive};
 use serde::{Deserialize, Serialize};
@@ -91,7 +91,7 @@ type OnWrite = extern "C" fn(
 ) -> c_int;
 
 #[link(name = "vb")]
-extern "C" {
+unsafe extern "C" {
     #[link_name = "vbEmulate"]
     fn vb_emulate(sim: *mut VB, cycles: *mut u32) -> c_int;
     #[link_name = "vbEmulateEx"]
@@ -170,7 +170,7 @@ extern "C" {
     fn vb_write(sim: *mut VB, address: u32, _type: VBDataType, value: i32) -> i32;
 }
 
-#[no_mangle]
+#[unsafe(no_mangle)]
 extern "C" fn on_frame(sim: *mut VB) -> c_int {
     // SAFETY: the *mut VB owns its userdata.
     // There is no way for the userdata to be null or otherwise invalid.
@@ -179,7 +179,7 @@ extern "C" fn on_frame(sim: *mut VB) -> c_int {
     1
 }
 
-#[no_mangle]
+#[unsafe(no_mangle)]
 extern "C" fn on_execute(sim: *mut VB, address: u32, _code: *const u16, _length: c_int) -> c_int {
     // SAFETY: the *mut VB owns its userdata.
     // There is no way for the userdata to be null or otherwise invalid.
@@ -196,14 +196,10 @@ extern "C" fn on_execute(sim: *mut VB, address: u32, _code: *const u16, _length:
         stopped = true;
     }
 
-    if stopped {
+    if stopped { 1 } else { 0 }
-        1
-    } else {
-        0
-    }
 }
 
-#[no_mangle]
+#[unsafe(no_mangle)]
 extern "C" fn on_read(
     sim: *mut VB,
     address: u32,
@@ -229,7 +225,7 @@ extern "C" fn on_read(
     0
 }
 
-#[no_mangle]
+#[unsafe(no_mangle)]
 extern "C" fn on_write(
     sim: *mut VB,
     address: u32,

src/gdbserver.rs

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

src/gdbserver/request.rs

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

src/graphics.rs

@@ -1,12 +1,13 @@
 use std::{
     sync::{
+        Arc, Mutex, MutexGuard,
         atomic::{AtomicU64, Ordering},
-        mpsc, Arc, Mutex, MutexGuard,
+        mpsc,
     },
     thread,
 };
 
-use anyhow::{bail, Result};
+use anyhow::{Result, bail};
 use itertools::Itertools as _;
 use wgpu::{
     Device, Extent3d, ImageCopyTexture, ImageDataLayout, Origin3d, Queue, Texture,
@@ -64,9 +65,7 @@ impl TextureSink {
             sample_count: 1,
             dimension: wgpu::TextureDimension::D2,
             format: TextureFormat::Rg8Unorm,
-            usage: TextureUsages::COPY_SRC
+            usage: TextureUsages::COPY_DST | TextureUsages::TEXTURE_BINDING,
-                | TextureUsages::COPY_DST
-                | TextureUsages::TEXTURE_BINDING,
             view_formats: &[TextureFormat::Rg8Unorm],
         };
         device.create_texture(&desc)

src/images.rs

@@ -7,17 +7,17 @@ use std::{
 };
 
 use egui::{
+    Color32, ColorImage, TextureHandle, TextureOptions,
     epaint::ImageDelta,
     load::{LoadError, SizedTexture, TextureLoader, TexturePoll},
-    Color32, ColorImage, TextureHandle, TextureOptions,
 };
 use tokio::{sync::mpsc, time::timeout};
 
-pub struct VramProcessor {
+pub struct ImageProcessor {
-    sender: mpsc::UnboundedSender<Box<dyn VramRendererImpl>>,
+    sender: mpsc::UnboundedSender<Box<dyn ImageRendererImpl>>,
 }
 
-impl VramProcessor {
+impl ImageProcessor {
     pub fn new() -> Self {
         let (sender, receiver) = mpsc::unbounded_channel();
         thread::spawn(move || {
@@ -26,7 +26,7 @@ impl VramProcessor {
                 .build()
                 .unwrap()
                 .block_on(async move {
-                    let mut worker = VramProcessorWorker {
+                    let mut worker = ImageProcessorWorker {
                         receiver,
                         renderers: vec![],
                     };
@@ -36,41 +36,40 @@ impl VramProcessor {
         Self { sender }
     }
 
-    pub fn add<const N: usize, R: VramRenderer<N> + 'static>(
+    pub fn add<const N: usize, R: ImageRenderer<N> + 'static>(
         &self,
         renderer: R,
-    ) -> ([VramImageHandle; N], VramParams<R::Params>) {
+        params: R::Params,
-        let handles = renderer.sizes().map(|[width, height]| {
+    ) -> ([ImageHandle; N], ImageParams<R::Params>) {
-            let data = Arc::new(Mutex::new(None));
+        let states = renderer.sizes().map(ImageState::new);
-            VramImageHandle {
+        let handles = states.clone().map(|state| ImageHandle {
-                size: [width as f32, height as f32],
+            size: state.size.map(|i| i as f32),
-                data,
+            data: state.sink,
-            }
         });
         let images = renderer
             .sizes()
-            .map(|[width, height]| VramImage::new(width, height));
+            .map(|[width, height]| ImageBuffer::new(width, height));
-        let sink = Arc::new(Mutex::new(R::Params::default()));
+        let sink = Arc::new(Mutex::new(params.clone()));
-        let _ = self.sender.send(Box::new(VramRendererWrapper {
+        let _ = self.sender.send(Box::new(ImageRendererWrapper {
             renderer,
             params: Arc::downgrade(&sink),
             images,
-            sinks: handles.clone().map(|i| i.data),
+            states,
         }));
-        let params = VramParams {
+        let params = ImageParams {
-            value: R::Params::default(),
+            value: params,
             sink,
         };
         (handles, params)
     }
 }
 
-struct VramProcessorWorker {
+struct ImageProcessorWorker {
-    receiver: mpsc::UnboundedReceiver<Box<dyn VramRendererImpl>>,
+    receiver: mpsc::UnboundedReceiver<Box<dyn ImageRendererImpl>>,
-    renderers: Vec<Box<dyn VramRendererImpl>>,
+    renderers: Vec<Box<dyn ImageRendererImpl>>,
 }
 
-impl VramProcessorWorker {
+impl ImageProcessorWorker {
     async fn run(&mut self) {
         loop {
             if self.renderers.is_empty() {
@@ -101,64 +100,66 @@ impl VramProcessorWorker {
     }
 }
 
-pub enum VramImage {
+pub struct ImageBuffer {
-    Unchanged(Option<Arc<ColorImage>>),
+    pub size: [usize; 2],
-    Changed(ColorImage),
+    pub pixels: Vec<Color32>,
 }
 
-impl VramImage {
+impl ImageBuffer {
     pub fn new(width: usize, height: usize) -> Self {
-        Self::Changed(ColorImage::new([width, height], Color32::BLACK))
+        Self {
-    }
+            size: [width, height],
-
+            pixels: vec![Color32::BLACK; width * height],
-    pub fn write(&mut self, coords: (usize, usize), shade: u8) {
-        match self {
-            Self::Unchanged(image) => {
-                if image.as_ref().is_none_or(|i| i[coords].r() == shade) {
-                    return;
-                }
-                let Some(mut new_image) = image.take().map(Arc::unwrap_or_clone) else {
-                    return;
-                };
-                new_image[coords] = Color32::from_gray(shade);
-                *self = Self::Changed(new_image);
-            }
-            Self::Changed(image) => {
-                image[coords] = Color32::from_gray(shade);
-            }
         }
     }
 
-    pub fn take(&mut self) -> Option<Arc<ColorImage>> {
+    pub fn clear(&mut self) {
-        match self {
+        for pixel in self.pixels.iter_mut() {
-            Self::Unchanged(_) => None,
+            *pixel = Color32::BLACK;
-            Self::Changed(image) => {
-                let arced = Arc::new(std::mem::take(image));
-                *self = Self::Unchanged(Some(arced.clone()));
-                Some(arced)
-            }
         }
     }
+
+    pub fn write(&mut self, coords: (usize, usize), pixel: Color32) {
+        self.pixels[coords.1 * self.size[0] + coords.0] = pixel;
+    }
+
+    pub fn add(&mut self, coords: (usize, usize), pixel: Color32) {
+        let index = coords.1 * self.size[0] + coords.0;
+        let old = self.pixels[index];
+        self.pixels[index] = Color32::from_rgb(
+            old.r() + pixel.r(),
+            old.g() + pixel.g(),
+            old.b() + pixel.b(),
+        );
+    }
+
+    pub fn changed(&self, image: &ColorImage) -> bool {
+        image.pixels.iter().zip(&self.pixels).any(|(a, b)| a != b)
+    }
+
+    pub fn read(&self, image: &mut ColorImage) {
+        image.pixels.copy_from_slice(&self.pixels);
+    }
 }
 
 #[derive(Clone)]
-pub struct VramImageHandle {
+pub struct ImageHandle {
     size: [f32; 2],
     data: Arc<Mutex<Option<Arc<ColorImage>>>>,
 }
 
-impl VramImageHandle {
+impl ImageHandle {
     fn pull(&mut self) -> Option<Arc<ColorImage>> {
         self.data.lock().unwrap().take()
     }
 }
 
-pub struct VramParams<T> {
+pub struct ImageParams<T> {
     value: T,
     sink: Arc<Mutex<T>>,
 }
 
-impl<T> Deref for VramParams<T> {
+impl<T> Deref for ImageParams<T> {
     type Target = T;
 
     fn deref(&self) -> &Self::Target {
@@ -166,7 +167,7 @@ impl<T> Deref for VramParams<T> {
     }
 }
 
-impl<T: Clone + Eq> VramParams<T> {
+impl<T: Clone + Eq> ImageParams<T> {
     pub fn write(&mut self, value: T) {
         if self.value != value {
             self.value = value.clone();
@@ -175,24 +176,60 @@ impl<T: Clone + Eq> VramParams<T> {
     }
 }
 
-pub trait VramRenderer<const N: usize>: Send {
+pub trait ImageRenderer<const N: usize>: Send {
-    type Params: Clone + Default + Send;
+    type Params: Clone + Send;
     fn sizes(&self) -> [[usize; 2]; N];
-    fn render(&mut self, params: &Self::Params, images: &mut [VramImage; N]);
+    fn render(&mut self, params: &Self::Params, images: &mut [ImageBuffer; N]);
 }
 
-struct VramRendererWrapper<const N: usize, R: VramRenderer<N>> {
+#[derive(Clone)]
+struct ImageState {
+    size: [usize; 2],
+    buffers: [Arc<ColorImage>; 2],
+    last_buffer: usize,
+    sink: Arc<Mutex<Option<Arc<ColorImage>>>>,
+}
+
+impl ImageState {
+    fn new(size: [usize; 2]) -> Self {
+        let buffers = [
+            Arc::new(ColorImage::new(size, Color32::BLACK)),
+            Arc::new(ColorImage::new(size, Color32::BLACK)),
+        ];
+        let sink = buffers[0].clone();
+        Self {
+            size,
+            buffers,
+            last_buffer: 0,
+            sink: Arc::new(Mutex::new(Some(sink))),
+        }
+    }
+    fn try_send_update(&mut self, image: &ImageBuffer) {
+        let last = &self.buffers[self.last_buffer];
+        if !image.changed(last) {
+            return;
+        }
+
+        let next_buffer = (self.last_buffer + 1) % self.buffers.len();
+        let next = &mut self.buffers[next_buffer];
+        image.read(Arc::make_mut(next));
+        self.last_buffer = next_buffer;
+        self.sink.lock().unwrap().replace(next.clone());
+    }
+}
+
+struct ImageRendererWrapper<const N: usize, R: ImageRenderer<N>> {
     renderer: R,
     params: Weak<Mutex<R::Params>>,
-    images: [VramImage; N],
+    images: [ImageBuffer; N],
-    sinks: [Arc<Mutex<Option<Arc<ColorImage>>>>; N],
+    states: [ImageState; N],
 }
 
-trait VramRendererImpl: Send {
+trait ImageRendererImpl: Send {
     fn try_update(&mut self) -> Result<(), ()>;
 }
 
-impl<const N: usize, R: VramRenderer<N> + Send> VramRendererImpl for VramRendererWrapper<N, R> {
+impl<const N: usize, R: ImageRenderer<N> + Send> ImageRendererImpl for ImageRendererWrapper<N, R> {
     fn try_update(&mut self) -> Result<(), ()> {
         let params = match self.params.upgrade() {
             Some(params) => params.lock().unwrap().clone(),
@@ -203,21 +240,19 @@ impl<const N: usize, R: VramRenderer<N> + Send> VramRendererImpl for VramRendere
         };
         self.renderer.render(&params, &mut self.images);
 
-        for (image, sink) in self.images.iter_mut().zip(&self.sinks) {
+        for (state, image) in self.states.iter_mut().zip(&self.images) {
-            if let Some(update) = image.take() {
+            state.try_send_update(image);
-                sink.lock().unwrap().replace(update);
-            }
         }
         Ok(())
     }
 }
 
-pub struct VramTextureLoader {
+pub struct ImageTextureLoader {
-    cache: Mutex<HashMap<String, (VramImageHandle, Option<TextureHandle>)>>,
+    cache: Mutex<HashMap<String, (ImageHandle, Option<TextureHandle>)>>,
 }
 
-impl VramTextureLoader {
+impl ImageTextureLoader {
-    pub fn new(renderers: impl IntoIterator<Item = (String, VramImageHandle)>) -> Self {
+    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));
@@ -228,9 +263,9 @@ impl VramTextureLoader {
     }
 }
 
-impl TextureLoader for VramTextureLoader {
+impl TextureLoader for ImageTextureLoader {
     fn id(&self) -> &str {
-        concat!(module_path!(), "VramTextureLoader")
+        concat!(module_path!(), "ImageTextureLoader")
     }
 
     fn load(

src/input.rs

@@ -1,12 +1,14 @@
 use std::{
-    collections::{hash_map::Entry, HashMap},
+    cmp::Ordering,
+    collections::{HashMap, HashSet, hash_map::Entry},
     fmt::Display,
     str::FromStr,
-    sync::{Arc, RwLock},
+    sync::{Arc, Mutex, RwLock},
 };
 
 use anyhow::anyhow;
-use gilrs::{ev::Code, Axis, Button, Gamepad, GamepadId};
+use egui::{Key, KeyboardShortcut, Modifiers};
+use gilrs::{Axis, Button, Gamepad, GamepadId, ev::Code};
 use serde::{Deserialize, Serialize};
 use winit::keyboard::{KeyCode, PhysicalKey};
 
@@ -454,3 +456,205 @@ struct PersistedGamepadMapping {
     default_buttons: Vec<(Code, VBKey)>,
     default_axes: Vec<(Code, (VBKey, VBKey))>,
 }
+
+#[derive(Serialize, Deserialize)]
+pub struct Shortcut {
+    pub shortcut: KeyboardShortcut,
+    pub command: Command,
+}
+
+#[derive(Clone, Copy, Serialize, Deserialize, PartialEq, Eq, Hash)]
+pub enum Command {
+    OpenRom,
+    Quit,
+    FrameAdvance,
+    Reset,
+    PauseResume,
+    // if you update this, update Command::all and add a default
+}
+
+impl Command {
+    pub fn all() -> [Self; 5] {
+        [
+            Self::OpenRom,
+            Self::Quit,
+            Self::PauseResume,
+            Self::Reset,
+            Self::FrameAdvance,
+        ]
+    }
+
+    pub fn name(self) -> &'static str {
+        match self {
+            Self::OpenRom => "Open ROM",
+            Self::Quit => "Exit",
+            Self::PauseResume => "Pause/Resume",
+            Self::Reset => "Reset",
+            Self::FrameAdvance => "Frame Advance",
+        }
+    }
+}
+
+impl Display for Command {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        f.write_str(self.name())
+    }
+}
+
+struct Shortcuts {
+    all: Vec<(Command, KeyboardShortcut)>,
+    by_command: HashMap<Command, KeyboardShortcut>,
+}
+
+impl Default for Shortcuts {
+    fn default() -> Self {
+        let mut shortcuts = Shortcuts {
+            all: vec![],
+            by_command: HashMap::new(),
+        };
+        shortcuts.set(
+            Command::OpenRom,
+            KeyboardShortcut::new(Modifiers::COMMAND, Key::O),
+        );
+        shortcuts.set(
+            Command::Quit,
+            KeyboardShortcut::new(Modifiers::COMMAND, Key::Q),
+        );
+        shortcuts.set(
+            Command::PauseResume,
+            KeyboardShortcut::new(Modifiers::NONE, Key::F5),
+        );
+        shortcuts.set(
+            Command::Reset,
+            KeyboardShortcut::new(Modifiers::SHIFT, Key::F5),
+        );
+        shortcuts.set(
+            Command::FrameAdvance,
+            KeyboardShortcut::new(Modifiers::NONE, Key::F6),
+        );
+        shortcuts
+    }
+}
+
+impl Shortcuts {
+    fn set(&mut self, command: Command, shortcut: KeyboardShortcut) {
+        if self.by_command.insert(command, shortcut).is_some() {
+            for (cmd, sht) in &mut self.all {
+                if *cmd == command {
+                    *sht = shortcut;
+                    break;
+                }
+            }
+        } else {
+            self.all.push((command, shortcut));
+        }
+        self.all.sort_by(|l, r| order_shortcut(l.1, r.1));
+    }
+
+    fn unset(&mut self, command: Command) {
+        if self.by_command.remove(&command).is_some() {
+            self.all.retain(|(c, _)| *c != command);
+        }
+    }
+
+    fn save(&self) -> PersistedShortcuts {
+        let mut shortcuts = PersistedShortcuts { shortcuts: vec![] };
+        for command in Command::all() {
+            let shortcut = self.by_command.get(&command).copied();
+            shortcuts.shortcuts.push((command, shortcut));
+        }
+        shortcuts
+    }
+}
+
+fn order_shortcut(left: KeyboardShortcut, right: KeyboardShortcut) -> Ordering {
+    left.logical_key.cmp(&right.logical_key).then_with(|| {
+        specificity(left.modifiers)
+            .cmp(&specificity(right.modifiers))
+            .reverse()
+    })
+}
+
+fn specificity(modifiers: egui::Modifiers) -> usize {
+    let mut mods = 0;
+    if modifiers.alt {
+        mods += 1;
+    }
+    if modifiers.command || modifiers.ctrl {
+        mods += 1;
+    }
+    if modifiers.shift {
+        mods += 1;
+    }
+    mods
+}
+
+#[derive(Serialize, Deserialize)]
+struct PersistedShortcuts {
+    shortcuts: Vec<(Command, Option<KeyboardShortcut>)>,
+}
+
+#[derive(Clone)]
+pub struct ShortcutProvider {
+    persistence: Persistence,
+    shortcuts: Arc<Mutex<Shortcuts>>,
+}
+
+impl ShortcutProvider {
+    pub fn new(persistence: Persistence) -> Self {
+        let mut shortcuts = Shortcuts::default();
+        if let Ok(saved) = persistence.load_config::<PersistedShortcuts>("shortcuts") {
+            for (command, shortcut) in saved.shortcuts {
+                if let Some(shortcut) = shortcut {
+                    shortcuts.set(command, shortcut);
+                } else {
+                    shortcuts.unset(command);
+                }
+            }
+        }
+        Self {
+            persistence,
+            shortcuts: Arc::new(Mutex::new(shortcuts)),
+        }
+    }
+
+    pub fn shortcut_for(&self, command: Command) -> Option<KeyboardShortcut> {
+        let lock = self.shortcuts.lock().unwrap();
+        lock.by_command.get(&command).copied()
+    }
+
+    pub fn consume_all(&self, input: &mut egui::InputState) -> HashSet<Command> {
+        let lock = self.shortcuts.lock().unwrap();
+        lock.all
+            .iter()
+            .filter_map(|(command, shortcut)| input.consume_shortcut(shortcut).then_some(*command))
+            .collect()
+    }
+
+    pub fn set(&self, command: Command, shortcut: KeyboardShortcut) {
+        let updated = {
+            let mut lock = self.shortcuts.lock().unwrap();
+            lock.set(command, shortcut);
+            lock.save()
+        };
+        let _ = self.persistence.save_config("shortcuts", &updated);
+    }
+
+    pub fn unset(&self, command: Command) {
+        let updated = {
+            let mut lock = self.shortcuts.lock().unwrap();
+            lock.unset(command);
+            lock.save()
+        };
+        let _ = self.persistence.save_config("shortcuts", &updated);
+    }
+
+    pub fn reset(&self) {
+        let updated = {
+            let mut lock = self.shortcuts.lock().unwrap();
+            *lock = Shortcuts::default();
+            lock.save()
+        };
+        let _ = self.persistence.save_config("shortcuts", &updated);
+    }
+}

src/main.rs

@@ -3,13 +3,13 @@
 
 use std::{path::PathBuf, process, time::SystemTime};
 
-use anyhow::{bail, Result};
+use anyhow::{Result, bail};
 use app::Application;
 use clap::Parser;
 use emulator::EmulatorBuilder;
 use thread_priority::{ThreadBuilder, ThreadPriority};
 use tracing::error;
-use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt, EnvFilter, Layer};
+use tracing_subscriber::{EnvFilter, Layer, layer::SubscriberExt, util::SubscriberInitExt};
 use winit::event_loop::{ControlFlow, EventLoop};
 
 mod app;
@@ -18,10 +18,10 @@ mod controller;
 mod emulator;
 mod gdbserver;
 mod graphics;
+mod images;
 mod input;
 mod memory;
 mod persistence;
-mod vram;
 mod window;
 
 #[derive(Parser)]

src/memory.rs

@@ -1,40 +1,51 @@
 use std::{
     collections::HashMap,
-    sync::{Arc, Mutex, MutexGuard},
+    fmt::Debug,
+    iter::FusedIterator,
+    sync::{Arc, Mutex, RwLock, RwLockReadGuard, TryLockError, Weak, atomic::AtomicU64},
 };
 
 use bytemuck::BoxBytes;
+use itertools::Itertools;
+use tracing::warn;
 
 use crate::emulator::{EmulatorClient, EmulatorCommand, SimId};
 
-pub struct MemoryMonitor {
+pub struct MemoryClient {
     client: EmulatorClient,
-    regions: HashMap<MemoryRegion, Arc<Mutex<BoxBytes>>>,
+    regions: Mutex<HashMap<MemoryRange, Weak<MemoryRegion>>>,
 }
 
-impl MemoryMonitor {
+impl MemoryClient {
     pub fn new(client: EmulatorClient) -> Self {
         Self {
             client,
-            regions: HashMap::new(),
+            regions: Mutex::new(HashMap::new()),
         }
     }
 
-    pub fn view(&mut self, sim: SimId, start: u32, length: usize) -> MemoryView {
+    pub fn watch(&self, sim: SimId, start: u32, length: usize) -> MemoryView {
-        let region = MemoryRegion { sim, start, length };
+        let range = MemoryRange { sim, start, length };
-        let memory = self.regions.entry(region).or_insert_with(|| {
+        let mut regions = self.regions.lock().unwrap_or_else(|e| e.into_inner());
-            let mut buf = aligned_memory(start, length);
+        let region = regions
-            let (tx, rx) = oneshot::channel();
+            .get(&range)
-            self.client
+            .and_then(|r| r.upgrade())
-                .send_command(EmulatorCommand::ReadMemory(sim, start, length, vec![], tx));
+            .unwrap_or_else(|| {
-            let bytes = pollster::block_on(rx).unwrap();
+                let region = Arc::new(MemoryRegion::new(start, length));
-            buf.copy_from_slice(&bytes);
+                regions.insert(range, Arc::downgrade(&region));
-            #[expect(clippy::arc_with_non_send_sync)] // TODO: remove after bytemuck upgrade
+                self.client
-            Arc::new(Mutex::new(buf))
+                    .send_command(EmulatorCommand::WatchMemory(range, Arc::downgrade(&region)));
-        });
+                region
-        MemoryView {
+            });
-            memory: memory.clone(),
+        MemoryView { region }
-        }
+    }
+
+    pub fn write<T: MemoryValue>(&self, sim: SimId, address: u32, data: &T) {
+        let mut buffer = vec![];
+        data.to_bytes(&mut buffer);
+        let (tx, _) = oneshot::channel();
+        self.client
+            .send_command(EmulatorCommand::WriteMemory(sim, address, buffer, tx));
     }
 }
 
@@ -52,40 +63,214 @@ fn aligned_memory(start: u32, length: usize) -> BoxBytes {
 }
 
 pub struct MemoryView {
-    memory: Arc<Mutex<BoxBytes>>,
+    region: Arc<MemoryRegion>,
 }
-// SAFETY: BoxBytes is supposed to be Send+Sync, will be in a new version
-unsafe impl Send for MemoryView {}
 
 impl MemoryView {
     pub fn borrow(&self) -> MemoryRef<'_> {
-        MemoryRef {
+        self.region.borrow()
-            inner: self.memory.lock().unwrap(),
-        }
     }
 }
 
 pub struct MemoryRef<'a> {
-    inner: MutexGuard<'a, BoxBytes>,
+    inner: RwLockReadGuard<'a, BoxBytes>,
 }
 
+pub trait MemoryValue {
+    fn from_bytes(bytes: &[u8]) -> Self;
+    fn to_bytes(&self, buffer: &mut Vec<u8>);
+}
+
+macro_rules! primitive_memory_value_impl {
+    ($T:ty, $L: expr) => {
+        impl MemoryValue for $T {
+            #[inline]
+            fn from_bytes(bytes: &[u8]) -> Self {
+                let bytes: [u8; std::mem::size_of::<$T>()] = std::array::from_fn(|i| bytes[i]);
+                <$T>::from_le_bytes(bytes)
+            }
+            #[inline]
+            fn to_bytes(&self, buffer: &mut Vec<u8>) {
+                buffer.extend_from_slice(&self.to_le_bytes())
+            }
+        }
+    };
+}
+
+primitive_memory_value_impl!(u8, 1);
+primitive_memory_value_impl!(i8, 1);
+primitive_memory_value_impl!(u16, 2);
+primitive_memory_value_impl!(i16, 2);
+primitive_memory_value_impl!(u32, 4);
+primitive_memory_value_impl!(i32, 4);
+
+impl<const N: usize, T: MemoryValue> MemoryValue for [T; N] {
+    #[inline]
+    fn from_bytes(bytes: &[u8]) -> Self {
+        std::array::from_fn(|i| {
+            T::from_bytes(&bytes[i * std::mem::size_of::<T>()..(i + 1) * std::mem::size_of::<T>()])
+        })
+    }
+    #[inline]
+    fn to_bytes(&self, buffer: &mut Vec<u8>) {
+        for item in self {
+            item.to_bytes(buffer);
+        }
+    }
+}
+
+pub struct MemoryIter<'a, T> {
+    bytes: &'a [u8],
+    _phantom: std::marker::PhantomData<T>,
+}
+
+impl<'a, T> MemoryIter<'a, T> {
+    fn new(bytes: &'a [u8]) -> Self {
+        Self {
+            bytes,
+            _phantom: std::marker::PhantomData,
+        }
+    }
+}
+
+impl<T: MemoryValue> Iterator for MemoryIter<'_, T> {
+    type Item = T;
+
+    #[inline]
+    fn next(&mut self) -> Option<Self::Item> {
+        let (bytes, rest) = self.bytes.split_at_checked(std::mem::size_of::<T>())?;
+        self.bytes = rest;
+        Some(T::from_bytes(bytes))
+    }
+
+    #[inline]
+    fn size_hint(&self) -> (usize, Option<usize>) {
+        let size = self.bytes.len() / std::mem::size_of::<T>();
+        (size, Some(size))
+    }
+}
+
+impl<T: MemoryValue> DoubleEndedIterator for MemoryIter<'_, T> {
+    fn next_back(&mut self) -> Option<Self::Item> {
+        let mid = self.bytes.len().checked_sub(std::mem::size_of::<T>())?;
+        // SAFETY: the checked_sub above is effectively a bounds check
+        let (rest, bytes) = unsafe { self.bytes.split_at_unchecked(mid) };
+        self.bytes = rest;
+        Some(T::from_bytes(bytes))
+    }
+}
+
+impl<T: MemoryValue> FusedIterator for MemoryIter<'_, T> {}
+
 impl MemoryRef<'_> {
-    pub fn read<T: bytemuck::AnyBitPattern>(&self, index: usize) -> T {
+    pub fn read<T: MemoryValue>(&self, index: usize) -> T {
         let from = index * size_of::<T>();
         let to = from + size_of::<T>();
-        *bytemuck::from_bytes(&self.inner[from..to])
+        T::from_bytes(&self.inner[from..to])
     }
 
-    pub fn range<T: bytemuck::AnyBitPattern>(&self, start: usize, count: usize) -> &[T] {
+    pub fn range<T: MemoryValue>(&self, start: usize, count: usize) -> MemoryIter<T> {
         let from = start * size_of::<T>();
         let to = from + (count * size_of::<T>());
-        bytemuck::cast_slice(&self.inner[from..to])
+        MemoryIter::new(&self.inner[from..to])
     }
 }
 
-#[derive(Clone, Copy, PartialEq, Eq, Hash)]
+#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)]
-struct MemoryRegion {
+pub struct MemoryRange {
-    sim: SimId,
+    pub sim: SimId,
-    start: u32,
+    pub start: u32,
-    length: usize,
+    pub length: usize,
+}
+
+const BUFFERS: usize = 4;
+pub struct MemoryRegion {
+    gens: [AtomicU64; BUFFERS],
+    bufs: [RwLock<BoxBytes>; BUFFERS],
+}
+impl Debug for MemoryRegion {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        f.debug_struct("MemoryRegion")
+            .field("gens", &self.gens)
+            .finish_non_exhaustive()
+    }
+}
+// SAFETY: BoxBytes is meant to be Send+Sync, will be in a future version
+unsafe impl Send for MemoryRegion {}
+// SAFETY: BoxBytes is meant to be Send+Sync, will be in a future version
+unsafe impl Sync for MemoryRegion {}
+
+impl MemoryRegion {
+    fn new(start: u32, length: usize) -> Self {
+        Self {
+            gens: std::array::from_fn(|i| AtomicU64::new(i as u64)),
+            bufs: std::array::from_fn(|_| RwLock::new(aligned_memory(start, length))),
+        }
+    }
+
+    pub fn borrow(&self) -> MemoryRef<'_> {
+        /*
+         * When reading memory, a thread will grab the newest buffer (with the highest gen)
+         * It will only fail to grab the lock if the writer already has it,
+         * but the writer prioritizes older buffers (with lower gens).
+         * So this method will only block if the writer produces three full buffers
+         * in the time it takes the reader to do four atomic reads and grab a lock.
+         * In the unlikely event this happens... just try again.
+         */
+        loop {
+            let newest_index = self
+                .gens
+                .iter()
+                .map(|i| i.load(std::sync::atomic::Ordering::Acquire))
+                .enumerate()
+                .max_by_key(|(_, g)| *g)
+                .map(|(i, _)| i)
+                .unwrap();
+            let inner = match self.bufs[newest_index].try_read() {
+                Ok(inner) => inner,
+                Err(TryLockError::Poisoned(e)) => e.into_inner(),
+                Err(TryLockError::WouldBlock) => {
+                    continue;
+                }
+            };
+            break MemoryRef { inner };
+        }
+    }
+
+    pub fn update(&self, data: &[u8]) {
+        let gens = self
+            .gens
+            .each_ref()
+            .map(|i| i.load(std::sync::atomic::Ordering::Acquire));
+        let next_gen = gens.iter().max().unwrap() + 1;
+        let indices = gens
+            .into_iter()
+            .enumerate()
+            .sorted_by_key(|(_, val)| *val)
+            .map(|(i, _)| i);
+        for index in indices {
+            let mut lock = match self.bufs[index].try_write() {
+                Ok(inner) => inner,
+                Err(TryLockError::Poisoned(e)) => e.into_inner(),
+                Err(TryLockError::WouldBlock) => {
+                    continue;
+                }
+            };
+            lock.copy_from_slice(data);
+            self.gens[index].store(next_gen, std::sync::atomic::Ordering::Release);
+            return;
+        }
+        /*
+         * We have four buffers, and (at time of writing) only three threads interacting with memory:
+         * - The UI thread, reading small regions of memory
+         * - The "image renderer" thread, reading large regions of memory
+         * - The emulation thread, writing memory every so often
+         * So it should be impossible for all four buffers to have a read lock at the same time,
+         *  and (because readers always read the newest buffer) at least one of the oldest three
+         *  buffers will be free the entire time we're in this method.
+         * TL;DR this should never happen.
+         * But if it does, do nothing. This isn't medical software, better to show stale data than crash.
+         */
+        warn!("all buffers were locked by a reader at the same time")
+    }
 }

src/persistence.rs

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

src/window.rs

@@ -3,7 +3,10 @@ use egui::{Context, ViewportBuilder, ViewportId};
 pub use game::GameWindow;
 pub use gdb::GdbServerWindow;
 pub use input::InputWindow;
-pub use vram::{BgMapWindow, CharacterDataWindow};
+pub use shortcuts::ShortcutsWindow;
+pub use vip::{
+    BgMapWindow, CharacterDataWindow, FrameBufferWindow, ObjectWindow, RegisterWindow, WorldWindow,
+};
 use winit::event::KeyEvent;
 
 use crate::emulator::SimId;
@@ -13,8 +16,9 @@ mod game;
 mod game_screen;
 mod gdb;
 mod input;
+mod shortcuts;
 mod utils;
-mod vram;
+mod vip;
 
 pub trait AppWindow {
     fn viewport_id(&self) -> ViewportId;
@@ -28,10 +32,12 @@ pub trait AppWindow {
         let _ = render_state;
     }
     fn on_destroy(&mut self) {}
-    fn handle_key_event(&mut self, event: &KeyEvent) {
+    fn handle_key_event(&mut self, event: &KeyEvent) -> bool {
         let _ = event;
+        false
     }
-    fn handle_gamepad_event(&mut self, event: &gilrs::Event) {
+    fn handle_gamepad_event(&mut self, event: &gilrs::Event) -> bool {
         let _ = event;
+        false
     }
 }

src/window/game.rs

@@ -3,20 +3,21 @@ use std::sync::mpsc;
 use crate::{
     app::UserEvent,
     emulator::{EmulatorClient, EmulatorCommand, EmulatorState, SimId, SimState},
+    input::{Command, ShortcutProvider},
     persistence::Persistence,
 };
 use egui::{
-    menu, Align2, Button, CentralPanel, Color32, Context, Direction, Frame, TopBottomPanel, Ui,
+    Align2, Button, CentralPanel, Color32, Context, Direction, Frame, TopBottomPanel, Ui, Vec2,
-    Vec2, ViewportBuilder, ViewportCommand, ViewportId, Window,
+    ViewportBuilder, ViewportCommand, ViewportId, Window, menu,
 };
 use egui_toast::{Toast, Toasts};
 use serde::{Deserialize, Serialize};
 use winit::event_loop::EventLoopProxy;
 
 use super::{
+    AppWindow,
     game_screen::{DisplayMode, GameScreen},
     utils::UiExt as _,
-    AppWindow,
 };
 
 const COLOR_PRESETS: [[Color32; 2]; 3] = [
@@ -38,6 +39,7 @@ pub struct GameWindow {
     client: EmulatorClient,
     proxy: EventLoopProxy<UserEvent>,
     persistence: Persistence,
+    shortcuts: ShortcutProvider,
     sim_id: SimId,
     config: GameConfig,
     screen: Option<GameScreen>,
@@ -50,6 +52,7 @@ impl GameWindow {
         client: EmulatorClient,
         proxy: EventLoopProxy<UserEvent>,
         persistence: Persistence,
+        shortcuts: ShortcutProvider,
         sim_id: SimId,
     ) -> Self {
         let config = load_config(&persistence, sim_id);
@@ -57,6 +60,7 @@ impl GameWindow {
             client,
             proxy,
             persistence,
+            shortcuts,
             sim_id,
             config,
             screen: None,
@@ -66,8 +70,53 @@ impl GameWindow {
     }
 
     fn show_menu(&mut self, ctx: &Context, 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;
+        let can_resume = is_ready && state == EmulatorState::Paused;
+        let can_frame_advance = is_ready && state != EmulatorState::Debugging;
+
+        for command in ui.input_mut(|input| self.shortcuts.consume_all(input)) {
+            match command {
+                Command::OpenRom => {
+                    let rom = rfd::FileDialog::new()
+                        .add_filter("Virtual Boy ROMs", &["vb", "vbrom"])
+                        .pick_file();
+                    if let Some(path) = rom {
+                        self.client
+                            .send_command(EmulatorCommand::LoadGame(self.sim_id, path));
+                    }
+                }
+                Command::Quit => {
+                    let _ = self.proxy.send_event(UserEvent::Quit(self.sim_id));
+                }
+                Command::PauseResume => {
+                    if state == EmulatorState::Paused && can_resume {
+                        self.client.send_command(EmulatorCommand::Resume);
+                    }
+                    if state == EmulatorState::Running && can_pause {
+                        self.client.send_command(EmulatorCommand::Pause);
+                    }
+                }
+                Command::Reset => {
+                    if is_ready {
+                        self.client
+                            .send_command(EmulatorCommand::Reset(self.sim_id));
+                    }
+                }
+                Command::FrameAdvance => {
+                    if can_frame_advance {
+                        self.client.send_command(EmulatorCommand::FrameAdvance);
+                    }
+                }
+            }
+        }
+
         ui.menu_button("ROM", |ui| {
-            if ui.button("Open ROM").clicked() {
+            if ui
+                .add(self.button_for(ui.ctx(), "Open ROM", Command::OpenRom))
+                .clicked()
+            {
                 let rom = rfd::FileDialog::new()
                     .add_filter("Virtual Boy ROMs", &["vb", "vbrom"])
                     .pick_file();
@@ -77,29 +126,54 @@ impl GameWindow {
                 }
                 ui.close_menu();
             }
-            if ui.button("Quit").clicked() {
+            if ui
+                .add(self.button_for(ui.ctx(), "Quit", Command::Quit))
+                .clicked()
+            {
                 let _ = self.proxy.send_event(UserEvent::Quit(self.sim_id));
             }
         });
         ui.menu_button("Emulation", |ui| {
-            let state = self.client.emulator_state();
-            let is_ready = self.client.sim_state(self.sim_id) == SimState::Ready;
-            let can_pause = is_ready && state == EmulatorState::Running;
-            let can_resume = is_ready && state == EmulatorState::Paused;
             if state == EmulatorState::Running {
-                if ui.add_enabled(can_pause, Button::new("Pause")).clicked() {
+                if ui
+                    .add_enabled(
+                        can_pause,
+                        self.button_for(ui.ctx(), "Pause", Command::PauseResume),
+                    )
+                    .clicked()
+                {
                     self.client.send_command(EmulatorCommand::Pause);
                     ui.close_menu();
                 }
-            } else if ui.add_enabled(can_resume, Button::new("Resume")).clicked() {
+            } else if ui
+                .add_enabled(
+                    can_resume,
+                    self.button_for(ui.ctx(), "Resume", Command::PauseResume),
+                )
+                .clicked()
+            {
                 self.client.send_command(EmulatorCommand::Resume);
                 ui.close_menu();
             }
-            if ui.add_enabled(is_ready, Button::new("Reset")).clicked() {
+            if ui
+                .add_enabled(is_ready, self.button_for(ui.ctx(), "Reset", Command::Reset))
+                .clicked()
+            {
                 self.client
                     .send_command(EmulatorCommand::Reset(self.sim_id));
                 ui.close_menu();
             }
+            ui.separator();
+            if ui
+                .add_enabled(
+                    can_frame_advance,
+                    self.button_for(ui.ctx(), "Frame Advance", Command::FrameAdvance),
+                )
+                .clicked()
+            {
+                self.client.send_command(EmulatorCommand::FrameAdvance);
+                ui.close_menu();
+            }
         });
         ui.menu_button("Options", |ui| self.show_options_menu(ctx, ui));
         ui.menu_button("Multiplayer", |ui| {
@@ -132,6 +206,7 @@ impl GameWindow {
                     .unwrap();
                 ui.close_menu();
             }
+            ui.separator();
             if ui.button("Character Data").clicked() {
                 self.proxy
                     .send_event(UserEvent::OpenCharacterData(self.sim_id))
@@ -144,18 +219,43 @@ impl GameWindow {
                     .unwrap();
                 ui.close_menu();
             }
+            if ui.button("Objects").clicked() {
+                self.proxy
+                    .send_event(UserEvent::OpenObjects(self.sim_id))
+                    .unwrap();
+                ui.close_menu();
+            }
+            if ui.button("Worlds").clicked() {
+                self.proxy
+                    .send_event(UserEvent::OpenWorlds(self.sim_id))
+                    .unwrap();
+                ui.close_menu();
+            }
+            if ui.button("Frame Buffers").clicked() {
+                self.proxy
+                    .send_event(UserEvent::OpenFrameBuffers(self.sim_id))
+                    .unwrap();
+                ui.close_menu();
+            }
+            if ui.button("Registers").clicked() {
+                self.proxy
+                    .send_event(UserEvent::OpenRegisters(self.sim_id))
+                    .unwrap();
+                ui.close_menu();
+            }
         });
-        ui.menu_button("About", |ui| {
+        ui.menu_button("Help", |ui| {
-            self.proxy.send_event(UserEvent::OpenAbout).unwrap();
+            if ui.button("About").clicked() {
-            ui.close_menu();
+                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 = self.config.dimensions;
-                let current_dims = current_dims.max - current_dims.min;
 
                 for scale in 1..=4 {
                     let label = format!("x{scale}");
@@ -195,10 +295,7 @@ impl GameWindow {
                     return;
                 }
 
-                let current_dims = {
+                let current_dims = self.config.dimensions;
-                    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) {
@@ -261,6 +358,10 @@ impl GameWindow {
                 ui.close_menu();
             }
         });
+        if ui.button("Key Shortcuts").clicked() {
+            self.proxy.send_event(UserEvent::OpenShortcuts).unwrap();
+            ui.close_menu();
+        }
     }
 
     fn show_color_picker(&mut self, ui: &mut Ui) {
@@ -302,6 +403,14 @@ impl GameWindow {
         }
         self.config = new_config;
     }
+
+    fn button_for(&self, ctx: &Context, text: &str, command: Command) -> Button {
+        let button = Button::new(text);
+        match self.shortcuts.shortcut_for(command) {
+            Some(shortcut) => button.shortcut_text(ctx.format_shortcut(&shortcut)),
+            None => button,
+        }
+    }
 }
 
 fn config_filename(sim_id: SimId) -> &'static str {
@@ -342,7 +451,7 @@ impl AppWindow for GameWindow {
 
     fn show(&mut self, ctx: &Context) {
         let dimensions = {
-            let bounds = ctx.input(|i| i.viewport().inner_rect.unwrap());
+            let bounds = ctx.available_rect();
             bounds.max - bounds.min
         };
         self.update_config(|c| c.dimensions = dimensions);

src/window/game_screen.rs

@@ -2,7 +2,7 @@ use std::{collections::HashMap, sync::Arc};
 
 use egui::{Color32, Rgba, Vec2, Widget};
 use serde::{Deserialize, Serialize};
-use wgpu::{util::DeviceExt as _, BindGroup, BindGroupLayout, Buffer, RenderPipeline};
+use wgpu::{BindGroup, BindGroupLayout, Buffer, RenderPipeline, util::DeviceExt as _};
 
 use crate::graphics::TextureSink;
 

src/window/input.rs

@@ -198,58 +198,63 @@ impl AppWindow for InputWindow {
         });
     }
 
-    fn handle_key_event(&mut self, event: &winit::event::KeyEvent) {
+    fn handle_key_event(&mut self, event: &winit::event::KeyEvent) -> bool {
         if !event.state.is_pressed() {
-            return;
+            return false;
         }
         let sim_id = match self.active_tab {
             InputTab::Player1 => SimId::Player1,
             InputTab::Player2 => SimId::Player2,
             _ => {
-                return;
+                return false;
             }
         };
         let Some(vb) = self.now_binding.take() else {
-            return;
+            return false;
         };
         let mut mappings = self.mappings.for_sim(sim_id).write().unwrap();
         mappings.add_keyboard_mapping(vb, event.physical_key);
         drop(mappings);
         self.mappings.save();
+        true
     }
 
-    fn handle_gamepad_event(&mut self, event: &gilrs::Event) {
+    fn handle_gamepad_event(&mut self, event: &gilrs::Event) -> bool {
         let InputTab::RebindGamepad(gamepad_id) = self.active_tab else {
-            return;
+            return false;
         };
         if gamepad_id != event.id {
-            return;
+            return false;
         }
         let Some(mappings) = self.mappings.for_gamepad(gamepad_id) else {
-            return;
+            return false;
         };
         let Some(vb) = self.now_binding else {
-            return;
+            return false;
         };
         match event.event {
             EventType::ButtonPressed(_, code) => {
                 let mut mapping = mappings.write().unwrap();
                 mapping.add_button_mapping(vb, code);
                 self.now_binding.take();
+                true
             }
             EventType::AxisChanged(_, value, code) => {
                 if value < -0.75 {
                     let mut mapping = mappings.write().unwrap();
                     mapping.add_axis_neg_mapping(vb, code);
                     self.now_binding.take();
-                }
+                    true
-                if value > 0.75 {
+                } else if value > 0.75 {
                     let mut mapping = mappings.write().unwrap();
                     mapping.add_axis_pos_mapping(vb, code);
                     self.now_binding.take();
+                    true
+                } else {
+                    false
                 }
             }
-            _ => {}
+            _ => false,
         }
     }
 }

src/window/shortcuts.rs

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

src/window/utils.rs

@@ -1,10 +1,17 @@
-use std::{ops::Range, str::FromStr};
+use std::{
-
+    fmt::{Display, UpperHex},
-use egui::{
+    ops::{Bound, RangeBounds},
-    ecolor::HexColor, Align, Color32, Frame, Layout, Response, RichText, Sense, TextEdit, Ui,
+    str::FromStr,
-    UiBuilder, Vec2, WidgetText,
 };
 
+use atoi::FromRadix16;
+use egui::{
+    Align, Color32, CursorIcon, Event, Frame, Key, Layout, Margin, Rect, Response, RichText,
+    Rounding, Sense, Shape, Stroke, TextEdit, Ui, UiBuilder, Vec2, Widget, WidgetText,
+    ecolor::HexColor,
+};
+use num_traits::{CheckedAdd, CheckedSub, One};
+
 pub trait UiExt {
     fn section(&mut self, title: impl Into<String>, add_contents: impl FnOnce(&mut Ui));
     fn selectable_button(&mut self, selected: bool, text: impl Into<WidgetText>) -> Response;
@@ -24,30 +31,28 @@ pub trait UiExt {
     fn color_pair_button(&mut self, left: Color32, right: Color32) -> Response;
 
     fn color_picker(&mut self, color: &mut Color32, hex: &mut String) -> Response;
-
-    fn number_picker<T: FromStr + PartialOrd>(
-        &mut self,
-        text: &mut String,
-        value: &mut T,
-        range: Range<T>,
-    );
 }
 
 impl UiExt for Ui {
     fn section(&mut self, title: impl Into<String>, add_contents: impl FnOnce(&mut Ui)) {
+        let title: String = title.into();
         let mut frame = Frame::group(self.style());
         frame.outer_margin.top += 10.0;
         frame.inner_margin.top += 2.0;
-        let res = frame.show(self, add_contents);
+        let res = self.push_id(&title, |ui| {
+            frame.show(ui, |ui| {
+                ui.set_max_width(ui.available_width());
+                add_contents(ui);
+            })
+        });
         let text = RichText::new(title).background_color(self.style().visuals.panel_fill);
         let old_rect = res.response.rect;
         let mut text_rect = old_rect;
         text_rect.min.x += 6.0;
-        let new_rect = self
+        self.allocate_new_ui(UiBuilder::new().max_rect(text_rect), |ui| ui.label(text));
-            .allocate_new_ui(UiBuilder::new().max_rect(text_rect), |ui| ui.label(text))
+        if old_rect.width() > 0.0 {
-            .response
+            self.advance_cursor_after_rect(old_rect);
-            .rect;
+        }
-        self.allocate_space((old_rect.max - new_rect.max) - (old_rect.min - new_rect.min));
     }
 
     fn selectable_button(&mut self, selected: bool, text: impl Into<WidgetText>) -> Response {
@@ -90,18 +95,323 @@ impl UiExt for Ui {
         )
         .inner
     }
+}
 
-    fn number_picker<T: FromStr + PartialOrd>(
+enum Direction {
-        &mut self,
+    Up,
-        text: &mut String,
+    Down,
-        value: &mut T,
+}
-        range: Range<T>,
+
-    ) {
+pub trait Number:
-        let res = self.add(TextEdit::singleline(text).horizontal_align(Align::Max));
+    Copy
-        if res.changed() {
+    + One
-            if let Some(new_value) = text.parse().ok().filter(|v| range.contains(v)) {
+    + CheckedAdd
-                *value = new_value;
+    + CheckedSub
-            }
+    + Eq
+    + Ord
+    + Display
+    + FromStr
+    + FromRadix16
+    + UpperHex
+    + Send
+    + Sync
+    + 'static
+{
+}
+impl<
+    T: Copy
+        + One
+        + CheckedAdd
+        + CheckedSub
+        + Eq
+        + Ord
+        + Display
+        + FromStr
+        + FromRadix16
+        + UpperHex
+        + Send
+        + Sync
+        + 'static,
+> Number for T
+{
+}
+
+pub struct NumberEdit<'a, T: Number> {
+    value: &'a mut T,
+    increment: T,
+    precision: usize,
+    min: Option<T>,
+    max: Option<T>,
+    desired_width: Option<f32>,
+    arrows: bool,
+    hex: bool,
+}
+
+impl<'a, T: Number> NumberEdit<'a, T> {
+    pub fn new(value: &'a mut T) -> Self {
+        Self {
+            value,
+            increment: T::one(),
+            precision: 3,
+            min: None,
+            max: None,
+            desired_width: None,
+            arrows: true,
+            hex: false,
         }
     }
+
+    pub fn precision(self, precision: usize) -> Self {
+        Self { precision, ..self }
+    }
+
+    pub fn range(self, range: impl RangeBounds<T>) -> Self {
+        let min = match range.start_bound() {
+            Bound::Unbounded => None,
+            Bound::Included(t) => Some(*t),
+            Bound::Excluded(t) => t.checked_add(&self.increment),
+        };
+        let max = match range.end_bound() {
+            Bound::Unbounded => None,
+            Bound::Included(t) => Some(*t),
+            Bound::Excluded(t) => t.checked_sub(&self.increment),
+        };
+        Self { min, max, ..self }
+    }
+
+    pub fn desired_width(self, desired_width: f32) -> Self {
+        Self {
+            desired_width: Some(desired_width),
+            ..self
+        }
+    }
+
+    pub fn arrows(self, arrows: bool) -> Self {
+        Self { arrows, ..self }
+    }
+
+    pub fn hex(self, hex: bool) -> Self {
+        Self { hex, ..self }
+    }
+}
+
+impl<T: Number> Widget for NumberEdit<'_, T> {
+    fn ui(self, ui: &mut Ui) -> Response {
+        let id = ui.id();
+        let to_string = |val: &T| {
+            if self.hex {
+                format!("{val:.0$X}", self.precision)
+            } else {
+                format!("{val:.0$}", self.precision)
+            }
+        };
+        let from_string = |val: &str| {
+            if self.hex {
+                let bytes = val.as_bytes();
+                let (result, consumed) = T::from_radix_16(bytes);
+                (consumed == bytes.len()).then_some(result)
+            } else {
+                val.parse::<T>().ok()
+            }
+        };
+
+        let (last_value, mut str, focus) = ui.memory(|m| {
+            let (lv, s) = m
+                .data
+                .get_temp(id)
+                .unwrap_or((*self.value, to_string(self.value)));
+            let focus = m.has_focus(id);
+            (lv, s, focus)
+        });
+        let mut stale = false;
+        if *self.value != last_value {
+            str = to_string(self.value);
+            stale = true;
+        }
+        let valid = from_string(&str).is_some_and(|v: T| v == *self.value);
+        let mut up_pressed = false;
+        let mut down_pressed = false;
+        if focus {
+            ui.input_mut(|i| {
+                i.events.retain(|e| match e {
+                    Event::Key {
+                        key: Key::ArrowUp,
+                        pressed: true,
+                        ..
+                    } => {
+                        up_pressed = true;
+                        false
+                    }
+                    Event::Key {
+                        key: Key::ArrowDown,
+                        pressed: true,
+                        ..
+                    } => {
+                        down_pressed = true;
+                        false
+                    }
+                    _ => true,
+                })
+            });
+        }
+        let mut desired_width = self
+            .desired_width
+            .unwrap_or_else(|| ui.spacing().text_edit_width);
+        if self.arrows {
+            desired_width -= 16.0;
+        }
+        let text = TextEdit::singleline(&mut str)
+            .horizontal_align(Align::Max)
+            .id(id)
+            .desired_width(desired_width)
+            .margin(Margin {
+                left: 4.0,
+                right: if self.arrows { 20.0 } else { 4.0 },
+                top: 2.0,
+                bottom: 2.0,
+            });
+        let mut res = if valid {
+            ui.add(text)
+        } else {
+            let message = match (self.min, self.max) {
+                (Some(min), Some(max)) => format!(
+                    "Please enter a number between {} and {}.",
+                    to_string(&min),
+                    to_string(&max)
+                ),
+                (Some(min), None) => {
+                    format!("Please enter a number greater than {}.", to_string(&min))
+                }
+                (None, Some(max)) => {
+                    format!("Please enter a number less than {}.", to_string(&max))
+                }
+                (None, None) => "Please enter a number.".to_string(),
+            };
+            ui.scope(|ui| {
+                let style = ui.style_mut();
+                style.visuals.selection.stroke.color = style.visuals.error_fg_color;
+                style.visuals.widgets.hovered.bg_stroke.color =
+                    style.visuals.error_fg_color.gamma_multiply(0.60);
+                ui.add(text)
+            })
+            .inner
+            .on_hover_text(message)
+        };
+
+        let mut delta = None;
+        if self.arrows {
+            let arrow_left = res.rect.max.x + 4.0;
+            let arrow_right = res.rect.max.x + 20.0;
+            let arrow_top = res.rect.min.y - 2.0;
+            let arrow_middle = (res.rect.min.y + res.rect.max.y) / 2.0;
+            let arrow_bottom = res.rect.max.y + 2.0;
+
+            let top_arrow_rect = Rect {
+                min: (arrow_left, arrow_top).into(),
+                max: (arrow_right, arrow_middle).into(),
+            };
+            if draw_arrow(ui, top_arrow_rect, true).clicked_or_dragged() || up_pressed {
+                delta = Some(Direction::Up);
+            }
+            let bottom_arrow_rect = Rect {
+                min: (arrow_left, arrow_middle).into(),
+                max: (arrow_right, arrow_bottom).into(),
+            };
+            if draw_arrow(ui, bottom_arrow_rect, false).clicked_or_dragged() || down_pressed {
+                delta = Some(Direction::Down);
+            }
+        }
+
+        let in_range =
+            |val: &T| self.min.is_none_or(|m| &m <= val) && self.max.is_none_or(|m| &m >= val);
+        if let Some(dir) = delta {
+            let value = match dir {
+                Direction::Up => self.value.checked_add(&self.increment),
+                Direction::Down => self.value.checked_sub(&self.increment),
+            };
+            if let Some(new_value) = value.filter(in_range) {
+                if *self.value != new_value {
+                    res.mark_changed();
+                }
+                *self.value = new_value;
+            }
+            str = to_string(self.value);
+            stale = true;
+        } else if res.changed {
+            if let Some(new_value) = from_string(&str).filter(in_range) {
+                if *self.value != new_value {
+                    res.mark_changed();
+                }
+                *self.value = new_value;
+            }
+            stale = true;
+        }
+        if stale {
+            ui.memory_mut(|m| m.data.insert_temp(id, (*self.value, str)));
+        }
+        res
+    }
+}
+
+fn draw_arrow(ui: &mut Ui, rect: Rect, up: bool) -> Response {
+    let arrow_res = ui
+        .allocate_rect(
+            rect,
+            Sense {
+                click: true,
+                drag: true,
+                focusable: false,
+            },
+        )
+        .on_hover_cursor(CursorIcon::Default);
+    let visuals = ui.style().visuals.widgets.style(&arrow_res);
+    let painter = ui.painter_at(arrow_res.rect);
+
+    let rounding = if up {
+        Rounding {
+            ne: 2.0,
+            ..Rounding::ZERO
+        }
+    } else {
+        Rounding {
+            se: 2.0,
+            ..Rounding::ZERO
+        }
+    };
+    painter.rect_filled(arrow_res.rect, rounding, visuals.bg_fill);
+
+    let left = rect.left() + 4.0;
+    let center = (rect.left() + rect.right()) / 2.0;
+    let right = rect.right() - 4.0;
+    let top = rect.top() + 3.0;
+    let bottom = rect.bottom() - 3.0;
+    let points = if up {
+        vec![
+            (left, bottom).into(),
+            (center, top).into(),
+            (right, bottom).into(),
+        ]
+    } else {
+        vec![
+            (right, top).into(),
+            (center, bottom).into(),
+            (left, top).into(),
+        ]
+    };
+    painter.add(Shape::convex_polygon(
+        points,
+        visuals.fg_stroke.color,
+        Stroke::NONE,
+    ));
+    arrow_res
+}
+
+trait ResponseExt {
+    fn clicked_or_dragged(&self) -> bool;
+}
+
+impl ResponseExt for Response {
+    fn clicked_or_dragged(&self) -> bool {
+        self.clicked() || self.dragged()
+    }
 }

src/window/vip.rs

@@ -0,0 +1,14 @@
+mod bgmap;
+mod chardata;
+mod framebuffer;
+mod object;
+mod registers;
+mod utils;
+mod world;
+
+pub use bgmap::*;
+pub use chardata::*;
+pub use framebuffer::*;
+pub use object::*;
+pub use registers::*;
+pub use world::*;

src/window/vip/bgmap.rs

@@ -1,45 +1,48 @@
 use std::sync::Arc;
 
 use egui::{
-    Align, CentralPanel, Checkbox, Color32, Context, Image, ScrollArea, Slider, TextEdit,
+    Align, CentralPanel, Checkbox, Color32, ComboBox, Context, Image, ScrollArea, Slider, TextEdit,
     TextureOptions, Ui, ViewportBuilder, ViewportId,
 };
 use egui_extras::{Column, Size, StripBuilder, TableBuilder};
 
 use crate::{
     emulator::SimId,
-    memory::{MemoryMonitor, MemoryView},
+    images::{ImageBuffer, ImageParams, ImageProcessor, ImageRenderer, ImageTextureLoader},
-    vram::{VramImage, VramParams, VramProcessor, VramRenderer, VramTextureLoader},
+    memory::{MemoryClient, MemoryView},
-    window::{utils::UiExt, AppWindow},
+    window::{
+        AppWindow,
+        utils::{NumberEdit, UiExt},
+    },
 };
 
-use super::utils::{parse_palette, CharacterGrid, GENERIC_PALETTE};
+use super::utils::{self, CellData, CharacterGrid};
 
 pub struct BgMapWindow {
     sim_id: SimId,
-    loader: Arc<VramTextureLoader>,
+    loader: Arc<ImageTextureLoader>,
+    memory: Arc<MemoryClient>,
     bgmaps: MemoryView,
     cell_index: usize,
-    cell_index_str: String,
     generic_palette: bool,
-    params: VramParams<BgMapParams>,
+    params: ImageParams<BgMapParams>,
     scale: f32,
     show_grid: bool,
 }
 
 impl BgMapWindow {
-    pub fn new(sim_id: SimId, memory: &mut MemoryMonitor, vram: &mut VramProcessor) -> Self {
+    pub fn new(sim_id: SimId, memory: &Arc<MemoryClient>, images: &mut ImageProcessor) -> Self {
         let renderer = BgMapRenderer::new(sim_id, memory);
-        let ([cell, bgmap], params) = vram.add(renderer);
+        let ([cell, bgmap], params) = images.add(renderer, BgMapParams::default());
         let loader =
-            VramTextureLoader::new([("vram://cell".into(), cell), ("vram://bgmap".into(), bgmap)]);
+            ImageTextureLoader::new([("vip://cell".into(), cell), ("vip://bgmap".into(), bgmap)]);
         Self {
             sim_id,
             loader: Arc::new(loader),
-            bgmaps: memory.view(sim_id, 0x00020000, 0x1d800),
+            memory: memory.clone(),
-            cell_index: 0,
+            bgmaps: memory.watch(sim_id, 0x00020000, 0x20000),
-            cell_index_str: "0".into(),
+            cell_index: params.cell_index,
-            generic_palette: false,
+            generic_palette: params.generic_palette,
             params,
             scale: 1.0,
             show_grid: false,
@@ -59,11 +62,9 @@ impl BgMapWindow {
                         });
                         row.col(|ui| {
                             let mut bgmap_index = self.cell_index / 4096;
-                            let mut bgmap_index_str = bgmap_index.to_string();
+                            ui.add(NumberEdit::new(&mut bgmap_index).range(0..16));
-                            ui.number_picker(&mut bgmap_index_str, &mut bgmap_index, 0..14);
                             if bgmap_index != self.cell_index / 4096 {
                                 self.cell_index = (bgmap_index * 4096) + (self.cell_index % 4096);
-                                self.cell_index_str = self.cell_index.to_string();
                             }
                         });
                     });
@@ -72,11 +73,7 @@ impl BgMapWindow {
                             ui.label("Cell");
                         });
                         row.col(|ui| {
-                            ui.number_picker(
+                            ui.add(NumberEdit::new(&mut self.cell_index).range(0..16 * 4096));
-                                &mut self.cell_index_str,
-                                &mut self.cell_index,
-                                0..16 * 4096,
-                            );
                         });
                     });
                     body.row(row_height, |mut row| {
@@ -93,14 +90,13 @@ impl BgMapWindow {
                         });
                     });
                 });
-            let image = Image::new("vram://cell")
+            let image = Image::new("vip://cell")
                 .maintain_aspect_ratio(true)
-                .tint(Color32::RED)
                 .texture_options(TextureOptions::NEAREST);
             ui.add(image);
             ui.section("Cell", |ui| {
-                let cell = self.bgmaps.borrow().read::<u16>(self.cell_index);
+                let mut data = self.bgmaps.borrow().read::<u16>(self.cell_index);
-                let (char_index, mut vflip, mut hflip, palette_index) = parse_cell(cell);
+                let mut cell = CellData::parse(data);
                 TableBuilder::new(ui)
                     .column(Column::remainder())
                     .column(Column::remainder())
@@ -110,12 +106,7 @@ impl BgMapWindow {
                                 ui.label("Character");
                             });
                             row.col(|ui| {
-                                let mut character_str = char_index.to_string();
+                                ui.add(NumberEdit::new(&mut cell.char_index).range(0..2048));
-                                ui.add_enabled(
-                                    false,
-                                    TextEdit::singleline(&mut character_str)
-                                        .horizontal_align(Align::Max),
-                                );
                             });
                         });
                         body.row(row_height, |mut row| {
@@ -123,36 +114,45 @@ impl BgMapWindow {
                                 ui.label("Palette");
                             });
                             row.col(|ui| {
-                                let mut palette = format!("BG {}", palette_index);
+                                ComboBox::from_id_salt("palette")
-                                ui.add_enabled(
+                                    .selected_text(format!("BG {}", cell.palette_index))
-                                    false,
+                                    .width(ui.available_width())
-                                    TextEdit::singleline(&mut palette).horizontal_align(Align::Max),
+                                    .show_ui(ui, |ui| {
-                                );
+                                        for palette in 0..4 {
+                                            ui.selectable_value(
+                                                &mut cell.palette_index,
+                                                palette,
+                                                format!("BG {palette}"),
+                                            );
+                                        }
+                                    });
                             });
                         });
                         body.row(row_height, |mut row| {
                             row.col(|ui| {
-                                let checkbox = Checkbox::new(&mut hflip, "H-flip");
+                                ui.add(Checkbox::new(&mut cell.hflip, "H-flip"));
-                                ui.add_enabled(false, checkbox);
                             });
                             row.col(|ui| {
-                                let checkbox = Checkbox::new(&mut vflip, "V-flip");
+                                ui.add(Checkbox::new(&mut cell.vflip, "V-flip"));
-                                ui.add_enabled(false, checkbox);
                             });
                         });
                     });
-                ui.section("Display", |ui| {
+                if cell.update(&mut data) {
-                    ui.horizontal(|ui| {
+                    let address = 0x00020000 + (self.cell_index * 2);
-                        ui.label("Scale");
+                    self.memory.write(self.sim_id, address as u32, &data);
-                        ui.spacing_mut().slider_width = ui.available_width();
+                }
-                        let slider = Slider::new(&mut self.scale, 1.0..=10.0)
+            });
-                            .step_by(1.0)
+            ui.section("Display", |ui| {
-                            .show_value(false);
+                ui.horizontal(|ui| {
-                        ui.add(slider);
+                    ui.label("Scale");
-                    });
+                    ui.spacing_mut().slider_width = ui.available_width();
-                    ui.checkbox(&mut self.show_grid, "Show grid");
+                    let slider = Slider::new(&mut self.scale, 1.0..=10.0)
-                    ui.checkbox(&mut self.generic_palette, "Generic palette");
+                        .step_by(1.0)
+                        .show_value(false);
+                    ui.add(slider);
                 });
+                ui.checkbox(&mut self.show_grid, "Show grid");
+                ui.checkbox(&mut self.generic_palette, "Generic palette");
             });
         });
         self.params.write(BgMapParams {
@@ -162,13 +162,12 @@ impl BgMapWindow {
     }
 
     fn show_bgmap(&mut self, ui: &mut Ui) {
-        let grid = CharacterGrid::new("vram://bgmap")
+        let grid = CharacterGrid::new("vip://bgmap")
             .with_scale(self.scale)
             .with_grid(self.show_grid)
             .with_selected(self.cell_index % 4096);
         if let Some(selected) = grid.show(ui) {
             self.cell_index = (self.cell_index / 4096 * 4096) + selected;
-            self.cell_index_str = self.cell_index.to_string();
         }
     }
 }
@@ -196,7 +195,7 @@ impl AppWindow for BgMapWindow {
         CentralPanel::default().show(ctx, |ui| {
             ui.horizontal_top(|ui| {
                 StripBuilder::new(ui)
-                    .size(Size::relative(0.3))
+                    .size(Size::relative(0.3).at_most(200.0))
                     .size(Size::remainder())
                     .horizontal(|mut strip| {
                         strip.cell(|ui| {
@@ -211,14 +210,6 @@ impl AppWindow for BgMapWindow {
     }
 }
 
-fn parse_cell(cell: u16) -> (usize, bool, bool, usize) {
-    let char_index = (cell & 0x7ff) as usize;
-    let vflip = cell & 0x1000 != 0;
-    let hflip = cell & 0x2000 != 0;
-    let palette_index = (cell >> 14) as usize;
-    (char_index, vflip, hflip, palette_index)
-}
-
 #[derive(Default, Clone, PartialEq, Eq)]
 struct BgMapParams {
     cell_index: usize,
@@ -233,50 +224,41 @@ struct BgMapRenderer {
 }
 
 impl BgMapRenderer {
-    pub fn new(sim_id: SimId, memory: &mut MemoryMonitor) -> Self {
+    pub fn new(sim_id: SimId, memory: &MemoryClient) -> Self {
         Self {
-            chardata: memory.view(sim_id, 0x00078000, 0x8000),
+            chardata: memory.watch(sim_id, 0x00078000, 0x8000),
-            bgmaps: memory.view(sim_id, 0x00020000, 0x1d800),
+            bgmaps: memory.watch(sim_id, 0x00020000, 0x20000),
-            brightness: memory.view(sim_id, 0x0005f824, 8),
+            brightness: memory.watch(sim_id, 0x0005f824, 8),
-            palettes: memory.view(sim_id, 0x0005f860, 16),
+            palettes: memory.watch(sim_id, 0x0005f860, 16),
         }
     }
 
-    fn render_bgmap(&self, image: &mut VramImage, bgmap_index: usize, generic_palette: bool) {
+    fn render_bgmap(&self, image: &mut ImageBuffer, bgmap_index: usize, generic_palette: bool) {
         let chardata = self.chardata.borrow();
         let bgmaps = self.bgmaps.borrow();
         let brightness = self.brightness.borrow();
         let palettes = self.palettes.borrow();
 
-        let brts = brightness.range::<u8>(0, 8);
+        let brts = brightness.read::<[u8; 8]>(0);
         let colors = if generic_palette {
-            [
+            [utils::generic_palette(Color32::RED); 4]
-                GENERIC_PALETTE,
-                GENERIC_PALETTE,
-                GENERIC_PALETTE,
-                GENERIC_PALETTE,
-            ]
         } else {
-            [
+            [0, 2, 4, 6].map(|i| utils::palette_colors(palettes.read(i), &brts, Color32::RED))
-                parse_palette(palettes.read(0), brts),
-                parse_palette(palettes.read(2), brts),
-                parse_palette(palettes.read(4), brts),
-                parse_palette(palettes.read(6), brts),
-            ]
         };
 
-        for (i, cell) in bgmaps
+        for (i, cell) in bgmaps.range::<u16>(bgmap_index * 4096, 4096).enumerate() {
-            .range::<u16>(bgmap_index * 4096, 4096)
+            let CellData {
-            .iter()
+                char_index,
-            .enumerate()
+                vflip,
-        {
+                hflip,
-            let (char_index, vflip, hflip, palette_index) = parse_cell(*cell);
+                palette_index,
-            let char = chardata.range::<u16>(char_index * 8, 8);
+            } = CellData::parse(cell);
+            let char = chardata.read::<[u16; 8]>(char_index);
             let palette = &colors[palette_index];
 
             for row in 0..8 {
                 let y = row + (i / 64) * 8;
-                for (col, pixel) in self.read_char_row(char, hflip, vflip, row).enumerate() {
+                for (col, pixel) in utils::read_char_row(&char, hflip, vflip, row).enumerate() {
                     let x = col + (i % 64) * 8;
                     image.write((x, y), palette[pixel as usize]);
                 }
@@ -284,54 +266,45 @@ impl BgMapRenderer {
         }
     }
 
-    fn render_bgmap_cell(&self, image: &mut VramImage, index: usize, generic_palette: bool) {
+    fn render_bgmap_cell(&self, image: &mut ImageBuffer, index: usize, generic_palette: bool) {
         let chardata = self.chardata.borrow();
         let bgmaps = self.bgmaps.borrow();
         let brightness = self.brightness.borrow();
         let palettes = self.palettes.borrow();
 
-        let brts = brightness.range::<u8>(0, 8);
+        let brts = brightness.read::<[u8; 8]>(0);
 
         let cell = bgmaps.read::<u16>(index);
 
-        let (char_index, vflip, hflip, palette_index) = parse_cell(cell);
+        let CellData {
-        let char = chardata.range::<u16>(char_index * 8, 8);
+            char_index,
+            vflip,
+            hflip,
+            palette_index,
+        } = CellData::parse(cell);
+        let char = chardata.read::<[u16; 8]>(char_index);
         let palette = if generic_palette {
-            GENERIC_PALETTE
+            utils::generic_palette(Color32::RED)
         } else {
-            parse_palette(palettes.read(palette_index * 2), brts)
+            utils::palette_colors(palettes.read(palette_index * 2), &brts, Color32::RED)
         };
 
         for row in 0..8 {
-            for (col, pixel) in self.read_char_row(char, hflip, vflip, row).enumerate() {
+            for (col, pixel) in utils::read_char_row(&char, hflip, vflip, row).enumerate() {
                 image.write((col, row), palette[pixel as usize]);
             }
         }
     }
-
-    fn read_char_row(
-        &self,
-        char: &[u16],
-        hflip: bool,
-        vflip: bool,
-        row: usize,
-    ) -> impl Iterator<Item = u8> {
-        let pixels = if vflip { char[7 - row] } else { char[row] };
-        (0..16).step_by(2).map(move |i| {
-            let pixel = if hflip { 14 - i } else { i };
-            ((pixels >> pixel) & 0x3) as u8
-        })
-    }
 }
 
-impl VramRenderer<2> for BgMapRenderer {
+impl ImageRenderer<2> for BgMapRenderer {
     type Params = BgMapParams;
 
     fn sizes(&self) -> [[usize; 2]; 2] {
         [[8, 8], [8 * 64, 8 * 64]]
     }
 
-    fn render(&mut self, params: &Self::Params, images: &mut [VramImage; 2]) {
+    fn render(&mut self, params: &Self::Params, images: &mut [ImageBuffer; 2]) {
         self.render_bgmap_cell(&mut images[0], params.cell_index, params.generic_palette);
         self.render_bgmap(
             &mut images[1],

src/window/vip/chardata.rs

@@ -9,15 +9,18 @@ use serde::{Deserialize, Serialize};
 
 use crate::{
     emulator::SimId,
-    memory::{MemoryMonitor, MemoryView},
+    images::{ImageBuffer, ImageParams, ImageProcessor, ImageRenderer, ImageTextureLoader},
-    vram::{VramImage, VramParams, VramProcessor, VramRenderer, VramTextureLoader},
+    memory::{MemoryClient, MemoryView},
-    window::{utils::UiExt as _, AppWindow},
+    window::{
+        AppWindow,
+        utils::{NumberEdit, UiExt as _},
+    },
 };
 
 use super::utils::{self, CharacterGrid};
 
 #[derive(Debug, Default, Clone, Copy, PartialEq, Eq, Hash, Serialize, Deserialize)]
-pub enum VramPalette {
+pub enum Palette {
     #[default]
     Generic,
     Bg0,
@@ -30,8 +33,8 @@ pub enum VramPalette {
     Obj3,
 }
 
-impl VramPalette {
+impl Palette {
-    pub const fn values() -> [VramPalette; 9] {
+    pub const fn values() -> [Palette; 9] {
         [
             Self::Generic,
             Self::Bg0,
@@ -60,7 +63,7 @@ impl VramPalette {
     }
 }
 
-impl Display for VramPalette {
+impl Display for Palette {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         match self {
             Self::Generic => f.write_str("Generic"),
@@ -78,33 +81,31 @@ impl Display for VramPalette {
 
 pub struct CharacterDataWindow {
     sim_id: SimId,
-    loader: Arc<VramTextureLoader>,
+    loader: Arc<ImageTextureLoader>,
     brightness: MemoryView,
     palettes: MemoryView,
-    palette: VramPalette,
+    palette: Palette,
     index: usize,
-    index_str: String,
+    params: ImageParams<CharDataParams>,
-    params: VramParams<CharDataParams>,
     scale: f32,
     show_grid: bool,
 }
 
 impl CharacterDataWindow {
-    pub fn new(sim_id: SimId, memory: &mut MemoryMonitor, vram: &mut VramProcessor) -> Self {
+    pub fn new(sim_id: SimId, memory: &MemoryClient, images: &mut ImageProcessor) -> Self {
         let renderer = CharDataRenderer::new(sim_id, memory);
-        let ([char, chardata], params) = vram.add(renderer);
+        let ([char, chardata], params) = images.add(renderer, CharDataParams::default());
-        let loader = VramTextureLoader::new([
+        let loader = ImageTextureLoader::new([
-            ("vram://char".into(), char),
+            ("vip://char".into(), char),
-            ("vram://chardata".into(), chardata),
+            ("vip://chardata".into(), chardata),
         ]);
         Self {
             sim_id,
             loader: Arc::new(loader),
-            brightness: memory.view(sim_id, 0x0005f824, 8),
+            brightness: memory.watch(sim_id, 0x0005f824, 8),
-            palettes: memory.view(sim_id, 0x0005f860, 16),
+            palettes: memory.watch(sim_id, 0x0005f860, 16),
             palette: params.palette,
             index: params.index,
-            index_str: params.index.to_string(),
             params,
             scale: 4.0,
             show_grid: true,
@@ -123,7 +124,7 @@ impl CharacterDataWindow {
                             ui.label("Index");
                         });
                         row.col(|ui| {
-                            ui.number_picker(&mut self.index_str, &mut self.index, 0..2048);
+                            ui.add(NumberEdit::new(&mut self.index).range(0..2048));
                         });
                     });
                     body.row(row_height, |mut row| {
@@ -159,9 +160,8 @@ impl CharacterDataWindow {
                         });
                     });
                 });
-            let image = Image::new("vram://char")
+            let image = Image::new("vip://char")
                 .maintain_aspect_ratio(true)
-                .tint(Color32::RED)
                 .texture_options(TextureOptions::NEAREST);
             ui.add(image);
             ui.section("Colors", |ui| {
@@ -171,7 +171,7 @@ impl CharacterDataWindow {
                         .selected_text(self.palette.to_string())
                         .width(ui.available_width())
                         .show_ui(ui, |ui| {
-                            for palette in VramPalette::values() {
+                            for palette in Palette::values() {
                                 ui.selectable_value(
                                     &mut self.palette,
                                     palette,
@@ -190,11 +190,7 @@ impl CharacterDataWindow {
                                     let rect = ui.available_rect_before_wrap();
                                     let scale = rect.height() / rect.width();
                                     let rect = rect.scale_from_center2(Vec2::new(scale, 1.0));
-                                    ui.painter().rect_filled(
+                                    ui.painter().rect_filled(rect, 0.0, color);
-                                        rect,
-                                        0.0,
-                                        Color32::RED * Color32::from_gray(color),
-                                    );
                                 });
                             }
                         });
@@ -219,24 +215,23 @@ impl CharacterDataWindow {
         });
     }
 
-    fn load_palette_colors(&self) -> [u8; 4] {
+    fn load_palette_colors(&self) -> [Color32; 4] {
         let Some(offset) = self.palette.offset() else {
-            return utils::GENERIC_PALETTE;
+            return utils::generic_palette(Color32::RED);
         };
         let palette = self.palettes.borrow().read(offset);
         let brightnesses = self.brightness.borrow();
-        let brts = brightnesses.range(0, 8);
+        let brts = brightnesses.read(0);
-        utils::parse_palette(palette, brts)
+        utils::palette_colors(palette, &brts, Color32::RED)
     }
 
     fn show_chardata(&mut self, ui: &mut Ui) {
-        let grid = CharacterGrid::new("vram://chardata")
+        let grid = CharacterGrid::new("vip://chardata")
             .with_scale(self.scale)
             .with_grid(self.show_grid)
             .with_selected(self.index);
         if let Some(selected) = grid.show(ui) {
             self.index = selected;
-            self.index_str = selected.to_string();
         }
     }
 }
@@ -264,7 +259,7 @@ impl AppWindow for CharacterDataWindow {
         CentralPanel::default().show(ctx, |ui| {
             ui.horizontal_top(|ui| {
                 StripBuilder::new(ui)
-                    .size(Size::relative(0.3))
+                    .size(Size::relative(0.3).at_most(200.0))
                     .size(Size::remainder())
                     .horizontal(|mut strip| {
                         strip.cell(|ui| {
@@ -281,13 +276,13 @@ impl AppWindow for CharacterDataWindow {
 
 #[derive(Serialize, Deserialize, Clone, PartialEq, Eq, Hash)]
 enum CharDataResource {
-    Character { palette: VramPalette, index: usize },
+    Character { palette: Palette, index: usize },
-    CharacterData { palette: VramPalette },
+    CharacterData { palette: Palette },
 }
 
 #[derive(Clone, Default, PartialEq, Eq)]
 struct CharDataParams {
-    palette: VramPalette,
+    palette: Palette,
     index: usize,
 }
 
@@ -297,36 +292,36 @@ struct CharDataRenderer {
     palettes: MemoryView,
 }
 
-impl VramRenderer<2> for CharDataRenderer {
+impl ImageRenderer<2> for CharDataRenderer {
     type Params = CharDataParams;
 
     fn sizes(&self) -> [[usize; 2]; 2] {
         [[8, 8], [16 * 8, 128 * 8]]
     }
 
-    fn render(&mut self, params: &Self::Params, image: &mut [VramImage; 2]) {
+    fn render(&mut self, params: &Self::Params, image: &mut [ImageBuffer; 2]) {
         self.render_character(&mut image[0], params.palette, params.index);
         self.render_character_data(&mut image[1], params.palette);
     }
 }
 
 impl CharDataRenderer {
-    pub fn new(sim_id: SimId, memory: &mut MemoryMonitor) -> Self {
+    pub fn new(sim_id: SimId, memory: &MemoryClient) -> Self {
         Self {
-            chardata: memory.view(sim_id, 0x00078000, 0x8000),
+            chardata: memory.watch(sim_id, 0x00078000, 0x8000),
-            brightness: memory.view(sim_id, 0x0005f824, 8),
+            brightness: memory.watch(sim_id, 0x0005f824, 8),
-            palettes: memory.view(sim_id, 0x0005f860, 16),
+            palettes: memory.watch(sim_id, 0x0005f860, 16),
         }
     }
 
-    fn render_character(&self, image: &mut VramImage, palette: VramPalette, index: usize) {
+    fn render_character(&self, image: &mut ImageBuffer, palette: Palette, index: usize) {
         if index >= 2048 {
             return;
         }
         let palette = self.load_palette(palette);
         let chardata = self.chardata.borrow();
         let character = chardata.range::<u16>(index * 8, 8);
-        for (row, pixels) in character.iter().enumerate() {
+        for (row, pixels) in character.enumerate() {
             for col in 0..8 {
                 let char = (pixels >> (col * 2)) & 0x03;
                 image.write((col, row), palette[char as usize]);
@@ -334,10 +329,10 @@ impl CharDataRenderer {
         }
     }
 
-    fn render_character_data(&self, image: &mut VramImage, palette: VramPalette) {
+    fn render_character_data(&self, image: &mut ImageBuffer, palette: Palette) {
         let palette = self.load_palette(palette);
         let chardata = self.chardata.borrow();
-        for (row, pixels) in chardata.range::<u16>(0, 8 * 2048).iter().enumerate() {
+        for (row, pixels) in chardata.range::<u16>(0, 8 * 2048).enumerate() {
             let char_index = row / 8;
             let row_index = row % 8;
             let x = (char_index % 16) * 8;
@@ -349,110 +344,13 @@ impl CharDataRenderer {
         }
     }
 
-    fn load_palette(&self, palette: VramPalette) -> [u8; 4] {
+    fn load_palette(&self, palette: Palette) -> [Color32; 4] {
         let Some(offset) = palette.offset() else {
-            return utils::GENERIC_PALETTE;
+            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.range(0, 8);
+        let brts = brightnesses.read(0);
-        utils::parse_palette(palette, brts)
+        utils::palette_colors(palette, &brts, Color32::RED)
     }
 }
-
-/*
-struct CharDataLoader {
-    chardata: MemoryView,
-    brightness: MemoryView,
-    palettes: MemoryView,
-}
-
-impl CharDataLoader {
-    pub fn new(sim_id: SimId, memory: &mut MemoryMonitor) -> Self {
-        Self {
-            chardata: memory.view(sim_id, 0x00078000, 0x8000),
-            brightness: memory.view(sim_id, 0x0005f824, 8),
-            palettes: memory.view(sim_id, 0x0005f860, 16),
-        }
-    }
-
-    fn update_character(&self, image: &mut VramImage, palette: VramPalette, index: usize) {
-        if index >= 2048 {
-            return;
-        }
-        let palette = self.load_palette(palette);
-        let chardata = self.chardata.borrow();
-        let character = chardata.range::<u16>(index * 8, 8);
-        for (row, pixels) in character.iter().enumerate() {
-            for col in 0..8 {
-                let char = (pixels >> (col * 2)) & 0x03;
-                image.write((col, row), palette[char as usize]);
-            }
-        }
-    }
-
-    fn update_character_data(&self, image: &mut VramImage, palette: VramPalette) {
-        let palette = self.load_palette(palette);
-        let chardata = self.chardata.borrow();
-        for (row, pixels) in chardata.range::<u16>(0, 8 * 2048).iter().enumerate() {
-            let char_index = row / 8;
-            let row_index = row % 8;
-            let x = (char_index % 16) * 8;
-            let y = (char_index / 16) * 8 + row_index;
-            for col in 0..8 {
-                let char = (pixels >> (col * 2)) & 0x03;
-                image.write((x + col, y), palette[char as usize]);
-            }
-        }
-    }
-
-    fn load_palette(&self, palette: VramPalette) -> [u8; 4] {
-        let Some(offset) = palette.offset() else {
-            return utils::GENERIC_PALETTE;
-        };
-        let palette = self.palettes.borrow().read(offset);
-        let brightnesses = self.brightness.borrow();
-        let brts = brightnesses.range(0, 8);
-        utils::parse_palette(palette, brts)
-    }
-}
-
-impl VramImageLoader for CharDataLoader {
-    type Resource = CharDataResource;
-
-    fn id(&self) -> &str {
-        concat!(module_path!(), "::CharDataLoader")
-    }
-
-    fn add(&self, resource: &Self::Resource) -> Option<VramImage> {
-        match resource {
-            CharDataResource::Character { palette, index } => {
-                let mut image = VramImage::new(8, 8);
-                self.update_character(&mut image, *palette, *index);
-                Some(image)
-            }
-            CharDataResource::CharacterData { palette } => {
-                let mut image = VramImage::new(8 * 16, 8 * 128);
-                self.update_character_data(&mut image, *palette);
-                Some(image)
-            }
-        }
-    }
-
-    fn update<'a>(
-        &'a self,
-        resources: impl Iterator<Item = (&'a Self::Resource, &'a mut VramImage)>,
-    ) {
-        for (resource, image) in resources {
-            match resource {
-                CharDataResource::Character { palette, index } => {
-                    self.update_character(image, *palette, *index)
-                }
-                CharDataResource::CharacterData { palette } => {
-                    self.update_character_data(image, *palette)
-                }
-            }
-        }
-    }
-}
- */

src/window/vip/framebuffer.rs

@@ -0,0 +1,267 @@
+use std::sync::Arc;
+
+use egui::{
+    Align, CentralPanel, Color32, Context, Image, ScrollArea, Slider, TextEdit, TextureOptions, Ui,
+    ViewportBuilder, ViewportId,
+};
+use egui_extras::{Column, Size, StripBuilder, TableBuilder};
+
+use crate::{
+    emulator::SimId,
+    images::{ImageBuffer, ImageParams, ImageProcessor, ImageRenderer, ImageTextureLoader},
+    memory::{MemoryClient, MemoryView},
+    window::{
+        AppWindow,
+        utils::{NumberEdit, UiExt as _},
+    },
+};
+
+use super::utils;
+
+pub struct FrameBufferWindow {
+    sim_id: SimId,
+    loader: Arc<ImageTextureLoader>,
+    index: usize,
+    left: bool,
+    right: bool,
+    generic_palette: bool,
+    params: ImageParams<FrameBufferParams>,
+    scale: f32,
+}
+
+impl FrameBufferWindow {
+    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,
+            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);
+        let loader = ImageTextureLoader::new([("vip://buffer".into(), buffer)]);
+        Self {
+            sim_id,
+            loader: Arc::new(loader),
+            index: params.index,
+            left: params.left,
+            right: params.right,
+            generic_palette: params.generic_palette,
+            params,
+            scale: 2.0,
+        }
+    }
+
+    fn show_form(&mut self, ui: &mut Ui) {
+        let row_height = ui.spacing().interact_size.y;
+        ui.vertical(|ui| {
+            TableBuilder::new(ui)
+                .column(Column::auto())
+                .column(Column::remainder())
+                .body(|mut body| {
+                    body.row(row_height, |mut row| {
+                        row.col(|ui| {
+                            ui.label("Index");
+                        });
+                        row.col(|ui| {
+                            ui.add(NumberEdit::new(&mut self.index).range(0..2));
+                        });
+                    });
+                    body.row(row_height, |mut row| {
+                        row.col(|ui| {
+                            ui.label("Left");
+                        });
+                        row.col(|ui| {
+                            let address = self.index * 0x00008000;
+                            let mut address_str = format!("{address:08x}");
+                            ui.add_enabled(
+                                false,
+                                TextEdit::singleline(&mut address_str).horizontal_align(Align::Max),
+                            );
+                        });
+                    });
+                    body.row(row_height, |mut row| {
+                        row.col(|ui| {
+                            ui.label("Right");
+                        });
+                        row.col(|ui| {
+                            let address = self.index * 0x00008000 + 0x00010000;
+                            let mut address_str = format!("{address:08x}");
+                            ui.add_enabled(
+                                false,
+                                TextEdit::singleline(&mut address_str).horizontal_align(Align::Max),
+                            );
+                        });
+                    });
+                });
+            ui.section("Display", |ui| {
+                ui.horizontal(|ui| {
+                    ui.label("Scale");
+                    ui.spacing_mut().slider_width = ui.available_width();
+                    let slider = Slider::new(&mut self.scale, 1.0..=10.0)
+                        .step_by(1.0)
+                        .show_value(false);
+                    ui.add(slider);
+                });
+                TableBuilder::new(ui)
+                    .columns(Column::remainder(), 2)
+                    .body(|mut body| {
+                        body.row(row_height, |mut row| {
+                            row.col(|ui| {
+                                ui.checkbox(&mut self.left, "Left");
+                            });
+                            row.col(|ui| {
+                                ui.checkbox(&mut self.right, "Right");
+                            });
+                        });
+                    });
+                ui.checkbox(&mut self.generic_palette, "Generic colors");
+            });
+        });
+
+        self.params.write(FrameBufferParams {
+            index: self.index,
+            left: self.left,
+            right: self.right,
+            generic_palette: self.generic_palette,
+            ..*self.params
+        });
+    }
+
+    fn show_buffers(&mut self, ui: &mut Ui) {
+        let image = Image::new("vip://buffer")
+            .fit_to_original_size(self.scale)
+            .texture_options(TextureOptions::NEAREST);
+        ui.add(image);
+    }
+}
+
+impl AppWindow for FrameBufferWindow {
+    fn viewport_id(&self) -> ViewportId {
+        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(format!("Frame Buffers ({})", self.sim_id))
+            .with_inner_size((640.0, 480.0))
+    }
+
+    fn on_init(&mut self, ctx: &Context, _render_state: &egui_wgpu::RenderState) {
+        ctx.add_texture_loader(self.loader.clone());
+    }
+
+    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))
+                    .size(Size::remainder())
+                    .horizontal(|mut strip| {
+                        strip.cell(|ui| {
+                            ScrollArea::vertical().show(ui, |ui| self.show_form(ui));
+                        });
+                        strip.cell(|ui| {
+                            ScrollArea::both().show(ui, |ui| self.show_buffers(ui));
+                        });
+                    });
+            });
+        });
+    }
+}
+
+#[derive(Clone, PartialEq, Eq)]
+struct FrameBufferParams {
+    index: usize,
+    left: bool,
+    right: bool,
+    generic_palette: bool,
+    left_color: Color32,
+    right_color: Color32,
+}
+
+struct FrameBufferRenderer {
+    buffers: [MemoryView; 4],
+    brightness: MemoryView,
+}
+
+impl FrameBufferRenderer {
+    fn new(sim_id: SimId, memory: &MemoryClient) -> Self {
+        Self {
+            buffers: [
+                memory.watch(sim_id, 0x00000000, 0x6000),
+                memory.watch(sim_id, 0x00008000, 0x6000),
+                memory.watch(sim_id, 0x00010000, 0x6000),
+                memory.watch(sim_id, 0x00018000, 0x6000),
+            ],
+            brightness: memory.watch(sim_id, 0x0005f824, 8),
+        }
+    }
+}
+
+impl ImageRenderer<1> for FrameBufferRenderer {
+    type Params = FrameBufferParams;
+
+    fn sizes(&self) -> [[usize; 2]; 1] {
+        [[384, 224]]
+    }
+
+    fn render(&mut self, params: &Self::Params, images: &mut [ImageBuffer; 1]) {
+        let image = &mut images[0];
+
+        let left_buffer = self.buffers[params.index].borrow();
+        let right_buffer = self.buffers[2 + params.index].borrow();
+
+        let colors = if params.generic_palette {
+            [
+                utils::generic_palette(params.left_color),
+                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, params.left_color)),
+                shades.map(|s| utils::shade(s, params.right_color)),
+            ]
+        };
+
+        let left_cols = left_buffer.range::<u8>(0, 0x6000);
+        let right_cols = right_buffer.range::<u8>(0, 0x6000);
+        for (index, (left, right)) in left_cols.zip(right_cols).enumerate() {
+            let top = (index % 64) * 4;
+            if top >= 224 {
+                continue;
+            }
+
+            let pixels = [0, 2, 4, 6].map(|i| {
+                let left = if params.left {
+                    colors[0][(left >> i) as usize & 0x3]
+                } else {
+                    Color32::BLACK
+                };
+                let right = if params.right {
+                    colors[1][(right >> i) as usize & 0x3]
+                } else {
+                    Color32::BLACK
+                };
+                Color32::from_rgb(
+                    left.r() + right.r(),
+                    left.g() + right.g(),
+                    left.b() + right.b(),
+                )
+            });
+            let x = index / 64;
+            for (i, pixel) in pixels.into_iter().enumerate() {
+                let y = top + i;
+                image.write((x, y), pixel);
+            }
+        }
+    }
+}

src/window/vip/object.rs

@@ -0,0 +1,342 @@
+use std::sync::Arc;
+
+use egui::{
+    Align, CentralPanel, Checkbox, Color32, ComboBox, Context, Image, ScrollArea, Slider, TextEdit,
+    TextureOptions, Ui, ViewportBuilder, ViewportId,
+};
+use egui_extras::{Column, Size, StripBuilder, TableBuilder};
+
+use crate::{
+    emulator::SimId,
+    images::{ImageBuffer, ImageParams, ImageProcessor, ImageRenderer, ImageTextureLoader},
+    memory::{MemoryClient, MemoryView},
+    window::{
+        AppWindow,
+        utils::{NumberEdit, UiExt as _},
+    },
+};
+
+use super::utils::{self, Object};
+
+pub struct ObjectWindow {
+    sim_id: SimId,
+    loader: Arc<ImageTextureLoader>,
+    memory: Arc<MemoryClient>,
+    objects: MemoryView,
+    index: usize,
+    generic_palette: bool,
+    params: ImageParams<ObjectParams>,
+    scale: f32,
+}
+
+impl ObjectWindow {
+    pub fn new(sim_id: SimId, memory: &Arc<MemoryClient>, images: &mut ImageProcessor) -> Self {
+        let initial_params = ObjectParams {
+            index: 0,
+            generic_palette: false,
+            left_color: Color32::from_rgb(0xff, 0x00, 0x00),
+            right_color: Color32::from_rgb(0x00, 0xc6, 0xf0),
+        };
+        let renderer = ObjectRenderer::new(sim_id, memory);
+        let ([zoom, full], params) = images.add(renderer, initial_params);
+        let loader =
+            ImageTextureLoader::new([("vip://zoom".into(), zoom), ("vip://full".into(), full)]);
+        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,
+            scale: 1.0,
+        }
+    }
+
+    fn show_form(&mut self, ui: &mut Ui) {
+        let row_height = ui.spacing().interact_size.y;
+        ui.vertical(|ui| {
+            TableBuilder::new(ui)
+                .column(Column::auto())
+                .column(Column::remainder())
+                .body(|mut body| {
+                    body.row(row_height, |mut row| {
+                        row.col(|ui| {
+                            ui.label("Index");
+                        });
+                        row.col(|ui| {
+                            ui.add(NumberEdit::new(&mut self.index).range(0..1024));
+                        });
+                    });
+                    body.row(row_height, |mut row| {
+                        row.col(|ui| {
+                            ui.label("Address");
+                        });
+                        row.col(|ui| {
+                            let address = 0x3e000 + self.index * 8;
+                            let mut address_str = format!("{address:08x}");
+                            ui.add_enabled(
+                                false,
+                                TextEdit::singleline(&mut address_str).horizontal_align(Align::Max),
+                            );
+                        });
+                    });
+                });
+            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.index);
+                let mut obj = Object::parse(object);
+                TableBuilder::new(ui)
+                    .column(Column::remainder())
+                    .column(Column::remainder())
+                    .body(|mut body| {
+                        body.row(row_height, |mut row| {
+                            row.col(|ui| {
+                                ui.label("Character");
+                            });
+                            row.col(|ui| {
+                                ui.add(NumberEdit::new(&mut obj.data.char_index).range(0..2048));
+                            });
+                        });
+                        body.row(row_height, |mut row| {
+                            row.col(|ui| {
+                                ui.label("Palette");
+                            });
+                            row.col(|ui| {
+                                ComboBox::from_id_salt("palette")
+                                    .selected_text(format!("OBJ {}", obj.data.palette_index))
+                                    .width(ui.available_width())
+                                    .show_ui(ui, |ui| {
+                                        for palette in 0..4 {
+                                            ui.selectable_value(
+                                                &mut obj.data.palette_index,
+                                                palette,
+                                                format!("OBJ {palette}"),
+                                            );
+                                        }
+                                    });
+                            });
+                        });
+                        body.row(row_height, |mut row| {
+                            row.col(|ui| {
+                                ui.label("X");
+                            });
+                            row.col(|ui| {
+                                ui.add(NumberEdit::new(&mut obj.x).range(-512..512));
+                            });
+                        });
+                        body.row(row_height, |mut row| {
+                            row.col(|ui| {
+                                ui.label("Y");
+                            });
+                            row.col(|ui| {
+                                ui.add(NumberEdit::new(&mut obj.y).range(-8..=224));
+                            });
+                        });
+                        body.row(row_height, |mut row| {
+                            row.col(|ui| {
+                                ui.label("Parallax");
+                            });
+                            row.col(|ui| {
+                                ui.add(NumberEdit::new(&mut obj.parallax).range(-512..512));
+                            });
+                        });
+                        body.row(row_height, |mut row| {
+                            row.col(|ui| {
+                                ui.add(Checkbox::new(&mut obj.data.hflip, "H-flip"));
+                            });
+                            row.col(|ui| {
+                                ui.add(Checkbox::new(&mut obj.data.vflip, "V-flip"));
+                            });
+                        });
+                        body.row(row_height, |mut row| {
+                            row.col(|ui| {
+                                ui.add(Checkbox::new(&mut obj.lon, "Left"));
+                            });
+                            row.col(|ui| {
+                                ui.add(Checkbox::new(&mut obj.ron, "Right"));
+                            });
+                        });
+                    });
+                if obj.update(&mut object) {
+                    let address = 0x3e000 + self.index * 8;
+                    self.memory.write(self.sim_id, address as u32, &object);
+                }
+            });
+            ui.section("Display", |ui| {
+                ui.horizontal(|ui| {
+                    ui.label("Scale");
+                    ui.spacing_mut().slider_width = ui.available_width();
+                    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.generic_palette, "Generic palette");
+            });
+        });
+        self.params.write(ObjectParams {
+            index: self.index,
+            generic_palette: self.generic_palette,
+            ..*self.params
+        });
+    }
+
+    fn show_object(&mut self, ui: &mut Ui) {
+        let image = Image::new("vip://full")
+            .fit_to_original_size(self.scale)
+            .texture_options(TextureOptions::NEAREST);
+        ui.add(image);
+    }
+}
+
+impl AppWindow for ObjectWindow {
+    fn viewport_id(&self) -> egui::ViewportId {
+        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(format!("Object Data ({})", self.sim_id))
+            .with_inner_size((640.0, 500.0))
+    }
+
+    fn on_init(&mut self, ctx: &Context, _render_state: &egui_wgpu::RenderState) {
+        ctx.add_texture_loader(self.loader.clone());
+    }
+
+    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))
+                    .size(Size::remainder())
+                    .horizontal(|mut strip| {
+                        strip.cell(|ui| {
+                            ScrollArea::vertical().show(ui, |ui| self.show_form(ui));
+                        });
+                        strip.cell(|ui| {
+                            ScrollArea::both().show(ui, |ui| self.show_object(ui));
+                        });
+                    });
+            });
+        });
+    }
+}
+
+#[derive(Clone, PartialEq, Eq)]
+struct ObjectParams {
+    index: usize,
+    generic_palette: bool,
+    left_color: Color32,
+    right_color: Color32,
+}
+
+enum Eye {
+    Left,
+    Right,
+}
+
+struct ObjectRenderer {
+    chardata: MemoryView,
+    objects: MemoryView,
+    brightness: MemoryView,
+    palettes: MemoryView,
+}
+
+impl ObjectRenderer {
+    pub fn new(sim_id: SimId, memory: &MemoryClient) -> Self {
+        Self {
+            chardata: memory.watch(sim_id, 0x00078000, 0x8000),
+            objects: memory.watch(sim_id, 0x0003e000, 0x2000),
+            brightness: memory.watch(sim_id, 0x0005f824, 8),
+            palettes: memory.watch(sim_id, 0x0005f860, 16),
+        }
+    }
+
+    fn render_object(
+        &self,
+        image: &mut ImageBuffer,
+        params: &ObjectParams,
+        use_pos: bool,
+        eye: Eye,
+    ) {
+        let chardata = self.chardata.borrow();
+        let objects = self.objects.borrow();
+        let brightness = self.brightness.borrow();
+        let palettes = self.palettes.borrow();
+
+        let object: [u16; 4] = objects.read(params.index);
+        let obj = Object::parse(object);
+
+        if match eye {
+            Eye::Left => !obj.lon,
+            Eye::Right => !obj.ron,
+        } {
+            return;
+        }
+
+        let brts = brightness.read::<[u8; 8]>(0);
+        let (x, y) = if use_pos {
+            let x = match eye {
+                Eye::Left => obj.x - obj.parallax,
+                Eye::Right => obj.x + obj.parallax,
+            };
+            (x, obj.y)
+        } else {
+            (0, 0)
+        };
+
+        let color = match eye {
+            Eye::Left => params.left_color,
+            Eye::Right => params.right_color,
+        };
+
+        let char = chardata.read::<[u16; 8]>(obj.data.char_index);
+        let palette = if params.generic_palette {
+            utils::generic_palette(color)
+        } else {
+            utils::palette_colors(palettes.read(8 + obj.data.palette_index * 2), &brts, color)
+        };
+
+        for row in 0..8 {
+            let real_y = y + row as i16;
+            if !(0..224).contains(&real_y) {
+                continue;
+            }
+            for (col, pixel) in
+                utils::read_char_row(&char, obj.data.hflip, obj.data.vflip, row).enumerate()
+            {
+                let real_x = x + col as i16;
+                if !(0..384).contains(&real_x) {
+                    continue;
+                }
+                image.add((real_x as usize, real_y as usize), palette[pixel as usize]);
+            }
+        }
+    }
+}
+
+impl ImageRenderer<2> for ObjectRenderer {
+    type Params = ObjectParams;
+
+    fn sizes(&self) -> [[usize; 2]; 2] {
+        [[8, 8], [384, 224]]
+    }
+
+    fn render(&mut self, params: &Self::Params, images: &mut [ImageBuffer; 2]) {
+        images[0].clear();
+        self.render_object(&mut images[0], params, false, Eye::Left);
+        self.render_object(&mut images[0], params, false, Eye::Right);
+        images[1].clear();
+        self.render_object(&mut images[1], params, true, Eye::Left);
+        self.render_object(&mut images[1], params, true, Eye::Right);
+    }
+}

src/window/vip/registers.rs

@@ -0,0 +1,819 @@
+use std::sync::Arc;
+
+use egui::{
+    Align, Button, CentralPanel, Checkbox, Color32, Context, Direction, Label, Layout, ScrollArea,
+    TextEdit, Ui, ViewportBuilder, ViewportId,
+};
+use egui_extras::{Column, Size, StripBuilder, TableBuilder};
+
+use crate::{
+    emulator::SimId,
+    memory::{MemoryClient, MemoryRef, MemoryValue, MemoryView},
+    window::{
+        AppWindow,
+        utils::{NumberEdit, UiExt},
+    },
+};
+
+use super::utils;
+
+pub struct RegisterWindow {
+    sim_id: SimId,
+    memory: Arc<MemoryClient>,
+    registers: MemoryView,
+}
+
+impl RegisterWindow {
+    pub fn new(sim_id: SimId, memory: &Arc<MemoryClient>) -> Self {
+        Self {
+            sim_id,
+            memory: memory.clone(),
+            registers: memory.watch(sim_id, 0x0005f800, 0x72),
+        }
+    }
+
+    fn show_interrupts(&mut self, ui: &mut Ui) {
+        let row_height = self.row_height(ui);
+        let [mut raw_intpnd, mut raw_intenb] = self.read_address(0x0005f800);
+        let mut intenb = InterruptReg::parse(raw_intenb);
+        let mut intpnd = InterruptReg::parse(raw_intpnd);
+        ui.section("Interrupt", |ui| {
+            let width = ui.available_width();
+            let xspace = ui.spacing().item_spacing.x;
+            ui.with_layout(Layout::top_down_justified(Align::Center), |ui| {
+                TableBuilder::new(ui)
+                    .id_salt("raw_values")
+                    .columns(Column::exact(width * 0.5 - xspace), 2)
+                    .cell_layout(Layout::left_to_right(Align::Max))
+                    .body(|mut body| {
+                        body.row(row_height, |mut row| {
+                            row.col(|ui| {
+                                ui.label("INTENB");
+                            });
+                            row.col(|ui| {
+                                let mut text = format!("{raw_intenb:04x}");
+                                ui.add_sized(
+                                    ui.available_size(),
+                                    TextEdit::singleline(&mut text).horizontal_align(Align::Max),
+                                );
+                            });
+                        });
+                        body.row(row_height, |mut row| {
+                            row.col(|ui| {
+                                ui.label("INTPND");
+                            });
+                            row.col(|ui| {
+                                let mut text = format!("{raw_intpnd:04x}");
+                                ui.add_enabled(
+                                    false,
+                                    TextEdit::singleline(&mut text).horizontal_align(Align::Max),
+                                );
+                            });
+                        });
+                    });
+                ui.add_space(8.0);
+                TableBuilder::new(ui)
+                    .id_salt("flags")
+                    .column(Column::exact(width * 0.5 - xspace))
+                    .columns(Column::exact(width * 0.25 - xspace), 2)
+                    .cell_layout(Layout::left_to_right(Align::Center).with_main_align(Align::RIGHT))
+                    .body(|mut body| {
+                        body.row(row_height, |mut row| {
+                            row.col(|_ui| {});
+                            row.col(|ui| {
+                                ui.add_sized(ui.available_size(), Label::new("ENB"));
+                            });
+                            row.col(|ui| {
+                                ui.add_sized(ui.available_size(), Label::new("PND"));
+                            });
+                        });
+                        let mut add_row = |label: &str, enb: &mut bool, pnd: &mut bool| {
+                            body.row(row_height, |mut row| {
+                                row.col(|ui| {
+                                    ui.label(label);
+                                });
+                                row.col(|ui| {
+                                    let space =
+                                        (ui.available_width() - ui.spacing().icon_width) / 2.0;
+                                    ui.add_space(space);
+                                    ui.checkbox(enb, "");
+                                });
+                                row.col(|ui| {
+                                    let space =
+                                        (ui.available_width() - ui.spacing().icon_width) / 2.0;
+                                    ui.add_space(space);
+                                    ui.checkbox(pnd, "");
+                                });
+                            });
+                        };
+                        add_row("TIMEERR", &mut intenb.timeerr, &mut intpnd.timeerr);
+                        add_row("XPEND", &mut intenb.xpend, &mut intpnd.xpend);
+                        add_row("SBHIT", &mut intenb.sbhit, &mut intpnd.sbhit);
+                        add_row("FRAMESTART", &mut intenb.framestart, &mut intpnd.framestart);
+                        add_row("GAMESTART", &mut intenb.gamestart, &mut intpnd.gamestart);
+                        add_row("RFBEND", &mut intenb.rfbend, &mut intpnd.rfbend);
+                        add_row("LFBEND", &mut intenb.lfbend, &mut intpnd.lfbend);
+                        add_row("SCANERR", &mut intenb.scanerr, &mut intpnd.scanerr);
+                    });
+            });
+            ui.allocate_space(ui.available_size());
+        });
+        if intpnd.update(&mut raw_intpnd) {
+            self.memory.write(self.sim_id, 0x0005f800, &raw_intpnd);
+        }
+        if intenb.update(&mut raw_intenb) {
+            self.memory.write(self.sim_id, 0x0005f802, &raw_intenb);
+        }
+    }
+
+    fn show_display_status(&mut self, ui: &mut Ui) {
+        let row_height = self.row_height(ui);
+        let mut raw_dpstts = self.read_address(0x0005f820);
+        let mut dpstts = DisplayReg::parse(raw_dpstts);
+        ui.section("Display", |ui| {
+            let width = ui.available_width();
+            TableBuilder::new(ui)
+                .column(Column::exact(width * 0.5))
+                .column(Column::exact(width * 0.5))
+                .cell_layout(Layout::left_to_right(Align::Max))
+                .body(|mut body| {
+                    body.row(row_height, |mut row| {
+                        row.col(|ui| {
+                            ui.label("DPSTTS");
+                        });
+                        row.col(|ui| {
+                            let mut value_str = format!("{raw_dpstts:04x}");
+                            ui.add_enabled(
+                                false,
+                                TextEdit::singleline(&mut value_str).horizontal_align(Align::Max),
+                            );
+                        });
+                    });
+                    body.row(row_height, |mut row| {
+                        row.col(|ui| {
+                            ui.add_enabled(true, Checkbox::new(&mut dpstts.lock, "LOCK"));
+                        });
+                        row.col(|ui| {
+                            ui.add_enabled(false, Checkbox::new(&mut dpstts.r1bsy, "R1BSY"));
+                        });
+                    });
+                    body.row(row_height, |mut row| {
+                        row.col(|ui| {
+                            ui.add_enabled(true, Checkbox::new(&mut dpstts.synce, "SYNCE"));
+                        });
+                        row.col(|ui| {
+                            ui.add_enabled(false, Checkbox::new(&mut dpstts.l1bsy, "L1BSY"));
+                        });
+                    });
+                    body.row(row_height, |mut row| {
+                        row.col(|ui| {
+                            ui.add_enabled(true, Checkbox::new(&mut dpstts.re, "RE"));
+                        });
+                        row.col(|ui| {
+                            ui.add_enabled(false, Checkbox::new(&mut dpstts.r0bsy, "R0BSY"));
+                        });
+                    });
+                    body.row(row_height, |mut row| {
+                        row.col(|ui| {
+                            ui.add_enabled(false, Checkbox::new(&mut dpstts.fclk, "FCLK"));
+                        });
+                        row.col(|ui| {
+                            ui.add_enabled(false, Checkbox::new(&mut dpstts.l0bsy, "L0BSY"));
+                        });
+                    });
+                    body.row(row_height, |mut row| {
+                        row.col(|ui| {
+                            ui.add_enabled(false, Checkbox::new(&mut dpstts.scanrdy, "SCANRDY"));
+                        });
+                        row.col(|ui| {
+                            ui.add_enabled(true, Checkbox::new(&mut dpstts.disp, "DISP"));
+                        });
+                    });
+                    body.row(row_height, |mut row| {
+                        row.col(|_ui| {});
+                        row.col(|ui| {
+                            if ui
+                                .add(Button::new("DPRST").min_size(ui.available_size()))
+                                .clicked()
+                            {
+                                dpstts.dprst = true;
+                            }
+                        });
+                    });
+                });
+            ui.allocate_space(ui.available_size());
+        });
+        if dpstts.update(&mut raw_dpstts) {
+            self.memory.write(self.sim_id, 0x0005f822, &raw_dpstts);
+        }
+    }
+
+    fn show_drawing_status(&mut self, ui: &mut Ui) {
+        let row_height = self.row_height(ui);
+        let [mut raw_xpstts, raw_xpctrl] = self.read_address(0x0005f840);
+        let mut xpstts = DrawingReg::parse(raw_xpstts);
+        ui.section("Drawing", |ui| {
+            let width = ui.available_width();
+            TableBuilder::new(ui)
+                .column(Column::exact(width * 0.5))
+                .column(Column::exact(width * 0.5))
+                .cell_layout(Layout::left_to_right(Align::Max))
+                .body(|mut body| {
+                    body.row(row_height, |mut row| {
+                        row.col(|ui| {
+                            ui.label("XPCTRL");
+                        });
+                        row.col(|ui| {
+                            let mut value_str = format!("{raw_xpctrl:04x}");
+                            ui.add_enabled(
+                                false,
+                                TextEdit::singleline(&mut value_str).horizontal_align(Align::Max),
+                            );
+                        });
+                    });
+                    body.row(row_height, |mut row| {
+                        row.col(|ui| {
+                            ui.label("XPSTTS");
+                        });
+                        row.col(|ui| {
+                            let mut value_str = format!("{raw_xpstts:04x}");
+                            ui.add_enabled(
+                                false,
+                                TextEdit::singleline(&mut value_str).horizontal_align(Align::Max),
+                            );
+                        });
+                    });
+                    /*
+                    body.row(row_height, |mut row| {
+                        row.col(|ui| {
+                            ui.label("SBCMP");
+                        });
+                        row.col(|ui| {
+                            let old_value = xpctrl.sbcmp;
+                            ui.add_enabled(true, NumberEdit::new(&mut xpctrl.sbcmp).range(0..32));
+                            cmp_changed = xpctrl.sbcmp != old_value;
+                        });
+                    });
+                     */
+                    body.row(row_height, |mut row| {
+                        row.col(|ui| {
+                            ui.label("SBCOUNT");
+                        });
+                        row.col(|ui| {
+                            ui.add_enabled(
+                                false,
+                                NumberEdit::new(&mut xpstts.sbcount)
+                                    .arrows(false)
+                                    .range(0..32),
+                            );
+                        });
+                    });
+                    body.row(row_height, |mut row| {
+                        row.col(|ui| {
+                            ui.add_enabled(false, Checkbox::new(&mut xpstts.sbout, "SBOUT"));
+                        });
+                        row.col(|ui| {
+                            ui.add_enabled(false, Checkbox::new(&mut xpstts.f1bsy, "F1BSY"));
+                        });
+                    });
+                    body.row(row_height, |mut row| {
+                        row.col(|ui| {
+                            ui.add_enabled(false, Checkbox::new(&mut xpstts.f0bsy, "F0BSY"));
+                        });
+                        row.col(|ui| {
+                            ui.add_enabled(false, Checkbox::new(&mut xpstts.overtime, "OVERTIME"));
+                        });
+                    });
+                    body.row(row_height, |mut row| {
+                        row.col(|ui| {
+                            ui.add_enabled(true, Checkbox::new(&mut xpstts.xpen, "XPEN"));
+                        });
+                        row.col(|ui| {
+                            if ui
+                                .add(Button::new("XPRST").min_size(ui.available_size()))
+                                .clicked()
+                            {
+                                xpstts.xprst = true;
+                            }
+                        });
+                    });
+                });
+            ui.allocate_space(ui.available_size());
+        });
+        if xpstts.update(&mut raw_xpstts) {
+            xpstts.update(&mut raw_xpstts);
+            self.memory.write(self.sim_id, 0x0005f842, &raw_xpstts);
+        }
+    }
+
+    fn show_colors(&mut self, ui: &mut Ui) {
+        let row_height = self.row_height(ui);
+        let registers = self.registers.borrow();
+        ui.section("Colors", |ui| {
+            let width = ui.available_width();
+            let xspace = ui.spacing().item_spacing.x;
+            TableBuilder::new(ui)
+                .column(Column::exact(width * 0.2 - xspace))
+                .columns(Column::exact(width * 0.20 - xspace), 4)
+                .cell_layout(Layout::left_to_right(Align::Max))
+                .body(|mut body| {
+                    body.row(row_height, |mut row| {
+                        row.col(|_ui| {});
+                        row.col(|_ui| {});
+                        row.col(|ui| {
+                            ui.with_layout(
+                                Layout::centered_and_justified(Direction::LeftToRight),
+                                |ui| ui.label("1"),
+                            );
+                        });
+                        row.col(|ui| {
+                            ui.with_layout(
+                                Layout::centered_and_justified(Direction::LeftToRight),
+                                |ui| ui.label("2"),
+                            );
+                        });
+                        row.col(|ui| {
+                            ui.with_layout(
+                                Layout::centered_and_justified(Direction::LeftToRight),
+                                |ui| ui.label("3"),
+                            );
+                        });
+                    });
+                    let mut brts: [u16; 3] = [
+                        read_address(&registers, 0x0005f824),
+                        read_address(&registers, 0x0005f826),
+                        read_address(&registers, 0x0005f828),
+                    ];
+                    body.row(row_height, |mut row| {
+                        let mut stale = false;
+                        row.col(|ui| {
+                            ui.label("BRT");
+                        });
+                        row.col(|_ui| {});
+                        for brt in brts.iter_mut() {
+                            row.col(|ui| {
+                                if ui
+                                    .add(NumberEdit::new(brt).range(0..256).arrows(false).hex(true))
+                                    .changed()
+                                {
+                                    stale = true;
+                                }
+                            });
+                        }
+                        if stale {
+                            self.memory.write(self.sim_id, 0x0005f824, &brts);
+                        }
+                    });
+                    body.row(row_height, |mut row| {
+                        row.col(|_ui| {});
+                        for shade in utils::parse_brts(&brts, Color32::RED) {
+                            row.col(|ui| {
+                                ui.painter().rect_filled(
+                                    ui.available_rect_before_wrap(),
+                                    0.0,
+                                    shade,
+                                );
+                            });
+                        }
+                    });
+                    let mut palettes = read_address::<[u16; 8]>(&registers, 0x0005f860);
+                    let mut add_row = |name: &str, address: u32, value: &mut u16| {
+                        let mut c1 = (*value >> 2) & 0x03;
+                        let mut c2 = (*value >> 4) & 0x03;
+                        let mut c3 = (*value >> 6) & 0x03;
+                        let mut stale = false;
+                        body.row(row_height, |mut row| {
+                            row.col(|ui| {
+                                ui.label(name);
+                            });
+                            row.col(|ui| {
+                                if ui
+                                    .add(
+                                        NumberEdit::new(value)
+                                            .range(0..256)
+                                            .desired_width(width * 0.2)
+                                            .arrows(false)
+                                            .hex(true),
+                                    )
+                                    .changed()
+                                {
+                                    stale = true;
+                                };
+                            });
+                            row.col(|ui| {
+                                if ui
+                                    .add(
+                                        NumberEdit::new(&mut c1)
+                                            .range(0..4)
+                                            .desired_width(ui.available_width() - xspace),
+                                    )
+                                    .changed()
+                                {
+                                    *value = (*value & 0xfff3) | (c1 << 2);
+                                    stale = true;
+                                }
+                            });
+                            row.col(|ui| {
+                                if ui
+                                    .add(
+                                        NumberEdit::new(&mut c2)
+                                            .range(0..4)
+                                            .desired_width(ui.available_width() - xspace),
+                                    )
+                                    .changed()
+                                {
+                                    *value = (*value & 0xffcf) | (c2 << 4);
+                                    stale = true;
+                                }
+                            });
+                            row.col(|ui| {
+                                if ui
+                                    .add(
+                                        NumberEdit::new(&mut c3)
+                                            .range(0..4)
+                                            .desired_width(ui.available_width() - xspace),
+                                    )
+                                    .changed()
+                                {
+                                    *value = (*value & 0xff3f) | (c3 << 6);
+                                    stale = true;
+                                }
+                            });
+                        });
+                        if stale {
+                            self.memory.write(self.sim_id, address, value);
+                        }
+                    };
+
+                    add_row("GPLT0", 0x0005f860, &mut palettes[0]);
+                    add_row("GPLT1", 0x0005f862, &mut palettes[1]);
+                    add_row("GPLT2", 0x0005f864, &mut palettes[2]);
+                    add_row("GPLT3", 0x0005f866, &mut palettes[3]);
+                    add_row("JPLT0", 0x0005f868, &mut palettes[4]);
+                    add_row("JPLT1", 0x0005f86a, &mut palettes[5]);
+                    add_row("JPLT2", 0x0005f86c, &mut palettes[6]);
+                    add_row("JPLT3", 0x0005f86e, &mut palettes[7]);
+
+                    body.row(row_height, |mut row| {
+                        row.col(|ui| {
+                            ui.label("BKCOL");
+                        });
+                        row.col(|ui| {
+                            let mut bkcol: u16 = read_address(&registers, 0x0005f870);
+                            if ui
+                                .add(
+                                    NumberEdit::new(&mut bkcol)
+                                        .range(0..4)
+                                        .desired_width(ui.available_width() - xspace),
+                                )
+                                .changed()
+                            {
+                                self.memory.write(self.sim_id, 0x0005f870, &bkcol);
+                            }
+                        });
+                        row.col(|_ui| {});
+                        row.col(|ui| {
+                            ui.label("REST");
+                        });
+                        row.col(|ui| {
+                            let mut rest: u16 = read_address(&registers, 0x0005f82a);
+                            if ui
+                                .add(
+                                    NumberEdit::new(&mut rest)
+                                        .range(0..256)
+                                        .arrows(false)
+                                        .hex(true),
+                                )
+                                .changed()
+                            {
+                                self.memory.write(self.sim_id, 0x0005f82a, &rest);
+                            }
+                        });
+                    });
+                });
+
+            ui.allocate_space(ui.available_size_before_wrap());
+        });
+    }
+
+    fn show_objects(&mut self, ui: &mut Ui) {
+        let row_height = self.row_height(ui);
+        ui.section("Objects", |ui| {
+            let width = ui.available_width();
+            let xspace = ui.spacing().item_spacing.x;
+            TableBuilder::new(ui)
+                .column(Column::exact(width * 0.3 - xspace))
+                .column(Column::exact(width * 0.3 - xspace))
+                .column(Column::exact(width * 0.4 - xspace))
+                .cell_layout(Layout::left_to_right(Align::Center).with_main_align(Align::RIGHT))
+                .body(|mut body| {
+                    body.row(row_height, |mut row| {
+                        row.col(|_ui| {});
+                        row.col(|ui| {
+                            ui.add_sized(ui.available_size(), Label::new("Start"));
+                        });
+                        row.col(|ui| {
+                            ui.add_sized(ui.available_size(), Label::new("End"));
+                        });
+                    });
+                    let mut spts = self.read_address::<[u16; 4]>(0x0005f848);
+                    let prevs = std::iter::once(0u16).chain(spts.map(|i| (i + 1) & 0x03ff));
+                    let mut changed = false;
+                    for (index, (spt, prev)) in spts.iter_mut().zip(prevs).enumerate() {
+                        body.row(row_height, |mut row| {
+                            row.col(|ui| {
+                                ui.label(format!("SPT{index}"));
+                            });
+                            row.col(|ui| {
+                                ui.with_layout(Layout::right_to_left(Align::Center), |ui| {
+                                    ui.label(prev.to_string());
+                                });
+                            });
+                            row.col(|ui| {
+                                if ui.add(NumberEdit::new(spt).range(0..1024)).changed() {
+                                    changed = true;
+                                }
+                            });
+                        });
+                    }
+                    if changed {
+                        self.memory.write(self.sim_id, 0x0005f848, &spts);
+                    }
+                });
+            ui.allocate_space(ui.available_size_before_wrap());
+        });
+    }
+
+    fn show_misc(&mut self, ui: &mut Ui) {
+        let row_height = self.row_height(ui);
+        let registers = self.registers.borrow();
+        ui.section("Misc.", |ui| {
+            let width = ui.available_width();
+            let xspace = ui.spacing().item_spacing.x;
+            TableBuilder::new(ui)
+                .column(Column::exact(width * 0.5 - xspace))
+                .column(Column::exact(width * 0.5 - xspace))
+                .cell_layout(Layout::left_to_right(Align::Center).with_main_align(Align::RIGHT))
+                .body(|mut body| {
+                    body.row(row_height, |mut row| {
+                        row.col(|ui| {
+                            ui.label("FRMCYC");
+                        });
+                        row.col(|ui| {
+                            let mut frmcyc = read_address::<u16>(&registers, 0x0005f82e);
+                            ui.with_layout(Layout::right_to_left(Align::Center), |ui| {
+                                if ui.add(NumberEdit::new(&mut frmcyc).range(0..32)).changed() {
+                                    self.memory.write(self.sim_id, 0x0005f82e, &frmcyc);
+                                }
+                            });
+                        });
+                    });
+                    let mut cta = read_address::<u16>(&registers, 0x0005f830);
+                    body.row(row_height, |mut row| {
+                        row.col(|ui| {
+                            ui.label("CTA");
+                        });
+                        row.col(|ui| {
+                            ui.with_layout(Layout::right_to_left(Align::Center), |ui| {
+                                ui.add_enabled(
+                                    false,
+                                    NumberEdit::new(&mut cta).arrows(false).hex(true),
+                                );
+                            });
+                        });
+                    });
+                    body.row(row_height, |mut row| {
+                        row.col(|ui| {
+                            ui.label("CTA_L");
+                        });
+                        row.col(|ui| {
+                            let mut cta_l = cta & 0xff;
+                            ui.with_layout(Layout::right_to_left(Align::Center), |ui| {
+                                ui.add_enabled(
+                                    false,
+                                    NumberEdit::new(&mut cta_l).arrows(false).hex(true),
+                                );
+                            });
+                        });
+                    });
+                    body.row(row_height, |mut row| {
+                        row.col(|ui| {
+                            ui.label("CTA_R");
+                        });
+                        row.col(|ui| {
+                            let mut cta_r = (cta >> 8) & 0xff;
+                            ui.with_layout(Layout::right_to_left(Align::Center), |ui| {
+                                ui.add_enabled(
+                                    false,
+                                    NumberEdit::new(&mut cta_r).arrows(false).hex(true),
+                                );
+                            });
+                        });
+                    });
+                });
+            ui.allocate_space(ui.available_size_before_wrap());
+        });
+    }
+
+    fn row_height(&self, ui: &mut Ui) -> f32 {
+        ui.spacing().interact_size.y + ui.style().visuals.selection.stroke.width
+    }
+
+    fn read_address<T: MemoryValue>(&self, address: usize) -> T {
+        read_address(&self.registers.borrow(), address)
+    }
+}
+
+fn read_address<T: MemoryValue>(registers: &MemoryRef, address: usize) -> T {
+    let index = (address - 0x0005f800) / size_of::<T>();
+    registers.read(index)
+}
+
+impl AppWindow for RegisterWindow {
+    fn viewport_id(&self) -> ViewportId {
+        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(format!("Registers ({})", self.sim_id))
+            .with_inner_size((800.0, 480.0))
+    }
+
+    fn show(&mut self, ctx: &Context) {
+        CentralPanel::default().show(ctx, |ui| {
+            ScrollArea::vertical().show(ui, |ui| {
+                ui.horizontal_top(|ui| {
+                    let width = ui.available_width();
+                    let xspace = ui.spacing().item_spacing.x;
+                    StripBuilder::new(ui)
+                        .size(Size::exact(width * 0.25 - xspace))
+                        .size(Size::exact(width * 0.225 - xspace))
+                        .size(Size::exact(width * 0.325 - xspace))
+                        .size(Size::exact(width * 0.2 - xspace))
+                        .horizontal(|mut strip| {
+                            strip.cell(|ui| {
+                                self.show_interrupts(ui);
+                            });
+                            strip.strip(|nested| {
+                                nested.sizes(Size::remainder(), 2).vertical(|mut strip| {
+                                    strip.cell(|ui| {
+                                        self.show_display_status(ui);
+                                    });
+                                    strip.cell(|ui| {
+                                        self.show_drawing_status(ui);
+                                    });
+                                });
+                            });
+                            strip.cell(|ui| {
+                                self.show_colors(ui);
+                            });
+                            strip.strip(|nested| {
+                                nested.sizes(Size::remainder(), 2).vertical(|mut strip| {
+                                    strip.cell(|ui| {
+                                        self.show_objects(ui);
+                                    });
+                                    strip.cell(|ui| {
+                                        self.show_misc(ui);
+                                    });
+                                });
+                            });
+                        });
+                });
+            });
+        });
+    }
+}
+
+struct InterruptReg {
+    timeerr: bool,
+    xpend: bool,
+    sbhit: bool,
+    framestart: bool,
+    gamestart: bool,
+    rfbend: bool,
+    lfbend: bool,
+    scanerr: bool,
+}
+
+impl InterruptReg {
+    fn parse(value: u16) -> Self {
+        Self {
+            timeerr: value & 0x8000 != 0,
+            xpend: value & 0x4000 != 0,
+            sbhit: value & 0x2000 != 0,
+            framestart: value & 0x0010 != 0,
+            gamestart: value & 0x0008 != 0,
+            rfbend: value & 0x0004 != 0,
+            lfbend: value & 0x0002 != 0,
+            scanerr: value & 0x0001 != 0,
+        }
+    }
+
+    fn update(&self, value: &mut u16) -> bool {
+        let new_value = (*value & 0x1fe0)
+            | if self.timeerr { 0x8000 } else { 0x0000 }
+            | if self.xpend { 0x4000 } else { 0x0000 }
+            | if self.sbhit { 0x2000 } else { 0x0000 }
+            | if self.framestart { 0x0010 } else { 0x0000 }
+            | if self.gamestart { 0x0008 } else { 0x0000 }
+            | if self.rfbend { 0x0004 } else { 0x0000 }
+            | if self.lfbend { 0x0002 } else { 0x0000 }
+            | if self.scanerr { 0x0001 } else { 0x0000 };
+        let changed = *value != new_value;
+        *value = new_value;
+        changed
+    }
+}
+
+struct DisplayReg {
+    lock: bool,
+    synce: bool,
+    re: bool,
+    fclk: bool,
+    scanrdy: bool,
+    r1bsy: bool,
+    l1bsy: bool,
+    r0bsy: bool,
+    l0bsy: bool,
+    disp: bool,
+    dprst: bool,
+}
+
+impl DisplayReg {
+    fn parse(value: u16) -> Self {
+        Self {
+            lock: value & 0x0400 != 0,
+            synce: value & 0x0200 != 0,
+            re: value & 0x0100 != 0,
+            fclk: value & 0x0080 != 0,
+            scanrdy: value & 0x0040 != 0,
+            r1bsy: value & 0x0020 != 0,
+            l1bsy: value & 0x0010 != 0,
+            r0bsy: value & 0x0008 != 0,
+            l0bsy: value & 0x0004 != 0,
+            disp: value & 0x0002 != 0,
+            dprst: value & 0x0001 != 0,
+        }
+    }
+
+    fn update(&self, value: &mut u16) -> bool {
+        let new_value = (*value & 0xf800)
+            | if self.lock { 0x0400 } else { 0x0000 }
+            | if self.synce { 0x0200 } else { 0x0000 }
+            | if self.re { 0x0100 } else { 0x0000 }
+            | if self.fclk { 0x0080 } else { 0x0000 }
+            | if self.scanrdy { 0x0040 } else { 0x0000 }
+            | if self.r1bsy { 0x0020 } else { 0x0000 }
+            | if self.l1bsy { 0x0010 } else { 0x0000 }
+            | if self.r0bsy { 0x0008 } else { 0x0000 }
+            | if self.l0bsy { 0x0004 } else { 0x0000 }
+            | if self.disp { 0x0002 } else { 0x0000 }
+            | if self.dprst { 0x0001 } else { 0x0000 };
+        let changed = *value != new_value;
+        *value = new_value;
+        changed
+    }
+}
+
+struct DrawingReg {
+    sbout: bool,
+    sbcount: u8,
+    overtime: bool,
+    f1bsy: bool,
+    f0bsy: bool,
+    xpen: bool,
+    xprst: bool,
+}
+
+impl DrawingReg {
+    fn parse(value: u16) -> Self {
+        Self {
+            sbout: value & 0x8000 != 0,
+            sbcount: (value >> 8) as u8 & 0x1f,
+            overtime: value & 0x0010 != 0,
+            f1bsy: value & 0x0008 != 0,
+            f0bsy: value & 0x0004 != 0,
+            xpen: value & 0x0002 != 0,
+            xprst: value & 0x0001 != 0,
+        }
+    }
+
+    fn update(&self, value: &mut u16) -> bool {
+        let new_value = (*value & 0x60e0)
+            | if self.sbout { 0x8000 } else { 0x0000 }
+            | (((self.sbcount & 0x1f) as u16) << 8)
+            | if self.overtime { 0x0010 } else { 0x0000 }
+            | if self.f1bsy { 0x0008 } else { 0x0000 }
+            | if self.f0bsy { 0x0004 } else { 0x0000 }
+            | if self.xpen { 0x0002 } else { 0x0000 }
+            | if self.xprst { 0x0001 } else { 0x0000 };
+        let changed = *value != new_value;
+        *value = new_value;
+        changed
+    }
+}

src/window/vip/utils.rs

@@ -0,0 +1,251 @@
+use egui::{Color32, Image, ImageSource, Response, Sense, TextureOptions, Ui, Widget};
+
+pub const GENERIC_PALETTE: [u8; 4] = [0, 32, 64, 128];
+
+pub fn shade(brt: u8, color: Color32) -> Color32 {
+    let corrected = if brt > 132 {
+        255.0
+    } else {
+        (brt as f32 * 255.0 / 133.0).round()
+    };
+    color.gamma_multiply(corrected / 255.0)
+}
+
+pub fn generic_palette(color: Color32) -> [Color32; 4] {
+    GENERIC_PALETTE.map(|brt| shade(brt, color))
+}
+
+pub const fn parse_palette(palette: u8) -> [u8; 4] {
+    [
+        0,
+        (palette >> 2) & 0x03,
+        (palette >> 4) & 0x03,
+        (palette >> 6) & 0x03,
+    ]
+}
+
+pub const fn parse_shades(brts: &[u8; 8]) -> [u8; 4] {
+    [
+        0,
+        brts[0],
+        brts[2],
+        brts[0].saturating_add(brts[2]).saturating_add(brts[4]),
+    ]
+}
+
+pub fn parse_brts(brts: &[u16; 3], color: Color32) -> [Color32; 4] {
+    [
+        Color32::BLACK,
+        shade(brts[0] as u8, color),
+        shade(brts[1] as u8, color),
+        shade((brts[0] + brts[1] + brts[2]) as u8, color),
+    ]
+}
+
+pub fn palette_colors(palette: u8, brts: &[u8; 8], color: Color32) -> [Color32; 4] {
+    let colors = parse_shades(brts).map(|s| shade(s, color));
+    parse_palette(palette).map(|p| colors[p as usize])
+}
+
+pub struct Object {
+    pub x: i16,
+    pub lon: bool,
+    pub ron: bool,
+    pub parallax: i16,
+    pub y: i16,
+    pub data: CellData,
+}
+
+impl Object {
+    pub fn parse(object: [u16; 4]) -> Self {
+        let x = ((object[0] & 0x03ff) << 6 >> 6) as i16;
+        let parallax = ((object[1] & 0x03ff) << 6 >> 6) as i16;
+        let lon = object[1] & 0x8000 != 0;
+        let ron = object[1] & 0x4000 != 0;
+        let y = (object[2] & 0x00ff) as i16;
+        // Y is stored as the bottom 8 bits of an i16,
+        // so only sign extend if it's out of range.
+        let y = if y > 224 { y << 8 >> 8 } else { y };
+        let data = CellData::parse(object[3]);
+        Self {
+            x,
+            lon,
+            ron,
+            parallax,
+            y,
+            data,
+        }
+    }
+
+    pub fn update(&self, source: &mut [u16; 4]) -> bool {
+        let mut changed = false;
+
+        let new_x = (self.x as u16 & 0x03ff) | (source[0] & 0xfc00);
+        changed |= source[0] != new_x;
+        source[0] = new_x;
+
+        let new_p = if self.lon { 0x8000 } else { 0x0000 }
+            | if self.ron { 0x4000 } else { 0x0000 }
+            | (self.parallax as u16 & 0x3ff)
+            | (source[1] & 0x3c00);
+        changed |= source[1] != new_p;
+        source[1] = new_p;
+
+        let new_y = (self.y as u16 & 0x00ff) | (source[2] & 0xff00);
+        changed |= source[2] != new_y;
+        source[2] = new_y;
+
+        if self.data.update(&mut source[3]) {
+            changed = true;
+        }
+        changed
+    }
+}
+
+pub struct CellData {
+    pub palette_index: usize,
+    pub hflip: bool,
+    pub vflip: bool,
+    pub char_index: usize,
+}
+
+impl CellData {
+    pub fn parse(cell: u16) -> Self {
+        let char_index = (cell & 0x7ff) as usize;
+        let vflip = cell & 0x1000 != 0;
+        let hflip = cell & 0x2000 != 0;
+        let palette_index = (cell >> 14) as usize;
+        Self {
+            char_index,
+            vflip,
+            hflip,
+            palette_index,
+        }
+    }
+
+    pub fn update(&self, source: &mut u16) -> bool {
+        let new_value = ((self.palette_index as u16) << 14)
+            | if self.hflip { 0x2000 } else { 0x0000 }
+            | if self.vflip { 0x1000 } else { 0x0000 }
+            | (self.char_index as u16 & 0x07ff)
+            | (*source & 0x0800);
+        let changed = *source != new_value;
+        *source = new_value;
+        changed
+    }
+}
+
+pub fn read_char_row(
+    char: &[u16; 8],
+    hflip: bool,
+    vflip: bool,
+    row: usize,
+) -> impl Iterator<Item = u8> {
+    let pixels = if vflip { char[7 - row] } else { char[row] };
+    (0..16).step_by(2).map(move |i| {
+        let pixel = if hflip { 14 - i } else { i };
+        ((pixels >> pixel) & 0x3) as u8
+    })
+}
+
+pub fn read_char_pixel(char: &[u16; 8], hflip: bool, vflip: bool, row: usize, col: usize) -> u8 {
+    let pixels = if vflip { char[7 - row] } else { char[row] };
+    let pixel = if hflip { 7 - col } else { col } << 1;
+    ((pixels >> pixel) & 0x3) as u8
+}
+
+pub struct CharacterGrid<'a> {
+    source: ImageSource<'a>,
+    scale: f32,
+    show_grid: bool,
+    selected: Option<usize>,
+}
+
+impl<'a> CharacterGrid<'a> {
+    pub fn new(source: impl Into<ImageSource<'a>>) -> Self {
+        Self {
+            source: source.into(),
+            scale: 1.0,
+            show_grid: false,
+            selected: None,
+        }
+    }
+
+    pub fn with_scale(self, scale: f32) -> Self {
+        Self { scale, ..self }
+    }
+
+    pub fn with_grid(self, show_grid: bool) -> Self {
+        Self { show_grid, ..self }
+    }
+
+    pub fn with_selected(self, selected: usize) -> Self {
+        Self {
+            selected: Some(selected),
+            ..self
+        }
+    }
+
+    pub fn show(self, ui: &mut Ui) -> Option<usize> {
+        let start_pos = ui.cursor().min;
+        let cell_size = 8.0 * self.scale;
+
+        let res = self.ui(ui);
+
+        let grid_width_cells = ((res.rect.max.x - res.rect.min.x) / cell_size).round() as usize;
+
+        if res.clicked() {
+            let click_pos = res.interact_pointer_pos()?;
+            let grid_pos = (click_pos - start_pos) / cell_size;
+            Some((grid_pos.y as usize * grid_width_cells) + grid_pos.x as usize)
+        } else {
+            None
+        }
+    }
+}
+
+impl Widget for CharacterGrid<'_> {
+    fn ui(self, ui: &mut Ui) -> Response {
+        let image = Image::new(self.source)
+            .fit_to_original_size(self.scale)
+            .texture_options(TextureOptions::NEAREST)
+            .sense(Sense::click());
+        let res = ui.add(image);
+
+        let cell_size = 8.0 * self.scale;
+        let grid_width_cells = ((res.rect.max.x - res.rect.min.x) / cell_size).round() as usize;
+        let grid_height_cells = ((res.rect.max.y - res.rect.min.y) / cell_size).round() as usize;
+
+        let painter = ui.painter_at(res.rect);
+        if self.show_grid {
+            let stroke = ui.style().visuals.widgets.noninteractive.fg_stroke;
+            for x in (1..grid_width_cells).map(|i| (i as f32) * cell_size) {
+                let p1 = (res.rect.min.x + x, res.rect.min.y).into();
+                let p2 = (res.rect.min.x + x, res.rect.max.y).into();
+                painter.line_segment([p1, p2], stroke);
+            }
+            for y in (1..grid_height_cells).map(|i| (i as f32) * cell_size) {
+                let p1 = (res.rect.min.x, res.rect.min.y + y).into();
+                let p2 = (res.rect.max.x, res.rect.min.y + y).into();
+                painter.line_segment([p1, p2], stroke);
+            }
+        }
+        if let Some(selected) = self.selected {
+            let x1 = (selected % grid_width_cells) as f32 * cell_size;
+            let x2 = x1 + cell_size;
+            let y1 = (selected / grid_width_cells) as f32 * cell_size;
+            let y2 = y1 + cell_size;
+            painter.line(
+                vec![
+                    (res.rect.min + (x1, y1).into()),
+                    (res.rect.min + (x2, y1).into()),
+                    (res.rect.min + (x2, y2).into()),
+                    (res.rect.min + (x1, y2).into()),
+                    (res.rect.min + (x1, y1).into()),
+                ],
+                ui.style().visuals.widgets.active.fg_stroke,
+            );
+        }
+        res
+    }
+}

src/window/vram.rs

@@ -1,6 +0,0 @@
-mod bgmap;
-mod chardata;
-mod utils;
-
-pub use bgmap::*;
-pub use chardata::*;

src/window/vram/utils.rs

@@ -1,115 +0,0 @@
-use egui::{Color32, Image, ImageSource, Response, Sense, TextureOptions, Ui, Widget};
-
-pub const GENERIC_PALETTE: [u8; 4] = [0, 64, 128, 255];
-
-pub fn parse_palette(palette: u8, brts: &[u8]) -> [u8; 4] {
-    let shades = [
-        0,
-        brts[0],
-        brts[2],
-        brts[0].saturating_add(brts[2]).saturating_add(brts[4]),
-    ];
-    [
-        0,
-        shades[(palette >> 2) as usize & 0x03],
-        shades[(palette >> 4) as usize & 0x03],
-        shades[(palette >> 6) as usize & 0x03],
-    ]
-}
-
-pub struct CharacterGrid<'a> {
-    source: ImageSource<'a>,
-    scale: f32,
-    show_grid: bool,
-    selected: Option<usize>,
-}
-
-impl<'a> CharacterGrid<'a> {
-    pub fn new(source: impl Into<ImageSource<'a>>) -> Self {
-        Self {
-            source: source.into(),
-            scale: 1.0,
-            show_grid: false,
-            selected: None,
-        }
-    }
-
-    pub fn with_scale(self, scale: f32) -> Self {
-        Self { scale, ..self }
-    }
-
-    pub fn with_grid(self, show_grid: bool) -> Self {
-        Self { show_grid, ..self }
-    }
-
-    pub fn with_selected(self, selected: usize) -> Self {
-        Self {
-            selected: Some(selected),
-            ..self
-        }
-    }
-
-    pub fn show(self, ui: &mut Ui) -> Option<usize> {
-        let start_pos = ui.cursor().min;
-        let cell_size = 8.0 * self.scale;
-
-        let res = self.ui(ui);
-
-        let grid_width_cells = ((res.rect.max.x - res.rect.min.x) / cell_size).round() as usize;
-
-        if res.clicked() {
-            let click_pos = res.interact_pointer_pos()?;
-            let grid_pos = (click_pos - start_pos) / cell_size;
-            Some((grid_pos.y as usize * grid_width_cells) + grid_pos.x as usize)
-        } else {
-            None
-        }
-    }
-}
-
-impl Widget for CharacterGrid<'_> {
-    fn ui(self, ui: &mut Ui) -> Response {
-        let image = Image::new(self.source)
-            .fit_to_original_size(self.scale)
-            .tint(Color32::RED)
-            .texture_options(TextureOptions::NEAREST)
-            .sense(Sense::click());
-        let res = ui.add(image);
-
-        let cell_size = 8.0 * self.scale;
-        let grid_width_cells = ((res.rect.max.x - res.rect.min.x) / cell_size).round() as usize;
-        let grid_height_cells = ((res.rect.max.y - res.rect.min.y) / cell_size).round() as usize;
-
-        let painter = ui.painter_at(res.rect);
-        if self.show_grid {
-            let stroke = ui.style().visuals.widgets.noninteractive.fg_stroke;
-            for x in (1..grid_width_cells).map(|i| (i as f32) * cell_size) {
-                let p1 = (res.rect.min.x + x, res.rect.min.y).into();
-                let p2 = (res.rect.min.x + x, res.rect.max.y).into();
-                painter.line(vec![p1, p2], stroke);
-            }
-            for y in (1..grid_height_cells).map(|i| (i as f32) * cell_size) {
-                let p1 = (res.rect.min.x, res.rect.min.y + y).into();
-                let p2 = (res.rect.max.x, res.rect.min.y + y).into();
-                painter.line(vec![p1, p2], stroke);
-            }
-        }
-        if let Some(selected) = self.selected {
-            let x1 = (selected % grid_width_cells) as f32 * cell_size;
-            let x2 = x1 + cell_size;
-            let y1 = (selected / grid_width_cells) as f32 * cell_size;
-            let y2 = y1 + cell_size;
-            painter.line(
-                vec![
-                    (res.rect.min + (x1, y1).into()),
-                    (res.rect.min + (x2, y1).into()),
-                    (res.rect.min + (x2, y2).into()),
-                    (res.rect.min + (x1, y2).into()),
-                    (res.rect.min + (x1, y1).into()),
-                ],
-                ui.style().visuals.widgets.active.fg_stroke,
-            );
-        }
-        res
-    }
-}