Linux: Experiment with CosmicText based Text System (#7539)

This is a rebase of @gabydds text_system updates. with some small
cleanups.

Currently cannot test this as build is not working in linux. Im just
putting it up here before I forget about it.

---------

Co-authored-by: gabydd <gabydinnerdavid@gmail.com>
Co-authored-by: Mikayla Maki <mikayla@zed.dev>
This commit is contained in:
h3mosphere 2024-02-09 17:49:03 +11:00 committed by GitHub
parent 0ab1094f0c
commit 67d280b8cb
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 531 additions and 47 deletions

View file

@ -1,40 +1,49 @@
//todo!(linux) remove
#[allow(unused)]
use crate::{point, size, FontStyle, FontWeight, Point, ShapedGlyph};
use crate::{
Bounds, DevicePixels, Font, FontId, FontMetrics, FontRun, GlyphId, LineLayout, Pixels,
PlatformTextSystem, RenderGlyphParams, SharedString, Size,
Bounds, DevicePixels, Font, FontFeatures, FontId, FontMetrics, FontRun, GlyphId, LineLayout,
Pixels, PlatformTextSystem, RenderGlyphParams, SharedString, Size,
};
use anyhow::Ok;
use anyhow::Result;
use anyhow::{anyhow, Context};
use collections::HashMap;
use font_kit::{font::Font as FontKitFont, source::SystemSource, sources::mem::MemSource};
use parking_lot::RwLock;
use cosmic_text::fontdb::Query;
use cosmic_text::{
Attrs, AttrsList, BufferLine, CacheKey, Family, Font as CosmicTextFont, FontSystem, SwashCache,
};
use parking_lot::{RwLock, RwLockUpgradableReadGuard};
use pathfinder_geometry::rect::RectF;
use pathfinder_geometry::rect::RectI;
use pathfinder_geometry::vector::{Vector2F, Vector2I};
use smallvec::SmallVec;
use std::borrow::Cow;
use std::{borrow::Cow, sync::Arc};
pub(crate) struct LinuxTextSystem(RwLock<LinuxTextSystemState>);
struct LinuxTextSystemState {
memory_source: MemSource,
system_source: SystemSource,
fonts: Vec<FontKitFont>,
swash_cache: SwashCache,
font_system: FontSystem,
fonts: Vec<Arc<CosmicTextFont>>,
font_selections: HashMap<Font, FontId>,
font_ids_by_postscript_name: HashMap<String, FontId>,
font_ids_by_family_name: HashMap<SharedString, SmallVec<[FontId; 4]>>,
postscript_names_by_font_id: HashMap<FontId, String>,
}
// todo!(linux): Double check this
unsafe impl Send for LinuxTextSystemState {}
unsafe impl Sync for LinuxTextSystemState {}
impl LinuxTextSystem {
pub(crate) fn new() -> Self {
let mut font_system = FontSystem::new();
// todo!(linux) make font loading non-blocking
font_system.db_mut().load_system_fonts();
Self(RwLock::new(LinuxTextSystemState {
memory_source: MemSource::empty(),
system_source: SystemSource::new(),
font_system,
swash_cache: SwashCache::new(),
fonts: Vec::new(),
font_selections: HashMap::default(),
font_ids_by_postscript_name: HashMap::default(),
// font_ids_by_postscript_name: HashMap::default(),
font_ids_by_family_name: HashMap::default(),
postscript_names_by_font_id: HashMap::default(),
}))
@ -49,14 +58,20 @@ impl Default for LinuxTextSystem {
#[allow(unused)]
impl PlatformTextSystem for LinuxTextSystem {
// todo!(linux)
fn add_fonts(&self, fonts: Vec<Cow<'static, [u8]>>) -> Result<()> {
Ok(())
self.0.write().add_fonts(fonts)
}
// todo!(linux)
// todo!(linux) ensure that this integrates with platform font loading
// do we need to do more than call load_system_fonts()?
fn all_font_names(&self) -> Vec<String> {
Vec::new()
self.0
.read()
.font_system
.db()
.faces()
.map(|face| face.post_script_name.clone())
.collect()
}
// todo!(linux)
@ -64,51 +79,112 @@ impl PlatformTextSystem for LinuxTextSystem {
Vec::new()
}
// todo!(linux)
fn font_id(&self, descriptor: &Font) -> Result<FontId> {
Ok(FontId(0))
fn font_id(&self, font: &Font) -> Result<FontId> {
// todo!(linux): Do we need to use CosmicText's Font APIs? Can we consolidate this to use font_kit?
let lock = self.0.upgradable_read();
if let Some(font_id) = lock.font_selections.get(font) {
Ok(*font_id)
} else {
let mut lock = RwLockUpgradableReadGuard::upgrade(lock);
let candidates = if let Some(font_ids) = lock.font_ids_by_family_name.get(&font.family)
{
font_ids.as_slice()
} else {
let font_ids = lock.load_family(&font.family, font.features)?;
lock.font_ids_by_family_name
.insert(font.family.clone(), font_ids);
lock.font_ids_by_family_name[&font.family].as_ref()
};
let id = lock
.font_system
.db()
.query(&Query {
families: &[Family::Name(&font.family)],
weight: font.weight.into(),
style: font.style.into(),
stretch: Default::default(),
})
.context("no font")?;
let font_id = if let Some(font_id) = lock.fonts.iter().position(|font| font.id() == id)
{
FontId(font_id)
} else {
// Font isn't in fonts so add it there, this is because we query all the fonts in the db
// and maybe we haven't loaded it yet
let font_id = FontId(lock.fonts.len());
let font = lock.font_system.get_font(id).unwrap();
lock.fonts.push(font);
font_id
};
lock.font_selections.insert(font.clone(), font_id);
Ok(font_id)
}
}
// todo!(linux)
fn font_metrics(&self, font_id: FontId) -> FontMetrics {
unimplemented!()
let metrics = self.0.read().fonts[font_id.0].as_swash().metrics(&[]);
FontMetrics {
units_per_em: metrics.units_per_em as u32,
ascent: metrics.ascent,
descent: -metrics.descent, // todo!(linux) confirm this is correct
line_gap: metrics.leading,
underline_position: metrics.underline_offset,
underline_thickness: metrics.stroke_size,
cap_height: metrics.cap_height,
x_height: metrics.x_height,
// todo!(linux): Compute this correctly
bounding_box: Bounds {
origin: point(0.0, 0.0),
size: size(metrics.max_width, metrics.ascent + metrics.descent),
},
}
}
// todo!(linux)
fn typographic_bounds(&self, font_id: FontId, glyph_id: GlyphId) -> Result<Bounds<f32>> {
unimplemented!()
let lock = self.0.read();
let metrics = lock.fonts[font_id.0].as_swash().metrics(&[]);
let glyph_metrics = lock.fonts[font_id.0].as_swash().glyph_metrics(&[]);
let glyph_id = glyph_id.0 as u16;
// todo!(linux): Compute this correctly
// see https://github.com/servo/font-kit/blob/master/src/loaders/freetype.rs#L614-L620
Ok(Bounds {
origin: point(0.0, 0.0),
size: size(
glyph_metrics.advance_width(glyph_id),
glyph_metrics.advance_height(glyph_id),
),
})
}
// todo!(linux)
fn advance(&self, font_id: FontId, glyph_id: GlyphId) -> Result<Size<f32>> {
unimplemented!()
self.0.read().advance(font_id, glyph_id)
}
// todo!(linux)
fn glyph_for_char(&self, font_id: FontId, ch: char) -> Option<GlyphId> {
None
self.0.read().glyph_for_char(font_id, ch)
}
// todo!(linux)
fn glyph_raster_bounds(&self, params: &RenderGlyphParams) -> Result<Bounds<DevicePixels>> {
unimplemented!()
self.0.write().raster_bounds(params)
}
// todo!(linux)
fn rasterize_glyph(
&self,
params: &RenderGlyphParams,
raster_bounds: Bounds<DevicePixels>,
) -> Result<(Size<DevicePixels>, Vec<u8>)> {
unimplemented!()
self.0.write().rasterize_glyph(params, raster_bounds)
}
// todo!(linux)
fn layout_line(&self, text: &str, font_size: Pixels, runs: &[FontRun]) -> LineLayout {
LineLayout::default() //TODO
self.0.write().layout_line(text, font_size, runs)
}
// todo!(linux)
// todo!(linux) Confirm that this has been superseded by the LineWrapper
fn wrap_line(
&self,
text: &str,
@ -119,3 +195,245 @@ impl PlatformTextSystem for LinuxTextSystem {
unimplemented!()
}
}
impl LinuxTextSystemState {
fn add_fonts(&mut self, fonts: Vec<Cow<'static, [u8]>>) -> Result<()> {
let db = self.font_system.db_mut();
for bytes in fonts {
match bytes {
Cow::Borrowed(embedded_font) => {
db.load_font_data(embedded_font.to_vec());
}
Cow::Owned(bytes) => {
db.load_font_data(bytes);
}
}
}
Ok(())
}
fn load_family(
&mut self,
name: &SharedString,
_features: FontFeatures,
) -> Result<SmallVec<[FontId; 4]>> {
let mut font_ids = SmallVec::new();
let family = self
.font_system
.get_font_matches(Attrs::new().family(cosmic_text::Family::Name(name)));
for font in family.as_ref() {
let font = self.font_system.get_font(*font).unwrap();
if font.as_swash().charmap().map('m') == 0 {
self.font_system.db_mut().remove_face(font.id());
continue;
};
let font_id = FontId(self.fonts.len());
font_ids.push(font_id);
self.fonts.push(font);
}
Ok(font_ids)
}
fn advance(&self, font_id: FontId, glyph_id: GlyphId) -> Result<Size<f32>> {
let width = self.fonts[font_id.0]
.as_swash()
.glyph_metrics(&[])
.advance_width(glyph_id.0 as u16);
let height = self.fonts[font_id.0]
.as_swash()
.glyph_metrics(&[])
.advance_height(glyph_id.0 as u16);
Ok(Size { width, height })
}
fn glyph_for_char(&self, font_id: FontId, ch: char) -> Option<GlyphId> {
let glyph_id = self.fonts[font_id.0].as_swash().charmap().map(ch);
if glyph_id == 0 {
None
} else {
Some(GlyphId(glyph_id.into()))
}
}
fn is_emoji(&self, font_id: FontId) -> bool {
// todo!(linux): implement this correctly
self.postscript_names_by_font_id
.get(&font_id)
.map_or(false, |postscript_name| {
postscript_name == "AppleColorEmoji"
})
}
// todo!(linux) both raster functions have problems because I am not sure this is the correct mapping from cosmic text to gpui system
fn raster_bounds(&mut self, params: &RenderGlyphParams) -> Result<Bounds<DevicePixels>> {
let font = &self.fonts[params.font_id.0];
let font_system = &mut self.font_system;
let image = self
.swash_cache
.get_image(
font_system,
CacheKey::new(
font.id(),
params.glyph_id.0 as u16,
params.font_size.into(),
(0.0, 0.0),
)
.0,
)
.clone()
.unwrap();
Ok(Bounds {
origin: point(image.placement.left.into(), (-image.placement.top).into()),
size: size(image.placement.width.into(), image.placement.height.into()),
})
}
fn rasterize_glyph(
&mut self,
params: &RenderGlyphParams,
glyph_bounds: Bounds<DevicePixels>,
) -> Result<(Size<DevicePixels>, Vec<u8>)> {
if glyph_bounds.size.width.0 == 0 || glyph_bounds.size.height.0 == 0 {
Err(anyhow!("glyph bounds are empty"))
} else {
// todo!(linux) handle subpixel variants
let bitmap_size = glyph_bounds.size;
let font = &self.fonts[params.font_id.0];
let font_system = &mut self.font_system;
let image = self
.swash_cache
.get_image(
font_system,
CacheKey::new(
font.id(),
params.glyph_id.0 as u16,
params.font_size.into(),
(0.0, 0.0),
)
.0,
)
.clone()
.unwrap();
Ok((bitmap_size, image.data))
}
}
// todo!(linux) This is all a quick first pass, maybe we should be using cosmic_text::Buffer
fn layout_line(&mut self, text: &str, font_size: Pixels, font_runs: &[FontRun]) -> LineLayout {
let mut attrs_list = AttrsList::new(Attrs::new());
let mut offs = 0;
for run in font_runs {
// todo!(linux) We need to check we are doing utf properly
let font = &self.fonts[run.font_id.0];
let font = self.font_system.db().face(font.id()).unwrap();
attrs_list.add_span(
offs..run.len,
Attrs::new()
.family(Family::Name(&font.families.first().unwrap().0))
.stretch(font.stretch)
.style(font.style)
.weight(font.weight),
);
offs += run.len;
}
let mut line = BufferLine::new(text, attrs_list, cosmic_text::Shaping::Advanced);
let layout = line.layout(
&mut self.font_system,
font_size.0,
f32::MAX, // todo!(linux) we don't have a width cause this should technically not be wrapped I believe
cosmic_text::Wrap::None,
);
let mut runs = Vec::new();
// todo!(linux) what I think can happen is layout returns possibly multiple lines which means we should be probably working with it higher up in the text rendering
let layout = layout.first().unwrap();
for glyph in &layout.glyphs {
let font_id = glyph.font_id;
let font_id = FontId(
self.fonts
.iter()
.position(|font| font.id() == font_id)
.unwrap(),
);
let mut glyphs = SmallVec::new();
// todo!(linux) this is definitely wrong, each glyph in glyphs from cosmic-text is a cluster with one glyph, ShapedRun takes a run of glyphs with the same font and direction
glyphs.push(ShapedGlyph {
id: GlyphId(glyph.glyph_id as u32),
position: point((glyph.x).into(), glyph.y.into()),
index: glyph.start,
is_emoji: self.is_emoji(font_id),
});
runs.push(crate::ShapedRun { font_id, glyphs });
}
LineLayout {
font_size,
width: layout.w.into(),
ascent: layout.max_ascent.into(),
descent: layout.max_descent.into(),
runs,
len: text.len(),
}
}
}
impl From<RectF> for Bounds<f32> {
fn from(rect: RectF) -> Self {
Bounds {
origin: point(rect.origin_x(), rect.origin_y()),
size: size(rect.width(), rect.height()),
}
}
}
impl From<RectI> for Bounds<DevicePixels> {
fn from(rect: RectI) -> Self {
Bounds {
origin: point(DevicePixels(rect.origin_x()), DevicePixels(rect.origin_y())),
size: size(DevicePixels(rect.width()), DevicePixels(rect.height())),
}
}
}
impl From<Vector2I> for Size<DevicePixels> {
fn from(value: Vector2I) -> Self {
size(value.x().into(), value.y().into())
}
}
impl From<RectI> for Bounds<i32> {
fn from(rect: RectI) -> Self {
Bounds {
origin: point(rect.origin_x(), rect.origin_y()),
size: size(rect.width(), rect.height()),
}
}
}
impl From<Point<u32>> for Vector2I {
fn from(size: Point<u32>) -> Self {
Vector2I::new(size.x as i32, size.y as i32)
}
}
impl From<Vector2F> for Size<f32> {
fn from(vec: Vector2F) -> Self {
size(vec.x(), vec.y())
}
}
impl From<FontWeight> for cosmic_text::Weight {
fn from(value: FontWeight) -> Self {
cosmic_text::Weight(value.0 as u16)
}
}
impl From<FontStyle> for cosmic_text::Style {
fn from(style: FontStyle) -> Self {
match style {
FontStyle::Normal => cosmic_text::Style::Normal,
FontStyle::Italic => cosmic_text::Style::Italic,
FontStyle::Oblique => cosmic_text::Style::Oblique,
}
}
}