diff --git a/dosbox-x.reference.conf b/dosbox-x.reference.conf index fed728e8e..970d70afc 100644 --- a/dosbox-x.reference.conf +++ b/dosbox-x.reference.conf @@ -31,9 +31,10 @@ # If disabled, the mouse position in DOSBox-X is exactly where the host OS reports it. # When using a high DPI mouse, the emulation of mouse movement can noticeably reduce the # sensitiveness of your device, i.e. the mouse is slower but more precise. -# Possible values: integration, locked, always, never, 0, 1, 2, 3. +# Possible values: integration, locked, always, never. # mouse_wheel_key: Convert mouse wheel movements into keyboard presses such as arrow keys. # 0: disabled; 1: up/down arrows; 2: left/right arrows; 3: PgUp/PgDn keys. +# Possible values: 0, 1, 2, 3. # waitonerror: Wait before closing the console if DOSBox-X has an error. # priority: Priority levels for DOSBox-X. Second entry behind the comma is for when DOSBox-X is not focused/minimized. # pause is only valid for the second entry. @@ -159,6 +160,7 @@ fileio = false # quit warning: Set this option to indicate whether DOSBox-X should show a warning message when the user tries to close its window. # If set to auto (default), DOSBox-X will warn if there are open file handles or a guest system is currently running. # Possible values: true, false, 1, 0, auto. +# show advanced options: If set, the Configuration UI will display all config options (including advanced ones) by default. # keyboard hook: Use keyboard hook (currently only on Windows) to catch special keys and synchronize the keyboard LEDs with the host # weitek: If set, emulate the Weitek coprocessor. This option only has effect if cputype=386 or cputype=486. # bochs debug port e9: If set, emulate Bochs debug port E9h. ASCII text written to this I/O port is assumed to be debug output, and logged. @@ -289,7 +291,7 @@ fileio = false # 24: 16MB aliasing. Common on 386SX systems (CPU had 24 external address bits) # or 386DX and 486 systems where the CPU communicated directly with the ISA bus (A24-A31 tied off) # 26: 64MB aliasing. Some 486s had only 26 external address bits, some motherboards tied off A26-A31 -# nocachedir: If set, MOUNT commands will mount with -nocachedir by default. +# nocachedir: If set, MOUNT commands will mount with -nocachedir (disable directory caching) by default. # freesizecap: If set, the value of MOUNT -freesize will be applied only if the actual free size is greater than the specified value. # leading colon write protect image: If set, BOOT and IMGMOUNT commands will put an image file name with a leading colon (:) in write-protect mode. # unmask keyboard on int 16 read: If set, INT 16h will unmask IRQ 1 (keyboard) when asked to read keyboard input. @@ -328,6 +330,7 @@ fastbioslogo = false startbanner = true dpi aware = auto quit warning = auto +show advanced options = false keyboard hook = false weitek = false bochs debug port e9 = false @@ -403,12 +406,6 @@ enable pci bus = true # For build engine games, use more memory than in the list above so it can # use triple buffering and thus won't flicker. # -# vesa set display vsync: Whether to wait for vertical retrace if VESA Set Display Address is used to pan the display. -# The default value -1 will wait if svga_oldvbe, or not otherwise. 0 means not to wait. -# 1 means always to wait. This affects only subfunction 0x00. Subfunction 0x80 will always wait -# as specified in the VESA BIOS standard. -# It is recommended to set this to 1 for VBETEST.EXE so that the panning test and information does not -# go by too fast. # vmemsizekb: Amount of video memory in kilobytes, in addition to vmemsize. # enable 8-bit dac: If set, allow VESA BIOS calls in IBM PC mode to set DAC width. Has no effect in PC-98 mode. # svga lfb base: If nonzero, define the physical memory address of the linear framebuffer. @@ -473,6 +470,12 @@ enable pci bus = true # for the entire 256 byte structure and the game crashes if it detects VESA BIOS extensions. # Needed for: # GETSADAM.EXE +# vesa set display vsync: Whether to wait for vertical retrace if VESA Set Display Address is used to pan the display. +# The default value -1 will wait if svga_oldvbe, or not otherwise. 0 means not to wait. +# 1 means always to wait. This affects only subfunction 0x00. Subfunction 0x80 will always wait +# as specified in the VESA BIOS standard. +# It is recommended to set this to 1 for VBETEST.EXE so that the panning test and information does not +# go by too fast. # vesa lfb base scanline adjust: If non-zero, the VESA BIOS will report the linear framebuffer offset by this many scanlines. # This does not affect the linear framebuffer's location. It only affects the linear framebuffer # location reported by the VESA BIOS. Set to nonzero for DOS games with sloppy VESA graphics pointer management. @@ -556,7 +559,6 @@ enable pci bus = true # This option forces VGA emulation to ignore odd/even mode except in text and CGA modes. vmemdelay = 0 vmemsize = -1 -vesa set display vsync = -1 vmemsizekb = 0 enable 8-bit dac = true svga lfb base = 0 @@ -581,6 +583,7 @@ unmask timer on int 10 setmode = false vesa bank switching window mirroring = false vesa bank switching window range check = true vesa zero buffer on get information = true +vesa set display vsync = -1 vesa lfb base scanline adjust = 0 vesa map non-lfb modes to 128kb region = false ega per scanline hpel = true @@ -1755,7 +1758,7 @@ ipx = false # nicbase: The base address of the NE2000 board. # nicirq: The interrupt it uses. Note serial2 uses IRQ3 as default. # macaddr: The physical address the emulator will use on your network. -# If you have multiple DOSBoxes running on your network, +# If you have multiple DOSBox-Xes running on your network, # this has to be changed for each. AC:DE:48 is an address range reserved for # private use, so modify the last three number blocks. # I.e. AC:DE:48:88:99:AB. diff --git a/include/build_timestamp.h b/include/build_timestamp.h index 7f4533874..b127a159a 100644 --- a/include/build_timestamp.h +++ b/include/build_timestamp.h @@ -1,4 +1,4 @@ /*auto-generated*/ -#define UPDATED_STR "Sep 8, 2020 3:01:07pm" -#define GIT_COMMIT_HASH "8c8a334" +#define UPDATED_STR "Sep 10, 2020 12:52:49pm" +#define GIT_COMMIT_HASH "ee03f93" #define COPYRIGHT_END_YEAR "2020" diff --git a/update-dosbox-x-reference-conf b/update-dosbox-x-reference-conf index 107939f0e..672e53a39 100755 --- a/update-dosbox-x-reference-conf +++ b/update-dosbox-x-reference-conf @@ -1,6 +1,6 @@ #!/bin/bash src/dosbox-x -fastlaunch -defaultdir . -c 'config -all -wcp dosbox-x.reference.conf' -c 'exit' || exit 1 -# Not really needed if command config -wcp [configfile] is used instead of config -wc [configfile] -# mv -v ~/.config/dosbox-x/dosbox-x.reference.conf dosbox-x.reference.conf || exit 1 +# Convert to Unix format if needed +dos2unix dosbox-x.reference.conf