joncampbell123/dosbox-x
1
0
Fork 0
mirror of https://github.com/joncampbell123/dosbox-x.git synced 2025-05-10 04:08:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

update config ref and timestamp

Browse Source
This commit is contained in:
Wengier 2022-05-01 18:25:54 -04:00
parent c3dd327737
commit d542ac043b
10 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/linux/com.dosbox_x.DOSBox-X.metainfo.xml.in
View File

@ -10,7 +10,7 @@
<category>Emulation</category>
</categories>
<releases>
<release version="@PACKAGE_VERSION@" date="2022-4-30"/>
<release version="@PACKAGE_VERSION@" date="2022-5-1"/>
</releases>
<screenshots>
<screenshot type="default">

5
contrib/windows/installer/dosbox-x.reference.setup.conf
View File

@ -706,8 +706,9 @@ pc-98 anex86 font =
# fontxdbcs24: FONTX2 file used to rendering SBCS characters (24x24) in DOS/V mode (with V-text and 24-pixel fonts enabled).
# For Simplified Chinese DOS/V, loading the HZK24? font file (https://github.com/aguegu/BitmapFont/tree/master/font) is also supported.
# For Traditional Chinese DOS/V, loading the STDFONT.24 font file from the ETen Chinese DOS system is also supported.
# showdbcsnodosv: Enables rendering of Chinese/Japanese/Korean characters for DBCS code pages in non-DOS/V, non-PC98, and non-TTF mode.
# Setting to "auto" enables rendering of Chinese/Japanese/Korean characters if a language file is loaded in such cases.
# showdbcsnodosv: Enables rendering of Chinese/Japanese/Korean characters for DBCS code pages in standard VGA and EGA machine types in non-DOS/V and non-TTF mode.
# DOS/V fonts will be used in such cases, which can be adjusted by the above config options (such as fontxdbcs, fontxdbcs14, and fontxdbcs24).
# Setting to "auto" enables Chinese/Japanese/Korean character rendering if a language file is loaded (or with "autodbcs" option set) in such cases.
# Possible values: true, false, 1, 0, auto.
# yen: Enables the Japanese yen symbol at 5ch if it is found at 7fh in a custom SBCS font for the Japanese DOS/V or JEGA emulation.
#DOSBOX-X-ADV:# del: Maps the undefined del symbol (0x7F) to the next character (0x80) for the Japanese DOS/V and other Japanese mode emulations.

5
dosbox-x.reference.conf
View File

@ -339,8 +339,9 @@ pc-98 anex86 font =
# fontxdbcs24: FONTX2 file used to rendering SBCS characters (24x24) in DOS/V mode (with V-text and 24-pixel fonts enabled).
# For Simplified Chinese DOS/V, loading the HZK24? font file (https://github.com/aguegu/BitmapFont/tree/master/font) is also supported.
# For Traditional Chinese DOS/V, loading the STDFONT.24 font file from the ETen Chinese DOS system is also supported.
# showdbcsnodosv: Enables rendering of Chinese/Japanese/Korean characters for DBCS code pages in non-DOS/V, non-PC98, and non-TTF mode.
# Setting to "auto" enables rendering of Chinese/Japanese/Korean characters if a language file is loaded in such cases.
# showdbcsnodosv: Enables rendering of Chinese/Japanese/Korean characters for DBCS code pages in standard VGA and EGA machine types in non-DOS/V and non-TTF mode.
# DOS/V fonts will be used in such cases, which can be adjusted by the above config options (such as fontxdbcs, fontxdbcs14, and fontxdbcs24).
# Setting to "auto" enables Chinese/Japanese/Korean character rendering if a language file is loaded (or with "autodbcs" option set) in such cases.
# Possible values: true, false, 1, 0, auto.
# yen: Enables the Japanese 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.

5
dosbox-x.reference.full.conf
View File

@ -686,8 +686,9 @@ pc-98 show graphics layer on initialize = true
# fontxdbcs24: FONTX2 file used to rendering SBCS characters (24x24) in DOS/V mode (with V-text and 24-pixel fonts enabled).
# For Simplified Chinese DOS/V, loading the HZK24? font file (https://github.com/aguegu/BitmapFont/tree/master/font) is also supported.
# For Traditional Chinese DOS/V, loading the STDFONT.24 font file from the ETen Chinese DOS system is also supported.
# showdbcsnodosv: Enables rendering of Chinese/Japanese/Korean characters for DBCS code pages in non-DOS/V, non-PC98, and non-TTF mode.
# Setting to "auto" enables rendering of Chinese/Japanese/Korean characters if a language file is loaded in such cases.
# showdbcsnodosv: Enables rendering of Chinese/Japanese/Korean characters for DBCS code pages in standard VGA and EGA machine types in non-DOS/V and non-TTF mode.
# DOS/V fonts will be used in such cases, which can be adjusted by the above config options (such as fontxdbcs, fontxdbcs14, and fontxdbcs24).
# Setting to "auto" enables Chinese/Japanese/Korean character rendering if a language file is loaded (or with "autodbcs" option set) in such cases.
# Possible values: true, false, 1, 0, auto.
# yen: Enables the Japanese yen symbol at 5ch if it is found at 7fh in a custom SBCS font for the Japanese DOS/V or JEGA emulation.
# del: Maps the undefined del symbol (0x7F) to the next character (0x80) for the Japanese DOS/V and other Japanese mode emulations.

4
include/build_timestamp.h
View File

@ -1,4 +1,4 @@
/*auto-generated*/
#define UPDATED_STR "Apr 30, 2022 11:14:43pm"
#define GIT_COMMIT_HASH "d89f04e"
#define UPDATED_STR "May 1, 2022 5:40:57pm"
#define GIT_COMMIT_HASH "65d8ff4"
#define COPYRIGHT_END_YEAR "2022"

5
src/dosbox.cpp
View File

@ -2185,8 +2185,9 @@ void DOSBOX_SetupConfigSections(void) {
Pstring = secprop->Add_string("showdbcsnodosv",Property::Changeable::WhenIdle,"auto");
Pstring->Set_values(truefalseautoopt);
Pstring->Set_help("Enables rendering of Chinese/Japanese/Korean characters for DBCS code pages in non-DOS/V, non-PC98, and non-TTF mode.\n"
"Setting to \"auto\" enables rendering of Chinese/Japanese/Korean characters if a language file is loaded in such cases.");
Pstring->Set_help("Enables rendering of Chinese/Japanese/Korean characters for DBCS code pages in standard VGA and EGA machine types in non-DOS/V and non-TTF mode.\n"
"DOS/V fonts will be used in such cases, which can be adjusted by the above config options (such as fontxdbcs, fontxdbcs14, and fontxdbcs24).\n"
"Setting to \"auto\" enables Chinese/Japanese/Korean character rendering if a language file is loaded (or with \"autodbcs\" option set) in such cases.");
Pstring->SetBasic(true);
Pbool = secprop->Add_bool("yen",Property::Changeable::OnlyAtStart,false);

2
src/hardware/hardware.cpp
View File

@ -1517,7 +1517,7 @@ void CAPTURE_ScreenShotEvent(bool pressed) {
CaptureState |= CAPTURE_IMAGE;
#endif
#if defined(USE_TTF)
showdbcs = true;
showdbcs = IS_EGAVGA_ARCH;
ttf_switch_off();
#endif
}

1
src/misc/messages.cpp
View File

@ -428,4 +428,5 @@ void MSG_Init() {
#else
showdbcs = showdbcsstr=="true"||showdbcsstr=="1"||(showdbcsstr=="auto" && loadlang);
#endif
if (!IS_EGAVGA_ARCH) showdbcs = false;
}

1
src/misc/programs.cpp
View File

@ -1110,6 +1110,7 @@ void ApplySetting(std::string pvar, std::string inputline, bool quiet) {
#else
showdbcs = showdbcsstr=="true"||showdbcsstr=="1"||(showdbcsstr=="auto" && loadlang);
#endif
if (!IS_EGAVGA_ARCH) showdbcs = false;
} else if (!strcasecmp(inputline.substr(0, 11).c_str(), "fepcontrol=")||!strcasecmp(inputline.substr(0, 7).c_str(), "vtext1=")||!strcasecmp(inputline.substr(0, 7).c_str(), "vtext2="))
DOSV_SetConfig(section);
} else if (!strcasecmp(pvar.c_str(), "render")) {

3
src/output/output_ttf.cpp
View File

@ -1362,6 +1362,7 @@ void ttf_switch_on(bool ss=true) {
SetVal("sdl", "output", "ttf");
std::string showdbcsstr = static_cast<Section_prop *>(control->GetSection("dosv"))->Get_string("showdbcsnodosv");
showdbcs = showdbcsstr=="true"||showdbcsstr=="1"||(showdbcsstr=="auto" && (loadlang || dbcs_sbcs));
if (!IS_EGAVGA_ARCH) showdbcs = false;
void OutputSettingMenuUpdate(void);
OutputSettingMenuUpdate();
if (ss) ttfswitch = false;
@ -1416,7 +1417,7 @@ void ttf_switch_off(bool ss=true) {
#endif
}
KEYBOARD_Clear();
showdbcs = true;
showdbcs = IS_EGAVGA_ARCH;
change_output(out);
SetVal("sdl", "output", output);
void OutputSettingMenuUpdate(void);