sdl, improve window resize handling

diff --git a/platform/common/menu_pico.c b/platform/common/menu_pico.c
index 415e1b5..5bf67b7 100644 (file)
--- a/platform/common/menu_pico.c
+++ b/platform/common/menu_pico.c
@@ -156,6 +156,8 @@ static void copy_bg(int dir)
 
 static void menu_draw_prep(void)
 {
+       plat_video_menu_update();
+
        if (menu_w == g_menuscreen_w && menu_h == g_menuscreen_h)
                return;
        menu_w = g_menuscreen_w, menu_h = g_menuscreen_h;

diff --git a/platform/common/plat_sdl.c b/platform/common/plat_sdl.c
index d1e833f..cdcaee7 100644 (file)
--- a/platform/common/plat_sdl.c
+++ b/platform/common/plat_sdl.c
@@ -285,6 +285,19 @@ void plat_video_clear_buffers(void)
        }
 }
 
+void plat_video_menu_update(void)
+{
+       // w/h might have changed due to resizing
+       plat_sdl_change_video_mode(g_menuscreen_w, g_menuscreen_h, 1);
+       resize_buffers();
+
+       // update pitch as it is needed by the menu bg scaler
+       if (plat_sdl_overlay || plat_sdl_gl_active)
+               g_menuscreen_pp = g_menuscreen_w;
+       else
+               g_menuscreen_pp = plat_sdl_screen->pitch / 2;
+}
+
 void plat_video_menu_enter(int is_rom_loaded)
 {
        if (SDL_MUSTLOCK(plat_sdl_screen))
@@ -293,16 +306,13 @@ void plat_video_menu_enter(int is_rom_loaded)
 
 void plat_video_menu_begin(void)
 {
-       plat_sdl_change_video_mode(g_menuscreen_w, g_menuscreen_h, 1);
-       resize_buffers();
-       if (plat_sdl_overlay || plat_sdl_gl_active) {
-               g_menuscreen_pp = g_menuscreen_w;
+       plat_video_menu_update(); // just in case
+
+       if (plat_sdl_overlay || plat_sdl_gl_active)
                g_menuscreen_ptr = shadow_fb;
-       }
        else {
                if (SDL_MUSTLOCK(plat_sdl_screen))
                        SDL_LockSurface(plat_sdl_screen);
-               g_menuscreen_pp = plat_sdl_screen->pitch / 2;
                g_menuscreen_ptr = plat_sdl_screen->pixels;
        }
 }

diff --git a/platform/gp2x/plat.c b/platform/gp2x/plat.c
index 96e9be0..422b4dd 100644 (file)
--- a/platform/gp2x/plat.c
+++ b/platform/gp2x/plat.c
@@ -147,6 +147,11 @@ void gp2x_make_fb_bufferable(int yes)
 }
 
 /* common */
+void plat_video_menu_update(void)
+{
+       // surface is always the screen
+}
+
 void plat_video_menu_enter(int is_rom_loaded)
 {
        if (gp2x_current_bpp != 16 || gp2x_dev_id == GP2X_DEV_WIZ) {

diff --git a/platform/libpicofe b/platform/libpicofe
index 9fba90a..fbbf5e3 160000 (submodule)
--- a/platform/libpicofe
+++ b/platform/libpicofe
@@ -1 +1 @@
-Subproject commit 9fba90ac323df5d2ad87735f6033ae720e5cb892
+Subproject commit fbbf5e3fc0aff858e206dd98ce4605b960d397cb

diff --git a/platform/linux/emu.c b/platform/linux/emu.c
index 736fbb1..9c9d16c 100644 (file)
--- a/platform/linux/emu.c
+++ b/platform/linux/emu.c
@@ -341,6 +341,10 @@ void pemu_forced_frame(int no_scale, int do_emu)
 \r
        g_menubg_src_ptr = realloc(g_menubg_src_ptr, g_screen_height * g_screen_ppitch * 2);\r
        memcpy(g_menubg_src_ptr, g_screen_ptr, g_screen_height * g_screen_ppitch * 2);\r
+       g_menubg_src_w = g_screen_width;\r
+       g_menubg_src_h = g_screen_height;\r
+       g_menubg_src_pp = g_screen_ppitch;\r
+\r
        currentConfig.scaling = hs, currentConfig.vscaling = vs;\r
 }\r
 \r
@@ -480,9 +484,6 @@ void pemu_loop_end(void)
        /* do one more frame for menu bg */\r
        plat_video_set_shadow(320, 240);\r
        pemu_forced_frame(0, 1);\r
-       g_menubg_src_w = g_screen_width;\r
-       g_menubg_src_h = g_screen_height;\r
-       g_menubg_src_pp = g_screen_ppitch;\r
        if (ghost_buf) {\r
                free(ghost_buf);\r
                ghost_buf = NULL;\r

diff --git a/platform/pandora/plat.c b/platform/pandora/plat.c
index bb7774f..1f056c8 100644 (file)
--- a/platform/pandora/plat.c
+++ b/platform/pandora/plat.c
@@ -199,6 +199,10 @@ void plat_video_toggle_renderer(int change, int is_menu)
                PicoDrawSetOutFormat(PDF_RGB555, 0);\r
 }\r
 \r
+void plat_video_menu_update(void)\r
+{\r
+}\r
+\r
 void plat_video_menu_enter(int is_rom_loaded)\r
 {\r
 }\r

diff --git a/platform/ps2/emu.c b/platform/ps2/emu.c
index 09e13d2..cab389c 100644 (file)
--- a/platform/ps2/emu.c
+++ b/platform/ps2/emu.c
@@ -868,6 +868,12 @@ void plat_video_wait_vsync(void)
        gsKit_sync(gsGlobal);
 }
 
+/* update surface data */
+void plat_video_menu_update(void)
+{
+       // surface is always the screen
+}
+
 /* switch from emulation display to menu display */
 void plat_video_menu_enter(int is_rom_loaded)
 {

diff --git a/platform/psp/plat.c b/platform/psp/plat.c
index 53e1361..0548278 100644 (file)
--- a/platform/psp/plat.c
+++ b/platform/psp/plat.c
@@ -98,6 +98,12 @@ void plat_video_wait_vsync(void)
        sceDisplayWaitVblankStart();
 }
 
+/* update surface data */
+void plat_video_menu_update(void)
+{
+       // surface is always the screen
+}
+
 /* switch from emulation display to menu display */
 void plat_video_menu_enter(int is_rom_loaded)
 {