Fixed crash if initialization of EGL failed but was tried again later.

The internal function SDL_EGL_LoadLibrary() did not delete and remove a mostly
uninitialized data structure if loading the library first failed. A later try to
use EGL then skipped initialization and assumed it was previously successful
because the data structure now already existed. This led to at least one crash
in the internal function SDL_EGL_ChooseConfig() because a NULL pointer was
dereferenced to make a call to eglBindAPI().

src/video/android/SDL_androidclipboard.c

@@ -0,0 +1,48 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2015 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#if SDL_VIDEO_DRIVER_ANDROID
+
+#include "SDL_androidvideo.h"
+
+#include "../../core/android/SDL_android.h"
+
+int
+Android_SetClipboardText(_THIS, const char *text)
+{
+    return Android_JNI_SetClipboardText(text);
+}
+
+char *
+Android_GetClipboardText(_THIS)
+{
+    return Android_JNI_GetClipboardText();
+}
+
+SDL_bool Android_HasClipboardText(_THIS)
+{
+    return Android_JNI_HasClipboardText();
+}
+
+#endif /* SDL_VIDEO_DRIVER_ANDROID */
+
+/* vi: set ts=4 sw=4 expandtab: */

src/video/android/SDL_androidclipboard.h

@@ -0,0 +1,32 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2015 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#ifndef _SDL_androidclipboard_h
+#define _SDL_androidclipboard_h
+
+extern int Android_SetClipboardText(_THIS, const char *text);
+extern char *Android_GetClipboardText(_THIS);
+extern SDL_bool Android_HasClipboardText(_THIS);
+
+#endif /* _SDL_androidclipboard_h */
+
+/* vi: set ts=4 sw=4 expandtab: */

src/video/android/SDL_androidevents.c

@@ -0,0 +1,125 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2015 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#if SDL_VIDEO_DRIVER_ANDROID
+
+/* We're going to do this by default */
+#define SDL_ANDROID_BLOCK_ON_PAUSE  1
+
+#include "SDL_androidevents.h"
+#include "SDL_events.h"
+#include "SDL_androidwindow.h"
+
+
+void android_egl_context_backup();
+void android_egl_context_restore();
+
+#if SDL_AUDIO_DRIVER_ANDROID
+void AndroidAUD_ResumeDevices(void);
+void AndroidAUD_PauseDevices(void);
+#else
+static void AndroidAUD_ResumeDevices(void) {}
+static void AndroidAUD_PauseDevices(void) {}
+#endif
+
+void 
+android_egl_context_restore() 
+{
+    SDL_Event event;
+    SDL_WindowData *data = (SDL_WindowData *) Android_Window->driverdata;
+    if (SDL_GL_MakeCurrent(Android_Window, (SDL_GLContext) data->egl_context) < 0) {
+        /* The context is no longer valid, create a new one */
+        data->egl_context = (EGLContext) SDL_GL_CreateContext(Android_Window);
+        SDL_GL_MakeCurrent(Android_Window, (SDL_GLContext) data->egl_context);
+        event.type = SDL_RENDER_DEVICE_RESET;
+        SDL_PushEvent(&event);
+    }
+}
+
+void 
+android_egl_context_backup() 
+{
+    /* Keep a copy of the EGL Context so we can try to restore it when we resume */
+    SDL_WindowData *data = (SDL_WindowData *) Android_Window->driverdata;
+    data->egl_context = SDL_GL_GetCurrentContext();
+    /* We need to do this so the EGLSurface can be freed */
+    SDL_GL_MakeCurrent(Android_Window, NULL);
+}
+
+void
+Android_PumpEvents(_THIS)
+{
+    static int isPaused = 0;
+#if SDL_ANDROID_BLOCK_ON_PAUSE
+    static int isPausing = 0;
+#endif
+    /* No polling necessary */
+
+    /*
+     * Android_ResumeSem and Android_PauseSem are signaled from Java_org_libsdl_app_SDLActivity_nativePause and Java_org_libsdl_app_SDLActivity_nativeResume
+     * When the pause semaphore is signaled, if SDL_ANDROID_BLOCK_ON_PAUSE is defined the event loop will block until the resume signal is emitted.
+     */
+
+#if SDL_ANDROID_BLOCK_ON_PAUSE
+    if (isPaused && !isPausing) {
+        /* Make sure this is the last thing we do before pausing */
+        android_egl_context_backup();
+        AndroidAUD_PauseDevices();
+        if(SDL_SemWait(Android_ResumeSem) == 0) {
+#else
+    if (isPaused) {
+        if(SDL_SemTryWait(Android_ResumeSem) == 0) {
+#endif
+            isPaused = 0;
+            AndroidAUD_ResumeDevices();
+            /* Restore the GL Context from here, as this operation is thread dependent */
+            if (!SDL_HasEvent(SDL_QUIT)) {
+                android_egl_context_restore();
+            }
+        }
+    }
+    else {
+#if SDL_ANDROID_BLOCK_ON_PAUSE
+        if( isPausing || SDL_SemTryWait(Android_PauseSem) == 0 ) {
+            /* We've been signaled to pause, but before we block ourselves, 
+            we need to make sure that certain key events have reached the app */
+            if (SDL_HasEvent(SDL_WINDOWEVENT) || SDL_HasEvent(SDL_APP_WILLENTERBACKGROUND) || SDL_HasEvent(SDL_APP_DIDENTERBACKGROUND) ) {
+                isPausing = 1;
+            }
+            else {
+                isPausing = 0;
+                isPaused = 1;
+            }
+        }
+#else
+        if(SDL_SemTryWait(Android_PauseSem) == 0) {
+            android_egl_context_backup();
+            AndroidAUD_PauseDevices();
+            isPaused = 1;
+        }
+#endif
+    }
+}
+
+#endif /* SDL_VIDEO_DRIVER_ANDROID */
+
+/* vi: set ts=4 sw=4 expandtab: */

src/video/android/SDL_androidevents.h

@@ -0,0 +1,27 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2015 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#include "SDL_androidvideo.h"
+
+extern void Android_PumpEvents(_THIS);
+
+/* vi: set ts=4 sw=4 expandtab: */

src/video/android/SDL_androidgl.c

@@ -0,0 +1,61 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2015 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#if SDL_VIDEO_DRIVER_ANDROID
+
+/* Android SDL video driver implementation */
+
+#include "SDL_video.h"
+#include "../SDL_egl_c.h"
+#include "SDL_androidwindow.h"
+
+#include "SDL_androidvideo.h"
+#include "../../core/android/SDL_android.h"
+
+#include <android/log.h>
+
+#include <dlfcn.h>
+
+SDL_EGL_CreateContext_impl(Android)
+SDL_EGL_MakeCurrent_impl(Android)
+
+void
+Android_GLES_SwapWindow(_THIS, SDL_Window * window)
+{
+    /* The following two calls existed in the original Java code
+     * If you happen to have a device that's affected by their removal,
+     * please report to Bugzilla. -- Gabriel
+     */
+    
+    /*_this->egl_data->eglWaitNative(EGL_CORE_NATIVE_ENGINE);
+    _this->egl_data->eglWaitGL();*/
+    SDL_EGL_SwapBuffers(_this, ((SDL_WindowData *) window->driverdata)->egl_surface);
+}
+
+int
+Android_GLES_LoadLibrary(_THIS, const char *path) {
+    return SDL_EGL_LoadLibrary(_this, path, (NativeDisplayType) 0);
+}
+
+#endif /* SDL_VIDEO_DRIVER_ANDROID */
+
+/* vi: set ts=4 sw=4 expandtab: */

src/video/android/SDL_androidkeyboard.c

@@ -0,0 +1,371 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2015 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#if SDL_VIDEO_DRIVER_ANDROID
+
+#include <android/log.h>
+
+#include "../../events/SDL_events_c.h"
+
+#include "SDL_androidkeyboard.h"
+
+#include "../../core/android/SDL_android.h"
+
+void Android_InitKeyboard(void)
+{
+    SDL_Keycode keymap[SDL_NUM_SCANCODES];
+
+    /* Add default scancode to key mapping */
+    SDL_GetDefaultKeymap(keymap);
+    SDL_SetKeymap(0, keymap, SDL_NUM_SCANCODES);
+}
+
+static SDL_Scancode Android_Keycodes[] = {
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_UNKNOWN */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_SOFT_LEFT */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_SOFT_RIGHT */
+    SDL_SCANCODE_AC_HOME, /* AKEYCODE_HOME */
+    SDL_SCANCODE_AC_BACK, /* AKEYCODE_BACK */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_CALL */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_ENDCALL */
+    SDL_SCANCODE_0, /* AKEYCODE_0 */
+    SDL_SCANCODE_1, /* AKEYCODE_1 */
+    SDL_SCANCODE_2, /* AKEYCODE_2 */
+    SDL_SCANCODE_3, /* AKEYCODE_3 */
+    SDL_SCANCODE_4, /* AKEYCODE_4 */
+    SDL_SCANCODE_5, /* AKEYCODE_5 */
+    SDL_SCANCODE_6, /* AKEYCODE_6 */
+    SDL_SCANCODE_7, /* AKEYCODE_7 */
+    SDL_SCANCODE_8, /* AKEYCODE_8 */
+    SDL_SCANCODE_9, /* AKEYCODE_9 */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_STAR */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_POUND */
+    SDL_SCANCODE_UP, /* AKEYCODE_DPAD_UP */
+    SDL_SCANCODE_DOWN, /* AKEYCODE_DPAD_DOWN */
+    SDL_SCANCODE_LEFT, /* AKEYCODE_DPAD_LEFT */
+    SDL_SCANCODE_RIGHT, /* AKEYCODE_DPAD_RIGHT */
+    SDL_SCANCODE_SELECT, /* AKEYCODE_DPAD_CENTER */
+    SDL_SCANCODE_VOLUMEUP, /* AKEYCODE_VOLUME_UP */
+    SDL_SCANCODE_VOLUMEDOWN, /* AKEYCODE_VOLUME_DOWN */
+    SDL_SCANCODE_POWER, /* AKEYCODE_POWER */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_CAMERA */
+    SDL_SCANCODE_CLEAR, /* AKEYCODE_CLEAR */
+    SDL_SCANCODE_A, /* AKEYCODE_A */
+    SDL_SCANCODE_B, /* AKEYCODE_B */
+    SDL_SCANCODE_C, /* AKEYCODE_C */
+    SDL_SCANCODE_D, /* AKEYCODE_D */
+    SDL_SCANCODE_E, /* AKEYCODE_E */
+    SDL_SCANCODE_F, /* AKEYCODE_F */
+    SDL_SCANCODE_G, /* AKEYCODE_G */
+    SDL_SCANCODE_H, /* AKEYCODE_H */
+    SDL_SCANCODE_I, /* AKEYCODE_I */
+    SDL_SCANCODE_J, /* AKEYCODE_J */
+    SDL_SCANCODE_K, /* AKEYCODE_K */
+    SDL_SCANCODE_L, /* AKEYCODE_L */
+    SDL_SCANCODE_M, /* AKEYCODE_M */
+    SDL_SCANCODE_N, /* AKEYCODE_N */
+    SDL_SCANCODE_O, /* AKEYCODE_O */
+    SDL_SCANCODE_P, /* AKEYCODE_P */
+    SDL_SCANCODE_Q, /* AKEYCODE_Q */
+    SDL_SCANCODE_R, /* AKEYCODE_R */
+    SDL_SCANCODE_S, /* AKEYCODE_S */
+    SDL_SCANCODE_T, /* AKEYCODE_T */
+    SDL_SCANCODE_U, /* AKEYCODE_U */
+    SDL_SCANCODE_V, /* AKEYCODE_V */
+    SDL_SCANCODE_W, /* AKEYCODE_W */
+    SDL_SCANCODE_X, /* AKEYCODE_X */
+    SDL_SCANCODE_Y, /* AKEYCODE_Y */
+    SDL_SCANCODE_Z, /* AKEYCODE_Z */
+    SDL_SCANCODE_COMMA, /* AKEYCODE_COMMA */
+    SDL_SCANCODE_PERIOD, /* AKEYCODE_PERIOD */
+    SDL_SCANCODE_LALT, /* AKEYCODE_ALT_LEFT */
+    SDL_SCANCODE_RALT, /* AKEYCODE_ALT_RIGHT */
+    SDL_SCANCODE_LSHIFT, /* AKEYCODE_SHIFT_LEFT */
+    SDL_SCANCODE_RSHIFT, /* AKEYCODE_SHIFT_RIGHT */
+    SDL_SCANCODE_TAB, /* AKEYCODE_TAB */
+    SDL_SCANCODE_SPACE, /* AKEYCODE_SPACE */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_SYM */
+    SDL_SCANCODE_WWW, /* AKEYCODE_EXPLORER */
+    SDL_SCANCODE_MAIL, /* AKEYCODE_ENVELOPE */
+    SDL_SCANCODE_RETURN, /* AKEYCODE_ENTER */
+    SDL_SCANCODE_BACKSPACE, /* AKEYCODE_DEL */
+    SDL_SCANCODE_GRAVE, /* AKEYCODE_GRAVE */
+    SDL_SCANCODE_MINUS, /* AKEYCODE_MINUS */
+    SDL_SCANCODE_EQUALS, /* AKEYCODE_EQUALS */
+    SDL_SCANCODE_LEFTBRACKET, /* AKEYCODE_LEFT_BRACKET */
+    SDL_SCANCODE_RIGHTBRACKET, /* AKEYCODE_RIGHT_BRACKET */
+    SDL_SCANCODE_BACKSLASH, /* AKEYCODE_BACKSLASH */
+    SDL_SCANCODE_SEMICOLON, /* AKEYCODE_SEMICOLON */
+    SDL_SCANCODE_APOSTROPHE, /* AKEYCODE_APOSTROPHE */
+    SDL_SCANCODE_SLASH, /* AKEYCODE_SLASH */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_AT */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_NUM */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_HEADSETHOOK */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_FOCUS */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_PLUS */
+    SDL_SCANCODE_MENU, /* AKEYCODE_MENU */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_NOTIFICATION */
+    SDL_SCANCODE_AC_SEARCH, /* AKEYCODE_SEARCH */
+    SDL_SCANCODE_AUDIOPLAY, /* AKEYCODE_MEDIA_PLAY_PAUSE */
+    SDL_SCANCODE_AUDIOSTOP, /* AKEYCODE_MEDIA_STOP */
+    SDL_SCANCODE_AUDIONEXT, /* AKEYCODE_MEDIA_NEXT */
+    SDL_SCANCODE_AUDIOPREV, /* AKEYCODE_MEDIA_PREVIOUS */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_MEDIA_REWIND */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_MEDIA_FAST_FORWARD */
+    SDL_SCANCODE_MUTE, /* AKEYCODE_MUTE */
+    SDL_SCANCODE_PAGEUP, /* AKEYCODE_PAGE_UP */
+    SDL_SCANCODE_PAGEDOWN, /* AKEYCODE_PAGE_DOWN */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_PICTSYMBOLS */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_SWITCH_CHARSET */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_BUTTON_A */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_BUTTON_B */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_BUTTON_C */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_BUTTON_X */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_BUTTON_Y */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_BUTTON_Z */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_BUTTON_L1 */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_BUTTON_R1 */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_BUTTON_L2 */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_BUTTON_R2 */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_BUTTON_THUMBL */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_BUTTON_THUMBR */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_BUTTON_START */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_BUTTON_SELECT */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_BUTTON_MODE */
+    SDL_SCANCODE_ESCAPE, /* AKEYCODE_ESCAPE */
+    SDL_SCANCODE_DELETE, /* AKEYCODE_FORWARD_DEL */
+    SDL_SCANCODE_LCTRL, /* AKEYCODE_CTRL_LEFT */
+    SDL_SCANCODE_RCTRL, /* AKEYCODE_CTRL_RIGHT */
+    SDL_SCANCODE_CAPSLOCK, /* AKEYCODE_CAPS_LOCK */
+    SDL_SCANCODE_SCROLLLOCK, /* AKEYCODE_SCROLL_LOCK */
+    SDL_SCANCODE_LGUI, /* AKEYCODE_META_LEFT */
+    SDL_SCANCODE_RGUI, /* AKEYCODE_META_RIGHT */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_FUNCTION */
+    SDL_SCANCODE_PRINTSCREEN, /* AKEYCODE_SYSRQ */
+    SDL_SCANCODE_PAUSE, /* AKEYCODE_BREAK */
+    SDL_SCANCODE_HOME, /* AKEYCODE_MOVE_HOME */
+    SDL_SCANCODE_END, /* AKEYCODE_MOVE_END */
+    SDL_SCANCODE_INSERT, /* AKEYCODE_INSERT */
+    SDL_SCANCODE_AC_FORWARD, /* AKEYCODE_FORWARD */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_MEDIA_PLAY */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_MEDIA_PAUSE */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_MEDIA_CLOSE */
+    SDL_SCANCODE_EJECT, /* AKEYCODE_MEDIA_EJECT */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_MEDIA_RECORD */
+    SDL_SCANCODE_F1, /* AKEYCODE_F1 */
+    SDL_SCANCODE_F2, /* AKEYCODE_F2 */
+    SDL_SCANCODE_F3, /* AKEYCODE_F3 */
+    SDL_SCANCODE_F4, /* AKEYCODE_F4 */
+    SDL_SCANCODE_F5, /* AKEYCODE_F5 */
+    SDL_SCANCODE_F6, /* AKEYCODE_F6 */
+    SDL_SCANCODE_F7, /* AKEYCODE_F7 */
+    SDL_SCANCODE_F8, /* AKEYCODE_F8 */
+    SDL_SCANCODE_F9, /* AKEYCODE_F9 */
+    SDL_SCANCODE_F10, /* AKEYCODE_F10 */
+    SDL_SCANCODE_F11, /* AKEYCODE_F11 */
+    SDL_SCANCODE_F12, /* AKEYCODE_F12 */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_NUM_LOCK */
+    SDL_SCANCODE_KP_0, /* AKEYCODE_NUMPAD_0 */
+    SDL_SCANCODE_KP_1, /* AKEYCODE_NUMPAD_1 */
+    SDL_SCANCODE_KP_2, /* AKEYCODE_NUMPAD_2 */
+    SDL_SCANCODE_KP_3, /* AKEYCODE_NUMPAD_3 */
+    SDL_SCANCODE_KP_4, /* AKEYCODE_NUMPAD_4 */
+    SDL_SCANCODE_KP_5, /* AKEYCODE_NUMPAD_5 */
+    SDL_SCANCODE_KP_6, /* AKEYCODE_NUMPAD_6 */
+    SDL_SCANCODE_KP_7, /* AKEYCODE_NUMPAD_7 */
+    SDL_SCANCODE_KP_8, /* AKEYCODE_NUMPAD_8 */
+    SDL_SCANCODE_KP_9, /* AKEYCODE_NUMPAD_9 */
+    SDL_SCANCODE_KP_DIVIDE, /* AKEYCODE_NUMPAD_DIVIDE */
+    SDL_SCANCODE_KP_MULTIPLY, /* AKEYCODE_NUMPAD_MULTIPLY */
+    SDL_SCANCODE_KP_MINUS, /* AKEYCODE_NUMPAD_SUBTRACT */
+    SDL_SCANCODE_KP_PLUS, /* AKEYCODE_NUMPAD_ADD */
+    SDL_SCANCODE_KP_PERIOD, /* AKEYCODE_NUMPAD_DOT */
+    SDL_SCANCODE_KP_COMMA, /* AKEYCODE_NUMPAD_COMMA */
+    SDL_SCANCODE_KP_ENTER, /* AKEYCODE_NUMPAD_ENTER */
+    SDL_SCANCODE_KP_EQUALS, /* AKEYCODE_NUMPAD_EQUALS */
+    SDL_SCANCODE_KP_LEFTPAREN, /* AKEYCODE_NUMPAD_LEFT_PAREN */
+    SDL_SCANCODE_KP_RIGHTPAREN, /* AKEYCODE_NUMPAD_RIGHT_PAREN */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_VOLUME_MUTE */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_INFO */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_CHANNEL_UP */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_CHANNEL_DOWN */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_ZOOM_IN */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_ZOOM_OUT */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_TV */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_WINDOW */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_GUIDE */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_DVR */
+    SDL_SCANCODE_AC_BOOKMARKS, /* AKEYCODE_BOOKMARK */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_CAPTIONS */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_SETTINGS */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_TV_POWER */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_TV_INPUT */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_STB_POWER */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_STB_INPUT */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_AVR_POWER */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_AVR_INPUT */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_PROG_RED */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_PROG_GREEN */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_PROG_YELLOW */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_PROG_BLUE */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_APP_SWITCH */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_BUTTON_1 */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_BUTTON_2 */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_BUTTON_3 */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_BUTTON_4 */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_BUTTON_5 */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_BUTTON_6 */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_BUTTON_7 */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_BUTTON_8 */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_BUTTON_9 */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_BUTTON_10 */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_BUTTON_11 */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_BUTTON_12 */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_BUTTON_13 */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_BUTTON_14 */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_BUTTON_15 */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_BUTTON_16 */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_LANGUAGE_SWITCH */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_MANNER_MODE */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_3D_MODE */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_CONTACTS */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_CALENDAR */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_MUSIC */
+    SDL_SCANCODE_CALCULATOR, /* AKEYCODE_CALCULATOR */
+    SDL_SCANCODE_LANG5, /* AKEYCODE_ZENKAKU_HANKAKU */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_EISU */
+    SDL_SCANCODE_INTERNATIONAL5, /* AKEYCODE_MUHENKAN */
+    SDL_SCANCODE_INTERNATIONAL4, /* AKEYCODE_HENKAN */
+    SDL_SCANCODE_LANG3, /* AKEYCODE_KATAKANA_HIRAGANA */
+    SDL_SCANCODE_INTERNATIONAL3, /* AKEYCODE_YEN */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_RO */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_KANA */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_ASSIST */
+    SDL_SCANCODE_BRIGHTNESSDOWN, /* AKEYCODE_BRIGHTNESS_DOWN */
+    SDL_SCANCODE_BRIGHTNESSUP, /* AKEYCODE_BRIGHTNESS_UP */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_MEDIA_AUDIO_TRACK */
+    SDL_SCANCODE_SLEEP, /* AKEYCODE_SLEEP */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_WAKEUP */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_PAIRING */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_MEDIA_TOP_MENU */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_11 */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_12 */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_LAST_CHANNEL */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_TV_DATA_SERVICE */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_VOICE_ASSIST */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_TV_RADIO_SERVICE */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_TV_TELETEXT */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_TV_NUMBER_ENTRY */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_TV_TERRESTRIAL_ANALOG */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_TV_TERRESTRIAL_DIGITAL */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_TV_SATELLITE */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_TV_SATELLITE_BS */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_TV_SATELLITE_CS */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_TV_SATELLITE_SERVICE */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_TV_NETWORK */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_TV_ANTENNA_CABLE */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_TV_INPUT_HDMI_1 */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_TV_INPUT_HDMI_2 */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_TV_INPUT_HDMI_3 */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_TV_INPUT_HDMI_4 */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_TV_INPUT_COMPOSITE_1 */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_TV_INPUT_COMPOSITE_2 */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_TV_INPUT_COMPONENT_1 */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_TV_INPUT_COMPONENT_2 */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_TV_INPUT_VGA_1 */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_TV_AUDIO_DESCRIPTION */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_TV_AUDIO_DESCRIPTION_MIX_UP */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_TV_AUDIO_DESCRIPTION_MIX_DOWN */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_TV_ZOOM_MODE */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_TV_CONTENTS_MENU */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_TV_MEDIA_CONTEXT_MENU */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_TV_TIMER_PROGRAMMING */
+    SDL_SCANCODE_HELP, /* AKEYCODE_HELP */
+};
+
+static SDL_Scancode
+TranslateKeycode(int keycode)
+{
+    SDL_Scancode scancode = SDL_SCANCODE_UNKNOWN;
+
+    if (keycode < SDL_arraysize(Android_Keycodes)) {
+        scancode = Android_Keycodes[keycode];
+    }
+    if (scancode == SDL_SCANCODE_UNKNOWN) {
+        __android_log_print(ANDROID_LOG_INFO, "SDL", "Unknown keycode %d", keycode);
+    }
+    return scancode;
+}
+
+int
+Android_OnKeyDown(int keycode)
+{
+    return SDL_SendKeyboardKey(SDL_PRESSED, TranslateKeycode(keycode));
+}
+
+int
+Android_OnKeyUp(int keycode)
+{
+    return SDL_SendKeyboardKey(SDL_RELEASED, TranslateKeycode(keycode));
+}
+
+SDL_bool
+Android_HasScreenKeyboardSupport(_THIS)
+{
+    return SDL_TRUE;
+}
+
+SDL_bool
+Android_IsScreenKeyboardShown(_THIS, SDL_Window * window)
+{
+    return SDL_IsTextInputActive();
+}
+
+void
+Android_StartTextInput(_THIS)
+{
+    SDL_VideoData *videodata = (SDL_VideoData *)_this->driverdata;
+    Android_JNI_ShowTextInput(&videodata->textRect);
+}
+
+void
+Android_StopTextInput(_THIS)
+{
+    Android_JNI_HideTextInput();
+}
+
+void
+Android_SetTextInputRect(_THIS, SDL_Rect *rect)
+{
+    SDL_VideoData *videodata = (SDL_VideoData *)_this->driverdata;
+
+    if (!rect) {
+        SDL_InvalidParamError("rect");
+        return;
+    }
+
+    videodata->textRect = *rect;
+}
+
+#endif /* SDL_VIDEO_DRIVER_ANDROID */
+
+/* vi: set ts=4 sw=4 expandtab: */

src/video/android/SDL_androidkeyboard.h

@@ -0,0 +1,36 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2015 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#include "SDL_androidvideo.h"
+
+extern void Android_InitKeyboard(void);
+extern int Android_OnKeyDown(int keycode);
+extern int Android_OnKeyUp(int keycode);
+
+extern SDL_bool Android_HasScreenKeyboardSupport(_THIS);
+extern SDL_bool Android_IsScreenKeyboardShown(_THIS, SDL_Window * window);
+
+extern void Android_StartTextInput(_THIS);
+extern void Android_StopTextInput(_THIS);
+extern void Android_SetTextInputRect(_THIS, SDL_Rect *rect);
+
+/* vi: set ts=4 sw=4 expandtab: */

src/video/android/SDL_androidmessagebox.c

@@ -0,0 +1,37 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2015 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#if SDL_VIDEO_DRIVER_ANDROID
+
+#include "SDL_messagebox.h"
+
+int
+Android_ShowMessageBox(const SDL_MessageBoxData *messageboxdata, int *buttonid)
+{
+    int Android_JNI_ShowMessageBox(const SDL_MessageBoxData *messageboxdata, int *buttonid);
+
+    return Android_JNI_ShowMessageBox(messageboxdata, buttonid);
+}
+
+#endif /* SDL_VIDEO_DRIVER_ANDROID */
+
+/* vi: set ts=4 sw=4 expandtab: */

src/video/android/SDL_androidmessagebox.h

@@ -0,0 +1,29 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2015 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#if SDL_VIDEO_DRIVER_ANDROID
+
+extern int Android_ShowMessageBox(const SDL_MessageBoxData *messageboxdata, int *buttonid);
+
+#endif /* SDL_VIDEO_DRIVER_ANDROID */
+
+/* vi: set ts=4 sw=4 expandtab: */

src/video/android/SDL_androidmouse.c

@@ -0,0 +1,84 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2015 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "../../SDL_internal.h"
+
+#if SDL_VIDEO_DRIVER_ANDROID
+
+#include "SDL_androidmouse.h"
+
+#include "SDL_events.h"
+#include "../../events/SDL_mouse_c.h"
+
+#include "../../core/android/SDL_android.h"
+
+#define ACTION_DOWN 0
+#define ACTION_UP 1
+#define ACTION_HOVER_MOVE 7
+#define ACTION_SCROLL 8
+#define BUTTON_PRIMARY 1
+#define BUTTON_SECONDARY 2
+#define BUTTON_TERTIARY 4
+
+void Android_OnMouse( int androidButton, int action, float x, float y) {
+    static Uint8 SDLButton;
+
+    if (!Android_Window) {
+        return;
+    }
+
+    switch(action) {
+        case ACTION_DOWN:
+            // Determine which button originated the event, and store it for ACTION_UP
+            SDLButton = SDL_BUTTON_LEFT;
+            if (androidButton == BUTTON_SECONDARY) {
+                SDLButton = SDL_BUTTON_RIGHT;
+            } else if (androidButton == BUTTON_TERTIARY) {
+                SDLButton = SDL_BUTTON_MIDDLE;
+            }
+            SDL_SendMouseMotion(Android_Window, 0, 0, x, y);
+            SDL_SendMouseButton(Android_Window, 0, SDL_PRESSED, SDLButton);
+            break;
+
+        case ACTION_UP:
+            // Android won't give us the button that originated the ACTION_DOWN event, so we'll
+            // assume it's the one we stored
+            SDL_SendMouseMotion(Android_Window, 0, 0, x, y);
+            SDL_SendMouseButton(Android_Window, 0, SDL_RELEASED, SDLButton);
+            break;
+
+        case ACTION_HOVER_MOVE:
+            SDL_SendMouseMotion(Android_Window, 0, 0, x, y);
+            break;
+
+        case ACTION_SCROLL:
+            SDL_SendMouseWheel(Android_Window, 0, x, y, SDL_MOUSEWHEEL_NORMAL);
+            break;
+
+        default:
+            break;
+    }
+}
+
+#endif /* SDL_VIDEO_DRIVER_ANDROID */
+
+/* vi: set ts=4 sw=4 expandtab: */
+

src/video/android/SDL_androidmouse.h

@@ -0,0 +1,31 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2015 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef _SDL_androidmouse_h
+#define _SDL_androidmouse_h
+
+#include "SDL_androidvideo.h"
+
+extern void Android_OnMouse( int button, int action, float x, float y);
+
+#endif /* _SDL_androidmouse_h */
+
+/* vi: set ts=4 sw=4 expandtab: */

src/video/android/SDL_androidtouch.c

@@ -0,0 +1,154 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2015 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#if SDL_VIDEO_DRIVER_ANDROID
+
+#include <android/log.h>
+
+#include "SDL_hints.h"
+#include "SDL_events.h"
+#include "SDL_log.h"
+#include "SDL_androidtouch.h"
+#include "../../events/SDL_mouse_c.h"
+#include "../../events/SDL_touch_c.h"
+#include "../../core/android/SDL_android.h"
+
+#define ACTION_DOWN 0
+#define ACTION_UP 1
+#define ACTION_MOVE 2
+#define ACTION_CANCEL 3
+#define ACTION_OUTSIDE 4
+#define ACTION_POINTER_DOWN 5
+#define ACTION_POINTER_UP 6
+
+static void Android_GetWindowCoordinates(float x, float y,
+                                         int *window_x, int *window_y)
+{
+    int window_w, window_h;
+
+    SDL_GetWindowSize(Android_Window, &window_w, &window_h);
+    *window_x = (int)(x * window_w);
+    *window_y = (int)(y * window_h);
+}
+
+static volatile SDL_bool separate_mouse_and_touch = SDL_FALSE;
+
+static void
+SeparateEventsHintWatcher(void *userdata, const char *name,
+                          const char *oldValue, const char *newValue)
+{
+    jclass mActivityClass = Android_JNI_GetActivityClass();
+    JNIEnv *env = Android_JNI_GetEnv();
+    jfieldID fid = (*env)->GetStaticFieldID(env, mActivityClass, "mSeparateMouseAndTouch", "Z");
+
+    separate_mouse_and_touch = (newValue && (SDL_strcmp(newValue, "1") == 0));
+    (*env)->SetStaticBooleanField(env, mActivityClass, fid, separate_mouse_and_touch ? JNI_TRUE : JNI_FALSE);
+}
+
+void Android_InitTouch(void)
+{
+    int i;
+    int* ids;
+    const int number = Android_JNI_GetTouchDeviceIds(&ids);
+
+    SDL_AddHintCallback(SDL_HINT_ANDROID_SEPARATE_MOUSE_AND_TOUCH,
+                        SeparateEventsHintWatcher, NULL);
+
+    if (0 < number) {
+        for (i = 0; i < number; ++i) {
+            SDL_AddTouch((SDL_TouchID) ids[i], ""); /* no error handling */
+        }
+        SDL_free(ids);
+    }
+}
+
+void Android_QuitTouch(void)
+{
+    SDL_DelHintCallback(SDL_HINT_ANDROID_SEPARATE_MOUSE_AND_TOUCH,
+                        SeparateEventsHintWatcher, NULL);
+    separate_mouse_and_touch = SDL_FALSE;
+}
+
+void Android_OnTouch(int touch_device_id_in, int pointer_finger_id_in, int action, float x, float y, float p)
+{
+    SDL_TouchID touchDeviceId = 0;
+    SDL_FingerID fingerId = 0;
+    int window_x, window_y;
+    static SDL_FingerID pointerFingerID = 0;
+
+    if (!Android_Window) {
+        return;
+    }
+
+    touchDeviceId = (SDL_TouchID)touch_device_id_in;
+    if (SDL_AddTouch(touchDeviceId, "") < 0) {
+        SDL_Log("error: can't add touch %s, %d", __FILE__, __LINE__);
+    }
+
+    fingerId = (SDL_FingerID)pointer_finger_id_in;
+    switch (action) {
+        case ACTION_DOWN:
+            /* Primary pointer down */
+            if (!separate_mouse_and_touch) {
+                Android_GetWindowCoordinates(x, y, &window_x, &window_y);
+                /* send moved event */
+                SDL_SendMouseMotion(Android_Window, SDL_TOUCH_MOUSEID, 0, window_x, window_y);
+                /* send mouse down event */
+                SDL_SendMouseButton(Android_Window, SDL_TOUCH_MOUSEID, SDL_PRESSED, SDL_BUTTON_LEFT);
+            }
+            pointerFingerID = fingerId;
+        case ACTION_POINTER_DOWN:
+            /* Non primary pointer down */
+            SDL_SendTouch(touchDeviceId, fingerId, SDL_TRUE, x, y, p);
+            break;
+
+        case ACTION_MOVE:
+            if (!pointerFingerID) {
+                if (!separate_mouse_and_touch) {
+                    Android_GetWindowCoordinates(x, y, &window_x, &window_y);
+                    /* send moved event */
+                    SDL_SendMouseMotion(Android_Window, SDL_TOUCH_MOUSEID, 0, window_x, window_y);
+                }
+            }
+            SDL_SendTouchMotion(touchDeviceId, fingerId, x, y, p);
+            break;
+
+        case ACTION_UP:
+            /* Primary pointer up */
+            if (!separate_mouse_and_touch) {
+                /* send mouse up */
+                SDL_SendMouseButton(Android_Window, SDL_TOUCH_MOUSEID, SDL_RELEASED, SDL_BUTTON_LEFT);
+            }
+            pointerFingerID = (SDL_FingerID) 0;
+        case ACTION_POINTER_UP:
+            /* Non primary pointer up */
+            SDL_SendTouch(touchDeviceId, fingerId, SDL_FALSE, x, y, p);
+            break;
+
+        default:
+            break;
+    }
+}
+
+#endif /* SDL_VIDEO_DRIVER_ANDROID */
+
+/* vi: set ts=4 sw=4 expandtab: */

src/video/android/SDL_androidtouch.h

@@ -0,0 +1,29 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2015 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#include "SDL_androidvideo.h"
+
+extern void Android_InitTouch(void);
+extern void Android_QuitTouch(void);
+extern void Android_OnTouch( int touch_device_id_in, int pointer_finger_id_in, int action, float x, float y, float p);
+
+/* vi: set ts=4 sw=4 expandtab: */

src/video/android/SDL_androidvideo.c

@@ -0,0 +1,210 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2015 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#if SDL_VIDEO_DRIVER_ANDROID
+
+/* Android SDL video driver implementation
+*/
+
+#include "SDL_video.h"
+#include "SDL_mouse.h"
+#include "../SDL_sysvideo.h"
+#include "../SDL_pixels_c.h"
+#include "../../events/SDL_events_c.h"
+#include "../../events/SDL_windowevents_c.h"
+
+#include "SDL_androidvideo.h"
+#include "SDL_androidclipboard.h"
+#include "SDL_androidevents.h"
+#include "SDL_androidkeyboard.h"
+#include "SDL_androidtouch.h"
+#include "SDL_androidwindow.h"
+
+#define ANDROID_VID_DRIVER_NAME "Android"
+
+/* Initialization/Query functions */
+static int Android_VideoInit(_THIS);
+static void Android_VideoQuit(_THIS);
+
+#include "../SDL_egl_c.h"
+/* GL functions (SDL_androidgl.c) */
+extern SDL_GLContext Android_GLES_CreateContext(_THIS, SDL_Window * window);
+extern int Android_GLES_MakeCurrent(_THIS, SDL_Window * window, SDL_GLContext context);
+extern void Android_GLES_SwapWindow(_THIS, SDL_Window * window);
+extern int Android_GLES_LoadLibrary(_THIS, const char *path);
+#define Android_GLES_GetProcAddress SDL_EGL_GetProcAddress
+#define Android_GLES_UnloadLibrary SDL_EGL_UnloadLibrary
+#define Android_GLES_SetSwapInterval SDL_EGL_SetSwapInterval
+#define Android_GLES_GetSwapInterval SDL_EGL_GetSwapInterval
+#define Android_GLES_DeleteContext SDL_EGL_DeleteContext
+
+/* Android driver bootstrap functions */
+
+
+/* These are filled in with real values in Android_SetScreenResolution on init (before SDL_main()) */
+int Android_ScreenWidth = 0;
+int Android_ScreenHeight = 0;
+Uint32 Android_ScreenFormat = SDL_PIXELFORMAT_UNKNOWN;
+int Android_ScreenRate = 0;
+
+SDL_sem *Android_PauseSem = NULL, *Android_ResumeSem = NULL;
+
+/* Currently only one window */
+SDL_Window *Android_Window = NULL;
+
+static int
+Android_Available(void)
+{
+    return 1;
+}
+
+static void
+Android_SuspendScreenSaver(_THIS)
+{
+    Android_JNI_SuspendScreenSaver(_this->suspend_screensaver);
+}
+
+static void
+Android_DeleteDevice(SDL_VideoDevice * device)
+{
+    SDL_free(device->driverdata);
+    SDL_free(device);
+}
+
+static SDL_VideoDevice *
+Android_CreateDevice(int devindex)
+{
+    SDL_VideoDevice *device;
+    SDL_VideoData *data;
+
+    /* Initialize all variables that we clean on shutdown */
+    device = (SDL_VideoDevice *) SDL_calloc(1, sizeof(SDL_VideoDevice));
+    if (!device) {
+        SDL_OutOfMemory();
+        return NULL;
+    }
+
+    data = (SDL_VideoData*) SDL_calloc(1, sizeof(SDL_VideoData));
+    if (!data) {
+        SDL_OutOfMemory();
+        SDL_free(device);
+        return NULL;
+    }
+
+    device->driverdata = data;
+
+    /* Set the function pointers */
+    device->VideoInit = Android_VideoInit;
+    device->VideoQuit = Android_VideoQuit;
+    device->PumpEvents = Android_PumpEvents;
+
+    device->CreateWindow = Android_CreateWindow;
+    device->SetWindowTitle = Android_SetWindowTitle;
+    device->DestroyWindow = Android_DestroyWindow;
+    device->GetWindowWMInfo = Android_GetWindowWMInfo;
+
+    device->free = Android_DeleteDevice;
+
+    /* GL pointers */
+    device->GL_LoadLibrary = Android_GLES_LoadLibrary;
+    device->GL_GetProcAddress = Android_GLES_GetProcAddress;
+    device->GL_UnloadLibrary = Android_GLES_UnloadLibrary;
+    device->GL_CreateContext = Android_GLES_CreateContext;
+    device->GL_MakeCurrent = Android_GLES_MakeCurrent;
+    device->GL_SetSwapInterval = Android_GLES_SetSwapInterval;
+    device->GL_GetSwapInterval = Android_GLES_GetSwapInterval;
+    device->GL_SwapWindow = Android_GLES_SwapWindow;
+    device->GL_DeleteContext = Android_GLES_DeleteContext;
+
+    /* Screensaver */
+    device->SuspendScreenSaver = Android_SuspendScreenSaver;
+
+    /* Text input */
+    device->StartTextInput = Android_StartTextInput;
+    device->StopTextInput = Android_StopTextInput;
+    device->SetTextInputRect = Android_SetTextInputRect;
+
+    /* Screen keyboard */
+    device->HasScreenKeyboardSupport = Android_HasScreenKeyboardSupport;
+    device->IsScreenKeyboardShown = Android_IsScreenKeyboardShown;
+
+    /* Clipboard */
+    device->SetClipboardText = Android_SetClipboardText;
+    device->GetClipboardText = Android_GetClipboardText;
+    device->HasClipboardText = Android_HasClipboardText;
+
+    return device;
+}
+
+VideoBootStrap Android_bootstrap = {
+    ANDROID_VID_DRIVER_NAME, "SDL Android video driver",
+    Android_Available, Android_CreateDevice
+};
+
+
+int
+Android_VideoInit(_THIS)
+{
+    SDL_DisplayMode mode;
+
+    mode.format = Android_ScreenFormat;
+    mode.w = Android_ScreenWidth;
+    mode.h = Android_ScreenHeight;
+    mode.refresh_rate = Android_ScreenRate;
+    mode.driverdata = NULL;
+    if (SDL_AddBasicVideoDisplay(&mode) < 0) {
+        return -1;
+    }
+
+    SDL_AddDisplayMode(&_this->displays[0], &mode);
+
+    Android_InitKeyboard();
+
+    Android_InitTouch();
+
+    /* We're done! */
+    return 0;
+}
+
+void
+Android_VideoQuit(_THIS)
+{
+    Android_QuitTouch();
+}
+
+/* This function gets called before VideoInit() */
+void
+Android_SetScreenResolution(int width, int height, Uint32 format, float rate)
+{
+    Android_ScreenWidth = width;
+    Android_ScreenHeight = height;
+    Android_ScreenFormat = format;
+    Android_ScreenRate = rate;
+
+    if (Android_Window) {
+        SDL_SendWindowEvent(Android_Window, SDL_WINDOWEVENT_RESIZED, width, height);
+    }
+}
+
+#endif /* SDL_VIDEO_DRIVER_ANDROID */
+
+/* vi: set ts=4 sw=4 expandtab: */

src/video/android/SDL_androidvideo.h

@@ -0,0 +1,49 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2015 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#ifndef _SDL_androidvideo_h
+#define _SDL_androidvideo_h
+
+#include "SDL_mutex.h"
+#include "SDL_rect.h"
+#include "../SDL_sysvideo.h"
+
+/* Called by the JNI layer when the screen changes size or format */
+extern void Android_SetScreenResolution(int width, int height, Uint32 format, float rate);
+
+/* Private display data */
+
+typedef struct SDL_VideoData
+{
+    SDL_Rect        textRect;
+} SDL_VideoData;
+
+extern int Android_ScreenWidth;
+extern int Android_ScreenHeight;
+extern Uint32 Android_ScreenFormat;
+extern SDL_sem *Android_PauseSem, *Android_ResumeSem;
+extern SDL_Window *Android_Window;
+
+
+#endif /* _SDL_androidvideo_h */
+
+/* vi: set ts=4 sw=4 expandtab: */

src/video/android/SDL_androidwindow.c

@@ -0,0 +1,139 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2015 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#if SDL_VIDEO_DRIVER_ANDROID
+
+#include "SDL_syswm.h"
+#include "../SDL_sysvideo.h"
+#include "../../events/SDL_keyboard_c.h"
+#include "../../events/SDL_mouse_c.h"
+
+#include "SDL_androidvideo.h"
+#include "SDL_androidwindow.h"
+
+int
+Android_CreateWindow(_THIS, SDL_Window * window)
+{
+    SDL_WindowData *data;
+    
+    if (Android_Window) {
+        return SDL_SetError("Android only supports one window");
+    }
+    
+    Android_PauseSem = SDL_CreateSemaphore(0);
+    Android_ResumeSem = SDL_CreateSemaphore(0);
+
+    /* Adjust the window data to match the screen */
+    window->x = 0;
+    window->y = 0;
+    window->w = Android_ScreenWidth;
+    window->h = Android_ScreenHeight;
+
+    window->flags &= ~SDL_WINDOW_RESIZABLE;     /* window is NEVER resizeable */
+    window->flags |= SDL_WINDOW_FULLSCREEN;     /* window is always fullscreen */
+    window->flags &= ~SDL_WINDOW_HIDDEN;
+    window->flags |= SDL_WINDOW_SHOWN;          /* only one window on Android */
+    window->flags |= SDL_WINDOW_INPUT_FOCUS;    /* always has input focus */
+
+    /* One window, it always has focus */
+    SDL_SetMouseFocus(window);
+    SDL_SetKeyboardFocus(window);
+    
+    data = (SDL_WindowData *) SDL_calloc(1, sizeof(*data));
+    if (!data) {
+        return SDL_OutOfMemory();
+    }
+    
+    data->native_window = Android_JNI_GetNativeWindow();
+    
+    if (!data->native_window) {
+        SDL_free(data);
+        return SDL_SetError("Could not fetch native window");
+    }
+    
+    data->egl_surface = SDL_EGL_CreateSurface(_this, (NativeWindowType) data->native_window);
+
+    if (data->egl_surface == EGL_NO_SURFACE) {
+        ANativeWindow_release(data->native_window);
+        SDL_free(data);
+        return SDL_SetError("Could not create GLES window surface");
+    }
+
+    window->driverdata = data;
+    Android_Window = window;
+    
+    return 0;
+}
+
+void
+Android_SetWindowTitle(_THIS, SDL_Window * window)
+{
+    Android_JNI_SetActivityTitle(window->title);
+}
+
+void
+Android_DestroyWindow(_THIS, SDL_Window * window)
+{
+    SDL_WindowData *data;
+    
+    if (window == Android_Window) {
+        Android_Window = NULL;
+        if (Android_PauseSem) SDL_DestroySemaphore(Android_PauseSem);
+        if (Android_ResumeSem) SDL_DestroySemaphore(Android_ResumeSem);
+        Android_PauseSem = NULL;
+        Android_ResumeSem = NULL;
+        
+        if(window->driverdata) {
+            data = (SDL_WindowData *) window->driverdata;
+            if (data->egl_surface != EGL_NO_SURFACE) {
+                SDL_EGL_DestroySurface(_this, data->egl_surface);
+            }
+            if (data->native_window) {
+                ANativeWindow_release(data->native_window);
+            }
+            SDL_free(window->driverdata);
+            window->driverdata = NULL;
+        }
+    }
+}
+
+SDL_bool
+Android_GetWindowWMInfo(_THIS, SDL_Window * window, SDL_SysWMinfo * info)
+{
+    SDL_WindowData *data = (SDL_WindowData *) window->driverdata;
+
+    if (info->version.major == SDL_MAJOR_VERSION &&
+        info->version.minor == SDL_MINOR_VERSION) {
+        info->subsystem = SDL_SYSWM_ANDROID;
+        info->info.android.window = data->native_window;
+        info->info.android.surface = data->egl_surface;
+        return SDL_TRUE;
+    } else {
+        SDL_SetError("Application not compiled with SDL %d.%d\n",
+                     SDL_MAJOR_VERSION, SDL_MINOR_VERSION);
+        return SDL_FALSE;
+    }
+}
+
+#endif /* SDL_VIDEO_DRIVER_ANDROID */
+
+/* vi: set ts=4 sw=4 expandtab: */

src/video/android/SDL_androidwindow.h

@@ -0,0 +1,44 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2015 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#ifndef _SDL_androidwindow_h
+#define _SDL_androidwindow_h
+
+#include "../../core/android/SDL_android.h"
+#include "../SDL_egl_c.h"
+
+extern int Android_CreateWindow(_THIS, SDL_Window * window);
+extern void Android_SetWindowTitle(_THIS, SDL_Window * window);
+extern void Android_DestroyWindow(_THIS, SDL_Window * window);
+extern SDL_bool Android_GetWindowWMInfo(_THIS, SDL_Window * window, struct SDL_SysWMinfo * info);
+
+typedef struct
+{
+    EGLSurface egl_surface;
+    EGLContext egl_context; /* We use this to preserve the context when losing focus */
+    ANativeWindow* native_window;
+    
+} SDL_WindowData;
+
+#endif /* _SDL_androidwindow_h */
+
+/* vi: set ts=4 sw=4 expandtab: */