diff options
| author | Behdad Esfahbod <behdad@gnome.org> | 2006-02-05 03:11:58 +0000 |
|---|---|---|
| committer | Behdad Esfahbod <behdad@src.gnome.org> | 2006-02-05 03:11:58 +0000 |
| commit | 6cddbd51fe9e616847a17be379149822c88104bf (patch) | |
| tree | 1bcecc7d9210c334829b439ef515585ebe297624 /modules/basic | |
| parent | 8adcead819b6bb6781f0b01c6b17175b2918af8f (diff) | |
| download | pango-6cddbd51fe9e616847a17be379149822c88104bf.tar.gz | |
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().
Diffstat (limited to 'modules/basic')
| -rw-r--r-- | modules/basic/basic-fc.c | 4 | ||||
| -rw-r--r-- | modules/basic/basic-win32.c | 6 | ||||
| -rw-r--r-- | modules/basic/basic-x.c | 4 |
3 files changed, 7 insertions, 7 deletions
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); |