X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=fceu.git;a=blobdiff_plain;f=drivers%2Fgp2x%2Fmenu.c;h=ee599b44a008e5f66dc991df44dfc7f9acff0a56;hp=11cca131a16370e81c32521e22b522266f47485e;hb=642070a99a18726024c5b214263221a0340e6987;hpb=7b356ee3dc5d7e54d9dc06c413f84380d1044441 diff --git a/drivers/gp2x/menu.c b/drivers/gp2x/menu.c index 11cca13..ee599b4 100644 --- a/drivers/gp2x/menu.c +++ b/drivers/gp2x/menu.c @@ -166,7 +166,7 @@ void gp2x_text_out15_lim(int x, int y, const char *texto, int max) gp2x_text_out15(x,y,buffer); } -static void gp2x_smalltext16(int x, int y, const char *texto) +static void gp2x_smalltext16(int x, int y, const char *texto, unsigned short color) { int i; unsigned char *src; @@ -187,7 +187,7 @@ static void gp2x_smalltext16(int x, int y, const char *texto) int w = 0x20; while (w) { - if( *src & w ) *dst = 0xffff; + if( *src & w ) *dst = color; dst++; w>>=1; } @@ -198,7 +198,7 @@ static void gp2x_smalltext16(int x, int y, const char *texto) } } -static void gp2x_smalltext16_lim(int x, int y, const char *texto, int max) +static void gp2x_smalltext16_lim(int x, int y, const char *texto, unsigned short color, int max) { char buffer[320/6+1]; @@ -207,7 +207,7 @@ static void gp2x_smalltext16_lim(int x, int y, const char *texto, int max) if (max < 0) max = 0; buffer[max] = 0; - gp2x_smalltext16(x, y, buffer); + gp2x_smalltext16(x, y, buffer, color); } @@ -299,6 +299,22 @@ static unsigned long wait_for_input_usbjoy(unsigned long interesting, int *joy) // -------------- ROM selector -------------- +// rrrr rggg gggb bbbb +static unsigned short file2color(const char *fname) +{ + const char *ext = fname + strlen(fname) - 3; + static const char *rom_exts[] = { "zip", "nes", "fds", "unf", "nez", "nif" }; // nif is for unif + static const char *other_exts[] = { "nsf", "ips", "fcm" }; + int i; + + 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; + for (i = 0; i < sizeof(other_exts)/sizeof(other_exts[0]); i++) + if (strcasecmp(ext, other_exts[i]) == 0) return 0xaff5; + return 0xffff; +} + static void draw_dirlist(char *curdir, struct dirent **namelist, int n, int sel) { int start, i, pos; @@ -310,16 +326,17 @@ static void draw_dirlist(char *curdir, struct dirent **namelist, int n, int sel) gp2x_fceu_darken_all(); if(start - 2 >= 0) - gp2x_smalltext16_lim(14, (start - 2)*10, curdir, 53-2); + gp2x_smalltext16_lim(14, (start - 2)*10, curdir, 0xffff, 53-2); for (i = 0; i < n; i++) { pos = start + i; if (pos < 0) continue; if (pos > 23) break; if (namelist[i+1]->d_type == DT_DIR) { - gp2x_smalltext16_lim(14, pos*10, "/", 1); - gp2x_smalltext16_lim(14+6, pos*10, namelist[i+1]->d_name, 53-3); + gp2x_smalltext16_lim(14, pos*10, "/", 0xfff6, 1); + gp2x_smalltext16_lim(14+6, pos*10, namelist[i+1]->d_name, 0xfff6, 53-3); } else { - gp2x_smalltext16_lim(14, pos*10, namelist[i+1]->d_name, 53-2); + unsigned short color = file2color(namelist[i+1]->d_name); + gp2x_smalltext16_lim(14, pos*10, namelist[i+1]->d_name, color, 53-2); } } gp2x_text_out15(5, 120, ">"); @@ -490,9 +507,9 @@ static int clistcallb(char *name, uint32 a, uint8 v, int compare, int s, int typ if (pos < 0) return 1; if (pos > 23) return 0; - gp2x_smalltext16_lim(14, pos*10, s ? "ON " : "OFF", 3); - gp2x_smalltext16_lim(14+6*4, pos*10, type ? "S" : "R", 1); - gp2x_smalltext16_lim(14+6*6, pos*10, name, 53-8); + gp2x_smalltext16_lim(14, pos*10, s ? "ON " : "OFF", 0xffff, 3); + gp2x_smalltext16_lim(14+6*4, pos*10, type ? "S" : "R", 0xffff, 1); + gp2x_smalltext16_lim(14+6*6, pos*10, name, 0xffff, 53-8); return 1; } @@ -509,7 +526,7 @@ static void draw_patchlist(int sel) FCEUI_ListCheats(clistcallb,0); pos = cheat_start + cheat_pos; - if (pos < 24) gp2x_smalltext16_lim(14, pos*10, "done", 4); + if (pos < 24) gp2x_smalltext16_lim(14, pos*10, "done", 0xffff, 4); gp2x_text_out15(5, 120, ">"); menu_flip(); @@ -911,7 +928,7 @@ static void kc_sel_loop(void) if(inp & GP2X_B) { switch (menu_sel) { case 0: key_config_loop(ctrl_actions, 10, 0); return; - case 1: key_config_loop(ctrl_actions, 8, 1); return; + case 1: key_config_loop(ctrl_actions, 10, 1); return; case 2: key_config_loop(emuctrl_actions, sizeof(emuctrl_actions)/sizeof(emuctrl_actions[0]), -1); return; case 3: if (!fceugi) SaveConfig(NULL); return; @@ -1058,7 +1075,7 @@ static void fcemenu_loop_options(void) static void draw_menu_options(int menu_sel) { - int tl_x = 25, tl_y = 32, y; + int tl_x = 25, tl_y = 20, y; char strframeskip[8], *strscaling, *strssconfirm; char *mms = mmuhack_status ? "active) " : "inactive)"; @@ -1084,26 +1101,35 @@ static void draw_menu_options(int menu_sel) gp2x_text_out15(tl_x, y, "Scaling: %s", strscaling); // 0 gp2x_text_out15(tl_x, (y+=10), "Show FPS %s", Settings.showfps?"ON":"OFF"); // 1 gp2x_text_out15(tl_x, (y+=10), "Frameskip %s", strframeskip); // 2 + gp2x_text_out15(tl_x, (y+=10), "Accurate renderer (slow) %s", Settings.accurate_mode?"ON":"OFF"); gp2x_text_out15(tl_x, (y+=10), "Enable sound %s", soundvol?"ON":"OFF"); - gp2x_text_out15(tl_x, (y+=10), "Sound Rate: %5iHz", Settings.sound_rate); // 4 + gp2x_text_out15(tl_x, (y+=10), "Sound Rate: %5iHz", Settings.sound_rate); // 5 gp2x_text_out15(tl_x, (y+=10), "Force Region: %s", - Settings.region_force == 2 ? "PAL" : Settings.region_force == 1 ? "NTSC" : "OFF"); // 5 + Settings.region_force == 2 ? "PAL" : Settings.region_force == 1 ? "NTSC" : "OFF"); // 6 gp2x_text_out15(tl_x, (y+=10), "Turbo rate %iHz", (Settings.turbo_rate_add*60/2) >> 24); - gp2x_text_out15(tl_x, (y+=10), "Confirm savestate %s", strssconfirm); // 7 + gp2x_text_out15(tl_x, (y+=10), "Confirm savestate %s", strssconfirm); // 8 gp2x_text_out15(tl_x, (y+=10), "Save slot %i", CurrentState); gp2x_text_out15(tl_x, (y+=10), "Faster RAM timings %s", Settings.ramtimings?"ON":"OFF"); - gp2x_text_out15(tl_x, (y+=10), "squidgehack (now %s %s", mms, Settings.mmuhack?"ON":"OFF"); // 10 + gp2x_text_out15(tl_x, (y+=10), "squidgehack (now %s %s", mms, Settings.mmuhack?"ON":"OFF"); // 11 gp2x_text_out15(tl_x, (y+=10), "Gamma correction %i.%02i", Settings.gamma / 100, Settings.gamma%100); gp2x_text_out15(tl_x, (y+=10), "Perfect VSYNC %s", Settings.perfect_vsync?"ON":"OFF"); - gp2x_text_out15(tl_x, (y+=10), "GP2X CPU clock %iMhz", Settings.cpuclock); // 13 + gp2x_text_out15(tl_x, (y+=10), "GP2X CPU clock %iMhz", Settings.cpuclock); // 14 gp2x_text_out15(tl_x, (y+=10), "[FCE Ultra options]"); - gp2x_text_out15(tl_x, (y+=10), "Save cfg as default"); // 15 + gp2x_text_out15(tl_x, (y+=10), "Save cfg as default"); // 16 if (fceugi) gp2x_text_out15(tl_x, (y+=10), "Save cfg for current game only"); // draw cursor gp2x_text_out15(tl_x - 16, tl_y + menu_sel*10, ">"); + if (menu_sel == 3) { + gp2x_text_out15(tl_x, 210, "ROM reload required for this"); + gp2x_text_out15(tl_x, 220, "setting to take effect"); + } else if (menu_sel == 10 || menu_sel == 11) { + gp2x_text_out15(tl_x, 210, "Emu restart required for this"); + gp2x_text_out15(tl_x, 220, "setting to take effect"); + } + menu_darken_text_bg(); menu_flip(); } @@ -1130,7 +1156,7 @@ static void config_commit(void) static int menu_loop_options(void) { static int menu_sel = 0; - int menu_sel_max = 15; + int ret, menu_sel_max = 16; unsigned long inp = 0; if (fceugi) menu_sel_max++; @@ -1143,20 +1169,25 @@ static int menu_loop_options(void) if(inp & GP2X_DOWN) { menu_sel++; if (menu_sel > menu_sel_max) menu_sel = 0; } if((inp& GP2X_B)||(inp&GP2X_LEFT)||(inp&GP2X_RIGHT)) { // toggleable options switch (menu_sel) { - case 1: Settings.showfps = !Settings.showfps; break; - case 3: soundvol = soundvol ? 0 : 50; break; - case 9: Settings.ramtimings = !Settings.ramtimings; break; - case 10: Settings.mmuhack = !Settings.mmuhack; break; - case 12: Settings.perfect_vsync = !Settings.perfect_vsync; break; - case 14: fcemenu_loop_options(); break; - case 15: // done (update and write) + case 1: Settings.showfps = !Settings.showfps; break; + case 3: Settings.accurate_mode = !Settings.accurate_mode; break; + case 4: soundvol = soundvol ? 0 : 50; break; + case 10: Settings.ramtimings = !Settings.ramtimings; break; + case 11: Settings.mmuhack = !Settings.mmuhack; break; + case 13: Settings.perfect_vsync = !Settings.perfect_vsync; break; + case 15: fcemenu_loop_options(); break; + case 16: // done (update and write) config_commit(); - SaveConfig(NULL); + ret = SaveConfig(NULL); + strcpy(menuErrorMsg, ret == 0 ? "default config saved" : "config save failed"); return 1; - case 16: // done (update and write for current game) - config_commit(); + case 17: // done (update and write for current game) if (lastLoadedGameName[0]) - SaveConfig(lastLoadedGameName); + { + config_commit(); + ret = SaveConfig(lastLoadedGameName); + strcpy(menuErrorMsg, ret == 0 ? "game config saved" : "config save failed"); + } return 1; } } @@ -1168,21 +1199,21 @@ static int menu_loop_options(void) switch (menu_sel) { case 0: int_incdec(&Settings.scaling, (inp & GP2X_LEFT) ? -1 : 1, 0, 3); break; case 2: int_incdec(&Settings.frameskip, (inp & GP2X_LEFT) ? -1 : 1, -1, 32); break; - case 4: + case 5: Settings.sound_rate = sndrate_prevnext(Settings.sound_rate, inp & GP2X_RIGHT); InitSound(); break; - case 5: int_incdec(&Settings.region_force, (inp & GP2X_LEFT) ? -1 : 1, 0, 2); break; - case 6: { + case 6: int_incdec(&Settings.region_force, (inp & GP2X_LEFT) ? -1 : 1, 0, 2); break; + case 7: { int hz = Settings.turbo_rate_add*60/2 >> 24; int_incdec(&hz, (inp & GP2X_LEFT) ? -1 : 1, 1, 30); Settings.turbo_rate_add = (hz*2 << 24) / 60 + 1; break; } - case 7: int_incdec(&Settings.sstate_confirm, (inp & GP2X_LEFT) ? -1 : 1, 0, 3); break; - case 8: int_incdec(&CurrentState, (inp & GP2X_LEFT) ? -1 : 1, 0, 9); break; - case 11: int_incdec(&Settings.gamma, (inp & GP2X_LEFT) ? -1 : 1, 0, 300); break; - case 13: + case 8: int_incdec(&Settings.sstate_confirm, (inp & GP2X_LEFT) ? -1 : 1, 0, 3); break; + case 9: int_incdec(&CurrentState, (inp & GP2X_LEFT) ? -1 : 1, 0, 9); break; + case 12: int_incdec(&Settings.gamma, (inp & GP2X_LEFT) ? -1 : 1, 0, 300); break; + case 14: while ((inp = gp2x_joystick_read(1)) & (GP2X_LEFT|GP2X_RIGHT)) { Settings.cpuclock += (inp & GP2X_LEFT) ? -1 : 1; if (Settings.cpuclock < 0) Settings.cpuclock = 0; // 0 ~ do not change