X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=frontend%2Fmain.c;h=b05893c963ac3771e75a507f0c869c6b8a571bd5;hp=884b6176c39a4d737704f5a510107bd5515a7476;hb=3c70c47bb2fa50066c4c3b23813253e03b8751fe;hpb=14dffdb7a0457fc647103deafa5f1cac12e888fb

diff --git a/frontend/main.c b/frontend/main.c
index 884b6176..b05893c9 100644
--- a/frontend/main.c
+++ b/frontend/main.c
@@ -15,9 +15,13 @@
 
 #include "plugin.h"
 #include "pcnt.h"
+#include "menu.h"
 #include "../gui/Linux.h"
 #include "../libpcsxcore/misc.h"
+#include "common/plat.h"
+#include "common/input.h"
 
+int ready_to_go;
 int UseGui;
 static char *(*real_getenv)(const char *name);
 
@@ -73,6 +77,8 @@ int main(int argc, char *argv[])
 	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) {
@@ -87,7 +93,6 @@ int main(int argc, char *argv[])
 
 	emuLog = stdout;
 	SetIsoFile(NULL);
-	Config.PsxOut = 1;
 
 	// read command line options
 	for (i = 1; i < argc; i++) {
@@ -184,45 +189,60 @@ int main(int argc, char *argv[])
 	chdir(plugin_default_dir);
 	g_free(plugin_default_dir);
 */
-	if (SysInit() == -1) return 1;
+	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();
+	// frontend stuff
+	in_init();
+	in_probe();
+	plat_init();
+	menu_init();
 
-		if (OpenPlugins() == -1) {
-			return 1;
-		}
+	if (LoadPlugins() == -1) {
+		SysMessage("Failed loading plugins!");
+		return 1;
+	}
+	pcnt_hook_plugins();
 
-		SysReset();
-		CheckCdrom();
+	if (OpenPlugins() == -1) {
+		return 1;
+	}
 
-		if (file[0] != '\0') {
-			Load(file);
-		} else {
-			if (runcd) {
-				if (LoadCdrom() == -1) {
-					ClosePlugins();
-					printf(_("Could not load CD-ROM!\n"));
-					return -1;
-				}
+	SysReset();
+	CheckCdrom();
+
+	if (file[0] != '\0') {
+		if (Load(file) != -1)
+			ready_to_go = 1;
+	} else {
+		if (runcd) {
+			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;
@@ -353,19 +373,6 @@ void SysPrintf(const char *fmt, ...) {
 	vsprintf(msg, fmt, list);
 	va_end(list);
 
-	if (Config.PsxOut) {
-		static char linestart = 1;
-		int l = strlen(msg);
-
-		printf(linestart ? " * %s" : "%s", msg);
-
-		if (l > 0 && msg[l - 1] == '\n') {
-			linestart = 1;
-		} else {
-			linestart = 0;
-		}
-	}
-
 	fprintf(emuLog, "%s", msg);
 }
 
@@ -389,7 +396,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);