SDL/HID fixes and clean-up (#224)

UnleashedRecomp/ui/game_window.cpp

@@ -3,8 +3,8 @@
 #include <os/logger.h>
 #include <os/user.h>
 #include <os/version.h>
-#include <ui/sdl_listener.h>
 #include <app.h>
+#include <sdl_listener.h>
 #include <SDL_syswm.h>
 
 #if _WIN32

UnleashedRecomp/ui/game_window.h

@@ -1,8 +1,8 @@
 #pragma once
 
 #include <gpu/rhi/plume_render_interface_types.h>
-#include <ui/window_events.h>
 #include <user/config.h>
+#include <sdl_events.h>
 
 #define DEFAULT_WIDTH 1280
 #define DEFAULT_HEIGHT 720

UnleashedRecomp/ui/installer_wizard.cpp

@@ -12,10 +12,10 @@
 #include <ui/imgui_utils.h>
 #include <ui/button_guide.h>
 #include <ui/message_window.h>
-#include <ui/sdl_listener.h>
 #include <ui/game_window.h>
 #include <decompressor.h>
 #include <exports.h>
+#include <sdl_listener.h>
 
 #include <res/images/common/hedge-dev.dds.h>
 #include <res/images/installer/install_001.dds.h>

UnleashedRecomp/ui/message_window.cpp

@@ -1,17 +1,18 @@
 #include "message_window.h"
-#include "imgui_utils.h"
 #include <api/SWA.h>
+#include <gpu/imgui/imgui_snapshot.h>
 #include <gpu/video.h>
 #include <hid/hid.h>
 #include <locale/locale.h>
 #include <ui/button_guide.h>
-#include <ui/sdl_listener.h>
+#include <ui/imgui_utils.h>
 #include <app.h>
-#include <exports.h>
-#include <res/images/common/general_window.dds.h>
 #include <decompressor.h>
+#include <exports.h>
+#include <sdl_listener.h>
+
+#include <res/images/common/general_window.dds.h>
 #include <res/images/common/select_fade.dds.h>
-#include <gpu/imgui/imgui_snapshot.h>
 
 constexpr double OVERLAY_CONTAINER_COMMON_MOTION_START = 0;
 constexpr double OVERLAY_CONTAINER_COMMON_MOTION_END = 11;

UnleashedRecomp/ui/sdl_listener.cpp

@@ -1,7 +0,0 @@
-#include "sdl_listener.h"
-
-std::vector<ISDLEventListener*>& GetEventListeners()
-{
-    static std::vector<ISDLEventListener*> g_eventListeners;
-    return g_eventListeners;
-}

UnleashedRecomp/ui/sdl_listener.h

@@ -1,21 +0,0 @@
-#pragma once
-
-class ISDLEventListener
-{
-public:
-    virtual ~ISDLEventListener() = default;
-    virtual void OnSDLEvent(SDL_Event* event) = 0;
-};
-
-extern std::vector<ISDLEventListener*>& GetEventListeners();
-
-class SDLEventListener : public ISDLEventListener
-{
-public:
-    SDLEventListener()
-    {
-        GetEventListeners().emplace_back(this);
-    }
-
-    void OnSDLEvent(SDL_Event* event) override {}
-};

UnleashedRecomp/ui/window_events.h

@@ -1,39 +0,0 @@
-#pragma once
-
-#include <SDL.h>
-#include "ui/game_window.h"
-
-#define SDL_USER_EVILSONIC (SDL_USEREVENT + 1)
-
-inline void SDL_ResizeEvent(SDL_Window* pWindow, int width, int height)
-{
-    SDL_Event event{};
-    event.type = SDL_WINDOWEVENT;
-    event.window.event = SDL_WINDOWEVENT_RESIZED;
-    event.window.windowID = SDL_GetWindowID(pWindow);
-    event.window.data1 = width;
-    event.window.data2 = height;
-
-    SDL_PushEvent(&event);
-}
-
-inline void SDL_MoveEvent(SDL_Window* pWindow, int x, int y)
-{
-    SDL_Event event{};
-    event.type = SDL_WINDOWEVENT;
-    event.window.event = SDL_WINDOWEVENT_MOVED;
-    event.window.windowID = SDL_GetWindowID(pWindow);
-    event.window.data1 = x;
-    event.window.data2 = y;
-
-    SDL_PushEvent(&event);
-}
-
-inline void SDL_User_EvilSonic(bool isEvil)
-{
-    SDL_Event event{};
-    event.type = SDL_USER_EVILSONIC;
-    event.user.code = isEvil;
-
-    SDL_PushEvent(&event);
-}