Finish the 'glyph 0' work of this morning: PANGO_GLYPH_NULL that I

2006-02-02  Behdad Esfahbod  <behdad@gnome.org>

        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.

1 files changed, 5 insertions, 5 deletions

diff --git a/pango/pangofc-font.c b/pango/pangofc-font.c
index 8dafbcb0..a14dd43a 100644
--- a/pango/pangofc-font.c
+++ b/pango/pangofc-font.c
@@ -435,7 +435,7 @@ pango_fc_font_create_metrics_for_context (PangoFcFont   *fcfont,
   g_object_unref (layout);
 
   return metrics;
-}		    
+}
 
 /* This function is cut-and-pasted into pangocairo-fcfont.c - it might be
  * better to add a virtual fcfont->create_context (font).
@@ -469,7 +469,7 @@ pango_fc_font_get_metrics (PangoFont     *font,
 	return pango_font_metrics_new ();
 
       info = g_slice_new0 (PangoFcMetricsInfo);
-      
+
       fcfont->metrics_by_lang = g_slist_prepend (fcfont->metrics_by_lang, 
 						 info);
 	
@@ -518,7 +518,7 @@ pango_fc_font_real_get_glyph (PangoFcFont *font,
   
   index = FcFreeTypeCharIndex (face, wc);
   if (index > (FT_UInt)face->num_glyphs)
-    index = PANGO_GLYPH_NULL;
+    index = 0;
 
   PANGO_FC_FONT_UNLOCK_FACE (font);
 
@@ -600,7 +600,7 @@ pango_fc_font_has_char (PangoFcFont *font,
  * for @font. If you only want to determine
  * whether the font has the glyph, use pango_fc_font_has_char().
  * 
- * Return value: the glyph index, or %PANGO_GLYPH_NULL, if the Unicode
+ * Return value: the glyph index, or 0, if the Unicode
  *   character doesn't exist in the font.
  *
  * Since: 1.4
@@ -817,7 +817,7 @@ pango_fc_font_get_raw_extents (PangoFcFont    *fcfont,
 
   face = PANGO_FC_FONT_LOCK_FACE (fcfont);
 
-  if (!glyph)
+  if (glyph == PANGO_GLYPH_EMPTY)
     gm = NULL;
   else
     gm = get_per_char (face, load_flags, glyph);