valter/dosbox-staging
1
0
Fork 0
Code Releases Activity

Change 'sdl.capture_mouse' default to 'seamless middlerelease'

Browse source 
Also, reformat help string, so that help comment generated in default
.conf file sort-of matches 80 columns.
This commit is contained in:
Patryk Obara 2020-02-14 14:36:08 +01:00 • committed by Patryk Obara
parent 9fee755542
commit 040e47372e
1 changed files with 19 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/gui/sdlmain.cpp
View file

@ -2218,15 +2218,15 @@ void Config_Add_SDL() {
// Define mouse control settings
Pmulti = sdl_sec->Add_multi("capture_mouse", always, " ");
const char *mouse_controls[] = {
"onclick", // default
"seamless", // default
"onclick",
"onstart",
"seamless",
"nomouse",
0
};
const char *middle_controls[] = {
"middlegame", // default
"middlerelease",
"middlerelease", // default
"middlegame",
0
};
// Generate and set the mouse control defaults from above arrays
@ -2243,15 +2243,22 @@ void Config_Add_SDL() {
// Construct and set the help block using defaults set above
std::string mouse_control_help(
"Choose a mouse control method:\n"
" onclick: The mouse will be captured after the first click inside the window.\n"
" onstart: The mouse is captured immediately on start (similar to real DOS).\n"
" seamless: The mouse can move seamlessly in and out of DOSBox and cannot be captured.\n"
" nomouse: The mouse is disabled and hidden without any input sent to the game.\n"
" onclick: The mouse will be captured after the first\n"
" click inside the window.\n"
" onstart: The mouse is captured immediately on start\n"
" (similar to real DOS).\n"
" seamless: The mouse can move seamlessly in and out of DOSBox\n"
" window and cannot be captured.\n"
" nomouse: The mouse is disabled and hidden without any\n"
" input sent to the game.\n"
"Choose how middle-clicks are handled (second parameter):\n"
" middlegame: Middle-clicks are sent to the game (Ctrl-F10 uncaptures the mouse).\n"
" middlerelease: Middle-clicks are used to uncapture the mouse (not sent to the game).\n"
" However, middle-clicks /will/ be sent to the game when when fullscreen\n"
" or when seamless control is set. Ctrl-F10 will also uncapture the mouse.\n"
" middlegame: Middle-clicks are sent to the game\n"
" (Ctrl-F10 uncaptures the mouse).\n"
" middlerelease: Middle-clicks are used to uncapture the mouse\n"
" (not sent to the game). However, middle-clicks\n"
" will be sent to the game in fullscreen or when\n"
" seamless control is set.\n"
" Ctrl-F10 will also uncapture the mouse.\n"
"Defaults (if not present or incorrect): ");
mouse_control_help += mouse_control_defaults;
Pmulti->Set_help(mouse_control_help);