X-Git-Url: https://git.octo.it/?p=rrdtool.git;a=blobdiff_plain;f=src%2Frrd_graph_helper.c;h=2e807419315d39f60767a779b5b4eda27e756569;hp=375521c25137250b8a0d1fd1d1960c331291e55a;hb=0dc5d6d50c0d95ba4f04b656358b26518d4ce854;hpb=554df7224e8b3fec9ec5981812b453c43072f150

diff --git a/src/rrd_graph_helper.c b/src/rrd_graph_helper.c
index 375521c..2e80741 100644
--- a/src/rrd_graph_helper.c
+++ b/src/rrd_graph_helper.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * RRDtool 1.2.4  Copyright by Tobi Oetiker, 1997-2005
+ * RRDtool 1.2.9  Copyright by Tobi Oetiker, 1997-2005
  ****************************************************************************
  * rrd_graph_helper.c  commandline parser functions 
  *                     this code initially written by Alex van den Bogaerdt
@@ -119,7 +119,7 @@ rrd_parse_color(char *string, graph_desc_t *gdp) {
     */
 
     i=0;
-    while (string[i] && isxdigit(string[i])) i++;
+    while (string[i] && isxdigit((unsigned int)string[i])) i++;
     if (string[i] != '\0') return 1; /* garbage follows hexdigits */
     switch (i) {
 	case 3:
@@ -295,6 +295,21 @@ rrd_parse_PVHLAST(char *line, unsigned int *eaten, graph_desc_t *gdp, image_desc
     int i,j,k;
     int colorfound=0;
     char tmpstr[MAX_VNAME_LEN + 10];	/* vname#RRGGBBAA\0 */
+    static int spacecnt = 0;
+
+    if (spacecnt == 0) {        
+	float one_space = gfx_get_text_width(im->canvas, 0,
+                               im->text_prop[TEXT_PROP_LEGEND].font,
+                               im->text_prop[TEXT_PROP_LEGEND].size,
+                               im->tabwidth,"    ", 0) / 4.0;
+	float target_space = gfx_get_text_width(im->canvas, 0,
+                               im->text_prop[TEXT_PROP_LEGEND].font,
+                               im->text_prop[TEXT_PROP_LEGEND].size,
+                               im->tabwidth,"oo", 0);
+	spacecnt =  target_space / one_space;	
+        dprintf("- spacecnt: %i onespace: %f targspace: %f\n",spacecnt,one_space,target_space);
+    }
+
 
     dprintf("- parsing '%s'\n",&line[*eaten]);
 
@@ -399,16 +414,15 @@ rrd_parse_PVHLAST(char *line, unsigned int *eaten, graph_desc_t *gdp, image_desc
 	
 	dprintf("- examining '%s'\n",&line[*eaten]);
 	if (linecp[*eaten] != '\0' && linecp[*eaten] != ':') {
-	    /* If the legend is not empty, it has to be prefixed with "m ". This then gets
+	    int spi;		
+	    /* If the legend is not empty, it has to be prefixed with spacecnt ' ' characters. This then gets
 	     * replaced by the color box later on. */
-	     (*eaten)--;
-	     linecp[*eaten]=' ';
-	     (*eaten)--;
-	     linecp[*eaten]='m';
+	    for (spi=0;spi<spacecnt && (*eaten) > 1;spi++){
+   	       linecp[--(*eaten)]=' ';
+	    }
 	}
 
 	if (rrd_parse_legend(linecp, eaten, gdp)) err=1;
-	
 	free(linecp);
 	if (err) return 1;