16 files changed, 149 insertions, 78 deletions

diff --git a/src/app.c b/src/app.c
index f8dc5697..be96bf6c 100644
--- a/src/app.c
+++ b/src/app.c
@@ -1583,7 +1583,11 @@ iBool isLandscape_App(void) {
 }
 
 enum iAppDeviceType deviceType_App(void) {
-#if defined (iPlatformAppleMobile)
+#if defined (iPlatformMobilePhone)
+    return phone_AppDeviceType;
+#elif defined (iPlatformMobileTablet)
+    return tablet_AppDeviceType;
+#elif defined (iPlatformAppleMobile)
     return isPhone_iOS() ? phone_AppDeviceType : tablet_AppDeviceType;
 #else
     return desktop_AppDeviceType;
@@ -2484,7 +2488,7 @@ iBool handleCommand_App(const char *cmd) {
     }
     else if (equal_Command(cmd, "tabs.close")) {
         iWidget *tabs = findWidget_App("doctabs");
-#if defined (iPlatformAppleMobile)
+#if defined (iPlatformMobile)
         /* Can't close the last on mobile. */
         if (tabCount_Widget(tabs) == 1 && numRoots_Window(get_Window()) == 1) {
             postCommand_App("navigate.home");
diff --git a/src/gmdocument.c b/src/gmdocument.c
index b9832f38..75f6f06b 100644
--- a/src/gmdocument.c
+++ b/src/gmdocument.c
@@ -82,6 +82,7 @@ struct Impl_GmDocument {
     iString   url;         /* for resolving relative links */
     iString   localHost;
     iInt2     size;
+    int       outsideMargin;
     iArray    layout; /* contents of source, laid out in document space */
     iPtrArray links;
     enum iGmDocumentBanner bannerType;
@@ -239,7 +240,10 @@ static iRangecc addLink_GmDocument_(iGmDocument *d, iRangecc line, iGmLinkId *li
                 iString *path = newRange_String(parts.path);
                 if (endsWithCase_String(path, ".gif")  || endsWithCase_String(path, ".jpg") ||
                     endsWithCase_String(path, ".jpeg") || endsWithCase_String(path, ".png") ||
-                    endsWithCase_String(path, ".tga")  || endsWithCase_String(path, ".psd") ||
+                    endsWithCase_String(path, ".tga")  || endsWithCase_String(path, ".psd") ||                    
+#if defined (LAGRANGE_ENABLE_WEBP)
+                    endsWithCase_String(path, ".webp") ||
+#endif
                     endsWithCase_String(path, ".hdr")  || endsWithCase_String(path, ".pic")) {
                     link->flags |= imageFileExtension_GmLinkFlag;
                 }
@@ -896,6 +900,12 @@ static void doLayout_GmDocument_(iGmDocument *d) {
                 pos.y += margin;
                 run.bounds.pos = pos;
                 run.bounds.size.x = d->size.x;
+                /* Extend the image to full width, including outside margin, if the viewport
+                   is narrow enough. */
+                if (d->outsideMargin < 5 * gap_UI) {
+                    run.bounds.size.x += d->outsideMargin * 2;
+                    run.bounds.pos.x  -= d->outsideMargin;
+                }                
                 const float aspect = (float) imgSize.y / (float) imgSize.x;
                 run.bounds.size.y = d->size.x * aspect;
                 run.visBounds = run.bounds;
@@ -990,6 +1000,7 @@ void init_GmDocument(iGmDocument *d) {
     init_String(&d->url);
     init_String(&d->localHost);
     d->bannerType = siteDomain_GmDocumentBanner;
+    d->outsideMargin = 0;
     d->size = zero_I2();
     init_Array(&d->layout, sizeof(iGmRun));
     init_PtrArray(&d->links);
@@ -1543,8 +1554,9 @@ void setBanner_GmDocument(iGmDocument *d, enum iGmDocumentBanner type) {
     d->bannerType = type;
 }
 
-void setWidth_GmDocument(iGmDocument *d, int width) {
+void setWidth_GmDocument(iGmDocument *d, int width, int outsideMargin) {
     d->size.x = width;
+    d->outsideMargin = outsideMargin; /* distance to edge of the viewport */
     doLayout_GmDocument_(d); /* TODO: just flag need-layout and do it later */
 }
 
@@ -1698,7 +1710,7 @@ void setUrl_GmDocument(iGmDocument *d, const iString *url) {
     updateIconBasedOnUrl_GmDocument_(d);
 }
 
-void setSource_GmDocument(iGmDocument *d, const iString *source, int width,
+void setSource_GmDocument(iGmDocument *d, const iString *source, int width, int outsideMargin,
                           enum iGmDocumentUpdate updateType) {
 //    printf("[GmDocument] source update (%zu bytes), width:%d, final:%d\n",
 //           size_String(source), width, updateType == final_GmDocumentUpdate);
@@ -1713,7 +1725,7 @@ void setSource_GmDocument(iGmDocument *d, const iString *source, int width,
     if (isNormalized_GmDocument_(d)) {
         normalize_GmDocument(d);
     }
-    setWidth_GmDocument(d, width); /* re-do layout */
+    setWidth_GmDocument(d, width, outsideMargin); /* re-do layout */
 }
 
 void foldPre_GmDocument(iGmDocument *d, uint16_t preId) {
diff --git a/src/gmdocument.h b/src/gmdocument.h
index 9a7a70df..9f8ee2ef 100644
--- a/src/gmdocument.h
+++ b/src/gmdocument.h
@@ -174,11 +174,11 @@ enum iGmDocumentUpdate {
 void    setThemeSeed_GmDocument (iGmDocument *, const iBlock *seed);
 void    setFormat_GmDocument    (iGmDocument *, enum iSourceFormat format);
 void    setBanner_GmDocument    (iGmDocument *, enum iGmDocumentBanner type);
-void    setWidth_GmDocument     (iGmDocument *, int width);
+void    setWidth_GmDocument     (iGmDocument *, int width, int outsideMargin);
 void    redoLayout_GmDocument   (iGmDocument *);
 iBool   updateOpenURLs_GmDocument(iGmDocument *);
 void    setUrl_GmDocument       (iGmDocument *, const iString *url);
-void    setSource_GmDocument    (iGmDocument *, const iString *source, int width,
+void    setSource_GmDocument    (iGmDocument *, const iString *source, int width, int outsideMargin,
                                  enum iGmDocumentUpdate updateType);
 void    foldPre_GmDocument      (iGmDocument *, uint16_t preId);
 
diff --git a/src/gmutil.c b/src/gmutil.c
index 9552c2a1..d87de8f6 100644
--- a/src/gmutil.c
+++ b/src/gmutil.c
@@ -511,54 +511,64 @@ const iString *findContainerArchive_Path(const iString *path) {
     return NULL;
 }
 
-const char *mediaType_Path(const iString *path) {
-    if (endsWithCase_String(path, ".gmi") || endsWithCase_String(path, ".gemini")) {
+const char *mediaTypeFromFileExtension_String(const iString *d) {
+    if (endsWithCase_String(d, ".gmi") || endsWithCase_String(d, ".gemini")) {
         return "text/gemini; charset=utf-8";
     }
-    else if (endsWithCase_String(path, ".pem")) {
+    else if (endsWithCase_String(d, ".pem")) {
         return "application/x-pem-file";
     }
-    else if (endsWithCase_String(path, ".zip")) {
+    else if (endsWithCase_String(d, ".zip")) {
         return "application/zip";
     }
-    else if (endsWithCase_String(path, ".gpub")) {
+    else if (endsWithCase_String(d, ".gpub")) {
         return "application/gpub+zip";
     }
-    else if (endsWithCase_String(path, ".xml")) {
+    else if (endsWithCase_String(d, ".xml")) {
         return "text/xml";
     }
-    else if (endsWithCase_String(path, ".png")) {
+    else if (endsWithCase_String(d, ".png")) {
         return "image/png";
     }
-    else if (endsWithCase_String(path, ".jpg") || endsWithCase_String(path, ".jpeg")) {
+    else if (endsWithCase_String(d, ".webp")) {
+        return "image/webp";
+    }
+    else if (endsWithCase_String(d, ".jpg") || endsWithCase_String(d, ".jpeg")) {
         return "image/jpeg";
     }
-    else if (endsWithCase_String(path, ".gif")) {
+    else if (endsWithCase_String(d, ".gif")) {
         return "image/gif";
     }
-    else if (endsWithCase_String(path, ".wav")) {
+    else if (endsWithCase_String(d, ".wav")) {
         return "audio/wave";
     }
-    else if (endsWithCase_String(path, ".ogg")) {
+    else if (endsWithCase_String(d, ".ogg")) {
         return "audio/ogg";
     }
-    else if (endsWithCase_String(path, ".mp3")) {
+    else if (endsWithCase_String(d, ".mp3")) {
         return "audio/mpeg";
     }
-    else if (endsWithCase_String(path, ".mid")) {
+    else if (endsWithCase_String(d, ".mid")) {
         return "audio/midi";
     }
-    else if (endsWithCase_String(path, ".txt") ||
-             endsWithCase_String(path, ".md") ||
-             endsWithCase_String(path, ".c") ||
-             endsWithCase_String(path, ".h") ||
-             endsWithCase_String(path, ".cc") ||
-             endsWithCase_String(path, ".hh") ||
-             endsWithCase_String(path, ".cpp") ||
-             endsWithCase_String(path, ".hpp")) {
+    else if (endsWithCase_String(d, ".txt") ||
+             endsWithCase_String(d, ".md") ||
+             endsWithCase_String(d, ".c") ||
+             endsWithCase_String(d, ".h") ||
+             endsWithCase_String(d, ".cc") ||
+             endsWithCase_String(d, ".hh") ||
+             endsWithCase_String(d, ".cpp") ||
+             endsWithCase_String(d, ".hpp")) {
         return "text/plain";
     }
-    const char *mtype = "application/octet-stream";
+    return "application/octet-stream";
+}
+
+const char *mediaType_Path(const iString *path) {
+    const char *mtype = mediaTypeFromFileExtension_String(path);
+    if (iCmpStr(mtype, "application/octet-stream")) {
+        return mtype; /* extension recognized */
+    }
     /* If the file is reasonably small and looks like UTF-8, we'll display it as text/plain. */
     if (fileExists_FileInfo(path) && fileSize_FileInfo(path) <= 5000000) {
         iFile *f = new_File(path);
diff --git a/src/gmutil.h b/src/gmutil.h
index f8491781..3c10d45b 100644
--- a/src/gmutil.h
+++ b/src/gmutil.h
@@ -133,6 +133,7 @@ const iString * withSpacesEncoded_String(const iString *);
 const iString * canonicalUrl_String     (const iString *);
 
 const char *    mediaType_Path                      (const iString *path);
+const char *    mediaTypeFromFileExtension_String   (const iString *);
 iRangecc        mediaTypeWithoutParameters_Rangecc  (iRangecc mime);
 
 const iString * findContainerArchive_Path           (const iString *path);
diff --git a/src/ios.m b/src/ios.m
index b82d54a7..c493e4f9 100644
--- a/src/ios.m
+++ b/src/ios.m
@@ -264,7 +264,6 @@ void setupApplication_iOS(void) {
                selector:@selector(keyboardOffScreen:)
                    name:UIKeyboardWillHideNotification
                  object:nil];
-    [[AVAudioSession sharedInstance] setCategory:AVAudioSessionCategoryPlayback error:nil];
     /* Media player remote controls. */
     MPRemoteCommandCenter *commandCenter = [MPRemoteCommandCenter sharedCommandCenter];
     [[commandCenter pauseCommand] addTargetWithHandler:^MPRemoteCommandHandlerStatus(MPRemoteCommandEvent * _Nonnull event) {
@@ -487,6 +486,8 @@ void init_AVFAudioPlayer(iAVFAudioPlayer *d) {
     d->player = NULL;
     d->volume = 1.0f;
     d->state = initialized_AVFAudioPlayerState;
+    /* Playback is imminent. */
+    [[AVAudioSession sharedInstance] setCategory:AVAudioSessionCategoryPlayback error:nil];
 }
 
 void deinit_AVFAudioPlayer(iAVFAudioPlayer *d) {
diff --git a/src/media.c b/src/media.c
index eb4a8311..5240ab5d 100644
--- a/src/media.c
+++ b/src/media.c
@@ -30,6 +30,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 #include "stb_image.h"
 #include "stb_image_resize.h"
 
+#if defined (LAGRANGE_ENABLE_WEBP)
+#   include <webp/decode.h>
+#endif
+
 #include <the_Foundation/file.h>
 #include <the_Foundation/ptrarray.h>
 #include <SDL_hints.h>
@@ -86,8 +90,16 @@ void deinit_GmImage(iGmImage *d) {
 void makeTexture_GmImage(iGmImage *d) {
     iBlock *data     = &d->partialData;
     d->numBytes      = size_Block(data);
-    uint8_t *imgData = stbi_load_from_memory(
-        constData_Block(data), size_Block(data), &d->size.x, &d->size.y, NULL, 4);
+    uint8_t *imgData = NULL;
+    if (cmp_String(&d->props.mime, "image/webp") == 0) {
+#if defined (LAGRANGE_ENABLE_WEBP)
+        imgData = WebPDecodeRGBA(constData_Block(data), size_Block(data), &d->size.x, &d->size.y);
+#endif        
+    }
+    else {
+        imgData = stbi_load_from_memory(
+            constData_Block(data), size_Block(data), &d->size.x, &d->size.y, NULL, 4);
+    }
     if (!imgData) {
         d->size    = zero_I2();
         d->texture = NULL;
diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index 7e138902..76e843d5 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -1054,9 +1054,12 @@ static void documentWasChanged_DocumentWidget_(iDocumentWidget *d) {
 
 void setSource_DocumentWidget(iDocumentWidget *d, const iString *source) {
     setUrl_GmDocument(d->doc, d->mod.url);
+    const int docWidth      = documentWidth_DocumentWidget_(d);
+    const int outsideMargin = (width_Widget(d) - docWidth) / 2;
     setSource_GmDocument(d->doc,
                          source,
-                         documentWidth_DocumentWidget_(d),
+                         docWidth,
+                         outsideMargin,
                          isFinished_GmRequest(d->request) ? final_GmDocumentUpdate
                                                           : partial_GmDocumentUpdate);
     documentWasChanged_DocumentWidget_(d);
@@ -1165,13 +1168,25 @@ static void showErrorPage_DocumentWidget_(iDocumentWidget *d, enum iGmStatusCode
                 iString *key = collectNew_String();
                 toString_Sym(SDLK_s, KMOD_PRIMARY, key);
                 appendFormat_String(src, "\n```\n%s\n```\n", cstr_String(meta));
-                makeFooterButtons_DocumentWidget_(
-                    d,
-                    (iMenuItem[]){ { translateCStr_Lang(download_Icon " " saveToDownloads_Label),
-                                     0,
-                                     0,
-                                     "document.save" } },
-                    1);
+                const char *mtype = mediaTypeFromFileExtension_String(d->mod.url);
+                iArray items;
+                init_Array(&items, sizeof(iMenuItem));
+                if (iCmpStr(mtype, "application/octet-stream")) {
+                    pushBack_Array(
+                        &items,
+                        &(iMenuItem){ translateCStr_Lang(format_CStr("View as \"%s\"", mtype)),
+                                      SDLK_RETURN,
+                                      0,
+                                      format_CStr("document.setmediatype mime:%s", mtype) });
+                }
+                pushBack_Array(
+                    &items,
+                    &(iMenuItem){ translateCStr_Lang(download_Icon " " saveToDownloads_Label),
+                                  0,
+                                  0,
+                                  "document.save" });
+                makeFooterButtons_DocumentWidget_(d, data_Array(&items), size_Array(&items));
+                deinit_Array(&items);
                 break;
             }
             default:
@@ -2254,7 +2269,7 @@ static iBool updateDocumentWidthRetainingScrollPosition_DocumentWidget_(iDocumen
         /* TODO: First *fully* visible run? */
         voffset = visibleRange_DocumentWidget_(d).start - top_Rect(run->visBounds);
     }
-    setWidth_GmDocument(d->doc, newWidth);
+    setWidth_GmDocument(d->doc, newWidth, (width_Widget(d) - newWidth) / 2);
     documentRunsInvalidated_DocumentWidget_(d);
     if (runLoc && !keepCenter) {
         run = findRunAtLoc_GmDocument(d->doc, runLoc);
@@ -3173,6 +3188,10 @@ static iBool handleCommand_DocumentWidget_(iDocumentWidget *d, const char *cmd)
              document_App() == d) {
         return handleSwipe_DocumentWidget_(d, cmd);
     }
+    else if (equal_Command(cmd, "document.setmediatype") && document_App() == d) {
+        setUrlAndSource_DocumentWidget(d, d->mod.url, string_Command(cmd, "mime"), &d->sourceContent);
+        return iTrue;
+    }
     return iFalse;
 }
 
diff --git a/src/ui/labelwidget.c b/src/ui/labelwidget.c
index ef306ab9..3bfa600b 100644
--- a/src/ui/labelwidget.c
+++ b/src/ui/labelwidget.c
@@ -68,7 +68,7 @@ static iInt2 padding_LabelWidget_(const iLabelWidget *d, int corner) {
                              : corner == 1 ? init_I2(w->padding[2], w->padding[1])
                              : corner == 2 ? init_I2(w->padding[2], w->padding[3])
                              : init_I2(w->padding[0], w->padding[3]));
-#if defined (iPlatformAppleMobile)
+#if defined (iPlatformMobile)
     return add_I2(widgetPad,
                   init_I2(flags & tight_WidgetFlag ? 2 * gap_UI : (4 * gap_UI),
                           (flags & extraPadding_WidgetFlag ? 1.5f : 1.0f) * 3 * gap_UI / 2));
diff --git a/src/ui/lookupwidget.c b/src/ui/lookupwidget.c
index a0a507ca..bf190d58 100644
--- a/src/ui/lookupwidget.c
+++ b/src/ui/lookupwidget.c
@@ -388,7 +388,7 @@ void init_LookupWidget(iLookupWidget *d) {
     init_Widget(w);
     setId_Widget(w, "lookup");
     setFlags_Widget(w, focusable_WidgetFlag, iTrue);
-#if defined (iPlatformAppleMobile)
+#if defined (iPlatformMobile)
     setFlags_Widget(w, unhittable_WidgetFlag, iTrue);
 #endif
     d->list = addChildFlags_Widget(w, iClob(new_ListWidget()),
diff --git a/src/ui/metrics.c b/src/ui/metrics.c
index 32561ed7..53a52afb 100644
--- a/src/ui/metrics.c
+++ b/src/ui/metrics.c
@@ -33,7 +33,7 @@ iInt2 gap2_UI     = { defaultGap_Metrics, defaultGap_Metrics };
 int   fontSize_UI = defaultFontSize_Metrics;
 
 void setScale_Metrics(float scale) {
-#if defined (iPlatformAppleMobile)
+#if defined (iPlatformMobile)
     /* iPad needs a bit larger UI elements as the viewing distance is generally longer.*/
     if (deviceType_App() == tablet_AppDeviceType) {
         scale *= 1.1f;
diff --git a/src/ui/mobile.c b/src/ui/mobile.c
index 0ff3fe85..168a92b8 100644
--- a/src/ui/mobile.c
+++ b/src/ui/mobile.c
@@ -57,11 +57,13 @@ static enum iFontId labelBoldFont_(void) {
 
 static void updatePanelSheetMetrics_(iWidget *sheet) {
     iWidget *navi       = findChild_Widget(sheet, "panel.navi");
-    iWidget *naviPad    = child_Widget(navi, 0);
+//    iWidget *naviPad    = child_Widget(navi, 0);
     int      naviHeight = lineHeight_Text(labelFont_()) + 4 * gap_UI;
+#if defined (iPlatformMobile)
+    float left = 0.0f, right = 0.0f, top = 0.0f, bottom = 0.0f;
 #if defined (iPlatformAppleMobile)
-    float left, right, top, bottom;
     safeAreaInsets_iOS(&left, &top, &right, &bottom);
+#endif
     setPadding_Widget(sheet, left, 0, right, 0);
     navi->rect.pos = init_I2(left, top);
     iConstForEach(PtrArray, i, findChildren_Widget(sheet, "panel.toppad")) {
diff --git a/src/ui/root.c b/src/ui/root.c
index a8b9f998..a72f002c 100644
--- a/src/ui/root.c
+++ b/src/ui/root.c
@@ -83,7 +83,7 @@ static const iMenuItem navMenuItems_[] = {
 };
 #endif
 
-#if defined (iPlatformAppleMobile)
+#if defined (iPlatformMobile)
 /* Tablet menu. */
 static const iMenuItem tabletNavMenuItems_[] = {
     { folder_Icon " ${menu.openfile}", SDLK_o, KMOD_PRIMARY, "file.open" },
@@ -120,9 +120,9 @@ static const iMenuItem phoneNavMenuItems_[] = {
     { "---", 0, 0, NULL },
     { gear_Icon " Settings...", SDLK_COMMA, KMOD_PRIMARY, "preferences" },
 };
-#endif /* AppleMobile */
+#endif /* Mobile */
 
-#if defined (iPlatformAppleMobile)
+#if defined (iPlatformMobile)
 static const iMenuItem identityButtonMenuItems_[] = {
     { "${menu.identity.notactive}", 0, 0, "ident.showactive" },
     { "---", 0, 0, NULL },
@@ -498,9 +498,10 @@ static void checkLoadAnimation_Root_(iRoot *d) {
 
 void updatePadding_Root(iRoot *d) {
     if (d == NULL) return;
-#if defined (iPlatformAppleMobile)
     iWidget *toolBar = findChild_Widget(d->widget, "toolbar");
-    float left, top, right, bottom;
+    float bottom = 0.0f;
+#if defined (iPlatformAppleMobile)
+    float left, top, right;
     safeAreaInsets_iOS(&left, &top, &right, &bottom);
     /* Respect the safe area insets. */ {
         setPadding_Widget(findChild_Widget(d->widget, "navdiv"), left, top, right, 0);
@@ -508,6 +509,7 @@ void updatePadding_Root(iRoot *d) {
             setPadding_Widget(toolBar, left, 0, right, bottom);
         }
     }
+#endif
     if (toolBar) {
         /* TODO: get this from toolBar height, but it's buggy for some reason */
         const int sidebarBottomPad = isPortrait_App() ? 11 * gap_UI + bottom : 0;
@@ -517,7 +519,6 @@ void updatePadding_Root(iRoot *d) {
            are not arranged correctly until it's hidden and reshown. */
     }
     /* Note that `handleNavBarCommands_` also adjusts padding and spacing. */
-#endif
 }
 
 void updateToolbarColors_Root(iRoot *d) {
@@ -829,13 +830,13 @@ static iBool handleSearchBarCommands_(iWidget *searchBar, const char *cmd) {
     return iFalse;
 }
 
-#if defined (iPlatformAppleMobile)
+#if defined (iPlatformMobile)
 static void dismissSidebar_(iWidget *sidebar, const char *toolButtonId) {
     if (isVisible_Widget(sidebar)) {
         postCommandf_App("%s.toggle", cstr_String(id_Widget(sidebar)));
-        if (toolButtonId) {
+//        if (toolButtonId) {
             //            setFlags_Widget(findWidget_App(toolButtonId), noBackground_WidgetFlag, iTrue);
-        }
+//        }
         setVisualOffset_Widget(sidebar, height_Widget(sidebar), 250, easeIn_AnimFlag);
     }
 }
@@ -909,7 +910,7 @@ static iBool handleToolBarCommands_(iWidget *toolBar, const char *cmd) {
     }
     return iFalse;
 }
-#endif /* defined (iPlatformAppleMobile) */
+#endif /* defined (iPlatformMobile) */
 
 static iLabelWidget *newLargeIcon_LabelWidget(const char *text, const char *cmd) {
     iLabelWidget *lab = newIcon_LabelWidget(text, 0, 0, cmd);
@@ -1198,8 +1199,8 @@ void createUserInterface_Root(iRoot *d) {
 #if defined (iPlatformMobile)
         const iBool isPhone = (deviceType_App() == phone_AppDeviceType);
 #endif
-#if !defined (iHaveNativeMenus)
-#   if defined (iPlatformAppleMobile)
+#if !defined (iHaveNativeMenus) || defined (iPlatformMobile)
+#   if defined (iPlatformMobile)
         iLabelWidget *navMenu =
             makeMenuButton_LabelWidget(menu_Icon, isPhone ? phoneNavMenuItems_ : tabletNavMenuItems_,
                                        isPhone ? iElemCount(phoneNavMenuItems_) : iElemCount(tabletNavMenuItems_));
@@ -1280,9 +1281,9 @@ void createUserInterface_Root(iRoot *d) {
         addChild_Widget(searchBar, iClob(newIcon_LabelWidget("  \u2b9d  ", 'g', KMOD_PRIMARY | KMOD_SHIFT, "find.prev")));
         addChild_Widget(searchBar, iClob(newIcon_LabelWidget(close_Icon, SDLK_ESCAPE, 0, "find.close")));
     }
-#if defined (iPlatformAppleMobile)
+#if defined (iPlatformMobile)
     /* Bottom toolbar. */
-    if (isPhone_iOS()) {
+    if (deviceType_App() == phone_AppDeviceType) {
         iWidget *toolBar = new_Widget();
         addChild_Widget(root, iClob(toolBar));
         setId_Widget(toolBar, "toolbar");
diff --git a/src/ui/sidebarwidget.c b/src/ui/sidebarwidget.c
index c2ad7bc6..b816b572 100644
--- a/src/ui/sidebarwidget.c
+++ b/src/ui/sidebarwidget.c
@@ -644,7 +644,7 @@ void init_SidebarWidget(iSidebarWidget *d, enum iSidebarSide side) {
     d->buttonFont = uiLabel_FontId;
     d->itemFonts[0] = uiContent_FontId;
     d->itemFonts[1] = uiContentBold_FontId;
-#if defined (iPlatformAppleMobile)
+#if defined (iPlatformMobile)
     if (deviceType_App() == phone_AppDeviceType) {
         d->itemFonts[0] = defaultBig_FontId;
         d->itemFonts[1] = defaultBigBold_FontId;
diff --git a/src/ui/text.c b/src/ui/text.c
index 006a4d0b..231281eb 100644
--- a/src/ui/text.c
+++ b/src/ui/text.c
@@ -361,7 +361,7 @@ static void initFonts_Text_(iText *d) {
         h12Font = &fontIosevkaTermExtended_Embedded;
         h3Font  = &fontIosevkaTermExtended_Embedded;
     }
-#if defined (iPlatformAppleMobile)
+#if defined (iPlatformMobile)
     const float uiSize = fontSize_UI * 1.1f;
 #else
     const float uiSize = fontSize_UI;
@@ -889,6 +889,7 @@ static void prepare_AttributedText_(iAttributedText *d, int overrideBaseDir, iCh
         resize_Array(&d->visualToLogical, length);
         d->bidiLevels = length ? malloc(length) : NULL;
         FriBidiParType baseDir = (FriBidiParType) FRIBIDI_TYPE_ON;
+        /* TODO: If this returns zero (error occurred), act like everything is LTR. */
         fribidi_log2vis(constData_Array(&d->logical),
                         length,
                         &baseDir,
diff --git a/src/ui/window.c b/src/ui/window.c
index f8391ed9..3ac02495 100644
--- a/src/ui/window.c
+++ b/src/ui/window.c
@@ -443,7 +443,11 @@ void init_Window(iWindow *d, iRect rect) {
     if (left_Rect(rect) >= 0 || top_Rect(rect) >= 0) {
         SDL_SetWindowPosition(d->win, left_Rect(rect), top_Rect(rect));
     }
+#if defined (iPlatformMobile)
+    const iInt2 minSize = zero_I2(); /* windows aren't independently resizable */
+#else
     const iInt2 minSize = init_I2(425, 325);
+#endif
     SDL_SetWindowMinimumSize(d->win, minSize.x, minSize.y);
     SDL_SetWindowTitle(d->win, "Lagrange");
     /* Some info. */ {
@@ -712,7 +716,6 @@ static iBool handleWindowEvent_Window_(iWindow *d, const SDL_WindowEvent *ev) {
                 }
             }
 #endif /* defined LAGRANGE_ENABLE_CUSTOM_FRAME */
-            //printf("MOVED: %d, %d\n", ev->data1, ev->data2); fflush(stdout);
             if (unsnap_Window_(d, &newPos)) {
                 return iTrue;
             }
@@ -753,7 +756,13 @@ static iBool handleWindowEvent_Window_(iWindow *d, const SDL_WindowEvent *ev) {
         case SDL_WINDOWEVENT_MINIMIZED:
             d->isMinimized = iTrue;
             return iTrue;
-#endif /* defined (iPlatformDesktop) */
+#else /* if defined (!iPlatformDesktop) */
+        case SDL_WINDOWEVENT_RESIZED:
+            /* On mobile, this occurs when the display is rotated. */
+            invalidate_Window(d);
+            postRefresh_App();
+            return iTrue;
+#endif
         case SDL_WINDOWEVENT_LEAVE:
             unhover_Widget();
             d->isMouseInside = iFalse;
@@ -763,19 +772,12 @@ static iBool handleWindowEvent_Window_(iWindow *d, const SDL_WindowEvent *ev) {
             d->isMouseInside = iTrue;
             postCommand_App("window.mouse.entered");
             return iTrue;
-#if defined (iPlatformMobile)
-        case SDL_WINDOWEVENT_RESIZED:
-            /* On mobile, this occurs when the display is rotated. */
-            invalidate_Window(d);
-            postRefresh_App();
-            return iTrue;
-#endif
         case SDL_WINDOWEVENT_FOCUS_GAINED:
             d->focusGainedAt = SDL_GetTicks();
             setCapsLockDown_Keys(iFalse);
             postCommand_App("window.focus.gained");
             d->isExposed = iTrue;
-#if defined (iPlatformMobile)
+#if !defined (iPlatformDesktop)
             /* Returned to foreground, may have lost buffered content. */
             invalidate_Window_(d, iTrue);
             postCommand_App("window.unfreeze");
@@ -783,7 +785,7 @@ static iBool handleWindowEvent_Window_(iWindow *d, const SDL_WindowEvent *ev) {
             return iFalse;
         case SDL_WINDOWEVENT_FOCUS_LOST:
             postCommand_App("window.focus.lost");
-#if defined (iPlatformMobile)
+#if !defined (iPlatformDesktop)
             setFreezeDraw_Window(d, iTrue);
 #endif
             return iFalse;
@@ -949,6 +951,10 @@ iBool setKeyRoot_Window(iWindow *d, iRoot *root) {
     return iFalse;
 }
 
+iLocalDef iBool isEscapeKeypress_(const SDL_Event *ev) {
+    return (ev->type == SDL_KEYDOWN || ev->type == SDL_KEYUP) && ev->key.keysym.sym == SDLK_ESCAPE;
+}
+
 iBool dispatchEvent_Window(iWindow *d, const SDL_Event *ev) {
     if (ev->type == SDL_MOUSEMOTION) {
         /* Hover widget may change. */
@@ -964,7 +970,11 @@ iBool dispatchEvent_Window(iWindow *d, const SDL_Event *ev) {
             }
             if ((ev->type == SDL_KEYDOWN || ev->type == SDL_KEYUP || ev->type == SDL_TEXTINPUT)
                      && d->keyRoot != root) {
-                continue; /* Key events go only to the root with keyboard focus. */
+                if (!isEscapeKeypress_(ev)) {
+                    /* Key events go only to the root with keyboard focus, with the exception
+                       of Escape that will also affect the entire window. */
+                    continue; 
+                }
             }
             if (ev->type == SDL_MOUSEWHEEL && !contains_Rect(rect_Root(root),
                                                              coord_MouseWheelEvent(&ev->wheel))) {
@@ -1015,7 +1025,6 @@ void draw_Window(iWindow *d) {
     if (d->isDrawFrozen) {
         return;
     }
-//#if defined (iPlatformMobile)
     /* Check if root needs resizing. */ {
         iInt2 renderSize;
         SDL_GetRendererOutputSize(d->render, &renderSize.x, &renderSize.y);
@@ -1024,7 +1033,6 @@ void draw_Window(iWindow *d) {
             processEvents_App(postedEventsOnly_AppEventMode);
         }
     }
-//#endif
     const int   winFlags = SDL_GetWindowFlags(d->win);
     const iBool gotFocus = (winFlags & SDL_WINDOW_INPUT_FOCUS) != 0;
     iPaint p;
@@ -1032,7 +1040,7 @@ void draw_Window(iWindow *d) {
     /* Clear the window. The clear color is visible as a border around the window
        when the custom frame is being used. */ {
         setCurrent_Root(d->roots[0]);
-#if defined (iPlatformAppleMobile)
+#if defined (iPlatformMobile)
        iColor back = get_Color(uiBackground_ColorId);
        if (deviceType_App() == phone_AppDeviceType) {
            /* Page background extends to safe area, so fill it completely. */