From cd18a78e924f262fda022cdaab1fc681cce42fec Mon Sep 17 00:00:00 2001 From: Fabrice Date: Wed, 11 Feb 2026 16:47:32 +0100 Subject: starting to upload fonts --- src/text.cc | 43 ++++++++++++++++++++++++++++++++++--------- 1 file changed, 34 insertions(+), 9 deletions(-) (limited to 'src/text.cc') diff --git a/src/text.cc b/src/text.cc index a19fe98..d209ed2 100644 --- a/src/text.cc +++ b/src/text.cc @@ -5,18 +5,23 @@ #include #include -#include "freetype/fttypes.h" +#include "freetype/freetype.h" #include "hash.h" #include "utils.h" -static void wayc_font_cache_init(struct font_cache_s* cache) { - wayc_notnull(cache); - wayc_hashmap_init(&cache->glyphs); +static bool wayc_font_cache_lookup(struct font_s* font, codepoint_t codepoint, + struct glyph_s* out) { + struct glyph_s glyph; + bool ok = wayc_hashmap_get(&font->cache, &codepoint, &glyph); + if (ok) *out = glyph; + return ok; } -static void wayc_font_cache_deinit(struct font_cache_s* cache) { - wayc_notnull(cache); - wayc_hashmap_deinit(&cache->glyphs); +[[maybe_unused]] static void wayc_font_cache_insert(struct font_s* font, + codepoint_t codepoint, + struct glyph_s glyph) { + wayc_notnull(font); + wayc_hashmap_insert(&font->cache, &codepoint, &glyph); } enum font_context_error_e wayc_font_context_init(struct font_context_s* ctx) { @@ -59,16 +64,36 @@ enum font_error_e wayc_font_init(struct font_s* font, if (err) return FONT_ERROR_FONT_LOAD; font->data = data; - wayc_font_cache_init(&font->cache); + wayc_hashmap_init(&font->cache); success = true; return FONT_ERROR_NONE; } +enum font_error_e wayc_font_lookup(struct font_s* font, codepoint_t codepoint, + struct glyph_s* out) { + wayc_notnull(font); + wayc_notnull(out); + + FT_Face face = font->face; + + bool found = wayc_font_cache_lookup(font, codepoint, out); + if (found) return FONT_ERROR_NONE; + + FT_UInt glyph_index = FT_Get_Char_Index(face, codepoint); + if (glyph_index == 0) return FONT_ERROR_NOT_MATCH; + + FT_Load_Glyph(face, glyph_index, FT_LOAD_DEFAULT); + FT_GlyphSlot slot = face->glyph; + FT_Render_Glyph(slot, FT_RENDER_MODE_NORMAL); + + wayc_panic("not yet implemented"); +} + void wayc_font_deinit(struct font_s* font) { wayc_notnull(font); - wayc_font_cache_deinit(&font->cache); + wayc_hashmap_deinit(&font->cache); FT_Done_Face(font->face); mi_free(font->data); } -- cgit v1.2.3