X-Git-Url: https://git.octo.it/?p=rrdtool.git;a=blobdiff_plain;f=src%2Frrd_gfx.c;h=5a8c289dffcb31d54e2bfac406e8a209ab6efcc8;hp=4ddd584e5d8423a55a435bb5e5ca3249f9caa40b;hb=0cab41a011f053fa84ac481849380f69ded26147;hpb=dd7a80457423c23c6d6d9cc05b46ced2a3ec2dc6 diff --git a/src/rrd_gfx.c b/src/rrd_gfx.c index 4ddd584..c4236de 100644 --- a/src/rrd_gfx.c +++ b/src/rrd_gfx.c @@ -1,1315 +1,354 @@ /**************************************************************************** - * RRDtool 1.1.x Copyright Tobias Oetiker, 1997 - 2002 + * RRDtool 1.4.3 Copyright by Tobi Oetiker, 1997-2010 **************************************************************************** * rrd_gfx.c graphics wrapper for rrdtool **************************************************************************/ /* #define DEBUG */ -#ifdef DEBUG -# define DPRINT(x) (void)(printf x, printf("\n")) +/* stupid MSVC doesnt support variadic macros = no debug for now! */ +#ifdef _MSC_VER +# define RRDPRINTF() #else -# define DPRINT(x) -#endif -#include "rrd_tool.h" -#include -#include -#include FT_FREETYPE_H - -#include "rrd_gfx.h" -#include "rrd_afm.h" - -/* lines are better drawn on the pixle than between pixles */ -#define LINEOFFSET 0.5 +# ifdef DEBUG +# define RRDPRINTF(...) fprintf(stderr, __VA_ARGS__); +# else +# define RRDPRINTF(...) +# endif /* DEBUG */ +#endif /* _MSC_VER */ -static -gfx_node_t *gfx_new_node( gfx_canvas_t *canvas,enum gfx_en type){ - gfx_node_t *node = art_new(gfx_node_t,1); - if (node == NULL) return NULL; - node->type = type; - node->color = 0x0; /* color of element 0xRRGGBBAA alpha 0xff is solid*/ - node->size =0.0; /* font size, line width */ - node->path = NULL; /* path */ - node->points = 0; - node->points_max =0; - node->closed_path = 0; - node->svp = NULL; /* svp */ - node->filename = NULL; /* font or image filename */ - node->text = NULL; - node->x = 0.0; - node->y = 0.0; /* position */ - node->angle = 0; - node->halign = GFX_H_NULL; /* text alignement */ - node->valign = GFX_V_NULL; /* text alignement */ - node->tabwidth = 0.0; - node->next = NULL; - if (canvas->lastnode != NULL){ - canvas->lastnode->next = node; - } - if (canvas->firstnode == NULL){ - canvas->firstnode = node; - } - canvas->lastnode = node; - return node; -} +#include "rrd_tool.h" +#include "rrd_graph.h" -gfx_canvas_t *gfx_new_canvas (void) { - gfx_canvas_t *canvas = art_new(gfx_canvas_t,1); - canvas->firstnode = NULL; - canvas->lastnode = NULL; - canvas->imgformat = IF_PNG; /* we default to PNG output */ - canvas->interlaced = 0; - canvas->zoom = 1.0; - return canvas; -} /* create a new line */ -gfx_node_t *gfx_new_line(gfx_canvas_t *canvas, - double X0, double Y0, - double X1, double Y1, - double width, gfx_color_t color){ - return gfx_new_dashed_line(canvas, X0, Y0, X1, Y1, width, color, 0, 0); -} - -gfx_node_t *gfx_new_dashed_line(gfx_canvas_t *canvas, - double X0, double Y0, - double X1, double Y1, - double width, gfx_color_t color, - double dash_on, double dash_off){ - - gfx_node_t *node; - ArtVpath *vec; - node = gfx_new_node(canvas,GFX_LINE); - if (node == NULL) return NULL; - vec = art_new(ArtVpath, 3); - if (vec == NULL) return NULL; - vec[0].code = ART_MOVETO_OPEN; vec[0].x=X0+LINEOFFSET; vec[0].y=Y0+LINEOFFSET; - vec[1].code = ART_LINETO; vec[1].x=X1+LINEOFFSET; vec[1].y=Y1+LINEOFFSET; - vec[2].code = ART_END; - - node->points = 3; - node->points_max = 3; - node->color = color; - node->size = width; - node->dash_on = dash_on; - node->dash_off = dash_off; - node->path = vec; - return node; +void gfx_line( + image_desc_t *im, + double X0, + double Y0, + double X1, + double Y1, + double width, + gfx_color_t color) +{ + gfx_dashed_line(im, X0, Y0, X1, Y1, width, color, 0, 0); +} + +void gfx_dashed_line( + image_desc_t *im, + double X0, + double Y0, + double X1, + double Y1, + double width, + gfx_color_t color, + double dash_on, + double dash_off) +{ + cairo_t *cr = im->cr; + 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); + gfx_line_fit(im, &x, &y); + gfx_line_fit(im, &X0, &Y0); + cairo_move_to(cr, X0, Y0); + gfx_line_fit(im, &X1, &Y1); + cairo_line_to(cr, X1, Y1); + if (dash_on > 0 || dash_off > 0) + cairo_set_dash(cr, dashes, 2, x); + cairo_set_source_rgba(cr, color.red, color.green, color.blue, + color.alpha); + cairo_stroke(cr); + cairo_restore(cr); } /* create a new area */ -gfx_node_t *gfx_new_area (gfx_canvas_t *canvas, - double X0, double Y0, - double X1, double Y1, - double X2, double Y2, - gfx_color_t color) { - - gfx_node_t *node; - ArtVpath *vec; - node = gfx_new_node(canvas,GFX_AREA); - if (node == NULL) return NULL; - vec = art_new(ArtVpath, 5); - if (vec == NULL) return NULL; - vec[0].code = ART_MOVETO; vec[0].x=X0; vec[0].y=Y0; - vec[1].code = ART_LINETO; vec[1].x=X1; vec[1].y=Y1; - vec[2].code = ART_LINETO; vec[2].x=X2; vec[2].y=Y2; - vec[3].code = ART_LINETO; vec[3].x=X0; vec[3].y=Y0; - vec[4].code = ART_END; - - node->points = 5; - node->points_max = 5; - node->color = color; - node->path = vec; +void gfx_new_area( + image_desc_t *im, + double X0, + double Y0, + double X1, + double Y1, + double X2, + double Y2, + gfx_color_t color) +{ + cairo_t *cr = im->cr; - return node; + cairo_new_path(cr); + gfx_area_fit(im, &X0, &Y0); + cairo_move_to(cr, X0, Y0); + gfx_area_fit(im, &X1, &Y1); + cairo_line_to(cr, X1, Y1); + gfx_area_fit(im, &X2, &Y2); + cairo_line_to(cr, X2, Y2); + cairo_set_source_rgba(cr, color.red, color.green, color.blue, + color.alpha); } /* add a point to a line or to an area */ -int gfx_add_point (gfx_node_t *node, - double x, double y){ - if (node == NULL) return 1; - if (node->type == GFX_AREA) { - double X0 = node->path[0].x; - double Y0 = node->path[0].y; - node->points -= 2; - art_vpath_add_point (&(node->path), - &(node->points), - &(node->points_max), - ART_LINETO, - x,y); - art_vpath_add_point (&(node->path), - &(node->points), - &(node->points_max), - ART_LINETO, - X0,Y0); - art_vpath_add_point (&(node->path), - &(node->points), - &(node->points_max), - ART_END, - 0,0); - } else if (node->type == GFX_LINE) { - node->points -= 1; - art_vpath_add_point (&(node->path), - &(node->points), - &(node->points_max), - ART_LINETO, - x+LINEOFFSET,y+LINEOFFSET); - art_vpath_add_point (&(node->path), - &(node->points), - &(node->points_max), - ART_END, - 0,0); - - } else { - /* can only add point to areas and lines */ - return 1; - } - return 0; -} - -void gfx_close_path (gfx_node_t *node) { - node->closed_path = 1; - if (node->path[0].code == ART_MOVETO_OPEN) - node->path[0].code = ART_MOVETO; -} - -/* create a text node */ -gfx_node_t *gfx_new_text (gfx_canvas_t *canvas, - double x, double y, gfx_color_t color, - char* font, double size, - double tabwidth, double angle, - enum gfx_h_align_en h_align, - enum gfx_v_align_en v_align, - char* text){ - gfx_node_t *node = gfx_new_node(canvas,GFX_TEXT); - if (angle != 0.0){ - /* currently we only support 0 and 270 */ - angle = 270.0; - } - - node->text = strdup(text); - node->size = size; - node->filename = strdup(font); - node->x = x; - node->y = y; - node->angle = angle; - node->color = color; - node->tabwidth = tabwidth; - node->halign = h_align; - node->valign = v_align; -#if 0 - /* debugging: show text anchor */ - gfx_new_line(canvas, x - 3, y + 0, x, y, 0.2, 0x00FF0000); - gfx_new_line(canvas, x - 0, y + 3, x, y, 0.2, 0x00FF0000); -#endif - return node; -} +void gfx_add_point( + image_desc_t *im, + double x, + double y) +{ + cairo_t *cr = im->cr; -int gfx_render(gfx_canvas_t *canvas, - art_u32 width, art_u32 height, - gfx_color_t background, FILE *fp){ - switch (canvas->imgformat) { - case IF_PNG: - return gfx_render_png (canvas, width, height, background, fp); - case IF_SVG: - return gfx_render_svg (canvas, width, height, background, fp); - case IF_EPS: - return gfx_render_eps (canvas, width, height, background, fp); - default: - return -1; - } + gfx_area_fit(im, &x, &y); + cairo_line_to(cr, x, y); } -double gfx_get_text_width ( gfx_canvas_t *canvas, - double start, char* font, double size, - double tabwidth, char* text){ - switch (canvas->imgformat) { - case IF_PNG: - return gfx_get_text_width_libart (canvas, start, font, size, tabwidth, text); - case IF_SVG: /* fall through */ - case IF_EPS: - return afm_get_text_width(start, font, size, tabwidth, text); - default: - return size * strlen(text); - } -} - -double gfx_get_text_width_libart ( gfx_canvas_t *canvas, - double start, char* font, double size, - double tabwidth, char* text){ - - FT_GlyphSlot slot; - FT_UInt previous=0; - FT_UInt glyph_index=0; - FT_Bool use_kerning; - int error; - FT_Face face; - FT_Library library=NULL; - double text_width=0; - FT_Init_FreeType( &library ); - error = FT_New_Face( library, font, 0, &face ); - if ( error ) return -1; - error = FT_Set_Char_Size(face, size*64,size*64, 100,100); - if ( error ) return -1; - - use_kerning = FT_HAS_KERNING(face); - slot = face->glyph; - for(;*text;text++) { - previous = glyph_index; - glyph_index = FT_Get_Char_Index( face, *text); +/* add a point to a line or to an area */ +void gfx_add_rect_fadey( + image_desc_t *im, + double x1,double y1, + double x2,double y2, + double py, + gfx_color_t color1, + gfx_color_t color2, + double height) +{ + cairo_t *cr = im->cr; - if (use_kerning && previous && glyph_index){ - FT_Vector delta; - FT_Get_Kerning( face, previous, glyph_index, - 0, &delta ); - text_width += (double)delta.x / 64.0; - - } - error = FT_Load_Glyph( face, glyph_index, 0 ); - if ( error ) { - FT_Done_FreeType(library); - return -1; - } - if (! previous) { - text_width -= (double)slot->metrics.horiBearingX / 64.0; /* add just char width */ - } - text_width += (double)slot->metrics.horiAdvance / 64.0; - } - text_width -= (double)slot->metrics.horiAdvance / 64.0; /* remove last step */ - text_width += (double)slot->metrics.width / 64.0; /* add just char width */ - text_width += (double)slot->metrics.horiBearingX / 64.0; /* add just char width */ - FT_Done_FreeType(library); - return text_width; -} - -static void gfx_libart_close_path(gfx_canvas_t *canvas, - gfx_node_t *node, ArtVpath **vec) + cairo_new_path(cr); + gfx_area_fit(im, &x1, &y1); + gfx_area_fit(im, &x2, &y2); + cairo_line_to(cr, x1, y1); + cairo_line_to(cr, x1, y2); + cairo_line_to(cr, x2, y2); + cairo_line_to(cr, x2, y1); + cairo_close_path(cr); + cairo_pattern_t* p; + if (height < 0) { + p = cairo_pattern_create_linear(x1,y1,x2,y1+height); + } else if (height > 0) { + p = cairo_pattern_create_linear(x1,(y2+py)/2+height,x2,(y2+py)/2); + } else { + p = cairo_pattern_create_linear(x1,y1,x2,(y2+py)/2); + } + //cairo_pattern_t* p = cairo_pattern_create_linear(x1,py+50,x2,py); + cairo_pattern_add_color_stop_rgba(p, 1, color1.red,color1.green,color1.blue,color1.alpha); + cairo_pattern_add_color_stop_rgba(p, 0, color2.red,color2.green,color2.blue,color2.alpha); + cairo_set_source(cr, p); + cairo_pattern_destroy(p); + cairo_fill(cr); +} + +void gfx_close_path( + image_desc_t *im) { - /* libart must have end==start for closed paths, - even if using ART_MOVETO and not ART_MOVETO_OPEN - so add extra point which is the same as the starting point */ - int points_max = node->points; /* scaled array has exact size */ - int points = node->points - 1; - art_vpath_add_point (vec, &points, &points_max, ART_LINETO, - (**vec).x, (**vec).y); - art_vpath_add_point (vec, &points, &points_max, ART_END, 0, 0); -} + cairo_t *cr = im->cr; -static void gfx_round_scaled_coordinates(gfx_canvas_t *canvas, - gfx_node_t *node, ArtVpath *vec) -{ - while (vec->code != ART_END) { - vec->x = floor(vec->x - LINEOFFSET + 0.5) + LINEOFFSET; - vec->y = floor(vec->y - LINEOFFSET + 0.5) + LINEOFFSET; - vec++; - } + cairo_close_path(cr); + cairo_fill(cr); } -static int gfx_save_png (art_u8 *buffer, FILE *fp, - long width, long height, long bytes_per_pixel); -/* render grafics into png image */ -int gfx_render_png (gfx_canvas_t *canvas, - art_u32 width, art_u32 height, - gfx_color_t background, FILE *fp){ - - - FT_Library library; - gfx_node_t *node = canvas->firstnode; - art_u8 red = background >> 24, green = (background >> 16) & 0xff; - art_u8 blue = (background >> 8) & 0xff, alpha = ( background & 0xff ); - unsigned long pys_width = width * canvas->zoom; - unsigned long pys_height = height * canvas->zoom; - const int bytes_per_pixel = 3; - unsigned long rowstride = pys_width*bytes_per_pixel; /* bytes per pixel */ - art_u8 *buffer = art_new (art_u8, rowstride*pys_height); - art_rgb_run_alpha (buffer, red, green, blue, alpha, pys_width*pys_height); - FT_Init_FreeType( &library ); - while(node){ - switch (node->type) { - case GFX_LINE: - case GFX_AREA: { - ArtVpath *vec; - double dst[6]; - ArtSVP *svp; - art_affine_scale(dst,canvas->zoom,canvas->zoom); - vec = art_vpath_affine_transform(node->path,dst); - if (node->closed_path) - gfx_libart_close_path(canvas, node, &vec); - gfx_round_scaled_coordinates(canvas, node, vec); - if(node->type == GFX_LINE){ - svp = art_svp_vpath_stroke ( vec, ART_PATH_STROKE_JOIN_ROUND, - ART_PATH_STROKE_CAP_ROUND, - node->size*canvas->zoom,1,1); - } else { - svp = art_svp_from_vpath ( vec ); - } - art_free(vec); - art_rgb_svp_alpha (svp ,0,0, pys_width, pys_height, - node->color, buffer, rowstride, NULL); - art_free(svp); - break; - } - case GFX_TEXT: { - int error; - float text_width=0.0, text_height = 0.0; - unsigned char *text; - art_u8 fcolor[3],falpha; - FT_Face face; - FT_GlyphSlot slot; - FT_UInt previous=0; - FT_UInt glyph_index=0; - FT_Bool use_kerning; - - float pen_x = 0.0 , pen_y = 0.0; - /* double x,y; */ - long ix,iy,iz; - - fcolor[0] = node->color >> 24; - fcolor[1] = (node->color >> 16) & 0xff; - fcolor[2] = (node->color >> 8) & 0xff; - falpha = node->color & 0xff; - error = FT_New_Face( library, - (char *)node->filename, - 0, - &face ); - if ( error ) break; - use_kerning = FT_HAS_KERNING(face); +/* create a text node */ +static PangoLayout *gfx_prep_text( + image_desc_t *im, + double x, + gfx_color_t color, + PangoFontDescription *font_desc, + double tabwidth, + const char *text) +{ + PangoLayout *layout = im->layout; + const PangoFontDescription *pfd; + cairo_t *cr = im->cr; - error = FT_Set_Char_Size(face, /* handle to face object */ - (long)(node->size*64), - (long)(node->size*64), - (long)(100*canvas->zoom), - (long)(100*canvas->zoom)); - if ( error ) break; - pen_x = node->x * canvas->zoom; - pen_y = node->y * canvas->zoom; - slot = face->glyph; + static double last_tabwidth = -1; - for(text=(unsigned char *)node->text;*text;text++) { - previous = glyph_index; - glyph_index = FT_Get_Char_Index( face, *text); - - if (use_kerning && previous && glyph_index){ - FT_Vector delta; - FT_Get_Kerning( face, previous, glyph_index, - 0, &delta ); - text_width += (double)delta.x / 64.0; - - } - error = FT_Load_Glyph( face, glyph_index, 0 ); - if ( error ) break; - if (previous == 0){ - pen_x -= (double)slot->metrics.horiBearingX / 64.0; /* adjust pos for first char */ - text_width -= (double)slot->metrics.horiBearingX / 64.0; /* add just char width */ - } - if ( text_height < (double)slot->metrics.horiBearingY / 64.0 ) { - text_height = (double)slot->metrics.horiBearingY / 64.0; - } - text_width += (double)slot->metrics.horiAdvance / 64.0; - } - text_width -= (double)slot->metrics.horiAdvance / 64.0; /* remove last step */ - text_width += (double)slot->metrics.width / 64.0; /* add just char width */ - text_width += (double)slot->metrics.horiBearingX / 64.0; /* add just char width */ - - switch(node->halign){ - case GFX_H_RIGHT: pen_x -= text_width; break; - case GFX_H_CENTER: pen_x -= text_width / 2.0; break; - case GFX_H_LEFT: break; - case GFX_H_NULL: break; - } - switch(node->valign){ - case GFX_V_TOP: pen_y += text_height; break; - case GFX_V_CENTER: pen_y += text_height / 2.0; break; - case GFX_V_BOTTOM: break; - case GFX_V_NULL: break; - } - glyph_index=0; - for(text=(unsigned char *)node->text;*text;text++) { - int gr; - previous = glyph_index; - glyph_index = FT_Get_Char_Index( face, *text); - - if (use_kerning && previous && glyph_index){ - FT_Vector delta; - FT_Get_Kerning( face, previous, glyph_index, - 0, &delta ); - pen_x += (double)delta.x / 64.0; - - } - error = FT_Load_Glyph( face, glyph_index, FT_LOAD_RENDER ); - if ( error ) break; - gr = slot->bitmap.num_grays -1; - for (iy=0; iy < slot->bitmap.rows; iy++){ - long buf_y = iy+(pen_y+0.5)-slot->bitmap_top; - if (buf_y < 0 || buf_y >= pys_height) continue; - buf_y *= rowstride; - for (ix=0;ix < slot->bitmap.width;ix++){ - long buf_x = ix + (pen_x + 0.5) + (double)slot->bitmap_left ; - art_u8 font_alpha; - - if (buf_x < 0 || buf_x >= pys_width) continue; - buf_x *= bytes_per_pixel ; - font_alpha = *(slot->bitmap.buffer + iy * slot->bitmap.width + ix); - font_alpha = (art_u8)((double)font_alpha / gr * falpha); - for (iz = 0; iz < 3; iz++){ - art_u8 *orig = buffer + buf_y + buf_x + iz; - *orig = (art_u8)((double)*orig / gr * ( gr - font_alpha) + - (double)fcolor[iz] / gr * (font_alpha)); - } - } - } - pen_x += (double)slot->metrics.horiAdvance / 64.0; - } - } + /* for performance reasons we might + want todo that only once ... tabs will always + be the same */ + 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; + + 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); } - node = node->next; - } - gfx_save_png(buffer,fp , pys_width,pys_height,bytes_per_pixel); - art_free(buffer); - FT_Done_FreeType( library ); - return 0; -} - -/* free memory used by nodes this will also remove memory required for - associated paths and svcs ... but not for text strings */ -int -gfx_destroy (gfx_canvas_t *canvas){ - gfx_node_t *next,*node = canvas->firstnode; - while(node){ - next = node->next; - art_free(node->path); - art_free(node->svp); - free(node->text); - free(node->filename); - art_free(node); - node = next; - } - return 0; -} - -static int gfx_save_png (art_u8 *buffer, FILE *fp, long width, long height, long bytes_per_pixel){ - png_structp png_ptr = NULL; - png_infop info_ptr = NULL; - int i; - png_bytep *row_pointers; - int rowstride = width * bytes_per_pixel; - png_text text[2]; - - if (fp == NULL) - return (1); - - png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING,NULL,NULL,NULL); - if (png_ptr == NULL) - { - return (1); - } - row_pointers = (png_bytepp)png_malloc(png_ptr, - height*sizeof(png_bytep)); - - info_ptr = png_create_info_struct(png_ptr); - - if (info_ptr == NULL) - { - png_destroy_write_struct(&png_ptr, (png_infopp)NULL); - return (1); - } - - if (setjmp(png_jmpbuf(png_ptr))) - { - /* If we get here, we had a problem writing the file */ - png_destroy_write_struct(&png_ptr, &info_ptr); - return (1); + pango_layout_set_tabs(layout, tab_array); + pango_tab_array_free(tab_array); } + pfd = pango_layout_get_font_description(layout); - png_init_io(png_ptr, fp); - png_set_IHDR (png_ptr, info_ptr,width, height, - 8, PNG_COLOR_TYPE_RGB, - PNG_INTERLACE_NONE, - PNG_COMPRESSION_TYPE_DEFAULT, - PNG_FILTER_TYPE_DEFAULT); - - text[0].key = "Software"; - text[0].text = "RRDtool, Tobias Oetiker , http://tobi.oetiker.ch"; - text[0].compression = PNG_TEXT_COMPRESSION_NONE; - png_set_text (png_ptr, info_ptr, text, 1); - - /* Write header data */ - png_write_info (png_ptr, info_ptr); - - for (i = 0; i < height; i++) - row_pointers[i] = (png_bytep) (buffer + i*rowstride); - - png_write_image(png_ptr, row_pointers); - png_write_end(png_ptr, info_ptr); - png_destroy_write_struct(&png_ptr, &info_ptr); - return 1; -} + if (!pfd || !pango_font_description_equal (pfd,font_desc)){ + pango_layout_set_font_description(layout, font_desc); + } +// fprintf(stderr,"%s\n",pango_font_description_to_string(pango_layout_get_font_description(layout))); - -/* ------- SVG ------- - SVG reference: - http://www.w3.org/TR/SVG/ -*/ -static int svg_indent = 0; -static int svg_single_line = 0; -static const char *svg_default_font = "Helvetica"; + cairo_new_path(cr); + cairo_set_source_rgba(cr, color.red, color.green, color.blue, + color.alpha); +/* layout = pango_cairo_create_layout(cr); */ -static void svg_print_indent(FILE *fp) -{ - int i; - for (i = svg_indent - svg_single_line; i > 0; i--) { - putc(' ', fp); - putc(' ', fp); - } -} - -static void svg_start_tag(FILE *fp, const char *name) -{ - svg_print_indent(fp); - putc('<', fp); - fputs(name, fp); - svg_indent++; -} - -static void svg_close_tag_single_line(FILE *fp) -{ - svg_single_line++; - putc('>', fp); -} - -static void svg_close_tag(FILE *fp) -{ - putc('>', fp); - if (!svg_single_line) - putc('\n', fp); -} - -static void svg_end_tag(FILE *fp, const char *name) -{ - /* name is NULL if closing empty-node tag */ - svg_indent--; - if (svg_single_line) - svg_single_line--; - else if (name) - svg_print_indent(fp); - if (name != NULL) { - fputs("': fputs(">", fp); break; - case '"': fputs(""", fp); break; - default: - if (ch >= 127) - fprintf(fp, "&#%d;", ch); - else - putc(ch, fp); - } - } -} - -static void svg_write_number(FILE *fp, double d) -{ - /* omit decimals if integer to reduce filesize */ - char buf[60], *p; - snprintf(buf, sizeof(buf), "%.2f", d); - p = buf; /* doesn't trust snprintf return value */ - while (*p) - p++; - while (--p > buf) { - char ch = *p; - if (ch == '0') { - *p = '\0'; /* zap trailing zeros */ - continue; - } - if (ch == '.') - *p = '\0'; /* zap trailing dot */ - break; - } - fputs(buf, fp); -} - -static int svg_color_is_black(int c) -{ - /* gfx_color_t is RRGGBBAA */ - return c == 0x000000FF; -} - -static void svg_write_color(FILE *fp, gfx_color_t c, const char *attr) -{ - /* gfx_color_t is RRGGBBAA, svg can use #RRGGBB and #RGB like html */ - gfx_color_t rrggbb = (int)((c >> 8) & 0xFFFFFF); - gfx_color_t opacity = c & 0xFF; - fprintf(fp, " %s=\"", attr); - if ((rrggbb & 0x0F0F0F) == ((rrggbb >> 4) & 0x0F0F0F)) { - /* css2 short form, #rgb is #rrggbb, not #r0g0b0 */ - fprintf(fp, "#%03lX", - ( ((rrggbb >> 8) & 0xF00) - | ((rrggbb >> 4) & 0x0F0) - | ( rrggbb & 0x00F))); - } else { - fprintf(fp, "#%06lX", rrggbb); - } - fputs("\"", fp); - if (opacity != 0xFF) { - fprintf(fp, " stroke-opacity=\""); - svg_write_number(fp, opacity / 255.0); - fputs("\"", fp); - } -} - -static void svg_common_path_attributes(FILE *fp, gfx_node_t *node) -{ - fputs(" stroke-width=\"", fp); - svg_write_number(fp, node->size); - fputs("\"", fp); - svg_write_color(fp, node->color, "stroke"); - fputs(" fill=\"none\"", fp); - if (node->dash_on > 0 && node->dash_off > 0) { - fputs(" stroke-dasharray=\"", fp); - svg_write_number(fp, node->dash_on); - fputs(",", fp); - svg_write_number(fp, node->dash_off); - fputs("\"", fp); - } -} +// pango_cairo_context_set_font_options(pango_context, im->font_options); +// pango_cairo_context_set_resolution(pango_context, 100); -static int svg_is_int_step(double a, double b) -{ - double diff = fabs(a - b); - return floor(diff) == diff; -} - -static int svg_path_straight_segment(FILE *fp, - double lastA, double currentA, double currentB, - gfx_node_t *node, - int segment_idx, int isx, char absChar, char relChar) -{ - if (!svg_is_int_step(lastA, currentA)) { - putc(absChar, fp); - svg_write_number(fp, currentA); - return 0; - } - if (segment_idx < node->points - 1) { - ArtVpath *vec = node->path + segment_idx + 1; - if (vec->code == ART_LINETO) { - double nextA = (isx ? vec->x : vec->y) - LINEOFFSET; - double nextB = (isx ? vec->y : vec->x) - LINEOFFSET; - if (nextB == currentB - && ((currentA >= lastA) == (nextA >= currentA)) - && svg_is_int_step(currentA, nextA)) { - return 1; /* skip to next as it is a straight line */ - } - } - } - putc(relChar, fp); - svg_write_number(fp, currentA - lastA); - return 0; -} - -static void svg_path(FILE *fp, gfx_node_t *node, int multi) -{ - int i; - double lastX = 0, lastY = 0; - /* for straight lines tags take less space than - tags because of the efficient packing - in the 'd' attribute */ - svg_start_tag(fp, "path"); - if (!multi) - svg_common_path_attributes(fp, node); - fputs(" d=\"", fp); - /* specification of the 'd' attribute: */ - /* http://www.w3.org/TR/SVG/paths.html#PathDataGeneralInformation */ - for (i = 0; i < node->points; i++) { - ArtVpath *vec = node->path + i; - double x = vec->x - LINEOFFSET; - double y = vec->y - LINEOFFSET; - switch (vec->code) { - case ART_MOVETO_OPEN: /* fall-through */ - case ART_MOVETO: - putc('M', fp); - svg_write_number(fp, x); - putc(',', fp); - svg_write_number(fp, y); - break; - case ART_LINETO: - /* try optimize filesize by using minimal lineto commands */ - /* without introducing rounding errors. */ - if (x == lastX) { - if (svg_path_straight_segment(fp, lastY, y, x, node, i, 0, 'V', 'v')) - continue; - } else if (y == lastY) { - if (svg_path_straight_segment(fp, lastX, x, y, node, i, 1, 'H', 'h')) - continue; - } else { - putc('L', fp); - svg_write_number(fp, x); - putc(',', fp); - svg_write_number(fp, y); - } - break; - case ART_CURVETO: break; /* unsupported */ - case ART_END: break; /* nop */ - } - lastX = x; - lastY = y; - } - if (node->closed_path) - fputs(" Z", fp); - fputs("\"", fp); - svg_close_tag_empty_node(fp); -} - -static void svg_multi_path(FILE *fp, gfx_node_t **nodeR) -{ - /* optimize for multiple paths with the same color, penwidth, etc. */ - int num = 1; - gfx_node_t *node = *nodeR; - gfx_node_t *next = node->next; - while (next) { - if (next->type != node->type - || next->size != node->size - || next->color != node->color - || next->dash_on != node->dash_on - || next->dash_off != node->dash_off) - break; - next = next->next; - num++; - } - if (num == 1) { - svg_path(fp, node, 0); - return; - } - svg_start_tag(fp, "g"); - svg_common_path_attributes(fp, node); - svg_close_tag(fp); - while (num && node) { - svg_path(fp, node, 1); - if (!--num) - break; - node = node->next; - *nodeR = node; - } - svg_end_tag(fp, "g"); -} - -static void svg_area(FILE *fp, gfx_node_t *node) -{ - int i; - double startX = 0, startY = 0; - svg_start_tag(fp, "polygon"); - fputs(" ", fp); - svg_write_color(fp, node->color, "fill"); - fputs(" points=\"", fp); - for (i = 0; i < node->points; i++) { - ArtVpath *vec = node->path + i; - double x = vec->x - LINEOFFSET; - double y = vec->y - LINEOFFSET; - switch (vec->code) { - case ART_MOVETO_OPEN: /* fall-through */ - case ART_MOVETO: - svg_write_number(fp, x); - putc(',', fp); - svg_write_number(fp, y); - startX = x; - startY = y; - break; - case ART_LINETO: - if (i == node->points - 2 - && node->path[i + 1].code == ART_END - && fabs(x - startX) < 0.001 && fabs(y - startY) < 0.001) { - break; /* poly area always closed, no need for last point */ - } - putc(' ', fp); - svg_write_number(fp, x); - putc(',', fp); - svg_write_number(fp, y); - break; - case ART_CURVETO: break; /* unsupported */ - case ART_END: break; /* nop */ - } - } - fputs("\"", fp); - svg_close_tag_empty_node(fp); -} - -static void svg_text(FILE *fp, gfx_node_t *node) -{ - double x = node->x - LINEOFFSET; - double y = node->y - LINEOFFSET; - if (node->angle != 0) { - svg_start_tag(fp, "g"); - fputs(" transform=\"translate(", fp); - svg_write_number(fp, x); - fputs(",", fp); - svg_write_number(fp, y); - fputs(") rotate(", fp); - svg_write_number(fp, node->angle); - fputs(")\"", fp); - x = y = 0; - svg_close_tag(fp); - } - switch (node->valign) { - case GFX_V_TOP: y += node->size; break; - case GFX_V_CENTER: y += node->size / 2; break; - case GFX_V_BOTTOM: break; - case GFX_V_NULL: break; - } - svg_start_tag(fp, "text"); - fputs(" x=\"", fp); - svg_write_number(fp, x); - fputs("\" y=\"", fp); - svg_write_number(fp, y); - if (strcmp(node->filename, svg_default_font)) - fprintf(fp, " font-family=\"%s\"", node->filename); - fputs("\" font-size=\"", fp); - svg_write_number(fp, node->size); - fputs("\"", fp); - if (!svg_color_is_black(node->color)) - svg_write_color(fp, node->color, "fill"); - switch (node->halign) { - case GFX_H_RIGHT: fputs(" text-anchor=\"end\"", fp); break; - case GFX_H_CENTER: fputs(" text-anchor=\"middle\"", fp); break; - case GFX_H_LEFT: break; - case GFX_H_NULL: break; - } - svg_close_tag_single_line(fp); - /* support for node->tabwidth missing */ - svg_write_text(fp, node->text); - svg_end_tag(fp, "text"); - if (node->angle != 0) - svg_end_tag(fp, "g"); -} - -int gfx_render_svg (gfx_canvas_t *canvas, - art_u32 width, art_u32 height, - gfx_color_t background, FILE *fp){ - gfx_node_t *node = canvas->firstnode; - fputs( -"\n" -"\n" -"\n", fp); - svg_start_tag(fp, "svg"); - fputs(" width=\"", fp); - svg_write_number(fp, width * canvas->zoom); - fputs("\" height=\"", fp); - svg_write_number(fp, height * canvas->zoom); - fputs("\" x=\"0\" y=\"0\" viewBox=\"", fp); - svg_write_number(fp, -LINEOFFSET); - fputs(" ", fp); - svg_write_number(fp, -LINEOFFSET); - fputs(" ", fp); - svg_write_number(fp, width - LINEOFFSET); - fputs(" ", fp); - svg_write_number(fp, height - LINEOFFSET); - fputs("\" preserveAspectRatio=\"xMidYMid\"", fp); - fprintf(fp, " font-family=\"%s\"", svg_default_font); /* default font */ - fputs(" stroke-linecap=\"round\" stroke-linejoin=\"round\"", fp); - svg_close_tag(fp); - svg_start_tag(fp, "rect"); - fprintf(fp, " x=\"0\" y=\"0\" width=\"%d\" height=\"%d\"", width, height); - svg_write_color(fp, background, "fill"); - svg_close_tag_empty_node(fp); - while (node) { - switch (node->type) { - case GFX_LINE: - svg_multi_path(fp, &node); - break; - case GFX_AREA: - svg_area(fp, node); - break; - case GFX_TEXT: - svg_text(fp, node); - } - node = node->next; - } - svg_end_tag(fp, "svg"); - return 0; -} +/* pango_cairo_update_context(cr, pango_context); */ -/* ------- EPS ------- - EPS and Postscript references: - http://partners.adobe.com/asn/developer/technotes/postscript.html -*/ -typedef struct eps_font -{ - const char *ps_font; - int id; - struct eps_font *next; -} eps_font; + /* pango expects the string to be utf-8 encoded */ + utf8_text = g_locale_to_utf8((const gchar *) text, -1, NULL, NULL, NULL); -typedef struct eps_state -{ - FILE *fp; - gfx_canvas_t *canvas; - art_u32 page_width, page_height; - eps_font *font_list; - /*--*/ - gfx_color_t color; - const char *font; - double font_size; - double line_width; - int linecap, linejoin; -} eps_state; + /* 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); -static void eps_set_color(eps_state *state, gfx_color_t color) -{ - /* gfx_color_t is RRGGBBAA */ - if (state->color == color) - return; - fprintf(state->fp, "%d %d %d Rgb\n", - (int)((color >> 24) & 255), - (int)((color >> 16) & 255), - (int)((color >> 8) & 255)); - state->color = color; + g_free(utf8_text); + return layout; } -static int eps_add_font(eps_state *state, gfx_node_t *node) +/* Size Text Node */ +double gfx_get_text_width( + image_desc_t *im, + double start, + PangoFontDescription *font_desc, + double tabwidth, + char *text) { - /* The fonts list could be postponed to the end using - (atend), but let's be nice and have them in the header. */ - const char *ps_font = afm_get_font_postscript_name(node->filename); - eps_font *ef; - for (ef = state->font_list; ef; ef = ef->next) { - if (!strcmp(ps_font, ef->ps_font)) - return 0; - } - ef = malloc(sizeof(eps_font)); - if (ef == NULL) { - rrd_set_error("malloc for eps_font"); - return -1; - } - ef->next = state->font_list; - ef->ps_font = ps_font; - state->font_list = ef; - return 0; -} - -static void eps_list_fonts(eps_state *state, const char *dscName) + PangoLayout *layout; + PangoRectangle log_rect; + gfx_color_t color = { 0, 0, 0, 0 }; + layout = gfx_prep_text(im, start, color, font_desc, tabwidth, text); + pango_layout_get_pixel_extents(layout, NULL, &log_rect); +/* g_object_unref(layout); */ + return log_rect.width; +} + +void gfx_text( + image_desc_t *im, + double x, + double y, + gfx_color_t color, + PangoFontDescription *font_desc, + double tabwidth, + double angle, + enum gfx_h_align_en h_align, + enum gfx_v_align_en v_align, + const char *text) { - eps_font *ef; - int lineLen = strlen(dscName); - if (!state->font_list) - return; - fputs(dscName, state->fp); - for (ef = state->font_list; ef; ef = ef->next) { - int nameLen = strlen(ef->ps_font); - if (lineLen + nameLen > 100 && lineLen) { - fputs("\n", state->fp); - fputs("%%- \n", state->fp); - lineLen = 5; - } else { - fputs(" ", state->fp); - lineLen++; + PangoLayout *layout; + PangoRectangle log_rect; + cairo_t *cr = im->cr; + double sx = 0; + double sy = 0; + + cairo_save(cr); + cairo_translate(cr, x, y); +/* 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_desc, tabwidth, text); + pango_layout_get_pixel_extents(layout, NULL, &log_rect); + cairo_rotate(cr, -angle * G_PI / 180.0); + sx = log_rect.x; + switch (h_align) { + case GFX_H_RIGHT: + sx -= log_rect.width; + break; + case GFX_H_CENTER: + sx -= log_rect.width / 2; + break; + case GFX_H_LEFT: + break; + case GFX_H_NULL: + break; } - fputs(ef->ps_font, state->fp); - lineLen += nameLen; - } - fputs("\n", state->fp); -} + sy = log_rect.y; + switch (v_align) { + case GFX_V_TOP: + break; + case GFX_V_CENTER: + sy -= log_rect.height / 2; + break; + case GFX_V_BOTTOM: + sy -= log_rect.height; + break; + case GFX_V_NULL: + break; + } + pango_cairo_update_layout(cr, layout); + cairo_move_to(cr, sx, sy); + pango_cairo_show_layout(cr, layout); +/* g_object_unref(layout); */ + cairo_restore(cr); -static void eps_define_fonts(eps_state *state) -{ - eps_font *ef; - if (!state->font_list) - return; - for (ef = state->font_list; ef; ef = ef->next) { - /* PostScript¨ LANGUAGE REFERENCE third edition - page 349 */ - fprintf(state->fp, - "%%\n" - "/%s findfont dup length dict begin\n" - "{ 1 index /FID ne {def} {pop pop} ifelse } forall\n" - "/Encoding ISOLatin1Encoding def\n" - "currentdict end\n" - "/%s-ISOLatin1 exch definefont pop\n" - "/SetFont-%s { /%s-ISOLatin1 findfont exch scalefont setfont } bd\n", - ef->ps_font, ef->ps_font, ef->ps_font, ef->ps_font); - } } -static int eps_prologue(eps_state *state) +/* convert color */ +struct gfx_color_t gfx_hex_to_col( + long unsigned int color) { - gfx_node_t *node; - fputs( - "%!PS-Adobe-3.0 EPSF-3.0\n" - "%%Creator: RRDtool 1.1.x, Tobias Oetiker, http://tobi.oetiker.ch\n" - /* can't like weird chars here */ - "%%Title: (RRDTool output)\n" - "%%DocumentData: Clean7Bit\n" - "", state->fp); - fprintf(state->fp, "%%%%BoundingBox: 0 0 %d %d\n", - state->page_width, state->page_height); - for (node = state->canvas->firstnode; node; node = node->next) { - if (node->type == GFX_TEXT && eps_add_font(state, node) == -1) - return -1; - } - eps_list_fonts(state, "%%DocumentFonts:"); - eps_list_fonts(state, "%%DocumentNeededFonts:"); - fputs( - "%%EndComments\n" - "%%BeginProlog\n" - "%%EndProlog\n" /* must have, or BoundingBox is ignored */ - "/bd { bind def } bind def\n" - "", state->fp); - fprintf(state->fp, "/X { %.2f add } bd\n", LINEOFFSET); - fputs( - "/X2 {X exch X exch} bd\n" - "/M {X2 moveto} bd\n" - "/L {X2 lineto} bd\n" - "/m {moveto} bd\n" - "/l {lineto} bd\n" - "/S {stroke} bd\n" - "/CP {closepath} bd\n" - "/WS {setlinewidth stroke} bd\n" - "/F {fill} bd\n" - "/TaL { } bd\n" - "/TaC {dup stringwidth pop neg 2 div 0 rmoveto } bd\n" - "/TaR {dup stringwidth pop neg 0 rmoveto } bd\n" - "/TL {moveto TaL show} bd\n" - "/TC {moveto TaC show} bd\n" - "/TR {moveto TaR show} bd\n" - "/Rgb { 255.0 div 3 1 roll\n" - " 255.0 div 3 1 roll \n" - " 255.0 div 3 1 roll setrgbcolor } bd\n" - "", state->fp); - eps_define_fonts(state); - return 0; -} + struct gfx_color_t gfx_color; -static void eps_write_linearea(eps_state *state, gfx_node_t *node) -{ - int i; - FILE *fp = state->fp; - int useOffset = 0; - eps_set_color(state, node->color); - if (node->type == GFX_LINE) { - if (state->linecap != 1) { - fputs("1 setlinecap\n", fp); - state->linecap = 1; - } - if (state->linejoin != 1) { - fputs("1 setlinejoin\n", fp); - state->linejoin = 1; - } - } - for (i = 0; i < node->points; i++) { - ArtVpath *vec = node->path + i; - double x = vec->x; - double y = state->page_height - vec->y; - if (vec->code == ART_MOVETO_OPEN || vec->code == ART_MOVETO) - useOffset = (fabs(x - floor(x) - 0.5) < 0.01 && fabs(y - floor(y) - 0.5) < 0.01); - if (useOffset) { - x -= LINEOFFSET; - y -= LINEOFFSET; - } - switch (vec->code) { - case ART_MOVETO_OPEN: /* fall-through */ - case ART_MOVETO: - svg_write_number(fp, x); - fputc(' ', fp); - svg_write_number(fp, y); - fputc(' ', fp); - fputs(useOffset ? "M\n" : "m\n", fp); - break; - case ART_LINETO: - svg_write_number(fp, x); - fputc(' ', fp); - svg_write_number(fp, y); - fputc(' ', fp); - fputs(useOffset ? "L\n" : "l\n", fp); - break; - case ART_CURVETO: break; /* unsupported */ - case ART_END: break; /* nop */ - } - } - if (node->type == GFX_LINE) { - if (node->closed_path) - fputs("CP ", fp); - if (node->size != state->line_width) { - state->line_width = node->size; - svg_write_number(fp, state->line_width); - fputs(" WS\n", fp); - } else { - fputs("S\n", fp); - } - } else { - fputs("F\n", fp); - } + gfx_color.red = 1.0 / 255.0 * ((color & 0xff000000) >> (3 * 8)); + gfx_color.green = 1.0 / 255.0 * ((color & 0x00ff0000) >> (2 * 8)); + gfx_color.blue = 1.0 / 255.0 * ((color & 0x0000ff00) >> (1 * 8)); + gfx_color.alpha = 1.0 / 255.0 * (color & 0x000000ff); + return gfx_color; } -static void eps_write_text(eps_state *state, gfx_node_t *node) -{ - FILE *fp = state->fp; - const unsigned char *p; - const char *ps_font = afm_get_font_postscript_name(node->filename); - char align = 'L'; - double x = node->x; - double y = state->page_height - node->y, ydelta = 0; - int lineLen = 0; - eps_set_color(state, node->color); - if (strcmp(ps_font, state->font) || node->size != state->font_size) { - state->font = ps_font; - state->font_size = node->size; - svg_write_number(fp, state->font_size); - fprintf(fp, " SetFont-%s\n", state->font); - } - fputs("(", fp); - lineLen = 20; - for (p = (const unsigned char*)node->text; *p; p++) { - if (lineLen > 70) { - fputs("\\\n", fp); /* backslash and \n */ - lineLen = 0; - } - switch (*p) { - case '(': - case ')': - case '\\': - case '\n': - case '\r': - case '\t': - fputc('\\', fp); - lineLen++; - /* fall-through */ - default: - if (*p >= 126) - fprintf(fp, "\\%03o", *p); - else - fputc(*p, fp); - lineLen++; - } - } - fputs(") ", fp); - switch(node->valign){ - case GFX_V_TOP: ydelta = -node->size; break; - case GFX_V_CENTER: ydelta = -node->size / 3.0; break; - case GFX_V_BOTTOM: break; - case GFX_V_NULL: break; - } - if (node->angle == 0) - y += ydelta; - switch (node->halign) { - case GFX_H_RIGHT: align = 'R'; break; - case GFX_H_CENTER: align = 'C'; break; - case GFX_H_LEFT: align= 'L'; break; - case GFX_H_NULL: align= 'L'; break; - } - if (node->angle != 0) { - fputs("\n", fp); - fputs(" gsave ", fp); - svg_write_number(fp, x); - fputc(' ', fp); - svg_write_number(fp, y); - fputs(" translate ", fp); - svg_write_number(fp, -node->angle); - fputs(" rotate 0 ", fp); - svg_write_number(fp, ydelta); - fputs(" moveto ", fp); - fprintf(fp, "Ta%c", align); - fputs(" show grestore\n", fp); - } else { - svg_write_number(fp, x); - fputc(' ', fp); - svg_write_number(fp, y); - fputs(" T", fp); - fputc(align, fp); - fputc('\n', fp); - } -} +/* gridfit_lines */ -static int eps_write_content(eps_state *state) +void gfx_line_fit( + image_desc_t *im, + double *x, + double *y) { - gfx_node_t *node; - fputs("%\n", state->fp); - for (node = state->canvas->firstnode; node; node = node->next) { - switch (node->type) { - case GFX_LINE: - case GFX_AREA: - eps_write_linearea(state, node); - break; - case GFX_TEXT: - eps_write_text(state, node); - break; - } - } - return 0; -} - -int gfx_render_eps (gfx_canvas_t *canvas, - art_u32 width, art_u32 height, - gfx_color_t background, FILE *fp){ - struct eps_state state; - state.fp = fp; - state.canvas = canvas; - state.page_width = width; - state.page_height = height; - state.font = "no-default-font"; - state.font_size = -1; - state.color = 0; /* black */ - state.font_list = NULL; - state.linecap = -1; - state.linejoin = -1; - if (eps_prologue(&state) == -1) - return -1; - eps_set_color(&state, background); - fprintf(fp, "0 0 M 0 %d L %d %d L %d 0 L fill\n", - height, width, height, width); - if (eps_write_content(&state) == -1) - return 0; - fputs("showpage\n", fp); - fputs("%%EOF\n", fp); - while (state.font_list) { - eps_font *next = state.font_list->next; - free(state.font_list); - state.font_list = next; - } - return 0; + cairo_t *cr = im->cr; + double line_width; + double line_height; + + if (!im->gridfit) + return; + cairo_user_to_device(cr, x, y); + line_width = cairo_get_line_width(cr); + line_height = line_width; + cairo_user_to_device_distance(cr, &line_width, &line_height); + line_width = line_width / 2.0 - ceil(line_width / 2.0); + line_height = line_height / 2.0 - ceil(line_height / 2.0); + *x = floor(*x - 0.5) - line_width; + *y = ceil(*y + 0.5) + line_height; + cairo_device_to_user(cr, x, y); +} + +/* gridfit_areas */ + +void gfx_area_fit( + image_desc_t *im, + double *x, + double *y) +{ + cairo_t *cr = im->cr; + + if (!im->gridfit) + return; + cairo_user_to_device(cr, x, y); + *x = floor(*x); + *y = ceil(*y); + cairo_device_to_user(cr, x, y); }