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

update config

Browse Source
This commit is contained in:
Wengier
2021-11-05 03:07:26 -04:00
parent 7f96a04ad3
commit f210e0d5c7
6 changed files with 20 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@@ -1,4 +1,4 @@
# This is the configuration file for DOSBox-X 0.83.19. (Please use the latest version of DOSBox-X)
# This is the configuration file for DOSBox-X 0.83.20. (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.
@@ -327,6 +327,9 @@ debuggerrun = debugger
#DOSBOX-X-ADV:# Possible values: , simple, cooperative_2nd.
#DOSBOX-X-ADV:# call binary on boot: If set, this is the path of a binary blob to load into the ROM BIOS area and execute immediately before booting the DOS system.
#DOSBOX-X-ADV:# This can be used for x86 assembly language experiments and automated testing against the CPU emulation.
#DOSBOX-X-ADV:# ibm rom basic: If set, this is the path of a ROM image containing IBM ROM BASIC. This is loaded just below the ROM BIOS.
#DOSBOX-X-ADV:# One recommended file is IBMROMBASIC-F6000h-1982-10-27.ROM, a 32KB ROM BIOS image loaded to segment F600 taken from an IBM 5150.
#DOSBOX-X-ADV:#
#DOSBOX-X-ADV:# rom bios allocation max: Maximum size (top down from 1MB) allowed for ROM BIOS dynamic allocation in KB
#DOSBOX-X-ADV:# rom bios minimum size: Once ROM BIOS layout is finalized, trim total region down to a minimum amount in KB
#DOSBOX-X-ADV:# irq delay ns: IRQ delay in nanoseconds. Set to -1 to use default, 0 to disable.
@@ -422,7 +425,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; keyboard hook; weitek; bochs debug port e9; compresssaveparts; 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; 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; 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; keyboard hook; weitek; bochs debug port e9; compresssaveparts; 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; 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 =
@@ -464,6 +467,7 @@ a20 = mask
#DOSBOX-X-ADV:call binary on reset =
#DOSBOX-X-ADV:unhandled irq handler =
#DOSBOX-X-ADV:call binary on boot =
#DOSBOX-X-ADV:ibm rom basic =
#DOSBOX-X-ADV:rom bios allocation max = 0
#DOSBOX-X-ADV:rom bios minimum size = 0
#DOSBOX-X-ADV:irq delay ns = -1
@@ -1129,7 +1133,7 @@ auxdevice = intellimouse
# colors: Specifies a color scheme to use for the TTF output by supply all 16 color values in RGB: (r,g,b) or hexadecimal as in HTML: #RRGGBB
# The original DOS colors (0-15): #000000 #0000aa #00aa00 #00aaaa #aa0000 #aa00aa #aa5500 #aaaaaa #555555 #5555ff #55ff55 #55ffff #ff5555 #ff55ff #ffff55 #ffffff
# gray scaled color scheme: (0,0,0) #0e0e0e (75,75,75) (89,89,89) (38,38,38) (52,52,52) #717171 #c0c0c0 #808080 (28,28,28) (150,150,150) (178,178,178) (76,76,76) (104,104,104) (226,226,226) (255,255,255)
# outputswitch: Specifies the output that DOSBox-X should switch to from the TTF output when a graphical mode is requiested, or auto for automatic selection.
# outputswitch: Specifies the output that DOSBox-X should switch to from the TTF output when a graphical mode is requested, or auto for automatic selection.
# Possible values: auto, surface, opengl, openglnb, openglhq, openglpp, direct3d.
# winperc: Specifies the window percentage for the TTF output (100 = full screen). Ignored if the ptsize setting is specified.
# ptsize: Specifies the font point size for the TTF output. If specified (minimum: 9), it will override the winperc setting.

6
dosbox-x.reference.conf
View File

@@ -1,4 +1,4 @@
# This is the configuration file for DOSBox-X 0.83.19. (Please use the latest version of DOSBox-X)
# This is the configuration file for DOSBox-X 0.83.20. (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.
@@ -188,7 +188,7 @@ debuggerrun = debugger
# Possible values: true, false, fixed, relative, cap, 2, 1, 0.
#
# Advanced options (see full configuration reference file [dosbox-x.reference.full.conf] for more details):
# -> disable graphical splash; keyboard hook; weitek; bochs debug port e9; compresssaveparts; 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; 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; 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; keyboard hook; weitek; bochs debug port e9; compresssaveparts; 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; 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 =
@@ -463,7 +463,7 @@ auxdevice = intellimouse
# colors: Specifies a color scheme to use for the TTF output by supply all 16 color values in RGB: (r,g,b) or hexadecimal as in HTML: #RRGGBB
# The original DOS colors (0-15): #000000 #0000aa #00aa00 #00aaaa #aa0000 #aa00aa #aa5500 #aaaaaa #555555 #5555ff #55ff55 #55ffff #ff5555 #ff55ff #ffff55 #ffffff
# gray scaled color scheme: (0,0,0) #0e0e0e (75,75,75) (89,89,89) (38,38,38) (52,52,52) #717171 #c0c0c0 #808080 (28,28,28) (150,150,150) (178,178,178) (76,76,76) (104,104,104) (226,226,226) (255,255,255)
# outputswitch: Specifies the output that DOSBox-X should switch to from the TTF output when a graphical mode is requiested, or auto for automatic selection.
# outputswitch: Specifies the output that DOSBox-X should switch to from the TTF output when a graphical mode is requested, or auto for automatic selection.
# Possible values: auto, surface, opengl, openglnb, openglhq, openglpp, direct3d.
# winperc: Specifies the window percentage for the TTF output (100 = full screen). Ignored if the ptsize setting is specified.
# ptsize: Specifies the font point size for the TTF output. If specified (minimum: 9), it will override the winperc setting.

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

@@ -1,4 +1,4 @@
# This is the configuration file for DOSBox-X 0.83.19. (Please use the latest version of DOSBox-X)
# This is the configuration file for DOSBox-X 0.83.20. (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.
@@ -319,6 +319,9 @@ debuggerrun = debugger
# Possible values: , simple, cooperative_2nd.
# call binary on boot: If set, this is the path of a binary blob to load into the ROM BIOS area and execute immediately before booting the DOS system.
# This can be used for x86 assembly language experiments and automated testing against the CPU emulation.
# ibm rom basic: If set, this is the path of a ROM image containing IBM ROM BASIC. This is loaded just below the ROM BIOS.
# One recommended file is IBMROMBASIC-F6000h-1982-10-27.ROM, a 32KB ROM BIOS image loaded to segment F600 taken from an IBM 5150.
#
# rom bios allocation max: Maximum size (top down from 1MB) allowed for ROM BIOS dynamic allocation in KB
# rom bios minimum size: Once ROM BIOS layout is finalized, trim total region down to a minimum amount in KB
# irq delay ns: IRQ delay in nanoseconds. Set to -1 to use default, 0 to disable.
@@ -452,6 +455,7 @@ pci bus clock = std33.3
call binary on reset =
unhandled irq handler =
call binary on boot =
ibm rom basic =
rom bios allocation max = 0
rom bios minimum size = 0
irq delay ns = -1
@@ -1101,7 +1105,7 @@ auxdevice = intellimouse
# colors: Specifies a color scheme to use for the TTF output by supply all 16 color values in RGB: (r,g,b) or hexadecimal as in HTML: #RRGGBB
# The original DOS colors (0-15): #000000 #0000aa #00aa00 #00aaaa #aa0000 #aa00aa #aa5500 #aaaaaa #555555 #5555ff #55ff55 #55ffff #ff5555 #ff55ff #ffff55 #ffffff
# gray scaled color scheme: (0,0,0) #0e0e0e (75,75,75) (89,89,89) (38,38,38) (52,52,52) #717171 #c0c0c0 #808080 (28,28,28) (150,150,150) (178,178,178) (76,76,76) (104,104,104) (226,226,226) (255,255,255)
# outputswitch: Specifies the output that DOSBox-X should switch to from the TTF output when a graphical mode is requiested, or auto for automatic selection.
# outputswitch: Specifies the output that DOSBox-X should switch to from the TTF output when a graphical mode is requested, or auto for automatic selection.
# Possible values: auto, surface, opengl, openglnb, openglhq, openglpp, direct3d.
# winperc: Specifies the window percentage for the TTF output (100 = full screen). Ignored if the ptsize setting is specified.
# ptsize: Specifies the font point size for the TTF output. If specified (minimum: 9), it will override the winperc setting.

4
include/build_timestamp.h
View File

@@ -1,4 +1,4 @@
/*auto-generated*/
#define UPDATED_STR "Nov 1, 2021 10:05:34am"
#define GIT_COMMIT_HASH "e77ccfa"
#define UPDATED_STR "Nov 5, 2021 3:04:59am"
#define GIT_COMMIT_HASH "7f96a04"
#define COPYRIGHT_END_YEAR "2021"

1
src/ints/int_dosv.cpp
View File

@@ -896,6 +896,7 @@ bool MakeSbcs24Font() {
}
#if defined(WIN32) && !defined(HX_DOS) && defined(C_SDL2)
#include "imm.h"
extern HWND GetHWND(void);
bool IME_GetEnable()
{