platform sdl, add window size option

diff --git a/platform/common/menu_pico.h b/platform/common/menu_pico.h
index 644fca7..d5ed935 100644 (file)
--- a/platform/common/menu_pico.h
+++ b/platform/common/menu_pico.h
@@ -47,6 +47,7 @@ typedef enum
        MA_OPT_INTERLACED,      /* giz */
        MA_OPT_TEARING_FIX,     /* wiz */
        MA_OPT_VOUT_MODE,
+       MA_OPT_VOUT_SIZE,
        MA_OPT_VOUT_FULL,
        MA_OPT_AUTOLOAD_SAVE,
        MA_OPT_SOUND_FILTER,

diff --git a/platform/common/plat_sdl.c b/platform/common/plat_sdl.c
index 8490212..c6036c3 100644 (file)
--- a/platform/common/plat_sdl.c
+++ b/platform/common/plat_sdl.c
@@ -341,13 +341,9 @@ void plat_video_clear_status(void)
 
 void plat_video_clear_buffers(void)
 {
-       if (plat_sdl_overlay || plat_sdl_gl_active ||
-           plat_sdl_screen->w >= 320*2 || plat_sdl_screen->h >= 240*2)
-               memset(shadow_fb, 0, g_menuscreen_w * g_menuscreen_h * 2);
-       else {
-               memset(g_screen_ptr, 0, plat_sdl_screen->pitch*plat_sdl_screen->h);
-               clear_buf_cnt = 3; // do it thrice in case of triple buffering
-       }
+       memset(shadow_fb, 0, g_menuscreen_w * g_menuscreen_h * 2);
+       memset(plat_sdl_screen->pixels, 0, plat_sdl_screen->pitch*plat_sdl_screen->h);
+       clear_buf_cnt = 3; // do it thrice in case of triple buffering
 }
 
 void plat_video_menu_update(void)
@@ -479,7 +475,7 @@ static void plat_sdl_resize(int w, int h)
        {
                g_menuscreen_h = plat_sdl_screen->h;
                g_menuscreen_w = plat_sdl_screen->w;
-
+#if 0 // auto resizing may be nice, but creates problems on some SDL platforms
                if (!plat_sdl_overlay && !plat_sdl_gl_active &&
                    plat_sdl_is_windowed() && !plat_sdl_is_fullscreen()) {
                        // in SDL window mode, adapt window to integer scaling
@@ -494,6 +490,7 @@ static void plat_sdl_resize(int w, int h)
                                g_menuscreen_h = 240;
                        }
                }
+#endif
        }
 
        resize_buffers();

diff --git a/platform/libpicofe b/platform/libpicofe
index 92bd9c3..023d7e8 160000 (submodule)
--- a/platform/libpicofe
+++ b/platform/libpicofe
@@ -1 +1 @@
-Subproject commit 92bd9c36dac9b5b560ba8f45055f0265a10d979a
+Subproject commit 023d7e890f1c4386ff3bc095efd96eb65fafe389

diff --git a/platform/linux/menu.c b/platform/linux/menu.c
index b37f3a5..11c72db 100644 (file)
--- a/platform/linux/menu.c
+++ b/platform/linux/menu.c
@@ -1,22 +1,50 @@
 // ------------ gfx options menu ------------
 
+#include "../libpicofe/plat_sdl.h"
+
 static const char *men_scaling_opts[] = { "OFF", "software", "hardware", NULL };
 static const char *men_filter_opts[] = { "nearest", "smoother", "bilinear 1", "bilinear 2", NULL };
 
 static const char h_scale[] = "Hardware scaling might not work on some devices";
 static const char h_stype[] = "Scaler algorithm for software scaling";
 
+static const char *mgn_windowsize(int id, int *offs)
+{
+       int scale = g_menuscreen_w / 320;
+
+       if (g_menuscreen_w == scale*320 && g_menuscreen_h == scale*240)
+               sprintf(static_buff, "%dx%d", scale*320, scale*240);
+       else    sprintf(static_buff, "custom");
+       return static_buff;
+}
+
+static int mh_windowsize(int id, int keys)
+{
+       if (keys & (PBTN_LEFT|PBTN_RIGHT)) { // multi choice
+               int scale = g_menuscreen_w / 320;
+               if (keys & PBTN_RIGHT) scale++;
+               if (keys & PBTN_LEFT ) scale--;
+               if (scale <= 0) scale = 1;
+               g_menuscreen_w = scale*320;
+               g_menuscreen_h = scale*240;
+               return 0;
+       }
+       return 1;
+}
+
 #define MENU_OPTIONS_GFX \
+       mee_cust_s_h  ("Window size",            MA_OPT_VOUT_SIZE, 0,mh_windowsize, mgn_windowsize, NULL), \
        mee_enum_h    ("Horizontal scaling",     MA_OPT_SCALING, currentConfig.scaling, men_scaling_opts, h_scale), \
        mee_enum_h    ("Vertical scaling",       MA_OPT_VSCALING, currentConfig.vscaling, men_scaling_opts, h_scale), \
        mee_enum_h    ("Scaler type",            MA_OPT3_FILTERING, currentConfig.filter, men_filter_opts, h_stype), \
 
 #define MENU_OPTIONS_ADV
 
-static menu_entry e_menu_keyconfig[];
+static menu_entry e_menu_keyconfig[], e_menu_gfx_options[];
 
 void linux_menu_init(void)
 {
+       me_enable(e_menu_gfx_options, MA_OPT_VOUT_SIZE, plat_sdl_is_windowed());
        me_enable(e_menu_keyconfig, MA_CTRL_DEADZONE, 0);
 }