From d89ef74163ebc57606e42fec87920deac8b30025 Mon Sep 17 00:00:00 2001
From: Armin Novak <anovak@thincast.com>
Date: Mon, 11 Dec 2023 09:56:49 +0100
Subject: [PATCH] [client,sdl] use SDL timer for display resize

* use SDL timer instead of freerdp implementation
* Disable timer after all events have been processed
---
 client/SDL/sdl_disp.cpp | 54 +++++++++++++++++++++++++++++++----------
 client/SDL/sdl_disp.hpp |  8 +++++-
 2 files changed, 48 insertions(+), 14 deletions(-)

diff --git a/client/SDL/sdl_disp.cpp b/client/SDL/sdl_disp.cpp
index d7bd288c0..e3e96b214 100644
--- a/client/SDL/sdl_disp.cpp
+++ b/client/SDL/sdl_disp.cpp
@@ -34,6 +34,7 @@
 #define TAG CLIENT_TAG("sdl.disp")
 
 #define RESIZE_MIN_DELAY 200 /* minimum delay in ms between two resizes */
+#define MAX_RETRIES 5
 
 BOOL sdlDispContext::settings_changed()
 {
@@ -169,7 +170,7 @@ void sdlDispContext::OnActivated(void* context, const ActivatedEventArgs* e)
 		if (e->firstActivation)
 			return;
 
-		sdlDisp->sendResize();
+		sdlDisp->addTimer();
 	}
 }
 
@@ -188,24 +189,40 @@ void sdlDispContext::OnGraphicsReset(void* context, const GraphicsResetEventArgs
 	if (sdlDisp->_activated && !freerdp_settings_get_bool(settings, FreeRDP_Fullscreen))
 	{
 		sdlDisp->set_window_resizable();
-		sdlDisp->sendResize();
+		sdlDisp->addTimer();
 	}
 }
 
-void sdlDispContext::OnTimer(void* context, const TimerEventArgs* e)
+Uint32 sdlDispContext::OnTimer(Uint32 interval, void* param)
 {
-	SdlContext* sdl = nullptr;
+	auto ctx = static_cast<sdlDispContext*>(param);
+	if (!ctx)
+		return 0;
+
+	SdlContext* sdl = ctx->_sdl;
 	sdlDispContext* sdlDisp = nullptr;
 	rdpSettings* settings = nullptr;
 
-	WINPR_UNUSED(e);
-	if (!sdl_disp_check_context(context, &sdl, &sdlDisp, &settings))
-		return;
+	if (!sdl_disp_check_context(sdl->context(), &sdl, &sdlDisp, &settings))
+		return 0;
 
+	WLog_Print(sdl->log, WLOG_TRACE, "checking for display changes...");
 	if (!sdlDisp->_activated || freerdp_settings_get_bool(settings, FreeRDP_Fullscreen))
-		return;
+		return 0;
+	else
+	{
+		auto rc = sdlDisp->sendResize();
+		if (!rc)
+			WLog_Print(sdl->log, WLOG_TRACE, "sent new display layout, result %d", rc);
+	}
+	if (sdlDisp->_timer_retries++ >= MAX_RETRIES)
+	{
+		WLog_Print(sdl->log, WLOG_TRACE, "deactivate timer, retries exceeded");
+		return 0;
+	}
 
-	sdlDisp->sendResize();
+	WLog_Print(sdl->log, WLOG_TRACE, "fire timer one more time");
+	return interval;
 }
 
 UINT sdlDispContext::sendLayout(const rdpMonitor* monitors, size_t nmonitors)
@@ -274,6 +291,17 @@ UINT sdlDispContext::sendLayout(const rdpMonitor* monitors, size_t nmonitors)
 	return ret;
 }
 
+BOOL sdlDispContext::addTimer()
+{
+	SDL_RemoveTimer(_timer);
+	WLog_Print(_sdl->log, WLOG_TRACE, "adding new display check timer");
+
+	_timer_retries = 0;
+	sendResize();
+	_timer = SDL_AddTimer(1000, sdlDispContext::OnTimer, this);
+	return TRUE;
+}
+
 #if SDL_VERSION_ATLEAST(2, 0, 10)
 BOOL sdlDispContext::handle_display_event(const SDL_DisplayEvent* ev)
 {
@@ -320,7 +348,7 @@ BOOL sdlDispContext::handle_window_event(const SDL_WindowEvent* ev)
 		case SDL_WINDOWEVENT_SIZE_CHANGED:
 			_targetWidth = ev->data1;
 			_targetHeight = ev->data2;
-			return sendResize();
+			return addTimer();
 
 		case SDL_WINDOWEVENT_LEAVE:
 			WINPR_ASSERT(_sdl);
@@ -401,7 +429,7 @@ BOOL sdlDispContext::uninit(DispClientContext* disp)
 	return TRUE;
 }
 
-sdlDispContext::sdlDispContext(SdlContext* sdl) : _sdl(sdl)
+sdlDispContext::sdlDispContext(SdlContext* sdl) : _sdl(sdl), _timer(0)
 {
 	WINPR_ASSERT(_sdl);
 	WINPR_ASSERT(_sdl->context()->settings);
@@ -414,7 +442,7 @@ sdlDispContext::sdlDispContext(SdlContext* sdl) : _sdl(sdl)
 	_lastSentHeight = _targetHeight = freerdp_settings_get_uint32(settings, FreeRDP_DesktopHeight);
 	PubSub_SubscribeActivated(pubSub, sdlDispContext::OnActivated);
 	PubSub_SubscribeGraphicsReset(pubSub, sdlDispContext::OnGraphicsReset);
-	PubSub_SubscribeTimer(pubSub, sdlDispContext::OnTimer);
+	addTimer();
 }
 
 sdlDispContext::~sdlDispContext()
@@ -424,5 +452,5 @@ sdlDispContext::~sdlDispContext()
 
 	PubSub_UnsubscribeActivated(pubSub, sdlDispContext::OnActivated);
 	PubSub_UnsubscribeGraphicsReset(pubSub, sdlDispContext::OnGraphicsReset);
-	PubSub_UnsubscribeTimer(pubSub, sdlDispContext::OnTimer);
+	SDL_RemoveTimer(_timer);
 }
diff --git a/client/SDL/sdl_disp.hpp b/client/SDL/sdl_disp.hpp
index d6d1a99c6..aa3fb3799 100644
--- a/client/SDL/sdl_disp.hpp
+++ b/client/SDL/sdl_disp.hpp
@@ -24,6 +24,8 @@
 
 #include "sdl_types.hpp"
 
+#include <SDL.h>
+
 class sdlDispContext
 {
 
@@ -50,12 +52,14 @@ class sdlDispContext
 	BOOL update_last_sent();
 	UINT sendLayout(const rdpMonitor* monitors, size_t nmonitors);
 
+	BOOL addTimer();
+
   private:
 	static UINT DisplayControlCaps(DispClientContext* disp, UINT32 maxNumMonitors,
 	                               UINT32 maxMonitorAreaFactorA, UINT32 maxMonitorAreaFactorB);
 	static void OnActivated(void* context, const ActivatedEventArgs* e);
 	static void OnGraphicsReset(void* context, const GraphicsResetEventArgs* e);
-	static void OnTimer(void* context, const TimerEventArgs* e);
+	static Uint32 SDLCALL OnTimer(Uint32 interval, void* param);
 
   private:
 	SdlContext* _sdl = nullptr;
@@ -73,4 +77,6 @@ class sdlDispContext
 	UINT16 _lastSentDesktopOrientation = 0;
 	UINT32 _lastSentDesktopScaleFactor = 0;
 	UINT32 _lastSentDeviceScaleFactor = 0;
+	SDL_TimerID _timer = 0;
+	unsigned _timer_retries = 0;
 };