claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #6046 from 86Box/feature/portable-mode

Browse Source 
Implement portable mode
This commit is contained in:
Miran Grča
2025-08-25 00:53:36 +02:00
committed by GitHub
parent c48220aa9e e3fe30cac5
commit e549a85755
5 changed files with 96 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/86box.c
View File

@@ -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];
@@ -753,8 +755,23 @@ pc_init(int argc, char *argv[])
path_get_dirname(exe_path, p);
#endif
path_normalize(exe_path);
path_slash(exe_path);
/*
* Determine if we are running in portable mode.
*
* We enable portable mode if the EXE path
* contains the global config file.
*/
path_append_filename(temp, exe_path, GLOBAL_CONFIG_FILE);
FILE *fp = fopen(temp, "r");
if (fp) {
portable_mode = 1;
fclose(fp);
}
/*
* Get the current working directory.
*
@@ -1096,6 +1113,10 @@ usage:
pclog("#\n# %ls v%ls logfile, created %s\n#\n",
EMU_NAME_W, EMU_VERSION_FULL_W, temp);
if (portable_mode) {
pclog("# Portable mode enabled.\n");
}
pclog("# Emulator path: %s\n", exe_path);
pclog("# Global configuration file: %s\n", global_cfg_path);

29
src/config.c
View File

@@ -140,10 +140,17 @@ load_global(void)
vmm_disabled = ini_section_get_int(cat, "vmm_disabled", 0);
p = ini_section_get_string(cat, "vmm_path", NULL);
if (p != NULL)
strncpy(vmm_path_cfg, p, sizeof(vmm_path_cfg) - 1);
else
if (p != NULL) {
/* Convert relative paths to absolute in portable mode */
if (portable_mode && !path_abs(p)) {
path_append_filename(vmm_path_cfg, exe_path, p);
path_normalize(vmm_path_cfg);
} else {
strncpy(vmm_path_cfg, p, sizeof(vmm_path_cfg) - 1);
}
} else {
plat_get_vmm_dir(vmm_path_cfg, sizeof(vmm_path_cfg));
}
}
/* Load "General" section. */
@@ -1620,7 +1627,7 @@ load_other_removable_devices(void)
sprintf(temp, "zip_%02i_image_path", c + 1);
p = ini_section_get_string(cat, temp, "");
sprintf(temp, "zip_%02i_writeprot", c + 1);
rdisk_drives[c].read_only = ini_section_get_int(cat, temp, 0);
ini_section_delete_var(cat, temp);
@@ -1724,7 +1731,7 @@ load_other_removable_devices(void)
sprintf(temp, "rdisk_%02i_image_path", c + 1);
p = ini_section_get_string(cat, temp, "");
sprintf(temp, "rdisk_%02i_writeprot", c + 1);
rdisk_drives[c].read_only = ini_section_get_int(cat, temp, 0);
ini_section_delete_var(cat, temp);
@@ -2213,10 +2220,16 @@ save_global(void)
else
ini_section_delete_var(cat, "vmm_disabled");
if (vmm_path_cfg[0] != 0)
ini_section_set_string(cat, "vmm_path", vmm_path_cfg);
else
if (vmm_path_cfg[0] != 0) {
/* Save path as relative to the EXE path in portable mode */
if (portable_mode && path_abs(vmm_path_cfg) && !strnicmp(vmm_path_cfg, exe_path, strlen(exe_path))) {
ini_section_set_string(cat, "vmm_path", &vmm_path_cfg[strlen(exe_path)]);
} else {
ini_section_set_string(cat, "vmm_path", vmm_path_cfg);
}
} else {
ini_section_delete_var(cat, "vmm_path");
}
}
/* Save "General" section. */

19
src/include/86box/86box.h
View File

@@ -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

45
src/qt/qt_platform.cpp
View File

@@ -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

16
src/unix/unix.c
View File

@@ -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