Mercurial > repos > blastem

comparison controller_info.c @ 1597:75aa418d0227

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 1fc61c844ec5
comparison
equal deleted inserted replaced
1596:437e80a700aa 1597:75aa418d0227
56 56
57 char const *labels_xbox[] = { 57 char const *labels_xbox[] = {
58 "A", "B", "X", "Y", "Back", NULL, "Start", "Click", "Click", "White", "Black", "LT", "RT" 58 "A", "B", "X", "Y", "Back", NULL, "Start", "Click", "Click", "White", "Black", "LT", "RT"
59 }; 59 };
60 char const *labels_360[] = { 60 char const *labels_360[] = {
61 "A", "B", "X", "Y", "Back", "Guide", "Start", "Click", "Click", "LB", "RB", "LT", "RT" 61 "A", "B", "X", "Y", "Back", "Xbox", "Start", "Click", "Click", "LB", "RB", "LT", "RT"
62 }; 62 };
63 static char const *labels_xbone[] = { 63 static char const *labels_xbone[] = {
64 "A", "B", "X", "Y", "View", "Guide", "Menu", "Click", "Click", "LB", "RB", "LT", "RT" 64 "A", "B", "X", "Y", "View", "Xbox", "Menu", "Click", "Click", "LB", "RB", "LT", "RT"
65 }; 65 };
66 static char const *labels_ps3[] = { 66 static char const *labels_ps3[] = {
67 "cross", "circle", "square", "triangle", "Select", "Guide", "Start", "L3", "R3", "L1", "R1", "L2", "R2" 67 "cross", "circle", "square", "triangle", "Select", "PS", "Start", "L3", "R3", "L1", "R1", "L2", "R2"
68 }; 68 };
69 static char const *labels_ps4[] = { 69 static char const *labels_ps4[] = {
70 "cross", "circle", "square", "triangle", "Share", "Guide", "Options", "L3", "R3", "L1", "R1", "L2", "R2" 70 "cross", "circle", "square", "triangle", "Share", "PS", "Options", "L3", "R3", "L1", "R1", "L2", "R2"
71 }; 71 };
72 static char const *labels_nintendo[] = { 72 static char const *labels_nintendo[] = {
73 "B", "A", "Y", "X", "-", "Home", "+", "Click", "Click", "L", "R", "ZL", "ZR" 73 "B", "A", "Y", "X", "-", "Home", "+", "Click", "Click", "L", "R", "ZL", "ZR"
74 }; 74 };
75 static char const *labels_genesis[] = { 75 static char const *labels_genesis[] = {
106 } 106 }
107 } 107 }
108 108
109 const char *get_button_label(controller_info *info, int button) 109 const char *get_button_label(controller_info *info, int button)
110 { 110 {
111 if (button >= SDL_CONTROLLER_BUTTON_DPAD_UP) {
112 static char const * dirs[] = {"Up", "Down", "Left", "Right"};
113 return dirs[button - SDL_CONTROLLER_BUTTON_DPAD_UP];
114 }
111 return label_source(info)[button]; 115 return label_source(info)[button];
112 } 116 }
113 117
114 static char const *axis_labels[] = { 118 static char const *axis_labels[] = {
115 "Left X", "Left Y", "Right X", "Right Y" 119 "Left X", "Left Y", "Right X", "Right Y"