From: kub <derkub@gmail.com>
Date: Sun, 2 Aug 2020 21:17:57 +0000 (+0200)
Subject: SDL UI, fix SDL input and SDL window output mode for osx compile
X-Git-Tag: v2.00~698
X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1f49b7503216a370fed12ff3128ea76eba47ae25;p=picodrive.git

SDL UI, fix SDL input and SDL window output mode for osx compile

NB for osx >= 10.14 you need SDL >= rev 13688 (ATM only available from SDL repo)
---

diff --git a/Makefile b/Makefile
index d5953bef..31a23ab8 100644
--- a/Makefile
+++ b/Makefile
@@ -206,6 +206,10 @@ include platform/common/common.mak
 OBJS += $(OBJS_COMMON)
 CFLAGS += $(addprefix -D,$(DEFINES))
 
+ifneq (,$(findstring sdl,$(OBJS)))
+CFLAGS += -DUSE_SDL
+endif
+
 ifneq ($(findstring gcc,$(CC)),)
 LDFLAGS += -Wl,-Map=$(TARGET).map
 endif
diff --git a/pico/pico.h b/pico/pico.h
index 5dac5c29..4cc29433 100644
--- a/pico/pico.h
+++ b/pico/pico.h
@@ -10,6 +10,7 @@
 #ifndef PICO_H
 #define PICO_H
 
+#include <stdint.h> // [u]int<n>_t
 #include <stdlib.h> // size_t
 
 #ifdef __cplusplus
diff --git a/platform/common/main.c b/platform/common/main.c
index e7b04466..6acdf531 100644
--- a/platform/common/main.c
+++ b/platform/common/main.c
@@ -10,6 +10,9 @@
 #include <stdlib.h>
 #include <string.h>
 #include <strings.h>
+#ifdef USE_SDL
+#include <SDL.h>
+#endif
 
 #include "../libpicofe/input.h"
 #include "../libpicofe/plat.h"
@@ -83,12 +86,12 @@ int main(int argc, char *argv[])
 
 	plat_target_init();
 	plat_init();
+	menu_init();
 
 	emu_prep_defconfig(); // depends on input
 	emu_read_config(NULL, 0);
 
 	emu_init();
-	menu_init();
 
 #ifdef GPERF
 	ProfilerStart("gperf.out");
diff --git a/platform/common/plat_sdl.c b/platform/common/plat_sdl.c
index 276a0c61..92da9f40 100644
--- a/platform/common/plat_sdl.c
+++ b/platform/common/plat_sdl.c
@@ -75,15 +75,15 @@ const struct menu_keymap in_sdl_joy_map[] __attribute__((weak)) =
 	{ SDLK_WORLD_3,	PBTN_MA3 },
 };
 
-extern const char * const in_sdl_key_names[] __attribute__((weak));
+const char *const *in_sdl_key_names_p __attribute__((weak)) = NULL;
 
-static const struct in_pdata in_sdl_platform_data = {
+
+static struct in_pdata in_sdl_platform_data = {
 	.defbinds = in_sdl_defbinds,
 	.key_map = in_sdl_key_map,
 	.kmap_size = sizeof(in_sdl_key_map) / sizeof(in_sdl_key_map[0]),
 	.joy_map = in_sdl_joy_map,
 	.jmap_size = sizeof(in_sdl_joy_map) / sizeof(in_sdl_joy_map[0]),
-	.key_names = in_sdl_key_names,
 };
 
 /* YUV stuff */
@@ -177,8 +177,10 @@ void plat_video_flip(void)
 		if (SDL_MUSTLOCK(plat_sdl_screen))
 			SDL_UnlockSurface(plat_sdl_screen);
 		SDL_Flip(plat_sdl_screen);
-		g_screen_ptr = plat_sdl_screen->pixels;
-		PicoDrawSetOutBuf(g_screen_ptr, g_screen_ppitch * 2);
+		if (g_screen_ptr != shadow_fb) {
+			g_screen_ptr = plat_sdl_screen->pixels;
+			plat_video_toggle_renderer(0, 0);
+		}
 	}
 }
 
@@ -244,8 +246,8 @@ void plat_video_loop_prepare(void)
 		if (SDL_MUSTLOCK(plat_sdl_screen))
 			SDL_LockSurface(plat_sdl_screen);
 		g_screen_ptr = plat_sdl_screen->pixels;
+		plat_video_toggle_renderer(0, 0);
 	}
-	PicoDrawSetOutBuf(g_screen_ptr, g_screen_ppitch * 2);
 }
 
 void plat_early_init(void)
@@ -292,6 +294,7 @@ void plat_init(void)
 	g_screen_ppitch = 320;
 	g_screen_ptr = shadow_fb;
 
+	in_sdl_platform_data.key_names = in_sdl_key_names_p;
 	in_sdl_init(&in_sdl_platform_data, plat_sdl_event_handler);
 	in_probe();
 
diff --git a/platform/opendingux/inputmap.c b/platform/opendingux/inputmap.c
index 8c4ba6a0..388d5e01 100644
--- a/platform/opendingux/inputmap.c
+++ b/platform/opendingux/inputmap.c
@@ -83,3 +83,4 @@ const char * const in_sdl_key_names[SDLK_LAST] = {
 	[SDLK_KP_PERIOD] = "R3",
 };
 #endif
+const char *const *in_sdl_key_names_p = in_sdl_key_names;