Change PANGO_GLYPH_EMPTY to 0x0FFFFFFF, to not overlap with

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

        * pango/pango-types.h: Change PANGO_GLYPH_EMPTY to 0x0FFFFFFF, to
        not overlap with PANGO_GLYPH_UNKNOWN_FLAG (0x10000000).
        Define PANGO_GET_UNKNOWN_GLYPH(wc) that simply returns
        wc|PANGO_GLYPH_UNKNOWN_FLAG.

        * docs/pango-sections.txt, docs/tmpl/glyphs.sgml: Document new
        symbols.

        * modules/*/*.c: Use PANGO_GET_UNKNOWN_GLYPH instead of various
        backend-specific functions.

        * pango/pangofc-font.c, pango/pangoft.c, pango/pangoxft-font.c,
        * pango/pangowin32.c, pango/pangox.c: Suggest using
        PANGO_GET_UNKNOWN_GLYPH in docs.

        * pango/pangofc-font.h: Deprecate pango_fc_font_get_unknown_glyph().

        * pango/pangowin32.h: Deprecate pango_win32_get_unknown_glyph().

11 files changed, 19 insertions, 19 deletions

diff --git a/modules/arabic/arabic-fc.c b/modules/arabic/arabic-fc.c
index 355646a7..50a0eb68 100644
--- a/modules/arabic/arabic-fc.c
+++ b/modules/arabic/arabic-fc.c
@@ -216,7 +216,7 @@ fallback_shape (PangoEngineShape *engine,
 	  index = pango_fc_font_get_glyph (fc_font, wc);
 
 	  if (!index)
-	    index = pango_fc_font_get_unknown_glyph (fc_font, wc);
+	    index = PANGO_GET_UNKNOWN_GLYPH ( wc);
 
 	  set_glyph (font, glyphs, i, p - text, index);
 	}
@@ -335,7 +335,7 @@ arabic_engine_shape (PangoEngineShape *engine,
 
 	  if (!index)
 	    {
-	      pango_ot_buffer_add_glyph (buffer, pango_fc_font_get_unknown_glyph (fc_font, wc),
+	      pango_ot_buffer_add_glyph (buffer, PANGO_GET_UNKNOWN_GLYPH ( wc),
 					 properties[i], p - text);
 	    }
 	  else
diff --git a/modules/basic/basic-fc.c b/modules/basic/basic-fc.c
index 5b8d90bf..80694bad 100644
--- a/modules/basic/basic-fc.c
+++ b/modules/basic/basic-fc.c
@@ -174,7 +174,7 @@ fallback_shape (PangoEngineShape *engine,
 
 	  if (!index)
             {
-	      index = pango_fc_font_get_unknown_glyph (fc_font, wc);
+	      index = PANGO_GET_UNKNOWN_GLYPH ( wc);
               set_glyph (font, glyphs, i, p - text, index);
 	    }
 	  else
@@ -390,7 +390,7 @@ basic_engine_shape (PangoEngineShape *engine,
 	  
 	  if (!index)
 	    {
-	      pango_ot_buffer_add_glyph (buffer, pango_fc_font_get_unknown_glyph (fc_font, wc),
+	      pango_ot_buffer_add_glyph (buffer, PANGO_GET_UNKNOWN_GLYPH ( wc),
 					 unknown_property, p - text);
 	    }
 	  else
diff --git a/modules/basic/basic-win32.c b/modules/basic/basic-win32.c
index 2b6c6017..fed595d3 100644
--- a/modules/basic/basic-win32.c
+++ b/modules/basic/basic-win32.c
@@ -849,10 +849,10 @@ itemize_shape_and_place (PangoFont        *font,
 	    {
 	      PangoRectangle logical_rect;
 	      /* Should pass actual char that was not found to
-	       * pango_win32_get_unknown_glyph(), but a bit hard to
+	       * PANGO_GET_UNKNOWN_GLYPH(), but a bit hard to
 	       * find out that at this point, so cheat and use 0.
 	       */
-	      PangoGlyph unk = pango_win32_get_unknown_glyph (font, 0);
+	      PangoGlyph unk = PANGO_GET_UNKNOWN_GLYPH (0);
 
 	      glyphs->glyphs[ng+glyphix].glyph = unk;
 	      pango_font_get_glyph_extents (font, unk, NULL, &logical_rect);
@@ -1034,7 +1034,7 @@ basic_engine_shape (PangoEngineShape *engine,
 		}
 	    }
 	  else
-	    set_glyph (font, glyphs, i, p - text, pango_win32_get_unknown_glyph (font, wc));
+	    set_glyph (font, glyphs, i, p - text, PANGO_GET_UNKNOWN_GLYPH (wc));
 	}
       
       p = g_utf8_next_char (p);
diff --git a/modules/basic/basic-x.c b/modules/basic/basic-x.c
index ffd07329..451ea6da 100644
--- a/modules/basic/basic-x.c
+++ b/modules/basic/basic-x.c
@@ -202,7 +202,7 @@ find_char (CharCache *cache, PangoFont *font, gunichar wc, const char *input)
     case '\r':
     case 0x2028: /* Line separator */
     case 0x2029: /* Paragraph separator */
-      return pango_x_font_get_unknown_glyph (font, wc);
+      return PANGO_GET_UNKNOWN_GLYPH (wc);
       break;
     }
   
@@ -640,7 +640,7 @@ basic_engine_shape (PangoEngineShape *engine,
 		}
 	    }
 	  else
-	    set_glyph (font, glyphs, i, p - text, pango_x_font_get_unknown_glyph (font, wc));
+	    set_glyph (font, glyphs, i, p - text, PANGO_GET_UNKNOWN_GLYPH (wc));
 	}
       
       p = g_utf8_next_char (p);
diff --git a/modules/hangul/hangul-fc.c b/modules/hangul/hangul-fc.c
index 0b12c94a..7c169a9d 100644
--- a/modules/hangul/hangul-fc.c
+++ b/modules/hangul/hangul-fc.c
@@ -128,7 +128,7 @@ set_glyph_tone (PangoFont *font, PangoGlyphString *glyphs, int i,
 #define find_char(font,wc) \
     pango_fc_font_get_glyph((PangoFcFont *)font, wc)
 #define get_unknown_glyph(font,wc) \
-    pango_fc_font_get_unknown_glyph((PangoFcFont *)font, wc)
+    PANGO_GET_UNKNOWN_GLYPH ( wc)
 
 static void
 render_tone (PangoFont *font, gunichar tone, PangoGlyphString *glyphs,
diff --git a/modules/hebrew/hebrew-fc.c b/modules/hebrew/hebrew-fc.c
index b396fa92..454e00ca 100644
--- a/modules/hebrew/hebrew-fc.c
+++ b/modules/hebrew/hebrew-fc.c
@@ -76,7 +76,7 @@ get_cluster_glyphs(PangoFont      *font,
 	
       glyph_num[i] = pango_fc_font_get_glyph ((PangoFcFont *)font, wc);
       if (!glyph_num[i])
-	glyph_num[i] = pango_fc_font_get_unknown_glyph ((PangoFcFont *)font, wc);
+	glyph_num[i] = PANGO_GET_UNKNOWN_GLYPH ( wc);
 
       glyph[i] = glyph_num[i];
 
@@ -356,7 +356,7 @@ hebrew_engine_shape (PangoEngineShape *engine,
 	  
 	  if (!index)
 	    {
-	      pango_ot_buffer_add_glyph (buffer, pango_fc_font_get_unknown_glyph (fc_font, wc),
+	      pango_ot_buffer_add_glyph (buffer, PANGO_GET_UNKNOWN_GLYPH ( wc),
 					 unknown_property, p - text);
 	    }
 	  else
diff --git a/modules/indic/indic-fc.c b/modules/indic/indic-fc.c
index 4cfcf7ae..021d3ef8 100644
--- a/modules/indic/indic-fc.c
+++ b/modules/indic/indic-fc.c
@@ -278,7 +278,7 @@ set_glyphs (PangoFont      *font,
 	  glyph = pango_fc_font_get_glyph (fc_font, wcs[i]);
 
 	  if (!glyph)
-	    glyph = pango_fc_font_get_unknown_glyph (fc_font, wcs[i]);
+	    glyph = PANGO_GET_UNKNOWN_GLYPH ( wcs[i]);
 	}
       pango_ot_buffer_add_glyph (buffer, glyph, tags[i], i);
     }
diff --git a/modules/khmer/khmer-fc.c b/modules/khmer/khmer-fc.c
index 75cebf87..2804741e 100644
--- a/modules/khmer/khmer-fc.c
+++ b/modules/khmer/khmer-fc.c
@@ -509,7 +509,7 @@ get_index (PangoFcFont *fc_font, gunichar wc)
 {
   PangoGlyph index = pango_fc_font_get_glyph (fc_font, wc);
   if (!index)
-    index = pango_fc_font_get_unknown_glyph (fc_font, wc);
+    index = PANGO_GET_UNKNOWN_GLYPH ( wc);
   return index;
 }
 
diff --git a/modules/syriac/syriac-fc.c b/modules/syriac/syriac-fc.c
index 876e725d..9cbbf511 100644
--- a/modules/syriac/syriac-fc.c
+++ b/modules/syriac/syriac-fc.c
@@ -208,7 +208,7 @@ fallback_shape (PangoEngineShape *engine,
 	  index = pango_fc_font_get_glyph (fc_font, wc);
 
 	  if (!index)
-	    index = pango_fc_font_get_unknown_glyph (fc_font, wc);
+	    index = PANGO_GET_UNKNOWN_GLYPH ( wc);
 
 	  set_glyph (font, glyphs, i, p - text, index);
 	}
@@ -309,7 +309,7 @@ syriac_engine_shape (PangoEngineShape *engine,
 
 	  if (!index)
 	    {
-	      pango_ot_buffer_add_glyph (buffer, pango_fc_font_get_unknown_glyph (fc_font, wc),
+	      pango_ot_buffer_add_glyph (buffer, PANGO_GET_UNKNOWN_GLYPH ( wc),
 					 properties[i], p - text);
 	    }
 	  else
diff --git a/modules/thai/thai-fc.c b/modules/thai/thai-fc.c
index 9a038e8b..aaedbb3e 100644
--- a/modules/thai/thai-fc.c
+++ b/modules/thai/thai-fc.c
@@ -231,13 +231,13 @@ thai_make_glyph_uni (ThaiFontInfo *font_info, gunichar uc)
   if (result)
     return result;
   else
-    return pango_fc_font_get_unknown_glyph (fc_font, uc);
+    return PANGO_GET_UNKNOWN_GLYPH ( uc);
 }
 
 PangoGlyph
 thai_make_unknown_glyph (ThaiFontInfo *font_info, gunichar uc)
 {
-  return pango_fc_font_get_unknown_glyph ((PangoFcFont *)font_info->font, uc);
+  return PANGO_GET_UNKNOWN_GLYPH ( uc);
 }
 
 static void
diff --git a/modules/tibetan/tibetan-fc.c b/modules/tibetan/tibetan-fc.c
index 77a10ca7..50a0b046 100644
--- a/modules/tibetan/tibetan-fc.c
+++ b/modules/tibetan/tibetan-fc.c
@@ -474,7 +474,7 @@ get_index (PangoFcFont *fc_font, gunichar wc)
 {
   PangoGlyph index = pango_fc_font_get_glyph (fc_font, wc);
   if (!index)
-    index = pango_fc_font_get_unknown_glyph (fc_font, wc);
+    index = PANGO_GET_UNKNOWN_GLYPH ( wc);
   return index;
 }