fix: Initialize SDL manually first before applying hints without patching

For some reason SDL_video was getting into a weird state if this wasn't done
Harmony doesn't work when published to single file

Author: pandinocoder

Intersect.Client.Core/Interface/Menu/SelectCharacterWindow.cs

@@ -1,4 +1,3 @@
-using HarmonyLib;
 using Intersect.Client.Core;
 using Intersect.Client.Framework.Content;
 using Intersect.Client.Framework.File_Management;

Intersect.Client.Core/Intersect.Client.Core.csproj

@@ -87,7 +87,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Lib.Harmony.Thin" Version="2.3.3" />
     <PackageReference Include="MonoGame.Framework.DesktopGL" Version="3.8.1.303" GeneratePathProperty="True" />
     <PackageReference Include="MonoGame.Library.SDL" Version="2.26.5.5" GeneratePathProperty="True" />
     <PackageReference Include="Steamworks.NET" Version="20.1.0" />

Intersect.Client.Core/MonoGame/IntersectGame.cs

@@ -1,5 +1,4 @@
 using Intersect.Client.Core;
-using Intersect.Client.Core.Controls;
 using Intersect.Client.Framework.Gwen.Input;
 using Intersect.Client.Framework.Gwen.Renderer;
 using Intersect.Client.Framework.Input;
@@ -15,7 +14,6 @@
 using Microsoft.Xna.Framework.Graphics;
 using System.Diagnostics;
 using System.Reflection;
-using HarmonyLib;
 using Intersect.Client.Framework.Database;
 using Intersect.Client.Framework.Graphics;
 using Intersect.Client.ThirdParty;
@@ -556,30 +554,40 @@ public void Start(IClientContext context, Action postStartupAction)
         {
             try
             {
-                var assemblyMonoGameFramework = AppDomain.CurrentDomain.GetAssemblies()
-                    .FirstOrDefault(assembly => assembly.FullName?.StartsWith("MonoGame.Framework") ?? false);
-                var typeInternalSdl = assemblyMonoGameFramework?.GetType("Sdl");
-                var methodSdlInit = typeInternalSdl?.GetMethod("Init");
-
-                var harmonyPatch = new Harmony(typeof(MonoGameRunner).Assembly.FullName ?? "Intersect.Client.Core");
-                harmonyPatch.Patch(methodSdlInit, postfix: SymbolExtensions.GetMethodInfo(() => SdlInitPost()));
+                DoSdlInit(12832);
             }
             catch (Exception exception)
             {
-                ApplicationContext.Context.Value?.Logger.LogWarning(exception, "Error occurred when trying to apply Harmony patch, this is not a fatal error");
+                ApplicationContext.Context.Value?.Logger.LogWarning(
+                    exception,
+                    "Error occurred while trying to initialize SDL"
+                );
             }
 
             using var game = new IntersectGame(context, postStartupAction);
             game.Run();
         }
 
-        private static void SdlInitPost()
+        private delegate void SdlInit(int flags);
+
+        private static void DoSdlInit(int flags)
         {
             if (PlatformHelper.CurrentPlatform != Platform.Linux)
             {
                 return;
             }
 
+            var assemblyMonoGameFramework = AppDomain.CurrentDomain.GetAssemblies()
+                .FirstOrDefault(assembly => assembly.FullName?.StartsWith("MonoGame.Framework") ?? false);
+            var typeInternalSdl = assemblyMonoGameFramework?.GetType("Sdl");
+            var methodSdlInit = typeInternalSdl?.GetMethod("Init");
+            var delegateSdlInit = methodSdlInit?.CreateDelegate<SdlInit>();
+            if (delegateSdlInit == null)
+            {
+                throw new InvalidOperationException("Missing Sdl.Init() from MonoGame");
+            }
+            delegateSdlInit(flags);
+
             if (!Sdl2.SDL_SetHint(Sdl2.SDL_VIDEO_X11_NET_WM_BYPASS_COMPOSITOR, false))
             {
                 ApplicationContext.Context.Value?.Logger.LogWarning("Failed to set X11 Compositor hint");

Intersect.Client.Core/MonoGame/NativeInterop/Sdl2.Hints.cs

@@ -8,7 +8,33 @@ public partial class Sdl2
     public const string SDL_VIDEO_X11_NET_WM_BYPASS_COMPOSITOR = "SDL_VIDEO_X11_NET_WM_BYPASS_COMPOSITOR";
 
     [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
-    public unsafe delegate int SDL_SetHint_d(byte* name, byte* value);
+    private unsafe delegate byte* SDL_GetHint_d(byte* name);
+
+    private static SDL_GetHint_d SDL_GetHint_f = Loader.Functions.LoadFunction<SDL_GetHint_d>(nameof(SDL_GetHint));
+
+    public static unsafe string? SDL_GetHint(string name)
+    {
+        fixed (byte* pName = Encoding.UTF8.GetBytes(name))
+        {
+            var textBytes = SDL_GetHint_f(pName);
+            if (textBytes == default)
+            {
+                return null;
+            }
+
+            var endTextBytes = textBytes;
+            while (*endTextBytes != default)
+            {
+                ++endTextBytes;
+            }
+
+            var hintText = Encoding.UTF8.GetString(textBytes, (int)(endTextBytes - textBytes));
+            return hintText;
+        }
+    }
+
+    [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
+    private unsafe delegate int SDL_SetHint_d(byte* name, byte* value);
 
     private static SDL_SetHint_d SDL_SetHint_f = Loader.Functions.LoadFunction<SDL_SetHint_d>(nameof(SDL_SetHint));
 

Intersect.Client.Core/MonoGame/NativeInterop/Sdl2.stdinc.cs

@@ -0,0 +1,49 @@
+using System.Runtime.InteropServices;
+using System.Text;
+
+namespace Intersect.Client.MonoGame.NativeInterop;
+
+public partial class Sdl2
+{
+    [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
+    private unsafe delegate byte* SDL_getenv_d(byte* name);
+
+    private static SDL_getenv_d SDL_getenv_f = Loader.Functions.LoadFunction<SDL_getenv_d>(nameof(SDL_getenv));
+
+    public static unsafe string? SDL_getenv(string name)
+    {
+        fixed (byte* pName = Encoding.UTF8.GetBytes(name))
+        {
+            var textBytes = SDL_GetHint_f(pName);
+            if (textBytes == default)
+            {
+                return null;
+            }
+
+            var endTextBytes = textBytes;
+            while (*endTextBytes != default)
+            {
+                ++endTextBytes;
+            }
+
+            var hintText = Encoding.UTF8.GetString(textBytes, (int)(endTextBytes - textBytes));
+            return hintText;
+        }
+    }
+
+    [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
+    private unsafe delegate int SDL_setenv_d(byte* name, byte* value, int overwrite);
+
+    private static SDL_setenv_d SDL_setenv_f = Loader.Functions.LoadFunction<SDL_setenv_d>(nameof(SDL_setenv));
+
+    public static unsafe bool SDL_setenv(string name, string value, bool overwrite)
+    {
+        fixed (byte* pValue = Encoding.UTF8.GetBytes(value))
+        {
+            fixed (byte* pName = Encoding.UTF8.GetBytes(name))
+            {
+                return SDL_setenv_f(pName, pValue, overwrite ? 1 : 0) != 0;
+            }
+        }
+    }
+}