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

2008-05-28 Emmanuele Bassi <ebassi@openedhand.com>

Browse Source 
Bug #919 - Replacement pango renderer (Neil Roberts)

	* clutter/clutter-backend.h:
	* clutter/clutter-backend.c:
	(clutter_backend_set_font_options),
	(clutter_backend_get_font_options): Add the ability to set
	the cairo_font_options_t* for the backend at construction
	time, so that backend implementations can have their own
	options.

	* clutter/clutter-color.c: Include pango/pango-attributes.h
	for the pango_color_parse() function.

	* clutter/clutter-label.c:
	(clutter_label_ensure_layout),
	(clutter_label_init), (clutter_label_set_text),
	(clutter_label_set_font_name), (clutter_label_set_ellipsize),
	(clutter_label_set_use_markup): Ensure that the cache is
	always primed when the Label changes; this makes sure that
	the cache is rebuilt outside the paint run, which should
	make the painting perform better especially on embedded
	devices.

	* clutter/clutter-entry.c:
	(clutter_entry_ensure_layout),
	(clutter_entry_init), (clutter_entry_set_text),
	(clutter_entry_set_font_name): Ditto as above.

	* clutter/clutter-private.h:
	* clutter/clutter-main.[ch]: Create the font-map inside the
	main context; add two new functions:

	  clutter_clear_glyph_cache()
	  clutter_set_use_mipmapped_text()

	that control the glyphs cache.

	* clutter/pango/Makefile.am:
	* clutter/pango/pangoclutter-fontmap.c:
	* clutter/pango/pangoclutter-private.h:
	* clutter/pango/pangoclutter-render.c:
	* clutter/pango/pangoclutter.h: Rewrite the Pango renderer
	using a PangoCairo context and saving the glyphs inside a
	more efficient cache.

	* configure.ac: Depend on pangocairo instead of pangoft2.
This commit is contained in:
Emmanuele Bassi
2008-05-28 14:03:28 +00:00
parent a0747e8c2d
commit f20cfeadb4
15 changed files with 765 additions and 863 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
clutter/clutter-main.c
View File

@ -367,6 +367,9 @@ clutter_context_free (ClutterMainContext *context)
clutter_id_pool_free (context->id_pool);
context->id_pool = NULL;
g_object_unref (context->font_map);
context->font_map = NULL;
/* XXX: The cleaning up of the event queue should be moved here from
the backend base class. */
@ -877,8 +880,9 @@ clutter_context_get_default (void)
if (G_UNLIKELY(!ClutterCntx))
{
ClutterMainContext *ctx;
gdouble resolution;
ctx = g_new0 (ClutterMainContext, 1);
ClutterCntx = ctx = g_new0 (ClutterMainContext, 1);
ctx->backend = g_object_new (_clutter_backend_impl_get_type (), NULL);
ctx->is_initialized = FALSE;
@ -889,7 +893,12 @@ clutter_context_get_default (void)
g_timer_start (ctx->timer);
#endif
ClutterCntx = ctx;
ctx->font_map = PANGO_CLUTTER_FONT_MAP (pango_clutter_font_map_new ());
resolution = clutter_backend_get_resolution (ctx->backend);
pango_clutter_font_map_set_resolution (ctx->font_map, resolution);
pango_clutter_font_map_set_use_mipmapping (ctx->font_map, TRUE);
}
return ClutterCntx;
@ -983,8 +992,6 @@ pre_parse_hook (GOptionContext *context,
clutter_context = clutter_context_get_default ();
clutter_context->font_map = PANGO_FT2_FONT_MAP (pango_ft2_font_map_new ());
pango_ft2_font_map_set_resolution (clutter_context->font_map, 96.0, 96.0);
clutter_context->id_pool = clutter_id_pool_new (256);
backend = clutter_context->backend;
@ -2071,3 +2078,38 @@ clutter_set_motion_events_frequency (guint frequency)
/* never allow the motion events to exceed the default frame rate */
context->motion_frequency = CLAMP (frequency, 1, clutter_default_fps);
}
/**
* clutter_clear_glyph_cache:
*
* Clears the internal cache of glyphs used by the Pango
* renderer. This will free up some memory and GL texture
* resources. The cache will be automatically refilled as more text is
* drawn.
*
* Since: 0.8
*/
void
clutter_clear_glyph_cache (void)
{
if (CLUTTER_CONTEXT ()->font_map)
pango_clutter_font_map_clear_glyph_cache (CLUTTER_CONTEXT ()->font_map);
}
/**
* clutter_set_use_mipmapped_text:
* @value: %TRUE to enable mipmapping or %FALSE to disable.
*
* Sets whether subsequent text rendering operations will use
* mipmapped textures or not. Using mipmapped textures will improve
* the quality for scaled down text but will use more texture memory.
*
* Since: 0.8
*/
void
clutter_set_use_mipmapped_text (gboolean value)
{
if (CLUTTER_CONTEXT ()->font_map)
pango_clutter_font_map_set_use_mipmapping (CLUTTER_CONTEXT ()->font_map,
value);
}