14 files changed, 204 insertions, 83 deletions

diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index 25559890..a52e99af 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -1332,7 +1332,8 @@ static void drawRun_DrawContext_(void *context, const iGmRun *run) {
                            run->text);
     }
     else {
-        if (d->showLinkNumbers && run->linkId && run->flags & decoration_GmRunFlag) {
+        if (d->showLinkNumbers && run->linkId && run->flags & decoration_GmRunFlag &&
+            ~run->flags & caption_GmRunFlag) {
             const size_t ord = visibleLinkOrdinal_DocumentView_(d->view, run->linkId);
             if (ord >= d->view->owner->ordinalBase) {
                 const iChar ordChar =
@@ -1655,7 +1656,6 @@ static iBool render_DocumentView_(const iDocumentView *d, iDrawContext *ctx, iBo
             ctx->viewPos      = init_I2(left_Rect(ctx->docBounds) - left_Rect(bounds), -buf->origin);
             //            printf("  buffer %zu: buf vis range %d...%d\n", i, bufVisRange.start, bufVisRange.end);
             if (!prerenderExtra && !isEmpty_Range(&bufVisRange)) {
-                didDraw = iTrue;
                 if (isEmpty_Rangei(buf->validRange)) {
                     /* Fill the required currently visible range (vis). */
                     const iRangei bufVisRange = intersect_Rangei(bufRange, vis);
@@ -1668,26 +1668,46 @@ static iBool render_DocumentView_(const iDocumentView *d, iDrawContext *ctx, iBo
                         extend_GmRunRange_(&meta->runsDrawn);
                         buf->validRange = bufVisRange;
                         //                printf("  buffer %zu valid %d...%d\n", i, bufRange.start, bufRange.end);
+                        didDraw = iTrue;
                     }
                 }
                 else {
                     /* Progressively fill the required runs. */
-                    if (meta->runsDrawn.start) {
+                    if (meta->runsDrawn.start && buf->validRange.start > bufRange.start) {
                         beginTarget_Paint(p, buf->texture);
-                        meta->runsDrawn.start = renderProgressive_GmDocument(d->doc, meta->runsDrawn.start,
-                                                                             -1, iInvalidSize,
-                                                                             bufVisRange,
-                                                                             drawRun_DrawContext_,
-                                                                             ctx);
-                        buf->validRange.start = bufVisRange.start;
+                        iZap(ctx->runsDrawn);
+                        const iGmRun *newStart = renderProgressive_GmDocument(d->doc,
+                                                                              meta->runsDrawn.start,
+                                                                              -1,
+                                                                              iInvalidSize,
+                                                                              bufVisRange,
+                                                                              drawRun_DrawContext_,
+                                                                              ctx);
+                        if (ctx->runsDrawn.start) {
+                            /* Something was actually drawn, so update the valid range. */
+                            const int newTop = top_Rect(ctx->runsDrawn.start->visBounds);
+                            if (newTop != buf->validRange.start) {
+                                didDraw = iTrue;
+//                                printf("render: valid:%d->%d run:%p->%p\n",
+//                                       buf->validRange.start, newTop,
+//                                       meta->runsDrawn.start,
+//                                       ctx->runsDrawn.start); fflush(stdout);
+                                buf->validRange.start = newTop;
+                            }
+                            meta->runsDrawn.start = newStart;
+                        }
                     }
                     if (meta->runsDrawn.end) {
                         beginTarget_Paint(p, buf->texture);
+                        iZap(ctx->runsDrawn);
                         meta->runsDrawn.end = renderProgressive_GmDocument(d->doc, meta->runsDrawn.end,
                                                                            +1, iInvalidSize,
                                                                            bufVisRange,
                                                                            drawRun_DrawContext_,
                                                                            ctx);
+                        if (ctx->runsDrawn.start) {
+                            didDraw = iTrue;
+                        }
                         buf->validRange.end = bufVisRange.end;
                     }
                 }
@@ -2711,7 +2731,7 @@ static void updateDocument_DocumentWidget_(iDocumentWidget *d,
                                                                  : "media.untitled.audio");
                         iUrl parts;
                         init_Url(&parts, d->mod.url);
-                        if (!isEmpty_Range(&parts.path)) {
+                        if (!isEmpty_Range(&parts.path) && !equalCase_Rangecc(parts.scheme, "data")) {
                             linkTitle =
                                 baseName_Path(collect_String(newRange_String(parts.path))).start;
                         }
@@ -3095,12 +3115,14 @@ static const char *humanReadableStatusCode_(enum iGmStatusCode code) {
     return format_CStr("%d ", code);
 }
 
-static void setUrl_DocumentWidget_(iDocumentWidget *d, const iString *url) {
+static iBool setUrl_DocumentWidget_(iDocumentWidget *d, const iString *url) {
     url = canonicalUrl_String(url);
     if (!equal_String(d->mod.url, url)) {
         d->flags |= urlChanged_DocumentWidgetFlag;
         set_String(d->mod.url, url);
+        return iTrue;
     }
+    return iFalse;
 }
 
 static void checkResponse_DocumentWidget_(iDocumentWidget *d) {
@@ -3125,7 +3147,9 @@ static void checkResponse_DocumentWidget_(iDocumentWidget *d) {
             iMediaRequest *mr = newReused_MediaRequest(d, d->requestLinkId, d->request);
             unlockResponse_GmRequest(d->request);
             d->request = NULL; /* ownership moved */
-            postCommand_Widget(d, "document.request.cancelled doc:%p", d);
+            if (!isFinished_GmRequest(mr->req)) {
+                postCommand_Widget(d, "document.request.cancelled doc:%p", d);
+            }
             pushBack_ObjectList(d->media, mr);
             iRelease(mr);
             /* Reset the fetch state, returning to the originating page. */
@@ -3133,9 +3157,14 @@ static void checkResponse_DocumentWidget_(iDocumentWidget *d) {
             if (equal_String(&mostRecentUrl_History(d->mod.history)->url, url_GmRequest(mr->req))) {
                 undo_History(d->mod.history);
             }
-            setUrl_DocumentWidget_(d, url_GmDocument(d->view.doc));
+            if (setUrl_DocumentWidget_(d, url_GmDocument(d->view.doc))) {
+                postCommand_Widget(d, "!document.changed doc:%p url:%s", d, cstr_String(d->mod.url));
+            }
             updateFetchProgress_DocumentWidget_(d);
             postCommand_Widget(d, "media.updated link:%u request:%p", d->requestLinkId, mr);
+            if (isFinished_GmRequest(mr->req)) {
+                postCommand_Widget(d, "media.finished link:%u request:%p", d->requestLinkId, mr);
+            }
             return;
         }
         /* Get ready for the incoming new document. */
@@ -3211,9 +3240,10 @@ static void checkResponse_DocumentWidget_(iDocumentWidget *d) {
                     addChildPos_Widget(buttons, iClob(lineBreak), front_WidgetAddPos);
                 }
                 /* Menu for additional actions, past entries. */ {
+                    const iBinding *bind = findCommand_Keys("input.precedingline");
                     iMenuItem items[] = { { "${menu.input.precedingline}",
-                                            SDLK_v,
-                                            KMOD_PRIMARY | KMOD_SHIFT,
+                                            bind->key,
+                                            bind->mods,
                                             format_CStr("!valueinput.set ptr:%p text:%s",
                                                         buttons,
                                                         cstr_String(&d->linePrecedingLink)) } };
diff --git a/src/ui/inputwidget.c b/src/ui/inputwidget.c
index aa55f3f0..6a8d428a 100644
--- a/src/ui/inputwidget.c
+++ b/src/ui/inputwidget.c
@@ -1115,7 +1115,14 @@ static void updateBuffered_InputWidget_(iInputWidget *d) {
 }
 
 void setText_InputWidget(iInputWidget *d, const iString *text) {
+    setTextUndoable_InputWidget(d, text, iFalse);
+}
+
+void setTextUndoable_InputWidget(iInputWidget *d, const iString *text, iBool isUndoable) {
     if (!d) return;
+    if (isUndoable) {
+        pushUndo_InputWidget_(d);
+    }
     if (d->inFlags & isUrl_InputWidgetFlag) {
         if (prefs_App()->decodeUserVisibleURLs) {
             iString *enc = collect_String(copy_String(text));
@@ -1139,7 +1146,9 @@ void setText_InputWidget(iInputWidget *d, const iString *text) {
     iString *nfcText = collect_String(copy_String(text));
     normalize_String(nfcText);
 #if !LAGRANGE_USE_SYSTEM_TEXT_INPUT
-    clearUndo_InputWidget_(d);
+    if (!isUndoable) {
+        clearUndo_InputWidget_(d);
+    }
     splitToLines_(nfcText, &d->lines);
     iAssert(!isEmpty_Array(&d->lines));
     iForEach(Array, i, &d->lines) {
@@ -1175,6 +1184,12 @@ void setTextCStr_InputWidget(iInputWidget *d, const char *cstr) {
     delete_String(str);
 }
 
+void setTextUndoableCStr_InputWidget(iInputWidget *d, const char *cstr, iBool isUndoable) {
+    iString *str = newCStr_String(cstr);
+    setTextUndoable_InputWidget(d, str, isUndoable);
+    delete_String(str);
+}
+
 void selectAll_InputWidget(iInputWidget *d) {
 #if LAGRANGE_USE_SYSTEM_TEXT_INPUT
     if (d->sysCtrl) {
diff --git a/src/ui/inputwidget.h b/src/ui/inputwidget.h
index 5a61ec22..000fa4b7 100644
--- a/src/ui/inputwidget.h
+++ b/src/ui/inputwidget.h
@@ -46,6 +46,8 @@ void    setMode_InputWidget             (iInputWidget *, enum iInputMode mode);
 void    setMaxLen_InputWidget           (iInputWidget *, size_t maxLen);
 void    setText_InputWidget             (iInputWidget *, const iString *text);
 void    setTextCStr_InputWidget         (iInputWidget *, const char *cstr);
+void    setTextUndoable_InputWidget     (iInputWidget *, const iString *text, iBool isUndoable);
+void    setTextUndoableCStr_InputWidget (iInputWidget *, const char *cstr, iBool isUndoable);
 void    setFont_InputWidget             (iInputWidget *, int fontId);
 void    setContentPadding_InputWidget   (iInputWidget *, int left, int right); /* only affects the text entry */
 void    setLineLimits_InputWidget       (iInputWidget *, int minLines, int maxLines);
diff --git a/src/ui/keys.c b/src/ui/keys.c
index d4d9320e..33f39633 100644
--- a/src/ui/keys.c
+++ b/src/ui/keys.c
@@ -241,6 +241,7 @@ static const struct { int id; iMenuItem bind; int flags; } defaultBindings_[] =
     { 110,{ "${menu.save.downloads}",       SDLK_s, KMOD_PRIMARY,           "document.save"                     }, 0 },
     { 120,{ "${keys.upload}",               SDLK_u, KMOD_PRIMARY,           "document.upload"                   }, 0 },
     { 121,{ "${keys.upload.edit}",          SDLK_e, KMOD_PRIMARY,           "document.upload copy:1"            }, 0 },
+    { 130,{ "${keys.input.precedingline}",  SDLK_v, KMOD_PRIMARY | KMOD_SHIFT, "input.precedingline"            }, 0 },
     /* The following cannot currently be changed (built-in duplicates). */
 #if defined (iPlatformApple)
     { 1002, { NULL, SDLK_LEFTBRACKET,  KMOD_PRIMARY,             "navigate.back"        }, 0 },
diff --git a/src/ui/linkinfo.c b/src/ui/linkinfo.c
index 5102f9b3..36ab00c8 100644
--- a/src/ui/linkinfo.c
+++ b/src/ui/linkinfo.c
@@ -92,8 +92,12 @@ void infoText_LinkInfo(const iGmDocument *doc, iGmLinkId linkId, iString *text_o
         appendRange_String(text_out, (iRangecc){ parts.path.start, constEnd_String(url) });
     }
     else if (scheme != gemini_GmLinkScheme) {
+        const size_t maxDispLen = 300;
         appendCStr_String(text_out, scheme == file_GmLinkScheme ? "" : globe_Icon " ");
-        append_String(text_out, url);
+        appendCStrN_String(text_out, cstr_String(url), iMin(maxDispLen, size_String(url)));
+        if (size_String(url) > maxDispLen) {
+            appendCStr_String(text_out, "...");
+        }
     }
     else {
         appendCStr_String(text_out, "\x1b[1m");
diff --git a/src/ui/mediaui.c b/src/ui/mediaui.c
index f0070688..2ddebb57 100644
--- a/src/ui/mediaui.c
+++ b/src/ui/mediaui.c
@@ -104,7 +104,7 @@ static int drawSevenSegmentTime_(iInt2 pos, int color, int align, int seconds) {
     if (align == right_Alignment) {
         pos.x -= size.x;
     }
-    drawRange_Text(font, addY_I2(pos, gap_UI / 2), color, range_String(&num));
+    drawRange_Text(font, addY_I2(pos, 0/*gap_UI / 2*/), color, range_String(&num));
     deinit_String(&num);
     return size.x;
 }
@@ -316,7 +316,7 @@ void draw_DownloadUI(const iDownloadUI *d, iPaint *p) {
               isFinished ? uiTextAction_ColorId : uiTextDim_ColorId,
               cstr_Lang(isFinished ? "media.download.complete" : "media.download.warnclose"));
     const int x2 = right_Rect(rect);
-    drawSevenSegmentBytes_MediaUI(uiLabel_FontId, init_I2(x2, y1),
+    drawSevenSegmentBytes_MediaUI(uiContent_FontId, init_I2(x2, y1),
                                   uiTextStrong_ColorId, uiTextDim_ColorId,
                                   info.numBytes);
     const iInt2 pos = init_I2(x2, y2);
diff --git a/src/ui/paint.c b/src/ui/paint.c
index 5e66f521..5f19ec3e 100644
--- a/src/ui/paint.c
+++ b/src/ui/paint.c
@@ -71,18 +71,19 @@ void endTarget_Paint(iPaint *d) {
 
 void setClip_Paint(iPaint *d, iRect rect) {
     addv_I2(&rect.pos, origin_Paint);
-    if (isEmpty_Rect(rect)) {
-        rect = init_Rect(0, 0, 1, 1);
-    }
     iRect targetRect = zero_Rect();
     SDL_Texture *target = SDL_GetRenderTarget(renderer_Paint_(d));
     if (target) {
         SDL_QueryTexture(target, NULL, NULL, &targetRect.size.x, &targetRect.size.y);
         rect = intersect_Rect(rect, targetRect);
     }
-    else {
+    /* The origin is non-zero when drawing into a widget's own buffer. */
+    if (isEqual_I2(zero_I2(), origin_Paint)) {
         rect = intersect_Rect(rect, rect_Root(get_Root()));
     }
+    if (isEmpty_Rect(rect)) {
+        rect = init_Rect(0, 0, 1, 1);
+    }
     SDL_RenderSetClipRect(renderer_Paint_(d), (const SDL_Rect *) &rect);
 }
 
diff --git a/src/ui/scrollwidget.c b/src/ui/scrollwidget.c
index 651669c6..71e4873f 100644
--- a/src/ui/scrollwidget.c
+++ b/src/ui/scrollwidget.c
@@ -239,15 +239,17 @@ static void draw_ScrollWidget_(const iScrollWidget *d) {
         init_Paint(&p);
         /* Blend if opacity is not at maximum. */
         p.alpha = 255 * value_Anim(&d->opacity);
-        SDL_Renderer *render = renderer_Window(get_Window());
-        if (p.alpha < 255) {
-            SDL_SetRenderDrawBlendMode(render, SDL_BLENDMODE_BLEND);
-        }
-        const iRect thumbRect = shrunk_Rect(
-            thumbRect_ScrollWidget_(d), init_I2(isPressed ? gap_UI : (gap_UI * 4 / 3), gap_UI / 2));
-        fillRect_Paint(&p, thumbRect, isPressed ? uiBackgroundPressed_ColorId : tmQuote_ColorId);
-        if (p.alpha < 255) {
-            SDL_SetRenderDrawBlendMode(render, SDL_BLENDMODE_NONE);
+        if (p.alpha > 0) {
+            SDL_Renderer *render = renderer_Window(get_Window());
+            if (p.alpha < 255) {
+                SDL_SetRenderDrawBlendMode(render, SDL_BLENDMODE_BLEND);
+            }
+            const iRect thumbRect = shrunk_Rect(
+                thumbRect_ScrollWidget_(d), init_I2(isPressed ? gap_UI : (gap_UI * 4 / 3), gap_UI / 2));
+            fillRect_Paint(&p, thumbRect, isPressed ? uiBackgroundPressed_ColorId : tmQuote_ColorId);
+            if (p.alpha < 255) {
+                SDL_SetRenderDrawBlendMode(render, SDL_BLENDMODE_NONE);
+            }
         }
     }
 }
diff --git a/src/ui/sidebarwidget.c b/src/ui/sidebarwidget.c
index 16677f9e..da377ac2 100644
--- a/src/ui/sidebarwidget.c
+++ b/src/ui/sidebarwidget.c
@@ -1181,39 +1181,43 @@ static iBool handleSidebarCommand_SidebarWidget_(iSidebarWidget *d, const char *
                                  argLabel_Command(cmd, "noanim") == 0 &&
                                  (d->side == left_SidebarSide || deviceType_App() != phone_AppDeviceType);
         int visX = 0;
-        int visY = 0;
+//        int visY = 0;
         if (isVisible_Widget(w)) {
             visX = left_Rect(bounds_Widget(w)) - left_Rect(w->root->widget->rect);
-            visY = top_Rect(bounds_Widget(w)) - top_Rect(w->root->widget->rect);
+//            visY = top_Rect(bounds_Widget(w)) - top_Rect(w->root->widget->rect);
         }
         const iBool isHiding = isVisible_Widget(w);
         setFlags_Widget(w, hidden_WidgetFlag, isHiding);
         /* Safe area inset for mobile. */
-        const int safePad = (d->side == left_SidebarSide ? left_Rect(safeRect_Root(w->root)) : 0);
+        const int safePad =
+            deviceType_App() == desktop_AppDeviceType
+                ? 0
+                : (d->side == left_SidebarSide ? left_Rect(safeRect_Root(w->root)) : 0);
         const int animFlags = easeOut_AnimFlag | softer_AnimFlag;
         if (!isPortraitPhone_App()) {
             if (!isHiding) {
-            setFlags_Widget(w, keepOnTop_WidgetFlag, iFalse);
-            w->rect.size.x = d->widthAsGaps * gap_UI;
-            invalidate_ListWidget(d->list);
-            if (isAnimated) {
-                setFlags_Widget(w, horizontalOffset_WidgetFlag, iTrue);
-                setVisualOffset_Widget(
-                    w, (d->side == left_SidebarSide ? -1 : 1) * (w->rect.size.x + safePad), 0, 0);
+                setFlags_Widget(w, keepOnTop_WidgetFlag, iFalse);
+                w->rect.size.x = d->widthAsGaps * gap_UI;
+                invalidate_ListWidget(d->list);
+                if (isAnimated) {
+                    setFlags_Widget(w, horizontalOffset_WidgetFlag, iTrue);
+                    setVisualOffset_Widget(w,
+                                           (d->side == left_SidebarSide ? -1 : 1) *
+                                               (w->rect.size.x + safePad),
+                                           0,
+                                           0);
                     setVisualOffset_Widget(w, 0, 300, animFlags);
+                }
             }
-        }
-        else if (isAnimated) {
-            setFlags_Widget(w, horizontalOffset_WidgetFlag, iTrue);
-            if (d->side == right_SidebarSide) {
-                setVisualOffset_Widget(w, visX, 0, 0);
-                setVisualOffset_Widget(
-                        w, visX + w->rect.size.x + safePad, 300, animFlags);
-            }
-            else {
-                setFlags_Widget(w, keepOnTop_WidgetFlag, iTrue);
-                setVisualOffset_Widget(
-                        w, -w->rect.size.x - safePad, 300, animFlags);
+            else if (isAnimated) {
+                setFlags_Widget(w, horizontalOffset_WidgetFlag, iTrue);
+                if (d->side == right_SidebarSide) {
+                    setVisualOffset_Widget(w, visX, 0, 0);
+                    setVisualOffset_Widget(w, visX + w->rect.size.x + safePad, 300, animFlags);
+                }
+                else {
+                    setFlags_Widget(w, keepOnTop_WidgetFlag, iTrue);
+                    setVisualOffset_Widget(w, -w->rect.size.x - safePad, 300, animFlags);
                 }
             }
             setScrollMode_ListWidget(d->list, normal_ScrollMode);
@@ -1226,15 +1230,16 @@ static iBool handleSidebarCommand_SidebarWidget_(iSidebarWidget *d, const char *
                 w->rect.pos.y = height_Rect(safeRect_Root(w->root)) - d->midHeight;
                 setVisualOffset_Widget(w, bottom_Rect(rect_Root(w->root)) - w->rect.pos.y, 0, 0);
                 setVisualOffset_Widget(w, 0, 300, animFlags);
-                //animateSlidingSheetHeight_SidebarWidget_(d);
+                // animateSlidingSheetHeight_SidebarWidget_(d);
                 setScrollMode_ListWidget(d->list, disabledAtTopBothDirections_ScrollMode);
             }
             else {
-                setVisualOffset_Widget(w, bottom_Rect(rect_Root(w->root)) - w->rect.pos.y, 300, animFlags);
+                setVisualOffset_Widget(
+                    w, bottom_Rect(rect_Root(w->root)) - w->rect.pos.y, 300, animFlags);
                 if (d->isEditing) {
                     setMobileEditMode_SidebarWidget_(d, iFalse);
+                }
             }
-        }
             showToolbar_Root(w->root, isHiding);
         }
         updateToolbarColors_Root(w->root);
@@ -1242,7 +1247,7 @@ static iBool handleSidebarCommand_SidebarWidget_(iSidebarWidget *d, const char *
         /* BUG: Rearranging because the arrange above didn't fully resolve the height. */
         arrange_Widget(w);
         if (!isPortraitPhone_App()) {
-        updateSize_DocumentWidget(document_App());
+            updateSize_DocumentWidget(document_App());
         }
         if (isVisible_Widget(w)) {
             updateItems_SidebarWidget_(d);
@@ -1387,6 +1392,10 @@ static iBool processEvent_SidebarWidget_(iSidebarWidget *d, const SDL_Event *ev)
                 }
             }
         }
+        else if (equal_Command(cmd, "idents.changed") && d->mode == identities_SidebarMode) {
+            updateItems_SidebarWidget_(d);
+            return iTrue;
+        }
         else if (isPortraitPhone_App() && isVisible_Widget(w) && d->side == left_SidebarSide &&
                  equal_Command(cmd, "swipe.forward")) {
             postCommand_App("sidebar.toggle");
diff --git a/src/ui/text.c b/src/ui/text.c
index 200108ed..c19aed2f 100644
--- a/src/ui/text.c
+++ b/src/ui/text.c
@@ -246,12 +246,24 @@ struct Impl_CacheRow {
     iInt2 pos;
 };
 
+iDeclareType(PrioMapItem)
+struct Impl_PrioMapItem {
+    int priority;
+    uint32_t fontIndex;
+};
+
+static int cmp_PrioMapItem_(const void *a, const void *b) {
+    const iPrioMapItem *i = a, *j = b;
+    return -iCmp(i->priority, j->priority);
+}
+
 struct Impl_Text {
 //    enum iTextFont contentFont;
 //    enum iTextFont headingFont;
     float          contentFontSize;
     iArray         fonts; /* fonts currently selected for use (incl. all styles/sizes) */
-    int            overrideFontId; /* always checked for glyphs first, regardless of which font is used */
+    int            overrideFontId; /* always checked for glyphs first, regardless of which font is used */    
+    iArray         fontPriorityOrder;
     SDL_Renderer * render;
     SDL_Texture *  cache;
     iInt2          cacheSize;
@@ -284,8 +296,9 @@ static void setupFontVariants_Text_(iText *d, const iFontSpec *spec, int baseId)
         /* This is the highest priority override font. */
         d->overrideFontId = baseId;
     }
+    pushBack_Array(&d->fontPriorityOrder, &(iPrioMapItem){ spec->priority, baseId });
     for (enum iFontStyle style = 0; style < max_FontStyle; style++) {
-        for (enum iFontSize sizeId = 0; sizeId < max_FontSize; sizeId++) {
+        for (enum iFontSize sizeId = 0; sizeId < max_FontSize; sizeId++) {            
             init_Font(font_Text_(FONT_ID(baseId, style, sizeId)),
                       spec,
                       spec->styles[style],
@@ -322,6 +335,7 @@ static void initFonts_Text_(iText *d) {
        and styles for each available font. Indices to `fonts` act as font runtime IDs. */
     /* First the mandatory fonts. */
     d->overrideFontId = -1;
+    clear_Array(&d->fontPriorityOrder);
     resize_Array(&d->fonts, auxiliary_FontId); /* room for the built-ins */
     setupFontVariants_Text_(d, tryFindSpec_(uiFont_PrefsString, "default"), default_FontId);
     setupFontVariants_Text_(d, tryFindSpec_(monospaceFont_PrefsString, "iosevka"), monospace_FontId);
@@ -331,12 +345,14 @@ static void initFonts_Text_(iText *d) {
     /* Check if there are auxiliary fonts available and set those up, too. */
     iConstForEach(PtrArray, s, listSpecsByPriority_Fonts()) {
         const iFontSpec *spec = s.ptr;
+//        printf("spec '%s': prio=%d\n", cstr_String(&spec->name), spec->priority);
         if (spec->flags & (auxiliary_FontSpecFlag | user_FontSpecFlag)) {
             const int fontId = size_Array(&d->fonts);
             resize_Array(&d->fonts, fontId + maxVariants_Fonts);
             setupFontVariants_Text_(d, spec, fontId);
         }
     }
+    sort_Array(&d->fontPriorityOrder, cmp_PrioMapItem_);
 #if !defined (NDEBUG)
     printf("[Text] %zu font variants ready\n", size_Array(&d->fonts));
 #endif
@@ -402,6 +418,7 @@ void init_Text(iText *d, SDL_Renderer *render) {
     iText *oldActive = activeText_;
     activeText_ = d;
     init_Array(&d->fonts, sizeof(iFont));
+    init_Array(&d->fontPriorityOrder, sizeof(iPrioMapItem));
     d->contentFontSize = contentScale_Text_;
     d->ansiEscape      = makeAnsiEscapePattern_Text(iFalse /* no ESC */);
     d->baseFontId      = -1;
@@ -436,6 +453,7 @@ void deinit_Text(iText *d) {
     deinitCache_Text_(d);
     d->render = NULL;
     iRelease(d->ansiEscape);
+    deinit_Array(&d->fontPriorityOrder);
     deinit_Array(&d->fonts);
 }
 
@@ -571,25 +589,24 @@ iLocalDef iFont *characterFont_Font_(iFont *d, iChar ch, uint32_t *glyphIndex) {
     if ((*glyphIndex = glyphIndex_Font_(d, ch)) != 0) {
         return d;
     }
-    /* As a fallback, check all other available fonts of this size. */
-    for (int aux = 0; aux < 2; aux++) {
-        for (iFont *font = font_Text_(FONT_ID(0, styleId, sizeId));
-             font < (iFont *) end_Array(&activeText_->fonts);
-             font += maxVariants_Fonts) {
-            const iBool isAuxiliary = (font->fontSpec->flags & auxiliary_FontSpecFlag) ? 1 : 0;
-            if (aux == isAuxiliary) {
-                /* First try auxiliary fonts, then other remaining fonts. */
-                continue;
-            }
-            if (font == d || font == overrideFont) {
-                continue; /* already checked this one */
-            }
-            if ((*glyphIndex = glyphIndex_Font_(font, ch)) != 0) {
-//                printf("using %s[%f] for %lc (%x) => %d\n",
-//                       cstr_String(&font->fontSpec->name), font->fontSpec->scaling,
-//                       (int) ch, ch, glyphIndex_Font_(font, ch));
-                return font;
-            }
+    /* As a fallback, check all other available fonts of this size in priority order. */
+    iConstForEach(Array, i, &activeText_->fontPriorityOrder) {
+        iFont *font = font_Text_(FONT_ID(((const iPrioMapItem *) i.value)->fontIndex,
+                                         styleId, sizeId));
+        if (font == d || font == overrideFont) {
+            continue; /* already checked this one */
+        }
+        if ((*glyphIndex = glyphIndex_Font_(font, ch)) != 0) {
+#if 0
+            printf("using '%s' (pr:%d) for %lc (%x) => %d  [missing in '%s']\n",
+                   cstr_String(&font->fontSpec->id),
+                   font->fontSpec->priority,
+                   (int) ch,
+                   ch,
+                   glyphIndex_Font_(font, ch),
+                   cstr_String(&d->fontSpec->id));
+#endif
+            return font;
         }
     }
     if (!*glyphIndex) {
@@ -1433,7 +1450,7 @@ static void evenMonospaceAdvances_GlyphBuffer_(iGlyphBuffer *d, iFont *baseFont)
         if (d->glyphPos[i].x_advance > 0 && d->font != baseFont) {
             const iChar ch = d->logicalText[info->cluster];
             if (isPictograph_Char(ch) || isEmoji_Char(ch)) {
-                const float dw = d->font->xScale * d->glyphPos[i].x_advance - monoAdvance;
+                const float dw = d->font->xScale * d->glyphPos[i].x_advance - (isEmoji_Char(ch) ? 2 : 1) * monoAdvance;
                 d->glyphPos[i].x_offset  -= dw / 2 / d->font->xScale - 1;
                 d->glyphPos[i].x_advance -= dw     / d->font->xScale - 1;
             }
diff --git a/src/ui/util.c b/src/ui/util.c
index 31907721..5dd8a0bd 100644
--- a/src/ui/util.c
+++ b/src/ui/util.c
@@ -1778,7 +1778,7 @@ iBool valueInputHandler_(iWidget *dlg, const char *cmd) {
     }
     else if (equal_Command(cmd, "valueinput.set")) {
         iInputWidget *input = findChild_Widget(dlg, "input");
-        setTextCStr_InputWidget(input, suffixPtr_Command(cmd, "text"));
+        setTextUndoableCStr_InputWidget(input, suffixPtr_Command(cmd, "text"), iTrue);
         validate_InputWidget(input);
         return iTrue;
     }
diff --git a/src/ui/widget.c b/src/ui/widget.c
index 9f67b1c7..fc754b7a 100644
--- a/src/ui/widget.c
+++ b/src/ui/widget.c
@@ -1290,7 +1290,7 @@ iBool processEvent_Widget(iWidget *d, const SDL_Event *ev) {
             /* TODO: Motion events occur frequently. Maybe it would help if these were handled
                via audiences that specifically register to listen for motion, to minimize the
                number of widgets that need to process them. */
-            const int hoverScrollLimit = 1.5f * lineHeight_Text(default_FontId);
+            const int hoverScrollLimit = 3.0f * lineHeight_Text(default_FontId);
             float speed = 0.0f;
             if (ev->motion.y < hoverScrollLimit) {
                 speed = (hoverScrollLimit - ev->motion.y) / (float) hoverScrollLimit;
@@ -1315,7 +1315,7 @@ iBool processEvent_Widget(iWidget *d, const SDL_Event *ev) {
                 if (elapsed > 100) {
                     elapsed = 16;    
                 }
-                int step = elapsed * gap_UI / 16 * iClamp(speed, -1.0f, 1.0f);
+                int step = elapsed * gap_UI / 8 * iClamp(speed, -1.0f, 1.0f);
                 if (step != 0) { 
                     lastHoverOverflowMotionTime_ = nowTime;
                     scrollOverflow_Widget(d, step);
diff --git a/src/ui/window.c b/src/ui/window.c
index 13abc5fa..47abf878 100644
--- a/src/ui/window.c
+++ b/src/ui/window.c
@@ -539,10 +539,19 @@ void deinit_Window(iWindow *d) {
 void init_MainWindow(iMainWindow *d, iRect rect) {
     theWindow_ = &d->base;
     theMainWindow_ = d;
+    d->enableBackBuf = iFalse;
     uint32_t flags = 0;
 #if defined (iPlatformAppleDesktop)
     SDL_SetHint(SDL_HINT_RENDER_DRIVER, shouldDefaultToMetalRenderer_MacOS() ? "metal" : "opengl");
     flags |= shouldDefaultToMetalRenderer_MacOS() ? SDL_WINDOW_METAL : SDL_WINDOW_OPENGL;
+    if (flags & SDL_WINDOW_METAL) {
+        /* There are some really odd refresh glitches that only occur with the Metal 
+           backend. It's perhaps related to it not expecting refresh to stop intermittently
+           to wait for input events. If forcing constant refreshing at full frame rate, the
+           problems seem to go away... Rendering everything to a separate render target
+           appears to sidestep some of the glitches. */
+        d->enableBackBuf = iTrue;
+    }
 #elif defined (iPlatformAppleMobile)
     SDL_SetHint(SDL_HINT_RENDER_DRIVER, "metal");
     flags |= SDL_WINDOW_METAL;
@@ -566,6 +575,7 @@ void init_MainWindow(iMainWindow *d, iRect rect) {
     d->place.lastNotifiedSize = zero_I2();
     d->place.snap             = 0;
     d->keyboardHeight         = 0;
+    d->backBuf                = NULL;
 #if defined(iPlatformMobile)
     const iInt2 minSize = zero_I2(); /* windows aren't independently resizable */
 #else
@@ -637,6 +647,9 @@ void init_MainWindow(iMainWindow *d, iRect rect) {
 }
 
 void deinit_MainWindow(iMainWindow *d) {
+    if (d->backBuf) {
+        SDL_DestroyTexture(d->backBuf);
+    }
     deinitRoots_Window_(as_Window(d));
     if (theWindow_ == as_Window(d)) {
         theWindow_ = NULL;
@@ -682,6 +695,10 @@ iRoot *otherRoot_Window(const iWindow *d, iRoot *root) {
 static void invalidate_MainWindow_(iMainWindow *d, iBool forced) {
     if (d && (!d->base.isInvalidated || forced)) {
         d->base.isInvalidated = iTrue;
+        if (d->enableBackBuf && d->backBuf) {
+            SDL_DestroyTexture(d->backBuf);
+            d->backBuf = NULL;
+        }
         resetFonts_Text(text_Window(d));
         postCommand_App("theme.changed auto:1"); /* forces UI invalidation */
     }
@@ -1272,11 +1289,28 @@ void draw_MainWindow(iMainWindow *d) {
                 d->maxDrawableHeight = renderSize.y;
             }
         }
+        if (d->enableBackBuf) {
+            /* Possible resize the backing buffer. */
+            if (!d->backBuf || !isEqual_I2(size_SDLTexture(d->backBuf), renderSize)) {
+                if (d->backBuf) {
+                    SDL_DestroyTexture(d->backBuf);
+                }
+                d->backBuf = SDL_CreateTexture(d->base.render,
+                                               SDL_PIXELFORMAT_RGB888,
+                                               SDL_TEXTUREACCESS_TARGET,
+                                               renderSize.x,
+                                               renderSize.y);
+//                printf("NEW BACKING: %dx%d %p\n", renderSize.x, renderSize.y, d->backBuf); fflush(stdout);
+            }
+        }
     }
     const int   winFlags = SDL_GetWindowFlags(d->base.win);
     const iBool gotFocus = (winFlags & SDL_WINDOW_INPUT_FOCUS) != 0;
     iPaint p;
     init_Paint(&p);
+    if (d->backBuf) {
+        SDL_SetRenderTarget(d->base.render, d->backBuf);
+    }
     /* Clear the window. The clear color is visible as a border around the window
        when the custom frame is being used. */ {
         setCurrent_Root(w->roots[0]);
@@ -1359,6 +1393,10 @@ void draw_MainWindow(iMainWindow *d) {
         drawCount_ = 0;
 #endif
     }
+    if (d->backBuf) {
+        SDL_SetRenderTarget(d->base.render, NULL);
+        SDL_RenderCopy(d->base.render, d->backBuf, NULL, NULL);
+    }
 #if 0
     /* Text cache debugging. */ {
         SDL_Rect rect = { d->roots[0]->widget->rect.size.x - 640, 0, 640, 2.5 * 640 };
diff --git a/src/ui/window.h b/src/ui/window.h
index b4e348d2..5abf23eb 100644
--- a/src/ui/window.h
+++ b/src/ui/window.h
@@ -118,6 +118,8 @@ struct Impl_MainWindow {
     SDL_Texture * appIcon;
     int           keyboardHeight; /* mobile software keyboards */
     int           maxDrawableHeight;
+    iBool         enableBackBuf; /* only used on macOS with Metal (helps with refresh glitches for some reason??) */
+    SDL_Texture * backBuf; /* enables refreshing the window without redrawing anything */
 };
 
 iLocalDef enum iWindowType type_Window(const iAnyWindow *d) {