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

SDL: fixed on-screen key layout and keycode remap dialogs, moved screen gestures to a separate variable

Browse Source
This commit is contained in:
Sergii Pylypenko
2021-05-31 02:36:56 +03:00
parent 05615e643d
commit 50df6e53d0
6 changed files with 97 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
project/jni/sdl-1.2/src/video/android/SDL_androidinput.c
View File

@@ -118,10 +118,10 @@ static int touchPointers[MAX_MULTITOUCH_POINTERS] = {0};
static int firstMousePointerId = -1, secondMousePointerId = -1;
enum { MAX_MULTITOUCH_GESTURES = 4 };
static int multitouchGestureKeycode[MAX_MULTITOUCH_GESTURES] = {
SDL_KEY(SDL_KEY_VAL(SDL_ANDROID_SCREENKB_KEYCODE_6)),
SDL_KEY(SDL_KEY_VAL(SDL_ANDROID_SCREENKB_KEYCODE_7)),
SDL_KEY(SDL_KEY_VAL(SDL_ANDROID_SCREENKB_KEYCODE_8)),
SDL_KEY(SDL_KEY_VAL(SDL_ANDROID_SCREENKB_KEYCODE_9))
SDL_KEY(SDL_KEY_VAL(SDL_ANDROID_SCREEN_GESTURE_KEYCODE_0)),
SDL_KEY(SDL_KEY_VAL(SDL_ANDROID_SCREEN_GESTURE_KEYCODE_1)),
SDL_KEY(SDL_KEY_VAL(SDL_ANDROID_SCREEN_GESTURE_KEYCODE_2)),
SDL_KEY(SDL_KEY_VAL(SDL_ANDROID_SCREEN_GESTURE_KEYCODE_3))
};
static int multitouchGestureSensitivity = 0;
static int multitouchGestureDist = -1;

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

@@ -216,17 +216,18 @@ extern int SDL_ANDROID_isTouchscreenKeyboardUsed;
#ifndef SDL_ANDROID_SCREENKB_KEYCODE_11
#define SDL_ANDROID_SCREENKB_KEYCODE_11 UNKNOWN
#endif
#ifndef SDL_ANDROID_SCREENKB_KEYCODE_12
#define SDL_ANDROID_SCREENKB_KEYCODE_12 UNKNOWN
#ifndef SDL_ANDROID_SCREEN_GESTURE_KEYCODE_0
#define SDL_ANDROID_SCREEN_GESTURE_KEYCODE_0 UNKNOWN
#endif
#ifndef SDL_ANDROID_SCREENKB_KEYCODE_13
#define SDL_ANDROID_SCREENKB_KEYCODE_13 UNKNOWN
#ifndef SDL_ANDROID_SCREEN_GESTURE_KEYCODE_1
#define SDL_ANDROID_SCREEN_GESTURE_KEYCODE_1 UNKNOWN
#endif
#ifndef SDL_ANDROID_SCREENKB_KEYCODE_14
#define SDL_ANDROID_SCREENKB_KEYCODE_14 UNKNOWN
#ifndef SDL_ANDROID_SCREEN_GESTURE_KEYCODE_2
#define SDL_ANDROID_SCREEN_GESTURE_KEYCODE_2 UNKNOWN
#endif
#ifndef SDL_ANDROID_SCREENKB_KEYCODE_15
#define SDL_ANDROID_SCREENKB_KEYCODE_15 UNKNOWN
#ifndef SDL_ANDROID_SCREEN_GESTURE_KEYCODE_3
#define SDL_ANDROID_SCREEN_GESTURE_KEYCODE_3 UNKNOWN
#endif
// Gamepad keys

15
project/jni/sdl-1.2/src/video/android/SDL_touchscreenkeyboard.c
View File

@@ -81,12 +81,12 @@ SDLK_UNKNOWN, // Text input
SDLK_UNKNOWN, // Joystick 0
SDLK_UNKNOWN, // Joystick 1
SDLK_UNKNOWN, // Joystick 2
SDL_KEY(SDL_KEY_VAL(SDL_ANDROID_SCREENKB_KEYCODE_6)),
SDL_KEY(SDL_KEY_VAL(SDL_ANDROID_SCREENKB_KEYCODE_7)),
SDL_KEY(SDL_KEY_VAL(SDL_ANDROID_SCREENKB_KEYCODE_8)),
SDL_KEY(SDL_KEY_VAL(SDL_ANDROID_SCREENKB_KEYCODE_9)),
SDL_KEY(SDL_KEY_VAL(SDL_ANDROID_SCREENKB_KEYCODE_10)),
SDL_KEY(SDL_KEY_VAL(SDL_ANDROID_SCREENKB_KEYCODE_11)),
SDL_KEY(SDL_KEY_VAL(SDL_ANDROID_SCREENKB_KEYCODE_12)),
SDL_KEY(SDL_KEY_VAL(SDL_ANDROID_SCREENKB_KEYCODE_13)),
SDL_KEY(SDL_KEY_VAL(SDL_ANDROID_SCREENKB_KEYCODE_14)),
SDL_KEY(SDL_KEY_VAL(SDL_ANDROID_SCREENKB_KEYCODE_15)),
};
enum { ARROW_LEFT = 1, ARROW_RIGHT = 2, ARROW_UP = 4, ARROW_DOWN = 8 };
@@ -886,12 +886,17 @@ JAVA_EXPORT_NAME(Settings_nativeSetupScreenKeyboard) ( JNIEnv* env, jobject thiz
for(ii = 0; ii < 2; ii++)
{
// Custom button ordering
int iii = ii + i*2;
int iii = ii + i * 2;
buttons[iii].w = buttonSizePixels;
buttons[iii].h = buttons[iii].w;
// Move to the screen edge
buttons[iii].x = SDL_ANDROID_sRealWindowWidth - buttons[iii].w * (ii + 1);
buttons[iii].y = SDL_ANDROID_sRealWindowHeight - buttons[iii].h * (i + 1);
// Second set of buttons to the left
buttons[iii + SDL_ANDROID_SCREENKEYBOARD_BUTTON_6].x = buttons[iii].x - buttonSizePixels * 2;
buttons[iii + SDL_ANDROID_SCREENKEYBOARD_BUTTON_6].y = buttons[iii].y;
buttons[iii + SDL_ANDROID_SCREENKEYBOARD_BUTTON_6].w = buttons[iii].w;
buttons[iii + SDL_ANDROID_SCREENKEYBOARD_BUTTON_6].h = buttons[iii].h;
}
if( SDL_ANDROID_joysticksAmount >= 2 )
{