Default UI keys cleanup [hap, R. Belmont]

- Pause moved from P to F5
- Step single frame moved from Shift-P to Shift-F5
- Create save state moved from Shift-F7 to F6
- Toggle cheats moved from F6 to Shift-F6

docs/source/usingmame/defaultkeys.rst

@@ -72,11 +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.
-**P**
-    Pauses the emulated machine.
-**Left Shift+P**
-    While paused, advances to next frame. If rewind is enabled, a new rewind
-    save state is also captured.
 **Left Shift+~**
     While paused, loads the most recent rewind save state.
 **F1**
@@ -134,6 +129,11 @@ and saving/loading save states.
     * **Enter** - switch to palette/colortable mode.
 
     Note: Not all systems have decoded graphics and/or tilemaps.
+**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*)
@@ -141,6 +141,11 @@ and saving/loading save states.
     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”)
 **Left Ctrl+F6**
     Decrease Prescaling.
@@ -154,11 +159,6 @@ 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**
-    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.
 **F8**
     Decrease frame skipping on the fly.
 **F9**

src/emu/inpttype.ipp

@@ -890,10 +890,10 @@ namespace {
 	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_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_P, 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_P, 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_P, 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_F7, KEYCODE_LSHIFT, input_seq::or_code, KEYCODE_F7, 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_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())                                                                                                        \
@@ -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) ) \
+	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_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))                                                                                                          \