Text: Removed pending glyphs tracker

3 files changed, 14 insertions, 44 deletions

diff --git a/src/ui/text.c b/src/ui/text.c
index a803da97..36e98e11 100644
--- a/src/ui/text.c
+++ b/src/ui/text.c
@@ -200,7 +200,6 @@ struct Impl_Text {
     iArray         cacheRows;
     SDL_Palette *  grayscale;
     iRegExp *      ansiEscape;
-    iPtrSet *      pendingRaster; /* glyphs */
 };
 
 static iText text_;
@@ -438,7 +437,6 @@ static void initCache_Text_(iText *d) {
 static void deinitCache_Text_(iText *d) {
     deinit_Array(&d->cacheRows);
     SDL_DestroyTexture(d->cache);
-    clear_PtrSet(text_.pendingRaster);
 }
 
 void init_Text(SDL_Renderer *render) {
@@ -456,7 +454,6 @@ void init_Text(SDL_Renderer *render) {
         d->grayscale = SDL_AllocPalette(256);
         SDL_SetPaletteColors(d->grayscale, colors, 0, 256);
     }
-    d->pendingRaster = new_PtrSet();
     initCache_Text_(d);
     initFonts_Text_(d);
 }
@@ -468,7 +465,6 @@ void deinit_Text(void) {
     deinitCache_Text_(d);
     d->render = NULL;
     iRelease(d->ansiEscape);
-    delete_PtrSet(d->pendingRaster);
 }
 
 void setOpacity_Text(float opacity) {
@@ -514,10 +510,6 @@ void resetFonts_Text(void) {
     initFonts_Text_(d);
 }
 
-size_t numPendingGlyphs_Text(void) {
-    return size_PtrSet(text_.pendingRaster);
-}
-
 iLocalDef iFont *font_Text_(enum iFontId id) {
     return &text_.fonts[id & mask_FontId];
 }
@@ -656,18 +648,10 @@ static void doRaster_Font_(const iFont *font, iGlyph *glyph) {
     SDL_Texture *oldTarget = SDL_GetRenderTarget(text_.render);
     SDL_SetRenderTarget(text_.render, text_.cache);
     if (!isRasterized_Glyph_(glyph, 0)) {
-        if (cache_Font_(font, glyph, 0)) {
-            if (isFullyRasterized_Glyph_(glyph)) {
-                remove_PtrSet(text_.pendingRaster, glyph);
-            }
-        }
+        cache_Font_(font, glyph, 0);
     }
     if (!isRasterized_Glyph_(glyph, 1)) {
-        if (cache_Font_(font, glyph, 1)) { /* half-pixel offset */
-            if (isFullyRasterized_Glyph_(glyph)) {
-                remove_PtrSet(text_.pendingRaster, glyph);
-            }
-        }
+        cache_Font_(font, glyph, 1); /* half-pixel offset */
     }
     SDL_SetRenderTarget(text_.render, oldTarget);
 }
@@ -697,7 +681,6 @@ static const iGlyph *glyph_Font_(iFont *d, iChar ch) {
         allocate_Font_(font, glyph, 0);
         allocate_Font_(font, glyph, 1);
         insert_Hash(&font->glyphs, &glyph->node);
-        insert_PtrSet(text_.pendingRaster, glyph);
     }
     if (enableRaster_Text_ && !isFullyRasterized_Glyph_(glyph)) {
         doRaster_Font_(font, glyph);
@@ -705,14 +688,18 @@ static const iGlyph *glyph_Font_(iFont *d, iChar ch) {
     return glyph;
 }
 
-void rasterizeSomePendingGlyphs_Text(void) {
-    size_t count = 5;
-    iForEach(PtrSet, i, text_.pendingRaster) {
-        iGlyph *glyph = *i.value;
-        remove_PtrSet(text_.pendingRaster, glyph);
-        doRaster_Font_(glyph->font, glyph);
-        if (!count--) break;
+static iChar nextChar_(const char **chPos, const char *end) {
+    if (*chPos == end) {
+        return 0;
+    }
+    iChar ch;
+    int len = decodeBytes_MultibyteChar(*chPos, end - *chPos, &ch);
+    if (len <= 0) {
+        (*chPos)++; /* skip it */
+        return 0;
     }
+    (*chPos) += len;
+    return ch;
 }
 
 enum iRunMode {
@@ -727,20 +714,6 @@ enum iRunMode {
     alwaysVariableWidthFlag_RunMode = iBit(12),
 };
 
-static iChar nextChar_(const char **chPos, const char *end) {
-    if (*chPos == end) {
-        return 0;
-    }
-    iChar ch;
-    int len = decodeBytes_MultibyteChar(*chPos, end - *chPos, &ch);
-    if (len <= 0) {
-        (*chPos)++; /* skip it */
-        return 0;
-    }
-    (*chPos) += len;
-    return ch;
-}
-
 static enum iFontId fontId_Text_(const iFont *font) {
     return (enum iFontId) (font - text_.fonts);
 }
@@ -949,7 +922,7 @@ static iRect run_Font_(iFont *d, const iRunArgs *args) {
         const iBool useMonoAdvance =
             monoAdvance > 0 && !isJapanese_FontId(fontId_Text_(glyph->font));
         const float advance = (useMonoAdvance ? monoAdvance : glyph->advance);
-        if (!isMeasuring_(mode)) {
+        if (!isMeasuring_(mode) && ch != 0x20 /* don't bother rendering spaces */) {
             if (useMonoAdvance && dst.w > advance && glyph->font != d && !isEmoji) {
                 /* Glyphs from a different font may need recentering to look better. */
                 dst.x -= (dst.w - advance) / 2;
diff --git a/src/ui/text.h b/src/ui/text.h
index c9f94307..897dfed0 100644
--- a/src/ui/text.h
+++ b/src/ui/text.h
@@ -171,8 +171,6 @@ void    setContentFont_Text     (enum iTextFont font);
 void    setHeadingFont_Text     (enum iTextFont font);
 void    setContentFontSize_Text (float fontSizeFactor); /* affects all except `default*` fonts */
 void    resetFonts_Text         (void);
-size_t  numPendingGlyphs_Text   (void);
-void    rasterizeSomePendingGlyphs_Text (void);
 
 int     lineHeight_Text         (int fontId);
 iInt2   measure_Text            (int fontId, const char *text);
diff --git a/src/ui/window.c b/src/ui/window.c
index d8d0b3ea..29f240c2 100644
--- a/src/ui/window.c
+++ b/src/ui/window.c
@@ -1862,7 +1862,6 @@ void draw_Window(iWindow *d) {
     }
 #endif
     SDL_RenderPresent(d->render);
-    rasterizeSomePendingGlyphs_Text();
 }
 
 void resize_Window(iWindow *d, int w, int h) {