Added preference for font smoothing

5 files changed, 35 insertions, 15 deletions

diff --git a/src/app.c b/src/app.c
index a7925def..607b29ee 100644
--- a/src/app.c
+++ b/src/app.c
@@ -233,6 +233,7 @@ static iString *serializePrefs_App_(const iApp *d) {
     appendFormat_String(str, "returnkey.set arg:%d\n", d->prefs.returnKey);
     /* TODO: Set up an array of booleans in Prefs and do these in a loop. */
     appendFormat_String(str, "prefs.animate.changed arg:%d\n", d->prefs.uiAnimations);
+    appendFormat_String(str, "prefs.font.smooth.changed arg:%d\n", d->prefs.fontSmoothing);
     appendFormat_String(str, "prefs.mono.gemini.changed arg:%d\n", d->prefs.monospaceGemini);
     appendFormat_String(str, "prefs.mono.gopher.changed arg:%d\n", d->prefs.monospaceGopher);
     appendFormat_String(str, "prefs.boldlink.dark.changed arg:%d\n", d->prefs.boldLinkDark);
@@ -2334,7 +2335,19 @@ iBool handleCommand_App(const char *cmd) {
     }
     else if (equal_Command(cmd, "quoteicon.set")) {
         d->prefs.quoteIcon = arg_Command(cmd) != 0;
-        postCommand_App("document.layout.changed");
+        postCommand_App("document.layout.changed redo:1");
+        return iTrue;
+    }
+    else if (equal_Command(cmd, "prefs.font.smooth.changed")) {
+        if (!isFrozen) {
+            setFreezeDraw_MainWindow(get_MainWindow(), iTrue);
+        }
+        d->prefs.fontSmoothing = arg_Command(cmd) != 0;
+        if (!isFrozen) {
+            resetFonts_Text(text_Window(get_MainWindow())); /* clear the glyph cache */
+            postCommand_App("font.changed");
+            postCommand_App("window.unfreeze");
+        }
         return iTrue;
     }
     else if (equal_Command(cmd, "prefs.mono.gemini.changed") ||
@@ -2750,6 +2763,7 @@ iBool handleCommand_App(const char *cmd) {
         setFlags_Widget(findChild_Widget(dlg, "prefs.boldlink.light"),
                         selected_WidgetFlag,
                         d->prefs.boldLinkLight);
+        setToggle_Widget(findChild_Widget(dlg, "prefs.font.smooth"), d->prefs.fontSmoothing);
         setFlags_Widget(
             findChild_Widget(dlg, format_CStr("prefs.linewidth.%d", d->prefs.lineWidth)),
             selected_WidgetFlag,
diff --git a/src/prefs.c b/src/prefs.c
index 65560264..f51538ac 100644
--- a/src/prefs.c
+++ b/src/prefs.c
@@ -60,6 +60,7 @@ void init_Prefs(iPrefs *d) {
     setCStr_String(&d->strings[bodyFont_PrefsString], "default");
     setCStr_String(&d->strings[monospaceFont_PrefsString], "iosevka");
     setCStr_String(&d->strings[monospaceDocumentFont_PrefsString], "iosevka-body");
+    d->fontSmoothing     = iTrue;
     d->monospaceGemini   = iFalse;
     d->monospaceGopher   = iFalse;
     d->boldLinkDark      = iTrue;
diff --git a/src/prefs.h b/src/prefs.h
index dc233cdc..d1131aae 100644
--- a/src/prefs.h
+++ b/src/prefs.h
@@ -87,6 +87,7 @@ struct Impl_Prefs {
     int              maxCacheSize; /* MB */
     int              maxMemorySize; /* MB */
     /* Style */
+    iBool            fontSmoothing;
     iBool            monospaceGemini;
     iBool            monospaceGopher;
     iBool            boldLinkDark;
diff --git a/src/ui/text.c b/src/ui/text.c
index 3d2cdf5d..fd865fbd 100644
--- a/src/ui/text.c
+++ b/src/ui/text.c
@@ -260,6 +260,7 @@ struct Impl_Text {
     int            cacheBottom;
     iArray         cacheRows;
     SDL_Palette *  grayscale;
+    SDL_Palette *  blackAndWhite; /* unsmoothed glyph palette */
     iRegExp *      ansiEscape;
 };
 
@@ -549,12 +550,21 @@ void init_Text(iText *d, SDL_Renderer *render) {
         d->grayscale = SDL_AllocPalette(256);
         SDL_SetPaletteColors(d->grayscale, colors, 0, 256);
     }
+    /* Black-and-white palette for unsmoothed glyphs. */ {
+        SDL_Color colors[256];
+        for (int i = 0; i < 256; ++i) {
+            colors[i] = (SDL_Color){ 255, 255, 255, i < 100 ? 0 : 255 };
+        }
+        d->blackAndWhite = SDL_AllocPalette(256);
+        SDL_SetPaletteColors(d->blackAndWhite, colors, 0, 256);        
+    }
     initCache_Text_(d);
     initFonts_Text_(d);
     activeText_ = oldActive;
 }
 
 void deinit_Text(iText *d) {
+    SDL_FreePalette(d->blackAndWhite);
     SDL_FreePalette(d->grayscale);
     deinitFonts_Text_(d);
     deinitCache_Text_(d);
@@ -603,6 +613,10 @@ void resetFonts_Text(iText *d) {
     initFonts_Text_(d);
 }
 
+static SDL_Palette *glyphPalette_(void) {
+    return prefs_App()->fontSmoothing ? activeText_->grayscale : activeText_->blackAndWhite;
+}
+
 static SDL_Surface *rasterizeGlyph_Font_(const iFont *d, uint32_t glyphIndex, float xShift) {
     int w, h;
     uint8_t *bmp = rasterizeGlyph_FontFile(d->fontFile, d->xScale, d->yScale, xShift, glyphIndex,
@@ -610,7 +624,7 @@ static SDL_Surface *rasterizeGlyph_Font_(const iFont *d, uint32_t glyphIndex, fl
     SDL_Surface *surface8 =
         SDL_CreateRGBSurfaceWithFormatFrom(bmp, w, h, 8, w, SDL_PIXELFORMAT_INDEX8);
     SDL_SetSurfaceBlendMode(surface8, SDL_BLENDMODE_NONE);
-    SDL_SetSurfacePalette(surface8, activeText_->grayscale);
+    SDL_SetSurfacePalette(surface8, glyphPalette_());
 #if LAGRANGE_RASTER_DEPTH != 8
     /* Convert to the cache format. */
     SDL_Surface *surf = SDL_ConvertSurfaceFormat(surface8, LAGRANGE_RASTER_FORMAT, 0);
@@ -890,18 +904,6 @@ static iRangecc sourceRange_AttributedText_(const iAttributedText *d, iRangei lo
     return range;
 }
 
-#if 0
-static iBool isAllSpace_AttributedText_(const iAttributedText *d, iRangei range) {
-    const iChar *logicalText = constData_Array(&d->logical);
-    for (size_t i = range.start; i < range.end; i++) {
-        if (logicalText[i] != 0x20) {
-            return iFalse;
-        }
-    }
-    return iTrue;
-}
-#endif
-
 static void finishRun_AttributedText_(iAttributedText *d, iAttributedRun *run, int endAt) {
     iAttributedRun finishedRun = *run;
     iAssert(endAt >= 0 && endAt <= size_Array(&d->logical));
@@ -1184,7 +1186,7 @@ static void cacheGlyphs_Font_(iFont *d, const iArray *glyphIndices) {
                                 LAGRANGE_RASTER_DEPTH,
                                 LAGRANGE_RASTER_FORMAT);
                     SDL_SetSurfaceBlendMode(buf, SDL_BLENDMODE_NONE);
-                    SDL_SetSurfacePalette(buf, activeText_->grayscale);
+                    SDL_SetSurfacePalette(buf, glyphPalette_());
                 }
                 SDL_Surface *surfaces[2] = {
                     !isRasterized_Glyph_(glyph, 0) ?
diff --git a/src/ui/util.c b/src/ui/util.c
index 3240b416..653102cb 100644
--- a/src/ui/util.c
+++ b/src/ui/util.c
@@ -2568,6 +2568,8 @@ iWidget *makePreferences_Widget(void) {
             addDialogPadding_(headings, values);
             addChild_Widget(headings, iClob(makeHeading_Widget("${prefs.font.ui}")));
             addFontButtons_(values, "ui");
+            addDialogPadding_(headings, values);
+            addDialogToggle_(headings, values, "${prefs.font.smooth}", "prefs.font.smooth");
             //            addDialogPadding_(headings, values);
 //            /* Custom font. */ {
 //                iInputWidget *customFont = new_InputWidget(0);