From 3bcd89b864fa03a3989a4101c4dd147dde336643 Mon Sep 17 00:00:00 2001
From: "Rob Swindell (on Windows 11)" <rob@synchro.net>
Date: Wed, 15 May 2024 19:11:55 -0700
Subject: [PATCH] Overhaul scfg.ini keys
All keys are now in the root/global section and they are now:
video_mode (default: 42)
uifc_mode (default: 0)
ciolib_mode (default: 0)
scaling (default: 0)
lines (default: 25)
insert (default: false)
esc_delay (default: 25)
---
src/sbbs3/scfg/scfg.c | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
diff --git a/src/sbbs3/scfg/scfg.c b/src/sbbs3/scfg/scfg.c
index 66c91bb436..bfc863fe19 100644
--- a/src/sbbs3/scfg/scfg.c
+++ b/src/sbbs3/scfg/scfg.c
@@ -48,6 +48,8 @@ char tmp[256];
char error[256];
char* area_sort_desc[] = { "Index Position", "Long Name", "Short Name", "Internal Code Suffix", NULL };
static char title[128];
+int ciolib_mode = CIOLIB_MODE_AUTO;
+enum text_modes video_mode = LCD80X25;
/* convenient space-saving global constants */
const char* nulstr="";
@@ -418,13 +420,14 @@ void read_scfg_ini()
snprintf(path, sizeof path, "%s/scfg.ini", cfg.ctrl_dir);
FILE* fp = iniOpenFile(path, /* update: */false);
- uifc.mode = iniReadInteger(fp, "uifc", "mode", uifc.mode);
- uifc.scrn_len = iniReadInteger(fp, "uifc", "height", uifc.scrn_len);
- uifc.insert_mode = iniReadBool(fp, "uifc", "insert", uifc.insert_mode);
- uifc.esc_delay = iniReadInteger(fp, "uifc", "esc_delay", uifc.esc_delay);
-
- ciolib_initial_mode = iniReadInteger(fp, "ciolib", "mode", ciolib_initial_mode);
- ciolib_initial_scaling = iniReadFloat(fp, "ciolib", "scaling", ciolib_initial_scaling);
+ const char* section = ROOT_SECTION;
+ video_mode = iniReadInteger(fp, section, "video_mode", video_mode);
+ uifc.mode = iniReadInteger(fp, section, "uifc_mode", uifc.mode);
+ uifc.scrn_len = iniReadInteger(fp, section, "lines", uifc.scrn_len);
+ uifc.insert_mode = iniReadBool(fp, section, "insert", uifc.insert_mode);
+ uifc.esc_delay = iniReadInteger(fp, section, "esc_delay", uifc.esc_delay);
+ ciolib_mode = iniReadInteger(fp, section, "ciolib_mode", ciolib_mode);
+ ciolib_initial_scaling = iniReadFloat(fp, section, "scaling", ciolib_initial_scaling);
if (fp != NULL)
iniCloseFile(fp);
@@ -438,8 +441,6 @@ int main(int argc, char **argv)
char cfg_fname[MAX_PATH + 1];
bool door_mode=false;
bool alt_chars = false;
- int ciolib_mode=CIOLIB_MODE_AUTO;
- enum text_modes video_mode = LCD80X25;
#if defined(_WIN32)
cio_api.options |= CONIO_OPT_DISABLE_CLOSE;
--
GitLab