Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-20 15:32:45 +03:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

- osd sdl default keys: remove ctrl-blocks on f3 and f4, move opengl filter from lctrl+f5 to lalt+f10,

Browse Source 
- osd windows default keys: move post processing key from lctrl+lalt+f5 to lalt+f10,
- mame default keys: move rewind step from shit+tilde to shift+f4, move cheat from shift+f6 to shift+f8, move quick save/load from (none) to shift+f6/f7
This commit is contained in:
hap 2024-02-16 23:37:50 +01:00
parent b2c3b4ea91
commit acf1912748
4 changed files with 50 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
docs/source/usingmame/defaultkeys.rst
View File

@ -72,8 +72,6 @@ and saving/loading save states.
**Delete**
Clear/reset to default when highlighting an entry on the input
configuration, cheat options, and plugin options pages.
**Left Shift+~**
While paused, loads the most recent rewind save state.
**F1**
Power the machine on for machines that have specific power button behavior.
**F2**
@ -129,28 +127,23 @@ and saving/loading save states.
* **Enter** - switch to palette/colortable mode.
Note: Not all systems have decoded graphics and/or tilemaps.
**Left Shift+F4**
While paused, loads the most recent rewind save state.
**F5**
Pauses the emulated machine.
**Left Shift+F5**
While paused, advances to next frame. If rewind is enabled, a new rewind
save state is also captured.
**Left Ctrl+F5**
Toggle Filter.
(*SDL MAME only*)
**Left Alt+Left Ctrl+F5**
Toggle HLSL Post-Processing.
(*Windows non-SDL MAME only*)
**F6**
Create a save state. Requires an additional keypress to identify the state,
similar to the load option above. If an existing save state is present, it
will also appear in the selection menu to allow overwriting of that save
state.
**Left Shift+F6**
Toggle cheat mode. (if started with “-cheat”)
Create a quick save state.
**Left Ctrl+F6**
Decrease Prescaling.
**Left Ctrl+F7**
Increase Prescaling.
(*SDL MAME only*)
**F7**
Load a save state. You will be prompted to press a key or select from the
menu to determine which save state you wish to load.
@ -159,12 +152,25 @@ and saving/loading save states.
drivers. If a given driver is not known to work perfectly, you will
receive a warning that the save state may not be valid when attempting to
save or load.*
**Left Shift+F7**
Load a quick save state.
**Left Ctrl+F7**
Increase Prescaling.
(*SDL MAME only*)
**F8**
Decrease frame skipping on the fly.
**Left Shift+F8**
Toggle cheat mode. (if started with “-cheat”)
**F9**
Increase frame skipping on the fly.
**F10**
Toggle speed throttling.
**Left Alt+F10**
Toggle HLSL Post-Processing.
(*Windows non-SDL MAME only*)
**Left Alt+F10**
Toggle Filter.
(*SDL MAME only*)
**F11**
Toggles speed display.
**Left Shift+F11**

18
src/emu/inpttype.ipp
View File

@ -887,20 +887,20 @@ namespace {
INPUT_PORT_DIGITAL_TYPE(0, UI, UI_PAGE_DOWN, N_p("input-name", "UI Page Down"), input_seq(KEYCODE_PGDN)) \
INPUT_PORT_DIGITAL_TYPE(0, UI, UI_PREV_GROUP, N_p("input-name", "UI Previous Group"), input_seq(KEYCODE_OPENBRACE)) \
INPUT_PORT_DIGITAL_TYPE(0, UI, UI_NEXT_GROUP, N_p("input-name", "UI Next Group"), input_seq(KEYCODE_CLOSEBRACE)) \
INPUT_PORT_DIGITAL_TYPE(0, UI, UI_ON_SCREEN_DISPLAY, N_p("input-name", "On Screen Display"), input_seq(KEYCODE_TILDE, input_seq::not_code, KEYCODE_LSHIFT, input_seq::not_code, KEYCODE_RSHIFT)) \
INPUT_PORT_DIGITAL_TYPE(0, UI, UI_ON_SCREEN_DISPLAY, N_p("input-name", "On Screen Display"), input_seq(KEYCODE_TILDE)) \
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_DEBUG_BREAK, N_p("input-name", "Break in Debugger"), input_seq(KEYCODE_TILDE)) \
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_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_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_F4, KEYCODE_LSHIFT, input_seq::or_code, KEYCODE_F4, KEYCODE_RSHIFT)) \
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()) \
INPUT_PORT_DIGITAL_TYPE(0, UI, UI_SAVE_STATE_QUICK, N_p("input-name", "Quick Save State"), input_seq(KEYCODE_F6, KEYCODE_LSHIFT, input_seq::or_code, KEYCODE_F6, KEYCODE_RSHIFT)) \
INPUT_PORT_DIGITAL_TYPE(0, UI, UI_LOAD_STATE, N_p("input-name", "Load State"), input_seq(KEYCODE_F7, input_seq::not_code, KEYCODE_LSHIFT, input_seq::not_code, KEYCODE_RSHIFT)) \
INPUT_PORT_DIGITAL_TYPE(0, UI, UI_LOAD_STATE_QUICK, N_p("input-name", "Load State - Quick"), input_seq()) \
INPUT_PORT_DIGITAL_TYPE(0, UI, UI_LOAD_STATE_QUICK, N_p("input-name", "Quick Load State"), input_seq(KEYCODE_F7, KEYCODE_LSHIFT, input_seq::or_code, KEYCODE_F7, KEYCODE_RSHIFT)) \
INPUT_PORT_DIGITAL_TYPE(0, UI, UI_RESET_MACHINE, N_p("input-name", "Reset Machine"), input_seq(KEYCODE_F3, KEYCODE_LSHIFT, input_seq::or_code, KEYCODE_F3, KEYCODE_RSHIFT)) \
INPUT_PORT_DIGITAL_TYPE(0, UI, UI_SOFT_RESET, N_p("input-name", "Soft Reset"), input_seq(KEYCODE_F3, input_seq::not_code, KEYCODE_LSHIFT, input_seq::not_code, KEYCODE_RSHIFT)) \
INPUT_PORT_DIGITAL_TYPE(0, UI, UI_SHOW_GFX, N_p("input-name", "Show Decoded Graphics"), input_seq(KEYCODE_F4)) \
INPUT_PORT_DIGITAL_TYPE(0, UI, UI_FRAMESKIP_DEC, N_p("input-name", "Frameskip Dec"), input_seq(KEYCODE_F8)) \
INPUT_PORT_DIGITAL_TYPE(0, UI, UI_SHOW_GFX, N_p("input-name", "Show Decoded Graphics"), input_seq(KEYCODE_F4, input_seq::not_code, KEYCODE_LSHIFT, input_seq::not_code, KEYCODE_RSHIFT)) \
INPUT_PORT_DIGITAL_TYPE(0, UI, UI_FRAMESKIP_DEC, N_p("input-name", "Frameskip Dec"), input_seq(KEYCODE_F8, input_seq::not_code, KEYCODE_LSHIFT, input_seq::not_code, KEYCODE_RSHIFT)) \
INPUT_PORT_DIGITAL_TYPE(0, UI, UI_FRAMESKIP_INC, N_p("input-name", "Frameskip Inc"), input_seq(KEYCODE_F9)) \
INPUT_PORT_DIGITAL_TYPE(0, UI, UI_THROTTLE, N_p("input-name", "Throttle"), input_seq(KEYCODE_F10)) \
INPUT_PORT_DIGITAL_TYPE(0, UI, UI_FAST_FORWARD, N_p("input-name", "Fast Forward"), input_seq(KEYCODE_INSERT)) \
@ -908,7 +908,7 @@ namespace {
INPUT_PORT_DIGITAL_TYPE(0, UI, UI_SNAPSHOT, N_p("input-name", "Save Snapshot"), input_seq(KEYCODE_F12, input_seq::not_code, KEYCODE_LSHIFT)) \
INPUT_PORT_DIGITAL_TYPE(0, UI, UI_RECORD_MNG, N_p("input-name", "Record MNG"), input_seq(KEYCODE_F12, KEYCODE_LSHIFT, input_seq::not_code, KEYCODE_LCONTROL)) \
INPUT_PORT_DIGITAL_TYPE(0, UI, UI_RECORD_AVI, N_p("input-name", "Record AVI"), input_seq(KEYCODE_F12, KEYCODE_LSHIFT, KEYCODE_LCONTROL)) \
INPUT_PORT_DIGITAL_TYPE(0, UI, UI_TOGGLE_CHEAT, N_p("input-name", "Toggle Cheat"), input_seq(KEYCODE_F6, KEYCODE_LSHIFT, input_seq::or_code, KEYCODE_F6, KEYCODE_RSHIFT)) \
INPUT_PORT_DIGITAL_TYPE(0, UI, UI_TOGGLE_CHEAT, N_p("input-name", "Toggle Cheat"), input_seq(KEYCODE_F8, KEYCODE_LSHIFT, input_seq::or_code, KEYCODE_F8, KEYCODE_RSHIFT)) \
INPUT_PORT_DIGITAL_TYPE(0, UI, UI_DISPLAY_COMMENT, N_p("input-name", "UI Display Comment"), input_seq(KEYCODE_SPACE)) \
INPUT_PORT_DIGITAL_TYPE(0, UI, UI_ZOOM_IN, N_p("input-name", "UI Zoom In"), input_seq(KEYCODE_EQUALS)) \
INPUT_PORT_DIGITAL_TYPE(0, UI, UI_ZOOM_OUT, N_p("input-name", "UI Zoom Out"), input_seq(KEYCODE_MINUS)) \

15
src/osd/modules/input/input_windows.cpp
View File

@ -80,6 +80,7 @@ void windows_osd_interface::customize_input_type_list(std::vector<input_type_ent
case IPT_UI_MENU:
entry.defseq(SEQ_TYPE_STANDARD).set(KEYCODE_TAB, input_seq::not_code, KEYCODE_LALT, input_seq::not_code, KEYCODE_RALT);
break;
// configurable UI mode switch
case IPT_UI_TOGGLE_UI:
{
@ -131,15 +132,15 @@ void windows_osd_interface::customize_input_type_list(std::vector<input_type_ent
entry.defseq(SEQ_TYPE_STANDARD).set(KEYCODE_F12, KEYCODE_LSHIFT, KEYCODE_LCONTROL, input_seq::not_code, KEYCODE_LALT);
break;
// add a Not lctrl Not lalt condition to the pause key
case IPT_UI_PAUSE:
entry.defseq(SEQ_TYPE_STANDARD).set(KEYCODE_F5, input_seq::not_code, KEYCODE_LCONTROL, input_seq::not_code, KEYCODE_LALT);
break;
// lctrl-lalt-F5 to toggle post-processing
// lalt-F10 to toggle post-processing
case IPT_OSD_4:
entry.configure_osd("POST_PROCESS", N_p("input-name", "Toggle Post-Processing"));
entry.defseq(SEQ_TYPE_STANDARD).set(KEYCODE_F5, KEYCODE_LALT, KEYCODE_LCONTROL);
entry.defseq(SEQ_TYPE_STANDARD).set(KEYCODE_F10, KEYCODE_LALT, KEYCODE_LALT);
break;
// add a Not LALT condition to the throttle key
case IPT_UI_THROTTLE:
entry.defseq(SEQ_TYPE_STANDARD).set(KEYCODE_F10, input_seq::not_code, KEYCODE_LALT);
break;
// leave everything else alone

47
src/osd/sdl/osdsdl.cpp
View File

@ -348,20 +348,15 @@ void sdl_osd_interface::customize_input_type_list(std::vector<input_type_entry>
// various dipswitches, and pressing them together with
// LCTRL will still press/toggle these dipswitches.
// 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 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;
// LCTRL-F5 to toggle OpenGL filtering
// LALT-F10 to toggle OpenGL filtering
case IPT_OSD_5:
entry.configure_osd("TOGGLE_FILTER", N_p("input-name", "Toggle Filter"));
entry.defseq(SEQ_TYPE_STANDARD).set(KEYCODE_F5, KEYCODE_LCONTROL);
entry.defseq(SEQ_TYPE_STANDARD).set(KEYCODE_F10, KEYCODE_LALT);
break;
// add a Not LALT condition to the throttle key
case IPT_UI_THROTTLE:
entry.defseq(SEQ_TYPE_STANDARD).set(KEYCODE_F10, input_seq::not_code, KEYCODE_LALT);
break;
// LCTRL-F6 to decrease OpenGL prescaling
@ -370,9 +365,9 @@ void sdl_osd_interface::customize_input_type_list(std::vector<input_type_entry>
entry.defseq(SEQ_TYPE_STANDARD).set(KEYCODE_F6, KEYCODE_LCONTROL);
break;
// 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);
// add a Not LCTRL condition to the save state key
case IPT_UI_SAVE_STATE:
entry.defseq(SEQ_TYPE_STANDARD).set(KEYCODE_F6, input_seq::not_code, KEYCODE_LCONTROL, input_seq::not_code, KEYCODE_LSHIFT, input_seq::not_code, KEYCODE_RSHIFT);
break;
// LCTRL-F7 to increase OpenGL prescaling
@ -381,27 +376,17 @@ void sdl_osd_interface::customize_input_type_list(std::vector<input_type_entry>
entry.defseq(SEQ_TYPE_STANDARD).set(KEYCODE_F7, KEYCODE_LCONTROL);
break;
// lshift-lalt-F12 for fullscreen video (BGFX)
// add a Not LCTRL 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, input_seq::not_code, KEYCODE_RSHIFT);
break;
// LSHIFT-LALT-F12 for fullscreen video (BGFX)
case IPT_OSD_8:
entry.configure_osd("RENDER_AVI", N_p("input-name", "Record Rendered Video"));
entry.defseq(SEQ_TYPE_STANDARD).set(KEYCODE_F12, KEYCODE_LSHIFT, KEYCODE_LALT);
break;
// 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 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;
// disable the config menu if the ALT key is down
// (allows ALT-TAB to switch between apps)
case IPT_UI_MENU: