gsk: Serialize custom fonts with url

If we see custom fonts when serializeing text nodes, write data
url that contains the font file, the first time we see it.

This does not add blobs standard fonts, like Cantarell or Monospace.

Update all affected nodeparser tests.
This commit is contained in:
Matthias Clasen 2024-01-15 20:00:36 -05:00
parent c2abf30c46
commit 385b9a7241
3 changed files with 89 additions and 15 deletions

View File

@ -2835,6 +2835,7 @@ typedef struct
gsize named_node_counter; gsize named_node_counter;
GHashTable *named_textures; GHashTable *named_textures;
gsize named_texture_counter; gsize named_texture_counter;
GHashTable *serialized_fonts;
} Printer; } Printer;
static void static void
@ -2987,6 +2988,7 @@ printer_init (Printer *self,
self->named_node_counter = 0; self->named_node_counter = 0;
self->named_textures = g_hash_table_new_full (NULL, NULL, NULL, g_free); self->named_textures = g_hash_table_new_full (NULL, NULL, NULL, g_free);
self->named_texture_counter = 0; self->named_texture_counter = 0;
self->serialized_fonts = g_hash_table_new (g_str_hash, g_str_equal);
printer_init_duplicates_for_node (self, node); printer_init_duplicates_for_node (self, node);
} }
@ -2998,6 +3000,7 @@ printer_clear (Printer *self)
g_string_free (self->str, TRUE); g_string_free (self->str, TRUE);
g_hash_table_unref (self->named_nodes); g_hash_table_unref (self->named_nodes);
g_hash_table_unref (self->named_textures); g_hash_table_unref (self->named_textures);
g_hash_table_unref (self->serialized_fonts);
} }
#define IDENT_LEVEL 2 /* Spaces per level */ #define IDENT_LEVEL 2 /* Spaces per level */
@ -3441,6 +3444,59 @@ append_texture_param (Printer *p,
g_bytes_unref (bytes); g_bytes_unref (bytes);
} }
static void
gsk_text_node_serialize_font (GskRenderNode *node,
Printer *p)
{
PangoFont *font = gsk_text_node_get_font (node);
PangoFontMap *fontmap = pango_font_get_font_map (font);
PangoFontDescription *desc;
char *s;
desc = pango_font_describe (font);
s = pango_font_description_to_string (desc);
g_string_append_printf (p->str, "\"%s\"", s);
g_free (s);
pango_font_description_free (desc);
/* Check if this is a custom font that we created from a url */
if (!g_object_get_data (G_OBJECT (fontmap), "font-files"))
return;
#ifdef HAVE_PANGOFT
{
FcPattern *pat;
FcResult res;
const char *file;
char *data;
gsize len;
char *b64;
pat = pango_fc_font_get_pattern (PANGO_FC_FONT (font));
res = FcPatternGetString (pat, FC_FILE, 0, (FcChar8 **)&file);
if (res != FcResultMatch)
return;
if (g_hash_table_contains (p->serialized_fonts, file))
return;
if (!g_file_get_contents (file, &data, &len, NULL))
return;
g_hash_table_add (p->serialized_fonts, (gpointer) file);
b64 = base64_encode_with_linebreaks ((const guchar *) data, len);
g_string_append (p->str, " url(\"data:font/ttf;base64,");
append_escaping_newlines (p->str, b64);
g_string_append (p->str, "\")");
g_free (b64);
g_free (data);
}
#endif
}
void void
gsk_text_node_serialize_glyphs (GskRenderNode *node, gsk_text_node_serialize_glyphs (GskRenderNode *node,
GString *p) GString *p)
@ -3994,29 +4050,21 @@ render_node_print (Printer *p,
{ {
const graphene_point_t *offset = gsk_text_node_get_offset (node); const graphene_point_t *offset = gsk_text_node_get_offset (node);
const GdkRGBA *color = gsk_text_node_get_color (node); const GdkRGBA *color = gsk_text_node_get_color (node);
PangoFont *font = gsk_text_node_get_font (node);
PangoFontDescription *desc;
char *font_name;
start_node (p, "text", node_name); start_node (p, "text", node_name);
if (!gdk_rgba_equal (color, &GDK_RGBA("000000"))) if (!gdk_rgba_equal (color, &GDK_RGBA ("000000")))
append_rgba_param (p, "color", color); append_rgba_param (p, "color", color);
_indent (p); _indent (p);
desc = pango_font_describe (font); g_string_append (p->str, "font: ");
font_name = pango_font_description_to_string (desc); gsk_text_node_serialize_font (node, p);
g_string_append_printf (p->str, "font: \"%s\";\n", font_name); g_string_append (p->str, ";\n");
g_free (font_name);
pango_font_description_free (desc);
_indent (p); _indent (p);
g_string_append (p->str, "glyphs: "); g_string_append (p->str, "glyphs: ");
gsk_text_node_serialize_glyphs (node, p->str); gsk_text_node_serialize_glyphs (node, p->str);
g_string_append (p->str, ";\n");
g_string_append_c (p->str, ';');
g_string_append_c (p->str, '\n');
if (!graphene_point_equal (offset, graphene_point_zero ())) if (!graphene_point_equal (offset, graphene_point_zero ()))
append_point_param (p, "offset", offset); append_point_param (p, "offset", offset);

View File

@ -1,5 +1,18 @@
text { text {
font: "text-mixed-color 7.5"; font: "text-mixed-color 7.5" url("data:font/ttf;base64,AAEAAAAKAIAAAwAgQ09MUgATAEEAAAJ8AAAALENQQUwB/wATAAACqAAAABpjbWFwAHcAPQAAATwA\
AAA0Z2x5Zu8g4kAAAAGEAAAA0mhlYWQmofyJAAAArAAAADZoaGVhDAEEAgAAAOQAAAAkaG10eAQA\
AQAAAAEoAAAAFGxvY2EAyAD5AAABcAAAABRtYXhwAAwACQAAAQgAAAAgbmFtZX7VdrQAAAJYAAAA\
IgABAAAAARmajs74k18PPPUAAggAAAAAAOHCPQAAAAAA4cpY+QAAAAAEAAgAAAAAAQACAAAAAAAA\
AAEAAAgAAAAAAAQAAAAAAAQAAAEAAAAAAAAAAAAAAAAAAAABAAEAAAAJAAgAAgAAAAAAAQAAAAAA\
AAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAABAAAAAAEAAAADAAAADAAEACgAAAAGAAQAAQAC\
ACAASP//AAAAIABB////4P/AAAEAAAAAAAAAAAAAAAwAGAAkADAAPABIAFwAaQABAAAAAAQACAAA\
AwAAMSERIQQA/AAIAAABAAAAAAQACAAAAwAAMSERIQQA/AAIAAABAAAAAAQACAAAAwAAMSERIQQA\
/AAIAAABAAAAAAQACAAAAwAAMSERIQQA/AAIAAABAAAAAAQACAAAAwAAMSERIQQA/AAIAAABAAAA\
AAQACAAAAwAAMSERIQQA/AAIAAACAAAAAAQACAAAAwAHAAAxIREhExEhEQQA/AAFA/YIAPgFB/b4\
CgAAAQEAAAADAAgAAAMAACEhESEBAAIA/gAIAAAAAAAAAQASAAEAAAAAAAEAEAAAdGV4dC1taXhl\
ZC1jb2xvcgAAAAAAAwAAAA4AAAAgAAMABAAAAAEABQABAAEABgACAAEAAgAAAAMAAQADAAIAAAAD\
AAEAAwAAAA4AAAAA//8A/wD//wAA/wAA\
");
glyphs: 7 10; glyphs: 7 10;
} }
text { text {

View File

@ -1,5 +1,18 @@
text { text {
font: "text-mixed-color 7.5"; font: "text-mixed-color 7.5" url("data:font/ttf;base64,AAEAAAAKAIAAAwAgQ09MUgATAEEAAAJ8AAAALENQQUwB/wATAAACqAAAABpjbWFwAHcAPQAAATwA\
AAA0Z2x5Zu8g4kAAAAGEAAAA0mhlYWQmofyJAAAArAAAADZoaGVhDAEEAgAAAOQAAAAkaG10eAQA\
AQAAAAEoAAAAFGxvY2EAyAD5AAABcAAAABRtYXhwAAwACQAAAQgAAAAgbmFtZX7VdrQAAAJYAAAA\
IgABAAAAARmajs74k18PPPUAAggAAAAAAOHCPQAAAAAA4cpY+QAAAAAEAAgAAAAAAQACAAAAAAAA\
AAEAAAgAAAAAAAQAAAAAAAQAAAEAAAAAAAAAAAAAAAAAAAABAAEAAAAJAAgAAgAAAAAAAQAAAAAA\
AAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAABAAAAAAEAAAADAAAADAAEACgAAAAGAAQAAQAC\
ACAASP//AAAAIABB////4P/AAAEAAAAAAAAAAAAAAAwAGAAkADAAPABIAFwAaQABAAAAAAQACAAA\
AwAAMSERIQQA/AAIAAABAAAAAAQACAAAAwAAMSERIQQA/AAIAAABAAAAAAQACAAAAwAAMSERIQQA\
/AAIAAABAAAAAAQACAAAAwAAMSERIQQA/AAIAAABAAAAAAQACAAAAwAAMSERIQQA/AAIAAABAAAA\
AAQACAAAAwAAMSERIQQA/AAIAAACAAAAAAQACAAAAwAHAAAxIREhExEhEQQA/AAFA/YIAPgFB/b4\
CgAAAQEAAAADAAgAAAMAACEhESEBAAIA/gAIAAAAAAAAAQASAAEAAAAAAAEAEAAAdGV4dC1taXhl\
ZC1jb2xvcgAAAAAAAwAAAA4AAAAgAAMABAAAAAEABQABAAEABgACAAEAAgAAAAMAAQADAAIAAAAD\
AAEAAwAAAA4AAAAA//8A/wD//wAA/wAA\
");
glyphs: 7 10; glyphs: 7 10;
} }
text { text {