From fe8d8ece9c235fa54731f8e614f9f652ccd5210b Mon Sep 17 00:00:00 2001
From: iceiix <43691553+iceiix@users.noreply.github.com>
Date: Sun, 28 Aug 2022 09:30:56 -0700
Subject: [PATCH] Fix set_cursor_grab on Linux. Closes #714 (#717)

The glutin/winit update in #700 changed set_cursor_grab from a bool to
an enum, but always used CursorGrabMode::Locked, which is only available
on macOS. Conditionally compile to use CursorGrabMode::Confined otherwise.
Fixes #714 and fixes #713

* set_cursor_grab failed with NotSupported(NotSupportedError) on Linux
Patch from https://github.com/iceiix/stevenarella/issues/714

* cargo fmt

Co-authored-by: inferno <inferrna@gmail.com>
---
 src/main.rs | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/main.rs b/src/main.rs
index 4124cd5..c3533d2 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -630,6 +630,11 @@ fn handle_window_event<T>(
     event: winit::event::Event<T>,
 ) -> bool {
     use winit::event::*;
+    let cursor_grab_mode = if cfg!(target_os = "macos") {
+        winit::window::CursorGrabMode::Locked
+    } else {
+        winit::window::CursorGrabMode::Confined
+    };
     match event {
         Event::MainEventsCleared => return true,
         Event::DeviceEvent {
@@ -659,9 +664,7 @@ fn handle_window_event<T>(
             use std::f64::consts::PI;
 
             if game.focused {
-                window
-                    .set_cursor_grab(winit::window::CursorGrabMode::Locked)
-                    .unwrap();
+                window.set_cursor_grab(cursor_grab_mode).unwrap();
                 window.set_cursor_visible(false);
                 if let Some(player) = game.server.player {
                     let rotation = game
@@ -719,9 +722,7 @@ fn handle_window_event<T>(
                             && !game.screen_sys.is_current_closable()
                         {
                             game.focused = true;
-                            window
-                                .set_cursor_grab(winit::window::CursorGrabMode::Locked)
-                                .unwrap();
+                            window.set_cursor_grab(cursor_grab_mode).unwrap();
                             window.set_cursor_visible(false);
                         } else if !game.focused {
                             #[cfg(not(target_arch = "wasm32"))]
@@ -783,9 +784,7 @@ fn handle_window_event<T>(
                                     screen::SettingsMenu::new(game.vars.clone(), true),
                                 ));
                             } else if game.screen_sys.is_current_closable() {
-                                window
-                                    .set_cursor_grab(winit::window::CursorGrabMode::Locked)
-                                    .unwrap();
+                                window.set_cursor_grab(cursor_grab_mode).unwrap();
                                 window.set_cursor_visible(false);
                                 game.focused = true;
                                 game.screen_sys.pop_screen();