/****************************************************************************
- * RRDtool 1.2.99907080300 Copyright by Tobi Oetiker, 1997-2007
+ * RRDtool 1.3.1 Copyright by Tobi Oetiker, 1997-2008
****************************************************************************
* rrd_gfx.c graphics wrapper for rrdtool
**************************************************************************/
double dash_off)
{
cairo_t *cr = im->cr;
- double dashes[] = { dash_on, dash_off };
+ double dashes[2];
double x = 0;
double y = 0;
+ dashes[0] = dash_on;
+ dashes[1] = dash_off;
+
cairo_save(cr);
cairo_new_path(cr);
cairo_set_line_width(cr, width);
double tabwidth,
const char *text)
{
- PangoLayout *layout;
- PangoFontDescription *font_desc;
+ static PangoLayout *layout = NULL;
+ static PangoContext *pango_context = NULL;
+ static PangoFontMap *pango_fontmap = NULL;
+ static char* last_font = NULL;
+ static double last_size = -1;
+ static double last_tabwidth = -1;
+
cairo_t *cr = im->cr;
/* for performance reasons we might
long i;
long tab_count = strlen(text);
long tab_shift = fmod(x, tabwidth);
+ int border = im->text_prop[TEXT_PROP_LEGEND].size * 2.0;
+
+ gchar *utf8_text;
- PangoTabArray *tab_array;
- PangoContext *pango_context;
+ /* initialize pango only once ... */
+ if (!pango_fontmap){
+ pango_fontmap = pango_cairo_font_map_get_default ();
+ }
+ if (!pango_context){
+ // fprintf(stderr,"c");
+ pango_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *) (pango_fontmap));
+ pango_cairo_context_set_resolution(pango_context, 100);
+ }
+ if (!layout){
+ // fprintf(stderr,"l");
+ layout = pango_layout_new (pango_context);
+ }
- tab_array = pango_tab_array_new(tab_count, (gboolean) (1));
- for (i = 1; i <= tab_count; i++) {
- pango_tab_array_set_tab(tab_array,
- i, PANGO_TAB_LEFT, tabwidth * i - tab_shift);
+ pango_cairo_context_set_font_options(pango_context, im->font_options);
+
+ pango_cairo_update_context (cr, pango_context);
+
+
+ if (last_tabwidth < 0 || last_tabwidth != tabwidth){
+ PangoTabArray *tab_array;
+ // fprintf(stderr,"t");
+ last_tabwidth = tabwidth;
+ tab_array = pango_tab_array_new(tab_count, (gboolean) (1));
+ for (i = 1; i <= tab_count; i++) {
+ pango_tab_array_set_tab(tab_array,
+ i, PANGO_TAB_LEFT,
+ tabwidth * i - tab_shift + border);
+ }
+ pango_layout_set_tabs(layout, tab_array);
+ pango_tab_array_free(tab_array);
}
+
+ if (last_font == NULL || strcmp(font,last_font) != 0){
+ PangoFontDescription *font_desc;
+ // fprintf(stderr,"f:%s",font);
+ if (last_font)
+ free(last_font);
+ last_font = strdup(font);
+ font_desc = pango_font_description_from_string(font);
+ pango_layout_set_font_description(layout, font_desc);
+ pango_font_description_free(font_desc);
+ }
+
+ if (last_size < 0 || last_size != size ){
+ PangoFontDescription *font_desc;
+ font_desc = pango_layout_get_font_description (layout);
+ pango_font_description_set_size(font_desc, size * PANGO_SCALE);
+ pango_layout_set_font_description(layout, font_desc);
+ }
+
cairo_new_path(cr);
cairo_set_source_rgba(cr, color.red, color.green, color.blue,
color.alpha);
- layout = pango_cairo_create_layout(cr);
- pango_context = pango_layout_get_context(layout);
- pango_cairo_context_set_font_options(pango_context, im->font_options);
- pango_cairo_update_context(cr, pango_context);
+/* layout = pango_cairo_create_layout(cr); */
+
+// pango_cairo_context_set_font_options(pango_context, im->font_options);
+// pango_cairo_context_set_resolution(pango_context, 100);
+
+/* pango_cairo_update_context(cr, pango_context); */
+
- pango_layout_set_tabs(layout, tab_array);
- font_desc = pango_font_description_from_string(font);
- pango_font_description_set_size(font_desc, size * PANGO_SCALE);
- pango_layout_set_font_description(layout, font_desc);
- pango_layout_set_markup(layout, text, -1);
+ /* pango expects the string to be utf-8 encoded */
+ utf8_text = g_locale_to_utf8((const gchar *) text, -1, NULL, NULL, NULL);
+
+ /* In case of an error, i.e. utf8_text == NULL (locale settings messed
+ * up?), we fall back to a possible "invalid UTF-8 string" warning instead
+ * of provoking a failed assertion in libpango. */
+ if (im->with_markup)
+ pango_layout_set_markup(layout, utf8_text ? utf8_text : text, -1);
+ else
+ pango_layout_set_text(layout, utf8_text ? utf8_text : text, -1);
+
+ g_free(utf8_text);
return layout;
}
PangoLayout *layout;
PangoRectangle log_rect;
gfx_color_t color = { 0, 0, 0, 0 };
- char *tab;
-
- /* turn \\t into tab */
- while ((tab = strstr(text, "\\t"))) {
- memmove(tab + 1, tab + 2, strlen(tab + 2));
- tab[0] = (char) 9;
- }
layout = gfx_prep_text(im, start, color, font, size, tabwidth, text);
pango_layout_get_pixel_extents(layout, NULL, &log_rect);
- pango_tab_array_free(pango_layout_get_tabs(layout));
- g_object_unref(layout);
+/* g_object_unref(layout); */
return log_rect.width;
}
{
PangoLayout *layout;
PangoRectangle log_rect;
- PangoRectangle ink_rect;
cairo_t *cr = im->cr;
double sx = 0;
double sy = 0;
/* gfx_line(cr,-2,0,2,0,1,color);
gfx_line(cr,0,-2,0,2,1,color); */
layout = gfx_prep_text(im, x, color, font, size, tabwidth, text);
- pango_layout_get_pixel_extents(layout, &ink_rect, &log_rect);
+ pango_layout_get_pixel_extents(layout, NULL, &log_rect);
cairo_rotate(cr, -angle * G_PI / 180.0);
sx = log_rect.x;
switch (h_align) {
pango_cairo_update_layout(cr, layout);
cairo_move_to(cr, sx, sy);
pango_cairo_show_layout(cr, layout);
- pango_tab_array_free(pango_layout_get_tabs(layout));
- g_object_unref(layout);
+/* g_object_unref(layout); */
cairo_restore(cr);
}
projects / rrdtool.git / blobdiff