X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Frrd_graph.c;h=d1f32ddcb650838f6022d6386d79edf81d496a0e;hb=f7e067b75a9ed10d757c60ff1fda4f747b9ea26b;hp=ff1859d6622cedfb85b3fc0d13c2dc9811604134;hpb=829d0547396813c62e606d95fd42612f15ab9cb3;p=rrdtool.git

diff --git a/src/rrd_graph.c b/src/rrd_graph.c
index ff1859d..d1f32dd 100644
--- a/src/rrd_graph.c
+++ b/src/rrd_graph.c
@@ -2737,41 +2737,62 @@ void grid_paint(
                 boxV = boxH;
                 /* shift the box up a bit */
                 Y0 -= boxV * 0.4;
-                /* make sure transparent colors show up the same way as in the graph */
-                gfx_new_area(im,
-                             X0, Y0 - boxV,
-                             X0, Y0, X0 + boxH, Y0, im->graph_col[GRC_BACK]);
-                gfx_add_point(im, X0 + boxH, Y0 - boxV);
-                gfx_close_path(im);
-                gfx_new_area(im, X0, Y0 - boxV, X0,
-                             Y0, X0 + boxH, Y0, im->gdes[i].col);
-                gfx_add_point(im, X0 + boxH, Y0 - boxV);
-                gfx_close_path(im);
-                cairo_save(im->cr);
-                cairo_new_path(im->cr);
-                cairo_set_line_width(im->cr, 1.0);
-                X1 = X0 + boxH;
-                Y1 = Y0 - boxV;
-                gfx_line_fit(im, &X0, &Y0);
-                gfx_line_fit(im, &X1, &Y1);
-                cairo_move_to(im->cr, X0, Y0);
-                cairo_line_to(im->cr, X1, Y0);
-                cairo_line_to(im->cr, X1, Y1);
-                cairo_line_to(im->cr, X0, Y1);
-                cairo_close_path(im->cr);
-                cairo_set_source_rgba(im->cr,
-                                      im->
-                                      graph_col
-                                      [GRC_FRAME].
-                                      red,
-                                      im->
-                                      graph_col
-                                      [GRC_FRAME].
-                                      green,
-                                      im->
-                                      graph_col
-                                      [GRC_FRAME].
-                                      blue, im->graph_col[GRC_FRAME].alpha);
+		if (im->gdes[i].gf == GF_HRULE) { /* [-] */ 
+			cairo_save(im->cr);
+			cairo_new_path(im->cr);
+			cairo_set_line_width(im->cr, 1.0);
+			gfx_line(im,
+				X0, Y0 - boxV / 2,
+				X0 + boxH, Y0 - boxV / 2,
+				1.0, im->gdes[i].col);
+            		gfx_close_path(im);
+		} else if (im->gdes[i].gf == GF_VRULE) { /* [|] */
+			cairo_save(im->cr);
+			cairo_new_path(im->cr);
+			cairo_set_line_width(im->cr, 1.0);
+			gfx_line(im,
+				X0 + boxH / 2, Y0,
+				X0 + boxH / 2, Y0 - boxV,
+				1.0, im->gdes[i].col);
+            		gfx_close_path(im);
+		} else if (im->gdes[i].gf == GF_LINE) { /* [/] */
+			cairo_save(im->cr);
+			cairo_new_path(im->cr);
+			cairo_set_line_width(im->cr, im->gdes[i].linewidth);
+			gfx_line(im,
+				X0, Y0,
+				X0 + boxH, Y0 - boxV,
+				im->gdes[i].linewidth, im->gdes[i].col);
+            		gfx_close_path(im);
+		} else {
+		/* make sure transparent colors show up the same way as in the graph */
+			gfx_new_area(im,
+				     X0, Y0 - boxV,
+				     X0, Y0, X0 + boxH, Y0, im->graph_col[GRC_BACK]);
+			gfx_add_point(im, X0 + boxH, Y0 - boxV);
+			gfx_close_path(im);
+			gfx_new_area(im, X0, Y0 - boxV, X0,
+				     Y0, X0 + boxH, Y0, im->gdes[i].col);
+			gfx_add_point(im, X0 + boxH, Y0 - boxV);
+			gfx_close_path(im);
+			cairo_save(im->cr);
+			cairo_new_path(im->cr);
+			cairo_set_line_width(im->cr, 1.0);
+			X1 = X0 + boxH;
+			Y1 = Y0 - boxV;
+			gfx_line_fit(im, &X0, &Y0);
+			gfx_line_fit(im, &X1, &Y1);
+			cairo_move_to(im->cr, X0, Y0);
+			cairo_line_to(im->cr, X1, Y0);
+			cairo_line_to(im->cr, X1, Y1);
+			cairo_line_to(im->cr, X0, Y1);
+			cairo_close_path(im->cr);
+			cairo_set_source_rgba(im->cr,
+					      im->graph_col[GRC_FRAME].red,
+					      im->graph_col[GRC_FRAME].green,
+					      im->graph_col[GRC_FRAME].blue,
+					      im->graph_col[GRC_FRAME].alpha);
+		}
                 if (im->gdes[i].dash) {
                     /* make box borders in legend dashed if the graph is dashed */
                     double    dashes[] = {
@@ -3983,12 +4004,7 @@ void rrd_graph_init(
 #ifdef HAVE_TZSET
     tzset();
 #endif
-#ifdef HAVE_SETLOCALE
-    setlocale(LC_TIME, "");
-#ifdef HAVE_MBSTOWCS
-    setlocale(LC_CTYPE, "");
-#endif
-#endif
+
     im->base = 1000;
     im->daemon_addr = NULL;
     im->draw_x_grid = 1;