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

Ensure that we propagate OutOfTextureSpace errors

Browse Source 
otherwise we won't be able to show many glyphs beyond those that
fit in the initial texture atlas!

refs: https://github.com/wez/wezterm/discussions/672
refs: https://github.com/wez/wezterm/issues/671
This commit is contained in:
Wez Furlong 2021-04-10 07:26:19 -07:00
parent b825f86380
commit c312983643
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
wezterm-gui/src/glyphcache.rs
View File

@ -1,4 +1,5 @@
use super::utilsprites::RenderMetrics;
use ::window::bitmaps::atlas::OutOfTextureSpace;
use ::window::bitmaps::atlas::{Atlas, Sprite};
#[cfg(test)]
use ::window::bitmaps::ImageTexture;
@ -407,11 +408,21 @@ impl<T: Texture2d> GlyphCache<T> {
return Ok(Rc::clone(entry));
}
let glyph = self
.load_glyph(info, style, followed_by_space)
.unwrap_or_else(|err| {
// Don't allow glyph loading errors to propagate, as
// that will result in incomplete window painting.
let glyph = match self.load_glyph(info, style, followed_by_space) {
Ok(g) => g,
Err(err) => {
if err
.root_cause()
.downcast_ref::<OutOfTextureSpace>()
.is_some()
{
// Ensure that we propagate this signal to expand
// our available teexture space
return Err(err);
}
// But otherwise: don't allow glyph loading errors to propagate,
// as that will result in incomplete window painting.
// Log the error and substitute instead.
log::error!(
"load_glyph failed; using blank instead. Error: {:#}. {:?} {:?}",
@ -428,7 +439,8 @@ impl<T: Texture2d> GlyphCache<T> {
bearing_y: PixelLength::zero(),
scale: 1.0,
})
});
}
};
self.glyph_cache.insert(key.to_owned(), Rc::clone(&glyph));
Ok(glyph)
}