wez/wezterm
1
1
Fork 0
mirror of https://github.com/wez/wezterm.git synced 2024-12-24 22:01:47 +03:00
Code Issues Projects Releases Wiki Activity

fonts: tune up fallback font resolution

Browse Source 
* Check built-in fonts before asking the system for codepoint coverage
* If one of the earlier stages resolved some fonts, skip the remaining
  stages and speculatively shape what we have.  This avoids triggering
  the system font lookup for fonts that are present in the font_dirs
  or that are built-in, such as powerline symbols.

refs: https://github.com/wez/wezterm/issues/559
This commit is contained in:
Wez Furlong 2021-03-22 15:03:50 -07:00
parent 961e4ef9f7
commit f7b0ea2eb7
1 changed files with 26 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
wezterm-font/src/lib.rs
View File

@ -95,29 +95,34 @@ impl LoadedFont {
fallback_str.escape_debug() fallback_str.escape_debug()
), ),
} }
match font_config
.locator if extra_handles.is_empty() {
.locate_fallback_for_codepoints(&no_glyphs) match font_config
{ .built_in
Ok(ref mut handles) => extra_handles.append(handles), .borrow()
Err(err) => log::error!( .locate_fallback_for_codepoints(&no_glyphs)
"Error: {} while resolving fallback for {} from font-locator", {
err, Ok(ref mut handles) => extra_handles.append(handles),
fallback_str.escape_debug() Err(err) => log::error!(
), "Error: {} while resolving fallback for {} for built-in fonts",
err,
fallback_str.escape_debug()
),
}
} }
match font_config if extra_handles.is_empty() {
.built_in match font_config
.borrow() .locator
.locate_fallback_for_codepoints(&no_glyphs) .locate_fallback_for_codepoints(&no_glyphs)
{ {
Ok(ref mut handles) => extra_handles.append(handles), Ok(ref mut handles) => extra_handles.append(handles),
Err(err) => log::error!( Err(err) => log::error!(
"Error: {} while resolving fallback for {} for built-in fonts", "Error: {} while resolving fallback for {} from font-locator",
err, err,
fallback_str.escape_debug() fallback_str.escape_debug()
), ),
}
} }
if extra_handles.is_empty() { if extra_handles.is_empty() {