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

update config

Browse Source
This commit is contained in:
Wengier
2021-06-07 17:35:07 -04:00
parent a3602de4f1
commit 5a6bc42d0e
6 changed files with 25 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -219,6 +219,9 @@ debuggerrun = debugger
# Possible values: ctrlalt, ctrlshift, altshift, mapper.
# mapper send key: Select the key the mapper SendKey function will send.
# Possible values: winlogo, winmenu, alttab, ctrlesc, ctrlbreak, ctrlaltdel.
# ime: Enables support for the system input method (IME) in the Windows SDL1 builds.
# If set to auto, the feature is only enabled if a Chinese/Japanese/Korean code page is set.
# Possible values: true, false, 1, 0, auto.
# synchronize time: If set, DOSBox-X will try to automatically synchronize time with the host, unless you decide to change the date/time manually.
#DOSBOX-X-ADV:# keyboard hook: Use keyboard hook (currently only on Windows) to catch special keys and synchronize the keyboard LEDs with the host.
#DOSBOX-X-ADV:# weitek: If set, emulate the Weitek coprocessor. This option only has effect if cputype=386 or cputype=486.
@@ -413,6 +416,7 @@ show advanced options = false
resolve config path = true
hostkey = mapper
mapper send key = ctrlaltdel
ime = auto
synchronize time = false
#DOSBOX-X-ADV:keyboard hook = false
#DOSBOX-X-ADV:weitek = false
@@ -939,7 +943,7 @@ ttf.wp =
ttf.printfont = true
#DOSBOX-X-ADV:ttf.autodbcs = true
#DOSBOX-X-ADV:ttf.autoboxdraw = true
#DOSBOX-X-ADV:ttf.halfwidthkana = false
#DOSBOX-X-ADV:ttf.halfwidthkana = true
ttf.blinkc = true
[vsync]

6
dosbox-x.reference.conf
View File

@@ -140,6 +140,9 @@ debuggerrun = debugger
# Possible values: ctrlalt, ctrlshift, altshift, mapper.
# mapper send key: Select the key the mapper SendKey function will send.
# Possible values: winlogo, winmenu, alttab, ctrlesc, ctrlbreak, ctrlaltdel.
# ime: Enables support for the system input method (IME) in the Windows SDL1 builds.
# If set to auto, the feature is only enabled if a Chinese/Japanese/Korean code page is set.
# Possible values: true, false, 1, 0, auto.
# synchronize time: If set, DOSBox-X will try to automatically synchronize time with the host, unless you decide to change the date/time manually.
# machine: The type of machine DOSBox-X tries to emulate.
# Possible values: hercules, cga, cga_mono, cga_rgb, cga_composite, cga_composite2, tandy, pcjr, ega, jega, vgaonly, svga_s3, svga_s386c928, svga_s3vision864, svga_s3vision868, svga_s3trio32, svga_s3trio64, svga_s3trio64v+, svga_s3virge, svga_s3virgevx, svga_et3000, svga_et4000, svga_paradise, vesa_nolfb, vesa_oldvbe, amstrad, pc98, pc9801, pc9821, fm_towns, mcga, mda.
@@ -190,6 +193,7 @@ show advanced options = false
resolve config path = true
hostkey = mapper
mapper send key = ctrlaltdel
ime = auto
synchronize time = false
machine = svga_s3
captures = capture
@@ -298,7 +302,7 @@ pc-98 force ibm keyboard layout = false
# For a font name or relative path, directories such as the working directory and default system font directory will be searched.
# For example, setting it to "consola" or "consola.ttf" will use the Consola font; similar for other TTF fonts.
# ttf.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.
# Possible values: auto, surface, opengl, openglnb, openglhq, openglpp, direct3d.
# Possible values: Possible values: auto, surface, opengl, openglnb, openglhq, openglpp, direct3d.
# ttf.winperc: Specifies the window percentage for the TTF output (100 = full screen). Ignored if the ttf.ptsize setting is specified.
# ttf.ptsize: Specifies the font point size for the TTF output. If specified (minimum: 9), it will override the ttf.winperc setting.
# ttf.lins: Specifies the number of rows on the screen for the TTF output (0 = default).

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

@@ -219,6 +219,9 @@ debuggerrun = debugger
# Possible values: ctrlalt, ctrlshift, altshift, mapper.
# mapper send key: Select the key the mapper SendKey function will send.
# Possible values: winlogo, winmenu, alttab, ctrlesc, ctrlbreak, ctrlaltdel.
# ime: Enables support for the system input method (IME) in the Windows SDL1 builds.
# If set to auto, the feature is only enabled if a Chinese/Japanese/Korean code page is set.
# Possible values: true, false, 1, 0, auto.
# synchronize time: If set, DOSBox-X will try to automatically synchronize time with the host, unless you decide to change the date/time manually.
# 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.
@@ -413,6 +416,7 @@ show advanced options = false
resolve config path = true
hostkey = mapper
mapper send key = ctrlaltdel
ime = auto
synchronize time = false
keyboard hook = false
weitek = false
@@ -939,7 +943,7 @@ ttf.char512 = true
ttf.printfont = true
ttf.autodbcs = true
ttf.autoboxdraw = true
ttf.halfwidthkana = false
ttf.halfwidthkana = true
ttf.blinkc = true
[vsync]

4
src/dosbox.cpp
View File

@@ -1047,11 +1047,11 @@ void DOSBOX_RealInit() {
if (IS_DOSV) DOSV_SetConfig(dos_section);
}
#if defined(WIN32) && !defined(HX_DOS) && !defined(C_SDL2) && defined(SDL_DOSBOX_X_SPECIAL)
if (enableime) {
if (enableime && !control->opt_silent) {
dos.im_enable_flag = true;
SDL_SetIMValues(SDL_IM_ENABLE, 1, NULL);
SDL_EnableUNICODE(1);
} else {
} else if (!control->opt_silent) {
dos.im_enable_flag = false;
SDL_SetIMValues(SDL_IM_ENABLE, 0, NULL);
}

6
src/gui/sdlmain.cpp
View File

@@ -14682,8 +14682,10 @@ fresh_boot:
sticky_keys(true); //Might not be needed if the shutdown function switches to windowed mode, but it doesn't hurt
#if defined(WIN32) && !defined(HX_DOS) && !defined(C_SDL2) && defined(SDL_DOSBOX_X_SPECIAL)
SDL_SetIMValues(SDL_IM_ONOFF, 0, NULL);
SDL_SetIMValues(SDL_IM_ENABLE, 0, NULL);
if (!control->opt_silent) {
SDL_SetIMValues(SDL_IM_ONOFF, 0, NULL);
SDL_SetIMValues(SDL_IM_ENABLE, 0, NULL);
}
#endif
//Force visible mouse to end user. Somehow this sometimes doesn't happen

8
vs2015/sdl/src/events/SDL_events.c
View File

@@ -511,7 +511,7 @@ int SDL_SetIMPosition( int x, int y )
SDL_VideoDevice *video = current_video;
SDL_VideoDevice *this = current_video;
if ( video ) {
if ( video && video->SetIMPosition != NULL ) {
return video->SetIMPosition(this, x, y);
}
#endif
@@ -528,7 +528,7 @@ char *SDL_SetIMValues(SDL_imvalue value, ...)
int t2;
SDL_VideoDevice *video = current_video;
SDL_VideoDevice *this = current_video;
if (video && value) {
if (video && value && video->SetIMValues != NULL) {
va_start(ap, value);
t2 = va_arg(ap, int);
ret = video->SetIMValues(this, value, t2);
@@ -560,7 +560,7 @@ char *SDL_GetIMValues(SDL_imvalue value, ...)
SDL_VideoDevice *video = current_video;
SDL_VideoDevice *this = current_video;
if (video && value) {
if (video && value && video->GetIMValues != NULL ) {
va_start(ap, value);
t2 = va_arg(ap, int*);
ret = video->GetIMValues(this, value, t2);
@@ -588,7 +588,7 @@ int SDL_FlushIMString(void *buffer)
SDL_VideoDevice *video = current_video;
SDL_VideoDevice *this = current_video;
if ( video ) {
if ( video && video->FlushIMString != NULL ) {
return video->FlushIMString(this, buffer);
}
#endif