fix some issues with menu bg

[picodrive.git] / platform / common / plat_sdl.c

diff --git a/platform/common/plat_sdl.c b/platform/common/plat_sdl.c
index fc7b200..4446f72 100644 (file)
--- a/platform/common/plat_sdl.c
+++ b/platform/common/plat_sdl.c
@@ -17,9 +17,11 @@
 #include "input_pico.h"
 #include "version.h"
 
+#include <pico/pico.h>
+
 static void *shadow_fb;
 
-static const struct in_default_bind in_sdl_defbinds[] = {
+const struct in_default_bind in_sdl_defbinds[] __attribute__((weak)) = {
        { SDLK_UP,     IN_BINDTYPE_PLAYER12, GBTN_UP },
        { SDLK_DOWN,   IN_BINDTYPE_PLAYER12, GBTN_DOWN },
        { SDLK_LEFT,   IN_BINDTYPE_PLAYER12, GBTN_LEFT },
@@ -33,6 +35,7 @@ static const struct in_default_bind in_sdl_defbinds[] = {
        { SDLK_RETURN, IN_BINDTYPE_PLAYER12, GBTN_START },
        { SDLK_f,      IN_BINDTYPE_PLAYER12, GBTN_MODE },
        { SDLK_ESCAPE, IN_BINDTYPE_EMU, PEVB_MENU },
+       { SDLK_TAB,    IN_BINDTYPE_EMU, PEVB_RESET },
        { SDLK_F1,     IN_BINDTYPE_EMU, PEVB_STATE_SAVE },
        { SDLK_F2,     IN_BINDTYPE_EMU, PEVB_STATE_LOAD },
        { SDLK_F3,     IN_BINDTYPE_EMU, PEVB_SSLOT_PREV },
@@ -45,6 +48,44 @@ static const struct in_default_bind in_sdl_defbinds[] = {
        { 0, 0, 0 }
 };
 
+const struct menu_keymap in_sdl_key_map[] __attribute__((weak)) =
+{
+       { SDLK_UP,      PBTN_UP },
+       { SDLK_DOWN,    PBTN_DOWN },
+       { SDLK_LEFT,    PBTN_LEFT },
+       { SDLK_RIGHT,   PBTN_RIGHT },
+       { SDLK_RETURN,  PBTN_MOK },
+       { SDLK_ESCAPE,  PBTN_MBACK },
+       { SDLK_SEMICOLON,       PBTN_MA2 },
+       { SDLK_QUOTE,   PBTN_MA3 },
+       { SDLK_LEFTBRACKET,  PBTN_L },
+       { SDLK_RIGHTBRACKET, PBTN_R },
+};
+
+const struct menu_keymap in_sdl_joy_map[] __attribute__((weak)) =
+{
+       { SDLK_UP,      PBTN_UP },
+       { SDLK_DOWN,    PBTN_DOWN },
+       { SDLK_LEFT,    PBTN_LEFT },
+       { SDLK_RIGHT,   PBTN_RIGHT },
+       /* joystick */
+       { SDLK_WORLD_0, PBTN_MOK },
+       { SDLK_WORLD_1, PBTN_MBACK },
+       { SDLK_WORLD_2, PBTN_MA2 },
+       { SDLK_WORLD_3, PBTN_MA3 },
+};
+
+extern const char * const in_sdl_key_names[] __attribute__((weak));
+
+static const 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 */
 static int yuv_ry[32], yuv_gy[32], yuv_by[32];
 static unsigned char yuv_u[32 * 2], yuv_v[32 * 2];
@@ -117,19 +158,19 @@ void plat_video_flip(void)
 
                SDL_LockYUVOverlay(plat_sdl_overlay);
                rgb565_to_uyvy(plat_sdl_overlay->pixels[0], shadow_fb,
-                               g_screen_width * g_screen_height);
+                               g_screen_ppitch * g_screen_height);
                SDL_UnlockYUVOverlay(plat_sdl_overlay);
                SDL_DisplayYUVOverlay(plat_sdl_overlay, &dstrect);
        }
        else if (plat_sdl_gl_active) {
-               gl_flip(shadow_fb, g_screen_width, g_screen_height);
+               gl_flip(shadow_fb, g_screen_ppitch, g_screen_height);
        }
        else {
                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_width * 2);
+               PicoDrawSetOutBuf(g_screen_ptr, g_screen_ppitch * 2);
        }
 }
 
@@ -163,13 +204,13 @@ void plat_video_menu_end(void)
 
                SDL_LockYUVOverlay(plat_sdl_overlay);
                rgb565_to_uyvy(plat_sdl_overlay->pixels[0], shadow_fb,
-                               g_menuscreen_w * g_menuscreen_h);
+                               g_menuscreen_pp * g_menuscreen_h);
                SDL_UnlockYUVOverlay(plat_sdl_overlay);
 
                SDL_DisplayYUVOverlay(plat_sdl_overlay, &dstrect);
        }
        else if (plat_sdl_gl_active) {
-               gl_flip(g_menuscreen_ptr, g_menuscreen_w, g_menuscreen_h);
+               gl_flip(g_menuscreen_ptr, g_menuscreen_pp, g_menuscreen_h);
        }
        else {
                if (SDL_MUSTLOCK(plat_sdl_screen))
@@ -196,7 +237,7 @@ void plat_video_loop_prepare(void)
                        SDL_LockSurface(plat_sdl_screen);
                g_screen_ptr = plat_sdl_screen->pixels;
        }
-       PicoDrawSetOutBuf(g_screen_ptr, g_screen_width * 2);
+       PicoDrawSetOutBuf(g_screen_ptr, g_screen_ppitch * 2);
 }
 
 void plat_early_init(void)
@@ -224,6 +265,7 @@ void plat_init(void)
 
        g_menuscreen_w = plat_sdl_screen->w;
        g_menuscreen_h = plat_sdl_screen->h;
+       g_menuscreen_pp = g_menuscreen_w;
        g_menuscreen_ptr = NULL;
 
        shadow_size = g_menuscreen_w * g_menuscreen_h * 2;
@@ -231,7 +273,7 @@ void plat_init(void)
                shadow_size = 320 * 480 * 2;
 
        shadow_fb = malloc(shadow_size);
-       g_menubg_ptr = malloc(shadow_size);
+       g_menubg_ptr = calloc(1, shadow_size);
        if (shadow_fb == NULL || g_menubg_ptr == NULL) {
                fprintf(stderr, "OOM\n");
                exit(1);
@@ -239,9 +281,10 @@ void plat_init(void)
 
        g_screen_width = 320;
        g_screen_height = 240;
+       g_screen_ppitch = 320;
        g_screen_ptr = shadow_fb;
 
-       in_sdl_init(in_sdl_defbinds, plat_sdl_event_handler);
+       in_sdl_init(&in_sdl_platform_data, plat_sdl_event_handler);
        in_probe();
 
        bgr_to_uyvy_init();