-// (c) Copyright 2006 notaz, All rights reserved.\r
+// (c) Copyright 2006,2007 notaz, All rights reserved.\r
// Free for non-commercial use.\r
\r
// For commercial use, separate licencing terms must be obtained.\r
#include "gp2x.h"\r
#include "emu.h"\r
#include "menu.h"\r
-#include "fonts.h"\r
-#include "usbjoy.h"\r
+#include "../linux/usbjoy.h"\r
+#include "../common/emu.h"\r
+#include "../common/menu.h"\r
+#include "../common/arm_utils.h"\r
+#include "../common/readpng.h"\r
+#include "../common/common.h"\r
+#include "../common/input.h"\r
#include "version.h"\r
\r
-#include <Pico/PicoInt.h>\r
-#include <Pico/Patch.h>\r
+#include <pico/pico_int.h>\r
+#include <pico/patch.h>\r
#include <zlib/zlib.h>\r
\r
#ifndef _DIRENT_HAVE_D_TYPE\r
-#error "need d_type for file browser\r
+#error "need d_type for file browser"\r
#endif\r
\r
-extern char *actionNames[];\r
-extern char romFileName[PATH_MAX];\r
-extern char *rom_data;\r
extern int mmuhack_status;\r
-extern int state_slot;\r
-\r
-static char *gp2xKeyNames[] = {\r
- "UP", "???", "LEFT", "???", "DOWN", "???", "RIGHT", "???",\r
- "START", "SELECT", "L", "R", "A", "B", "X", "Y",\r
- "???", "???", "???", "???", "???", "???", "VOL DOWN", "VOL UP",\r
- "???", "???", "???", "PUSH", "???", "???", "???", "???"\r
-};\r
-\r
-char menuErrorMsg[40] = {0, };\r
\r
+void menu_darken_bg(void *dst, int pixels, int darker);\r
+static void menu_prepare_bg(int use_game_bg);\r
\r
-static void gp2x_text(unsigned char *screen, int x, int y, const char *text, int color)\r
+void menu_flip(void)\r
{\r
- int i,l;\r
-\r
- screen = screen + x + y*320;\r
-\r
- for (i = 0; i < strlen(text); i++)\r
- {\r
- for (l=0;l<8;l++)\r
- {\r
- if(fontdata8x8[((text[i])*8)+l]&0x80) screen[l*320+0]=color;\r
- if(fontdata8x8[((text[i])*8)+l]&0x40) screen[l*320+1]=color;\r
- if(fontdata8x8[((text[i])*8)+l]&0x20) screen[l*320+2]=color;\r
- if(fontdata8x8[((text[i])*8)+l]&0x10) screen[l*320+3]=color;\r
- if(fontdata8x8[((text[i])*8)+l]&0x08) screen[l*320+4]=color;\r
- if(fontdata8x8[((text[i])*8)+l]&0x04) screen[l*320+5]=color;\r
- if(fontdata8x8[((text[i])*8)+l]&0x02) screen[l*320+6]=color;\r
- if(fontdata8x8[((text[i])*8)+l]&0x01) screen[l*320+7]=color;\r
- }\r
- screen += 8;\r
- }\r
+ gp2x_video_flush_cache();\r
+ gp2x_video_flip2();\r
}\r
\r
-// draws white text to current bbp15 screen\r
-void gp2x_text_out15(int x, int y, const char *text)\r
-{\r
- int i,l;\r
- unsigned short *screen = gp2x_screen;\r
\r
- screen = screen + x + y*320;\r
-\r
- for (i = 0; i < strlen(text); i++)\r
- {\r
- for (l=0;l<8;l++)\r
- {\r
- if(fontdata8x8[((text[i])*8)+l]&0x80) screen[l*320+0]=0xffff;\r
- if(fontdata8x8[((text[i])*8)+l]&0x40) screen[l*320+1]=0xffff;\r
- if(fontdata8x8[((text[i])*8)+l]&0x20) screen[l*320+2]=0xffff;\r
- if(fontdata8x8[((text[i])*8)+l]&0x10) screen[l*320+3]=0xffff;\r
- if(fontdata8x8[((text[i])*8)+l]&0x08) screen[l*320+4]=0xffff;\r
- if(fontdata8x8[((text[i])*8)+l]&0x04) screen[l*320+5]=0xffff;\r
- if(fontdata8x8[((text[i])*8)+l]&0x02) screen[l*320+6]=0xffff;\r
- if(fontdata8x8[((text[i])*8)+l]&0x01) screen[l*320+7]=0xffff;\r
- }\r
- screen += 8;\r
- }\r
-}\r
+// --------- loading ROM screen ----------\r
\r
+static int cdload_called = 0;\r
\r
-void gp2x_text_out8(int x, int y, const char *texto, ...)\r
+static void load_progress_cb(int percent)\r
{\r
- va_list args;\r
- char buffer[512];\r
-\r
- va_start(args,texto);\r
- vsprintf(buffer,texto,args);\r
- va_end(args);\r
+ int ln, len = percent * 320 / 100;\r
+ unsigned short *dst = (unsigned short *)gp2x_screen + 320*20;\r
\r
- gp2x_text(gp2x_screen,x,y,buffer,0xf0);\r
+ if (len > 320) len = 320;\r
+ for (ln = 8; ln > 0; ln--, dst += 320)\r
+ memset(dst, 0xff, len*2);\r
+ menu_flip();\r
}\r
\r
-\r
-void gp2x_text_out8_2(int x, int y, const char *texto, int color)\r
+static void cdload_progress_cb(int percent)\r
{\r
- gp2x_text(gp2x_screen, x, y, texto, color);\r
-}\r
+ int ln, len = percent * 320 / 100;\r
+ unsigned short *dst = (unsigned short *)gp2x_screen + 320*20;\r
\r
-void gp2x_text_out8_lim(int x, int y, const char *texto, int max)\r
-{\r
- char buffer[320/8+1];\r
+ memset(dst, 0xff, 320*2*8);\r
\r
- strncpy(buffer, texto, 320/8);\r
- if (max > 320/8) max = 320/8;\r
- if (max < 0) max = 0;\r
- buffer[max] = 0;\r
+ smalltext_out16(1, 3*10, "Processing CD image / MP3s", 0xffff);\r
+ smalltext_out16_lim(1, 4*10, romFileName, 0xffff, 80);\r
+ dst += 320*30;\r
\r
- gp2x_text(gp2x_screen,x,y,buffer,0xf0);\r
+ if (len > 320) len = 320;\r
+ for (ln = 8; ln > 0; ln--, dst += 320)\r
+ memset(dst, 0xff, len*2);\r
+ menu_flip();\r
+ cdload_called = 1;\r
}\r
\r
-static void gp2x_smalltext8(int x, int y, const char *texto)\r
+void menu_romload_prepare(const char *rom_name)\r
{\r
- int i;\r
- unsigned char *src, *dst;\r
-\r
- for (i = 0;; i++, x += 6)\r
- {\r
- unsigned char c = (unsigned char) texto[i];\r
- int h = 8;\r
-\r
- if (!c) break;\r
-\r
- src = fontdata6x8[c];\r
- dst = (unsigned char *)gp2x_screen + x + y*320;\r
-\r
- while (h--)\r
- {\r
- int w = 0x20;\r
- while (w)\r
- {\r
- if( *src & w ) *dst = 0xf0;\r
- dst++;\r
- w>>=1;\r
- }\r
- src++;\r
-\r
- dst += 320-6;\r
- }\r
- }\r
-}\r
-\r
-static void gp2x_smalltext8_lim(int x, int y, const char *texto, int max)\r
-{\r
- char buffer[320/6+1];\r
-\r
- strncpy(buffer, texto, 320/6);\r
- if (max > 320/6) max = 320/6;\r
- if (max < 0) max = 0;\r
- buffer[max] = 0;\r
-\r
- gp2x_smalltext8(x, y, buffer);\r
+ const char *p = rom_name + strlen(rom_name);\r
+ while (p > rom_name && *p != '/') p--;\r
+\r
+ if (rom_loaded) gp2x_pd_clone_buffer2();\r
+ else memset(gp2x_screen, 0, 320*240*2);\r
+\r
+ smalltext_out16(1, 1, "Loading", 0xffff);\r
+ smalltext_out16_lim(1, 10, p, 0xffff, 53);\r
+ gp2x_memcpy_buffers(3, gp2x_screen, 0, 320*240*2);\r
+ menu_flip();\r
+ PicoCartLoadProgressCB = load_progress_cb;\r
+ PicoCDLoadProgressCB = cdload_progress_cb;\r
+ cdload_called = 0;\r
}\r
\r
-\r
-static unsigned long inp_prev = 0;\r
-static int inp_prevjoy = 0;\r
-\r
-static unsigned long wait_for_input(unsigned long interesting)\r
+void menu_romload_end(void)\r
{\r
- unsigned long ret;\r
- static int repeats = 0, wait = 300*1000;\r
- int release = 0, i;\r
-\r
- if (repeats == 5 || repeats == 15 || repeats == 30) wait /= 2;\r
-\r
- for (i = 0; i < 6 && inp_prev == gp2x_joystick_read(1); i++) {\r
- if(i == 0) repeats++;\r
- usleep(wait/6);\r
- }\r
-\r
- while ( !((ret = gp2x_joystick_read(1)) & interesting) ) {\r
- usleep(50000);\r
- release = 1;\r
- }\r
-\r
- if (release || ret != inp_prev) {\r
- repeats = 0;\r
- wait = 300*1000;\r
- }\r
- inp_prev = ret;\r
- inp_prevjoy = 0;\r
-\r
- // we don't need diagonals in menus\r
- if ((ret&GP2X_UP) && (ret&GP2X_LEFT)) ret &= ~GP2X_LEFT;\r
- if ((ret&GP2X_UP) && (ret&GP2X_RIGHT)) ret &= ~GP2X_RIGHT;\r
- if ((ret&GP2X_DOWN) && (ret&GP2X_LEFT)) ret &= ~GP2X_LEFT;\r
- if ((ret&GP2X_DOWN) && (ret&GP2X_RIGHT)) ret &= ~GP2X_RIGHT;\r
-\r
- return ret;\r
+ PicoCartLoadProgressCB = PicoCDLoadProgressCB = NULL;\r
+ smalltext_out16(1, cdload_called ? 60 : 30, "Starting emulation...", 0xffff);\r
+ menu_flip();\r
}\r
\r
-static unsigned long input2_read(unsigned long interesting, int *joy)\r
-{\r
- unsigned long ret;\r
- int i;\r
-\r
- do\r
- {\r
- *joy = 0;\r
- if ((ret = gp2x_joystick_read(0) & interesting)) break;\r
- gp2x_usbjoy_update();\r
- for (i = 0; i < num_of_joys; i++) {\r
- ret = gp2x_usbjoy_check2(i);\r
- if (ret) { *joy = i + 1; break; }\r
- }\r
- if (ret) break;\r
- }\r
- while(0);\r
-\r
- return ret;\r
-}\r
+// -------------- ROM selector --------------\r
\r
-// similar to wait_for_input(), but returns joy num\r
-static unsigned long wait_for_input_usbjoy(unsigned long interesting, int *joy)\r
+// rrrr rggg gggb bbbb\r
+static unsigned short file2color(const char *fname)\r
{\r
- unsigned long ret;\r
- const int wait = 300*1000;\r
+ const char *ext = fname + strlen(fname) - 3;\r
+ static const char *rom_exts[] = { "zip", "bin", "smd", "gen", "iso", "cso", "cue" };\r
+ static const char *other_exts[] = { "gmv", "pat" };\r
int i;\r
\r
- if (inp_prevjoy == 0) inp_prev &= interesting;\r
- for (i = 0; i < 6; i++) {\r
- ret = input2_read(interesting, joy);\r
- if (*joy != inp_prevjoy || ret != inp_prev) break;\r
- usleep(wait/6);\r
- }\r
-\r
- while ( !(ret = input2_read(interesting, joy)) ) {\r
- usleep(50000);\r
- }\r
-\r
- inp_prev = ret;\r
- inp_prevjoy = *joy;\r
-\r
- return ret;\r
+ if (ext < fname) ext = fname;\r
+ for (i = 0; i < sizeof(rom_exts)/sizeof(rom_exts[0]); i++)\r
+ if (strcasecmp(ext, rom_exts[i]) == 0) return 0xbdff;\r
+ for (i = 0; i < sizeof(other_exts)/sizeof(other_exts[0]); i++)\r
+ if (strcasecmp(ext, other_exts[i]) == 0) return 0xaff5;\r
+ return 0xffff;\r
}\r
\r
-\r
-\r
-// -------------- ROM selector --------------\r
-\r
static void draw_dirlist(char *curdir, struct dirent **namelist, int n, int sel)\r
{\r
int start, i, pos;\r
start = 12 - sel;\r
n--; // exclude current dir (".")\r
\r
- //memset(gp2x_screen, 0, 320*240);\r
gp2x_pd_clone_buffer2();\r
\r
+ if (!rom_loaded) {\r
+ menu_darken_bg(gp2x_screen, 320*240, 0);\r
+ }\r
+\r
+ menu_darken_bg((char *)gp2x_screen + 320*120*2, 320*8, 0);\r
+\r
if(start - 2 >= 0)\r
- gp2x_smalltext8_lim(14, (start - 2)*10, curdir, 53-2);\r
+ smalltext_out16_lim(14, (start - 2)*10, curdir, 0xffff, 53-2);\r
for (i = 0; i < n; i++) {\r
pos = start + i;\r
if (pos < 0) continue;\r
if (pos > 23) break;\r
if (namelist[i+1]->d_type == DT_DIR) {\r
- gp2x_smalltext8_lim(14, pos*10, "/", 1);\r
- gp2x_smalltext8_lim(14+6, pos*10, namelist[i+1]->d_name, 53-3);\r
+ smalltext_out16_lim(14, pos*10, "/", 0xfff6, 1);\r
+ smalltext_out16_lim(14+6, pos*10, namelist[i+1]->d_name, 0xfff6, 53-3);\r
} else {\r
- gp2x_smalltext8_lim(14, pos*10, namelist[i+1]->d_name, 53-2);\r
+ unsigned short color = file2color(namelist[i+1]->d_name);\r
+ smalltext_out16_lim(14, pos*10, namelist[i+1]->d_name, color, 53-2);\r
}\r
}\r
- gp2x_text_out8(5, 120, ">");\r
- gp2x_video_flip2();\r
+ text_out16(5, 120, ">");\r
+ menu_flip();\r
}\r
\r
static int scandir_cmp(const void *p1, const void *p2)\r
return alphasort(d1, d2);\r
}\r
\r
+static char *filter_exts[] = {\r
+ ".mp3", ".MP3", ".srm", ".brm", "s.gz", ".mds", "bcfg", ".txt", ".htm", "html",\r
+ ".jpg", ".gpe"\r
+};\r
+\r
+static int scandir_filter(const struct dirent *ent)\r
+{\r
+ const char *p;\r
+ int i;\r
+\r
+ if (ent == NULL || ent->d_name == NULL) return 0;\r
+ if (strlen(ent->d_name) < 5) return 1;\r
+\r
+ p = ent->d_name + strlen(ent->d_name) - 4;\r
+\r
+ for (i = 0; i < sizeof(filter_exts)/sizeof(filter_exts[0]); i++)\r
+ {\r
+ if (strcmp(p, filter_exts[i]) == 0) return 0;\r
+ }\r
+\r
+ return 1;\r
+}\r
+\r
+static void do_delete(const char *fpath, const char *fname)\r
+{\r
+ int len, inp;\r
+\r
+ gp2x_pd_clone_buffer2();\r
+\r
+ if (!rom_loaded)\r
+ menu_darken_bg(gp2x_screen, 320*240, 0);\r
+\r
+ len = strlen(fname);\r
+ if (len > 320/6) len = 320/6;\r
+\r
+ text_out16(320/2 - 15*8/2, 80, "About to delete");\r
+ smalltext_out16_lim(320/2 - len*6/2, 95, fname, 0xbdff, len);\r
+ text_out16(320/2 - 13*8/2, 110, "Are you sure?");\r
+ text_out16(320/2 - 25*8/2, 120, "(Y - confirm, X - cancel)");\r
+ menu_flip();\r
+\r
+\r
+ while (in_menu_wait_any(50) & (PBTN_WEST|PBTN_MENU));\r
+ inp = in_menu_wait(GP2X_Y|PBTN_MBACK); /* FIXME */\r
+ if (inp & GP2X_Y)\r
+ remove(fpath);\r
+}\r
\r
static char *romsel_loop(char *curr_path)\r
{\r
unsigned long inp = 0;\r
char *ret = NULL, *fname = NULL;\r
\r
+rescan:\r
// is this a dir or a full path?\r
if ((dir = opendir(curr_path))) {\r
closedir(dir);\r
fname = p+1;\r
}\r
\r
- n = scandir(curr_path, &namelist, 0, scandir_cmp);\r
+ n = scandir(curr_path, &namelist, scandir_filter, scandir_cmp);\r
if (n < 0) {\r
// try root\r
- n = scandir(curr_path, &namelist, 0, scandir_cmp);\r
+ n = scandir("/", &namelist, scandir_filter, scandir_cmp);\r
if (n < 0) {\r
// oops, we failed\r
- printf("dir: "); printf(curr_path); printf("\n");\r
+ printf("dir: %s\n", curr_path);\r
perror("scandir");\r
return NULL;\r
}\r
for (;;)\r
{\r
draw_dirlist(curr_path, namelist, n, sel);\r
- inp = wait_for_input(GP2X_UP|GP2X_DOWN|GP2X_LEFT|GP2X_RIGHT|GP2X_L|GP2X_R|GP2X_B|GP2X_X);\r
- if(inp & GP2X_UP ) { sel--; if (sel < 0) sel = n-2; }\r
- if(inp & GP2X_DOWN) { sel++; if (sel > n-2) sel = 0; }\r
- if(inp &(GP2X_LEFT|GP2X_L)) { sel-=10; if (sel < 0) sel = 0; }\r
- if(inp &(GP2X_RIGHT|GP2X_R)) { sel+=10; if (sel > n-2) sel = n-2; }\r
- if(inp & GP2X_B) { // enter dir/select\r
+ inp = in_menu_wait(PBTN_UP|PBTN_DOWN|PBTN_LEFT|PBTN_RIGHT|PBTN_L|PBTN_R|PBTN_WEST|PBTN_MOK|PBTN_MBACK|PBTN_MENU);\r
+ if(inp & PBTN_UP ) { sel--; if (sel < 0) sel = n-2; }\r
+ if(inp & PBTN_DOWN) { sel++; if (sel > n-2) sel = 0; }\r
+ if(inp & PBTN_LEFT) { sel-=10; if (sel < 0) sel = 0; }\r
+ if(inp & PBTN_L) { sel-=24; if (sel < 0) sel = 0; }\r
+ if(inp & PBTN_RIGHT) { sel+=10; if (sel > n-2) sel = n-2; }\r
+ if(inp & PBTN_R) { sel+=24; if (sel > n-2) sel = n-2; }\r
+ if ((inp & PBTN_MOK) || (inp & (PBTN_MENU|PBTN_WEST)) == (PBTN_MENU|PBTN_WEST)) // enter dir/select || delete\r
+ {\r
again:\r
- if (namelist[sel+1]->d_type == DT_REG) {\r
+ if (namelist[sel+1]->d_type == DT_REG)\r
+ {\r
strcpy(romFileName, curr_path);\r
strcat(romFileName, "/");\r
strcat(romFileName, namelist[sel+1]->d_name);\r
- ret = romFileName;\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 (inp & PBTN_MOK) { // return sel\r
+ ret = romFileName;\r
+ break;\r
+ }\r
+ do_delete(romFileName, namelist[sel+1]->d_name);\r
+ if (n > 0) {\r
+ while (n--) free(namelist[n]);\r
+ free(namelist);\r
+ }\r
+ goto rescan;\r
+ }\r
+ else if (namelist[sel+1]->d_type == DT_DIR)\r
+ {\r
+ int newlen;\r
+ char *p, *newdir;\r
+ if (!(inp & PBTN_MOK)) continue;\r
+ newlen = strlen(curr_path) + strlen(namelist[sel+1]->d_name) + 2;\r
+ newdir = malloc(newlen);\r
if (strcmp(namelist[sel+1]->d_name, "..") == 0) {\r
char *start = curr_path;\r
p = start + strlen(start) - 1;\r
ret = romsel_loop(newdir);\r
free(newdir);\r
break;\r
- } else {\r
+ }\r
+ else\r
+ {\r
// unknown file type, happens on NTFS mounts. Try to guess.\r
FILE *tstf; int tmp;\r
strcpy(romFileName, curr_path);\r
}\r
}\r
}\r
- if(inp & GP2X_X) break; // cancel\r
+ if(inp & PBTN_MBACK) break; // cancel\r
}\r
\r
if (n > 0) {\r
- while(n--) free(namelist[n]);\r
+ while (n--) free(namelist[n]);\r
free(namelist);\r
}\r
\r
\r
static void draw_patchlist(int sel)\r
{\r
- int start, i, pos;\r
+ int start, i, pos, active;\r
\r
start = 12 - sel;\r
\r
pos = start + i;\r
if (pos < 0) continue;\r
if (pos > 23) break;\r
- gp2x_smalltext8_lim(14, pos*10, PicoPatches[i].active ? "ON " : "OFF", 3);\r
- gp2x_smalltext8_lim(14+6*4, pos*10, PicoPatches[i].name, 53-6);\r
+ active = PicoPatches[i].active;\r
+ smalltext_out16_lim(14, pos*10, active ? "ON " : "OFF", active ? 0xfff6 : 0xffff, 3);\r
+ smalltext_out16_lim(14+6*4, pos*10, PicoPatches[i].name, active ? 0xfff6 : 0xffff, 53-6);\r
}\r
pos = start + i;\r
- if (pos < 24) gp2x_smalltext8_lim(14, pos*10, "done", 4);\r
+ if (pos < 24) smalltext_out16_lim(14, pos*10, "done", 0xffff, 4);\r
\r
- gp2x_text_out8(5, 120, ">");\r
- gp2x_video_flip2();\r
+ text_out16(5, 120, ">");\r
+ menu_flip();\r
}\r
\r
\r
-void patches_menu_loop(void)\r
+static void patches_menu_loop(void)\r
{\r
int menu_sel = 0;\r
unsigned long inp = 0;\r
for(;;)\r
{\r
draw_patchlist(menu_sel);\r
- inp = wait_for_input(GP2X_UP|GP2X_DOWN|GP2X_LEFT|GP2X_RIGHT|GP2X_L|GP2X_R|GP2X_B|GP2X_X);\r
- if(inp & GP2X_UP ) { menu_sel--; if (menu_sel < 0) menu_sel = PicoPatchCount; }\r
- if(inp & GP2X_DOWN) { menu_sel++; if (menu_sel > PicoPatchCount) menu_sel = 0; }\r
- if(inp &(GP2X_LEFT|GP2X_L)) { menu_sel-=10; if (menu_sel < 0) menu_sel = 0; }\r
- if(inp &(GP2X_RIGHT|GP2X_R)) { menu_sel+=10; if (menu_sel > PicoPatchCount) menu_sel = PicoPatchCount; }\r
- if(inp & GP2X_B) { // action\r
+ inp = in_menu_wait(PBTN_UP|PBTN_DOWN|PBTN_LEFT|PBTN_RIGHT|PBTN_L|PBTN_R|PBTN_MOK|PBTN_MBACK);\r
+ if(inp & PBTN_UP ) { menu_sel--; if (menu_sel < 0) menu_sel = PicoPatchCount; }\r
+ if(inp & PBTN_DOWN) { menu_sel++; if (menu_sel > PicoPatchCount) menu_sel = 0; }\r
+ if(inp &(PBTN_LEFT|PBTN_L)) { menu_sel-=10; if (menu_sel < 0) menu_sel = 0; }\r
+ if(inp &(PBTN_RIGHT|PBTN_R)) { menu_sel+=10; if (menu_sel > PicoPatchCount) menu_sel = PicoPatchCount; }\r
+ if(inp & PBTN_MOK) { // action\r
if (menu_sel < PicoPatchCount)\r
PicoPatches[menu_sel].active = !PicoPatches[menu_sel].active;\r
else return;\r
}\r
- if(inp & GP2X_X) return;\r
+ if(inp & PBTN_MBACK) return;\r
}\r
\r
}\r
\r
// ------------ savestate loader ------------\r
\r
-static void menu_prepare_bg(void);\r
-\r
static int state_slot_flags = 0;\r
\r
static void state_check_slots(void)\r
\r
for (slot = 0; slot < 10; slot++)\r
{\r
- if (emu_check_save_file(slot))\r
+ if (emu_checkSaveFile(slot))\r
{\r
state_slot_flags |= 1 << slot;\r
}\r
\r
if (strcmp(fname + strlen(fname) - 3, ".gz") == 0) {\r
file = gzopen(fname, "rb");\r
- emu_set_save_cbs(1);\r
+ emu_setSaveStateCbs(1);\r
} else {\r
file = fopen(fname, "rb");\r
- emu_set_save_cbs(0);\r
+ emu_setSaveStateCbs(0);\r
}\r
\r
if (file) {\r
- if (PicoMCD & 1) {\r
+ if (PicoAHW & PAHW_MCD) {\r
PicoCdLoadStateGfx(file);\r
} else {\r
areaSeek(file, 0x10020, SEEK_SET); // skip header and RAM in state file\r
areaClose(file);\r
}\r
\r
- emu_forced_frame();\r
- gp2x_memcpy_buffers((1<<2), gp2x_screen, 0, 320*240*2);\r
- menu_prepare_bg();\r
+ emu_forcedFrame(POPT_EN_SOFTSCALE);\r
+ menu_prepare_bg(1);\r
\r
memcpy(Pico.vram, tmp_vram, sizeof(Pico.vram));\r
memcpy(Pico.cram, tmp_cram, sizeof(Pico.cram));\r
draw_savestate_bg(menu_sel);\r
gp2x_pd_clone_buffer2();\r
\r
- gp2x_text_out8(tl_x, 30, is_loading ? "Load state" : "Save state");\r
+ text_out16(tl_x, 30, is_loading ? "Load state" : "Save state");\r
+\r
+ menu_draw_selection(tl_x - 16, tl_y + menu_sel*10, 108);\r
\r
/* draw all 10 slots */\r
y = tl_y;\r
for (i = 0; i < 10; i++, y+=10)\r
{\r
- gp2x_text_out8(tl_x, y, "SLOT %i (%s)", i, (state_slot_flags & (1 << i)) ? "USED" : "free");\r
+ text_out16(tl_x, y, "SLOT %i (%s)", i, (state_slot_flags & (1 << i)) ? "USED" : "free");\r
}\r
- gp2x_text_out8(tl_x, y, "back");\r
+ text_out16(tl_x, y, "back");\r
\r
- // draw cursor\r
- gp2x_text_out8(tl_x - 16, tl_y + menu_sel*10, ">");\r
-\r
- gp2x_video_flip2();\r
+ menu_flip();\r
}\r
\r
static int savestate_menu_loop(int is_loading)\r
{\r
- int menu_sel = 10, menu_sel_max = 10;\r
+ static int menu_sel = 10;\r
+ int menu_sel_max = 10;\r
unsigned long inp = 0;\r
\r
state_check_slots();\r
for(;;)\r
{\r
draw_savestate_menu(menu_sel, is_loading);\r
- inp = wait_for_input(GP2X_UP|GP2X_DOWN|GP2X_B|GP2X_X);\r
- if(inp & GP2X_UP ) {\r
+ inp = in_menu_wait(PBTN_UP|PBTN_DOWN|PBTN_MOK|PBTN_MBACK);\r
+ if(inp & PBTN_UP ) {\r
do {\r
menu_sel--; if (menu_sel < 0) menu_sel = menu_sel_max;\r
} while (!(state_slot_flags & (1 << menu_sel)) && menu_sel != menu_sel_max && is_loading);\r
}\r
- if(inp & GP2X_DOWN) {\r
+ if(inp & PBTN_DOWN) {\r
do {\r
menu_sel++; if (menu_sel > menu_sel_max) menu_sel = 0;\r
} while (!(state_slot_flags & (1 << menu_sel)) && menu_sel != menu_sel_max && is_loading);\r
}\r
- if(inp & GP2X_B) { // save/load\r
+ if(inp & PBTN_MOK) { // save/load\r
if (menu_sel < 10) {\r
state_slot = menu_sel;\r
if (emu_SaveLoadGame(is_loading, 0)) {\r
return 0;\r
} else return 1;\r
}\r
- if(inp & GP2X_X) return 1;\r
+ if(inp & PBTN_MBACK) return 1;\r
}\r
}\r
\r
// -------------- key config --------------\r
\r
-static char *usb_joy_key_name(int joy, int num)\r
+static char *action_binds(int player_idx, int action_mask)\r
{\r
- static char name[16];\r
- switch (num)\r
+ static char strkeys[32];\r
+ int d, k, d_prev = -1;\r
+\r
+ strkeys[0] = 0;\r
+\r
+ for (d = 0; d < IN_MAX_DEVS; d++)\r
{\r
- case 0: sprintf(name, "Joy%i UP", joy); break;\r
- case 1: sprintf(name, "Joy%i DOWN", joy); break;\r
- case 2: sprintf(name, "Joy%i LEFT", joy); break;\r
- case 3: sprintf(name, "Joy%i RIGHT", joy); break;\r
- default:sprintf(name, "Joy%i b%i", joy, num-3); break;\r
+ const int *binds;\r
+ int count;\r
+\r
+ binds = in_get_dev_binds(d);\r
+ if (binds == NULL)\r
+ continue;\r
+\r
+ count = in_get_dev_bind_count(d);\r
+ for (k = 0; k < count; k++)\r
+ {\r
+ const char *xname;\r
+ char prefix[16];\r
+ if (!(binds[k] & action_mask))\r
+ continue;\r
+\r
+ if (player_idx >= 0 && ((binds[k] >> 16) & 3) != player_idx)\r
+ continue;\r
+\r
+ xname = in_get_key_name(d, k);\r
+ if (strkeys[0])\r
+ strncat(strkeys, d == d_prev ? " + " : ", ", sizeof(strkeys));\r
+ if (d) sprintf(prefix, "%d: ", d);\r
+ if (d) strncat(strkeys, prefix, sizeof(strkeys));\r
+ strncat(strkeys, xname, sizeof(strkeys));\r
+ d_prev = d;\r
+ }\r
}\r
- return name;\r
+\r
+ // limit..\r
+ strkeys[20] = 0;\r
+\r
+ return strkeys;\r
}\r
\r
-static void draw_key_config(int curr_act, int is_p2)\r
+static void unbind_action(int action, int pl_idx, int joy)\r
{\r
- char strkeys[32*5];\r
- int joy, i;\r
+ int i, u;\r
\r
- strkeys[0] = 0;\r
- for (i = 0; i < 32; i++)\r
+ if (joy <= 0)\r
{\r
- if (currentConfig.KeyBinds[i] & (1 << curr_act))\r
- {\r
- if (curr_act < 16 && (currentConfig.KeyBinds[i] & (1 << 16)) != (is_p2 << 16)) continue;\r
- if (strkeys[0]) { strcat(strkeys, " + "); strcat(strkeys, gp2xKeyNames[i]); break; }\r
- else strcpy(strkeys, gp2xKeyNames[i]);\r
+ for (i = 0; i < 32; i++) {\r
+ if (pl_idx >= 0 && (currentConfig.KeyBinds[i]&0x30000) != (pl_idx<<16)) continue;\r
+ currentConfig.KeyBinds[i] &= ~action;\r
}\r
}\r
- for (joy = 0; joy < num_of_joys; joy++)\r
+ if (joy < 0)\r
{\r
- for (i = 0; i < 32; i++)\r
- {\r
- if (currentConfig.JoyBinds[joy][i] & (1 << curr_act))\r
- {\r
- if (curr_act < 16 && (currentConfig.JoyBinds[joy][i] & (1 << 16)) != (is_p2 << 16)) continue;\r
- if (strkeys[0]) {\r
- strcat(strkeys, ", "); strcat(strkeys, usb_joy_key_name(joy + 1, i));\r
- break;\r
- }\r
- else strcpy(strkeys, usb_joy_key_name(joy + 1, i));\r
+ for (u = 0; u < 4; u++)\r
+ for (i = 0; i < 32; i++) {\r
+ if (pl_idx >= 0 && (currentConfig.JoyBinds[u][i]&0x30000) != (pl_idx<<16)) continue;\r
+ currentConfig.JoyBinds[u][i] &= ~action;\r
}\r
+ }\r
+ else if (joy > 0)\r
+ {\r
+ for (i = 0; i < 32; i++) {\r
+ if (pl_idx >= 0 && (currentConfig.JoyBinds[joy-1][i]&0x30000) != (pl_idx<<16)) continue;\r
+ currentConfig.JoyBinds[joy-1][i] &= ~action;\r
}\r
}\r
+}\r
+\r
+static int count_bound_keys(int dev_id, int action_mask, int player_idx)\r
+{\r
+ const int *binds;\r
+ int k, keys = 0;\r
+ int count;\r
+\r
+ binds = in_get_dev_binds(dev_id);\r
+ if (binds == NULL)\r
+ return 0;\r
+\r
+ count = in_get_dev_bind_count(dev_id);\r
+ for (k = 0; k < count; k++)\r
+ {\r
+ if (!(binds[k] & action_mask))\r
+ continue;\r
+\r
+ if (player_idx >= 0 && ((binds[k] >> 16) & 3) != player_idx)\r
+ continue;\r
+\r
+ keys++;\r
+ }\r
+\r
+ return keys;\r
+}\r
+\r
+static void draw_key_config(const me_bind_action *opts, int opt_cnt, int player_idx,\r
+ int sel, int is_bind)\r
+{\r
+ int x, y, tl_y = 30, i;\r
\r
- //memset(gp2x_screen, 0, 320*240);\r
gp2x_pd_clone_buffer2();\r
- gp2x_text_out8(60, 40, "Action: %s", actionNames[curr_act]);\r
- gp2x_text_out8(60, 60, "Keys: %s", strkeys);\r
+ if (player_idx >= 0) {\r
+ text_out16(80, 10, "Player %i controls", player_idx + 1);\r
+ x = 80;\r
+ } else {\r
+ text_out16(80, 10, "Emulator controls");\r
+ x = 40;\r
+ }\r
\r
- gp2x_text_out8(30, 180, "Use SELECT to change action");\r
- gp2x_text_out8(30, 190, "Press a key to bind/unbind");\r
- gp2x_text_out8(30, 200, "Select \"Done\" action and");\r
- gp2x_text_out8(30, 210, " press any key to finish");\r
- gp2x_video_flip2();\r
+ menu_draw_selection(x - 16, tl_y + sel*10, (player_idx >= 0) ? 66 : 140);\r
+\r
+ y = tl_y;\r
+ for (i = 0; i < opt_cnt; i++, y+=10)\r
+ text_out16(x, y, "%s : %s", opts[i].name, action_binds(player_idx, opts[i].mask));\r
+\r
+ text_out16(x, y, "Done");\r
+\r
+ if (sel < opt_cnt) {\r
+ text_out16(30, 205, is_bind ? "Press a button to bind/unbind" : "Press B to define");\r
+ text_out16(30, 225, "Select \"Done\" to exit");\r
+ } else {\r
+ text_out16(30, 205, "Use Options -> Save cfg");\r
+ text_out16(30, 215, "to save controls");\r
+ text_out16(30, 225, "Press B or X to exit");\r
+ }\r
+ menu_flip();\r
}\r
\r
-static void key_config_loop(int is_p2)\r
+static void key_config_loop(const me_bind_action *opts, int opt_cnt, int player_idx)\r
{\r
- int curr_act = 0, joy = 0, i;\r
- unsigned long inp = 0;\r
+ int sel = 0, menu_sel_max = opt_cnt;\r
+ int kc, dev_id, is_down, mkey, unbind;\r
\r
for (;;)\r
{\r
- draw_key_config(curr_act, is_p2);\r
- inp = wait_for_input_usbjoy(CONFIGURABLE_KEYS, &joy);\r
- // printf("got %08lX from joy %i\n", inp, joy);\r
- if (joy == 0) {\r
- if (inp & GP2X_SELECT) {\r
- curr_act++;\r
- while (!actionNames[curr_act] && curr_act < 32) curr_act++;\r
- if (curr_act > 31) curr_act = 0;\r
- }\r
- inp &= CONFIGURABLE_KEYS;\r
- inp &= ~GP2X_SELECT;\r
+ draw_key_config(opts, opt_cnt, player_idx, sel, 0);\r
+ mkey = in_menu_wait(PBTN_UP|PBTN_DOWN|PBTN_MBACK|PBTN_MOK);\r
+ switch (mkey) {\r
+ case PBTN_UP: sel--; if (sel < 0) sel = menu_sel_max; continue;\r
+ case PBTN_DOWN: sel++; if (sel > menu_sel_max) sel = 0; continue;\r
+ case PBTN_MBACK: return;\r
+ case PBTN_MOK:\r
+ if (sel >= opt_cnt)\r
+ return;\r
+ while (in_menu_wait_any(30) & PBTN_MOK);\r
+ break;\r
+ default:continue;\r
}\r
- if (curr_act == 31 && inp) break;\r
- if (joy == 0) {\r
- for (i = 0; i < 32; i++)\r
- if (inp & (1 << i)) {\r
- currentConfig.KeyBinds[i] ^= (1 << curr_act);\r
- if (is_p2) currentConfig.KeyBinds[i] |= (1 << 16); // player 2 flag\r
- else currentConfig.KeyBinds[i] &= ~(1 << 16);\r
- }\r
- } else {\r
- for (i = 0; i < 32; i++)\r
- if (inp & (1 << i)) {\r
- currentConfig.JoyBinds[joy-1][i] ^= (1 << curr_act);\r
- if (is_p2) currentConfig.JoyBinds[joy-1][i] |= (1 << 16);\r
- else currentConfig.JoyBinds[joy-1][i] &= ~(1 << 16);\r
- }\r
+\r
+ draw_key_config(opts, opt_cnt, player_idx, sel, 1);\r
+\r
+ /* wait for some up event */\r
+ for (is_down = 1; is_down; ) {\r
+ kc = in_update_keycode(&dev_id, &is_down, -1);\r
+ }\r
+\r
+ unbind = count_bound_keys(dev_id, opts[sel].mask, player_idx) >= 2;\r
+\r
+ in_bind_key(dev_id, kc, opts[sel].mask, unbind);\r
+ if (player_idx >= 0) {\r
+ /* FIXME */\r
+ in_bind_key(dev_id, kc, 3 << 16, 1);\r
+ in_bind_key(dev_id, kc, player_idx << 16, 0);\r
}\r
}\r
}\r
\r
+\r
+menu_entry ctrlopt_entries[] =\r
+{\r
+ { "Player 1", MB_NONE, MA_CTRL_PLAYER1, NULL, 0, 0, 0, 1, 0 },\r
+ { "Player 2", MB_NONE, MA_CTRL_PLAYER2, NULL, 0, 0, 0, 1, 0 },\r
+ { "Emulator controls", MB_NONE, MA_CTRL_EMU, NULL, 0, 0, 0, 1, 0 },\r
+ { "6 button pad", MB_ONOFF, MA_OPT_6BUTTON_PAD, &PicoOpt, 0x020, 0, 0, 1, 1 },\r
+ { "Turbo rate", MB_RANGE, MA_CTRL_TURBO_RATE, ¤tConfig.turbo_rate, 0, 1, 30, 1, 1 },\r
+ { "Done", MB_NONE, MA_CTRL_DONE, NULL, 0, 0, 0, 1, 0 },\r
+};\r
+\r
+#define CTRLOPT_ENTRY_COUNT (sizeof(ctrlopt_entries) / sizeof(ctrlopt_entries[0]))\r
+const int ctrlopt_entry_count = CTRLOPT_ENTRY_COUNT;\r
+\r
+\r
static void draw_kc_sel(int menu_sel)\r
{\r
int tl_x = 25+40, tl_y = 60, y, i;\r
char joyname[36];\r
\r
y = tl_y;\r
- //memset(gp2x_screen, 0, 320*240);\r
gp2x_pd_clone_buffer2();\r
- gp2x_text_out8(tl_x, y, "Player 1");\r
- gp2x_text_out8(tl_x, (y+=10), "Player 2");\r
- gp2x_text_out8(tl_x, (y+=10), "Done");\r
+ menu_draw_selection(tl_x - 16, tl_y + menu_sel*10, 138);\r
\r
- // draw cursor\r
- gp2x_text_out8(tl_x - 16, tl_y + menu_sel*10, ">");\r
+ me_draw(ctrlopt_entries, ctrlopt_entry_count, tl_x, tl_y, NULL, NULL);\r
\r
tl_x = 25;\r
- gp2x_text_out8(tl_x, (y=110), "USB joys detected:");\r
- if (num_of_joys > 0) {\r
- for (i = 0; i < num_of_joys; i++) {\r
- strncpy(joyname, joy_name(joys[i]), 33); joyname[33] = 0;\r
- gp2x_text_out8(tl_x, (y+=10), "%i: %s", i+1, joyname);\r
- }\r
- } else {\r
- gp2x_text_out8(tl_x, (y+=10), "none");\r
+ text_out16(tl_x, (y=130), "Input devices:");\r
+ for (i = 0; i < IN_MAX_DEVS && y < 230; i++) {\r
+ const char *tmp, *name = in_get_dev_name(i, 1);\r
+ if (name == NULL)\r
+ continue;\r
+ tmp = strchr(name, ':');\r
+ if (tmp != NULL)\r
+ name = tmp + 1;\r
+ strncpy(joyname, name, 33); joyname[33] = 0;\r
+ text_out16(tl_x, (y+=10), "%i: %s", i, joyname);\r
}\r
\r
-\r
- gp2x_video_flip2();\r
+ menu_flip();\r
}\r
\r
+\r
+// player2_flag, reserved, ?, ?,\r
+// ?, ?, fast forward, menu\r
+// "NEXT SAVE SLOT", "PREV SAVE SLOT", "SWITCH RENDERER", "SAVE STATE",\r
+// "LOAD STATE", "VOLUME UP", "VOLUME DOWN", "DONE"\r
+me_bind_action emuctrl_actions[] =\r
+{\r
+ { "Load State ", 1<<28 },\r
+ { "Save State ", 1<<27 },\r
+ { "Prev Save Slot ", 1<<25 },\r
+ { "Next Save Slot ", 1<<24 },\r
+ { "Switch Renderer ", 1<<26 },\r
+ { "Volume Down ", 1<<30 },\r
+ { "Volume Up ", 1<<29 },\r
+ { "Fast forward ", 1<<22 },\r
+ { "Enter Menu ", 1<<23 },\r
+ { "Pico Next page ", 1<<21 },\r
+ { "Pico Prev page ", 1<<20 },\r
+ { "Pico Switch input", 1<<19 },\r
+ { NULL, 0 }\r
+};\r
+\r
static void kc_sel_loop(void)\r
{\r
- int menu_sel = 2, menu_sel_max = 2;\r
+ int menu_sel = 5, menu_sel_max = 5;\r
unsigned long inp = 0;\r
+ menu_id selected_id;\r
\r
- for(;;)\r
+ while (1)\r
{\r
draw_kc_sel(menu_sel);\r
- inp = wait_for_input(GP2X_UP|GP2X_DOWN|GP2X_B|GP2X_X);\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) {\r
- switch (menu_sel) {\r
- case 0: key_config_loop(0); return;\r
- case 1: key_config_loop(1); return;\r
+ inp = in_menu_wait(PBTN_UP|PBTN_DOWN|PBTN_RIGHT|PBTN_LEFT|PBTN_MOK|PBTN_MBACK);\r
+ selected_id = me_index2id(ctrlopt_entries, CTRLOPT_ENTRY_COUNT, menu_sel);\r
+ if (inp & (PBTN_LEFT|PBTN_RIGHT)) // multi choise\r
+ me_process(ctrlopt_entries, CTRLOPT_ENTRY_COUNT, selected_id, (inp&PBTN_RIGHT) ? 1 : 0);\r
+ if (inp & PBTN_UP ) { menu_sel--; if (menu_sel < 0) menu_sel = menu_sel_max; }\r
+ if (inp & PBTN_DOWN) { menu_sel++; if (menu_sel > menu_sel_max) menu_sel = 0; }\r
+ if (inp & PBTN_MOK) {\r
+ int is_6button = PicoOpt & POPT_6BTN_PAD;\r
+ switch (selected_id) {\r
+ case MA_CTRL_PLAYER1: key_config_loop(me_ctrl_actions, is_6button ? 15 : 11, 0); return;\r
+ case MA_CTRL_PLAYER2: key_config_loop(me_ctrl_actions, is_6button ? 15 : 11, 1); return;\r
+ case MA_CTRL_EMU: key_config_loop(emuctrl_actions,\r
+ sizeof(emuctrl_actions)/sizeof(emuctrl_actions[0]) - 1, -1); return;\r
+ case MA_CTRL_DONE: if (!rom_loaded) emu_WriteConfig(0); return;\r
default: return;\r
}\r
}\r
- if(inp & GP2X_X) return;\r
+ if (inp & PBTN_MBACK) return;\r
}\r
}\r
\r
\r
-\r
// --------- sega/mega cd options ----------\r
\r
-static void draw_cd_menu_options(int menu_sel, char *b_us, char *b_eu, char *b_jp)\r
+menu_entry cdopt_entries[] =\r
+{\r
+ { NULL, MB_NONE, MA_CDOPT_TESTBIOS_USA, NULL, 0, 0, 0, 1, 0 },\r
+ { NULL, MB_NONE, MA_CDOPT_TESTBIOS_EUR, NULL, 0, 0, 0, 1, 0 },\r
+ { NULL, MB_NONE, MA_CDOPT_TESTBIOS_JAP, NULL, 0, 0, 0, 1, 0 },\r
+ { "CD LEDs", MB_ONOFF, MA_CDOPT_LEDS, ¤tConfig.EmuOpt, 0x0400, 0, 0, 1, 1 },\r
+ { "CDDA audio", MB_ONOFF, MA_CDOPT_CDDA, &PicoOpt, 0x0800, 0, 0, 1, 1 },\r
+ { "PCM audio", MB_ONOFF, MA_CDOPT_PCM, &PicoOpt, 0x0400, 0, 0, 1, 1 },\r
+ { NULL, MB_NONE, MA_CDOPT_READAHEAD, NULL, 0, 0, 0, 1, 1 },\r
+ { "SaveRAM cart", MB_ONOFF, MA_CDOPT_SAVERAM, &PicoOpt, 0x8000, 0, 0, 1, 1 },\r
+ { "Scale/Rot. fx (slow)", MB_ONOFF, MA_CDOPT_SCALEROT_CHIP,&PicoOpt, 0x1000, 0, 0, 1, 1 },\r
+ { "Better sync (slow)", MB_ONOFF, MA_CDOPT_BETTER_SYNC, &PicoOpt, 0x2000, 0, 0, 1, 1 },\r
+ { "done", MB_NONE, MA_CDOPT_DONE, NULL, 0, 0, 0, 1, 0 },\r
+};\r
+\r
+#define CDOPT_ENTRY_COUNT (sizeof(cdopt_entries) / sizeof(cdopt_entries[0]))\r
+const int cdopt_entry_count = CDOPT_ENTRY_COUNT;\r
+\r
+\r
+struct bios_names_t\r
+{\r
+ char us[32], eu[32], jp[32];\r
+};\r
+\r
+static void menu_cdopt_cust_draw(const menu_entry *entry, int x, int y, void *param)\r
{\r
- int tl_x = 25, tl_y = 60, y;\r
+ struct bios_names_t *bios_names = param;\r
+ char ra_buff[16];\r
+\r
+ switch (entry->id)\r
+ {\r
+ case MA_CDOPT_TESTBIOS_USA: text_out16(x, y, "USA BIOS: %s", bios_names->us); break;\r
+ case MA_CDOPT_TESTBIOS_EUR: text_out16(x, y, "EUR BIOS: %s", bios_names->eu); break;\r
+ case MA_CDOPT_TESTBIOS_JAP: text_out16(x, y, "JAP BIOS: %s", bios_names->jp); break;\r
+ case MA_CDOPT_READAHEAD:\r
+ if (PicoCDBuffers > 1) sprintf(ra_buff, "%5iK", PicoCDBuffers * 2);\r
+ else strcpy(ra_buff, " OFF");\r
+ text_out16(x, y, "ReadAhead buffer %s", ra_buff);\r
+ break;\r
+ default:break;\r
+ }\r
+}\r
+\r
+static void draw_cd_menu_options(int menu_sel, struct bios_names_t *bios_names)\r
+{\r
+ int tl_x = 25, tl_y = 60;\r
+ menu_id selected_id;\r
char ra_buff[16];\r
\r
if (PicoCDBuffers > 1) sprintf(ra_buff, "%5iK", PicoCDBuffers * 2);\r
else strcpy(ra_buff, " OFF");\r
\r
- y = tl_y;\r
- //memset(gp2x_screen, 0, 320*240);\r
gp2x_pd_clone_buffer2();\r
\r
- gp2x_text_out8(tl_x, y, "USA BIOS: %s", b_us); // 0\r
- gp2x_text_out8(tl_x, (y+=10), "EUR BIOS: %s", b_eu); // 1\r
- gp2x_text_out8(tl_x, (y+=10), "JAP BIOS: %s", b_jp); // 2\r
- gp2x_text_out8(tl_x, (y+=10), "CD LEDs %s", (currentConfig.EmuOpt &0x0400)?"ON":"OFF"); // 3\r
- gp2x_text_out8(tl_x, (y+=10), "CDDA audio (using mp3s) %s", (currentConfig.PicoOpt&0x0800)?"ON":"OFF"); // 4\r
- gp2x_text_out8(tl_x, (y+=10), "PCM audio %s", (currentConfig.PicoOpt&0x0400)?"ON":"OFF"); // 5\r
- gp2x_text_out8(tl_x, (y+=10), "ReadAhead buffer %s", ra_buff); // 6\r
- gp2x_text_out8(tl_x, (y+=10), "Scale/Rot. fx (buggy,slow) %s", (currentConfig.PicoOpt&0x1000)?"ON":"OFF"); // 7\r
- gp2x_text_out8(tl_x, (y+=10), "Better sync (slow) %s", (currentConfig.PicoOpt&0x2000)?"ON":"OFF"); // 8\r
- gp2x_text_out8(tl_x, (y+=10), "Done");\r
+ menu_draw_selection(tl_x - 16, tl_y + menu_sel*10, 246);\r
\r
- // draw cursor\r
- gp2x_text_out8(tl_x - 16, tl_y + menu_sel*10, ">");\r
+ me_draw(cdopt_entries, CDOPT_ENTRY_COUNT, tl_x, tl_y, menu_cdopt_cust_draw, bios_names);\r
\r
- if ((menu_sel == 0 && strcmp(b_us, "NOT FOUND")) ||\r
- (menu_sel == 1 && strcmp(b_eu, "NOT FOUND")) ||\r
- (menu_sel == 2 && strcmp(b_jp, "NOT FOUND")))\r
- gp2x_text_out8(tl_x, 220, "Press start to test selected BIOS");\r
+/* FIXME\r
+ selected_id = me_index2id(cdopt_entries, CDOPT_ENTRY_COUNT, menu_sel);\r
+ if ((selected_id == MA_CDOPT_TESTBIOS_USA && strcmp(bios_names->us, "NOT FOUND")) ||\r
+ (selected_id == MA_CDOPT_TESTBIOS_EUR && strcmp(bios_names->eu, "NOT FOUND")) ||\r
+ (selected_id == MA_CDOPT_TESTBIOS_JAP && strcmp(bios_names->jp, "NOT FOUND")))\r
+ text_out16(tl_x, 210, "Press start to test selected BIOS");\r
+*/\r
\r
- gp2x_video_flip2();\r
+ menu_flip();\r
}\r
\r
static void cd_menu_loop_options(void)\r
{\r
- int menu_sel = 0, menu_sel_max = 9;\r
+ static int menu_sel = 0;\r
+ int menu_sel_max = 10;\r
unsigned long inp = 0;\r
- char bios_us[32], bios_eu[32], bios_jp[32], *bios, *p;\r
+ struct bios_names_t bios_names;\r
+ menu_id selected_id;\r
+ char *bios, *p;\r
\r
- if (find_bios(4, &bios)) { // US\r
+ if (emu_findBios(4, &bios)) { // US\r
for (p = bios+strlen(bios)-1; p > bios && *p != '/'; p--); p++;\r
- strncpy(bios_us, p, 31); bios_us[31] = 0;\r
- } else strcpy(bios_us, "NOT FOUND");\r
+ strncpy(bios_names.us, p, sizeof(bios_names.us)); bios_names.us[sizeof(bios_names.us)-1] = 0;\r
+ } else strcpy(bios_names.us, "NOT FOUND");\r
\r
- if (find_bios(8, &bios)) { // EU\r
+ if (emu_findBios(8, &bios)) { // EU\r
for (p = bios+strlen(bios)-1; p > bios && *p != '/'; p--); p++;\r
- strncpy(bios_eu, p, 31); bios_eu[31] = 0;\r
- } else strcpy(bios_eu, "NOT FOUND");\r
+ strncpy(bios_names.eu, p, sizeof(bios_names.eu)); bios_names.eu[sizeof(bios_names.eu)-1] = 0;\r
+ } else strcpy(bios_names.eu, "NOT FOUND");\r
\r
- if (find_bios(1, &bios)) { // JP\r
+ if (emu_findBios(1, &bios)) { // JP\r
for (p = bios+strlen(bios)-1; p > bios && *p != '/'; p--); p++;\r
- strncpy(bios_jp, p, 31); bios_jp[31] = 0;\r
- } else strcpy(bios_jp, "NOT FOUND");\r
+ strncpy(bios_names.jp, p, sizeof(bios_names.jp)); bios_names.jp[sizeof(bios_names.jp)-1] = 0;\r
+ } else strcpy(bios_names.jp, "NOT FOUND");\r
\r
for(;;)\r
{\r
- draw_cd_menu_options(menu_sel, bios_us, bios_eu, bios_jp);\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 3: currentConfig.EmuOpt ^=0x0400; break;\r
- case 4: currentConfig.PicoOpt^=0x0800; break;\r
- case 5: currentConfig.PicoOpt^=0x0400; break;\r
- case 6:\r
- if (inp & GP2X_LEFT) {\r
- PicoCDBuffers >>= 1;\r
- if (PicoCDBuffers < 64) PicoCDBuffers = 0;\r
- } else {\r
- if (PicoCDBuffers < 64) PicoCDBuffers = 64;\r
- else PicoCDBuffers <<= 1;\r
- if (PicoCDBuffers > 4096) PicoCDBuffers = 4096;\r
- }\r
- break;\r
- case 7: currentConfig.PicoOpt^=0x1000; break;\r
- case 8: currentConfig.PicoOpt^=0x2000; break;\r
- case 9: return;\r
+ draw_cd_menu_options(menu_sel, &bios_names);\r
+ inp = in_menu_wait(PBTN_UP|PBTN_DOWN|PBTN_LEFT|PBTN_RIGHT|PBTN_MOK|PBTN_MBACK);\r
+ if (inp & PBTN_UP ) { menu_sel--; if (menu_sel < 0) menu_sel = menu_sel_max; }\r
+ if (inp & PBTN_DOWN) { menu_sel++; if (menu_sel > menu_sel_max) menu_sel = 0; }\r
+ selected_id = me_index2id(cdopt_entries, CDOPT_ENTRY_COUNT, menu_sel);\r
+ if (inp & (PBTN_LEFT|PBTN_RIGHT)) { // multi choise\r
+ if (!me_process(cdopt_entries, CDOPT_ENTRY_COUNT, selected_id, (inp&PBTN_RIGHT) ? 1 : 0) &&\r
+ selected_id == MA_CDOPT_READAHEAD) {\r
+ if (inp & PBTN_LEFT) {\r
+ PicoCDBuffers >>= 1;\r
+ if (PicoCDBuffers < 2) PicoCDBuffers = 0;\r
+ } else {\r
+ if (PicoCDBuffers < 2) PicoCDBuffers = 2;\r
+ else PicoCDBuffers <<= 1;\r
+ if (PicoCDBuffers > 8*1024) PicoCDBuffers = 8*1024; // 16M\r
+ }\r
}\r
}\r
- if(inp & (GP2X_X|GP2X_A)) return;\r
- if(inp & GP2X_START) { // BIOS testers\r
- switch (menu_sel) {\r
- case 0: if (find_bios(4, &bios)) { // test US\r
+ if (inp & PBTN_MOK) {\r
+ // toggleable options\r
+ if (!me_process(cdopt_entries, CDOPT_ENTRY_COUNT, selected_id, 1) &&\r
+ selected_id == MA_CDOPT_DONE) {\r
+ return;\r
+ }\r
+ // BIOS testers\r
+ switch (selected_id) {\r
+ case MA_CDOPT_TESTBIOS_USA:\r
+ if (emu_findBios(4, &bios)) { // test US\r
strcpy(romFileName, bios);\r
engineState = PGS_ReloadRom;\r
return;\r
}\r
break;\r
- case 1: if (find_bios(8, &bios)) { // test EU\r
+ case MA_CDOPT_TESTBIOS_EUR:\r
+ if (emu_findBios(8, &bios)) { // test EU\r
strcpy(romFileName, bios);\r
engineState = PGS_ReloadRom;\r
return;\r
}\r
break;\r
- case 2: if (find_bios(1, &bios)) { // test JP\r
+ case MA_CDOPT_TESTBIOS_JAP:\r
+ if (emu_findBios(1, &bios)) { // test JP\r
strcpy(romFileName, bios);\r
engineState = PGS_ReloadRom;\r
return;\r
}\r
break;\r
+ default:\r
+ break;\r
}\r
}\r
+ if (inp & PBTN_MBACK) return;\r
}\r
}\r
\r
\r
// --------- advanced options ----------\r
\r
+menu_entry opt2_entries[] =\r
+{\r
+ { NULL, MB_NONE, MA_OPT2_GAMMA, NULL, 0, 0, 0, 1, 1 },\r
+ { "A_SN's gamma curve", MB_ONOFF, MA_OPT2_A_SN_GAMMA, ¤tConfig.EmuOpt, 0x1000, 0, 0, 1, 1 },\r
+ { "Perfect vsync", MB_ONOFF, MA_OPT2_VSYNC, ¤tConfig.EmuOpt, 0x2000, 0, 0, 1, 1 },\r
+ { "Disable sprite limit", MB_ONOFF, MA_OPT2_NO_SPRITE_LIM, &PicoOpt, 0x40000, 0, 0, 1, 1 },\r
+ { "Emulate Z80", MB_ONOFF, MA_OPT2_ENABLE_Z80, &PicoOpt, 0x00004, 0, 0, 1, 1 },\r
+ { "Emulate YM2612 (FM)", MB_ONOFF, MA_OPT2_ENABLE_YM2612, &PicoOpt, 0x00001, 0, 0, 1, 1 },\r
+ { "Emulate SN76496 (PSG)", MB_ONOFF, MA_OPT2_ENABLE_SN76496,&PicoOpt, 0x00002, 0, 0, 1, 1 },\r
+ { "gzip savestates", MB_ONOFF, MA_OPT2_GZIP_STATES, ¤tConfig.EmuOpt, 0x0008, 0, 0, 1, 1 },\r
+ { "Don't save last used ROM", MB_ONOFF, MA_OPT2_NO_LAST_ROM, ¤tConfig.EmuOpt, 0x0020, 0, 0, 1, 1 },\r
+ { "needs restart:", MB_NONE, MA_NONE, NULL, 0, 0, 0, 1, 0 },\r
+ { "craigix's RAM timings", MB_ONOFF, MA_OPT2_RAMTIMINGS, ¤tConfig.EmuOpt, 0x0100, 0, 0, 1, 1 },\r
+ { NULL, MB_ONOFF, MA_OPT2_SQUIDGEHACK, ¤tConfig.EmuOpt, 0x0010, 0, 0, 1, 1 },\r
+ { "SVP dynarec", MB_ONOFF, MA_OPT2_SVP_DYNAREC, &PicoOpt, 0x20000, 0, 0, 1, 1 },\r
+ { "Disable idle loop patching",MB_ONOFF, MA_OPT2_NO_IDLE_LOOPS, &PicoOpt, 0x80000, 0, 0, 1, 1 },\r
+ { "done", MB_NONE, MA_OPT2_DONE, NULL, 0, 0, 0, 1, 0 },\r
+};\r
+\r
+#define OPT2_ENTRY_COUNT (sizeof(opt2_entries) / sizeof(opt2_entries[0]))\r
+const int opt2_entry_count = OPT2_ENTRY_COUNT;\r
+\r
+static void menu_opt2_cust_draw(const menu_entry *entry, int x, int y, void *param)\r
+{\r
+ if (entry->id == MA_OPT2_GAMMA)\r
+ text_out16(x, y, "Gamma correction %i.%02i", currentConfig.gamma / 100, currentConfig.gamma%100);\r
+ else if (entry->id == MA_OPT2_SQUIDGEHACK)\r
+ text_out16(x, y, "Squidgehack (now %s %s", mmuhack_status ? "active) " : "inactive)",\r
+ (currentConfig.EmuOpt&0x0010)?"ON":"OFF");\r
+}\r
+\r
+\r
static void draw_amenu_options(int menu_sel)\r
{\r
- int tl_x = 25, tl_y = 60, y;\r
- char *mms = mmuhack_status ? "active) " : "inactive)";\r
+ int tl_x = 25, tl_y = 50;\r
\r
- y = tl_y;\r
- //memset(gp2x_screen, 0, 320*240);\r
gp2x_pd_clone_buffer2();\r
\r
- gp2x_text_out8(tl_x, y, "Scale 32 column mode %s", (currentConfig.PicoOpt&0x100)?"ON":"OFF"); // 0\r
- gp2x_text_out8(tl_x, (y+=10), "Gamma correction %i.%02i", currentConfig.gamma / 100, currentConfig.gamma%100); // 1\r
- gp2x_text_out8(tl_x, (y+=10), "Emulate Z80 %s", (currentConfig.PicoOpt&0x004)?"ON":"OFF"); // 2\r
- gp2x_text_out8(tl_x, (y+=10), "Emulate YM2612 (FM) %s", (currentConfig.PicoOpt&0x001)?"ON":"OFF"); // 3\r
- gp2x_text_out8(tl_x, (y+=10), "Emulate SN76496 (PSG) %s", (currentConfig.PicoOpt&0x002)?"ON":"OFF"); // 4\r
- gp2x_text_out8(tl_x, (y+=10), "gzip savestates %s", (currentConfig.EmuOpt &0x008)?"ON":"OFF"); // 5\r
- gp2x_text_out8(tl_x, (y+=10), "Don't save config on exit %s", (currentConfig.EmuOpt &0x020)?"ON":"OFF"); // 6\r
- gp2x_text_out8(tl_x, (y+=10), "needs restart:");\r
- gp2x_text_out8(tl_x, (y+=10), "craigix's RAM timings %s", (currentConfig.EmuOpt &0x100)?"ON":"OFF"); // 8\r
- gp2x_text_out8(tl_x, (y+=10), "squidgehack (now %s %s", mms, (currentConfig.EmuOpt &0x010)?"ON":"OFF"); // 9\r
- gp2x_text_out8(tl_x, (y+=10), "Done");\r
+ menu_draw_selection(tl_x - 16, tl_y + menu_sel*10, 252);\r
\r
- // draw cursor\r
- gp2x_text_out8(tl_x - 16, tl_y + menu_sel*10, ">");\r
+ me_draw(opt2_entries, OPT2_ENTRY_COUNT, tl_x, tl_y, menu_opt2_cust_draw, NULL);\r
\r
- gp2x_video_flip2();\r
+ menu_flip();\r
}\r
\r
static void amenu_loop_options(void)\r
{\r
- int menu_sel = 0, menu_sel_max = 10;\r
+ static int menu_sel = 0;\r
+ int menu_sel_max;\r
unsigned long inp = 0;\r
+ menu_id selected_id;\r
+\r
+ menu_sel_max = me_count_enabled(opt2_entries, OPT2_ENTRY_COUNT) - 1;\r
\r
for(;;)\r
{\r
draw_amenu_options(menu_sel);\r
- inp = wait_for_input(GP2X_UP|GP2X_DOWN|GP2X_LEFT|GP2X_RIGHT|GP2X_B|GP2X_X|GP2X_A);\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: currentConfig.PicoOpt^=0x100; break;\r
- case 2: currentConfig.PicoOpt^=0x004; break;\r
- case 3: currentConfig.PicoOpt^=0x001; break;\r
- case 4: currentConfig.PicoOpt^=0x002; break;\r
- case 5: currentConfig.EmuOpt ^=0x008; break;\r
- case 6: currentConfig.EmuOpt ^=0x020; break;\r
- case 8: currentConfig.EmuOpt ^=0x100; break;\r
- case 9: currentConfig.EmuOpt ^=0x010; break;\r
- case 10: return;\r
+ inp = in_menu_wait(PBTN_UP|PBTN_DOWN|PBTN_LEFT|PBTN_RIGHT|PBTN_MOK|PBTN_MBACK);\r
+ if (inp & PBTN_UP ) { menu_sel--; if (menu_sel < 0) menu_sel = menu_sel_max; }\r
+ if (inp & PBTN_DOWN) { menu_sel++; if (menu_sel > menu_sel_max) menu_sel = 0; }\r
+ selected_id = me_index2id(opt2_entries, OPT2_ENTRY_COUNT, menu_sel);\r
+ if (inp & (PBTN_LEFT|PBTN_RIGHT)) { // multi choise\r
+ if (!me_process(opt2_entries, OPT2_ENTRY_COUNT, selected_id, (inp&PBTN_RIGHT) ? 1 : 0) &&\r
+ selected_id == MA_OPT2_GAMMA) {\r
+ while ((inp = in_menu_wait_any(20)) & (PBTN_LEFT|PBTN_RIGHT)) {\r
+ currentConfig.gamma += (inp & PBTN_LEFT) ? -1 : 1;\r
+ if (currentConfig.gamma < 1) currentConfig.gamma = 1;\r
+ if (currentConfig.gamma > 300) currentConfig.gamma = 300;\r
+ draw_amenu_options(menu_sel);\r
+ }\r
}\r
}\r
- if(inp & (GP2X_X|GP2X_A)) return;\r
- if(inp & (GP2X_LEFT|GP2X_RIGHT)) { // multi choise\r
- switch (menu_sel) {\r
- case 1:\r
- while ((inp = gp2x_joystick_read(1)) & (GP2X_LEFT|GP2X_RIGHT)) {\r
- currentConfig.gamma += (inp & GP2X_LEFT) ? -1 : 1;\r
- if (currentConfig.gamma < 1) currentConfig.gamma = 1;\r
- if (currentConfig.gamma > 300) currentConfig.gamma = 300;\r
- draw_amenu_options(menu_sel);\r
- usleep(18*1000);\r
- }\r
- break;\r
+ if (inp & PBTN_MOK) { // toggleable options\r
+ if (!me_process(opt2_entries, OPT2_ENTRY_COUNT, selected_id, 1) &&\r
+ selected_id == MA_OPT2_DONE) {\r
+ return;\r
}\r
}\r
+ if (inp & PBTN_MBACK) return;\r
}\r
}\r
\r
// -------------- options --------------\r
\r
-static const char *region_name(unsigned int code)\r
+\r
+menu_entry opt_entries[] =\r
{\r
- static const char *names[] = { "Auto", " Japan NTSC", " Japan PAL", " USA", " Europe" };\r
- static const char *names_short[] = { "", " JP", " JP", " US", " EU" };\r
- int u, i = 0;\r
- if (code) {\r
- code <<= 1;\r
- while((code >>= 1)) i++;\r
- if (i > 4) return "unknown";\r
- return names[i];\r
- } else {\r
- static char name[24];\r
- strcpy(name, "Auto:");\r
- for (u = 0; u < 3; u++) {\r
- i = 0; code = ((PicoAutoRgnOrder >> u*4) & 0xf) << 1;\r
- while((code >>= 1)) i++;\r
- strcat(name, names_short[i]);\r
- }\r
- return name;\r
+ { NULL, MB_NONE, MA_OPT_RENDERER, NULL, 0, 0, 0, 1, 1 },\r
+ { NULL, MB_RANGE, MA_OPT_SCALING, ¤tConfig.scaling, 0, 0, 3, 1, 1 },\r
+ { "Accurate sprites", MB_ONOFF, MA_OPT_ACC_SPRITES, &PicoOpt, 0x080, 0, 0, 0, 1 },\r
+ { "Show FPS", MB_ONOFF, MA_OPT_SHOW_FPS, ¤tConfig.EmuOpt, 0x002, 0, 0, 1, 1 },\r
+ { NULL, MB_RANGE, MA_OPT_FRAMESKIP, ¤tConfig.Frameskip, 0, -1, 16, 1, 1 },\r
+ { "Enable sound", MB_ONOFF, MA_OPT_ENABLE_SOUND, ¤tConfig.EmuOpt, 0x004, 0, 0, 1, 1 },\r
+ { NULL, MB_NONE, MA_OPT_SOUND_QUALITY, NULL, 0, 0, 0, 1, 1 },\r
+ { "Use ARM940 core for sound", MB_ONOFF, MA_OPT_ARM940_SOUND, &PicoOpt, 0x200, 0, 0, 1, 1 },\r
+ { NULL, MB_NONE, MA_OPT_REGION, NULL, 0, 0, 0, 1, 1 },\r
+ { "Use SRAM/BRAM savestates", MB_ONOFF, MA_OPT_SRAM_STATES, ¤tConfig.EmuOpt, 0x001, 0, 0, 1, 1 },\r
+ { NULL, MB_NONE, MA_OPT_CONFIRM_STATES,NULL, 0, 0, 0, 1, 1 },\r
+ { "Save slot", MB_RANGE, MA_OPT_SAVE_SLOT, &state_slot, 0, 0, 9, 1, 1 },\r
+ { NULL, MB_NONE, MA_OPT_CPU_CLOCKS, NULL, 0, 0, 0, 1, 1 },\r
+ { "[Sega/Mega CD options]", MB_NONE, MA_OPT_SCD_OPTS, NULL, 0, 0, 0, 1, 0 },\r
+ { "[advanced options]", MB_NONE, MA_OPT_ADV_OPTS, NULL, 0, 0, 0, 1, 0 },\r
+ { NULL, MB_NONE, MA_OPT_SAVECFG, NULL, 0, 0, 0, 1, 0 },\r
+ { "Save cfg for current game only",MB_NONE,MA_OPT_SAVECFG_GAME,NULL, 0, 0, 0, 1, 0 },\r
+ { NULL, MB_NONE, MA_OPT_LOADCFG, NULL, 0, 0, 0, 1, 0 },\r
+};\r
+\r
+#define OPT_ENTRY_COUNT (sizeof(opt_entries) / sizeof(opt_entries[0]))\r
+const int opt_entry_count = OPT_ENTRY_COUNT;\r
+\r
+\r
+static void menu_opt_cust_draw(const menu_entry *entry, int x, int y, void *param)\r
+{\r
+ char *str, str24[24];\r
+\r
+ switch (entry->id)\r
+ {\r
+ case MA_OPT_RENDERER:\r
+ if (PicoOpt & POPT_ALT_RENDERER)\r
+ str = " 8bit fast";\r
+ else if (currentConfig.EmuOpt&0x80)\r
+ str = "16bit accurate";\r
+ else\r
+ str = " 8bit accurate";\r
+ text_out16(x, y, "Renderer: %s", str);\r
+ break;\r
+ case MA_OPT_SCALING:\r
+ switch (currentConfig.scaling) {\r
+ default: str = " OFF"; break;\r
+ case 1: str = "hw horizontal"; break;\r
+ case 2: str = "hw horiz. + vert."; break;\r
+ case 3: str = "sw horizontal"; break;\r
+ }\r
+ text_out16(x, y, "Scaling: %s", str);\r
+ break;\r
+ case MA_OPT_FRAMESKIP:\r
+ if (currentConfig.Frameskip < 0)\r
+ strcpy(str24, "Auto");\r
+ else sprintf(str24, "%i", currentConfig.Frameskip);\r
+ text_out16(x, y, "Frameskip %s", str24);\r
+ break;\r
+ case MA_OPT_SOUND_QUALITY:\r
+ str = (PicoOpt & POPT_EN_STEREO) ? "stereo" : "mono";\r
+ text_out16(x, y, "Sound Quality: %5iHz %s", PsndRate, str);\r
+ break;\r
+ case MA_OPT_REGION:\r
+ text_out16(x, y, "Region: %s", me_region_name(PicoRegionOverride, PicoAutoRgnOrder));\r
+ break;\r
+ case MA_OPT_CONFIRM_STATES:\r
+ switch ((currentConfig.EmuOpt >> 9) & 5) {\r
+ default: str = "OFF"; break;\r
+ case 1: str = "writes"; break;\r
+ case 4: str = "loads"; break;\r
+ case 5: str = "both"; break;\r
+ }\r
+ text_out16(x, y, "Confirm savestate %s", str);\r
+ break;\r
+ case MA_OPT_CPU_CLOCKS:\r
+ text_out16(x, y, "GP2X CPU clocks %iMhz", currentConfig.CPUclock);\r
+ break;\r
+ case MA_OPT_SAVECFG:\r
+ str24[0] = 0;\r
+ if (config_slot != 0) sprintf(str24, " (profile: %i)", config_slot);\r
+ text_out16(x, y, "Save cfg as default%s", str24);\r
+ break;\r
+ case MA_OPT_LOADCFG:\r
+ text_out16(x, y, "Load cfg from profile %i", config_slot);\r
+ break;\r
+ default:\r
+ printf("%s: unimplemented (%i)\n", __FUNCTION__, entry->id);\r
+ break;\r
}\r
}\r
\r
+\r
+\r
static void draw_menu_options(int menu_sel)\r
{\r
- int tl_x = 25, tl_y = 40, y;\r
- char monostereo[8], strframeskip[8], *strrend;\r
-\r
- strcpy(monostereo, (currentConfig.PicoOpt&0x08)?"stereo":"mono");\r
- if (currentConfig.Frameskip < 0)\r
- strcpy(strframeskip, "Auto");\r
- else sprintf(strframeskip, "%i", currentConfig.Frameskip);\r
- if (currentConfig.PicoOpt&0x10) {\r
- strrend = " 8bit fast";\r
- } else if (currentConfig.EmuOpt&0x80) {\r
- strrend = "16bit accurate";\r
- } else {\r
- strrend = " 8bit accurate";\r
- }\r
+ int tl_x = 25, tl_y = 24;\r
\r
- y = tl_y;\r
- //memset(gp2x_screen, 0, 320*240);\r
gp2x_pd_clone_buffer2();\r
\r
- gp2x_text_out8(tl_x, y, "Renderer: %s", strrend); // 0\r
- gp2x_text_out8(tl_x, (y+=10), "Accurate timing (slower) %s", (currentConfig.PicoOpt&0x040)?"ON":"OFF"); // 1\r
- gp2x_text_out8(tl_x, (y+=10), "Accurate sprites (slower) %s", (currentConfig.PicoOpt&0x080)?"ON":"OFF"); // 2\r
- gp2x_text_out8(tl_x, (y+=10), "Show FPS %s", (currentConfig.EmuOpt &0x002)?"ON":"OFF"); // 3\r
- gp2x_text_out8(tl_x, (y+=10), "Frameskip %s", strframeskip);\r
- gp2x_text_out8(tl_x, (y+=10), "Enable sound %s", (currentConfig.EmuOpt &0x004)?"ON":"OFF"); // 5\r
- gp2x_text_out8(tl_x, (y+=10), "Sound Quality: %5iHz %s", currentConfig.PsndRate, monostereo);\r
- gp2x_text_out8(tl_x, (y+=10), "Use ARM940 core for sound %s", (currentConfig.PicoOpt&0x200)?"ON":"OFF"); // 7\r
- gp2x_text_out8(tl_x, (y+=10), "6 button pad %s", (currentConfig.PicoOpt&0x020)?"ON":"OFF"); // 8\r
- gp2x_text_out8(tl_x, (y+=10), "Genesis Region: %s", region_name(currentConfig.PicoRegion));\r
- gp2x_text_out8(tl_x, (y+=10), "Use SRAM/BRAM savestates %s", (currentConfig.EmuOpt &0x001)?"ON":"OFF"); // 10\r
- gp2x_text_out8(tl_x, (y+=10), "Confirm save overwrites %s", (currentConfig.EmuOpt &0x200)?"ON":"OFF"); // 11\r
- gp2x_text_out8(tl_x, (y+=10), "Save slot %i", state_slot); // 12\r
- gp2x_text_out8(tl_x, (y+=10), "GP2X CPU clocks %iMhz", currentConfig.CPUclock);\r
- gp2x_text_out8(tl_x, (y+=10), "[Sega/Mega CD options]");\r
- gp2x_text_out8(tl_x, (y+=10), "[advanced options]"); // 15\r
- gp2x_text_out8(tl_x, (y+=10), "Save cfg as default");\r
- if (rom_data)\r
- gp2x_text_out8(tl_x, (y+=10), "Save cfg for current game only");\r
+ menu_draw_selection(tl_x - 16, tl_y + menu_sel*10, 284);\r
\r
- // draw cursor\r
- gp2x_text_out8(tl_x - 16, tl_y + menu_sel*10, ">");\r
+ me_draw(opt_entries, OPT_ENTRY_COUNT, tl_x, tl_y, menu_opt_cust_draw, NULL);\r
\r
- gp2x_video_flip2();\r
+ menu_flip();\r
}\r
\r
static int sndrate_prevnext(int rate, int dir)\r
static int rgn_orders[] = { 0x148, 0x184, 0x814, 0x418, 0x841, 0x481 };\r
int i;\r
if (right) {\r
- if (!currentConfig.PicoRegion) {\r
+ if (!PicoRegionOverride) {\r
for (i = 0; i < 6; i++)\r
if (rgn_orders[i] == PicoAutoRgnOrder) break;\r
if (i < 5) PicoAutoRgnOrder = rgn_orders[i+1];\r
- else currentConfig.PicoRegion=1;\r
+ else PicoRegionOverride=1;\r
}\r
- else currentConfig.PicoRegion<<=1;\r
- if (currentConfig.PicoRegion > 8) currentConfig.PicoRegion = 8;\r
+ else PicoRegionOverride<<=1;\r
+ if (PicoRegionOverride > 8) PicoRegionOverride = 8;\r
} else {\r
- if (!currentConfig.PicoRegion) {\r
+ if (!PicoRegionOverride) {\r
for (i = 0; i < 6; i++)\r
if (rgn_orders[i] == PicoAutoRgnOrder) break;\r
if (i > 0) PicoAutoRgnOrder = rgn_orders[i-1];\r
}\r
- else currentConfig.PicoRegion>>=1;\r
+ else PicoRegionOverride>>=1;\r
}\r
}\r
\r
static void menu_options_save(void)\r
{\r
- PicoOpt = currentConfig.PicoOpt;\r
- PsndRate = currentConfig.PsndRate;\r
- PicoRegionOverride = currentConfig.PicoRegion;\r
- if (PicoOpt & 0x20) {\r
- actionNames[ 8] = "Z"; actionNames[ 9] = "Y";\r
- actionNames[10] = "X"; actionNames[11] = "MODE";\r
- } else {\r
- actionNames[8] = actionNames[9] = actionNames[10] = actionNames[11] = 0;\r
+ if (PicoRegionOverride) {\r
+ // force setting possibly changed..\r
+ Pico.m.pal = (PicoRegionOverride == 2 || PicoRegionOverride == 8) ? 1 : 0;\r
+ }\r
+ if (!(PicoOpt & POPT_6BTN_PAD)) {\r
+ // unbind XYZ MODE, just in case\r
+ unbind_action(0xf00, -1, -1);\r
}\r
}\r
\r
static int menu_loop_options(void)\r
{\r
- int menu_sel = 0, menu_sel_max = 16;\r
+ static int menu_sel = 0;\r
+ int menu_sel_max, ret;\r
unsigned long inp = 0;\r
+ menu_id selected_id;\r
\r
- if (rom_data) menu_sel_max++;\r
- currentConfig.PicoOpt = PicoOpt;\r
- currentConfig.PsndRate = PsndRate;\r
- currentConfig.PicoRegion = PicoRegionOverride;\r
+ me_enable(opt_entries, OPT_ENTRY_COUNT, MA_OPT_SAVECFG_GAME, rom_loaded);\r
+ me_enable(opt_entries, OPT_ENTRY_COUNT, MA_OPT_LOADCFG, config_slot != config_slot_current);\r
+ menu_sel_max = me_count_enabled(opt_entries, OPT_ENTRY_COUNT) - 1;\r
+ if (menu_sel > menu_sel_max) menu_sel = menu_sel_max;\r
\r
- for(;;)\r
+ while (1)\r
{\r
draw_menu_options(menu_sel);\r
- inp = wait_for_input(GP2X_UP|GP2X_DOWN|GP2X_LEFT|GP2X_RIGHT|GP2X_B|GP2X_X|GP2X_A);\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 1: currentConfig.PicoOpt^=0x040; break;\r
- case 2: currentConfig.PicoOpt^=0x080; break;\r
- case 3: currentConfig.EmuOpt ^=0x002; break;\r
- case 5: currentConfig.EmuOpt ^=0x004; break;\r
- case 7: currentConfig.PicoOpt^=0x200; break;\r
- case 8: currentConfig.PicoOpt^=0x020; break;\r
- case 10: currentConfig.EmuOpt ^=0x001; break;\r
- case 11: currentConfig.EmuOpt ^=0x200; break;\r
- case 14: cd_menu_loop_options();\r
- if (engineState == PGS_ReloadRom)\r
- return 0; // test BIOS\r
- break;\r
- case 15: amenu_loop_options(); break;\r
- case 16: // done (update and write)\r
- menu_options_save();\r
- if (emu_WriteConfig(0)) strcpy(menuErrorMsg, "config saved");\r
- else strcpy(menuErrorMsg, "failed to write config");\r
- return 1;\r
- case 17: // done (update and write for current game)\r
- menu_options_save();\r
- if (emu_WriteConfig(1)) strcpy(menuErrorMsg, "config saved");\r
- else strcpy(menuErrorMsg, "failed to write config");\r
- return 1;\r
+ inp = in_menu_wait(PBTN_UP|PBTN_DOWN|PBTN_LEFT|PBTN_RIGHT|PBTN_MOK|PBTN_MBACK);\r
+ if (inp & PBTN_UP ) { menu_sel--; if (menu_sel < 0) menu_sel = menu_sel_max; }\r
+ if (inp & PBTN_DOWN) { menu_sel++; if (menu_sel > menu_sel_max) menu_sel = 0; }\r
+ selected_id = me_index2id(opt_entries, OPT_ENTRY_COUNT, menu_sel);\r
+ if (inp & (PBTN_LEFT|PBTN_RIGHT)) { // multi choice\r
+ if (!me_process(opt_entries, OPT_ENTRY_COUNT, selected_id, (inp&PBTN_RIGHT) ? 1 : 0)) {\r
+ switch (selected_id) {\r
+ case MA_OPT_RENDERER:\r
+ if (inp & PBTN_LEFT) {\r
+ if (PicoOpt&0x10) PicoOpt&= ~0x10;\r
+ else if (!(currentConfig.EmuOpt &0x80))currentConfig.EmuOpt |= 0x80;\r
+ else if ( currentConfig.EmuOpt &0x80) break;\r
+ } else {\r
+ if (PicoOpt&0x10) break;\r
+ else if (!(currentConfig.EmuOpt &0x80))PicoOpt|= 0x10;\r
+ else if ( currentConfig.EmuOpt &0x80) currentConfig.EmuOpt &= ~0x80;\r
+ }\r
+ break;\r
+ case MA_OPT_SOUND_QUALITY:\r
+ if ((inp & PBTN_RIGHT) && PsndRate == 44100 && !(PicoOpt&0x08)) {\r
+ PsndRate = 8000; PicoOpt|= 0x08;\r
+ } else if ((inp & PBTN_LEFT) && PsndRate == 8000 && (PicoOpt&0x08)) {\r
+ PsndRate = 44100; PicoOpt&=~0x08;\r
+ } else PsndRate = sndrate_prevnext(PsndRate, inp & PBTN_RIGHT);\r
+ break;\r
+ case MA_OPT_REGION:\r
+ region_prevnext(inp & PBTN_RIGHT);\r
+ break;\r
+ case MA_OPT_CONFIRM_STATES: {\r
+ int n = ((currentConfig.EmuOpt>>9)&1) | ((currentConfig.EmuOpt>>10)&2);\r
+ n += (inp & PBTN_LEFT) ? -1 : 1;\r
+ if (n < 0) n = 0; else if (n > 3) n = 3;\r
+ n |= n << 1; n &= ~2;\r
+ currentConfig.EmuOpt &= ~0xa00;\r
+ currentConfig.EmuOpt |= n << 9;\r
+ break;\r
+ }\r
+ case MA_OPT_SAVE_SLOT:\r
+ if (inp & PBTN_RIGHT) {\r
+ state_slot++; if (state_slot > 9) state_slot = 0;\r
+ } else {state_slot--; if (state_slot < 0) state_slot = 9;\r
+ }\r
+ break;\r
+ case MA_OPT_CPU_CLOCKS:\r
+ while ((inp = in_menu_wait_any(50)) & (PBTN_LEFT|PBTN_RIGHT)) {\r
+ currentConfig.CPUclock += (inp & PBTN_LEFT) ? -1 : 1;\r
+ if (currentConfig.CPUclock < 1) currentConfig.CPUclock = 1;\r
+ draw_menu_options(menu_sel);\r
+ }\r
+ break;\r
+ case MA_OPT_SAVECFG:\r
+ case MA_OPT_SAVECFG_GAME:\r
+ case MA_OPT_LOADCFG:\r
+ config_slot += (inp&PBTN_RIGHT) ? 1 : -1;\r
+ if (config_slot > 9) config_slot = 0;\r
+ if (config_slot < 0) config_slot = 9;\r
+ me_enable(opt_entries, OPT_ENTRY_COUNT, MA_OPT_LOADCFG, config_slot != config_slot_current);\r
+ menu_sel_max = me_count_enabled(opt_entries, OPT_ENTRY_COUNT) - 1;\r
+ if (menu_sel > menu_sel_max) menu_sel = menu_sel_max;\r
+ break;\r
+ default:\r
+ //printf("%s: something unknown selected (%i)\n", __FUNCTION__, selected_id);\r
+ break;\r
+ }\r
}\r
}\r
- if(inp & (GP2X_X|GP2X_A)) {\r
+ if (inp & PBTN_MOK) {\r
+ if (!me_process(opt_entries, OPT_ENTRY_COUNT, selected_id, 1))\r
+ {\r
+ switch (selected_id)\r
+ {\r
+ case MA_OPT_SCD_OPTS:\r
+ cd_menu_loop_options();\r
+ if (engineState == PGS_ReloadRom)\r
+ return 0; // test BIOS\r
+ break;\r
+ case MA_OPT_ADV_OPTS:\r
+ amenu_loop_options();\r
+ break;\r
+ case MA_OPT_SAVECFG: // done (update and write)\r
+ menu_options_save();\r
+ if (emu_WriteConfig(0)) strcpy(menuErrorMsg, "config saved");\r
+ else strcpy(menuErrorMsg, "failed to write config");\r
+ return 1;\r
+ case MA_OPT_SAVECFG_GAME: // done (update and write for current game)\r
+ menu_options_save();\r
+ if (emu_WriteConfig(1)) strcpy(menuErrorMsg, "config saved");\r
+ else strcpy(menuErrorMsg, "failed to write config");\r
+ return 1;\r
+ case MA_OPT_LOADCFG:\r
+ ret = emu_ReadConfig(1, 1);\r
+ if (!ret) ret = emu_ReadConfig(0, 1);\r
+ if (ret) strcpy(menuErrorMsg, "config loaded");\r
+ else strcpy(menuErrorMsg, "failed to load config");\r
+ return 1;\r
+ default:\r
+ //printf("%s: something unknown selected (%i)\n", __FUNCTION__, selected_id);\r
+ break;\r
+ }\r
+ }\r
+ }\r
+ if(inp & PBTN_MBACK) {\r
menu_options_save();\r
return 0; // done (update, no write)\r
}\r
- if(inp & (GP2X_LEFT|GP2X_RIGHT)) { // multi choise\r
- switch (menu_sel) {\r
- case 0:\r
- if (inp & GP2X_LEFT) {\r
- if ( currentConfig.PicoOpt&0x10) currentConfig.PicoOpt&= ~0x10;\r
- else if (!(currentConfig.EmuOpt &0x80))currentConfig.EmuOpt |= 0x80;\r
- else if ( currentConfig.EmuOpt &0x80) break;\r
- } else {\r
- if ( currentConfig.PicoOpt&0x10) break;\r
- else if (!(currentConfig.EmuOpt &0x80))currentConfig.PicoOpt|= 0x10;\r
- else if ( currentConfig.EmuOpt &0x80) currentConfig.EmuOpt &= ~0x80;\r
- }\r
- break;\r
- case 4:\r
- currentConfig.Frameskip += (inp & GP2X_LEFT) ? -1 : 1;\r
- if (currentConfig.Frameskip < 0) currentConfig.Frameskip = -1;\r
- if (currentConfig.Frameskip > 32) currentConfig.Frameskip = 32;\r
- break;\r
- case 6:\r
- if ((inp & GP2X_RIGHT) && currentConfig.PsndRate == 44100 && !(currentConfig.PicoOpt&0x08)) {\r
- currentConfig.PsndRate = 8000; currentConfig.PicoOpt|= 0x08;\r
- } else if ((inp & GP2X_LEFT) && currentConfig.PsndRate == 8000 && (currentConfig.PicoOpt&0x08)) {\r
- currentConfig.PsndRate = 44100; currentConfig.PicoOpt&=~0x08;\r
- } else currentConfig.PsndRate = sndrate_prevnext(currentConfig.PsndRate, inp & GP2X_RIGHT);\r
- break;\r
- case 9:\r
- region_prevnext(inp & GP2X_RIGHT);\r
- break;\r
- case 12:\r
- if (inp & GP2X_RIGHT) {\r
- state_slot++; if (state_slot > 9) state_slot = 0;\r
- } else {state_slot--; if (state_slot < 0) state_slot = 9;\r
- }\r
- break;\r
- case 13:\r
- while ((inp = gp2x_joystick_read(1)) & (GP2X_LEFT|GP2X_RIGHT)) {\r
- currentConfig.CPUclock += (inp & GP2X_LEFT) ? -1 : 1;\r
- if (currentConfig.CPUclock < 1) currentConfig.CPUclock = 1;\r
- draw_menu_options(menu_sel);\r
- usleep(50*1000);\r
- }\r
- break;\r
- }\r
- }\r
}\r
}\r
\r
\r
static void draw_menu_credits(void)\r
{\r
- int tl_x = 15, tl_y = 70, y;\r
- //memset(gp2x_screen, 0, 320*240);\r
+ int tl_x = 15, tl_y = 56, y;\r
gp2x_pd_clone_buffer2();\r
\r
- gp2x_text_out8(tl_x, 20, "PicoDrive v" VERSION " (c) notaz, 2006,2007");\r
+ text_out16(tl_x, 20, "PicoDrive v" VERSION " (c) notaz, 2006-2008");\r
y = tl_y;\r
- gp2x_text_out8(tl_x, y, "Credits:");\r
- gp2x_text_out8(tl_x, (y+=10), "Dave: Cyclone 68000 core,");\r
- gp2x_text_out8(tl_x, (y+=10), " base code of PicoDrive");\r
- gp2x_text_out8(tl_x, (y+=10), "Reesy & FluBBa: DrZ80 core");\r
- gp2x_text_out8(tl_x, (y+=10), "MAME devs: YM2612 and SN76496 cores");\r
- gp2x_text_out8(tl_x, (y+=10), "Charles MacDonald: Genesis hw docs");\r
- gp2x_text_out8(tl_x, (y+=10), "Stephane Dallongeville:");\r
- gp2x_text_out8(tl_x, (y+=10), " opensource Gens");\r
- gp2x_text_out8(tl_x, (y+=10), "Haze: Genesis hw info");\r
- gp2x_text_out8(tl_x, (y+=10), "rlyeh and others: minimal SDK");\r
- gp2x_text_out8(tl_x, (y+=10), "Squidge: squidgehack");\r
- gp2x_text_out8(tl_x, (y+=10), "Dzz: ARM940 sample");\r
- gp2x_text_out8(tl_x, (y+=10), "GnoStiC / Puck2099: USB joystick");\r
- gp2x_text_out8(tl_x, (y+=10), "craigix: GP2X hardware");\r
-\r
- gp2x_video_flip2();\r
+ text_out16(tl_x, y, "Credits:");\r
+ text_out16(tl_x, (y+=10), "fDave: Cyclone 68000 core,");\r
+ text_out16(tl_x, (y+=10), " base code of PicoDrive");\r
+ text_out16(tl_x, (y+=10), "Reesy & FluBBa: DrZ80 core");\r
+ text_out16(tl_x, (y+=10), "MAME devs: YM2612 and SN76496 cores");\r
+ text_out16(tl_x, (y+=10), "rlyeh and others: minimal SDK");\r
+ text_out16(tl_x, (y+=10), "Squidge: squidgehack");\r
+ text_out16(tl_x, (y+=10), "Dzz: ARM940 sample");\r
+ text_out16(tl_x, (y+=10), "GnoStiC / Puck2099: USB joy code");\r
+ text_out16(tl_x, (y+=10), "craigix: GP2X hardware");\r
+ text_out16(tl_x, (y+=10), "ketchupgun: skin design");\r
+\r
+ text_out16(tl_x, (y+=20), "special thanks (for docs, ideas):");\r
+ text_out16(tl_x, (y+=10), " Charles MacDonald, Haze,");\r
+ text_out16(tl_x, (y+=10), " Stephane Dallongeville,");\r
+ text_out16(tl_x, (y+=10), " Lordus, Exophase, Rokas,");\r
+ text_out16(tl_x, (y+=10), " Nemesis, Tasco Deluxe");\r
+\r
+ menu_flip();\r
}\r
\r
\r
// -------------- root menu --------------\r
\r
+menu_entry main_entries[] =\r
+{\r
+ { "Resume game", MB_NONE, MA_MAIN_RESUME_GAME, NULL, 0, 0, 0, 0, 0 },\r
+ { "Save State", MB_NONE, MA_MAIN_SAVE_STATE, NULL, 0, 0, 0, 0, 0 },\r
+ { "Load State", MB_NONE, MA_MAIN_LOAD_STATE, NULL, 0, 0, 0, 0, 0 },\r
+ { "Reset game", MB_NONE, MA_MAIN_RESET_GAME, NULL, 0, 0, 0, 0, 0 },\r
+ { "Load new ROM/ISO", MB_NONE, MA_MAIN_LOAD_ROM, NULL, 0, 0, 0, 1, 0 },\r
+ { "Change options", MB_NONE, MA_MAIN_OPTIONS, NULL, 0, 0, 0, 1, 0 },\r
+ { "Configure controls", MB_NONE, MA_MAIN_CONTROLS, NULL, 0, 0, 0, 1, 0 },\r
+ { "Credits", MB_NONE, MA_MAIN_CREDITS, NULL, 0, 0, 0, 1, 0 },\r
+ { "Patches / GameGenie",MB_NONE, MA_MAIN_PATCHES, NULL, 0, 0, 0, 0, 0 },\r
+ { "Exit", MB_NONE, MA_MAIN_EXIT, NULL, 0, 0, 0, 1, 0 }\r
+};\r
+\r
+#define MAIN_ENTRY_COUNT (sizeof(main_entries) / sizeof(main_entries[0]))\r
+\r
static void draw_menu_root(int menu_sel)\r
{\r
- int tl_x = 70, tl_y = 70, y;\r
- //memset(gp2x_screen, 0, 320*240);\r
+ const int tl_x = 70, tl_y = 70;\r
+\r
gp2x_pd_clone_buffer2();\r
\r
- gp2x_text_out8(tl_x, 20, "PicoDrive v" VERSION);\r
+ text_out16(tl_x, 20, "PicoDrive v" VERSION);\r
\r
- y = tl_y;\r
- if (rom_data) {\r
- gp2x_text_out8(tl_x, y, "Resume game");\r
- gp2x_text_out8(tl_x, (y+=10), "Save State");\r
- gp2x_text_out8(tl_x, (y+=10), "Load State");\r
- gp2x_text_out8(tl_x, (y+=10), "Reset game");\r
- } else {\r
- y += 30;\r
- }\r
- gp2x_text_out8(tl_x, (y+=10), "Load new ROM/ISO");\r
- gp2x_text_out8(tl_x, (y+=10), "Change options");\r
- gp2x_text_out8(tl_x, (y+=10), "Configure controls");\r
- gp2x_text_out8(tl_x, (y+=10), "Credits");\r
- gp2x_text_out8(tl_x, (y+=10), "Exit");\r
- if (PicoPatches)\r
- gp2x_text_out8(tl_x, (y+=10), "Patches / GameGenie");\r
+ menu_draw_selection(tl_x - 16, tl_y + menu_sel*10, 146);\r
+\r
+ me_draw(main_entries, MAIN_ENTRY_COUNT, tl_x, tl_y, NULL, NULL);\r
\r
- // draw cursor\r
- gp2x_text_out8(tl_x - 16, tl_y + menu_sel*10, ">");\r
// error\r
- if (menuErrorMsg[0]) gp2x_text_out8(5, 226, menuErrorMsg);\r
- gp2x_video_flip2();\r
+ if (menuErrorMsg[0]) {\r
+ memset((char *)gp2x_screen + 320*224*2, 0, 320*16*2);\r
+ text_out16(5, 226, menuErrorMsg);\r
+ }\r
+ menu_flip();\r
}\r
\r
\r
static void menu_loop_root(void)\r
{\r
- int ret, menu_sel = 4, menu_sel_max = 8, menu_sel_min = 4;\r
+ static int menu_sel = 0;\r
+ int ret, menu_sel_max;\r
unsigned long inp = 0;\r
- char curr_path[PATH_MAX], *selfname;\r
- FILE *tstf;\r
\r
- if ( (tstf = fopen(currentConfig.lastRomFile, "rb")) )\r
- {\r
- fclose(tstf);\r
- strcpy(curr_path, currentConfig.lastRomFile);\r
- }\r
- else\r
- {\r
- getcwd(curr_path, PATH_MAX);\r
- }\r
+ me_enable(main_entries, MAIN_ENTRY_COUNT, MA_MAIN_RESUME_GAME, rom_loaded);\r
+ me_enable(main_entries, MAIN_ENTRY_COUNT, MA_MAIN_SAVE_STATE, rom_loaded);\r
+ me_enable(main_entries, MAIN_ENTRY_COUNT, MA_MAIN_LOAD_STATE, rom_loaded);\r
+ me_enable(main_entries, MAIN_ENTRY_COUNT, MA_MAIN_RESET_GAME, rom_loaded);\r
+ me_enable(main_entries, MAIN_ENTRY_COUNT, MA_MAIN_PATCHES, PicoPatches != NULL);\r
\r
- if (rom_data) menu_sel = menu_sel_min = 0;\r
- if (PicoPatches) menu_sel_max = 9;\r
+ menu_sel_max = me_count_enabled(main_entries, MAIN_ENTRY_COUNT) - 1;\r
+ if (menu_sel > menu_sel_max) menu_sel = menu_sel_max;\r
\r
- for(;;)\r
+ /* make sure action buttons are not pressed on entering menu */\r
+ draw_menu_root(menu_sel);\r
+ while (in_menu_wait_any(50) & (PBTN_MOK|PBTN_MBACK|PBTN_MENU));\r
+\r
+ for (;;)\r
{\r
draw_menu_root(menu_sel);\r
- inp = wait_for_input(GP2X_UP|GP2X_DOWN|GP2X_B|GP2X_X|GP2X_SELECT);\r
- if(inp & GP2X_UP ) { menu_sel--; if (menu_sel < menu_sel_min) menu_sel = menu_sel_max; }\r
- if(inp & GP2X_DOWN) { menu_sel++; if (menu_sel > menu_sel_max) menu_sel = menu_sel_min; }\r
- if(inp &(GP2X_SELECT|GP2X_X)){\r
- if (rom_data) {\r
- while (gp2x_joystick_read(1) & (GP2X_SELECT|GP2X_X)) usleep(50*1000); // wait until select is released\r
+ inp = in_menu_wait(PBTN_UP|PBTN_DOWN|PBTN_MOK|PBTN_MBACK|PBTN_MENU|PBTN_L|PBTN_R);\r
+ if(inp & PBTN_UP ) { menu_sel--; if (menu_sel < 0) menu_sel = menu_sel_max; }\r
+ if(inp & PBTN_DOWN) { menu_sel++; if (menu_sel > menu_sel_max) menu_sel = 0; }\r
+ if((inp & (PBTN_L|PBTN_R)) == (PBTN_L|PBTN_R)) debug_menu_loop();\r
+ if(inp &(PBTN_MENU|PBTN_MBACK)){\r
+ if (rom_loaded) {\r
+ while (in_menu_wait_any(50) & (PBTN_MENU|PBTN_MBACK)); // wait until select is released\r
engineState = PGS_Running;\r
break;\r
}\r
}\r
- if(inp & GP2X_B ) {\r
- switch (menu_sel) {\r
- case 0: // resume game\r
- if (rom_data) { engineState = PGS_Running; return; }\r
+ if(inp & PBTN_MOK) {\r
+ switch (me_index2id(main_entries, MAIN_ENTRY_COUNT, menu_sel))\r
+ {\r
+ case MA_MAIN_RESUME_GAME:\r
+ if (rom_loaded) {\r
+ while (in_menu_wait_any(50) & PBTN_MOK);\r
+ engineState = PGS_Running;\r
+ return;\r
+ }\r
break;\r
- case 1: // save state\r
- if (rom_data) {\r
+ case MA_MAIN_SAVE_STATE:\r
+ if (rom_loaded) {\r
if(savestate_menu_loop(0))\r
continue;\r
engineState = PGS_Running;\r
return;\r
}\r
break;\r
- case 2: // load state\r
- if (rom_data) {\r
+ case MA_MAIN_LOAD_STATE:\r
+ if (rom_loaded) {\r
if(savestate_menu_loop(1))\r
continue;\r
+ while (in_menu_wait_any(50) & PBTN_MOK);\r
engineState = PGS_Running;\r
return;\r
}\r
break;\r
- case 3: // reset game\r
- if (rom_data) {\r
+ case MA_MAIN_RESET_GAME:\r
+ if (rom_loaded) {\r
emu_ResetGame();\r
+ while (in_menu_wait_any(50) & PBTN_MOK);\r
engineState = PGS_Running;\r
return;\r
}\r
break;\r
- case 4: // select rom\r
+ case MA_MAIN_LOAD_ROM:\r
+ {\r
+ char curr_path[PATH_MAX], *selfname;\r
+ FILE *tstf;\r
+ if ( (tstf = fopen(loadedRomFName, "rb")) )\r
+ {\r
+ fclose(tstf);\r
+ strcpy(curr_path, loadedRomFName);\r
+ }\r
+ else\r
+ getcwd(curr_path, PATH_MAX);\r
selfname = romsel_loop(curr_path);\r
if (selfname) {\r
printf("selected file: %s\n", selfname);\r
engineState = PGS_ReloadRom;\r
+ return;\r
}\r
- return;\r
- case 5: // options\r
+ break;\r
+ }\r
+ case MA_MAIN_OPTIONS:\r
ret = menu_loop_options();\r
if (ret == 1) continue; // status update\r
if (engineState == PGS_ReloadRom)\r
return; // BIOS test\r
break;\r
- case 6: // controls\r
+ case MA_MAIN_CONTROLS:\r
kc_sel_loop();\r
break;\r
- case 7: // credits\r
+ case MA_MAIN_CREDITS:\r
draw_menu_credits();\r
usleep(500*1000);\r
- inp = wait_for_input(GP2X_B|GP2X_X);\r
+ inp = in_menu_wait(PBTN_MOK|PBTN_MBACK);\r
break;\r
- case 8: // exit\r
+ case MA_MAIN_EXIT:\r
engineState = PGS_Quit;\r
return;\r
- case 9: // patches/gg\r
- if (rom_data && PicoPatches) {\r
+ case MA_MAIN_PATCHES:\r
+ if (rom_loaded && PicoPatches) {\r
patches_menu_loop();\r
PicoPatchApply();\r
strcpy(menuErrorMsg, "Patches applied");\r
continue;\r
}\r
break;\r
+ default:\r
+ printf("%s: something unknown selected\n", __FUNCTION__);\r
+ break;\r
}\r
}\r
menuErrorMsg[0] = 0; // clear error msg\r
}\r
}\r
\r
-\r
-static void menu_prepare_bg(void)\r
+static void menu_prepare_bg(int use_game_bg)\r
{\r
- extern int localPal[0x100];\r
- int c, i;\r
-\r
- // don't clear old palette just for fun (but make it dark)\r
- for (i = 0x100-1; i >= 0; i--) {\r
- c = localPal[i];\r
- localPal[i] = ((c >> 1) & 0x007f7f7f) - ((c >> 3) & 0x001f1f1f);\r
+ if (use_game_bg)\r
+ {\r
+ // darken the active framebuffer\r
+ memset(gp2x_screen, 0, 320*8*2);\r
+ menu_darken_bg((char *)gp2x_screen + 320*8*2, 320*224, 1);\r
+ memset((char *)gp2x_screen + 320*232*2, 0, 320*8*2);\r
+ }\r
+ else\r
+ {\r
+ // should really only happen once, on startup..\r
+ readpng(gp2x_screen, "skin/background.png", READPNG_BG);\r
}\r
- localPal[0xe0] = 0x00000000; // reserved pixels for OSD\r
- localPal[0xf0] = 0x00ffffff;\r
\r
- gp2x_video_setpalette(localPal, 0x100);\r
+ // copy to buffer2\r
+ gp2x_memcpy_buffers((1<<2), gp2x_screen, 0, 320*240*2);\r
}\r
\r
static void menu_gfx_prepare(void)\r
{\r
- menu_prepare_bg();\r
+ menu_prepare_bg(rom_loaded);\r
\r
- // switch to 8bpp\r
- gp2x_video_changemode2(8);\r
- gp2x_video_RGB_setscaling(320, 240);\r
- gp2x_video_flip2();\r
+ // switch to 16bpp\r
+ gp2x_video_changemode2(16);\r
+ gp2x_video_RGB_setscaling(0, 320, 240);\r
+ menu_flip();\r
}\r
\r
\r
-void menu_loop(void)\r
+void menu_loop_old(void)\r
{\r
+ in_set_blocking(1);\r
menu_gfx_prepare();\r
\r
menu_loop_root();\r
\r
+ in_set_blocking(0);\r
menuErrorMsg[0] = 0;\r
}\r
+\r
+\r
+// --------- CD tray close menu ----------\r
+\r
+static void draw_menu_tray(int menu_sel)\r
+{\r
+ int tl_x = 70, tl_y = 90, y;\r
+ memset(gp2x_screen, 0, 320*240*2);\r
+\r
+ text_out16(tl_x, 20, "The unit is about to");\r
+ text_out16(tl_x, 30, "close the CD tray.");\r
+\r
+ y = tl_y;\r
+ text_out16(tl_x, y, "Load new CD image");\r
+ text_out16(tl_x, (y+=10), "Insert nothing");\r
+\r
+ // draw cursor\r
+ text_out16(tl_x - 16, tl_y + menu_sel*10, ">");\r
+ // error\r
+ if (menuErrorMsg[0]) text_out16(5, 226, menuErrorMsg);\r
+ menu_flip();\r
+}\r
+\r
+\r
+int menu_loop_tray(void)\r
+{\r
+ int menu_sel = 0, menu_sel_max = 1;\r
+ unsigned long inp = 0;\r
+ char curr_path[PATH_MAX], *selfname;\r
+ FILE *tstf;\r
+\r
+ gp2x_memset_all_buffers(0, 0, 320*240*2);\r
+ menu_gfx_prepare();\r
+\r
+ if ( (tstf = fopen(loadedRomFName, "rb")) )\r
+ {\r
+ fclose(tstf);\r
+ strcpy(curr_path, loadedRomFName);\r
+ }\r
+ else\r
+ {\r
+ getcwd(curr_path, PATH_MAX);\r
+ }\r
+\r
+ /* make sure action buttons are not pressed on entering menu */\r
+ draw_menu_tray(menu_sel);\r
+ while (in_menu_wait_any(50) & PBTN_MOK);\r
+\r
+ for (;;)\r
+ {\r
+ draw_menu_tray(menu_sel);\r
+ inp = in_menu_wait(PBTN_UP|PBTN_DOWN|PBTN_MOK);\r
+ if(inp & PBTN_UP ) { menu_sel--; if (menu_sel < 0) menu_sel = menu_sel_max; }\r
+ if(inp & PBTN_DOWN) { menu_sel++; if (menu_sel > menu_sel_max) menu_sel = 0; }\r
+ if(inp & PBTN_MOK ) {\r
+ switch (menu_sel) {\r
+ case 0: // select image\r
+ selfname = romsel_loop(curr_path);\r
+ if (selfname) {\r
+ int ret = -1;\r
+ cd_img_type cd_type;\r
+ cd_type = emu_cdCheck(NULL, romFileName);\r
+ if (cd_type != CIT_NOT_CD)\r
+ ret = Insert_CD(romFileName, cd_type);\r
+ if (ret != 0) {\r
+ sprintf(menuErrorMsg, "Load failed, invalid CD image?");\r
+ printf("%s\n", menuErrorMsg);\r
+ continue;\r
+ }\r
+ engineState = PGS_RestartRun;\r
+ return 1;\r
+ }\r
+ break;\r
+ case 1: // insert nothing\r
+ engineState = PGS_RestartRun;\r
+ return 0;\r
+ }\r
+ }\r
+ menuErrorMsg[0] = 0; // clear error msg\r
+ }\r
+}\r
+\r
+\r
notaz.gp2x.de / libpicofe.git / blobdiff