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, 12 insertions, 10 deletions

diff --git a/pango/fonts.c b/pango/fonts.c
index e030d6b5..79d237e9 100644
--- a/pango/fonts.c
+++ b/pango/fonts.c
@@ -1166,25 +1166,25 @@ pango_font_get_glyph_extents  (PangoFont      *font,
 			       PangoRectangle *ink_rect,
 			       PangoRectangle *logical_rect)
 {
-  if (G_UNLIKELY (font == NULL))
+  if (G_UNLIKELY (!PANGO_IS_FONT (font)))
     {
       
       if (!_pango_warning_history.get_glyph_extents)
         {
 	  _pango_warning_history.get_glyph_extents = TRUE;
-	  g_critical ("pango_font_get_glyph_extents called with font == NULL, expect ugly output");
+	  g_critical ("pango_font_get_glyph_extents called with bad font, expect ugly output");
 	}
       if (ink_rect)
         {
-	  ink_rect->x = 0;
-	  ink_rect->y = 0;
-	  ink_rect->height = PANGO_UNKNOWN_GLYPH_HEIGHT * PANGO_SCALE;
-	  ink_rect->width = PANGO_UNKNOWN_GLYPH_WIDTH * PANGO_SCALE;
+	  ink_rect->x = PANGO_SCALE;
+	  ink_rect->y = - (PANGO_UNKNOWN_GLYPH_HEIGHT - 1) * PANGO_SCALE;
+	  ink_rect->height = (PANGO_UNKNOWN_GLYPH_HEIGHT - 2) * PANGO_SCALE;
+	  ink_rect->width = (PANGO_UNKNOWN_GLYPH_WIDTH - 2) * PANGO_SCALE;
         }
       if (logical_rect)
         {
-	  logical_rect->x = 0;
-	  logical_rect->y = 0;
+	  logical_rect->x = logical_rect->y = 0;
+	  logical_rect->y = - PANGO_UNKNOWN_GLYPH_HEIGHT * PANGO_SCALE;
 	  logical_rect->height = PANGO_UNKNOWN_GLYPH_HEIGHT * PANGO_SCALE;
 	  logical_rect->width = PANGO_UNKNOWN_GLYPH_WIDTH * PANGO_SCALE;
 	}
@@ -1279,7 +1279,8 @@ pango_font_metrics_new (void)
 PangoFontMetrics *
 pango_font_metrics_ref (PangoFontMetrics *metrics)
 {
-  g_return_val_if_fail (metrics != NULL, NULL);
+  if (!metrics)
+    return NULL;
   
   metrics->ref_count++;
 
@@ -1297,7 +1298,8 @@ pango_font_metrics_ref (PangoFontMetrics *metrics)
 void
 pango_font_metrics_unref (PangoFontMetrics *metrics)
 {
-  g_return_if_fail (metrics != NULL);
+  if (!metrics)
+    return;
   g_return_if_fail (metrics->ref_count > 0 );
   
   metrics->ref_count--;