miguel.horta/commandergenius
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SDL: added keycodes for gamepad analog sticks to SDL_ANDROID_SetIndividualGamepadKeymap(), while API is still fresh

Browse Source
This commit is contained in:
Sergii Pylypenko
2017-11-16 21:36:15 +02:00
parent e618b3a2d0
commit df9ffa1c2b
10 changed files with 340 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

100
project/jni/sdl-1.2/src/video/android/SDL_androidinput.h
View File

@@ -260,6 +260,30 @@ extern int SDL_ANDROID_isTouchscreenKeyboardUsed;
#ifndef SDL_ANDROID_GAMEPAD_0_KEYCODE_15
#define SDL_ANDROID_GAMEPAD_0_KEYCODE_15 RIGHT
#endif
#ifndef SDL_ANDROID_GAMEPAD_0_KEYCODE_16
#define SDL_ANDROID_GAMEPAD_0_KEYCODE_16 UP
#endif
#ifndef SDL_ANDROID_GAMEPAD_0_KEYCODE_17
#define SDL_ANDROID_GAMEPAD_0_KEYCODE_17 DOWN
#endif
#ifndef SDL_ANDROID_GAMEPAD_0_KEYCODE_18
#define SDL_ANDROID_GAMEPAD_0_KEYCODE_18 LEFT
#endif
#ifndef SDL_ANDROID_GAMEPAD_0_KEYCODE_19
#define SDL_ANDROID_GAMEPAD_0_KEYCODE_19 RIGHT
#endif
#ifndef SDL_ANDROID_GAMEPAD_0_KEYCODE_20
#define SDL_ANDROID_GAMEPAD_0_KEYCODE_20 UNKNOWN
#endif
#ifndef SDL_ANDROID_GAMEPAD_0_KEYCODE_21
#define SDL_ANDROID_GAMEPAD_0_KEYCODE_21 UNKNOWN
#endif
#ifndef SDL_ANDROID_GAMEPAD_0_KEYCODE_22
#define SDL_ANDROID_GAMEPAD_0_KEYCODE_22 UNKNOWN
#endif
#ifndef SDL_ANDROID_GAMEPAD_0_KEYCODE_23
#define SDL_ANDROID_GAMEPAD_0_KEYCODE_23 UNKNOWN
#endif
#ifndef SDL_ANDROID_GAMEPAD_1_KEYCODE_0
#define SDL_ANDROID_GAMEPAD_1_KEYCODE_0 SDL_ANDROID_GAMEPAD_0_KEYCODE_0
@@ -309,6 +333,30 @@ extern int SDL_ANDROID_isTouchscreenKeyboardUsed;
#ifndef SDL_ANDROID_GAMEPAD_1_KEYCODE_15
#define SDL_ANDROID_GAMEPAD_1_KEYCODE_15 SDL_ANDROID_GAMEPAD_0_KEYCODE_15
#endif
#ifndef SDL_ANDROID_GAMEPAD_1_KEYCODE_16
#define SDL_ANDROID_GAMEPAD_1_KEYCODE_16 SDL_ANDROID_GAMEPAD_0_KEYCODE_16
#endif
#ifndef SDL_ANDROID_GAMEPAD_1_KEYCODE_17
#define SDL_ANDROID_GAMEPAD_1_KEYCODE_17 SDL_ANDROID_GAMEPAD_0_KEYCODE_17
#endif
#ifndef SDL_ANDROID_GAMEPAD_1_KEYCODE_18
#define SDL_ANDROID_GAMEPAD_1_KEYCODE_18 SDL_ANDROID_GAMEPAD_0_KEYCODE_18
#endif
#ifndef SDL_ANDROID_GAMEPAD_1_KEYCODE_19
#define SDL_ANDROID_GAMEPAD_1_KEYCODE_19 SDL_ANDROID_GAMEPAD_0_KEYCODE_19
#endif
#ifndef SDL_ANDROID_GAMEPAD_1_KEYCODE_20
#define SDL_ANDROID_GAMEPAD_1_KEYCODE_20 SDL_ANDROID_GAMEPAD_0_KEYCODE_20
#endif
#ifndef SDL_ANDROID_GAMEPAD_1_KEYCODE_21
#define SDL_ANDROID_GAMEPAD_1_KEYCODE_21 SDL_ANDROID_GAMEPAD_0_KEYCODE_21
#endif
#ifndef SDL_ANDROID_GAMEPAD_1_KEYCODE_22
#define SDL_ANDROID_GAMEPAD_1_KEYCODE_22 SDL_ANDROID_GAMEPAD_0_KEYCODE_22
#endif
#ifndef SDL_ANDROID_GAMEPAD_1_KEYCODE_23
#define SDL_ANDROID_GAMEPAD_1_KEYCODE_23 SDL_ANDROID_GAMEPAD_0_KEYCODE_23
#endif
#ifndef SDL_ANDROID_GAMEPAD_2_KEYCODE_0
#define SDL_ANDROID_GAMEPAD_2_KEYCODE_0 SDL_ANDROID_GAMEPAD_0_KEYCODE_0
@@ -358,6 +406,30 @@ extern int SDL_ANDROID_isTouchscreenKeyboardUsed;
#ifndef SDL_ANDROID_GAMEPAD_2_KEYCODE_15
#define SDL_ANDROID_GAMEPAD_2_KEYCODE_15 SDL_ANDROID_GAMEPAD_0_KEYCODE_15
#endif
#ifndef SDL_ANDROID_GAMEPAD_2_KEYCODE_16
#define SDL_ANDROID_GAMEPAD_2_KEYCODE_16 SDL_ANDROID_GAMEPAD_0_KEYCODE_16
#endif
#ifndef SDL_ANDROID_GAMEPAD_2_KEYCODE_17
#define SDL_ANDROID_GAMEPAD_2_KEYCODE_17 SDL_ANDROID_GAMEPAD_0_KEYCODE_17
#endif
#ifndef SDL_ANDROID_GAMEPAD_2_KEYCODE_18
#define SDL_ANDROID_GAMEPAD_2_KEYCODE_18 SDL_ANDROID_GAMEPAD_0_KEYCODE_18
#endif
#ifndef SDL_ANDROID_GAMEPAD_2_KEYCODE_19
#define SDL_ANDROID_GAMEPAD_2_KEYCODE_19 SDL_ANDROID_GAMEPAD_0_KEYCODE_19
#endif
#ifndef SDL_ANDROID_GAMEPAD_2_KEYCODE_20
#define SDL_ANDROID_GAMEPAD_2_KEYCODE_20 SDL_ANDROID_GAMEPAD_0_KEYCODE_20
#endif
#ifndef SDL_ANDROID_GAMEPAD_2_KEYCODE_21
#define SDL_ANDROID_GAMEPAD_2_KEYCODE_21 SDL_ANDROID_GAMEPAD_0_KEYCODE_21
#endif
#ifndef SDL_ANDROID_GAMEPAD_2_KEYCODE_22
#define SDL_ANDROID_GAMEPAD_2_KEYCODE_22 SDL_ANDROID_GAMEPAD_0_KEYCODE_22
#endif
#ifndef SDL_ANDROID_GAMEPAD_2_KEYCODE_23
#define SDL_ANDROID_GAMEPAD_2_KEYCODE_23 SDL_ANDROID_GAMEPAD_0_KEYCODE_23
#endif
#ifndef SDL_ANDROID_GAMEPAD_3_KEYCODE_0
#define SDL_ANDROID_GAMEPAD_3_KEYCODE_0 SDL_ANDROID_GAMEPAD_0_KEYCODE_0
@@ -407,6 +479,30 @@ extern int SDL_ANDROID_isTouchscreenKeyboardUsed;
#ifndef SDL_ANDROID_GAMEPAD_3_KEYCODE_15
#define SDL_ANDROID_GAMEPAD_3_KEYCODE_15 SDL_ANDROID_GAMEPAD_0_KEYCODE_15
#endif
#ifndef SDL_ANDROID_GAMEPAD_3_KEYCODE_16
#define SDL_ANDROID_GAMEPAD_3_KEYCODE_16 SDL_ANDROID_GAMEPAD_0_KEYCODE_16
#endif
#ifndef SDL_ANDROID_GAMEPAD_3_KEYCODE_17
#define SDL_ANDROID_GAMEPAD_3_KEYCODE_17 SDL_ANDROID_GAMEPAD_0_KEYCODE_17
#endif
#ifndef SDL_ANDROID_GAMEPAD_3_KEYCODE_18
#define SDL_ANDROID_GAMEPAD_3_KEYCODE_18 SDL_ANDROID_GAMEPAD_0_KEYCODE_18
#endif
#ifndef SDL_ANDROID_GAMEPAD_3_KEYCODE_19
#define SDL_ANDROID_GAMEPAD_3_KEYCODE_19 SDL_ANDROID_GAMEPAD_0_KEYCODE_19
#endif
#ifndef SDL_ANDROID_GAMEPAD_3_KEYCODE_20
#define SDL_ANDROID_GAMEPAD_3_KEYCODE_20 SDL_ANDROID_GAMEPAD_0_KEYCODE_20
#endif
#ifndef SDL_ANDROID_GAMEPAD_3_KEYCODE_21
#define SDL_ANDROID_GAMEPAD_3_KEYCODE_21 SDL_ANDROID_GAMEPAD_0_KEYCODE_21
#endif
#ifndef SDL_ANDROID_GAMEPAD_3_KEYCODE_22
#define SDL_ANDROID_GAMEPAD_3_KEYCODE_22 SDL_ANDROID_GAMEPAD_0_KEYCODE_22
#endif
#ifndef SDL_ANDROID_GAMEPAD_3_KEYCODE_23
#define SDL_ANDROID_GAMEPAD_3_KEYCODE_23 SDL_ANDROID_GAMEPAD_0_KEYCODE_23
#endif
// Queue events to main thread
@@ -422,6 +518,10 @@ extern void SDL_ANDROID_MainThreadPushText( int ascii, int unicode );
extern void SDL_android_init_keymap(SDLKey *SDL_android_keymap);
extern void SDL_ANDROID_MainThreadPushMouseWheel( int x, int y ); // SDL 1.3 only
extern void SDL_ANDROID_MainThreadPushAppActive(int active);
extern void SDL_ANDROID_UpdateScreenUnderFingerRect(int x, int y);
extern void SDL_ANDROID_DeferredTextInput(void);
// Internal input queue stuff
extern SDLKey SDL_android_keymap[KEYCODE_LAST+1];