-
Notifications
You must be signed in to change notification settings - Fork 8.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix Windows 10 support for nearby font loading (#12554)
By replacing `IDWriteFontSetBuilder2::AddFontFile` with `IDWriteFactory5::CreateFontFileReference` and `IDWriteFontSetBuilder1::AddFontFile` we add nearby font loading support for Windows 10, build 15021. This commit also fixes font fallback for AtlasEngine, which was crashing during testing. Finally it fixes a bug in DxEngine, where we only created a "nearby" font collection if we couldn't find the font in the system collection. This doesn't fix the bug, if the font is locked or broken in the system collection. This is related to #11648. ## PR Checklist * [x] Closes #12420 * [x] I work here * [x] Tests added/passed ## Validation Steps Performed * Build a Debug version of Windows Terminal * Put Jetbrains Mono into the writeable AppX directory * Jetbrains Mono is present in the settings UI ✅ * DxEngine works with Jetbrains Mono ✅ * AtlasEngine works with Jetbrains Mono ✅ (cherry picked from commit f84ccad)
- Loading branch information
Showing
13 changed files
with
196 additions
and
234 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,96 @@ | ||
| // Copyright (c) Microsoft Corporation. | ||
| // Licensed under the MIT license. | ||
|
|
||
| #pragma once | ||
|
|
||
| namespace Microsoft::Console::Render::FontCache | ||
| { | ||
| namespace details | ||
| { | ||
| inline const std::vector<wil::com_ptr<IDWriteFontFile>>& getNearbyFontFiles(IDWriteFactory5* factory5) | ||
| { | ||
| static const auto fontFiles = [=]() { | ||
| std::vector<wil::com_ptr<IDWriteFontFile>> files; | ||
|
|
||
| const std::filesystem::path module{ wil::GetModuleFileNameW<std::wstring>(nullptr) }; | ||
| const auto folder{ module.parent_path() }; | ||
|
|
||
| for (const auto& p : std::filesystem::directory_iterator(folder)) | ||
| { | ||
| if (til::ends_with(p.path().native(), L".ttf")) | ||
| { | ||
| wil::com_ptr<IDWriteFontFile> fontFile; | ||
| if (SUCCEEDED_LOG(factory5->CreateFontFileReference(p.path().c_str(), nullptr, fontFile.addressof()))) | ||
| { | ||
| files.emplace_back(std::move(fontFile)); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| files.shrink_to_fit(); | ||
| return files; | ||
| }(); | ||
| return fontFiles; | ||
| } | ||
|
|
||
| inline wil::com_ptr<IDWriteFontCollection> getFontCollection(bool forceUpdate) | ||
| { | ||
| wil::com_ptr<IDWriteFactory> factory; | ||
| THROW_IF_FAILED(DWriteCreateFactory(DWRITE_FACTORY_TYPE_SHARED, __uuidof(factory), reinterpret_cast<::IUnknown**>(factory.addressof()))); | ||
|
|
||
| wil::com_ptr<IDWriteFontCollection> systemFontCollection; | ||
| THROW_IF_FAILED(factory->GetSystemFontCollection(systemFontCollection.addressof(), forceUpdate)); | ||
|
|
||
| if constexpr (Feature_NearbyFontLoading::IsEnabled()) | ||
| { | ||
| // IDWriteFactory5 is supported since Windows 10, build 15021. | ||
| const auto factory5 = factory.try_query<IDWriteFactory5>(); | ||
| if (!factory5) | ||
| { | ||
| return systemFontCollection; | ||
| } | ||
|
|
||
| const auto& nearbyFontFiles = getNearbyFontFiles(factory5.get()); | ||
| if (nearbyFontFiles.empty()) | ||
| { | ||
| return systemFontCollection; | ||
| } | ||
|
|
||
| wil::com_ptr<IDWriteFontSet> systemFontSet; | ||
| // IDWriteFontCollection1 is supported since Windows 7. | ||
| THROW_IF_FAILED(systemFontCollection.query<IDWriteFontCollection1>()->GetFontSet(systemFontSet.addressof())); | ||
|
|
||
| wil::com_ptr<IDWriteFontSetBuilder1> fontSetBuilder; | ||
| THROW_IF_FAILED(factory5->CreateFontSetBuilder(fontSetBuilder.addressof())); | ||
| THROW_IF_FAILED(fontSetBuilder->AddFontSet(systemFontSet.get())); | ||
|
|
||
| for (const auto& file : nearbyFontFiles) | ||
| { | ||
| LOG_IF_FAILED(fontSetBuilder->AddFontFile(file.get())); | ||
| } | ||
|
|
||
| wil::com_ptr<IDWriteFontSet> fontSet; | ||
| THROW_IF_FAILED(fontSetBuilder->CreateFontSet(fontSet.addressof())); | ||
|
|
||
| wil::com_ptr<IDWriteFontCollection1> fontCollection; | ||
| THROW_IF_FAILED(factory5->CreateFontCollectionFromFontSet(fontSet.get(), fontCollection.addressof())); | ||
|
|
||
| return std::move(fontCollection); | ||
| } | ||
| else | ||
| { | ||
| return systemFontCollection; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| inline wil::com_ptr<IDWriteFontCollection> GetCached() | ||
| { | ||
| return details::getFontCollection(false); | ||
| } | ||
|
|
||
| inline wil::com_ptr<IDWriteFontCollection> GetFresh() | ||
| { | ||
| return details::getFontCollection(true); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.