brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Always have a valid font map

Browse Source 
Every time we request a CoglPangoFontMap, either internally or
externally, we should have one available.

Reviewed-by: Neil Roberts <neil@linux.intel.com>
This commit is contained in:
Emmanuele Bassi 2010-06-09 11:53:58 +01:00
parent 5929468599
commit 91a359c44e
1 changed files with 45 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
clutter/clutter-main.c
View File

@ -678,6 +678,29 @@ result:
return actor; return actor;
} }
CoglPangoFontMap *
_clutter_context_get_pango_fontmap (ClutterMainContext *self)
{
CoglPangoFontMap *font_map;
gdouble resolution;
gboolean use_mipmapping;
if (G_LIKELY (self->font_map != NULL))
return self->font_map;
font_map = COGL_PANGO_FONT_MAP (cogl_pango_font_map_new ());
resolution = clutter_backend_get_resolution (self->backend);
cogl_pango_font_map_set_resolution (font_map, resolution);
use_mipmapping = !clutter_disable_mipmap_text;
cogl_pango_font_map_set_use_mipmapping (font_map, use_mipmapping);
self->font_map = font_map;
return self->font_map;
}
static ClutterTextDirection static ClutterTextDirection
clutter_get_text_direction (void) clutter_get_text_direction (void)
{ {
@ -774,22 +797,12 @@ _clutter_context_get_pango_context (ClutterMainContext *self)
PangoContext * PangoContext *
_clutter_context_create_pango_context (ClutterMainContext *self) _clutter_context_create_pango_context (ClutterMainContext *self)
{ {
CoglPangoFontMap *font_map;
PangoContext *context; PangoContext *context;
if (self->font_map == NULL) font_map = _clutter_context_get_pango_fontmap (self);
{
gdouble resolution;
self->font_map = COGL_PANGO_FONT_MAP (cogl_pango_font_map_new ()); context = cogl_pango_font_map_create_context (font_map);
resolution = clutter_backend_get_resolution (self->backend);
cogl_pango_font_map_set_resolution (self->font_map, resolution);
if (G_LIKELY (!clutter_disable_mipmap_text))
cogl_pango_font_map_set_use_mipmapping (self->font_map, TRUE);
}
context = cogl_pango_font_map_create_context (self->font_map);
update_pango_context (self->backend, context); update_pango_context (self->backend, context);
pango_context_set_language (context, pango_language_get_default ()); pango_context_set_language (context, pango_language_get_default ());
@ -2860,8 +2873,10 @@ clutter_get_keyboard_grab (void)
void void
clutter_clear_glyph_cache (void) clutter_clear_glyph_cache (void)
{ {
if (CLUTTER_CONTEXT ()->font_map) CoglPangoFontMap *font_map;
cogl_pango_font_map_clear_glyph_cache (CLUTTER_CONTEXT ()->font_map);
font_map = _clutter_context_get_pango_fontmap (CLUTTER_CONTEXT ());
cogl_pango_font_map_clear_glyph_cache (font_map);
} }
/** /**
@ -2882,19 +2897,19 @@ clutter_clear_glyph_cache (void)
void void
clutter_set_font_flags (ClutterFontFlags flags) clutter_set_font_flags (ClutterFontFlags flags)
{ {
ClutterMainContext *context = _clutter_context_get_default ();
CoglPangoFontMap *font_map;
ClutterFontFlags old_flags, changed_flags; ClutterFontFlags old_flags, changed_flags;
const cairo_font_options_t *font_options; const cairo_font_options_t *font_options;
cairo_font_options_t *new_font_options; cairo_font_options_t *new_font_options;
gboolean use_mipmapping;
ClutterBackend *backend; ClutterBackend *backend;
backend = clutter_get_default_backend (); backend = clutter_get_default_backend ();
if (CLUTTER_CONTEXT ()->font_map == NULL) font_map = _clutter_context_get_pango_fontmap (context);
_clutter_context_create_pango_context (CLUTTER_CONTEXT ()); use_mipmapping = (flags & CLUTTER_FONT_MIPMAPPING) != 0;
cogl_pango_font_map_set_use_mipmapping (font_map, use_mipmapping);
cogl_pango_font_map_set_use_mipmapping (CLUTTER_CONTEXT ()->font_map,
(flags
& CLUTTER_FONT_MIPMAPPING) != 0);
old_flags = clutter_get_font_flags (); old_flags = clutter_get_font_flags ();
@ -2915,8 +2930,9 @@ clutter_set_font_flags (ClutterFontFlags flags)
cairo_font_options_destroy (new_font_options); cairo_font_options_destroy (new_font_options);
if (CLUTTER_CONTEXT ()->pango_context) /* update the default pango context, if any */
update_pango_context (backend, CLUTTER_CONTEXT ()->pango_context); if (context->pango_context != NULL)
update_pango_context (backend, context->pango_context);
} }
/** /**
@ -2932,18 +2948,16 @@ clutter_set_font_flags (ClutterFontFlags flags)
ClutterFontFlags ClutterFontFlags
clutter_get_font_flags (void) clutter_get_font_flags (void)
{ {
ClutterMainContext *ctxt = CLUTTER_CONTEXT (); ClutterMainContext *context = CLUTTER_CONTEXT ();
CoglPangoFontMap *font_map = NULL; CoglPangoFontMap *font_map = NULL;
const cairo_font_options_t *font_options; const cairo_font_options_t *font_options;
ClutterFontFlags flags = 0; ClutterFontFlags flags = 0;
font_map = CLUTTER_CONTEXT ()->font_map; font_map = _clutter_context_get_pango_fontmap (context);
if (cogl_pango_font_map_get_use_mipmapping (font_map))
if (G_LIKELY (font_map)
&& cogl_pango_font_map_get_use_mipmapping (font_map))
flags |= CLUTTER_FONT_MIPMAPPING; flags |= CLUTTER_FONT_MIPMAPPING;
font_options = clutter_backend_get_font_options (ctxt->backend); font_options = clutter_backend_get_font_options (context->backend);
if ((cairo_font_options_get_hint_style (font_options) if ((cairo_font_options_get_hint_style (font_options)
!= CAIRO_HINT_STYLE_DEFAULT) != CAIRO_HINT_STYLE_DEFAULT)
@ -2999,10 +3013,9 @@ clutter_get_input_device_for_id (gint id)
PangoFontMap * PangoFontMap *
clutter_get_font_map (void) clutter_get_font_map (void)
{ {
if (CLUTTER_CONTEXT ()->font_map) ClutterMainContext *context = _clutter_context_get_default ();
return PANGO_FONT_MAP (CLUTTER_CONTEXT ()->font_map);
return NULL; return PANGO_FONT_MAP (_clutter_context_get_pango_fontmap (context));
} }
typedef struct _ClutterRepaintFunction typedef struct _ClutterRepaintFunction