#include "gp2x.h"\r
#include "emu.h"\r
#include "menu.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 int mmuhack_status;\r
\r
-const char *keyNames[] = {\r
- "UP", "???", "LEFT", "???", "DOWN", "???", "RIGHT", "???",\r
- "START", "SELECT", "L", "R", "A", "B", "X", "Y",\r
- "???", "???", "???", "???", "???", "???", "VOL DOWN", "VOL UP",\r
- "???", "???", "???", "PUSH", "???", "???", "???", "???"\r
-};\r
-\r
-static void menu_darken_bg(void *dst, int pixels, int darker);\r
+void menu_darken_bg(void *dst, int pixels, int darker);\r
static void menu_prepare_bg(int use_game_bg);\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
-{\r
- unsigned long ret;\r
- static int repeats = 0, wait = 50*1000;\r
- int release = 0, i;\r
-\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
- 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
- usleep(50000);\r
- release = 1;\r
- }\r
-\r
- if (release || ret != inp_prev) {\r
- repeats = 0;\r
- wait = 50*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
-}\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
-\r
-// similar to wait_for_input(), but returns joy num\r
-static unsigned long wait_for_input_usbjoy(unsigned long interesting, int *joy)\r
-{\r
- unsigned long ret;\r
- const int wait = 300*1000;\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
- // handle only 1 event at a time\r
- for (i = 1; i != 0; i <<= 1)\r
- if (ret & i) { ret &= i; break; }\r
-\r
- return ret;\r
-}\r
-\r
-static void menu_flip(void)\r
+void menu_flip(void)\r
{\r
gp2x_video_flush_cache();\r
gp2x_video_flip2();\r
static unsigned short file2color(const char *fname)\r
{\r
const char *ext = fname + strlen(fname) - 3;\r
- static const char *rom_exts[] = { "zip", "bin", "smd", "gen", "iso", "cso" };\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
\r
static char *filter_exts[] = {\r
".mp3", ".MP3", ".srm", ".brm", "s.gz", ".mds", "bcfg", ".txt", ".htm", "html",\r
- ".jpg", ".gpe", ".cue"\r
+ ".jpg", ".gpe"\r
};\r
\r
static int scandir_filter(const struct dirent *ent)\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
struct dirent **namelist;\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
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) { 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
+ 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
return ret;\r
}\r
\r
-// ------------ debug menu ------------\r
-\r
-char *debugString(void);\r
-\r
-static void draw_debug(void)\r
-{\r
- char *p, *str = debugString();\r
- int len, line;\r
-\r
- gp2x_pd_clone_buffer2();\r
-\r
- p = str;\r
- for (line = 0; line < 24; line++)\r
- {\r
- while (*p && *p != '\n') p++;\r
- len = p - str;\r
- if (len > 55) len = 55;\r
- smalltext_out16_lim(1, line*10, str, 0xffff, len);\r
- if (*p == 0) break;\r
- p++; str = p;\r
- }\r
- menu_flip();\r
-}\r
-\r
-static void debug_menu_loop(void)\r
-{\r
- draw_debug();\r
- wait_for_input(GP2X_B|GP2X_X);\r
-}\r
-\r
// ------------ patch/gg menu ------------\r
\r
static void draw_patchlist(int sel)\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
\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_forcedFrame();\r
+ emu_forcedFrame(POPT_EN_SOFTSCALE);\r
menu_prepare_bg(1);\r
\r
memcpy(Pico.vram, tmp_vram, sizeof(Pico.vram));\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
-{\r
- static char name[16];\r
- switch (num)\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
- }\r
- return name;\r
-}\r
-\r
static char *action_binds(int player_idx, int action_mask)\r
{\r
- static char strkeys[32*5];\r
- int joy, i;\r
+ static char strkeys[32];\r
+ int d, k, d_prev = -1;\r
\r
strkeys[0] = 0;\r
- for (i = 0; i < 32; i++) // i is key index\r
- {\r
- if (currentConfig.KeyBinds[i] & action_mask)\r
- {\r
- if (player_idx >= 0 && ((currentConfig.KeyBinds[i] >> 16) & 3) != player_idx) continue;\r
- if (strkeys[0]) { strcat(strkeys, " + "); strcat(strkeys, keyNames[i]); break; }\r
- else strcpy(strkeys, keyNames[i]);\r
- }\r
- }\r
- for (joy = 0; joy < num_of_joys; joy++)\r
+\r
+ for (d = 0; d < IN_MAX_DEVS; d++)\r
{\r
- for (i = 0; i < 32; i++)\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
- if (currentConfig.JoyBinds[joy][i] & action_mask)\r
- {\r
- if (player_idx >= 0 && ((currentConfig.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
- }\r
- else strcpy(strkeys, usb_joy_key_name(joy + 1, i));\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
\r
}\r
}\r
\r
-static int count_bound_keys(int action, int pl_idx, int joy)\r
+static int count_bound_keys(int dev_id, int action_mask, int player_idx)\r
{\r
- int i, keys = 0;\r
+ const int *binds;\r
+ int k, keys = 0;\r
+ int count;\r
\r
- if (joy)\r
- {\r
- for (i = 0; i < 32; i++) {\r
- if (pl_idx >= 0 && (currentConfig.JoyBinds[joy-1][i]&0x30000) != (pl_idx<<16)) continue;\r
- if (currentConfig.JoyBinds[joy-1][i] & action) keys++;\r
- }\r
- }\r
- else\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
- for (i = 0; i < 32; i++) {\r
- if (pl_idx >= 0 && (currentConfig.KeyBinds[i]&0x30000) != (pl_idx<<16)) continue;\r
- if (currentConfig.KeyBinds[i] & action) keys++;\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, int sel)\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 = 40, i;\r
+ int x, y, tl_y = 30, i;\r
\r
gp2x_pd_clone_buffer2();\r
if (player_idx >= 0) {\r
- text_out16(80, 20, "Player %i controls", player_idx + 1);\r
+ text_out16(80, 10, "Player %i controls", player_idx + 1);\r
x = 80;\r
} else {\r
- text_out16(80, 20, "Emulator controls");\r
+ text_out16(80, 10, "Emulator controls");\r
x = 40;\r
}\r
\r
- menu_draw_selection(x - 16, tl_y + sel*10, (player_idx >= 0) ? 66 : 130);\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, "Done");\r
\r
if (sel < opt_cnt) {\r
- text_out16(30, 180, "Press a button to bind/unbind");\r
- text_out16(30, 190, "Use SELECT to clear");\r
- text_out16(30, 200, "To bind UP/DOWN, hold SELECT");\r
- text_out16(30, 210, "Select \"Done\" to exit");\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, 190, "Use Options -> Save cfg");\r
- text_out16(30, 200, "to save controls");\r
- text_out16(30, 210, "Press B or X to exit");\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(const me_bind_action *opts, int opt_cnt, int player_idx)\r
{\r
- int joy = 0, sel = 0, menu_sel_max = opt_cnt, prev_select = 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(opts, opt_cnt, player_idx, sel);\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
- prev_select = 0;\r
- if(inp & GP2X_UP ) { sel--; if (sel < 0) sel = menu_sel_max; continue; }\r
- if(inp & GP2X_DOWN) { sel++; if (sel > menu_sel_max) sel = 0; continue; }\r
- }\r
- if (sel >= opt_cnt) {\r
- if (inp & (GP2X_B|GP2X_X)) break;\r
- else continue;\r
- }\r
- // if we are here, we want to bind/unbind something\r
- if ((inp & GP2X_SELECT) && !prev_select)\r
- unbind_action(opts[sel].mask, player_idx, -1);\r
- prev_select = inp & GP2X_SELECT;\r
- inp &= CONFIGURABLE_KEYS;\r
- inp &= ~GP2X_SELECT;\r
- for (i = 0; i < 32; i++)\r
- if (inp & (1 << i)) {\r
- if (count_bound_keys(opts[sel].mask, player_idx, 0) >= 2)\r
- currentConfig.KeyBinds[i] &= ~opts[sel].mask; // allow to unbind only\r
- else currentConfig.KeyBinds[i] ^= opts[sel].mask;\r
- if (player_idx >= 0 && (currentConfig.KeyBinds[i] & opts[sel].mask)) {\r
- currentConfig.KeyBinds[i] &= ~(3 << 16);\r
- currentConfig.KeyBinds[i] |= player_idx << 16;\r
- }\r
- }\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
- else if (sel < opt_cnt)\r
- {\r
- for (i = 0; i < 32; i++)\r
- if (inp & (1 << i)) {\r
- int *bind = ¤tConfig.JoyBinds[joy-1][i];\r
- if ((*bind & opts[sel].mask) && (player_idx < 0 || player_idx == ((*bind>>16)&3)))\r
- *bind &= ~opts[sel].mask;\r
- else {\r
- // override\r
- unbind_action(opts[sel].mask, player_idx, joy);\r
- *bind = opts[sel].mask;\r
- if (player_idx > 0) *bind |= player_idx << 16;\r
- }\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
gp2x_pd_clone_buffer2();\r
menu_draw_selection(tl_x - 16, tl_y + menu_sel*10, 138);\r
\r
- text_out16(tl_x, y, "Player 1");\r
- text_out16(tl_x, (y+=10), "Player 2");\r
- text_out16(tl_x, (y+=10), "Emulator controls");\r
- text_out16(tl_x, (y+=10), "Done");\r
+ me_draw(ctrlopt_entries, ctrlopt_entry_count, tl_x, tl_y, NULL, NULL);\r
\r
tl_x = 25;\r
- text_out16(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
- text_out16(tl_x, (y+=10), "%i: %s", i+1, joyname);\r
- }\r
- } else {\r
- text_out16(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
menu_flip();\r
}\r
\r
\r
-// player2_flag, ?, ?, ?, ?, ?, ?, menu\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
- { NULL, 0 }\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 = 3, menu_sel_max = 3;\r
+ int menu_sel = 5, menu_sel_max = 5;\r
unsigned long inp = 0;\r
- int is_6button = PicoOpt & 0x020;\r
+ menu_id selected_id;\r
\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(me_ctrl_actions, is_6button ? 12 : 8, 0); return;\r
- case 1: key_config_loop(me_ctrl_actions, is_6button ? 12 : 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 (!rom_loaded) emu_WriteConfig(0); 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
{ 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 (using mp3s)", MB_ONOFF, MA_CDOPT_CDDA, &PicoOpt, 0x0800, 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
{ "done", MB_NONE, MA_CDOPT_DONE, NULL, 0, 0, 0, 1, 0 },\r
};\r
\r
-const int cdopt_entry_count = (sizeof(cdopt_entries) / sizeof(cdopt_entries[0]));\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
me_draw(cdopt_entries, CDOPT_ENTRY_COUNT, tl_x, tl_y, menu_cdopt_cust_draw, bios_names);\r
\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
menu_flip();\r
}\r
for(;;)\r
{\r
draw_cd_menu_options(menu_sel, &bios_names);\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
+ 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 & (GP2X_LEFT|GP2X_RIGHT)) { // multi choise\r
- if (!me_process(cdopt_entries, CDOPT_ENTRY_COUNT, selected_id, (inp&GP2X_RIGHT) ? 1 : 0) &&\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 & GP2X_LEFT) {\r
+ if (inp & PBTN_LEFT) {\r
PicoCDBuffers >>= 1;\r
- if (PicoCDBuffers < 64) PicoCDBuffers = 0;\r
+ if (PicoCDBuffers < 2) PicoCDBuffers = 0;\r
} else {\r
- if (PicoCDBuffers < 64) PicoCDBuffers = 64;\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_B) { // toggleable options\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
- }\r
- if (inp & GP2X_START) { // BIOS testers\r
+ // BIOS testers\r
switch (selected_id) {\r
case MA_CDOPT_TESTBIOS_USA:\r
if (emu_findBios(4, &bios)) { // test US\r
break;\r
}\r
}\r
- if (inp & (GP2X_X|GP2X_A)) return;\r
+ if (inp & PBTN_MBACK) return;\r
}\r
}\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
{ "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 = (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
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
+ 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 & (GP2X_LEFT|GP2X_RIGHT)) { // multi choise\r
- if (!me_process(opt2_entries, OPT2_ENTRY_COUNT, selected_id, (inp&GP2X_RIGHT) ? 1 : 0) &&\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 = gp2x_joystick_read(1)) & (GP2X_LEFT|GP2X_RIGHT)) {\r
- currentConfig.gamma += (inp & GP2X_LEFT) ? -1 : 1;\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
- usleep(18*1000);\r
}\r
}\r
}\r
- if (inp & GP2X_B) { // toggleable options\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 & (GP2X_X|GP2X_A)) return;\r
+ if (inp & PBTN_MBACK) return;\r
}\r
}\r
\r
{\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 timing (slower)", MB_ONOFF, MA_OPT_ACC_TIMING, &PicoOpt, 0x040, 0, 0, 1, 1 },\r
- { "Accurate sprites (slower)", MB_ONOFF, MA_OPT_ACC_SPRITES, &PicoOpt, 0x080, 0, 0, 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
- { "6 button pad", MB_ONOFF, MA_OPT_6BUTTON_PAD, &PicoOpt, 0x020, 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
switch (entry->id)\r
{\r
case MA_OPT_RENDERER:\r
- if (PicoOpt&0x10)\r
+ if (PicoOpt & POPT_ALT_RENDERER)\r
str = " 8bit fast";\r
else if (currentConfig.EmuOpt&0x80)\r
str = "16bit accurate";\r
text_out16(x, y, "Frameskip %s", str24);\r
break;\r
case MA_OPT_SOUND_QUALITY:\r
- str = (PicoOpt&0x08)?"stereo":"mono";\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
// force setting possibly changed..\r
Pico.m.pal = (PicoRegionOverride == 2 || PicoRegionOverride == 8) ? 1 : 0;\r
}\r
- if (!(PicoOpt & 0x20)) {\r
+ if (!(PicoOpt & POPT_6BTN_PAD)) {\r
// unbind XYZ MODE, just in case\r
unbind_action(0xf00, -1, -1);\r
}\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
+ 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 & (GP2X_LEFT|GP2X_RIGHT)) { // multi choice\r
- if (!me_process(opt_entries, OPT_ENTRY_COUNT, selected_id, (inp&GP2X_RIGHT) ? 1 : 0)) {\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 & GP2X_LEFT) {\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
}\r
break;\r
case MA_OPT_SOUND_QUALITY:\r
- if ((inp & GP2X_RIGHT) && PsndRate == 44100 && !(PicoOpt&0x08)) {\r
+ if ((inp & PBTN_RIGHT) && PsndRate == 44100 && !(PicoOpt&0x08)) {\r
PsndRate = 8000; PicoOpt|= 0x08;\r
- } else if ((inp & GP2X_LEFT) && 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 & GP2X_RIGHT);\r
+ } else PsndRate = sndrate_prevnext(PsndRate, inp & PBTN_RIGHT);\r
break;\r
case MA_OPT_REGION:\r
- region_prevnext(inp & GP2X_RIGHT);\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 & GP2X_LEFT) ? -1 : 1;\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
break;\r
}\r
case MA_OPT_SAVE_SLOT:\r
- if (inp & GP2X_RIGHT) {\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 = gp2x_joystick_read(1)) & (GP2X_LEFT|GP2X_RIGHT)) {\r
- currentConfig.CPUclock += (inp & GP2X_LEFT) ? -1 : 1;\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
- usleep(50*1000);\r
}\r
break;\r
case MA_OPT_SAVECFG:\r
case MA_OPT_SAVECFG_GAME:\r
case MA_OPT_LOADCFG:\r
- config_slot += (inp&GP2X_RIGHT) ? 1 : -1;\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
}\r
}\r
}\r
- if (inp & GP2X_B) {\r
+ if (inp & PBTN_MOK) {\r
if (!me_process(opt_entries, OPT_ENTRY_COUNT, selected_id, 1))\r
{\r
switch (selected_id)\r
}\r
}\r
}\r
- if(inp & (GP2X_X|GP2X_A)) {\r
+ if(inp & PBTN_MBACK) {\r
menu_options_save();\r
return 0; // done (update, no write)\r
}\r
\r
static void draw_menu_credits(void)\r
{\r
- int tl_x = 15, tl_y = 64, y;\r
+ int tl_x = 15, tl_y = 56, y;\r
gp2x_pd_clone_buffer2();\r
\r
- text_out16(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
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), "Charles MacDonald: Genesis hw docs");\r
- text_out16(tl_x, (y+=10), "Stephane Dallongeville:");\r
- text_out16(tl_x, (y+=10), " opensource Gens");\r
- text_out16(tl_x, (y+=10), "Haze: Genesis hw info");\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 joystick");\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
/* make sure action buttons are not pressed on entering menu */\r
draw_menu_root(menu_sel);\r
- while (gp2x_joystick_read(1) & (GP2X_B|GP2X_X|GP2X_SELECT)) usleep(50*1000);\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|GP2X_L|GP2X_R);\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_L|GP2X_R)) == (GP2X_L|GP2X_R)) debug_menu_loop();\r
- if(inp &(GP2X_SELECT|GP2X_X)){\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 (gp2x_joystick_read(1) & (GP2X_SELECT|GP2X_X)) usleep(50*1000); // wait until select is released\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
+ 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 (gp2x_joystick_read(1) & GP2X_B) usleep(50*1000);\r
+ while (in_menu_wait_any(50) & PBTN_MOK);\r
engineState = PGS_Running;\r
return;\r
}\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
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
{\r
char curr_path[PATH_MAX], *selfname;\r
FILE *tstf;\r
- if ( (tstf = fopen(lastRomFile, "rb")) )\r
+ if ( (tstf = fopen(loadedRomFName, "rb")) )\r
{\r
fclose(tstf);\r
- strcpy(curr_path, lastRomFile);\r
+ strcpy(curr_path, loadedRomFName);\r
}\r
else\r
getcwd(curr_path, PATH_MAX);\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 MA_MAIN_EXIT:\r
engineState = PGS_Quit;\r
}\r
}\r
\r
-static void menu_darken_bg(void *dst, int pixels, int darker)\r
-{\r
- unsigned int *screen = dst;\r
- pixels /= 2;\r
- if (darker)\r
- {\r
- while (pixels--)\r
- {\r
- unsigned int p = *screen;\r
- *screen++ = ((p&0xf79ef79e)>>1) - ((p&0xc618c618)>>3);\r
- }\r
- }\r
- else\r
- {\r
- while (pixels--)\r
- {\r
- unsigned int p = *screen;\r
- *screen++ = (p&0xf79ef79e)>>1;\r
- }\r
- }\r
-}\r
-\r
static void menu_prepare_bg(int use_game_bg)\r
{\r
if (use_game_bg)\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
gp2x_memset_all_buffers(0, 0, 320*240*2);\r
menu_gfx_prepare();\r
\r
- if ( (tstf = fopen(lastRomFile, "rb")) )\r
+ if ( (tstf = fopen(loadedRomFName, "rb")) )\r
{\r
fclose(tstf);\r
- strcpy(curr_path, lastRomFile);\r
+ strcpy(curr_path, loadedRomFName);\r
}\r
else\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
+ while (in_menu_wait_any(50) & PBTN_MOK);\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
+ 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, cd_type;\r
- cd_type = emu_cdCheck(NULL);\r
- if (cd_type > 0)\r
- ret = Insert_CD(romFileName, cd_type == 2);\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
notaz.gp2x.de / libpicofe.git / blobdiff