add per game configs (by popular demand, no controls yet though)
[pcsx_rearmed.git] / frontend / menu.c
index 4291ac5..bb2a893 100644 (file)
 
 #include <stdio.h>
 #include <string.h>
+#include <errno.h>
 
+#include "menu.h"
 #include "config.h"
 #include "plugin_lib.h"
 #include "omap.h"
 #include "common/plat.h"
+#include "../gui/Linux.h"
 #include "../libpcsxcore/misc.h"
 #include "../libpcsxcore/new_dynarec/new_dynarec.h"
+#include "revision.h"
 
 #define MENU_X2 1
 #define array_size(x) (sizeof(x) / sizeof(x[0]))
@@ -41,13 +45,39 @@ typedef enum
        MA_OPT_SAVECFG,
        MA_OPT_SAVECFG_GAME,
        MA_OPT_CPU_CLOCKS,
+       MA_OPT_FILTERING,
 } menu_id;
 
-extern int ready_to_go;
+enum {
+       SCALE_1_1,
+       SCALE_4_3,
+       SCALE_FULLSCREEN,
+       SCALE_CUSTOM,
+};
 
-static int dummy, state_slot;
+extern int ready_to_go;
+static int game_config_loaded;
+static int last_psx_w, last_psx_h, last_psx_bpp;
+static int scaling, filter, state_slot, cpu_clock;
 static char rom_fname_reload[MAXPATHLEN];
 static char last_selected_fname[MAXPATHLEN];
+int g_opts;
+
+// from softgpu plugin
+extern int iUseDither;
+extern int UseFrameSkip;
+extern uint32_t dwActFixes;
+
+// sound plugin
+extern int iUseReverb;
+extern int iUseInterpolation;
+extern int iXAPitch;
+extern int iSPUIRQWait;
+extern int iUseTimer;
+
+
+static int min(int x, int y) { return x < y ? x : y; }
+static int max(int x, int y) { return x > y ? x : y; }
 
 void emu_make_path(char *buff, const char *end, int size)
 {
@@ -63,27 +93,400 @@ void emu_make_path(char *buff, const char *end, int size)
 
 static int emu_check_save_file(int slot)
 {
-       return 0;
+       char *fname;
+       int ret;
+
+       fname = get_state_filename(slot);
+       if (fname == NULL)
+               return 0;
+
+       ret = CheckState(fname);
+       free(fname);
+       return ret == 0 ? 1 : 0;
 }
 
 static int emu_save_load_game(int load, int sram)
 {
-       return 0;
+       char *fname;
+       int ret;
+
+       fname = get_state_filename(state_slot);
+       if (fname == NULL)
+               return 0;
+
+       if (load)
+               ret = LoadState(fname);
+       else
+               ret = SaveState(fname);
+       free(fname);
+
+       return ret;
+}
+
+static void draw_savestate_bg(int slot)
+{
+}
+
+static void menu_set_defconfig(void)
+{
+       scaling = SCALE_4_3;
+
+       Config.Xa = Config.Cdda = Config.Sio =
+       Config.SpuIrq = Config.RCntFix = Config.VSyncWA = 0;
+
+       iUseDither = UseFrameSkip = 0;
+       dwActFixes = 1<<7;
+
+       iUseReverb = 2;
+       iUseInterpolation = 1;
+       iXAPitch = iSPUIRQWait = 0;
+       iUseTimer = 2;
 }
 
-static int emu_write_config(int is_game)
+#define CE_CONFIG_STR(val) \
+       { #val, 0, Config.val }
+
+#define CE_CONFIG_VAL(val) \
+       { #val, sizeof(Config.val), &Config.val }
+
+#define CE_STR(val) \
+       { #val, 0, val }
+
+#define CE_INTVAL(val) \
+       { #val, sizeof(val), &val }
+
+static const struct {
+       const char *name;
+       size_t len;
+       void *val;
+} config_data[] = {
+       CE_CONFIG_STR(Bios),
+       CE_CONFIG_STR(Gpu),
+       CE_CONFIG_STR(Spu),
+       CE_CONFIG_STR(Cdr),
+       CE_CONFIG_VAL(Xa),
+       CE_CONFIG_VAL(Sio),
+       CE_CONFIG_VAL(Mdec),
+       CE_CONFIG_VAL(PsxAuto),
+       CE_CONFIG_VAL(Cdda),
+       CE_CONFIG_VAL(Debug),
+       CE_CONFIG_VAL(PsxOut),
+       CE_CONFIG_VAL(SpuIrq),
+       CE_CONFIG_VAL(RCntFix),
+       CE_CONFIG_VAL(VSyncWA),
+       CE_CONFIG_VAL(Cpu),
+       CE_CONFIG_VAL(PsxType),
+       CE_INTVAL(scaling),
+       CE_INTVAL(g_layer_x),
+       CE_INTVAL(g_layer_y),
+       CE_INTVAL(g_layer_w),
+       CE_INTVAL(g_layer_h),
+       CE_INTVAL(filter),
+       CE_INTVAL(state_slot),
+       CE_INTVAL(cpu_clock),
+       CE_INTVAL(g_opts),
+       CE_INTVAL(iUseDither),
+       CE_INTVAL(UseFrameSkip),
+       CE_INTVAL(dwActFixes),
+       CE_INTVAL(iUseReverb),
+       CE_INTVAL(iUseInterpolation),
+       CE_INTVAL(iXAPitch),
+       CE_INTVAL(iSPUIRQWait),
+       CE_INTVAL(iUseTimer),
+};
+
+static void make_cfg_fname(char *buf, size_t size, int is_game)
 {
+       char trimlabel[33];
+       int j;
+
+       strncpy(trimlabel, CdromLabel, 32);
+       trimlabel[32] = 0;
+       for (j = 31; j >= 0; j--)
+               if (trimlabel[j] == ' ')
+                       trimlabel[j] = 0;
+
+       if (is_game)
+               snprintf(cfgfile, sizeof(cfgfile), "." PCSX_DOT_DIR "cfg/%.32s-%.9s.cfg", trimlabel, CdromId);
+       else
+               snprintf(cfgfile, sizeof(cfgfile), "." PCSX_DOT_DIR "%s", cfgfile_basename);
+}
+
+static int menu_write_config(int is_game)
+{
+       char cfgfile[MAXPATHLEN];
+       FILE *f;
+       int i;
+
+       make_cfg_fname(cfgfile, sizeof(cfgfile), is_game);
+       f = fopen(cfgfile, "w");
+       if (f == NULL) {
+               printf("failed to open: %s\n", cfgfile);
+               return -1;
+       }
+
+       for (i = 0; i < ARRAY_SIZE(config_data); i++) {
+               fprintf(f, "%s = ", config_data[i].name);
+               switch (config_data[i].len) {
+               case 0:
+                       fprintf(f, "%s\n", (char *)config_data[i].val);
+                       break;
+               case 1:
+                       fprintf(f, "%x\n", *(u8 *)config_data[i].val);
+                       break;
+               case 2:
+                       fprintf(f, "%x\n", *(u16 *)config_data[i].val);
+                       break;
+               case 4:
+                       fprintf(f, "%x\n", *(u32 *)config_data[i].val);
+                       break;
+               default:
+                       printf("menu_write_config: unhandled len %d for %s\n",
+                                config_data[i].len, config_data[i].name);
+                       break;
+               }
+       }
+
+       if (!is_game)
+               fprintf(f, "lastcdimg = %s\n", last_selected_fname);
+
+       fclose(f);
        return 0;
 }
 
-static void emu_set_defconfig(void)
+static void parse_str_val(char *cval, const char *src)
+{
+       char *tmp;
+       strncpy(cval, src, MAXPATHLEN);
+       cval[MAXPATHLEN - 1] = 0;
+       tmp = strchr(cval, '\n');
+       if (tmp == NULL)
+               tmp = strchr(cval, '\r');
+       if (tmp != NULL)
+               *tmp = 0;
+}
+
+static int menu_load_config(int is_game)
+{
+       char cfgfile[MAXPATHLEN];
+       int i, ret = -1;
+       long size;
+       char *cfg;
+       FILE *f;
+
+       make_cfg_fname(cfgfile, sizeof(cfgfile), is_game);
+       f = fopen(cfgfile, "r");
+       if (f == NULL) {
+               printf("failed to open: %s\n", cfgfile);
+               return -1;
+       }
+
+       fseek(f, 0, SEEK_END);
+       size = ftell(f);
+       if (size <= 0) {
+               printf("bad size %ld: %s\n", size, cfgfile);
+               goto fail;
+       }
+
+       cfg = malloc(size + 1);
+       if (cfg == NULL)
+               goto fail;
+
+       fseek(f, 0, SEEK_SET);
+       if (fread(cfg, 1, size, f) != size) {
+               printf("failed to read: %s\n", cfgfile);
+               goto fail_read;
+       }
+       cfg[size] = 0;
+
+       for (i = 0; i < ARRAY_SIZE(config_data); i++) {
+               char *tmp, *tmp2;
+               u32 val;
+
+               tmp = strstr(cfg, config_data[i].name);
+               if (tmp == NULL)
+                       continue;
+               tmp += strlen(config_data[i].name);
+               if (strncmp(tmp, " = ", 3) != 0)
+                       continue;
+               tmp += 3;
+
+               if (config_data[i].len == 0) {
+                       parse_str_val(config_data[i].val, tmp);
+                       continue;
+               }
+
+               tmp2 = NULL;
+               val = strtoul(tmp, &tmp2, 16);
+               if (tmp2 == NULL || tmp == tmp2)
+                       continue; // parse failed
+
+               switch (config_data[i].len) {
+               case 1:
+                       *(u8 *)config_data[i].val = val;
+                       break;
+               case 2:
+                       *(u16 *)config_data[i].val = val;
+                       break;
+               case 4:
+                       *(u32 *)config_data[i].val = val;
+                       break;
+               default:
+                       printf("menu_load_config: unhandled len %d for %s\n",
+                                config_data[i].len, config_data[i].name);
+                       break;
+               }
+       }
+
+       if (!is_game) {
+               char *tmp = strstr(cfg, "lastcdimg = ");
+               if (tmp != NULL) {
+                       tmp += 12;
+                       parse_str_val(last_selected_fname, tmp);
+               }
+       }
+
+fail_read:
+       free(cfg);
+fail:
+       fclose(f);
+       return ret;
+}
+
+// rrrr rggg gggb bbbb
+static unsigned short fname2color(const char *fname)
 {
+       static const char *cdimg_exts[] = { ".bin", ".img", ".iso", ".z", ".cue" };
+       static const char *other_exts[] = { ".ccd", ".toc", ".mds", ".sub", ".table" };
+       const char *ext = strrchr(fname, '.');
+       int i;
+
+       if (ext == NULL)
+               return 0xffff;
+       for (i = 0; i < array_size(cdimg_exts); i++)
+               if (strcasecmp(ext, cdimg_exts[i]) == 0)
+                       return 0x7bff;
+       for (i = 0; i < array_size(other_exts); i++)
+               if (strcasecmp(ext, other_exts[i]) == 0)
+                       return 0xa514;
+       return 0xffff;
 }
 
+#define MENU_ALIGN_LEFT
+#define menu_init menu_init_common
 #include "common/menu.c"
+#undef menu_init
 
-static void draw_savestate_bg(int slot)
+// ---------- pandora specific -----------
+
+static const char pnd_script_base[] = "sudo -n /usr/pandora/scripts";
+static char **pnd_filter_list;
+
+static int get_cpu_clock(void)
+{
+       FILE *f;
+       int ret = 0;
+       f = fopen("/proc/pandora/cpu_mhz_max", "r");
+       if (f) {
+               fscanf(f, "%d", &ret);
+               fclose(f);
+       }
+       return ret;
+}
+
+static void apply_cpu_clock(void)
+{
+       char buf[128];
+
+       if (cpu_clock != 0 && cpu_clock != get_cpu_clock()) {
+               snprintf(buf, sizeof(buf), "unset DISPLAY; echo y | %s/op_cpuspeed.sh %d",
+                        pnd_script_base, cpu_clock);
+               system(buf);
+       }
+}
+
+static void apply_filter(int which)
 {
+       static int old = -1;
+       char buf[128];
+       int i;
+
+       if (pnd_filter_list == NULL || which == old)
+               return;
+
+       for (i = 0; i < which; i++)
+               if (pnd_filter_list[i] == NULL)
+                       return;
+
+       if (pnd_filter_list[i] == NULL)
+               return;
+
+       snprintf(buf, sizeof(buf), "%s/op_videofir.sh %s", pnd_script_base, pnd_filter_list[i]);
+       system(buf);
+       old = which;
+}
+
+static menu_entry e_menu_gfx_options[];
+
+static void pnd_menu_init(void)
+{
+       struct dirent *ent;
+       int i, count = 0;
+       char **mfilters;
+       char buff[64], *p;
+       DIR *dir;
+
+       cpu_clock = get_cpu_clock();
+
+       dir = opendir("/etc/pandora/conf/dss_fir");
+       if (dir == NULL) {
+               perror("filter opendir");
+               return;
+       }
+
+       while (1) {
+               errno = 0;
+               ent = readdir(dir);
+               if (ent == NULL) {
+                       if (errno != 0)
+                               perror("readdir");
+                       break;
+               }
+               p = strstr(ent->d_name, "_up");
+               if (p != NULL && (p[3] == 0 || !strcmp(p + 3, "_h")))
+                       count++;
+       }
+
+       if (count == 0)
+               return;
+
+       mfilters = calloc(count + 1, sizeof(mfilters[0]));
+       if (mfilters == NULL)
+               return;
+
+       rewinddir(dir);
+       for (i = 0; (ent = readdir(dir)); ) {
+               size_t len;
+
+               p = strstr(ent->d_name, "_up");
+               if (p == NULL || (p[3] != 0 && strcmp(p + 3, "_h")))
+                       continue;
+
+               len = p - ent->d_name;
+               if (len > sizeof(buff) - 1)
+                       continue;
+
+               strncpy(buff, ent->d_name, len);
+               buff[len] = 0;
+               mfilters[i] = strdup(buff);
+               if (mfilters[i] != NULL)
+                       i++;
+       }
+       closedir(dir);
+
+       i = me_id2offset(e_menu_gfx_options, MA_OPT_FILTERING);
+       e_menu_gfx_options[i].data = (void *)mfilters;
+       pnd_filter_list = mfilters;
 }
 
 // -------------- key config --------------
@@ -95,7 +498,7 @@ me_bind_action me_ctrl_actions[] =
        { "LEFT    ", 1 << DKEY_LEFT },
        { "RIGHT   ", 1 << DKEY_RIGHT },
        { "TRIANGLE", 1 << DKEY_TRIANGLE },
-       { "CIRCLE  ", 1 << DKEY_SQUARE },
+       { "CIRCLE  ", 1 << DKEY_CIRCLE },
        { "CROSS   ", 1 << DKEY_CROSS },
        { "SQUARE  ", 1 << DKEY_SQUARE },
        { "L1      ", 1 << DKEY_L1 },
@@ -109,10 +512,12 @@ me_bind_action me_ctrl_actions[] =
 
 me_bind_action emuctrl_actions[] =
 {
+/*
        { "Load State       ", PEV_STATE_LOAD },
        { "Save State       ", PEV_STATE_SAVE },
        { "Prev Save Slot   ", PEV_SSLOT_PREV },
        { "Next Save Slot   ", PEV_SSLOT_NEXT },
+*/
        { "Enter Menu       ", PEV_MENU },
        { NULL,                0 }
 };
@@ -158,19 +563,12 @@ static const char *mgn_saveloadcfg(int id, int *offs)
        return "";
 }
 
-static int mh_saveloadcfg(int id, int keys)
+static int mh_savecfg(int id, int keys)
 {
-       switch (id) {
-       case MA_OPT_SAVECFG:
-       case MA_OPT_SAVECFG_GAME:
-               if (emu_write_config(id == MA_OPT_SAVECFG_GAME ? 1 : 0))
-                       me_update_msg("config saved");
-               else
-                       me_update_msg("failed to write config");
-               break;
-       default:
-               return 0;
-       }
+       if (menu_write_config(id == MA_OPT_SAVECFG_GAME ? 1 : 0) == 0)
+               me_update_msg("config saved");
+       else
+               me_update_msg("failed to write config");
 
        return 1;
 }
@@ -180,8 +578,8 @@ static menu_entry e_menu_keyconfig[] =
        mee_handler_id("Player 1",          MA_CTRL_PLAYER1,    key_config_loop_wrap),
        mee_handler_id("Player 2",          MA_CTRL_PLAYER2,    key_config_loop_wrap),
        mee_handler_id("Emulator controls", MA_CTRL_EMU,        key_config_loop_wrap),
-       mee_cust_nosave("Save global config",       MA_OPT_SAVECFG, mh_saveloadcfg, mgn_saveloadcfg),
-       mee_cust_nosave("Save cfg for loaded game", MA_OPT_SAVECFG_GAME, mh_saveloadcfg, mgn_saveloadcfg),
+//     mee_cust_nosave("Save global config",       MA_OPT_SAVECFG, mh_savecfg, mgn_saveloadcfg),
+//     mee_cust_nosave("Save cfg for loaded game", MA_OPT_SAVECFG_GAME, mh_savecfg, mgn_saveloadcfg),
        mee_label     (""),
        mee_label     ("Input devices:"),
        mee_label_mk  (MA_CTRL_DEV_FIRST, mgn_dev_name),
@@ -198,67 +596,222 @@ static int menu_loop_keyconfig(int id, int keys)
 {
        static int sel = 0;
 
-       me_enable(e_menu_keyconfig, MA_OPT_SAVECFG_GAME, ready_to_go);
+//     me_enable(e_menu_keyconfig, MA_OPT_SAVECFG_GAME, ready_to_go);
        me_loop(e_menu_keyconfig, &sel, NULL);
        return 0;
 }
 
-// ------------ adv options menu ------------
+// ------------ gfx options menu ------------
 
-static menu_entry e_menu_adv_options[] =
+static const char *men_scaler[] = { "1x1", "scaled 4:3", "fullscreen", "custom", NULL };
+static const char h_cscaler[]   = "Displays the scaler layer, you can resize it\n"
+                                 "using d-pad or move it using R+d-pad";
+static const char *men_dummy[] = { NULL };
+
+static int menu_loop_cscaler(int id, int keys)
 {
-       mee_onoff     ("captain placeholder", 0, dummy, 1),
+       unsigned int inp;
+
+       scaling = SCALE_CUSTOM;
+
+       omap_enable_layer(1);
+       //pnd_restore_layer_data();
+
+       for (;;)
+       {
+               menu_draw_begin(0);
+               memset(g_menuscreen_ptr, 0, g_menuscreen_w * g_menuscreen_h * 2);
+               text_out16(2, 480 - 18, "%dx%d | d-pad to resize, R+d-pad to move", g_layer_w, g_layer_h);
+               menu_draw_end();
+
+               inp = in_menu_wait(PBTN_UP|PBTN_DOWN|PBTN_LEFT|PBTN_RIGHT|PBTN_R|PBTN_MOK|PBTN_MBACK, 40);
+               if (inp & PBTN_UP)    g_layer_y--;
+               if (inp & PBTN_DOWN)  g_layer_y++;
+               if (inp & PBTN_LEFT)  g_layer_x--;
+               if (inp & PBTN_RIGHT) g_layer_x++;
+               if (!(inp & PBTN_R)) {
+                       if (inp & PBTN_UP)    g_layer_h += 2;
+                       if (inp & PBTN_DOWN)  g_layer_h -= 2;
+                       if (inp & PBTN_LEFT)  g_layer_w += 2;
+                       if (inp & PBTN_RIGHT) g_layer_w -= 2;
+               }
+               if (inp & (PBTN_MOK|PBTN_MBACK))
+                       break;
+
+               if (inp & (PBTN_UP|PBTN_DOWN|PBTN_LEFT|PBTN_RIGHT)) {
+                       if (g_layer_x < 0)   g_layer_x = 0;
+                       if (g_layer_x > 640) g_layer_x = 640;
+                       if (g_layer_y < 0)   g_layer_y = 0;
+                       if (g_layer_y > 420) g_layer_y = 420;
+                       if (g_layer_w < 160) g_layer_w = 160;
+                       if (g_layer_h < 60)  g_layer_h = 60;
+                       if (g_layer_x + g_layer_w > 800)
+                               g_layer_w = 800 - g_layer_x;
+                       if (g_layer_y + g_layer_h > 480)
+                               g_layer_h = 480 - g_layer_y;
+                       omap_enable_layer(1);
+               }
+       }
+
+       omap_enable_layer(0);
+
+       return 0;
+}
+
+static menu_entry e_menu_gfx_options[] =
+{
+       mee_enum      ("Scaler",                   0, scaling, men_scaler),
+       mee_enum      ("Filter",                   MA_OPT_FILTERING, filter, men_dummy),
+//     mee_onoff     ("Vsync",                    0, vsync, 1),
+       mee_cust_h    ("Setup custom scaler",      0, menu_loop_cscaler, NULL, h_cscaler),
        mee_end,
 };
 
-static int menu_loop_adv_options(int id, int keys)
+static int menu_loop_gfx_options(int id, int keys)
 {
        static int sel = 0;
-       me_loop(e_menu_adv_options, &sel, NULL);
+
+       me_loop(e_menu_gfx_options, &sel, NULL);
+
        return 0;
 }
 
-// ------------ gfx options menu ------------
+// ------------ bios/plugins ------------
+
+static const char *men_gpu_dithering[] = { "None", "Game dependant", "Always", NULL };
+static const char h_gpu[]              = "Configure built-in P.E.Op.S. SoftGL Driver V1.17\n"
+                                        "Coded by Pete Bernert and the P.E.Op.S. team";
+static const char h_gpu_0[]            = "Needed for Chrono Cross";
+static const char h_gpu_1[]            = "Capcom fighting games";
+static const char h_gpu_2[]            = "Black screens in Lunar";
+static const char h_gpu_3[]            = "Compatibility mode";
+static const char h_gpu_6[]            = "Pandemonium 2";
+static const char h_gpu_7[]            = "Skip every second frame";
+static const char h_gpu_8[]            = "Needed by Dark Forces";
+static const char h_gpu_9[]            = "better g-colors, worse textures";
+static const char h_gpu_10[]           = "Toggle busy flags after drawing";
+
+static menu_entry e_menu_plugin_gpu[] =
+{
+       mee_enum      ("Dithering",                  0, iUseDither, men_gpu_dithering),
+       mee_onoff_h   ("Odd/even bit hack",          0, dwActFixes, 1<<0, h_gpu_0),
+       mee_onoff_h   ("Expand screen width",        0, dwActFixes, 1<<1, h_gpu_1),
+       mee_onoff_h   ("Ignore brightness color",    0, dwActFixes, 1<<2, h_gpu_2),
+       mee_onoff_h   ("Disable coordinate check",   0, dwActFixes, 1<<3, h_gpu_3),
+       mee_onoff_h   ("Lazy screen update",         0, dwActFixes, 1<<6, h_gpu_6),
+       mee_onoff_h   ("Old frame skipping",         0, dwActFixes, 1<<7, h_gpu_7),
+       mee_onoff_h   ("Repeated flat tex triangles ",0,dwActFixes, 1<<8, h_gpu_8),
+       mee_onoff_h   ("Draw quads with triangles",  0, dwActFixes, 1<<9, h_gpu_9),
+       mee_onoff_h   ("Fake 'gpu busy' states",     0, dwActFixes, 1<<10, h_gpu_10),
+       mee_end,
+};
 
-static menu_entry e_menu_gfx_options[] =
+static int menu_loop_plugin_gpu(int id, int keys)
+{
+       static int sel = 0;
+       me_loop(e_menu_plugin_gpu, &sel, NULL);
+       return 0;
+}
+
+static const char *men_spu_reverb[] = { "Off", "Fake", "On", NULL };
+static const char *men_spu_interp[] = { "None", "Simple", "Gaussian", "Cubic", NULL };
+static const char h_spu[]           = "Configure built-in P.E.Op.S. Sound Driver V1.7\n"
+                                     "Coded by Pete Bernert and the P.E.Op.S. team";
+static const char h_spu_irq_wait[]  = "Wait for CPU; only useful for some games, may cause glitches";
+static const char h_spu_thread[]    = "Run sound emulation in separate thread";
+
+static menu_entry e_menu_plugin_spu[] =
 {
+       mee_enum      ("Reverb",                    0, iUseReverb, men_spu_reverb),
+       mee_enum      ("Interpolation",             0, iUseInterpolation, men_spu_interp),
+       mee_onoff     ("Adjust XA pitch",           0, iXAPitch, 1),
+       mee_onoff_h   ("SPU IRQ Wait",              0, iSPUIRQWait, 1, h_spu_irq_wait),
+       mee_onoff_h   ("Use sound thread",          0, iUseTimer, 1, h_spu_thread),
        mee_end,
 };
 
-static int menu_loop_gfx_options(int id, int keys)
+static int menu_loop_plugin_spu(int id, int keys)
 {
        static int sel = 0;
+       me_loop(e_menu_plugin_spu, &sel, NULL);
+       return 0;
+}
 
-       me_loop(e_menu_gfx_options, &sel, NULL);
+static menu_entry e_menu_plugin_options[] =
+{
+       mee_handler_h ("Configure built-in GPU plugin", menu_loop_plugin_gpu, h_gpu),
+       mee_handler_h ("Configure built-in SPU plugin", menu_loop_plugin_spu, h_spu),
+       mee_end,
+};
 
+static int menu_loop_plugin_options(int id, int keys)
+{
+       static int sel = 0;
+       me_loop(e_menu_plugin_options, &sel, NULL);
        return 0;
 }
 
-// ------------ options menu ------------
+// ------------ adv options menu ------------
+
+static const char h_cfg_xa[]     = "Disables XA sound, which can sometimes improve performance";
+static const char h_cfg_cdda[]   = "Disable CD Audio for a performance boost\n"
+                                  "(proper .cue/.bin dump is needed otherwise)";
+static const char h_cfg_sio[]    = "This should be enabled for certain memcards/gamepads";
+static const char h_cfg_spuirq[] = "Compatibility tweak; should probably be left off";
+static const char h_cfg_rcnt1[]  = "Parasite Eve 2, Vandal Hearts 1/2 Fix";
+static const char h_cfg_rcnt2[]  = "InuYasha Sengoku Battle Fix";
+
+static menu_entry e_menu_adv_options[] =
+{
+       mee_onoff     ("Show CPU load",          0, g_opts, OPT_SHOWCPU),
+       mee_onoff_h   ("Disable XA Decoding",    0, Config.Xa, 1, h_cfg_xa),
+       mee_onoff_h   ("Disable CD Audio",       0, Config.Cdda, 1, h_cfg_cdda),
+       mee_onoff_h   ("SIO IRQ Always Enabled", 0, Config.Sio, 1, h_cfg_sio),
+       mee_onoff_h   ("SPU IRQ Always Enabled", 0, Config.SpuIrq, 1, h_cfg_spuirq),
+       mee_onoff_h   ("Rootcounter hack",       0, Config.RCntFix, 1, h_cfg_rcnt1),
+       mee_onoff_h   ("Rootcounter hack 2",     0, Config.VSyncWA, 1, h_cfg_rcnt2),
+       mee_end,
+};
+
+static int menu_loop_adv_options(int id, int keys)
+{
+       static int sel = 0;
+       me_loop(e_menu_adv_options, &sel, NULL);
+       return 0;
+}
 
-static menu_entry e_menu_options[];
+// ------------ options menu ------------
 
 static int mh_restore_defaults(int id, int keys)
 {
-       emu_set_defconfig();
+       menu_set_defconfig();
        me_update_msg("defaults restored");
        return 1;
 }
 
+static const char *men_region[]       = { "NTSC", "PAL", NULL };
+/*
 static const char *men_confirm_save[] = { "OFF", "writes", "loads", "both", NULL };
 static const char h_confirm_save[]    = "Ask for confirmation when overwriting save,\n"
                                        "loading state or both";
+*/
+static const char h_restore_def[]     = "Switches back to default / recommended\n"
+                                       "configuration";
 
 static menu_entry e_menu_options[] =
 {
-       mee_range     ("Save slot",                0, state_slot, 0, 9),
-       mee_enum_h    ("Confirm savestate",        0, dummy, men_confirm_save, h_confirm_save),
-       mee_range     ("",                         MA_OPT_CPU_CLOCKS, dummy, 20, 5000),
+//     mee_range     ("Save slot",                0, state_slot, 0, 9),
+//     mee_enum_h    ("Confirm savestate",        0, dummy, men_confirm_save, h_confirm_save),
+       mee_onoff     ("Frameskip",                0, UseFrameSkip, 1),
+       mee_onoff     ("Show FPS",                 0, g_opts, OPT_SHOWFPS),
+       mee_enum      ("Region",                   0, Config.PsxType, men_region),
+       mee_range     ("CPU clock",                MA_OPT_CPU_CLOCKS, cpu_clock, 20, 5000),
        mee_handler   ("[Display]",                menu_loop_gfx_options),
+       mee_handler   ("[BIOS/Plugins]",           menu_loop_plugin_options),
        mee_handler   ("[Advanced]",               menu_loop_adv_options),
-       mee_cust_nosave("Save global config",      MA_OPT_SAVECFG,      mh_saveloadcfg, mgn_saveloadcfg),
-       mee_cust_nosave("Save cfg for loaded game",MA_OPT_SAVECFG_GAME, mh_saveloadcfg, mgn_saveloadcfg),
-       mee_handler   ("Restore defaults",         mh_restore_defaults),
+       mee_cust_nosave("Save global config",      MA_OPT_SAVECFG,      mh_savecfg, mgn_saveloadcfg),
+       mee_cust_nosave("Save cfg for loaded game",MA_OPT_SAVECFG_GAME, mh_savecfg, mgn_saveloadcfg),
+       mee_handler_h ("Restore default config",   mh_restore_defaults, h_restore_def),
        mee_end,
 };
 
@@ -268,7 +821,7 @@ static int menu_loop_options(int id, int keys)
        int i;
 
        i = me_id2offset(e_menu_options, MA_OPT_CPU_CLOCKS);
-       e_menu_options[i].enabled = e_menu_options[i].name[0] ? 1 : 0;
+       e_menu_options[i].enabled = cpu_clock != 0 ? 1 : 0;
        me_enable(e_menu_options, MA_OPT_SAVECFG_GAME, ready_to_go);
 
        me_loop(e_menu_options, &sel, NULL);
@@ -278,15 +831,9 @@ static int menu_loop_options(int id, int keys)
 
 // ------------ debug menu ------------
 
-#ifdef __GNUC__
-#define COMPILER "gcc " __VERSION__
-#else
-#define COMPILER
-#endif
-
 static void draw_frame_debug(void)
 {
-       smalltext_out16(4, 1, "build: "__DATE__ " " __TIME__ " " COMPILER, 0xffff);
+       smalltext_out16(4, 1, "build: "__DATE__ " " __TIME__ " " REV, 0xe7fc);
 }
 
 static void debug_menu_loop(void)
@@ -308,20 +855,24 @@ static void debug_menu_loop(void)
 
 // ------------ main menu ------------
 
+void OnFile_Exit();
+
 const char *plat_get_credits(void)
 {
-       return  "(C) 1999-2003 PCSX Team\n"
+       return  "PCSX-ReARMed\n\n"
+               "(C) 1999-2003 PCSX Team\n"
                "(C) 2005-2009 PCSX-df Team\n"
                "(C) 2009-2010 PCSX-Reloaded Team\n\n"
                "GPU and SPU code by Pete Bernert\n"
                "  and the P.E.Op.S. team\n"
-               "ARM recompiler by Ari64\n\n"
+               "ARM recompiler (C) 2009-2010 Ari64\n\n"
                "integration, optimization and\n"
-               "  frontend by (C) notaz, 2010\n";
+               "  frontend (C) 2010 notaz\n";
 }
 
 static char *romsel_run(void)
 {
+       extern void set_cd_image(const char *fname);
        char *ret;
 
        ret = menu_loop_romsel(last_selected_fname, sizeof(last_selected_fname));
@@ -331,7 +882,7 @@ static char *romsel_run(void)
        lprintf("selected file: %s\n", ret);
        ready_to_go = 0;
 
-       SetIsoFile(ret);
+       set_cd_image(ret);
        LoadPlugins();
        NetOpened = 0;
        if (OpenPlugins() == -1) {
@@ -355,6 +906,8 @@ static char *romsel_run(void)
                return NULL;
        }
 
+       strcpy(last_selected_fname, rom_fname_reload);
+       game_config_loaded = 0;
        ready_to_go = 1;
        return ret;
 }
@@ -366,6 +919,8 @@ static int main_menu_handler(int id, int keys)
        switch (id)
        {
        case MA_MAIN_RESUME_GAME:
+               if (ready_to_go)
+                       return 1;
                break;
        case MA_MAIN_SAVE_STATE:
                if (ready_to_go)
@@ -376,6 +931,14 @@ static int main_menu_handler(int id, int keys)
                        return menu_loop_savestate(1);
                break;
        case MA_MAIN_RESET_GAME:
+               if (ready_to_go) {
+                       OpenPlugins();
+                       SysReset();
+                       if (CheckCdrom() != -1) {
+                               LoadCdrom();
+                       }
+                       return 1;
+               }
                break;
        case MA_MAIN_LOAD_ROM:
                ret_name = romsel_run();
@@ -383,11 +946,12 @@ static int main_menu_handler(int id, int keys)
                        return 1;
                break;
        case MA_MAIN_CREDITS:
-               draw_menu_credits();
+               draw_menu_credits(draw_frame_debug);
                in_menu_wait(PBTN_MOK|PBTN_MBACK, 70);
                break;
        case MA_MAIN_EXIT:
-               exit(1); // FIXME
+               OnFile_Exit();
+               break;
        default:
                lprintf("%s: something unknown selected\n", __FUNCTION__);
                break;
@@ -412,19 +976,22 @@ static menu_entry e_menu_main[] =
        mee_end,
 };
 
+// ----------------------------
+
+static void menu_leave_emu(void);
+
 void menu_loop(void)
 {
        static int sel = 0;
 
-       omap_enable_layer(0);
+       menu_leave_emu();
 
        me_enable(e_menu_main, MA_MAIN_RESUME_GAME, ready_to_go);
        me_enable(e_menu_main, MA_MAIN_SAVE_STATE,  ready_to_go);
        me_enable(e_menu_main, MA_MAIN_LOAD_STATE,  ready_to_go);
        me_enable(e_menu_main, MA_MAIN_RESET_GAME,  ready_to_go);
 
-strcpy(last_selected_fname, "/mnt/ntz/stuff/psx");
-       menu_enter(ready_to_go);
+//     menu_enter(ready_to_go);
        in_set_config_int(0, IN_CFG_BLOCKING, 1);
 
        do {
@@ -439,8 +1006,103 @@ strcpy(last_selected_fname, "/mnt/ntz/stuff/psx");
 
        memset(g_menuscreen_ptr, 0, g_menuscreen_w * g_menuscreen_h * 2);
        menu_draw_end();
-       omap_enable_layer(1);
+       menu_prepare_emu();
+}
+
+void menu_init(void)
+{
+       char buff[MAXPATHLEN];
+
+       strcpy(last_selected_fname, "/media");
+
+       pnd_menu_init();
+       menu_init_common();
+
+       menu_set_defconfig();
+       menu_load_config(0);
+       last_psx_w = 320;
+       last_psx_h = 240;
+       last_psx_bpp = 16;
+
+       g_menubg_src_ptr = calloc(g_menuscreen_w * g_menuscreen_h * 2, 1);
+       if (g_menubg_src_ptr == NULL)
+               exit(1);
+       emu_make_path(buff, "skin/background.png", sizeof(buff));
+       readpng(g_menubg_src_ptr, buff, READPNG_BG, g_menuscreen_w, g_menuscreen_h);
+}
+
+void menu_notify_mode_change(int w, int h, int bpp)
+{
+       last_psx_w = w;
+       last_psx_h = h;
+       last_psx_bpp = bpp;
+
+       if (scaling == SCALE_1_1) {
+               g_layer_x = 800/2 - w/2;  g_layer_y = 480/2 - h/2;
+               g_layer_w = w; g_layer_h = h;
+       }
+}
+
+static void menu_leave_emu(void)
+{
+       if (GPU_close != NULL) {
+               int ret = GPU_close();
+               if (ret)
+                       fprintf(stderr, "Warning: GPU_close returned %d\n", ret);
+       }
+
+       memcpy(g_menubg_ptr, g_menubg_src_ptr, g_menuscreen_w * g_menuscreen_h * 2);
+       if (ready_to_go && last_psx_bpp == 16) {
+               int x = max(0, g_menuscreen_w - last_psx_w);
+               int y = max(0, g_menuscreen_h / 2 - last_psx_h / 2);
+               int w = min(g_menuscreen_w, last_psx_w);
+               int h = min(g_menuscreen_h, last_psx_h);
+               u16 *d = (u16 *)g_menubg_ptr + g_menuscreen_w * y + x;
+               u16 *s = pl_fbdev_buf;
+
+               for (; h > 0; h--, d += g_menuscreen_w, s += last_psx_w)
+                       menu_darken_bg(d, s, w, 0);
+       }
+}
+
+void menu_prepare_emu(void)
+{
+       if (!game_config_loaded) {
+               menu_set_defconfig();
+               menu_load_config(1);
+               game_config_loaded = 1;
+       }
+
+       switch (scaling) {
+       case SCALE_1_1:
+               menu_notify_mode_change(last_psx_w, last_psx_h, last_psx_bpp);
+               break;
+       case SCALE_4_3:
+               g_layer_x = 80;  g_layer_y = 0;
+               g_layer_w = 640; g_layer_h = 480;
+               break;
+       case SCALE_FULLSCREEN:
+               g_layer_x = 0;   g_layer_y = 0;
+               g_layer_w = 800; g_layer_h = 480;
+               break;
+       case SCALE_CUSTOM:
+               break;
+       }
+       apply_filter(filter);
+       apply_cpu_clock();
        stop = 0;
+
+       // core doesn't care about Config.Cdda changes,
+       // so handle them manually here
+       if (Config.Cdda)
+               CDR_stop();
+
+       if (GPU_open != NULL) {
+               extern unsigned long gpuDisp;
+               int ret = GPU_open(&gpuDisp, "PCSX", NULL);
+               if (ret)
+                       fprintf(stderr, "Warning: GPU_open returned %d\n", ret);
+       }
 }
 
 void me_update_msg(const char *msg)