};
const char *keyboard_table[ k_srbind_max ] = {
- [k_srbind_jump] = KEYBOARD_GLYPH( "A" ),
+ [k_srbind_jump] = "\xa1",
[k_srbind_push] = KEYBOARD_GLYPH( "W" ),
[k_srbind_trick0] = "\x99",
[k_srbind_trick1] = "\x9a",
return keyboard_table[ axis ];
}
-static const char *joystick_display_string( enum sr_joystick joystick )
+static const char *joystick_display_string( enum sr_joystick joystick,
+ u32 axis )
{
- const char *controller_table[ k_srjoystick_max ] = {
- [k_srjoystick_steer] = "\x88",
- [k_srjoystick_grab] = "\x8e",
- [k_srjoystick_look] = "\x8e"
+ const char *controller_table[ k_srjoystick_max ][3] = {
+ [k_srjoystick_steer] = {"\x88","\x89","\x8a"},
+ [k_srjoystick_grab] = {"\x8c","\x8d","\x8e"},
+ [k_srjoystick_look] = {"\x8c","\x8d","\x8e"}
};
- const char *keyboard_table[ k_srjoystick_max ] = {
- [k_srjoystick_steer] = KEYBOARD_GLYPH( "\x93" )KEYBOARD_GLYPH( "\x95" ),
- [k_srjoystick_grab] = "\xa4",
- [k_srjoystick_look] = "\xa4"
+ const char *keyboard_table[ k_srjoystick_max ][3] = {
+ [k_srjoystick_steer] = {KEYBOARD_GLYPH("A")KEYBOARD_GLYPH("D"), /*h*/
+ KEYBOARD_GLYPH("W")KEYBOARD_GLYPH("S"), /*v*/
+
+ KEYBOARD_GLYPH("A")KEYBOARD_GLYPH("D") /*hv*/
+ KEYBOARD_GLYPH("W")KEYBOARD_GLYPH("S"), },
+ [k_srjoystick_grab] = {"\xa4","\xa4","\xa4"},
+ [k_srjoystick_look] = {"\xa4","\xa4","\xa4"}
};
if( vg_input.display_input_method == k_input_method_controller )
- return controller_table[ joystick ];
- else
- return keyboard_table[ joystick ];
+ return controller_table[ joystick ][axis];
+ else return keyboard_table[ joystick ][axis];
}
static int buttons_filter_fixed(void)
setbtn( k_srbind_mdown, buttons[ SDL_CONTROLLER_BUTTON_DPAD_DOWN ] );
setbtn( k_srbind_mback, buttons[ SDL_CONTROLLER_BUTTON_B ] );
setbtn( k_srbind_maccept,buttons[ SDL_CONTROLLER_BUTTON_A ] );
- setbtn( k_srbind_mopen, buttons[ SDL_CONTROLLER_BUTTON_GUIDE ] );
+ setbtn( k_srbind_mopen, buttons[ SDL_CONTROLLER_BUTTON_START ] );
+ setbtn( k_srbind_mback, buttons[ SDL_CONTROLLER_BUTTON_START ] );
float *axis = controller->axises;
if( lh > sensitivity ) setbtn( k_srbind_mright, 1 );
if( lh < -sensitivity ) setbtn( k_srbind_mleft, 1 );
- if( lv > sensitivity ) setbtn( k_srbind_mup, 1 );
- if( lv < -sensitivity ) setbtn( k_srbind_mdown, 1 );
+ if( lv > sensitivity ) setbtn( k_srbind_mdown, 1 );
+ if( lv < -sensitivity ) setbtn( k_srbind_mup, 1 );
}
srinput.axis_states[ k_sraxis_grab ][0] =