From 0627baa93986a9ad239f277bbe4a697c5663fbd8 Mon Sep 17 00:00:00 2001
From: akallabeth <akallabeth@posteo.net>
Date: Fri, 14 Apr 2023 11:50:17 +0200
Subject: [PATCH] [client,sdl] move functions to proper place

---
 client/SDL/sdl_freerdp.cpp | 37 +++++++++++++++++++++++++++++++++++++
 client/SDL/sdl_freerdp.hpp |  3 +++
 client/SDL/sdl_utils.cpp   | 37 -------------------------------------
 client/SDL/sdl_utils.hpp   |  5 -----
 4 files changed, 40 insertions(+), 42 deletions(-)

diff --git a/client/SDL/sdl_freerdp.cpp b/client/SDL/sdl_freerdp.cpp
index 67eeaa6c3..e949fab18 100644
--- a/client/SDL/sdl_freerdp.cpp
+++ b/client/SDL/sdl_freerdp.cpp
@@ -1277,3 +1277,40 @@ int main(int argc, char* argv[])
 
 	return rc;
 }
+
+BOOL update_fullscreen(sdlContext* sdl, BOOL enter)
+{
+	WINPR_ASSERT(sdl);
+
+	CriticalSectionLock lock(sdl->critical);
+	for (uint32_t x = 0; x < sdl->windowCount; x++)
+	{
+		sdl_window_t* window = &sdl->windows[x];
+		if (!sdl_push_user_event(SDL_USEREVENT_WINDOW_FULLSCREEN, window->window, enter))
+			return FALSE;
+	}
+	sdl->fullscreen = enter;
+	return TRUE;
+}
+
+BOOL update_resizeable(sdlContext* sdl, BOOL enable)
+{
+	WINPR_ASSERT(sdl);
+
+	CriticalSectionLock lock(sdl->critical);
+
+	const rdpSettings* settings = sdl->common.context.settings;
+	const BOOL dyn = freerdp_settings_get_bool(settings, FreeRDP_DynamicResolutionUpdate);
+	const BOOL smart = freerdp_settings_get_bool(settings, FreeRDP_SmartSizing);
+	BOOL use = (dyn && enable) || smart;
+
+	for (uint32_t x = 0; x < sdl->windowCount; x++)
+	{
+		sdl_window_t* window = &sdl->windows[x];
+		if (!sdl_push_user_event(SDL_USEREVENT_WINDOW_RESIZEABLE, window->window, use))
+			return FALSE;
+	}
+	sdl->resizeable = use;
+
+	return TRUE;
+}
diff --git a/client/SDL/sdl_freerdp.hpp b/client/SDL/sdl_freerdp.hpp
index 6222c7dfb..633dfdf25 100644
--- a/client/SDL/sdl_freerdp.hpp
+++ b/client/SDL/sdl_freerdp.hpp
@@ -69,3 +69,6 @@ struct sdl_context
 
 	wLog* log;
 };
+
+BOOL update_resizeable(sdlContext* sdl, BOOL enable);
+BOOL update_fullscreen(sdlContext* sdl, BOOL enter);
diff --git a/client/SDL/sdl_utils.cpp b/client/SDL/sdl_utils.cpp
index 672e151e8..0eb1a32db 100644
--- a/client/SDL/sdl_utils.cpp
+++ b/client/SDL/sdl_utils.cpp
@@ -173,40 +173,3 @@ BOOL sdl_push_user_event(Uint32 type, ...)
 	va_end(ap);
 	return SDL_PushEvent(&ev) == 1;
 }
-
-BOOL update_fullscreen(sdlContext* sdl, BOOL enter)
-{
-	WINPR_ASSERT(sdl);
-
-	CriticalSectionLock lock(sdl->critical);
-	for (uint32_t x = 0; x < sdl->windowCount; x++)
-	{
-		sdl_window_t* window = &sdl->windows[x];
-		if (!sdl_push_user_event(SDL_USEREVENT_WINDOW_FULLSCREEN, window->window, enter))
-			return FALSE;
-	}
-	sdl->fullscreen = enter;
-	return TRUE;
-}
-
-BOOL update_resizeable(sdlContext* sdl, BOOL enable)
-{
-	WINPR_ASSERT(sdl);
-
-	CriticalSectionLock lock(sdl->critical);
-
-	const rdpSettings* settings = sdl->common.context.settings;
-	const BOOL dyn = freerdp_settings_get_bool(settings, FreeRDP_DynamicResolutionUpdate);
-	const BOOL smart = freerdp_settings_get_bool(settings, FreeRDP_SmartSizing);
-	BOOL use = (dyn && enable) || smart;
-
-	for (uint32_t x = 0; x < sdl->windowCount; x++)
-	{
-		sdl_window_t* window = &sdl->windows[x];
-		if (!sdl_push_user_event(SDL_USEREVENT_WINDOW_RESIZEABLE, window->window, use))
-			return FALSE;
-	}
-	sdl->resizeable = use;
-
-	return TRUE;
-}
diff --git a/client/SDL/sdl_utils.hpp b/client/SDL/sdl_utils.hpp
index 7c1720abc..f9daf06aa 100644
--- a/client/SDL/sdl_utils.hpp
+++ b/client/SDL/sdl_utils.hpp
@@ -25,8 +25,6 @@
 #include <stdbool.h>
 #include <SDL.h>
 
-#include "sdl_types.hpp"
-
 class CriticalSectionLock
 {
   public:
@@ -55,9 +53,6 @@ enum
 	SDL_USEREVENT_POINTER_SET
 };
 
-BOOL update_resizeable(sdlContext* sdl, BOOL enable);
-BOOL update_fullscreen(sdlContext* sdl, BOOL enter);
-
 BOOL sdl_push_user_event(Uint32 type, ...);
 
 const char* sdl_event_type_str(Uint32 type);