[pango: 1/3] single function type for FC substitute callback




commit 79baf68b39e7654f8f00c60c8a86ef6054a391dc
Author: Caleb Hearon <crh0872 gmail com>
Date:   Sun May 31 17:51:06 2020 +0000

    single function type for FC substitute callback

 docs/pango-sections.txt | 1 +
 pango/pangofc-fontmap.h | 9 +++++++++
 pango/pangoft2.h        | 4 ++--
 pango/pangoxft.h        | 4 ++--
 4 files changed, 14 insertions(+), 4 deletions(-)
---
diff --git a/docs/pango-sections.txt b/docs/pango-sections.txt
index 4648816b..1a9aede9 100644
--- a/docs/pango-sections.txt
+++ b/docs/pango-sections.txt
@@ -978,6 +978,7 @@ pango_fc_font_map_config_changed
 pango_fc_font_map_shutdown
 pango_fc_font_map_set_config
 pango_fc_font_map_get_config
+PangoFcSubstituteFunc
 pango_fc_font_description_from_pattern
 PANGO_FC_FONT_FEATURES
 PANGO_FC_GRAVITY
diff --git a/pango/pangofc-fontmap.h b/pango/pangofc-fontmap.h
index a41ae1d9..f7cc88b4 100644
--- a/pango/pangofc-fontmap.h
+++ b/pango/pangofc-fontmap.h
@@ -105,6 +105,15 @@ PANGO_AVAILABLE_IN_1_44
 hb_face_t * pango_fc_font_map_get_hb_face (PangoFcFontMap *fcfontmap,
                                            PangoFcFont    *fcfont);
 
+/**
+ * PangoFcSubstituteFunc:
+ * @pattern: the FcPattern to tweak.
+ * @data: user data.
+ *
+ * Function type for doing final config tweaking on prepared FcPatterns.
+ */
+typedef void (*PangoFcSubstituteFunc) (FcPattern *pattern,
+                                      gpointer   data);
 /**
  * PANGO_FC_GRAVITY:
  *
diff --git a/pango/pangoft2.h b/pango/pangoft2.h
index 483bc366..2f45c9e3 100644
--- a/pango/pangoft2.h
+++ b/pango/pangoft2.h
@@ -28,6 +28,7 @@
 #include <ft2build.h>
 #include FT_FREETYPE_H
 
+#include <pango/pangofc-fontmap.h>
 #include <pango/pango-layout.h>
 #include <pango/pangofc-font.h>
 
@@ -66,8 +67,7 @@ typedef struct _PangoFT2FontMap      PangoFT2FontMap;
  *
  * Function type for doing final config tweaking on prepared FcPatterns.
  */
-typedef void (*PangoFT2SubstituteFunc) (FcPattern *pattern,
-                                       gpointer   data);
+typedef PangoFcSubstituteFunc PangoFT2SubstituteFunc;
 
 /* Calls for applications */
 
diff --git a/pango/pangoxft.h b/pango/pangoxft.h
index f14b89c9..95898f80 100644
--- a/pango/pangoxft.h
+++ b/pango/pangoxft.h
@@ -23,6 +23,7 @@
 #ifndef __PANGOXFT_H__
 #define __PANGOXFT_H__
 
+#include <pango/pangofc-fontmap.h>
 #include <pango/pango-context.h>
 #include <pango/pango-ot.h>
 #include <pango/pangofc-font.h>
@@ -84,8 +85,7 @@ typedef struct _PangoXftFont    PangoXftFont;
  *
  * Function type for doing final config tweaking on prepared FcPatterns.
  */
-typedef void (*PangoXftSubstituteFunc) (FcPattern *pattern,
-                                       gpointer   data);
+typedef PangoFcSubstituteFunc PangoXftSubstituteFunc;
 
 /* Calls for applications
  */


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]