Mercurial > repos > blastem
changeset 1597:75aa418d0227
Use better names for "Guide" button on PS and Xbox controllers, handle d-pad directions in get_button_label
| author | Michael Pavone <pavone@retrodev.com> |
|---|---|
| date | Wed, 25 Jul 2018 09:35:46 -0700 |
| parents | 437e80a700aa |
| children | 5e2af89c3467 |
| files | controller_info.c |
| diffstat | 1 files changed, 8 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/controller_info.c Sun Jul 22 17:48:46 2018 -0700 +++ b/controller_info.c Wed Jul 25 09:35:46 2018 -0700 @@ -58,16 +58,16 @@ "A", "B", "X", "Y", "Back", NULL, "Start", "Click", "Click", "White", "Black", "LT", "RT" }; char const *labels_360[] = { - "A", "B", "X", "Y", "Back", "Guide", "Start", "Click", "Click", "LB", "RB", "LT", "RT" + "A", "B", "X", "Y", "Back", "Xbox", "Start", "Click", "Click", "LB", "RB", "LT", "RT" }; static char const *labels_xbone[] = { - "A", "B", "X", "Y", "View", "Guide", "Menu", "Click", "Click", "LB", "RB", "LT", "RT" + "A", "B", "X", "Y", "View", "Xbox", "Menu", "Click", "Click", "LB", "RB", "LT", "RT" }; static char const *labels_ps3[] = { - "cross", "circle", "square", "triangle", "Select", "Guide", "Start", "L3", "R3", "L1", "R1", "L2", "R2" + "cross", "circle", "square", "triangle", "Select", "PS", "Start", "L3", "R3", "L1", "R1", "L2", "R2" }; static char const *labels_ps4[] = { - "cross", "circle", "square", "triangle", "Share", "Guide", "Options", "L3", "R3", "L1", "R1", "L2", "R2" + "cross", "circle", "square", "triangle", "Share", "PS", "Options", "L3", "R3", "L1", "R1", "L2", "R2" }; static char const *labels_nintendo[] = { "B", "A", "Y", "X", "-", "Home", "+", "Click", "Click", "L", "R", "ZL", "ZR" @@ -108,6 +108,10 @@ const char *get_button_label(controller_info *info, int button) { + if (button >= SDL_CONTROLLER_BUTTON_DPAD_UP) { + static char const * dirs[] = {"Up", "Down", "Left", "Right"}; + return dirs[button - SDL_CONTROLLER_BUTTON_DPAD_UP]; + } return label_source(info)[button]; }