From 156d6f8bc8a3dd4dbdd89a3148ab3f82bf86faf8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Hrdli=C4=8Dka?= <13226155+dhrdlicka@users.noreply.github.com> Date: Sun, 24 Aug 2025 20:49:16 +0200 Subject: [PATCH] Add provisions for portable mode to global dir functions --- src/86box.c | 2 ++ src/include/86box/86box.h | 19 +++++++++++------ src/qt/qt_platform.cpp | 45 ++++++++++++++++++++++++++++----------- src/unix/unix.c | 16 ++++++++------ 4 files changed, 56 insertions(+), 26 deletions(-) diff --git a/src/86box.c b/src/86box.c index 36638687a..baf0a32ea 100644 --- a/src/86box.c +++ b/src/86box.c @@ -228,6 +228,8 @@ int other_scsi_present = 0; /* SCSI contro present */ int is_pcjr = 0; /* The current machine is PCjr. */ +int portable_mode = 0; /* We are running in portable mode + (global dirs = exe path) */ // Accelerator key array struct accelKey acc_keys[NUM_ACCELS]; diff --git a/src/include/86box/86box.h b/src/include/86box/86box.h index 175b5b302..2906cf31f 100644 --- a/src/include/86box/86box.h +++ b/src/include/86box/86box.h @@ -42,6 +42,8 @@ #define GLOBAL_CONFIG_FILE "86box_global.cfg" #define NVR_PATH "nvr" #define SCREENSHOT_PATH "screenshots" +#define VMM_PATH "Virtual Machines" +#define VMM_PATH_WINDOWS "86Box VMs" /* Recently used images */ #define MAX_PREV_IMAGES 10 @@ -188,14 +190,17 @@ extern int hook_enabled; /* (C) Keyboard hook is enabled */ extern int vmm_disabled; /* (G) disable built-in manager */ extern char vmm_path_cfg[1024]; /* (G) VMs path (unless -E is used) */ -extern char exe_path[2048]; /* path (dir) of executable */ -extern char usr_path[1024]; /* path (dir) of user data */ -extern char cfg_path[1024]; /* full path of config file */ +extern char exe_path[2048]; /* path (dir) of executable */ +extern char usr_path[1024]; /* path (dir) of user data */ +extern char cfg_path[1024]; /* full path of config file */ extern char global_cfg_path[1024]; /* full path of global config file */ -extern int open_dir_usr_path; /* default file open dialog directory of usr_path */ -extern char uuid[MAX_UUID_LEN]; /* UUID or machine identifier */ -extern char vmm_path[1024]; /* VM Manager path to scan */ -extern int start_vmm; +extern int open_dir_usr_path; /* default file open dialog directory of usr_path */ +extern char uuid[MAX_UUID_LEN]; /* UUID or machine identifier */ +extern char vmm_path[1024]; /* VM Manager path to scan */ +extern int start_vmm; /* the current execution will start the manager */ +extern int portable_mode /* we are running in portable mode + (global dirs = exe path) */ + #ifndef USE_NEW_DYNAREC extern FILE *stdlog; /* file to log output to */ #endif diff --git a/src/qt/qt_platform.cpp b/src/qt/qt_platform.cpp index 0de5d840c..653926071 100644 --- a/src/qt/qt_platform.cpp +++ b/src/qt/qt_platform.cpp @@ -668,25 +668,37 @@ plat_chdir(char *path) void plat_get_global_config_dir(char *outbuf, const size_t len) { - const auto dir = QDir(QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation)); - if (!dir.exists()) { - if (!dir.mkpath(".")) { - qWarning("Failed to create global configuration directory %s", dir.absolutePath().toUtf8().constData()); + if (portable_mode) { + strncpy(outbuf, exe_path, len); + } else { + const auto dir = QDir(QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation)); + if (!dir.exists()) { + if (!dir.mkpath(".")) { + qWarning("Failed to create global configuration directory %s", dir.absolutePath().toUtf8().constData()); + } } + strncpy(outbuf, dir.canonicalPath().toUtf8().constData(), len); } - strncpy(outbuf, dir.canonicalPath().toUtf8().constData(), len); + + path_slash(outbuf); } void plat_get_global_data_dir(char *outbuf, const size_t len) { - const auto dir = QDir(QStandardPaths::writableLocation(QStandardPaths::AppDataLocation)); - if (!dir.exists()) { - if (!dir.mkpath(".")) { - qWarning("Failed to create global data directory %s", dir.absolutePath().toUtf8().constData()); + if (portable_mode) { + strncpy(outbuf, exe_path, len); + } else { + const auto dir = QDir(QStandardPaths::writableLocation(QStandardPaths::AppDataLocation)); + if (!dir.exists()) { + if (!dir.mkpath(".")) { + qWarning("Failed to create global data directory %s", dir.absolutePath().toUtf8().constData()); + } } + strncpy(outbuf, dir.canonicalPath().toUtf8().constData(), len); } - strncpy(outbuf, dir.canonicalPath().toUtf8().constData(), len); + + path_slash(outbuf); } void @@ -694,17 +706,26 @@ plat_get_temp_dir(char *outbuf, const uint8_t len) { const auto dir = QDir(QStandardPaths::writableLocation(QStandardPaths::TempLocation)); strncpy(outbuf, dir.canonicalPath().toUtf8().constData(), len); + path_slash(outbuf); } void plat_get_vmm_dir(char *outbuf, const size_t len) { + QString path; + + if (portable_mode) { + path = QDir(exe_path).filePath(VMM_PATH); + } else { #ifdef Q_OS_WINDOWS - const auto path = QDir::home().filePath("86Box VMs"); + path = QDir::home().filePath(VMM_PATH_WINDOWS); #else - const auto path = QDir(QStandardPaths::writableLocation(QStandardPaths::AppDataLocation)).filePath("Virtual Machines"); + path = QDir(QStandardPaths::writableLocation(QStandardPaths::AppDataLocation)).filePath(VMM_PATH); #endif + } + strncpy(outbuf, path.toUtf8().constData(), len); + path_slash(outbuf); } void diff --git a/src/unix/unix.c b/src/unix/unix.c index bc9b9fedf..b4d6daa17 100644 --- a/src/unix/unix.c +++ b/src/unix/unix.c @@ -875,19 +875,21 @@ plat_init_rom_paths(void) void plat_get_global_config_dir(char *outbuf, const size_t len) { - char *prefPath = SDL_GetPrefPath(NULL, "86Box"); - strncpy(outbuf, prefPath, len); - path_slash(outbuf); - SDL_free(prefPath); + return plat_get_global_data_dir(outbuf, len); } void plat_get_global_data_dir(char *outbuf, const size_t len) { - char *prefPath = SDL_GetPrefPath(NULL, "86Box"); - strncpy(outbuf, prefPath, len); + if (portable_mode) { + strncpy(outbuf, exe_path, len); + } else { + char *prefPath = SDL_GetPrefPath(NULL, "86Box"); + strncpy(outbuf, prefPath, len); + SDL_free(prefPath); + } + path_slash(outbuf); - SDL_free(prefPath); } void