Add mode "On (Only On-Screen Keyboard While in Game)" to "Use L3 Button to Show Menu" core input option (#715)

Author: schellingb

core_options.h

@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2020-2025 Bernhard Schelling
+ *  Copyright (C) 2020-2026 Bernhard Schelling
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -233,7 +233,7 @@ static retro_core_option_v2_definition option_defs[DBP_Option::_OPTIONS_TOTAL] =
 	},
 	#endif
 	{
-		"dosbox_pure_force60fps", // legacy name
+		"dosbox_pure_force60fps", // legacy name (now forcefps)
 		"Force Output FPS", NULL,
 		"Enable this to force output at a fixed rate. Try 60 FPS if you encounter screen tearing or vsync issues." "\n"
 		"Output will have frames skipped at lower rates and frames duplicated at higher rates.", NULL,
@@ -325,11 +325,11 @@ static retro_core_option_v2_definition option_defs[DBP_Option::_OPTIONS_TOTAL] =
 
 	// Input
 	{
-		"dosbox_pure_on_screen_keyboard", // legacy name
+		"dosbox_pure_on_screen_keyboard", // legacy name (now map_osd)
 		"Use L3 Button to Show Menu", NULL,
 		"Always bind the L3 controller button to show the menu to swap CDs/Disks and use the On-Screen Keyboard.", NULL,
 		DBP_OptionCat::Input,
-		{ { "true", "On (Default to Menu)" }, { "keyboard", "On (Default to On-Screen Keyboard)" }, { "false", "Off" } },
+		{ { "true", "On (Default to Menu)" }, { "keyboard", "On (Default to On-Screen Keyboard)" }, { "onlyosk", "On (Only On-Screen Keyboard While in Game)" }, { "false", "Off" } },
 		"true"
 	},
 	{

dosbox_pure_osd.h

@@ -1229,9 +1229,9 @@ struct DBP_OnScreenKeyboardState
 
 				DBP_ASSERT(draww);
 				int rl = (int)((oskx + x) * fx), rr = (int)((oskx + x + draww) * fx), rt = (int)((osky + y) * fy), rb = (int)((osky + y + drawh) * fy);
-				bool hovered = (cX >= rl-1 && cX <= rr && cY >= rt-1 && cY <= rb);
 
-				KBD_KEYS kbd_key = keyboard_keys[row][k - keyboard_rows[row]];
+				const KBD_KEYS kbd_key = keyboard_keys[row][k - keyboard_rows[row]];
+				const bool hovered = (cX >= rl-1 && cX <= rr && cY >= rt-1 && cY <= rb && (dbp_map_osd != 'o' || !dbp_game_running || kbd_key != KBD_LAST));
 				if (hovered) hovered_key = kbd_key;
 
 				buf.AlphaBlendFillRect(rl, rt, rr-rl, rb-rt, (pressed_key == kbd_key ? buf.BGCOL_KEYPRESS : (held[kbd_key] ? buf.BGCOL_KEYHELD : (hovered ? buf.BGCOL_KEYHOVER : buf.BGCOL_KEY))));
@@ -2162,8 +2162,9 @@ struct DBP_OnScreenDisplay : DBP_MenuInterceptor
 			case DBPOSD_SETTINGS: delete ptr.settings; break;
 			#endif
 		}
-		if (in_mode != _DBPOSD_OPEN && in_mode != _DBPOSD_CLOSE) { mode = in_mode; if (!ptr._all) default_shown = 0; }
-		else if (in_mode == _DBPOSD_OPEN && (!default_shown || last_map != dbp_map_osd)) { mode = ((last_map = dbp_map_osd) == 'k' ? DBPOSD_OSK : DBPOSD_MAIN); default_shown = true; }
+		if (dbp_map_osd == 'o' && dbp_game_running) { mode = DBPOSD_OSK; } // only osk
+		else if (in_mode != _DBPOSD_OPEN && in_mode != _DBPOSD_CLOSE) { mode = in_mode; if (!ptr._all) default_shown = 0; }
+		else if (in_mode == _DBPOSD_OPEN && (!default_shown || last_map != dbp_map_osd)) { mode = (((last_map = dbp_map_osd) == 'k' || last_map == 'o') ? DBPOSD_OSK : DBPOSD_MAIN); default_shown = true; }
 		ptr._all = NULL;
 		StartIntercept();
 		switch (in_mode == _DBPOSD_CLOSE ? _DBPOSD_CLOSE : mode)
@@ -2191,7 +2192,7 @@ struct DBP_OnScreenDisplay : DBP_MenuInterceptor
 		bool isOSK = (mode == DBPOSD_OSK);
 		bool mouseMoved = mouse.Update(buf, isOSK);
 
-		if (1) // now always show button bar, was (DBP_FullscreenOSD || !isOSK) before
+		if (dbp_map_osd != 'o' || !dbp_game_running)
 		{
 			int btny = h - 13 - lh, btnmrgn = (w >= 296 ? 34 : 8), ydist = (isOSK ? (int)(127 - (btny - mouse.y) / (h*0.001f)) : 0xFF);
 			Bit32u btnblend = (DBP_FullscreenOSD ? 0xFF000000 : ((ydist > dbp_alphablend_base ? dbp_alphablend_base : (ydist < 30 ? 30 : ydist)) << 24));