diff --git a/crates/horizon-client/src/game.rs b/crates/horizon-client/src/game.rs index a35dbda95..3db004829 100644 --- a/crates/horizon-client/src/game.rs +++ b/crates/horizon-client/src/game.rs @@ -5630,8 +5630,10 @@ impl Game<'_> { if self.lan_acting.is_some() { return; } - // MouseHandler.grabMouse never captures an inactive window. - if capture && !self.focused { + // MouseHandler.grabMouse never captures an inactive window, and vanilla + // grabs only on `setScreen(null)`: the pack prompt and server dialogs + // are screens over the world that keep the pointer. + if capture && (!self.focused || self.server_packs.prompt.is_some() || self.dialog_open()) { return; } // The container screen's press state belongs to the screen: a screen @@ -6112,7 +6114,14 @@ impl Game<'_> { // Screen.extractBlurredBackground blurs the world and HUD, while the // screen's background, widgets, toasts and debug overlay stay sharp. batch.blur_at = batch.vertices.len() as u32; - match self.screen { + // PackConfirmScreen takes the open screen's place (it comes back once + // the prompt is answered): the screen under the prompt isn't drawn. + let screen = if self.server_packs.prompt.is_some() { + Screen::Playing + } else { + self.screen + }; + match screen { Screen::Paused if self.pause_menu => self.draw_pause_menu(&mut batch), // PauseScreen(false): only its title, at the top. Screen::Paused => { @@ -6152,9 +6161,11 @@ impl Game<'_> { // ToastManager.extractRenderState: F1 hides the toasts too. self.draw_toasts(&mut batch, !show_hud); self.draw_pack_toasts(&mut batch, !show_hud); - self.remote_hud(&mut batch); - self.draw_sign_editor(&mut batch); - self.draw_book(&mut batch); + if self.server_packs.prompt.is_none() { + self.remote_hud(&mut batch); + self.draw_sign_editor(&mut batch); + self.draw_book(&mut batch); + } batch } fn creative_inventory_open(&self) -> bool { @@ -12677,13 +12688,16 @@ impl ApplicationHandler for Game<'_> { self.left = false; self.right = false; self.capture(false); - // Screens (books, signs) stay open instead of pausing. + // Gui.setPauseScreen: an open screen (books, signs, the + // pack prompt, a server dialog) stays instead of pausing. if self.screen == Screen::Playing && self.player.is_some() && !self.options.no_pause && self.settings.file.bool("pauseOnLostFocus") && self.book.is_none() && self.sign_edit.is_none() + && self.server_packs.prompt.is_none() + && !self.dialog_open() { self.screen = Screen::Paused; } diff --git a/crates/horizon-client/src/game/server_packs.rs b/crates/horizon-client/src/game/server_packs.rs index a616be199..5650c58e2 100644 --- a/crates/horizon-client/src/game/server_packs.rs +++ b/crates/horizon-client/src/game/server_packs.rs @@ -269,6 +269,8 @@ impl Game<'_> { open.requests.push((p.id, p.url, p.hash)); open.required = p.required; open.prompt = text; + // Gui.setScreen: KeyMapping.releaseAll, so no walking behind the prompt. + self.keys.clear(); self.capture(false); } /// `handleResourcePackPop`: one pack, or all of them. diff --git a/tests/test_world_input_capture.py b/tests/test_world_input_capture.py index 5607c3684..e9a93ee4e 100644 --- a/tests/test_world_input_capture.py +++ b/tests/test_world_input_capture.py @@ -86,25 +86,39 @@ impl Window { struct Mouse { ignore_first: bool } impl Mouse { fn set_ignore_first_move(&mut self) { self.ignore_first = true; } } struct Remote; +#[derive(Default)] +struct ServerPacks { prompt: Option<()> } struct Game { focused: bool, agent_pointer: bool, window: Option, mouse: Mouse, captured: bool, title: Option<()>, screen: Screen, remote: Option, mining: bool, lan_acting: Option, renderer: Option, cursor: (f32, f32), + server_packs: ServerPacks, } impl Default for Game { fn default() -> Self { Self { focused: true, agent_pointer: false, window: Some(Window::default()), mouse: Mouse::default(), captured: false, title: None, screen: Screen::Playing, remote: None, mining: false, lan_acting: None, - renderer: None, cursor: (0.0, 0.0) } + renderer: None, cursor: (0.0, 0.0), server_packs: ServerPacks::default() } } } impl Game { fn stop_mining(&mut self) { self.mining = false; } fn reset_inventory_clicks(&mut self) {} + fn dialog_open(&self) -> bool { false } METHODS } fn main() { + // The server pack prompt keeps the pointer: nothing grabs it while it is open. + { + let mut game = Game::default(); + game.server_packs.prompt = Some(()); + game.capture(true); + assert!(!game.captured); + game.server_packs.prompt = None; + game.capture(true); + assert!(game.captured); + } // New and existing worlds, returning to title, and reopening a world. for remote in [false, true] { let mut game = Game::default();