Bug 478914 – Use something invalid instead of '?' when validating input

2007-12-10  Behdad Esfahbod  <behdad@gnome.org>

        Bug 478914 – Use something invalid instead of '?' when validating
        input text

        * pango/pango-layout.c (pango_layout_set_text): Set invalid input
        bytes to -1, which gives a unichar value of -1, and eventually a
        glyph value of -1, aka PANGO_GLYPH_INVALID_INPUT.

        * pango/fonts.c (pango_font_get_glyph_extents),
        (pango_font_get_metrics), (pango_font_get_font_map):
        * pango/modules.c (build_map):
        * pango/pango-context.c (get_script), (get_shaper_and_font),
        (string_from_script), (itemize_state_process_run):
        * pango/pango-coverage.c (pango_coverage_get):
        * pango/pango-impl-utils.h:
        * pango/pango-utils.c:
        * pango/pangocairo-font.c (pango_cairo_font_get_scaled_font),
        (_pango_cairo_font_private_get_hex_box_info),
        (_pango_cairo_font_private_get_glyph_extents_missing):
        * pango/pangocairo-private.h:
        * pango/pangocairo-render.c (_pango_cairo_renderer_draw_frame),
        (_pango_cairo_renderer_draw_box_glyph),
        (_pango_cairo_renderer_draw_unknown_glyph):
        * pango/pangofc-fontmap.c (pango_fc_font_map_get_patterns):
        * pango/pangoft2-private.h:
        * pango/pangoft2-render.c (pango_ft2_font_render_box_glyph),
        (pango_ft2_font_render_glyph), (pango_ft2_renderer_draw_glyph):
        * pango/pangoft2.c (pango_ft2_font_get_face),
        (pango_ft2_font_get_glyph_extents):
        * pango/pangox.c (pango_x_find_subfont), (pango_x_render):
        * pango/pangoxft-font.c (_pango_xft_font_get_mini_font),
        (get_glyph_extents_missing), (pango_xft_font_get_font):
        * pango/pangoxft-private.h:
        * pango/pangoxft-render.c (get_total_matrix), (draw_box),
        (_pango_xft_renderer_draw_box_glyph),
        (_pango_xft_renderer_draw_unknown_glyph),
        (pango_xft_renderer_draw_glyphs):
        * pango/shape.c (pango_shape):
        Render PANGO_GLYPH_INVALID_INPUT to a single-width box with a cross
        inside.  Also cleanup spewed warnings and warn at the source, where
        we fail to find a shaper, instead of at every location that we see
        a NULL font.

        * pango/pango-font.h:
        * docs/pango-sections.txt:
        * docs/tmpl/glyphs.sgml:
        New public macro:

                PANGO_GLYPH_INVALID_INPUT


svn path=/trunk/; revision=2519

1 files changed, 2 insertions, 17 deletions

diff --git a/pango/shape.c b/pango/shape.c
index 1fd2d814..d0be6da5 100644
--- a/pango/shape.c
+++ b/pango/shape.c
@@ -50,7 +50,7 @@ pango_shape (const gchar      *text,
 
   glyphs->num_glyphs = 0;
 
-  if (G_LIKELY (PANGO_IS_ENGINE_SHAPE (analysis->shape_engine) && PANGO_IS_FONT (analysis->font)))
+  if (G_LIKELY (analysis->shape_engine && analysis->font))
     {
       _pango_engine_shape_shape (analysis->shape_engine, analysis->font,
 				 text, length, analysis, glyphs);
@@ -106,22 +106,7 @@ pango_shape (const gchar      *text,
 	}
     }
   else
-    {
-      if (!PANGO_IS_ENGINE_SHAPE (analysis->shape_engine) &&
-	  !_pango_warning_history.shape_shape_engine)
-	{
-	  _pango_warning_history.shape_shape_engine = TRUE;
-	  g_warning ("pango_shape called with bad shape_engine, expect ugly output");
-	}
-      if (!PANGO_IS_FONT (analysis->font) &&
-	  !_pango_warning_history.shape_font)
-	{
-	  _pango_warning_history.shape_font = TRUE;
-	  g_warning ("pango_shape called with bad font, expect ugly output");
-	}
-
-      glyphs->num_glyphs = 0;
-    }
+    glyphs->num_glyphs = 0;
 
   if (!glyphs->num_glyphs)
     {