\r
#include "../../input.h"\r
#include "../../state.h"\r
+#include "../../palette.h"\r
\r
#ifndef _DIRENT_HAVE_D_TYPE\r
#error "need d_type for file browser\r
"18???", "19???", "1a???","PUSH", "1c???","1d???", "1e???", "1f???"\r
};\r
\r
+\r
+static char path_buffer[PATH_MAX];\r
+\r
char menuErrorMsg[40] = {0, };\r
\r
// TODO\r
return 1;\r
}\r
\r
-static char *romsel_loop(char *curr_path)\r
+static char *filesel_loop(char *curr_path, char *final_dest)\r
{\r
struct dirent **namelist;\r
DIR *dir;\r
- int n, sel = 0;\r
+ int n, newlen, sel = 0;\r
unsigned long inp = 0;\r
char *ret = NULL, *fname = NULL;\r
\r
if(inp & GP2X_R) { sel+=24; if (sel > n-2) sel = n-2; }\r
if(inp & GP2X_B) { // enter dir/select\r
again:\r
- if (namelist[sel+1]->d_type == DT_REG) {\r
- strcpy(lastLoadedGameName, curr_path);\r
- strcat(lastLoadedGameName, "/");\r
- strcat(lastLoadedGameName, namelist[sel+1]->d_name);\r
- ret = lastLoadedGameName;\r
+ newlen = strlen(curr_path) + strlen(namelist[sel+1]->d_name) + 2;\r
+ if (namelist[sel+1]->d_type == DT_REG) { // file selected\r
+ if (final_dest == NULL) final_dest = malloc(newlen);\r
+ if (final_dest == NULL) break;\r
+ strcpy(final_dest, curr_path);\r
+ strcat(final_dest, "/");\r
+ strcat(final_dest, namelist[sel+1]->d_name);\r
+ ret = final_dest;\r
break;\r
} else if (namelist[sel+1]->d_type == DT_DIR) {\r
- int newlen = strlen(curr_path) + strlen(namelist[sel+1]->d_name) + 2;\r
char *p, *newdir = malloc(newlen);\r
+ if (newdir == NULL) break;\r
if (strcmp(namelist[sel+1]->d_name, "..") == 0) {\r
char *start = curr_path;\r
p = start + strlen(start) - 1;\r
strcat(newdir, "/");\r
strcat(newdir, namelist[sel+1]->d_name);\r
}\r
- ret = romsel_loop(newdir);\r
+ ret = filesel_loop(newdir, final_dest);\r
free(newdir);\r
break;\r
} else {\r
// unknown file type, happens on NTFS mounts. Try to guess.\r
- FILE *tstf; int tmp;\r
- strcpy(lastLoadedGameName, curr_path);\r
- strcat(lastLoadedGameName, "/");\r
- strcat(lastLoadedGameName, namelist[sel+1]->d_name);\r
- tstf = fopen(lastLoadedGameName, "rb");\r
+ char *tstfn; FILE *tstf; int tmp;\r
+ tstfn = malloc(newlen);\r
+ if (tstfn == NULL) break;\r
+ strcpy(tstfn, curr_path);\r
+ strcat(tstfn, "/");\r
+ strcat(tstfn, namelist[sel+1]->d_name);\r
+ tstf = fopen(tstfn, "rb");\r
+ free(tstfn);\r
if (tstf != NULL)\r
{\r
if (fread(&tmp, 1, 1, tstf) > 0 || ferror(tstf) == 0)\r
{\r
if (Settings.JoyBinds[joy][i] & action_mask)\r
{\r
- if (player_idx >= 0 && ((Settings.KeyBinds[i] >> 16) & 3) != player_idx) continue;\r
+ if (player_idx >= 0 && ((Settings.JoyBinds[joy][i] >> 16) & 3) != player_idx) continue;\r
if (strkeys[0]) {\r
strcat(strkeys, ", "); strcat(strkeys, usb_joy_key_name(joy + 1, i));\r
break;\r
gp2x_text_out15(30, 210, "To bind UP/DOWN, hold VOL-");\r
gp2x_text_out15(30, 220, "Select \"Done\" to exit");\r
} else {\r
+ gp2x_text_out15(30, 200, "Use Options -> Save cfg");\r
+ gp2x_text_out15(30, 210, "to save controls");\r
gp2x_text_out15(30, 220, "Press B or X to exit");\r
}\r
gp2x_video_flip();\r
Settings.KeyBinds[i] |= player_idx << 16;\r
}\r
}\r
- } else if (sel < opt_cnt) {\r
+ }\r
+ else if (sel < opt_cnt)\r
+ {\r
for (i = 0; i < 32; i++)\r
if (inp & (1 << i)) {\r
if (count_bound_keys(opts[sel].mask, 1) >= 1) // disallow combos for usbjoy\r
case 1: key_config_loop(ctrl_actions, 8, 1); return;\r
case 2: key_config_loop(emuctrl_actions,\r
sizeof(emuctrl_actions)/sizeof(emuctrl_actions[0]), -1); return;\r
+ case 3: if (!fceugi) SaveConfig(NULL); return;\r
default: return;\r
}\r
}\r
extern int srendlinev[2];\r
extern int erendlinev[2];\r
extern int eoptions;\r
+extern char *cpalette;\r
+extern void LoadCPalette(void);\r
\r
\r
static void int_incdec(int *p, int inc, int min, int max)\r
static void draw_fcemenu_options(int menu_sel)\r
{\r
int tl_x = 25, tl_y = 60, y;\r
+ char cpal[32];\r
+\r
+ if (cpalette != NULL)\r
+ {\r
+ char *p = cpalette + strlen(cpalette) - 1;\r
+ while (*p != '/' && p > cpalette) p--;\r
+ if (*p == '/') p++;\r
+ strncpy(cpal, p, 16);\r
+ cpal[16] = 0;\r
+ }\r
+ else strcpy(cpal, " OFF");\r
\r
y = tl_y;\r
gp2x_fceu_copy_bg();\r
\r
- gp2x_text_out15(tl_x, y, "NTSC Color Emulation %s", ntsccol?"ON":"OFF"); // 0\r
+ gp2x_text_out15(tl_x, y, "Custom palette: %s", cpal); // 0\r
+ gp2x_text_out15(tl_x, (y+=10), "NTSC Color Emulation %s", ntsccol?"ON":"OFF");\r
gp2x_text_out15(tl_x, (y+=10), " Tint (default: 56) %i", ntsctint);\r
gp2x_text_out15(tl_x, (y+=10), " Hue (default: 72) %i", ntschue);\r
gp2x_text_out15(tl_x, (y+=10), "First visible line (NTSC) %i", srendlinev[0]);\r
- gp2x_text_out15(tl_x, (y+=10), "Last visible line (NTSC) %i", erendlinev[0]);\r
- gp2x_text_out15(tl_x, (y+=10), "First visible line (PAL) %i", srendlinev[1]); // 5\r
+ gp2x_text_out15(tl_x, (y+=10), "Last visible line (NTSC) %i", erendlinev[0]); // 5\r
+ gp2x_text_out15(tl_x, (y+=10), "First visible line (PAL) %i", srendlinev[1]);\r
gp2x_text_out15(tl_x, (y+=10), "Last visible line (PAL) %i", erendlinev[1]);\r
gp2x_text_out15(tl_x, (y+=10), "Clip 8 left/right columns %s", (eoptions&EO_CLIPSIDES)?"ON":"OFF");\r
- gp2x_text_out15(tl_x, (y+=10), "Disable 8 sprite limit %s", "TODO");\r
- gp2x_text_out15(tl_x, (y+=10), "Done"); // 9\r
+ gp2x_text_out15(tl_x, (y+=10), "Disable 8 sprite limit %s", (eoptions&EO_NO8LIM)?"ON":"OFF");\r
+ gp2x_text_out15(tl_x, (y+=10), "Done"); // 10\r
+\r
+ if (menu_sel == 0) {\r
+ gp2x_text_out15(30, 210, "Press B to browse,");\r
+ gp2x_text_out15(30, 220, "START to use default");\r
+ }\r
\r
// draw cursor\r
gp2x_text_out15(tl_x - 16, tl_y + menu_sel*10, ">");\r
\r
static void fcemenu_loop_options(void)\r
{\r
- int menu_sel = 0, menu_sel_max = 9, i;\r
+ int menu_sel = 0, menu_sel_max = 10, i;\r
unsigned long inp = 0;\r
\r
FCEUI_GetNTSCTH(&ntsctint, &ntschue);\r
for(;;)\r
{\r
draw_fcemenu_options(menu_sel);\r
- inp = wait_for_input(GP2X_UP|GP2X_DOWN|GP2X_LEFT|GP2X_RIGHT|GP2X_B|GP2X_X|GP2X_A);\r
+ inp = wait_for_input(GP2X_UP|GP2X_DOWN|GP2X_LEFT|GP2X_RIGHT|GP2X_B|GP2X_X|GP2X_A|GP2X_START);\r
if(inp & GP2X_UP ) { menu_sel--; if (menu_sel < 0) menu_sel = menu_sel_max; }\r
if(inp & GP2X_DOWN) { menu_sel++; if (menu_sel > menu_sel_max) menu_sel = 0; }\r
if((inp& GP2X_B)||(inp&GP2X_LEFT)||(inp&GP2X_RIGHT)) { // toggleable options\r
switch (menu_sel) {\r
- case 0: ntsccol = !ntsccol; break;\r
- case 7: eoptions^=EO_CLIPSIDES; break;\r
- case 9: return;\r
+ case 1: ntsccol = !ntsccol; break;\r
+ case 8: eoptions^=EO_CLIPSIDES; break;\r
+ case 9: eoptions^=EO_NO8LIM; break;\r
+ case 10: return;\r
}\r
}\r
if(inp & (GP2X_X|GP2X_A)) {\r
}\r
FCEUI_SetNTSCTH(ntsccol, ntsctint, ntschue);\r
FCEUI_SetRenderedLines(srendlinev[0],erendlinev[0],srendlinev[1],erendlinev[1]);\r
+ FCEUI_DisableSpriteLimitation(eoptions&EO_NO8LIM);\r
+ if (cpalette) LoadCPalette();\r
+ else FCEUI_SetPaletteArray(0); // set to default\r
+ FCEU_ResetPalette();\r
return;\r
}\r
if(inp & (GP2X_LEFT|GP2X_RIGHT)) { // multi choise\r
switch (menu_sel) {\r
- case 1: int_incdec(&ntsctint, (inp & GP2X_LEFT) ? -1 : 1, 0, 128); break;\r
- case 2: int_incdec(&ntschue, (inp & GP2X_LEFT) ? -1 : 1, 0, 128); break;\r
- case 3: int_incdec(&srendlinev[0], (inp & GP2X_LEFT) ? -1 : 1, 0, 239); break;\r
- case 4: int_incdec(&erendlinev[0], (inp & GP2X_LEFT) ? -1 : 1, 0, 239); break;\r
- case 5: int_incdec(&srendlinev[1], (inp & GP2X_LEFT) ? -1 : 1, 0, 239); break;\r
- case 6: int_incdec(&erendlinev[1], (inp & GP2X_LEFT) ? -1 : 1, 0, 239); break;\r
+ case 2: int_incdec(&ntsctint, (inp & GP2X_LEFT) ? -1 : 1, 0, 128); break;\r
+ case 3: int_incdec(&ntschue, (inp & GP2X_LEFT) ? -1 : 1, 0, 128); break;\r
+ case 4: int_incdec(&srendlinev[0], (inp & GP2X_LEFT) ? -1 : 1, 0, 239); break;\r
+ case 5: int_incdec(&erendlinev[0], (inp & GP2X_LEFT) ? -1 : 1, 0, 239); break;\r
+ case 6: int_incdec(&srendlinev[1], (inp & GP2X_LEFT) ? -1 : 1, 0, 239); break;\r
+ case 7: int_incdec(&erendlinev[1], (inp & GP2X_LEFT) ? -1 : 1, 0, 239); break;\r
+ }\r
+ }\r
+ if(menu_sel == 0 && (inp & (GP2X_START|GP2X_B))) { // custom palette\r
+ if ((inp & GP2X_START) && cpalette) {\r
+ free(cpalette);\r
+ cpalette=NULL;\r
+ }\r
+ else if (inp & GP2X_B) {\r
+ char *selfname;\r
+ if (cpalette) strncpy(path_buffer, cpalette, sizeof(path_buffer));\r
+ else getcwd(path_buffer, PATH_MAX);\r
+ path_buffer[sizeof(path_buffer)-1] = 0;\r
+\r
+ selfname = filesel_loop(path_buffer, NULL);\r
+ if (selfname) {\r
+ if (cpalette) free(cpalette);\r
+ cpalette = selfname;\r
+ }\r
}\r
}\r
}\r
gp2x_text_out15(tl_x, (y+=10), "Sound Rate: %5iHz", Settings.sound_rate); // 4\r
gp2x_text_out15(tl_x, (y+=10), "Force Region: %s",\r
Settings.region_force == 2 ? "PAL" : Settings.region_force == 1 ? "NTSC" : "OFF"); // 5\r
- gp2x_text_out15(tl_x, (y+=10), "Use SRAM savestates %s", "OFF");\r
gp2x_text_out15(tl_x, (y+=10), "Turbo rate %iHz", (Settings.turbo_rate_add*60/2) >> 24);\r
- gp2x_text_out15(tl_x, (y+=10), "Confirm savestate %s", strssconfirm); // 8\r
+ gp2x_text_out15(tl_x, (y+=10), "Confirm savestate %s", strssconfirm); // 7\r
gp2x_text_out15(tl_x, (y+=10), "Save slot %i", CurrentState);\r
gp2x_text_out15(tl_x, (y+=10), "Faster RAM timings %s", Settings.ramtimings?"ON":"OFF");\r
- gp2x_text_out15(tl_x, (y+=10), "squidgehack (now %s %s", mms, Settings.mmuhack?"ON":"OFF"); // 11\r
+ gp2x_text_out15(tl_x, (y+=10), "squidgehack (now %s %s", mms, Settings.mmuhack?"ON":"OFF"); // 10\r
gp2x_text_out15(tl_x, (y+=10), "Gamma correction %i.%02i", Settings.gamma / 100, Settings.gamma%100);\r
- gp2x_text_out15(tl_x, (y+=10), "GP2X CPU clock %iMhz", Settings.cpuclock); // 13\r
+ gp2x_text_out15(tl_x, (y+=10), "GP2X CPU clock %iMhz", Settings.cpuclock); // 12\r
gp2x_text_out15(tl_x, (y+=10), "[FCE Ultra options]");\r
gp2x_text_out15(tl_x, (y+=10), "Save cfg as default");\r
if (fceugi)\r
switch (menu_sel) {\r
case 1: Settings.showfps = !Settings.showfps; break;\r
case 3: soundvol = soundvol ? 0 : 100; break;\r
- case 10: Settings.ramtimings = !Settings.ramtimings; break;\r
- case 11: Settings.mmuhack = !Settings.mmuhack; break;\r
- case 14: fcemenu_loop_options(); break;\r
- case 15: // done (update and write)\r
+ case 9: Settings.ramtimings = !Settings.ramtimings; break;\r
+ case 10: Settings.mmuhack = !Settings.mmuhack; break;\r
+ case 13: fcemenu_loop_options(); break;\r
+ case 14: // done (update and write)\r
config_commit();\r
SaveConfig(NULL);\r
return 1;\r
- case 16: // done (update and write for current game)\r
+ case 15: // done (update and write for current game)\r
config_commit();\r
if (lastLoadedGameName[0])\r
SaveConfig(lastLoadedGameName);\r
InitSound();\r
break;\r
case 5: int_incdec(&Settings.region_force, (inp & GP2X_LEFT) ? -1 : 1, 0, 2); break;\r
- case 7: {\r
+ case 6: {\r
int hz = Settings.turbo_rate_add*60/2 >> 24;\r
int_incdec(&hz, (inp & GP2X_LEFT) ? -1 : 1, 1, 30);\r
Settings.turbo_rate_add = (hz*2 << 24) / 60 + 1;\r
break;\r
}\r
- case 8: int_incdec(&Settings.sstate_confirm, (inp & GP2X_LEFT) ? -1 : 1, 0, 3); break;\r
- case 9: int_incdec(&CurrentState, (inp & GP2X_LEFT) ? -1 : 1, 0, 9); break;\r
- case 12: int_incdec(&Settings.gamma, (inp & GP2X_LEFT) ? -1 : 1, 0, 300); break;\r
- case 13:\r
+ case 7: int_incdec(&Settings.sstate_confirm, (inp & GP2X_LEFT) ? -1 : 1, 0, 3); break;\r
+ case 8: int_incdec(&CurrentState, (inp & GP2X_LEFT) ? -1 : 1, 0, 9); break;\r
+ case 11: int_incdec(&Settings.gamma, (inp & GP2X_LEFT) ? -1 : 1, 0, 300); break;\r
+ case 12:\r
while ((inp = gp2x_joystick_read(1)) & (GP2X_LEFT|GP2X_RIGHT)) {\r
Settings.cpuclock += (inp & GP2X_LEFT) ? -1 : 1;\r
if (Settings.cpuclock < 0) Settings.cpuclock = 0; // 0 ~ do not change\r
int ret, menu_sel_max = 8, menu_sel_min = 4;\r
static int menu_sel = 4;\r
unsigned long inp = 0;\r
- char curr_path[PATH_MAX], *selfname;\r
- FILE *tstf;\r
-\r
- if ( (tstf = fopen(lastLoadedGameName, "rb")) )\r
- {\r
- fclose(tstf);\r
- strncpy(curr_path, lastLoadedGameName, sizeof(curr_path));\r
- curr_path[sizeof(curr_path)-1] = 0;\r
- }\r
- else\r
- {\r
- getcwd(curr_path, PATH_MAX);\r
- }\r
\r
if (fceugi) menu_sel_min = 0;\r
// TODO if (PicoPatches) menu_sel_max = 9;\r
}\r
break;\r
case 4: // select rom\r
- selfname = romsel_loop(curr_path);\r
+ {\r
+ FILE *tstf;\r
+ char *selfname;\r
+\r
+ if ( (tstf = fopen(lastLoadedGameName, "rb")) )\r
+ {\r
+ fclose(tstf);\r
+ strncpy(path_buffer, lastLoadedGameName, sizeof(path_buffer));\r
+ path_buffer[sizeof(path_buffer)-1] = 0;\r
+ }\r
+ else\r
+ {\r
+ getcwd(path_buffer, PATH_MAX);\r
+ }\r
+\r
+ selfname = filesel_loop(path_buffer, lastLoadedGameName);\r
if (selfname) {\r
printf("selected file: %s\n", selfname);\r
while (gp2x_joystick_read(1) & GP2X_B) usleep(50*1000);\r
return 2;\r
}\r
break;\r
+ }\r
case 5: // options\r
ret = menu_loop_options();\r
if (ret == 1) continue; // status update\r
notaz.gp2x.de / fceu.git / blobdiff