-// (c) Copyright 2006-2009 notaz, All rights reserved.\r
+// (c) Copyright 2006-2010 notaz, All rights reserved.\r
// Free for non-commercial use.\r
\r
// For commercial use, separate licencing terms must be obtained.\r
#include <version.h>\r
#include <revision.h>\r
\r
-#include <pico/pico_int.h>\r
+#include <pico/pico.h>\r
#include <pico/patch.h>\r
\r
static char static_buff[64];\r
-char menu_error_msg[64] = { 0, };\r
static int menu_error_time = 0;\r
+char menu_error_msg[64] = { 0, };\r
+void *g_menuscreen_ptr;\r
+void *g_menubg_src_ptr;\r
+void *g_menubg_ptr;\r
\r
#ifndef UIQ3\r
\r
+#if !SCREEN_SIZE_FIXED\r
+int g_menuscreen_w = MSCREEN_WIDTH;\r
+int g_menuscreen_h = MSCREEN_HEIGHT;\r
+#endif\r
+\r
static unsigned char *menu_font_data = NULL;\r
static int menu_text_color = 0xffff; // default to white\r
static int menu_sel_color = -1; // disabled\r
// draws text to current bbp16 screen\r
static void text_out16_(int x, int y, const char *text, int color)\r
{\r
- int i, l, u, tr, tg, tb, len;\r
- unsigned short *dest = (unsigned short *)g_screen_ptr + x + y * g_screen_width;\r
+ int i, lh, tr, tg, tb, len;\r
+ unsigned short *dest = (unsigned short *)g_menuscreen_ptr + x + y * g_menuscreen_w;\r
tr = (color & 0xf800) >> 8;\r
tg = (color & 0x07e0) >> 3;\r
tb = (color & 0x001f) << 3;\r
len = p - text;\r
}\r
\r
+ lh = me_mfont_h;\r
+ if (y + lh > g_menuscreen_h)\r
+ lh = g_menuscreen_h - y;\r
+\r
for (i = 0; i < len; i++)\r
{\r
unsigned char *src = menu_font_data + (unsigned int)text[i] * me_mfont_w * me_mfont_h / 2;\r
unsigned short *dst = dest;\r
- for (l = 0; l < me_mfont_h; l++, dst += g_screen_width - me_mfont_w)\r
+ int u, l;\r
+\r
+ for (l = 0; l < lh; l++, dst += g_menuscreen_w - me_mfont_w)\r
{\r
for (u = me_mfont_w / 2; u > 0; u--, src++)\r
{\r
{\r
va_list args;\r
char buffer[256];\r
- int maxw = (g_screen_width - x) / me_mfont_w;\r
+ int maxw = (g_menuscreen_w - x) / me_mfont_w;\r
\r
if (maxw < 0)\r
return;\r
break;\r
\r
src = fontdata6x8[c];\r
- dst = (unsigned short *)g_screen_ptr + x + y * g_screen_width;\r
+ dst = (unsigned short *)g_menuscreen_ptr + x + y * g_menuscreen_w;\r
\r
while (h--)\r
{\r
dst += multiplier;\r
}\r
\r
- dst += g_screen_width - me_sfont_w;\r
+ dst += g_menuscreen_w - me_sfont_w;\r
}\r
src++;\r
}\r
static void smalltext_out16(int x, int y, const char *texto, int color)\r
{\r
char buffer[128];\r
- int maxw = (g_screen_width - x) / 6;\r
+ int maxw = (g_menuscreen_w - x) / me_sfont_w;\r
\r
if (maxw < 0)\r
return;\r
if (menu_sel_color < 0) return; // no selection hilight\r
\r
if (y > 0) y--;\r
- dest = (unsigned short *)g_screen_ptr + x + y * g_screen_width + 14;\r
+ dest = (unsigned short *)g_menuscreen_ptr + x + y * g_menuscreen_w + me_mfont_w * 2 - 2;\r
for (h = me_mfont_h + 1; h > 0; h--)\r
{\r
dst = dest;\r
- for (i = w - 14; i > 0; i--)\r
+ for (i = w - (me_mfont_w * 2 - 2); i > 0; i--)\r
*dst++ = menu_sel_color;\r
- dest += g_screen_width;\r
+ dest += g_menuscreen_w;\r
}\r
}\r
\r
\r
// load custom font and selector (stored as 1st symbol in font table)\r
emu_make_path(buff, "skin/font.png", sizeof(buff));\r
- readpng(menu_font_data, buff, READPNG_FONT);\r
+ readpng(menu_font_data, buff, READPNG_FONT,\r
+ MENU_X2 ? 256 : 128, MENU_X2 ? 320 : 160);\r
// default selector symbol is '>'\r
memcpy(menu_font_data, menu_font_data + ((int)'>') * me_mfont_w * me_mfont_h / 2,\r
me_mfont_w * me_mfont_h / 2);\r
emu_make_path(buff, "skin/selector.png", sizeof(buff));\r
- readpng(menu_font_data, buff, READPNG_SELECTOR);\r
+ readpng(menu_font_data, buff, READPNG_SELECTOR, me_mfont_w, me_mfont_h);\r
\r
// load custom colors\r
emu_make_path(buff, "skin/skin.txt", sizeof(buff));\r
}\r
\r
\r
+static void menu_darken_bg(void *dst, void *src, int pixels, int darker)\r
+{\r
+ unsigned int *dest = dst;\r
+ unsigned int *sorc = src;\r
+ pixels /= 2;\r
+ if (darker)\r
+ {\r
+ while (pixels--)\r
+ {\r
+ unsigned int p = *sorc++;\r
+ *dest++ = ((p&0xf79ef79e)>>1) - ((p&0xc618c618)>>3);\r
+ }\r
+ }\r
+ else\r
+ {\r
+ while (pixels--)\r
+ {\r
+ unsigned int p = *sorc++;\r
+ *dest++ = (p&0xf79ef79e)>>1;\r
+ }\r
+ }\r
+}\r
+\r
+static void menu_enter(int is_rom_loaded)\r
+{\r
+ if (is_rom_loaded)\r
+ {\r
+ void *src = g_menubg_src_ptr;\r
+ if (src == NULL)\r
+ src = g_menuscreen_ptr;\r
+\r
+ // darken the active framebuffer\r
+ menu_darken_bg(g_menubg_ptr, src, g_menuscreen_w * g_menuscreen_h, 1);\r
+ }\r
+ else\r
+ {\r
+ char buff[256];\r
+\r
+ // should really only happen once, on startup..\r
+ emu_make_path(buff, "skin/background.png", sizeof(buff));\r
+ if (readpng(g_menubg_ptr, buff, READPNG_BG, g_menuscreen_w, g_menuscreen_h) < 0)\r
+ memset(g_menubg_ptr, 0, g_menuscreen_w * g_menuscreen_h * 2);\r
+ }\r
+\r
+ plat_video_menu_enter(is_rom_loaded);\r
+}\r
+\r
static int me_id2offset(const menu_entry *ent, menu_id id)\r
{\r
int i;\r
\r
static void me_draw(const menu_entry *entries, int sel, void (*draw_more)(void))\r
{\r
- const menu_entry *ent;\r
+ const menu_entry *ent, *ent_sel = entries;\r
int x, y, w = 0, h = 0;\r
int offs, col2_offs = 27 * me_mfont_w;\r
+ int vi_sel_ln = 0;\r
const char *name;\r
- int asel = 0;\r
int i, n;\r
\r
/* calculate size of menu rect */\r
if (!ent->enabled)\r
continue;\r
\r
- if (i == sel)\r
- asel = n;\r
+ if (i == sel) {\r
+ ent_sel = ent;\r
+ vi_sel_ln = n;\r
+ }\r
\r
name = NULL;\r
wt = strlen(ent->name) * me_mfont_w;\r
wt = col2_offs;\r
\r
switch (ent->beh) {\r
- case MB_NONE: break;\r
+ case MB_NONE:\r
+ break;\r
case MB_OPT_ONOFF:\r
- case MB_OPT_RANGE: wt += me_mfont_w * 3; break;\r
+ case MB_OPT_RANGE:\r
+ wt += me_mfont_w * 3;\r
+ break;\r
case MB_OPT_CUSTOM:\r
case MB_OPT_CUSTONOFF:\r
case MB_OPT_CUSTRANGE:\r
if (name != NULL)\r
wt += (strlen(name) + offs) * me_mfont_w;\r
break;\r
+ case MB_OPT_ENUM:\r
+ wt += 10 * me_mfont_w;\r
+ break;\r
}\r
}\r
\r
h = n * me_mfont_h;\r
w += me_mfont_w * 2; /* selector */\r
\r
- if (w > g_screen_width) {\r
- lprintf("width %d > %d\n", w, g_screen_width);\r
- w = g_screen_width;\r
+ if (w > g_menuscreen_w) {\r
+ lprintf("width %d > %d\n", w, g_menuscreen_w);\r
+ w = g_menuscreen_w;\r
}\r
- if (h > g_screen_height) {\r
- lprintf("height %d > %d\n", w, g_screen_height);\r
- h = g_screen_height;\r
+ if (h > g_menuscreen_h) {\r
+ lprintf("height %d > %d\n", w, g_menuscreen_h);\r
+ h = g_menuscreen_h;\r
}\r
\r
- x = g_screen_width / 2 - w / 2;\r
- y = g_screen_height / 2 - h / 2;\r
+ x = g_menuscreen_w / 2 - w / 2;\r
+ y = g_menuscreen_h / 2 - h / 2;\r
\r
/* draw */\r
plat_video_menu_begin();\r
- menu_draw_selection(x, y + asel * me_mfont_h, w);\r
+ menu_draw_selection(x, y + vi_sel_ln * me_mfont_h, w);\r
x += me_mfont_w * 2;\r
\r
for (ent = entries; ent->name; ent++)\r
{\r
+ const char **names;\r
+ int len;\r
+\r
if (!ent->enabled)\r
continue;\r
\r
if (name != NULL)\r
text_out16(x + col2_offs + offs * me_mfont_w, y, "%s", name);\r
break;\r
+ case MB_OPT_ENUM:\r
+ names = (const char **)ent->data;\r
+ offs = 0;\r
+ for (i = 0; names[i] != NULL; i++) {\r
+ len = strlen(names[i]);\r
+ if (len > 10)\r
+ offs = 10 - len - 2;\r
+ if (i == *(int *)ent->var) {\r
+ text_out16(x + col2_offs + offs * me_mfont_w, y, "%s", names[i]);\r
+ break;\r
+ }\r
+ }\r
+ break;\r
}\r
\r
y += me_mfont_h;\r
}\r
\r
- /* display message if we have one */\r
+ /* display help or message if we have one */\r
+ h = (g_menuscreen_h - h) / 2; // bottom area height\r
if (menu_error_msg[0] != 0) {\r
- if (g_screen_height - h >= 2 * me_mfont_h)\r
- text_out16(5, g_screen_height - me_mfont_h - 4, menu_error_msg);\r
+ if (h >= me_mfont_h + 4)\r
+ text_out16(5, g_menuscreen_h - me_mfont_h - 4, menu_error_msg);\r
else\r
lprintf("menu msg doesn't fit!\n");\r
\r
if (plat_get_ticks_ms() - menu_error_time > 2048)\r
menu_error_msg[0] = 0;\r
}\r
+ else if (ent_sel->help != NULL) {\r
+ const char *tmp = ent_sel->help;\r
+ int l;\r
+ for (l = 0; tmp != NULL && *tmp != 0; l++)\r
+ tmp = strchr(tmp + 1, '\n');\r
+ if (h >= l * me_sfont_h + 4)\r
+ for (tmp = ent_sel->help; l > 0; l--, tmp = strchr(tmp, '\n') + 1)\r
+ smalltext_out16(5, g_menuscreen_h - (l * me_sfont_h + 4), tmp, 0xffff);\r
+ }\r
\r
if (draw_more != NULL)\r
draw_more();\r
\r
static int me_process(menu_entry *entry, int is_next, int is_lr)\r
{\r
+ const char **names;\r
int c;\r
switch (entry->beh)\r
{\r
if (*(int *)entry->var > (int)entry->max)\r
*(int *)entry->var = (int)entry->min;\r
return 1;\r
+ case MB_OPT_ENUM:\r
+ names = (const char **)entry->data;\r
+ for (c = 0; names[c] != NULL; c++)\r
+ ;\r
+ *(int *)entry->var += is_next ? 1 : -1;\r
+ if (*(int *)entry->var < 0)\r
+ *(int *)entry->var = 0;\r
+ if (*(int *)entry->var >= c)\r
+ *(int *)entry->var = c - 1;\r
+ return 1;\r
default:\r
return 0;\r
}\r
continue;\r
}\r
\r
- if (inp & (PBTN_MOK|PBTN_LEFT|PBTN_RIGHT))\r
+ if (inp & (PBTN_MOK|PBTN_LEFT|PBTN_RIGHT|PBTN_L|PBTN_R))\r
{\r
- if (menu[sel].handler != NULL) {\r
+ /* require PBTN_MOK for MB_NONE */\r
+ if (menu[sel].handler != NULL && (menu[sel].beh != MB_NONE || (inp & PBTN_MOK))) {\r
ret = menu[sel].handler(menu[sel].id, inp);\r
if (ret) break;\r
- menu_sel_max = me_count(menu) - 1; /* might change */\r
+ menu_sel_max = me_count(menu) - 1; /* might change, so update */\r
}\r
}\r
}\r
/* ***************************************** */\r
\r
/* platform specific options and handlers */\r
+#if defined(__GP2X__)\r
#include "../gp2x/menu.c"\r
+#elif defined(PANDORA)\r
+#include "../pandora/menu.c"\r
+#else\r
+#define MENU_OPTIONS_GFX\r
+#define MENU_OPTIONS_ADV\r
+#define menu_main_plat_draw NULL\r
+#endif\r
\r
static void draw_menu_credits(void)\r
{\r
p++;\r
}\r
\r
- x = g_screen_width / 2 - w * me_mfont_w / 2;\r
- y = g_screen_height / 2 - h * me_mfont_h / 2;\r
+ x = g_menuscreen_w / 2 - w * me_mfont_w / 2;\r
+ y = g_menuscreen_h / 2 - h * me_mfont_h / 2;\r
if (x < 0) x = 0;\r
if (y < 0) y = 0;\r
\r
plat_video_menu_begin();\r
\r
- for (p = creds; *p != 0 && y <= g_screen_height - me_mfont_h; y += me_mfont_h) {\r
+ for (p = creds; *p != 0 && y <= g_menuscreen_h - me_mfont_h; y += me_mfont_h) {\r
text_out16(x, y, p);\r
\r
for (; *p != 0 && *p != '\n'; p++)\r
\r
static void load_progress_cb(int percent)\r
{\r
- int ln, len = percent * g_screen_width / 100;\r
- unsigned short *dst = (unsigned short *)g_screen_ptr + g_screen_width * 10 * 2;\r
+ int ln, len = percent * g_menuscreen_w / 100;\r
+ unsigned short *dst = (unsigned short *)g_menuscreen_ptr + g_menuscreen_w * me_sfont_h * 2;\r
\r
- if (len > g_screen_width)\r
- len = g_screen_width;\r
- for (ln = 10 - 2; ln > 0; ln--, dst += g_screen_width)\r
+ if (len > g_menuscreen_w)\r
+ len = g_menuscreen_w;\r
+ for (ln = me_sfont_h - 2; ln > 0; ln--, dst += g_menuscreen_w)\r
memset(dst, 0xff, len * 2);\r
plat_video_menu_end();\r
}\r
\r
static void cdload_progress_cb(const char *fname, int percent)\r
{\r
- int ln, len = percent * g_screen_width / 100;\r
- unsigned short *dst = (unsigned short *)g_screen_ptr + g_screen_width * 10 * 2;\r
+ int ln, len = percent * g_menuscreen_w / 100;\r
+ unsigned short *dst = (unsigned short *)g_menuscreen_ptr + g_menuscreen_w * me_sfont_h * 2;\r
\r
- memset(dst, 0xff, g_screen_width * (me_sfont_h - 2) * 2);\r
+ memset(dst, 0xff, g_menuscreen_w * (me_sfont_h - 2) * 2);\r
\r
smalltext_out16(1, 3 * me_sfont_h, "Processing CD image / MP3s", 0xffff);\r
smalltext_out16(1, 4 * me_sfont_h, fname, 0xffff);\r
- dst += g_screen_width * me_sfont_h * 3;\r
+ dst += g_menuscreen_w * me_sfont_h * 3;\r
\r
- if (len > g_screen_width)\r
- len = g_screen_width;\r
- for (ln = (me_sfont_h - 2); ln > 0; ln--, dst += g_screen_width)\r
+ if (len > g_menuscreen_w)\r
+ len = g_menuscreen_w;\r
+ for (ln = (me_sfont_h - 2); ln > 0; ln--, dst += g_menuscreen_w)\r
memset(dst, 0xff, len * 2);\r
\r
plat_video_menu_end();\r
void menu_romload_prepare(const char *rom_name)\r
{\r
const char *p = rom_name + strlen(rom_name);\r
+ int i;\r
\r
while (p > rom_name && *p != '/')\r
p--;\r
\r
- /* fill both buffers, callbacks won't update in full */\r
- plat_video_menu_begin();\r
- smalltext_out16(1, 1, "Loading", 0xffff);\r
- smalltext_out16(1, me_sfont_h, p, 0xffff);\r
- plat_video_menu_end();\r
-\r
- plat_video_menu_begin();\r
- smalltext_out16(1, 1, "Loading", 0xffff);\r
- smalltext_out16(1, me_sfont_h, p, 0xffff);\r
- plat_video_menu_end();\r
+ /* fill all buffers, callbacks won't update in full */\r
+ for (i = 0; i < 3; i++) {\r
+ plat_video_menu_begin();\r
+ smalltext_out16(1, 1, "Loading", 0xffff);\r
+ smalltext_out16(1, me_sfont_h, p, 0xffff);\r
+ plat_video_menu_end();\r
+ }\r
\r
PicoCartLoadProgressCB = load_progress_cb;\r
PicoCDLoadProgressCB = cdload_progress_cb;\r
plat_video_menu_begin();\r
\r
if (!rom_loaded)\r
- menu_darken_bg(g_screen_ptr, g_screen_width * g_screen_height, 0);\r
+ menu_darken_bg(g_menuscreen_ptr, g_menuscreen_ptr, g_menuscreen_w * g_menuscreen_h, 0);\r
\r
len = strlen(fname);\r
- if (len > g_screen_width/6)\r
- len = g_screen_width/6;\r
+ if (len > g_menuscreen_w / me_sfont_w)\r
+ len = g_menuscreen_w / me_sfont_w;\r
\r
- mid = g_screen_width / 2;\r
+ mid = g_menuscreen_w / 2;\r
text_out16(mid - me_mfont_w * 15 / 2, 8 * me_mfont_h, "About to delete");\r
smalltext_out16(mid - len * me_sfont_w / 2, 9 * me_mfont_h + 5, fname, 0xbdff);\r
text_out16(mid - me_mfont_w * 13 / 2, 11 * me_mfont_h, "Are you sure?");\r
static void draw_dirlist(char *curdir, struct dirent **namelist, int n, int sel)\r
{\r
int max_cnt, start, i, x, pos;\r
+ void *darken_ptr;\r
\r
- max_cnt = g_screen_height / me_sfont_h;\r
+ max_cnt = g_menuscreen_h / me_sfont_h;\r
start = max_cnt / 2 - sel;\r
n--; // exclude current dir (".")\r
\r
// if (!rom_loaded)\r
// menu_darken_bg(gp2x_screen, 320*240, 0);\r
\r
- menu_darken_bg((short *)g_screen_ptr + g_screen_width * max_cnt/2 * 10, g_screen_width * 8, 0);\r
+ darken_ptr = (short *)g_menuscreen_ptr + g_menuscreen_w * max_cnt/2 * me_sfont_h;\r
+ menu_darken_bg(darken_ptr, darken_ptr, g_menuscreen_w * me_sfont_h * 8 / 10, 0);\r
\r
x = 5 + me_mfont_w + 1;\r
if (start - 2 >= 0)\r
{\r
int max_cnt, start, i, pos, active;\r
\r
- max_cnt = g_screen_height / 10;\r
+ max_cnt = g_menuscreen_h / me_sfont_h;\r
start = max_cnt / 2 - sel;\r
\r
plat_video_menu_begin();\r
if (pos < 0) continue;\r
if (pos >= max_cnt) break;\r
active = PicoPatches[i].active;\r
- smalltext_out16(14, pos * me_sfont_h, active ? "ON " : "OFF", active ? 0xfff6 : 0xffff);\r
- smalltext_out16(14+6*4, pos * me_sfont_h, PicoPatches[i].name, active ? 0xfff6 : 0xffff);\r
+ smalltext_out16(14, pos * me_sfont_h, active ? "ON " : "OFF", active ? 0xfff6 : 0xffff);\r
+ smalltext_out16(14 + me_sfont_w*4, pos * me_sfont_h, PicoPatches[i].name, active ? 0xfff6 : 0xffff);\r
}\r
pos = start + i;\r
if (pos < max_cnt)\r
\r
static void draw_savestate_bg(int slot)\r
{\r
- struct PicoVideo tmp_pv;\r
- unsigned short tmp_cram[0x40];\r
- unsigned short tmp_vsram[0x40];\r
- void *tmp_vram;\r
const char *fname;\r
+ void *tmp_state;\r
\r
fname = emu_get_save_fname(1, 0, slot);\r
- if (!fname) return;\r
-\r
- tmp_vram = malloc(sizeof(Pico.vram));\r
- if (tmp_vram == NULL) return;\r
+ if (!fname)\r
+ return;\r
\r
- memcpy(tmp_vram, Pico.vram, sizeof(Pico.vram));\r
- memcpy(tmp_cram, Pico.cram, sizeof(Pico.cram));\r
- memcpy(tmp_vsram, Pico.vsram, sizeof(Pico.vsram));\r
- memcpy(&tmp_pv, &Pico.video, sizeof(Pico.video));\r
+ tmp_state = PicoTmpStateSave();\r
\r
- PicoStateLoadVDP(fname);\r
+ PicoStateLoadGfx(fname);\r
\r
/* do a frame and fetch menu bg */\r
- pemu_forced_frame(POPT_EN_SOFTSCALE);\r
- plat_video_menu_enter(1);\r
+ pemu_forced_frame(POPT_EN_SOFTSCALE, 0);\r
+ menu_enter(1);\r
\r
- memcpy(Pico.vram, tmp_vram, sizeof(Pico.vram));\r
- memcpy(Pico.cram, tmp_cram, sizeof(Pico.cram));\r
- memcpy(Pico.vsram, tmp_vsram, sizeof(Pico.vsram));\r
- memcpy(&Pico.video, &tmp_pv, sizeof(Pico.video));\r
- free(tmp_vram);\r
+ PicoTmpStateRestore(tmp_state);\r
}\r
\r
static void draw_savestate_menu(int menu_sel, int is_loading)\r
\r
w = (13 + 2) * me_mfont_w;\r
h = (1+2+10+1) * me_mfont_h;\r
- x = g_screen_width / 2 - w / 2;\r
+ x = g_menuscreen_w / 2 - w / 2;\r
if (x < 0) x = 0;\r
- y = g_screen_height / 2 - h / 2;\r
+ y = g_menuscreen_h / 2 - h / 2;\r
if (y < 0) y = 0;\r
\r
plat_video_menu_begin();\r
static int menu_sel = 10;\r
int menu_sel_max = 10;\r
unsigned long inp = 0;\r
+ int ret = 0;\r
\r
state_check_slots();\r
\r
state_slot = menu_sel;\r
if (emu_save_load_game(is_loading, 0)) {\r
me_update_msg(is_loading ? "Load failed" : "Save failed");\r
- return 0;\r
+ break;\r
}\r
- return 1;\r
+ ret = 1;\r
+ break;\r
}\r
- return 0;\r
+ break;\r
}\r
if (inp & PBTN_MBACK)\r
- return 0;\r
+ break;\r
}\r
+\r
+ return ret;\r
}\r
\r
// -------------- key config --------------\r
int x, y, w, i;\r
\r
w = ((player_idx >= 0) ? 20 : 30) * me_mfont_w;\r
- x = g_screen_width / 2 - w / 2;\r
- y = (g_screen_height - 4 * me_mfont_h) / 2 - (2 + opt_cnt) * me_mfont_h / 2;\r
+ x = g_menuscreen_w / 2 - w / 2;\r
+ y = (g_menuscreen_h - 4 * me_mfont_h) / 2 - (2 + opt_cnt) * me_mfont_h / 2;\r
if (x < me_mfont_w * 2)\r
x = me_mfont_w * 2;\r
\r
w = strlen(dev_name) * me_mfont_w;\r
if (w < 30 * me_mfont_w)\r
w = 30 * me_mfont_w;\r
- if (w > g_screen_width)\r
- w = g_screen_width;\r
+ if (w > g_menuscreen_w)\r
+ w = g_menuscreen_w;\r
\r
- x = g_screen_width / 2 - w / 2;\r
+ x = g_menuscreen_w / 2 - w / 2;\r
\r
if (!is_bind) {\r
snprintf(buff2, sizeof(buff2), "%s", in_get_key_name(-1, -PBTN_MOK));\r
snprintf(buff, sizeof(buff), "%s - bind, %s - clear", buff2,\r
in_get_key_name(-1, -PBTN_MA2));\r
- text_out16(x, g_screen_height - 4 * me_mfont_h, buff);\r
+ text_out16(x, g_menuscreen_h - 4 * me_mfont_h, buff);\r
}\r
else\r
- text_out16(x, g_screen_height - 4 * me_mfont_h, "Press a button to bind/unbind");\r
+ text_out16(x, g_menuscreen_h - 4 * me_mfont_h, "Press a button to bind/unbind");\r
\r
if (dev_count > 1) {\r
- text_out16(x, g_screen_height - 3 * me_mfont_h, dev_name);\r
- text_out16(x, g_screen_height - 2 * me_mfont_h, "Press left/right for other devs");\r
+ text_out16(x, g_menuscreen_h - 3 * me_mfont_h, dev_name);\r
+ text_out16(x, g_menuscreen_h - 2 * me_mfont_h, "Press left/right for other devs");\r
}\r
\r
plat_video_menu_end();\r
break;\r
}\r
continue;\r
- case PBTN_MBACK: return;\r
+ case PBTN_MBACK:\r
+ return;\r
case PBTN_MOK:\r
if (sel >= opt_cnt)\r
return;\r
- while (in_menu_wait_any(30) & PBTN_MOK);\r
+ while (in_menu_wait_any(30) & PBTN_MOK)\r
+ ;\r
break;\r
case PBTN_MA2:\r
in_unbind_all(dev_id, opts[sel].mask << mask_shift, bindtype);\r
in_get_dev_info(dev_id, IN_INFO_DOES_COMBOS))\r
unbind = 0;\r
\r
- in_bind_key(dev_id, kc, opts[sel].mask << mask_shift, bindtype, unbind);\r
+ if (unbind)\r
+ in_unbind_all(dev_id, opts[sel].mask << mask_shift, bindtype);\r
+\r
+ in_bind_key(dev_id, kc, opts[sel].mask << mask_shift, bindtype, 0);\r
}\r
}\r
\r
}\r
\r
static int mh_saveloadcfg(menu_id id, int keys);\r
-static const char *mgn_savecfg(menu_id id, int *offs);\r
+static const char *mgn_saveloadcfg(menu_id id, int *offs);\r
\r
static menu_entry e_menu_keyconfig[] =\r
{\r
mee_handler_id("Emulator controls", MA_CTRL_EMU, key_config_loop_wrap),\r
mee_onoff ("6 button pad", MA_OPT_6BUTTON_PAD, PicoOpt, POPT_6BTN_PAD),\r
mee_range ("Turbo rate", MA_CTRL_TURBO_RATE, currentConfig.turbo_rate, 1, 30),\r
- mee_handler_mkname_id(MA_OPT_SAVECFG, mh_saveloadcfg, mgn_savecfg),\r
- mee_handler_id("Save cfg for loaded game", MA_OPT_SAVECFG_GAME, mh_saveloadcfg),\r
+ mee_cust_nosave("Save global config", MA_OPT_SAVECFG, mh_saveloadcfg, mgn_saveloadcfg),\r
+ mee_cust_nosave("Save cfg for loaded game", MA_OPT_SAVECFG_GAME, mh_saveloadcfg, mgn_saveloadcfg),\r
mee_label (""),\r
mee_label ("Input devices:"),\r
mee_label_mk (MA_CTRL_DEV_FIRST, mgn_dev_name),\r
return 0;\r
}\r
\r
+static const char h_cdleds[] = "Show power/CD LEDs of emulated console";\r
+static const char h_cdda[] = "Play audio tracks from mp3s/wavs/bins";\r
+static const char h_cdpcm[] = "Emulate PCM audio chip for effects/voices/music";\r
+static const char h_srcart[] = "Emulate the save RAM cartridge accessory\n"\r
+ "most games don't need this";\r
+static const char h_scfx[] = "Emulate scale/rotate ASIC chip for graphics effects\n"\r
+ "disable to improve performance";\r
+static const char h_bsync[] = "More accurate mode for CPUs (needed for some games)\n"\r
+ "disable to improve performance";\r
+\r
static menu_entry e_menu_cd_options[] =\r
{\r
- mee_onoff("CD LEDs", MA_CDOPT_LEDS, currentConfig.EmuOpt, EOPT_EN_CD_LEDS),\r
- mee_onoff("CDDA audio", MA_CDOPT_CDDA, PicoOpt, POPT_EN_MCD_CDDA),\r
- mee_onoff("PCM audio", MA_CDOPT_PCM, PicoOpt, POPT_EN_MCD_PCM),\r
- mee_cust ("ReadAhead buffer", MA_CDOPT_READAHEAD, mh_cdopt_ra, mgn_cdopt_ra),\r
- mee_onoff("SaveRAM cart", MA_CDOPT_SAVERAM, PicoOpt, POPT_EN_MCD_RAMCART),\r
- mee_onoff("Scale/Rot. fx (slow)", MA_CDOPT_SCALEROT_CHIP, PicoOpt, POPT_EN_MCD_GFX),\r
- mee_onoff("Better sync (slow)", MA_CDOPT_BETTER_SYNC, PicoOpt, POPT_EN_MCD_PSYNC),\r
+ mee_onoff_h("CD LEDs", MA_CDOPT_LEDS, currentConfig.EmuOpt, EOPT_EN_CD_LEDS, h_cdleds),\r
+ mee_onoff_h("CDDA audio", MA_CDOPT_CDDA, PicoOpt, POPT_EN_MCD_CDDA, h_cdda),\r
+ mee_onoff_h("PCM audio", MA_CDOPT_PCM, PicoOpt, POPT_EN_MCD_PCM, h_cdpcm),\r
+ mee_cust ("ReadAhead buffer", MA_CDOPT_READAHEAD, mh_cdopt_ra, mgn_cdopt_ra),\r
+ mee_onoff_h("SaveRAM cart", MA_CDOPT_SAVERAM, PicoOpt, POPT_EN_MCD_RAMCART, h_srcart),\r
+ mee_onoff_h("Scale/Rot. fx (slow)", MA_CDOPT_SCALEROT_CHIP, PicoOpt, POPT_EN_MCD_GFX, h_scfx),\r
+ mee_onoff_h("Better sync (slow)", MA_CDOPT_BETTER_SYNC, PicoOpt, POPT_EN_MCD_PSYNC, h_bsync),\r
mee_end,\r
};\r
\r
\r
// ------------ 32X options menu ------------\r
\r
+#ifndef NO_32X\r
+\r
+// convert from multiplier of VClk\r
+static int mh_opt_sh2cycles(menu_id id, int keys)\r
+{\r
+ int *mul = (id == MA_32XOPT_MSH2_CYCLES) ? &p32x_msh2_multiplier : &p32x_ssh2_multiplier;\r
+\r
+ if (keys & (PBTN_LEFT|PBTN_RIGHT))\r
+ *mul += (keys & PBTN_LEFT) ? -10 : 10;\r
+ if (keys & (PBTN_L|PBTN_R))\r
+ *mul += (keys & PBTN_L) ? -100 : 100;\r
+\r
+ if (*mul < 1)\r
+ *mul = 1;\r
+ else if (*mul > (10 << SH2_MULTI_SHIFT))\r
+ *mul = 10 << SH2_MULTI_SHIFT;\r
+\r
+ return 0;\r
+}\r
+\r
+static const char *mgn_opt_sh2cycles(menu_id id, int *offs)\r
+{\r
+ int mul = (id == MA_32XOPT_MSH2_CYCLES) ? p32x_msh2_multiplier : p32x_ssh2_multiplier;\r
+ \r
+ sprintf(static_buff, "%d", 7670 * mul >> SH2_MULTI_SHIFT);\r
+ return static_buff;\r
+}\r
+\r
+static const char h_32x_enable[] = "Enable emulation of the 32X addon";\r
+static const char h_pwm[] = "Disabling may improve performance, but break sound";\r
+static const char h_sh2cycles[] = "Cycles/millisecond (similar to DOSBox)\n"\r
+ "lower values speed up emulation but break games\n"\r
+ "at least 11000 recommended for compatibility";\r
+\r
static menu_entry e_menu_32x_options[] =\r
{\r
- mee_onoff("32X enabled", MA_32XOPT_ENABLE_32X, PicoOpt, POPT_EN_32X),\r
- mee_onoff("PWM sound", MA_32XOPT_PWM, PicoOpt, POPT_EN_PWM),\r
+ mee_onoff_h ("32X enabled", MA_32XOPT_ENABLE_32X, PicoOpt, POPT_EN_32X, h_32x_enable),\r
+ mee_enum ("32X renderer", MA_32XOPT_RENDERER, currentConfig.renderer32x, renderer_names32x),\r
+ mee_onoff_h ("PWM sound", MA_32XOPT_PWM, PicoOpt, POPT_EN_PWM, h_pwm),\r
+ mee_cust_h ("Master SH2 cycles", MA_32XOPT_MSH2_CYCLES, mh_opt_sh2cycles, mgn_opt_sh2cycles, h_sh2cycles),\r
+ mee_cust_h ("Slave SH2 cycles", MA_32XOPT_SSH2_CYCLES, mh_opt_sh2cycles, mgn_opt_sh2cycles, h_sh2cycles),\r
+ mee_end,\r
};\r
\r
static int menu_loop_32x_options(menu_id id, int keys)\r
{\r
static int sel = 0;\r
+\r
+ me_enable(e_menu_32x_options, MA_32XOPT_RENDERER, renderer_names32x[0] != NULL);\r
me_loop(e_menu_32x_options, &sel, NULL);\r
+\r
return 0;\r
}\r
\r
+#endif\r
+\r
// ------------ adv options menu ------------\r
\r
static menu_entry e_menu_adv_options[] =\r
mee_onoff ("Don't save last used ROM", MA_OPT2_NO_LAST_ROM, currentConfig.EmuOpt, EOPT_NO_AUTOSVCFG),\r
mee_onoff ("Disable idle loop patching",MA_OPT2_NO_IDLE_LOOPS,PicoOpt, POPT_DIS_IDLE_DET),\r
mee_onoff ("Disable frame limiter", MA_OPT2_NO_FRAME_LIMIT,currentConfig.EmuOpt, EOPT_NO_FRMLIMIT),\r
- MENU_GP2X_OPTIONS_ADV\r
+ MENU_OPTIONS_ADV\r
mee_end,\r
};\r
\r
\r
// ------------ gfx options menu ------------\r
\r
-static int mh_opt_render(menu_id id, int keys)\r
-{\r
- plat_video_toggle_renderer((keys & PBTN_RIGHT) ? 1 : 0, 0, 1);\r
- return 0;\r
-}\r
-\r
static menu_entry e_menu_gfx_options[] =\r
{\r
- mee_cust ("Renderer", MA_OPT_RENDERER, mh_opt_render, mgn_opt_renderer),\r
- MENU_GP2X_OPTIONS_GFX\r
+ mee_enum("Renderer", MA_OPT_RENDERER, currentConfig.renderer, renderer_names),\r
+ MENU_OPTIONS_GFX\r
mee_end,\r
};\r
\r
static int menu_loop_gfx_options(menu_id id, int keys)\r
{\r
static int sel = 0;\r
+\r
+ me_enable(e_menu_gfx_options, MA_OPT_RENDERER, renderer_names[0] != NULL);\r
me_loop(e_menu_gfx_options, &sel, NULL);\r
+\r
return 0;\r
}\r
\r
\r
static int mh_opt_misc(menu_id id, int keys)\r
{\r
- int i;\r
-\r
switch (id) {\r
case MA_OPT_SOUND_QUALITY:\r
PsndRate = sndrate_prevnext(PsndRate, keys & PBTN_RIGHT);\r
case MA_OPT_REGION:\r
region_prevnext(keys & PBTN_RIGHT);\r
break;\r
- case MA_OPT_CONFIRM_STATES:\r
- i = ((currentConfig.EmuOpt>>9)&1) | ((currentConfig.EmuOpt>>10)&2);\r
- i += (keys & PBTN_LEFT) ? -1 : 1;\r
- if (i < 0) i = 0; else if (i > 3) i = 3;\r
- i |= i << 1; i &= ~2;\r
- currentConfig.EmuOpt &= ~0xa00;\r
- currentConfig.EmuOpt |= i << 9;\r
- break;\r
default:\r
break;\r
}\r
me_update_msg("failed to write config");\r
break;\r
case MA_OPT_LOADCFG:\r
- ret = emu_read_config(1, 1);\r
- if (!ret) ret = emu_read_config(0, 1);\r
+ ret = emu_read_config(rom_fname_loaded, 1);\r
+ if (!ret) ret = emu_read_config(NULL, 1);\r
if (ret) me_update_msg("config loaded");\r
else me_update_msg("failed to load config");\r
break;\r
}\r
}\r
\r
-static const char *mgn_opt_c_saves(menu_id id, int *offs)\r
-{\r
- switch ((currentConfig.EmuOpt >> 9) & 5) {\r
- default: return "OFF";\r
- case 1: return "writes";\r
- case 4: return "loads";\r
- case 5: return "both";\r
- }\r
-}\r
-\r
-static const char *mgn_savecfg(menu_id id, int *offs)\r
+static const char *mgn_saveloadcfg(menu_id id, int *offs)\r
{\r
- strcpy(static_buff, "Save global config");\r
+ static_buff[0] = 0;\r
if (config_slot != 0)\r
- sprintf(static_buff + strlen(static_buff), " (profile: %i)", config_slot);\r
+ sprintf(static_buff, "[%i]", config_slot);\r
return static_buff;\r
}\r
\r
-static const char *mgn_loadcfg(menu_id id, int *offs)\r
-{\r
- sprintf(static_buff, "Load cfg from profile %i", config_slot);\r
- return static_buff;\r
-}\r
+static const char *men_confirm_save[] = { "OFF", "writes", "loads", "both", NULL };\r
+static const char h_confirm_save[] = "Ask for confirmation when overwriting save,\n"\r
+ "loading state or both";\r
\r
static menu_entry e_menu_options[] =\r
{\r
mee_onoff ("Show FPS", MA_OPT_SHOW_FPS, currentConfig.EmuOpt, EOPT_SHOW_FPS),\r
mee_onoff ("Enable sound", MA_OPT_ENABLE_SOUND, currentConfig.EmuOpt, EOPT_EN_SOUND),\r
mee_cust ("Sound Quality", MA_OPT_SOUND_QUALITY, mh_opt_misc, mgn_opt_sound),\r
- mee_cust ("Confirm savestate", MA_OPT_CONFIRM_STATES,mh_opt_misc, mgn_opt_c_saves),\r
- mee_range (cpu_clk_name, MA_OPT_CPU_CLOCKS, currentConfig.CPUclock, 20, 900),\r
+ mee_enum_h ("Confirm savestate", MA_OPT_CONFIRM_STATES,currentConfig.confirm_save, men_confirm_save, h_confirm_save),\r
+ mee_range ("", MA_OPT_CPU_CLOCKS, currentConfig.CPUclock, 20, 900),\r
mee_handler ("[Display options]", menu_loop_gfx_options),\r
mee_handler ("[Sega/Mega CD options]", menu_loop_cd_options),\r
+#ifndef NO_32X\r
mee_handler ("[32X options]", menu_loop_32x_options),\r
+#endif\r
mee_handler ("[Advanced options]", menu_loop_adv_options),\r
- mee_handler_mkname_id(MA_OPT_SAVECFG, mh_saveloadcfg, mgn_savecfg),\r
- mee_handler_id("Save cfg for current game only", MA_OPT_SAVECFG_GAME, mh_saveloadcfg),\r
- mee_handler_mkname_id(MA_OPT_LOADCFG, mh_saveloadcfg, mgn_loadcfg),\r
+ mee_cust_nosave("Save global config", MA_OPT_SAVECFG, mh_saveloadcfg, mgn_saveloadcfg),\r
+ mee_cust_nosave("Save cfg for loaded game",MA_OPT_SAVECFG_GAME, mh_saveloadcfg, mgn_saveloadcfg),\r
+ mee_cust_nosave("Load cfg from profile", MA_OPT_LOADCFG, mh_saveloadcfg, mgn_saveloadcfg),\r
mee_handler ("Restore defaults", mh_restore_defaults),\r
mee_end,\r
};\r
static int menu_loop_options(menu_id id, int keys)\r
{\r
static int sel = 0;\r
+ int i;\r
\r
+ i = me_id2offset(e_menu_options, MA_OPT_CPU_CLOCKS);\r
+ e_menu_options[i].enabled = e_menu_options[i].name ? 1 : 0;\r
me_enable(e_menu_options, MA_OPT_SAVECFG_GAME, rom_loaded);\r
me_enable(e_menu_options, MA_OPT_LOADCFG, config_slot != config_slot_current);\r
\r
}\r
\r
str = p;\r
- for (line = from; line < g_screen_height / me_sfont_h; line++)\r
+ for (line = from; line < g_menuscreen_h / me_sfont_h; line++)\r
{\r
smalltext_out16(1, line * me_sfont_h, str, 0xffff);\r
while (*p && *p != '\n')\r
if (PicoDrawMask & PDRAW_SPRITES_HI_ON) memcpy(layer_str + 19, "spr_hi", 6);\r
if (PicoDrawMask & PDRAW_32X_ON) memcpy(layer_str + 26, "32x", 4);\r
\r
- memset(g_screen_ptr, 0, g_screen_width * g_screen_height * 2);\r
- pemu_forced_frame(0);\r
+ memset(g_menuscreen_ptr, 0, g_menuscreen_w * g_menuscreen_h * 2);\r
+ pemu_forced_frame(0, 0);\r
smalltext_out16(4, 1, "build: r" REVISION " "__DATE__ " " __TIME__ " " COMPILER, 0xffff);\r
- smalltext_out16(4, g_screen_height - me_sfont_h, layer_str, 0xffff);\r
+ smalltext_out16(4, g_menuscreen_h - me_sfont_h, layer_str, 0xffff);\r
}\r
\r
static void debug_menu_loop(void)\r
plat_debug_cat(tmp);\r
draw_text_debug(tmp, 0, 0);\r
if (dumped) {\r
- smalltext_out16(g_screen_width - 6 * me_sfont_h,\r
- g_screen_height - me_mfont_h, "dumped", 0xffff);\r
+ smalltext_out16(g_menuscreen_w - 6 * me_sfont_h,\r
+ g_menuscreen_h - me_mfont_h, "dumped", 0xffff);\r
dumped = 0;\r
}\r
break;\r
- case 1: draw_frame_debug(); break;\r
- case 2: memset(g_screen_ptr, 0, g_screen_width * g_screen_height * 2);\r
- pemu_forced_frame(0);\r
- menu_darken_bg(g_screen_ptr, g_screen_width * g_screen_height, 0);\r
- PDebugShowSpriteStats((unsigned short *)g_screen_ptr + (g_screen_height/2 - 240/2)*g_screen_width +\r
- g_screen_width/2 - 320/2, g_screen_width); break;\r
- case 3: memset(g_screen_ptr, 0, g_screen_width * g_screen_height * 2);\r
- PDebugShowPalette(g_screen_ptr, g_screen_width);\r
- PDebugShowSprite((unsigned short *)g_screen_ptr + g_screen_width*120 + g_screen_width/2 + 16,\r
- g_screen_width, spr_offs);\r
+ case 1: draw_frame_debug();\r
+ break;\r
+ case 2: memset(g_menuscreen_ptr, 0, g_menuscreen_w * g_menuscreen_h * 2);\r
+ pemu_forced_frame(0, 1);\r
+ menu_darken_bg(g_menuscreen_ptr, g_menuscreen_ptr, g_menuscreen_w * g_menuscreen_h, 0);\r
+ PDebugShowSpriteStats((unsigned short *)g_menuscreen_ptr + (g_menuscreen_h/2 - 240/2)*g_menuscreen_w +\r
+ g_menuscreen_w/2 - 320/2, g_menuscreen_w);\r
+ break;\r
+ case 3: memset(g_menuscreen_ptr, 0, g_menuscreen_w * g_menuscreen_h * 2);\r
+ PDebugShowPalette(g_menuscreen_ptr, g_menuscreen_w);\r
+ PDebugShowSprite((unsigned short *)g_menuscreen_ptr + g_menuscreen_w*120 + g_menuscreen_w/2 + 16,\r
+ g_menuscreen_w, spr_offs);\r
draw_text_debug(PDebugSpriteList(), spr_offs, 6);\r
break;\r
case 4: plat_video_menu_begin();\r
mee_handler_id("Load State", MA_MAIN_LOAD_STATE, main_menu_handler),\r
mee_handler_id("Reset game", MA_MAIN_RESET_GAME, main_menu_handler),\r
mee_handler_id("Load new ROM/ISO", MA_MAIN_LOAD_ROM, main_menu_handler),\r
- mee_handler_id("Change options", MA_MAIN_OPTIONS, menu_loop_options),\r
- mee_handler_id("Configure controls", MA_MAIN_OPTIONS, menu_loop_keyconfig),\r
+ mee_handler ("Change options", menu_loop_options),\r
+ mee_handler ("Configure controls", menu_loop_keyconfig),\r
mee_handler_id("Credits", MA_MAIN_CREDITS, main_menu_handler),\r
mee_handler_id("Patches / GameGenie",MA_MAIN_PATCHES, main_menu_handler),\r
mee_handler_id("Exit", MA_MAIN_EXIT, main_menu_handler),\r
me_enable(e_menu_main, MA_MAIN_RESET_GAME, rom_loaded);\r
me_enable(e_menu_main, MA_MAIN_PATCHES, PicoPatches != NULL);\r
\r
- plat_video_menu_enter(rom_loaded);\r
+ menu_enter(rom_loaded);\r
in_set_blocking(1);\r
me_loop(e_menu_main, &sel, menu_main_plat_draw);\r
\r
{\r
int ret = 1, sel = 0;\r
\r
- plat_video_menu_enter(rom_loaded);\r
+ menu_enter(rom_loaded);\r
\r
in_set_blocking(1);\r
me_loop(e_menu_tray, &sel, NULL);\r
\r
// ------------ util ------------\r
\r
-/* GP2X/wiz for now, probably extend later */\r
-void menu_plat_setup(int is_wiz)\r
-{\r
- int i;\r
-\r
- if (!is_wiz) {\r
- me_enable(e_menu_gfx_options, MA_OPT_TEARING_FIX, 0);\r
- i = me_id2offset(e_menu_gfx_options, MA_OPT_TEARING_FIX);\r
- e_menu_gfx_options[i].need_to_save = 0;\r
- return;\r
- }\r
-\r
- me_enable(e_menu_adv_options, MA_OPT_ARM940_SOUND, 0);\r
- me_enable(e_menu_gfx_options, MA_OPT2_GAMMA, 0);\r
- me_enable(e_menu_gfx_options, MA_OPT2_A_SN_GAMMA, 0);\r
-\r
- i = me_id2offset(e_menu_gfx_options, MA_OPT_SCALING);\r
- e_menu_gfx_options[i].max = 1; /* only off and sw */\r
- i = me_id2offset(e_menu_gfx_options, MA_OPT_ARM940_SOUND);\r
- e_menu_gfx_options[i].need_to_save = 0;\r
-}\r
-\r
-/* TODO: rename */\r
-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
/* hidden options for config engine only */\r
static menu_entry e_menu_hidden[] =\r
{\r
e_menu_gfx_options,\r
e_menu_adv_options,\r
e_menu_cd_options,\r
+#ifndef NO_32X\r
e_menu_32x_options,\r
+#endif\r
e_menu_keyconfig,\r
e_menu_hidden,\r
};\r
notaz.gp2x.de / libpicofe.git / blobdiff