Reduce instances of font fallback dialog

src/cascadia/TerminalControl/TermControl.cpp

@@ -2113,8 +2113,8 @@ namespace winrt::Microsoft::Terminal::Control::implementation
         //      actually fail. We need a way to gracefully fallback.
         _renderer->TriggerFontChange(newDpi, _desiredFont, _actualFont);
 
-        // If the actual font isn't what was requested...
-        if (_actualFont.GetFaceName() != _desiredFont.GetFaceName())
+        // If the actual font went through the last-chance fallback routines...
+        if (_actualFont.GetFallback())
         {
             // Then warn the user that we picked something because we couldn't find their font.
 

src/renderer/base/fontinfo.cpp

@@ -20,7 +20,8 @@ FontInfo::FontInfo(const std::wstring_view faceName,
                    const bool fSetDefaultRasterFont /* = false */) :
     FontInfoBase(faceName, family, weight, fSetDefaultRasterFont, codePage),
     _coordSize(coordSize),
-    _coordSizeUnscaled(coordSize)
+    _coordSizeUnscaled(coordSize),
+    _didFallback(false)
 {
     ValidateFont();
 }
@@ -60,6 +61,16 @@ void FontInfo::SetFromEngine(const std::wstring_view faceName,
     _ValidateCoordSize();
 }
 
+bool FontInfo::GetFallback() const noexcept
+{
+    return _didFallback;
+}
+
+void FontInfo::SetFallback(const bool didFallback) noexcept
+{
+    _didFallback = didFallback;
+}
+
 void FontInfo::ValidateFont()
 {
     _ValidateCoordSize();

src/renderer/dx/DxFontRenderData.cpp

@@ -36,6 +36,50 @@ DxFontRenderData::DxFontRenderData(::Microsoft::WRL::ComPtr<IDWriteFactory1> dwr
     return _systemFontFallback;
 }
 
+[[nodiscard]] Microsoft::WRL::ComPtr<IDWriteFontCollection1> DxFontRenderData::PackageCollection() const
+{
+    if (!_packageLoadCollection)
+    {
+        // Factory3 has a convenience to get us a font set builder.
+        ::Microsoft::WRL::ComPtr<IDWriteFactory3> factory3;
+        THROW_IF_FAILED(_dwriteFactory.As(&factory3));
+
+        ::Microsoft::WRL::ComPtr<IDWriteFontSetBuilder> fontSetBuilder;
+        THROW_IF_FAILED(factory3->CreateFontSetBuilder(&fontSetBuilder));
+
+        // Builder2 has a convenience to just feed in paths to font files.
+        ::Microsoft::WRL::ComPtr<IDWriteFontSetBuilder2> fontSetBuilder2;
+        THROW_IF_FAILED(fontSetBuilder.As(&fontSetBuilder2));
+
+        // Find the directory we're running from then enumerate all the TTF files
+        // sitting next to us.
+        const std::filesystem::path module{ wil::GetModuleFileNameW<std::wstring>(nullptr) };
+        const auto folder = module.parent_path();
+
+        for (auto& p : std::filesystem::directory_iterator(folder))
+        {
+            if (p.is_regular_file())
+            {
+                auto extension = p.path().extension().wstring();
+                std::transform(extension.begin(), extension.end(), extension.begin(), std::towlower);
+
+                const std::wstring_view ttfExtension{ L".ttf" };
+                if (ttfExtension == extension)
+                {
+                    fontSetBuilder2->AddFontFile(p.path().c_str());
+                }
+            }
+        }
+
+        ::Microsoft::WRL::ComPtr<IDWriteFontSet> fontSet;
+        THROW_IF_FAILED(fontSetBuilder2->CreateFontSet(&fontSet));
+
+        THROW_IF_FAILED(factory3->CreateFontCollectionFromFontSet(fontSet.Get(), &_packageLoadCollection));
+    }
+
+    return _packageLoadCollection;
+}
+
 [[nodiscard]] til::size DxFontRenderData::GlyphCell() noexcept
 {
     return _glyphCell;
@@ -94,7 +138,9 @@ DxFontRenderData::DxFontRenderData(::Microsoft::WRL::ComPtr<IDWriteFactory1> dwr
         // _ResolveFontFaceWithFallback overrides the last argument with the locale name of the font,
         // but we should use the system's locale to render the text.
         std::wstring fontLocaleName = localeName;
-        const auto face = _ResolveFontFaceWithFallback(fontName, weight, stretch, style, fontLocaleName);
+
+        bool didFallback = false;
+        const auto face = _ResolveFontFaceWithFallback(fontName, weight, stretch, style, fontLocaleName, didFallback);
 
         DWRITE_FONT_METRICS1 fontMetrics;
         face->GetMetrics(&fontMetrics);
@@ -221,8 +267,9 @@ DxFontRenderData::DxFontRenderData(::Microsoft::WRL::ComPtr<IDWriteFactory1> dwr
         DWRITE_FONT_WEIGHT weightItalic = weight;
         DWRITE_FONT_STYLE styleItalic = DWRITE_FONT_STYLE_ITALIC;
         DWRITE_FONT_STRETCH stretchItalic = stretch;
+        bool didItalicFallback = false;
 
-        const auto faceItalic = _ResolveFontFaceWithFallback(fontNameItalic, weightItalic, stretchItalic, styleItalic, fontLocaleName);
+        const auto faceItalic = _ResolveFontFaceWithFallback(fontNameItalic, weightItalic, stretchItalic, styleItalic, fontLocaleName, didItalicFallback);
 
         Microsoft::WRL::ComPtr<IDWriteTextFormat> formatItalic;
         THROW_IF_FAILED(_dwriteFactory->CreateTextFormat(fontNameItalic.data(),
@@ -266,6 +313,7 @@ DxFontRenderData::DxFontRenderData(::Microsoft::WRL::ComPtr<IDWriteFactory1> dwr
                              false,
                              scaled,
                              unscaled);
+        actual.SetFallback(didFallback);
 
         LineMetrics lineMetrics;
         // There is no font metric for the grid line width, so we use a small
@@ -578,37 +626,76 @@ CATCH_RETURN()
 // - weight - The weight (bold, light, etc.)
 // - stretch - The stretch of the font is the spacing between each letter
 // - style - Normal, italic, etc.
+// - localeName - Locale to search for appropriate fonts
+// - didFallback - Indicates whether we couldn't match the user request and had to choose from a hardcoded default list.
 // Return Value:
 // - Smart pointer holding interface reference for queryable font data.
 [[nodiscard]] Microsoft::WRL::ComPtr<IDWriteFontFace1> DxFontRenderData::_ResolveFontFaceWithFallback(std::wstring& familyName,
                                                                                                       DWRITE_FONT_WEIGHT& weight,
                                                                                                       DWRITE_FONT_STRETCH& stretch,
                                                                                                       DWRITE_FONT_STYLE& style,
-                                                                                                      std::wstring& localeName) const
+                                                                                                      std::wstring& localeName,
+                                                                                                      bool& didFallback) const
 {
+    // First attempt to find exactly what the user asked for.
+    didFallback = false;
     auto face = _FindFontFace(familyName, weight, stretch, style, localeName);
 
     if (!face)
     {
-        for (const auto fallbackFace : FALLBACK_FONT_FACES)
+        // If we missed, try looking a little more by trimming the last word off the requested family name a few times.
+        // Quite often, folks are specifying weights or something in the familyName and it causes failed resolution and
+        // an unexpected error dialog. We theoretically could detect the weight words and convert them, but this
+        // is the quick fix for the majority scenario.
+        // The long/full fix is backlogged to GH#xxxx
+        // Also this doesn't count as a fallback because we don't want to annoy folks with the warning dialog over
+        // this resolution.
+        while (!face && !familyName.empty())
         {
-            familyName = fallbackFace;
-            face = _FindFontFace(familyName, weight, stretch, style, localeName);
+            const auto lastSpace = familyName.find_last_of(L'\x20');
 
-            if (face)
+            // value is unsigned and npos will be greater than size.
+            // if we didn't find anything to trim, leave.
+            if (lastSpace >= familyName.size())
             {
                 break;
             }
 
-            familyName = fallbackFace;
-            weight = DWRITE_FONT_WEIGHT_NORMAL;
-            stretch = DWRITE_FONT_STRETCH_NORMAL;
-            style = DWRITE_FONT_STYLE_NORMAL;
+            // trim string down to just before the found space
+            // (space found at 6... trim from 0 for 6 length will give us 0-5 as the new string)
+            familyName = familyName.substr(0, lastSpace);
+
+            // Try to find it with the shortened family name
             face = _FindFontFace(familyName, weight, stretch, style, localeName);
+        }
 
-            if (face)
+        // Alright, if our quick shot at trimming didn't work either...
+        // move onto looking up a font from our hardcoded list of fonts
+        // that should really always be available.
+        if (!face)
+        {
+            for (const auto fallbackFace : FALLBACK_FONT_FACES)
             {
-                break;
+                familyName = fallbackFace;
+                face = _FindFontFace(familyName, weight, stretch, style, localeName);
+
+                if (face)
+                {
+                    didFallback = true;
+                    break;
+                }
+
+                familyName = fallbackFace;
+                weight = DWRITE_FONT_WEIGHT_NORMAL;
+                stretch = DWRITE_FONT_STRETCH_NORMAL;
+                style = DWRITE_FONT_STYLE_NORMAL;
+                face = _FindFontFace(familyName, weight, stretch, style, localeName);
+
+                if (face)
+                {
+                    didFallback = true;
+                    break;
+                }
             }
         }
     }
@@ -642,6 +729,13 @@ CATCH_RETURN()
     BOOL familyExists;
     THROW_IF_FAILED(fontCollection->FindFamilyName(familyName.data(), &familyIndex, &familyExists));
 
+    // If the system collection missed, try the files sitting next to our binary in the package.
+    if (!familyExists)
+    {
+        PackageCollection().As(&fontCollection);
+        THROW_IF_FAILED(fontCollection->FindFamilyName(familyName.data(), &familyIndex, &familyExists));
+    }
+
     if (familyExists)
     {
         Microsoft::WRL::ComPtr<IDWriteFontFamily> fontFamily;

src/renderer/dx/DxFontRenderData.h

@@ -35,6 +35,8 @@ namespace Microsoft::Console::Render
 
         [[nodiscard]] Microsoft::WRL::ComPtr<IDWriteFontFallback> SystemFontFallback();
 
+        [[nodiscard]] Microsoft::WRL::ComPtr<IDWriteFontCollection1> PackageCollection() const;
+
         [[nodiscard]] til::size GlyphCell() noexcept;
         [[nodiscard]] LineMetrics GetLineMetrics() noexcept;
 
@@ -62,7 +64,8 @@ namespace Microsoft::Console::Render
                                                                                               DWRITE_FONT_WEIGHT& weight,
                                                                                               DWRITE_FONT_STRETCH& stretch,
                                                                                               DWRITE_FONT_STYLE& style,
-                                                                                              std::wstring& localeName) const;
+                                                                                              std::wstring& localeName,
+                                                                                              bool& didFallback) const;
 
         [[nodiscard]] ::Microsoft::WRL::ComPtr<IDWriteFontFace1> _FindFontFace(std::wstring& familyName,
                                                                                DWRITE_FONT_WEIGHT& weight,
@@ -87,6 +90,7 @@ namespace Microsoft::Console::Render
         ::Microsoft::WRL::ComPtr<IBoxDrawingEffect> _boxDrawingEffect;
 
         ::Microsoft::WRL::ComPtr<IDWriteFontFallback> _systemFontFallback;
+        mutable ::Microsoft::WRL::ComPtr<IDWriteFontCollection1> _packageLoadCollection;
         std::wstring _userLocaleName;
 
         til::size _glyphCell;

src/renderer/inc/FontInfo.hpp

@@ -47,6 +47,9 @@ class FontInfo : public FontInfoBase
                        const COORD coordSize,
                        const COORD coordSizeUnscaled);
 
+    bool GetFallback() const noexcept;
+    void SetFallback(const bool didFallback) noexcept;
+
     void ValidateFont();
 
     friend bool operator==(const FontInfo& a, const FontInfo& b);
@@ -56,6 +59,7 @@ class FontInfo : public FontInfoBase
 
     COORD _coordSize;
     COORD _coordSizeUnscaled;
+    bool _didFallback;
 };
 
 bool operator==(const FontInfo& a, const FontInfo& b);