From 8ffa00c050c0590ac18b04a3e6b85af458139ef1 Mon Sep 17 00:00:00 2001
From: "Allan C. Marques Lira" <acmlira@gmail.com>
Date: Thu, 29 Oct 2020 11:26:37 -0300
Subject: [PATCH] sdl: add blitting to avoid event handling issues

We encountered some problems related to updating screens and handling events.
To solve these problems we started with a generic implementation, now, we
always design on a virtual surface and use `SDL_BlitSurface` to overlay the
previous one.

Author: @acmlira and @flsobral
---
 TotalCrossVM/src/init/tcsdl.cpp | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/TotalCrossVM/src/init/tcsdl.cpp b/TotalCrossVM/src/init/tcsdl.cpp
index 20dbe159e2..10eeac8dd2 100644
--- a/TotalCrossVM/src/init/tcsdl.cpp
+++ b/TotalCrossVM/src/init/tcsdl.cpp
@@ -139,8 +139,6 @@ bool TCSDL_Init(ScreenSurface screen, const char* title, bool fullScreen) {
 			std::cerr << "SDL_CreateTexturet(): " << SDL_GetError() << '\n';
 			return false;
 		}
-	} else {
-		surface = SDL_GetWindowSurface(window);
 	}
 
 	// Get pixel format struct
@@ -161,14 +159,9 @@ bool TCSDL_Init(ScreenSurface screen, const char* title, bool fullScreen) {
 	// pixel order
 	screen->pixelformat = windowPixelFormat;
 
-	if (usesTexture) {
-		// Adjusts screen's pixel surface
-		if (IS_NULL(screen->pixels = (uint8*) malloc(screen->pitch * screen->screenH))) {
-			std::cerr << "Failed to alloc " << (screen->pitch * screen->screenH) << " bytes for pixel surface" << '\n';
-			return false;
-		}
-	}else {
-		screen->pixels = (uint8*) surface->pixels;
+	if (IS_NULL(screen->pixels = (uint8*) malloc(screen->pitch * screen->screenH))) {
+		std::cerr << "Failed to alloc " << (screen->pitch * screen->screenH) << " bytes for pixel surface" << '\n';
+		return false;
 	}
 
 	if (IS_NULL(screen->extension = (ScreenSurfaceEx) malloc(sizeof(TScreenSurfaceEx)))) {
@@ -178,6 +171,15 @@ bool TCSDL_Init(ScreenSurface screen, const char* title, bool fullScreen) {
 		std::cerr << "Failed to alloc TScreenSurfaceEx of " << sizeof(TScreenSurfaceEx) << " bytes" << '\n';
 		return false;
 	}
+
+	surface = SDL_CreateRGBSurfaceWithFormatFrom(
+						screen->pixels, 
+						screen->screenW,
+						screen->screenH,
+						screen->bpp,
+						screen->pitch,
+						windowPixelFormat);
+
 	SCREEN_EX(screen)->window = window;
 	SCREEN_EX(screen)->renderer = renderer;
 	SCREEN_EX(screen)->texture = texture;
@@ -200,6 +202,9 @@ void TCSDL_UpdateTexture(int w, int h, int pitch, void* pixels) {
 	if(usesTexture) {
 		// Update the given texture rectangle with new pixel data.
 		SDL_UpdateTexture(texture, NULL, pixels, pitch);
+	} else {
+		// Copy virtual surface to window surface
+		SDL_BlitSurface(surface, NULL, SDL_GetWindowSurface(window), NULL);
 	}
 	// Call SDL render present
 	TCSDL_Present();