pandora: tripplebuffer fbdev out, refactoring

[libpicofe.git] / common / menu.c

diff --git a/common/menu.c b/common/menu.c
index c9fc188..ded7bbc 100644 (file)
--- a/common/menu.c
+++ b/common/menu.c
@@ -590,7 +590,16 @@ static void me_loop(menu_entry *menu, int *menu_sel, void (*draw_more)(void))
 /* ***************************************** */\r
 \r
 /* platform specific options and handlers */\r
+#if   defined(__GP2X__)\r
 #include "../gp2x/menu.c"\r
+#elif defined(PANDORA)\r
+#include "../pandora/menu.c"\r
+#else\r
+#define MENU_OPTIONS_GFX\r
+#define MENU_OPTIONS_ADV\r
+#define mgn_opt_renderer NULL /* TODO */\r
+#define menu_main_plat_draw NULL\r
+#endif\r
 \r
 static void draw_menu_credits(void)\r
 {\r
@@ -668,20 +677,18 @@ static void cdload_progress_cb(const char *fname, int percent)
 void menu_romload_prepare(const char *rom_name)\r
 {\r
        const char *p = rom_name + strlen(rom_name);\r
+       int i;\r
 \r
        while (p > rom_name && *p != '/')\r
                p--;\r
 \r
-       /* fill both buffers, callbacks won't update in full */\r
-       plat_video_menu_begin();\r
-       smalltext_out16(1, 1, "Loading", 0xffff);\r
-       smalltext_out16(1, me_sfont_h, p, 0xffff);\r
-       plat_video_menu_end();\r
-\r
-       plat_video_menu_begin();\r
-       smalltext_out16(1, 1, "Loading", 0xffff);\r
-       smalltext_out16(1, me_sfont_h, p, 0xffff);\r
-       plat_video_menu_end();\r
+       /* fill all buffers, callbacks won't update in full */\r
+       for (i = 0; i < 3; i++) {\r
+               plat_video_menu_begin();\r
+               smalltext_out16(1, 1, "Loading", 0xffff);\r
+               smalltext_out16(1, me_sfont_h, p, 0xffff);\r
+               plat_video_menu_end();\r
+       }\r
 \r
        PicoCartLoadProgressCB = load_progress_cb;\r
        PicoCDLoadProgressCB = cdload_progress_cb;\r
@@ -767,8 +774,8 @@ static void draw_dirlist(char *curdir, struct dirent **namelist, int n, int sel)
 //     if (!rom_loaded)\r
 //             menu_darken_bg(gp2x_screen, 320*240, 0);\r
 \r
-       darken_ptr = (short *)g_screen_ptr + g_screen_width * max_cnt/2 * 10;\r
-       menu_darken_bg(darken_ptr, darken_ptr, g_screen_width * 8, 0);\r
+       darken_ptr = (short *)g_screen_ptr + g_screen_width * max_cnt/2 * me_sfont_h;\r
+       menu_darken_bg(darken_ptr, darken_ptr, g_screen_width * me_sfont_h * 8 / 10, 0);\r
 \r
        x = 5 + me_mfont_w + 1;\r
        if (start - 2 >= 0)\r
@@ -1485,6 +1492,7 @@ static menu_entry e_menu_32x_options[] =
 {\r
        mee_onoff("32X enabled",          MA_32XOPT_ENABLE_32X,   PicoOpt, POPT_EN_32X),\r
        mee_onoff("PWM sound",            MA_32XOPT_PWM,          PicoOpt, POPT_EN_PWM),\r
+       mee_end,\r
 };\r
 \r
 static int menu_loop_32x_options(menu_id id, int keys)\r
@@ -1507,7 +1515,7 @@ static menu_entry e_menu_adv_options[] =
        mee_onoff     ("Don't save last used ROM", MA_OPT2_NO_LAST_ROM,   currentConfig.EmuOpt, EOPT_NO_AUTOSVCFG),\r
        mee_onoff     ("Disable idle loop patching",MA_OPT2_NO_IDLE_LOOPS,PicoOpt, POPT_DIS_IDLE_DET),\r
        mee_onoff     ("Disable frame limiter",    MA_OPT2_NO_FRAME_LIMIT,currentConfig.EmuOpt, EOPT_NO_FRMLIMIT),\r
-       MENU_GP2X_OPTIONS_ADV\r
+       MENU_OPTIONS_ADV\r
        mee_end,\r
 };\r
 \r
@@ -1529,7 +1537,7 @@ static int mh_opt_render(menu_id id, int keys)
 static menu_entry e_menu_gfx_options[] =\r
 {\r
        mee_cust      ("Renderer",                 MA_OPT_RENDERER,       mh_opt_render, mgn_opt_renderer),\r
-       MENU_GP2X_OPTIONS_GFX\r
+       MENU_OPTIONS_GFX\r
        mee_end,\r
 };\r
 \r