diff options
| author | Michael Pavone <pavone@retrodev.com> | 2018-07-25 09:35:46 -0700 |
|---|---|---|
| committer | Michael Pavone <pavone@retrodev.com> | 2018-07-25 09:35:46 -0700 |
| commit | b99e8ecc6db74221d4e1c9d26e119f5f63b275ae (patch) | |
| tree | 00da49ff8bf31af9eedad2855b9eb8d7245985e2 /controller_info.c | |
| parent | 47d77ef9201c0ebe2c443a98d53b563657d9f7ed (diff) | |
Use better names for "Guide" button on PS and Xbox controllers, handle d-pad directions in get_button_label
Diffstat (limited to 'controller_info.c')
| -rw-r--r-- | controller_info.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/controller_info.c b/controller_info.c index 1001c97..a96713b 100644 --- a/controller_info.c +++ b/controller_info.c @@ -58,16 +58,16 @@ char const *labels_xbox[] = { "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 @@ static const char** label_source(controller_info *info) 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]; } |