graph: factor out cairo text drawing helpers

Signed-off-by: Stephen M. Cameron <stephenmcameron@gmail.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/Makefile b/Makefile
index 3091d0952273f6363c9c2ab46280e40953a1bb60..ca025c8fd499c9d6c22199032666d88176f9a6e6 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -70,7 +70,7 @@ endif
 OBJS = $(SOURCE:.c=.o)
 FIO_OBJS = $(OBJS) fio.o
 GFIO_OBJS = $(OBJS) gfio.o graph.o tickmarks.o ghelpers.o goptions.o gerror.o \
-                       gclient.o gcompat.o
+                       gclient.o gcompat.o cairo_text_helpers.o
 
 T_SMALLOC_OBJS = t/stest.o
 T_SMALLOC_OBJS += mutex.o smalloc.o t/log.o
@@ -135,6 +135,9 @@ gfio.o: gfio.c ghelpers.c
 graph.o: graph.c graph.h
        $(QUIET_CC)$(CC) $(CFLAGS) $(GTK_CFLAGS) $(CPPFLAGS) -c graph.c
 
+cairo_text_helpers.o: cairo_text_helpers.c cairo_text_helpers.h
+       $(QUIET_CC)$(CC) $(CFLAGS) $(GTK_CFLAGS) $(CPPFLAGS) -c cairo_text_helpers.c
+
 t/stest: $(T_SMALLOC_OBJS)
        $(QUIET_CC)$(CC) $(LDFLAGS) $(CFLAGS) -o $@ $(T_SMALLOC_OBJS) $(LIBS) $(LDFLAGS)
 

diff --git a/cairo_text_helpers.c b/cairo_text_helpers.c
new file mode 100644 (file)
index 0000000..89b9aa2
--- /dev/null
+++ b/cairo_text_helpers.c
@@ -0,0 +1,85 @@
+#include <cairo.h>
+#include <gtk/gtk.h>
+#include <math.h>
+
+static void draw_aligned_text(cairo_t *cr, const char *font, double x, double y,
+                              double fontsize, const char *text, int alignment)
+{
+#define CENTERED 0
+#define LEFT_JUSTIFIED 1
+#define RIGHT_JUSTIFIED 2
+
+       double factor, direction;
+       cairo_text_extents_t extents;
+
+       switch(alignment) {
+               case CENTERED:
+                       direction = -1.0;
+                       factor = 0.5;
+                       break;
+               case RIGHT_JUSTIFIED:
+                       direction = -1.0;
+                       factor = 1.0;
+                       break;
+               case LEFT_JUSTIFIED:
+               default:
+                       direction = 1.0;
+                       factor = 1.0;
+                       break;
+       }
+       cairo_select_font_face(cr, font, CAIRO_FONT_SLANT_NORMAL, CAIRO_FONT_WEIGHT_NORMAL);
+
+       cairo_set_font_size(cr, fontsize);
+       cairo_text_extents(cr, text, &extents);
+       x = x + direction * (factor * extents.width  + extents.x_bearing);
+       y = y - (extents.height / 2 + extents.y_bearing);
+
+       cairo_move_to(cr, x, y);
+       cairo_show_text(cr, text);
+}
+
+void draw_centered_text(cairo_t *cr, const char *font, double x, double y,
+                              double fontsize, const char *text)
+{
+       draw_aligned_text(cr, font, x, y, fontsize, text, CENTERED);
+}
+
+void draw_right_justified_text(cairo_t *cr, const char *font,
+                               double x, double y,
+                               double fontsize, const char *text)
+{
+       draw_aligned_text(cr, font, x, y, fontsize, text, RIGHT_JUSTIFIED);
+}
+
+void draw_left_justified_text(cairo_t *cr, const char *font,
+                               double x, double y,
+                               double fontsize, const char *text)
+{
+       draw_aligned_text(cr, font, x, y, fontsize, text, LEFT_JUSTIFIED);
+}
+
+void draw_vertical_centered_text(cairo_t *cr, const char * font, double x,
+                                       double y, double fontsize,
+                                       const char *text)
+{
+       double sx, sy;
+       cairo_text_extents_t extents;
+
+       cairo_select_font_face(cr, font, CAIRO_FONT_SLANT_NORMAL, CAIRO_FONT_WEIGHT_NORMAL);
+
+       cairo_set_font_size(cr, fontsize);
+       cairo_text_extents(cr, text, &extents);
+       sx = x;
+       sy = y;
+       y = y + (extents.width / 2.0 + extents.x_bearing);
+       x = x - (extents.height / 2.0 + extents.y_bearing);
+
+       cairo_move_to(cr, x, y);
+       cairo_save(cr);
+       cairo_translate(cr, -sx, -sy);
+       cairo_rotate(cr, -90.0 * M_PI / 180.0);
+       cairo_translate(cr, sx, sy);
+       cairo_show_text(cr, text);
+       cairo_restore(cr);
+}
+

diff --git a/cairo_text_helpers.h b/cairo_text_helpers.h
new file mode 100644 (file)
index 0000000..f8157d4
--- /dev/null
+++ b/cairo_text_helpers.h
@@ -0,0 +1,18 @@
+#ifndef CAIRO_TEXT_HELPERS_H
+#define CAIRO_TEXT_HELPERS_H
+
+void draw_centered_text(cairo_t *cr, const char *font, double x, double y,
+                              double fontsize, const char *text);
+
+void draw_right_justified_text(cairo_t *cr, const char *font,
+                               double x, double y,
+                               double fontsize, const char *text);
+
+void draw_left_justified_text(cairo_t *cr, const char *font,
+                               double x, double y,
+                               double fontsize, const char *text);
+
+void draw_vertical_centered_text(cairo_t *cr, const char * font, double x,
+                                       double y, double fontsize,
+                                       const char *text);
+#endif

diff --git a/graph.c b/graph.c
index 51eb3eff17cb1f5f4d99ee203ea3718f4c482774..ba013da449d162a38311ccc7950decb86bc16131 100644 (file)
--- a/graph.c
+++ b/graph.c
@@ -33,6 +33,7 @@
 #include "graph.h"
 #include "flist.h"
 #include "lib/prio_tree.h"
+#include "cairo_text_helpers.h"
 
 /*
  * Allowable difference to show tooltip
@@ -266,87 +267,6 @@ static void draw_bars(struct graph *bg, cairo_t *cr, struct graph_label *lb,
        }
 }
 
-static void draw_aligned_text(struct graph *g, cairo_t *cr, double x, double y,
-                              double fontsize, const char *text, int alignment)
-{
-#define CENTERED 0
-#define LEFT_JUSTIFIED 1
-#define RIGHT_JUSTIFIED 2
-
-       double factor, direction;
-       cairo_text_extents_t extents;
-
-       switch(alignment) {
-               case CENTERED:
-                       direction = -1.0;
-                       factor = 0.5;
-                       break;
-               case RIGHT_JUSTIFIED:
-                       direction = -1.0;
-                       factor = 1.0;
-                       break;
-               case LEFT_JUSTIFIED:
-               default:
-                       direction = 1.0;
-                       factor = 1.0;
-                       break;
-       }
-       cairo_select_font_face(cr, g->font, CAIRO_FONT_SLANT_NORMAL, CAIRO_FONT_WEIGHT_NORMAL);
-
-       cairo_set_font_size(cr, fontsize);
-       cairo_text_extents(cr, text, &extents);
-       x = x + direction * (factor * extents.width  + extents.x_bearing);
-       y = y - (extents.height / 2 + extents.y_bearing);
-
-       cairo_move_to(cr, x, y);
-       cairo_show_text(cr, text);
-}
-
-static inline void draw_centered_text(struct graph *g, cairo_t *cr, double x, double y,
-                              double fontsize, const char *text)
-{
-       draw_aligned_text(g, cr, x, y, fontsize, text, CENTERED);
-}
-
-static inline void draw_right_justified_text(struct graph *g, cairo_t *cr,
-                               double x, double y,
-                               double fontsize, const char *text)
-{
-       draw_aligned_text(g, cr, x, y, fontsize, text, RIGHT_JUSTIFIED);
-}
-
-static inline void draw_left_justified_text(struct graph *g, cairo_t *cr,
-                               double x, double y,
-                               double fontsize, const char *text)
-{
-       draw_aligned_text(g, cr, x, y, fontsize, text, LEFT_JUSTIFIED);
-}
-
-static void draw_vertical_centered_text(struct graph *g, cairo_t *cr, double x,
-                                       double y, double fontsize,
-                                       const char *text)
-{
-       double sx, sy;
-       cairo_text_extents_t extents;
-
-       cairo_select_font_face(cr, g->font, CAIRO_FONT_SLANT_NORMAL, CAIRO_FONT_WEIGHT_NORMAL);
-
-       cairo_set_font_size(cr, fontsize);
-       cairo_text_extents(cr, text, &extents);
-       sx = x;
-       sy = y;
-       y = y + (extents.width / 2.0 + extents.x_bearing);
-       x = x - (extents.height / 2.0 + extents.y_bearing);
-
-       cairo_move_to(cr, x, y);
-       cairo_save(cr);
-       cairo_translate(cr, -sx, -sy);
-       cairo_rotate(cr, -90.0 * M_PI / 180.0);
-       cairo_translate(cr, sx, sy);
-       cairo_show_text(cr, text);
-       cairo_restore(cr);
-}
-
 static void graph_draw_common(struct graph *g, cairo_t *cr,
        double *x1, double *y1, double *x2, double *y2)
 {
@@ -365,9 +285,9 @@ static void graph_draw_common(struct graph *g, cairo_t *cr,
        cairo_line_to(cr, *x1, *y1);
        cairo_stroke(cr);
 
-       draw_centered_text(g, cr, g->xdim / 2, g->ydim / 20, 20.0, g->title);
-       draw_centered_text(g, cr, g->xdim / 2, g->ydim * 0.97, 14.0, g->xtitle);
-       draw_vertical_centered_text(g, cr, g->xdim * 0.02, g->ydim / 2, 14.0, g->ytitle);
+       draw_centered_text(cr, g->font, g->xdim / 2, g->ydim / 20, 20.0, g->title);
+       draw_centered_text(cr, g->font, g->xdim / 2, g->ydim * 0.97, 14.0, g->xtitle);
+       draw_vertical_centered_text(cr, g->font, g->xdim * 0.02, g->ydim / 2, 14.0, g->ytitle);
        cairo_stroke(cr);
 }
 
@@ -422,7 +342,7 @@ static void graph_draw_x_ticks(struct graph *g, cairo_t *cr,
                        continue;
 
                /* draw tickmark label */
-               draw_centered_text(g, cr, tx, y2 * 1.04, 12.0, tm[i].string);
+               draw_centered_text(cr, g->font, tx, y2 * 1.04, 12.0, tm[i].string);
                cairo_stroke(cr);
        }
 }
@@ -484,7 +404,7 @@ static double graph_draw_y_ticks(struct graph *g, cairo_t *cr,
                        continue;
 
                /* draw tickmark label */
-               draw_right_justified_text(g, cr, x1 - (x2 - x1) * 0.025, ty, 12.0, tm[i].string);
+               draw_right_justified_text(cr, g->font, x1 - (x2 - x1) * 0.025, ty, 12.0, tm[i].string);
                cairo_stroke(cr);
        }
 
@@ -521,7 +441,7 @@ void bar_graph_draw(struct graph *bg, cairo_t *cr)
        maxdata = find_max_data(bg);
 
        if (fabs(maxdata - mindata) < 1e-20) {
-               draw_centered_text(bg, cr,
+               draw_centered_text(cr, bg->font,
                        x1 + (x2 - x1) / 2.0,
                        y1 + (y2 - y1) / 2.0, 20.0, "No good data");
                return;
@@ -538,7 +458,7 @@ void bar_graph_draw(struct graph *bg, cairo_t *cr)
                label_offset = bg->xdim * 0.1 + space_per_label * (double) i + space_per_label * 0.1;
                draw_bars(bg, cr, lb, label_offset, bar_width, mindata, maxdata);
                // draw_centered_text(cr, label_offset + (bar_width / 2.0 + bar_width * 0.1), bg->ydim * 0.93,
-               draw_centered_text(bg, cr, x1 + space_per_label * (i + 0.5), bg->ydim * 0.93,
+               draw_centered_text(cr, bg->font, x1 + space_per_label * (i + 0.5), bg->ydim * 0.93,
                        12.0, lb->label); 
                i++;
        }