From 6c9e853b93be4c01027e625427787e38be9b99f3 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Fri, 3 Feb 2006 02:46:17 +0000 Subject: Finish the 'glyph 0' work of this morning: PANGO_GLYPH_NULL that I 2006-02-02 Behdad Esfahbod Finish the 'glyph 0' work of this morning: PANGO_GLYPH_NULL that I introduced is renamed to PANGO_GLYPH_EMPTY. It means, no rendering should be performed. The backends however, still return 0 if a glyph is not found. The modules then are free to replace this 0 glyph with an unknown character. * modules/arabic/arabic-fc.c, modules/basic/basic-atsui.c, modules/basic/basic-fc.c, modules/basic/basic-win32.c, modules/basic/basic-x.c, modules/hangul/hangul-fc.c, modules/hebrew/hebrew-fc.c, modules/indic/indic-fc.c, modules/khmer/khmer-fc.c, modules/syriac/syriac-fc.c, modules/thai/thai-fc.c, modules/tibetan/tibetan-fc.c, pango/pangox.c, pango/pangowin32.c: Adapt to above change. Backends return 0 if glyph not found. * pango/fonts.c (pango_font_get_glyph_extents): If font is not usable (!PANGO_IS_FONT (font)), return the generic UNKNOWN_GLYPH metrics. This is used when your backends are misconfigured and you don't find *any* font at all. * pango/pango-engince.c: Add unknown glyphs in fallback shaper, instead of empty glyphs. * pango/shape.c: Call the fall-back shaper if shaper fails, instead of generating a dummy glyph string ourselves. * pango/pango-layout.c (imposed_shape, shape_tab): Use PANGO_GLYPH_EMPTY instead of glyph 0. * pango/pango-renderer.c (pango_renderer_draw_glyph): No-op on PANGO_GLYPH_EMPTY instead of glyph 0. * pango/pangocairo-atsuifont.c, pango/pangocairo-win32font.c, pango/pangocairo-fcfont.c, pango/pangocairo-font.c, pango/pangocairo-private.h: install_font returns a boolean now. * pango/pangocairo-render.c, pango/pangoxft-render.c: Handle font and hex-box failures more gracefully by drawing a generic unknown-box glyph. * pango/pangoft2.c, pango/pangoft2-render.c: Draw the generic unknown-box glyph here too. For unknown glyphs though, if the font is TTF (FT_IS_SFNT), use the zero-indexed glyph, otherwise, draw a box of proper size. --- pango/pangofc-decoder.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pango/pangofc-decoder.c') diff --git a/pango/pangofc-decoder.c b/pango/pangofc-decoder.c index a2989528..1f985265 100644 --- a/pango/pangofc-decoder.c +++ b/pango/pangofc-decoder.c @@ -70,7 +70,7 @@ pango_fc_decoder_get_charset (PangoFcDecoder *decoder, * glyph is most convenient for it. (Usually whatever glyph is directly * in the fonts character map table.) * - * Return value: the glyph index, or %PANGO_GLYPH_NULL if the glyph isn't + * Return value: the glyph index, or 0 if the glyph isn't * covered by the font. * * Since: 1.6 @@ -80,7 +80,7 @@ pango_fc_decoder_get_glyph (PangoFcDecoder *decoder, PangoFcFont *fcfont, guint32 wc) { - g_return_val_if_fail (PANGO_IS_FC_DECODER (decoder), PANGO_GLYPH_NULL); + g_return_val_if_fail (PANGO_IS_FC_DECODER (decoder), 0); return PANGO_FC_DECODER_GET_CLASS (decoder)->get_glyph (decoder, fcfont, wc); } -- cgit v1.2.1