[pango/userfont: 6/15] adapt userfont example

[Matthias Clasen <matthiasc src gnome org>]

commit e9546ac3cf0d02f91143d421c1923c0139979fd4
Author: Matthias Clasen <mclasen redhat com>
Date:   Thu Jan 27 21:09:55 2022 -0500

    adapt userfont example

 examples/userfont.c | 29 +++++++++++++++++++++++------
 1 file changed, 23 insertions(+), 6 deletions(-)
---
diff --git a/examples/userfont.c b/examples/userfont.c
index 41ca5621..9d185b55 100644
--- a/examples/userfont.c
+++ b/examples/userfont.c
@@ -126,11 +126,24 @@ advance_cb (PangoHbFace    *face,
 }
 
 static gboolean
-extents_cb (PangoHbFace        *face,
-            int                 size,
-            hb_codepoint_t      glyph,
-            hb_glyph_extents_t *extents,
-            gpointer            user_data)
+font_extents_cb (PangoHbFace       *face,
+                 int                size,
+                 hb_font_extents_t *extents,
+                 gpointer           user_data)
+{
+  extents->ascender = 0.75 * size;
+  extents->descender = 0.25 * size;
+  extents->line_gap = 0;
+
+  return TRUE;
+}
+
+static gboolean
+glyph_extents_cb (PangoHbFace        *face,
+                  int                 size,
+                  hb_codepoint_t      glyph,
+                  hb_glyph_extents_t *extents,
+                  gpointer            user_data)
 {
   extents->x_bearing = 0;
   extents->y_bearing = - 0.75 * size;
@@ -189,7 +202,11 @@ setup_fontmap (PangoHbFontMap *fontmap)
 
   desc = pango_font_description_new ();
   pango_font_description_set_family (desc, "Userfont");
-  face = pango_hb_face_new_user (glyph_cb, advance_cb, extents_cb, render_cb,
+  face = pango_hb_face_new_user (font_extents_cb,
+                                 glyph_cb,
+                                 advance_cb,
+                                 glyph_extents_cb,
+                                 render_cb,
                                  (gpointer) glyphs, NULL,
                                  "Black", desc);
   pango_hb_font_map_add_face (fontmap, face);