summaryrefslogtreecommitdiffstatshomepage
path: root/ctrlr
diff options
context:
space:
mode:
author Vas Crabb <vas@vastheman.com>2023-02-18 06:18:45 +1100
committer Vas Crabb <vas@vastheman.com>2023-02-18 06:18:45 +1100
commitd4589e0b29d6085072ff635d87c3d95c21813a58 (patch)
treec0d3283ecdd99bd380fc155f4e09b7f4bd573116 /ctrlr
parent20d7135179ffe9959f4bfb759a0e5735b7aaaf15 (diff)
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.
Diffstat (limited to 'ctrlr')
-rw-r--r--ctrlr/hotrod.cfg11
-rw-r--r--ctrlr/hotrodse.cfg11
-rw-r--r--ctrlr/scorpionxg.cfg11
-rw-r--r--ctrlr/slikstik.cfg11
-rw-r--r--ctrlr/xarcade.cfg11
5 files changed, 50 insertions, 5 deletions
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 @@
<newseq type="standard">KEYCODE_ENTER OR KEYCODE_LCONTROL</newseq>
</port>
- <port type="UI_CONFIGURE">
+ <port type="UI_MENU">
<newseq type="standard">KEYCODE_TAB OR KEYCODE_1 KEYCODE_3</newseq>
</port>
+ <port type="UI_BACK">
+ <newseq type="standard">KEYCODE_ESC OR KEYCODE_LALT OR JOYCODE_1_BUTTON2</newseq>
+ </port>
<port type="UI_CANCEL">
<newseq type="standard">KEYCODE_ESC OR KEYCODE_2 KEYCODE_4</newseq>
</port>
+ <port type="UI_CLEAR">
+ <newseq type="standard">KEYCODE_DEL OR KEYCODE_SPACE OR JOYCODE_1_BUTTON3</newseq>
+ </port>
+ <port type="UI_HELP">
+ <newseq type="standard">KEYCODE_F1 OR KEYCODE_LSHIFT OR JOYCODE_1_BUTTON4</newseq>
+ </port>
<port type="START1">
<newseq type="standard">KEYCODE_1</newseq>
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 @@
<newseq type="standard">KEYCODE_ENTER OR KEYCODE_LCONTROL</newseq>
</port>
- <port type="UI_CONFIGURE">
+ <port type="UI_MENU">
<newseq type="standard">KEYCODE_TAB OR KEYCODE_1 KEYCODE_3</newseq>
</port>
+ <port type="UI_BACK">
+ <newseq type="standard">KEYCODE_ESC OR KEYCODE_LALT OR JOYCODE_1_BUTTON2</newseq>
+ </port>
<port type="UI_CANCEL">
<newseq type="standard">KEYCODE_ESC OR KEYCODE_2 KEYCODE_4</newseq>
</port>
+ <port type="UI_CLEAR">
+ <newseq type="standard">KEYCODE_DEL OR KEYCODE_SPACE OR JOYCODE_1_BUTTON3</newseq>
+ </port>
+ <port type="UI_HELP">
+ <newseq type="standard">KEYCODE_F1 OR KEYCODE_LSHIFT OR JOYCODE_1_BUTTON4</newseq>
+ </port>
<port type="START1">
<newseq type="standard">KEYCODE_1</newseq>
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 @@
<newseq type="standard">KEYCODE_ENTER OR KEYCODE_LCONTROL</newseq>
</port>
- <port type="UI_CONFIGURE">
+ <port type="UI_MENU">
<newseq type="standard">KEYCODE_TAB</newseq>
</port>
+ <port type="UI_BACK">
+ <newseq type="standard">KEYCODE_ESC OR KEYCODE_LALT OR JOYCODE_1_BUTTON2</newseq>
+ </port>
<port type="UI_CANCEL">
<newseq type="standard">KEYCODE_ESC</newseq>
</port>
+ <port type="UI_CLEAR">
+ <newseq type="standard">KEYCODE_DEL OR KEYCODE_SPACE OR JOYCODE_1_BUTTON3</newseq>
+ </port>
+ <port type="UI_HELP">
+ <newseq type="standard">KEYCODE_F1 OR KEYCODE_C OR JOYCODE_1_BUTTON4</newseq>
+ </port>
<port type="START1">
<newseq type="standard">KEYCODE_1</newseq>
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 @@
<newseq type="standard">KEYCODE_7 OR KEYCODE_ENTER OR JOYCODE_1_BUTTON1</newseq>
</port>
- <port type="UI_CONFIGURE">
+ <port type="UI_MENU">
<newseq type="standard">KEYCODE_TAB OR KEYCODE_1 KEYCODE_5</newseq>
</port>
+ <port type="UI_BACK">
+ <newseq type="standard">KEYCODE_ESC OR KEYCODE_H OR JOYCODE_1_BUTTON2 OR KEYCODE_L</newseq>
+ </port>
<port type="UI_CANCEL">
<newseq type="standard">KEYCODE_ESC OR KEYCODE_2 KEYCODE_6</newseq>
</port>
+ <port type="UI_CLEAR">
+ <newseq type="standard">KEYCODE_DEL OR KEYCODE_9 OR JOYCODE_1_BUTTON3</newseq>
+ </port>
+ <port type="UI_HELP">
+ <newseq type="standard">KEYCODE_F1 OR KEYCODE_0 OR JOYCODE_1_BUTTON4</newseq>
+ </port>
<port type="START1">
<newseq type="standard">KEYCODE_1 OR JOYCODE_1_START</newseq>
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 @@
<newseq type="standard">KEYCODE_ENTER OR KEYCODE_LCONTROL</newseq>
</port>
- <port type="UI_CONFIGURE">
+ <port type="UI_MENU">
<newseq type="standard">KEYCODE_TAB OR KEYCODE_1 KEYCODE_3</newseq>
</port>
+ <port type="UI_BACK">
+ <newseq type="standard">KEYCODE_ESC OR KEYCODE_LALT OR JOYCODE_1_BUTTON2</newseq>
+ </port>
<port type="UI_CANCEL">
<newseq type="standard">KEYCODE_ESC OR KEYCODE_2 KEYCODE_4</newseq>
</port>
+ <port type="UI_CLEAR">
+ <newseq type="standard">KEYCODE_DEL OR KEYCODE_SPACE OR JOYCODE_1_BUTTON3</newseq>
+ </port>
+ <port type="UI_HELP">
+ <newseq type="standard">KEYCODE_F1 OR KEYCODE_LSHIFT OR JOYCODE_1_BUTTON4</newseq>
+ </port>
<port type="START1">
<newseq type="standard">KEYCODE_1</newseq>