From c333aea4163feaba57043b3d7e83547d7a408a65 Mon Sep 17 00:00:00 2001 From: Wengier Date: Wed, 28 Jul 2021 05:17:06 -0400 Subject: [PATCH] update config ref and timestamp --- .../com.dosbox_x.DOSBox-X.metainfo.xml.in | 2 +- .../installer/dosbox-x.reference.setup.conf | 18 +++--- dosbox-x.reference.conf | 60 +++++++++++-------- dosbox-x.reference.full.conf | 8 ++- include/build_timestamp.h | 4 +- src/dosbox.cpp | 10 ++-- 6 files changed, 61 insertions(+), 41 deletions(-) diff --git a/contrib/linux/com.dosbox_x.DOSBox-X.metainfo.xml.in b/contrib/linux/com.dosbox_x.DOSBox-X.metainfo.xml.in index 12fe715dd..f3882fbbe 100644 --- a/contrib/linux/com.dosbox_x.DOSBox-X.metainfo.xml.in +++ b/contrib/linux/com.dosbox_x.DOSBox-X.metainfo.xml.in @@ -10,7 +10,7 @@ Emulation - + diff --git a/contrib/windows/installer/dosbox-x.reference.setup.conf b/contrib/windows/installer/dosbox-x.reference.setup.conf index 92fd8086d..ee5f296b4 100644 --- a/contrib/windows/installer/dosbox-x.reference.setup.conf +++ b/contrib/windows/installer/dosbox-x.reference.setup.conf @@ -673,14 +673,14 @@ pc-98 anex86 font = # getsysfont: If enabled, DOSBox-X will try to get and use the system fonts on Windows and Linux platforms for the DOS/V emulation. # If this cannot be done, then DOSBox-X will try to use the internal Japanese DOS/V font, or you can specify a different font. # fontxsbcs: FONTX2 file used to rendering SBCS characters (8x19) in DOS/V or JEGA mode. If not specified, the default one will be used. -#DOSBOX-X-ADV:# fontxsbcs16: FONTX2 file used to rendering SBCS characters (8x16) in DOS/V mode. +# fontxsbcs16: FONTX2 file used to rendering SBCS characters (8x16) in DOS/V or JEGA mode. If not specified, the default one will be used. #DOSBOX-X-ADV:# fontxsbcs24: FONTX2 file used to rendering SBCS characters (12x24) in DOS/V mode. # fontxdbcs: FONTX2 file used to rendering DBCS characters (16x16) in DOS/V or JEGA mode. If not specified, the default one will be used. # For Simplified Chinese DOS/V, loading the HZK16 font file (https://github.com/aguegu/BitmapFont/tree/master/font) is also supported. # For Traditional Chinese DOS/V, loading the STDFONT.15 font file from the ETen Chinese DOS system is also supported. -#DOSBOX-X-ADV:# fontxdbcs14: FONTX2 file used to rendering SBCS characters (14x14) for the Configuration Tool. If not specified, the default one will be used. -#DOSBOX-X-ADV:# For Simplified Chinese DOS/V, loading the HZK14 font file (https://github.com/aguegu/BitmapFont/tree/master/font) is also supported. -#DOSBOX-X-ADV:# For Traditional Chinese DOS/V, loading the STDFONT.15 font file from the ETen Chinese DOS system is also supported. +# fontxdbcs14: FONTX2 file used to rendering SBCS characters (14x14) for Configuration Tool and Mapper Editor. If not specified, the default one will be used. +# For Simplified Chinese DOS/V, loading the HZK14 font file (https://github.com/aguegu/BitmapFont/tree/master/font) is also supported. +# For Traditional Chinese DOS/V, loading the STDFONT.15 font file from the ETen Chinese DOS system is also supported. #DOSBOX-X-ADV:# fontxdbcs24: FONTX2 file used to rendering SBCS characters (24x24) in DOS/V mode. # gbk: Enables the GBK extension (in addition to the standard GB2312 charset) for the Simplified Chinese DOS/V emulation or TTF output. # yen: Enables the yen symbol (¥) at 5ch if it is found at 7fh in a custom SBCS font for the Japanese DOS/V or JEGA emulation. @@ -691,15 +691,15 @@ pc-98 anex86 font = #DOSBOX-X-ADV:# vtext2: V-text screen mode 2 for the DOS/V emulation. #DOSBOX-X-ADV-SEE:# #DOSBOX-X-ADV-SEE:# Advanced options (see full configuration reference file [dosbox-x.reference.full.conf] for more details): -#DOSBOX-X-ADV-SEE:# -> fontxsbcs16; fontxsbcs24; fontxdbcs14; fontxdbcs24; del; vtext; vtext2 +#DOSBOX-X-ADV-SEE:# -> fontxsbcs24; fontxdbcs24; del; vtext; vtext2 #DOSBOX-X-ADV-SEE:# dosv = off getsysfont = true fontxsbcs = -#DOSBOX-X-ADV:fontxsbcs16 = +fontxsbcs16 = #DOSBOX-X-ADV:fontxsbcs24 = fontxdbcs = -#DOSBOX-X-ADV:fontxdbcs14 = +fontxdbcs14 = #DOSBOX-X-ADV:fontxdbcs24 = gbk = false yen = false @@ -2071,6 +2071,9 @@ timeout = 0 # Long filename (LFN) support will be enabled with a reported DOS version of 7.0 or higher with "lfn=auto" (default). # Similarly, FAT32 disk images will be supported with a reported DOS version of 7.1 or higher. # +# shellhigh: Load the DOSBox-X command shell into the upper memory when the UMB is available. +# If set to auto (default), it is enabled if the reported DOS version is at least 7.0. +# Possible values: true, false, 1, 0, auto. # lfn: Enable long filename support. If set to auto (default), it is enabled if the reported DOS version is at least 7.0. # If set to autostart, the builtin VER command won't activate/disactivate LFN support according to the reported DOS version. # Possible values: true, false, 1, 0, auto, autostart. @@ -2182,6 +2185,7 @@ umb = true #DOSBOX-X-ADV:private area in umb = true quick reboot = false ver = +shellhigh = auto lfn = auto automount = true automountall = false diff --git a/dosbox-x.reference.conf b/dosbox-x.reference.conf index 7880604d8..f06588357 100644 --- a/dosbox-x.reference.conf +++ b/dosbox-x.reference.conf @@ -302,34 +302,40 @@ pc-98 try font rom = true pc-98 anex86 font = [dosv] -# dosv: Enable DOS/V emulation and specify which version to emulate. This option is intended for use with games or software -# originating from East Asia (China, Japan, Korea) that use the double byte character set (DBCS) encodings and DOS/V extensions -# to display Japanese (jp), Chinese (chs/cht/cn/tw), or Korean (ko) text. Note that enabling DOS/V replaces 80x25 text mode with -# a EGA/VGA graphics mode that emulates text mode to display the characters and may be incompatible with non-Asian software that -# assumes direct access to the text mode via segment 0xB800. For a general DOS environment with CJK support please disable DOS/V -# emulation and use TrueType font (TTF) output with a CJK code page (932, 936, 949, 950) and TTF font with CJK characters instead. -# Possible values: off, jp, ko, chs, cht, cn, tw. -# getsysfont: If enabled, DOSBox-X will try to get and use the system fonts on Windows and Linux platforms for the DOS/V emulation. -# If this cannot be done, then DOSBox-X will try to use the internal Japanese DOS/V font, or you can specify a different font. -# fontxsbcs: FONTX2 file used to rendering SBCS characters (8x19) in DOS/V or JEGA mode. If not specified, the default one will be used. -# fontxdbcs: FONTX2 file used to rendering DBCS characters (16x16) in DOS/V or JEGA mode. If not specified, the default one will be used. -# For Simplified Chinese DOS/V, loading the HZK16 font file (https://github.com/aguegu/BitmapFont/tree/master/font) is also supported. -# For Traditional Chinese DOS/V, loading the STDFONT.15 font file from the ETen Chinese DOS system is also supported. -# gbk: Enables the GBK extension (in addition to the standard GB2312 charset) for the Simplified Chinese DOS/V emulation or TTF output. -# yen: Enables the yen symbol (¥) at 5ch if it is found at 7fh in a custom SBCS font for the Japanese DOS/V or JEGA emulation. -# fepcontrol: FEP control API for the DOS/V emulation. -# Possible values: ias, mskanji, both. +# dosv: Enable DOS/V emulation and specify which version to emulate. This option is intended for use with games or software +# originating from East Asia (China, Japan, Korea) that use the double byte character set (DBCS) encodings and DOS/V extensions +# to display Japanese (jp), Chinese (chs/cht/cn/tw), or Korean (ko) text. Note that enabling DOS/V replaces 80x25 text mode with +# a EGA/VGA graphics mode that emulates text mode to display the characters and may be incompatible with non-Asian software that +# assumes direct access to the text mode via segment 0xB800. For a general DOS environment with CJK support please disable DOS/V +# emulation and use TrueType font (TTF) output with a CJK code page (932, 936, 949, 950) and TTF font with CJK characters instead. +# Possible values: off, jp, ko, chs, cht, cn, tw. +# getsysfont: If enabled, DOSBox-X will try to get and use the system fonts on Windows and Linux platforms for the DOS/V emulation. +# If this cannot be done, then DOSBox-X will try to use the internal Japanese DOS/V font, or you can specify a different font. +# fontxsbcs: FONTX2 file used to rendering SBCS characters (8x19) in DOS/V or JEGA mode. If not specified, the default one will be used. +# fontxsbcs16: FONTX2 file used to rendering SBCS characters (8x16) in DOS/V or JEGA mode. If not specified, the default one will be used. +# fontxdbcs: FONTX2 file used to rendering DBCS characters (16x16) in DOS/V or JEGA mode. If not specified, the default one will be used. +# For Simplified Chinese DOS/V, loading the HZK16 font file (https://github.com/aguegu/BitmapFont/tree/master/font) is also supported. +# For Traditional Chinese DOS/V, loading the STDFONT.15 font file from the ETen Chinese DOS system is also supported. +# fontxdbcs14: FONTX2 file used to rendering SBCS characters (14x14) for Configuration Tool and Mapper Editor. If not specified, the default one will be used. +# For Simplified Chinese DOS/V, loading the HZK14 font file (https://github.com/aguegu/BitmapFont/tree/master/font) is also supported. +# For Traditional Chinese DOS/V, loading the STDFONT.15 font file from the ETen Chinese DOS system is also supported. +# gbk: Enables the GBK extension (in addition to the standard GB2312 charset) for the Simplified Chinese DOS/V emulation or TTF output. +# yen: Enables the yen symbol (¥) at 5ch if it is found at 7fh in a custom SBCS font for the Japanese DOS/V or JEGA emulation. +# fepcontrol: FEP control API for the DOS/V emulation. +# Possible values: ias, mskanji, both. # # Advanced options (see full configuration reference file [dosbox-x.reference.full.conf] for more details): -# -> fontxsbcs16; fontxsbcs24; fontxdbcs14; fontxdbcs24; del; vtext; vtext2 +# -> fontxsbcs24; fontxdbcs24; del; vtext; vtext2 # -dosv = off -getsysfont = true -fontxsbcs = -fontxdbcs = -gbk = false -yen = false -fepcontrol = both +dosv = off +getsysfont = true +fontxsbcs = +fontxsbcs16 = +fontxdbcs = +fontxdbcs14 = +gbk = false +yen = false +fepcontrol = both [video] # vmemsize: Amount of video memory in megabytes. @@ -965,6 +971,9 @@ timeout = 0 # Long filename (LFN) support will be enabled with a reported DOS version of 7.0 or higher with "lfn=auto" (default). # Similarly, FAT32 disk images will be supported with a reported DOS version of 7.1 or higher. # +# shellhigh: Load the DOSBox-X command shell into the upper memory when the UMB is available. +# If set to auto (default), it is enabled if the reported DOS version is at least 7.0. +# Possible values: true, false, 1, 0, auto. # lfn: Enable long filename support. If set to auto (default), it is enabled if the reported DOS version is at least 7.0. # If set to autostart, the builtin VER command won't activate/disactivate LFN support according to the reported DOS version. # Possible values: true, false, 1, 0, auto, autostart. @@ -1012,6 +1021,7 @@ ems = true umb = true quick reboot = false ver = +shellhigh = auto lfn = auto automount = true automountall = false diff --git a/dosbox-x.reference.full.conf b/dosbox-x.reference.full.conf index cd8c20d5d..ace3e2d72 100644 --- a/dosbox-x.reference.full.conf +++ b/dosbox-x.reference.full.conf @@ -653,12 +653,12 @@ pc-98 show graphics layer on initialize = true # getsysfont: If enabled, DOSBox-X will try to get and use the system fonts on Windows and Linux platforms for the DOS/V emulation. # If this cannot be done, then DOSBox-X will try to use the internal Japanese DOS/V font, or you can specify a different font. # fontxsbcs: FONTX2 file used to rendering SBCS characters (8x19) in DOS/V or JEGA mode. If not specified, the default one will be used. -# fontxsbcs16: FONTX2 file used to rendering SBCS characters (8x16) in DOS/V mode. +# fontxsbcs16: FONTX2 file used to rendering SBCS characters (8x16) in DOS/V or JEGA mode. If not specified, the default one will be used. # fontxsbcs24: FONTX2 file used to rendering SBCS characters (12x24) in DOS/V mode. # fontxdbcs: FONTX2 file used to rendering DBCS characters (16x16) in DOS/V or JEGA mode. If not specified, the default one will be used. # For Simplified Chinese DOS/V, loading the HZK16 font file (https://github.com/aguegu/BitmapFont/tree/master/font) is also supported. # For Traditional Chinese DOS/V, loading the STDFONT.15 font file from the ETen Chinese DOS system is also supported. -# fontxdbcs14: FONTX2 file used to rendering SBCS characters (14x14) for the Configuration Tool. If not specified, the default one will be used. +# fontxdbcs14: FONTX2 file used to rendering SBCS characters (14x14) for Configuration Tool and Mapper Editor. If not specified, the default one will be used. # For Simplified Chinese DOS/V, loading the HZK14 font file (https://github.com/aguegu/BitmapFont/tree/master/font) is also supported. # For Traditional Chinese DOS/V, loading the STDFONT.15 font file from the ETen Chinese DOS system is also supported. # fontxdbcs24: FONTX2 file used to rendering SBCS characters (24x24) in DOS/V mode. @@ -2015,6 +2015,9 @@ timeout = 0 # Long filename (LFN) support will be enabled with a reported DOS version of 7.0 or higher with "lfn=auto" (default). # Similarly, FAT32 disk images will be supported with a reported DOS version of 7.1 or higher. # +# shellhigh: Load the DOSBox-X command shell into the upper memory when the UMB is available. +# If set to auto (default), it is enabled if the reported DOS version is at least 7.0. +# Possible values: true, false, 1, 0, auto. # lfn: Enable long filename support. If set to auto (default), it is enabled if the reported DOS version is at least 7.0. # If set to autostart, the builtin VER command won't activate/disactivate LFN support according to the reported DOS version. # Possible values: true, false, 1, 0, auto, autostart. @@ -2122,6 +2125,7 @@ keep private area on boot = auto private area in umb = true quick reboot = false ver = +shellhigh = auto lfn = auto automount = true automountall = false diff --git a/include/build_timestamp.h b/include/build_timestamp.h index 4d7846374..5891263d6 100644 --- a/include/build_timestamp.h +++ b/include/build_timestamp.h @@ -1,4 +1,4 @@ /*auto-generated*/ -#define UPDATED_STR "Jul 25, 2021 1:22:57pm" -#define GIT_COMMIT_HASH "6956f4e" +#define UPDATED_STR "Jul 28, 2021 5:06:45am" +#define GIT_COMMIT_HASH "5ce7b10" #define COPYRIGHT_END_YEAR "2021" diff --git a/src/dosbox.cpp b/src/dosbox.cpp index d23804bcf..7bbbf6453 100644 --- a/src/dosbox.cpp +++ b/src/dosbox.cpp @@ -2047,7 +2047,8 @@ void DOSBOX_SetupConfigSections(void) { Pstring->SetBasic(true); Pstring = secprop->Add_path("fontxsbcs16",Property::Changeable::OnlyAtStart,""); - Pstring->Set_help("FONTX2 file used to rendering SBCS characters (8x16) in DOS/V mode."); + Pstring->Set_help("FONTX2 file used to rendering SBCS characters (8x16) in DOS/V or JEGA mode. If not specified, the default one will be used."); + Pstring->SetBasic(true); Pstring = secprop->Add_path("fontxsbcs24",Property::Changeable::OnlyAtStart,""); Pstring->Set_help("FONTX2 file used to rendering SBCS characters (12x24) in DOS/V mode."); @@ -2059,9 +2060,10 @@ void DOSBOX_SetupConfigSections(void) { Pstring->SetBasic(true); Pstring = secprop->Add_path("fontxdbcs14",Property::Changeable::OnlyAtStart,""); - Pstring->Set_help("FONTX2 file used to rendering SBCS characters (14x14) for the Configuration Tool. If not specified, the default one will be used.\n" + Pstring->Set_help("FONTX2 file used to rendering SBCS characters (14x14) for Configuration Tool and Mapper Editor. If not specified, the default one will be used.\n" "For Simplified Chinese DOS/V, loading the HZK14 font file (https://github.com/aguegu/BitmapFont/tree/master/font) is also supported.\n" "For Traditional Chinese DOS/V, loading the STDFONT.15 font file from the ETen Chinese DOS system is also supported."); + Pstring->SetBasic(true); Pstring = secprop->Add_path("fontxdbcs24",Property::Changeable::OnlyAtStart,""); Pstring->Set_help("FONTX2 file used to rendering SBCS characters (24x24) in DOS/V mode."); @@ -4050,8 +4052,8 @@ void DOSBOX_SetupConfigSections(void) { Pstring = secprop->Add_string("shellhigh",Property::Changeable::OnlyAtStart,"auto"); Pstring->Set_values(truefalseautoopt); - Pstring->Set_help("Load the command shell in upper memory if umb is supported. If set to auto (default), it " - "is enabled if the reported DOS version is at least 7.0.\n"); + Pstring->Set_help("Load the DOSBox-X command shell into the upper memory when the UMB is available.\n" + "If set to auto (default), it is enabled if the reported DOS version is at least 7.0."); Pstring->SetBasic(true); Pstring = secprop->Add_string("lfn",Property::Changeable::WhenIdle,"auto");