X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=psp%2Fmenu.c;h=e1daabfbfc829141536c61fadac0d7d817a8124c;hb=c633456460a2995bfa4732fb2fb0bca3c785936e;hp=18c8536a81a4566d8e50523dadc8c1703b7d5124;hpb=2951214ea65ce2e2ac40671511b8d5a9ea2d2842;p=libpicofe.git diff --git a/psp/menu.c b/psp/menu.c index 18c8536..e1daabf 100644 --- a/psp/menu.c +++ b/psp/menu.c @@ -1,4 +1,4 @@ -// (c) Copyright 2006,2007 notaz, All rights reserved. +// (c) Copyright 2007 notaz, All rights reserved. // Free for non-commercial use. // For commercial use, separate licencing terms must be obtained. @@ -6,21 +6,21 @@ // don't like to use loads of #ifdefs, so duplicating GP2X code // horribly instead -//#include #include #include #include #include -#include // for opendir #include // PATH_MAX #include #include #include +#include #include "psp.h" #include "emu.h" #include "menu.h" +#include "mp3.h" #include "../common/menu.h" #include "../common/emu.h" #include "../common/readpng.h" @@ -34,38 +34,39 @@ #define pspKeyUnkn "???" static const char * const pspKeyNames[] = { - "SELECT", pspKeyUnkn, pspKeyUnkn, "START", "UP", "RIGHT", "DOWN", "LEFT", - "L", "R", pspKeyUnkn, pspKeyUnkn, "TRIANGLE", "CIRCLE", "X", "SQUARE", - "HOME", "HOLD", "WLAN_UP", "REMOTE", "VOLUP", "VOLDOWN", "SCREEN", "NOTE", - pspKeyUnkn, pspKeyUnkn, pspKeyUnkn, pspKeyUnkn, pspKeyUnkn, pspKeyUnkn, pspKeyUnkn, pspKeyUnkn + "SELECT", pspKeyUnkn, pspKeyUnkn, "START", "UP", "RIGHT", "DOWN", "LEFT", + "L", "R", pspKeyUnkn, pspKeyUnkn, "TRIANGLE", "CIRCLE", "X", "SQUARE", + "HOME", "HOLD", "WLAN_UP", "REMOTE", "VOLUP", "VOLDOWN", "SCREEN", "NOTE", + pspKeyUnkn, pspKeyUnkn, pspKeyUnkn, pspKeyUnkn, "NUB UP", "NUB RIGHT", "NUB DOWN", "NUB LEFT" // fake }; -unsigned int __attribute__((aligned(16))) guCmdList[1024]; // TODO: adjust, mv - -static unsigned char bg_buffer[480*272*2] __attribute__((aligned(16))); // TODO: move to vram? +static unsigned short bg_buffer[480*272] __attribute__((aligned(16))); #define menu_screen psp_screen static void menu_darken_bg(void *dst, const void *src, int pixels, int darker); -static void menu_prepare_bg(int use_game_bg); +static void menu_prepare_bg(int use_game_bg, int use_fg); static unsigned int inp_prev = 0; -static unsigned long wait_for_input(unsigned int interesting) +static unsigned long wait_for_input(unsigned int interesting, int is_key_config) { unsigned int ret; static int repeats = 0, wait = 50; - int release = 0, i; + int release = 0, count, i; + + if (!is_key_config) + interesting |= (interesting & 0xf0) << 24; // also use analog if (repeats == 2 || repeats == 4) wait /= 2; if (repeats == 6) wait = 15; - for (i = 0; i < 6 && inp_prev == psp_pad_read(); i++) { + for (i = 0; i < 6 && inp_prev == psp_pad_read(1); i++) { if (i == 0) repeats++; psp_msleep(wait); } - while ( !((ret = psp_pad_read()) & interesting) ) { + for (count = 0; !((ret = psp_pad_read(1)) & interesting) && count < 100; count++) { psp_msleep(50); release = 1; } @@ -76,6 +77,9 @@ static unsigned long wait_for_input(unsigned int interesting) } inp_prev = ret; + if (!is_key_config) + ret |= (ret & 0xf0000000) >> 24; // use analog as d-pad + // we don't need diagonals in menus if ((ret&BTN_UP) && (ret&BTN_LEFT)) ret &= ~BTN_LEFT; if ((ret&BTN_UP) && (ret&BTN_RIGHT)) ret &= ~BTN_RIGHT; @@ -93,33 +97,53 @@ static void menu_draw_begin(void) // for (i = 272; i >= 0; i--, dst += 512, src += 480) // memcpy32((int *)dst, (int *)src, 480*2/4); + sceGuSync(0,0); // sync with prev sceGuStart(GU_DIRECT, guCmdList); sceGuCopyImage(GU_PSM_5650, 0, 0, 480, 272, 480, bg_buffer, 0, 0, 512, menu_screen); sceGuFinish(); - sceGuSync(0, GU_SYNC_FINISH); + sceGuSync(0,0); } static void menu_draw_end(void) { - sceDisplayWaitVblankStart(); - psp_video_flip(); + psp_video_flip(1); } // --------- loading ROM screen ---------- +static int lcdr_line = 0; + static void load_progress_cb(int percent) { int ln, len = percent * 480 / 100; unsigned short *dst; - sceDisplayWaitVblankStart(); + //sceDisplayWaitVblankStart(); + + dst = (unsigned short *)menu_screen + 512*10*lcdr_line; + + if (len > 480) len = 480; + for (ln = 8; ln > 0; ln--, dst += 512) + memset(dst, 0xff, len*2); +} + +static void cdload_progress_cb(int percent) +{ + int ln, len = percent * 480 / 100; + unsigned short *dst; + + if (lcdr_line <= 2) { + lcdr_line++; + smalltext_out16(1, lcdr_line++ * 10, "Processing CD image / MP3s", 0xffff); + smalltext_out16_lim(1, lcdr_line++ * 10, romFileName, 0xffff, 80); + } - dst = (unsigned short *)menu_screen + 512*20; + dst = (unsigned short *)menu_screen + 512*10*lcdr_line; if (len > 480) len = 480; - for (ln = 10; ln > 0; ln--, dst += 512) + for (ln = 8; ln > 0; ln--, dst += 512) memset(dst, 0xff, len*2); } @@ -129,17 +153,20 @@ void menu_romload_prepare(const char *rom_name) while (p > rom_name && *p != '/') p--; psp_video_switch_to_single(); - menu_draw_begin(); + if (rom_data) menu_draw_begin(); + else memset32_uncached(psp_screen, 0, 512*272*2/4); smalltext_out16(1, 1, "Loading", 0xffff); smalltext_out16_lim(1, 10, p, 0xffff, 80); PicoCartLoadProgressCB = load_progress_cb; + PicoCDLoadProgressCB = cdload_progress_cb; + lcdr_line = 2; } void menu_romload_end(void) { - PicoCartLoadProgressCB = NULL; - smalltext_out16(1, 30, "Starting emulation...", 0xffff); + PicoCartLoadProgressCB = PicoCDLoadProgressCB = NULL; + smalltext_out16(1, ++lcdr_line*10, "Starting emulation...", 0xffff); } // -------------- ROM selector -------------- @@ -154,7 +181,7 @@ struct my_dirent char d_name[255]; }; -// rrrr rggg gggb bbbb +// bbbb bggg gggr rrrr static unsigned short file2color(const char *fname) { const char *ext = fname + strlen(fname) - 3; @@ -164,7 +191,7 @@ static unsigned short file2color(const char *fname) if (ext < fname) ext = fname; for (i = 0; i < sizeof(rom_exts)/sizeof(rom_exts[0]); i++) - if (strcasecmp(ext, rom_exts[i]) == 0) return 0xbdff; + if (strcasecmp(ext, rom_exts[i]) == 0) return 0xfdf7; for (i = 0; i < sizeof(other_exts)/sizeof(other_exts[0]); i++) if (strcasecmp(ext, other_exts[i]) == 0) return 0xaff5; return 0xffff; @@ -192,11 +219,11 @@ static void draw_dirlist(char *curdir, struct my_dirent **namelist, int n, int s if (pos < 0) continue; if (pos > 26) break; if (namelist[i+1]->d_type & DT_DIR) { - smalltext_out16_lim(14, pos*10, "/", 0xfff6, 1); - smalltext_out16_lim(14+6, pos*10, namelist[i+1]->d_name, 0xfff6, 53-3); + smalltext_out16_lim(14, pos*10, "/", 0xd7ff, 1); + smalltext_out16_lim(14+6, pos*10, namelist[i+1]->d_name, 0xd7ff, 80-3); } else { unsigned short color = file2color(namelist[i+1]->d_name); - smalltext_out16_lim(14, pos*10, namelist[i+1]->d_name, color, 53-2); + smalltext_out16_lim(14, pos*10, namelist[i+1]->d_name, color, 80-2); } } text_out16(5, 130, ">"); @@ -250,6 +277,9 @@ static int my_scandir(const char *dir, struct my_dirent ***namelist_out, dir_uid = sceIoDopen(dir); if (dir_uid >= 0) { + /* it is very important to clear SceIoDirent to be passed to sceIoDread(), */ + /* or else it may crash, probably misinterpreting something in it. */ + memset(&sce_ent, 0, sizeof(sce_ent)); ret = sceIoDread(dir_uid, &sce_ent); if (ret < 0) { @@ -266,7 +296,7 @@ static int my_scandir(const char *dir, struct my_dirent ***namelist_out, if (ent == NULL) { lprintf("%s:%i: OOM\n", __FILE__, __LINE__); goto fail; } ent->d_type = sce_ent.d_stat.st_attr; strncpy(ent->d_name, sce_ent.d_name, sizeof(ent->d_name)); - ent->d_name[sizeof(ent->d_name)] = 0; + ent->d_name[sizeof(ent->d_name)-1] = 0; if (filter == NULL || filter(ent)) namelist[name_count++] = ent; else free(ent); @@ -280,6 +310,7 @@ static int my_scandir(const char *dir, struct my_dirent ***namelist_out, namelist = tmp; } + memset(&sce_ent, 0, sizeof(sce_ent)); ret = sceIoDread(dir_uid, &sce_ent); } @@ -304,28 +335,34 @@ end: } +static SceIoStat cpstat; + static char *romsel_loop(char *curr_path) { struct my_dirent **namelist; - DIR *dir; - int n, sel = 0; + int n, iret, sel = 0; unsigned long inp = 0; char *ret = NULL, *fname = NULL; // is this a dir or a full path? - if ((dir = opendir(curr_path))) { - closedir(dir); - } else { + memset(&cpstat, 0, sizeof(cpstat)); + iret = sceIoGetstat(curr_path, &cpstat); + if (iret >= 0 && (cpstat.st_attr & FIO_SO_IFREG)) { // file char *p; for (p = curr_path + strlen(curr_path) - 1; p > curr_path && *p != '/'; p--); - *p = 0; - fname = p+1; + if (p > curr_path) { + *p = 0; + fname = p+1; + } + else strcpy(curr_path, "ms0:/"); } + else if (iret >= 0 && (cpstat.st_attr & FIO_SO_IFDIR)); // dir + else strcpy(curr_path, "ms0:/"); // something else n = my_scandir(curr_path, &namelist, scandir_filter, scandir_cmp); if (n < 0) { // try root.. - n = my_scandir("/", &namelist, scandir_filter, scandir_cmp); + n = my_scandir("ms0:/", &namelist, scandir_filter, scandir_cmp); if (n < 0) { // oops, we failed lprintf("scandir failed, dir: "); lprintf(curr_path); lprintf("\n"); @@ -347,14 +384,14 @@ static char *romsel_loop(char *curr_path) for (;;) { draw_dirlist(curr_path, namelist, n, sel); - inp = wait_for_input(BTN_UP|BTN_DOWN|BTN_LEFT|BTN_RIGHT|BTN_L|BTN_R|BTN_X|BTN_CIRCLE); + inp = wait_for_input(BTN_UP|BTN_DOWN|BTN_LEFT|BTN_RIGHT|BTN_L|BTN_R|BTN_X|BTN_CIRCLE, 0); if(inp & BTN_UP ) { sel--; if (sel < 0) sel = n-2; } if(inp & BTN_DOWN) { sel++; if (sel > n-2) sel = 0; } if(inp & BTN_LEFT) { sel-=10; if (sel < 0) sel = 0; } if(inp & BTN_L) { sel-=24; if (sel < 0) sel = 0; } if(inp & BTN_RIGHT) { sel+=10; if (sel > n-2) sel = n-2; } if(inp & BTN_R) { sel+=24; if (sel > n-2) sel = n-2; } - if(inp & BTN_X) { // enter dir/select + if(inp & BTN_CIRCLE) { // enter dir/select if (namelist[sel+1]->d_type & DT_REG) { strcpy(romFileName, curr_path); strcat(romFileName, "/"); @@ -368,8 +405,8 @@ static char *romsel_loop(char *curr_path) char *start = curr_path; p = start + strlen(start) - 1; while (*p == '/' && p > start) p--; - while (*p != '/' && p > start) p--; - if (p <= start) strcpy(newdir, "/"); + while (*p != '/' && *p != ':' && p > start) p--; + if (p <= start || *p == ':') strcpy(newdir, "ms0:/"); else { strncpy(newdir, start, p-start); newdir[p-start] = 0; } } else { strcpy(newdir, curr_path); @@ -383,7 +420,7 @@ static char *romsel_loop(char *curr_path) break; } } - if(inp & BTN_CIRCLE) break; // cancel + if(inp & BTN_X) break; // cancel } if (n > 0) { @@ -420,8 +457,10 @@ static void draw_debug(void) static void debug_menu_loop(void) { + int ret = 0; draw_debug(); - wait_for_input(BTN_X|BTN_CIRCLE); + while (!(ret & (BTN_X|BTN_CIRCLE))) + ret = wait_for_input(BTN_X|BTN_CIRCLE, 0); } // ------------ patch/gg menu ------------ @@ -458,17 +497,17 @@ static void patches_menu_loop(void) for(;;) { draw_patchlist(menu_sel); - inp = wait_for_input(BTN_UP|BTN_DOWN|BTN_LEFT|BTN_RIGHT|BTN_L|BTN_R|BTN_X|BTN_CIRCLE); + inp = wait_for_input(BTN_UP|BTN_DOWN|BTN_LEFT|BTN_RIGHT|BTN_L|BTN_R|BTN_X|BTN_CIRCLE, 0); if(inp & BTN_UP ) { menu_sel--; if (menu_sel < 0) menu_sel = PicoPatchCount; } if(inp & BTN_DOWN) { menu_sel++; if (menu_sel > PicoPatchCount) menu_sel = 0; } if(inp &(BTN_LEFT|BTN_L)) { menu_sel-=10; if (menu_sel < 0) menu_sel = 0; } if(inp &(BTN_RIGHT|BTN_R)) { menu_sel+=10; if (menu_sel > PicoPatchCount) menu_sel = PicoPatchCount; } - if(inp & BTN_X) { // action + if(inp & BTN_CIRCLE) { // action if (menu_sel < PicoPatchCount) PicoPatches[menu_sel].active = !PicoPatches[menu_sel].active; else return; } - if(inp & BTN_CIRCLE) return; + if(inp & BTN_X) return; } } @@ -492,24 +531,38 @@ static void state_check_slots(void) } } +static void *get_oldstate_for_preview(void) +{ + unsigned char *ptr = malloc(sizeof(Pico.vram) + sizeof(Pico.cram) + sizeof(Pico.vsram) + sizeof(Pico.video)); + if (ptr == NULL) return NULL; + + memcpy(ptr, Pico.vram, sizeof(Pico.vram)); + memcpy(ptr + sizeof(Pico.vram), Pico.cram, sizeof(Pico.cram)); + memcpy(ptr + sizeof(Pico.vram) + sizeof(Pico.cram), Pico.vsram, sizeof(Pico.vsram)); + memcpy(ptr + sizeof(Pico.vram) + sizeof(Pico.cram) + sizeof(Pico.vsram), &Pico.video, sizeof(Pico.video)); + return ptr; +} + +static void restore_oldstate(void *ptrx) +{ + unsigned char *ptr = ptrx; + memcpy(Pico.vram, ptr, sizeof(Pico.vram)); + memcpy(Pico.cram, ptr + sizeof(Pico.vram), sizeof(Pico.cram)); + memcpy(Pico.vsram, ptr + sizeof(Pico.vram) + sizeof(Pico.cram), sizeof(Pico.vsram)); + memcpy(&Pico.video,ptr + sizeof(Pico.vram) + sizeof(Pico.cram) + sizeof(Pico.vsram), sizeof(Pico.video)); + free(ptrx); +} + static void draw_savestate_bg(int slot) { - struct PicoVideo tmp_pv; - unsigned short tmp_cram[0x40]; - unsigned short tmp_vsram[0x40]; - void *tmp_vram, *file; + void *file, *oldstate; char *fname; fname = emu_GetSaveFName(1, 0, slot); if (!fname) return; - tmp_vram = malloc(sizeof(Pico.vram)); - if (tmp_vram == NULL) return; - - memcpy(tmp_vram, Pico.vram, sizeof(Pico.vram)); - memcpy(tmp_cram, Pico.cram, sizeof(Pico.cram)); - memcpy(tmp_vsram, Pico.vsram, sizeof(Pico.vsram)); - memcpy(&tmp_pv, &Pico.video, sizeof(Pico.video)); + oldstate = get_oldstate_for_preview(); + if (oldstate == NULL) return; if (strcmp(fname + strlen(fname) - 3, ".gz") == 0) { file = gzopen(fname, "rb"); @@ -535,13 +588,9 @@ static void draw_savestate_bg(int slot) } emu_forcedFrame(); - menu_prepare_bg(1); + menu_prepare_bg(1, 0); - memcpy(Pico.vram, tmp_vram, sizeof(Pico.vram)); - memcpy(Pico.cram, tmp_cram, sizeof(Pico.cram)); - memcpy(Pico.vsram, tmp_vsram, sizeof(Pico.vsram)); - memcpy(&Pico.video, &tmp_pv, sizeof(Pico.video)); - free(tmp_vram); + restore_oldstate(oldstate); } static void draw_savestate_menu(int menu_sel, int is_loading) @@ -578,7 +627,7 @@ static int savestate_menu_loop(int is_loading) for(;;) { draw_savestate_menu(menu_sel, is_loading); - inp = wait_for_input(BTN_UP|BTN_DOWN|BTN_X|BTN_CIRCLE); + inp = wait_for_input(BTN_UP|BTN_DOWN|BTN_X|BTN_CIRCLE, 0); if(inp & BTN_UP ) { do { menu_sel--; if (menu_sel < 0) menu_sel = menu_sel_max; @@ -589,10 +638,10 @@ static int savestate_menu_loop(int is_loading) menu_sel++; if (menu_sel > menu_sel_max) menu_sel = 0; } while (!(state_slot_flags & (1 << menu_sel)) && menu_sel != menu_sel_max && is_loading); } - if(inp & BTN_X) { // save/load + if(inp & BTN_CIRCLE) { // save/load if (menu_sel < 10) { state_slot = menu_sel; - PicoStateProgressCB = emu_stateCb; /* also suitable for menu */ + PicoStateProgressCB = emu_msg_cb; /* also suitable for menu */ if (emu_SaveLoadGame(is_loading, 0)) { strcpy(menuErrorMsg, is_loading ? "Load failed" : "Save failed"); return 1; @@ -600,7 +649,7 @@ static int savestate_menu_loop(int is_loading) return 0; } else return 1; } - if(inp & BTN_CIRCLE) return 1; + if(inp & BTN_X) return 1; } } @@ -617,7 +666,11 @@ static char *action_binds(int player_idx, int action_mask) if (currentConfig.KeyBinds[i] & action_mask) { if (player_idx >= 0 && ((currentConfig.KeyBinds[i] >> 16) & 3) != player_idx) continue; - if (strkeys[0]) { strcat(strkeys, " + "); strcat(strkeys, pspKeyNames[i]); break; } + if (strkeys[0]) { + strcat(strkeys, i >= 28 ? ", " : " + "); // nub "buttons" don't create combos + strcat(strkeys, pspKeyNames[i]); + break; + } else strcpy(strkeys, pspKeyNames[i]); } } @@ -670,14 +723,14 @@ static void draw_key_config(const bind_action_t *opts, int opt_cnt, int player_i text_out16(x, y, "Done"); if (sel < opt_cnt) { - text_out16(80+30, 180, "Press a button to bind/unbind"); - text_out16(80+30, 190, "Use SELECT to clear"); - text_out16(80+30, 200, "To bind UP/DOWN, hold SELECT"); - text_out16(80+30, 210, "Select \"Done\" to exit"); + text_out16(80+30, 220, "Press a button to bind/unbind"); + text_out16(80+30, 230, "Use SELECT to clear"); + text_out16(80+30, 240, "To bind UP/DOWN, hold SELECT"); + text_out16(80+30, 250, "Select \"Done\" to exit"); } else { - text_out16(80+30, 190, "Use Options -> Save cfg"); - text_out16(80+30, 200, "to save controls"); - text_out16(80+30, 210, "Press X or O to exit"); + text_out16(80+30, 230, "Use Options -> Save cfg"); + text_out16(80+30, 240, "to save controls"); + text_out16(80+30, 250, "Press X or O to exit"); } menu_draw_end(); } @@ -690,7 +743,7 @@ static void key_config_loop(const bind_action_t *opts, int opt_cnt, int player_i for (;;) { draw_key_config(opts, opt_cnt, player_idx, sel); - inp = wait_for_input(CONFIGURABLE_KEYS|BTN_SELECT); + inp = wait_for_input(CONFIGURABLE_KEYS|BTN_SELECT, 1); if (!(inp & BTN_SELECT)) { prev_select = 0; if(inp & BTN_UP ) { sel--; if (sel < 0) sel = menu_sel_max; continue; } @@ -763,8 +816,6 @@ static bind_action_t emuctrl_actions[] = { "Prev Save Slot ", 1<<25 }, { "Next Save Slot ", 1<<24 }, { "Switch Renderer", 1<<26 }, - { "Volume Down ", 1<<30 }, - { "Volume Up ", 1<<29 }, }; static void kc_sel_loop(void) @@ -776,10 +827,10 @@ static void kc_sel_loop(void) while (1) { draw_kc_sel(menu_sel); - inp = wait_for_input(BTN_UP|BTN_DOWN|BTN_X|BTN_CIRCLE); + inp = wait_for_input(BTN_UP|BTN_DOWN|BTN_X|BTN_CIRCLE, 0); if (inp & BTN_UP ) { menu_sel--; if (menu_sel < 0) menu_sel = menu_sel_max; } if (inp & BTN_DOWN) { menu_sel++; if (menu_sel > menu_sel_max) menu_sel = 0; } - if (inp & BTN_X) { + if (inp & BTN_CIRCLE) { switch (menu_sel) { case 0: key_config_loop(ctrl_actions, is_6button ? 12 : 8, 0); return; case 1: key_config_loop(ctrl_actions, is_6button ? 12 : 8, 1); return; @@ -789,7 +840,7 @@ static void kc_sel_loop(void) default: return; } } - if (inp & BTN_CIRCLE) return; + if (inp & BTN_X) return; } } @@ -857,7 +908,7 @@ static void draw_cd_menu_options(int menu_sel, struct bios_names_t *bios_names) if ((selected_id == MA_CDOPT_TESTBIOS_USA && strcmp(bios_names->us, "NOT FOUND")) || (selected_id == MA_CDOPT_TESTBIOS_EUR && strcmp(bios_names->eu, "NOT FOUND")) || (selected_id == MA_CDOPT_TESTBIOS_JAP && strcmp(bios_names->jp, "NOT FOUND"))) - text_out16(tl_x, 210, "Press start to test selected BIOS"); + text_out16(tl_x, 250, "Press start to test selected BIOS"); menu_draw_end(); } @@ -872,24 +923,29 @@ static void cd_menu_loop_options(void) char *bios, *p; if (emu_findBios(4, &bios)) { // US - for (p = bios+strlen(bios)-1; p > bios && *p != '/'; p--); p++; + for (p = bios+strlen(bios)-1; p > bios && *p != '/'; p--); + if (*p == '/') p++; strncpy(bios_names.us, p, sizeof(bios_names.us)); bios_names.us[sizeof(bios_names.us)-1] = 0; } else strcpy(bios_names.us, "NOT FOUND"); if (emu_findBios(8, &bios)) { // EU - for (p = bios+strlen(bios)-1; p > bios && *p != '/'; p--); p++; + for (p = bios+strlen(bios)-1; p > bios && *p != '/'; p--); + if (*p == '/') p++; strncpy(bios_names.eu, p, sizeof(bios_names.eu)); bios_names.eu[sizeof(bios_names.eu)-1] = 0; } else strcpy(bios_names.eu, "NOT FOUND"); if (emu_findBios(1, &bios)) { // JP - for (p = bios+strlen(bios)-1; p > bios && *p != '/'; p--); p++; + for (p = bios+strlen(bios)-1; p > bios && *p != '/'; p--); + if (*p == '/') p++; strncpy(bios_names.jp, p, sizeof(bios_names.jp)); bios_names.jp[sizeof(bios_names.jp)-1] = 0; } else strcpy(bios_names.jp, "NOT FOUND"); - for(;;) + menuErrorMsg[0] = 0; + + for (;;) { draw_cd_menu_options(menu_sel, &bios_names); - inp = wait_for_input(BTN_UP|BTN_DOWN|BTN_LEFT|BTN_RIGHT|BTN_X|BTN_CIRCLE); + inp = wait_for_input(BTN_UP|BTN_DOWN|BTN_LEFT|BTN_RIGHT|BTN_X|BTN_CIRCLE|BTN_START, 0); if (inp & BTN_UP ) { menu_sel--; if (menu_sel < 0) menu_sel = menu_sel_max; } if (inp & BTN_DOWN) { menu_sel++; if (menu_sel > menu_sel_max) menu_sel = 0; } selected_id = me_index2id(cdopt_entries, CDOPT_ENTRY_COUNT, menu_sel); @@ -906,11 +962,12 @@ static void cd_menu_loop_options(void) } } } - if (inp & BTN_X) { // toggleable options + if (inp & BTN_CIRCLE) // toggleable options if (!me_process(cdopt_entries, CDOPT_ENTRY_COUNT, selected_id, 1) && selected_id == MA_CDOPT_DONE) { return; } + if (inp & BTN_START) { switch (selected_id) { // BIOS testers case MA_CDOPT_TESTBIOS_USA: if (emu_findBios(4, &bios)) { // test US @@ -937,7 +994,173 @@ static void cd_menu_loop_options(void) break; } } - if (inp & BTN_CIRCLE) return; + if (inp & BTN_X) return; + } +} + +// --------- display options ---------- + +menu_entry opt3_entries[] = +{ + { NULL, MB_NONE, MA_OPT3_SCALE, NULL, 0, 0, 0, 1 }, + { NULL, MB_NONE, MA_OPT3_HSCALE32, NULL, 0, 0, 0, 1 }, + { NULL, MB_NONE, MA_OPT3_HSCALE40, NULL, 0, 0, 0, 1 }, + { NULL, MB_ONOFF, MA_OPT3_FILTERING, ¤tConfig.scaling, 1, 0, 0, 1 }, + { NULL, MB_NONE, MA_OPT3_VSYNC, NULL, 0, 0, 0, 1 }, + { "Set to unscaled centered", MB_NONE, MA_OPT3_PRES_NOSCALE, NULL, 0, 0, 0, 1 }, + { "Set to 4:3 scaled", MB_NONE, MA_OPT3_PRES_SCALE43, NULL, 0, 0, 0, 1 }, + { "Set to fullscreen", MB_NONE, MA_OPT3_PRES_FULLSCR, NULL, 0, 0, 0, 1 }, + { "done", MB_NONE, MA_OPT3_DONE, NULL, 0, 0, 0, 1 }, +}; + +#define OPT3_ENTRY_COUNT (sizeof(opt3_entries) / sizeof(opt3_entries[0])) + + +static void menu_opt3_cust_draw(const menu_entry *entry, int x, int y, void *param) +{ + switch (entry->id) + { + case MA_OPT3_SCALE: + text_out16(x, y, "Scale factor: %.2f", currentConfig.scale); + break; + case MA_OPT3_HSCALE32: + text_out16(x, y, "Hor. scale (for low res. games): %.2f", currentConfig.hscale32); + break; + case MA_OPT3_HSCALE40: + text_out16(x, y, "Hor. scale (for hi res. games): %.2f", currentConfig.hscale40); + break; + case MA_OPT3_FILTERING: + text_out16(x, y, "Bilinear filtering %s", currentConfig.scaling?"ON":"OFF"); + break; + case MA_OPT3_VSYNC: { + char *val = " never"; + if (currentConfig.EmuOpt & 0x2000) + val = (currentConfig.EmuOpt & 0x10000) ? "sometimes" : " always"; + text_out16(x, y, "Wait for vsync (slow) %s", val); + break; + } + default: break; + } +} + +static void menu_opt3_preview(int is_32col) +{ + void *oldstate = NULL; + + if (rom_data == NULL || ((Pico.video.reg[12]&1)^1) != is_32col) + { + extern char bgdatac32_start[], bgdatac40_start[]; + extern int bgdatac32_size, bgdatac40_size; + void *bgdata = is_32col ? bgdatac32_start : bgdatac40_start; + unsigned long insize = is_32col ? bgdatac32_size : bgdatac40_size, outsize = 65856; + int ret; + ret = uncompress((Bytef *)bg_buffer, &outsize, bgdata, insize); + if (ret == 0) + { + if (rom_data != NULL) oldstate = get_oldstate_for_preview(); + memcpy(Pico.vram, bg_buffer, sizeof(Pico.vram)); + memcpy(Pico.cram, (char *)bg_buffer + 0x10000, 0x40*2); + memcpy(Pico.vsram, (char *)bg_buffer + 0x10080, 0x40*2); + memcpy(&Pico.video,(char *)bg_buffer + 0x10100, 0x40); + } + else + lprintf("uncompress returned %i\n", ret); + } + + memset32_uncached(psp_screen, 0, 512*272*2/4); + emu_forcedFrame(); + menu_prepare_bg(1, 0); + + if (oldstate) restore_oldstate(oldstate); +} + +static void draw_dispmenu_options(int menu_sel) +{ + int tl_x = 80, tl_y = 16+50; + + menu_draw_begin(); + + menu_draw_selection(tl_x - 16, tl_y + menu_sel*10, 316); + + me_draw(opt3_entries, OPT3_ENTRY_COUNT, tl_x, tl_y, menu_opt3_cust_draw, NULL); + + menu_draw_end(); +} + +static void dispmenu_loop_options(void) +{ + static int menu_sel = 0; + int menu_sel_max, is_32col = (Pico.video.reg[12]&1)^1; + unsigned long inp = 0; + menu_id selected_id; + + menu_sel_max = me_count_enabled(opt3_entries, OPT3_ENTRY_COUNT) - 1; + + for (;;) + { + draw_dispmenu_options(menu_sel); + inp = wait_for_input(BTN_UP|BTN_DOWN|BTN_LEFT|BTN_RIGHT|BTN_X|BTN_CIRCLE, 0); + if (inp & BTN_UP ) { menu_sel--; if (menu_sel < 0) menu_sel = menu_sel_max; } + if (inp & BTN_DOWN) { menu_sel++; if (menu_sel > menu_sel_max) menu_sel = 0; } + selected_id = me_index2id(opt3_entries, OPT3_ENTRY_COUNT, menu_sel); + if (selected_id == MA_OPT3_HSCALE40 && is_32col) { is_32col = 0; menu_opt3_preview(is_32col); } + if (selected_id == MA_OPT3_HSCALE32 && !is_32col) { is_32col = 1; menu_opt3_preview(is_32col); } + + if (inp & (BTN_LEFT|BTN_RIGHT)) // multi choise + { + float *setting = NULL; + int tmp; + me_process(opt3_entries, OPT3_ENTRY_COUNT, selected_id, (inp&BTN_RIGHT) ? 1 : 0); + switch (selected_id) { + case MA_OPT3_SCALE: setting = ¤tConfig.scale; break; + case MA_OPT3_HSCALE40: setting = ¤tConfig.hscale40; is_32col = 0; break; + case MA_OPT3_HSCALE32: setting = ¤tConfig.hscale32; is_32col = 1; break; + case MA_OPT3_FILTERING:menu_opt3_preview(is_32col); break; + case MA_OPT3_VSYNC: tmp = ((currentConfig.EmuOpt>>13)&1) | ((currentConfig.EmuOpt>>15)&2); + tmp = (inp & BTN_LEFT) ? (tmp>>1) : ((tmp<<1)|1); + if (tmp > 3) tmp = 3; + currentConfig.EmuOpt &= ~0x12000; + currentConfig.EmuOpt |= ((tmp&2)<<15) | ((tmp&1)<<13); + break; + default: break; + } + if (setting != NULL) { + while ((inp = psp_pad_read(0)) & (BTN_LEFT|BTN_RIGHT)) { + *setting += (inp & BTN_LEFT) ? -0.01 : 0.01; + if (*setting <= 0) *setting = 0.01; + menu_opt3_preview(is_32col); + draw_dispmenu_options(menu_sel); // will wait vsync + } + } + } + if (inp & BTN_CIRCLE) { // toggleable options + me_process(opt3_entries, OPT3_ENTRY_COUNT, selected_id, 1); + switch (selected_id) { + case MA_OPT3_DONE: + return; + case MA_OPT3_PRES_NOSCALE: + currentConfig.scale = currentConfig.hscale40 = currentConfig.hscale32 = 1.0; + menu_opt3_preview(is_32col); + break; + case MA_OPT3_PRES_SCALE43: + currentConfig.scale = 1.20; + currentConfig.hscale40 = 1.00; + currentConfig.hscale32 = 1.25; + menu_opt3_preview(is_32col); + break; + case MA_OPT3_PRES_FULLSCR: + currentConfig.scale = 1.20; + currentConfig.hscale40 = 1.25; + currentConfig.hscale32 = 1.56; + menu_opt3_preview(is_32col); + break; + case MA_OPT3_FILTERING: + menu_opt3_preview(is_32col); + break; + default: break; + } + } + if (inp & BTN_X) return; } } @@ -946,14 +1169,14 @@ static void cd_menu_loop_options(void) menu_entry opt2_entries[] = { - { "Emulate Z80", MB_ONOFF, MA_OPT2_ENABLE_Z80, ¤tConfig.PicoOpt,0x0004, 0, 0, 1 }, - { "Emulate YM2612 (FM)", MB_ONOFF, MA_OPT2_ENABLE_YM2612, ¤tConfig.PicoOpt,0x0001, 0, 0, 1 }, - { "Emulate SN76496 (PSG)", MB_ONOFF, MA_OPT2_ENABLE_SN76496,¤tConfig.PicoOpt,0x0002, 0, 0, 1 }, - { "Double buffering", MB_ONOFF, MA_OPT2_DBLBUFF, ¤tConfig.EmuOpt, 0x8000, 0, 0, 1 }, - { "Wait for V-sync (slow)", MB_ONOFF, MA_OPT2_VSYNC, ¤tConfig.EmuOpt, 0x2000, 0, 0, 1 }, - { "gzip savestates", MB_ONOFF, MA_OPT2_GZIP_STATES, ¤tConfig.EmuOpt, 0x0008, 0, 0, 1 }, - { "Don't save last used ROM", MB_ONOFF, MA_OPT2_NO_LAST_ROM, ¤tConfig.EmuOpt, 0x0020, 0, 0, 1 }, - { "done", MB_NONE, MA_OPT2_DONE, NULL, 0, 0, 0, 1 }, + { "Emulate Z80", MB_ONOFF, MA_OPT2_ENABLE_Z80, ¤tConfig.PicoOpt,0x00004, 0, 0, 1 }, + { "Emulate YM2612 (FM)", MB_ONOFF, MA_OPT2_ENABLE_YM2612, ¤tConfig.PicoOpt,0x00001, 0, 0, 1 }, + { "Emulate SN76496 (PSG)", MB_ONOFF, MA_OPT2_ENABLE_SN76496, ¤tConfig.PicoOpt,0x00002, 0, 0, 1 }, + { "gzip savestates", MB_ONOFF, MA_OPT2_GZIP_STATES, ¤tConfig.EmuOpt, 0x00008, 0, 0, 1 }, + { "Don't save last used ROM", MB_ONOFF, MA_OPT2_NO_LAST_ROM, ¤tConfig.EmuOpt, 0x00020, 0, 0, 1 }, + { "Status line in main menu", MB_ONOFF, MA_OPT2_STATUS_LINE, ¤tConfig.EmuOpt, 0x20000, 0, 0, 1 }, + { "Disable frame limitter", MB_ONOFF, MA_OPT2_NO_FRAME_LIMIT, ¤tConfig.EmuOpt, 0x40000, 0, 0, 1 }, + { "done", MB_NONE, MA_OPT2_DONE, NULL, 0, 0, 0, 1 }, }; #define OPT2_ENTRY_COUNT (sizeof(opt2_entries) / sizeof(opt2_entries[0])) @@ -984,29 +1207,23 @@ static void amenu_loop_options(void) for(;;) { draw_amenu_options(menu_sel); - inp = wait_for_input(BTN_UP|BTN_DOWN|BTN_LEFT|BTN_RIGHT|BTN_X|BTN_CIRCLE); + inp = wait_for_input(BTN_UP|BTN_DOWN|BTN_LEFT|BTN_RIGHT|BTN_X|BTN_CIRCLE, 0); if (inp & BTN_UP ) { menu_sel--; if (menu_sel < 0) menu_sel = menu_sel_max; } if (inp & BTN_DOWN) { menu_sel++; if (menu_sel > menu_sel_max) menu_sel = 0; } selected_id = me_index2id(opt2_entries, OPT2_ENTRY_COUNT, menu_sel); if (inp & (BTN_LEFT|BTN_RIGHT)) { // multi choise if (!me_process(opt2_entries, OPT2_ENTRY_COUNT, selected_id, (inp&BTN_RIGHT) ? 1 : 0) && selected_id == MA_OPT2_GAMMA) { - while ((inp = psp_pad_read()) & (BTN_LEFT|BTN_RIGHT)) { - currentConfig.gamma += (inp & BTN_LEFT) ? -1 : 1; - if (currentConfig.gamma < 1) currentConfig.gamma = 1; - if (currentConfig.gamma > 300) currentConfig.gamma = 300; - draw_amenu_options(menu_sel); - psp_msleep(18); - } + // TODO? } } - if (inp & BTN_X) { // toggleable options + if (inp & BTN_CIRCLE) { // toggleable options if (!me_process(opt2_entries, OPT2_ENTRY_COUNT, selected_id, 1) && selected_id == MA_OPT2_DONE) { return; } } - if (inp & BTN_CIRCLE) return; + if (inp & BTN_X) return; } } @@ -1016,8 +1233,6 @@ static void amenu_loop_options(void) menu_entry opt_entries[] = { { NULL, MB_NONE, MA_OPT_RENDERER, NULL, 0, 0, 0, 1 }, - { "Scanline mode (faster)", MB_ONOFF, MA_OPT_INTERLACED, ¤tConfig.EmuOpt, 0x4000, 0, 0, 1 }, - { "Scale low res mode", MB_ONOFF, MA_OPT_SCALING, ¤tConfig.scaling, 0x0001, 0, 3, 1 }, { "Accurate timing (slower)", MB_ONOFF, MA_OPT_ACC_TIMING, ¤tConfig.PicoOpt, 0x0040, 0, 0, 1 }, { "Accurate sprites (slower)", MB_ONOFF, MA_OPT_ACC_SPRITES, ¤tConfig.PicoOpt, 0x0080, 0, 0, 1 }, { "Show FPS", MB_ONOFF, MA_OPT_SHOW_FPS, ¤tConfig.EmuOpt, 0x0002, 0, 0, 1 }, @@ -1029,8 +1244,10 @@ menu_entry opt_entries[] = { "Use SRAM/BRAM savestates", MB_ONOFF, MA_OPT_SRAM_STATES, ¤tConfig.EmuOpt, 0x0001, 0, 0, 1 }, { NULL, MB_NONE, MA_OPT_CONFIRM_STATES,NULL, 0, 0, 0, 1 }, { "Save slot", MB_RANGE, MA_OPT_SAVE_SLOT, &state_slot, 0, 0, 9, 1 }, + { NULL, MB_NONE, MA_OPT_CPU_CLOCKS, NULL, 0, 0, 0, 1 }, + { "[Display options]", MB_NONE, MA_OPT_DISP_OPTS, NULL, 0, 0, 0, 1 }, { "[Sega/Mega CD options]", MB_NONE, MA_OPT_SCD_OPTS, NULL, 0, 0, 0, 1 }, - { "[advanced options]", MB_NONE, MA_OPT_ADV_OPTS, NULL, 0, 0, 0, 1 }, + { "[Advanced options]", MB_NONE, MA_OPT_ADV_OPTS, NULL, 0, 0, 0, 1 }, { NULL, MB_NONE, MA_OPT_SAVECFG, NULL, 0, 0, 0, 1 }, { "Save cfg for current game only",MB_NONE,MA_OPT_SAVECFG_GAME,NULL, 0, 0, 0, 1 }, { NULL, MB_NONE, MA_OPT_LOADCFG, NULL, 0, 0, 0, 1 }, @@ -1070,12 +1287,12 @@ static void menu_opt_cust_draw(const menu_entry *entry, int x, int y, void *para { case MA_OPT_RENDERER: if (currentConfig.PicoOpt&0x10) - str = " 8bit fast"; + str = "fast"; else if (currentConfig.EmuOpt&0x80) - str = "16bit accurate"; + str = "accurate"; else - str = " 8bit accurate"; - text_out16(x, y, "Renderer: %s", str); + str = " 8bit accurate"; // n/a + text_out16(x, y, "Renderer: %s", str); break; case MA_OPT_FRAMESKIP: if (currentConfig.Frameskip < 0) @@ -1099,6 +1316,9 @@ static void menu_opt_cust_draw(const menu_entry *entry, int x, int y, void *para } text_out16(x, y, "Confirm savestate %s", str); break; + case MA_OPT_CPU_CLOCKS: + text_out16(x, y, "CPU/bus clock %3i/%3iMHz", currentConfig.CPUclock, currentConfig.CPUclock/2); + break; case MA_OPT_SAVECFG: str24[0] = 0; if (config_slot != 0) sprintf(str24, " (profile: %i)", config_slot); @@ -1114,7 +1334,6 @@ static void menu_opt_cust_draw(const menu_entry *entry, int x, int y, void *para } - static void draw_menu_options(int menu_sel) { int tl_x = 80+25, tl_y = 16+24; @@ -1195,7 +1414,7 @@ static int menu_loop_options(void) while (1) { draw_menu_options(menu_sel); - inp = wait_for_input(BTN_UP|BTN_DOWN|BTN_LEFT|BTN_RIGHT|BTN_X|BTN_CIRCLE); + inp = wait_for_input(BTN_UP|BTN_DOWN|BTN_LEFT|BTN_RIGHT|BTN_X|BTN_CIRCLE, 0); if (inp & BTN_UP ) { menu_sel--; if (menu_sel < 0) menu_sel = menu_sel_max; } if (inp & BTN_DOWN) { menu_sel++; if (menu_sel > menu_sel_max) menu_sel = 0; } selected_id = me_index2id(opt_entries, OPT_ENTRY_COUNT, menu_sel); @@ -1203,31 +1422,16 @@ static int menu_loop_options(void) if (!me_process(opt_entries, OPT_ENTRY_COUNT, selected_id, (inp&BTN_RIGHT) ? 1 : 0)) { switch (selected_id) { case MA_OPT_RENDERER: - if (inp & BTN_LEFT) { - if ((currentConfig.PicoOpt&0x10) || !(currentConfig.EmuOpt &0x80)) { - currentConfig.PicoOpt&= ~0x10; - currentConfig.EmuOpt |= 0x80; - } + if ((currentConfig.PicoOpt&0x10) || !(currentConfig.EmuOpt &0x80)) { + currentConfig.PicoOpt&= ~0x10; + currentConfig.EmuOpt |= 0x80; } else { - if (!(currentConfig.PicoOpt&0x10) || (currentConfig.EmuOpt &0x80)) { - currentConfig.PicoOpt|= 0x10; - currentConfig.EmuOpt &= ~0x80; - } + currentConfig.PicoOpt|= 0x10; + currentConfig.EmuOpt &= ~0x80; } break; case MA_OPT_SOUND_QUALITY: - if ((inp & BTN_RIGHT) && currentConfig.PsndRate == 44100 && - !(currentConfig.PicoOpt&0x08)) - { - currentConfig.PsndRate = 11025; - currentConfig.PicoOpt |= 8; - } else if ((inp & BTN_LEFT) && currentConfig.PsndRate == 11025 && - (currentConfig.PicoOpt&0x08) && !(PicoMCD&1)) - { - currentConfig.PsndRate = 44100; - currentConfig.PicoOpt &= ~8; - } else - currentConfig.PsndRate = sndrate_prevnext(currentConfig.PsndRate, inp & BTN_RIGHT); + currentConfig.PsndRate = sndrate_prevnext(currentConfig.PsndRate, inp & BTN_RIGHT); break; case MA_OPT_REGION: region_prevnext(inp & BTN_RIGHT); @@ -1247,6 +1451,14 @@ static int menu_loop_options(void) } else {state_slot--; if (state_slot < 0) state_slot = 9; } break; + case MA_OPT_CPU_CLOCKS: + while ((inp = psp_pad_read(0)) & (BTN_LEFT|BTN_RIGHT)) { + currentConfig.CPUclock += (inp & BTN_LEFT) ? -1 : 1; + if (currentConfig.CPUclock < 19) currentConfig.CPUclock = 19; + if (currentConfig.CPUclock > 333) currentConfig.CPUclock = 333; + draw_menu_options(menu_sel); // will wait vsync + } + break; case MA_OPT_SAVECFG: case MA_OPT_SAVECFG_GAME: case MA_OPT_LOADCFG: @@ -1263,11 +1475,14 @@ static int menu_loop_options(void) } } } - if (inp & BTN_X) { + if (inp & BTN_CIRCLE) { if (!me_process(opt_entries, OPT_ENTRY_COUNT, selected_id, 1)) { switch (selected_id) { + case MA_OPT_DISP_OPTS: + dispmenu_loop_options(); + break; case MA_OPT_SCD_OPTS: cd_menu_loop_options(); if (engineState == PGS_ReloadRom) @@ -1298,7 +1513,7 @@ static int menu_loop_options(void) } } } - if(inp & BTN_CIRCLE) { + if(inp & BTN_X) { menu_options_save(); return 0; // done (update, no write) } @@ -1316,12 +1531,15 @@ static void draw_menu_credits(void) y = tl_y; text_out16(tl_x, y, "Credits:"); - text_out16(tl_x, (y+=10), "Dave: base code of PicoDrive"); + text_out16(tl_x, (y+=10), "fDave: base code of PicoDrive"); + text_out16(tl_x, (y+=10), "Chui: Fame/C"); + text_out16(tl_x, (y+=10), "NJ: CZ80"); text_out16(tl_x, (y+=10), "MAME devs: YM2612 and SN76496 cores"); - text_out16(tl_x, (y+=10), "Charles MacDonald: Genesis hw docs"); text_out16(tl_x, (y+=10), "Stephane Dallongeville:"); - text_out16(tl_x, (y+=10), " opensource Gens"); + text_out16(tl_x, (y+=10), " Gens code, base of Fame/C, CZ80"); + text_out16(tl_x, (y+=10), "Charles MacDonald: Genesis hw docs"); text_out16(tl_x, (y+=10), "Haze: Genesis hw info"); + text_out16(tl_x, (y+=10), "ps2dev.org people: PSP SDK/code"); text_out16(tl_x, (y+=10), "ketchupgun: skin design"); menu_draw_end(); @@ -1348,21 +1566,23 @@ menu_entry main_entries[] = static void draw_menu_root(int menu_sel) { - const int tl_x = 80+70, tl_y = 16+70; + const int tl_x = 86+70, tl_y = 16+70; + char *stat = NULL; menu_draw_begin(); - text_out16(tl_x, 16+20, "PicoDrive v" VERSION); + if ((currentConfig.EmuOpt&0x20000) && (stat = psp_get_status_line())) + text_out16(287, 12, "%s", stat); + + text_out16(tl_x, 48, "PicoDrive v" VERSION); menu_draw_selection(tl_x - 16, tl_y + menu_sel*10, 146); me_draw(main_entries, MAIN_ENTRY_COUNT, tl_x, tl_y, NULL, NULL); // error - if (menuErrorMsg[0]) { - // memset((char *)menu_screen + 321*224*2, 0, 321*16*2); - text_out16(5, 258, menuErrorMsg); - } + if (menuErrorMsg[0]) + text_out16(10, 252, menuErrorMsg); menu_draw_end(); } @@ -1382,31 +1602,40 @@ static void menu_loop_root(void) menu_sel_max = me_count_enabled(main_entries, MAIN_ENTRY_COUNT) - 1; if (menu_sel > menu_sel_max) menu_sel = menu_sel_max; + // mp3 errors? + if (mp3_last_error != 0) { + if (mp3_last_error == -1) + sprintf(menuErrorMsg, "Unsupported mp3 format, use 44kHz stereo"); + else sprintf(menuErrorMsg, "mp3 init failed, code %08x", mp3_last_error); + mp3_last_error = 0; + } + /* make sure action buttons are not pressed on entering menu */ draw_menu_root(menu_sel); - while (psp_pad_read() & (BTN_X|BTN_CIRCLE|BTN_SELECT)) psp_msleep(50); + while (psp_pad_read(1) & (BTN_X|BTN_CIRCLE|BTN_SELECT)) psp_msleep(50); for (;;) { draw_menu_root(menu_sel); - inp = wait_for_input(BTN_UP|BTN_DOWN|BTN_X|BTN_CIRCLE|BTN_SELECT|BTN_L|BTN_R); + inp = wait_for_input(BTN_UP|BTN_DOWN|BTN_X|BTN_CIRCLE|BTN_SELECT|BTN_L|BTN_R, 0); if(inp & BTN_UP ) { menu_sel--; if (menu_sel < 0) menu_sel = menu_sel_max; } if(inp & BTN_DOWN) { menu_sel++; if (menu_sel > menu_sel_max) menu_sel = 0; } if((inp & (BTN_L|BTN_R)) == (BTN_L|BTN_R)) debug_menu_loop(); - if( inp & (BTN_SELECT|BTN_CIRCLE)) { + if( inp & (BTN_SELECT|BTN_X)) { if (rom_data) { - while (psp_pad_read() & (BTN_SELECT|BTN_CIRCLE)) psp_msleep(50); // wait until released + while (psp_pad_read(1) & (BTN_SELECT|BTN_X)) psp_msleep(50); // wait until released engineState = PGS_Running; break; } } - if(inp & BTN_X) { + if(inp & BTN_CIRCLE) { + menuErrorMsg[0] = 0; // clear error msg switch (me_index2id(main_entries, MAIN_ENTRY_COUNT, menu_sel)) { case MA_MAIN_RESUME_GAME: if (rom_data) { - while (psp_pad_read() & BTN_X) psp_msleep(50); + while (psp_pad_read(1) & BTN_CIRCLE) psp_msleep(50); engineState = PGS_Running; return; } @@ -1465,7 +1694,9 @@ static void menu_loop_root(void) case MA_MAIN_CREDITS: draw_menu_credits(); psp_msleep(500); - inp = wait_for_input(BTN_X|BTN_CIRCLE); + inp = 0; + while (!(inp & (BTN_X|BTN_CIRCLE))) + inp = wait_for_input(BTN_X|BTN_CIRCLE, 0); break; case MA_MAIN_EXIT: engineState = PGS_Quit; @@ -1483,7 +1714,6 @@ static void menu_loop_root(void) break; } } - menuErrorMsg[0] = 0; // clear error msg } } @@ -1511,29 +1741,30 @@ static void menu_darken_bg(void *dst, const void *src, int pixels, int darker) } } -static void menu_prepare_bg(int use_game_bg) +static void menu_prepare_bg(int use_game_bg, int use_fg) { - memset(bg_buffer, 0, sizeof(bg_buffer)); - if (use_game_bg) { // darken the active framebuffer - /* - memset(bg_buffer, 0, 321*8*2); - menu_darken_bg(bg_buffer + 321*8*2, (char *)giz_screen + 321*8*2, 321*224, 1); - memset(bg_buffer + 321*232*2, 0, 321*8*2); - */ + unsigned short *dst = bg_buffer; + unsigned short *src = use_fg ? psp_video_get_active_fb() : psp_screen; + int i; + for (i = 272; i > 0; i--, dst += 480, src += 512) + menu_darken_bg(dst, src, 480, 1); + //memset32_uncached((int *)(bg_buffer + 480*264), 0, 480*8*2/4); } else { // should really only happen once, on startup.. + memset32_uncached((int *)(void *)bg_buffer, 0, sizeof(bg_buffer)/4); readpng(bg_buffer, "skin/background.png", READPNG_BG); } + sceKernelDcacheWritebackAll(); } static void menu_gfx_prepare(void) { - menu_prepare_bg(rom_data != NULL); + menu_prepare_bg(rom_data != NULL, 1); menu_draw_begin(); menu_draw_end(); @@ -1594,15 +1825,15 @@ int menu_loop_tray(void) /* make sure action buttons are not pressed on entering menu */ draw_menu_tray(menu_sel); - while (psp_pad_read() & BTN_X) psp_msleep(50); + while (psp_pad_read(1) & BTN_CIRCLE) psp_msleep(50); for (;;) { draw_menu_tray(menu_sel); - inp = wait_for_input(BTN_UP|BTN_DOWN|BTN_X); + inp = wait_for_input(BTN_UP|BTN_DOWN|BTN_CIRCLE, 0); if(inp & BTN_UP ) { menu_sel--; if (menu_sel < 0) menu_sel = menu_sel_max; } if(inp & BTN_DOWN) { menu_sel++; if (menu_sel > menu_sel_max) menu_sel = 0; } - if(inp & BTN_X ) { + if(inp & BTN_CIRCLE) { switch (menu_sel) { case 0: // select image selfname = romsel_loop(curr_path);