wez/wezterm
1
1
Fork 0
mirror of https://github.com/wez/wezterm.git synced 2024-12-23 13:21:38 +03:00
Code Issues Projects Releases Wiki Activity

fontconfig: allow proportional fallbacks for codepoints

Browse Source 
refs: https://github.com/wez/wezterm/discussions/2468#discussioncomment-3528085
This commit is contained in:
Wez Furlong 2022-09-04 07:05:58 -07:00
parent 821e833ad0
commit c38816fc6e
2 changed files with 60 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
docs/changelog.md
View File

@ -11,7 +11,10 @@ usually the best available version.
As features stabilize some brief notes about them will accumulate here.
* Not yet
#### Changed
* fontconfig: when locating a fallback font for a given codepoint, allow
matching non-monospace fonts if we can't find any matching monospace fonts.
[#2468](https://github.com/wez/wezterm/discussions/2468)
### 20220904-064125-9a6cee2b

20
wezterm-font/src/locator/font_config.rs
View File

@ -170,6 +170,12 @@ impl FontLocator for FontConfigFontLocator {
charset.add(c)?;
}
let mut fonts = vec![];
// Make two passes to locate a fallback: first try to find any
// strictly monospace version, then, if we didn't find any matches,
// look for a version with any spacing.
for only_monospace in [true, false] {
let mut pattern = FontPattern::new()?;
pattern.add_charset(&charset)?;
pattern.add_integer("weight", 80)?;
@ -179,6 +185,7 @@ impl FontLocator for FontConfigFontLocator {
.list()
.context("pattern.list with no spacing constraint")?];
if only_monospace {
for &spacing in &SPACING {
pattern.delete_property("spacing")?;
pattern.add_integer("spacing", spacing)?;
@ -188,8 +195,7 @@ impl FontLocator for FontConfigFontLocator {
.with_context(|| format!("pattern.list with spacing={}", spacing))?,
);
}
let mut fonts = vec![];
}
for list in lists {
for pat in list.iter() {
@ -218,6 +224,16 @@ impl FontLocator for FontConfigFontLocator {
}
}
if fonts.is_empty() {
// If we get here on the first iteration, then we didn't
// find a monospace version of fonts with those codepoints,
// let's continue and try any matching font
continue;
}
break;
}
Ok(fonts)
}