From cdc43065e0da95858aaeec70bef0f764d26a22e7 Mon Sep 17 00:00:00 2001 From: Bilal Elmoussaoui Date: Wed, 4 Sep 2024 13:30:55 +0200 Subject: [PATCH] cogl/pango: Remove font map helper It only calls into pangocairo API and only used inside clutter so just call pangocairo API directly Part-of: --- clutter/clutter/clutter-actor.c | 3 ++- clutter/clutter/clutter-backend.c | 5 ++++- clutter/clutter/clutter-context.c | 4 +++- cogl/cogl-pango/cogl-pango-fontmap.c | 17 ----------------- cogl/cogl-pango/cogl-pango.h | 28 ---------------------------- 5 files changed, 9 insertions(+), 48 deletions(-) diff --git a/clutter/clutter/clutter-actor.c b/clutter/clutter/clutter-actor.c index b32bab860..2dc17c33d 100644 --- a/clutter/clutter/clutter-actor.c +++ b/clutter/clutter/clutter-actor.c @@ -482,6 +482,7 @@ #include #include +#include #include "cogl/cogl.h" @@ -13112,7 +13113,7 @@ clutter_actor_create_pango_context (ClutterActor *self) font_map = clutter_context_get_pango_fontmap (context); - pango_context = cogl_pango_font_map_create_context (font_map); + pango_context = pango_font_map_create_context (PANGO_FONT_MAP (font_map)); update_pango_context (clutter_context_get_backend (context), pango_context); pango_context_set_language (pango_context, pango_language_get_default ()); diff --git a/clutter/clutter/clutter-backend.c b/clutter/clutter/clutter-backend.c index f8f47bb4e..1a011a3d9 100644 --- a/clutter/clutter/clutter-backend.c +++ b/clutter/clutter/clutter-backend.c @@ -39,6 +39,8 @@ #include "config.h" +#include + #include "clutter/clutter-backend-private.h" #include "clutter/clutter-context-private.h" #include "clutter/clutter-debug.h" @@ -152,7 +154,8 @@ clutter_backend_real_resolution_changed (ClutterBackend *backend) resolution = dpi / 1024.0; if (context->font_map != NULL) - cogl_pango_font_map_set_resolution (context->font_map, resolution); + pango_cairo_font_map_set_resolution (PANGO_CAIRO_FONT_MAP (context->font_map), + resolution); } static gboolean diff --git a/clutter/clutter/clutter-context.c b/clutter/clutter/clutter-context.c index b58283ff1..ee1179159 100644 --- a/clutter/clutter/clutter-context.c +++ b/clutter/clutter/clutter-context.c @@ -21,6 +21,7 @@ #include "clutter/clutter-context-private.h" #include +#include #include "clutter/clutter-accessibility-private.h" #include "clutter/clutter-backend-private.h" @@ -319,7 +320,8 @@ clutter_context_get_pango_fontmap (ClutterContext *context) font_map = COGL_PANGO_FONT_MAP (cogl_pango_font_map_new (cogl_context)); resolution = clutter_backend_get_resolution (context->backend); - cogl_pango_font_map_set_resolution (font_map, resolution); + pango_cairo_font_map_set_resolution (PANGO_CAIRO_FONT_MAP (font_map), + resolution); context->font_map = font_map; diff --git a/cogl/cogl-pango/cogl-pango-fontmap.c b/cogl/cogl-pango/cogl-pango-fontmap.c index 1cea50bac..e769d5e2e 100644 --- a/cogl/cogl-pango/cogl-pango-fontmap.c +++ b/cogl/cogl-pango/cogl-pango-fontmap.c @@ -74,14 +74,6 @@ cogl_pango_font_map_new (CoglContext *context) return fm; } -PangoContext * -cogl_pango_font_map_create_context (CoglPangoFontMap *fm) -{ - g_return_val_if_fail (COGL_PANGO_IS_FONT_MAP (fm), NULL); - - return pango_font_map_create_context (PANGO_FONT_MAP (fm)); -} - PangoRenderer * cogl_pango_font_map_get_renderer (CoglPangoFontMap *fm) { @@ -92,15 +84,6 @@ cogl_pango_font_map_get_renderer (CoglPangoFontMap *fm) return priv->renderer; } -void -cogl_pango_font_map_set_resolution (CoglPangoFontMap *font_map, - double dpi) -{ - g_return_if_fail (COGL_PANGO_IS_FONT_MAP (font_map)); - - pango_cairo_font_map_set_resolution (PANGO_CAIRO_FONT_MAP (font_map), dpi); -} - static GQuark cogl_pango_font_map_get_priv_key (void) { diff --git a/cogl/cogl-pango/cogl-pango.h b/cogl/cogl-pango/cogl-pango.h index fcaea6ff8..4e386bd51 100644 --- a/cogl/cogl-pango/cogl-pango.h +++ b/cogl/cogl-pango/cogl-pango.h @@ -65,34 +65,6 @@ typedef void (* CoglPangoPipelineSetup) (CoglPipeline *pipeline, COGL_EXPORT PangoFontMap * cogl_pango_font_map_new (CoglContext *context); -/** - * cogl_pango_font_map_create_context: - * @font_map: a #CoglPangoFontMap - * - * Create a [class@Pango.Context] for the given @font_map. - * - * Returns: (transfer full): the newly created context: free with [method@GObject.Object.unref]. - */ -COGL_EXPORT PangoContext * -cogl_pango_font_map_create_context (CoglPangoFontMap *font_map); - -/** - * cogl_pango_font_map_set_resolution: - * @font_map: a #CoglPangoFontMap - * @dpi: The resolution in "dots per inch". (Physical inches aren't - * actually involved; the terminology is conventional.) - * - * Sets the resolution for the @font_map. - * - * This is a scale factor between points specified in a - * [struct@Pango.FontDescription] and Cogl units. - * The default value is %96, meaning that a 10 point font will be 13 - * units high. (10 * 96. / 72. = 13.3). - */ -COGL_EXPORT void -cogl_pango_font_map_set_resolution (CoglPangoFontMap *font_map, - double dpi); - /** * cogl_pango_ensure_glyph_cache_for_layout: * @layout: A #PangoLayout