#include "menu.h"\r
#include "fonts.h"\r
#include "usbjoy.h"\r
+#include "asmutils.h"\r
#include "version.h"\r
\r
#include <Pico/PicoInt.h>\r
static unsigned long wait_for_input(unsigned long interesting)\r
{\r
unsigned long ret;\r
- static int repeats = 0, wait = 300*1000;\r
+ static int repeats = 0, wait = 50*1000;\r
int release = 0, i;\r
\r
- if (repeats == 5 || repeats == 15 || repeats == 30) wait /= 2;\r
+ if (repeats == 2 || repeats == 4) wait /= 2;\r
+ if (repeats == 6) wait = 15 * 1000;\r
\r
for (i = 0; i < 6 && inp_prev == gp2x_joystick_read(1); i++) {\r
- if(i == 0) repeats++;\r
- usleep(wait/6);\r
+ if (i == 0) repeats++;\r
+ if (wait >= 30*1000) usleep(wait); // usleep sleeps for ~30ms minimum\r
+ else spend_cycles(wait * currentConfig.CPUclock);\r
}\r
\r
while ( !((ret = gp2x_joystick_read(1)) & interesting) ) {\r
\r
if (release || ret != inp_prev) {\r
repeats = 0;\r
- wait = 300*1000;\r
+ wait = 50*1000;\r
}\r
inp_prev = ret;\r
inp_prevjoy = 0;\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_LEFT) { sel-=10; if (sel < 0) sel = 0; }\r
+ if(inp & GP2X_L) { sel-=24; if (sel < 0) sel = 0; }\r
+ if(inp & GP2X_RIGHT) { sel+=10; if (sel > n-2) sel = n-2; }\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
gp2x_text_out8(tl_x, (y+=10), "Emulate YM2612 (FM) %s", (currentConfig.PicoOpt&0x001)?"ON":"OFF"); // 2\r
gp2x_text_out8(tl_x, (y+=10), "Emulate SN76496 (PSG) %s", (currentConfig.PicoOpt&0x002)?"ON":"OFF"); // 3\r
gp2x_text_out8(tl_x, (y+=10), "gzip savestates %s", (currentConfig.EmuOpt &0x008)?"ON":"OFF"); // 4\r
- gp2x_text_out8(tl_x, (y+=10), "Don't save config on exit %s", (currentConfig.EmuOpt &0x020)?"ON":"OFF"); // 5\r
+ gp2x_text_out8(tl_x, (y+=10), "Don't save last used ROM %s", (currentConfig.EmuOpt &0x020)?"ON":"OFF"); // 5\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"); // 7\r
gp2x_text_out8(tl_x, (y+=10), "squidgehack (now %s %s", mms, (currentConfig.EmuOpt &0x010)?"ON":"OFF"); // 8\r
if(inp & GP2X_B ) {\r
switch (menu_sel) {\r
case 0: // resume game\r
- if (rom_data) { engineState = PGS_Running; return; }\r
+ if (rom_data) {\r
+ while (gp2x_joystick_read(1) & GP2X_B) usleep(50*1000);\r
+ engineState = PGS_Running;\r
+ return;\r
+ }\r
break;\r
case 1: // save state\r
if (rom_data) {\r
\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, 0xe0, 320*240);\r
+\r
+ gp2x_text_out8(tl_x, 20, "The unit is about to");\r
+ gp2x_text_out8(tl_x, 30, "close the CD tray.");\r
+\r
+ y = tl_y;\r
+ gp2x_text_out8(tl_x, y, "Load new CD image");\r
+ gp2x_text_out8(tl_x, (y+=10), "Insert nothing");\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
+}\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, 0xe0, 320*240);\r
+ menu_gfx_prepare();\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
+\r
+ /* make sure action buttons are not pressed on entering menu */\r
+ draw_menu_tray(menu_sel);\r
+ while (gp2x_joystick_read(1) & GP2X_B) usleep(50*1000);\r
+\r
+ for (;;)\r
+ {\r
+ draw_menu_tray(menu_sel);\r
+ inp = wait_for_input(GP2X_UP|GP2X_DOWN|GP2X_B);\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: // select image\r
+ selfname = romsel_loop(curr_path);\r
+ if (selfname) {\r
+ int ret = -1, cd_type;\r
+ cd_type = emu_cd_check(NULL);\r
+ if (cd_type > 0)\r
+ ret = Insert_CD(romFileName, cd_type == 2);\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