8 files changed, 75 insertions, 17 deletions

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 c60a2916..5c7e41ea 100644
--- a/src/resources.c
+++ b/src/resources.c
@@ -25,6 +25,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 #include <the_Foundation/archive.h>
 #include <the_Foundation/version.h>
 
+#include <SDL_rwops.h>
+
 static iArchive *archive_;
     
 iBlock blobAbout_Resources;
@@ -96,7 +98,23 @@ static struct {
 
 iBool init_Resources(const char *path) {
     archive_ = new_Archive();
-    if (openFile_Archive(archive_, collectNewCStr_String(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");
+    if (io) {
+        iBlock buf;
+        init_Block(&buf, (size_t) SDL_RWsize(io));
+        SDL_RWread(io, data_Block(&buf), size_Block(&buf), 1);
+        SDL_RWclose(io);
+        ok = openData_Archive(archive_, &buf);
+        deinit_Block(&buf);
+    }
+#else
+    ok = openFile_Archive(archive_, collectNewCStr_String(path));
+#endif
+    if (ok) {
         iVersion appVer;
         init_Version(&appVer, range_CStr(LAGRANGE_APP_VERSION));
         iVersion resVer;
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/text.c b/src/ui/text.c
index 977cac9c..4a4b3776 100644
--- a/src/ui/text.c
+++ b/src/ui/text.c
@@ -1871,7 +1871,7 @@ iInt2 tryAdvance_Text(int fontId, iRangecc text, int width, const char **endPos)
 }
 
 iInt2 tryAdvanceNoWrap_Text(int fontId, iRangecc text, int width, const char **endPos) {
-    if (width <= 1) {
+    if (width && width <= 1) {
         *endPos = text.start;
         return zero_I2();
     }
@@ -2070,7 +2070,7 @@ iTextMetrics draw_WrapText(iWrapText *d, int fontId, iInt2 pos, int color) {
         const int width = d->mode == word_WrapTextMode
                               ? tryAdvance_Text(fontId, text, d->maxWidth, &endPos).x
                               : tryAdvanceNoWrap_Text(fontId, text, d->maxWidth, &endPos).x;
-        notify_WrapText_(d, endPos, (iTextAttrib){ .colorId = color }, 0, width);
+        notify_WrapText_(d, endPos, (iTextAttrib){ .fgColorId = color }, 0, width);
         drawRange_Text(fontId, pos, color, (iRangecc){ text.start, endPos });
         text.start = endPos;
         pos.y += lineHeight_Text(fontId);
diff --git a/src/ui/text_simple.c b/src/ui/text_simple.c
index 81fb94a5..8560c138 100644
--- a/src/ui/text_simple.c
+++ b/src/ui/text_simple.c
@@ -61,7 +61,7 @@ static iRect runSimple_Font_(iFont *d, const iRunArgs *args) {
        and other non-complex LTR scripts. Composed glyphs are not supported (must rely on text
        being in a pre-composed form). This algorithm is used if HarfBuzz is not available. */
     const iInt2 orig        = args->pos;
-    iTextAttrib attrib      = { .colorId = args->color };
+    iTextAttrib attrib      = { .fgColorId = args->color };
     iRect       bounds      = { orig, init_I2(0, d->height) };
     float       xpos        = orig.x;
     float       xposMax     = xpos;
@@ -118,8 +118,9 @@ static iRect runSimple_Font_(iFont *d, const iRunArgs *args) {
             if (match_RegExp(activeText_->ansiEscape, chPos, args->text.end - chPos, &m)) {
                 if (mode & draw_RunMode && ~mode & permanentColorFlag_RunMode) {
                     /* Change the color. */
-                    const iColor clr =
-                        ansiForeground_Color(capturedRange_RegExpMatch(&m, 1), tmParagraph_ColorId);
+                    iColor clr;
+                    ansiColors_Color(capturedRange_RegExpMatch(&m, 1), tmParagraph_ColorId,
+                                     none_ColorId, &clr, NULL);
                     SDL_SetTextureColorMod(activeText_->cache, clr.r, clr.g, clr.b);
                     if (args->mode & fillBackground_RunMode) {
                         SDL_SetRenderDrawColor(activeText_->render, clr.r, clr.g, clr.b, 0);
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;