X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=frontend%2Fmain.c;h=29d2c2579d68dbf8d5f38713c42d4f74db0c44ac;hp=53e3674a540d521ce43f6e8a5a7ac9ad88fb090f;hb=ea66e8840b75b0284f192e6fa068857b91ef08eb;hpb=456f1b86b44a631e7c58e42ae72ce07970843944

diff --git a/frontend/main.c b/frontend/main.c
index 53e3674a..29d2c257 100644
--- a/frontend/main.c
+++ b/frontend/main.c
@@ -1,5 +1,5 @@
 /*
- * (C) notaz, 2010-2011
+ * (C) notaz, 2010-2012
  *
  * This work is licensed under the terms of the GNU GPLv2 or later.
  * See the COPYING file in the top-level directory.
@@ -32,6 +32,9 @@
 #include "libpicofe/plat.h"
 #include "libpicofe/readpng.h"
 #endif
+#ifndef BOOT_MSG
+#define BOOT_MSG "Booting up..."
+#endif
 
 // don't include debug.h - it breaks ARM build (R1 redefined)
 void StartDebugger();
@@ -249,6 +252,22 @@ do_state_slot:
 		toggle_fast_forward(0);
 		plugin_call_rearmed_cbs();
 		break;
+	case SACTION_TOGGLE_FPS:
+		if ((g_opts & (OPT_SHOWFPS|OPT_SHOWCPU))
+		    == (OPT_SHOWFPS|OPT_SHOWCPU))
+			g_opts &= ~(OPT_SHOWFPS|OPT_SHOWCPU);
+		else if (g_opts & OPT_SHOWFPS)
+			g_opts |= OPT_SHOWCPU;
+		else
+			g_opts |= OPT_SHOWFPS;
+		break;
+	case SACTION_TOGGLE_FULLSCREEN:
+		g_fullscreen = !g_fullscreen;
+		if (GPU_open != NULL && GPU_close != NULL) {
+			GPU_close();
+			GPU_open(&gpuDisp, "PCSX", NULL);
+		}
+		break;
 	case SACTION_SCREENSHOT:
 		{
 			char buf[MAXPATHLEN];
@@ -393,7 +412,7 @@ out:
 	fclose(f);
 }
 
-void emu_on_new_cd(void)
+void emu_on_new_cd(int show_hud_msg)
 {
 	ClearAllCheats();
 	parse_cwcheat();
@@ -403,8 +422,10 @@ void emu_on_new_cd(void)
 		printf("----------------------------------------------------------\n");
 	}
 
-	snprintf(hud_msg, sizeof(hud_msg), "Booting up...");
-	hud_new_msg = 2;
+	if (show_hud_msg) {
+		snprintf(hud_msg, sizeof(hud_msg), BOOT_MSG);
+		hud_new_msg = 3;
+	}
 }
 
 int emu_core_preinit(void)
@@ -560,11 +581,17 @@ int main(int argc, char *argv[])
 				printf(_("Could not load CD-ROM!\n"));
 				return -1;
 			}
-			emu_on_new_cd();
+			emu_on_new_cd(!loadst);
 			ready_to_go = 1;
 		}
 	}
 
+	if (loadst_f) {
+		int ret = LoadState(loadst_f);
+		printf("%s state file: %s\n", ret ? "failed to load" : "loaded", loadst_f);
+		ready_to_go |= ret == 0;
+	}
+
 	if (ready_to_go) {
 		menu_prepare_emu();
 
@@ -573,10 +600,6 @@ int main(int argc, char *argv[])
 			int ret = emu_load_state(loadst - 1);
 			printf("%s state %d\n", ret ? "failed to load" : "loaded", loadst);
 		}
-		if (loadst_f) {
-			int ret = LoadState(loadst_f);
-			printf("%s state file: %s\n", ret ? "failed to load" : "loaded", loadst_f);
-		}
 	}
 	else
 		menu_loop();
@@ -718,6 +741,8 @@ int emu_load_state(int slot)
 	char fname[MAXPATHLEN];
 	int ret;
 
+	hud_msg[0] = 0;
+
 	ret = get_state_filename(fname, sizeof(fname), slot);
 	if (ret != 0)
 		return ret;