diff --git a/contrib/windows/installer/dosbox-x.reference.setup.conf b/contrib/windows/installer/dosbox-x.reference.setup.conf index a05e1f0cf..485f57e4f 100644 --- a/contrib/windows/installer/dosbox-x.reference.setup.conf +++ b/contrib/windows/installer/dosbox-x.reference.setup.conf @@ -233,7 +233,7 @@ debuggerrun = debugger # Possible values: ctrlalt, ctrlshift, altshift, mapper. # mapper send key: Select the key the mapper SendKey function will send. # Possible values: winlogo, winmenu, alttab, ctrlesc, ctrlbreak, ctrlaltdel. -# ime: Enables support for the system input methods (IME) for inputting characters in Windows SDL1 builds. +# ime: Enables support for the system input methods (IME) for inputting characters in Windows and Linux builds. # If set to auto, this feature is only enabled if DOSBox-X starts with a Chinese/Japanese/Korean code page. # Possible values: true, false, 1, 0, auto. # synchronize time: If set, DOSBox-X will try to automatically synchronize time with the host, unless you decide to change the date/time manually. @@ -1154,9 +1154,10 @@ auxdevice = intellimouse #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. #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 +#DOSBOX-X-ADV-SEE:# -> wpbg; wpfg; char512; autodbcs; autoboxdraw; halfwidthkana; dosvfunc #DOSBOX-X-ADV-SEE:# font = fontbold = @@ -1181,6 +1182,7 @@ printfont = true #DOSBOX-X-ADV:autoboxdraw = true #DOSBOX-X-ADV:halfwidthkana = true blinkc = true +#DOSBOX-X-ADV:dosvfunc = false [voodoo] # voodoo_card: Enable support for the 3dfx Voodoo card. @@ -1996,7 +1998,7 @@ timeout = 0 # file access tries: If a positive integer is set, DOSBox-X will try to read/write/lock files directly on mounted local drives for the specified number of times before failing on Windows systems. # For networked database applications (e.g. dBase, FoxPro, etc), it is recommended to set this to e.g. 3 for correct operations. # network redirector: Report DOS network redirector as resident. This will allow the host name to be returned unless the secure mode is enabled. -# You can also directly access UNC network paths in the form \MACHINE\SHARE even if they are not mounted as drives on Windows systems. +# You can also directly access UNC network paths in the form \\MACHINE\SHARE even if they are not mounted as drives on Windows systems. # Set either "ipx=true" in [ipx] section or "ne2000=true" in [ne2000] section for a full network redirector environment. #DOSBOX-X-ADV:# minimum dos initial private segment: In non-mainline mapping mode, where DOS structures are allocated from base memory, this sets the #DOSBOX-X-ADV:# minimum segment value. Recommended value is 0x70. You may reduce the value down to 0x50 if freeing diff --git a/dosbox-x.reference.conf b/dosbox-x.reference.conf index 3a6e78797..01df0d8de 100644 --- a/dosbox-x.reference.conf +++ b/dosbox-x.reference.conf @@ -146,7 +146,7 @@ debuggerrun = debugger # Possible values: ctrlalt, ctrlshift, altshift, mapper. # mapper send key: Select the key the mapper SendKey function will send. # Possible values: winlogo, winmenu, alttab, ctrlesc, ctrlbreak, ctrlaltdel. -# ime: Enables support for the system input methods (IME) for inputting characters in Windows SDL1 builds. +# ime: Enables support for the system input methods (IME) for inputting characters in Windows and Linux builds. # If set to auto, this feature is only enabled if DOSBox-X starts with a Chinese/Japanese/Korean code page. # Possible values: true, false, 1, 0, auto. # synchronize time: If set, DOSBox-X will try to automatically synchronize time with the host, unless you decide to change the date/time manually. @@ -468,7 +468,7 @@ auxdevice = intellimouse # You can also change the blinking rate by setting an interger between 1 (fastest) and 7 (slowest), or 0 for no cursor. # # Advanced options (see full configuration reference file [dosbox-x.reference.full.conf] for more details): -# -> wpbg; wpfg; char512; autodbcs; autoboxdraw; halfwidthkana +# -> wpbg; wpfg; char512; autodbcs; autoboxdraw; halfwidthkana; dosvfunc # font = fontbold = @@ -949,7 +949,7 @@ timeout = 0 # file access tries: If a positive integer is set, DOSBox-X will try to read/write/lock files directly on mounted local drives for the specified number of times before failing on Windows systems. # For networked database applications (e.g. dBase, FoxPro, etc), it is recommended to set this to e.g. 3 for correct operations. # network redirector: Report DOS network redirector as resident. This will allow the host name to be returned unless the secure mode is enabled. -# You can also directly access UNC network paths in the form \MACHINE\SHARE even if they are not mounted as drives on Windows systems. +# You can also directly access UNC network paths in the form \\MACHINE\SHARE even if they are not mounted as drives on Windows systems. # Set either "ipx=true" in [ipx] section or "ne2000=true" in [ne2000] section for a full network redirector environment. # minimum mcb free: Minimum free segment value to leave free. At startup, the DOS kernel will allocate memory # up to this point. This can be used to deal with EXEPACK issues or DOS programs that cannot diff --git a/dosbox-x.reference.full.conf b/dosbox-x.reference.full.conf index 09790aa2d..02c0f2c4d 100644 --- a/dosbox-x.reference.full.conf +++ b/dosbox-x.reference.full.conf @@ -225,7 +225,7 @@ debuggerrun = debugger # Possible values: ctrlalt, ctrlshift, altshift, mapper. # mapper send key: Select the key the mapper SendKey function will send. # Possible values: winlogo, winmenu, alttab, ctrlesc, ctrlbreak, ctrlaltdel. -# ime: Enables support for the system input methods (IME) for inputting characters in Windows SDL1 builds. +# ime: Enables support for the system input methods (IME) for inputting characters in Windows and Linux builds. # If set to auto, this feature is only enabled if DOSBox-X starts with a Chinese/Japanese/Korean code page. # Possible values: true, false, 1, 0, auto. # synchronize time: If set, DOSBox-X will try to automatically synchronize time with the host, unless you decide to change the date/time manually. @@ -1122,6 +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. font = fontbold = fontital = @@ -1145,6 +1146,7 @@ autodbcs = true autoboxdraw = true halfwidthkana = true blinkc = true +dosvfunc = false [voodoo] # voodoo_card: Enable support for the 3dfx Voodoo card. @@ -1940,7 +1942,7 @@ timeout = 0 # file access tries: If a positive integer is set, DOSBox-X will try to read/write/lock files directly on mounted local drives for the specified number of times before failing on Windows systems. # For networked database applications (e.g. dBase, FoxPro, etc), it is recommended to set this to e.g. 3 for correct operations. # network redirector: Report DOS network redirector as resident. This will allow the host name to be returned unless the secure mode is enabled. -# You can also directly access UNC network paths in the form \MACHINE\SHARE even if they are not mounted as drives on Windows systems. +# You can also directly access UNC network paths in the form \\MACHINE\SHARE even if they are not mounted as drives on Windows systems. # Set either "ipx=true" in [ipx] section or "ne2000=true" in [ne2000] section for a full network redirector environment. # minimum dos initial private segment: In non-mainline mapping mode, where DOS structures are allocated from base memory, this sets the # minimum segment value. Recommended value is 0x70. You may reduce the value down to 0x50 if freeing diff --git a/src/hardware/vga_draw.cpp b/src/hardware/vga_draw.cpp index faeacf39d..38ec71064 100644 --- a/src/hardware/vga_draw.cpp +++ b/src/hardware/vga_draw.cpp @@ -4000,7 +4000,7 @@ static void VGA_VerticalTimer(Bitu /*val*/) { if (uname[0]!=0&&uname[1]==0) { (*draw).chr=uname[0]; (*draw).unicode=1; - if ((*draw).chr>=0x2488&&(*draw).chr<=0x2490) { // Single wide, yet DBCS encoding. More to be added + if ((*draw).chr==0x2014||(*draw).chr>=0x2488&&(*draw).chr<=0x2490) { // Single wide, yet DBCS encoding. More to be added dbw=false; dex=true; } else { @@ -4073,7 +4073,7 @@ static void VGA_VerticalTimer(Bitu /*val*/) { if (uname[0]!=0&&uname[1]==0) { (*draw).chr=uname[0]; (*draw).unicode=1; - if ((*draw).chr>=0x2488&&(*draw).chr<=0x2490) { // Single wide, yet DBCS encoding. More to be added + if ((*draw).chr==0x2014||(*draw).chr>=0x2488&&(*draw).chr<=0x2490) { // Single wide, yet DBCS encoding. More to be added dbw=false; dex=true; } else {