X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=frontend%2Fmain.c;h=1030a326ae6c2e5758d8d7439898d15c9a308bca;hp=37c9ba32969ef78951c7b5d4d2cfa786cbb57029;hb=ef94866c5ee97402b81a173093c0be4ca0daa4a0;hpb=6fe1f05632f22ddba1d19814e2b14454e8e51940 diff --git a/frontend/main.c b/frontend/main.c index 37c9ba32..1030a326 100644 --- a/frontend/main.c +++ b/frontend/main.c @@ -13,6 +13,7 @@ #include #include #include +#include #include "main.h" #include "plugin.h" @@ -20,14 +21,23 @@ #include "pcnt.h" #include "menu.h" #include "../libpcsxcore/misc.h" +#include "../libpcsxcore/new_dynarec/new_dynarec.h" #include "../plugins/cdrcimg/cdrcimg.h" #include "common/plat.h" #include "common/input.h" +#include "common/readpng.h" int ready_to_go; unsigned long gpuDisp; char cfgfile_basename[MAXPATHLEN]; static char *(*real_getenv)(const char *name); +int state_slot; +enum sched_action emu_action, emu_action_old; +char hud_msg[64]; +int hud_new_msg; + +// from softgpu plugin +extern int UseFrameSkip; static void make_path(char *buf, size_t size, const char *dir, const char *fname) { @@ -58,20 +68,36 @@ static void CheckSubDir() { create_profile_dir(CHEATS_DIR); create_profile_dir(PATCHES_DIR); create_profile_dir(PCSX_DOT_DIR "cfg"); + create_profile_dir("/screenshots/"); +} + +static int get_gameid_filename(char *buf, int size, const char *fmt, int i) { + char trimlabel[33]; + int j; + + strncpy(trimlabel, CdromLabel, 32); + trimlabel[32] = 0; + for (j = 31; j >= 0; j--) + if (trimlabel[j] == ' ') + trimlabel[j] = 0; + else + continue; + + snprintf(buf, size, fmt, trimlabel, CdromId, i); + + return 0; } void set_cd_image(const char *fname) { const char *ext = NULL; - if (fname != NULL) { - int len = strlen(fname); - ext = fname; - if (len > 2) - ext = fname + len - 2; - } + if (fname != NULL) + ext = strrchr(fname, '.'); - if (ext && strcasecmp(ext, ".z") == 0) { + if (ext && ( + strcasecmp(ext, ".z") == 0 || strcasecmp(ext, ".bz") == 0 || + strcasecmp(ext, ".znx") == 0 || strcasecmp(ext, ".pbp") == 0)) { SetIsoFile(NULL); cdrcimg_set_fname(fname); strcpy(Config.Cdr, "builtin_cdrcimg"); @@ -99,14 +125,74 @@ static void set_default_paths(void) snprintf(Config.PatchesDir, sizeof(Config.PatchesDir), "." PATCHES_DIR); } +void do_emu_action(void) +{ + char buf[MAXPATHLEN]; + int ret; + + emu_action_old = emu_action; + + switch (emu_action) { + case SACTION_NONE: + return; + case SACTION_ENTER_MENU: + menu_loop(); + return; + case SACTION_LOAD_STATE: + ret = emu_load_state(state_slot); + snprintf(hud_msg, sizeof(hud_msg), ret == 0 ? "LOADED" : "FAIL!"); + break; + case SACTION_SAVE_STATE: + ret = emu_save_state(state_slot); + snprintf(hud_msg, sizeof(hud_msg), ret == 0 ? "SAVED" : "FAIL!"); + break; + case SACTION_NEXT_SSLOT: + state_slot++; + if (state_slot > 9) + state_slot = 0; + goto do_state_slot; + case SACTION_PREV_SSLOT: + state_slot--; + if (state_slot < 0) + state_slot = 9; + goto do_state_slot; + case SACTION_TOGGLE_FSKIP: + UseFrameSkip ^= 1; + snprintf(hud_msg, sizeof(hud_msg), "FRAMESKIP %s", + UseFrameSkip ? "ON" : "OFF"); + break; + case SACTION_SCREENSHOT: + { + void *scrbuf; + int w, h, bpp; + time_t t = time(NULL); + struct tm *tb = localtime(&t); + int ti = tb->tm_yday * 1000000 + tb->tm_hour * 10000 + + tb->tm_min * 100 + tb->tm_sec; + + scrbuf = pl_prepare_screenshot(&w, &h, &bpp); + get_gameid_filename(buf, sizeof(buf), + "screenshots/%.32s-%.9s.%d.png", ti); + ret = -1; + if (scrbuf != 0 && bpp == 16) + ret = writepng(buf, scrbuf, w, h); + if (ret == 0) + snprintf(hud_msg, sizeof(hud_msg), "SCREENSHOT TAKEN"); + break; + } + } + hud_new_msg = 3; + return; + +do_state_slot: + snprintf(hud_msg, sizeof(hud_msg), "STATE SLOT %d [%s]", state_slot, + emu_check_state(state_slot) == 0 ? "USED" : "FREE"); + hud_new_msg = 3; +} + int main(int argc, char *argv[]) { - char file[MAXPATHLEN] = ""; - char path[MAXPATHLEN]; - const char *cdfile = NULL; - int loadst = 0; void *tmp; - int i; tmp = dlopen("/lib/libdl.so.2", RTLD_LAZY); if (tmp == NULL) @@ -126,6 +212,22 @@ int main(int argc, char *argv[]) emuLog = stdout; SetIsoFile(NULL); + memset(&Config, 0, sizeof(Config)); + + CheckSubDir(); + set_default_paths(); + strcpy(Config.Bios, "HLE"); + +#ifdef MAEMO + extern int maemo_main(int argc, char **argv); + return maemo_main(argc, argv); +#else + char file[MAXPATHLEN] = ""; + char path[MAXPATHLEN]; + const char *cdfile = NULL; + int loadst = 0; + int i; + // read command line options for (i = 1; i < argc; i++) { if (!strcmp(argv[i], "-psxout")) Config.PsxOut = 1; @@ -181,12 +283,6 @@ int main(int argc, char *argv[]) } } - memset(&Config, 0, sizeof(PcsxConfig)); - - CheckSubDir(); - set_default_paths(); - strcpy(Config.Bios, "HLE"); - if (cdfile) set_cd_image(cdfile); @@ -195,7 +291,7 @@ int main(int argc, char *argv[]) // frontend stuff in_init(); - in_probe(); + //in_probe(); plat_init(); menu_init(); @@ -232,17 +328,15 @@ int main(int argc, char *argv[]) } } - // If a state has been specified, then load that - if (loadst) { - char state_filename[MAXPATHLEN]; - int ret = get_state_filename(state_filename, sizeof(state_filename), loadst - 1); - if (ret == 0) - ret = LoadState(state_filename); - printf("%s state %s\n", ret ? "failed to load" : "loaded", state_filename); - } - - if (ready_to_go) + if (ready_to_go) { menu_prepare_emu(); + + // If a state has been specified, then load that + if (loadst) { + int ret = emu_load_state(loadst - 1); + printf("%s state %d\n", ret ? "failed to load" : "loaded", loadst); + } + } else menu_loop(); @@ -250,11 +344,16 @@ int main(int argc, char *argv[]) while (1) { + stop = 0; + emu_action = SACTION_NONE; + psxCpu->Execute(); - menu_loop(); + if (emu_action != SACTION_NONE) + do_emu_action(); } return 0; +#endif } int SysInit() { @@ -313,28 +412,53 @@ void SysUpdate() { void OnFile_Exit() { printf("OnFile_Exit\n"); +#ifndef MAEMO menu_finish(); - plat_finish(); +#endif SysClose(); + plat_finish(); exit(0); } int get_state_filename(char *buf, int size, int i) { - char trimlabel[33]; - int j; + return get_gameid_filename(buf, size, + "." STATES_DIR "%.32s-%.9s.%3.3d", i); +} - strncpy(trimlabel, CdromLabel, 32); - trimlabel[32] = 0; - for (j = 31; j >= 0; j--) - if (trimlabel[j] == ' ') - trimlabel[j] = 0; - else - continue; +int emu_check_state(int slot) +{ + char fname[MAXPATHLEN]; + int ret; - snprintf(buf, size, "." STATES_DIR "%.32s-%.9s.%3.3d", - trimlabel, CdromId, i); + ret = get_state_filename(fname, sizeof(fname), slot); + if (ret != 0) + return ret; - return 0; + return CheckState(fname); +} + +int emu_save_state(int slot) +{ + char fname[MAXPATHLEN]; + int ret; + + ret = get_state_filename(fname, sizeof(fname), slot); + if (ret != 0) + return ret; + + return SaveState(fname); +} + +int emu_load_state(int slot) +{ + char fname[MAXPATHLEN]; + int ret; + + ret = get_state_filename(fname, sizeof(fname), slot); + if (ret != 0) + return ret; + + return LoadState(fname); } void SysPrintf(const char *fmt, ...) {