Rerwite everything to share an egui context

src/app.rs

@@ -1,18 +1,25 @@
-use std::{collections::HashSet, num::NonZero, sync::Arc, thread, time::Duration};
+use std::{
+    collections::hash_map::Entry,
+    num::NonZero,
+    sync::Arc,
+    thread,
+    time::{Duration, Instant},
+};
 
 use egui::{
-    Context, FontData, FontDefinitions, FontFamily, IconData, TextWrapMode, ViewportBuilder,
+    Context, FontData, FontDefinitions, FontFamily, IconData, PlatformOutput, RawInput,
-    ViewportCommand, ViewportId, ViewportInfo,
+    TextWrapMode, ViewportBuilder, ViewportCommand, ViewportEvent, ViewportId, ViewportIdMap,
-    ahash::{HashMap, HashMapExt},
+    ViewportIdSet, ViewportInfo, style::ScrollStyle,
-    style::ScrollStyle,
 };
+use egui_wgpu::winit::Painter;
+use egui_winit::EventResponse;
 use gilrs::{EventType, Gilrs};
 use tracing::{error, warn};
 use winit::{
     application::ApplicationHandler,
     event::WindowEvent,
-    event_loop::{ActiveEventLoop, EventLoopProxy},
+    event_loop::{ActiveEventLoop, ControlFlow, EventLoopProxy},
-    window::Window,
+    window::{Window, WindowId},
 };
 
 use crate::{
@@ -23,11 +30,7 @@ use crate::{
     input::{MappingProvider, ShortcutProvider},
     memory::MemoryClient,
     persistence::Persistence,
-    window::{
+    window::{AppWindow, ChildWindow, GameScreen, GameWindow, InitArgs},
-        AboutWindow, AppWindow, BgMapWindow, CharacterDataWindow, FrameBufferWindow, GameWindow,
-        GdbServerWindow, HotkeysWindow, InitArgs, InputWindow, ObjectWindow, ProfileWindow,
-        RegisterWindow, TerminalWindow, WorldWindow,
-    },
 };
 
 fn load_icon() -> anyhow::Result<IconData> {
@@ -41,28 +44,23 @@ fn load_icon() -> anyhow::Result<IconData> {
     })
 }
 
+struct SharedViewportState {
+    viewport_info: ViewportIdMap<ViewportInfo>,
+    painter: Painter,
+    resized_viewport: Option<ViewportId>,
+}
+
 pub struct Application {
-    icon: Option<Arc<IconData>>,
-    wgpu: WgpuState,
     client: EmulatorClient,
-    proxy: EventLoopProxy<UserEvent>,
+    ctx: Context,
-    mappings: MappingProvider,
+    shared: SharedViewportState,
-    shortcuts: ShortcutProvider,
+    icon: Option<Arc<IconData>>,
+    app: GameWindow,
     controllers: ControllerManager,
-    memory: Arc<MemoryClient>,
+    viewports: ViewportIdMap<ViewportManager>,
-    images: Arc<ImageTextureLoader>,
-    persistence: Persistence,
-    viewports: HashMap<ViewportId, Viewport>,
     focused: Option<ViewportId>,
-    init_debug_port: Option<u16>,
+    redraw_times: ViewportIdMap<Instant>,
-    init_profiling: bool,
+    initial_windows: Vec<ChildWindow>,
-    init_bgmap: bool,
-    init_chardata: bool,
-    init_objects: bool,
-    init_worlds: bool,
-    init_framebuffers: bool,
-    init_registers: bool,
-    init_terminal: bool,
 }
 
 impl Application {
@@ -84,132 +82,320 @@ impl Application {
             let proxy = proxy.clone();
             thread::spawn(|| process_gamepad_input(mappings, proxy));
         }
-        let app = Self {
+        let app = GameWindow::new(
-            icon,
+            ViewportId::ROOT,
-            wgpu,
+            client.clone(),
-            client,
+            proxy.clone(),
-            proxy,
+            persistence.clone(),
-            mappings,
+            shortcuts.clone(),
-            shortcuts,
+            &memory,
-            memory,
+            &images,
-            images,
+            mappings.clone(),
-            controllers,
+            SimId::Player1,
-            persistence,
+        );
-            viewports: HashMap::new(),
-            focused: None,
-            init_debug_port: args.debug_port,
-            init_profiling: args.profile,
-            init_bgmap: args.bgmap_data,
-            init_chardata: args.character_data,
-            init_objects: args.object_data,
-            init_worlds: args.worlds,
-            init_framebuffers: args.frame_buffers,
-            init_registers: args.registers,
-            init_terminal: args.terminal,
-        };
-        if args.player2 {
-            app.client
-                .send_command(EmulatorCommand::StartSecondSim(args.rom.clone()));
 
-            app.proxy
+        let ctx = Context::default();
-                .send_event(UserEvent::OpenPlayer2)
+        let mut fonts = FontDefinitions::default();
-                .expect("Failed to open Player 2 window");
+        fonts.font_data.insert(
+            "Selawik".into(),
+            Arc::new(FontData::from_static(include_bytes!(
+                "../assets/selawik.ttf"
+            ))),
+        );
+        fonts
+            .families
+            .get_mut(&FontFamily::Proportional)
+            .unwrap()
+            .insert(0, "Selawik".into());
+        ctx.set_fonts(fonts);
+        ctx.global_style_mut(|s| {
+            s.wrap_mode = Some(TextWrapMode::Extend);
+            s.visuals.menu_corner_radius = Default::default();
+            s.spacing.scroll = ScrollStyle::thin();
+        });
+        egui_extras::install_image_loaders(&ctx);
+        ctx.add_texture_loader(images.clone());
+        ctx.set_embed_viewports(false);
+        {
+            let proxy = proxy.clone();
+            ctx.set_request_repaint_callback(move |info| {
+                let _ = proxy.send_event(UserEvent::RequestRedraw(
+                    info.viewport_id,
+                    Instant::now() + info.delay,
+                ));
+            });
+        }
+
+        let wgpu_config = egui_wgpu::WgpuConfiguration {
+            present_mode: wgpu::PresentMode::AutoVsync,
+            wgpu_setup: egui_wgpu::WgpuSetup::Existing(egui_wgpu::WgpuSetupExisting {
+                instance: wgpu.instance.clone(),
+                adapter: wgpu.adapter.clone(),
+                device: wgpu.device.clone(),
+                queue: wgpu.queue.clone(),
+            }),
+            ..egui_wgpu::WgpuConfiguration::default()
+        };
+
+        let options = egui_wgpu::RendererOptions::default();
+        let painter = pollster::block_on(Painter::new(ctx.clone(), wgpu_config, false, options));
+
+        let mut initial_windows = vec![];
+        if let Some(port) = args.debug_port {
+            initial_windows.push(ChildWindow::Debugger { port: Some(port) });
+        }
+        if args.profile {
+            initial_windows.push(ChildWindow::Profiler { launch: true });
+        }
+        if args.character_data {
+            initial_windows.push(ChildWindow::CharacterData);
+        }
+        if args.bgmap_data {
+            initial_windows.push(ChildWindow::BgMap);
+        }
+        if args.object_data {
+            initial_windows.push(ChildWindow::Objects);
+        }
+        if args.worlds {
+            initial_windows.push(ChildWindow::Worlds);
+        }
+        if args.frame_buffers {
+            initial_windows.push(ChildWindow::FrameBuffers);
+        }
+        if args.registers {
+            initial_windows.push(ChildWindow::Registers);
+        }
+        if args.terminal {
+            initial_windows.push(ChildWindow::Terminal);
+        }
+        if args.player2 {
+            client.send_command(EmulatorCommand::StartSecondSim(args.rom.clone()));
+            initial_windows.push(ChildWindow::Player2);
+        }
+
+        Self {
+            client,
+            ctx,
+            shared: SharedViewportState {
+                viewport_info: ViewportIdMap::default(),
+                painter,
+                resized_viewport: None,
+            },
+            icon,
+            app,
+            controllers,
+            viewports: ViewportIdMap::default(),
+            focused: None,
+            redraw_times: ViewportIdMap::default(),
+            initial_windows,
         }
-        app
     }
 
-    fn open(&mut self, event_loop: &ActiveEventLoop, window: Box<dyn AppWindow>) {
+    fn check_repaint(&mut self, event_loop: &ActiveEventLoop) {
-        let viewport_id = window.viewport_id();
+        let now = Instant::now();
-        if let Some(viewport) = self.viewports.get(&viewport_id) {
+        self.redraw_times.retain(|viewport_id, time| {
-            viewport.window.focus_window();
+            if *time > now {
-            return;
+                return true;
+            }
+            if let Some(viewport) = self.viewports.get(viewport_id) {
+                viewport.window.request_redraw();
+            }
+            false
+        });
+        if let Some(next_repaint_time) = self.redraw_times.values().min().copied() {
+            event_loop.set_control_flow(ControlFlow::WaitUntil(next_repaint_time));
         }
-        self.viewports.insert(
+    }
-            viewport_id,
+
-            Viewport::new(
+    fn repaint_all(&mut self, event_loop: &ActiveEventLoop) {
-                &self.images,
+        enum ViewportUpdate {
-                event_loop,
+            Keep {
-                &self.wgpu,
+                recreate: bool,
-                self.icon.clone(),
+                builder: ViewportBuilder,
-                window,
+                parent: ViewportId,
-            ),
+                commands: Vec<ViewportCommand>,
-        );
+            },
+            Remove,
+        }
+        let mut updates = ViewportIdMap::<ViewportUpdate>::default();
+        for viewport in self.viewports.values() {
+            updates.insert(
+                viewport.id,
+                ViewportUpdate::Keep {
+                    recreate: false,
+                    builder: viewport.builder.clone(),
+                    parent: self
+                        .shared
+                        .viewport_info
+                        .get(&viewport.id)
+                        .and_then(|vp| vp.parent)
+                        .unwrap_or(ViewportId::ROOT),
+                    commands: vec![],
+                },
+            );
+        }
+
+        for viewport in self.viewports.values_mut() {
+            let mut input = viewport.take_egui_input();
+            if !self.shared.viewport_info.contains_key(&viewport.id) {
+                continue;
+            }
+            input.viewports = self.shared.viewport_info.clone();
+            let output = self.ctx.run_ui(input, |ui| {
+                if viewport.id == ViewportId::ROOT {
+                    self.app.show(ui);
+                } else if let Some(cb) = ui.viewport(|v| v.viewport_ui_cb.clone()) {
+                    cb(ui);
+                }
+            });
+            viewport.handle_platform_output(output.platform_output);
+            for (id, update) in updates.iter_mut() {
+                if !output.viewport_output.contains_key(id) {
+                    self.shared.viewport_info.remove(id);
+                    *update = ViewportUpdate::Remove;
+                }
+            }
+            for (id, mut vp) in output.viewport_output {
+                match updates.entry(id) {
+                    Entry::Vacant(e) => {
+                        e.insert(ViewportUpdate::Keep {
+                            recreate: true,
+                            builder: vp.builder,
+                            parent: vp.parent,
+                            commands: vp.commands,
+                        });
+                    }
+                    Entry::Occupied(e) => {
+                        let ViewportUpdate::Keep {
+                            recreate,
+                            builder,
+                            commands,
+                            ..
+                        } = e.into_mut()
+                        else {
+                            continue;
+                        };
+                        let (_, should_recreate) = builder.patch(vp.builder);
+                        *recreate |= should_recreate;
+                        commands.append(&mut vp.commands);
+                    }
+                }
+            }
+            let clipped_primitives = self.ctx.tessellate(output.shapes, output.pixels_per_point);
+            self.shared.painter.paint_and_update_textures(
+                viewport.id,
+                output.pixels_per_point,
+                [0.0, 0.0, 0.0, 0.0],
+                &clipped_primitives,
+                &output.textures_delta,
+                vec![],
+            );
+            viewport.window.pre_present_notify();
+        }
+        let mut active_viewports = ViewportIdSet::default();
+        for (id, update) in updates {
+            match update {
+                ViewportUpdate::Keep {
+                    recreate,
+                    builder,
+                    parent,
+                    commands,
+                } => {
+                    active_viewports.insert(id);
+                    let manager = self
+                        .viewports
+                        .remove(&id)
+                        .filter(|_| !recreate)
+                        .unwrap_or_else(|| {
+                            let manager = ViewportManager::new(
+                                &self.ctx,
+                                id,
+                                parent,
+                                event_loop,
+                                builder,
+                                &mut self.shared,
+                            );
+                            self.app.handle_init(
+                                id,
+                                InitArgs {
+                                    window: &manager.window,
+                                    render_state: &self.shared.painter.render_state().unwrap(),
+                                },
+                            );
+                            manager
+                        });
+                    manager.process_viewport_commands(commands, &mut self.shared);
+                    self.viewports.insert(id, manager);
+                }
+                ViewportUpdate::Remove => {
+                    self.viewports.remove(&id);
+                }
+            }
+        }
+        if !active_viewports.contains(&ViewportId::ROOT) {
+            event_loop.exit();
+        }
+        self.shared.painter.gc_viewports(&active_viewports);
     }
 }
 
 impl ApplicationHandler<UserEvent> for Application {
     fn resumed(&mut self, event_loop: &ActiveEventLoop) {
-        if let Some(port) = self.init_debug_port {
+        let mut viewport_builder = self.app.initial_viewport();
-            let mut server =
+        if let Some(icon) = &self.icon {
-                GdbServerWindow::new(SimId::Player1, self.client.clone(), self.proxy.clone());
+            viewport_builder = viewport_builder.with_icon(icon.clone());
-            server.launch(port);
-            self.open(event_loop, Box::new(server));
         }
-        let app = GameWindow::new(
+        let manager = ViewportManager::new(
-            self.client.clone(),
+            &self.ctx,
-            self.proxy.clone(),
+            ViewportId::ROOT,
-            self.persistence.clone(),
+            ViewportId::ROOT,
-            self.shortcuts.clone(),
+            event_loop,
-            SimId::Player1,
+            viewport_builder,
+            &mut self.shared,
         );
-        self.open(event_loop, Box::new(app));
+        let render_state = self.shared.painter.render_state().unwrap();
-        let sim_id = SimId::Player1;
+        GameScreen::init_pipeline(&render_state);
-        if self.init_profiling {
+        self.app.handle_init(
-            let mut profiler = ProfileWindow::new(sim_id, self.client.clone());
+            ViewportId::ROOT,
-            profiler.launch();
+            InitArgs {
-            self.open(event_loop, Box::new(profiler));
+                window: &manager.window,
+                render_state: &render_state,
+            },
+        );
+        self.viewports.insert(ViewportId::ROOT, manager);
+        for window in std::mem::take(&mut self.initial_windows) {
+            self.app.open(window);
         }
-        if self.init_chardata {
+    }
-            let chardata = CharacterDataWindow::new(sim_id, &self.memory, &self.images);
+
-            self.open(event_loop, Box::new(chardata));
+    fn about_to_wait(&mut self, _event_loop: &ActiveEventLoop) {
-        }
+        if let Some(viewport) = self.viewports.get(&ViewportId::ROOT) {
-        if self.init_bgmap {
+            viewport.window.request_redraw();
-            let bgmap = BgMapWindow::new(sim_id, &self.memory, &self.images);
-            self.open(event_loop, Box::new(bgmap));
-        }
-        if self.init_objects {
-            let objects = ObjectWindow::new(sim_id, &self.memory, &self.images);
-            self.open(event_loop, Box::new(objects));
-        }
-        if self.init_worlds {
-            let world = WorldWindow::new(sim_id, &self.memory, &self.images);
-            self.open(event_loop, Box::new(world));
-        }
-        if self.init_framebuffers {
-            let fb = FrameBufferWindow::new(sim_id, &self.memory, &self.images);
-            self.open(event_loop, Box::new(fb));
-        }
-        if self.init_registers {
-            let registers = RegisterWindow::new(sim_id, &self.memory);
-            self.open(event_loop, Box::new(registers));
-        }
-        if self.init_terminal {
-            let terminal = TerminalWindow::new(sim_id, &self.client);
-            self.open(event_loop, Box::new(terminal));
         }
     }
 
     fn window_event(
         &mut self,
         event_loop: &ActiveEventLoop,
-        window_id: winit::window::WindowId,
+        window_id: WindowId,
         event: WindowEvent,
     ) {
         let Some(viewport) = self
             .viewports
             .values_mut()
-            .find(|v| v.window.id() == window_id)
+            .find(|v| v.has_window_id(window_id))
         else {
             return;
         };
-        let viewport_id = viewport.id();
+        let viewport_id = viewport.id;
-        let mut queue_redraw = false;
+        let (response, close_requested) = viewport.on_window_event(&event, &mut self.shared);
-        let mut inactive_viewports = HashSet::new();
+        if close_requested && viewport_id == ViewportId::ROOT {
-        let (consumed, action) = viewport.on_window_event(&event);
+            event_loop.exit();
-        if !consumed {
+        }
+        if !response.consumed {
             match event {
                 WindowEvent::KeyboardInput { event, .. } => {
-                    if !viewport.app.handle_key_event(&event) {
+                    if !self.app.handle_key_event(viewport_id, &event) {
                         self.controllers.handle_key_event(&event);
                     }
                 }
@@ -219,39 +405,10 @@ impl ApplicationHandler<UserEvent> for Application {
                 _ => {}
             }
         }
-        match action {
+        if response.repaint {
-            Some(Action::Redraw) => {
+            self.repaint_all(event_loop);
-                for viewport in self.viewports.values_mut() {
-                    match viewport.redraw(event_loop) {
-                        Some(Action::Redraw) => {
-                            queue_redraw = true;
-                        }
-                        Some(Action::Close) => {
-                            inactive_viewports.insert(viewport.id());
-                        }
-                        None => {}
-                    }
-                }
-            }
-            Some(Action::Close) => {
-                inactive_viewports.insert(viewport_id);
-            }
-            None => {}
-        }
-        self.viewports
-            .retain(|k, _| !inactive_viewports.contains(k));
-        match self.viewports.get(&viewport_id) {
-            Some(viewport) => {
-                if queue_redraw {
-                    viewport.window.request_redraw();
-                }
-            }
-            None => {
-                if viewport_id == ViewportId::ROOT {
-                    event_loop.exit();
-                }
-            }
         }
+        self.check_repaint(event_loop);
     }
 
     fn device_event(
@@ -268,96 +425,32 @@ impl ApplicationHandler<UserEvent> for Application {
             else {
                 return;
             };
-            viewport.state.on_mouse_motion(delta);
+            viewport.on_mouse_motion(delta);
         }
     }
 
     fn user_event(&mut self, event_loop: &ActiveEventLoop, event: UserEvent) {
         match event {
             UserEvent::GamepadEvent(event) => {
-                if let Some(viewport) = self
+                if !self
                     .focused
-                    .as_ref()
+                    .is_some_and(|id| self.app.handle_gamepad_event(id, &event))
-                    .and_then(|id| self.viewports.get_mut(id))
-                    && viewport.app.handle_gamepad_event(&event)
                 {
-                    return;
+                    self.controllers.handle_gamepad_event(&event);
                 }
-                self.controllers.handle_gamepad_event(&event);
             }
-            UserEvent::OpenAbout => {
+            UserEvent::Quit(sim_id) => match sim_id {
-                let about = AboutWindow;
+                SimId::Player1 => event_loop.exit(),
-                self.open(event_loop, Box::new(about));
+                SimId::Player2 => self.app.close(ChildWindow::Player2),
-            }
+            },
-            UserEvent::OpenCharacterData(sim_id) => {
+            UserEvent::RequestRedraw(viewport, when) => {
-                let chardata = CharacterDataWindow::new(sim_id, &self.memory, &self.images);
+                let scheduled = self.redraw_times.entry(viewport).or_insert(when);
-                self.open(event_loop, Box::new(chardata));
+                if *scheduled > when {
-            }
+                    *scheduled = when;
-            UserEvent::OpenBgMap(sim_id) => {
-                let bgmap = BgMapWindow::new(sim_id, &self.memory, &self.images);
-                self.open(event_loop, Box::new(bgmap));
-            }
-            UserEvent::OpenObjects(sim_id) => {
-                let objects = ObjectWindow::new(sim_id, &self.memory, &self.images);
-                self.open(event_loop, Box::new(objects));
-            }
-            UserEvent::OpenWorlds(sim_id) => {
-                let world = WorldWindow::new(sim_id, &self.memory, &self.images);
-                self.open(event_loop, Box::new(world));
-            }
-            UserEvent::OpenFrameBuffers(sim_id) => {
-                let fb = FrameBufferWindow::new(sim_id, &self.memory, &self.images);
-                self.open(event_loop, Box::new(fb));
-            }
-            UserEvent::OpenRegisters(sim_id) => {
-                let registers = RegisterWindow::new(sim_id, &self.memory);
-                self.open(event_loop, Box::new(registers));
-            }
-            UserEvent::OpenTerminal(sim_id) => {
-                let terminal = TerminalWindow::new(sim_id, &self.client);
-                self.open(event_loop, Box::new(terminal));
-            }
-            UserEvent::OpenProfiler(sim_id) => {
-                let profile = ProfileWindow::new(sim_id, self.client.clone());
-                self.open(event_loop, Box::new(profile));
-            }
-            UserEvent::OpenDebugger(sim_id) => {
-                let debugger =
-                    GdbServerWindow::new(sim_id, self.client.clone(), self.proxy.clone());
-                self.open(event_loop, Box::new(debugger));
-            }
-            UserEvent::OpenInput => {
-                let input = InputWindow::new(self.mappings.clone());
-                self.open(event_loop, Box::new(input));
-            }
-            UserEvent::OpenHotkeys => {
-                let hotkeys = HotkeysWindow::new(self.shortcuts.clone());
-                self.open(event_loop, Box::new(hotkeys));
-            }
-            UserEvent::OpenPlayer2 => {
-                let p2 = GameWindow::new(
-                    self.client.clone(),
-                    self.proxy.clone(),
-                    self.persistence.clone(),
-                    self.shortcuts.clone(),
-                    SimId::Player2,
-                );
-                self.open(event_loop, Box::new(p2));
-            }
-            UserEvent::Quit(sim_id) => {
-                self.viewports
-                    .retain(|_, viewport| viewport.app.sim_id() != sim_id);
-                if !self.viewports.contains_key(&ViewportId::ROOT) {
-                    event_loop.exit();
                 }
             }
         }
-    }
+        self.check_repaint(event_loop);
-
-    fn about_to_wait(&mut self, _event_loop: &ActiveEventLoop) {
-        if let Some(viewport) = self.viewports.get(&ViewportId::ROOT) {
-            viewport.window.request_redraw();
-        }
     }
 
     fn exiting(&mut self, _event_loop: &ActiveEventLoop) {
@@ -420,229 +513,109 @@ impl WgpuState {
     }
 }
 
-struct Viewport {
+struct ViewportManager {
-    painter: egui_wgpu::winit::Painter,
+    id: ViewportId,
-    ctx: Context,
-    info: ViewportInfo,
-    commands: Vec<ViewportCommand>,
-    builder: ViewportBuilder,
     window: Arc<Window>,
     state: egui_winit::State,
-    app: Box<dyn AppWindow>,
+    builder: ViewportBuilder,
 }
-impl Viewport {
+impl ViewportManager {
-    pub fn new(
+    fn new(
-        images: &Arc<ImageTextureLoader>,
+        ctx: &Context,
+        viewport_id: ViewportId,
+        parent_id: ViewportId,
         event_loop: &ActiveEventLoop,
-        wgpu: &WgpuState,
+        builder: ViewportBuilder,
-        icon: Option<Arc<IconData>>,
+        shared: &mut SharedViewportState,
-        mut app: Box<dyn AppWindow>,
     ) -> Self {
-        let ctx = Context::default();
+        let window = Arc::new(egui_winit::create_window(ctx, event_loop, &builder).unwrap());
-        let mut fonts = FontDefinitions::default();
+        pollster::block_on(shared.painter.set_window(viewport_id, Some(window.clone()))).unwrap();
-        fonts.font_data.insert(
+        let state = egui_winit::State::new(
-            "Selawik".into(),
-            Arc::new(FontData::from_static(include_bytes!(
-                "../assets/selawik.ttf"
-            ))),
-        );
-        fonts
-            .families
-            .get_mut(&FontFamily::Proportional)
-            .unwrap()
-            .insert(0, "Selawik".into());
-        ctx.set_fonts(fonts);
-        ctx.global_style_mut(|s| {
-            s.wrap_mode = Some(TextWrapMode::Extend);
-            s.visuals.menu_corner_radius = Default::default();
-            s.spacing.scroll = ScrollStyle::thin();
-        });
-        egui_extras::install_image_loaders(&ctx);
-        ctx.add_texture_loader(images.clone());
-
-        let wgpu_config = egui_wgpu::WgpuConfiguration {
-            present_mode: wgpu::PresentMode::AutoVsync,
-            wgpu_setup: egui_wgpu::WgpuSetup::Existing(egui_wgpu::WgpuSetupExisting {
-                instance: wgpu.instance.clone(),
-                adapter: wgpu.adapter.clone(),
-                device: wgpu.device.clone(),
-                queue: wgpu.queue.clone(),
-            }),
-            ..egui_wgpu::WgpuConfiguration::default()
-        };
-
-        let options = egui_wgpu::RendererOptions::default();
-        let mut painter = pollster::block_on(egui_wgpu::winit::Painter::new(
             ctx.clone(),
-            wgpu_config,
+            viewport_id,
-            false,
+            event_loop,
-            options,
+            Some(window.scale_factor() as f32),
-        ));
+            event_loop.system_theme(),
+            shared.painter.max_texture_side(),
+        );
 
-        let mut info = ViewportInfo::default();
+        let mut info = ViewportInfo {
-        let mut builder = app.initial_viewport();
+            parent: Some(parent_id),
-        if let Some(icon) = icon {
+            ..ViewportInfo::default()
-            builder = builder.with_icon(icon);
-        }
-        let viewport_id = app.viewport_id();
-        let (window, state) =
-            create_window_and_state(&ctx, viewport_id, event_loop, &builder, &mut painter);
-        egui_winit::update_viewport_info(&mut info, &ctx, &window, true);
-
-        let render_state = painter.render_state();
-        let args = InitArgs {
-            window: &window,
-            render_state: render_state.as_ref().unwrap(),
         };
-        app.on_init(args);
+        egui_winit::update_viewport_info(&mut info, ctx, &window, true);
+        shared.viewport_info.insert(viewport_id, info);
+
         Self {
-            painter,
+            id: viewport_id,
-            ctx,
-            info,
-            commands: vec![],
-            builder,
             window,
             state,
-            app,
+            builder,
         }
     }
 
-    pub fn id(&self) -> ViewportId {
+    fn has_window_id(&self, window_id: WindowId) -> bool {
-        self.app.viewport_id()
+        self.window.id() == window_id
     }
 
-    pub fn on_window_event(&mut self, event: &WindowEvent) -> (bool, Option<Action>) {
+    fn on_mouse_motion(&mut self, delta: (f64, f64)) {
-        let response = self.state.on_window_event(&self.window, event);
+        self.state.on_mouse_motion(delta);
-        egui_winit::update_viewport_info(
+    }
-            &mut self.info,
-            self.state.egui_ctx(),
-            &self.window,
-            false,
-        );
 
-        let action = match event {
+    fn on_window_event(
-            WindowEvent::RedrawRequested => Some(Action::Redraw),
+        &mut self,
-            WindowEvent::CloseRequested => Some(Action::Close),
+        event: &WindowEvent,
-            WindowEvent::Resized(size) => {
+        shared: &mut SharedViewportState,
-                if let (Some(width), Some(height)) =
+    ) -> (EventResponse, bool) {
-                    (NonZero::new(size.width), NonZero::new(size.height))
+        if let WindowEvent::Resized(size) = event
-                {
+            && let (Some(width), Some(height)) =
-                    self.painter
+                (NonZero::new(size.width), NonZero::new(size.height))
-                        .on_window_resized(self.app.viewport_id(), width, height);
+        {
-                }
+            if shared.resized_viewport != Some(self.id) {
-                None
+                shared.resized_viewport = Some(self.id);
+                shared.painter.on_window_resize_state_change(self.id, true);
             }
-            _ if response.repaint => Some(Action::Redraw),
+            shared.painter.on_window_resized(self.id, width, height);
-            _ => None,
+        }
-        };
+        let response = self.state.on_window_event(&self.window, event);
-        (response.consumed, action)
+        let info = shared.viewport_info.get_mut(&self.id).unwrap();
+        if let WindowEvent::CloseRequested = event {
+            info.events.push(ViewportEvent::Close);
+        }
+        egui_winit::update_viewport_info(info, self.state.egui_ctx(), &self.window, false);
+        (response, info.close_requested())
     }
 
-    fn redraw(&mut self, event_loop: &ActiveEventLoop) -> Option<Action> {
+    fn take_egui_input(&mut self) -> RawInput {
-        let viewport_id = self.app.viewport_id();
+        self.state.take_egui_input(&self.window)
-        let mut input = self.state.take_egui_input(&self.window);
+    }
-        input.viewports = std::iter::once((viewport_id, self.info.clone())).collect();
-        input.viewport_id = viewport_id;
-        let mut output = self.ctx.run_ui(input, |ui| {
-            self.app.show(ui);
-        });
-        let clipped_primitives = self.ctx.tessellate(output.shapes, output.pixels_per_point);
-        self.painter.paint_and_update_textures(
-            viewport_id,
-            output.pixels_per_point,
-            [0.0, 0.0, 0.0, 0.0],
-            &clipped_primitives,
-            &output.textures_delta,
-            vec![],
-        );
 
+    fn handle_platform_output(&mut self, platform_output: PlatformOutput) {
         self.state
-            .handle_platform_output(&self.window, output.platform_output);
+            .handle_platform_output(&self.window, platform_output);
+    }
 
-        let Some(mut viewport_output) = output.viewport_output.remove(&viewport_id) else {
+    fn process_viewport_commands(
-            return Some(Action::Close);
+        &self,
-        };
+        commands: Vec<ViewportCommand>,
-
+        shared: &mut SharedViewportState,
-        let (mut deferred_commands, recreate) = self.builder.patch(viewport_output.builder);
+    ) {
-        if recreate {
+        let info = shared.viewport_info.get_mut(&self.id).unwrap();
-            let (window, state) = create_window_and_state(
-                &self.ctx,
-                viewport_id,
-                event_loop,
-                &self.builder,
-                &mut self.painter,
-            );
-            egui_winit::update_viewport_info(&mut self.info, &self.ctx, &window, true);
-            self.window = window;
-            self.state = state;
-        }
-        self.commands.append(&mut deferred_commands);
-        self.commands.append(&mut viewport_output.commands);
         egui_winit::process_viewport_commands(
-            &self.ctx,
+            self.state.egui_ctx(),
-            &mut self.info,
+            info,
-            std::mem::take(&mut self.commands),
+            commands,
             &self.window,
             &mut vec![],
         );
-
-        if self.info.close_requested() {
-            Some(Action::Close)
-        } else {
-            Some(Action::Redraw)
-        }
-    }
-}
-
-impl Drop for Viewport {
-    fn drop(&mut self) {
-        self.app.on_destroy();
     }
 }
 
 #[derive(Debug)]
 pub enum UserEvent {
     GamepadEvent(gilrs::Event),
-    OpenAbout,
-    OpenCharacterData(SimId),
-    OpenBgMap(SimId),
-    OpenObjects(SimId),
-    OpenWorlds(SimId),
-    OpenFrameBuffers(SimId),
-    OpenRegisters(SimId),
-    OpenTerminal(SimId),
-    OpenProfiler(SimId),
-    OpenDebugger(SimId),
-    OpenInput,
-    OpenHotkeys,
-    OpenPlayer2,
     Quit(SimId),
-}
+    RequestRedraw(ViewportId, Instant),
-
-pub enum Action {
-    Redraw,
-    Close,
-}
-
-fn create_window_and_state(
-    ctx: &Context,
-    viewport_id: ViewportId,
-    event_loop: &ActiveEventLoop,
-    builder: &ViewportBuilder,
-    painter: &mut egui_wgpu::winit::Painter,
-) -> (Arc<Window>, egui_winit::State) {
-    pollster::block_on(painter.set_window(viewport_id, None)).unwrap();
-    let window = Arc::new(egui_winit::create_window(ctx, event_loop, builder).unwrap());
-    pollster::block_on(painter.set_window(viewport_id, Some(window.clone()))).unwrap();
-    let state = egui_winit::State::new(
-        ctx.clone(),
-        viewport_id,
-        event_loop,
-        Some(window.scale_factor() as f32),
-        event_loop.system_theme(),
-        painter.max_texture_side(),
-    );
-    (window, state)
 }
 
 fn process_gamepad_input(mappings: MappingProvider, proxy: EventLoopProxy<UserEvent>) {

src/window.rs

@@ -1,9 +1,9 @@
 use std::sync::Arc;
 
 pub use about::AboutWindow;
-use egui::{Ui, ViewportBuilder, ViewportId};
+use egui::{Ui, ViewportBuilder};
-pub use game::GameWindow;
+pub use game::{ChildWindow, GameWindow};
-pub use game_screen::DisplayMode;
+pub use game_screen::{DisplayMode, GameScreen};
 pub use gdb::GdbServerWindow;
 pub use hotkeys::HotkeysWindow;
 pub use input::InputWindow;
@@ -28,7 +28,6 @@ mod utils;
 mod vip;
 
 pub trait AppWindow {
-    fn viewport_id(&self) -> ViewportId;
     fn sim_id(&self) -> SimId {
         SimId::Player1
     }
@@ -40,7 +39,6 @@ pub trait AppWindow {
     fn on_init(&mut self, args: InitArgs) {
         let _ = args;
     }
-    fn on_destroy(&mut self) {}
     fn handle_key_event(&mut self, event: &KeyEvent) -> bool {
         let _ = event;
         false

src/window/about.rs

@@ -1,14 +1,10 @@
-use egui::{CentralPanel, Image, Ui, ViewportBuilder, ViewportId};
+use egui::{CentralPanel, Image, Ui, ViewportBuilder};
 
 use super::AppWindow;
 
 pub struct AboutWindow;
 
 impl AppWindow for AboutWindow {
-    fn viewport_id(&self) -> ViewportId {
-        ViewportId::from_hash_of("About")
-    }
-
     fn initial_viewport(&self) -> ViewportBuilder {
         ViewportBuilder::default()
             .with_title("About Lemur")

src/window/game.rs

@@ -1,5 +1,7 @@
 use std::{
-    sync::{Arc, mpsc},
+    collections::HashMap,
+    ops::{Deref, DerefMut},
+    sync::{Arc, Mutex, atomic::AtomicBool, mpsc},
     time::Duration,
 };
 
@@ -7,9 +9,15 @@ use crate::{
     app::UserEvent,
     config::{COLOR_PRESETS, SimConfig},
     emulator::{EmulatorClient, EmulatorCommand, EmulatorState, SimId, SimState},
-    input::{Command, ShortcutProvider},
+    images::ImageTextureLoader,
+    input::{Command, MappingProvider, ShortcutProvider},
+    memory::MemoryClient,
     persistence::Persistence,
-    window::InitArgs,
+    window::{
+        AboutWindow, BgMapWindow, CharacterDataWindow, FrameBufferWindow, GdbServerWindow,
+        HotkeysWindow, InitArgs, InputWindow, ObjectWindow, ProfileWindow, RegisterWindow,
+        TerminalWindow, WorldWindow,
+    },
 };
 use anyhow::Context as _;
 use egui::{
@@ -17,7 +25,7 @@ use egui::{
     ViewportBuilder, ViewportCommand, ViewportId, Window,
 };
 use egui_notify::{Anchor, Toast, Toasts};
-use winit::event_loop::EventLoopProxy;
+use winit::{event::KeyEvent, event_loop::EventLoopProxy};
 
 use super::{
     AppWindow,
@@ -26,6 +34,7 @@ use super::{
 };
 
 pub struct GameWindow {
+    viewport_id: ViewportId,
     client: EmulatorClient,
     proxy: EventLoopProxy<UserEvent>,
     persistence: Persistence,
@@ -34,17 +43,27 @@ pub struct GameWindow {
     config: SimConfig,
     toasts: Toasts,
     screen: Option<GameScreen>,
-    messages: Option<mpsc::Receiver<Toast>>,
+    messages: mpsc::Receiver<Toast>,
+    message_sink: mpsc::Sender<Toast>,
     color_picker: Option<ColorPickerState>,
     window: Option<Arc<winit::window::Window>>,
+    memory: Arc<MemoryClient>,
+    images: Arc<ImageTextureLoader>,
+    mappings: MappingProvider,
+    children: HashMap<ViewportId, ChildWindowWrapper>,
 }
 
 impl GameWindow {
+    #[expect(clippy::too_many_arguments)]
     pub fn new(
+        viewport_id: ViewportId,
         client: EmulatorClient,
         proxy: EventLoopProxy<UserEvent>,
         persistence: Persistence,
         shortcuts: ShortcutProvider,
+        memory: &Arc<MemoryClient>,
+        images: &Arc<ImageTextureLoader>,
+        mappings: MappingProvider,
         sim_id: SimId,
     ) -> Self {
         let config = SimConfig::load(&persistence, sim_id);
@@ -52,7 +71,9 @@ impl GameWindow {
             .with_anchor(Anchor::BottomLeft)
             .with_margin((10.0, 10.0).into())
             .reverse(true);
+        let (message_sink, messages) = mpsc::channel();
         Self {
+            viewport_id,
             client,
             proxy,
             persistence,
@@ -61,9 +82,135 @@ impl GameWindow {
             config,
             toasts,
             screen: None,
-            messages: None,
+            messages,
+            message_sink,
             color_picker: None,
             window: None,
+            memory: memory.clone(),
+            images: images.clone(),
+            mappings: mappings.clone(),
+            children: HashMap::new(),
+        }
+    }
+
+    pub fn open(&mut self, window: ChildWindow) {
+        let viewport_id = window.viewport_id(self.sim_id);
+        if self.children.contains_key(&viewport_id) {
+            return;
+        }
+        let child = match window {
+            ChildWindow::About => AppWrapper::of_dyn(AboutWindow),
+            ChildWindow::CharacterData => AppWrapper::of_dyn(CharacterDataWindow::new(
+                self.sim_id,
+                &self.memory,
+                &self.images,
+            )),
+            ChildWindow::BgMap => {
+                AppWrapper::of_dyn(BgMapWindow::new(self.sim_id, &self.memory, &self.images))
+            }
+            ChildWindow::Objects => {
+                AppWrapper::of_dyn(ObjectWindow::new(self.sim_id, &self.memory, &self.images))
+            }
+            ChildWindow::Worlds => {
+                AppWrapper::of_dyn(WorldWindow::new(self.sim_id, &self.memory, &self.images))
+            }
+            ChildWindow::FrameBuffers => AppWrapper::of_dyn(FrameBufferWindow::new(
+                self.sim_id,
+                &self.memory,
+                &self.images,
+            )),
+            ChildWindow::Registers => {
+                AppWrapper::of_dyn(RegisterWindow::new(self.sim_id, &self.memory))
+            }
+            ChildWindow::Terminal => {
+                AppWrapper::of_dyn(TerminalWindow::new(self.sim_id, &self.client))
+            }
+            ChildWindow::Profiler { launch } => {
+                let mut profile = ProfileWindow::new(self.sim_id, self.client.clone());
+                if launch {
+                    profile.launch();
+                }
+                AppWrapper::of_dyn(profile)
+            }
+            ChildWindow::Debugger { port } => {
+                let mut debugger =
+                    GdbServerWindow::new(self.sim_id, self.client.clone(), self.proxy.clone());
+                if let Some(port) = port {
+                    debugger.launch(port);
+                }
+                AppWrapper::of_dyn(debugger)
+            }
+            ChildWindow::Input => AppWrapper::of_dyn(InputWindow::new(self.mappings.clone())),
+            ChildWindow::Hotkeys => AppWrapper::of_dyn(HotkeysWindow::new(self.shortcuts.clone())),
+            ChildWindow::Player2 => {
+                if self.sim_id == SimId::Player2 {
+                    return;
+                }
+                AppWrapper::of_game(GameWindow::new(
+                    viewport_id,
+                    self.client.clone(),
+                    self.proxy.clone(),
+                    self.persistence.clone(),
+                    self.shortcuts.clone(),
+                    &self.memory,
+                    &self.images,
+                    self.mappings.clone(),
+                    SimId::Player2,
+                ))
+            }
+        };
+
+        let viewport = child.initial_viewport();
+        self.children.insert(
+            viewport_id,
+            ChildWindowWrapper {
+                app: Arc::new(Mutex::new(child)),
+                updates: Some(viewport),
+                close_requested: Arc::new(AtomicBool::new(false)),
+            },
+        );
+    }
+
+    pub fn close(&mut self, window: ChildWindow) {
+        let id = window.viewport_id(self.sim_id);
+        self.children.remove(&id);
+    }
+
+    pub fn handle_init(&mut self, viewport_id: ViewportId, args: InitArgs) {
+        self.handle_event(viewport_id, |window| window.on_init(args))
+    }
+
+    pub fn handle_key_event(&mut self, viewport_id: ViewportId, event: &KeyEvent) -> bool {
+        self.handle_event(viewport_id, |window| window.handle_key_event(event))
+    }
+
+    pub fn handle_gamepad_event(&mut self, viewport_id: ViewportId, event: &gilrs::Event) -> bool {
+        self.handle_event(viewport_id, |window| window.handle_gamepad_event(event))
+    }
+
+    fn handle_event<F, R>(&mut self, viewport_id: ViewportId, cb: F) -> R
+    where
+        F: FnOnce(&mut dyn AppWindow) -> R,
+        R: Default,
+    {
+        let p2_viewport_id = ChildWindow::Player2.viewport_id(SimId::Player1);
+
+        if self.viewport_id == viewport_id {
+            cb(self)
+        } else if let Some(child) = self.children.get_mut(&viewport_id) {
+            cb(child.app.lock().unwrap().deref_mut().deref_mut())
+        } else if let Some(mut p2) = self
+            .children
+            .get_mut(&p2_viewport_id)
+            .map(|w| w.app.lock().unwrap())
+        {
+            if let AppWrapper::Game(g) = p2.deref_mut() {
+                g.handle_event(viewport_id, cb)
+            } else {
+                R::default()
+            }
+        } else {
+            R::default()
         }
     }
 
@@ -217,7 +364,7 @@ impl GameWindow {
             {
                 self.client
                     .send_command(EmulatorCommand::StartSecondSim(None));
-                self.proxy.send_event(UserEvent::OpenPlayer2).unwrap();
+                self.open(ChildWindow::Player2);
             }
             if has_player_2 {
                 let linked = self.client.are_sims_linked();
@@ -231,55 +378,37 @@ impl GameWindow {
         });
         ui.menu_button("Tools", |ui| {
             if ui.button("Terminal").clicked() {
-                self.proxy
+                self.open(ChildWindow::Terminal);
-                    .send_event(UserEvent::OpenTerminal(self.sim_id))
-                    .unwrap();
             }
             if ui.button("Profiler").clicked() {
-                self.proxy
+                self.open(ChildWindow::Profiler { launch: false });
-                    .send_event(UserEvent::OpenProfiler(self.sim_id))
-                    .unwrap();
             }
             if ui.button("GDB Server").clicked() {
-                self.proxy
+                self.open(ChildWindow::Debugger { port: None });
-                    .send_event(UserEvent::OpenDebugger(self.sim_id))
-                    .unwrap();
             }
             ui.separator();
             if ui.button("Character Data").clicked() {
-                self.proxy
+                self.open(ChildWindow::CharacterData);
-                    .send_event(UserEvent::OpenCharacterData(self.sim_id))
-                    .unwrap();
             }
             if ui.button("Background Maps").clicked() {
-                self.proxy
+                self.open(ChildWindow::BgMap);
-                    .send_event(UserEvent::OpenBgMap(self.sim_id))
-                    .unwrap();
             }
             if ui.button("Objects").clicked() {
-                self.proxy
+                self.open(ChildWindow::Objects);
-                    .send_event(UserEvent::OpenObjects(self.sim_id))
-                    .unwrap();
             }
             if ui.button("Worlds").clicked() {
-                self.proxy
+                self.open(ChildWindow::Worlds);
-                    .send_event(UserEvent::OpenWorlds(self.sim_id))
-                    .unwrap();
             }
             if ui.button("Frame Buffers").clicked() {
-                self.proxy
+                self.open(ChildWindow::FrameBuffers);
-                    .send_event(UserEvent::OpenFrameBuffers(self.sim_id))
-                    .unwrap();
             }
             if ui.button("Registers").clicked() {
-                self.proxy
+                self.open(ChildWindow::Registers);
-                    .send_event(UserEvent::OpenRegisters(self.sim_id))
-                    .unwrap();
             }
         });
         ui.menu_button("Help", |ui| {
             if ui.button("About").clicked() {
-                self.proxy.send_event(UserEvent::OpenAbout).unwrap();
+                self.open(ChildWindow::About);
             }
         });
     }
@@ -424,11 +553,11 @@ impl GameWindow {
         });
         ui.menu_button("Input", |ui| {
             if ui.button("Bind Inputs").clicked() {
-                self.proxy.send_event(UserEvent::OpenInput).unwrap();
+                self.open(ChildWindow::Input);
             }
         });
         if ui.button("Hotkeys").clicked() {
-            self.proxy.send_event(UserEvent::OpenHotkeys).unwrap();
+            self.open(ChildWindow::Hotkeys);
         }
     }
 
@@ -480,13 +609,6 @@ impl GameWindow {
 }
 
 impl AppWindow for GameWindow {
-    fn viewport_id(&self) -> ViewportId {
-        match self.sim_id {
-            SimId::Player1 => ViewportId::ROOT,
-            SimId::Player2 => ViewportId::from_hash_of("Player2"),
-        }
-    }
-
     fn sim_id(&self) -> SimId {
         self.sim_id
     }
@@ -504,10 +626,8 @@ impl AppWindow for GameWindow {
         };
         self.update_config(|c| c.dimensions = dimensions);
 
-        if let Some(messages) = self.messages.as_mut() {
+        while let Ok(toast) = self.messages.try_recv() {
-            while let Ok(toast) = messages.try_recv() {
+            self.toasts.add(toast);
-                self.toasts.add(toast);
-            }
         }
         Panel::top("menubar")
             .exact_size(22.0)
@@ -533,22 +653,43 @@ impl AppWindow for GameWindow {
             }
         });
         self.toasts.show(ui);
+        self.children.retain(|id, child| {
+            if child
+                .close_requested
+                .load(std::sync::atomic::Ordering::Relaxed)
+            {
+                return false;
+            }
+            let app = child.app.clone();
+            let viewport_builder = child.updates.take().unwrap_or_default();
+            let close_requested = child.close_requested.clone();
+            ui.show_viewport_deferred(*id, viewport_builder, move |ui, _| {
+                app.lock().unwrap().show(ui);
+                if ui.input(|s| s.viewport().close_requested()) {
+                    close_requested.store(true, std::sync::atomic::Ordering::Relaxed);
+                }
+            });
+            true
+        });
+        ui.request_repaint_after(Duration::from_millis(10));
     }
 
     fn on_init(&mut self, args: InitArgs) {
-        let (screen, sink) = GameScreen::init(args.render_state);
+        if self.screen.is_none() {
-        let (message_sink, message_source) = mpsc::channel();
+            let (screen, sink) = GameScreen::init(args.render_state);
-        self.client.send_command(EmulatorCommand::ConnectToSim(
+            self.client.send_command(EmulatorCommand::ConnectToSim(
-            self.sim_id,
+                self.sim_id,
-            sink,
+                sink,
-            message_sink,
+                self.message_sink.clone(),
-        ));
+            ));
-        self.screen = Some(screen);
+            self.screen = Some(screen);
-        self.messages = Some(message_source);
+        }
         self.window = Some(args.window.clone());
     }
+}
 
-    fn on_destroy(&mut self) {
+impl Drop for GameWindow {
+    fn drop(&mut self) {
         if self.sim_id == SimId::Player2 {
             self.client.send_command(EmulatorCommand::StopSecondSim);
         }
@@ -561,3 +702,77 @@ struct ColorPickerState {
     just_opened: bool,
     unpause_on_close: bool,
 }
+
+struct ChildWindowWrapper {
+    app: Arc<Mutex<AppWrapper>>,
+    updates: Option<ViewportBuilder>,
+    close_requested: Arc<AtomicBool>,
+}
+enum AppWrapper {
+    Game(Box<GameWindow>),
+    Dyn(Box<dyn AppWindow + Send + 'static>),
+}
+impl AppWrapper {
+    fn of_game(game: GameWindow) -> Self {
+        Self::Game(Box::new(game))
+    }
+    fn of_dyn<T: AppWindow + Send + 'static>(inner: T) -> Self {
+        Self::Dyn(Box::new(inner))
+    }
+}
+impl Deref for AppWrapper {
+    type Target = dyn AppWindow + Send + 'static;
+    fn deref(&self) -> &Self::Target {
+        match self {
+            Self::Dyn(inner) => inner.as_ref(),
+            Self::Game(inner) => inner.as_ref(),
+        }
+    }
+}
+impl DerefMut for AppWrapper {
+    fn deref_mut(&mut self) -> &mut Self::Target {
+        match self {
+            Self::Dyn(inner) => inner.as_mut(),
+            Self::Game(inner) => inner.as_mut(),
+        }
+    }
+}
+
+#[derive(Debug)]
+pub enum ChildWindow {
+    About,
+    CharacterData,
+    BgMap,
+    Objects,
+    Worlds,
+    FrameBuffers,
+    Registers,
+    Terminal,
+    Profiler { launch: bool },
+    Debugger { port: Option<u16> },
+    Input,
+    Hotkeys,
+    Player2,
+}
+impl ChildWindow {
+    fn viewport_id(&self, sim_id: SimId) -> ViewportId {
+        ViewportId::from_hash_of(format!("{sim_id:?}{}", self.name()))
+    }
+    fn name(&self) -> &'static str {
+        match self {
+            Self::About => "About",
+            Self::CharacterData => "CharacterData",
+            Self::BgMap => "BgMap",
+            Self::Objects => "Objects",
+            Self::Worlds => "Worlds",
+            Self::FrameBuffers => "FrameBuffers",
+            Self::Registers => "Registers",
+            Self::Terminal => "Terminal",
+            Self::Profiler { .. } => "Profiler",
+            Self::Debugger { .. } => "Debugger",
+            Self::Input => "Input",
+            Self::Hotkeys => "Hotkeys",
+            Self::Player2 => "Player2",
+        }
+    }
+}

src/window/game_screen.rs

@@ -14,7 +14,7 @@ pub struct GameScreen {
 }
 
 impl GameScreen {
-    fn init_pipeline(render_state: &egui_wgpu::RenderState) {
+    pub fn init_pipeline(render_state: &egui_wgpu::RenderState) {
         let device = &render_state.device;
 
         let bind_group_layout = device.create_bind_group_layout(&wgpu::BindGroupLayoutDescriptor {
@@ -117,8 +117,6 @@ impl GameScreen {
     }
 
     pub fn init(render_state: &egui_wgpu::RenderState) -> (Self, TextureSink) {
-        Self::init_pipeline(render_state);
-
         let device = &render_state.device;
         let queue = &render_state.queue;
 

src/window/gdb.rs

@@ -1,4 +1,4 @@
-use egui::{Button, CentralPanel, TextEdit, ViewportBuilder, ViewportId};
+use egui::{Button, CentralPanel, TextEdit, ViewportBuilder};
 use winit::event_loop::EventLoopProxy;
 
 use crate::{
@@ -42,10 +42,6 @@ impl GdbServerWindow {
 }
 
 impl AppWindow for GdbServerWindow {
-    fn viewport_id(&self) -> ViewportId {
-        ViewportId::from_hash_of(format!("Debugger-{}", self.sim_id))
-    }
-
     fn sim_id(&self) -> SimId {
         self.sim_id
     }

src/window/hotkeys.rs

@@ -1,6 +1,5 @@
 use egui::{
     Button, CentralPanel, Event, KeyboardShortcut, Label, Layout, Slider, Ui, ViewportBuilder,
-    ViewportId,
 };
 use egui_extras::{Column, TableBuilder};
 
@@ -125,10 +124,6 @@ impl HotkeysWindow {
 }
 
 impl AppWindow for HotkeysWindow {
-    fn viewport_id(&self) -> ViewportId {
-        ViewportId::from_hash_of("shortcuts")
-    }
-
     fn initial_viewport(&self) -> ViewportBuilder {
         ViewportBuilder::default()
             .with_title("Keyboard Shortcuts")

src/window/input.rs

@@ -1,4 +1,4 @@
-use egui::{Button, CentralPanel, Label, Layout, Panel, Ui, ViewportBuilder, ViewportId};
+use egui::{Button, CentralPanel, Label, Layout, Panel, Ui, ViewportBuilder};
 use egui_extras::{Column, TableBuilder};
 use gilrs::{EventType, GamepadId};
 use std::sync::RwLock;
@@ -160,10 +160,6 @@ impl InputWindow {
 }
 
 impl AppWindow for InputWindow {
-    fn viewport_id(&self) -> ViewportId {
-        ViewportId::from_hash_of("input")
-    }
-
     fn initial_viewport(&self) -> ViewportBuilder {
         ViewportBuilder::default()
             .with_title("Bind Inputs")

src/window/profile.rs

@@ -1,7 +1,7 @@
 use std::{fs, sync::Arc, time::Duration};
 
 use anyhow::Result;
-use egui::{Button, CentralPanel, Checkbox, Label, ViewportBuilder, ViewportId};
+use egui::{Button, CentralPanel, Checkbox, Label, ViewportBuilder};
 use egui_notify::{Anchor, Toast, Toasts};
 use winit::window::Window;
 
@@ -82,10 +82,6 @@ impl ProfileWindow {
 }
 
 impl AppWindow for ProfileWindow {
-    fn viewport_id(&self) -> ViewportId {
-        ViewportId::from_hash_of(format!("Profile-{}", self.sim_id))
-    }
-
     fn sim_id(&self) -> SimId {
         self.sim_id
     }

src/window/terminal.rs

@@ -1,8 +1,6 @@
 use std::{collections::VecDeque, sync::mpsc};
 
-use egui::{
+use egui::{Align, CentralPanel, FontFamily, Label, RichText, ScrollArea, Ui, ViewportBuilder};
-    Align, CentralPanel, FontFamily, Label, RichText, ScrollArea, Ui, ViewportBuilder, ViewportId,
-};
 
 use crate::emulator::{EmulatorClient, EmulatorCommand, SimId};
 
@@ -31,10 +29,6 @@ impl TerminalWindow {
 }
 
 impl AppWindow for TerminalWindow {
-    fn viewport_id(&self) -> ViewportId {
-        ViewportId::from_hash_of(format!("terminal-{}", self.sim_id))
-    }
-
     fn sim_id(&self) -> SimId {
         self.sim_id
     }

src/window/vip/bgmap.rs

@@ -2,7 +2,7 @@ use std::sync::Arc;
 
 use egui::{
     Align, CentralPanel, Checkbox, Color32, ComboBox, Image, ScrollArea, Slider, TextEdit,
-    TextureOptions, Ui, ViewportBuilder, ViewportId,
+    TextureOptions, Ui, ViewportBuilder,
 };
 use egui_extras::{Column, Size, StripBuilder, TableBuilder};
 
@@ -169,10 +169,6 @@ impl BgMapWindow {
 }
 
 impl AppWindow for BgMapWindow {
-    fn viewport_id(&self) -> ViewportId {
-        ViewportId::from_hash_of(format!("bgmap-{}", self.sim_id))
-    }
-
     fn sim_id(&self) -> SimId {
         self.sim_id
     }

src/window/vip/chardata.rs

@@ -2,7 +2,7 @@ use std::fmt::Display;
 
 use egui::{
     Align, CentralPanel, Color32, ComboBox, Image, ScrollArea, Slider, TextEdit, TextureOptions,
-    Ui, Vec2, ViewportBuilder, ViewportId,
+    Ui, Vec2, ViewportBuilder,
 };
 use egui_extras::{Column, Size, StripBuilder, TableBuilder};
 use serde::{Deserialize, Serialize};
@@ -231,10 +231,6 @@ impl CharacterDataWindow {
 }
 
 impl AppWindow for CharacterDataWindow {
-    fn viewport_id(&self) -> ViewportId {
-        ViewportId::from_hash_of(format!("chardata-{}", self.sim_id))
-    }
-
     fn sim_id(&self) -> SimId {
         self.sim_id
     }

src/window/vip/framebuffer.rs

@@ -1,6 +1,6 @@
 use egui::{
     Align, CentralPanel, Color32, Image, ScrollArea, Slider, TextEdit, TextureOptions, Ui,
-    ViewportBuilder, ViewportId,
+    ViewportBuilder,
 };
 use egui_extras::{Column, Size, StripBuilder, TableBuilder};
 
@@ -134,10 +134,6 @@ impl FrameBufferWindow {
 }
 
 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
     }

src/window/vip/object.rs

@@ -2,7 +2,7 @@ use std::sync::Arc;
 
 use egui::{
     Align, CentralPanel, Checkbox, Color32, ComboBox, Image, ScrollArea, Slider, TextEdit,
-    TextureOptions, Ui, ViewportBuilder, ViewportId,
+    TextureOptions, Ui, ViewportBuilder,
 };
 use egui_extras::{Column, Size, StripBuilder, TableBuilder};
 
@@ -190,10 +190,6 @@ impl ObjectWindow {
 }
 
 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
     }

src/window/vip/registers.rs

@@ -2,7 +2,7 @@ use std::sync::Arc;
 
 use egui::{
     Align, Button, CentralPanel, Checkbox, Color32, Direction, Label, Layout, ScrollArea, TextEdit,
-    Ui, ViewportBuilder, ViewportId,
+    Ui, ViewportBuilder,
 };
 use egui_extras::{Column, Size, StripBuilder, TableBuilder};
 
@@ -630,10 +630,6 @@ fn read_address<T: MemoryValue>(registers: &MemoryRef, address: usize) -> T {
 }
 
 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
     }

src/window/vip/world.rs

@@ -2,7 +2,7 @@ use std::{fmt::Display, sync::Arc};
 
 use egui::{
     Align, CentralPanel, Checkbox, Color32, ComboBox, Image, ScrollArea, Slider, TextEdit,
-    TextureOptions, Ui, ViewportBuilder, ViewportId,
+    TextureOptions, Ui, ViewportBuilder,
 };
 use egui_extras::{Column, Size, StripBuilder, TableBuilder};
 use fixed::{
@@ -506,10 +506,6 @@ impl WorldWindow {
 }
 
 impl AppWindow for WorldWindow {
-    fn viewport_id(&self) -> ViewportId {
-        ViewportId::from_hash_of(format!("world-{}", self.sim_id))
-    }
-
     fn sim_id(&self) -> SimId {
         self.sim_id
     }