1 files changed, 47 insertions, 13 deletions

diff --git a/src/ui/text.c b/src/ui/text.c
index c19aed2f..83e87d0c 100644
--- a/src/ui/text.c
+++ b/src/ui/text.c
@@ -258,8 +258,6 @@ static int cmp_PrioMapItem_(const void *a, const void *b) {
 }
 
 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 */    
@@ -276,7 +274,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)
@@ -296,6 +295,7 @@ static void setupFontVariants_Text_(iText *d, const iFontSpec *spec, int baseId)
         /* This is the highest priority override font. */
         d->overrideFontId = baseId;
     }
+    iAssert(activeText_ == d);
     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++) {            
@@ -357,6 +357,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) {
@@ -424,6 +426,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];
@@ -497,10 +500,13 @@ static void resetCache_Text_(iText *d) {
 }
 
 void resetFonts_Text(iText *d) {
+    iText *oldActive = activeText_;
+    setCurrent_Text(d); /* some routines rely on the global `activeText_` pointer */
     deinitFonts_Text_(d);
     deinitCache_Text_(d);
     initCache_Text_(d);
     initFonts_Text_(d);
+    setCurrent_Text(oldActive);
 }
 
 static SDL_Palette *glyphPalette_(void) {
@@ -610,8 +616,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;
 }
@@ -1459,14 +1480,14 @@ static void evenMonospaceAdvances_GlyphBuffer_(iGlyphBuffer *d, iFont *baseFont)
 }
 
 static iRect run_Font_(iFont *d, const iRunArgs *args) {
-    const int    mode       = args->mode;
-    const iInt2  orig       = args->pos;
-    iRect        bounds     = { orig, init_I2(0, d->height) };
-    float        xCursor    = 0.0f;
-    float        yCursor    = 0.0f;
-    float        xCursorMax = 0.0f;
-    const iBool  isMonospaced = isMonospaced_Font(d);
-    iWrapText *wrap = args->wrap;
+    const int   mode         = args->mode;
+    const iInt2 orig         = args->pos;
+    iRect       bounds       = { orig, init_I2(0, d->height) };
+    float       xCursor      = 0.0f;
+    float       yCursor      = 0.0f;
+    float       xCursorMax   = 0.0f;
+    const iBool isMonospaced = isMonospaced_Font(d);
+    iWrapText  *wrap         = args->wrap;
     iAssert(args->text.end >= args->text.start);
     /* Split the text into a number of attributed runs that specify exactly which
        font is used and other attributes such as color. (HarfBuzz shaping is done
@@ -2250,6 +2271,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;
 }