InputManager: fix exclusive fullscreen with SDL

Author: emoose

src/hooks_graphics.cpp

@@ -407,9 +407,6 @@ class WindowedBorderless : public Hook
 			Settings::WindowPositionX, Settings::WindowPositionY, 
 			Game::screen_resolution->x, Game::screen_resolution->y,
 			0x40);
-
-		void InputManager_Init(HWND);
-		InputManager_Init(window);
 	}
 
 public:

src/input_manager.cpp

@@ -205,21 +205,20 @@ class InputManager
 
 		SDL_Init(SDL_INIT_GAMEPAD | SDL_INIT_VIDEO);
 
+		// Need to setup SDL_Window for SDL to see keyboard events
 		SDL_PropertiesID props = SDL_CreateProperties();
-		if (props == 0)
-		{
-			spdlog::error(__FUNCTION__ ": failed to create properties ({})", SDL_GetError());
-		}
-		else
+		if (props)
 		{
 			SDL_SetStringProperty(props, SDL_PROP_WINDOW_CREATE_TITLE_STRING, "OutRun2006Tweaks");
 			SDL_SetNumberProperty(props, SDL_PROP_WINDOW_CREATE_RESIZABLE_BOOLEAN, true);
 			SDL_SetNumberProperty(props, SDL_PROP_WINDOW_CREATE_WIDTH_NUMBER, 1280);
 			SDL_SetNumberProperty(props, SDL_PROP_WINDOW_CREATE_HEIGHT_NUMBER, 720);
 			SDL_SetPointerProperty(props, SDL_PROP_WINDOW_CREATE_WIN32_HWND_POINTER, hwnd);
 
-			window = SDL_CreateWindowWithProperties(props); // Needed for SDL keyboard events
+			window = SDL_CreateWindowWithProperties(props);
 		}
+		else
+			spdlog::error(__FUNCTION__ ": failed to create properties ({}), keyboard might not work with UseNewInput properly!", SDL_GetError());
 
 		setupKeyboardBindings();
 	}
@@ -488,12 +487,6 @@ class InputManager
 };
 InputManager InputManager::instance;
 
-void InputManager_Init(HWND window)
-{
-	if (Settings::UseNewInput)
-		InputManager::instance.init(window);
-}
-
 void InputManager_Update()
 {
 	if (Settings::UseNewInput)
@@ -559,6 +552,13 @@ class NewInputHook : public Hook
 		return VolumeSwitch_hook.ccall<int>(volumeId);
 	}
 
+	inline static SafetyHookMid WindowInit_hook = {};
+	static void WindowInit_dest(SafetyHookContext& ctx)
+	{
+		if (Settings::UseNewInput)
+			InputManager::instance.init((HWND)ctx.ebp);
+	}
+
 public:
 	std::string_view description() override
 	{
@@ -577,6 +577,7 @@ class NewInputHook : public Hook
 		GetVolume_hook = safetyhook::create_inline(Module::exe_ptr(0x53720), GetVolume_dest);
 		GetVolumeOld_hook = safetyhook::create_inline(Module::exe_ptr(0x53750), GetVolumeOld_dest);
 		VolumeSwitch_hook = safetyhook::create_inline(Module::exe_ptr(0x53780), VolumeSwitch_dest);
+		WindowInit_hook = safetyhook::create_mid(Module::exe_ptr(0xEB2B), WindowInit_dest);
 
 		return true;
 	}