wez/wezterm
1
1
Fork 0
mirror of https://github.com/wez/wezterm.git synced 2024-11-10 15:04:32 +03:00
Code Issues Projects Releases Wiki Activity

fonts: improve debugging for windows font loading

Browse Source 
We didn't have as much info here as I thought; improve it!

refs: https://github.com/wez/wezterm/issues/624
This commit is contained in:
Wez Furlong 2021-04-03 17:42:44 -07:00
parent c22765c1a7
commit 2c7e5196ac
2 changed files with 39 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
wezterm-font/src/locator/gdi.rs
View File

@ -184,24 +184,50 @@ impl FontLocator for GdiFontLocator {
for font_attr in fonts_selection {
let descriptor = attributes_to_descriptor(font_attr);
if let Some(handle) = handle_from_descriptor(&collection, &descriptor) {
if let Ok(parsed) = crate::parser::ParsedFont::from_locator(&handle) {
if crate::parser::font_info_matches(font_attr, parsed.names()) {
log::debug!("Got {:?} from dwrote", handle);
fonts.push(handle);
loaded.insert(font_attr.clone());
continue;
fn try_handle(
font_attr: &FontAttributes,
handle: FontDataHandle,
fonts: &mut Vec<FontDataHandle>,
loaded: &mut HashSet<FontAttributes>,
) -> bool {
match crate::parser::ParsedFont::from_locator(&handle) {
Ok(parsed) => {
if crate::parser::font_info_matches(font_attr, parsed.names()) {
fonts.push(handle);
loaded.insert(font_attr.clone());
true
} else {
log::debug!("parsed {:?} doesn't match {:?}", parsed, font_attr);
false
}
}
Err(err) => {
log::debug!("unable to resolve {:?} to a path: {:#}", handle, err);
false
}
}
}
if let Ok(handle) = load_font(font_attr) {
if let Ok(parsed) = crate::parser::ParsedFont::from_locator(&handle) {
if crate::parser::font_info_matches(font_attr, parsed.names()) {
fonts.push(handle);
loaded.insert(font_attr.clone());
match handle_from_descriptor(&collection, &descriptor) {
Some(handle) => {
log::debug!("Got {:?} from dwrote", handle);
if try_handle(font_attr, handle, &mut fonts, loaded) {
continue;
}
}
None => {
log::debug!("dwrote couldn't resolve {:?}", font_attr);
}
}
match load_font(font_attr) {
Ok(handle) => {
log::debug!("Got {:?} from gdi", handle);
try_handle(font_attr, handle, &mut fonts, loaded);
}
Err(err) => {
log::debug!("gdi couldn't resolve {:?} to a path: {:#}", font_attr, err);
}
}
}

1
wezterm-font/src/parser.rs
View File

@ -13,6 +13,7 @@ pub enum MaybeShaped {
}
/// Represents a parsed font
#[derive(Debug)]
pub struct ParsedFont {
names: Names,
}