src/emulator.rs

@@ -946,9 +946,6 @@ pub struct EmulatorClient {
 }
 
 impl EmulatorClient {
-    pub fn has_player_2(&self) -> bool {
-        self.sim_state(SimId::Player2) != SimState::Uninitialized
-    }
     pub fn sim_state(&self, sim_id: SimId) -> SimState {
         self.sim_state[sim_id.to_index()].load(Ordering::Acquire)
     }

src/window.rs

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

src/window/game.rs

@@ -53,7 +53,6 @@ pub struct GameWindow {
     children: ViewportIdMap<ChildWindowWrapper>,
     child_states: UiData<ViewportIdMap<ChildState>>,
     queued_children: Vec<ChildWindow>,
-    show_player_name: bool,
 }
 
 impl GameWindow {
@@ -95,7 +94,6 @@ impl GameWindow {
             children: ViewportIdMap::default(),
             child_states: UiData::new(),
             queued_children: vec![],
-            show_player_name: false,
         }
     }
 
@@ -178,8 +176,6 @@ impl GameWindow {
         };
 
         let mut viewport = child.initial_viewport();
-        let title = viewport.title.clone().unwrap();
-        let sim_id = child.sim_id();
         if let Some(state) = self.child_states.get(&viewport_id) {
             viewport.position = Some(state.position);
             viewport.inner_size = Some(state.size);
@@ -188,8 +184,6 @@ impl GameWindow {
             viewport_id,
             ChildWindowWrapper {
                 app: Arc::new(Mutex::new(child)),
-                title,
-                sim_id,
                 updates: Some(viewport),
                 close_requested: Arc::new(AtomicBool::new(false)),
             },
@@ -377,7 +371,7 @@ impl GameWindow {
         });
         ui.menu_button("Options", |ui| self.show_options_menu(ui));
         ui.menu_button("Multiplayer", |ui| {
-            let has_player_2 = self.client.has_player_2();
+            let has_player_2 = self.client.sim_state(SimId::Player2) != SimState::Uninitialized;
             if self.sim_id == SimId::Player1
                 && !has_player_2
                 && ui.button("Open Player 2").clicked()
@@ -629,8 +623,8 @@ impl GameWindow {
 }
 
 impl AppWindow for GameWindow {
-    fn sim_id(&self) -> Option<SimId> {
+    fn sim_id(&self) -> SimId {
-        Some(self.sim_id)
+        self.sim_id
     }
 
     fn initial_viewport(&self) -> ViewportBuilder {
@@ -645,30 +639,6 @@ impl AppWindow for GameWindow {
     }
 
     fn show(&mut self, ui: &mut Ui) {
-        let has_player_2 = self.client.has_player_2();
-        if !self.show_player_name && has_player_2 {
-            ui.send_viewport_cmd(ViewportCommand::Title(format!("Lemur ({})", self.sim_id)));
-            for (viewport_id, child) in &self.children {
-                if let Some(sim_id) = child.sim_id {
-                    ui.send_viewport_cmd_to(
-                        *viewport_id,
-                        ViewportCommand::Title(format!("{} ({sim_id})", child.title)),
-                    );
-                }
-            }
-            self.show_player_name = true;
-        } else if self.show_player_name && !has_player_2 {
-            ui.send_viewport_cmd(ViewportCommand::Title("Lemur".to_string()));
-            for (viewport_id, child) in &self.children {
-                if child.sim_id.is_some() {
-                    ui.send_viewport_cmd_to(
-                        *viewport_id,
-                        ViewportCommand::Title(child.title.clone()),
-                    );
-                }
-            }
-            self.show_player_name = false;
-        }
         self.child_states.load(ui);
         let dimensions = {
             let bounds = ui.content_rect();
@@ -720,15 +690,12 @@ impl AppWindow for GameWindow {
             let app = child.app.clone();
             let viewport_builder = child.updates.take().unwrap_or_default();
             let close_requested = child.close_requested.clone();
-            if let (Some(outer), Some(inner)) = ui.input_for(*id, |inp| {
+            if let Some(rect) = ui.input_for(*id, |inp| inp.viewport().outer_rect) {
-                let viewport = inp.viewport();
-                (viewport.outer_rect, viewport.inner_rect)
-            }) {
                 self.child_states.insert(
                     *id,
                     ChildState {
-                        position: outer.min,
+                        position: rect.min,
-                        size: inner.size(),
+                        size: rect.size(),
                     },
                 );
             }
@@ -775,8 +742,6 @@ struct ColorPickerState {
 
 struct ChildWindowWrapper {
     app: Arc<Mutex<AppWrapper>>,
-    title: String,
-    sim_id: Option<SimId>,
     updates: Option<ViewportBuilder>,
     close_requested: Arc<AtomicBool>,
 }

src/window/gdb.rs

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

src/window/profile.rs

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

src/window/terminal.rs

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

src/window/vip/bgmap.rs

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

src/window/vip/chardata.rs

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

src/window/vip/framebuffer.rs

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

src/window/vip/object.rs

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

src/window/vip/registers.rs

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

src/window/vip/world.rs

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