frontend: change how exit is done

[pcsx_rearmed.git] / frontend / main.c

diff --git a/frontend/main.c b/frontend/main.c
index 8b35b09..df2af8f 100644 (file)
--- a/frontend/main.c
+++ b/frontend/main.c
@@ -33,6 +33,8 @@
 #include "libpicofe/readpng.h"
 
 static void toggle_fast_forward(int force_off);
+static void check_profile(void);
+static void check_memcards(void);
 #endif
 #ifndef BOOT_MSG
 #define BOOT_MSG "Booting up..."
@@ -48,7 +50,7 @@ extern int iUseInterpolation;
 extern int iXAPitch;
 extern int iVolume;
 
-int ready_to_go, g_resetting;
+int ready_to_go, g_emu_want_quit, g_emu_resetting;
 unsigned long gpuDisp;
 char cfgfile_basename[MAXPATHLEN];
 int state_slot;
@@ -66,28 +68,6 @@ static void make_path(char *buf, size_t size, const char *dir, const char *fname
 #define MAKE_PATH(buf, dir, fname) \
        make_path(buf, sizeof(buf), dir, fname)
 
-static void create_profile_dir(const char *directory) {
-       char path[MAXPATHLEN];
-
-       MAKE_PATH(path, directory, NULL);
-       mkdir(path, S_IRWXU | S_IRWXG);
-}
-
-static void CheckSubDir() {
-       // make sure that ~/.pcsx exists
-       create_profile_dir(PCSX_DOT_DIR);
-
-       create_profile_dir(BIOS_DIR);
-       create_profile_dir(MEMCARD_DIR);
-       create_profile_dir(STATES_DIR);
-       create_profile_dir(PLUGINS_DIR);
-       create_profile_dir(PLUGINS_CFG_DIR);
-       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;
@@ -126,9 +106,12 @@ void set_cd_image(const char *fname)
 
 static void set_default_paths(void)
 {
+#ifndef NO_FRONTEND
+       snprintf(Config.PatchesDir, sizeof(Config.PatchesDir), "." PATCHES_DIR);
        MAKE_PATH(Config.Mcd1, MEMCARD_DIR, "card1.mcd");
        MAKE_PATH(Config.Mcd2, MEMCARD_DIR, "card2.mcd");
        strcpy(Config.BiosDir, "bios");
+#endif
 
        strcpy(Config.PluginsDir, "plugins");
        strcpy(Config.Gpu, "builtin_gpu");
@@ -137,8 +120,6 @@ static void set_default_paths(void)
        strcpy(Config.Pad1, "builtin_pad");
        strcpy(Config.Pad2, "builtin_pad");
        strcpy(Config.Net, "Disabled");
-
-       snprintf(Config.PatchesDir, sizeof(Config.PatchesDir), "." PATCHES_DIR);
 }
 
 void emu_set_default_config(void)
@@ -175,25 +156,6 @@ void emu_set_default_config(void)
        in_type2 = PSE_PAD_TYPE_STANDARD;
 }
 
-static void check_memcards(void)
-{
-       char buf[MAXPATHLEN];
-       FILE *f;
-       int i;
-
-       for (i = 1; i <= 9; i++) {
-               snprintf(buf, sizeof(buf), ".%scard%d.mcd", MEMCARD_DIR, i);
-
-               f = fopen(buf, "rb");
-               if (f == NULL) {
-                       SysPrintf("Creating memcard: %s\n", buf);
-                       CreateMcd(buf);
-               }
-               else
-                       fclose(f);
-       }
-}
-
 void do_emu_action(void)
 {
        int ret;
@@ -456,8 +418,10 @@ int emu_core_init(void)
 {
        SysPrintf("Starting PCSX-ReARMed " REV "\n");
 
-       CheckSubDir();
+#ifndef NO_FRONTEND
+       check_profile();
        check_memcards();
+#endif
 
        if (EmuInit() == -1) {
                SysPrintf("PSX emulator couldn't be initialized.\n");
@@ -473,7 +437,54 @@ int emu_core_init(void)
        return 0;
 }
 
+void emu_core_ask_exit(void)
+{
+       stop = 1;
+       g_emu_want_quit = 1;
+}
+
 #ifndef NO_FRONTEND
+static void create_profile_dir(const char *directory) {
+       char path[MAXPATHLEN];
+
+       MAKE_PATH(path, directory, NULL);
+       mkdir(path, S_IRWXU | S_IRWXG);
+}
+
+static void check_profile(void) {
+       // make sure that ~/.pcsx exists
+       create_profile_dir(PCSX_DOT_DIR);
+
+       create_profile_dir(BIOS_DIR);
+       create_profile_dir(MEMCARD_DIR);
+       create_profile_dir(STATES_DIR);
+       create_profile_dir(PLUGINS_DIR);
+       create_profile_dir(PLUGINS_CFG_DIR);
+       create_profile_dir(CHEATS_DIR);
+       create_profile_dir(PATCHES_DIR);
+       create_profile_dir(PCSX_DOT_DIR "cfg");
+       create_profile_dir("/screenshots/");
+}
+
+static void check_memcards(void)
+{
+       char buf[MAXPATHLEN];
+       FILE *f;
+       int i;
+
+       for (i = 1; i <= 9; i++) {
+               snprintf(buf, sizeof(buf), ".%scard%d.mcd", MEMCARD_DIR, i);
+
+               f = fopen(buf, "rb");
+               if (f == NULL) {
+                       SysPrintf("Creating memcard: %s\n", buf);
+                       CreateMcd(buf);
+               }
+               else
+                       fclose(f);
+       }
+}
+
 int main(int argc, char *argv[])
 {
        char file[MAXPATHLEN] = "";
@@ -617,7 +628,7 @@ int main(int argc, char *argv[])
 
        pl_start_watchdog();
 
-       while (1)
+       while (!g_emu_want_quit)
        {
                stop = 0;
                emu_action = SACTION_NONE;
@@ -627,6 +638,12 @@ int main(int argc, char *argv[])
                        do_emu_action();
        }
 
+       printf("Exit..\n");
+       ClosePlugins();
+       SysClose();
+       menu_finish();
+       plat_finish();
+
        return 0;
 }
 
@@ -679,7 +696,7 @@ void SysReset() {
        // so we need to prevent updateLace() call..
        void *real_lace = GPU_updateLace;
        GPU_updateLace = dummy_lace;
-       g_resetting = 1;
+       g_emu_resetting = 1;
 
        // reset can run code, timing must be set
        pl_timing_prepare(Config.PsxType);
@@ -690,7 +707,7 @@ void SysReset() {
        CDR_stop();
 
        GPU_updateLace = real_lace;
-       g_resetting = 0;
+       g_emu_resetting = 0;
 }
 
 void SysClose() {
@@ -699,22 +716,15 @@ void SysClose() {
 
        StopDebugger();
 
-       if (emuLog != NULL) fclose(emuLog);
+       if (emuLog != NULL && emuLog != stdout && emuLog != stderr) {
+               fclose(emuLog);
+               emuLog = NULL;
+       }
 }
 
 void SysUpdate() {
 }
 
-void OnFile_Exit() {
-       printf("OnFile_Exit\n");
-       SysClose();
-#ifndef NO_FRONTEND
-       menu_finish();
-       plat_finish();
-       exit(0);
-#endif
-}
-
 int get_state_filename(char *buf, int size, int i) {
        return get_gameid_filename(buf, size,
                "." STATES_DIR "%.32s-%.9s.%3.3d", i);
@@ -804,8 +814,7 @@ void SysMessage(const char *fmt, ...) {
 }
 
 static void SignalExit(int sig) {
-       ClosePlugins();
-       OnFile_Exit();
+       emu_core_ask_exit();
 }
 
 #define PARSEPATH(dst, src) \