revive pandora and win32 builds, rm gp2x dep for linux, lots of refactoring

[libpicofe.git] / common / menu.c

diff --git a/common/menu.c b/common/menu.c
index b5e5e36..c9fc188 100644 (file)
--- a/common/menu.c
+++ b/common/menu.c
@@ -23,8 +23,9 @@
 #include <pico/patch.h>\r
 \r
 static char static_buff[64];\r
-char menu_error_msg[64] = { 0, };\r
 static int  menu_error_time = 0;\r
+char menu_error_msg[64] = { 0, };\r
+void *g_menubg_ptr;\r
 \r
 #ifndef UIQ3\r
 \r
@@ -300,6 +301,49 @@ void menu_init(void)
 }\r
 \r
 \r
+static void menu_darken_bg(void *dst, void *src, int pixels, int darker)\r
+{\r
+       unsigned int *dest = dst;\r
+       unsigned int *sorc = src;\r
+       pixels /= 2;\r
+       if (darker)\r
+       {\r
+               while (pixels--)\r
+               {\r
+                       unsigned int p = *sorc++;\r
+                       *dest++ = ((p&0xf79ef79e)>>1) - ((p&0xc618c618)>>3);\r
+               }\r
+       }\r
+       else\r
+       {\r
+               while (pixels--)\r
+               {\r
+                       unsigned int p = *sorc++;\r
+                       *dest++ = (p&0xf79ef79e)>>1;\r
+               }\r
+       }\r
+}\r
+\r
+static void menu_enter(int is_rom_loaded)\r
+{\r
+       if (is_rom_loaded)\r
+       {\r
+               // darken the active framebuffer\r
+               menu_darken_bg(g_menubg_ptr, g_screen_ptr, g_screen_width * g_screen_height, 1);\r
+       }\r
+       else\r
+       {\r
+               char buff[256];\r
+\r
+               // should really only happen once, on startup..\r
+               emu_make_path(buff, "skin/background.png", sizeof(buff));\r
+               if (readpng(g_menubg_ptr, buff, READPNG_BG) < 0)\r
+                       memset(g_menubg_ptr, 0, g_screen_width * g_screen_height * 2);\r
+       }\r
+\r
+       plat_video_menu_enter(is_rom_loaded);\r
+}\r
+\r
 static int me_id2offset(const menu_entry *ent, menu_id id)\r
 {\r
        int i;\r
@@ -664,7 +708,7 @@ static void do_delete(const char *fpath, const char *fname)
        plat_video_menu_begin();\r
 \r
        if (!rom_loaded)\r
-               menu_darken_bg(g_screen_ptr, g_screen_width * g_screen_height, 0);\r
+               menu_darken_bg(g_screen_ptr, g_screen_ptr, g_screen_width * g_screen_height, 0);\r
 \r
        len = strlen(fname);\r
        if (len > g_screen_width/6)\r
@@ -712,6 +756,7 @@ static unsigned short file2color(const char *fname)
 static void draw_dirlist(char *curdir, struct dirent **namelist, int n, int sel)\r
 {\r
        int max_cnt, start, i, x, pos;\r
+       void *darken_ptr;\r
 \r
        max_cnt = g_screen_height / me_sfont_h;\r
        start = max_cnt / 2 - sel;\r
@@ -722,7 +767,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
-       menu_darken_bg((short *)g_screen_ptr + g_screen_width * max_cnt/2 * 10, g_screen_width * 8, 0);\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
 \r
        x = 5 + me_mfont_w + 1;\r
        if (start - 2 >= 0)\r
@@ -1002,7 +1048,7 @@ static void draw_savestate_bg(int slot)
 \r
        /* do a frame and fetch menu bg */\r
        pemu_forced_frame(POPT_EN_SOFTSCALE);\r
-       plat_video_menu_enter(1);\r
+       menu_enter(1);\r
 \r
        memcpy(Pico.vram, tmp_vram, sizeof(Pico.vram));\r
        memcpy(Pico.cram, tmp_cram, sizeof(Pico.cram));\r
@@ -1809,7 +1855,7 @@ static void debug_menu_loop(void)
                        case 1: draw_frame_debug(); break;\r
                        case 2: memset(g_screen_ptr, 0, g_screen_width * g_screen_height * 2);\r
                                pemu_forced_frame(0);\r
-                               menu_darken_bg(g_screen_ptr, g_screen_width * g_screen_height, 0);\r
+                               menu_darken_bg(g_screen_ptr, g_screen_ptr, g_screen_width * g_screen_height, 0);\r
                                PDebugShowSpriteStats((unsigned short *)g_screen_ptr + (g_screen_height/2 - 240/2)*g_screen_width +\r
                                        g_screen_width/2 - 320/2, g_screen_width); break;\r
                        case 3: memset(g_screen_ptr, 0, g_screen_width * g_screen_height * 2);\r
@@ -1969,7 +2015,7 @@ void menu_loop(void)
        me_enable(e_menu_main, MA_MAIN_RESET_GAME,  rom_loaded);\r
        me_enable(e_menu_main, MA_MAIN_PATCHES, PicoPatches != NULL);\r
 \r
-       plat_video_menu_enter(rom_loaded);\r
+       menu_enter(rom_loaded);\r
        in_set_blocking(1);\r
        me_loop(e_menu_main, &sel, menu_main_plat_draw);\r
 \r
@@ -2017,7 +2063,7 @@ int menu_loop_tray(void)
 {\r
        int ret = 1, sel = 0;\r
 \r
-       plat_video_menu_enter(rom_loaded);\r
+       menu_enter(rom_loaded);\r
 \r
        in_set_blocking(1);\r
        me_loop(e_menu_tray, &sel, NULL);\r
@@ -2068,29 +2114,6 @@ void menu_plat_setup(int is_wiz)
        e_menu_gfx_options[i].need_to_save = 0;\r
 }\r
 \r
-/* TODO: rename */\r
-void menu_darken_bg(void *dst, int pixels, int darker)\r
-{\r
-       unsigned int *screen = dst;\r
-       pixels /= 2;\r
-       if (darker)\r
-       {\r
-               while (pixels--)\r
-               {\r
-                       unsigned int p = *screen;\r
-                       *screen++ = ((p&0xf79ef79e)>>1) - ((p&0xc618c618)>>3);\r
-               }\r
-       }\r
-       else\r
-       {\r
-               while (pixels--)\r
-               {\r
-                       unsigned int p = *screen;\r
-                       *screen++ = (p&0xf79ef79e)>>1;\r
-               }\r
-       }\r
-}\r
-\r
 /* hidden options for config engine only */\r
 static menu_entry e_menu_hidden[] =\r
 {\r