X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=frontend%2Fmenu.c;h=01b568e49e75a48b8fe1417a9784e0fbbbe58a64;hp=2f734464c71f2e1b1ecf776047899b3d27b17d64;hb=a80ae4a0353fce94df700ec84222d3c56c3d813a;hpb=17a54a4a45daf9eed7665c520301691d4f2b08f3 diff --git a/frontend/menu.c b/frontend/menu.c index 2f734464..01b568e4 100644 --- a/frontend/menu.c +++ b/frontend/menu.c @@ -22,7 +22,7 @@ #include "omap.h" #include "pandora.h" #include "pcnt.h" -#include "arm_utils.h" +#include "cspace.h" #include "common/plat.h" #include "common/input.h" #include "linux/in_evdev.h" @@ -65,12 +65,13 @@ typedef enum 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; +static int scaling, filter, cpu_clock, cpu_clock_st, volume_boost, frameskip; static char rom_fname_reload[MAXPATHLEN]; static char last_selected_fname[MAXPATHLEN]; static int warned_about_bios, region, in_type_sel1, in_type_sel2; @@ -159,6 +160,7 @@ static void menu_sync_config(void) } iVolume = 768 + 128 * volume_boost; + pl_rearmed_cbs.frameskip = frameskip - 1; pl_timing_prepare(Config.PsxType); } @@ -167,6 +169,7 @@ static void menu_set_defconfig(void) g_opts = 0; scaling = SCALE_4_3; volume_boost = 0; + frameskip = 0; region = 0; in_type_sel1 = in_type_sel2 = 0; @@ -175,7 +178,6 @@ static void menu_set_defconfig(void) Config.SpuIrq = Config.RCntFix = Config.VSyncWA = 0; Config.CdrReschedule = 0; - pl_rearmed_cbs.frameskip = 0; pl_rearmed_cbs.gpu_peops.iUseDither = 0; pl_rearmed_cbs.gpu_peops.dwActFixes = 1<<7; pl_rearmed_cbs.gpu_unai.abe_hack = @@ -210,6 +212,9 @@ static void menu_set_defconfig(void) #define CE_INTVAL_V(val, ver) \ { #val #ver, sizeof(val), &val } +#define CE_INTVAL_PV(val, ver) \ + { #val #ver, sizeof(pl_rearmed_cbs.val), &pl_rearmed_cbs.val } + static const struct { const char *name; size_t len; @@ -231,7 +236,7 @@ static const struct { CE_CONFIG_VAL(Cpu), CE_CONFIG_VAL(CdrReschedule), CE_INTVAL(region), - CE_INTVAL(scaling), + CE_INTVAL_V(scaling, 2), CE_INTVAL(g_layer_x), CE_INTVAL(g_layer_y), CE_INTVAL(g_layer_w), @@ -242,17 +247,17 @@ static const struct { CE_INTVAL(g_opts), CE_INTVAL(in_type_sel1), CE_INTVAL(in_type_sel2), - CE_INTVAL_P(frameskip), + CE_INTVAL_V(frameskip, 2), CE_INTVAL_P(gpu_peops.iUseDither), CE_INTVAL_P(gpu_peops.dwActFixes), CE_INTVAL_P(gpu_unai.abe_hack), CE_INTVAL_P(gpu_unai.no_light), CE_INTVAL_P(gpu_unai.no_blend), - CE_INTVAL(iUseReverb), - CE_INTVAL(iXAPitch), - CE_INTVAL_V(iUseInterpolation, 2), - CE_INTVAL_V(iSPUIRQWait, 2), - CE_INTVAL(iUseTimer), + 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(in_evdev_allow_abs_only), CE_INTVAL(volume_boost), @@ -606,6 +611,18 @@ static void apply_lcdrate(int pal) old = pal; } +static int get_bat_capacity(void) +{ + FILE *f; + int ret = 0; + f = fopen("/sys/class/power_supply/bq27500-0/capacity", "r"); + if (f) { + fscanf(f, "%d", &ret); + fclose(f); + } + return ret; +} + static menu_entry e_menu_gfx_options[]; static void pnd_menu_init(void) @@ -1003,7 +1020,7 @@ static int menu_loop_keyconfig(int id, int keys) // ------------ gfx options menu ------------ -static const char *men_scaler[] = { "1x1", "scaled 4:3", "fullscreen", "custom", NULL }; +static const char *men_scaler[] = { "1x1", "scaled 4:3", "integer 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 }; @@ -1239,6 +1256,7 @@ static int mh_restore_defaults(int id, int keys) } static const char *men_region[] = { "Auto", "NTSC", "PAL", NULL }; +static const char *men_frameskip[] = { "Auto", "Off", "1", 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" @@ -1252,7 +1270,7 @@ 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_onoff_h ("Frameskip", 0, pl_rearmed_cbs.frameskip, 1, h_frameskip), + mee_enum_h ("Frameskip", 0, frameskip, men_frameskip, h_frameskip), mee_onoff ("Show FPS", 0, g_opts, OPT_SHOWFPS), mee_enum ("Region", 0, region, men_region), mee_range ("CPU clock", MA_OPT_CPU_CLOCKS, cpu_clock, 20, 5000), @@ -1468,13 +1486,25 @@ void OnFile_Exit(); static void draw_frame_main(void) { + struct tm *tmp; + time_t ltime; + char ltime_s[16]; + char buff[64]; + if (CdromId[0] != 0) { - char buff[64]; snprintf(buff, sizeof(buff), "%.32s/%.9s (running as %s, with %s)", get_cd_label(), CdromId, Config.PsxType ? "PAL" : "NTSC", Config.HLE ? "HLE" : "BIOS"); smalltext_out16(4, 1, buff, 0x105f); } + + if (ready_to_go) { + ltime = time(NULL); + tmp = localtime(<ime); + strftime(ltime_s, sizeof(ltime_s), "%H:%M", tmp); + snprintf(buff, sizeof(buff), "%s %3d%%", ltime_s, get_bat_capacity()); + smalltext_out16(4, 1 + me_sfont_h, buff, 0x105f); + } } static void draw_frame_credits(void) @@ -1574,6 +1604,9 @@ static int run_cd_image(const char *fname) ready_to_go = 0; reload_plugins(fname); + // always autodetect, menu_sync_config will override as needed + Config.PsxAuto = 1; + if (CheckCdrom() == -1) { // Only check the CD if we are starting the console with a CD ClosePlugins(); @@ -1957,14 +1990,53 @@ void menu_init(void) void menu_notify_mode_change(int w, int h, int bpp) { + float mult; + int imult; + 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; + switch (scaling) { + case SCALE_1_1: g_layer_w = w; g_layer_h = h; + break; + + 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; + + case SCALE_4_3v2: + // 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; + + case SCALE_FULLSCREEN: + g_layer_w = g_menuscreen_w; + g_layer_h = g_menuscreen_h; + break; + + default: + break; } + + 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; } static void menu_leave_emu(void) @@ -2000,21 +2072,7 @@ void menu_prepare_emu(void) plat_video_menu_leave(); - 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; - } + menu_notify_mode_change(last_psx_w, last_psx_h, last_psx_bpp); psxCpu = (Config.Cpu == CPU_INTERPRETER) ? &psxInt : &psxRec; if (psxCpu != prev_cpu)