more

contrib/translations/en/en_US.lng

@@ -248,6 +248,9 @@ Primary config file: ◙%s◙
 :PROGRAM_CONFIG_ADDITIONAL_CONF
 Additional config files:◙
 .
+:PROGRAM_CONFIG_GLOBAL_CONF
+◙Global config file: ◙%s◙
+.
 :PROGRAM_CONFIG_CONFDIR
 DOSBox-X %s user configuration directory: ◙%s◙◙
 .

contrib/translations/es/es_ES.lng

@@ -248,6 +248,9 @@ Archivo config primario: ◙%s◙
 :PROGRAM_CONFIG_ADDITIONAL_CONF
 Ficheros config adicionales:◙
 .
+:PROGRAM_CONFIG_GLOBAL_CONF
+◙Archivo config global: ◙%s◙
+.
 :PROGRAM_CONFIG_CONFDIR
 Directorio de user configuración DOSBox-X %s: ◙%s◙◙
 .

contrib/translations/ja/ja_JP.lng

@@ -261,6 +261,12 @@ Config ファイルが読み込まれていません!
 :PROGRAM_CONFIG_ADDITIONAL_CONF
 追加の設定ファイル:
 
+.
+:PROGRAM_CONFIG_GLOBAL_CONF
+
+グローバル設定ファイル:
+%s
+
 .
 :PROGRAM_CONFIG_CONFDIR
 DOSBox-X %s 設定用ディレクトリ:
@@ -358,10 +364,10 @@ DOSBox-X configuration に含まれるセクション:
 文法が違います: config -get "セクション プロパティ".
 .
 :PROGRAM_CONFIG_PRINT_STARTUP
+
 DOSBox-X は以下のコマンドラインパラメータを指定して起動されました:
 %s
 
-
 .
 :PROGRAM_CONFIG_MISSINGPARAM
 パラメータが足りません。

contrib/translations/zh/zh_CN.lng

@@ -260,6 +260,12 @@ IDE 位置
 :PROGRAM_CONFIG_ADDITIONAL_CONF
 附加配置文件:
 
+.
+:PROGRAM_CONFIG_GLOBAL_CONF
+
+全局配置文件:
+%s
+
 .
 :PROGRAM_CONFIG_CONFDIR
 DOSBox-X %s 用户配置文件目录: 

src/gui/sdlmain.cpp

@@ -300,6 +300,7 @@ Bitu frames = 0;
 unsigned int page=0;
 unsigned int hostkeyalt=0;
 unsigned int sendkeymap=0;
+std::string configfile = "";
 std::string strPasteBuffer = "";
 ScreenSizeInfo screen_size_info;
 bool CodePageHostToGuestUTF16(char *d/*CROSS_LEN*/,const uint16_t *s/*CROSS_LEN*/);
@@ -12638,9 +12639,9 @@ int main(int argc, char* argv[]) SDL_MAIN_NOEXCEPT {
     }
 #endif
 
+    configfile = "";
     std::string workdiropt = "default";
     std::string workdirdef = "";
-    std::string configfile = "";
     std::string exepath=GetDOSBoxXPath();
     struct stat st;
     if (!control->opt_defaultconf && control->config_file_list.empty() && stat("dosbox-x.conf", &st) && stat("dosbox.conf", &st)) {

src/ints/int_dosv.cpp

@@ -93,6 +93,9 @@ static enum DOSV_FEP_CTRL dosv_fep_ctrl;
 static HFONT jfont_16;
 static HFONT jfont_24;
 #endif
+#if defined(USE_TTF)
+extern bool autoboxdraw;
+#endif
 
 bool gbk = false;
 bool del_flag = true;
@@ -105,7 +108,6 @@ bool isDBCSCP();
 bool INT10_SetDOSVModeVtext(uint16_t mode, enum DOSV_VTEXT_MODE vtext_mode);
 bool CodePageGuestToHostUTF16(uint16_t *d/*CROSS_LEN*/,const char *s/*CROSS_LEN*/);
 bool CodePageHostToGuestUTF16(char *d/*CROSS_LEN*/,const uint16_t *s/*CROSS_LEN*/);
-extern bool autoboxdraw;
 
 bool isKanji1(uint8_t chr) {
     if (dos.loaded_codepage == 936 || IS_PDOSV)
@@ -677,7 +679,9 @@ void JFONT_Init() {
 		LoadFontxFile(path.c_str(), 14);
 	}
 	if(IS_DOSV) {
+#if defined(USE_TTF)
 		autoboxdraw = true;
+#endif
 		pathprop = section->Get_path("fontxsbcs16");
 		if(pathprop) {
 			std::string path=pathprop->realpath;

src/misc/programs.cpp

@@ -52,7 +52,7 @@ typedef struct {
 
 Bitu call_program;
 extern const char *modifier;
-extern std::string langname;
+extern std::string langname, configfile;
 extern int enablelfn, paste_speed, wheel_key, freesizecap, wpType, wpVersion, wpBG, wpFG, lastset, blinkCursor;
 extern bool dos_kernel_disabled, force_nocachedir, wpcolon, lockmount, enable_config_as_shell_commands, load, winrun, winautorun, startcmd, startwait, startquiet, starttranspath, mountwarning, wheel_guest, clipboard_dosapi, noremark_save_state, force_load_state, sync_time, manualtime, showbold, showital, showline, showsout, char512, printfont, dbcs_sbcs, autoboxdraw, halfwidthkana, ticksLocked;
 
@@ -656,7 +656,7 @@ void CONFIG::Run(void) {
 			char cwd[512] = {0};
 			char *res = getcwd(cwd,sizeof(cwd)-1);
 			if (res!=NULL) WriteOut(MSG_Get("PROGRAM_CONFIG_WORKDIR"), cwd);
-			if (size==0) WriteOut(MSG_Get("PROGRAM_CONFIG_NOCONFIGFILE"));
+			if (size==0&&!configfile.size()) WriteOut(MSG_Get("PROGRAM_CONFIG_NOCONFIGFILE"));
 			else {
 				WriteOut(MSG_Get("PROGRAM_CONFIG_PRIMARY_CONF"),control->configfiles.front().c_str());
 				if (size > 1) {
@@ -664,6 +664,7 @@ void CONFIG::Run(void) {
 					for(Bitu i = 1; i < size; i++)
 						WriteOut("%s\n",control->configfiles[i].c_str());
 				}
+				if (configfile.size()) WriteOut(MSG_Get("PROGRAM_CONFIG_GLOBAL_CONF"),configfile.c_str());
 			}
 			if (control->startup_params.size() > 0) {
 				std::string test;
@@ -1661,6 +1662,7 @@ void PROGRAMS_Init() {
 	// listconf
 	MSG_Add("PROGRAM_CONFIG_NOCONFIGFILE","No config file loaded!\n");
 	MSG_Add("PROGRAM_CONFIG_PRIMARY_CONF","Primary config file: \n%s\n");
+	MSG_Add("PROGRAM_CONFIG_GLOBAL_CONF","\nGlobal config file: \n%s\n");
 	MSG_Add("PROGRAM_CONFIG_ADDITIONAL_CONF","Additional config files:\n");
 	MSG_Add("PROGRAM_CONFIG_CONFDIR","DOSBox-X %s user configuration directory: \n%s\n\n");
 	MSG_Add("PROGRAM_CONFIG_WORKDIR","DOSBox-X's working directory: \n%s\n\n");