[gtk/wip-fontchooser-tewaks] fontchooser: Speed up fature examples
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/wip-fontchooser-tewaks] fontchooser: Speed up fature examples
- Date: Sat, 1 Jan 2022 20:38:42 +0000 (UTC)
commit 791dc7b9be4bbb1c26eaa74811cb5abff24fa9a9
Author: Matthias Clasen <mclasen redhat com>
Date: Fri Dec 31 09:17:42 2021 -0500
fontchooser: Speed up fature examples
We were doing unnecessary work here, which could
get really slow with some fonts. Just compute
the reverse charmap once and reuse it.
gtk/gtkfontchooserwidget.c | 73 +++++++++++++++++++++++++++++-----------------
1 file changed, 47 insertions(+), 26 deletions(-)
---
diff --git a/gtk/gtkfontchooserwidget.c b/gtk/gtkfontchooserwidget.c
index 27608eb16f..d7e7d3fef7 100644
--- a/gtk/gtkfontchooserwidget.c
+++ b/gtk/gtkfontchooserwidget.c
@@ -152,6 +152,8 @@ struct _GtkFontChooserWidget
GList *feature_items;
GAction *tweak_action;
+
+ hb_map_t *glyphmap;
};
struct _GtkFontChooserWidgetClass
@@ -1794,11 +1796,12 @@ feat_pressed (GtkGestureClick *gesture,
}
static char *
-find_affected_text (hb_tag_t feature_tag,
- hb_font_t *hb_font,
- hb_tag_t script_tag,
- hb_tag_t lang_tag,
- int max_chars)
+find_affected_text (GtkFontChooserWidget *fontchooser,
+ hb_tag_t feature_tag,
+ hb_font_t *hb_font,
+ hb_tag_t script_tag,
+ hb_tag_t lang_tag,
+ int max_chars)
{
hb_face_t *hb_face;
unsigned int script_index = 0;
@@ -1848,24 +1851,35 @@ find_affected_text (hb_tag_t feature_tag,
glyphs_after,
glyphs_output);
- gid = -1;
- while (hb_set_next (glyphs_input, &gid)) {
- hb_codepoint_t ch;
- if (n_chars == max_chars)
- {
- g_string_append (chars, "…");
- break;
- }
- for (ch = 0; ch < 0xffff; ch++) {
- hb_codepoint_t glyph = 0;
- hb_font_get_nominal_glyph (hb_font, ch, &glyph);
- if (glyph == gid) {
- g_string_append_unichar (chars, (gunichar)ch);
- n_chars++;
- break;
- }
+ if (!fontchooser->glyphmap)
+ {
+ fontchooser->glyphmap = hb_map_create ();
+ for (hb_codepoint_t ch = 0; ch < 0xffff; ch++)
+ {
+ hb_codepoint_t glyph = 0;
+ if (hb_font_get_nominal_glyph (hb_font, ch, &glyph) &&
+ !hb_map_has (fontchooser->glyphmap, glyph))
+ hb_map_set (fontchooser->glyphmap, glyph, ch);
+ }
}
- }
+
+ while (hb_set_next (glyphs_input, &gid))
+ {
+ hb_codepoint_t ch;
+
+ if (n_chars == max_chars)
+ {
+ g_string_append (chars, "…");
+ break;
+ }
+ ch = hb_map_get (fontchooser->glyphmap, gid);
+ if (ch != HB_MAP_VALUE_INVALID)
+ {
+ g_string_append_unichar (chars, (gunichar)ch);
+ n_chars++;
+ }
+ }
+
hb_set_destroy (glyphs_input);
}
}
@@ -1874,7 +1888,8 @@ find_affected_text (hb_tag_t feature_tag,
}
static void
-update_feature_example (FeatureItem *item,
+update_feature_example (GtkFontChooserWidget *fontchooser,
+ FeatureItem *item,
hb_font_t *hb_font,
hb_tag_t script_tag,
hb_tag_t lang_tag,
@@ -1929,9 +1944,9 @@ update_feature_example (FeatureItem *item,
else if (strcmp (item->name, "frac") == 0)
input = g_strdup ("1/2 2/3 7/8");
else if (strcmp (item->name, "nalt") == 0)
- input = find_affected_text (item->tag, hb_font, script_tag, lang_tag, 3);
+ input = find_affected_text (fontchooser, item->tag, hb_font, script_tag, lang_tag, 3);
else
- input = find_affected_text (item->tag, hb_font, script_tag, lang_tag, 10);
+ input = find_affected_text (fontchooser, item->tag, hb_font, script_tag, lang_tag, 10);
if (input[0] != '\0')
{
@@ -2211,7 +2226,7 @@ gtk_font_chooser_widget_update_font_features (GtkFontChooserWidget *fontchooser)
gtk_widget_show (item->top);
gtk_widget_show (gtk_widget_get_parent (item->top));
- update_feature_example (item, hb_font, script_tag, lang_tag, fontchooser->font_desc);
+ update_feature_example (fontchooser, item, hb_font, script_tag, lang_tag,
fontchooser->font_desc);
if (GTK_IS_CHECK_BUTTON (item->feat))
{
@@ -2227,6 +2242,12 @@ gtk_font_chooser_widget_update_font_features (GtkFontChooserWidget *fontchooser)
}
}
}
+
+ if (fontchooser->glyphmap)
+ {
+ hb_map_destroy (fontchooser->glyphmap);
+ fontchooser->glyphmap = NULL;
+ }
}
g_object_unref (pango_font);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]