From f8345b810deb0bd1c10c9b5fa01667187d2c726e Mon Sep 17 00:00:00 2001 From: arbee Date: Tue, 13 Feb 2024 22:47:29 -0500 Subject: Fixed OSD interaction with updated default keys. [R. Belmont] --- src/emu/inpttype.ipp | 2 +- src/osd/modules/input/input_windows.cpp | 5 +++++ src/osd/sdl/osdsdl.cpp | 15 ++++++++++----- 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/src/emu/inpttype.ipp b/src/emu/inpttype.ipp index 75ff0e066b8..2f054be4784 100644 --- a/src/emu/inpttype.ipp +++ b/src/emu/inpttype.ipp @@ -891,7 +891,7 @@ namespace { INPUT_PORT_DIGITAL_TYPE(0, UI, UI_TOGGLE_UI, N_p("input-name", "Toggle UI Controls"), input_seq(KEYCODE_SCRLOCK, input_seq::not_code, KEYCODE_LSHIFT, input_seq::not_code, KEYCODE_RSHIFT)) \ INPUT_PORT_DIGITAL_TYPE(0, UI, UI_DEBUG_BREAK, N_p("input-name", "Break in Debugger"), input_seq(KEYCODE_TILDE, input_seq::not_code, KEYCODE_LSHIFT, input_seq::not_code, KEYCODE_RSHIFT)) \ INPUT_PORT_DIGITAL_TYPE(0, UI, UI_PAUSE, N_p("input-name", "Pause"), input_seq(KEYCODE_F5, input_seq::not_code, KEYCODE_LSHIFT, input_seq::not_code, KEYCODE_RSHIFT)) \ - INPUT_PORT_DIGITAL_TYPE(0, UI, UI_PAUSE_SINGLE, N_p("input-name", "Pause - Single Step"), input_seq(KEYCODE_F5, KEYCODE_LSHIFT, input_seq::or_code, KEYCODE_P, KEYCODE_RSHIFT)) \ + INPUT_PORT_DIGITAL_TYPE(0, UI, UI_PAUSE_SINGLE, N_p("input-name", "Pause - Single Step"), input_seq(KEYCODE_F5, KEYCODE_LSHIFT, input_seq::or_code, KEYCODE_F5, KEYCODE_RSHIFT)) \ INPUT_PORT_DIGITAL_TYPE(0, UI, UI_REWIND_SINGLE, N_p("input-name", "Rewind - Single Step"), input_seq(KEYCODE_TILDE, KEYCODE_LSHIFT)) \ INPUT_PORT_DIGITAL_TYPE(0, UI, UI_SAVE_STATE, N_p("input-name", "Save State"), input_seq(KEYCODE_F6, input_seq::not_code, KEYCODE_LSHIFT, input_seq::not_code, KEYCODE_RSHIFT)) \ INPUT_PORT_DIGITAL_TYPE(0, UI, UI_SAVE_STATE_QUICK, N_p("input-name", "Save State - Quick"), input_seq()) \ diff --git a/src/osd/modules/input/input_windows.cpp b/src/osd/modules/input/input_windows.cpp index 1db0e3ac02c..f3ef38bcab0 100644 --- a/src/osd/modules/input/input_windows.cpp +++ b/src/osd/modules/input/input_windows.cpp @@ -131,6 +131,11 @@ void windows_osd_interface::customize_input_type_list(std::vector // various dipswitches, and pressing them together with // LCTRL will still press/toggle these dipswitches. - // add a Not lcrtl condition to the reset key + // add a Not lctrl condition to the reset key case IPT_UI_SOFT_RESET: entry.defseq(SEQ_TYPE_STANDARD).set(KEYCODE_F3, input_seq::not_code, KEYCODE_LCONTROL, input_seq::not_code, KEYCODE_LSHIFT); break; - // add a Not lcrtl condition to the show gfx key + // add a Not lctrl condition to the show gfx key case IPT_UI_SHOW_GFX: entry.defseq(SEQ_TYPE_STANDARD).set(KEYCODE_F4, input_seq::not_code, KEYCODE_LCONTROL); break; @@ -370,7 +370,7 @@ void sdl_osd_interface::customize_input_type_list(std::vector entry.defseq(SEQ_TYPE_STANDARD).set(KEYCODE_F6, KEYCODE_LCONTROL); break; - // add a Not lcrtl condition to the toggle cheat key + // add a Not lctrl condition to the toggle cheat key case IPT_UI_TOGGLE_CHEAT: entry.defseq(SEQ_TYPE_STANDARD).set(KEYCODE_F6, input_seq::not_code, KEYCODE_LCONTROL); break; @@ -387,12 +387,17 @@ void sdl_osd_interface::customize_input_type_list(std::vector entry.defseq(SEQ_TYPE_STANDARD).set(KEYCODE_F12, KEYCODE_LSHIFT, KEYCODE_LALT); break; - // add a Not lcrtl condition to the load state key + // add a Not lctrl condition to the pause key + case IPT_UI_PAUSE: + entry.defseq(SEQ_TYPE_STANDARD).set(KEYCODE_F5, input_seq::not_code, KEYCODE_LCONTROL); + break; + + // add a Not lctrl Not lshift condition to the load state key case IPT_UI_LOAD_STATE: entry.defseq(SEQ_TYPE_STANDARD).set(KEYCODE_F7, input_seq::not_code, KEYCODE_LCONTROL, input_seq::not_code, KEYCODE_LSHIFT); break; - // add a Not lcrtl condition to the throttle key + // add a Not lctrl condition to the throttle key case IPT_UI_THROTTLE: entry.defseq(SEQ_TYPE_STANDARD).set(KEYCODE_F10, input_seq::not_code, KEYCODE_LCONTROL); break; -- cgit v1.2.3