9 files changed, 250 insertions, 72 deletions

diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index e18d5283..105a7158 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -200,6 +200,8 @@ enum iDocumentWidgetFlag {
     selectWords_DocumentWidgetFlag           = iBit(7),
     selectLines_DocumentWidgetFlag           = iBit(8),
     pinchZoom_DocumentWidgetFlag             = iBit(9),
+    movingSelectMarkStart_DocumentWidgetFlag = iBit(10),
+    movingSelectMarkEnd_DocumentWidgetFlag   = iBit(11),
 };
 
 enum iDocumentLinkOrdinalMode {
@@ -251,6 +253,7 @@ struct Impl_DocumentWidget {
     const iGmRun * firstVisibleRun;
     const iGmRun * lastVisibleRun;
     iClick         click;
+    iInt2          contextPos; /* coordinates of latest right click */
     iString        pendingGotoHeading;
     float          initNormScrollY;
     iAnim          scrollY;
@@ -259,6 +262,7 @@ struct Impl_DocumentWidget {
     iScrollWidget *scroll;
     iWidget *      menu;
     iWidget *      playerMenu;
+    iWidget *      copyMenu;
     iVisBuf *      visBuf;
     iPtrSet *      invalidRuns;
     iDrawBufs *    drawBufs; /* dynamic state for drawing */
@@ -324,6 +328,7 @@ void init_DocumentWidget(iDocumentWidget *d) {
     addChild_Widget(w, iClob(d->scroll = new_ScrollWidget()));
     d->menu         = NULL; /* created when clicking */
     d->playerMenu   = NULL;
+    d->copyMenu     = NULL;
     d->drawBufs     = new_DrawBufs();
     d->translation  = NULL;
     addChildFlags_Widget(w,
@@ -367,6 +372,15 @@ void deinit_DocumentWidget(iDocumentWidget *d) {
     deinit_PersistentDocumentState(&d->mod);
 }
 
+static iRangecc selectMark_DocumentWidget_(const iDocumentWidget *d) {
+    /* Normalize so start < end. */
+    iRangecc norm = d->selectMark;
+    if (norm.start > norm.end) {
+        iSwap(const char *, norm.start, norm.end);
+    }
+    return norm;
+}
+
 static void enableActions_DocumentWidget_(iDocumentWidget *d, iBool enable) {
     /* Actions are invisible child widgets of the DocumentWidget. */
     iForEach(ObjectList, i, children_Widget(d)) {
@@ -1747,6 +1761,26 @@ static iBool handleCommand_DocumentWidget_(iDocumentWidget *d, const char *cmd)
         updateWindowTitle_DocumentWidget_(d);
         return iFalse;
     }
+    else if (equal_Command(cmd, "document.select") && d == document_App()) {
+        /* Touch selection mode. */
+        if (!arg_Command(cmd)) {
+            d->selectMark = iNullRange;
+            setFlags_Widget(w, touchDrag_WidgetFlag, iFalse);
+            setFadeEnabled_ScrollWidget(d->scroll, iTrue);
+        }
+        else {
+            setFlags_Widget(w, touchDrag_WidgetFlag, iTrue);
+            d->flags |= movingSelectMarkEnd_DocumentWidgetFlag |
+                        selectWords_DocumentWidgetFlag; /* finger-based selection is imprecise */
+            d->flags &= ~selectLines_DocumentWidgetFlag;
+            setFadeEnabled_ScrollWidget(d->scroll, iFalse);
+            d->selectMark = sourceLoc_DocumentWidget_(d, d->contextPos);
+            extendRange_Rangecc(&d->selectMark, range_String(source_GmDocument(d->doc)),
+                                word_RangeExtension | bothStartAndEnd_RangeExtension);
+            d->initialSelectMark = d->selectMark;
+        }
+        return iTrue;
+    }
     else if (equal_Command(cmd, "document.info") && d == document_App()) {
         const char *unchecked       = red_ColorEscape "\u2610";
         const char *checked         = green_ColorEscape "\u2611";
@@ -1870,6 +1904,9 @@ static iBool handleCommand_DocumentWidget_(iDocumentWidget *d, const char *cmd)
         }
         SDL_SetClipboardText(cstr_String(copied));
         delete_String(copied);
+        if (flags_Widget(w) & touchDrag_WidgetFlag) {
+            postCommand_App("document.select arg:0");
+        }
         return iTrue;
     }
     else if (equal_Command(cmd, "document.copylink") && document_App() == d) {
@@ -1960,7 +1997,7 @@ static iBool handleCommand_DocumentWidget_(iDocumentWidget *d, const char *cmd)
         cacheDocumentGlyphs_DocumentWidget_(d);
         return iFalse;
     }
-    else if (equalWidget_Command(cmd, w, "document.translate")) {
+    else if (equal_Command(cmd, "document.translate") && d == document_App()) {
         if (!d->translation) {
             d->translation = new_Translation(d);
         }
@@ -2623,10 +2660,12 @@ static iBool processEvent_DocumentWidget_(iDocumentWidget *d, const SDL_Event *e
         }
         if (ev->button.button == SDL_BUTTON_RIGHT &&
             contains_Widget(w, init_I2(ev->button.x, ev->button.y))) {
-            if (!d->menu || !isVisible_Widget(d->menu)) {
+            if (!isVisible_Widget(d->menu)) {
                 d->contextLink = d->hoverLink;
+                d->contextPos = init_I2(ev->button.x, ev->button.y);
                 if (d->menu) {
                     destroy_Widget(d->menu);
+                    d->menu = NULL;
                 }
                 setFocus_Widget(NULL);
                 iArray items;
@@ -2637,6 +2676,12 @@ static iBool processEvent_DocumentWidget_(iDocumentWidget *d, const SDL_Event *e
                     const iRangecc scheme   = urlScheme_String(linkUrl);
                     const iBool    isGemini = equalCase_Rangecc(scheme, "gemini");
                     iBool          isNative = iFalse;
+                    if (deviceType_App() != desktop_AppDeviceType) {
+                        /* Show the link as the first, non-interactive item. */
+                        pushBack_Array(&items, &(iMenuItem){
+                            format_CStr("```%s", cstr_String(linkUrl)),
+                            0, 0, NULL });
+                    }
                     if (willUseProxy_App(scheme) || isGemini ||
                         equalCase_Rangecc(scheme, "finger") ||
                         equalCase_Rangecc(scheme, "gopher")) {
@@ -2707,24 +2752,18 @@ static iBool processEvent_DocumentWidget_(iDocumentWidget *d, const SDL_Event *e
                         }
                     }
                 }
-                else {
+                else if (deviceType_App() == desktop_AppDeviceType) {
                     if (!isEmpty_Range(&d->selectMark)) {
-                        pushBackN_Array(
-                            &items,
-                            (iMenuItem[]){ { "${menu.copy}", 0, 0, "copy" }, { "---", 0, 0, NULL } },
-                            2);
-                    }
-                    if (deviceType_App() == desktop_AppDeviceType) {
-                        pushBackN_Array(
-                            &items,
-                            (iMenuItem[]){
-                                { "${menu.back}", navigateBack_KeyShortcut, "navigate.back" },
-                                { "${menu.forward}", navigateForward_KeyShortcut, "navigate.forward" } },
-                            2);
+                        pushBackN_Array(&items,
+                                        (iMenuItem[]){ { "${menu.copy}", 0, 0, "copy" },
+                                                       { "---", 0, 0, NULL } },
+                                        2);
                     }
                     pushBackN_Array(
                         &items,
                         (iMenuItem[]){
+                            { "${menu.back}", navigateBack_KeyShortcut, "navigate.back" },
+                            { "${menu.forward}", navigateForward_KeyShortcut, "navigate.forward" },
                             { upArrow_Icon " ${menu.parent}", navigateParent_KeyShortcut, "navigate.parent" },
                             { upArrowBar_Icon " ${menu.root}", navigateRoot_KeyShortcut, "navigate.root" },
                             { "---", 0, 0, NULL },
@@ -2738,7 +2777,7 @@ static iBool processEvent_DocumentWidget_(iDocumentWidget *d, const SDL_Event *e
                             { globe_Icon " ${menu.page.translate}", 0, 0, "document.translate" },
                             { "---", 0, 0, NULL },
                             { "${menu.page.copyurl}", 0, 0, "document.copylink" } },
-                        12);
+                        15);
                     if (isEmpty_Range(&d->selectMark)) {
                         pushBackN_Array(
                             &items,
@@ -2748,6 +2787,21 @@ static iBool processEvent_DocumentWidget_(iDocumentWidget *d, const SDL_Event *e
                             2);
                     }
                 }
+                else {
+                    /* Mobile text selection menu. */
+#if 0
+                    pushBackN_Array(
+                        &items,
+                        (iMenuItem[]){
+                            { "${menu.select}", 0, 0, "document.select arg:1" },
+                            { "${menu.select.word}", 0, 0, "document.select arg:2" },
+                            { "${menu.select.par}", 0, 0, "document.select arg:3" },
+                        },
+                        3);
+#endif
+                    postCommand_App("document.select arg:1");
+                    return iTrue;
+                }
                 d->menu = makeMenu_Widget(w, data_Array(&items), size_Array(&items));
                 deinit_Array(&items);
             }
@@ -2763,26 +2817,29 @@ static iBool processEvent_DocumentWidget_(iDocumentWidget *d, const SDL_Event *e
             if (d->grabbedPlayer) {
                 return iTrue;
             }
+            /* Enable hover state now that scrolling has surely finished. */
             if (d->flags & noHoverWhileScrolling_DocumentWidgetFlag) {
                 d->flags &= ~noHoverWhileScrolling_DocumentWidgetFlag;
                 updateHover_DocumentWidget_(d, mouseCoord_Window(get_Window()));
             }
-            iChangeFlags(d->flags, selecting_DocumentWidgetFlag, iFalse);
-            iChangeFlags(d->flags, selectWords_DocumentWidgetFlag, d->click.count == 2);
-            iChangeFlags(d->flags, selectLines_DocumentWidgetFlag, d->click.count >= 3);
-            /* Double/triple clicks marks the selection immediately. */
-            if (d->click.count >= 2) {
-                beginMarkingSelection_DocumentWidget_(d, d->click.startPos);
-                extendRange_Rangecc(
-                    &d->selectMark,
-                    range_String(source_GmDocument(d->doc)),
-                    bothStartAndEnd_RangeExtension |
-                        (d->click.count == 2 ? word_RangeExtension : line_RangeExtension));
-                d->initialSelectMark = d->selectMark;
-                refresh_Widget(w);
-            }
-            else {
-                d->initialSelectMark = iNullRange;
+            if (~flags_Widget(w) & touchDrag_WidgetFlag) {
+                iChangeFlags(d->flags, selecting_DocumentWidgetFlag, iFalse);
+                iChangeFlags(d->flags, selectWords_DocumentWidgetFlag, d->click.count == 2);
+                iChangeFlags(d->flags, selectLines_DocumentWidgetFlag, d->click.count >= 3);
+                /* Double/triple clicks marks the selection immediately. */
+                if (d->click.count >= 2) {
+                    beginMarkingSelection_DocumentWidget_(d, d->click.startPos);
+                    extendRange_Rangecc(
+                        &d->selectMark,
+                        range_String(source_GmDocument(d->doc)),
+                        bothStartAndEnd_RangeExtension |
+                            (d->click.count == 2 ? word_RangeExtension : line_RangeExtension));
+                    d->initialSelectMark = d->selectMark;
+                    refresh_Widget(w);
+                }
+                else {
+                    d->initialSelectMark = iNullRange;
+                }
             }
             return iTrue;
         case drag_ClickResult: {
@@ -2796,29 +2853,59 @@ static iBool processEvent_DocumentWidget_(iDocumentWidget *d, const SDL_Event *e
                 refresh_Widget(w);
                 return iTrue;
             }
-            /* Begin selecting a range of text. */
+            /* Fold/unfold a preformatted block. */
             if (~d->flags & selecting_DocumentWidgetFlag && d->hoverPre &&
                 preIsFolded_GmDocument(d->doc, d->hoverPre->preId)) {
                 return iTrue;
             }
+            /* Begin selecting a range of text. */
             if (~d->flags & selecting_DocumentWidgetFlag) {
                 beginMarkingSelection_DocumentWidget_(d, d->click.startPos);
             }
             iRangecc loc = sourceLoc_DocumentWidget_(d, pos_Click(&d->click));
-            if (!d->selectMark.start) {
+            if (d->selectMark.start == NULL) {
                 d->selectMark = loc;
             }
             else if (loc.end) {
-                d->selectMark.end = (d->selectMark.end > d->selectMark.start ? loc.end : loc.start);
+                if (flags_Widget(w) & touchDrag_WidgetFlag) {
+                    /* Choose which end to move. */
+                    if (!(d->flags & (movingSelectMarkStart_DocumentWidgetFlag |
+                                      movingSelectMarkEnd_DocumentWidgetFlag))) {
+                        const iRangecc mark    = selectMark_DocumentWidget_(d);
+                        const char *   midMark = mark.start + size_Range(&mark) / 2;
+                        const iRangecc loc     = sourceLoc_DocumentWidget_(d, pos_Click(&d->click));
+                        const iBool    isCloserToStart = d->selectMark.start > d->selectMark.end ?
+                            (loc.start > midMark) : (loc.start < midMark);
+                        iChangeFlags(d->flags, movingSelectMarkStart_DocumentWidgetFlag, isCloserToStart);
+                        iChangeFlags(d->flags, movingSelectMarkEnd_DocumentWidgetFlag, !isCloserToStart);
+                    }
+                    /* Move the start or the end depending on which is nearer. */
+                    if (d->flags & movingSelectMarkStart_DocumentWidgetFlag) {
+                        d->selectMark.start = loc.start;
+                    }
+                    else {
+                        d->selectMark.end = (d->selectMark.end > d->selectMark.start ? loc.end : loc.start);
+                    }
+                }
+                else {
+                    d->selectMark.end = (d->selectMark.end > d->selectMark.start ? loc.end : loc.start);
+                }
             }
             iAssert((!d->selectMark.start && !d->selectMark.end) ||
                     ( d->selectMark.start &&  d->selectMark.end));
-            /* Extend the selection when double/triple clicking. */
+            /* Extend to full words/paragraphs. */
             if (d->flags & (selectWords_DocumentWidgetFlag | selectLines_DocumentWidgetFlag)) {
                 extendRange_Rangecc(
                     &d->selectMark,
                     range_String(source_GmDocument(d->doc)),
-                    d->click.count == 2 ? word_RangeExtension : line_RangeExtension);
+                    (d->flags & movingSelectMarkStart_DocumentWidgetFlag ? moveStart_RangeExtension
+                                                                         : moveEnd_RangeExtension) |
+                        (d->flags & selectWords_DocumentWidgetFlag ? word_RangeExtension
+                                                                   : line_RangeExtension));
+                if (d->flags & movingSelectMarkStart_DocumentWidgetFlag) {
+                    d->initialSelectMark.start =
+                        d->initialSelectMark.end = d->selectMark.start;
+                }
                 if (!isEmpty_Range(&d->initialSelectMark)) {
                     if (d->selectMark.end > d->selectMark.start) {
                         d->selectMark.start = d->initialSelectMark.start;
@@ -2842,13 +2929,42 @@ static iBool processEvent_DocumentWidget_(iDocumentWidget *d, const SDL_Event *e
             if (isVisible_Widget(d->menu)) {
                 closeMenu_Widget(d->menu);
             }
+            d->flags &= ~(movingSelectMarkStart_DocumentWidgetFlag |
+                          movingSelectMarkEnd_DocumentWidgetFlag);
             if (!isMoved_Click(&d->click)) {
                 setFocus_Widget(NULL);
+                /* Tap in tap selection mode. */
+                if (flags_Widget(w) & touchDrag_WidgetFlag) {
+                    const iRangecc tapLoc = sourceLoc_DocumentWidget_(d, pos_Click(&d->click));
+                    /* Tapping on the selection will show a menu. */
+                    const iRangecc mark = selectMark_DocumentWidget_(d);
+                    if (tapLoc.start >= mark.start && tapLoc.end <= mark.end) {
+                        if (d->copyMenu) {
+                            closeMenu_Widget(d->copyMenu);
+                            destroy_Widget(d->copyMenu);
+                            d->copyMenu = NULL;
+                        }
+                        d->copyMenu = makeMenu_Widget(w, (iMenuItem[]){
+                            { clipCopy_Icon " ${menu.copy}", 0, 0, "copy" },
+                            { "---", 0, 0, NULL },
+                            { close_Icon " Clear Selection", 0, 0, "document.select arg:0" },
+                        }, 3);
+                        setFlags_Widget(d->copyMenu, noFadeBackground_WidgetFlag, iTrue);
+                        openMenu_Widget(d->copyMenu, pos_Click(&d->click));
+                        return iTrue;
+                    }
+                    else {
+                        /* Tapping elsewhere exits selection mode. */
+                        postCommand_Widget(d, "document.select arg:0");
+                        return iTrue;
+                    }
+                }
                 if (d->hoverPre) {
                     togglePreFold_DocumentWidget_(d, d->hoverPre->preId);
                     return iTrue;
                 }
                 if (d->hoverLink) {
+                    /* TODO: Move this to a method. */
                     const iGmLinkId linkId = d->hoverLink->linkId;
                     const int linkFlags = linkFlags_GmDocument(d->doc, linkId);
                     iAssert(linkId);
@@ -3636,6 +3752,18 @@ static void draw_DocumentWidget_(const iDocumentWidget *d) {
         drawCentered_Text(font, bounds, iFalse, uiBackground_ColorId, "%d %%",
                           d->pinchZoomPosted);
     }
+    /* Touch selection indicator. */
+    if (flags_Widget(w) & touchDrag_WidgetFlag) {
+        iString msg;
+        init_String(&msg);
+        format_String(&msg, "Selecting: drag and tap");
+        fillRect_Paint(&ctx.paint, (iRect){ topLeft_Rect(bounds),
+            init_I2(width_Rect(bounds), lineHeight_Text(uiLabelBold_FontId))},
+                       uiTextAction_ColorId);
+        drawRange_Text(uiLabelBold_FontId, addX_I2(topLeft_Rect(bounds), 3 * gap_UI),
+                       uiBackground_ColorId, range_String(&msg));
+        deinit_String(&msg);
+    }
 }
 
 /*----------------------------------------------------------------------------------------------*/
diff --git a/src/ui/scrollwidget.c b/src/ui/scrollwidget.c
index 55ede426..32b57c69 100644
--- a/src/ui/scrollwidget.c
+++ b/src/ui/scrollwidget.c
@@ -48,6 +48,7 @@ struct Impl_ScrollWidget {
     iClick click;
     int startThumb;
     iAnim opacity;
+    iBool fadeEnabled;
     uint32_t fadeStart;
     iBool willCheckFade;
 };
@@ -76,6 +77,7 @@ void init_ScrollWidget(iScrollWidget *d) {
     init_Click(&d->click, d, SDL_BUTTON_LEFT);
     init_Anim(&d->opacity, minOpacity_());
     d->willCheckFade = iFalse;
+    d->fadeEnabled = iTrue;
 }
 
 void deinit_ScrollWidget(iScrollWidget *d) {
@@ -108,7 +110,7 @@ static void unfade_ScrollWidget_(iScrollWidget *d, float opacity) {
         setValue_Anim(&d->opacity, opacity, 66);
         addTicker_App(animateOpacity_ScrollWidget_, d);
     }
-    if (!d->willCheckFade) {
+    if (!d->willCheckFade && d->fadeEnabled) {
         d->willCheckFade = iTrue;
         /* TODO: This causes an inexplicable refresh issue on macOS: the drawing of one frame
            takes 100ms for some reason (not the current frame but some time after). */
@@ -142,6 +144,11 @@ void setThumb_ScrollWidget(iScrollWidget *d, int thumb, int thumbSize) {
     }
 }
 
+void setFadeEnabled_ScrollWidget(iScrollWidget *d, iBool fadeEnabled) {
+    d->fadeEnabled = fadeEnabled;
+    unfade_ScrollWidget_(d, 1.0f);
+}
+
 static iBool processEvent_ScrollWidget_(iScrollWidget *d, const SDL_Event *ev) {
     iWidget *w = as_Widget(d);
     if (isMetricsChange_UserEvent(ev)) {
@@ -156,7 +163,7 @@ static iBool processEvent_ScrollWidget_(iScrollWidget *d, const SDL_Event *ev) {
         }
     }
     if (isCommand_UserEvent(ev, "scrollbar.fade")) {
-        if (d->willCheckFade && SDL_GetTicks() > d->fadeStart) {
+        if (d->fadeEnabled && d->willCheckFade && SDL_GetTicks() > d->fadeStart) {
             setValue_Anim(&d->opacity, minOpacity_(), 200);
             remove_Periodic(periodic_App(), d);
             d->willCheckFade = iFalse;
diff --git a/src/ui/scrollwidget.h b/src/ui/scrollwidget.h
index e6cda03d..e3f0a51f 100644
--- a/src/ui/scrollwidget.h
+++ b/src/ui/scrollwidget.h
@@ -31,3 +31,4 @@ iDeclareObjectConstruction(ScrollWidget)
 void    setRange_ScrollWidget   (iScrollWidget *, iRangei range);
 void    setThumb_ScrollWidget   (iScrollWidget *, int thumb, int thumbSize);
 
+void    setFadeEnabled_ScrollWidget (iScrollWidget *, iBool fadeEnabled);
diff --git a/src/ui/touch.c b/src/ui/touch.c
index 87bb7478..0f23e948 100644
--- a/src/ui/touch.c
+++ b/src/ui/touch.c
@@ -59,6 +59,7 @@ struct Impl_Touch {
     iBool hasMoved;
     iBool isTapBegun;
     iBool isTouchDrag;
+    iBool didConvertToTouchDrag;
     iBool isTapAndHold;
     int pinchId;
     enum iTouchEdge edge;
@@ -226,7 +227,7 @@ static void update_TouchState_(void *ptr) {
     /* Check for long presses to simulate right clicks. */
     iForEach(Array, i, d->touches) {
         iTouch *touch = i.value;
-        if (touch->pinchId) {
+        if (touch->pinchId || touch->isTouchDrag) {
             continue;
         }
         /* Holding a touch will reset previous momentum for this widget. */
@@ -253,6 +254,14 @@ static void update_TouchState_(void *ptr) {
 #endif
                 dispatchMotion_Touch_(init_F3(-100, -100, 0), 0);
             }
+            if (touch->isTapAndHold && touch->affinity &&
+                flags_Widget(touch->affinity) & touchDrag_WidgetFlag) {
+                /* Convert to touch drag. */
+                touch->isTapAndHold = iFalse;
+                touch->isTouchDrag = iTrue;
+                touch->didConvertToTouchDrag = iTrue;
+                dispatchButtonDown_Touch_(touch->pos[0]);
+            }
         }
     }
     /* Update/cancel momentum scrolling. */ {
@@ -486,16 +495,7 @@ iBool processEvent_Touch(const SDL_Event *ev) {
                 touch->edge = none_TouchEdge;
                 pushPos_Touch_(touch, pos, fing->timestamp);
                 dispatchMotion_Touch_(touch->startPos, 0);
-                dispatchEvent_Widget(window->root, (SDL_Event *) &(SDL_MouseButtonEvent){
-                    .type = SDL_MOUSEBUTTONDOWN,
-                    .timestamp = fing->timestamp,
-                    .clicks = 1,
-                    .state = SDL_PRESSED,
-                    .which = SDL_TOUCH_MOUSEID,
-                    .button = SDL_BUTTON_LEFT,
-                    .x = x_F3(touch->startPos),
-                    .y = y_F3(touch->startPos)
-                });
+                dispatchButtonDown_Touch_(touch->startPos);
                 dispatchMotion_Touch_(pos, SDL_BUTTON_LMASK);
                 return iTrue;
             }
@@ -603,11 +603,10 @@ iBool processEvent_Touch(const SDL_Event *ev) {
                 continue;
             }
             if (flags_Widget(touch->affinity) & touchDrag_WidgetFlag) {
-                if (!touch->isTouchDrag) {
+                if (!touch->isTouchDrag && !touch->didConvertToTouchDrag) {
                     dispatchButtonDown_Touch_(touch->startPos);
                 }
                 dispatchButtonUp_Touch_(pos);
-//                setHover_Widget(NULL);
                 remove_ArrayIterator(&i);
                 continue;
             }
@@ -678,7 +677,7 @@ void widgetDestroyed_Touch(iWidget *widget) {
         }
     }
     iForEach(Array, p, d->pinches) {
-        iPinch *pinch = i.value;
+        iPinch *pinch = p.value;
         if (pinch->affinity == widget) {
             remove_ArrayIterator(&p);
         }
diff --git a/src/ui/util.c b/src/ui/util.c
index e6edb119..047fa7af 100644
--- a/src/ui/util.c
+++ b/src/ui/util.c
@@ -220,20 +220,18 @@ static const char *moveForward_(const char *pos, iRangecc bounds, int mode) {
 void extendRange_Rangecc(iRangecc *d, iRangecc bounds, int mode) {
     if (!d->start) return;
     if (d->end >= d->start) {
-        if (mode & bothStartAndEnd_RangeExtension) {
+        if (mode & moveStart_RangeExtension) {
             d->start = moveBackward_(d->start, bounds, mode);
-            d->end   = moveForward_(d->end, bounds, mode);
         }
-        else {
+        if (mode & moveEnd_RangeExtension) {
             d->end = moveForward_(d->end, bounds, mode);
         }
     }
     else {
-        if (mode & bothStartAndEnd_RangeExtension) {
+        if (mode & moveStart_RangeExtension) {
             d->start = moveForward_(d->start, bounds, mode);
-            d->end   = moveBackward_(d->end, bounds, mode);
         }
-        else {
+        if (mode & moveEnd_RangeExtension) {
             d->end = moveBackward_(d->end, bounds, mode);
         }
     }
@@ -573,13 +571,22 @@ iWidget *makeMenu_Widget(iWidget *parent, const iMenuItem *items, size_t n) {
             addChild_Widget(menu, iClob(makeMenuSeparator_()));
         }
         else {
+            iBool isInfo = iFalse;
+            const char *labelText = item->label;
+            if (startsWith_CStr(labelText, "```")) {
+                labelText += 3;
+                isInfo = iTrue;
+            }
             iLabelWidget *label = addChildFlags_Widget(
                 menu,
-                iClob(newKeyMods_LabelWidget(item->label, item->key, item->kmods, item->command)),
+                iClob(newKeyMods_LabelWidget(labelText, item->key, item->kmods, item->command)),
                 noBackground_WidgetFlag | frameless_WidgetFlag | alignLeft_WidgetFlag |
-                    drawKey_WidgetFlag | itemFlags);
+                drawKey_WidgetFlag | (isInfo ? wrapText_WidgetFlag : 0) | itemFlags);
             haveIcons |= checkIcon_LabelWidget(label);
             updateSize_LabelWidget(label); /* drawKey was set */
+            if (isInfo) {
+                setTextColor_LabelWidget(label, uiTextAction_ColorId);
+            }
         }
     }
     if (deviceType_App() == phone_AppDeviceType) {
@@ -639,6 +646,9 @@ void openMenuFlags_Widget(iWidget *d, iInt2 coord, iBool postCommands) {
             if (isInstance_Object(i.object, &Class_LabelWidget)) {
                 iLabelWidget *label = i.object;
                 const iBool isCaution = startsWith_String(text_LabelWidget(label), uiTextCaution_ColorEscape);
+                if (flags_Widget(as_Widget(label)) & wrapText_WidgetFlag) {
+                    continue;
+                }
                 if (deviceType_App() == desktop_AppDeviceType) {
                     setFont_LabelWidget(label, isCaution ? uiLabelBold_FontId : uiLabel_FontId);
                 }
diff --git a/src/ui/util.h b/src/ui/util.h
index 42dad6e0..d39a00fa 100644
--- a/src/ui/util.h
+++ b/src/ui/util.h
@@ -86,7 +86,9 @@ iLocalDef iBool isOverlapping_Rangei(iRangei a, iRangei b) {
 enum iRangeExtension {
     word_RangeExtension            = iBit(1),
     line_RangeExtension            = iBit(2),
-    bothStartAndEnd_RangeExtension = iBit(3),
+    moveStart_RangeExtension       = iBit(3),
+    moveEnd_RangeExtension         = iBit(4),
+    bothStartAndEnd_RangeExtension = moveStart_RangeExtension | moveEnd_RangeExtension,
 };
 
 void        extendRange_Rangecc     (iRangecc *, iRangecc bounds, int mode);
diff --git a/src/ui/widget.c b/src/ui/widget.c
index 3eea761e..78a8a8bf 100644
--- a/src/ui/widget.c
+++ b/src/ui/widget.c
@@ -1004,8 +1004,7 @@ void drawBackground_Widget(const iWidget *d) {
     }
     /* Popup menus have a shadowed border. */
     iBool shadowBorder   = (d->flags & keepOnTop_WidgetFlag && ~d->flags & mouseModal_WidgetFlag) != 0;
-    iBool fadeBackground = (d->bgColor >= 0 || d->frameColor >= 0) &&
-                                 d->flags & mouseModal_WidgetFlag;
+    iBool fadeBackground = (d->bgColor >= 0 || d->frameColor >= 0) && d->flags & mouseModal_WidgetFlag;
     if (deviceType_App() == phone_AppDeviceType) {
         if (shadowBorder) {
             fadeBackground = iTrue;
@@ -1017,7 +1016,7 @@ void drawBackground_Widget(const iWidget *d) {
         init_Paint(&p);
         drawSoftShadow_Paint(&p, bounds_Widget(d), 12 * gap_UI, black_ColorId, 30);
     }
-    if (fadeBackground) {
+    if (fadeBackground && ~d->flags & noFadeBackground_WidgetFlag) {
         iPaint p;
         init_Paint(&p);
         p.alpha = 0x50;
diff --git a/src/ui/widget.h b/src/ui/widget.h
index 27295149..2116e0d8 100644
--- a/src/ui/widget.h
+++ b/src/ui/widget.h
@@ -113,6 +113,7 @@ enum iWidgetFlag {
 #define moveToParentBottomEdge_WidgetFlag   iBit64(57)
 #define parentCannotResizeHeight_WidgetFlag iBit64(58)
 #define ignoreForParentWidth_WidgetFlag     iBit64(59)
+#define noFadeBackground_WidgetFlag         iBit64(60)
 
 enum iWidgetAddPos {
     back_WidgetAddPos,
diff --git a/src/ui/window.c b/src/ui/window.c
index d00d19a7..0a5bab6f 100644
--- a/src/ui/window.c
+++ b/src/ui/window.c
@@ -362,7 +362,8 @@ static const iMenuItem identityButtonMenuItems_[] = {
 };
 #endif
 
-static const char *reloadCStr_ = reload_Icon;
+static const char *reloadCStr_   = reload_Icon;
+static const char *pageMenuCStr_ = midEllipsis_Icon;
 
 /* TODO: A preference for these, maybe? */
 static const char *stopSeqCStr_[] = {
@@ -476,8 +477,14 @@ static uint32_t updateReloadAnimation_Window_(uint32_t interval, void *window) {
 }
 
 static void setReloadLabel_Window_(iWindow *d, iBool animating) {
+    const iBool isMobile = deviceType_App() != desktop_AppDeviceType;
     iLabelWidget *label = findChild_Widget(d->root, "reload");
-    updateTextCStr_LabelWidget(label, animating ? loadAnimationCStr_() : reloadCStr_);
+    updateTextCStr_LabelWidget(label, animating ? loadAnimationCStr_() :
+                               (isMobile ? pageMenuCStr_ : reloadCStr_));
+    if (isMobile) {
+        setCommand_LabelWidget(label,
+                               collectNewCStr_String(animating ? "navigate.reload" : "menu.open"));
+    }
 }
 
 static void checkLoadAnimation_Window_(iWindow *d) {
@@ -1047,11 +1054,35 @@ static void setupUserInterface_Window(iWindow *d) {
                 addChildFlags_Widget(
                     rightEmbed, iClob(progress), collapse_WidgetFlag);
             }
-            /* Reload button. */
-            iLabelWidget *reload = newIcon_LabelWidget(reloadCStr_, 0, 0, "navigate.reload");
-            setId_Widget(as_Widget(reload), "reload");
-            addChildFlags_Widget(as_Widget(url), iClob(reload), embedFlags | moveToParentRightEdge_WidgetFlag);
-            updateSize_LabelWidget(reload);
+            /* Reload button. */ {
+                iLabelWidget *reload;
+                if (deviceType_App() == desktop_AppDeviceType) {
+                    reload = newIcon_LabelWidget(reloadCStr_, 0, 0, "navigate.reload");
+                }
+                else {
+                    /* In a mobile layout, the reload button is replaced with the Page/Ellipsis menu. */
+                    reload = makeMenuButton_LabelWidget(pageMenuCStr_,
+                        (iMenuItem[]){
+                            { reload_Icon " ${menu.reload}", reload_KeyShortcut, "navigate.reload" },
+                            { timer_Icon " ${menu.autoreload}", 0, 0, "document.autoreload.menu" },
+                            { "---", 0, 0, NULL },
+                            { upArrow_Icon " ${menu.parent}", navigateParent_KeyShortcut, "navigate.parent" },
+                            { upArrowBar_Icon " ${menu.root}", navigateRoot_KeyShortcut, "navigate.root" },
+                            { "---", 0, 0, NULL },
+                            { pin_Icon " ${menu.page.bookmark}", SDLK_d, KMOD_PRIMARY, "bookmark.add" },
+                            { star_Icon " ${menu.page.subscribe}", subscribeToPage_KeyModifier, "feeds.subscribe" },
+                            { book_Icon " ${menu.page.import}", 0, 0, "bookmark.links confirm:1" },
+                            { globe_Icon " ${menu.page.translate}", 0, 0, "document.translate" },
+                            { "---", 0, 0, NULL },
+                            { "${menu.page.copyurl}", 0, 0, "document.copylink" },
+                            { "${menu.page.copysource}", 'c', KMOD_PRIMARY, "copy" },
+                            { download_Icon " " saveToDownloads_Label, SDLK_s, KMOD_PRIMARY, "document.save" } },
+                        14);
+                }
+                setId_Widget(as_Widget(reload), "reload");
+                addChildFlags_Widget(as_Widget(url), iClob(reload), embedFlags | moveToParentRightEdge_WidgetFlag);
+                updateSize_LabelWidget(reload);
+            }
             setId_Widget(addChild_Widget(rightEmbed, iClob(makePadding_Widget(0))), "url.embedpad");
         }
         if (deviceType_App() != desktop_AppDeviceType) {