/****************************************************************************
- * RRDtool 1.2.4 Copyright by Tobi Oetiker, 1997-2005
+ * RRDtool 1.2.9 Copyright by Tobi Oetiker, 1997-2005
****************************************************************************
* rrd_gfx.c graphics wrapper for rrdtool
**************************************************************************/
/* #define DEBUG */
#ifdef DEBUG
-# define DPRINT(x) (void)(printf x, printf("\n"))
+# define DPRINTF(x,...) fprintf(stderr, x, ## __VA_ARGS__);
#else
-# define DPRINT(x)
+# define DPRINTF(x,...)
#endif
#include "rrd_tool.h"
#include <png.h>
#include "rrd_gfx.h"
#include "rrd_afm.h"
+#include "unused.h"
/* lines are better drawn on the pixle than between pixles */
#define LINEOFFSET 0.5
struct gfx_string_s {
unsigned int width;
unsigned int height;
- size_t count; /* number of characters */
+ int count; /* number of characters */
gfx_char glyphs;
size_t num_glyphs;
FT_BBox bbox;
}
double gfx_get_text_width_libart (
- gfx_canvas_t *canvas, double start, char* font, double size,
+ gfx_canvas_t *canvas, double UNUSED(start), char* font, double size,
double tabwidth, char* text, int rotation ){
int error;
FT_UInt previous;
FT_Vector ft_pen;
- gfx_string string;
+ gfx_string string = (gfx_string) malloc (sizeof(struct gfx_string_s));
+
gfx_char glyph; /* current glyph in table */
- unsigned int n;
+ int n;
int error;
int gottab = 0;
+
+#ifdef HAVE_MBSTOWCS
+ wchar_t *cstr;
+ size_t clen = strlen(text)+1;
+ cstr = malloc(sizeof(wchar_t) * clen); /* yes we are allocating probably too much here, I know */
+ string->count=mbstowcs(cstr,text,clen);
+ if ( string->count == -1){
+ string->count=mbstowcs(cstr,"Enc-Err",6);
+ }
+#else
+ char *cstr = strdup(text);
+ string->count = strlen (text);
+#endif
+
ft_pen.x = 0; /* start at (0,0) !! */
ft_pen.y = 0;
- string = (gfx_string) malloc (sizeof(struct gfx_string_s));
+
string->width = 0;
string->height = 0;
- string->count = strlen (text);
string->glyphs = (gfx_char) calloc (string->count,sizeof(struct gfx_char_s));
string->num_glyphs = 0;
string->transform.xx = (FT_Fixed)( cos(M_PI*(rotation)/180.0)*0x10000);
use_kerning = FT_HAS_KERNING(face);
previous = 0;
glyph = string->glyphs;
- for (n=0; n<string->count;glyph++) {
+ for (n=0; n<string->count;glyph++,n++) {
FT_Vector vec;
/* handle the tabs ...
have a witespace glyph inserted, but set its width such that the distance
of the new right edge is x times tabwidth from 0,0 where x is an integer. */
- unsigned char letter = text[n];
+ unsigned int letter = cstr[n];
gottab = 0;
- if (letter == '\\' && n+1 < string->count && text[n+1] == 't'){
+ if (letter == '\\' && n+1 < string->count && cstr[n+1] == 't'){
/* we have a tab here so skip the backslash and
set t to ' ' so that we get a white space */
gottab = 1;
glyph->pos.x = 0;
glyph->pos.y = 0;
glyph->image = NULL;
-
glyph->index = FT_Get_Char_Index( face, letter );
/* compute glyph origin */
canvas->aa_type == AA_LIGHT ? FT_LOAD_TARGET_LIGHT :
FT_LOAD_TARGET_MONO : FT_LOAD_TARGET_MONO);
if (error) {
- fprintf (stderr, "couldn't load glyph: %c\n", letter);
+ DPRINTF("couldn't load glyph: %c\n", letter)
continue;
}
error = FT_Get_Glyph (slot, &glyph->image);
if (error) {
- fprintf (stderr, "couldn't get glyph from slot: %c\n", letter);
+ DPRINTF("couldn't get glyph %c from slot %d\n", letter, (int)slot)
continue;
}
/* if we are in tabbing mode, we replace the tab with a space and shift the position
FT_Vector_Transform (&vec, &string->transform);
error = FT_Glyph_Transform (glyph->image, &string->transform, &vec);
if (error) {
- fprintf (stderr, "couldn't transform glyph\n");
+ DPRINTF("couldn't transform glyph id %d\n", letter)
continue;
}
canvas->aa_type == AA_LIGHT ? FT_RENDER_MODE_LIGHT :
FT_RENDER_MODE_MONO : FT_RENDER_MODE_MONO, 0, 1);
if (error) {
- fprintf (stderr, "couldn't convert glyph to bitmap\n");
+ DPRINTF("couldn't convert glyph id %d to bitmap\n", letter)
continue;
}
/* increment number of glyphs */
previous = glyph->index;
string->num_glyphs++;
- n++;
-
}
+ free(cstr);
/* printf ("number of glyphs = %d\n", string->num_glyphs);*/
compute_string_bbox( string );
/* the last character was a tab */
string->width = string->bbox.xMax - string->bbox.xMin;
} */
string->height = string->bbox.yMax - string->bbox.yMin;
-
return string;
}
pen_x += vec.x/64;
pen_y += vec.y/64;
glyph = string->glyphs;
- for(n=0; n<string->num_glyphs; ++n, ++glyph) {
+ for(n=0; n<string->num_glyphs; n++, glyph++) {
int gr;
FT_Glyph image;
FT_BitmapGlyph bit;
/* long buf_x,comp_n; */
/* make copy to transform */
if (! glyph->image) {
- fprintf (stderr, "no image\n");
+ DPRINTF("no image\n")
continue;
}
error = FT_Glyph_Copy (glyph->image, &image);
if (error) {
- fprintf (stderr, "couldn't copy image\n");
+ DPRINTF("couldn't copy image\n")
continue;
}
*/
static int svg_indent = 0;
static int svg_single_line = 0;
-static const char *svg_default_font = "Helvetica";
+static const char *svg_default_font = "-dummy-";
typedef struct svg_dash
{
int dash_enable;
static void svg_text(FILE *fp, gfx_node_t *node)
{
pdf_coords g;
+ const char *fontname;
/* as svg has 0,0 in top-left corner (like most screens) instead of
bottom-left corner like pdf and eps, we have to fake the coords
using offset and inverse sin(r) value */
svg_write_number(fp, page_height - g.tmy);
fputs("\"", fp);
}
-
-/* if (strcmp(node->filename, svg_default_font))
- fprintf(fp, " font-family=\"%s\"", node->filename);
- */
- fputs(" font-family=\"Helvetica", fp);
- fputs("\" font-size=\"", fp);
+ fontname = afm_get_font_name(node->filename);
+ if (strcmp(fontname, svg_default_font))
+ fprintf(fp, " font-family=\"%s\"", fontname);
+ fputs(" font-size=\"", fp);
svg_write_number(fp, node->size);
fputs("\"", fp);
if (!svg_color_is_black(node->color))
art_u32 width, art_u32 height,
gfx_color_t background, FILE *fp){
gfx_node_t *node = canvas->firstnode;
+ /* Find the first font used, and assume it is the mostly used
+ one. It reduces the number of font-familty attributes. */
+ while (node) {
+ if (node->type == GFX_TEXT && node->filename) {
+ svg_default_font = afm_get_font_name(node->filename);
+ break;
+ }
+ node = node->next;
+ }
fputs(
"<?xml version=\"1.0\" standalone=\"no\"?>\n"
"<!DOCTYPE svg PUBLIC \"-//W3C//DTD SVG 1.0//EN\"\n"
" \"http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd\">\n"
"<!--\n"
-" SVG file created by RRDtool,\n"
-" Tobias Oetiker <tobi@oetike.ch>, http://tobi.oetiker.ch\n"
+" SVG file created by\n"
+" RRDtool " PACKAGE_VERSION " Tobias Oetiker, http://tobi.oetiker.ch\n"
"\n"
" The width/height attributes in the outhermost svg node\n"
" are just default sizes for the browser which is used\n"
fprintf(fp, " x=\"0\" y=\"0\" width=\"%d\" height=\"%d\"", width, height);
svg_write_color(fp, background, "fill");
svg_close_tag_empty_node(fp);
+ node = canvas->firstnode;
while (node) {
switch (node->type) {
case GFX_LINE:
gfx_node_t *node;
fputs(
"%!PS-Adobe-3.0 EPSF-3.0\n"
- "%%Creator: RRDtool 1.2.4 Tobias Oetiker, http://tobi.oetiker.ch\n"
+ "%%Creator: RRDtool " PACKAGE_VERSION " Tobias Oetiker, http://tobi.oetiker.ch\n"
/* can't like weird chars here */
"%%Title: (RRDtool output)\n"
"%%DocumentData: Clean7Bit\n"
static void eps_write_text(eps_state *state, gfx_node_t *node)
{
FILE *fp = state->fp;
- const unsigned char *p;
+ const char *p;
const char *ps_font = afm_get_font_postscript_name(node->filename);
int lineLen = 0;
pdf_coords g;
fputs("T1 ", fp);
fputs("(", fp);
lineLen = 20;
- for (p = (const unsigned char*)node->text; *p; p++) {
- if (lineLen > 70) {
+ p = node->text;
+ while (1) {
+ unsigned char ch = *(unsigned char*)p;
+ if (!ch)
+ break;
+ if (++lineLen > 70) {
fputs("\\\n", fp); /* backslash and \n */
lineLen = 0;
}
- switch (*p) {
+ switch (ch) {
+ case '%':
case '(':
case ')':
case '\\':
+ fputc('\\', fp);
+ fputc(ch, fp);
+ break;
case '\n':
+ fputs("\\n", fp);
+ break;
case '\r':
+ fputs("\\r", fp);
+ break;
case '\t':
- fputc('\\', fp);
- lineLen++;
- /* fall-through */
+ fputs("\\t", fp);
+ break;
default:
- if (*p >= 126)
- fprintf(fp, "\\%03o", *p);
- else
- fputc(*p, fp);
- lineLen++;
- }
+ if (ch >= 126 || ch < 32) {
+ fprintf(fp, "\\%03o", ch);
+ lineLen += 3;
+ } else {
+ fputc(ch, fp);
+ }
+ }
+ p++;
}
if (node->angle) {
/* can't use svg_write_number as 2 decimals is far from enough to avoid
state.linecap = -1;
state.linejoin = -1;
state.has_dash = 0;
+ state.line_width = 1;
if (eps_prologue(&state) == -1)
return -1;
eps_set_color(&state, background);
int last_obj_id;
/*--*/
pdf_buffer pdf_header;
- pdf_buffer catalog_obj, pages_obj, page1_obj;
+ pdf_buffer info_obj, catalog_obj, pages_obj, page1_obj;
pdf_buffer fontsdict_obj;
pdf_buffer graph_stream;
} pdf_state;
pdf_puts(buf, tmp);
}
+static void pdf_put_string_contents(pdf_buffer *buf, const char *text)
+{
+ const char *p = text;
+ while (1) {
+ unsigned char ch = *(unsigned char*)p;
+ switch (ch) {
+ case 0: return;
+ case '(':
+ case ')':
+ case '\\':
+ pdf_puts(buf, "\\");
+ pdf_put(buf, p, 1);
+ break;
+ case '\n':
+ pdf_puts(buf, "\\n");
+ break;
+ case '\r':
+ pdf_puts(buf, "\\r");
+ break;
+ case '\t':
+ pdf_puts(buf, "\\t");
+ break;
+ default:
+ if (ch >= 126 || ch < 32) {
+ char tmp[10];
+ snprintf(tmp, sizeof(tmp), "\\%03o", ch);
+ pdf_puts(buf, tmp);
+ } else {
+ pdf_put(buf, p, 1);
+ }
+ }
+ p++;
+ }
+}
+
static void pdf_init_object(pdf_state *state, pdf_buffer *buf)
{
pdf_init_buffer(state, buf);
{
pdf_coords g;
pdf_buffer *s = &state->graph_stream;
- const unsigned char *p;
pdf_font *font = pdf_find_font(state, node);
if (font == NULL) {
rrd_set_error("font disappeared");
pdf_write_matrix(state, node, &g, 1);
pdf_puts(s, " Tm\n");
pdf_puts(s, "(");
- for (p = (const unsigned char*)node->text; *p; p++) {
- char tmp[30];
- switch (*p) {
- case '(':
- case ')':
- case '\\':
- case '\n':
- case '\r':
- case '\t':
- pdf_puts(s, "\\");
- /* fall-through */
- default:
- if (*p >= 126) {
- snprintf(tmp, sizeof(tmp), "\\%03o", *p);
- pdf_puts(s, tmp);
- } else {
- pdf_put(s, (const char*)p, 1);
- }
- }
- }
+ pdf_put_string_contents(s, node->text);
pdf_puts(s, ") Tj\n");
if (PDF_CALC_DEBUG || !next_is_text)
pdf_puts(s, "ET\n");
{
pdf_init_buffer(state, &state->pdf_header);
pdf_init_dict(state, &state->catalog_obj);
+ pdf_init_dict(state, &state->info_obj);
pdf_init_dict(state, &state->pages_obj);
pdf_init_dict(state, &state->page1_obj);
pdf_init_dict(state, &state->fontsdict_obj);
static void pdf_setup_document(pdf_state *state)
{
+ const char *creator = "RRDtool " PACKAGE_VERSION " Tobias Oetiker, http://tobi.oetiker.ch";
/* all objects created by now, so init code can reference them */
/* HEADER */
pdf_puts(&state->pdf_header, "%PDF-1.3\n");
/* following 8 bit comment is recommended by Adobe for
indicating binary file to file transfer applications */
pdf_puts(&state->pdf_header, "%\xE2\xE3\xCF\xD3\n");
+ /* INFO */
+ pdf_putsi(&state->info_obj, "/Creator (");
+ pdf_put_string_contents(&state->info_obj, creator);
+ pdf_puts(&state->info_obj, ")\n");
/* CATALOG */
pdf_putsi(&state->catalog_obj, "/Type /Catalog\n");
pdf_putsi(&state->catalog_obj, "/Pages ");
fprintf(state->fp, "<<\n");
fprintf(state->fp, "\t/Size %d\n", state->last_obj_id + 1);
fprintf(state->fp, "\t/Root %d 0 R\n", state->catalog_obj.id);
+ fprintf(state->fp, "\t/Info %d 0 R\n", state->info_obj.id);
fprintf(state->fp, ">>\n");
fprintf(state->fp, "startxref\n");
fprintf(state->fp, "%d\n", xref_pos);
int gfx_render_pdf (gfx_canvas_t *canvas,
art_u32 width, art_u32 height,
- gfx_color_t background, FILE *fp){
+ gfx_color_t UNUSED(background), FILE *fp){
struct pdf_state state;
memset(&state, 0, sizeof(pdf_state));
state.fp = fp;
projects / rrdtool.git / blobdiff