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, 14 insertions, 17 deletions

diff --git a/pango/pangoxft-font.c b/pango/pangoxft-font.c
index 73e87104..2dc14452 100644
--- a/pango/pangoxft-font.c
+++ b/pango/pangoxft-font.c
@@ -27,8 +27,6 @@
 #include "pangoxft-private.h"
 #include "pangofc-private.h"
 
-PangoXftWarningHistory _pango_xft_warning_history = { FALSE };
-
 #define PANGO_XFT_FONT_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), PANGO_TYPE_XFT_FONT, PangoXftFontClass))
 #define PANGO_XFT_IS_FONT_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), PANGO_TYPE_XFT_FONT))
 #define PANGO_XFT_FONT_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), PANGO_TYPE_XFT_FONT, PangoXftFontClass))
@@ -153,12 +151,12 @@ _pango_xft_font_get_mini_font (PangoXftFont *xfont)
 	pango_font_description_set_size (desc, new_size);
 
       xfont->mini_font = pango_font_map_load_font (fcfont->fontmap, context, desc);
-      if (!xfont->mini_font)
-	return NULL;
-
       pango_font_description_free (desc);
       g_object_unref (context);
 
+      if (!xfont->mini_font)
+	return NULL;
+
       mini_xft = xft_font_get_font (xfont->mini_font);
 
       for (i = 0 ; i < 16 ; i++)
@@ -169,7 +167,6 @@ _pango_xft_font_get_mini_font (PangoXftFont *xfont)
 	  height = MAX (height, extents.height);
 	}
 
-
       xfont->mini_width = PANGO_SCALE * width;
       xfont->mini_height = PANGO_SCALE * height;
       xfont->mini_pad = PANGO_SCALE * MIN (height / 2, MAX ((int)(2.2 * height + 27) / 28, 1));
@@ -210,8 +207,15 @@ get_glyph_extents_missing (PangoXftFont    *xfont,
 {
   PangoFont *font = PANGO_FONT (xfont);
   XftFont *xft_font = xft_font_get_font (font);
+  gunichar ch;
+  gint cols;
+  
+  ch = glyph & ~PANGO_GLYPH_UNKNOWN_FLAG;
 
-  gint cols = (glyph & ~PANGO_GLYPH_UNKNOWN_FLAG) > 0xffff ? 3 : 2;
+  if (G_UNLIKELY (glyph == PANGO_GLYPH_INVALID_INPUT || ch > 0x10FFFF))
+    cols = 1;
+  else
+    cols = ch > 0xffff ? 3 : 2;
 
   _pango_xft_font_get_mini_font (xfont);
 
@@ -463,20 +467,13 @@ pango_xft_font_real_shutdown (PangoFcFont *fcfont)
  *
  * Returns the XftFont of a font.
  *
- * Return value: the XftFont associated to @font.
+ * Return value: the XftFont associated to @font, or %NULL if @font is %NULL.
  **/
 XftFont *
 pango_xft_font_get_font (PangoFont *font)
 {
-  if (G_UNLIKELY (!PANGO_XFT_IS_FONT (font)))
-    {
-      if (!_pango_xft_warning_history.get_font)
-	{
-	  _pango_xft_warning_history.get_font = TRUE;
-	  g_warning ("pango_xft_font_get_font called with bad font, expect ugly output");
-	}
-      return NULL;
-    }
+  if (G_UNLIKELY (!font))
+    return NULL;
 
   return xft_font_get_font (font);
 }