10 files changed, 259 insertions, 29 deletions

diff --git a/src/app.c b/src/app.c
index b323f7c6..1820905b 100644
--- a/src/app.c
+++ b/src/app.c
@@ -1365,6 +1365,10 @@ void processEvents_App(enum iAppEventMode eventMode) {
                     dispatchCommands_Periodic(&d->periodic);
                     continue;
                 }
+                if (ev.type == SDL_USEREVENT && ev.user.code == releaseObject_UserEventCode) {
+                    iRelease(ev.user.data1);
+                    continue;
+                }
                 if (ev.type == SDL_USEREVENT && ev.user.code == refresh_UserEventCode) {
                     gotRefresh = iTrue;
                     continue;
@@ -2262,6 +2266,13 @@ void resetFonts_App(void) {
     }
 }
 
+void availableFontsChanged_App(void) {
+    iApp *d = &app_;
+    iConstForEach(PtrArray, win, listWindows_App_(d, collectNew_PtrArray())) {
+        resetMissing_Text(text_Window(win.ptr));
+    }    
+}
+
 static void invalidateCachedDocuments_App_(void) {
     iForEach(ObjectList, i, iClob(listDocuments_App(NULL))) {
         invalidateCachedLayout_History(history_DocumentWidget(i.object));
@@ -2388,24 +2399,49 @@ iBool handleCommand_App(const char *cmd) {
         reload_Fonts(); /* also does font cache reset, window invalidation */
         return iTrue;
     }
-#if 0
-    else if (equal_Command(cmd, "font.user")) {
-        const char *path = suffixPtr_Command(cmd, "path");
-        if (cmp_String(&d->prefs.symbolFontPath, path)) {
-            if (!isFrozen) {
-                setFreezeDraw_MainWindow(get_MainWindow(), iTrue);
-            }
-            setCStr_String(&d->prefs.symbolFontPath, path);
-            loadUserFonts_Text();
-            resetFonts_App(d);
-            if (!isFrozen) {
-                postCommand_App("font.changed");
-                postCommand_App("window.unfreeze");
-            }
+    else if (equal_Command(cmd, "font.find")) {
+        searchOnlineLibraryForCharacters_Fonts(string_Command(cmd, "chars"));
+        return iTrue;
+    }
+    else if (equal_Command(cmd, "font.found")) {
+        if (hasLabel_Command(cmd, "error")) {
+            makeSimpleMessage_Widget("${heading.glyphfinder}",
+                                     format_CStr("%d %s",
+                                                 argLabel_Command(cmd, "error"),
+                                                 suffixPtr_Command(cmd, "msg")));
+            return iTrue;
         }
+        iString *src = collectNew_String();
+        setCStr_String(src, "# ${heading.glyphfinder.results}\n\n");
+        iRangecc path = iNullRange;
+        iBool isFirst = iTrue;
+        while (nextSplit_Rangecc(range_Command(cmd, "packs"), ",", &path)) {
+            if (isFirst) {
+                appendCStr_String(src, "${glyphfinder.results}\n\n");
+            }
+            iRangecc fpath = path;
+            iRangecc fsize = path;
+            fpath.end = strchr(fpath.start, ';');
+            fsize.start = fpath.end + 1;
+            const uint32_t size = strtoul(fsize.start, NULL, 10);
+            appendFormat_String(src, "=> gemini://skyjake.fi/fonts/%s %s (%.1f MB)\n",
+                                cstr_Rangecc(fpath),
+                                cstr_Rangecc(fpath),
+                                (double) size / 1.0e6);
+            isFirst = iFalse;
+        }
+        if (isFirst) {
+            appendFormat_String(src, "${glyphfinder.results.empty}\n");
+        }
+        appendCStr_String(src, "\n=> about:fonts ${menu.fonts}");
+        iDocumentWidget *page = newTab_App(NULL, iTrue);
+        translate_Lang(src);
+        setUrlAndSource_DocumentWidget(page,
+                                       collectNewCStr_String(""),
+                                       collectNewCStr_String("text/gemini"),
+                                       utf8_String(src));
         return iTrue;
     }
-#endif
     else if (equal_Command(cmd, "font.set")) {
         if (!isFrozen) {
             setFreezeDraw_MainWindow(get_MainWindow(), iTrue);
diff --git a/src/app.h b/src/app.h
index 5968de0d..22fe5d46 100644
--- a/src/app.h
+++ b/src/app.h
@@ -67,6 +67,7 @@ enum iUserEventCode {
        take, it could turn into a tap-and-hold for example. */
     widgetTapBegins_UserEventCode,
     widgetTouchEnds_UserEventCode, /* finger lifted, but momentum may continue */
+    releaseObject_UserEventCode, /* object that needs releasing in the main thread */
 };
 
 const iString *execPath_App     (void);
@@ -142,6 +143,7 @@ iDocumentWidget *   document_Command    (const char *cmd);
 void            openInDefaultBrowser_App(const iString *url);
 void            revealPath_App          (const iString *path);
 void            resetFonts_App          (void);
+void            availableFontsChanged_App(void);
 
 iMainWindow *   mainWindow_App  (void);
 void            closePopups_App (void);
diff --git a/src/fontpack.c b/src/fontpack.c
index a440234e..96006226 100644
--- a/src/fontpack.c
+++ b/src/fontpack.c
@@ -23,6 +23,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 #include "fontpack.h"
 #include "resources.h"
 #include "ui/window.h"
+#include "gmrequest.h"
 #include "app.h"
 
 #include <the_Foundation/archive.h>
@@ -748,7 +749,7 @@ const iPtrArray *listSpecsByPriority_Fonts(void) {
     return &fonts_.specOrder;
 }
 
-iString *infoText_FontPack(const iFontPack *d) {
+iString *infoText_FontPack(const iFontPack *d, iBool isFull) {
     const iFontPack *installed        = pack_Fonts(cstr_String(&d->id));
     const iBool      isInstalled      = (installed != NULL);
     const int        installedVersion = installed ? installed->version : 0;
@@ -757,9 +758,17 @@ iString *infoText_FontPack(const iFontPack *d) {
     size_t           sizeInBytes      = 0;
     iPtrSet         *uniqueFiles      = new_PtrSet();
     iStringList     *names            = new_StringList();
+    size_t           numNames         = 0;
+    iBool            isAbbreviated    = iFalse;
     iConstForEach(PtrArray, i, listSpecs_FontPack(d)) {
         const iFontSpec *spec = i.ptr;
-        pushBack_StringList(names, &spec->name);
+        numNames++;
+        if (isFull || size_StringList(names) < 20) {
+            pushBack_StringList(names, &spec->name);
+        }
+        else {
+            isAbbreviated = iTrue;
+        }
         iForIndices(j, spec->styles) {
             insert_PtrSet(uniqueFiles, spec->styles[j]->sourceData.i);
         }
@@ -777,11 +786,12 @@ iString *infoText_FontPack(const iFontPack *d) {
             if (!endsWith_String(str, "(")) {
                 appendCStr_String(str, ", ");
             }
-            appendCStr_String(str, formatCStrs_Lang("num.fonts.n", size_StringList(names)));
+            appendCStr_String(str, formatCStrs_Lang("num.fonts.n", numNames));
         }
         appendFormat_String(str, ")");
     }
-    appendFormat_String(str, " \u2014 %s\n", cstrCollect_String(joinCStr_StringList(names, ", ")));
+    appendFormat_String(str, " \u2014 %s%s\n", cstrCollect_String(joinCStr_StringList(names, ", ")),
+                        isAbbreviated ? ", ..." : "");
     if (isInstalled && installedVersion != d->version) {
         appendCStr_String(str, format_Lang("${fontpack.meta.version}\n", d->version));
     }
@@ -945,7 +955,7 @@ const iString *infoPage_Fonts(iRangecc query) {
                         appendFormat_String(str, "### %s\n",
                                             isEmpty_String(packId) ? "fonts.ini" :
                                             cstr_String(packId));
-                        append_String(str, collect_String(infoText_FontPack(pack)));
+                        append_String(str, collect_String(infoText_FontPack(pack, iFalse)));
                         appendFormat_String(str, "=> %s ${fontpack.meta.viewfile}\n",
                                             cstrCollect_String(makeFileUrl_String(&spec->sourcePath)));
                         if (pack->isStandalone) {
@@ -1018,6 +1028,7 @@ void install_Fonts(const iString *packId, const iBlock *data) {
     iRelease(f);
     /* Newly installed fontpacks may have a higher priority that overrides other fonts. */
     reload_Fonts();
+    availableFontsChanged_App();
 }
 
 void installFontFile_Fonts(const iString *fileName, const iBlock *data) {
@@ -1028,6 +1039,7 @@ void installFontFile_Fonts(const iString *fileName, const iBlock *data) {
     }
     iRelease(f);
     reload_Fonts();
+    availableFontsChanged_App();
 }
 
 void enablePack_Fonts(const iString *packId, iBool enable) {
@@ -1040,6 +1052,7 @@ void enablePack_Fonts(const iString *packId, iBool enable) {
     }
     updateActive_Fonts();
     resetFonts_App();
+    availableFontsChanged_App();
     invalidate_Window(get_MainWindow());
 }
 
@@ -1047,5 +1060,100 @@ void updateActive_Fonts(void) {
     sortSpecs_Fonts_(&fonts_);
 }
 
-iDefineClass(FontFile)
+static void findCharactersInCMap_(iGmRequest *d, iGmRequest *req) {
+    /* Note: Called in background thread. */
+    iUnused(req);
+    const iString *missingChars = userData_Object(d);
+    if (isSuccess_GmStatusCode(status_GmRequest(d))) {
+        iStringList *matchingPacks = new_StringList();
+        iChar needed[20];
+        iChar minChar = UINT32_MAX, maxChar = 0;
+        size_t numNeeded = 0;
+        iConstForEach(String, ch, missingChars) {
+            needed[numNeeded++] = ch.value;
+            minChar = iMin(minChar, ch.value);
+            maxChar = iMax(maxChar, ch.value);
+            if (numNeeded == iElemCount(needed)) {
+                /* Shouldn't be that many. */
+                break;
+            }
+        }
+        iBlock  *data = decompressGzip_Block(body_GmRequest(d));
+        iRangecc line = iNullRange;
+        while (nextSplit_Rangecc(range_Block(data), "\n", &line)) {
+            iRangecc fontpackPath = iNullRange;
+            for (const char *pos = line.start; pos < line.end; pos++) {
+                if (*pos == ':') {
+                    fontpackPath.start = line.start;
+                    fontpackPath.end = pos;
+                    line.start = pos + 1;
+                    trimStart_Rangecc(&line);
+                    break;
+                }
+            }
+            if (fontpackPath.start) {
+                /* Parse the character ranges and see if any match what we need. */
+                const char *pos = line.start;
+                while (pos < line.end) {
+                    char *endp;
+                    uint32_t first = strtoul(pos, &endp, 10);
+                    uint32_t last  = first;
+                    if (*endp == '-') {
+                        last = strtoul(endp + 1, &endp, 10);        
+                    }
+                    if (maxChar < first) {
+                        break; /* The rest are even higher. */
+                    }
+                    if (minChar <= last) {
+                        for (size_t i = 0; i < numNeeded; i++) {
+                            if (needed[i] >= first && needed[i] <= last) {
+                                /* Got it. */
+                                pushBackRange_StringList(matchingPacks, fontpackPath);
+                                break;
+                            }
+                        }
+                    }
+                    pos = endp + 1;
+                }
+            }
+        }
+        delete_Block(data);
+        iString result;
+        init_String(&result);
+        format_String(&result, "font.found chars:%s packs:", cstr_String(missingChars));
+        iConstForEach(StringList, s, matchingPacks) {
+            if (s.pos != 0) {
+                appendCStr_String(&result, ",");
+            }
+            append_String(&result, s.value);
+        }
+        postCommandString_Root(NULL, &result);
+        deinit_String(&result);
+        iRelease(matchingPacks);
+    }
+    else {
+        /* Report error. */
+        postCommandf_Root(NULL,
+                          "font.found chars:%s error:%d msg:\x1b[1m%s\x1b[0m\n%s",
+                          cstr_String(missingChars),
+                          status_GmRequest(d),
+                          cstr_String(meta_GmRequest(d)),
+                          cstr_String(url_GmRequest(d)));
+    }
+//    fflush(stdout);
+    delete_String(userData_Object(d));
+    /* We can't delete ourselves; threads must be joined from another thread. */
+    SDL_PushEvent((SDL_Event *) &(SDL_UserEvent){
+        .type = SDL_USEREVENT, .code = releaseObject_UserEventCode, .data1 = d });
+}
 
+void searchOnlineLibraryForCharacters_Fonts(const iString *chars) {
+    /* Fetch the character map from skyjake.fi. */
+    iGmRequest *req = new_GmRequest(certs_App());
+    setUrl_GmRequest(req, collectNewCStr_String("gemini://skyjake.fi/fonts/cmap.txt.gz"));
+    setUserData_Object(req, copy_String(chars));
+    iConnect(GmRequest, req, finished, req, findCharactersInCMap_);
+    submit_GmRequest(req);
+}
+
+iDefineClass(FontFile)
diff --git a/src/fontpack.h b/src/fontpack.h
index aa6f2b9f..f6d4d483 100644
--- a/src/fontpack.h
+++ b/src/fontpack.h
@@ -160,7 +160,7 @@ const iString *     loadPath_FontPack       (const iFontPack *); /* may return N
 iBool               isDisabled_FontPack     (const iFontPack *);
 iBool               isReadOnly_FontPack     (const iFontPack *);
 const iPtrArray *   listSpecs_FontPack      (const iFontPack *);
-iString *           infoText_FontPack       (const iFontPack *);
+iString *           infoText_FontPack       (const iFontPack *, iBool isFull);
 const iArray *      actions_FontPack        (const iFontPack *, iBool showInstalled);
 
 const iString *     idFromUrl_FontPack      (const iString *url);
@@ -186,3 +186,5 @@ void                reload_Fonts                (void);
 iLocalDef iBool isInstalled_Fonts(const char *packId) {
     return pack_Fonts(packId) != NULL;
 }
+
+void                searchOnlineLibraryForCharacters_Fonts  (const iString *chars);
diff --git a/src/ui/banner.c b/src/ui/banner.c
index 11ae1574..79d70039 100644
--- a/src/ui/banner.c
+++ b/src/ui/banner.c
@@ -327,7 +327,8 @@ iBool processEvent_Banner(iBanner *d, const SDL_Event *ev) {
                             else {
                                 switch (item->code) {
                                     case missingGlyphs_GmStatusCode:
-                                        postCommandf_App("open newtab:1 url:about:fonts");
+                                        //postCommandf_App("open newtab:1 url:about:fonts");
+                                        makeGlyphFinder_Widget();
                                         break;
                                     case ansiEscapes_GmStatusCode:
                                         makeQuestion_Widget(
diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index 25559890..97ecb4ba 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -2661,7 +2661,7 @@ static void updateDocument_DocumentWidget_(iDocumentWidget *d,
                             if (loadArchive_FontPack(fp, zip)) {
                                 appendFormat_String(&str, "# " fontpack_Icon "%s\n%s",
                                                     cstr_String(id_FontPack(fp).id),
-                                                    cstrCollect_String(infoText_FontPack(fp)));
+                                                    cstrCollect_String(infoText_FontPack(fp, iTrue)));
                             }
                             appendCStr_String(&str, "\n");
                             appendCStr_String(&str, cstr_Lang("fontpack.help"));
diff --git a/src/ui/text.c b/src/ui/text.c
index 200108ed..ab2af2b2 100644
--- a/src/ui/text.c
+++ b/src/ui/text.c
@@ -247,8 +247,6 @@ struct Impl_CacheRow {
 };
 
 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 */
@@ -264,7 +262,8 @@ struct Impl_Text {
     int            ansiFlags;
     int            baseFontId; /* base attributes (for restoring via escapes) */
     int            baseFgColorId;
-    iBool          missingGlyphs; /* true if a glyph couldn't be found */
+    iBool          missingGlyphs;  /* true if a glyph couldn't be found */
+    iChar          missingChars[20]; /* rotating buffer of the latest missing characters */
 };
 
 iDefineTypeConstructionArgs(Text, (SDL_Renderer *render), render)
@@ -341,6 +340,8 @@ static void initFonts_Text_(iText *d) {
     printf("[Text] %zu font variants ready\n", size_Array(&d->fonts));
 #endif
     gap_Text = iRound(gap_UI * d->contentFontSize);
+//    d->missingGlyphs = iFalse;
+//    iZap(d->missingChars);
 }
 
 static void deinitFonts_Text_(iText *d) {
@@ -407,6 +408,7 @@ void init_Text(iText *d, SDL_Renderer *render) {
     d->baseFontId      = -1;
     d->baseFgColorId   = -1;
     d->missingGlyphs   = iFalse;
+    iZap(d->missingChars);
     d->render          = render;
     /* A grayscale palette for rasterized glyphs. */ {
         SDL_Color colors[256];
@@ -593,8 +595,23 @@ iLocalDef iFont *characterFont_Font_(iFont *d, iChar ch, uint32_t *glyphIndex) {
         }
     }
     if (!*glyphIndex) {
-        activeText_->missingGlyphs = iTrue;
-        fprintf(stderr, "failed to find %08x (%lc)\n", ch, (int)ch); fflush(stderr);
+        fprintf(stderr, "failed to find %08x (%lc)\n", ch, (int) ch); fflush(stderr);
+        iText *tx = activeText_;
+        tx->missingGlyphs = iTrue;
+        /* Remember a few of the latest missing characters. */
+        iBool gotIt = iFalse;
+        for (size_t i = 0; i < iElemCount(tx->missingChars); i++) {
+            if (tx->missingChars[i] == ch) {
+                gotIt = iTrue;
+                break;
+            }
+        }
+        if (!gotIt) {
+            memmove(tx->missingChars + 1,
+                    tx->missingChars,
+                    sizeof(tx->missingChars) - sizeof(tx->missingChars[0]));
+            tx->missingChars[0] = ch;
+        }
     }
     return d;
 }
@@ -2233,6 +2250,19 @@ iBool checkMissing_Text(void) {
     return missing;
 }
 
+iChar missing_Text(size_t index) {
+    const iText *d = activeText_;
+    if (index >= iElemCount(d->missingChars)) {
+        return 0;
+    }
+    return d->missingChars[index];
+}
+
+void resetMissing_Text(iText *d) {
+    d->missingGlyphs = iFalse;
+    iZap(d->missingChars);
+}
+
 SDL_Texture *glyphCache_Text(void) {
     return activeText_->cache;
 }
diff --git a/src/ui/text.h b/src/ui/text.h
index b952df84..e741880d 100644
--- a/src/ui/text.h
+++ b/src/ui/text.h
@@ -227,6 +227,8 @@ struct Impl_WrapText {
 iTextMetrics    measure_WrapText    (iWrapText *, int fontId);
 iTextMetrics    draw_WrapText       (iWrapText *, int fontId, iInt2 pos, int color);
 
+iChar           missing_Text        (size_t index);
+void            resetMissing_Text   (iText *);
 iBool           checkMissing_Text   (void); /* returns the flag, and clears it */
 SDL_Texture *   glyphCache_Text     (void);
 
diff --git a/src/ui/util.c b/src/ui/util.c
index 31907721..8e71dcec 100644
--- a/src/ui/util.c
+++ b/src/ui/util.c
@@ -3451,6 +3451,54 @@ iWidget *makeTranslation_Widget(iWidget *parent) {
     return dlg;
 }
 
+iWidget *makeGlyphFinder_Widget(void) {
+    iString msg;
+    iString command;
+    init_String(&msg);
+    initCStr_String(&command, "!font.find chars:");
+    for (size_t i = 0; ; i++) {
+        iChar ch = missing_Text(i);
+        if (!ch) break;
+        appendFormat_String(&msg, " U+%04X", ch);
+        appendChar_String(&command, ch);
+    }
+    iArray items;
+    init_Array(&items, sizeof(iMenuItem));
+    if (!isEmpty_String(&msg)) {
+        prependCStr_String(&msg, "${dlg.glyphfinder.missing} ");
+        appendCStr_String(&msg, "\n\n${dlg.glyphfinder.help}");
+        pushBackN_Array(
+            &items,
+            (iMenuItem[]){
+                { "${menu.fonts}", 0, 0, "!open newtab:1 url:about:fonts" },
+                { "${dlg.glyphfinder.disable}", 0, 0, "prefs.font.warnmissing.changed arg:0" },
+                { "---" },
+                { uiTextCaution_ColorEscape magnifyingGlass_Icon " ${dlg.glyphfinder.search}",
+                  0,
+                  0,
+                  cstr_String(&command) },
+                { "${close}", 0, 0, "cancel" } },
+            5);
+    }
+    else {
+        setCStr_String(&msg, "${dlg.glyphfinder.help.empty}");
+        pushBackN_Array(&items,
+                        (iMenuItem[]){ { "${menu.reload}", 0, 0, "navigate.reload" },
+                                       { "${close}", 0, 0, "cancel" } },
+                        2);
+    }
+    iWidget *dlg = makeQuestion_Widget("${heading.glyphfinder}", cstr_String(&msg),
+                                       constData_Array(&items),
+                                       size_Array(&items));
+    arrange_Widget(dlg);
+    deinit_Array(&items);
+    deinit_String(&command);
+    deinit_String(&msg);
+    return dlg;
+}
+
+/*----------------------------------------------------------------------------------------------*/
+
 void init_PerfTimer(iPerfTimer *d) {
     d->ticks = SDL_GetPerformanceCounter();
 }
diff --git a/src/ui/util.h b/src/ui/util.h
index 98ce784c..0289d579 100644
--- a/src/ui/util.h
+++ b/src/ui/util.h
@@ -342,6 +342,7 @@ iWidget *   makeBookmarkCreation_Widget (const iString *url, const iString *titl
 iWidget *   makeIdentityCreation_Widget (void);
 iWidget *   makeFeedSettings_Widget     (uint32_t bookmarkId);
 iWidget *   makeTranslation_Widget      (iWidget *parent);
+iWidget *   makeGlyphFinder_Widget      (void);
 
 const char *    languageId_String   (const iString *menuItemLabel);
 int             languageIndex_CStr  (const char *langId);