mirrors/Bochs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Setting up options without specifying display library is now also supported.

Browse Source
This commit is contained in:
Volker Ruppert 2020-11-29 13:37:07 +00:00
parent 11318c98f3
commit 90dc9f7468
4 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
bochs/.bochsrc
View File

@ -80,6 +80,7 @@
# "timeout" - time (in seconds) to wait for client (rfb, vncsrv)
#
# See the examples below for other currently supported options.
# Setting up options without specifying display library is also supported.
#=======================================================================
#display_library: amigaos
#display_library: carbon

15
bochs/config.cc
View File

@ -2326,11 +2326,16 @@ static int parse_line_formatted(const char *context, int num_params, char *param
if ((num_params < 2) || (num_params > 3)) {
PARSE_ERR(("%s: display_library directive: wrong # args.", context));
}
if (!SIM->get_param_enum(BXPN_SEL_DISPLAY_LIBRARY)->set_by_name(params[1]))
PARSE_ERR(("%s: display library '%s' not available", context, params[1]));
if (num_params == 3) {
if (!strncmp(params[2], "options=", 8)) {
SIM->get_param_string(BXPN_DISPLAYLIB_OPTIONS)->set(&params[2][8]);
if (SIM->get_param_enum(BXPN_SEL_DISPLAY_LIBRARY)->set_by_name(params[1])) {
i = 2;
} else {
i = 1;
}
if ((num_params == 3) || (i == 1)) {
if (!strncmp(params[i], "options=", 8)) {
SIM->get_param_string(BXPN_DISPLAYLIB_OPTIONS)->set(&params[i][8]);
} else if (i == 1) {
PARSE_ERR(("%s: display library '%s' not available", context, params[1]));
} else {
PARSE_ERR(("%s: display_library directive malformed", context));
}

4
bochs/doc/docbook/user/user.dbk
View File

@ -3351,7 +3351,8 @@ the "wx" configuration interface, see
Examples:
<screen>
display_library: x
display_library: sdl
display_library: sdl2, options=fullscreen
display_library: options=cmdmode
</screen>
Some display libraries now support specific options to control their
behaviour. These options are supported by more than one display library:
@ -3372,6 +3373,7 @@ See the examples below for other currently supported options.
# on desktop window size
display_library: win32, options="traphotkeys autoscale"
</screen>
Setting up options without specifying display library is also supported.
</para>
<table>

12
bochs/doc/man/bochsrc.5
View File

@ -1,5 +1,5 @@
.\"Document Author: Timothy R. Butler - tbutler@uninetsolutions.com"
.TH bochsrc 5 "23 Nov 2020" "bochsrc" "The Bochs Project"
.TH bochsrc 5 "29 Nov 2020" "bochsrc" "The Bochs Project"
.\"SKIP_SECTION"
.SH NAME
bochsrc \- Configuration file for Bochs.
@ -102,7 +102,7 @@ The choices are:
nogui no display at all
.B NOTE:
if you use the "wx" configuration interface, you must also use
If you use the "wx" configuration interface, you must also use
the "wx" display library.
.B Specific options:
@ -116,6 +116,14 @@ behaviour. These options are supported by more than one display library:
"nokeyrepeat" - turn off host keyboard repeat (sdl, sdl2, x)
"timeout" - time (in seconds) to wait for client (rfb, vncsrv)
.B NOTE:
Setting up options without specifying display library is also supported.
Examples:
display_library: x
display_library: sdl2, options=fullscreen,hideIPS
display_library: options=cmdmode
.TP
.I "cpu:"
This defines cpu-related parameters inside Bochs: