Add a new "auto-pause" and "pause on reset" (dbg) setting.

This commit also revamps how settings are ordered and laid out.
hades-emu · Mar 6, 2024 · 18771b8 · 18771b8
1 parent 3362dba
commit 18771b8
Show file tree

Hide file tree

Showing 8 changed files with 388 additions and 293 deletions.
diff --git a/include/app/app.h b/include/app/app.h
@@ -162,6 +162,12 @@ struct app {
         // Skip BIOS
         bool skip_bios;
 
+        // Automatically pause the game when the window looses focus
+        bool auto_pause;
+
+        // Pause immediately after resetting the game
+        bool pause_on_reset;
+
         // Backup storage
         struct {
             bool autodetect;
@@ -424,7 +430,7 @@ void app_config_push_recent_rom(struct app *app, char const *path);
 
 /* emulator.c */
 void app_emulator_process_all_notifs(struct app *app);
-bool app_emulator_configure(struct app *app, char const *rom_path);
+bool app_emulator_configure_and_run(struct app *app, char const *rom_path);
 void app_emulator_reset(struct app *app);
 void app_emulator_stop(struct app *app);
 void app_emulator_run(struct app *app);

diff --git a/source/app/bindings.c b/source/app/bindings.c
@@ -166,7 +166,7 @@ app_bindings_handle(
         case BIND_EMULATOR_QUICKSAVE:           app_emulator_quicksave(app, 0); break;
         case BIND_EMULATOR_QUICKLOAD:           app_emulator_quickload(app, 0); break;
         case BIND_EMULATOR_PAUSE:               app->emulation.is_running ? app_emulator_pause(app) : app_emulator_run(app); break;
-        case BIND_EMULATOR_RESET:               app_emulator_reset(app); app_emulator_run(app); break;
+        case BIND_EMULATOR_RESET:               app_emulator_reset(app); break;
         default: break;
     }
 }
diff --git a/source/app/config.c b/source/app/config.c
@@ -94,6 +94,14 @@ app_config_load(
         if (mjson_get_bool(data, data_len, "$.emulation.skip_bios", &b)) {
             app->emulation.skip_bios = b;
         }
+
+        if (mjson_get_bool(data, data_len, "$.emulation.auto_pause", &b)) {
+            app->emulation.auto_pause = b;
+        }
+
+        if (mjson_get_bool(data, data_len, "$.emulation.pause_on_reset", &b)) {
+            app->emulation.pause_on_reset = b;
+        }
     }
 
     // Video
@@ -251,7 +259,9 @@ app_config_save(
                 "rtc": {
                     "autodetect": %B,
                     "enabled": %B
-                }
+                },
+                "auto_pause": %B,
+                "pause_on_reset": %B
             },
 
             // Video
@@ -283,6 +293,8 @@ app_config_save(
         (int)app->emulation.backup_storage.type,
         (int)app->emulation.rtc.autodetect,
         (int)app->emulation.rtc.enabled,
+        (int)app->emulation.auto_pause,
+        (int)app->emulation.pause_on_reset,
         (int)app->video.display_size,
         (int)app->video.aspect_ratio,
         (int)app->video.vsync,

diff --git a/source/app/emulator.c b/source/app/emulator.c
@@ -468,9 +468,10 @@ app_emulator_configure_backup(
 **   - Update the gba's launch configuration
 **   - Reset the emulator
 **   - Wait for the reset notification
+**   - Run/Pause the emulator, according to the configuration
 */
 bool
-app_emulator_configure(
+app_emulator_configure_and_run(
     struct app *app,
     char const *rom_path
 ) {
@@ -601,6 +602,12 @@ app_emulator_configure(
 
     logln(HS_INFO, "Game successfully loaded.");
 
+    if (app->emulation.pause_on_reset) {
+        app_emulator_pause(app);
+    } else {
+        app_emulator_run(app);
+    }
+
     return (false);
 }
 
@@ -614,7 +621,7 @@ app_emulator_reset(
     char *game_path;
 
     game_path = strdup(app->emulation.game_path);
-    app_emulator_configure(app, game_path);
+    app_emulator_configure_and_run(app, game_path);
     free(game_path);
 }
 

diff --git a/source/app/main.c b/source/app/main.c
@@ -117,14 +117,7 @@ main(
     );
 
     if (app.args.rom_path) {
-        app_emulator_configure(&app, app.args.rom_path);
-        if (app.emulation.launch_config) {
-#ifdef WITH_DEBUGGER
-            app_emulator_pause(&app);
-#else
-            app_emulator_run(&app);
-#endif
-        }
+        app_emulator_configure_and_run(&app, app.args.rom_path);
     }
 
 #ifdef WITH_DEBUGGER

diff --git a/source/app/sdl/event.c b/source/app/sdl/event.c
@@ -76,6 +76,18 @@ app_sdl_handle_events(
                         }
                         break;
                     };
+                    case SDL_WINDOWEVENT_FOCUS_GAINED: {
+                        if (app->emulation.auto_pause && app->emulation.is_started && !app->emulation.is_running) {
+                            app_emulator_run(app);
+                        }
+                        break;
+                    };
+                    case SDL_WINDOWEVENT_FOCUS_LOST: {
+                        if (app->emulation.auto_pause && app->emulation.is_started && app->emulation.is_running) {
+                            app_emulator_pause(app);
+                        }
+                        break;
+                    };
                 }
                 break;
             };

diff --git a/source/app/windows/menubar.c b/source/app/windows/menubar.c
@@ -36,9 +36,7 @@ app_win_menubar_file(
             );
 
             if (result == NFD_OKAY) {
-                if (!app_emulator_configure(app, path)) {
-                    app_emulator_run(app);
-                }
+                app_emulator_configure_and_run(app, path);
                 NFD_FreePath(path);
             }
         }
@@ -50,13 +48,11 @@ app_win_menubar_file(
                 if (igMenuItem_Bool(hs_basename(app->file.recent_roms[x]), NULL, false, true)) {
                     char *path;
 
-                    // app->file.recent_roms[] is modified by `app_emulator_configure()` so we need to copy
+                    // app->file.recent_roms[] is modified by `app_emulator_configure_and_run()` so we need to copy
                     // the path to a safe space first.
                     path = strdup(app->file.recent_roms[x]);
 
-                    if (!app_emulator_configure(app, path)) {
-                        app_emulator_run(app);
-                    }
+                    app_emulator_configure_and_run(app, path);
 
                     free(path);
                 }
@@ -199,7 +195,6 @@ app_win_menubar_emulation(
         bind = SDL_GetKeyName(app->binds.keyboard[BIND_EMULATOR_RESET]);
         if (igMenuItem_Bool("Reset", bind ?: "", false, app->emulation.is_started)) {
             app_emulator_reset(app);
-            app_emulator_run(app);
         }
 
         igSeparator();