Fontpack lookup via missing glyphs

IssueID #435

6 files changed, 89 insertions, 6 deletions

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 6a535882..fdb55232 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -2756,6 +2756,7 @@ static void updateDocument_DocumentWidget_(iDocumentWidget *d,
                 }
                 d->flags |= drawDownloadCounter_DocumentWidgetFlag;
                 clear_PtrSet(d->view.invalidRuns);
+                documentRunsInvalidated_DocumentWidget_(d);
                 deinit_String(&str);
                 return;
             }
diff --git a/src/ui/text.c b/src/ui/text.c
index 7bb418eb..86ac709b 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) {
@@ -403,6 +404,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];
@@ -589,8 +591,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;
 }
@@ -2199,6 +2216,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 c8bb6f85..a34cc9bd 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);