X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=frontend%2Fmain.c;h=b3a56c606d2963c242f0488f350ea7b35b01ea0e;hp=fd1c119862215ded0d80fae800b3ede6ec8ad5c6;hb=7e400e1c1d60c94128b3b44019be9e9ad52a033c;hpb=7139f3c8070e9aa14fd36c2451d7f10079caa37a

diff --git a/frontend/main.c b/frontend/main.c
index fd1c1198..b3a56c60 100644
--- a/frontend/main.c
+++ b/frontend/main.c
@@ -15,9 +15,14 @@
 
 #include "plugin.h"
 #include "pcnt.h"
+#include "menu.h"
 #include "../gui/Linux.h"
 #include "../libpcsxcore/misc.h"
+#include "../plugins/cdrcimg/cdrcimg.h"
+#include "common/plat.h"
+#include "common/input.h"
 
+int ready_to_go;
 int UseGui;
 static char *(*real_getenv)(const char *name);
 
@@ -51,15 +56,23 @@ static void CheckSubDir() {
 	create_profile_dir(PATCHES_DIR);
 }
 
-static void CreateMemcard(char *filename, char *conf_mcd) {
-	struct stat buf;
-
-	make_path(conf_mcd, MAXPATHLEN, MEMCARD_DIR, filename);
-
-	/* Only create a memory card if an existing one does not exist */
-	if (stat(conf_mcd, &buf) == -1) {
-		SysPrintf(_("Creating memory card: %s\n"), conf_mcd);
-		CreateMcd(conf_mcd);
+void set_cd_image(const char *fname)
+{
+	const char *ext;
+	int len;
+	
+	len = strlen(fname);
+	ext = fname;
+	if (len > 2)
+		ext = fname + len - 2;
+
+	if (strcasecmp(ext, ".z") == 0) {
+		SetIsoFile(NULL);
+		cdrcimg_set_fname(fname);
+		strcpy(Config.Cdr, "builtin_cdrcimg");
+	} else {
+		SetIsoFile(fname);
+		strcpy(Config.Cdr, "builtin_cdr");
 	}
 }
 
@@ -67,12 +80,14 @@ int main(int argc, char *argv[])
 {
 	char file[MAXPATHLEN] = "";
 	char path[MAXPATHLEN];
-	int runcd = 0;
+	const char *cdfile = NULL;
 	int loadst = 0;
 	void *tmp;
 	int i;
 
 	tmp = dlopen("/lib/libdl.so.2", RTLD_LAZY);
+	if (tmp == NULL)
+		tmp = dlopen("/lib32/libdl.so.2", RTLD_LAZY);
 	if (tmp != NULL)
 		real_getenv = dlsym(tmp, "getenv");
 	if (real_getenv == NULL) {
@@ -112,8 +127,7 @@ int main(int argc, char *argv[])
 					isofilename[0] = 0;
 			}
 
-			SetIsoFile(isofilename);
-			runcd = 1;
+			cdfile = isofilename;
 		}
 		else if (!strcmp(argv[i], "-h") ||
 			 !strcmp(argv[i], "-help") ||
@@ -150,6 +164,8 @@ int main(int argc, char *argv[])
 	CheckSubDir();
 //	ScanAllPlugins();
 
+	MAKE_PATH(Config.Mcd1, MEMCARD_DIR, "card1.mcd");
+	MAKE_PATH(Config.Mcd2, MEMCARD_DIR, "card2.mcd");
 	strcpy(Config.Bios, "HLE");
 	strcpy(Config.BiosDir, "./");
 
@@ -159,21 +175,7 @@ int main(int argc, char *argv[])
 	strcpy(Config.Cdr, "builtin_cdr");
 	strcpy(Config.Pad1, "builtin_pad");
 	strcpy(Config.Pad2, "builtin_pad");
-
-	// try to load config
-	// if the config file doesn't exist
-	if (LoadConfig() == -1) {
-		// Uh oh, no config file found, use some defaults
-		Config.PsxAuto = 1;
-
-		// create & load default memcards if they don't exist
-		CreateMemcard("card1.mcd", Config.Mcd1);
-		CreateMemcard("card2.mcd", Config.Mcd2);
-
-		LoadMcds(Config.Mcd1, Config.Mcd2);
-
-		SaveConfig();
-	}
+	Config.PsxAuto = 1;
 
 	snprintf(Config.PatchesDir, sizeof(Config.PatchesDir), "." PATCHES_DIR);
 /*
@@ -183,45 +185,64 @@ int main(int argc, char *argv[])
 	chdir(plugin_default_dir);
 	g_free(plugin_default_dir);
 */
-	if (SysInit() == -1) return 1;
 
-	// if !gui
-	{
-		// the following only occurs if the gui isn't started
-		if (LoadPlugins() == -1) {
-			SysMessage("Failed loading plugins!");
-			return 1;
-		}
-		pcnt_hook_plugins();
+	if (cdfile)
+		set_cd_image(cdfile);
 
-		if (OpenPlugins() == -1) {
-			return 1;
-		}
+	if (SysInit() == -1)
+		return 1;
 
-		SysReset();
-		CheckCdrom();
+	// frontend stuff
+	in_init();
+	in_probe();
+	plat_init();
+	menu_init();
 
-		if (file[0] != '\0') {
-			Load(file);
-		} else {
-			if (runcd) {
-				if (LoadCdrom() == -1) {
-					ClosePlugins();
-					printf(_("Could not load CD-ROM!\n"));
-					return -1;
-				}
+	if (LoadPlugins() == -1) {
+		SysMessage("Failed loading plugins!");
+		return 1;
+	}
+	pcnt_hook_plugins();
+
+	if (OpenPlugins() == -1) {
+		return 1;
+	}
+
+	SysReset();
+	CheckCdrom();
+
+	if (file[0] != '\0') {
+		if (Load(file) != -1)
+			ready_to_go = 1;
+	} else {
+		if (cdfile) {
+			if (LoadCdrom() == -1) {
+				ClosePlugins();
+				printf(_("Could not load CD-ROM!\n"));
+				return -1;
 			}
+			ready_to_go = 1;
 		}
+	}
 
-		// If a state has been specified, then load that
-		if (loadst) {
-			StatesC = loadst - 1;
-			char *state_filename = get_state_filename(StatesC);
-			LoadState(state_filename);
-			free(state_filename);
-		}
+	// If a state has been specified, then load that
+	if (loadst) {
+		StatesC = loadst - 1;
+		char *state_filename = get_state_filename(StatesC);
+		int ret = LoadState(state_filename);
+		printf("%s state %s\n", ret ? "failed to load" : "loaded", state_filename);
+		free(state_filename);
+	}
 
+	if (ready_to_go)
+		menu_prepare_emu();
+	else
+		menu_loop();
+
+	while (1)
+	{
 		psxCpu->Execute();
+		menu_loop();
 	}
 
 	return 0;
@@ -252,6 +273,9 @@ void StartGui() {
 
 void SysReset() {
 	EmuReset();
+
+	// hmh core forgets this
+	CDR_stop();
 }
 
 void SysClose() {
@@ -272,7 +296,9 @@ void UpdateMenuSlots() {
 }
 
 void OnFile_Exit() {
-        printf("OnFile_Exit\n");
+	printf("OnFile_Exit\n");
+	plat_finish();
+	SysClose();
 	exit(0);
 }
 
@@ -375,7 +401,8 @@ char *getenv(const char *name)
 {
 	static char ret[8] = ".";
 
-	if (name && strcmp(name, "HOME") == 0)
+	if (name && strcmp(name, "HOME") == 0 &&
+			((int)name >> 28) == 0) // HACK: let libs find home
 		return ret;
 
 	return real_getenv(name);
@@ -384,11 +411,13 @@ char *getenv(const char *name)
 
 /* we hook statically linked plugins here */
 static const char *builtin_plugins[] = {
-	"builtin_gpu", "builtin_spu", "builtin_cdr", "builtin_pad"
+	"builtin_gpu", "builtin_spu", "builtin_cdr", "builtin_pad",
+	"builtin_cdrcimg",
 };
 
 static const int builtin_plugin_ids[] = {
 	PLUGIN_GPU, PLUGIN_SPU, PLUGIN_CDR, PLUGIN_PAD,
+	PLUGIN_CDRCIMG,
 };
 
 void *SysLoadLibrary(const char *lib) {