From e1ec9dd8457e22b7c1d96f95879c043248443787 Mon Sep 17 00:00:00 2001 From: Sergii Pylypenko Date: Tue, 10 Jan 2017 22:20:10 +0200 Subject: [PATCH] SDL: more fixes to text input --- project/jni/application/ninslash/src | 2 +- project/jni/sdl-1.2/src/video/android/SDL_androidvideo.c | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/project/jni/application/ninslash/src b/project/jni/application/ninslash/src index 02170840f..c38940c50 160000 --- a/project/jni/application/ninslash/src +++ b/project/jni/application/ninslash/src @@ -1 +1 @@ -Subproject commit 02170840f63db3ecc1add0f9fdf568dbc5f5c47c +Subproject commit c38940c500e3e284b8a1e291faa587c151ef670b diff --git a/project/jni/sdl-1.2/src/video/android/SDL_androidvideo.c b/project/jni/sdl-1.2/src/video/android/SDL_androidvideo.c index 2bb8875a3..5075ca3aa 100644 --- a/project/jni/sdl-1.2/src/video/android/SDL_androidvideo.c +++ b/project/jni/sdl-1.2/src/video/android/SDL_androidvideo.c @@ -266,14 +266,22 @@ extern int SDL_Flip(SDL_Surface *screen); extern SDL_Surface *SDL_GetVideoSurface(void); #endif +JNIEXPORT void JNICALL +JAVA_EXPORT_NAME(DemoGLSurfaceView_nativeMotionEvent) ( JNIEnv* env, jobject thiz, jint x, jint y, jint action, jint pointerId, jint force, jint radius ); + void SDL_ANDROID_CallJavaShowScreenKeyboard(const char * oldText, char * outBuf, int outBufLen, int async) { + int i; JNIEnv *JavaEnv = GetJavaEnv(); // Clear mouse button state, to avoid repeated clicks on the text field in some apps SDL_ANDROID_MainThreadPushMouseButton( SDL_RELEASED, SDL_BUTTON_LEFT ); SDL_ANDROID_MainThreadPushMouseButton( SDL_RELEASED, SDL_BUTTON_RIGHT ); SDL_ANDROID_MainThreadPushMouseButton( SDL_RELEASED, SDL_BUTTON_MIDDLE ); + for (i = 0; i < MAX_MULTITOUCH_POINTERS; i++) + { + JAVA_EXPORT_NAME(DemoGLSurfaceView_nativeMotionEvent) ( NULL, NULL, 0, 0, MOUSE_UP, i, 0, 0 ); + } SDL_ANDROID_TextInputFinished = 0; SDL_ANDROID_IsScreenKeyboardShownFlag = 1;