diff --git a/project/jni/sdl-1.2/src/video/android/SDL_androidinput.c b/project/jni/sdl-1.2/src/video/android/SDL_androidinput.c index 768787988..cbf481cab 100644 --- a/project/jni/sdl-1.2/src/video/android/SDL_androidinput.c +++ b/project/jni/sdl-1.2/src/video/android/SDL_androidinput.c @@ -132,8 +132,8 @@ static int multitouchGestureMiddleX = -1; static int multitouchGestureMiddleY = -1; static int multitouchGestureHappened = 0; enum { MULTITOUCH_MOUSE_WHEEL_DIST = 20 }; -int SDL_ANDROID_TouchscreenCalibrationWidth = 480; -int SDL_ANDROID_TouchscreenCalibrationHeight = 320; +int SDL_ANDROID_TouchscreenCalibrationWidth = 0; +int SDL_ANDROID_TouchscreenCalibrationHeight = 0; int SDL_ANDROID_TouchscreenCalibrationX = 0; int SDL_ANDROID_TouchscreenCalibrationY = 0; static int leftClickTimeout = 0; @@ -309,14 +309,19 @@ static void AdjustTouchScreenCalibration( jint *xx, jint *yy ) { int x = *xx, y = *yy; - x -= SDL_ANDROID_TouchscreenCalibrationX; - y -= SDL_ANDROID_TouchscreenCalibrationY; + if( SDL_ANDROID_TouchscreenCalibrationWidth > 0 ) + { + x -= SDL_ANDROID_TouchscreenCalibrationX; + y -= SDL_ANDROID_TouchscreenCalibrationY; + x = x * SDL_ANDROID_sRealWindowWidth / SDL_ANDROID_TouchscreenCalibrationWidth; + y = y * SDL_ANDROID_sRealWindowHeight / SDL_ANDROID_TouchscreenCalibrationHeight; + } + #if SDL_VIDEO_RENDER_RESIZE // Translate mouse coordinates - x -= (SDL_ANDROID_sRealWindowWidth - SDL_ANDROID_sWindowWidth) / 2; - x = x * SDL_ANDROID_sFakeWindowWidth / SDL_ANDROID_TouchscreenCalibrationWidth; - y = y * SDL_ANDROID_sFakeWindowHeight / SDL_ANDROID_TouchscreenCalibrationHeight; + x = x * SDL_ANDROID_sFakeWindowWidth / SDL_ANDROID_sWindowWidth; + y = y * SDL_ANDROID_sFakeWindowHeight / SDL_ANDROID_sWindowHeight; if( x < 0 ) x = 0; if( x > SDL_ANDROID_sFakeWindowWidth ) @@ -325,10 +330,6 @@ static void AdjustTouchScreenCalibration( jint *xx, jint *yy ) y = 0; if( y > SDL_ANDROID_sFakeWindowHeight ) y = SDL_ANDROID_sFakeWindowHeight; - -#else - x = x * SDL_ANDROID_sRealWindowWidth / SDL_ANDROID_TouchscreenCalibrationWidth; - y = y * SDL_ANDROID_sRealWindowHeight / SDL_ANDROID_TouchscreenCalibrationHeight; #endif *xx = x; diff --git a/project/jni/sdl-1.2/src/video/android/SDL_androidvideo-1.2.c b/project/jni/sdl-1.2/src/video/android/SDL_androidvideo-1.2.c index 02bff7e2e..b210bcc41 100644 --- a/project/jni/sdl-1.2/src/video/android/SDL_androidvideo-1.2.c +++ b/project/jni/sdl-1.2/src/video/android/SDL_androidvideo-1.2.c @@ -447,7 +447,6 @@ SDL_Surface *ANDROID_SetVideoMode(_THIS, SDL_Surface *current, // and expects those 256 pixels to stretch 2x height like on a TV interlaced display. SDL_ANDROID_sWindowWidth = SDL_ANDROID_sWindowHeight * 4 / 3; - //SDL_ANDROID_TouchscreenCalibrationWidth = SDL_ANDROID_sWindowWidth; SDL_ANDROID_ForceClearScreenRectAmount = 2; } 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 56dd776fa..7ce3e2fc8 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 @@ -202,9 +202,6 @@ JAVA_EXPORT_NAME(DemoRenderer_nativeResize) ( JNIEnv* env, jobject thiz, jint if( SDL_ANDROID_ScreenKeep43Ratio ) SDL_ANDROID_sWindowWidth = (SDL_ANDROID_sFakeWindowWidth * SDL_ANDROID_sRealWindowHeight) / SDL_ANDROID_sFakeWindowHeight; - SDL_ANDROID_TouchscreenCalibrationWidth = SDL_ANDROID_sWindowWidth; - SDL_ANDROID_TouchscreenCalibrationHeight = SDL_ANDROID_sWindowHeight; - __android_log_print(ANDROID_LOG_INFO, "libSDL", "Physical screen resolution is %dx%d 43Ratio %d", w, h, keepRatio); } @@ -577,7 +574,7 @@ int SDLCALL SDL_ANDROID_CloudSave(const char *filename, const char *saveId, cons const char *description, const char *screenshotFile, uint64_t playedTimeMs) { JNIEnv *JavaEnv = GetJavaEnv(); - __android_log_print(ANDROID_LOG_INFO, "libSDL", "SDL_ANDROID_CloudSave: played time %llu", playedTimeMs); + //__android_log_print(ANDROID_LOG_INFO, "libSDL", "SDL_ANDROID_CloudSave: played time %llu", playedTimeMs); if( !filename ) return 0; if( !saveId )