Add option to disable EventSystem override

Author: sinai-dev

src/Core/Config/ConfigManager.cs

@@ -21,6 +21,7 @@ public static class ConfigManager
         public static ConfigElement<bool>       Force_Unlock_Mouse;
         public static ConfigElement<KeyCode>    Force_Unlock_Toggle;
         public static ConfigElement<bool>       Aggressive_Mouse_Unlock;
+        public static ConfigElement<bool>       Disable_EventSystem_Override;
         public static ConfigElement<string>     Default_Output_Path;
         public static ConfigElement<bool>       Log_Unity_Debug;
         public static ConfigElement<bool>       Hide_On_Startup;
@@ -93,7 +94,11 @@ private static void CreateConfigElements()
                 KeyCode.None);
 
             Aggressive_Mouse_Unlock = new ConfigElement<bool>("Aggressive Mouse Unlock",
-                "Use WaitForEndOfFrame to aggressively force the Mouse to be unlocked (requires game restart).",
+                "Use WaitForEndOfFrame to aggressively force the Mouse to be unlocked.\n<b>Requires restart to take effect.</b>",
+                false);
+
+            Disable_EventSystem_Override = new ConfigElement<bool>("Disable EventSystem override",
+                "If enabled, UnityExplorer will not override the EventSystem from the game.\n<b>May require restart to take effect.</b>",
                 false);
 
             Log_Unity_Debug = new ConfigElement<bool>("Log Unity Debug",

src/Core/Input/CursorUnlocker.cs

@@ -37,12 +37,15 @@ public static void Init()
             lastVisibleState = Cursor.visible;
 
             SetupPatches();
-
             UpdateCursorControl();
 
+            // Hook up config values
+
+            // Force Unlock Mouse
             Unlock = ConfigManager.Force_Unlock_Mouse.Value;
             ConfigManager.Force_Unlock_Mouse.OnValueChanged += (bool val) => { Unlock = val; };
 
+            // Aggressive Mouse Unlock
             if (ConfigManager.Aggressive_Mouse_Unlock.Value)
                 SetupAggressiveUnlock();
         }
@@ -83,15 +86,15 @@ public static void UpdateCursorControl()
                     Cursor.lockState = CursorLockMode.None;
                     Cursor.visible = true;
 
-                    if (UIManager.EventSys)
+                    if (!ConfigManager.Disable_EventSystem_Override.Value && UIManager.EventSys)
                         SetEventSystem();
                 }
                 else
                 {
                     Cursor.lockState = lastLockMode;
                     Cursor.visible = lastVisibleState;
 
-                    if (UIManager.EventSys)
+                    if (!ConfigManager.Disable_EventSystem_Override.Value && UIManager.EventSys)
                         ReleaseEventSystem();
                 }
 
@@ -160,26 +163,19 @@ private static void SetupPatches()
 
         public static void Prefix_EventSystem_set_current(ref EventSystem value)
         {
-            if (!UIManager.EventSys)
+            if (!settingEventSystem && value)
             {
-                if (value)
-                {
-                    lastEventSystem = value;
-                    lastInputModule = value.currentInputModule;
-                }
-                return;
+                lastEventSystem = value;
+                lastInputModule = value.currentInputModule;
             }
 
-            if (!settingEventSystem && value != UIManager.EventSys)
-            {
-                lastEventSystem = value;
-                lastInputModule = value?.currentInputModule;
+            if (!UIManager.EventSys)
+                return;
 
-                if (ShouldActuallyUnlock)
-                {
-                    value = UIManager.EventSys;
-                    value.enabled = true;
-                }
+            if (!settingEventSystem && ShouldActuallyUnlock && !ConfigManager.Disable_EventSystem_Override.Value)
+            {
+                value = UIManager.EventSys;
+                value.enabled = true;
             }
         }
 

src/UI/UIManager.cs

@@ -145,7 +145,7 @@ public static void Update()
             if (InputManager.GetKeyDown(ConfigManager.Force_Unlock_Toggle.Value))
                 CursorUnlocker.Unlock = !CursorUnlocker.Unlock;
 
-            if (EventSystem.current != EventSys)
+            if (!ConfigManager.Disable_EventSystem_Override.Value && EventSystem.current != EventSys)
                 CursorUnlocker.SetEventSystem();
 
             UIPanel.UpdateFocus();