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

diff --git a/frontend/main.c b/frontend/main.c
index fd1c1198..bbcd7e41 100644
--- a/frontend/main.c
+++ b/frontend/main.c
@@ -17,7 +17,11 @@
 #include "pcnt.h"
 #include "../gui/Linux.h"
 #include "../libpcsxcore/misc.h"
+#include "common/menu.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) {
@@ -183,45 +189,58 @@ 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_loop();
+
+	while (1)
+	{
 		psxCpu->Execute();
+		menu_loop();
 	}
 
 	return 0;
@@ -375,7 +394,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);