From d4589e0b29d6085072ff635d87c3d95c21813a58 Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Sat, 18 Feb 2023 06:18:45 +1100 Subject: Input refactoring: osd/modules/input, emu/inpttype.cpp: Made most default joystick assignments supplied by input modules. Input modules take available controls into consideration when generating default assignments. emu/inpttype.ipp: Added a separate "Back" UI input separate from Cancel. You may want an easier to hit combination for moving to the previous menu than for exiting or cancelling input. They both default to Escape. emu/inpttype.ipp: Added a UI Help control. Currently only used by analog inputs menu emu/inpttype.h: Moved I/O port field type enum to its own header and sorted UI controls so they appear in a more logical order. ui: Don't use UI Select to restore defaults - people should be getting used to the UI Clear input by now. UI Select cycles multi-value items instead. ui/inputmap.cpp: Don't use immediate cancel to cycle between clearing and restoring default assignment (use UI Clear instead). osd: Reduced the number of files needing to include the dreaded emu.h. Got some implementation out of headers. --- ctrlr/hotrod.cfg | 11 ++++++++++- ctrlr/hotrodse.cfg | 11 ++++++++++- ctrlr/scorpionxg.cfg | 11 ++++++++++- ctrlr/slikstik.cfg | 11 ++++++++++- ctrlr/xarcade.cfg | 11 ++++++++++- 5 files changed, 50 insertions(+), 5 deletions(-) (limited to 'ctrlr') diff --git a/ctrlr/hotrod.cfg b/ctrlr/hotrod.cfg index ccbbe0ac0dc..93d44424a46 100644 --- a/ctrlr/hotrod.cfg +++ b/ctrlr/hotrod.cfg @@ -25,12 +25,21 @@ KEYCODE_ENTER OR KEYCODE_LCONTROL - + KEYCODE_TAB OR KEYCODE_1 KEYCODE_3 + + KEYCODE_ESC OR KEYCODE_LALT OR JOYCODE_1_BUTTON2 + KEYCODE_ESC OR KEYCODE_2 KEYCODE_4 + + KEYCODE_DEL OR KEYCODE_SPACE OR JOYCODE_1_BUTTON3 + + + KEYCODE_F1 OR KEYCODE_LSHIFT OR JOYCODE_1_BUTTON4 + KEYCODE_1 diff --git a/ctrlr/hotrodse.cfg b/ctrlr/hotrodse.cfg index 9a01517d10d..f91a45dfde4 100644 --- a/ctrlr/hotrodse.cfg +++ b/ctrlr/hotrodse.cfg @@ -25,12 +25,21 @@ KEYCODE_ENTER OR KEYCODE_LCONTROL - + KEYCODE_TAB OR KEYCODE_1 KEYCODE_3 + + KEYCODE_ESC OR KEYCODE_LALT OR JOYCODE_1_BUTTON2 + KEYCODE_ESC OR KEYCODE_2 KEYCODE_4 + + KEYCODE_DEL OR KEYCODE_SPACE OR JOYCODE_1_BUTTON3 + + + KEYCODE_F1 OR KEYCODE_LSHIFT OR JOYCODE_1_BUTTON4 + KEYCODE_1 diff --git a/ctrlr/scorpionxg.cfg b/ctrlr/scorpionxg.cfg index faa48c816e7..cf7d544981c 100644 --- a/ctrlr/scorpionxg.cfg +++ b/ctrlr/scorpionxg.cfg @@ -27,12 +27,21 @@ KEYCODE_ENTER OR KEYCODE_LCONTROL - + KEYCODE_TAB + + KEYCODE_ESC OR KEYCODE_LALT OR JOYCODE_1_BUTTON2 + KEYCODE_ESC + + KEYCODE_DEL OR KEYCODE_SPACE OR JOYCODE_1_BUTTON3 + + + KEYCODE_F1 OR KEYCODE_C OR JOYCODE_1_BUTTON4 + KEYCODE_1 diff --git a/ctrlr/slikstik.cfg b/ctrlr/slikstik.cfg index 8815980a6b5..d1ffe4c46b4 100644 --- a/ctrlr/slikstik.cfg +++ b/ctrlr/slikstik.cfg @@ -32,12 +32,21 @@ KEYCODE_7 OR KEYCODE_ENTER OR JOYCODE_1_BUTTON1 - + KEYCODE_TAB OR KEYCODE_1 KEYCODE_5 + + KEYCODE_ESC OR KEYCODE_H OR JOYCODE_1_BUTTON2 OR KEYCODE_L + KEYCODE_ESC OR KEYCODE_2 KEYCODE_6 + + KEYCODE_DEL OR KEYCODE_9 OR JOYCODE_1_BUTTON3 + + + KEYCODE_F1 OR KEYCODE_0 OR JOYCODE_1_BUTTON4 + KEYCODE_1 OR JOYCODE_1_START diff --git a/ctrlr/xarcade.cfg b/ctrlr/xarcade.cfg index 92bbbbeec9e..b05fce74b1d 100644 --- a/ctrlr/xarcade.cfg +++ b/ctrlr/xarcade.cfg @@ -25,12 +25,21 @@ KEYCODE_ENTER OR KEYCODE_LCONTROL - + KEYCODE_TAB OR KEYCODE_1 KEYCODE_3 + + KEYCODE_ESC OR KEYCODE_LALT OR JOYCODE_1_BUTTON2 + KEYCODE_ESC OR KEYCODE_2 KEYCODE_4 + + KEYCODE_DEL OR KEYCODE_SPACE OR JOYCODE_1_BUTTON3 + + + KEYCODE_F1 OR KEYCODE_LSHIFT OR JOYCODE_1_BUTTON4 + KEYCODE_1 -- cgit v1.2.3