From a19f5f172d1bc4ed82511772e2e1a8974e958498 Mon Sep 17 00:00:00 2001 From: Wengier Date: Sat, 23 Oct 2021 23:47:12 -0400 Subject: [PATCH] more --- .../installer/dosbox-x.reference.setup.conf | 14 +++++++------- dosbox-x.reference.conf | 8 +++++++- dosbox-x.reference.full.conf | 2 +- src/dosbox.cpp | 4 +++- 4 files changed, 18 insertions(+), 10 deletions(-) diff --git a/contrib/windows/installer/dosbox-x.reference.setup.conf b/contrib/windows/installer/dosbox-x.reference.setup.conf index 485f57e4f..447b267bd 100644 --- a/contrib/windows/installer/dosbox-x.reference.setup.conf +++ b/contrib/windows/installer/dosbox-x.reference.setup.conf @@ -1145,19 +1145,19 @@ auxdevice = intellimouse # strikeout: If set, DOSBox-X will display strikeout text visually (requires a word processor be set) for the TTF output. #DOSBOX-X-ADV:# char512: If set, DOSBox-X will display the 512-character font if possible (requires a word processor be set) for the TTF output. # printfont: If set, DOSBox-X will force to use the current TrueType font (set via font option) for printing in addition to displaying. -#DOSBOX-X-ADV:# autodbcs: If set, DOSBox-X enables Chinese/Japnese/Korean DBCS (double-byte) characters when these code pages are active by default. -#DOSBOX-X-ADV:# Only applicable when using a DBCS code page (932: Japanese, 936: Simplified Chinese; 949: Korean; 950: Traditional Chinese) -#DOSBOX-X-ADV:# This applies to both the display and printing of these characters (see the [printer] section for details of the latter). +# autodbcs: If set, DOSBox-X enables Chinese/Japnese/Korean DBCS (double-byte) characters when these code pages are active by default. +# Only applicable when using a DBCS code page (932: Japanese, 936: Simplified Chinese; 949: Korean; 950: Traditional Chinese) +# This applies to both the display and printing of these characters (see the [printer] section for details of the latter). #DOSBOX-X-ADV:# autoboxdraw: If set, DOSBox-X will auto-detect ASCII box-drawing characters for CJK (Chinese/Japanese/Korean) support in the TTF output. #DOSBOX-X-ADV:# Only applicable when using a DBCS code page (932: Japanese, 936: Simplified Chinese; 949: Korean; 950: Traditional Chinese) #DOSBOX-X-ADV:# This applies to both the display and printing of these characters (see the [printer] section for details of the latter). #DOSBOX-X-ADV:# halfwidthkana: If set, DOSBox-X enables half-width Katakana to replace upper ASCII characters for the Japanese code page (932) of a non-PC98 machine type in the TTF output. # blinkc: If set to true, the cursor blinks for the TTF output; setting it to false will turn the blinking off. # You can also change the blinking rate by setting an interger between 1 (fastest) and 7 (slowest), or 0 for no cursor. -#DOSBOX-X-ADV:# dosvfunc: If set, enables FEP control to function for DOS/V applications, and changes the blinking of character attributes to high brightness. +# dosvfunc: If set, enables FEP control to function for Japanese DOS/V applications, and changes the blinking of character attributes to high brightness. #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:# -> wpbg; wpfg; char512; autodbcs; autoboxdraw; halfwidthkana; dosvfunc +#DOSBOX-X-ADV-SEE:# -> wpbg; wpfg; char512; autoboxdraw; halfwidthkana #DOSBOX-X-ADV-SEE:# font = fontbold = @@ -1178,11 +1178,11 @@ underline = true strikeout = false #DOSBOX-X-ADV:char512 = true printfont = true -#DOSBOX-X-ADV:autodbcs = true +autodbcs = true #DOSBOX-X-ADV:autoboxdraw = true #DOSBOX-X-ADV:halfwidthkana = true blinkc = true -#DOSBOX-X-ADV:dosvfunc = false +dosvfunc = false [voodoo] # voodoo_card: Enable support for the 3dfx Voodoo card. diff --git a/dosbox-x.reference.conf b/dosbox-x.reference.conf index 01df0d8de..fd29a117d 100644 --- a/dosbox-x.reference.conf +++ b/dosbox-x.reference.conf @@ -464,11 +464,15 @@ auxdevice = intellimouse # underline: If set, DOSBox-X will display underlined text visually (requires a word processor be set) for the TTF output. # strikeout: If set, DOSBox-X will display strikeout text visually (requires a word processor be set) for the TTF output. # printfont: If set, DOSBox-X will force to use the current TrueType font (set via font option) for printing in addition to displaying. +# autodbcs: If set, DOSBox-X enables Chinese/Japnese/Korean DBCS (double-byte) characters when these code pages are active by default. +# Only applicable when using a DBCS code page (932: Japanese, 936: Simplified Chinese; 949: Korean; 950: Traditional Chinese) +# This applies to both the display and printing of these characters (see the [printer] section for details of the latter). # blinkc: If set to true, the cursor blinks for the TTF output; setting it to false will turn the blinking off. # You can also change the blinking rate by setting an interger between 1 (fastest) and 7 (slowest), or 0 for no cursor. +# dosvfunc: If set, enables FEP control to function for Japanese DOS/V applications, and changes the blinking of character attributes to high brightness. # # Advanced options (see full configuration reference file [dosbox-x.reference.full.conf] for more details): -# -> wpbg; wpfg; char512; autodbcs; autoboxdraw; halfwidthkana; dosvfunc +# -> wpbg; wpfg; char512; autoboxdraw; halfwidthkana # font = fontbold = @@ -486,7 +490,9 @@ italic = true underline = true strikeout = false printfont = true +autodbcs = true blinkc = true +dosvfunc = false [voodoo] # voodoo_card: Enable support for the 3dfx Voodoo card. diff --git a/dosbox-x.reference.full.conf b/dosbox-x.reference.full.conf index 02c0f2c4d..44d0423be 100644 --- a/dosbox-x.reference.full.conf +++ b/dosbox-x.reference.full.conf @@ -1122,7 +1122,7 @@ auxdevice = intellimouse # halfwidthkana: If set, DOSBox-X enables half-width Katakana to replace upper ASCII characters for the Japanese code page (932) of a non-PC98 machine type in the TTF output. # blinkc: If set to true, the cursor blinks for the TTF output; setting it to false will turn the blinking off. # You can also change the blinking rate by setting an interger between 1 (fastest) and 7 (slowest), or 0 for no cursor. -# dosvfunc: If set, enables FEP control to function for DOS/V applications, and changes the blinking of character attributes to high brightness. +# dosvfunc: If set, enables FEP control to function for Japanese DOS/V applications, and changes the blinking of character attributes to high brightness. font = fontbold = fontital = diff --git a/src/dosbox.cpp b/src/dosbox.cpp index 55d58c9ac..b29de8213 100644 --- a/src/dosbox.cpp +++ b/src/dosbox.cpp @@ -2750,6 +2750,7 @@ void DOSBOX_SetupConfigSections(void) { Pbool->Set_help("If set, DOSBox-X enables Chinese/Japnese/Korean DBCS (double-byte) characters when these code pages are active by default.\n" "Only applicable when using a DBCS code page (932: Japanese, 936: Simplified Chinese; 949: Korean; 950: Traditional Chinese)\n" "This applies to both the display and printing of these characters (see the [printer] section for details of the latter)."); + Pbool->SetBasic(true); Pbool = secprop->Add_bool("autoboxdraw", Property::Changeable::WhenIdle, true); Pbool->Set_help("If set, DOSBox-X will auto-detect ASCII box-drawing characters for CJK (Chinese/Japanese/Korean) support in the TTF output.\n" @@ -2765,7 +2766,8 @@ void DOSBOX_SetupConfigSections(void) { Pstring->SetBasic(true); Pbool = secprop->Add_bool("dosvfunc", Property::Changeable::OnlyAtStart, false); - Pbool->Set_help("If set, enables FEP control to function for DOS/V applications, and changes the blinking of character attributes to high brightness."); + Pbool->Set_help("If set, enables FEP control to function for Japanese DOS/V applications, and changes the blinking of character attributes to high brightness."); + Pbool->SetBasic(true); secprop=control->AddSection_prop("voodoo",&Null_Init,false); //Voodoo