gfio: add font selection and resize original window

Font doesn't quite work yet, since we still setup the graphs
before anything is loaded. Will fix that later.

Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/gfio.c b/gfio.c
index 6e70c3e7e1659890c5cbd3fd7e9ab875ae7a6a40..833cd93daef2883e462fad5ae6fbc4f3a7db1286 100644 (file)
--- a/gfio.c
+++ b/gfio.c
@@ -32,6 +32,7 @@
 #include "graph.h"
 
 static int gfio_server_running;
+static const char *gfio_graph_font;
 
 static void gfio_update_thread_status(char *status_message, double perc);
 
@@ -125,7 +126,7 @@ static void setup_iops_graph(struct gui *ui)
        if (ui->iops_graph)
                graph_free(ui->iops_graph);
        ui->iops_graph = graph_new(DRAWING_AREA_XDIM / 2.0,
-                                       DRAWING_AREA_YDIM);
+                                       DRAWING_AREA_YDIM, gfio_graph_font);
        graph_title(ui->iops_graph, "IOPS");
        graph_x_title(ui->iops_graph, "Time");
        graph_y_title(ui->iops_graph, "IOPS");
@@ -140,7 +141,7 @@ static void setup_bandwidth_graph(struct gui *ui)
        if (ui->bandwidth_graph)
                graph_free(ui->bandwidth_graph);
        ui->bandwidth_graph = graph_new(DRAWING_AREA_XDIM / 2.0,
-                                               DRAWING_AREA_YDIM);
+                                       DRAWING_AREA_YDIM, gfio_graph_font);
        graph_title(ui->bandwidth_graph, "Bandwidth");
        graph_x_title(ui->bandwidth_graph, "Time");
        graph_y_title(ui->bandwidth_graph, "Bandwidth");
@@ -1662,7 +1663,7 @@ static void view_log(GtkWidget *w, gpointer data)
 
 static void preferences(GtkWidget *w, gpointer data)
 {
-       GtkWidget *dialog, *frame, *box, **buttons;
+       GtkWidget *dialog, *frame, *box, **buttons, *vbox, *font;
        int i;
 
        dialog = gtk_dialog_new_with_buttons("Preferences",
@@ -1674,17 +1675,35 @@ static void preferences(GtkWidget *w, gpointer data)
 
        frame = gtk_frame_new("Debug logging");
        gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox), frame, FALSE, FALSE, 5);
+
+       vbox = gtk_vbox_new(FALSE, 6);
+       gtk_container_add(GTK_CONTAINER(frame), vbox);
+
        box = gtk_hbox_new(FALSE, 6);
-       gtk_container_add(GTK_CONTAINER(frame), box);
+       gtk_container_add(GTK_CONTAINER(vbox), box);
 
        buttons = malloc(sizeof(GtkWidget *) * FD_DEBUG_MAX);
 
        for (i = 0; i < FD_DEBUG_MAX; i++) {
+               if (i == 7) {
+                       box = gtk_hbox_new(FALSE, 6);
+                       gtk_container_add(GTK_CONTAINER(vbox), box);
+               }
+
+
                buttons[i] = gtk_check_button_new_with_label(debug_levels[i].name);
                gtk_widget_set_tooltip_text(buttons[i], debug_levels[i].help);
                gtk_box_pack_start(GTK_BOX(box), buttons[i], FALSE, FALSE, 6);
        }
 
+       frame = gtk_frame_new("Graph font");
+       gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox), frame, FALSE, FALSE, 5);
+       vbox = gtk_vbox_new(FALSE, 6);
+       gtk_container_add(GTK_CONTAINER(frame), vbox);
+
+       font = gtk_font_button_new();
+       gtk_box_pack_start(GTK_BOX(vbox), font, FALSE, FALSE, 5);
+
        gtk_widget_show_all(dialog);
 
        if (gtk_dialog_run(GTK_DIALOG(dialog)) != GTK_RESPONSE_ACCEPT) {
@@ -1700,6 +1719,9 @@ static void preferences(GtkWidget *w, gpointer data)
                        fio_debug |= (1UL << i);
        }
 
+       gfio_graph_font = strdup(gtk_font_button_get_font_name(GTK_FONT_BUTTON(font)));
+       printf("got font %s\n", gfio_graph_font);
+
        gtk_widget_destroy(dialog);
 }
 
@@ -1796,7 +1818,7 @@ static void init_ui(int *argc, char **argv[], struct gui *ui)
        
        ui->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
         gtk_window_set_title(GTK_WINDOW(ui->window), "fio");
-       gtk_window_set_default_size(GTK_WINDOW(ui->window), 700, 500);
+       gtk_window_set_default_size(GTK_WINDOW(ui->window), 700, 700);
 
        g_signal_connect(ui->window, "delete-event", G_CALLBACK(quit_clicked), NULL);
        g_signal_connect(ui->window, "destroy", G_CALLBACK(quit_clicked), NULL);

diff --git a/graph.c b/graph.c
index 18d47dec1559510adb886796d5f8081e6327a2f8..1cd2caab0724ea4a59ed4644a47ba9c06a9352c1 100644 (file)
--- a/graph.c
+++ b/graph.c
@@ -57,9 +57,10 @@ struct graph {
        struct graph_label *labels;
        struct graph_label *tail;
        int per_label_limit;
+       const char *font;
 };
 
-struct graph *graph_new(unsigned int xdim, unsigned int ydim)
+struct graph *graph_new(unsigned int xdim, unsigned int ydim, const char *font)
 {
        struct graph *g;
 
@@ -67,6 +68,9 @@ struct graph *graph_new(unsigned int xdim, unsigned int ydim)
        g->xdim = xdim;
        g->ydim = ydim;
        g->per_label_limit = -1;
+       g->font = font;
+       if (!g->font)
+               g->font = "Sans";
        return g;
 }
 
@@ -182,14 +186,12 @@ static void draw_bars(struct graph *bg, cairo_t *cr, struct graph_label *lb,
        }
 }
 
-static void draw_centered_text(cairo_t *cr, double x, double y,
-               double fontsize, const char *text)
+static void draw_centered_text(struct graph *g, cairo_t *cr, double x, double y,
+                              double fontsize, const char *text)
 {
        cairo_text_extents_t extents;
 
-       cairo_select_font_face (cr, "Sans",
-               CAIRO_FONT_SLANT_NORMAL,
-               CAIRO_FONT_WEIGHT_NORMAL);
+       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);
@@ -200,15 +202,14 @@ static void draw_centered_text(cairo_t *cr, double x, double y,
        cairo_show_text(cr, text);
 }
 
-static void draw_vertical_centered_text(cairo_t *cr, double x, double y,
-               double fontsize, const char *text)
+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, "Sans",
-               CAIRO_FONT_SLANT_NORMAL,
-               CAIRO_FONT_WEIGHT_NORMAL);
+       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);
@@ -230,7 +231,7 @@ static void graph_draw_common(struct graph *g, cairo_t *cr,
        double *x1, double *y1, double *x2, double *y2)
 {
         cairo_set_source_rgb(cr, 0, 0, 0);
-        cairo_set_line_width (cr, 1.0);
+        cairo_set_line_width (cr, 0.8);
 
         cairo_move_to(cr, 0, 0);
         cairo_line_to(cr, 0, g->ydim);
@@ -240,9 +241,9 @@ static void graph_draw_common(struct graph *g, cairo_t *cr,
 
        /* for now just set margins at 10% of width.  This is not very good. */
        *x1 = g->xdim / 10.0;   
-       *x2 = 9.0 * *x1; 
+       *x2 = 9.0 * *x1;
        *y1 = g->ydim / 10.0;   
-       *y2 = 9.0 * *y1; 
+       *y2 = 9.0 * *y1;
 
        cairo_move_to(cr, *x1, *y1);
        cairo_line_to(cr, *x1, *y2);
@@ -251,9 +252,9 @@ static void graph_draw_common(struct graph *g, cairo_t *cr,
        cairo_line_to(cr, *x1, *y1);
        cairo_stroke(cr);
 
-       draw_centered_text(cr, g->xdim / 2, g->ydim / 20, 20.0, g->title);
-       draw_centered_text(cr, g->xdim / 2, g->ydim * 0.97, 14.0, g->xtitle);
-       draw_vertical_centered_text(cr, g->xdim * 0.02, g->ydim / 2, 14.0, g->ytitle);
+       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);
        cairo_stroke(cr);
 }
 
@@ -274,7 +275,7 @@ static void graph_draw_x_ticks(struct graph *g, cairo_t *cr,
                        continue;
 
                /* Draw tick mark */
-               cairo_set_line_width(cr, 1.0);
+               cairo_set_line_width(cr, 0.8);
                cairo_move_to(cr, tx, y2);
                cairo_line_to(cr, tx, y2 + (y2 - y1) * 0.03);
                cairo_stroke(cr);
@@ -289,7 +290,7 @@ static void graph_draw_x_ticks(struct graph *g, cairo_t *cr,
                cairo_restore(cr);
 
                /* draw tickmark label */
-               draw_centered_text(cr, tx, y2 * 1.04, 12.0, tm[i].string);
+               draw_centered_text(g, cr, tx, y2 * 1.04, 12.0, tm[i].string);
                cairo_stroke(cr);
                
        }
@@ -325,7 +326,7 @@ static void graph_draw_y_ticks(struct graph *g, cairo_t *cr,
                cairo_restore(cr);
 
                /* draw tickmark label */
-               draw_centered_text(cr, x1 - (x2 - x1) * 0.04, ty, 12.0, tm[i].string);
+               draw_centered_text(g, cr, x1 - (x2 - x1) * 0.04, ty, 12.0, tm[i].string);
                cairo_stroke(cr);
        }
 }
@@ -348,7 +349,7 @@ void bar_graph_draw(struct graph *bg, cairo_t *cr)
        maxdata = find_max_data(bg->labels);
 
        if (fabs(maxdata - mindata) < 1e-20) {
-               draw_centered_text(cr,
+               draw_centered_text(bg, cr,
                        x1 + (x2 - x1) / 2.0,
                        y1 + (y2 - y1) / 2.0, 20.0, "No good data");
                return;
@@ -364,7 +365,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(cr, x1 + space_per_label * (i + 0.5), bg->ydim * 0.93,
+               draw_centered_text(bg, cr, x1 + space_per_label * (i + 0.5), bg->ydim * 0.93,
                        12.0, lb->label); 
                i++;
        }
@@ -418,7 +419,7 @@ void line_graph_draw(struct graph *g, cairo_t *cr)
        maxy = find_xy_value(g, gety, maxdouble);
 
        if (fabs(maxx - minx) < 1e-20 || fabs(maxy - miny) < 1e-20) {
-               draw_centered_text(cr,
+               draw_centered_text(g, cr,
                        x1 + (x2 - x1) / 2.0,
                        y1 + (y2 - y1) / 2.0, 20.0, "No good Data");
                return;
@@ -427,7 +428,7 @@ void line_graph_draw(struct graph *g, cairo_t *cr)
        graph_draw_x_ticks(g, cr, x1, y1, x2, y2, minx, maxx, 10);
        graph_draw_y_ticks(g, cr, x1, y1, x2, y2, miny, maxy, 10);
 
-       cairo_set_line_width(cr, 2.5);
+       cairo_set_line_width(cr, 1.5);
        for (i = g->labels; i; i = i->next) {
                first = 1;
                cairo_set_source_rgb(cr, i->r, i->g, i->b);

diff --git a/graph.h b/graph.h
index 156b8e92ce33e5b565ac9d2ab042bdfedb52dc66..8202fe63a19e7feb96a9be0c3aea57eb95ea1092 100644 (file)
--- a/graph.h
+++ b/graph.h
@@ -3,7 +3,7 @@
 
 struct graph;
 
-struct graph *graph_new(unsigned int xdim, unsigned int ydim);
+struct graph *graph_new(unsigned int xdim, unsigned int ydim, const char *font);
 void bar_graph_draw(struct graph *g, cairo_t *cr);
 void line_graph_draw(struct graph *g, cairo_t *cr);
 void line_graph_set_data_count_limit(struct graph *g, int per_label_limit);