11 files changed, 100 insertions, 17 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 18789f9c..321014ed 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -96,7 +96,7 @@ set (RESOURCES
     res/shadow.png
     res/fontpack.ini
 )
-file (GLOB FONTS RELATIVE ${CMAKE_SOURCE_DIR} res/fonts/*)
+file (GLOB FONTS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} res/fonts/*)
 list (APPEND RESOURCES ${FONTS})
 if ((UNIX AND NOT APPLE) OR MSYS)
     list (APPEND RESOURCES res/lagrange-64.png)
@@ -285,7 +285,12 @@ else ()
 endif ()
 
 # Target.
-add_executable (app ${SOURCES} ${RESOURCES})
+if (NOT ANDROID)
+    add_executable (app ${SOURCES} ${RESOURCES})
+else ()
+    # The whole app becomes one shared library, based on this static one.
+    add_library (app STATIC ${SOURCES})
+endif ()
 set_property (TARGET app PROPERTY C_STANDARD 11)
 if (TARGET ext-deps)
     add_dependencies (app ext-deps)
@@ -445,6 +450,8 @@ elseif (HAIKU)
     target_compile_definitions (app PUBLIC
         LAGRANGE_EMB_BIN="${CMAKE_INSTALL_PREFIX}/resources.lgr")
     install (FILES ${EMB_BIN} DESTINATION .)
+elseif (ANDROID)
+    file (COPY ${EMB_BIN} DESTINATION ${CMAKE_SOURCE_DIR}/../app/src/main/assets)
 elseif (UNIX AND NOT APPLE)
     include (GNUInstallDirs)
     set_target_properties (app PROPERTIES
diff --git a/Depends-Android.cmake b/Depends-Android.cmake
new file mode 100644
index 00000000..74635620
--- /dev/null
+++ b/Depends-Android.cmake
@@ -0,0 +1,31 @@
+if (NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/lib/the_Foundation/.git)
+    message (FATAL_ERROR "'lib/the_Foundation' Git submodule not found")
+endif ()
+
+# the_Foundation is checked out as a submodule, make sure it's up to date.
+find_package (Git)
+if (GIT_FOUND)
+    execute_process (
+        COMMAND ${GIT_EXECUTABLE} submodule update
+        WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+        OUTPUT_VARIABLE subout
+        OUTPUT_STRIP_TRAILING_WHITESPACE
+    )
+    if (subout)
+        message (FATAL_ERROR "'lib/the_Foundation' Git submodule has been updated, please re-run CMake.\n")
+    endif ()
+endif ()
+
+set (INSTALL_THE_FOUNDATION OFF)
+set (TFDN_STATIC_LIBRARY    ON  CACHE BOOL "")
+set (TFDN_ENABLE_INSTALL    OFF CACHE BOOL "")
+set (TFDN_ENABLE_TESTS      OFF CACHE BOOL "")
+set (TFDN_ENABLE_WEBREQUEST OFF CACHE BOOL "")
+add_subdirectory (lib/the_Foundation)  
+add_library (the_Foundation::the_Foundation ALIAS the_Foundation)
+if (NOT OPENSSL_FOUND)
+    message (FATAL_ERROR "Lagrange requires OpenSSL for TLS. Please check if pkg-config can find 'openssl'.")
+endif ()
+if (NOT ZLIB_FOUND)
+    message (FATAL_ERROR "Lagrange requires zlib for reading compressed archives. Please check if pkg-config can find 'zlib'.")
+endif ()
\ No newline at end of file
diff --git a/Depends.cmake b/Depends.cmake
index ca01b6c5..246f3398 100644
--- a/Depends.cmake
+++ b/Depends.cmake
@@ -3,6 +3,11 @@ if (IOS)
     return ()
 endif ()
 
+if (ANDROID)
+    include (Depends-Android.cmake)
+    return ()
+endif ()
+
 find_package (PkgConfig)
 find_program (MESON_EXECUTABLE meson DOC "Meson build system")
 find_program (NINJA_EXECUTABLE ninja DOC "Ninja build tool")
diff --git a/Resources.cmake b/Resources.cmake
index fc5d20c6..15ef15ea 100644
--- a/Resources.cmake
+++ b/Resources.cmake
@@ -16,11 +16,11 @@ function (make_resources dst)
     file (REMOVE ${dst})
     get_filename_component (dstName ${dst} NAME)
     message (STATUS "  ${dstName}")
-    set (versionTempPath ${CMAKE_SOURCE_DIR}/res/VERSION)
+    set (versionTempPath ${CMAKE_CURRENT_SOURCE_DIR}/res/VERSION)
     file (WRITE ${versionTempPath} ${PROJECT_VERSION})
     execute_process (
         COMMAND ${ZIP_EXECUTABLE} -1 ${dst} VERSION ${files}
-        WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/res
+        WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/res
         OUTPUT_QUIET
     )
     file (REMOVE ${versionTempPath})
diff --git a/lib/the_Foundation b/lib/the_Foundation
-Subproject 92cbb82857c0794b250abe835b98c9ee1b9f9c1
+Subproject 47e3a0f80dee74e008c3bd2895ae108debf94cc
diff --git a/src/app.c b/src/app.c
index a2de03ca..bfac84d9 100644
--- a/src/app.c
+++ b/src/app.c
@@ -92,7 +92,10 @@ static const char *defaultDataDir_App_ = "~/Library/Application Support";
 #define EMB_BIN "../resources.lgr"
 static const char *defaultDataDir_App_ = "~/AppData/Roaming/fi.skyjake.Lagrange";
 #endif
-#if defined (iPlatformLinux) || defined (iPlatformOther)
+#if defined (iPlatformAndroidMobile)
+#define EMB_BIN "resources.lgr" /* loaded from assets with SDL_rwops */
+static const char *defaultDataDir_App_ = NULL; /* will ask SDL */
+#elif defined (iPlatformLinux) || defined (iPlatformOther)
 #define EMB_BIN  "../../share/lagrange/resources.lgr"
 #define EMB_BIN2  "../../../share/lagrange/resources.lgr"
 static const char *defaultDataDir_App_ = "~/.config/lagrange";
@@ -137,6 +140,9 @@ struct Impl_App {
     int          autoReloadTimer;
     iPeriodic    periodic;
     int          warmupFrames; /* forced refresh just after resuming from background; FIXME: shouldn't be needed */
+#if defined (iPlatformAndroidMobile)
+    float        displayDensity;
+#endif
     /* Preferences: */
     iBool        commandEcho;         /* --echo */
     iBool        forceSoftwareRender; /* --sw */
@@ -300,7 +306,10 @@ static const char *dataDir_App_(void) {
         return userDir;
     }
 #endif
-    return defaultDataDir_App_;
+    if (defaultDataDir_App_) {
+        return defaultDataDir_App_;
+    }
+    return SDL_GetPrefPath("Jaakko Keränen", "fi.skyjake.lagrange");
 }
 
 static const char *downloadDir_App_(void) {
@@ -698,7 +707,7 @@ static iBool hasCommandLineOpenableScheme_(const iRangecc uri) {
 }
 
 static void init_App_(iApp *d, int argc, char **argv) {
-#if defined (iPlatformLinux)
+#if defined (iPlatformLinux) && !defined (iPlatformAndroid)
     d->isRunningUnderWindowSystem = !iCmpStr(SDL_GetCurrentVideoDriver(), "x11") ||
                                     !iCmpStr(SDL_GetCurrentVideoDriver(), "wayland");
 #else
@@ -745,6 +754,8 @@ static void init_App_(iApp *d, int argc, char **argv) {
         }
     }
     init_Lang();
+    iStringList *openCmds = new_StringList();
+#if !defined (iPlatformAndroidMobile)
     /* Configure the valid command line options. */ {
         defineValues_CommandLine(&d->args, "close-tab", 0);
         defineValues_CommandLine(&d->args, "echo;E", 0);
@@ -759,7 +770,6 @@ static void init_App_(iApp *d, int argc, char **argv) {
         defineValues_CommandLine(&d->args, "sw", 0);
         defineValues_CommandLine(&d->args, "version;V", 0);
     }
-    iStringList *openCmds = new_StringList();
     /* Handle command line options. */ {
         if (contains_CommandLine(&d->args, "help")) {
             puts(cstr_Block(&blobArghelp_Resources));
@@ -808,6 +818,7 @@ static void init_App_(iApp *d, int argc, char **argv) {
             }
         }
     }
+#endif
 #if defined (LAGRANGE_ENABLE_IPC)
     /* Only one instance is allowed to run at a time; the runtime files (bookmarks, etc.)
        are not shareable. */ {
@@ -842,7 +853,7 @@ static void init_App_(iApp *d, int argc, char **argv) {
     /* Must scale by UI scaling factor. */
     mulfv_I2(&d->initialWindowRect.size, desktopDPI_Win32());
 #endif
-#if defined (iPlatformLinux)
+#if defined (iPlatformLinux) && !defined (iPlatformAndroid)
     /* Scale by the primary (?) monitor DPI. */
     if (isRunningUnderWindowSystem_App()) {
         float vdpi;
@@ -1301,6 +1312,15 @@ void processEvents_App(enum iAppEventMode eventMode) {
                     }
                     ev.key.keysym.mod = mapMods_Keys(ev.key.keysym.mod & ~KMOD_CAPS);
                 }
+#if defined (iPlatformAndroidMobile)
+                /* Ignore all mouse events; just use touch. */
+                if (ev.type == SDL_MOUSEBUTTONDOWN ||
+                    ev.type == SDL_MOUSEBUTTONUP ||
+                    ev.type == SDL_MOUSEMOTION ||
+                    ev.type == SDL_MOUSEWHEEL) {
+                    continue;
+                }
+#endif
                 /* Scroll events may be per-pixel or mouse wheel steps. */
                 if (ev.type == SDL_MOUSEWHEEL) {
 #if defined (iPlatformAppleDesktop)
@@ -1759,6 +1779,8 @@ enum iAppDeviceType deviceType_App(void) {
     return tablet_AppDeviceType;
 #elif defined (iPlatformAppleMobile)
     return isPhone_iOS() ? phone_AppDeviceType : tablet_AppDeviceType;
+#elif defined (iPlatformAndroidMobile)
+    return phone_AppDeviceType; /* TODO: Java side could tell us via cmdline if this is a tablet. */
 #else
     return desktop_AppDeviceType;
 #endif
@@ -3350,3 +3372,10 @@ void closePopups_App(void) {
         }
     }
 }
+
+#if defined (iPlatformAndroidMobile)
+float displayDensity_Android(void) {
+    iApp *d = &app_;
+    return toFloat_String(at_CommandLine(&d->args, 1));
+}
+#endif
diff --git a/src/main.c b/src/main.c
index 6e5e99e9..ad69c6df 100644
--- a/src/main.c
+++ b/src/main.c
@@ -67,9 +67,11 @@ int main(int argc, char **argv) {
                           "ECDHE-RSA-AES128-GCM-SHA256:"
                           "DHE-RSA-AES256-GCM-SHA384");
     SDL_SetHint(SDL_HINT_VIDEO_ALLOW_SCREENSAVER, "1");
+    SDL_SetHint(SDL_HINT_MAC_BACKGROUND_APP, "1");
     SDL_SetHint(SDL_HINT_MAC_CTRL_CLICK_EMULATE_RIGHT_CLICK, "1");
+#if SDL_VERSION_ATLEAST(2, 0, 8)
     SDL_SetHint(SDL_HINT_VIDEO_X11_NET_WM_BYPASS_COMPOSITOR, "0");
-    SDL_SetHint(SDL_HINT_MAC_BACKGROUND_APP, "1");
+#endif
 #if 0
     SDL_SetHint(SDL_HINT_MOUSE_TOUCH_EVENTS, "1"); /* debugging! */
 #endif
diff --git a/src/resources.c b/src/resources.c
index 0358e3a3..5c7e41ea 100644
--- a/src/resources.c
+++ b/src/resources.c
@@ -101,8 +101,9 @@ iBool init_Resources(const char *path) {
     iBool ok = iFalse;
 #if defined (iPlatformAndroidMobile)
     /* Resources are bundled as assets so they cannot be loaded as a regular file.
-       Fortunately, SDL implements a file wrapper. */ {
-        SDL_RWops *io = SDL_RWFromFile(path, "rb");
+       Fortunately, SDL implements a file wrapper. */
+    SDL_RWops *io = SDL_RWFromFile(path, "rb");
+    if (io) {
         iBlock buf;
         init_Block(&buf, (size_t) SDL_RWsize(io));
         SDL_RWread(io, data_Block(&buf), size_Block(&buf), 1);
diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index 746e03e0..46af5fcd 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -1224,10 +1224,6 @@ static void showErrorPage_DocumentWidget_(iDocumentWidget *d, enum iGmStatusCode
             case tooManyRedirects_GmStatusCode:
                 appendFormat_String(src, "=> %s\n", cstr_String(meta));
                 break;
-            case tlsFailure_GmStatusCode:
-//                useBanner = iFalse; /* valid data wasn't received from host */
-//                appendFormat_String(src, ">%s\n", cstr_String(meta));
-                break;
             case tlsServerCertificateExpired_GmStatusCode:
                 makeFooterButtons_DocumentWidget_(
                     d,
diff --git a/src/ui/touch.c b/src/ui/touch.c
index 195d1dff..d6846572 100644
--- a/src/ui/touch.c
+++ b/src/ui/touch.c
@@ -42,7 +42,11 @@ iDeclareType(TouchState)
 
 static const uint32_t longPressSpanMs_  = 500;
 static const uint32_t shortPressSpanMs_ = 250;
+#if defined (iPlatformAndroidMobile)
+static const int      tapRadiusPt_      = 30; /* inaccurate sensors? */
+#else
 static const int      tapRadiusPt_      = 10;
+#endif
 
 enum iTouchEdge {
     none_TouchEdge,
diff --git a/src/ui/window.c b/src/ui/window.c
index 0bbe588c..9f12cabf 100644
--- a/src/ui/window.c
+++ b/src/ui/window.c
@@ -263,6 +263,10 @@ static float pixelRatio_Window_(const iWindow *d) {
 #   define baseDPI_Window   96.0f
 #endif
 
+#if defined (iPlatformAndroidMobile)
+float displayDensity_Android(void);
+#endif
+
 static float displayScale_Window_(const iWindow *d) {
     /* The environment variable LAGRANGE_OVERRIDE_DPI can be used to override the automatic
        display DPI detection. If not set, or is an empty string, ignore it.
@@ -289,6 +293,8 @@ static float displayScale_Window_(const iWindow *d) {
 #elif defined (iPlatformMsys)
     iUnused(d);
     return desktopDPI_Win32();
+#elif defined (iPlatformAndroidMobile)
+    return displayDensity_Android();
 #else
     if (isRunningUnderWindowSystem_App()) {
         float vdpi = 0.0f;
@@ -457,7 +463,7 @@ void init_Window(iWindow *d, enum iWindowType type, iRect rect, uint32_t flags)
     d->mouseGrab     = NULL;
     d->focus         = NULL;
     d->pendingCursor = NULL;
-    d->isExposed     = iFalse;
+    d->isExposed     = (deviceType_App() != desktop_AppDeviceType);
     d->isMinimized   = iFalse;
     d->isInvalidated = iFalse; /* set when posting event, to avoid repeated events */
     d->isMouseInside = iTrue;
@@ -541,6 +547,8 @@ void init_MainWindow(iMainWindow *d, iRect rect) {
     SDL_SetHint(SDL_HINT_RENDER_DRIVER, "metal");
     flags |= SDL_WINDOW_METAL;
     d->base.isExposed = iTrue;
+#elif defined (iPlatformAndroidMobile)
+    d->base.isExposed = iTrue;
 #else
     if (!forceSoftwareRender_App()) {
         flags |= SDL_WINDOW_OPENGL;