From 8a159a59cd6a3c61f55d1d6421396aa59bbf0bee Mon Sep 17 00:00:00 2001 From: Jonathan Campbell Date: Fri, 1 Mar 2024 00:04:45 -0800 Subject: [PATCH] Prepare for release --- CHANGELOG | 2 +- configure.ac | 2 +- .../com.dosbox_x.DOSBox-X.metainfo.xml.in | 4 +- contrib/translations/de/de_DE.lng | 2 +- contrib/translations/de/de_pc98.lng | 2 +- contrib/translations/en/en_US.lng | 2 +- contrib/translations/es/es_ES.lng | 2 +- contrib/translations/fr/fr_FR.lng | 2 +- contrib/translations/hu/hu_HU.lng | 2 +- contrib/translations/it/it_IT.lng | 2 +- contrib/translations/ja/ja_JP.lng | 2 +- contrib/translations/ko/ko_KR.lng | 2 +- contrib/translations/nl/nl_NL.lng | 2 +- contrib/translations/pt/pt_BR.lng | 2 +- contrib/translations/ru/ru_RU.lng | 2 +- contrib/translations/tr/tr_TR.lng | 2 +- contrib/translations/zh/zh_CN.lng | 2 +- contrib/translations/zh/zh_TW.lng | 2 +- .../windows/installer/DOSBox-X-installer.iss | 2 +- contrib/windows/installer/DOSBox-X-setup.iss | 2 +- .../windows/installer/DOSBox-X-setupXP.iss | 2 +- .../installer/dosbox-x.reference.setup.conf | 107 ++++++++++++------ dosbox-x.reference.conf | 75 +++++++----- dosbox-x.reference.full.conf | 100 ++++++++++------ include/build_timestamp.h | 6 +- vs/config_package.h | 6 +- 26 files changed, 214 insertions(+), 124 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 50a444027..26061c52f 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,4 +1,4 @@ -Next: +2024.03.01 - If an empty CD-ROM drive is attached to IDE emulation, return "Medium Not Present" instead of a read error, when asked to read. (joncampbell123). - Add "empty drive" CD-ROM image type "IMGMOUNT e: empty -t iso" as a way diff --git a/configure.ac b/configure.ac index 61b08d3fe..f0f0dc6e9 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ dnl Init. -AC_INIT(dosbox-x,2023.10.06,[https://github.com/joncampbell123/dosbox-x/issues],[],[https://dosbox-x.com]) +AC_INIT(dosbox-x,2024.03.01,[https://github.com/joncampbell123/dosbox-x/issues],[],[https://dosbox-x.com]) AC_PREREQ(2.60) AC_CONFIG_SRCDIR(README.md) 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 6bebdff49..420b92ba3 100644 --- a/contrib/linux/com.dosbox_x.DOSBox-X.metainfo.xml.in +++ b/contrib/linux/com.dosbox_x.DOSBox-X.metainfo.xml.in @@ -1,5 +1,5 @@ - + com.dosbox_x.DOSBox-X GPL-2.0 @@ -10,7 +10,7 @@ Emulation - + diff --git a/contrib/translations/de/de_DE.lng b/contrib/translations/de/de_DE.lng index 45ba3ec10..aa7a649c4 100644 --- a/contrib/translations/de/de_DE.lng +++ b/contrib/translations/de/de_DE.lng @@ -1,6 +1,6 @@ :DOSBOX-X:LANGUAGE:German :DOSBOX-X:CODEPAGE:858 -:DOSBOX-X:VERSION:2023.10.06 +:DOSBOX-X:VERSION:2024.03.01 :DOSBOX-X:REMARK: :PROGRAM_BOOT_BOOTING Starte von Laufwerk diff --git a/contrib/translations/de/de_pc98.lng b/contrib/translations/de/de_pc98.lng index 9feb07b07..de4d6ae77 100644 --- a/contrib/translations/de/de_pc98.lng +++ b/contrib/translations/de/de_pc98.lng @@ -1,6 +1,6 @@ :DOSBOX-X:LANGUAGE:German :DOSBOX-X:CODEPAGE:858 -:DOSBOX-X:VERSION:2023.10.06 +:DOSBOX-X:VERSION:2024.03.01 :DOSBOX-X:REMARK: :PROGRAM_BOOT_BOOTING Starte von Laufwerk diff --git a/contrib/translations/en/en_US.lng b/contrib/translations/en/en_US.lng index e7d8fb712..eb7fe7c4b 100644 --- a/contrib/translations/en/en_US.lng +++ b/contrib/translations/en/en_US.lng @@ -1,6 +1,6 @@ :DOSBOX-X:LANGUAGE:English (United States) :DOSBOX-X:CODEPAGE:437 -:DOSBOX-X:VERSION:2023.10.06 +:DOSBOX-X:VERSION:2024.03.01 :DOSBOX-X:REMARK: :AUTOEXEC_CONFIGFILE_HELP Lines in this section will be run at startup. diff --git a/contrib/translations/es/es_ES.lng b/contrib/translations/es/es_ES.lng index e45645140..b87797a5f 100644 --- a/contrib/translations/es/es_ES.lng +++ b/contrib/translations/es/es_ES.lng @@ -1,6 +1,6 @@ :DOSBOX-X:LANGUAGE:Spanish (Spain) :DOSBOX-X:CODEPAGE:858 -:DOSBOX-X:VERSION:2023.10.06 +:DOSBOX-X:VERSION:2024.03.01 :DOSBOX-X:REMARK: :AUTOEXEC_CONFIGFILE_HELP Las líneas de esta sección se iniciarán al inicio. diff --git a/contrib/translations/fr/fr_FR.lng b/contrib/translations/fr/fr_FR.lng index 6c1114d15..7f00635a6 100644 --- a/contrib/translations/fr/fr_FR.lng +++ b/contrib/translations/fr/fr_FR.lng @@ -1,6 +1,6 @@ :DOSBOX-X:LANGUAGE:French (France) :DOSBOX-X:CODEPAGE:859 -:DOSBOX-X:VERSION:2023.10.06 +:DOSBOX-X:VERSION:2024.03.01 :DOSBOX-X:REMARK: :AUTOEXEC_CONFIGFILE_HELP Les lignes de cette section seront exécutées au démarrage. diff --git a/contrib/translations/hu/hu_HU.lng b/contrib/translations/hu/hu_HU.lng index 966aba80e..fc9f495bd 100644 --- a/contrib/translations/hu/hu_HU.lng +++ b/contrib/translations/hu/hu_HU.lng @@ -1,6 +1,6 @@ :DOSBOX-X:LANGUAGE:Hungarian (Hungary) :DOSBOX-X:CODEPAGE:852 -:DOSBOX-X:VERSION:2023.10.06 +:DOSBOX-X:VERSION:2024.03.01 :DOSBOX-X:REMARK: :AUTOEXEC_CONFIGFILE_HELP Ebben a szekcióban lévő sorok indításkor lefutnak. diff --git a/contrib/translations/it/it_IT.lng b/contrib/translations/it/it_IT.lng index a7ecee61f..8cbc31e13 100644 --- a/contrib/translations/it/it_IT.lng +++ b/contrib/translations/it/it_IT.lng @@ -1,6 +1,6 @@ :DOSBOX-X:LANGUAGE:Italiano (Italy) :DOSBOX-X:CODEPAGE:437 -:DOSBOX-X:VERSION:2023.10.06 +:DOSBOX-X:VERSION:2024.03.01 :DOSBOX-X:REMARK: :PROGRAM_IMGMAKE_BADSIZE Argomenti errati per -size o -chs. diff --git a/contrib/translations/ja/ja_JP.lng b/contrib/translations/ja/ja_JP.lng index f56c1331b..6bd017990 100644 --- a/contrib/translations/ja/ja_JP.lng +++ b/contrib/translations/ja/ja_JP.lng @@ -1,6 +1,6 @@ :DOSBOX-X:LANGUAGE:Japanese :DOSBOX-X:CODEPAGE:932 -:DOSBOX-X:VERSION:2023.10.06 +:DOSBOX-X:VERSION:2024.03.01 :DOSBOX-X:REMARK:PC-98, JEGA, DOS/V エミュレーション、または とコード ページ 932 の日本語フォントを使用して、日本語の表示と印刷を直接サポートします :AUTOEXEC_CONFIGFILE_HELP このセクションに記載の行は起動時に実行されます。 diff --git a/contrib/translations/ko/ko_KR.lng b/contrib/translations/ko/ko_KR.lng index 70730af13..0cbdc170b 100644 --- a/contrib/translations/ko/ko_KR.lng +++ b/contrib/translations/ko/ko_KR.lng @@ -1,6 +1,6 @@ :DOSBOX-X:LANGUAGE:Korean :DOSBOX-X:CODEPAGE:949 -:DOSBOX-X:VERSION:2023.10.06 +:DOSBOX-X:VERSION:2024.03.01 :DOSBOX-X:REMARK:DOS/V 에뮬레이션 또는 코드 페이지 949의 한국어 글꼴을 사용하여 한국어 표시 및 인쇄를 직접 지원합니다. :AUTOEXEC_CONFIGFILE_HELP 이 섹션에 나열된 줄은 시작할 때 실행됩니다. diff --git a/contrib/translations/nl/nl_NL.lng b/contrib/translations/nl/nl_NL.lng index 731266642..082f05a3f 100644 --- a/contrib/translations/nl/nl_NL.lng +++ b/contrib/translations/nl/nl_NL.lng @@ -1,6 +1,6 @@ :DOSBOX-X:LANGUAGE:Nederlands (Nederland) :DOSBOX-X:CODEPAGE:858 -:DOSBOX-X:VERSION:2023.10.06 +:DOSBOX-X:VERSION:2024.03.01 :DOSBOX-X:REMARK: :AUTOEXEC_CONFIGFILE_HELP Lijnen in dit gedeelte worden uitgevoerd bij opstarten. diff --git a/contrib/translations/pt/pt_BR.lng b/contrib/translations/pt/pt_BR.lng index c82d1e1c1..b72e109c8 100644 --- a/contrib/translations/pt/pt_BR.lng +++ b/contrib/translations/pt/pt_BR.lng @@ -1,6 +1,6 @@ :DOSBOX-X:LANGUAGE:Portuguese (Brazil) :DOSBOX-X:CODEPAGE:860 -:DOSBOX-X:VERSION:2023.10.06 +:DOSBOX-X:VERSION:2024.03.01 :DOSBOX-X:REMARK: :AUTOEXEC_CONFIGFILE_HELP As linhas nesta seção serão sempre executadas ao se iniciar o DOSBox-X. diff --git a/contrib/translations/ru/ru_RU.lng b/contrib/translations/ru/ru_RU.lng index 6de877f2d..c8cf529b3 100644 --- a/contrib/translations/ru/ru_RU.lng +++ b/contrib/translations/ru/ru_RU.lng @@ -1,6 +1,6 @@ :DOSBOX-X:LANGUAGE:Русский (Россия) :DOSBOX-X:CODEPAGE:866 -:DOSBOX-X:VERSION:2023.10.06 +:DOSBOX-X:VERSION:2024.03.01 :DOSBOX-X:REMARK: :AUTOEXEC_CONFIGFILE_HELP Строки в этом разделе будут выполнены при запуске. diff --git a/contrib/translations/tr/tr_TR.lng b/contrib/translations/tr/tr_TR.lng index 7e5bd73c7..777b2c26d 100644 --- a/contrib/translations/tr/tr_TR.lng +++ b/contrib/translations/tr/tr_TR.lng @@ -1,6 +1,6 @@ :DOSBOX-X:LANGUAGE:Turkish (Turkey) :DOSBOX-X:CODEPAGE:857 -:DOSBOX-X:VERSION:2023.10.06 +:DOSBOX-X:VERSION:2024.03.01 :DOSBOX-X:REMARK: :AUTOEXEC_CONFIGFILE_HELP Lines in this section will be run at startup. diff --git a/contrib/translations/zh/zh_CN.lng b/contrib/translations/zh/zh_CN.lng index 89213b741..5ff4543d8 100644 --- a/contrib/translations/zh/zh_CN.lng +++ b/contrib/translations/zh/zh_CN.lng @@ -1,6 +1,6 @@ :DOSBOX-X:LANGUAGE:Simplified Chinese :DOSBOX-X:CODEPAGE:936 -:DOSBOX-X:VERSION:2023.10.06 +:DOSBOX-X:VERSION:2024.03.01 :DOSBOX-X:REMARK:建议将国家和代码页设为 86,936 并搭配中文字体; 或使用 chs 或 cn 中文 DOS/V 模式以直接支持中文显示和打印 :AUTOEXEC_CONFIGFILE_HELP Lines in this section will be run at startup. diff --git a/contrib/translations/zh/zh_TW.lng b/contrib/translations/zh/zh_TW.lng index 5cc8fd95e..c6274927f 100644 --- a/contrib/translations/zh/zh_TW.lng +++ b/contrib/translations/zh/zh_TW.lng @@ -1,6 +1,6 @@ :DOSBOX-X:LANGUAGE:Traditional Chinese :DOSBOX-X:CODEPAGE:950 -:DOSBOX-X:VERSION:2023.10.06 +:DOSBOX-X:VERSION:2024.03.01 :DOSBOX-X:REMARK:建議將國家和字碼頁設為 886,950 並搭配中文字型; 或使用 cht 或 tw 中文 DOS/V 模式以直接支援中文顯示和列印 :AUTOEXEC_CONFIGFILE_HELP 區段中的指令行會在啟動時執行. diff --git a/contrib/windows/installer/DOSBox-X-installer.iss b/contrib/windows/installer/DOSBox-X-installer.iss index 7fb5efdc0..09f2fdfba 100644 --- a/contrib/windows/installer/DOSBox-X-installer.iss +++ b/contrib/windows/installer/DOSBox-X-installer.iss @@ -1,5 +1,5 @@ #define MyAppName "DOSBox-X" -#define MyAppVersion "2023.10.06" +#define MyAppVersion "2024.03.01" #define MyAppBit "(32/64bit for Windows)" #define MyAppPublisher "joncampbell123 [DOSBox-X Team]" #define MyAppURL "https://dosbox-x.com/" diff --git a/contrib/windows/installer/DOSBox-X-setup.iss b/contrib/windows/installer/DOSBox-X-setup.iss index 935e04596..790b49db4 100644 --- a/contrib/windows/installer/DOSBox-X-setup.iss +++ b/contrib/windows/installer/DOSBox-X-setup.iss @@ -1,5 +1,5 @@ #define MyAppName "DOSBox-X" -#define MyAppVersion "2023.10.06" +#define MyAppVersion "2024.03.01" #define MyAppBit "(32-bit)" #define MyAppPublisher "joncampbell123 [DOSBox-X Team]" #define MyAppURL "https://dosbox-x.com/" diff --git a/contrib/windows/installer/DOSBox-X-setupXP.iss b/contrib/windows/installer/DOSBox-X-setupXP.iss index c75dbbc84..3c2598cb0 100644 --- a/contrib/windows/installer/DOSBox-X-setupXP.iss +++ b/contrib/windows/installer/DOSBox-X-setupXP.iss @@ -1,5 +1,5 @@ #define MyAppName "DOSBox-X" -#define MyAppVersion "2023.10.06" +#define MyAppVersion "2024.03.01" #define MyAppBit "(32/64bit for XP)" #define MyAppPublisher "joncampbell123 [DOSBox-X Team]" #define MyAppURL "https://dosbox-x.com/" diff --git a/contrib/windows/installer/dosbox-x.reference.setup.conf b/contrib/windows/installer/dosbox-x.reference.setup.conf index db33c9c73..2e4a56c8e 100644 --- a/contrib/windows/installer/dosbox-x.reference.setup.conf +++ b/contrib/windows/installer/dosbox-x.reference.setup.conf @@ -1,4 +1,4 @@ -# This is the configuration file for DOSBox-X 2023.10.06. (Please use the latest version of DOSBox-X) +# This is the configuration file for DOSBox-X 2024.03.01. (Please use the latest version of DOSBox-X) # Lines starting with a # are comment lines and are ignored by DOSBox-X. # They are used to (briefly) document the effect of each option. # To write out ALL options, use command 'config -all' with -wc or -writeconf options. @@ -380,6 +380,10 @@ debuggerrun = debugger #DOSBOX-X-ADV:# Majic 12 "Show": If UMBs are enabled, set this option to 639 to avoid MCB chain corruption error. #DOSBOX-X-ADV:# isa memory hole at 512kb: If set, emulate an ISA memory hole at the 512KB to 640KB area (0x80000-0x9FFFF). #DOSBOX-X-ADV:# Possible values: true, false, 1, 0, auto. +#DOSBOX-X-ADV:# isa memory hole at 15mb: If set, emulate an ISA memory hole at the 15MB to 16MB area (0xF00000-0xFFFFFF). +#DOSBOX-X-ADV:# If auto, hole is disabled by default for IBM compatible modes and enabled by default for NEC PC-98 compatible modes. +#DOSBOX-X-ADV:# The reason for this is that the hole is needed for the PC-9821 256-color mode linear framebuffer to work with some DOS games even when memsize >= 16. +#DOSBOX-X-ADV:# Possible values: true, false, 1, 0, auto. #DOSBOX-X-ADV:# reboot delay: Reboot delay. How long to pause at BIOS POST after reboot in milliseconds. #DOSBOX-X-ADV:# This option is provided so that it is possible to see what the guest application #DOSBOX-X-ADV:# or OS might have written to the screen before resetting the system. A value of @@ -438,7 +442,7 @@ debuggerrun = debugger #DOSBOX-X-ADV:# enable pci bus: Enable PCI bus 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:# -> disable graphical splash; allow quit after warning; keyboard hook; weitek; bochs debug port e9; video debug at startup; compresssaveparts; show recorded filename; skip encoding unchanged frames; capture chroma format; capture format; shell environment size; private area size; turn off a20 gate on boot; cbus bus clock; isa bus clock; pci bus clock; call binary on reset; unhandled irq handler; call binary on boot; ibm rom basic; rom bios allocation max; rom bios minimum size; irq delay ns; iodelay; iodelay16; iodelay32; acpi; acpi rsd ptr location; acpi sci irq; acpi iobase; acpi reserved size; memsizekb; dos mem limit; isa memory hole at 512kb; reboot delay; memalias; convert fat free space; convert fat timeout; leading colon write protect image; locking disk image mount; unmask keyboard on int 16 read; int16 keyboard polling undocumented cf behavior; allow port 92 reset; enable port 92; enable 1st dma controller; enable 2nd dma controller; allow dma address decrement; enable 128k capable 16-bit dma; enable dma extra page registers; dma page registers write-only; cascade interrupt never in service; cascade interrupt ignore in service; enable slave pic; enable pc nmi mask; allow more than 640kb base memory; enable pci bus +#DOSBOX-X-ADV-SEE:# -> disable graphical splash; allow quit after warning; keyboard hook; weitek; bochs debug port e9; video debug at startup; compresssaveparts; show recorded filename; skip encoding unchanged frames; capture chroma format; capture format; shell environment size; private area size; turn off a20 gate on boot; cbus bus clock; isa bus clock; pci bus clock; call binary on reset; unhandled irq handler; call binary on boot; ibm rom basic; rom bios allocation max; rom bios minimum size; irq delay ns; iodelay; iodelay16; iodelay32; acpi; acpi rsd ptr location; acpi sci irq; acpi iobase; acpi reserved size; memsizekb; dos mem limit; isa memory hole at 512kb; isa memory hole at 15mb; reboot delay; memalias; convert fat free space; convert fat timeout; leading colon write protect image; locking disk image mount; unmask keyboard on int 16 read; int16 keyboard polling undocumented cf behavior; allow port 92 reset; enable port 92; enable 1st dma controller; enable 2nd dma controller; allow dma address decrement; enable 128k capable 16-bit dma; enable dma extra page registers; dma page registers write-only; cascade interrupt never in service; cascade interrupt ignore in service; enable slave pic; enable pc nmi mask; allow more than 640kb base memory; enable pci bus #DOSBOX-X-ADV-SEE:# language = title = @@ -499,6 +503,7 @@ memsize = 16 #DOSBOX-X-ADV:memsizekb = 0 #DOSBOX-X-ADV:dos mem limit = 0 #DOSBOX-X-ADV:isa memory hole at 512kb = auto +#DOSBOX-X-ADV:isa memory hole at 15mb = auto #DOSBOX-X-ADV:reboot delay = -1 #DOSBOX-X-ADV:memalias = 0 nocachedir = false @@ -529,47 +534,62 @@ convertdrivefat = true # frameskip: How many frames DOSBox-X skips before drawing one. # aspect: Aspect ratio correction mode. Can be set to the following values: # 'false' (default): -# 'direct3d'/opengl outputs: image is simply scaled to full window/fullscreen size, possibly resulting in disproportional image -# 'surface' output: it does no aspect ratio correction (default), resulting in disproportional images if VGA mode pixel ratio is not 4:3 +# 'direct3d'/opengl outputs: image is simply scaled to full +# window/fullscreen size, possibly resulting in dis- +# proportional image +# 'surface' output: it does no aspect ratio correction, +# resulting in disproportional images if VGA mode pixel +# ratio is not 4:3 (default) # 'true': -# 'direct3d'/opengl outputs: uses output driver functions to scale / pad image with black bars, correcting output to proportional 4:3 image -# In most cases image degradation should not be noticeable (it all depends on the video adapter and how much the image is upscaled). -# Should have none to negligible impact on performance, mostly being done in hardware -# For the pixel-perfect scaling (output=openglpp), it is recommended to enable this whenever the emulated display has an aspect ratio of 4:3 -# 'surface' output: inherits old DOSBox aspect ratio correction method (adjusting rendered image line count to correct output to 4:3 ratio) -# Due to source image manipulation this mode does not mix well with scalers, i.e. multiline scalers like hq2x/hq3x will work poorly -# Slightly degrades visual image quality. Has a tiny impact on performance -# When using xBRZ scaler with 'surface' output, aspect ratio correction is done by the scaler itself, so none of the above apply +# 'direct3d'/opengl outputs: uses output driver functions to +# scale / pad image with black bars, correcting output +# to proportional 4:3 image +# In most cases image degradation should not be noticeable +# (it all depends on the video adapter and how much the image +# is upscaled). +# Should have none to negligible impact on performance, +# mostly being done in hardware. +# For the pixel-perfect scaling (output=openglpp), it is +# recommended to enable this whenever the emulated display +# has an aspect ratio of 4:3 +# 'surface' output: inherits old DOSBox aspect ratio correction +# method (adjusting rendered image line count to correct +# output to 4:3 ratio) +# Due to source image manipulation this mode does not mix +# well with scalers, i.e. multiline scalers like hq2x/hq3x +# will work poorly +# Slightly degrades visual image quality. Has a tiny impact +# on performance. +# When using xBRZ scaler with 'surface' output, aspect +# ratio correction is done by the scaler itself, so none of +# the above apply. # Possible values: false, true, 0, 1, yes, no, nearest, bilinear. # aspect_ratio: Set the aspect ratio (e.g. 16:9) in the aspect ratio correction mode. 0:0 means the default ratio of 4:3, and -1:-1 means the original image ratio. # char9: Allow 9-pixel wide text mode fonts instead of 8-pixel wide fonts. # euro: Display Euro symbol instead of the specified ASCII character (33-255). # For example, setting it to 128 allows Euro symbol to be displayed instead of C-cedilla. -# doublescan: If set, doublescanned output emits two scanlines for each source line, in the -# same manner as the actual VGA output (320x200 is rendered as 640x400 for example). +# doublescan: If set, doublescanned output emits two scanlines for each source line, in the same manner as the actual VGA output (320x200 is rendered as 640x400 for example). # If clear, doublescanned output is rendered at the native source resolution (320x200 as 320x200). -# This affects the raster PRIOR to the software or hardware scalers. Choose wisely. +# This affects the raster PRIOR to the software or hardware scalers. +# Setting this option may prevent some scalers to work as expected. +# Try turning this option off in such case. # For pixel-perfect scaling (output=openglpp), it is recommended to turn this option off. -# scaler: Scaler used to enlarge/enhance low resolution modes. If 'forced' is appended, -# then the scaler will be used even if the result might not be desired. +# scaler: Scaler used to enlarge/enhance low resolution modes. Add keyword 'forced', after the name of the scaler to always use the scaler even if the result might not be desired.(e.g. 'normal2x forced') # Appending 'prompt' will cause a confirmation message for forcing the scaler. # To fit a scaler in the resolution used at full screen may require a border or side bars. # To fill the screen entirely, depending on your hardware, a different scaler/fullresolution might work. # Scalers should work with most output options, but they are ignored for openglpp and TrueType font outputs. # Possible values: none, normal2x, normal3x, normal4x, normal5x, advmame2x, advmame3x, advinterp2x, advinterp3x, hq2x, hq3x, 2xsai, super2xsai, supereagle, tv2x, tv3x, rgb2x, rgb3x, scan2x, scan3x, gray, gray2x, hardware_none, hardware2x, hardware3x, hardware4x, hardware5x, xbrz, xbrz_bilinear. # glshader: Path to GLSL shader source to use with OpenGL output ("none" to disable, or "default" for default shader). -# Can be either an absolute path, a file in the "glshaders" subdirectory of the DOSBox-X configuration directory, -# or one of the built-in shaders (e.g. "sharp" for the pixel-perfect scaling mode): +# Can be either an absolute path, a file in the "glshaders" subdirectory of the DOSBox-X configuration directory, or one of the built-in shaders (e.g. "sharp" for the pixel-perfect scaling mode): # advinterp2x, advinterp3x, advmame2x, advmame3x, rgb2x, rgb3x, scan2x, scan3x, tv2x, tv3x, sharp. -# pixelshader: Set Direct3D pixel shader program (effect file must be in Shaders subdirectory). If 'forced' is appended, -# then the pixel shader will be used even if the result might not be desired. +# pixelshader: Set Direct3D pixel shader program (effect file must be in Shaders subdirectory). If 'forced' is appended, then the pixel shader will be used even if the result might not be desired. #DOSBOX-X-ADV:# xbrz slice: Number of screen lines to process in single xBRZ scaler taskset task, affects xBRZ performance, 16 is the default #DOSBOX-X-ADV:# xbrz fixed scale factor: To use fixed xBRZ scale factor (i.e. to attune performance), set it to 2-6, 0 - use automatic calculation (default) #DOSBOX-X-ADV:# xbrz max scale factor: To cap maximum xBRZ scale factor used (i.e. to attune performance), set it to 2-6, 0 - use scaler allowed maximum (default) # autofit: Best fits image to window -# - Intended for output=direct3d, fullresolution=original, aspect=true +# Intended for output=direct3d, fullresolution=original, aspect=true # monochrome_pal: Specify the color of monochrome display. -# Possible values: green, amber, gray, white # Append 'bright' for a brighter look. # Possible values: green, amber, gray, white. #DOSBOX-X-ADV-SEE:# @@ -595,14 +615,12 @@ monochrome_pal = green # pc-98 BIOS copyright string: If set, the PC-98 BIOS copyright string is placed at E800:0000. Enable this for software that detects PC-98 vs Epson. #DOSBOX-X-ADV:# pc-98 int 1b fdc timer wait: If set, INT 1Bh floppy access will wait for the timer to count down before returning. #DOSBOX-X-ADV:# This is needed for Ys II to run without crashing. -#DOSBOX-X-ADV:# pc-98 pic init to read isr: If set, the programmable interrupt controllers are initialized by default (if PC-98 mode) -#DOSBOX-X-ADV:# so that the in-service interrupt status can be read immediately. There seems to be a common -#DOSBOX-X-ADV:# convention in PC-98 games to program and/or assume this mode for cooperative interrupt handling. -#DOSBOX-X-ADV:# This option is enabled by default for best compatibility with PC-98 games. +#DOSBOX-X-ADV:# pc-98 pic init to read isr: If set, the programmable interrupt controllers are initialized by default (if PC-98 mode) so that the in-service interrupt status can be read immediately. There seems to be a common convention in PC-98 games to program and/or assume this mode for cooperative interrupt handling. This option is enabled by default for best compatibility with PC-98 games. # pc-98 fm board: In PC-98 mode, selects the FM music board to emulate. # Possible values: auto, off, false, board14, board26k, board86, board86c. #DOSBOX-X-ADV:# pc-98 fm board irq: If set, helps to determine the IRQ of the FM board. A setting of zero means to auto-determine the IRQ. #DOSBOX-X-ADV:# pc-98 fm board io port: If set, helps to determine the base I/O port of the FM board. A setting of zero means to auto-determine the port number. +#DOSBOX-X-ADV:# pc-98 time stamp: Emulate the time stamp/hardware wait I/O ports at 5Ch and 5Eh. This is recommended. #DOSBOX-X-ADV:# pc-98 sound bios: Set Sound BIOS enabled bit in MEMSW 4 for some games that require it. #DOSBOX-X-ADV:# TODO: Real emulation of PC-9801-26K/86 Sound BIOS #DOSBOX-X-ADV:# pc-98 load sound bios rom file: If set, load SOUND.ROM if available and prsent that to the guest instead of trying to emulate directly. @@ -624,6 +642,7 @@ monochrome_pal = green #DOSBOX-X-ADV:# in 200-line graphics modes upconverted to 400-line raster display. When enabled, odd #DOSBOX-X-ADV:# numbered scanlines are blanked instead of doubled # pc-98 bus mouse: Enable PC-98 bus mouse emulation. Disabling this option does not disable INT 33h emulation. +#DOSBOX-X-ADV:# pc-98 nec mouse function: If set, Use NEC mouse function in int 33h. #DOSBOX-X-ADV:# pc-98 video mode: Specify the preferred PC-98 video mode. #DOSBOX-X-ADV:# Valid values are 15, 24, or 31 for each specific horizontal refresh rate on the platform. #DOSBOX-X-ADV:# 24khz is default and best supported at this time. @@ -652,16 +671,23 @@ monochrome_pal = green # pc-98 force ibm keyboard layout: Force to use a default keyboard layout like IBM US-English for PC-98 emulation. # Will only work with apps and games using BIOS for keyboard. # Possible values: true, false, 1, 0, auto. +# pc-98 force JIS keyboard layout: Force to use a default keyboard layout like JIS (JP106) for PC-98 emulation. +# Will only work with apps and games using BIOS for keyboard. # pc-98 try font rom: If enabled, DOSBox-X will first try to load FONT.ROM as generated by T98Tools for PC-98 emulation. # pc-98 anex86 font: Specify an Anex86 compatible font to load as supported by the Anex86 emulator for PC-98 emulation. # By default DOSBox-X tries to load ANEX86.BMP followed by FREECG98.BMP after trying to load FONT.ROM. # If you specify a font here then it will be tried first, perhaps before FONT.ROM (see previous option). +#DOSBOX-X-ADV:# pc-98 fontx sbcs: Specifies a FONTX2 file (8x16) to be used in PC-98 mode. +#DOSBOX-X-ADV:# This file has priority over ANEX86.BMP and FREECG98.BMP. +#DOSBOX-X-ADV:# pc-98 fontx dbcs: Specifies a FONTX2 file (16x16) to be used in PC-98 mode. +#DOSBOX-X-ADV:# This file has priority over ANEX86.BMP and FREECG98.BMP. +#DOSBOX-X-ADV:# pc-98 fontx internal symbol: If set, Use the internal data for hankaku symbols instead of the data in the FONTX2 file. #DOSBOX-X-ADV:# pc-98 show graphics layer on initialize: If PC-98 mode and INT 33h emulation is enabled, the graphics layer will be automatically enabled #DOSBOX-X-ADV:# at driver startup AND when INT 33h AX=0 is called. This is NEC MOUSE.COM behavior and default #DOSBOX-X-ADV:# enabled. To emulate other drivers like QMOUSE that do not follow this behavior, set to false. #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:# -> pc-98 int 1b fdc timer wait; pc-98 pic init to read isr; pc-98 fm board irq; pc-98 fm board io port; pc-98 sound bios; pc-98 load sound bios rom file; pc-98 buffer page flip; pc-98 enable 256-color planar; pc-98 enable 188 user cg; pc-98 start gdc at 5mhz; pc-98 allow scanline effect; pc-98 video mode; pc-98 timer always cycles; pc-98 timer master frequency; pc-98 allow 4 display partition graphics; pc-98 show graphics layer on initialize +#DOSBOX-X-ADV-SEE:# -> pc-98 int 1b fdc timer wait; pc-98 pic init to read isr; pc-98 fm board irq; pc-98 fm board io port; pc-98 time stamp; pc-98 sound bios; pc-98 load sound bios rom file; pc-98 buffer page flip; pc-98 enable 256-color planar; pc-98 enable 188 user cg; pc-98 start gdc at 5mhz; pc-98 allow scanline effect; pc-98 nec mouse function; pc-98 video mode; pc-98 timer always cycles; pc-98 timer master frequency; pc-98 allow 4 display partition graphics; pc-98 fontx sbcs; pc-98 fontx dbcs; pc-98 fontx internal symbol; pc-98 show graphics layer on initialize #DOSBOX-X-ADV-SEE:# pc-98 BIOS copyright string = false #DOSBOX-X-ADV:pc-98 int 1b fdc timer wait = false @@ -669,6 +695,7 @@ pc-98 BIOS copyright string = false pc-98 fm board = auto #DOSBOX-X-ADV:pc-98 fm board irq = 0 #DOSBOX-X-ADV:pc-98 fm board io port = 0 +#DOSBOX-X-ADV:pc-98 time stamp = true #DOSBOX-X-ADV:pc-98 sound bios = false #DOSBOX-X-ADV:pc-98 load sound bios rom file = true #DOSBOX-X-ADV:pc-98 buffer page flip = false @@ -681,20 +708,25 @@ pc-98 enable egc = true #DOSBOX-X-ADV:pc-98 start gdc at 5mhz = false #DOSBOX-X-ADV:pc-98 allow scanline effect = true pc-98 bus mouse = true +#DOSBOX-X-ADV:pc-98 nec mouse function = false #DOSBOX-X-ADV:pc-98 video mode = #DOSBOX-X-ADV:pc-98 timer always cycles = auto #DOSBOX-X-ADV:pc-98 timer master frequency = 0 #DOSBOX-X-ADV:pc-98 allow 4 display partition graphics = -1 pc-98 force ibm keyboard layout = auto +pc-98 force JIS keyboard layout = false pc-98 try font rom = true pc-98 anex86 font = +#DOSBOX-X-ADV:pc-98 fontx sbcs = +#DOSBOX-X-ADV:pc-98 fontx dbcs = +#DOSBOX-X-ADV:pc-98 fontx internal symbol = false #DOSBOX-X-ADV:pc-98 show graphics layer on initialize = true [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 -# an EGA/VGA graphics mode that emulates text mode to display the characters and may be incompatible with non-Asian software that +# 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. @@ -803,6 +835,10 @@ j3100colorscroll = false #DOSBOX-X-ADV:# #DOSBOX-X-ADV:# 4low behavior is default for ET4000 emulation. #DOSBOX-X-ADV:# Possible values: , auto, 4x4, 4low, first16. +#DOSBOX-X-ADV:# enable supermegazeux tweakmode: If set, allow old MegaZeux 256-color text tweakmode aka 'Super MegaZeux mode'. Not all cards support this tweakmode. +#DOSBOX-X-ADV:# The ones that do are not emulated yet by DOSBox-X. It is not known at this time whether S3 chipsets support the hack. +#DOSBOX-X-ADV:# On normal cards the tweakmode does nothing but halve the text mode resolution without any other effects. +#DOSBOX-X-ADV:# Possible values: true, false, 1, 0, auto. #DOSBOX-X-ADV:# vga bios use rom image: If set, load a VGA BIOS from a ROM image file. If clear, provide our own INT 10h emulation as normal. #DOSBOX-X-ADV:# vga bios rom image: If set, load the VGA BIOS from the specified file (must be 1KB to 64KB in size). #DOSBOX-X-ADV:# If left unset, and DOSBox-X is asked to load a VGA BIOS from a file, a file name @@ -826,7 +862,7 @@ j3100colorscroll = false #DOSBOX-X-ADV:# not emulate a RAMDAC that is accessible through port 3C6h. This option has no effect for non-VGA video hardware. #DOSBOX-X-ADV:# sierra ramdac lock 565: When emulating High Sierra highcolor RAMDAC, assume 5:6:5 at all times if set. Else, #DOSBOX-X-ADV:# bit 6 of the DAC command selects between 5:5:5 and 5:6:5. Set this option for demos or -#DOSBOX-X-ADV:# games that got the command byte wrong (MFX Transgrassion 2) or any other demo that is +#DOSBOX-X-ADV:# games that got the command byte wrong (MFX Transgression 2) or any other demo that is #DOSBOX-X-ADV:# not rendering highcolor 16bpp correctly. #DOSBOX-X-ADV:# vga fill active memory: If set, DOSBox-X will fill inactive video memory regions with RAM rather than mapping them as empty. This allows the ETen Chinese DOS system (e.g. ET16V and ET24VA) to run. #DOSBOX-X-ADV:# page flip debug line: VGA debugging switch. If set, an inverse line will be drawn on the exact scanline that the CRTC display offset registers were written. @@ -960,7 +996,7 @@ j3100colorscroll = false # Possible values: true, false, 1, 0, auto. #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:# -> vmemdelay; vbe window granularity; vbe window size; enable 8-bit dac; svga lfb base; pci vga; vga attribute controller mapping; vga bios use rom image; vga bios rom image; vga bios size override; video bios dont duplicate cga first half rom font; video bios always offer 14-pixel high rom font; video bios always offer 16-pixel high rom font; video bios enable cga second half rom font; forcerate; sierra ramdac; sierra ramdac lock 565; vga fill active memory; page flip debug line; vertical retrace poll debug line; cgasnow; vga 3da undefined bits; rom bios 8x8 CGA font; rom bios video parameter table; int 10h points at vga bios; unmask timer on int 10 setmode; vesa bank switching window mirroring; vesa bank switching window range check; vesa zero buffer on get information; vesa set display vsync; vesa lfb base scanline adjust; vesa map non-lfb modes to 128kb region; ega per scanline hpel; allow hpel effects; allow hretrace effects; hretrace effect weight; vesa modelist cap; vesa modelist width limit; vesa modelist height limit; vesa vbe put modelist in vesa information; vesa vbe 1.2 modes are 32bpp; allow low resolution vesa modes; allow explicit 24bpp vesa modes; allow high definition vesa modes; allow unusual vesa modes; allow 32bpp vesa modes; allow 24bpp vesa modes; allow 16bpp vesa modes; allow 15bpp vesa modes; allow 8bpp vesa modes; allow 4bpp vesa modes; allow 4bpp packed vesa modes; allow tty vesa modes; double-buffered line compare; ignore vblank wraparound; ignore extended memory bit; enable vga resize delay; resize only on vga active display width increase; vga palette update on full load; ignore odd-even mode in non-cga modes; ignore sequencer blanking +#DOSBOX-X-ADV-SEE:# -> vmemdelay; vbe window granularity; vbe window size; enable 8-bit dac; svga lfb base; pci vga; vga attribute controller mapping; enable supermegazeux tweakmode; vga bios use rom image; vga bios rom image; vga bios size override; video bios dont duplicate cga first half rom font; video bios always offer 14-pixel high rom font; video bios always offer 16-pixel high rom font; video bios enable cga second half rom font; forcerate; sierra ramdac; sierra ramdac lock 565; vga fill active memory; page flip debug line; vertical retrace poll debug line; cgasnow; vga 3da undefined bits; rom bios 8x8 CGA font; rom bios video parameter table; int 10h points at vga bios; unmask timer on int 10 setmode; vesa bank switching window mirroring; vesa bank switching window range check; vesa zero buffer on get information; vesa set display vsync; vesa lfb base scanline adjust; vesa map non-lfb modes to 128kb region; ega per scanline hpel; allow hpel effects; allow hretrace effects; hretrace effect weight; vesa modelist cap; vesa modelist width limit; vesa modelist height limit; vesa vbe put modelist in vesa information; vesa vbe 1.2 modes are 32bpp; allow low resolution vesa modes; allow explicit 24bpp vesa modes; allow high definition vesa modes; allow unusual vesa modes; allow 32bpp vesa modes; allow 24bpp vesa modes; allow 16bpp vesa modes; allow 15bpp vesa modes; allow 8bpp vesa modes; allow 4bpp vesa modes; allow 4bpp packed vesa modes; allow tty vesa modes; double-buffered line compare; ignore vblank wraparound; ignore extended memory bit; enable vga resize delay; resize only on vga active display width increase; vga palette update on full load; ignore odd-even mode in non-cga modes; ignore sequencer blanking #DOSBOX-X-ADV-SEE:# #DOSBOX-X-ADV:vmemdelay = 0 vmemsize = -1 @@ -972,6 +1008,7 @@ high intensity blinking = true #DOSBOX-X-ADV:svga lfb base = 0 #DOSBOX-X-ADV:pci vga = true #DOSBOX-X-ADV:vga attribute controller mapping = auto +#DOSBOX-X-ADV:enable supermegazeux tweakmode = #DOSBOX-X-ADV:vga bios use rom image = false #DOSBOX-X-ADV:vga bios rom image = #DOSBOX-X-ADV:vga bios size override = 0 @@ -1512,7 +1549,7 @@ fluid.soundfont = [sblaster] # sbtype: Type of Sound Blaster to emulate. 'gb' is Game Blaster. -# Possible values: sb1, sb2, sbpro1, sbpro2, sb16, sb16vibra, gb, ess688, reveal_sc400, none. +# Possible values: sb1, sb2, sbpro1, sbpro2, sb16, sb16vibra, gb, ess688, ess1688, reveal_sc400, none. # sbbase: The IO address of the Sound Blaster. # 220h to 2E0h are for use with IBM PC Sound Blaster emulation. # D2h to DEh are for use with NEC PC-98 Sound Blaster 16 emulation. @@ -1565,7 +1602,7 @@ fluid.soundfont = # sbmixer: Allow the Sound Blaster mixer to modify the DOSBox-X mixer. # oplmode: Type of OPL emulation. On 'auto' the mode is determined by the 'sbtype' setting. # All OPL modes are AdLib-compatible, except for 'cms' (set 'sbtype=none' with 'cms' for a Game Blaster). -# Possible values: auto, cms, opl2, dualopl2, opl3, opl3gold, none, hardware, hardwaregb. +# Possible values: auto, cms, opl2, dualopl2, opl3, opl3gold, none, hardware, hardwaregb, esfm. #DOSBOX-X-ADV:# adlib force timer overflow on detect: If set, Adlib/OPL emulation will signal 'overflow' on timers after 50 I/O reads. #DOSBOX-X-ADV:# This is a temporary hack to work around timing bugs noted in DOSBox-X. Certain #DOSBOX-X-ADV:# games (Wolfenstein 3D) poll the Adlib status port a fixed number of times assuming @@ -1574,7 +1611,7 @@ fluid.soundfont = #DOSBOX-X-ADV:# lower cycles counts, set this option. # oplemu: Provider for the OPL emulation. 'compat' might provide better quality. # 'nuked' is the most accurate (but the most CPU-intensive). See oplrate as well. -# Possible values: default, compat, fast, nuked, mame, opl2board, opl3duoboard, retrowave_opl3. +# Possible values: default, compat, fast, nuked, mame, opl2board, opl3duoboard, retrowave_opl3, esfmu. # oplrate: Sample rate of OPL music emulation. Use 49716 for highest quality (set the mixer rate accordingly). # Possible values: 49716, 48000, 44100, 32000, 22050, 16000, 11025, 8000. # oplport: Serial port of the OPL2 Audio Board when oplemu=opl2board, opl2mode will become 'opl2' automatically. @@ -2470,7 +2507,7 @@ timeout = default #DOSBOX-X-ADV:# Notes: #DOSBOX-X-ADV:# - If mapped ranges differ, the shorter range is extended to fit. #DOSBOX-X-ADV:# - If conflicting host ports are given, only the first one is setup. -#DOSBOX-X-ADV:# - If conflicting guest ports are given, the latter rule takes predecent. +#DOSBOX-X-ADV:# - If conflicting guest ports are given, the latter rule takes precedent. #DOSBOX-X-ADV:# udp_port_forwards: Forwards one or more UDP ports from the host into the DOS guest. #DOSBOX-X-ADV:# The format is the same as for TCP port forwards. #DOSBOX-X-ADV-SEE:# diff --git a/dosbox-x.reference.conf b/dosbox-x.reference.conf index ce3c822ac..fd555dbdb 100644 --- a/dosbox-x.reference.conf +++ b/dosbox-x.reference.conf @@ -1,4 +1,4 @@ -# This is the configuration file for DOSBox-X 2023.10.06. (Please use the latest version of DOSBox-X) +# This is the configuration file for DOSBox-X 2024.03.01. (Please use the latest version of DOSBox-X) # Lines starting with a # are comment lines and are ignored by DOSBox-X. # They are used to (briefly) document the effect of each option. # To write out ALL options, use command 'config -all' with -wc or -writeconf options. @@ -195,7 +195,7 @@ debuggerrun = debugger # convertdrivefat: If set, DOSBox-X will auto-convert mounted non-FAT drives (such as local drives) to FAT format for use with guest systems. # # Advanced options (see full configuration reference file [dosbox-x.reference.full.conf] for more details): -# -> disable graphical splash; allow quit after warning; keyboard hook; weitek; bochs debug port e9; video debug at startup; compresssaveparts; show recorded filename; skip encoding unchanged frames; capture chroma format; capture format; shell environment size; private area size; turn off a20 gate on boot; cbus bus clock; isa bus clock; pci bus clock; call binary on reset; unhandled irq handler; call binary on boot; ibm rom basic; rom bios allocation max; rom bios minimum size; irq delay ns; iodelay; iodelay16; iodelay32; acpi; acpi rsd ptr location; acpi sci irq; acpi iobase; acpi reserved size; memsizekb; dos mem limit; isa memory hole at 512kb; reboot delay; memalias; convert fat free space; convert fat timeout; leading colon write protect image; locking disk image mount; unmask keyboard on int 16 read; int16 keyboard polling undocumented cf behavior; allow port 92 reset; enable port 92; enable 1st dma controller; enable 2nd dma controller; allow dma address decrement; enable 128k capable 16-bit dma; enable dma extra page registers; dma page registers write-only; cascade interrupt never in service; cascade interrupt ignore in service; enable slave pic; enable pc nmi mask; allow more than 640kb base memory; enable pci bus +# -> disable graphical splash; allow quit after warning; keyboard hook; weitek; bochs debug port e9; video debug at startup; compresssaveparts; show recorded filename; skip encoding unchanged frames; capture chroma format; capture format; shell environment size; private area size; turn off a20 gate on boot; cbus bus clock; isa bus clock; pci bus clock; call binary on reset; unhandled irq handler; call binary on boot; ibm rom basic; rom bios allocation max; rom bios minimum size; irq delay ns; iodelay; iodelay16; iodelay32; acpi; acpi rsd ptr location; acpi sci irq; acpi iobase; acpi reserved size; memsizekb; dos mem limit; isa memory hole at 512kb; isa memory hole at 15mb; reboot delay; memalias; convert fat free space; convert fat timeout; leading colon write protect image; locking disk image mount; unmask keyboard on int 16 read; int16 keyboard polling undocumented cf behavior; allow port 92 reset; enable port 92; enable 1st dma controller; enable 2nd dma controller; allow dma address decrement; enable 128k capable 16-bit dma; enable dma extra page registers; dma page registers write-only; cascade interrupt never in service; cascade interrupt ignore in service; enable slave pic; enable pc nmi mask; allow more than 640kb base memory; enable pci bus # language = title = @@ -229,45 +229,59 @@ convertdrivefat = true # frameskip: How many frames DOSBox-X skips before drawing one. # aspect: Aspect ratio correction mode. Can be set to the following values: # 'false' (default): -# 'direct3d'/opengl outputs: image is simply scaled to full window/fullscreen size, possibly resulting in disproportional image -# 'surface' output: it does no aspect ratio correction (default), resulting in disproportional images if VGA mode pixel ratio is not 4:3 +# 'direct3d'/opengl outputs: image is simply scaled to full +# window/fullscreen size, possibly resulting in dis- +# proportional image +# 'surface' output: it does no aspect ratio correction, +# resulting in disproportional images if VGA mode pixel +# ratio is not 4:3 (default) # 'true': -# 'direct3d'/opengl outputs: uses output driver functions to scale / pad image with black bars, correcting output to proportional 4:3 image -# In most cases image degradation should not be noticeable (it all depends on the video adapter and how much the image is upscaled). -# Should have none to negligible impact on performance, mostly being done in hardware -# For the pixel-perfect scaling (output=openglpp), it is recommended to enable this whenever the emulated display has an aspect ratio of 4:3 -# 'surface' output: inherits old DOSBox aspect ratio correction method (adjusting rendered image line count to correct output to 4:3 ratio) -# Due to source image manipulation this mode does not mix well with scalers, i.e. multiline scalers like hq2x/hq3x will work poorly -# Slightly degrades visual image quality. Has a tiny impact on performance -# When using xBRZ scaler with 'surface' output, aspect ratio correction is done by the scaler itself, so none of the above apply +# 'direct3d'/opengl outputs: uses output driver functions to +# scale / pad image with black bars, correcting output +# to proportional 4:3 image +# In most cases image degradation should not be noticeable +# (it all depends on the video adapter and how much the image +# is upscaled). +# Should have none to negligible impact on performance, +# mostly being done in hardware. +# For the pixel-perfect scaling (output=openglpp), it is +# recommended to enable this whenever the emulated display +# has an aspect ratio of 4:3 +# 'surface' output: inherits old DOSBox aspect ratio correction +# method (adjusting rendered image line count to correct +# output to 4:3 ratio) +# Due to source image manipulation this mode does not mix +# well with scalers, i.e. multiline scalers like hq2x/hq3x +# will work poorly +# Slightly degrades visual image quality. Has a tiny impact +# on performance. +# When using xBRZ scaler with 'surface' output, aspect +# ratio correction is done by the scaler itself, so none of +# the above apply. # Possible values: false, true, 0, 1, yes, no, nearest, bilinear. # aspect_ratio: Set the aspect ratio (e.g. 16:9) in the aspect ratio correction mode. 0:0 means the default ratio of 4:3, and -1:-1 means the original image ratio. # char9: Allow 9-pixel wide text mode fonts instead of 8-pixel wide fonts. # euro: Display Euro symbol instead of the specified ASCII character (33-255). # For example, setting it to 128 allows Euro symbol to be displayed instead of C-cedilla. -# doublescan: If set, doublescanned output emits two scanlines for each source line, in the -# same manner as the actual VGA output (320x200 is rendered as 640x400 for example). +# doublescan: If set, doublescanned output emits two scanlines for each source line, in the same manner as the actual VGA output (320x200 is rendered as 640x400 for example). # If clear, doublescanned output is rendered at the native source resolution (320x200 as 320x200). # This affects the raster PRIOR to the software or hardware scalers. -# Setting this option may prevent some scalers to work as expected. Try turning this option off in such case. +# Setting this option may prevent some scalers to work as expected. +# Try turning this option off in such case. # For pixel-perfect scaling (output=openglpp), it is recommended to turn this option off. -# scaler: Scaler used to enlarge/enhance low resolution modes. If 'forced' is appended, -# then the scaler will be used even if the result might not be desired. +# scaler: Scaler used to enlarge/enhance low resolution modes. Add keyword 'forced', after the name of the scaler to always use the scaler even if the result might not be desired.(e.g. 'normal2x forced') # Appending 'prompt' will cause a confirmation message for forcing the scaler. # To fit a scaler in the resolution used at full screen may require a border or side bars. # To fill the screen entirely, depending on your hardware, a different scaler/fullresolution might work. # Scalers should work with most output options, but they are ignored for openglpp and TrueType font outputs. # Possible values: none, normal2x, normal3x, normal4x, normal5x, advmame2x, advmame3x, advinterp2x, advinterp3x, hq2x, hq3x, 2xsai, super2xsai, supereagle, tv2x, tv3x, rgb2x, rgb3x, scan2x, scan3x, gray, gray2x, hardware_none, hardware2x, hardware3x, hardware4x, hardware5x, xbrz, xbrz_bilinear. # glshader: Path to GLSL shader source to use with OpenGL output ("none" to disable, or "default" for default shader). -# Can be either an absolute path, a file in the "glshaders" subdirectory of the DOSBox-X configuration directory, -# or one of the built-in shaders (e.g. "sharp" for the pixel-perfect scaling mode): +# Can be either an absolute path, a file in the "glshaders" subdirectory of the DOSBox-X configuration directory, or one of the built-in shaders (e.g. "sharp" for the pixel-perfect scaling mode): # advinterp2x, advinterp3x, advmame2x, advmame3x, rgb2x, rgb3x, scan2x, scan3x, tv2x, tv3x, sharp. -# pixelshader: Set Direct3D pixel shader program (effect file must be in Shaders subdirectory). If 'forced' is appended, -# then the pixel shader will be used even if the result might not be desired. +# pixelshader: Set Direct3D pixel shader program (effect file must be in Shaders subdirectory). If 'forced' is appended, then the pixel shader will be used even if the result might not be desired. # autofit: Best fits image to window -# - Intended for output=direct3d, fullresolution=original, aspect=true +# Intended for output=direct3d, fullresolution=original, aspect=true # monochrome_pal: Specify the color of monochrome display. -# Possible values: green, amber, gray, white # Append 'bright' for a brighter look. # Possible values: green, amber, gray, white. # @@ -298,13 +312,15 @@ monochrome_pal = green # pc-98 force ibm keyboard layout: Force to use a default keyboard layout like IBM US-English for PC-98 emulation. # Will only work with apps and games using BIOS for keyboard. # Possible values: true, false, 1, 0, auto. +# pc-98 force JIS keyboard layout: Force to use a default keyboard layout like JIS (JP106) for PC-98 emulation. +# Will only work with apps and games using BIOS for keyboard. # pc-98 try font rom: If enabled, DOSBox-X will first try to load FONT.ROM as generated by T98Tools for PC-98 emulation. # pc-98 anex86 font: Specify an Anex86 compatible font to load as supported by the Anex86 emulator for PC-98 emulation. # By default DOSBox-X tries to load ANEX86.BMP followed by FREECG98.BMP after trying to load FONT.ROM. # If you specify a font here then it will be tried first, perhaps before FONT.ROM (see previous option). # # Advanced options (see full configuration reference file [dosbox-x.reference.full.conf] for more details): -# -> pc-98 int 1b fdc timer wait; pc-98 pic init to read isr; pc-98 fm board irq; pc-98 fm board io port; pc-98 sound bios; pc-98 load sound bios rom file; pc-98 buffer page flip; pc-98 enable 256-color planar; pc-98 enable 188 user cg; pc-98 start gdc at 5mhz; pc-98 allow scanline effect; pc-98 video mode; pc-98 timer always cycles; pc-98 timer master frequency; pc-98 allow 4 display partition graphics; pc-98 show graphics layer on initialize +# -> pc-98 int 1b fdc timer wait; pc-98 pic init to read isr; pc-98 fm board irq; pc-98 fm board io port; pc-98 time stamp; pc-98 sound bios; pc-98 load sound bios rom file; pc-98 buffer page flip; pc-98 enable 256-color planar; pc-98 enable 188 user cg; pc-98 start gdc at 5mhz; pc-98 allow scanline effect; pc-98 nec mouse function; pc-98 video mode; pc-98 timer always cycles; pc-98 timer master frequency; pc-98 allow 4 display partition graphics; pc-98 fontx sbcs; pc-98 fontx dbcs; pc-98 fontx internal symbol; pc-98 show graphics layer on initialize # pc-98 BIOS copyright string = false pc-98 fm board = auto @@ -314,6 +330,7 @@ pc-98 enable grcg = true pc-98 enable egc = true pc-98 bus mouse = true pc-98 force ibm keyboard layout = auto +pc-98 force JIS keyboard layout = false pc-98 try font rom = true pc-98 anex86 font = @@ -321,7 +338,7 @@ pc-98 anex86 font = # 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 -# an EGA/VGA graphics mode that emulates text mode to display the characters and may be incompatible with non-Asian software that +# 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. @@ -409,7 +426,7 @@ j3100colorscroll = false # Possible values: true, false, 1, 0, auto. # # Advanced options (see full configuration reference file [dosbox-x.reference.full.conf] for more details): -# -> vmemdelay; vbe window granularity; vbe window size; enable 8-bit dac; svga lfb base; pci vga; vga attribute controller mapping; vga bios use rom image; vga bios rom image; vga bios size override; video bios dont duplicate cga first half rom font; video bios always offer 14-pixel high rom font; video bios always offer 16-pixel high rom font; video bios enable cga second half rom font; forcerate; sierra ramdac; sierra ramdac lock 565; vga fill active memory; page flip debug line; vertical retrace poll debug line; cgasnow; vga 3da undefined bits; rom bios 8x8 CGA font; rom bios video parameter table; int 10h points at vga bios; unmask timer on int 10 setmode; vesa bank switching window mirroring; vesa bank switching window range check; vesa zero buffer on get information; vesa set display vsync; vesa lfb base scanline adjust; vesa map non-lfb modes to 128kb region; ega per scanline hpel; allow hpel effects; allow hretrace effects; hretrace effect weight; vesa modelist cap; vesa modelist width limit; vesa modelist height limit; vesa vbe put modelist in vesa information; vesa vbe 1.2 modes are 32bpp; allow low resolution vesa modes; allow explicit 24bpp vesa modes; allow high definition vesa modes; allow unusual vesa modes; allow 32bpp vesa modes; allow 24bpp vesa modes; allow 16bpp vesa modes; allow 15bpp vesa modes; allow 8bpp vesa modes; allow 4bpp vesa modes; allow 4bpp packed vesa modes; allow tty vesa modes; double-buffered line compare; ignore vblank wraparound; ignore extended memory bit; enable vga resize delay; resize only on vga active display width increase; vga palette update on full load; ignore odd-even mode in non-cga modes; ignore sequencer blanking +# -> vmemdelay; vbe window granularity; vbe window size; enable 8-bit dac; svga lfb base; pci vga; vga attribute controller mapping; enable supermegazeux tweakmode; vga bios use rom image; vga bios rom image; vga bios size override; video bios dont duplicate cga first half rom font; video bios always offer 14-pixel high rom font; video bios always offer 16-pixel high rom font; video bios enable cga second half rom font; forcerate; sierra ramdac; sierra ramdac lock 565; vga fill active memory; page flip debug line; vertical retrace poll debug line; cgasnow; vga 3da undefined bits; rom bios 8x8 CGA font; rom bios video parameter table; int 10h points at vga bios; unmask timer on int 10 setmode; vesa bank switching window mirroring; vesa bank switching window range check; vesa zero buffer on get information; vesa set display vsync; vesa lfb base scanline adjust; vesa map non-lfb modes to 128kb region; ega per scanline hpel; allow hpel effects; allow hretrace effects; hretrace effect weight; vesa modelist cap; vesa modelist width limit; vesa modelist height limit; vesa vbe put modelist in vesa information; vesa vbe 1.2 modes are 32bpp; allow low resolution vesa modes; allow explicit 24bpp vesa modes; allow high definition vesa modes; allow unusual vesa modes; allow 32bpp vesa modes; allow 24bpp vesa modes; allow 16bpp vesa modes; allow 15bpp vesa modes; allow 8bpp vesa modes; allow 4bpp vesa modes; allow 4bpp packed vesa modes; allow tty vesa modes; double-buffered line compare; ignore vblank wraparound; ignore extended memory bit; enable vga resize delay; resize only on vga active display width increase; vga palette update on full load; ignore odd-even mode in non-cga modes; ignore sequencer blanking # vmemsize = -1 vmemsizekb = 0 @@ -648,7 +665,7 @@ fluid.soundfont = [sblaster] # sbtype: Type of Sound Blaster to emulate. 'gb' is Game Blaster. -# Possible values: sb1, sb2, sbpro1, sbpro2, sb16, sb16vibra, gb, ess688, reveal_sc400, none. +# Possible values: sb1, sb2, sbpro1, sbpro2, sb16, sb16vibra, gb, ess688, ess1688, reveal_sc400, none. # sbbase: The IO address of the Sound Blaster. # 220h to 2E0h are for use with IBM PC Sound Blaster emulation. # D2h to DEh are for use with NEC PC-98 Sound Blaster 16 emulation. @@ -671,10 +688,10 @@ fluid.soundfont = # sbmixer: Allow the Sound Blaster mixer to modify the DOSBox-X mixer. # oplmode: Type of OPL emulation. On 'auto' the mode is determined by the 'sbtype' setting. # All OPL modes are AdLib-compatible, except for 'cms' (set 'sbtype=none' with 'cms' for a Game Blaster). -# Possible values: auto, cms, opl2, dualopl2, opl3, opl3gold, none, hardware, hardwaregb. +# Possible values: auto, cms, opl2, dualopl2, opl3, opl3gold, none, hardware, hardwaregb, esfm. # oplemu: Provider for the OPL emulation. 'compat' might provide better quality. # 'nuked' is the most accurate (but the most CPU-intensive). See oplrate as well. -# Possible values: default, compat, fast, nuked, mame, opl2board, opl3duoboard, retrowave_opl3. +# Possible values: default, compat, fast, nuked, mame, opl2board, opl3duoboard, retrowave_opl3, esfmu. # oplrate: Sample rate of OPL music emulation. Use 49716 for highest quality (set the mixer rate accordingly). # Possible values: 49716, 48000, 44100, 32000, 22050, 16000, 11025, 8000. # oplport: Serial port of the OPL2 Audio Board when oplemu=opl2board, opl2mode will become 'opl2' automatically. diff --git a/dosbox-x.reference.full.conf b/dosbox-x.reference.full.conf index 6b561bdd2..8e45297b0 100644 --- a/dosbox-x.reference.full.conf +++ b/dosbox-x.reference.full.conf @@ -1,4 +1,4 @@ -# This is the configuration file for DOSBox-X 2023.10.06. (Please use the latest version of DOSBox-X) +# This is the configuration file for DOSBox-X 2024.03.01. (Please use the latest version of DOSBox-X) # Lines starting with a # are comment lines and are ignored by DOSBox-X. # They are used to (briefly) document the effect of each option. # To write out ALL options, use command 'config -all' with -wc or -writeconf options. @@ -372,6 +372,10 @@ debuggerrun = debugger # Majic 12 "Show": If UMBs are enabled, set this option to 639 to avoid MCB chain corruption error. # isa memory hole at 512kb: If set, emulate an ISA memory hole at the 512KB to 640KB area (0x80000-0x9FFFF). # Possible values: true, false, 1, 0, auto. +# isa memory hole at 15mb: If set, emulate an ISA memory hole at the 15MB to 16MB area (0xF00000-0xFFFFFF). +# If auto, hole is disabled by default for IBM compatible modes and enabled by default for NEC PC-98 compatible modes. +# The reason for this is that the hole is needed for the PC-9821 256-color mode linear framebuffer to work with some DOS games even when memsize >= 16. +# Possible values: true, false, 1, 0, auto. # reboot delay: Reboot delay. How long to pause at BIOS POST after reboot in milliseconds. # This option is provided so that it is possible to see what the guest application # or OS might have written to the screen before resetting the system. A value of @@ -487,6 +491,7 @@ memsize = 16 memsizekb = 0 dos mem limit = 0 isa memory hole at 512kb = auto +isa memory hole at 15mb = auto reboot delay = -1 memalias = 0 nocachedir = false @@ -517,48 +522,62 @@ enable pci bus = true # frameskip: How many frames DOSBox-X skips before drawing one. # aspect: Aspect ratio correction mode. Can be set to the following values: # 'false' (default): -# 'direct3d'/opengl outputs: image is simply scaled to full window/fullscreen size, possibly resulting in disproportional image -# 'surface' output: it does no aspect ratio correction (default), resulting in disproportional images if VGA mode pixel ratio is not 4:3 +# 'direct3d'/opengl outputs: image is simply scaled to full +# window/fullscreen size, possibly resulting in dis- +# proportional image +# 'surface' output: it does no aspect ratio correction, +# resulting in disproportional images if VGA mode pixel +# ratio is not 4:3 (default) # 'true': -# 'direct3d'/opengl outputs: uses output driver functions to scale / pad image with black bars, correcting output to proportional 4:3 image -# In most cases image degradation should not be noticeable (it all depends on the video adapter and how much the image is upscaled). -# Should have none to negligible impact on performance, mostly being done in hardware -# For the pixel-perfect scaling (output=openglpp), it is recommended to enable this whenever the emulated display has an aspect ratio of 4:3 -# 'surface' output: inherits old DOSBox aspect ratio correction method (adjusting rendered image line count to correct output to 4:3 ratio) -# Due to source image manipulation this mode does not mix well with scalers, i.e. multiline scalers like hq2x/hq3x will work poorly -# Slightly degrades visual image quality. Has a tiny impact on performance -# When using xBRZ scaler with 'surface' output, aspect ratio correction is done by the scaler itself, so none of the above apply +# 'direct3d'/opengl outputs: uses output driver functions to +# scale / pad image with black bars, correcting output +# to proportional 4:3 image +# In most cases image degradation should not be noticeable +# (it all depends on the video adapter and how much the image +# is upscaled). +# Should have none to negligible impact on performance, +# mostly being done in hardware. +# For the pixel-perfect scaling (output=openglpp), it is +# recommended to enable this whenever the emulated display +# has an aspect ratio of 4:3 +# 'surface' output: inherits old DOSBox aspect ratio correction +# method (adjusting rendered image line count to correct +# output to 4:3 ratio) +# Due to source image manipulation this mode does not mix +# well with scalers, i.e. multiline scalers like hq2x/hq3x +# will work poorly +# Slightly degrades visual image quality. Has a tiny impact +# on performance. +# When using xBRZ scaler with 'surface' output, aspect +# ratio correction is done by the scaler itself, so none of +# the above apply. # Possible values: false, true, 0, 1, yes, no, nearest, bilinear. # aspect_ratio: Set the aspect ratio (e.g. 16:9) in the aspect ratio correction mode. 0:0 means the default ratio of 4:3, and -1:-1 means the original image ratio. # char9: Allow 9-pixel wide text mode fonts instead of 8-pixel wide fonts. # euro: Display Euro symbol instead of the specified ASCII character (33-255). # For example, setting it to 128 allows Euro symbol to be displayed instead of C-cedilla. -# doublescan: If set, doublescanned output emits two scanlines for each source line, in the -# same manner as the actual VGA output (320x200 is rendered as 640x400 for example). +# doublescan: If set, doublescanned output emits two scanlines for each source line, in the same manner as the actual VGA output (320x200 is rendered as 640x400 for example). # If clear, doublescanned output is rendered at the native source resolution (320x200 as 320x200). # This affects the raster PRIOR to the software or hardware scalers. -# Setting this option may prevent some scalers to work as expected. Try turning this option off in such case. +# Setting this option may prevent some scalers to work as expected. +# Try turning this option off in such case. # For pixel-perfect scaling (output=openglpp), it is recommended to turn this option off. -# scaler: Scaler used to enlarge/enhance low resolution modes. If 'forced' is appended, -# then the scaler will be used even if the result might not be desired. +# scaler: Scaler used to enlarge/enhance low resolution modes. Add keyword 'forced', after the name of the scaler to always use the scaler even if the result might not be desired.(e.g. 'normal2x forced') # Appending 'prompt' will cause a confirmation message for forcing the scaler. # To fit a scaler in the resolution used at full screen may require a border or side bars. # To fill the screen entirely, depending on your hardware, a different scaler/fullresolution might work. # Scalers should work with most output options, but they are ignored for openglpp and TrueType font outputs. # Possible values: none, normal2x, normal3x, normal4x, normal5x, advmame2x, advmame3x, advinterp2x, advinterp3x, hq2x, hq3x, 2xsai, super2xsai, supereagle, tv2x, tv3x, rgb2x, rgb3x, scan2x, scan3x, gray, gray2x, hardware_none, hardware2x, hardware3x, hardware4x, hardware5x, xbrz, xbrz_bilinear. # glshader: Path to GLSL shader source to use with OpenGL output ("none" to disable, or "default" for default shader). -# Can be either an absolute path, a file in the "glshaders" subdirectory of the DOSBox-X configuration directory, -# or one of the built-in shaders (e.g. "sharp" for the pixel-perfect scaling mode): +# Can be either an absolute path, a file in the "glshaders" subdirectory of the DOSBox-X configuration directory, or one of the built-in shaders (e.g. "sharp" for the pixel-perfect scaling mode): # advinterp2x, advinterp3x, advmame2x, advmame3x, rgb2x, rgb3x, scan2x, scan3x, tv2x, tv3x, sharp. -# pixelshader: Set Direct3D pixel shader program (effect file must be in Shaders subdirectory). If 'forced' is appended, -# then the pixel shader will be used even if the result might not be desired. +# pixelshader: Set Direct3D pixel shader program (effect file must be in Shaders subdirectory). If 'forced' is appended, then the pixel shader will be used even if the result might not be desired. # xbrz slice: Number of screen lines to process in single xBRZ scaler taskset task, affects xBRZ performance, 16 is the default # xbrz fixed scale factor: To use fixed xBRZ scale factor (i.e. to attune performance), set it to 2-6, 0 - use automatic calculation (default) # xbrz max scale factor: To cap maximum xBRZ scale factor used (i.e. to attune performance), set it to 2-6, 0 - use scaler allowed maximum (default) # autofit: Best fits image to window -# - Intended for output=direct3d, fullresolution=original, aspect=true +# Intended for output=direct3d, fullresolution=original, aspect=true # monochrome_pal: Specify the color of monochrome display. -# Possible values: green, amber, gray, white # Append 'bright' for a brighter look. # Possible values: green, amber, gray, white. frameskip = 0 @@ -580,14 +599,12 @@ monochrome_pal = green # pc-98 BIOS copyright string: If set, the PC-98 BIOS copyright string is placed at E800:0000. Enable this for software that detects PC-98 vs Epson. # pc-98 int 1b fdc timer wait: If set, INT 1Bh floppy access will wait for the timer to count down before returning. # This is needed for Ys II to run without crashing. -# pc-98 pic init to read isr: If set, the programmable interrupt controllers are initialized by default (if PC-98 mode) -# so that the in-service interrupt status can be read immediately. There seems to be a common -# convention in PC-98 games to program and/or assume this mode for cooperative interrupt handling. -# This option is enabled by default for best compatibility with PC-98 games. +# pc-98 pic init to read isr: If set, the programmable interrupt controllers are initialized by default (if PC-98 mode) so that the in-service interrupt status can be read immediately. There seems to be a common convention in PC-98 games to program and/or assume this mode for cooperative interrupt handling. This option is enabled by default for best compatibility with PC-98 games. # pc-98 fm board: In PC-98 mode, selects the FM music board to emulate. # Possible values: auto, off, false, board14, board26k, board86, board86c. # pc-98 fm board irq: If set, helps to determine the IRQ of the FM board. A setting of zero means to auto-determine the IRQ. # pc-98 fm board io port: If set, helps to determine the base I/O port of the FM board. A setting of zero means to auto-determine the port number. +# pc-98 time stamp: Emulate the time stamp/hardware wait I/O ports at 5Ch and 5Eh. This is recommended. # pc-98 sound bios: Set Sound BIOS enabled bit in MEMSW 4 for some games that require it. # TODO: Real emulation of PC-9801-26K/86 Sound BIOS # pc-98 load sound bios rom file: If set, load SOUND.ROM if available and prsent that to the guest instead of trying to emulate directly. @@ -609,6 +626,7 @@ monochrome_pal = green # in 200-line graphics modes upconverted to 400-line raster display. When enabled, odd # numbered scanlines are blanked instead of doubled # pc-98 bus mouse: Enable PC-98 bus mouse emulation. Disabling this option does not disable INT 33h emulation. +# pc-98 nec mouse function: If set, Use NEC mouse function in int 33h. # pc-98 video mode: Specify the preferred PC-98 video mode. # Valid values are 15, 24, or 31 for each specific horizontal refresh rate on the platform. # 24khz is default and best supported at this time. @@ -637,10 +655,17 @@ monochrome_pal = green # pc-98 force ibm keyboard layout: Force to use a default keyboard layout like IBM US-English for PC-98 emulation. # Will only work with apps and games using BIOS for keyboard. # Possible values: true, false, 1, 0, auto. +# pc-98 force JIS keyboard layout: Force to use a default keyboard layout like JIS (JP106) for PC-98 emulation. +# Will only work with apps and games using BIOS for keyboard. # pc-98 try font rom: If enabled, DOSBox-X will first try to load FONT.ROM as generated by T98Tools for PC-98 emulation. # pc-98 anex86 font: Specify an Anex86 compatible font to load as supported by the Anex86 emulator for PC-98 emulation. # By default DOSBox-X tries to load ANEX86.BMP followed by FREECG98.BMP after trying to load FONT.ROM. # If you specify a font here then it will be tried first, perhaps before FONT.ROM (see previous option). +# pc-98 fontx sbcs: Specifies a FONTX2 file (8x16) to be used in PC-98 mode. +# This file has priority over ANEX86.BMP and FREECG98.BMP. +# pc-98 fontx dbcs: Specifies a FONTX2 file (16x16) to be used in PC-98 mode. +# This file has priority over ANEX86.BMP and FREECG98.BMP. +# pc-98 fontx internal symbol: If set, Use the internal data for hankaku symbols instead of the data in the FONTX2 file. # pc-98 show graphics layer on initialize: If PC-98 mode and INT 33h emulation is enabled, the graphics layer will be automatically enabled # at driver startup AND when INT 33h AX=0 is called. This is NEC MOUSE.COM behavior and default # enabled. To emulate other drivers like QMOUSE that do not follow this behavior, set to false. @@ -650,6 +675,7 @@ pc-98 pic init to read isr = true pc-98 fm board = auto pc-98 fm board irq = 0 pc-98 fm board io port = 0 +pc-98 time stamp = true pc-98 sound bios = false pc-98 load sound bios rom file = true pc-98 buffer page flip = false @@ -662,20 +688,25 @@ pc-98 enable 188 user cg = true pc-98 start gdc at 5mhz = false pc-98 allow scanline effect = true pc-98 bus mouse = true +pc-98 nec mouse function = false pc-98 video mode = pc-98 timer always cycles = auto pc-98 timer master frequency = 0 pc-98 allow 4 display partition graphics = -1 pc-98 force ibm keyboard layout = auto +pc-98 force JIS keyboard layout = false pc-98 try font rom = true pc-98 anex86 font = +pc-98 fontx sbcs = +pc-98 fontx dbcs = +pc-98 fontx internal symbol = false pc-98 show graphics layer on initialize = true [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 -# an EGA/VGA graphics mode that emulates text mode to display the characters and may be incompatible with non-Asian software that +# 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. @@ -780,6 +811,10 @@ j3100textcolor = # # 4low behavior is default for ET4000 emulation. # Possible values: , auto, 4x4, 4low, first16. +# enable supermegazeux tweakmode: If set, allow old MegaZeux 256-color text tweakmode aka 'Super MegaZeux mode'. Not all cards support this tweakmode. +# The ones that do are not emulated yet by DOSBox-X. It is not known at this time whether S3 chipsets support the hack. +# On normal cards the tweakmode does nothing but halve the text mode resolution without any other effects. +# Possible values: true, false, 1, 0, auto. # vga bios use rom image: If set, load a VGA BIOS from a ROM image file. If clear, provide our own INT 10h emulation as normal. # vga bios rom image: If set, load the VGA BIOS from the specified file (must be 1KB to 64KB in size). # If left unset, and DOSBox-X is asked to load a VGA BIOS from a file, a file name @@ -803,7 +838,7 @@ j3100textcolor = # not emulate a RAMDAC that is accessible through port 3C6h. This option has no effect for non-VGA video hardware. # sierra ramdac lock 565: When emulating High Sierra highcolor RAMDAC, assume 5:6:5 at all times if set. Else, # bit 6 of the DAC command selects between 5:5:5 and 5:6:5. Set this option for demos or -# games that got the command byte wrong (MFX Transgrassion 2) or any other demo that is +# games that got the command byte wrong (MFX Transgression 2) or any other demo that is # not rendering highcolor 16bpp correctly. # vga fill active memory: If set, DOSBox-X will fill inactive video memory regions with RAM rather than mapping them as empty. This allows the ETen Chinese DOS system (e.g. ET16V and ET24VA) to run. # page flip debug line: VGA debugging switch. If set, an inverse line will be drawn on the exact scanline that the CRTC display offset registers were written. @@ -945,6 +980,7 @@ high intensity blinking = true svga lfb base = 0 pci vga = true vga attribute controller mapping = auto +enable supermegazeux tweakmode = vga bios use rom image = false vga bios rom image = vga bios size override = 0 @@ -1473,7 +1509,7 @@ fluid.chorus.type = 0 [sblaster] # sbtype: Type of Sound Blaster to emulate. 'gb' is Game Blaster. -# Possible values: sb1, sb2, sbpro1, sbpro2, sb16, sb16vibra, gb, ess688, reveal_sc400, none. +# Possible values: sb1, sb2, sbpro1, sbpro2, sb16, sb16vibra, gb, ess688, ess1688, reveal_sc400, none. # sbbase: The IO address of the Sound Blaster. # 220h to 2E0h are for use with IBM PC Sound Blaster emulation. # D2h to DEh are for use with NEC PC-98 Sound Blaster 16 emulation. @@ -1526,7 +1562,7 @@ fluid.chorus.type = 0 # sbmixer: Allow the Sound Blaster mixer to modify the DOSBox-X mixer. # oplmode: Type of OPL emulation. On 'auto' the mode is determined by the 'sbtype' setting. # All OPL modes are AdLib-compatible, except for 'cms' (set 'sbtype=none' with 'cms' for a Game Blaster). -# Possible values: auto, cms, opl2, dualopl2, opl3, opl3gold, none, hardware, hardwaregb. +# Possible values: auto, cms, opl2, dualopl2, opl3, opl3gold, none, hardware, hardwaregb, esfm. # adlib force timer overflow on detect: If set, Adlib/OPL emulation will signal 'overflow' on timers after 50 I/O reads. # This is a temporary hack to work around timing bugs noted in DOSBox-X. Certain # games (Wolfenstein 3D) poll the Adlib status port a fixed number of times assuming @@ -1535,7 +1571,7 @@ fluid.chorus.type = 0 # lower cycles counts, set this option. # oplemu: Provider for the OPL emulation. 'compat' might provide better quality. # 'nuked' is the most accurate (but the most CPU-intensive). See oplrate as well. -# Possible values: default, compat, fast, nuked, mame, opl2board, opl3duoboard, retrowave_opl3. +# Possible values: default, compat, fast, nuked, mame, opl2board, opl3duoboard, retrowave_opl3, esfmu. # oplrate: Sample rate of OPL music emulation. Use 49716 for highest quality (set the mixer rate accordingly). # Possible values: 49716, 48000, 44100, 32000, 22050, 16000, 11025, 8000. # oplport: Serial port of the OPL2 Audio Board when oplemu=opl2board, opl2mode will become 'opl2' automatically. @@ -2407,7 +2443,7 @@ timeout = default # Notes: # - If mapped ranges differ, the shorter range is extended to fit. # - If conflicting host ports are given, only the first one is setup. -# - If conflicting guest ports are given, the latter rule takes predecent. +# - If conflicting guest ports are given, the latter rule takes precedent. # udp_port_forwards: Forwards one or more UDP ports from the host into the DOS guest. # The format is the same as for TCP port forwards. restricted = false diff --git a/include/build_timestamp.h b/include/build_timestamp.h index 5d5bb966d..e75dd8c7e 100644 --- a/include/build_timestamp.h +++ b/include/build_timestamp.h @@ -1,4 +1,4 @@ /*auto-generated*/ -#define UPDATED_STR "Oct 6, 2023 3:33:20pm" -#define GIT_COMMIT_HASH "59744fe" -#define COPYRIGHT_END_YEAR "2023" +#define UPDATED_STR "Mar 1, 2024 12:00:26am" +#define GIT_COMMIT_HASH "a1610c0" +#define COPYRIGHT_END_YEAR "2024" diff --git a/vs/config_package.h b/vs/config_package.h index 277a4cb11..a6794ca46 100644 --- a/vs/config_package.h +++ b/vs/config_package.h @@ -1,8 +1,8 @@ #define PACKAGE "dosbox-x" #define PACKAGE_BUGREPORT "https://github.com/joncampbell123/dosbox-x/issues" #define PACKAGE_NAME "dosbox-x" -#define PACKAGE_STRING "dosbox-x 2023.10.06" +#define PACKAGE_STRING "dosbox-x 2024.03.01" #define PACKAGE_TARNAME "dosbox-x" #define PACKAGE_URL "https://dosbox-x.com" -#define PACKAGE_VERSION "2023.10.06" -#define VERSION "2023.10.06" +#define PACKAGE_VERSION "2024.03.01" +#define VERSION "2024.03.01"