frontend: scanline efect and memcard saving

[pcsx_rearmed.git] / frontend / menu.c

diff --git a/frontend/menu.c b/frontend/menu.c
index 65f7b98..cfa3284 100644 (file)
--- a/frontend/menu.c
+++ b/frontend/menu.c
@@ -1,5 +1,5 @@
 /*
 /*

- * (C) Gražvydas "notaz" Ignotas, 2010-2011
+ * (C) Gražvydas "notaz" Ignotas, 2010-2013

  *
  * This work is licensed under the terms of any of these licenses
  * (at your option):
  *
  * This work is licensed under the terms of any of these licenses
  * (at your option):


@@ -8,6 +8,7 @@
  * See the COPYING file in the top-level directory.
  */
 
  * See the COPYING file in the top-level directory.
  */
 

+#define _GNU_SOURCE 1

 #include <stdio.h>
 #include <string.h>
 #include <errno.h>
 #include <stdio.h>
 #include <string.h>
 #include <errno.h>


@@ -16,6 +17,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>

+#include <dirent.h>

 
 #include "main.h"
 #include "menu.h"
 
 #include "main.h"
 #include "menu.h"


@@ -24,16 +26,19 @@
 #include "plugin_lib.h"
 #include "plat.h"
 #include "pcnt.h"
 #include "plugin_lib.h"
 #include "plat.h"
 #include "pcnt.h"

-#include "common/plat.h"
-#include "common/input.h"
-#include "linux/in_evdev.h"
+#include "cspace.h"
+#include "libpicofe/plat.h"
+#include "libpicofe/input.h"
+#include "libpicofe/linux/in_evdev.h"
+#include "libpicofe/plat.h"

 #include "../libpcsxcore/misc.h"
 #include "../libpcsxcore/cdrom.h"
 #include "../libpcsxcore/cdriso.h"
 #include "../libpcsxcore/misc.h"
 #include "../libpcsxcore/cdrom.h"
 #include "../libpcsxcore/cdriso.h"

-#include "../libpcsxcore/psemu_plugin_defs.h"
+#include "../libpcsxcore/cheat.h"

 #include "../libpcsxcore/new_dynarec/new_dynarec.h"
 #include "../libpcsxcore/new_dynarec/new_dynarec.h"

-#include "../plugins/dfinput/main.h"
-#include "../plugins/gpulib/cspace.h"
+#include "../plugins/dfinput/externals.h"
+#include "../plugins/dfsound/spu_config.h"
+#include "psemu_plugin_defs.h"

 #include "revision.h"
 
 #define REARMED_BIRTHDAY_TIME 1293306830       /* 25 Dec 2010 */
 #include "revision.h"
 
 #define REARMED_BIRTHDAY_TIME 1293306830       /* 25 Dec 2010 */


@@ -52,6 +57,8 @@ typedef enum
        MA_MAIN_SWAP_CD_MULTI,
        MA_MAIN_RUN_BIOS,
        MA_MAIN_RUN_EXE,
        MA_MAIN_SWAP_CD_MULTI,
        MA_MAIN_RUN_BIOS,
        MA_MAIN_RUN_EXE,

+       MA_MAIN_LOAD_CHEATS,
+       MA_MAIN_CHEATS,

        MA_MAIN_CONTROLS,
        MA_MAIN_CREDITS,
        MA_MAIN_EXIT,
        MA_MAIN_CONTROLS,
        MA_MAIN_CREDITS,
        MA_MAIN_EXIT,


@@ -69,29 +76,27 @@ typedef enum
        MA_OPT_SAVECFG_GAME,
        MA_OPT_CPU_CLOCKS,
        MA_OPT_DISP_OPTS,
        MA_OPT_SAVECFG_GAME,
        MA_OPT_CPU_CLOCKS,
        MA_OPT_DISP_OPTS,

-       MA_OPT_SCALER,
+       MA_OPT_VARSCALER,
+       MA_OPT_VARSCALER_C,

        MA_OPT_SCALER2,
        MA_OPT_SCALER2,

-       MA_OPT_FILTERING,
-       MA_OPT_SCALER_C,
+       MA_OPT_HWFILTER,
+       MA_OPT_SWFILTER,
+       MA_OPT_GAMMA,
+       MA_OPT_VOUT_MODE,
+       MA_OPT_SCANLINES,
+       MA_OPT_SCANLINE_LEVEL,

 } menu_id;
 
 } menu_id;
 

-enum {
-       SCALE_1_1,
-       SCALE_4_3,
-       SCALE_4_3v2,
-       SCALE_FULLSCREEN,
-       SCALE_CUSTOM,
-};
-
-static int last_psx_w, last_psx_h, last_psx_bpp;
-static int scaling, filter, cpu_clock, cpu_clock_st, volume_boost, frameskip;
-static char rom_fname_reload[MAXPATHLEN];
+static int last_vout_w, last_vout_h, last_vout_bpp;
+static int cpu_clock, cpu_clock_st, volume_boost, frameskip;

 static char last_selected_fname[MAXPATHLEN];
 static char last_selected_fname[MAXPATHLEN];

-static int warned_about_bios, region, in_type_sel1, in_type_sel2;
+static int config_save_counter, region, in_type_sel1, in_type_sel2;

 static int psx_clock;
 static int psx_clock;

-static int memcard1_sel, memcard2_sel;
-int g_opts;
+static int memcard1_sel = -1, memcard2_sel = -1;
+int g_opts, g_scaler, g_gamma = 100;
+int scanlines, scanline_level = 20;

 int soft_scaling, analog_deadzone; // for Caanoo
 int soft_scaling, analog_deadzone; // for Caanoo

+int soft_filter;

 
 #ifdef __ARM_ARCH_7A__
 #define DEFAULT_PSX_CLOCK 57
 
 #ifdef __ARM_ARCH_7A__
 #define DEFAULT_PSX_CLOCK 57


@@ -101,20 +106,24 @@ int soft_scaling, analog_deadzone; // for Caanoo
 #define DEFAULT_PSX_CLOCK_S "50"
 #endif
 
 #define DEFAULT_PSX_CLOCK_S "50"
 #endif
 

-// sound plugin
-extern int iUseReverb;
-extern int iUseInterpolation;
-extern int iXAPitch;
-extern int iSPUIRQWait;
-extern int iUseTimer;
-extern int iVolume;
-

 static const char *bioses[24];
 static const char *gpu_plugins[16];
 static const char *spu_plugins[16];
 static const char *memcards[32];
 static int bios_sel, gpu_plugsel, spu_plugsel;
 
 static const char *bioses[24];
 static const char *gpu_plugins[16];
 static const char *spu_plugins[16];
 static const char *memcards[32];
 static int bios_sel, gpu_plugsel, spu_plugsel;
 

+#ifndef UI_FEATURES_H
+#define MENU_BIOS_PATH "bios/"
+#define MENU_SHOW_VARSCALER 0
+#define MENU_SHOW_VOUTMODE 1
+#define MENU_SHOW_SCALER2 0
+#define MENU_SHOW_NUBS_BTNS 0
+#define MENU_SHOW_VIBRATION 0
+#define MENU_SHOW_DEADZONE 0
+#define MENU_SHOW_MINIMIZE 0
+#define MENU_SHOW_FULLSCREEN 1
+#define MENU_SHOW_VOLUME 0
+#endif

 
 static int min(int x, int y) { return x < y ? x : y; }
 static int max(int x, int y) { return x > y ? x : y; }
 
 static int min(int x, int y) { return x < y ? x : y; }
 static int max(int x, int y) { return x > y ? x : y; }


@@ -177,6 +186,112 @@ static int emu_save_load_game(int load, int unused)
        return ret;
 }
 
        return ret;
 }
 

+static void rm_namelist_entry(struct dirent **namelist,
+       int count, const char *name)
+{
+       int i;
+
+       for (i = 1; i < count; i++) {
+               if (namelist[i] == NULL || namelist[i]->d_type == DT_DIR)
+                       continue;
+
+               if (strcmp(name, namelist[i]->d_name) == 0) {
+                       free(namelist[i]);
+                       namelist[i] = NULL;
+                       break;
+               }
+       }
+}
+
+static int optional_cdimg_filter(struct dirent **namelist, int count,
+       const char *basedir)
+{
+       const char *ext, *p;
+       char buf[256], buf2[256];
+       int i, d, ret, good_cue;
+       struct stat64 statf;
+       FILE *f;
+
+       if (count <= 1)
+               return count;
+
+       for (i = 1; i < count; i++) {
+               if (namelist[i] == NULL || namelist[i]->d_type == DT_DIR)
+                       continue;
+
+               ext = strrchr(namelist[i]->d_name, '.');
+               if (ext == NULL) {
+                       // should not happen but whatever
+                       free(namelist[i]);
+                       namelist[i] = NULL;
+                       continue;
+               }
+               ext++;
+
+               // first find .cue files and remove files they reference
+               if (strcasecmp(ext, "cue") == 0)
+               {
+                       snprintf(buf, sizeof(buf), "%s/%s", basedir,
+                               namelist[i]->d_name);
+
+                       f = fopen(buf, "r");
+                       if (f == NULL) {
+                               free(namelist[i]);
+                               namelist[i] = NULL;
+                               continue;
+                       }
+
+                       good_cue = 0;
+                       while (fgets(buf, sizeof(buf), f)) {
+                               ret = sscanf(buf, " FILE \"%256[^\"]\"", buf2);
+                               if (ret != 1)
+                                       ret = sscanf(buf, " FILE %256s", buf2);
+                               if (ret != 1)
+                                       continue;
+
+                               p = strrchr(buf2, '/');
+                               if (p == NULL)
+                                       p = strrchr(buf2, '\\');
+                               if (p != NULL)
+                                       p++;
+                               else
+                                       p = buf2;
+
+                               snprintf(buf, sizeof(buf), "%s/%s", basedir, p);
+                               ret = stat64(buf, &statf);
+                               if (ret == 0) {
+                                       rm_namelist_entry(namelist, count, p);
+                                       good_cue = 1;
+                               }
+                       }
+                       fclose(f);
+
+                       if (!good_cue) {
+                               free(namelist[i]);
+                               namelist[i] = NULL;
+                       }
+                       continue;
+               }
+
+               p = strcasestr(namelist[i]->d_name, "track");
+               if (p != NULL) {
+                       ret = strtoul(p + 5, NULL, 10);
+                       if (ret > 1) {
+                               free(namelist[i]);
+                               namelist[i] = NULL;
+                               continue;
+                       }
+               }
+       }
+
+       // compact namelist
+       for (i = d = 1; i < count; i++)
+               if (namelist[i] != NULL)
+                       namelist[d++] = namelist[i];
+
+       return d;
+}
+

 // propagate menu settings to the emu vars
 static void menu_sync_config(void)
 {
 // propagate menu settings to the emu vars
 static void menu_sync_config(void)
 {


@@ -204,7 +319,7 @@ static void menu_sync_config(void)
                allow_abs_only_old = in_evdev_allow_abs_only;
        }
 
                allow_abs_only_old = in_evdev_allow_abs_only;
        }
 

-       iVolume = 768 + 128 * volume_boost;
+       spu_config.iVolume = 768 + 128 * volume_boost;

        pl_rearmed_cbs.frameskip = frameskip - 1;
        pl_timing_prepare(Config.PsxType);
 }
        pl_rearmed_cbs.frameskip = frameskip - 1;
        pl_timing_prepare(Config.PsxType);
 }


@@ -214,11 +329,16 @@ static void menu_set_defconfig(void)
        emu_set_default_config();
 
        g_opts = 0;
        emu_set_default_config();
 
        g_opts = 0;

-       scaling = SCALE_4_3;
+       g_scaler = SCALE_4_3;
+       g_gamma = 100;

        volume_boost = 0;
        frameskip = 0;
        analog_deadzone = 50;
        soft_scaling = 1;
        volume_boost = 0;
        frameskip = 0;
        analog_deadzone = 50;
        soft_scaling = 1;

+       soft_filter = 0;
+       scanlines = 0;
+       scanline_level = 20;
+       plat_target.vout_fullscreen = 0;

        psx_clock = DEFAULT_PSX_CLOCK;
 
        region = 0;
        psx_clock = DEFAULT_PSX_CLOCK;
 
        region = 0;


@@ -240,6 +360,9 @@ static void menu_set_defconfig(void)
 #define CE_INTVAL(val) \
        { #val, sizeof(val), &val }
 
 #define CE_INTVAL(val) \
        { #val, sizeof(val), &val }
 

+#define CE_INTVAL_N(name, val) \
+       { name, sizeof(val), &val }
+

 #define CE_INTVAL_P(val) \
        { #val, sizeof(pl_rearmed_cbs.val), &pl_rearmed_cbs.val }
 
 #define CE_INTVAL_P(val) \
        { #val, sizeof(pl_rearmed_cbs.val), &pl_rearmed_cbs.val }
 


@@ -259,11 +382,11 @@ static const struct {
        void *val;
 } config_data[] = {
        CE_CONFIG_STR(Bios),
        void *val;
 } config_data[] = {
        CE_CONFIG_STR(Bios),

-       CE_CONFIG_STR_V(Gpu, 2),
+       CE_CONFIG_STR_V(Gpu, 3),

        CE_CONFIG_STR(Spu),
 //     CE_CONFIG_STR(Cdr),
        CE_CONFIG_VAL(Xa),
        CE_CONFIG_STR(Spu),
 //     CE_CONFIG_STR(Cdr),
        CE_CONFIG_VAL(Xa),

-       CE_CONFIG_VAL(Sio),
+//     CE_CONFIG_VAL(Sio),

        CE_CONFIG_VAL(Mdec),
        CE_CONFIG_VAL(Cdda),
        CE_CONFIG_VAL(Debug),
        CE_CONFIG_VAL(Mdec),
        CE_CONFIG_VAL(Cdda),
        CE_CONFIG_VAL(Debug),


@@ -272,20 +395,29 @@ static const struct {
        CE_CONFIG_VAL(RCntFix),
        CE_CONFIG_VAL(VSyncWA),
        CE_CONFIG_VAL(Cpu),
        CE_CONFIG_VAL(RCntFix),
        CE_CONFIG_VAL(VSyncWA),
        CE_CONFIG_VAL(Cpu),

-       CE_CONFIG_VAL(CdrReschedule),

        CE_INTVAL(region),
        CE_INTVAL(region),

-       CE_INTVAL_V(scaling, 2),
+       CE_INTVAL_V(g_scaler, 3),
+       CE_INTVAL(g_gamma),

        CE_INTVAL(g_layer_x),
        CE_INTVAL(g_layer_y),
        CE_INTVAL(g_layer_w),
        CE_INTVAL(g_layer_h),
        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(soft_filter),
+       CE_INTVAL(scanlines),
+       CE_INTVAL(scanline_level),
+       CE_INTVAL(plat_target.vout_method),
+       CE_INTVAL(plat_target.hwfilter),
+       CE_INTVAL(plat_target.vout_fullscreen),

        CE_INTVAL(state_slot),
        CE_INTVAL(cpu_clock),
        CE_INTVAL(g_opts),
        CE_INTVAL(in_type_sel1),
        CE_INTVAL(in_type_sel2),
        CE_INTVAL(analog_deadzone),
        CE_INTVAL(state_slot),
        CE_INTVAL(cpu_clock),
        CE_INTVAL(g_opts),
        CE_INTVAL(in_type_sel1),
        CE_INTVAL(in_type_sel2),
        CE_INTVAL(analog_deadzone),

+       CE_INTVAL(memcard1_sel),
+       CE_INTVAL(memcard2_sel),
+       CE_INTVAL_N("adev0_is_nublike", in_adev_is_nublike[0]),
+       CE_INTVAL_N("adev1_is_nublike", in_adev_is_nublike[1]),

        CE_INTVAL_V(frameskip, 3),
        CE_INTVAL_P(gpu_peops.iUseDither),
        CE_INTVAL_P(gpu_peops.dwActFixes),
        CE_INTVAL_V(frameskip, 3),
        CE_INTVAL_P(gpu_peops.iUseDither),
        CE_INTVAL_P(gpu_peops.dwActFixes),


@@ -294,6 +426,8 @@ static const struct {
        CE_INTVAL_P(gpu_unai.no_light),
        CE_INTVAL_P(gpu_unai.no_blend),
        CE_INTVAL_P(gpu_neon.allow_interlace),
        CE_INTVAL_P(gpu_unai.no_light),
        CE_INTVAL_P(gpu_unai.no_blend),
        CE_INTVAL_P(gpu_neon.allow_interlace),

+       CE_INTVAL_P(gpu_neon.enhancement_enable),
+       CE_INTVAL_P(gpu_neon.enhancement_no_main),

        CE_INTVAL_P(gpu_peopsgl.bDrawDither),
        CE_INTVAL_P(gpu_peopsgl.iFilterType),
        CE_INTVAL_P(gpu_peopsgl.iFrameTexType),
        CE_INTVAL_P(gpu_peopsgl.bDrawDither),
        CE_INTVAL_P(gpu_peopsgl.iFilterType),
        CE_INTVAL_P(gpu_peopsgl.iFrameTexType),


@@ -304,12 +438,11 @@ static const struct {
        CE_INTVAL_P(gpu_peopsgl.iVRamSize),
        CE_INTVAL_P(gpu_peopsgl.iTexGarbageCollection),
        CE_INTVAL_P(gpu_peopsgl.dwActFixes),
        CE_INTVAL_P(gpu_peopsgl.iVRamSize),
        CE_INTVAL_P(gpu_peopsgl.iTexGarbageCollection),
        CE_INTVAL_P(gpu_peopsgl.dwActFixes),

-       CE_INTVAL_V(iUseReverb, 3),
-       CE_INTVAL_V(iXAPitch, 3),
-       CE_INTVAL_V(iUseInterpolation, 3),
-       CE_INTVAL_V(iSPUIRQWait, 3),
-       CE_INTVAL_V(iUseTimer, 3),
-       CE_INTVAL(warned_about_bios),
+       CE_INTVAL(spu_config.iUseReverb),
+       CE_INTVAL(spu_config.iXAPitch),
+       CE_INTVAL(spu_config.iUseInterpolation),
+       CE_INTVAL(spu_config.iTempo),
+       CE_INTVAL(config_save_counter),

        CE_INTVAL(in_evdev_allow_abs_only),
        CE_INTVAL(volume_boost),
        CE_INTVAL(psx_clock),
        CE_INTVAL(in_evdev_allow_abs_only),
        CE_INTVAL(volume_boost),
        CE_INTVAL(psx_clock),


@@ -340,6 +473,7 @@ static void make_cfg_fname(char *buf, size_t size, int is_game)
 }
 
 static void keys_write_all(FILE *f);
 }
 
 static void keys_write_all(FILE *f);

+static char *mystrip(char *str);

 
 static int menu_write_config(int is_game)
 {
 
 static int menu_write_config(int is_game)
 {


@@ -347,6 +481,8 @@ static int menu_write_config(int is_game)
        FILE *f;
        int i;
 
        FILE *f;
        int i;
 

+       config_save_counter++;
+

        make_cfg_fname(cfgfile, sizeof(cfgfile), is_game);
        f = fopen(cfgfile, "w");
        if (f == NULL) {
        make_cfg_fname(cfgfile, sizeof(cfgfile), is_game);
        f = fopen(cfgfile, "w");
        if (f == NULL) {


@@ -371,20 +507,55 @@ static int menu_write_config(int is_game)
                        break;
                default:
                        printf("menu_write_config: unhandled len %d for %s\n",
                        break;
                default:
                        printf("menu_write_config: unhandled len %d for %s\n",

-                                config_data[i].len, config_data[i].name);
+                                (int)config_data[i].len, config_data[i].name);

                        break;
                }
        }
 
                        break;
                }
        }
 

-       if (!is_game)
-               fprintf(f, "lastcdimg = %s\n", last_selected_fname);
-

        keys_write_all(f);
        fclose(f);
 
        return 0;
 }
 
        keys_write_all(f);
        fclose(f);
 
        return 0;
 }
 

+static int menu_do_last_cd_img(int is_get)
+{
+       static const char *defaults[] = { "/media", "/mnt/sd", "/mnt" };
+       char path[256];
+       struct stat64 st;
+       FILE *f;
+       int i, ret = -1;
+
+       snprintf(path, sizeof(path), "." PCSX_DOT_DIR "lastcdimg.txt");
+       f = fopen(path, is_get ? "r" : "w");
+       if (f == NULL) {
+               ret = -1;
+               goto out;
+       }
+
+       if (is_get) {
+               ret = fread(last_selected_fname, 1, sizeof(last_selected_fname) - 1, f);
+               last_selected_fname[ret] = 0;
+               mystrip(last_selected_fname);
+       }
+       else
+               fprintf(f, "%s\n", last_selected_fname);
+       fclose(f);
+
+out:
+       if (is_get) {
+               for (i = 0; last_selected_fname[0] == 0
+                      || stat64(last_selected_fname, &st) != 0; i++)
+               {
+                       if (i >= ARRAY_SIZE(defaults))
+                               break;
+                       strcpy(last_selected_fname, defaults[i]);
+               }
+       }
+
+       return 0;
+}
+

 static void parse_str_val(char *cval, const char *src)
 {
        char *tmp;
 static void parse_str_val(char *cval, const char *src)
 {
        char *tmp;


@@ -466,7 +637,7 @@ static int menu_load_config(int is_game)
                        break;
                default:
                        printf("menu_load_config: unhandled len %d for %s\n",
                        break;
                default:
                        printf("menu_load_config: unhandled len %d for %s\n",

-                                config_data[i].len, config_data[i].name);
+                                (int)config_data[i].len, config_data[i].name);

                        break;
                }
        }
                        break;
                }
        }


@@ -489,10 +660,6 @@ fail:
 
        menu_sync_config();
 
 
        menu_sync_config();
 

-       // caanoo old config compat hack
-       if (strcmp(Config.Gpu, "gpuPCSX4ALL.so") == 0)
-               strcpy(Config.Gpu, "gpu_unai.so");
-

        // sync plugins
        for (i = bios_sel = 0; bioses[i] != NULL; i++)
                if (strcmp(Config.Bios, bioses[i]) == 0)
        // sync plugins
        for (i = bios_sel = 0; bioses[i] != NULL; i++)
                if (strcmp(Config.Bios, bioses[i]) == 0)


@@ -506,23 +673,51 @@ fail:
                if (strcmp(Config.Spu, spu_plugins[i]) == 0)
                        { spu_plugsel = i; break; }
 
                if (strcmp(Config.Spu, spu_plugins[i]) == 0)
                        { spu_plugsel = i; break; }
 

+       // memcard selections
+       char mcd1_old[sizeof(Config.Mcd1)];
+       char mcd2_old[sizeof(Config.Mcd2)];
+       strcpy(mcd1_old, Config.Mcd1);
+       strcpy(mcd2_old, Config.Mcd2);
+
+       if ((unsigned int)memcard1_sel < ARRAY_SIZE(memcards)) {
+               if (memcard1_sel == 0)
+                       strcpy(Config.Mcd1, "none");
+               else if (memcards[memcard1_sel] != NULL)
+                       snprintf(Config.Mcd1, sizeof(Config.Mcd1), ".%s%s",
+                               MEMCARD_DIR, memcards[memcard1_sel]);
+       }
+       if ((unsigned int)memcard2_sel < ARRAY_SIZE(memcards)) {
+               if (memcard2_sel == 0)
+                       strcpy(Config.Mcd2, "none");
+               else if (memcards[memcard2_sel] != NULL)
+                       snprintf(Config.Mcd2, sizeof(Config.Mcd2), ".%s%s",
+                               MEMCARD_DIR, memcards[memcard2_sel]);
+       }
+       if (strcmp(mcd1_old, Config.Mcd1) || strcmp(mcd2_old, Config.Mcd2))
+               LoadMcds(Config.Mcd1, Config.Mcd2);
+

        return ret;
 }
 
        return ret;
 }
 

+static const char *filter_exts[] = {
+       "bin", "img", "mdf", "iso", "cue", "z",
+       "bz",  "znx", "pbp", "cbn", NULL
+};
+

 // rrrr rggg gggb bbbb
 static unsigned short fname2color(const char *fname)
 {
 // rrrr rggg gggb bbbb
 static unsigned short fname2color(const char *fname)
 {

-       static const char *cdimg_exts[] = { ".bin", ".img", ".mdf", ".iso", ".cue", ".z",
-                                           ".bz", ".znx", ".pbp", ".cbn" };
-       static const char *other_exts[] = { ".ccd", ".toc", ".mds", ".sub",
-                                           ".table", ".index", ".sbi" };
+       static const char *other_exts[] = {
+               "ccd", "toc", "mds", "sub", "table", "index", "sbi"
+       };

        const char *ext = strrchr(fname, '.');
        int i;
 
        if (ext == NULL)
                return 0xffff;
        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)
+       ext++;
+       for (i = 0; filter_exts[i] != NULL; i++)
+               if (strcasecmp(ext, filter_exts[i]) == 0)

                        return 0x7bff;
        for (i = 0; i < array_size(other_exts); i++)
                if (strcasecmp(ext, other_exts[i]) == 0)
                        return 0x7bff;
        for (i = 0; i < array_size(other_exts); i++)
                if (strcasecmp(ext, other_exts[i]) == 0)


@@ -532,10 +727,6 @@ static unsigned short fname2color(const char *fname)
 
 static void draw_savestate_bg(int slot);
 
 
 static void draw_savestate_bg(int slot);
 

-static const char *filter_exts[] = {
-       ".mp3", ".MP3", ".txt", ".htm", "html", ".jpg", ".pnd"
-};
-

 #define MENU_ALIGN_LEFT
 #ifdef __ARM_ARCH_7A__ // assume hires device
 #define MENU_X2 1
 #define MENU_ALIGN_LEFT
 #ifdef __ARM_ARCH_7A__ // assume hires device
 #define MENU_X2 1


@@ -543,9 +734,7 @@ static const char *filter_exts[] = {
 #define MENU_X2 0
 #endif
 
 #define MENU_X2 0
 #endif
 

-#define menu_init menu_init_common
-#include "common/menu.c"
-#undef menu_init
+#include "libpicofe/menu.c"

 
 // a bit of black magic here
 static void draw_savestate_bg(int slot)
 
 // a bit of black magic here
 static void draw_savestate_bg(int slot)


@@ -567,8 +756,8 @@ static void draw_savestate_bg(int slot)
        if (f == NULL)
                return;
 
        if (f == NULL)
                return;
 

-       if (gzseek(f, 0x29933d, SEEK_SET) != 0x29933d) {
-               fprintf(stderr, "gzseek failed\n");
+       if ((ret = (int)gzseek(f, 0x29933d, SEEK_SET)) != 0x29933d) {
+               fprintf(stderr, "gzseek failed: %d\n", ret);

                gzclose(f);
                return;
        }
                gzclose(f);
                return;
        }


@@ -593,12 +782,18 @@ static void draw_savestate_bg(int slot)
 
        x = gpu->ulControl[5] & 0x3ff;
        y = (gpu->ulControl[5] >> 10) & 0x1ff;
 
        x = gpu->ulControl[5] & 0x3ff;
        y = (gpu->ulControl[5] >> 10) & 0x1ff;

-       s = (u16 *)gpu->psxVRam + y * 1024 + (x & ~1);

        w = psx_widths[(gpu->ulStatus >> 16) & 7];
        tmp = gpu->ulControl[7];
        h = ((tmp >> 10) & 0x3ff) - (tmp & 0x3ff);
        if (gpu->ulStatus & 0x80000) // doubleheight
                h *= 2;
        w = psx_widths[(gpu->ulStatus >> 16) & 7];
        tmp = gpu->ulControl[7];
        h = ((tmp >> 10) & 0x3ff) - (tmp & 0x3ff);
        if (gpu->ulStatus & 0x80000) // doubleheight
                h *= 2;

+       if (h <= 0 || h > 512)
+               goto out;
+       if (y > 512 - 64)
+               y = 0;
+       if (y + h > 512)
+               h = 512 - y;
+       s = (u16 *)gpu->psxVRam + y * 1024 + x;

 
        x = max(0, g_menuscreen_w - w) & ~3;
        y = max(0, g_menuscreen_h / 2 - h / 2);
 
        x = max(0, g_menuscreen_w - w) & ~3;
        y = max(0, g_menuscreen_h / 2 - h / 2);


@@ -621,126 +816,6 @@ out:
        free(gpu);
 }
 
        free(gpu);
 }
 

-// ---------- XXX: pandora specific -----------
-
-static const char pnd_script_base[] = "sudo -n /usr/pandora/scripts";
-static char **pnd_filter_list;
-
-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 void apply_lcdrate(int pal)
-{
-       static int old = -1;
-       char buf[128];
-
-       if (pal == old)
-               return;
-
-       snprintf(buf, sizeof(buf), "%s/op_lcdrate.sh %d",
-                       pnd_script_base, pal ? 50 : 60);
-       system(buf);
-       old = pal;
-}
-
-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];
-       DIR *dir;
-
-       cpu_clock_st = cpu_clock = plat_cpu_clock_get();
-
-       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;
-               }
-
-               if (ent->d_type != DT_REG && ent->d_type != DT_LNK)
-                       continue;
-
-               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;
-
-               if (ent->d_type != DT_REG && ent->d_type != DT_LNK)
-                       continue;
-
-               len = strlen(ent->d_name);
-
-               // skip pre-HF5 extra files
-               if (len >= 3 && strcmp(ent->d_name + len - 3, "_v3") == 0)
-                       continue;
-               if (len >= 3 && strcmp(ent->d_name + len - 3, "_v5") == 0)
-                       continue;
-
-               // have to cut "_up_h" for pre-HF5
-               if (len > 5 && strcmp(ent->d_name + len - 5, "_up_h") == 0)
-                       len -= 5;
-
-               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;
-}
-
-void menu_finish(void)
-{
-       plat_cpu_clock_apply(cpu_clock_st);
-}
-

 // -------------- key config --------------
 
 me_bind_action me_ctrl_actions[] =
 // -------------- key config --------------
 
 me_bind_action me_ctrl_actions[] =


@@ -772,15 +847,23 @@ me_bind_action emuctrl_actions[] =
        { "Next Save Slot   ", 1 << SACTION_NEXT_SSLOT },
        { "Toggle Frameskip ", 1 << SACTION_TOGGLE_FSKIP },
        { "Take Screenshot  ", 1 << SACTION_SCREENSHOT },
        { "Next Save Slot   ", 1 << SACTION_NEXT_SSLOT },
        { "Toggle Frameskip ", 1 << SACTION_TOGGLE_FSKIP },
        { "Take Screenshot  ", 1 << SACTION_SCREENSHOT },

-       { "Enter Menu       ", 1 << SACTION_ENTER_MENU },
-#ifdef __ARM_ARCH_7A__ /* XXX */
+       { "Show/Hide FPS    ", 1 << SACTION_TOGGLE_FPS },
+#ifdef __ARM_ARCH_7A__
+       { "Switch Renderer  ", 1 << SACTION_SWITCH_DISPMODE },
+#endif
+       { "Fast Forward     ", 1 << SACTION_FAST_FORWARD },
+#if MENU_SHOW_MINIMIZE

        { "Minimize         ", 1 << SACTION_MINIMIZE },
 #endif
        { "Minimize         ", 1 << SACTION_MINIMIZE },
 #endif

+#if MENU_SHOW_FULLSCREEN
+       { "Toggle fullscreen", 1 << SACTION_TOGGLE_FULLSCREEN },
+#endif
+       { "Enter Menu       ", 1 << SACTION_ENTER_MENU },

        { "Gun Trigger      ", 1 << SACTION_GUN_TRIGGER },
        { "Gun A button     ", 1 << SACTION_GUN_A },
        { "Gun B button     ", 1 << SACTION_GUN_B },
        { "Gun Offscreen Trigger", 1 << SACTION_GUN_TRIGGER2 },
        { "Gun Trigger      ", 1 << SACTION_GUN_TRIGGER },
        { "Gun A button     ", 1 << SACTION_GUN_A },
        { "Gun B button     ", 1 << SACTION_GUN_B },
        { "Gun Offscreen Trigger", 1 << SACTION_GUN_TRIGGER2 },

-#ifndef __ARM_ARCH_7A__ /* XXX */
+#if MENU_SHOW_VOLUME

        { "Volume Up        ", 1 << SACTION_VOLUME_UP },
        { "Volume Down      ", 1 << SACTION_VOLUME_DOWN },
 #endif
        { "Volume Up        ", 1 << SACTION_VOLUME_UP },
        { "Volume Down      ", 1 << SACTION_VOLUME_DOWN },
 #endif


@@ -798,7 +881,7 @@ static char *mystrip(char *str)
 
        len = strlen(str);
        for (i = len - 1; i >= 0; i--)
 
        len = strlen(str);
        for (i = len - 1; i >= 0; i--)

-               if (str[i] != ' ') break;
+               if (str[i] != ' ' && str[i] != '\r' && str[i] != '\n') break;

        str[i+1] = 0;
 
        return str;
        str[i+1] = 0;
 
        return str;


@@ -998,17 +1081,21 @@ static int key_config_loop_wrap(int id, int keys)
        return 0;
 }
 
        return 0;
 }
 

+static const char h_nubmode[] = "Maps nub-like analog controls to PSX ones better\n"
+                               "Might cause problems with real analog sticks";

 static const char *adevnames[IN_MAX_DEVS + 2];
 static int stick_sel[2];
 
 static menu_entry e_menu_keyconfig_analog[] =
 {
 static const char *adevnames[IN_MAX_DEVS + 2];
 static int stick_sel[2];
 
 static menu_entry e_menu_keyconfig_analog[] =
 {

-       mee_enum ("Left stick (L3)",  0, stick_sel[0], adevnames),
-       mee_range("  X axis",    0, in_adev_axis[0][0], 0, 7),
-       mee_range("  Y axis",    0, in_adev_axis[0][1], 0, 7),
-       mee_enum ("Right stick (R3)", 0, stick_sel[1], adevnames),
-       mee_range("  X axis",    0, in_adev_axis[1][0], 0, 7),
-       mee_range("  Y axis",    0, in_adev_axis[1][1], 0, 7),
+       mee_enum   ("Left stick (L3)",  0, stick_sel[0], adevnames),
+       mee_range  ("  X axis",    0, in_adev_axis[0][0], 0, 7),
+       mee_range  ("  Y axis",    0, in_adev_axis[0][1], 0, 7),
+       mee_onoff_h("  nub mode",  0, in_adev_is_nublike[0], 1, h_nubmode),
+       mee_enum   ("Right stick (R3)", 0, stick_sel[1], adevnames),
+       mee_range  ("  X axis",    0, in_adev_axis[1][0], 0, 7),
+       mee_range  ("  Y axis",    0, in_adev_axis[1][1], 0, 7),
+       mee_onoff_h("  nub mode",  0, in_adev_is_nublike[1], 1, h_nubmode),

        mee_end,
 };
 
        mee_end,
 };
 


@@ -1075,9 +1162,9 @@ static const char *mgn_saveloadcfg(int id, int *offs)
 static int mh_savecfg(int id, int keys)
 {
        if (menu_write_config(id == MA_OPT_SAVECFG_GAME ? 1 : 0) == 0)
 static int mh_savecfg(int id, int keys)
 {
        if (menu_write_config(id == MA_OPT_SAVECFG_GAME ? 1 : 0) == 0)

-               me_update_msg("config saved");
+               menu_update_msg("config saved");

        else
        else

-               me_update_msg("failed to write config");
+               menu_update_msg("failed to write config");

 
        return 1;
 }
 
        return 1;
 }


@@ -1086,7 +1173,7 @@ static int mh_input_rescan(int id, int keys)
 {
        //menu_sync_config();
        in_probe();
 {
        //menu_sync_config();
        in_probe();

-       me_update_msg("rescan complete.");
+       menu_update_msg("rescan complete.");

 
        return 0;
 }
 
        return 0;
 }


@@ -1139,28 +1226,42 @@ static int menu_loop_keyconfig(int id, int keys)
 
 // ------------ gfx options menu ------------
 
 
 // ------------ gfx options menu ------------
 

-static const char *men_scaler[] = { "1x1", "scaled 4:3", "integer scaled 4:3", "fullscreen", "custom", NULL };
+static const char *men_scaler[] = {
+       "1x1", "integer scaled 2x", "scaled 4:3", "integer scaled 4:3", "fullscreen", "custom", NULL
+};
+static const char *men_soft_filter[] = { "None",
+#ifdef __ARM_NEON__
+       "scale2x", "eagle2x",
+#endif
+       NULL };
+static const char *men_dummy[] = { NULL };
+static const char h_scaler[]    = "int. 2x  - scales w. or h. 2x if it fits on screen\n"
+                                 "int. 4:3 - uses integer if possible, else fractional";

 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 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 const char h_overlay[]   = "Overlay provides hardware accelerated scaling";
+static const char h_soft_filter[] = "Works only if game uses low resolution modes";
+static const char h_scanline_l[]  = "Scanline brightness, 0-100%";
+static const char h_gamma[]     = "Gamma/brightness adjustment (default 100)";

 
 static int menu_loop_cscaler(int id, int keys)
 {
        unsigned int inp;
 
 
 static int menu_loop_cscaler(int id, int keys)
 {
        unsigned int inp;
 

-       scaling = SCALE_CUSTOM;
+       g_scaler = SCALE_CUSTOM;

 
 

-       plat_gvideo_open();
+       plat_gvideo_open(Config.PsxType);

 
        for (;;)
        {
 
        for (;;)
        {

-               menu_draw_begin(0);
+               menu_draw_begin(0, 1);

                memset(g_menuscreen_ptr, 4, g_menuscreen_w * g_menuscreen_h * 2);
                text_out16(2, 2, "%d,%d", g_layer_x, g_layer_y);
                text_out16(2, 480 - 18, "%dx%d | d-pad: resize, R+d-pad: move", g_layer_w, g_layer_h);
                menu_draw_end();
 
                memset(g_menuscreen_ptr, 4, g_menuscreen_w * g_menuscreen_h * 2);
                text_out16(2, 2, "%d,%d", g_layer_x, g_layer_y);
                text_out16(2, 480 - 18, "%dx%d | d-pad: resize, R+d-pad: 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);
+               inp = in_menu_wait(PBTN_UP|PBTN_DOWN|PBTN_LEFT|PBTN_RIGHT
+                               |PBTN_R|PBTN_MOK|PBTN_MBACK, NULL, 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_UP)    g_layer_y--;
                if (inp & PBTN_DOWN)  g_layer_y++;
                if (inp & PBTN_LEFT)  g_layer_x--;


@@ -1186,7 +1287,7 @@ static int menu_loop_cscaler(int id, int keys)
                        if (g_layer_y + g_layer_h > 480)
                                g_layer_h = 480 - g_layer_y;
                        // resize the layer
                        if (g_layer_y + g_layer_h > 480)
                                g_layer_h = 480 - g_layer_y;
                        // resize the layer

-                       plat_gvideo_open();
+                       plat_gvideo_open(Config.PsxType);

                }
        }
 
                }
        }
 


@@ -1197,11 +1298,18 @@ static int menu_loop_cscaler(int id, int keys)
 
 static menu_entry e_menu_gfx_options[] =
 {
 
 static menu_entry e_menu_gfx_options[] =
 {

-       mee_enum      ("Scaler",                   MA_OPT_SCALER, scaling, men_scaler),
+       mee_enum_h    ("Scaler",                   MA_OPT_VARSCALER, g_scaler, men_scaler, h_scaler),
+       mee_enum      ("Video output mode",        MA_OPT_VOUT_MODE, plat_target.vout_method, men_dummy),

        mee_onoff     ("Software Scaling",         MA_OPT_SCALER2, soft_scaling, 1),
        mee_onoff     ("Software Scaling",         MA_OPT_SCALER2, soft_scaling, 1),

-       mee_enum      ("Filter",                   MA_OPT_FILTERING, filter, men_dummy),
+       mee_enum      ("Hardware Filter",          MA_OPT_HWFILTER, plat_target.hwfilter, men_dummy),
+       mee_enum_h    ("Software Filter",          MA_OPT_SWFILTER, soft_filter, men_soft_filter, h_soft_filter),
+#ifdef __ARM_NEON__
+       mee_onoff     ("Scanlines",                MA_OPT_SCANLINES, scanlines, 1),
+       mee_range_h   ("Scanline brightness",      MA_OPT_SCANLINE_LEVEL, scanline_level, 0, 100, h_scanline_l),
+#endif
+       mee_range_h   ("Gamma adjustment",         MA_OPT_GAMMA, g_gamma, 1, 200, h_gamma),

 //     mee_onoff     ("Vsync",                    0, vsync, 1),
 //     mee_onoff     ("Vsync",                    0, vsync, 1),

-       mee_cust_h    ("Setup custom scaler",      MA_OPT_SCALER_C, menu_loop_cscaler, NULL, h_cscaler),
+       mee_cust_h    ("Setup custom scaler",      MA_OPT_VARSCALER_C, menu_loop_cscaler, NULL, h_cscaler),

        mee_end,
 };
 
        mee_end,
 };
 


@@ -1218,18 +1326,26 @@ static int menu_loop_gfx_options(int id, int keys)
 
 #ifdef __ARM_NEON__
 
 
 #ifdef __ARM_NEON__
 

-static const char h_gpu_neon[] = "Configure built-in NEON GPU plugin";
+static const char h_gpu_neon[] =
+       "Configure built-in NEON GPU plugin";
+static const char h_gpu_neon_enhanced[] =
+       "Renders in double resolution at the cost of lower performance\n"
+       "(not available for high resolution games)";
+static const char h_gpu_neon_enhanced_hack[] =
+       "Speed hack for above option (glitches some games)";

 static const char *men_gpu_interlace[] = { "Off", "On", "Auto", NULL };
 
 static menu_entry e_menu_plugin_gpu_neon[] =
 {
        mee_enum      ("Enable interlace mode",      0, pl_rearmed_cbs.gpu_neon.allow_interlace, men_gpu_interlace),
 static const char *men_gpu_interlace[] = { "Off", "On", "Auto", NULL };
 
 static menu_entry e_menu_plugin_gpu_neon[] =
 {
        mee_enum      ("Enable interlace mode",      0, pl_rearmed_cbs.gpu_neon.allow_interlace, men_gpu_interlace),

+       mee_onoff_h   ("Enhanced resolution (slow)", 0, pl_rearmed_cbs.gpu_neon.enhancement_enable, 1, h_gpu_neon_enhanced),
+       mee_onoff_h   ("Enhanced res. speed hack",   0, pl_rearmed_cbs.gpu_neon.enhancement_no_main, 1, h_gpu_neon_enhanced_hack),

        mee_end,
 };
 
 static int menu_loop_plugin_gpu_neon(int id, int keys)
 {
        mee_end,
 };
 
 static int menu_loop_plugin_gpu_neon(int id, int keys)
 {

-       int sel = 0;
+       static int sel = 0;

        me_loop(e_menu_plugin_gpu_neon, &sel);
        return 0;
 }
        me_loop(e_menu_plugin_gpu_neon, &sel);
        return 0;
 }


@@ -1324,17 +1440,16 @@ static int menu_loop_plugin_gpu_peopsgl(int id, int keys)
 
 static const char *men_spu_interp[] = { "None", "Simple", "Gaussian", "Cubic", NULL };
 static const char h_spu_volboost[]  = "Large values cause distortion";
 
 static const char *men_spu_interp[] = { "None", "Simple", "Gaussian", "Cubic", NULL };
 static const char h_spu_volboost[]  = "Large values cause distortion";

-static const char h_spu_irq_wait[]  = "Wait for CPU (recommended set to ON)";
-static const char h_spu_thread[]    = "Run sound emulation in main thread (recommended)";
+static const char h_spu_tempo[]     = "Slows down audio if emu is too slow\n"
+                                     "This is inaccurate and breaks games";

 
 static menu_entry e_menu_plugin_spu[] =
 {
        mee_range_h   ("Volume boost",              0, volume_boost, -5, 30, h_spu_volboost),
 
 static menu_entry e_menu_plugin_spu[] =
 {
        mee_range_h   ("Volume boost",              0, volume_boost, -5, 30, h_spu_volboost),

-       mee_onoff     ("Reverb",                    0, iUseReverb, 2),
-       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   ("Sound in main thread",      0, iUseTimer, 2, h_spu_thread),
+       mee_onoff     ("Reverb",                    0, spu_config.iUseReverb, 1),
+       mee_enum      ("Interpolation",             0, spu_config.iUseInterpolation, men_spu_interp),
+       mee_onoff     ("Adjust XA pitch",           0, spu_config.iXAPitch, 1),
+       mee_onoff_h   ("Adjust tempo",              0, spu_config.iTempo, 1, h_spu_tempo),

        mee_end,
 };
 
        mee_end,
 };
 


@@ -1351,13 +1466,10 @@ static const char h_bios[]       = "HLE is simulated BIOS. BIOS selection is sav
 static const char h_plugin_gpu[] = 
 #ifdef __ARM_NEON__
                                   "builtin_gpu is the NEON GPU, very fast and accurate\n"
 static const char h_plugin_gpu[] = 
 #ifdef __ARM_NEON__
                                   "builtin_gpu is the NEON GPU, very fast and accurate\n"

-                                  "gpuPEOPS "
-#else
-                                  "builtin_gpu "

 #endif
 #endif

-                                               "is Pete's soft GPU, slow but accurate\n"
-                                  "gpuPCSX4ALL is GPU from PCSX4ALL, fast but glitchy\n"
-                                  "gpuGLES Pete's hw GPU, uses 3D chip but is glitchy\n"
+                                  "gpu_peops is Pete's soft GPU, slow but accurate\n"
+                                  "gpu_unai is GPU from PCSX4ALL, fast but glitchy\n"
+                                  "gpu_gles Pete's hw GPU, uses 3D chip but is glitchy\n"

                                   "must save config and reload the game if changed";
 static const char h_plugin_spu[] = "spunull effectively disables sound\n"
                                   "must save config and reload the game if changed";
                                   "must save config and reload the game if changed";
 static const char h_plugin_spu[] = "spunull effectively disables sound\n"
                                   "must save config and reload the game if changed";


@@ -1375,8 +1487,8 @@ static menu_entry e_menu_plugin_options[] =
        mee_handler_h ("Configure built-in GPU plugin", menu_loop_plugin_gpu_neon, h_gpu_neon),
 #endif
        mee_handler_h ("Configure gpu_peops plugin",    menu_loop_plugin_gpu_peops, h_gpu_peops),
        mee_handler_h ("Configure built-in GPU plugin", menu_loop_plugin_gpu_neon, h_gpu_neon),
 #endif
        mee_handler_h ("Configure gpu_peops plugin",    menu_loop_plugin_gpu_peops, h_gpu_peops),

-       mee_handler_h ("Configure PCSX4ALL GPU plugin", menu_loop_plugin_gpu_unai, h_gpu_unai),
-       mee_handler_h ("Configure GLES GPU plugin",     menu_loop_plugin_gpu_peopsgl, h_gpu_peopsgl),
+       mee_handler_h ("Configure gpu_unai GPU plugin", menu_loop_plugin_gpu_unai, h_gpu_unai),
+       mee_handler_h ("Configure gpu_gles GPU plugin", menu_loop_plugin_gpu_peopsgl, h_gpu_peopsgl),

        mee_handler_h ("Configure built-in SPU plugin", menu_loop_plugin_spu, h_spu),
        mee_end,
 };
        mee_handler_h ("Configure built-in SPU plugin", menu_loop_plugin_spu, h_spu),
        mee_end,
 };


@@ -1421,7 +1533,6 @@ static int menu_loop_speed_hacks(int id, int keys)
        return 0;
 }
 
        return 0;
 }
 

-static const char *men_cfg_cdrr[] = { "Auto", "ON", "OFF", NULL };

 static const char h_cfg_cpul[]   = "Shows CPU usage in %";
 static const char h_cfg_spu[]    = "Shows active SPU channels\n"
                                   "(green: normal, red: fmod, blue: noise)";
 static const char h_cfg_cpul[]   = "Shows CPU usage in %";
 static const char h_cfg_spu[]    = "Shows active SPU channels\n"
                                   "(green: normal, red: fmod, blue: noise)";


@@ -1435,7 +1546,6 @@ static const char h_cfg_rcnt1[]  = "Parasite Eve 2, Vandal Hearts 1/2 Fix\n"
                                   "(timing hack, breaks other games)";
 static const char h_cfg_rcnt2[]  = "InuYasha Sengoku Battle Fix\n"
                                   "(timing hack, breaks other games)";
                                   "(timing hack, breaks other games)";
 static const char h_cfg_rcnt2[]  = "InuYasha Sengoku Battle Fix\n"
                                   "(timing hack, breaks other games)";

-static const char h_cfg_cdrr[]   = "Compatibility tweak (CD timing hack, breaks FMVs)";

 static const char h_cfg_nodrc[]  = "Disable dynamic recompiler and use interpreter\n"
                                   "Might be useful to overcome some dynarec bugs";
 static const char h_cfg_shacks[] = "Breaks games but may give better performance\n"
 static const char h_cfg_nodrc[]  = "Disable dynamic recompiler and use interpreter\n"
                                   "Might be useful to overcome some dynarec bugs";
 static const char h_cfg_shacks[] = "Breaks games but may give better performance\n"


@@ -1448,11 +1558,10 @@ static menu_entry e_menu_adv_options[] =
        mee_onoff_h   ("Disable Frame Limiter",  0, g_opts, OPT_NO_FRAMELIM, h_cfg_fl),
        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   ("Disable Frame Limiter",  0, g_opts, OPT_NO_FRAMELIM, h_cfg_fl),
        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   ("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_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_enum_h    ("CD read reschedule hack",0, Config.CdrReschedule, men_cfg_cdrr, h_cfg_cdrr),

        mee_onoff_h   ("Disable dynarec (slow!)",0, Config.Cpu, 1, h_cfg_nodrc),
        mee_handler_h ("[Speed hacks]",             menu_loop_speed_hacks, h_cfg_shacks),
        mee_end,
        mee_onoff_h   ("Disable dynarec (slow!)",0, Config.Cpu, 1, h_cfg_nodrc),
        mee_handler_h ("[Speed hacks]",             menu_loop_speed_hacks, h_cfg_shacks),
        mee_end,


@@ -1470,7 +1579,7 @@ static int menu_loop_adv_options(int id, int keys)
 static int mh_restore_defaults(int id, int keys)
 {
        menu_set_defconfig();
 static int mh_restore_defaults(int id, int keys)
 {
        menu_set_defconfig();

-       me_update_msg("defaults restored");
+       menu_update_msg("defaults restored");

        return 1;
 }
 
        return 1;
 }
 


@@ -1552,17 +1661,17 @@ static void debug_menu_loop(void)
 
        while (1)
        {
 
        while (1)
        {

-               menu_draw_begin(0);
+               menu_draw_begin(0, 1);

                draw_frame_debug(gpuf, df_x, df_y);
                menu_draw_end();
 
                inp = in_menu_wait(PBTN_MOK|PBTN_MBACK|PBTN_MA2|PBTN_MA3|PBTN_L|PBTN_R |
                draw_frame_debug(gpuf, df_x, df_y);
                menu_draw_end();
 
                inp = in_menu_wait(PBTN_MOK|PBTN_MBACK|PBTN_MA2|PBTN_MA3|PBTN_L|PBTN_R |

-                                       PBTN_UP|PBTN_DOWN|PBTN_LEFT|PBTN_RIGHT, 10);
+                                       PBTN_UP|PBTN_DOWN|PBTN_LEFT|PBTN_RIGHT, NULL, 10);

                if      (inp & PBTN_MBACK) break;
                else if (inp & PBTN_UP)    { if (df_y > 0) df_y--; }
                else if (inp & PBTN_DOWN)  { if (df_y < 512 - g_menuscreen_h) df_y++; }
                if      (inp & PBTN_MBACK) break;
                else if (inp & PBTN_UP)    { if (df_y > 0) df_y--; }
                else if (inp & PBTN_DOWN)  { if (df_y < 512 - g_menuscreen_h) df_y++; }

-               else if (inp & PBTN_LEFT)  { if (df_x > 0) df_x--; }
-               else if (inp & PBTN_RIGHT) { if (df_x < 1024 - g_menuscreen_w) df_x++; }
+               else if (inp & PBTN_LEFT)  { if (df_x > 0) df_x -= 2; }
+               else if (inp & PBTN_RIGHT) { if (df_x < 1024 - g_menuscreen_w) df_x += 2; }

        }
 
        free(gpuf);
        }
 
        free(gpuf);


@@ -1604,7 +1713,7 @@ static void draw_mc_bg(void)
                GetMcdBlockInfo(2, i + 1, &blocks2[i]);
        }
 
                GetMcdBlockInfo(2, i + 1, &blocks2[i]);
        }
 

-       menu_draw_begin(1);
+       menu_draw_begin(1, 1);

 
        memcpy(g_menuscreen_ptr, g_menubg_src_ptr, g_menuscreen_w * g_menuscreen_h * 2);
 
 
        memcpy(g_menuscreen_ptr, g_menubg_src_ptr, g_menuscreen_w * g_menuscreen_h * 2);
 


@@ -1634,10 +1743,10 @@ out:
 
 static void handle_memcard_sel(void)
 {
 
 static void handle_memcard_sel(void)
 {

-       Config.Mcd1[0] = 0;
+       strcpy(Config.Mcd1, "none");

        if (memcard1_sel != 0)
                snprintf(Config.Mcd1, sizeof(Config.Mcd1), ".%s%s", MEMCARD_DIR, memcards[memcard1_sel]);
        if (memcard1_sel != 0)
                snprintf(Config.Mcd1, sizeof(Config.Mcd1), ".%s%s", MEMCARD_DIR, memcards[memcard1_sel]);

-       Config.Mcd2[0] = 0;
+       strcpy(Config.Mcd2, "none");

        if (memcard2_sel != 0)
                snprintf(Config.Mcd2, sizeof(Config.Mcd2), ".%s%s", MEMCARD_DIR, memcards[memcard2_sel]);
        LoadMcds(Config.Mcd1, Config.Mcd2);
        if (memcard2_sel != 0)
                snprintf(Config.Mcd2, sizeof(Config.Mcd2), ".%s%s", MEMCARD_DIR, memcards[memcard2_sel]);
        LoadMcds(Config.Mcd1, Config.Mcd2);


@@ -1676,6 +1785,59 @@ static int menu_loop_memcards(int id, int keys)
        return 0;
 }
 
        return 0;
 }
 

+// ------------ cheats menu ------------
+
+static void draw_cheatlist(int sel)
+{
+       int max_cnt, start, i, pos, active;
+
+       max_cnt = g_menuscreen_h / me_sfont_h;
+       start = max_cnt / 2 - sel;
+
+       menu_draw_begin(1, 1);
+
+       for (i = 0; i < NumCheats; i++) {
+               pos = start + i;
+               if (pos < 0) continue;
+               if (pos >= max_cnt) break;
+               active = Cheats[i].Enabled;
+               smalltext_out16(14,                pos * me_sfont_h,
+                       active ? "ON " : "OFF", active ? 0xfff6 : 0xffff);
+               smalltext_out16(14 + me_sfont_w*4, pos * me_sfont_h,
+                       Cheats[i].Descr, active ? 0xfff6 : 0xffff);
+       }
+       pos = start + i;
+       if (pos < max_cnt)
+               smalltext_out16(14, pos * me_sfont_h, "done", 0xffff);
+
+       text_out16(5, max_cnt / 2 * me_sfont_h, ">");
+       menu_draw_end();
+}
+
+static void menu_loop_cheats(void)
+{
+       static int menu_sel = 0;
+       int inp;
+
+       for (;;)
+       {
+               draw_cheatlist(menu_sel);
+               inp = in_menu_wait(PBTN_UP|PBTN_DOWN|PBTN_LEFT|PBTN_RIGHT|PBTN_L|PBTN_R
+                               |PBTN_MOK|PBTN_MBACK, NULL, 33);
+               if (inp & PBTN_UP  ) { menu_sel--; if (menu_sel < 0) menu_sel = NumCheats; }
+               if (inp & PBTN_DOWN) { menu_sel++; if (menu_sel > NumCheats) menu_sel = 0; }
+               if (inp &(PBTN_LEFT|PBTN_L))  { menu_sel-=10; if (menu_sel < 0) menu_sel = 0; }
+               if (inp &(PBTN_RIGHT|PBTN_R)) { menu_sel+=10; if (menu_sel > NumCheats) menu_sel = NumCheats; }
+               if (inp & PBTN_MOK) { // action
+                       if (menu_sel < NumCheats)
+                               Cheats[menu_sel].Enabled = !Cheats[menu_sel].Enabled;
+                       else    break;
+               }
+               if (inp & PBTN_MBACK)
+                       break;
+       }
+}
+

 // --------- main menu help ----------
 
 static void menu_bios_warn(void)
 // --------- main menu help ----------
 
 static void menu_bios_warn(void)


@@ -1684,11 +1846,8 @@ static void menu_bios_warn(void)
        static const char msg[] =
                "You don't seem to have copied any BIOS\n"
                "files to\n"
        static const char msg[] =
                "You don't seem to have copied any BIOS\n"
                "files to\n"

-#ifdef __ARM_ARCH_7A__ // XXX
-               "<SD card>/pandora/appdata/pcsx_rearmed/bios/\n\n"
-#else
-               "pcsx_rearmed/bios/\n\n"
-#endif
+               MENU_BIOS_PATH "\n\n"
+

                "While many games work fine with fake\n"
                "(HLE) BIOS, others (like MGS and FF8)\n"
                "require BIOS to work.\n"
                "While many games work fine with fake\n"
                "(HLE) BIOS, others (like MGS and FF8)\n"
                "require BIOS to work.\n"


@@ -1707,7 +1866,7 @@ static void menu_bios_warn(void)
        {
                draw_menu_message(tmp_msg, NULL);
 
        {
                draw_menu_message(tmp_msg, NULL);
 

-               inp = in_menu_wait(PBTN_MOK|PBTN_MBACK, 70);
+               inp = in_menu_wait(PBTN_MOK|PBTN_MBACK, NULL, 70);

                if (inp & (PBTN_MBACK|PBTN_MOK))
                        return;
        }
                if (inp & (PBTN_MBACK|PBTN_MOK))
                        return;
        }


@@ -1715,7 +1874,7 @@ static void menu_bios_warn(void)
 
 // ------------ main menu ------------
 
 
 // ------------ main menu ------------
 

-void OnFile_Exit();
+static menu_entry e_menu_main[];

 
 static void draw_frame_main(void)
 {
 
 static void draw_frame_main(void)
 {


@@ -1734,7 +1893,7 @@ static void draw_frame_main(void)
        }
 
        if (ready_to_go) {
        }
 
        if (ready_to_go) {

-               capacity = plat_get_bat_capacity();
+               capacity = plat_target_bat_capacity_get();

                ltime = time(NULL);
                tmp = localtime(&ltime);
                strftime(ltime_s, sizeof(ltime_s), "%H:%M", tmp);
                ltime = time(NULL);
                tmp = localtime(&ltime);
                strftime(ltime_s, sizeof(ltime_s), "%H:%M", tmp);


@@ -1795,7 +1954,7 @@ static int reload_plugins(const char *cdimg)
        pcnt_hook_plugins();
        NetOpened = 0;
        if (OpenPlugins() == -1) {
        pcnt_hook_plugins();
        NetOpened = 0;
        if (OpenPlugins() == -1) {

-               me_update_msg("failed to open plugins");
+               menu_update_msg("failed to open plugins");

                return -1;
        }
        plugin_call_rearmed_cbs();
                return -1;
        }
        plugin_call_rearmed_cbs();


@@ -1823,9 +1982,11 @@ static int run_bios(void)
 
 static int run_exe(void)
 {
 
 static int run_exe(void)
 {

+       const char *exts[] = { "exe", NULL };

        const char *fname;
 
        const char *fname;
 

-       fname = menu_loop_romsel(last_selected_fname, sizeof(last_selected_fname));
+       fname = menu_loop_romsel(last_selected_fname,
+               sizeof(last_selected_fname), exts, NULL);

        if (fname == NULL)
                return -1;
 
        if (fname == NULL)
                return -1;
 


@@ -1835,7 +1996,7 @@ static int run_exe(void)
 
        SysReset();
        if (Load(fname) != 0) {
 
        SysReset();
        if (Load(fname) != 0) {

-               me_update_msg("exe load failed, bad file?");
+               menu_update_msg("exe load failed, bad file?");

                printf("meh\n");
                return -1;
        }
                printf("meh\n");
                return -1;
        }


@@ -1855,7 +2016,7 @@ static int run_cd_image(const char *fname)
        if (CheckCdrom() == -1) {
                // Only check the CD if we are starting the console with a CD
                ClosePlugins();
        if (CheckCdrom() == -1) {
                // Only check the CD if we are starting the console with a CD
                ClosePlugins();

-               me_update_msg("unsupported/invalid CD image");
+               menu_update_msg("unsupported/invalid CD image");

                return -1;
        }
 
                return -1;
        }
 


@@ -1864,13 +2025,13 @@ static int run_cd_image(const char *fname)
        // Read main executable directly from CDRom and start it
        if (LoadCdrom() == -1) {
                ClosePlugins();
        // Read main executable directly from CDRom and start it
        if (LoadCdrom() == -1) {
                ClosePlugins();

-               me_update_msg("failed to load CD image");
+               menu_update_msg("failed to load CD image");

                return -1;
        }
 
                return -1;
        }
 

+       emu_on_new_cd(1);

        ready_to_go = 1;
        ready_to_go = 1;

-       snprintf(hud_msg, sizeof(hud_msg), "Booting up...");
-       hud_new_msg = 2;
+

        return 0;
 }
 
        return 0;
 }
 


@@ -1879,7 +2040,9 @@ static int romsel_run(void)
        int prev_gpu, prev_spu;
        const char *fname;
 
        int prev_gpu, prev_spu;
        const char *fname;
 

-       fname = menu_loop_romsel(last_selected_fname, sizeof(last_selected_fname));
+       fname = menu_loop_romsel(last_selected_fname,
+                       sizeof(last_selected_fname), filter_exts,
+                       optional_cdimg_filter);

        if (fname == NULL)
                return -1;
 
        if (fname == NULL)
                return -1;
 


@@ -1903,18 +2066,18 @@ static int romsel_run(void)
                        return -1;
        }
 
                        return -1;
        }
 

-       if (Config.HLE)
-               printf("note: running without BIOS, expect compatibility problems\n");
-
-       strcpy(last_selected_fname, rom_fname_reload);
+       strcpy(last_selected_fname, fname);
+       menu_do_last_cd_img(0);

        return 0;
 }
 
 static int swap_cd_image(void)
 {
        return 0;
 }
 
 static int swap_cd_image(void)
 {

-       char *fname;
+       const char *fname;

 
 

-       fname = menu_loop_romsel(last_selected_fname, sizeof(last_selected_fname));
+       fname = menu_loop_romsel(last_selected_fname,
+                       sizeof(last_selected_fname), filter_exts,
+                       optional_cdimg_filter);

        if (fname == NULL)
                return -1;
 
        if (fname == NULL)
                return -1;
 


@@ -1925,18 +2088,18 @@ static int swap_cd_image(void)
 
        set_cd_image(fname);
        if (ReloadCdromPlugin() < 0) {
 
        set_cd_image(fname);
        if (ReloadCdromPlugin() < 0) {

-               me_update_msg("failed to load cdr plugin");
+               menu_update_msg("failed to load cdr plugin");

                return -1;
        }
        if (CDR_open() < 0) {
                return -1;
        }
        if (CDR_open() < 0) {

-               me_update_msg("failed to open cdr plugin");
+               menu_update_msg("failed to open cdr plugin");

                return -1;
        }
 
        SetCdOpenCaseTime(time(NULL) + 2);
        LidInterrupt();
 
                return -1;
        }
 
        SetCdOpenCaseTime(time(NULL) + 2);
        LidInterrupt();
 

-       strcpy(last_selected_fname, rom_fname_reload);
+       strcpy(last_selected_fname, fname);

        return 0;
 }
 
        return 0;
 }
 


@@ -1948,7 +2111,7 @@ static int swap_cd_multidisk(void)
 
        CDR_close();
        if (CDR_open() < 0) {
 
        CDR_close();
        if (CDR_open() < 0) {

-               me_update_msg("failed to open cdr plugin");
+               menu_update_msg("failed to open cdr plugin");

                return -1;
        }
 
                return -1;
        }
 


@@ -1958,6 +2121,29 @@ static int swap_cd_multidisk(void)
        return 0;
 }
 
        return 0;
 }
 

+static void load_pcsx_cht(void)
+{
+       static const char *exts[] = { "cht", NULL };
+       const char *fname;
+       char msg[64];
+
+       fname = menu_loop_romsel(last_selected_fname,
+                       sizeof(last_selected_fname), exts, NULL);
+       if (fname == NULL)
+               return;
+
+       printf("selected cheat file: %s\n", fname);
+       LoadCheats(fname);
+
+       if (NumCheats == 0 && NumCodes == 0)
+               menu_update_msg("failed to load cheats");
+       else {
+               snprintf(msg, sizeof(msg), "%d cheat(s) loaded", NumCheats + NumCodes);
+               menu_update_msg(msg);
+       }
+       me_enable(e_menu_main, MA_MAIN_CHEATS, ready_to_go && NumCheats);
+}
+

 static int main_menu_handler(int id, int keys)
 {
        switch (id)
 static int main_menu_handler(int id, int keys)
 {
        switch (id)


@@ -1998,13 +2184,19 @@ static int main_menu_handler(int id, int keys)
                if (run_exe() == 0)
                        return 1;
                break;
                if (run_exe() == 0)
                        return 1;
                break;

+       case MA_MAIN_CHEATS:
+               menu_loop_cheats();
+               break;
+       case MA_MAIN_LOAD_CHEATS:
+               load_pcsx_cht();
+               break;

        case MA_MAIN_CREDITS:
                draw_menu_message(credits_text, draw_frame_credits);
        case MA_MAIN_CREDITS:
                draw_menu_message(credits_text, draw_frame_credits);

-               in_menu_wait(PBTN_MOK|PBTN_MBACK, 70);
+               in_menu_wait(PBTN_MOK|PBTN_MBACK, NULL, 70);

                break;
        case MA_MAIN_EXIT:
                break;
        case MA_MAIN_EXIT:

-               OnFile_Exit();
-               break;
+               emu_core_ask_exit();
+               return 1;

        default:
                lprintf("%s: something unknown selected\n", __FUNCTION__);
                break;
        default:
                lprintf("%s: something unknown selected\n", __FUNCTION__);
                break;


@@ -2020,6 +2212,7 @@ static menu_entry e_menu_main2[] =
        mee_handler_id("Run BIOS",           MA_MAIN_RUN_BIOS,      main_menu_handler),
        mee_handler_id("Run EXE",            MA_MAIN_RUN_EXE,       main_menu_handler),
        mee_handler   ("Memcard manager",    menu_loop_memcards),
        mee_handler_id("Run BIOS",           MA_MAIN_RUN_BIOS,      main_menu_handler),
        mee_handler_id("Run EXE",            MA_MAIN_RUN_EXE,       main_menu_handler),
        mee_handler   ("Memcard manager",    menu_loop_memcards),

+       mee_handler_id("Load PCSX cheats..", MA_MAIN_LOAD_CHEATS,   main_menu_handler),

        mee_end,
 };
 
        mee_end,
 };
 


@@ -2030,6 +2223,7 @@ static int main_menu2_handler(int id, int keys)
        me_enable(e_menu_main2, MA_MAIN_SWAP_CD,  ready_to_go);
        me_enable(e_menu_main2, MA_MAIN_SWAP_CD_MULTI, ready_to_go && cdrIsoMultidiskCount > 1);
        me_enable(e_menu_main2, MA_MAIN_RUN_BIOS, bios_sel != 0);
        me_enable(e_menu_main2, MA_MAIN_SWAP_CD,  ready_to_go);
        me_enable(e_menu_main2, MA_MAIN_SWAP_CD_MULTI, ready_to_go && cdrIsoMultidiskCount > 1);
        me_enable(e_menu_main2, MA_MAIN_RUN_BIOS, bios_sel != 0);

+       me_enable(e_menu_main2, MA_MAIN_LOAD_CHEATS, ready_to_go);

 
        return me_loop_d(e_menu_main2, &sel, NULL, draw_frame_main);
 }
 
        return me_loop_d(e_menu_main2, &sel, NULL, draw_frame_main);
 }


@@ -2047,6 +2241,7 @@ static menu_entry e_menu_main[] =
        mee_handler_id("Load CD image",      MA_MAIN_LOAD_ROM,    main_menu_handler),
        mee_handler   ("Options",            menu_loop_options),
        mee_handler   ("Controls",           menu_loop_keyconfig),
        mee_handler_id("Load CD image",      MA_MAIN_LOAD_ROM,    main_menu_handler),
        mee_handler   ("Options",            menu_loop_options),
        mee_handler   ("Controls",           menu_loop_keyconfig),

+       mee_handler_id("Cheats",             MA_MAIN_CHEATS,      main_menu_handler),

        mee_handler_h ("Extra stuff",        main_menu2_handler,  h_extra),
        mee_handler_id("Credits",            MA_MAIN_CREDITS,     main_menu_handler),
        mee_handler_id("Exit",               MA_MAIN_EXIT,        main_menu_handler),
        mee_handler_h ("Extra stuff",        main_menu2_handler,  h_extra),
        mee_handler_id("Credits",            MA_MAIN_CREDITS,     main_menu_handler),
        mee_handler_id("Exit",               MA_MAIN_EXIT,        main_menu_handler),


@@ -2059,28 +2254,38 @@ static void menu_leave_emu(void);
 
 void menu_loop(void)
 {
 
 void menu_loop(void)
 {

+       static int warned_about_bios = 0;

        static int sel = 0;
 
        menu_leave_emu();
 
        static int sel = 0;
 
        menu_leave_emu();
 

-       if (bioses[1] == NULL && !warned_about_bios) {
-               menu_bios_warn();
-               warned_about_bios = 1;
+       if (config_save_counter == 0) {
+               // assume first run
+               if (bioses[1] != NULL) {
+                       // autoselect BIOS to make user's life easier
+                       snprintf(Config.Bios, sizeof(Config.Bios), "%s", bioses[1]);
+                       bios_sel = 1;
+               }
+               else if (!warned_about_bios) {
+                       menu_bios_warn();
+                       warned_about_bios = 1;
+               }

        }
 
        me_enable(e_menu_main, MA_MAIN_RESUME_GAME, ready_to_go);
        me_enable(e_menu_main, MA_MAIN_SAVE_STATE,  ready_to_go && CdromId[0]);
        me_enable(e_menu_main, MA_MAIN_LOAD_STATE,  ready_to_go && CdromId[0]);
        me_enable(e_menu_main, MA_MAIN_RESET_GAME,  ready_to_go);
        }
 
        me_enable(e_menu_main, MA_MAIN_RESUME_GAME, ready_to_go);
        me_enable(e_menu_main, MA_MAIN_SAVE_STATE,  ready_to_go && CdromId[0]);
        me_enable(e_menu_main, MA_MAIN_LOAD_STATE,  ready_to_go && CdromId[0]);
        me_enable(e_menu_main, MA_MAIN_RESET_GAME,  ready_to_go);

+       me_enable(e_menu_main, MA_MAIN_CHEATS,      ready_to_go && NumCheats);

 
        in_set_config_int(0, IN_CFG_BLOCKING, 1);
 
        do {
                me_loop_d(e_menu_main, &sel, NULL, draw_frame_main);
 
        in_set_config_int(0, IN_CFG_BLOCKING, 1);
 
        do {
                me_loop_d(e_menu_main, &sel, NULL, draw_frame_main);

-       } while (!ready_to_go);
+       } while (!ready_to_go && !g_emu_want_quit);

 
        /* wait until menu, ok, back is released */
 
        /* wait until menu, ok, back is released */

-       while (in_menu_wait_any(50) & (PBTN_MENU|PBTN_MOK|PBTN_MBACK))
+       while (in_menu_wait_any(NULL, 50) & (PBTN_MENU|PBTN_MOK|PBTN_MBACK))

                ;
 
        in_set_config_int(0, IN_CFG_BLOCKING, 0);
                ;
 
        in_set_config_int(0, IN_CFG_BLOCKING, 0);


@@ -2242,18 +2447,19 @@ do_memcards:
 void menu_init(void)
 {
        char buff[MAXPATHLEN];
 void menu_init(void)
 {
        char buff[MAXPATHLEN];

+       int i;

 
 

-       strcpy(last_selected_fname, "/media");
+       cpu_clock_st = cpu_clock = plat_target_cpu_clock_get();

 
        scan_bios_plugins();
 
        scan_bios_plugins();

-       pnd_menu_init();
-       menu_init_common();
+       menu_init_base();

 
        menu_set_defconfig();
        menu_load_config(0);
 
        menu_set_defconfig();
        menu_load_config(0);

-       last_psx_w = 320;
-       last_psx_h = 240;
-       last_psx_bpp = 16;
+       menu_do_last_cd_img(1);
+       last_vout_w = 320;
+       last_vout_h = 240;
+       last_vout_bpp = 16;

 
        g_menubg_src_ptr = calloc(g_menuscreen_w * g_menuscreen_h * 2, 1);
        g_menubg_ptr = calloc(g_menuscreen_w * g_menuscreen_h * 2, 1);
 
        g_menubg_src_ptr = calloc(g_menuscreen_w * g_menuscreen_h * 2, 1);
        g_menubg_ptr = calloc(g_menuscreen_w * g_menuscreen_h * 2, 1);


@@ -2265,72 +2471,40 @@ void menu_init(void)
        emu_make_path(buff, "skin/background.png", sizeof(buff));
        readpng(g_menubg_src_ptr, buff, READPNG_BG, g_menuscreen_w, g_menuscreen_h);
 
        emu_make_path(buff, "skin/background.png", sizeof(buff));
        readpng(g_menubg_src_ptr, buff, READPNG_BG, g_menuscreen_w, g_menuscreen_h);
 

-#ifndef __ARM_ARCH_7A__ /* XXX */
-       me_enable(e_menu_gfx_options, MA_OPT_SCALER, 0);
-       me_enable(e_menu_gfx_options, MA_OPT_FILTERING, 0);
-       me_enable(e_menu_gfx_options, MA_OPT_SCALER_C, 0);
-       me_enable(e_menu_keyconfig, MA_CTRL_NUBS_BTNS, 0);
-#else
-       me_enable(e_menu_gfx_options, MA_OPT_SCALER2, 0);
-       me_enable(e_menu_keyconfig, MA_CTRL_VIBRATION, 0);
-       me_enable(e_menu_keyconfig, MA_CTRL_DEADZONE, 0);
-#endif
-}
+       i = plat_target.cpu_clock_set != NULL
+               && plat_target.cpu_clock_get != NULL && cpu_clock_st > 0;
+       me_enable(e_menu_gfx_options, MA_OPT_CPU_CLOCKS, i);

 
 

-void menu_notify_mode_change(int w, int h, int bpp)
-{
-       float mult;
-       int imult;
+       i = me_id2offset(e_menu_gfx_options, MA_OPT_VOUT_MODE);
+       e_menu_gfx_options[i].data = plat_target.vout_methods;
+       me_enable(e_menu_gfx_options, MA_OPT_VOUT_MODE,
+               plat_target.vout_methods != NULL);

 
 

-       last_psx_w = w;
-       last_psx_h = h;
-       last_psx_bpp = bpp;
-
-       // XXX: should really menu code cotrol the layer size?
-       switch (scaling) {
-       case SCALE_1_1:
-               g_layer_w = w; g_layer_h = h;
-               break;
+       i = me_id2offset(e_menu_gfx_options, MA_OPT_HWFILTER);
+       e_menu_gfx_options[i].data = plat_target.hwfilters;
+       me_enable(e_menu_gfx_options, MA_OPT_HWFILTER,
+               plat_target.hwfilters != NULL);

 
 

-       case SCALE_4_3v2:
-               if (h > g_menuscreen_h || (240 < h && h <= 360))
-                       goto fractional_4_3;
-
-               // 4:3 that prefers integer scaling
-               imult = g_menuscreen_h / h;
-               g_layer_w = w * imult;
-               g_layer_h = h * imult;
-               mult = (float)g_layer_w / (float)g_layer_h;
-               if (mult < 1.25f || mult > 1.666f)
-                       g_layer_w = 4.0f/3.0f * (float)g_layer_h;
-               printf("  -> %dx%d %.1f\n", g_layer_w, g_layer_h, mult);
-               break;
-
-       fractional_4_3:
-       case SCALE_4_3:
-               mult = 240.0f / (float)h * 4.0f / 3.0f;
-               if (h > 256)
-                       mult *= 2.0f;
-               g_layer_w = mult * (float)g_menuscreen_h;
-               g_layer_h = g_menuscreen_h;
-               printf("  -> %dx%d %.1f\n", g_layer_w, g_layer_h, mult);
-               break;
+       me_enable(e_menu_gfx_options, MA_OPT_GAMMA,
+               plat_target.gamma_set != NULL);

 
 

-       case SCALE_FULLSCREEN:
-               g_layer_w = g_menuscreen_w;
-               g_layer_h = g_menuscreen_h;
-               break;
-
-       default:
-               break;
-       }
+#ifndef __ARM_ARCH_7A__
+       me_enable(e_menu_gfx_options, MA_OPT_SWFILTER, 0);
+#endif
+       me_enable(e_menu_gfx_options, MA_OPT_VARSCALER, MENU_SHOW_VARSCALER);
+       me_enable(e_menu_gfx_options, MA_OPT_VOUT_MODE, MENU_SHOW_VOUTMODE);
+       me_enable(e_menu_gfx_options, MA_OPT_VARSCALER_C, MENU_SHOW_VARSCALER);
+       me_enable(e_menu_gfx_options, MA_OPT_SCALER2, MENU_SHOW_SCALER2);
+       me_enable(e_menu_keyconfig, MA_CTRL_NUBS_BTNS, MENU_SHOW_NUBS_BTNS);
+       me_enable(e_menu_keyconfig, MA_CTRL_VIBRATION, MENU_SHOW_VIBRATION);
+       me_enable(e_menu_keyconfig, MA_CTRL_DEADZONE, MENU_SHOW_DEADZONE);
+}

 
 

-       g_layer_x = g_menuscreen_w / 2 - g_layer_w / 2;
-       g_layer_y = g_menuscreen_h / 2 - g_layer_h / 2;
-       if (g_layer_x < 0) g_layer_x = 0;
-       if (g_layer_y < 0) g_layer_y = 0;
-       if (g_layer_w > g_menuscreen_w) g_layer_w = g_menuscreen_w;
-       if (g_layer_h > g_menuscreen_h) g_layer_w = g_menuscreen_h;
+void menu_notify_mode_change(int w, int h, int bpp)
+{
+       last_vout_w = w;
+       last_vout_h = h;
+       last_vout_bpp = bpp;

 }
 
 static void menu_leave_emu(void)
 }
 
 static void menu_leave_emu(void)


@@ -2345,27 +2519,27 @@ static void menu_leave_emu(void)
 
        memcpy(g_menubg_ptr, g_menubg_src_ptr, g_menuscreen_w * g_menuscreen_h * 2);
        if (pl_vout_buf != NULL && ready_to_go) {
 
        memcpy(g_menubg_ptr, g_menubg_src_ptr, g_menuscreen_w * g_menuscreen_h * 2);
        if (pl_vout_buf != NULL && ready_to_go) {

-               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);
+               int x = max(0, g_menuscreen_w - last_vout_w);
+               int y = max(0, g_menuscreen_h / 2 - last_vout_h / 2);
+               int w = min(g_menuscreen_w, last_vout_w);
+               int h = min(g_menuscreen_h, last_vout_h);

                u16 *d = (u16 *)g_menubg_ptr + g_menuscreen_w * y + x;
                char *s = pl_vout_buf;
 
                u16 *d = (u16 *)g_menubg_ptr + g_menuscreen_w * y + x;
                char *s = pl_vout_buf;
 

-               if (last_psx_bpp == 16) {
-                       for (; h > 0; h--, d += g_menuscreen_w, s += last_psx_w * 2)
+               if (last_vout_bpp == 16) {
+                       for (; h > 0; h--, d += g_menuscreen_w, s += last_vout_w * 2)

                                menu_darken_bg(d, s, w, 0);
                }
                else {
                                menu_darken_bg(d, s, w, 0);
                }
                else {

-                       for (; h > 0; h--, d += g_menuscreen_w, s += last_psx_w * 3) {
-                               bgr888_to_rgb565(d, s, w * 3);
+                       for (; h > 0; h--, d += g_menuscreen_w, s += last_vout_w * 3) {
+                               rgb888_to_rgb565(d, s, w * 3);

                                menu_darken_bg(d, d, w, 0);
                        }
                }
        }
 
        if (ready_to_go)
                                menu_darken_bg(d, d, w, 0);
                        }
                }
        }
 
        if (ready_to_go)

-               cpu_clock = plat_cpu_clock_get();
+               cpu_clock = plat_target_cpu_clock_get();

 }
 
 void menu_prepare_emu(void)
 }
 
 void menu_prepare_emu(void)


@@ -2374,12 +2548,13 @@ void menu_prepare_emu(void)
 
        plat_video_menu_leave();
 
 
        plat_video_menu_leave();
 

-       menu_notify_mode_change(last_psx_w, last_psx_h, last_psx_bpp);
-

        psxCpu = (Config.Cpu == CPU_INTERPRETER) ? &psxInt : &psxRec;
        psxCpu = (Config.Cpu == CPU_INTERPRETER) ? &psxInt : &psxRec;

-       if (psxCpu != prev_cpu)
+       if (psxCpu != prev_cpu) {
+               prev_cpu->Shutdown();
+               psxCpu->Init();

                // note that this does not really reset, just clears drc caches
                psxCpu->Reset();
                // note that this does not really reset, just clears drc caches
                psxCpu->Reset();

+       }

 
        // core doesn't care about Config.Cdda changes,
        // so handle them manually here
 
        // core doesn't care about Config.Cdda changes,
        // so handle them manually here


@@ -2387,10 +2562,8 @@ void menu_prepare_emu(void)
                CDR_stop();
 
        menu_sync_config();
                CDR_stop();
 
        menu_sync_config();

-       apply_lcdrate(Config.PsxType);
-       apply_filter(filter);

        if (cpu_clock > 0)
        if (cpu_clock > 0)

-               plat_cpu_clock_apply(cpu_clock);
+               plat_target_cpu_clock_set(cpu_clock);

 
        // push config to GPU plugin
        plugin_call_rearmed_cbs();
 
        // push config to GPU plugin
        plugin_call_rearmed_cbs();


@@ -2404,7 +2577,7 @@ void menu_prepare_emu(void)
        dfinput_activate();
 }
 
        dfinput_activate();
 }
 

-void me_update_msg(const char *msg)
+void menu_update_msg(const char *msg)

 {
        strncpy(menu_error_msg, msg, sizeof(menu_error_msg));
        menu_error_msg[sizeof(menu_error_msg) - 1] = 0;
 {
        strncpy(menu_error_msg, msg, sizeof(menu_error_msg));
        menu_error_msg[sizeof(menu_error_msg) - 1] = 0;


@@ -2413,3 +2586,8 @@ void me_update_msg(const char *msg)
        lprintf("msg: %s\n", menu_error_msg);
 }
 
        lprintf("msg: %s\n", menu_error_msg);
 }
 

+void menu_finish(void)
+{
+       if (cpu_clock_st > 0)
+               plat_target_cpu_clock_set(cpu_clock_st);
+}