From c513c246a5be456b9c452c3dd080ec206e21dc0d Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk002@yahoo.com>
Date: Sun, 26 Feb 2023 21:17:25 -0800
Subject: [PATCH] more SDL wrapping for stonesense

---
 library/include/modules/DFSDL.h |  2 ++
 library/modules/DFSDL.cpp       | 26 +++++++++++++++++++-------
 2 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/library/include/modules/DFSDL.h b/library/include/modules/DFSDL.h
index 226b9f881..9f07ea3db 100644
--- a/library/include/modules/DFSDL.h
+++ b/library/include/modules/DFSDL.h
@@ -81,7 +81,9 @@ void cleanup();
 
 DFHACK_EXPORT DFSDL_Surface * DFIMG_Load(const char *file);
 DFHACK_EXPORT int DFSDL_SetAlpha(DFSDL_Surface *surface, uint32_t flag, uint8_t alpha);
+DFHACK_EXPORT DFSDL_Surface * DFSDL_GetVideoSurface(void);
 DFHACK_EXPORT DFSDL_Surface * DFSDL_CreateRGBSurface(uint32_t flags, int width, int height, int depth, uint32_t Rmask, uint32_t Gmask, uint32_t Bmask, uint32_t Amask);
+DFHACK_EXPORT DFSDL_Surface * DFSDL_CreateRGBSurfaceFrom(void *pixels, int width, int height, int depth, int pitch, uint32_t Rmask, uint32_t Gmask, uint32_t Bmask, uint32_t Amask);
 DFHACK_EXPORT int DFSDL_UpperBlit(DFSDL_Surface *src, const DFSDL_Rect *srcrect, DFSDL_Surface *dst, DFSDL_Rect *dstrect);
 DFHACK_EXPORT DFSDL_Surface * DFSDL_ConvertSurface(DFSDL_Surface *src, const DFSDL_PixelFormat *fmt, uint32_t flags);
 DFHACK_EXPORT void DFSDL_FreeSurface(DFSDL_Surface *surface);
diff --git a/library/modules/DFSDL.cpp b/library/modules/DFSDL.cpp
index 08e213b94..6a3e6af2f 100644
--- a/library/modules/DFSDL.cpp
+++ b/library/modules/DFSDL.cpp
@@ -28,13 +28,15 @@ static const std::vector<std::string> SDL_IMAGE_LIBS {
 
 DFSDL_Surface * (*g_IMG_Load)(const char *) = nullptr;
 int (*g_SDL_SetAlpha)(DFSDL_Surface *, uint32_t, uint8_t) = nullptr;
-DFSDL_Surface * (*g_SDL_CreateRGBSurface)(uint32_t, int, int, int, uint32_t, uint32_t, uint32_t, uint32_t);
-int (*g_SDL_UpperBlit)(DFSDL_Surface *, const DFSDL_Rect *, DFSDL_Surface *, DFSDL_Rect *);
-DFSDL_Surface * (*g_SDL_ConvertSurface)(DFSDL_Surface *, const DFSDL_PixelFormat *, uint32_t);
-void (*g_SDL_FreeSurface)(DFSDL_Surface *);
-int (*g_SDL_SemWait)(DFSDL_sem *);
-int (*g_SDL_SemPost)(DFSDL_sem *);
-int (*g_SDL_PushEvent)(DFSDL_Event *);
+DFSDL_Surface * (*g_SDL_GetVideoSurface)(void) = nullptr;
+DFSDL_Surface * (*g_SDL_CreateRGBSurface)(uint32_t, int, int, int, uint32_t, uint32_t, uint32_t, uint32_t) = nullptr;
+DFSDL_Surface * (*g_SDL_CreateRGBSurfaceFrom)(void *pixels, int width, int height, int depth, int pitch, uint32_t Rmask, uint32_t Gmask, uint32_t Bmask, uint32_t Amask) = nullptr;
+int (*g_SDL_UpperBlit)(DFSDL_Surface *, const DFSDL_Rect *, DFSDL_Surface *, DFSDL_Rect *) = nullptr;
+DFSDL_Surface * (*g_SDL_ConvertSurface)(DFSDL_Surface *, const DFSDL_PixelFormat *, uint32_t) = nullptr;
+void (*g_SDL_FreeSurface)(DFSDL_Surface *) = nullptr;
+int (*g_SDL_SemWait)(DFSDL_sem *) = nullptr;
+int (*g_SDL_SemPost)(DFSDL_sem *) = nullptr;
+int (*g_SDL_PushEvent)(DFSDL_Event *) = nullptr;
 
 bool DFSDL::init(color_ostream &out) {
     for (auto &lib_str : SDL_LIBS) {
@@ -64,7 +66,9 @@ bool DFSDL::init(color_ostream &out) {
 
     bind(g_sdl_image_handle, IMG_Load);
     bind(g_sdl_handle, SDL_SetAlpha);
+    bind(g_sdl_handle, SDL_GetVideoSurface);
     bind(g_sdl_handle, SDL_CreateRGBSurface);
+    bind(g_sdl_handle, SDL_CreateRGBSurfaceFrom);
     bind(g_sdl_handle, SDL_UpperBlit);
     bind(g_sdl_handle, SDL_ConvertSurface);
     bind(g_sdl_handle, SDL_FreeSurface);
@@ -97,10 +101,18 @@ int DFSDL::DFSDL_SetAlpha(DFSDL_Surface *surface, uint32_t flag, uint8_t alpha)
     return g_SDL_SetAlpha(surface, flag, alpha);
 }
 
+DFSDL_Surface * DFSDL::DFSDL_GetVideoSurface(void) {
+    return g_SDL_GetVideoSurface();
+}
+
 DFSDL_Surface * DFSDL::DFSDL_CreateRGBSurface(uint32_t flags, int width, int height, int depth, uint32_t Rmask, uint32_t Gmask, uint32_t Bmask, uint32_t Amask) {
     return g_SDL_CreateRGBSurface(flags, width, height, depth, Rmask, Gmask, Bmask, Amask);
 }
 
+DFSDL_Surface * DFSDL::DFSDL_CreateRGBSurfaceFrom(void *pixels, int width, int height, int depth, int pitch, uint32_t Rmask, uint32_t Gmask, uint32_t Bmask, uint32_t Amask) {
+    return g_SDL_CreateRGBSurfaceFrom(pixels, width, height, depth, pitch, Rmask, Gmask, Bmask, Amask);
+}
+
 int DFSDL::DFSDL_UpperBlit(DFSDL_Surface *src, const DFSDL_Rect *srcrect, DFSDL_Surface *dst, DFSDL_Rect *dstrect) {
     return g_SDL_UpperBlit(src, srcrect, dst, dstrect);
 }